Merge branch '1.21.1' of https://github.com/Zepalesque/The-Aether-Redux into 1.21.1

Author: Ultrasquid9

gradle.properties

@@ -31,7 +31,7 @@ mappings_mc_ver=1.21.1
 mappings=2024.11.17
 
 # Required Dependencies
-zenith_version=1.3.14
+zenith_version=1.3.16b
 unity_version=0.1.27
 aether_version=1.5.10
 nitrogen_version=1.1.25

src/main/java/net/zepalesque/redux/Redux.java

@@ -24,6 +24,7 @@
 import net.zepalesque.redux.attachment.ReduxDataAttachments;
 import net.zepalesque.redux.block.ReduxBlocks;
 import net.zepalesque.redux.blockset.flower.ReduxFlowerSets;
+import net.zepalesque.redux.blockset.leaf.ReduxLeafSets;
 import net.zepalesque.redux.blockset.stone.ReduxStoneSets;
 import net.zepalesque.redux.blockset.wood.ReduxWoodSets;
 import net.zepalesque.redux.client.ReduxClient;
@@ -88,7 +89,12 @@ public Redux(ModContainer mod, IEventBus bus, Dist dist) {
             bus.addListener(ReduxColors::itemColors);
         }
 
-        Reflection.initialize(ReduxWoodSets.class, ReduxStoneSets.class, ReduxFlowerSets.class);
+        Reflection.initialize(
+            ReduxWoodSets.class,
+            ReduxStoneSets.class,
+            ReduxFlowerSets.class,
+            ReduxLeafSets.class
+        );
 
         DeferredRegister<?>[] registers = {
             ReduxBlocks.BLOCKS,

src/main/java/net/zepalesque/redux/blockset/flower/type/BaseFlowerSet.java

@@ -192,7 +192,7 @@ public BaseFlowerSet<B> compost(float chance) {
 
 	@Override
 	public BaseFlowerSet<B> withPotProperties(UnaryOperator<Properties> prop) {
-		UnaryOperator<Properties> old = this.potProperties;
+		var old = this.potProperties;
 		this.potProperties = original -> prop.apply(old.apply(original));
 		return this;
 	}

src/main/java/net/zepalesque/redux/blockset/leaf/ReduxLeafSets.java

@@ -0,0 +1,29 @@
+package net.zepalesque.redux.blockset.leaf;
+
+import net.zepalesque.redux.Redux;
+import net.zepalesque.redux.blockset.leaf.type.SnowableLeafSet;
+import net.zepalesque.zenith.api.blockset.type.AbstractFlowerSet;
+import net.zepalesque.zenith.api.blockset.type.AbstractLeafSet;
+
+public class ReduxLeafSets {
+	
+//	public static final SnowableLeafSet
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	public static <T extends AbstractLeafSet<T>> T register(T set) {
+		Redux.BLOCK_SETS.add(set);
+		return set;
+	}
+}

src/main/java/net/zepalesque/redux/blockset/leaf/type/AetherLeafSet.java

@@ -0,0 +1,50 @@
+package net.zepalesque.redux.blockset.leaf.type;
+
+import com.aetherteam.aether.block.AetherBlocks;
+import com.aetherteam.aether.block.natural.AetherDoubleDropsLeaves;
+import net.minecraft.world.level.block.SaplingBlock;
+import net.minecraft.world.level.block.grower.TreeGrower;
+import net.minecraft.world.level.block.state.BlockBehaviour;
+import net.minecraft.world.level.material.MapColor;
+import net.zepalesque.redux.block.ReduxBlocks;
+import net.zepalesque.redux.data.prov.ReduxBlockStateProvider;
+import net.zepalesque.redux.data.prov.ReduxItemModelProvider;
+import net.zepalesque.redux.item.ReduxItems;
+
+public class AetherLeafSet extends BaseLeafPileSet<AetherDoubleDropsLeaves, SaplingBlock, AetherLeafSet> {
+	public AetherLeafSet(String id, String saplTexFold, String leafTexFold, TreeGrower grower, MapColor leafColor, MapColor saplingColor) {
+		super(
+			id,
+			saplTexFold,
+			leafTexFold,
+			grower,
+			() -> new AetherDoubleDropsLeaves(
+				BlockBehaviour.Properties.ofFullCopy(
+					AetherBlocks.SKYROOT_LEAVES.get()
+				).mapColor(leafColor)
+			), treeGrower -> new SaplingBlock(
+				treeGrower,
+				BlockBehaviour.Properties.ofFullCopy(
+					AetherBlocks.SKYROOT_SAPLING.get()
+				).mapColor(saplingColor)
+			)
+		);
+		
+		var blocks = ReduxBlocks.BLOCKS;
+		var items = ReduxItems.ITEMS;
+	}
+	
+	
+	@Override
+	public void mainBlockData(ReduxBlockStateProvider data) {
+		data.crossBlock(this.sapling().get(), this.saplTexFold);
+		data.pottedPlant(this.pot().get(), this.sapling().get(), this.saplTexFold);
+		data.block(this.leaves().get(), this.leafTexFold);
+	}
+	
+	@Override
+	public void mainItemData(ReduxItemModelProvider data) {
+		data.itemBlockFlat(this.sapling().get(), this.saplTexFold);
+		data.itemBlock(this.leaves().get());
+	}
+}

src/main/java/net/zepalesque/redux/blockset/leaf/type/BaseLeafPileSet.java

@@ -0,0 +1,84 @@
+package net.zepalesque.redux.blockset.leaf.type;
+
+import net.minecraft.world.item.BlockItem;
+import net.minecraft.world.item.Item;
+import net.minecraft.world.level.block.LeavesBlock;
+import net.minecraft.world.level.block.SaplingBlock;
+import net.minecraft.world.level.block.SoundType;
+import net.minecraft.world.level.block.grower.TreeGrower;
+import net.minecraft.world.level.block.state.BlockBehaviour;
+import net.minecraft.world.level.block.state.properties.NoteBlockInstrument;
+import net.minecraft.world.level.material.MapColor;
+import net.neoforged.neoforge.registries.DeferredBlock;
+import net.neoforged.neoforge.registries.DeferredRegister;
+import net.neoforged.neoforge.registries.datamaps.builtin.NeoForgeDataMaps;
+import net.zepalesque.redux.block.ReduxBlocks;
+import net.zepalesque.redux.block.natural.ReduxNaturalWall;
+import net.zepalesque.redux.data.prov.ReduxBlockStateProvider;
+import net.zepalesque.redux.data.prov.ReduxDataMapProvider;
+import net.zepalesque.redux.data.prov.ReduxItemModelProvider;
+import net.zepalesque.redux.item.ReduxItems;
+import net.zepalesque.unity.block.natural.leaves.LeafPileBlock;
+
+import java.util.function.Function;
+import java.util.function.Supplier;
+
+public abstract class BaseLeafPileSet<L extends LeavesBlock, S extends SaplingBlock, Self extends BaseLeafPileSet<L, S, Self>> extends BaseLeafSet<L, S, Self> {
+	
+	private final DeferredBlock<LeafPileBlock> pile;
+	
+	private float pileCompost;
+	
+	public BaseLeafPileSet(String id, String saplTexFold, String leafTexFold, TreeGrower grower, Supplier<L> leaves, Function<TreeGrower, S> sapling) {
+		super(id, saplTexFold, leafTexFold, grower, leaves, sapling);
+		var blocks = ReduxBlocks.BLOCKS;
+		var items = ReduxItems.ITEMS;
+		this.pile = pile(blocks, items, id);
+	}
+	protected DeferredBlock<LeafPileBlock> pile(
+		DeferredRegister.Blocks registry,
+		DeferredRegister.Items items,
+		String id
+	) {
+		var block = registry.register(id + "_leaf_pile", () ->
+			new LeafPileBlock(this.leaves)
+		);
+		items.register(block.getId().getPath(), () ->
+			new BlockItem(block.get(), new Item.Properties())
+		);
+		return block;
+	}
+	
+	public DeferredBlock<LeafPileBlock> pile() {
+		return this.pile;
+	}
+	
+	public Self pileCompost(float amount) {
+		this.pileCompost = amount;
+		return self();
+	}
+	
+	@Override
+	public void mapData(ReduxDataMapProvider data) {
+		super.mapData(data);
+		var compostables = data.builder(NeoForgeDataMaps.COMPOSTABLES);
+		data.addCompost(compostables, this.pile(), this.pileCompost);
+	}
+	
+	@Override
+	public void blockData(ReduxBlockStateProvider data) {
+		this.mainBlockData(data);
+		data.leafPile(this.pile().get(), this.leaves().get(), this.leafTexFold);
+	}
+	
+	public abstract void mainBlockData(ReduxBlockStateProvider data);
+	
+	
+	@Override
+	public void itemData(ReduxItemModelProvider data) {
+		this.mainItemData(data);
+		data.leafPile(this.pile().get());
+	}
+	
+	public abstract void mainItemData(ReduxItemModelProvider data);
+}