diff options
| author | Dream-Master <dream-master@gmx.net> | 2018-12-02 10:34:21 +0100 |
|---|---|---|
| committer | Dream-Master <dream-master@gmx.net> | 2018-12-02 10:34:21 +0100 |
| commit | 95f6b6364fd312d5e4d3112a3a23eecb255eba5f (patch) | |
| tree | 2cb7eff386ae7250fbcaec0e510542873533f52c /src/main/java/gregtech/loaders/oreprocessing | |
| parent | a336830433db2b206c8a109c14606223e5dfc621 (diff) | |
| parent | a4fb56921e866236041ee7cd6dd722b931f15df0 (diff) | |
| download | GT5-Unofficial-95f6b6364fd312d5e4d3112a3a23eecb255eba5f.tar.gz GT5-Unofficial-95f6b6364fd312d5e4d3112a3a23eecb255eba5f.tar.bz2 GT5-Unofficial-95f6b6364fd312d5e4d3112a3a23eecb255eba5f.zip | |
Merge branch 'New-EBF-Coils' into experimental
Diffstat (limited to 'src/main/java/gregtech/loaders/oreprocessing')
| -rw-r--r-- | src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java index 99cf2e6366..f1ff05b426 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.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(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)); + 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); } } |