diff --git a/src/main/java/com/simibubi/create/AllDisplaySources.java b/src/main/java/com/simibubi/create/AllDisplaySources.java index 5b1f64692b..351bffb9bc 100644 --- a/src/main/java/com/simibubi/create/AllDisplaySources.java +++ b/src/main/java/com/simibubi/create/AllDisplaySources.java @@ -1,12 +1,5 @@ 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; @@ -35,16 +28,21 @@ 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.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) .associate(Blocks.RESPAWN_ANCHOR) @@ -149,4 +147,7 @@ public class AllDisplaySources { private static RegistryEntry simple(String name, Supplier supplier) { return REGISTRATE.displaySource(name, supplier).register(); } + + public static void register() { + } } diff --git a/src/main/java/com/simibubi/create/AllDisplayTargets.java b/src/main/java/com/simibubi/create/AllDisplayTargets.java index c1bbb7bd6e..725d99e830 100644 --- a/src/main/java/com/simibubi/create/AllDisplayTargets.java +++ b/src/main/java/com/simibubi/create/AllDisplayTargets.java @@ -1,19 +1,18 @@ package com.simibubi.create; -import static com.simibubi.create.Create.REGISTRATE; - -import java.util.Map; -import java.util.function.Supplier; - import com.simibubi.create.api.behaviour.display.DisplayTarget; import com.simibubi.create.content.redstone.displayLink.target.DisplayBoardTarget; import com.simibubi.create.content.redstone.displayLink.target.LecternDisplayTarget; import com.simibubi.create.content.redstone.displayLink.target.NixieTubeDisplayTarget; import com.simibubi.create.content.redstone.displayLink.target.SignDisplayTarget; import com.tterrag.registrate.util.entry.RegistryEntry; - import net.minecraft.world.level.block.entity.BlockEntityType; +import java.util.Map; +import java.util.function.Supplier; + +import static com.simibubi.create.Create.REGISTRATE; + public class AllDisplayTargets { public static final RegistryEntry SIGN = REGISTRATE.displayTarget("sign", SignDisplayTarget::new) .associate(BlockEntityType.SIGN) @@ -35,4 +34,7 @@ public class AllDisplayTargets { private static RegistryEntry simple(String name, Supplier supplier) { return REGISTRATE.displayTarget(name, supplier).register(); } + + public static void register() { + } } diff --git a/src/main/java/com/simibubi/create/Create.java b/src/main/java/com/simibubi/create/Create.java index b59910dddd..eef9e69951 100644 --- a/src/main/java/com/simibubi/create/Create.java +++ b/src/main/java/com/simibubi/create/Create.java @@ -112,6 +112,8 @@ public class Create { AllSoundEvents.prepare(); AllTags.init(); AllCreativeModeTabs.register(modEventBus); + AllDisplaySources.register(); + AllDisplayTargets.register(); AllBlocks.register(); AllItems.register(); AllFluids.register(); @@ -136,9 +138,6 @@ public class Create { AllItemAttributeTypes.register(modEventBus); // FIXME: some of these registrations are not thread-safe - AllMovementBehaviours.registerDefaults(); - AllInteractionBehaviours.registerDefaults(); - ContraptionMovementSetting.registerDefaults(); BogeySizes.init(); AllBogeyStyles.init(); // ---- @@ -171,6 +170,9 @@ public class Create { BoilerHeaters.registerDefaults(); AllPortalTracks.registerDefaults(); BlockSpoutingBehaviour.registerDefaults(); + AllMovementBehaviours.registerDefaults(); + AllInteractionBehaviours.registerDefaults(); + ContraptionMovementSetting.registerDefaults(); // -- AllAdvancements.register();