From fb43070ec67dc64cdf8a69a408675788e3538fa3 Mon Sep 17 00:00:00 2001 From: Dream-Master Date: Fri, 12 Jan 2018 21:54:12 +0100 Subject: [Balance] Adjust oilsands to make them worthwhile #2406 https://github.com/GTNewHorizons/NewHorizons/issues/2406 --- src/main/java/gregtech/api/enums/ConfigCategories.java | 1 - src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java | 5 +---- 2 files changed, 1 insertion(+), 5 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/gregtech/api/enums/ConfigCategories.java b/src/main/java/gregtech/api/enums/ConfigCategories.java index 1919441539..153aed893f 100644 --- a/src/main/java/gregtech/api/enums/ConfigCategories.java +++ b/src/main/java/gregtech/api/enums/ConfigCategories.java @@ -13,7 +13,6 @@ 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 30be03b4b6..472eea5f8d 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java @@ -19,12 +19,9 @@ 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.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)); + 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); } } -- cgit