upstream/EnderIO
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/EnderIO.git synced 2026-10-26 14:24:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed Fuckup

Browse Source 
+ renamed constructor params for easier access
+ reduced log-spam
+ version increase
This commit is contained in:
bartimaeusnek committed 2020-05-27 13:24:21 +02:00
1 parent 2c714d4321
commit ea5786c266
4 files changed
+10 -10
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

gradle.properties
+1 -1
View File
@@ -2,7 +2,7 @@ minecraft_version=1.7.10
forge_version=10.13.4.1614-1.7.10 forge_version=10.13.4.1614-1.7.10
forgeDep_version=10.13.4.1614 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 #Comment out this line to get rid of the appendix
#mod_appendix=beta #mod_appendix=beta
src/main/java/crazypants/enderio/machine/AbstractPoweredMachineEntity.java
+2 -2
View File
@@ -217,9 +217,9 @@ public abstract class AbstractPoweredMachineEntity extends AbstractMachineEntity
NBTTagCompound cap = nbtRoot.getCompoundTag(CAPACITOR_TAG_STRING); NBTTagCompound cap = nbtRoot.getCompoundTag(CAPACITOR_TAG_STRING);
setCapacitor(new BasicCapacitor( setCapacitor(new BasicCapacitor(
cap.getInteger("Tier"), cap.getInteger("Tier"),
cap.getInteger("MaxEnergyExtracted"), cap.getInteger("MaxEnergyReceived"),
cap.getInteger("MaxEnergyStored"), cap.getInteger("MaxEnergyStored"),
cap.getInteger("MaxEnergyReceived") cap.getInteger("MaxEnergyExtracted")
)); ));
} }
src/main/java/crazypants/enderio/machine/recipe/RecipeConfig.java
+5 -5
View File
@@ -128,25 +128,25 @@ public class RecipeConfig {
for (RecipeGroup group : userConfig.getRecipeGroups().values()) { for (RecipeGroup group : userConfig.getRecipeGroups().values()) {
if(!group.enabled) { if(!group.enabled) {
if(recipeGroups.remove(group.name) != null) { 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 { } else {
RecipeGroup modifyGroup = recipeGroups.get(group.name); RecipeGroup modifyGroup = recipeGroups.get(group.name);
if(modifyGroup == null) { 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); modifyGroup = new RecipeGroup(group.name);
recipeGroups.put(group.name, modifyGroup); recipeGroups.put(group.name, modifyGroup);
} }
for (RecipeElement recipe : group.recipes.values()) { for (RecipeElement recipe : group.recipes.values()) {
if(recipe.isValid()) { if(recipe.isValid()) {
if(modifyGroup.recipes.containsKey(recipe.name)) { 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 { } else {
Log.info("Added user defined recipe " + recipe.name); Log.debug("Added user defined recipe " + recipe.name);
} }
modifyGroup.addRecipe(recipe); modifyGroup.addRecipe(recipe);
} else { } 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); modifyGroup.recipes.remove(recipe.name);
} }
} }
src/main/java/crazypants/enderio/power/BasicCapacitor.java
+2 -2
View File
@@ -22,8 +22,8 @@ public class BasicCapacitor implements ICapacitor {
this(tier, maxEnergyIO, maxEnergyStored, maxEnergyIO); this(tier, maxEnergyIO, maxEnergyStored, maxEnergyIO);
} }
public BasicCapacitor(int tier, int maxEnergyIn, int maxEnergyStored, int maxEnergyOut) { public BasicCapacitor(int tier, int maxEnergyReceived, int maxEnergyStored, int maxEnergyExtracted) {
configure(tier, maxEnergyIn, maxEnergyStored, maxEnergyOut); configure(tier, maxEnergyReceived, maxEnergyStored, maxEnergyExtracted);
} }