diff options
| author | Dream-Master <dream-master@gmx.net> | 2018-12-02 17:20:15 +0100 |
|---|---|---|
| committer | Dream-Master <dream-master@gmx.net> | 2018-12-02 17:20:15 +0100 |
| commit | ac7282a30ef161101cabc921e52db5c5d7e0096c (patch) | |
| tree | 053d1f8a1f3a4dca379f288e51e0203536dd8353 | |
| parent | 628876f254b778be2ca68ebfe1ff7096a935a7ef (diff) | |
| download | GT5-Unofficial-ac7282a30ef161101cabc921e52db5c5d7e0096c.tar.gz GT5-Unofficial-ac7282a30ef161101cabc921e52db5c5d7e0096c.tar.bz2 GT5-Unofficial-ac7282a30ef161101cabc921e52db5c5d7e0096c.zip | |
Revert "issue with malachite ore (nether version) #3872"
This reverts commit 56c6a1230882d9fe9b3abc3f8b9bbea9a018d57a.
| -rw-r--r-- | src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java index f1ff05b426..99cf2e6366 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.oreNetherrack) || (aPrefix == OrePrefixes.oreNether) || (aPrefix == OrePrefixes.oreEndstone) || (aPrefix == OrePrefixes.oreEnd) || (aPrefix == OrePrefixes.oreRich) || (aPrefix == OrePrefixes.oreDense); if (aMaterial == Materials.Oilsands) { - GT_Values.RA.addCentrifugeRecipe(GT_Utility.copyAmount(1L, new Object[]{aStack}), null, null, Materials.OilHeavy.getFluid(2000L), new ItemStack(net.minecraft.init.Blocks.sand, 1, 0), null, null, null, null, null, new int[]{2000},300, 30); + GT_Values.RA.addCentrifugeRecipe(GT_Utility.copyAmount(1L, new Object[]{aStack}), null, null, Materials.OilHeavy.getFluid(tIsRich ? 4000L : 2000L), new ItemStack(net.minecraft.init.Blocks.sand, 1, 0), null, null, null, null, null, new int[]{tIsRich ? 2000 : 4000}, tIsRich ? 600 : 300, 30); + } 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)); } } |