Skip to content

Update 1.20.4 branch #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MikiP98 merged 4 commits into from
May 26, 2025
Merged

Update 1.20.4 branch #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e94745e
Update roadmap
MikiP98 May 26, 2025
4d04c2c
Fix game stuck in loading when coloured feature set is disabled
MikiP98 May 26, 2025
18a92b0
Fix coloured Jack o'Lanterns being registered despite them should be
MikiP98 May 26, 2025
4ab20bd
Added tag for coloured Jack o'Lanterns
MikiP98 May 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down Expand Up @@ -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


Expand Down
9 changes: 6 additions & 3 deletions src/client/java/io/github/mikip98/humilityafm/HumilityAFMClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
1 change: 1 addition & 0 deletions src/main/java/io/github/mikip98/humilityafm/content/ModBlockTags.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ public class ModBlockTags {

// Jack o'Lanterns
public static final TagKey<Block> JACK_O_LANTERNS = TagKey.of(RegistryKeys.BLOCK, getId("jack_o_lanterns"));
public static final TagKey<Block> COLOURED_JACK_O_LANTERNS = TagKey.of(RegistryKeys.BLOCK, getId("coloured_jack_o_lanterns"));

// Candlesticks
public static final TagKey<Block> CANDLESTICKS = TagKey.of(RegistryKeys.BLOCK, getId("candlesticks"));
Expand Down
7 changes: 6 additions & 1 deletion src/main/java/io/github/mikip98/humilityafm/datagen/BlockTagGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<Block>.FabricTagBuilder tag = getOrCreateTagBuilder(ModBlockTags.CANDLESTICKS)
Expand All @@ -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
Expand Down
12 changes: 9 additions & 3 deletions src/main/java/io/github/mikip98/humilityafm/registries/BlockRegistry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down Expand Up @@ -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(), "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);

}

// Register Forced corner stairs
Expand Down