Add fertilizer registry (#112)

This commit is contained in:
Guillaume Mercier authored and GitHub committed 2026-04-01 20:02:06 +02:00
1 parent 4844bc937b
commit cf8f2f54c5
7 files changed
+110 -16

No files matched your search

@@ -0,0 +1,40 @@
package forestry.api.multiblock;
import java.util.Collection;
import net.minecraft.item.ItemStack;
public interface IFarmFertilizerRegistry {
/**
* Gets a list of all fertilizer stacks in the registry.
*
* @return The current fertilizer registry.
*/
Collection<ItemStack> getFertilizers();
/**
* Adds a new fertilizer to the registry.
*
* @apiNote The stack size doesn't matter it always consumes 1.
* @apiNote You can use OreDictionary.WILDCARD_VALUE to specific that any meta of the item will be ok.
*
* @param itemstack The item to add to the registry.
*/
void addFertilizer(ItemStack itemstack);
/**
* Removes a fertilizer from the fretilizer registry.
*
* @param itemstack The item to remove from the registry.
*/
void removeFertilizer(ItemStack itemstack);
/**
* Checks if an item is a usable multi-farm fertilizer.
*
* @param itemstack - The stack to check with.
* @return True if the item is a fertilizer item.
*/
boolean isFertilizer(ItemStack itemstack);
}
@@ -8,4 +8,6 @@ package forestry.api.multiblock;
public class MultiblockManager {
public static IMultiblockLogicFactory logicFactory;
public static IFarmFertilizerRegistry farmFertilizerRegistry;
}
@@ -0,0 +1,50 @@
package forestry.farming.multiblock;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import net.minecraft.item.ItemStack;
import forestry.api.multiblock.IFarmFertilizerRegistry;
import forestry.core.utils.ItemStackUtil;
public class FarmFertilizerRegistry implements IFarmFertilizerRegistry {
// the current list isn't big enough to require a hash map, and is faster as a list.
private final List<ItemStack> fertilizers = new ArrayList<>(5);
@Override
public Collection<ItemStack> getFertilizers() {
return fertilizers;
}
@Override
public void addFertilizer(ItemStack itemstack) {
// maybe throw warn? but could also be nice to leave as no warn for easier/cleaner optional mod dependencies
if (itemstack == null || itemstack.getItem() == null || itemstack.stackSize <= 0) return;
fertilizers.add(itemstack);
}
@Override
public void removeFertilizer(ItemStack itemstack) {
// maybe throw warn? but could also be nice to leave as no warn for easier/cleaner optional mod dependencies
if (itemstack == null || itemstack.getItem() == null) return;
fertilizers.removeIf(fert -> {
// in stack first so it wild card can be used for a wild-card clear.
return ItemStackUtil.isIdenticalItem(itemstack, fert);
});
}
@Override
public boolean isFertilizer(ItemStack itemstack) {
if (itemstack == null) return false;
for (ItemStack fert : this.fertilizers) {
// fert first to allow for wild card checks
if (ItemStackUtil.isIdenticalItem(fert, itemstack)) {
return true;
}
}
return false;
}
}
@@ -12,7 +12,6 @@ import java.util.Deque;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
import net.minecraftforge.fluids.Fluid;
@@ -21,6 +20,7 @@ import forestry.api.farming.FarmDirection;
import forestry.api.farming.IFarmInventory;
import forestry.api.farming.IFarmLogic;
import forestry.api.farming.IFarmable;
import forestry.api.multiblock.MultiblockManager;
import forestry.core.fluids.FluidHelper;
import forestry.core.fluids.TankManager;
import forestry.core.inventory.InventoryAdapterRestricted;
@@ -28,9 +28,6 @@ import forestry.core.inventory.wrappers.InventoryMapper;
import forestry.core.utils.InventoryUtil;
import forestry.core.utils.PlayerUtil;
import forestry.core.utils.SlotUtil;
import forestry.plugins.PluginCore;
import forestry.plugins.PluginManager;
import ic2.api.item.IC2Items;
public class InventoryFarm extends InventoryAdapterRestricted implements IFarmInventory {
@@ -134,18 +131,8 @@ public class InventoryFarm extends InventoryAdapterRestricted implements IFarmIn
@Override
public boolean acceptsAsFertilizer(ItemStack itemstack) {
if (itemstack == null) {
return false;
}
Item item = itemstack.getItem();
if (PluginManager.Module.INDUSTRIALCRAFT.isEnabled()) {
Item ic2fert = IC2Items.getItem("fertilizer").getItem();
if (ic2fert == item) {
return true;
}
}
return PluginCore.items.fertilizerCompound == item;
// check if it's a fertilizer
return MultiblockManager.farmFertilizerRegistry.isFertilizer(itemstack);
}
@Override
@@ -55,6 +55,7 @@ import forestry.core.recipes.RecipeUtil;
import forestry.core.tiles.MachineDefinition;
import forestry.core.utils.ClimateUtil;
import forestry.core.utils.ForestryModEnvWarningCallable;
import forestry.farming.multiblock.FarmFertilizerRegistry;
@Plugin(
pluginID = "Core",
@@ -85,6 +86,7 @@ public class PluginCore extends ForestryPlugin {
AlleleHelper.instance = new AlleleHelper();
MultiblockManager.logicFactory = new MultiblockLogicFactory();
MultiblockManager.farmFertilizerRegistry = new FarmFertilizerRegistry();
}
@Override
@@ -20,6 +20,7 @@ import net.minecraft.init.Items;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraftforge.oredict.OreDictionary;
import cpw.mods.fml.common.SidedProxy;
import cpw.mods.fml.common.event.FMLInterModComms.IMCMessage;
@@ -30,6 +31,7 @@ import forestry.api.circuits.CircuitSocketType;
import forestry.api.circuits.ICircuitLayout;
import forestry.api.farming.Farmables;
import forestry.api.farming.IFarmable;
import forestry.api.multiblock.MultiblockManager;
import forestry.core.circuits.Circuit;
import forestry.core.circuits.CircuitLayout;
import forestry.core.config.Constants;
@@ -402,5 +404,8 @@ public class PluginFarming extends ForestryPlugin {
layoutManual,
PluginCore.items.tubes.get(EnumElectronTube.LAPIS, 1),
Circuit.farmCocoaManual);
MultiblockManager.farmFertilizerRegistry
.addFertilizer(new ItemStack(PluginCore.items.fertilizerCompound, 1, OreDictionary.WILDCARD_VALUE));
}
}
@@ -32,6 +32,7 @@ import forestry.api.core.ForestryAPI;
import forestry.api.farming.Farmables;
import forestry.api.fuels.EngineBronzeFuel;
import forestry.api.fuels.FuelManager;
import forestry.api.multiblock.MultiblockManager;
import forestry.api.recipes.RecipeManagers;
import forestry.api.storage.BackpackManager;
import forestry.api.storage.IBackpackDefinition;
@@ -94,6 +95,7 @@ public class PluginIC2 extends ForestryPlugin {
private static ItemStack silver;
private static ItemStack brass;
private static ItemStack uuMatter;
private static ItemStack fertilizer;
public static ItemStack resin;
public static ItemStack rubberwood;
@@ -162,11 +164,13 @@ public class PluginIC2 extends ForestryPlugin {
brass = IC2Items.getItem("bronzeIngot");
uran238 = IC2Items.getItem("Uran238");
fertilizer = IC2Items.getItem("fertilizer");
Circuit.farmRubberManual = new CircuitFarmLogic("manualRubber", FarmLogicRubber.class);
ICircuitLayout layoutEngineTin = new CircuitLayout("engine.tin", CircuitSocketType.ELECTRIC_ENGINE);
ChipsetManager.circuitRegistry.registerLayout(layoutEngineTin);
}
@Override
@@ -378,6 +382,10 @@ public class PluginIC2 extends ForestryPlugin {
'V',
Blocks.piston);
}
if (PluginManager.Module.FARMING.isEnabled() && fertilizer != null) {
MultiblockManager.farmFertilizerRegistry.addFertilizer(fertilizer);
}
}
/**