aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java
diff options
context:
space:
mode:
authorBlood-Asp <bloodasphendrik@gmail.com>2017-11-25 18:43:13 +0100
committerGitHub <noreply@github.com>2017-11-25 18:43:13 +0100
commitdbbefafbccc2aca31f718775e43c4f36ca7e0a85 (patch)
tree9ad3fcaef69c67c9451413a0ab958c2472cd8365 /src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java
parent2b8cca2565c58f99654840f6e3cafc5142fbd9ca (diff)
parent1c9c9af45bfa46278ed4840c3c6ae1459879d2fe (diff)
downloadGT5-Unofficial-dbbefafbccc2aca31f718775e43c4f36ca7e0a85.tar.gz
GT5-Unofficial-dbbefafbccc2aca31f718775e43c4f36ca7e0a85.tar.bz2
GT5-Unofficial-dbbefafbccc2aca31f718775e43c4f36ca7e0a85.zip
Merge branch 'unstable' into GT6-styled_pipes
Diffstat (limited to 'src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java')
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java18
1 files changed, 11 insertions, 7 deletions
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java
index 3558e08f69..def5ed7b63 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java
@@ -1,5 +1,6 @@
package gregtech.loaders.oreprocessing;
+import gregtech.GT_Mod;
import gregtech.api.GregTech_API;
import gregtech.api.enums.*;
import gregtech.api.util.GT_ModHandler;
@@ -19,14 +20,17 @@ public class ProcessingBlock implements gregtech.api.interfaces.IOreRecipeRegist
ItemStack tStack2 = GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L);
ItemStack tStack3 = GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L);
- GT_ModHandler.removeRecipe(new ItemStack[]{GT_Utility.copyAmount(1L, new Object[]{aStack})});
+ if (GT_Mod.gregtechproxy.mNerfStorageBlocks) {
- if (tStack1 != null)
- GT_ModHandler.removeRecipe(new ItemStack[]{tStack1, tStack1, tStack1, tStack1, tStack1, tStack1, tStack1, tStack1, tStack1});
- if (tStack2 != null)
- GT_ModHandler.removeRecipe(new ItemStack[]{tStack2, tStack2, tStack2, tStack2, tStack2, tStack2, tStack2, tStack2, tStack2});
- if (tStack3 != null) {
- GT_ModHandler.removeRecipe(new ItemStack[]{tStack3, tStack3, tStack3, tStack3, tStack3, tStack3, tStack3, tStack3, tStack3});
+ GT_ModHandler.removeRecipe(new ItemStack[]{GT_Utility.copyAmount(1L, new Object[]{aStack})});
+
+ if (tStack1 != null)
+ GT_ModHandler.removeRecipe(new ItemStack[]{tStack1, tStack1, tStack1, tStack1, tStack1, tStack1, tStack1, tStack1, tStack1});
+ if (tStack2 != null)
+ GT_ModHandler.removeRecipe(new ItemStack[]{tStack2, tStack2, tStack2, tStack2, tStack2, tStack2, tStack2, tStack2, tStack2});
+ if (tStack3 != null) {
+ GT_ModHandler.removeRecipe(new ItemStack[]{tStack3, tStack3, tStack3, tStack3, tStack3, tStack3, tStack3, tStack3, tStack3});
+ }
}
if (aMaterial.mStandardMoltenFluid != null) {
GT_Values.RA.addFluidSolidifierRecipe(ItemList.Shape_Mold_Block.get(0L, new Object[0]), aMaterial.getMolten(1296L), GT_OreDictUnificator.get(OrePrefixes.block, aMaterial, 1L), 288, 8);