Fix #580, Fix #1479 Add a way to register items to work as fertilizer in farms in a config

This commit is contained in:
Nedelosk committed 2016-12-22 02:47:00 +01:00
1 parent d392666dc4
commit d4c2d7220d
12 files changed
+119 -30

No files matched your search

@@ -8,6 +8,10 @@ package forestry.api.farming;
import com.google.common.collect.HashMultimap;
import com.google.common.collect.Multimap;
import net.minecraft.item.ItemStack;
import java.util.LinkedHashMap;
import javax.annotation.Nonnull;
public class Farmables {
@@ -18,5 +22,8 @@ public class Farmables {
*/
@Nonnull
public static final Multimap<String, IFarmable> farmables = HashMultimap.create();
@Nonnull
public static final LinkedHashMap<ItemStack, Integer> fertilizers = new LinkedHashMap();
}
@@ -34,6 +34,7 @@ public class Config {
public static final String CATEGORY_COMMON = "common";
public static final String CATEGORY_FLUIDS = "fluids";
public static final String CATEGORY_FARM = "farm";
public static LocalizedConfiguration configCommon;
public static LocalizedConfiguration configFluid;
@@ -30,7 +30,7 @@ public class GameMode implements IGameMode {
private static final float ENERGY_DEMAND_MODIFIER = 1.0f;
private static final float FUEL_MODIFIER = 1.0f;
private static final int FARM_FERTILIZER_VALUE = 2000;
private static final int FARM_FERTILIZER_MODIFIER = 4;
private static final int recipeFertilizerOutputApatite = 8;
private static final int recipeFertilizerOutputAsh = 16;
@@ -75,7 +75,7 @@ public class GameMode implements IGameMode {
initSettingFloat(config, "energy", "demand.modifier", ENERGY_DEMAND_MODIFIER);
initSettingBoolean(config, "energy", "engine.clockwork", true);
initSettingInt(config, "farms", "fertilizer.value", FARM_FERTILIZER_VALUE);
initSettingInt(config, "farms", "fertilizer.modifier", FARM_FERTILIZER_MODIFIER);
initSettingFloat(config, "fuel.ethanol", "generator", FUEL_MODIFIER);
initSettingFloat(config, "fuel.ethanol", "combustion", FUEL_MODIFIER);
@@ -10,8 +10,18 @@
******************************************************************************/
package forestry.farming;
import java.io.File;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map.Entry;
import java.util.Set;
import javax.annotation.Nonnull;
import net.minecraft.block.BlockBeetroot;
import net.minecraft.block.BlockCrops;
import net.minecraft.block.BlockNetherWart;
@@ -23,12 +33,14 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraftforge.client.event.TextureStitchEvent;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.common.config.Property;
import net.minecraftforge.fml.common.SidedProxy;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.fml.common.registry.GameRegistry;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import net.minecraftforge.oredict.OreDictionary;
import forestry.Forestry;
import forestry.api.circuits.ChipsetManager;
import forestry.api.circuits.CircuitSocketType;
import forestry.api.circuits.ICircuitLayout;
@@ -37,10 +49,15 @@ import forestry.api.farming.Farmables;
import forestry.core.PluginCore;
import forestry.core.circuits.Circuit;
import forestry.core.circuits.CircuitLayout;
import forestry.core.config.Config;
import forestry.core.config.Constants;
import forestry.core.config.LocalizedConfiguration;
import forestry.core.items.EnumElectronTube;
import forestry.core.recipes.RecipeUtil;
import forestry.core.utils.ItemStackUtil;
import forestry.core.utils.Log;
import forestry.core.utils.OreDictUtil;
import forestry.core.utils.Translator;
import forestry.farming.blocks.BlockMushroom;
import forestry.farming.blocks.BlockRegistryFarming;
import forestry.farming.blocks.EnumFarmBlockType;
@@ -91,7 +108,7 @@ public class PluginFarming extends BlankForestryPlugin {
@Override
public void preInit() {
MinecraftForge.EVENT_BUS.register(this);
Farmables.farmables.put("farmArboreal", new FarmableVanillaSapling());
if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.ARBORICULTURE)) {
Farmables.farmables.put("farmArboreal", new FarmableGE());
@@ -125,6 +142,9 @@ public class PluginFarming extends BlankForestryPlugin {
Farmables.farmables.put("farmVegetables", new FarmableAgingCrop(new ItemStack(Items.CARROT), Blocks.CARROTS, BlockCrops.AGE, 7));
Farmables.farmables.put("farmVegetables", new FarmableAgingCrop(new ItemStack(Items.BEETROOT_SEEDS), Blocks.BEETROOTS, BlockBeetroot.BEETROOT_AGE, 3));
//Foretsry fertilizer
Farmables.fertilizers.put(new ItemStack(PluginCore.items.fertilizerCompound, 1, OreDictionary.WILDCARD_VALUE), 500);
proxy.initializeModels();
// Layouts
@@ -133,7 +153,39 @@ public class PluginFarming extends BlankForestryPlugin {
ICircuitLayout layoutManual = new CircuitLayout("farms.manual", CircuitSocketType.FARM);
ChipsetManager.circuitRegistry.registerLayout(layoutManual);
}
private void loadConfig(LocalizedConfiguration config){
List<String> defaultFertilizers = new ArrayList<>(getItemStrings(Farmables.fertilizers));
Collections.sort(defaultFertilizers);
String[] defaultSortedFertilizers = defaultFertilizers.toArray(new String[defaultFertilizers.size()]);
Property fertilizerConf = config.get("fertilizers", "items", defaultSortedFertilizers, Translator.translateToLocal("for.config.farm.fertilizers.items"));
Farmables.fertilizers.clear();
String[] fertilizerList = fertilizerConf.getStringList();
for(int i = 0;i < fertilizerList.length;i++){
try{
String fertilizer = fertilizerList[i];
String[] fertilizers = fertilizer.split(";");
ItemStack fertilizerItem = ItemStackUtil.parseItemStackString(fertilizers[0], OreDictionary.WILDCARD_VALUE);
int fertilizerValue = Integer.parseInt(fertilizers[1]);
Farmables.fertilizers.put(fertilizerItem, fertilizerValue);
}catch(Exception e){
Log.error("Forestry failed to parse a fertilizer entry at the farm config, at the position " + i + ".", e);
}
}
}
@Nonnull
private static Set<String> getItemStrings(LinkedHashMap<ItemStack, Integer> itemStacks) {
Set<String> itemStrings = new HashSet<>(itemStacks.size());
for (Entry<ItemStack, Integer> itemStack : itemStacks.entrySet()) {
String itemString = ItemStackUtil.getStringForItemStack(itemStack.getKey());
itemString += ";" + itemStack.getValue();
itemStrings.add(itemString);
}
return itemStrings;
}
@Override
public void registerTriggers() {
FarmingTriggers.initialize();
@@ -142,6 +194,12 @@ public class PluginFarming extends BlankForestryPlugin {
@Override
public void doInit() {
super.doInit();
//Load config
File configFile = new File(Forestry.instance.getConfigFolder(), Config.CATEGORY_FARM + ".cfg");
LocalizedConfiguration config = new LocalizedConfiguration(configFile, "1.0.0");
loadConfig(config);
config.save();
GameRegistry.registerTileEntity(TileFarmPlain.class, "forestry.Farm");
GameRegistry.registerTileEntity(TileFarmGearbox.class, "forestry.FarmGearbox");
@@ -633,7 +633,7 @@ public class FarmController extends RectangularMultiblockControllerBase implemen
for (FarmTarget target : farmTargets) {
// Check fertilizer and water
if (!fertilizerManager.hasFertilizer(fertilizerConsumption)) {
if (!fertilizerManager.hasFertilizer(inventory, fertilizerConsumption)) {
farmWorkStatus.hasFertilizer = false;
continue;
}
@@ -645,7 +645,7 @@ public class FarmController extends RectangularMultiblockControllerBase implemen
if (cultivateTarget(worldObj, this, target, logic, farmListeners)) {
// Remove fertilizer and water
fertilizerManager.removeFertilizer(fertilizerConsumption);
fertilizerManager.removeFertilizer(inventory, fertilizerConsumption);
removeLiquid(liquid);
farmWorkStatus.didWork = true;
@@ -729,7 +729,7 @@ public class FarmController extends RectangularMultiblockControllerBase implemen
IErrorLogic errorLogic = getErrorLogic();
// Check fertilizer
Boolean hasFertilizer = fertilizerManager.hasFertilizer(fertilizerConsumption);
Boolean hasFertilizer = fertilizerManager.hasFertilizer(inventory, fertilizerConsumption);
if (errorLogic.setCondition(!hasFertilizer, EnumErrorCode.NO_FERTILIZER)) {
return false;
}
@@ -750,7 +750,7 @@ public class FarmController extends RectangularMultiblockControllerBase implemen
}
// Remove fertilizer and water
fertilizerManager.removeFertilizer(fertilizerConsumption);
fertilizerManager.removeFertilizer(inventory, fertilizerConsumption);
removeLiquid(requiredLiquid);
// Let event handlers handle the harvest first.
@@ -765,7 +765,7 @@ public class FarmController extends RectangularMultiblockControllerBase implemen
@Override
public int getStoredFertilizerScaled(int scale) {
return fertilizerManager.getStoredFertilizerScaled(scale);
return fertilizerManager.getStoredFertilizerScaled(inventory, scale);
}
@Override
@@ -14,7 +14,6 @@ import java.io.IOException;
import net.minecraft.nbt.NBTTagCompound;
import forestry.api.core.ForestryAPI;
import forestry.api.core.INbtReadable;
import forestry.api.core.INbtWritable;
import forestry.core.network.DataInputStreamForestry;
@@ -23,24 +22,22 @@ import forestry.core.network.IStreamable;
public class FarmFertilizerManager implements INbtWritable, INbtReadable, IStreamable {
private static final int BUFFER_FERTILIZER = 200;
private final int fertilizerValue = ForestryAPI.activeMode.getIntegerSetting("farms.fertilizer.value");
private int storedFertilizer;
public FarmFertilizerManager() {
storedFertilizer = 0;
}
public boolean hasFertilizer(int amount) {
if (fertilizerValue < 0) {
public boolean hasFertilizer(InventoryFarm inventory, int amount) {
if (inventory.getFertilizerValue() < 0) {
return true;
}
return storedFertilizer >= amount;
}
public void removeFertilizer(int amount) {
if (fertilizerValue < 0) {
public void removeFertilizer(InventoryFarm inventory, int amount) {
if (inventory.getFertilizerValue() < 0) {
return;
}
@@ -52,6 +49,7 @@ public class FarmFertilizerManager implements INbtWritable, INbtReadable, IStrea
public boolean maintainFertilizer(InventoryFarm inventory) {
if (storedFertilizer <= BUFFER_FERTILIZER) {
int fertilizerValue = inventory.getFertilizerValue();
if (fertilizerValue < 0) {
storedFertilizer += 2000;
} else if (inventory.useFertilizer()) {
@@ -73,12 +71,12 @@ public class FarmFertilizerManager implements INbtWritable, INbtReadable, IStrea
return data;
}
public int getStoredFertilizerScaled(int scale) {
public int getStoredFertilizerScaled(InventoryFarm inventory, int scale) {
if (storedFertilizer == 0) {
return 0;
}
return storedFertilizer * scale / (fertilizerValue + BUFFER_FERTILIZER);
return storedFertilizer * scale / (inventory.getFertilizerValue() + BUFFER_FERTILIZER);
}
@Override
@@ -11,22 +11,23 @@
package forestry.farming.multiblock;
import java.util.Stack;
import java.util.Map.Entry;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.FluidUtil;
import net.minecraftforge.oredict.OreDictionary;
import forestry.api.core.ForestryAPI;
import forestry.api.farming.FarmDirection;
import forestry.api.farming.Farmables;
import forestry.api.farming.IFarmInventory;
import forestry.api.farming.IFarmLogic;
import forestry.api.farming.IFarmable;
import forestry.core.PluginCore;
import forestry.core.fluids.FluidHelper;
import forestry.core.fluids.TankManager;
import forestry.core.inventory.InventoryAdapterRestricted;
@@ -49,6 +50,8 @@ public class InventoryFarm extends InventoryAdapterRestricted implements IFarmIn
public static final int SLOT_CAN_COUNT = 1;
public static final int SLOT_COUNT = SLOT_RESOURCES_COUNT + SLOT_GERMLINGS_COUNT + SLOT_PRODUCTION_COUNT + SLOT_FERTILIZER_COUNT + SLOT_CAN_COUNT;
private static final int FERTILIZER_MODIFIER = ForestryAPI.activeMode.getIntegerSetting("farms.fertilizer.modifier");
private final FarmController farmController;
@@ -135,9 +138,14 @@ public class InventoryFarm extends InventoryAdapterRestricted implements IFarmIn
if (itemstack == null) {
return false;
}
Item item = itemstack.getItem();
return PluginCore.items.fertilizerCompound == item;
for(Entry<ItemStack, Integer> fertilizer : Farmables.fertilizers.entrySet()){
ItemStack fertilizerItem = fertilizer.getKey();
if(itemstack.getItem() == fertilizerItem.getItem() && (fertilizerItem.getItemDamage() == itemstack.getItemDamage() || fertilizerItem.getItemDamage() == OreDictionary.WILDCARD_VALUE)){
return true;
}
}
return false;
}
@Override
@@ -204,6 +212,21 @@ public class InventoryFarm extends InventoryAdapterRestricted implements IFarmIn
return added;
}
public int getFertilizerValue() {
ItemStack fertilizerStack = getStackInSlot(SLOT_FERTILIZER);
if (fertilizerStack == null || fertilizerStack.stackSize <= 0) {
return 0;
}
for(Entry<ItemStack, Integer> fertilizer : Farmables.fertilizers.entrySet()){
ItemStack fertilizerItem = fertilizer.getKey();
if(fertilizerStack.getItem() == fertilizerItem.getItem() && (fertilizerItem.getItemDamage() == fertilizerStack.getItemDamage() || fertilizerItem.getItemDamage() == OreDictionary.WILDCARD_VALUE)){
return fertilizer.getValue() * FERTILIZER_MODIFIER;
}
}
return 0;
}
public boolean useFertilizer() {
ItemStack fertilizer = getStackInSlot(SLOT_FERTILIZER);
@@ -113,6 +113,8 @@ public class PluginIC2 extends BlankForestryPlugin {
ICircuitLayout layoutEngineTin = new CircuitLayout("engine.tin", CircuitSocketType.ELECTRIC_ENGINE);
ChipsetManager.circuitRegistry.registerLayout(layoutEngineTin);
Farmables.fertilizers.put(IC2Items.getItem("crop_res", "fertilizer"), 250);
}
@Override