diff --git a/gradle.properties b/gradle.properties index 525243e..8db30e3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ minecraft_version=1.7.10 forge_version=10.13.4.1492-1.7.10 forgeDep_version=10.13.4 -mod_version=0.9.3 +mod_version=0.9.4 #Comment out this line to get rid of the appendix mod_appendix=beta diff --git a/src/main/java/info/loenwind/enderioaddons/machine/afarm/TileAfarm.java b/src/main/java/info/loenwind/enderioaddons/machine/afarm/TileAfarm.java index 9bc3dc7..b707480 100644 --- a/src/main/java/info/loenwind/enderioaddons/machine/afarm/TileAfarm.java +++ b/src/main/java/info/loenwind/enderioaddons/machine/afarm/TileAfarm.java @@ -13,6 +13,8 @@ import static info.loenwind.enderioaddons.config.Config.farmDelay3; import static info.loenwind.enderioaddons.config.Config.farmRFperTickPerArea; import static info.loenwind.enderioaddons.config.Config.farmRFperTickPerModule; +import static info.loenwind.enderioaddons.recipe.Recipes.handRake_iron; +import static info.loenwind.enderioaddons.recipe.Recipes.handRake_wood; import info.loenwind.autosave.annotations.Storable; import info.loenwind.autosave.annotations.Store; import info.loenwind.enderioaddons.baseclass.TileEnderIOAddons; @@ -71,7 +73,6 @@ import com.enderio.core.common.util.BlockCoord; import com.enderio.core.common.util.ItemUtil; -import cpw.mods.fml.common.registry.GameRegistry.ItemStackHolder; import crazypants.enderio.machine.ContinuousTask; import crazypants.enderio.machine.IMachineRecipe; import crazypants.enderio.machine.IPoweredTask; @@ -83,11 +84,6 @@ @Storable public class TileAfarm extends TileEnderIOAddons implements INetworkUpdatable { - @ItemStackHolder(value = "AgriCraft:handRake", meta = 0) - public static final ItemStack handRake_wood = null; - @ItemStackHolder(value = "AgriCraft:handRake", meta = 1) - public static final ItemStack handRake_iron = null; - public static final int NUM_CONTROL_SLOTS = 6; public static final int NUM_CONTROL_STORAGE_SLOTS = 12; public static final int NUM_SEED_GHOST_SLOTS = 4; diff --git a/src/main/java/info/loenwind/enderioaddons/plant/EioaCropPlant.java b/src/main/java/info/loenwind/enderioaddons/plant/EioaCropPlant.java index 4af413b..18709b5 100644 --- a/src/main/java/info/loenwind/enderioaddons/plant/EioaCropPlant.java +++ b/src/main/java/info/loenwind/enderioaddons/plant/EioaCropPlant.java @@ -4,6 +4,9 @@ import static info.loenwind.enderioaddons.config.Config.seedsBonemealEnabled; import static info.loenwind.enderioaddons.config.Config.seedsTierEasy; import static info.loenwind.enderioaddons.config.Config.seedsTierHard; +import static info.loenwind.enderioaddons.recipe.Recipes.capacitor1; +import static info.loenwind.enderioaddons.recipe.Recipes.capacitor2; +import static info.loenwind.enderioaddons.recipe.Recipes.capacitor8; import info.loenwind.enderioaddons.machine.afarm.BlockAfarm; import info.loenwind.enderioaddons.machine.part.ItemMachinePart; import info.loenwind.enderioaddons.machine.part.MachinePart; @@ -28,19 +31,11 @@ import com.enderio.core.common.util.BlockCoord; import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; -import cpw.mods.fml.common.registry.GameRegistry.ItemStackHolder; import crazypants.enderio.machine.farm.PacketFarmAction; import crazypants.enderio.network.PacketHandler; public class EioaCropPlant implements ICropPlant { - @ItemStackHolder(value = "EnderIO:itemBasicCapacitor", meta = 0) - public static final ItemStack capacitor1 = null; - @ItemStackHolder(value = "EnderIO:itemBasicCapacitor", meta = 1) - public static final ItemStack capacitor2 = null; - @ItemStackHolder(value = "EnderIO:itemBasicCapacitor", meta = 2) - public static final ItemStack capacitor8 = null; - private final List fruits = new ArrayList<>(); private final ArrayList allfruits = new ArrayList<>(); private final List lowfruits = new ArrayList<>();