diff options
Diffstat (limited to 'src/main')
3 files changed, 21 insertions, 1 deletions
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/MainMod.java b/src/main/java/com/github/bartimaeusnek/bartworks/MainMod.java index b936be1f72..3f01018d84 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/MainMod.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/MainMod.java @@ -219,6 +219,22 @@ public final class MainMod { new CircuitImprintLoader().run(); if (classicMode) new DownTierLoader().run(); + fixEnergyRequirements(); + } + + private static void fixEnergyRequirements() { + maploop: + for (GT_Recipe.GT_Recipe_Map map : GT_Recipe.GT_Recipe_Map.sMappings){ + for (GT_Recipe recipe : map.mRecipeList){ + if (recipe.mFakeRecipe) + continue maploop; + for (int i = 0; i < 10; i++) { + if (recipe.mEUt == BW_Util.getTierVoltage(i)){ + recipe.mEUt = BW_Util.getMachineVoltageFromTier(i); + } + } + } + } } private static void unificationEnforcer() { diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/CircuitGeneration/CircuitImprintLoader.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/CircuitGeneration/CircuitImprintLoader.java index 26f774b780..a2442cb6d2 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/CircuitGeneration/CircuitImprintLoader.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/CircuitGeneration/CircuitImprintLoader.java @@ -113,6 +113,8 @@ public class CircuitImprintLoader implements Runnable { int[] oreIDs = OreDictionary.getOreIDs(is); if(oreIDs == null || oreIDs.length < 1 || !OreDictionary.getOreName(oreIDs[0]).contains("circuit")) { is.stackSize = 64; + if (is.stackSize > is.getItem().getItemStackLimit() || is.stackSize > is.getMaxStackSize()) + is.stackSize = is.getMaxStackSize(); } } newRecipe.mFluidInputs[0].amount *= 4; @@ -143,6 +145,8 @@ public class CircuitImprintLoader implements Runnable { else { in[i] = original.mInputs[i].copy(); in[i].stackSize *= 16; + if (in[i].stackSize > in[i].getItem().getItemStackLimit() || in[i].stackSize > in[i].getMaxStackSize()) + in[i].stackSize = in[i].getMaxStackSize(); } // if (in[i].stackSize > 64) // return null; diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/processingLoaders/AdditionalRecipes.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/processingLoaders/AdditionalRecipes.java index e657a5af83..d6a1f898aa 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/processingLoaders/AdditionalRecipes.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/processingLoaders/AdditionalRecipes.java @@ -110,7 +110,7 @@ public class AdditionalRecipes implements Runnable { new BWRecipes.DynamicGTRecipe(false, new ItemStack[]{ BW_Meta_Items.getNEWCIRCUITS().getStack(3), - WerkstoffLoader.MagnetoResonaticDust.get(gemExquisite, (2)), + WerkstoffLoader.MagnetoResonaticDust.get(gemExquisite, (1)), BW_Meta_Items.getNEWCIRCUITS().getStack(i + 3), ItemList.Circuit_Parts_DiodeSMD.get((i + 6) * 4), ItemList.Circuit_Parts_CapacitorSMD.get((i + 6) * 4), |