Added recipes to convert to and from EIO Farming Station

HenryLoenwind · Mar 28, 2016 · 919b5dd · 919b5dd
1 parent eebb639
commit 919b5dd
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 16 deletions.
diff --git a/src/main/java/info/loenwind/enderioaddons/config/ItemHelper.java b/src/main/java/info/loenwind/enderioaddons/config/ItemHelper.java
@@ -29,10 +29,6 @@ public static List<WeightedItemStack> readWeightedList(String input) {
       if (item != null && !item.trim().isEmpty()) {
         final Matcher matcher = p.matcher(item);
         if (matcher.matches()) {
-          //          System.out.println(matcher.groupCount());
-          //          for (int i = 0; i <= matcher.groupCount(); i++) {
-          //            System.out.println("Group " + i + ": >" + matcher.group(i) + "<");
-          //          }
           String modid = matcher.group(1);
           String itemid = matcher.group(2);
           String metaS = matcher.group(3);
@@ -100,14 +96,4 @@ public static List<ItemStack> readList(Config config) {
     return result;
   }
 
-  public static void main(String[] args) {
-    readWeightedList(",minecraft:dirt@1=99,;, enderio:whatever@0 = 47   ,other:what=13,");
-    String a = "enderioaddons:itemMachineParts@23=13500, EnderIO:itemBasicCapacitor@0=10, EnderIO:itemBasicCapacitor@1=5, EnderIO:itemBasicCapacitor@2=1";
-
-    String b = "enderioaddons:itemMachineParts@23=10000, enderioaddons:itemMachineParts@24=3000, enderioaddons:itemMachineParts@25=500, "
-        + "EnderIO:itemBasicCapacitor@0=10, EnderIO:itemBasicCapacitor@1=5, EnderIO:itemBasicCapacitor@2=1";
-    info.loenwind.enderioaddons.config.ItemHelper.readWeightedList(info.loenwind.enderioaddons.config.Config.plantDropsLowGain);
-    readWeightedList(a);
-    readWeightedList(b);
-  }
 }
diff --git a/src/main/java/info/loenwind/enderioaddons/plant/EioaGrowthRequirement.java b/src/main/java/info/loenwind/enderioaddons/plant/EioaGrowthRequirement.java
@@ -63,7 +63,7 @@ public EioaGrowthRequirement() {
           Log.warn("Config value 'plantRequiredBlocks' is invalid (second element has no block) and will be (partially) ignored.");
         }
 
-        ItemStack itemStackDarkBar = list.get(1);
+        ItemStack itemStackDarkBar = list.get(2);
         Block blockDarkBar = Block.getBlockFromItem(itemStackDarkBar.getItem());
         if (blockDarkBar != null) {
           if (itemStackDarkBar.getItemDamage() <= 15 || itemStackDarkBar.getItemDamage() == OreDictionary.WILDCARD_VALUE) {

diff --git a/src/main/java/info/loenwind/enderioaddons/recipe/Recipes.java b/src/main/java/info/loenwind/enderioaddons/recipe/Recipes.java
@@ -104,6 +104,8 @@ public class Recipes implements InitAware {
 
   @ItemStackHolder(value = "EnderIO:blockPowerMonitor", meta = 0)
   public static final ItemStack blockPowerMonitor = null;
+  @ItemStackHolder(value = "EnderIO:blockFarmStation", meta = 0)
+  public static final ItemStack blockFarmStation = null;
 
   @ItemStackHolder(value = "EnderIO:item.darkSteel_helmet")
   public static final ItemStack darkSteel_helmet = null;
@@ -390,6 +392,8 @@ public void init(FMLInitializationEvent event) {
 
         addShaped(moduleIQ, "bbb", "bzb", "bbb", 'b', moduleBase, 'z', zombieBit);
         addShaped(farm, "ehe", "eCe", "cMc", 'e', electricSteel, 'h', Items.diamond_hoe, 'C', machineChassi, 'M', moduleIQ, 'c', crystal);
+        addShaped(farm, "bbb", "bFb", "bbb", 'b', moduleBase, 'F', blockFarmStation);
+        addShapeless(blockFarmStation, farm, "itemBasicGear");
         addShaped(induRake, "bb", " d", " d", 'b', darkSteelBars, 'd', darkSteel);
         addShaped(induRake, "bb", "d ", "d ", 'b', darkSteelBars, 'd', darkSteel);
         if (handRake_wood != null) {

diff --git a/src/main/resources/assets/enderioaddons/lang/en_US.lang b/src/main/resources/assets/enderioaddons/lang/en_US.lang
@@ -214,7 +214,7 @@ enderioaddons.nei.teaser.enderioaddons.darkseeds.page0=These seeds need power to
 # ATTN: The ".image" ones are filenames for png files
 enderioaddons.nei.teaser.enderioaddons.darkseeds.page1.image=capplant
 enderioaddons.nei.teaser.enderioaddons.darkseeds.page2=Details: Must be planted on a capacitor bank. Bedrock must be below capacitor bank. Must be surrounded by at least 6 dark iron bars. NO sun light, but light level must be at least 13. Block above must be air. Capacitor bank must supply 100.000 RF per growth tick.
-enderioaddons.nei.teaser.enderioaddons.darkseeds.page3=Can't figure out what's wrong? There's a config setting that will write diagnostics to the logfile. Enable it. (ESC -> Mod Options -> Ender IO Addons -> Config -> Agricraft Farming Station -> farmDebugLoggingEnabled -> true)
+enderioaddons.nei.teaser.enderioaddons.darkseeds.page3=Can't figure out what's wrong? There's a config setting that will write diagnostics to the logfile. Enable it. (ESC -> Mod Options -> Ender IO Addons -> Config -> development -> growthRequirementDebuggingEnabled -> true)
 enderioaddons.agricraft_journal.darkplant=A funny thing, seeds made from non-living things, grown by the power of RF energy.
 
 tile.enderioaddons.rlever10.name=Self-reseting lever (10 seconds)