mirror of
https://github.com/GTNewHorizons/EnderIO.git
synced 2026-10-25 20:22:23 +00:00
Fixed Fuckup
+ renamed constructor params for easier access + reduced log-spam + version increase
This commit is contained in:
1 parent
2c714d4321
commit
ea5786c266
4 files changed
+10
-10
No files matched your search
+1
-1
@@ -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
|
||||
|
||||
@@ -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")
|
||||
));
|
||||
}
|
||||
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in new issue
Block a user