Add composting support (fixes #4263)

VazkiiMods · Nov 30, 2023 · 9d3d3f1 · 9d3d3f1
1 parent ed1d45e
commit 9d3d3f1
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 0 deletions.
diff --git a/Fabric/src/main/java/vazkii/botania/fabric/FabricCommonInitializer.java b/Fabric/src/main/java/vazkii/botania/fabric/FabricCommonInitializer.java
@@ -30,6 +30,7 @@
 import net.fabricmc.fabric.api.networking.v1.ServerPlayConnectionEvents;
 import net.fabricmc.fabric.api.object.builder.v1.entity.FabricDefaultAttributeRegistry;
 import net.fabricmc.fabric.api.object.builder.v1.entity.MinecartComparatorLogicRegistry;
+import net.fabricmc.fabric.api.registry.CompostingChanceRegistry;
 import net.fabricmc.fabric.api.registry.FlattenableBlockRegistry;
 import net.fabricmc.fabric.api.registry.FuelRegistry;
 import net.fabricmc.fabric.api.registry.TillableBlockRegistry;
@@ -125,6 +126,7 @@ public void onInitialize() {
 		registryInit();
 
 		PaintableData.init();
+		CompostingData.init(CompostingChanceRegistry.INSTANCE::add);
 		DefaultCorporeaMatchers.init();
 
 		PatchouliAPI.get().registerMultiblock(BuiltInRegistries.BLOCK.getKey(BotaniaBlocks.alfPortal), AlfheimPortalBlockEntity.MULTIBLOCK.get());

diff --git a/Forge/src/main/java/vazkii/botania/forge/ForgeCommonInitializer.java b/Forge/src/main/java/vazkii/botania/forge/ForgeCommonInitializer.java
@@ -27,6 +27,7 @@
 import net.minecraft.world.item.*;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.Blocks;
+import net.minecraft.world.level.block.ComposterBlock;
 import net.minecraft.world.level.block.entity.AbstractFurnaceBlockEntity;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.state.BlockState;
@@ -147,6 +148,7 @@ public void commonSetup(FMLCommonSetupEvent evt) {
 		evt.enqueueWork(BotaniaBlocks::addDispenserBehaviours);
 		BotaniaBlocks.addAxeStripping();
 		PaintableData.init();
+		CompostingData.init((itemLike, chance) -> ComposterBlock.COMPOSTABLES.putIfAbsent(itemLike.asItem(), (float) chance));
 		DefaultCorporeaMatchers.init();
 
 		PatchouliAPI.get().registerMultiblock(BuiltInRegistries.BLOCK.getKey(BotaniaBlocks.alfPortal), AlfheimPortalBlockEntity.MULTIBLOCK.get());

diff --git a/Xplat/src/main/java/vazkii/botania/common/handler/CompostingData.java b/Xplat/src/main/java/vazkii/botania/common/handler/CompostingData.java
@@ -0,0 +1,32 @@
+package vazkii.botania.common.handler;
+
+import it.unimi.dsi.fastutil.floats.FloatConsumer;
+import net.minecraft.world.item.DyeColor;
+import net.minecraft.world.level.ItemLike;
+
+import vazkii.botania.common.block.BotaniaBlocks;
+import vazkii.botania.common.item.BotaniaItems;
+
+import java.util.function.BiConsumer;
+
+public class CompostingData {
+	public static void init(BiConsumer<ItemLike, Float> registrationMethod) {
+		// common vanilla composting chances:
+		final float chanceLowest = 0.3f;
+		final float chanceLow = 0.5f;
+		final float chanceMid = 0.65f;
+		final float chanceHigh = 0.85f;
+		// unused here: final float chanceHighest = 1.0f;
+
+		// see https://github.com/VazkiiMods/Botania/issues/4263#issuecomment-1529130978
+		for (final var dyeColor : DyeColor.values()) {
+			registrationMethod.accept(BotaniaItems.getPetal(dyeColor), chanceLowest);
+			registrationMethod.accept(BotaniaBlocks.getPetalBlock(dyeColor), chanceLow);
+			registrationMethod.accept(BotaniaBlocks.getFlower(dyeColor), chanceMid);
+			registrationMethod.accept(BotaniaBlocks.getDoubleFlower(dyeColor), chanceMid);
+			registrationMethod.accept(BotaniaBlocks.getMushroom(dyeColor), chanceMid);
+		}
+
+		registrationMethod.accept(BotaniaBlocks.cellBlock, chanceHigh);
+	}
+}