Add farm hoe whitelist

This commit is contained in:
tterrag1098 committed 2014-12-30 23:19:16 -05:00
1 parent 82eafe917a
commit 9fc63d98c2
3 files changed
+37 -2

No files matched your search

@@ -576,6 +576,8 @@ public class EnderIO {
@EventHandler
public void postInit(FMLPostInitializationEvent event) {
Config.postInit();
//Regsiter the enchants
Enchantments.getInstance();
@@ -4,6 +4,7 @@ import java.io.File;
import java.util.ArrayList;
import java.util.List;
import net.minecraft.item.ItemStack;
import net.minecraftforge.common.config.Configuration;
import tterrag.core.common.event.ConfigFileChangedEvent;
import cpw.mods.fml.client.event.ConfigChangedEvent.OnConfigChangedEvent;
@@ -11,6 +12,7 @@ import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.Optional.Method;
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import cpw.mods.fml.common.registry.GameRegistry;
import crazypants.enderio.EnderIO;
import crazypants.enderio.Log;
import crazypants.vecmath.VecmathUtil;
@@ -264,6 +266,14 @@ public final class Config {
public static boolean farmEssenceBerriesEnabled = true;
public static boolean farmManaBeansEnabled = false;
public static boolean farmHarvestJungleWhenCocoa = false;
public static String[] hoeStrings = new String[] {
"minecraft:wooden_hoe", "minecraft:stone_hoe", "minecraft:iron_hoe", "minecraft:diamond_hoe", "minecraft:golden_hoe",
"MekanismTools:ObsidianHoe", "MekanismTools:LapisLazuliHoe", "MekanismTools:OsmiumHoe", "MekanismTools:BronzeHoe", "MekanismTools:GlowstoneHoe", "MekanismTools:SteelHoe",
"Steamcraft:hoeBrass", "Steamcraft:hoeGildedGold",
"Railcraft:tool.steel.hoe",
"TConstruct:mattock"
};
public static ItemStack[] farmHoes = new ItemStack[0];
public static int magnetPowerUsePerSecondRF = 1;
public static int magnetPowerCapacityRF = 100000;
@@ -440,6 +450,7 @@ public final class Config {
if(event.modID.equals(EnderIO.MODID)) {
Log.info("Updating config...");
syncConfig(false);
postInit();
}
}
@@ -450,6 +461,7 @@ public final class Config {
Log.info("Updating config...");
syncConfig(true);
event.setSuccessful();
postInit();
}
}
@@ -925,6 +937,9 @@ public final class Config {
farmHarvestJungleWhenCocoa = config.get(sectionFarm.name, "farmHarvestJungleWhenCocoa", farmHarvestJungleWhenCocoa,
"If this is enabled the farm will harvest jungle wood even if it has cocoa beans in its inventory.").getBoolean();
hoeStrings = config.get(sectionFarm.name, "farmHoes", hoeStrings,
"Use this to specify items that can be hoes in the farming station. Use the registry name (eg. modid:name).").getStringList();
combustionGeneratorUseOpaqueModel = config.get(sectionAesthetic.name, "combustionGeneratorUseOpaqueModel", combustionGeneratorUseOpaqueModel,
"If set to true: fluid will not be shown in combustion generator tanks. Improves FPS. ").getBoolean(combustionGeneratorUseOpaqueModel);
@@ -1107,7 +1122,14 @@ public final class Config {
}
public static void postInit() {
farmHoes = new ItemStack[hoeStrings.length];
for (int i = 0; i < Config.hoeStrings.length; i++) {
String[] data = hoeStrings[i].split(":");
farmHoes[i] = GameRegistry.findItemStack(data[0], data[1], 1);
}
}
private Config() {
}
}
@@ -16,6 +16,7 @@ import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.server.MinecraftServer;
import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.oredict.OreDictionary;
import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint;
import crazypants.enderio.EnderIO;
import crazypants.enderio.ModObject;
@@ -38,7 +39,17 @@ import crazypants.util.Lang;
public class TileFarmStation extends AbstractPoweredTaskEntity {
public enum ToolType {
HOE { boolean match(ItemStack item) { return item.getItem() instanceof ItemHoe; }},
HOE {
boolean match(ItemStack item) {
for (ItemStack stack : Config.farmHoes) {
if (stack != null && OreDictionary.itemMatches(item, stack, false)) {
return true;
}
}
return false;
}
},
AXE { boolean match(ItemStack item) { return item.getItem().getHarvestLevel(item, "axe") > 0; }},
TREETAP { boolean match(ItemStack item) { return item.getItem().getClass() == RubberTreeFarmerIC2.treeTap;}};