that's pretty important

- add register methods to AllDisplaySources/Targets
- move now-treadsafe registrations out of comment
This commit is contained in:
TropheusJ 2025-02-19 11:23:43 -05:00
parent 4bb2a862cf
commit 381a0ae3bd
3 changed files with 23 additions and 18 deletions

View file

@ -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<DeathCounterDisplaySource> DEATH_COUNT = REGISTRATE.displaySource("death_count", DeathCounterDisplaySource::new)
.associate(Blocks.RESPAWN_ANCHOR)
@ -149,4 +147,7 @@ public class AllDisplaySources {
private static <T extends DisplaySource> RegistryEntry<T> simple(String name, Supplier<T> supplier) {
return REGISTRATE.displaySource(name, supplier).register();
}
public static void register() {
}
}

View file

@ -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<SignDisplayTarget> SIGN = REGISTRATE.displayTarget("sign", SignDisplayTarget::new)
.associate(BlockEntityType.SIGN)
@ -35,4 +34,7 @@ public class AllDisplayTargets {
private static <T extends DisplayTarget> RegistryEntry<T> simple(String name, Supplier<T> supplier) {
return REGISTRATE.displayTarget(name, supplier).register();
}
public static void register() {
}
}

View file

@ -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();