From ea5786c2667fc4d9d00b832141ee83be73798d12 Mon Sep 17 00:00:00 2001
From: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
Date: Wed, 27 May 2020 13:24:21 +0200
Subject: [PATCH] Fixed Fuckup + renamed constructor params for easier access +
 reduced log-spam + version increase

---
 gradle.properties                                      |  2 +-
 .../enderio/machine/AbstractPoweredMachineEntity.java  |  4 ++--
 .../enderio/machine/recipe/RecipeConfig.java           | 10 +++++-----
 .../java/crazypants/enderio/power/BasicCapacitor.java  |  4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 5ad4145c..9f0e9f3d 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,7 +2,7 @@ minecraft_version=1.7.10
 forge_version=10.13.4.1614-1.7.10
 forgeDep_version=10.13.4.1614
 
-mod_version=2.3.1.12_beta
+mod_version=2.3.1.13_beta
 
 #Comment out this line to get rid of the appendix
 #mod_appendix=beta
diff --git a/src/main/java/crazypants/enderio/machine/AbstractPoweredMachineEntity.java b/src/main/java/crazypants/enderio/machine/AbstractPoweredMachineEntity.java
index 0bec1dff..4aea2e47 100644
--- a/src/main/java/crazypants/enderio/machine/AbstractPoweredMachineEntity.java
+++ b/src/main/java/crazypants/enderio/machine/AbstractPoweredMachineEntity.java
@@ -217,9 +217,9 @@ public abstract class AbstractPoweredMachineEntity extends AbstractMachineEntity
     NBTTagCompound cap = nbtRoot.getCompoundTag(CAPACITOR_TAG_STRING);
     setCapacitor(new BasicCapacitor(
             cap.getInteger("Tier"),
-            cap.getInteger("MaxEnergyExtracted"),
+            cap.getInteger("MaxEnergyReceived"),
             cap.getInteger("MaxEnergyStored"),
-            cap.getInteger("MaxEnergyReceived")
+            cap.getInteger("MaxEnergyExtracted")
     ));
   }
 
diff --git a/src/main/java/crazypants/enderio/machine/recipe/RecipeConfig.java b/src/main/java/crazypants/enderio/machine/recipe/RecipeConfig.java
index 1eb457b7..51a5ce51 100644
--- a/src/main/java/crazypants/enderio/machine/recipe/RecipeConfig.java
+++ b/src/main/java/crazypants/enderio/machine/recipe/RecipeConfig.java
@@ -128,25 +128,25 @@ public class RecipeConfig {
     for (RecipeGroup group : userConfig.getRecipeGroups().values()) {
       if(!group.enabled) {
         if(recipeGroups.remove(group.name) != null) {
-          Log.info("Disabled core recipe group " + group.name + " due to user config.");
+          Log.debug("Disabled core recipe group " + group.name + " due to user config.");
         }
       } else {
         RecipeGroup modifyGroup = recipeGroups.get(group.name);
         if(modifyGroup == null) {
-          Log.info("Added user defined recipe group " + group.name);
+          Log.debug("Added user defined recipe group " + group.name);
           modifyGroup = new RecipeGroup(group.name);
           recipeGroups.put(group.name, modifyGroup);
         }
         for (RecipeElement recipe : group.recipes.values()) {
           if(recipe.isValid()) {
             if(modifyGroup.recipes.containsKey(recipe.name)) {
-              Log.info("Replacing core recipe " + recipe.name + "  with user defined recipe.");
+              Log.debug("Replacing core recipe " + recipe.name + "  with user defined recipe.");
             } else {
-              Log.info("Added user defined recipe " + recipe.name);
+              Log.debug("Added user defined recipe " + recipe.name);
             }
             modifyGroup.addRecipe(recipe);
           } else {
-            Log.info("Removed recipe " + recipe.name + " due to user config.");
+            Log.debug("Removed recipe " + recipe.name + " due to user config.");
             modifyGroup.recipes.remove(recipe.name);
           }
         }
diff --git a/src/main/java/crazypants/enderio/power/BasicCapacitor.java b/src/main/java/crazypants/enderio/power/BasicCapacitor.java
index d8a02699..5127edd3 100644
--- a/src/main/java/crazypants/enderio/power/BasicCapacitor.java
+++ b/src/main/java/crazypants/enderio/power/BasicCapacitor.java
@@ -22,8 +22,8 @@ public class BasicCapacitor implements ICapacitor {
     this(tier, maxEnergyIO, maxEnergyStored, maxEnergyIO);
   }
 
-  public BasicCapacitor(int tier, int maxEnergyIn, int maxEnergyStored, int maxEnergyOut) {
-    configure(tier, maxEnergyIn, maxEnergyStored, maxEnergyOut);
+  public BasicCapacitor(int tier, int maxEnergyReceived, int maxEnergyStored, int maxEnergyExtracted) {
+    configure(tier, maxEnergyReceived, maxEnergyStored, maxEnergyExtracted);
   }