feat: little fixes and changes

Author: Zepalesque

gradle.properties

@@ -33,7 +33,7 @@ mappings=2024.06.23
 # Required Dependencies
 zenith_version=1.3.04
 
-aether_version=1.5.3
+aether_version=1.5.4
 nitrogen_version=1.1.22
 cumulus_version=2.0.0
 

src/main/java/net/zepalesque/unity/block/natural/AetherShortGrassBlock.java

@@ -121,8 +121,7 @@ public interface TintOverride {
         Integer tint(
                 BlockState state,
                 @Nullable BlockAndTintGetter level,
-                @Nullable BlockPos pos, int index,
-                Predicate<Integer> indexGoal,
+                @Nullable BlockPos pos,
                 boolean useBelowProperties
         );
     }

src/main/java/net/zepalesque/unity/client/UnityColors.java

@@ -80,7 +80,7 @@ public static int getColor(BlockState state, @Nullable BlockAndTintGetter level,
             if (level != null && pos != null) {
 
                 for (AetherShortGrassBlock.TintOverride override : AetherShortGrassBlock.COLOR_OVERRIDES) {
-                    @Nullable Integer i = override.tint(state, level, pos, index, indexGoal, useBelowProperties);
+                    @Nullable Integer i = override.tint(state, level, pos, useBelowProperties);
                     if (i != null) return i;
                 }
 
@@ -95,10 +95,10 @@ public static int getColor(BlockState state, @Nullable BlockAndTintGetter level,
     /**
      * See {@link AetherShortGrassBlock#COLOR_OVERRIDES} and {@link UnityColors#getColor}
      */
-    public static Integer unityColors(BlockState state, BlockAndTintGetter level, BlockPos pos, int index, Predicate<Integer> indexGoal, boolean useBelowProperties) {
+    public static Integer unityColors(BlockState state, BlockAndTintGetter level, BlockPos pos, boolean useBelowProperties) {
         if (state.hasProperty(UnityStates.ENCHANTED) && state.getValue(UnityStates.ENCHANTED))
             return 0xFFFFFF;
-        else if (level.getBlockState(pos.below()).is(UnityTags.Blocks.SHORT_AETHER_GRASS_DEFAULT_COLORING))
+        else if (useBelowProperties && level.getBlockState(pos.below()).is(UnityTags.Blocks.SHORT_AETHER_GRASS_DEFAULT_COLORING))
             return AETHER_GRASS_COLOR;
         return null;
     }

src/main/java/net/zepalesque/unity/data/prov/UnityBlockStateProvider.java

@@ -8,6 +8,8 @@
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.CampfireBlock;
 import net.minecraft.world.level.block.SpreadingSnowyDirtBlock;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.properties.Property;
 import net.neoforged.neoforge.client.model.generators.BlockModelBuilder;
 import net.neoforged.neoforge.client.model.generators.ConfiguredModel;
 import net.neoforged.neoforge.client.model.generators.ModelFile;
@@ -18,6 +20,8 @@
 import net.zepalesque.unity.block.natural.leaves.LeafPileBlock;
 import net.zepalesque.unity.block.state.UnityStates;
 
+import java.util.function.Function;
+
 @SuppressWarnings("unused")
 public abstract class UnityBlockStateProvider extends AetherBlockStateProvider implements TextureExtensions {
 
@@ -47,21 +51,21 @@ public void tintableShortGrass(AetherShortGrassBlock block, String location) {
         });
     }
 
-    public void tintableGrassBlock(Block block, Block dirt, String location, String dirtLocation) {
-        tintableGrassBlock(block, dirt, location, dirtLocation, (snow, bottom, top) -> models().cubeBottomTop(texture(block).getNamespace() + ":" + name(block) + "_snow", snow, bottom, top));
+    public void tintableGrassBlock(Block block, Block dirt, String location, String dirtLocation, Property<?>... ignored) {
+        tintableGrassBlock(block, dirt, location, dirtLocation, (snow, bottom, top) -> models().cubeBottomTop(texture(block).getNamespace() + ":" + name(block) + "_snow", snow, bottom, top), ignored);
     }
 
-    public void tintableGrassBlockOverride(Block block, Block dirt, String location, String dirtLocation) {
-        tintableGrassBlock(block, dirt, location, dirtLocation, (snow, bottom, top) -> models().getExistingFile(texture(block, "", "_snow")));
+    public void tintableGrassBlockOverride(Block block, Block dirt, String location, String dirtLocation, Property<?>... ignored) {
+        tintableGrassBlock(block, dirt, location, dirtLocation, (snow, bottom, top) -> models().getExistingFile(texture(block, "", "_snow")), ignored);
     }
 
-    public void tintableGrassBlock(Block block, Block dirt, String location, String dirtLocation, SnowGrassModelMaker snowModel) {
+    public void tintableGrassBlock(Block block, Block dirt, String location, String dirtLocation, SnowGrassModelMaker snowModel, Property<?>... ignored) {
         ResourceLocation bottom = texture(dirt, dirtLocation);
         ResourceLocation top = texture(block, location, "_top");
         ResourceLocation overlay = texture(block, location, "_side_overlay");
         ResourceLocation side = texture(block, location, "_side");
         ResourceLocation snow = texture(block, location, "_side_snow");
-        tintableGrassBlock(block, bottom, top, overlay, side, snowModel.create(snow, bottom, top));
+        tintableGrassBlock(block, bottom, top, overlay, side, snowModel.create(snow, bottom, top), ignored);
     }
 
     @FunctionalInterface
@@ -73,18 +77,21 @@ public void tintableGrassBlock(Block block, ResourceLocation bottom,
                                    ResourceLocation top,
                                    ResourceLocation overlay,
                                    ResourceLocation side,
-                                   ModelFile snowModel) {
+                                   ModelFile snowModel, Property<?>... ignored) {
 
         ModelFile model = models().withExistingParent(texture(block).getNamespace() + ":" + name(block), Unity.loc(ModelProvider.BLOCK_FOLDER + "/template/tinted_grass_block"))
             .texture("overlay", overlay)
             .texture("side", side)
             .texture("top", top)
             .texture("bottom", bottom)
             .texture("particle", bottom);
-        this.getVariantBuilder(block).forAllStates(state -> {
+        Function<BlockState, ConfiguredModel[]> mapper = state -> {
             boolean isSnowy = state.getValue(SpreadingSnowyDirtBlock.SNOWY);
             return ConfiguredModel.allYRotations(isSnowy ? snowModel : model, 0, false);
-        });
+        };
+        
+        if (ignored.length == 0) this.getVariantBuilder(block).forAllStates(mapper);
+        else this.getVariantBuilder(block).forAllStatesExcept(mapper, ignored);
     }