Merge branch 'new-features' into experimental

4 files changed, 27 insertions, 25 deletions

diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrushedPurified.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrushedPurified.java
index 1cd9ef3d98..c35a658f5b 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrushedPurified.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrushedPurified.java
@@ -17,26 +17,26 @@ public class ProcessingCrushedPurified implements gregtech.api.interfaces.IOreRe
         GT_ModHandler.addThermalCentrifugeRecipe(GT_Utility.copyAmount(1L, new Object[]{aStack}), (int) Math.min(5000L, Math.abs(aMaterial.getMass() * 20L)), new Object[]{GT_OreDictUnificator.get(OrePrefixes.crushedCentrifuged, aMaterial.mMacerateInto, GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial.mMacerateInto, 1L), 1L), GT_OreDictUnificator.get(OrePrefixes.dustTiny, GT_Utility.selectItemInList(1, aMaterial.mMacerateInto, aMaterial.mOreByProducts), 1L)});
         ItemStack tGem = GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L);
         if (tGem != null)
-            if(aMaterial == Materials.Tanzanite||
-                    aMaterial == Materials.Sapphire||
-                    aMaterial == Materials.Olivine||
-                    aMaterial == Materials.GreenSapphire||
-                    aMaterial == Materials.Opal||
-                    aMaterial == Materials.Amethyst||
-                    aMaterial == Materials.Emerald||
-                    aMaterial == Materials.Ruby||
-                    aMaterial == Materials.Amber||
-                    aMaterial == Materials.Diamond||
-                    aMaterial == Materials.FoolsRuby||
-                    aMaterial == Materials.BlueTopaz||
-                    aMaterial == Materials.GarnetRed||
-                    aMaterial == Materials.Topaz||
-                    aMaterial == Materials.Jasper||
-                    aMaterial == Materials.GarnetYellow){
-                GT_Values.RA.addSifterRecipe(GT_Utility.copyAmount(1L, new Object[]{aStack}), new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.gemExquisite, aMaterial, tGem, 1L), GT_OreDictUnificator.get(OrePrefixes.gemFlawless, aMaterial, tGem, 1L), tGem, GT_OreDictUnificator.get(OrePrefixes.gemFlawed, aMaterial, tGem, 1L), GT_OreDictUnificator.get(OrePrefixes.gemChipped, aMaterial, tGem, 1L), GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, tGem, 1L)}, new int[]{300, 1200, 4500, 1400, 2800, 3500}, 800, 16);
-
-            }else{
-                GT_Values.RA.addSifterRecipe(GT_Utility.copyAmount(1L, new Object[]{aStack}), new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.gemExquisite, aMaterial, tGem, 1L), GT_OreDictUnificator.get(OrePrefixes.gemFlawless, aMaterial, tGem, 1L), tGem, GT_OreDictUnificator.get(OrePrefixes.gemFlawed, aMaterial, tGem, 1L), GT_OreDictUnificator.get(OrePrefixes.gemChipped, aMaterial, tGem, 1L), GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, tGem, 1L)}, new int[]{100, 400, 1500, 2000, 4000, 5000}, 800, 16);
-            }
-    }
+        	if(aMaterial == Materials.Tanzanite||
+        	aMaterial == Materials.Sapphire||
+        	aMaterial == Materials.Olivine||
+        	aMaterial == Materials.GreenSapphire||
+        	aMaterial == Materials.Opal||
+        	aMaterial == Materials.Amethyst||
+        	aMaterial == Materials.Emerald||
+        	aMaterial == Materials.Ruby||
+        	aMaterial == Materials.Amber||
+        	aMaterial == Materials.Diamond||
+        	aMaterial == Materials.FoolsRuby||
+        	aMaterial == Materials.BlueTopaz||
+        	aMaterial == Materials.GarnetRed||
+        	aMaterial == Materials.Topaz||
+        	aMaterial == Materials.Jasper||
+        	aMaterial == Materials.GarnetYellow){
+        		GT_Values.RA.addSifterRecipe(GT_Utility.copyAmount(1L, new Object[]{aStack}), new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.gemExquisite, aMaterial, tGem, 1L), GT_OreDictUnificator.get(OrePrefixes.gemFlawless, aMaterial, tGem, 1L), tGem, GT_OreDictUnificator.get(OrePrefixes.gemFlawed, aMaterial, tGem, 1L), GT_OreDictUnificator.get(OrePrefixes.gemChipped, aMaterial, tGem, 1L), GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, tGem, 1L)}, new int[]{300, 1200, 4500, 1400, 2800, 3500}, 800, 16);
+            		
+        	}else{
+        		GT_Values.RA.addSifterRecipe(GT_Utility.copyAmount(1L, new Object[]{aStack}), new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.gemExquisite, aMaterial, tGem, 1L), GT_OreDictUnificator.get(OrePrefixes.gemFlawless, aMaterial, tGem, 1L), tGem, GT_OreDictUnificator.get(OrePrefixes.gemFlawed, aMaterial, tGem, 1L), GT_OreDictUnificator.get(OrePrefixes.gemChipped, aMaterial, tGem, 1L), GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, tGem, 1L)}, new int[]{100, 400, 1500, 2000, 4000, 5000}, 800, 16);
+        	}
+       }
 }
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingWire04.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingWire04.java
index 33afe9c1b7..70ebf0b31e 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingWire04.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingWire04.java
@@ -36,4 +36,4 @@ public class ProcessingWire04 implements gregtech.api.interfaces.IOreRecipeRegis
                     Api.INSTANCE.registries().p2pTunnel().addNewAttunement(GT_OreDictUnificator.get(OrePrefixes.cableGt04, aMaterial, 1L), TunnelType.IC2_POWER);
                 }
             }
-        }
\ No newline at end of file
+        }
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingWire08.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingWire08.java
index 9a93426a53..d798558b6d 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingWire08.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingWire08.java
@@ -36,4 +36,4 @@ public class ProcessingWire08 implements gregtech.api.interfaces.IOreRecipeRegis
             Api.INSTANCE.registries().p2pTunnel().addNewAttunement(GT_OreDictUnificator.get(OrePrefixes.cableGt08, aMaterial, 1L), TunnelType.IC2_POWER);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingWire12.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingWire12.java
index 5b55b24275..9074e085cc 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingWire12.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingWire12.java
@@ -10,6 +10,8 @@ import gregtech.api.enums.OrePrefixes;
 import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_OreDictUnificator;
 import gregtech.api.util.GT_Utility;
+import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
 
 public class ProcessingWire12 implements gregtech.api.interfaces.IOreRecipeRegistrator {
@@ -34,4 +36,4 @@ public class ProcessingWire12 implements gregtech.api.interfaces.IOreRecipeRegis
             Api.INSTANCE.registries().p2pTunnel().addNewAttunement(GT_OreDictUnificator.get(OrePrefixes.cableGt12, aMaterial, 1L), TunnelType.IC2_POWER);
         }
     }
-}
\ No newline at end of file
+}