diff options
| author | Dream-Master <dream-master@gmx.net> | 2018-01-14 15:52:58 +0100 |
|---|---|---|
| committer | Dream-Master <dream-master@gmx.net> | 2018-01-14 15:52:58 +0100 |
| commit | c2abf92ec70b28e37c52cbcb394e89a0c88b651a (patch) | |
| tree | 543aa5ac5ede08fb2c1cfd2d1e8378f1cee37674 | |
| parent | d9dc6f9cf01887f732b1cb367338042a7380c632 (diff) | |
| download | GT5-Unofficial-c2abf92ec70b28e37c52cbcb394e89a0c88b651a.tar.gz GT5-Unofficial-c2abf92ec70b28e37c52cbcb394e89a0c88b651a.tar.bz2 GT5-Unofficial-c2abf92ec70b28e37c52cbcb394e89a0c88b651a.zip | |
Revert "[Balance] Adjust oilsands to make them worthwhile #2406"
This reverts commit fb43070ec67dc64cdf8a69a408675788e3538fa3.
| -rw-r--r-- | src/main/java/gregtech/api/enums/ConfigCategories.java | 1 | ||||
| -rw-r--r-- | src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/main/java/gregtech/api/enums/ConfigCategories.java b/src/main/java/gregtech/api/enums/ConfigCategories.java index 153aed893f..1919441539 100644 --- a/src/main/java/gregtech/api/enums/ConfigCategories.java +++ b/src/main/java/gregtech/api/enums/ConfigCategories.java @@ -13,6 +13,7 @@ public enum ConfigCategories { public enum Materials { heatdamage, + oreprocessingoutputmultiplier, blastfurnacerequirements, blastinductionsmelter,; } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java index 472eea5f8d..30be03b4b6 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java @@ -19,9 +19,12 @@ public class ProcessingOre implements gregtech.api.interfaces.IOreRecipeRegistra } public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { + boolean tIsRich = (aPrefix == OrePrefixes.oreNether) || (aPrefix == OrePrefixes.oreEnd) || (aPrefix == OrePrefixes.oreDense); if (aMaterial == Materials.Oilsands) { - GT_Values.RA.addCentrifugeRecipe(GT_Utility.copyAmount(1L, new Object[]{aStack}), null, null, Materials.OilHeavy.getFluid(2000L), GT_ModHandler.getModItem("dreamcraft", "item.SandDust", 1, 0), null, null, null, null, null, new int[]{2500}, 100, 10); + GT_Values.RA.addCentrifugeRecipe(GT_Utility.copyAmount(1L, new Object[]{aStack}), null, null, Materials.Oil.getFluid(tIsRich ? 1000L : 500L), new ItemStack(net.minecraft.init.Blocks.sand, 1, 0), null, null, null, null, null, new int[]{tIsRich ? '?' : '?'}, tIsRich ? 2000 : 1000, 5); + } else { + registerStandardOreRecipes(aPrefix, aMaterial, GT_Utility.copyAmount(1L, new Object[]{aStack}), Math.max(1, gregtech.api.GregTech_API.sOPStuff.get(gregtech.api.enums.ConfigCategories.Materials.oreprocessingoutputmultiplier, aMaterial.toString(), 1)) * (tIsRich ? 2 : 1)); } } |