From 179e6c141e93107b32868379b4cf5bbc52e49ce3 Mon Sep 17 00:00:00 2001 From: IThundxr Date: Sun, 2 Mar 2025 08:22:55 -0500 Subject: [PATCH] Missing computers - Fix warning getting logged when cc: tweaked isn't installed - update changelog --- changelog.md | 8 +++++++ .../simibubi/create/AllDisplaySources.java | 21 ++++++++++++------- 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/changelog.md b/changelog.md index 23d0c116b1..21ab1a90ce 100644 --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,11 @@ +------------------------------------------------------ +Create 6.0.2 +------------------------------------------------------ + +#### Bug Fixes + +- Fix warning getting logged when cc: tweaked isn't installed + ------------------------------------------------------ Create 6.0.1 ------------------------------------------------------ diff --git a/src/main/java/com/simibubi/create/AllDisplaySources.java b/src/main/java/com/simibubi/create/AllDisplaySources.java index c18e587580..6bb319f1e6 100644 --- a/src/main/java/com/simibubi/create/AllDisplaySources.java +++ b/src/main/java/com/simibubi/create/AllDisplaySources.java @@ -1,5 +1,12 @@ package com.simibubi.create; +import static com.simibubi.create.Create.REGISTRATE; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.function.Supplier; + import com.simibubi.create.api.behaviour.display.DisplaySource; import com.simibubi.create.compat.Mods; import com.simibubi.create.content.redstone.displayLink.source.AccumulatedItemCountDisplaySource; @@ -29,20 +36,15 @@ import com.simibubi.create.content.redstone.displayLink.source.StopWatchDisplayS import com.simibubi.create.content.redstone.displayLink.source.TimeOfDayDisplaySource; import com.simibubi.create.content.redstone.displayLink.source.TrainStatusDisplaySource; import com.tterrag.registrate.util.entry.RegistryEntry; + +import net.minecraftforge.registries.ForgeRegistries; + import net.minecraft.Util; import net.minecraft.core.registries.Registries; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.DyeColor; import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.entity.BlockEntityType; -import net.minecraftforge.registries.ForgeRegistries; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.function.Supplier; - -import static com.simibubi.create.Create.REGISTRATE; public class AllDisplaySources { public static final RegistryEntry DEATH_COUNT = REGISTRATE.displaySource("death_count", DeathCounterDisplaySource::new) @@ -87,6 +89,9 @@ public class AllDisplaySources { public static final RegistryEntry COMPUTER = REGISTRATE.displaySource("computer", ComputerDisplaySource::new) .onRegisterAfter(Registries.BLOCK_ENTITY_TYPE, source -> { + if (!Mods.COMPUTERCRAFT.isLoaded()) + return; + List types = List.of("wired_modem_full", "computer_normal", "computer_advanced", "computer_command"); for (String name : types) { ResourceLocation id = Mods.COMPUTERCRAFT.rl(name);