From e94745e39f93902c1b7efe2bd9780d81f8823fbd Mon Sep 17 00:00:00 2001 From: MikiP98 Date: Mon, 26 May 2025 18:32:59 +0200 Subject: [PATCH 1/4] Update roadmap --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 64a4ca30..d0c7d115 100644 --- a/README.md +++ b/README.md @@ -102,7 +102,8 @@ Lighten up your builds with unobtrusive light source - ~~De-separate the particle texture from the block texture in cabinets and others~~ - ~~Make Redstone Jack o'Lanterns to turn off when powered~~ - ~~Make Soul Jack o'Lanterns special in some way (for now particles)~~ - +- ~~Port to newer MC versions:~~ + - ~~1.20.4~~ ### High priority: @@ -150,7 +151,6 @@ Lighten up your builds with unobtrusive light source - Fix nether wood block variants burning - Add Illuminated Cabinet Brightening to the config - Port to newer MC versions: - - 1.20.4 - 1.21.4 From 4d04c2cbf53010a5568ee9b5691ec2b2a7ef7d58 Mon Sep 17 00:00:00 2001 From: MikiP98 Date: Mon, 26 May 2025 19:42:08 +0200 Subject: [PATCH 2/4] Fix game stuck in loading when coloured feature set is disabled --- .../io/github/mikip98/humilityafm/HumilityAFMClient.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/client/java/io/github/mikip98/humilityafm/HumilityAFMClient.java b/src/client/java/io/github/mikip98/humilityafm/HumilityAFMClient.java index 1957e9c3..d190eb4b 100644 --- a/src/client/java/io/github/mikip98/humilityafm/HumilityAFMClient.java +++ b/src/client/java/io/github/mikip98/humilityafm/HumilityAFMClient.java @@ -51,9 +51,12 @@ public void onInitializeClient() { BlockRenderLayerMap.INSTANCE.putBlock(floorIlluminatedCabinetBlockVariant, renderLayer); } - // LED block variants - BlockEntityRendererFactories.register(BlockEntityRegistry.LIGHT_STRIP_BLOCK_ENTITY, LightStripBlockEntityRenderer::new); - if (ModConfig.enableLightStripBrightening && !ModConfig.shimmerDetected) LightStripBlockEntityRenderer.enableBrightening(); + // Light Strip variants + if (ModConfig.enableColouredFeatureSetBeta) { + BlockEntityRendererFactories.register(BlockEntityRegistry.LIGHT_STRIP_BLOCK_ENTITY, LightStripBlockEntityRenderer::new); + if (ModConfig.enableLightStripBrightening && !ModConfig.shimmerDetected) + LightStripBlockEntityRenderer.enableBrightening(); + } FabricLoader.getInstance().getModContainer(MOD_ID).ifPresent(container -> { ResourceManagerHelper.registerBuiltinResourcePack(getId("3d_cabinet"), container, ResourcePackActivationType.NORMAL); From 18a92b071b5f0f91e270b04493ed6291e6ceaffd Mon Sep 17 00:00:00 2001 From: MikiP98 Date: Mon, 26 May 2025 20:07:09 +0200 Subject: [PATCH 3/4] Fix coloured Jack o'Lanterns being registered despite them should be --- .../humilityafm/registries/BlockRegistry.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/main/java/io/github/mikip98/humilityafm/registries/BlockRegistry.java b/src/main/java/io/github/mikip98/humilityafm/registries/BlockRegistry.java index 36b82a70..63a41b31 100644 --- a/src/main/java/io/github/mikip98/humilityafm/registries/BlockRegistry.java +++ b/src/main/java/io/github/mikip98/humilityafm/registries/BlockRegistry.java @@ -55,9 +55,9 @@ public class BlockRegistry { // Jack o'Lanterns public static final Block JACK_O_LANTERN_REDSTONE = new JackOLanternRedStone(); public static final Block JACK_O_LANTERN_SOUL = new JackOLanternSoul(); - public static final Block[] COLOURED_WEAK_JACK_O_LANTERNS = Arrays.stream(GenerationData.vanillaColorPallet).map(s -> registerWithItem(new JackOLantern(), "jack_o_lantern_" + s + "_weak")).toArray(Block[]::new); - public static final Block[] COLOURED_JACK_O_LANTERNS = Arrays.stream(GenerationData.vanillaColorPallet).map(s -> registerWithItem(new JackOLantern(), "jack_o_lantern_" + s)).toArray(Block[]::new); - public static final Block[] COLOURED_STRONG_JACK_O_LANTERNS = Arrays.stream(GenerationData.vanillaColorPallet).map(s -> registerWithItem(new JackOLantern(), "jack_o_lantern_" + s + "_strong")).toArray(Block[]::new); + public static Block[] COLOURED_WEAK_JACK_O_LANTERNS; + public static Block[] COLOURED_JACK_O_LANTERNS; + public static Block[] COLOURED_STRONG_JACK_O_LANTERNS; public static void register() { @@ -146,6 +146,12 @@ public static void register() { "light_strip_" ); putIntoItemGroup(ColouredFeatureSetGenerator.LightStripBlockVariants, ItemGroups.COLORED_BLOCKS); + + // Register coloured Jack o'Lanterns + COLOURED_WEAK_JACK_O_LANTERNS = Arrays.stream(GenerationData.vanillaColorPallet).map(s -> registerWithItem(new JackOLantern(), "jack_o_lantern_" + s + "_weak")).toArray(Block[]::new); + COLOURED_JACK_O_LANTERNS = Arrays.stream(GenerationData.vanillaColorPallet).map(s -> registerWithItem(new JackOLantern(), "jack_o_lantern_" + s)).toArray(Block[]::new); + COLOURED_STRONG_JACK_O_LANTERNS = Arrays.stream(GenerationData.vanillaColorPallet).map(s -> registerWithItem(new JackOLantern(), "jack_o_lantern_" + s + "_strong")).toArray(Block[]::new); + } // Register Forced corner stairs From 4ab20bd2cef3cb24853588591f16f488d52bd25e Mon Sep 17 00:00:00 2001 From: MikiP98 Date: Mon, 26 May 2025 20:12:47 +0200 Subject: [PATCH 4/4] Added tag for coloured Jack o'Lanterns --- .../github/mikip98/humilityafm/content/ModBlockTags.java | 1 + .../mikip98/humilityafm/datagen/BlockTagGenerator.java | 7 ++++++- .../mikip98/humilityafm/registries/BlockRegistry.java | 6 +++--- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/main/java/io/github/mikip98/humilityafm/content/ModBlockTags.java b/src/main/java/io/github/mikip98/humilityafm/content/ModBlockTags.java index c333c3a9..c8724e15 100644 --- a/src/main/java/io/github/mikip98/humilityafm/content/ModBlockTags.java +++ b/src/main/java/io/github/mikip98/humilityafm/content/ModBlockTags.java @@ -32,6 +32,7 @@ public class ModBlockTags { // Jack o'Lanterns public static final TagKey JACK_O_LANTERNS = TagKey.of(RegistryKeys.BLOCK, getId("jack_o_lanterns")); + public static final TagKey COLOURED_JACK_O_LANTERNS = TagKey.of(RegistryKeys.BLOCK, getId("coloured_jack_o_lanterns")); // Candlesticks public static final TagKey CANDLESTICKS = TagKey.of(RegistryKeys.BLOCK, getId("candlesticks")); diff --git a/src/main/java/io/github/mikip98/humilityafm/datagen/BlockTagGenerator.java b/src/main/java/io/github/mikip98/humilityafm/datagen/BlockTagGenerator.java index 5cf42168..3019c88f 100644 --- a/src/main/java/io/github/mikip98/humilityafm/datagen/BlockTagGenerator.java +++ b/src/main/java/io/github/mikip98/humilityafm/datagen/BlockTagGenerator.java @@ -71,6 +71,10 @@ protected void configure(RegistryWrapper.WrapperLookup arg) { getOrCreateTagBuilder(ModBlockTags.JACK_O_LANTERNS) .add(getId("jack_o_lantern_redstone")) .add(getId("jack_o_lantern_soul")); + getOrCreateTagBuilder(ModBlockTags.COLOURED_JACK_O_LANTERNS) + .add(getIds(Arrays.stream(GenerationData.vanillaColorPallet).map(s -> "coloured_weak_jack_o_lantern_" + s + "_weak"))) + .add(getIds(Arrays.stream(GenerationData.vanillaColorPallet).map(s -> "coloured_weak_jack_o_lantern_" + s))) + .add(getIds(Arrays.stream(GenerationData.vanillaColorPallet).map(s -> "coloured_weak_jack_o_lantern_" + s + "_strong"))); // Candlesticks FabricTagProvider.FabricTagBuilder tag = getOrCreateTagBuilder(ModBlockTags.CANDLESTICKS) @@ -94,7 +98,8 @@ protected void configure(RegistryWrapper.WrapperLookup arg) { .addTag(ModBlockTags.WOODEN_INNER_STAIRS) .addTag(ModBlockTags.WOODEN_OUTER_STAIRS) // Jack o'Lanterns - .addTag(ModBlockTags.JACK_O_LANTERNS); + .addTag(ModBlockTags.JACK_O_LANTERNS) + .addOptionalTag(ModBlockTags.COLOURED_JACK_O_LANTERNS); // Pickaxe Mineable getOrCreateTagBuilder(ModBlockTags.PICKAXE_MINEABLE) // Terracotta Tiles diff --git a/src/main/java/io/github/mikip98/humilityafm/registries/BlockRegistry.java b/src/main/java/io/github/mikip98/humilityafm/registries/BlockRegistry.java index 63a41b31..8e462a2e 100644 --- a/src/main/java/io/github/mikip98/humilityafm/registries/BlockRegistry.java +++ b/src/main/java/io/github/mikip98/humilityafm/registries/BlockRegistry.java @@ -148,9 +148,9 @@ public static void register() { putIntoItemGroup(ColouredFeatureSetGenerator.LightStripBlockVariants, ItemGroups.COLORED_BLOCKS); // Register coloured Jack o'Lanterns - COLOURED_WEAK_JACK_O_LANTERNS = Arrays.stream(GenerationData.vanillaColorPallet).map(s -> registerWithItem(new JackOLantern(), "jack_o_lantern_" + s + "_weak")).toArray(Block[]::new); - COLOURED_JACK_O_LANTERNS = Arrays.stream(GenerationData.vanillaColorPallet).map(s -> registerWithItem(new JackOLantern(), "jack_o_lantern_" + s)).toArray(Block[]::new); - COLOURED_STRONG_JACK_O_LANTERNS = Arrays.stream(GenerationData.vanillaColorPallet).map(s -> registerWithItem(new JackOLantern(), "jack_o_lantern_" + s + "_strong")).toArray(Block[]::new); + COLOURED_WEAK_JACK_O_LANTERNS = Arrays.stream(GenerationData.vanillaColorPallet).map(s -> registerWithItem(new JackOLantern(), "coloured_jack_o_lantern_" + s + "_weak")).toArray(Block[]::new); + COLOURED_JACK_O_LANTERNS = Arrays.stream(GenerationData.vanillaColorPallet).map(s -> registerWithItem(new JackOLantern(), "coloured_jack_o_lantern_" + s)).toArray(Block[]::new); + COLOURED_STRONG_JACK_O_LANTERNS = Arrays.stream(GenerationData.vanillaColorPallet).map(s -> registerWithItem(new JackOLantern(), "coloured_jack_o_lantern_" + s + "_strong")).toArray(Block[]::new); }