diff options
| author | Johannes Gäßler <updrn@student.kit.edu> | 2017-06-24 11:56:35 +0200 |
|---|---|---|
| committer | Dream-Master <dream-master@gmx.net> | 2017-06-24 20:19:10 +0200 |
| commit | d32b6bb758a8905a1f885ccae43678c61de2029d (patch) | |
| tree | 2059b752217984b5b9be81ec9b36a1da1899d720 | |
| parent | 729f7e0aeeb9d0735abd1ae86a52dfb7f4be424d (diff) | |
| download | GT5-Unofficial-d32b6bb758a8905a1f885ccae43678c61de2029d.tar.gz GT5-Unofficial-d32b6bb758a8905a1f885ccae43678c61de2029d.tar.bz2 GT5-Unofficial-d32b6bb758a8905a1f885ccae43678c61de2029d.zip | |
cherry pick
6f3d92f3fab34444e8a8cc32bee9f80efde0eaaf
Added a config option for easier EV+ Cables
| -rw-r--r-- | src/main/java/gregtech/GT_Mod.java | 1 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/GT_Proxy.java | 2 | ||||
| -rw-r--r-- | src/main/java/gregtech/loaders/oreprocessing/ProcessingWire.java | 23 |
3 files changed, 22 insertions, 4 deletions
diff --git a/src/main/java/gregtech/GT_Mod.java b/src/main/java/gregtech/GT_Mod.java index 24894c8f4f..d6295cb82c 100644 --- a/src/main/java/gregtech/GT_Mod.java +++ b/src/main/java/gregtech/GT_Mod.java @@ -274,6 +274,7 @@ public class GT_Mod implements IGT_Mod { GregTech_API.meIOLoaded = Loader.isModLoaded("EnderIO"); gregtechproxy.mForceFreeFace = GregTech_API.sMachineFile.get(ConfigCategories.machineconfig, "forceFreeFace",true); gregtechproxy.mBrickedBlastFurnace = tMainConfig.get("general", "BrickedBlastFurnace", true).getBoolean(true); + gregtechproxy.mEasierEVPlusCables = tMainConfig.get("general", "EasierEVPlusCables", false).getBoolean(false); GregTech_API.mUseOnlyGoodSolderingMaterials = GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.harderrecipes, "useonlygoodsolderingmaterials", GregTech_API.mUseOnlyGoodSolderingMaterials); gregtechproxy.mChangeHarvestLevels = GregTech_API.sMaterialProperties.get("havestLevel", "activateHarvestLevelChange", false);//TODO CHECK diff --git a/src/main/java/gregtech/common/GT_Proxy.java b/src/main/java/gregtech/common/GT_Proxy.java index 4b768f8372..6477b47191 100644 --- a/src/main/java/gregtech/common/GT_Proxy.java +++ b/src/main/java/gregtech/common/GT_Proxy.java @@ -192,8 +192,8 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler { public boolean mAMHInteraction = true; public boolean mForceFreeFace = true; public boolean mBrickedBlastFurnace = true; + public boolean mEasierEVPlusCables = false; - public GT_Proxy() { GameRegistry.registerFuelHandler(this); MinecraftForge.EVENT_BUS.register(this); diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingWire.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingWire.java index 4bee5049b1..31a2bdd2c9 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingWire.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingWire.java @@ -111,10 +111,27 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr for (Materials rubber : rubbers) { GT_Values.RA.addAssemblerRecipe(aStack, ItemList.Circuit_Integrated.getWithDamage(0L, 24L, new Object[0]),rubber.getMolten(144 * costMultiplier), GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L), 100, 8); } - for (Materials dielectric : dielectrics) { - for (Materials syntheticRubber : syntheticRubbers) { - GT_Values.RA.addAssemblerRecipe(new ItemStack[]{aStack, dielectric.getDustSmall(costMultiplier)}, syntheticRubber.getMolten(costMultiplier * 36), GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L), 100, 8); + if (GT_Mod.gregtechproxy.mEasierEVPlusCables) { + for (Materials rubber : rubbers) { + GT_Values.RA.addAssemblerRecipe(aStack, ItemList.Circuit_Integrated.getWithDamage(0L, 24L, new Object[0]), + rubber.getMolten(144 * costMultiplier), GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L), 100, 8); + } + for (Materials dielectric : dielectrics) { + for (Materials syntheticRubber : syntheticRubbers) { + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{aStack, dielectric.getDustSmall(costMultiplier)}, + syntheticRubber.getMolten(costMultiplier * 36), GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L), 100, 8); + } } + } else { + for (Materials dielectric : dielectrics) { + for (Materials syntheticRubber : syntheticRubbers) { + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{aStack, dielectric.getDustSmall(costMultiplier), GT_OreDictUnificator.get(OrePrefixes.foil, aMaterial, costMultiplier)}, + syntheticRubber.getMolten(costMultiplier * 36), GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L), 100, 8); + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{aStack, dielectric.getDustSmall(costMultiplier), GT_OreDictUnificator.get(OrePrefixes.foil, Materials.PolyphenyleneSulfide, costMultiplier)}, + syntheticRubber.getMolten(costMultiplier * 36), GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L), 100, 8); + } + } + } break; default: |