aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gtPlusPlus/xmod/gregtech/loaders
diff options
context:
space:
mode:
authorJason Mitchell <mitchej@gmail.com>2023-01-28 19:32:44 -0800
committerJason Mitchell <mitchej@gmail.com>2023-01-28 19:32:44 -0800
commit55f64675b42ac8d3c557cc850f78664bee006f6f (patch)
tree2afd26dd3d5e6f763119bc192b57c66a1a075922 /src/main/java/gtPlusPlus/xmod/gregtech/loaders
parent0f5dfd01b877b6a1019e0671b88d07974aae68c0 (diff)
downloadGT5-Unofficial-55f64675b42ac8d3c557cc850f78664bee006f6f.tar.gz
GT5-Unofficial-55f64675b42ac8d3c557cc850f78664bee006f6f.tar.bz2
GT5-Unofficial-55f64675b42ac8d3c557cc850f78664bee006f6f.zip
[ci skip] spotlessApply with the new settings
Diffstat (limited to 'src/main/java/gtPlusPlus/xmod/gregtech/loaders')
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/loaders/GT_Material_Loader.java137
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingAngleGrinder.java73
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingElectricButcherKnife.java63
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingElectricLighter.java53
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingElectricSnips.java53
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingToolHeadChoocher.java54
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_AlloySmelter.java5
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Assembler.java47
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java165
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelterGT_Ex.java76
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelterGT_GTNH.java53
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java110
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Extruder.java27
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_FluidCanning.java94
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluids.java297
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluorite.java93
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_MaterialProcessing.java129
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_MetalRecipe.java54
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_MultisUsingFluidInsteadOfCells.java17
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Ore.java270
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Plasma.java12
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Plates.java133
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Recycling.java131
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_ShapedCrafting.java148
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/loaders/misc/AddCustomMachineToPA.java5
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/loaders/misc/AssLineAchievements.java32
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_AlgaeFarm.java23
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_ChemicalSkips.java538
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_GTNH.java9
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_GlueLine.java168
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_LFTR.java88
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_MolecularTransformer.java5
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_Nuclear.java249
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_NuclearFuelProcessing.java229
34 files changed, 1711 insertions, 1929 deletions
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/GT_Material_Loader.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/GT_Material_Loader.java
index 894d45ee39..980efc1bdb 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/GT_Material_Loader.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/GT_Material_Loader.java
@@ -1,5 +1,9 @@
package gtPlusPlus.xmod.gregtech.loaders;
+import java.lang.reflect.*;
+import java.util.HashMap;
+import java.util.Map;
+
import gregtech.api.enums.Materials;
import gregtech.api.enums.OrePrefixes;
import gtPlusPlus.api.objects.Logger;
@@ -8,9 +12,6 @@ import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.util.Utils;
import gtPlusPlus.core.util.minecraft.MaterialUtils;
import gtPlusPlus.core.util.reflect.ReflectionUtils;
-import java.lang.reflect.*;
-import java.util.HashMap;
-import java.util.Map;
public class GT_Material_Loader {
@@ -43,14 +44,16 @@ public class GT_Material_Loader {
// Make this class Dynamically implement IMaterialHandler
if (mProxyObject == null) {
mProxyObject = Proxy.newProxyInstance(
- mInterface.getClassLoader(), new Class[] {mInterface}, new MaterialHandler(getInstance()));
+ mInterface.getClassLoader(),
+ new Class[] { mInterface },
+ new MaterialHandler(getInstance()));
}
if (ReflectionUtils.invoke(
Materials.class,
"add",
- new Class[] {ReflectionUtils.getClass("gregtech.api.interfaces.IMaterialHandler")},
- new Object[] {mProxyObject})) {
+ new Class[] { ReflectionUtils.getClass("gregtech.api.interfaces.IMaterialHandler") },
+ new Object[] { mProxyObject })) {
Logger.REFLECTION("Successfully invoked add, on the proxied object implementing IMaterialHandler.");
Logger.REFLECTION("Examining Proxy to ensure it implements the correct Interface.");
@@ -134,17 +137,22 @@ public class GT_Material_Loader {
enableComponent.invoke(prefix, mMaterial);
Logger.DEBUG_MATERIALS("Enabled " + prefix.name() + " for " + mMaterial.mDefaultLocalName + ".");
return true;
- } catch (IllegalAccessException
- | IllegalArgumentException
- | InvocationTargetException
- | NoSuchMethodException
+ } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException | NoSuchMethodException
| SecurityException error) {
- Logger.DEBUG_MATERIALS("Failed to enabled " + prefix.name() + " for " + mMaterial.mDefaultLocalName
- + ". Caught " + error.getCause().toString() + ".");
+ Logger.DEBUG_MATERIALS(
+ "Failed to enabled " + prefix.name()
+ + " for "
+ + mMaterial.mDefaultLocalName
+ + ". Caught "
+ + error.getCause().toString()
+ + ".");
error.printStackTrace();
}
- Logger.DEBUG_MATERIALS("Did not enable " + prefix.name() + " for " + mMaterial.mDefaultLocalName
- + ". Report this error to Alkalus on Github.");
+ Logger.DEBUG_MATERIALS(
+ "Did not enable " + prefix.name()
+ + " for "
+ + mMaterial.mDefaultLocalName
+ + ". Report this error to Alkalus on Github.");
return false;
}
@@ -169,8 +177,9 @@ public class GT_Material_Loader {
}
return mValid > 0;
} catch (SecurityException | IllegalArgumentException e) {
- Logger.DEBUG_MATERIALS("Total Failure - Unable to re-enable " + MaterialUtils.getMaterialName(material)
- + ". Most likely an IllegalArgumentException, but small chance it's a SecurityException.");
+ Logger.DEBUG_MATERIALS(
+ "Total Failure - Unable to re-enable " + MaterialUtils.getMaterialName(material)
+ + ". Most likely an IllegalArgumentException, but small chance it's a SecurityException.");
return false;
}
}
@@ -203,77 +212,29 @@ public class GT_Material_Loader {
}
/*
- public static class ProxyListener implements java.lang.reflect.InvocationHandler {
-
- public static Object IMaterialHandlerProxy;
-
- ProxyListener(){
-
- Logger.REFLECTION("Failed setting IMaterialHandler Proxy instance.");
- }
-
- //Loading the class at runtime
- public static void main(String[] args) throws IllegalAccessException, IllegalArgumentException, InvocationTargetException, NoSuchMethodException, SecurityException, ClassNotFoundException {
- Class<?> someInterface = ReflectionUtils.getClass("gregtech.api.interfaces.IMaterialHandler");
- Object instance = Proxy.newProxyInstance(someInterface.getClassLoader(), new Class<?>[]{someInterface}, new InvocationHandler() {
-
- @Override
- public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
- //Handle the invocations
- if(method.getName().equals("onMaterialsInit")){
- Logger.REFLECTION("Invoked onMaterialsInit() via IMaterialHandler proxy");
- return 1;
- }
- else if(method.getName().equals("onComponentInit")){
- Logger.REFLECTION("Invoked onComponentInit() via IMaterialHandler proxy");
- return 2;
- }
- else if(method.getName().equals("onComponentIteration")){
- Logger.REFLECTION("Invoked onComponentIteration() via IMaterialHandler proxy");
- return 3;
- }
- else {
- return -1;
- }
- }
- });
- System.out.println(instance.getClass().getDeclaredMethod("someMethod", (Class<?>[])null).invoke(instance, new Object[]{}));
- }
-
- private static class MaterialHandler implements InvocationHandler {
- private final Object original;
-
- public MaterialHandler(Object original) {
- this.original = original;
- }
-
- @Override
- public Object invoke(Object proxy, Method method, Object[] args)
- throws IllegalAccessException, IllegalArgumentException,
- InvocationTargetException {
- System.out.println("BEFORE");
- method.invoke(original, args);
- System.out.println("AFTER");
- return null;
- }
- }
-
- public static void init(){
-
- Class<?> someInterface = ReflectionUtils.getClass("gregtech.api.interfaces.IMaterialHandler");
- GT_Material_Loader original = GT_Material_Loader.instance;
- MaterialHandler handler = new MaterialHandler(original);
-
- Object f = Proxy.newProxyInstance(someInterface.getClassLoader(),
- new Class[] { someInterface },
- handler);
-
- f.originalMethod("Hallo");
- }
-
-
-
- }
-
+ * public static class ProxyListener implements java.lang.reflect.InvocationHandler { public static Object
+ * IMaterialHandlerProxy; ProxyListener(){ Logger.REFLECTION("Failed setting IMaterialHandler Proxy instance."); }
+ * //Loading the class at runtime public static void main(String[] args) throws IllegalAccessException,
+ * IllegalArgumentException, InvocationTargetException, NoSuchMethodException, SecurityException,
+ * ClassNotFoundException { Class<?> someInterface =
+ * ReflectionUtils.getClass("gregtech.api.interfaces.IMaterialHandler"); Object instance =
+ * Proxy.newProxyInstance(someInterface.getClassLoader(), new Class<?>[]{someInterface}, new InvocationHandler() {
+ * @Override public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { //Handle the
+ * invocations if(method.getName().equals("onMaterialsInit")){
+ * Logger.REFLECTION("Invoked onMaterialsInit() via IMaterialHandler proxy"); return 1; } else
+ * if(method.getName().equals("onComponentInit")){
+ * Logger.REFLECTION("Invoked onComponentInit() via IMaterialHandler proxy"); return 2; } else
+ * if(method.getName().equals("onComponentIteration")){
+ * Logger.REFLECTION("Invoked onComponentIteration() via IMaterialHandler proxy"); return 3; } else { return -1; } }
+ * }); System.out.println(instance.getClass().getDeclaredMethod("someMethod", (Class<?>[])null).invoke(instance, new
+ * Object[]{})); } private static class MaterialHandler implements InvocationHandler { private final Object
+ * original; public MaterialHandler(Object original) { this.original = original; }
+ * @Override public Object invoke(Object proxy, Method method, Object[] args) throws IllegalAccessException,
+ * IllegalArgumentException, InvocationTargetException { System.out.println("BEFORE"); method.invoke(original,
+ * args); System.out.println("AFTER"); return null; } } public static void init(){ Class<?> someInterface =
+ * ReflectionUtils.getClass("gregtech.api.interfaces.IMaterialHandler"); GT_Material_Loader original =
+ * GT_Material_Loader.instance; MaterialHandler handler = new MaterialHandler(original); Object f =
+ * Proxy.newProxyInstance(someInterface.getClassLoader(), new Class[] { someInterface }, handler);
+ * f.originalMethod("Hallo"); } }
*/
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingAngleGrinder.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingAngleGrinder.java
index f43a255534..247cdb890b 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingAngleGrinder.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingAngleGrinder.java
@@ -1,5 +1,7 @@
package gtPlusPlus.xmod.gregtech.loaders;
+import net.minecraft.item.ItemStack;
+
import gregtech.api.enums.GT_Values;
import gregtech.api.enums.ItemList;
import gregtech.api.enums.Materials;
@@ -16,36 +18,27 @@ import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes;
import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
import gtPlusPlus.xmod.gregtech.api.interfaces.internal.Interface_OreRecipeRegistrator;
import gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedGregtechTools;
-import net.minecraft.item.ItemStack;
public class ProcessingAngleGrinder implements Interface_OreRecipeRegistrator, Runnable {
+
public ProcessingAngleGrinder() {
GregtechOrePrefixes.toolAngleGrinder.add(this);
}
@Override
- public void registerOre(
- final GregtechOrePrefixes aPrefix,
- final Materials aMaterial,
- final String aOreDictName,
- final String aModName,
- final ItemStack aStack) {
+ public void registerOre(final GregtechOrePrefixes aPrefix, final Materials aMaterial, final String aOreDictName,
+ final String aModName, final ItemStack aStack) {
if ((aMaterial != Materials.Stone) && (aMaterial != Materials.Flint)) {
if (aMaterial != Materials.Rubber) {
- if ((!aMaterial.contains(SubTag.WOOD))
- && (!aMaterial.contains(SubTag.BOUNCY))
+ if ((!aMaterial.contains(SubTag.WOOD)) && (!aMaterial.contains(SubTag.BOUNCY))
&& (!aMaterial.contains(SubTag.NO_SMASHING))) {}
}
}
}
@Override
- public void registerOre(
- final GregtechOrePrefixes aPrefix,
- final GT_Materials aMaterial,
- final String aOreDictName,
- final String aModName,
- final ItemStack aStack) {
+ public void registerOre(final GregtechOrePrefixes aPrefix, final GT_Materials aMaterial, final String aOreDictName,
+ final String aModName, final ItemStack aStack) {
// TODO Auto-generated method stub
}
@@ -58,12 +51,10 @@ public class ProcessingAngleGrinder implements Interface_OreRecipeRegistrator, R
Materials aMaterial = null;
for (int r = 0; r < size; r++) {
aMaterial = i[r];
- if ((aMaterial != Materials.Stone)
- && (aMaterial != Materials.Flint)
+ if ((aMaterial != Materials.Stone) && (aMaterial != Materials.Flint)
&& (aMaterial != Materials.Rubber)
&& (aMaterial != Materials._NULL)) {
- if ((!aMaterial.contains(SubTag.WOOD))
- && (!aMaterial.contains(SubTag.BOUNCY))
+ if ((!aMaterial.contains(SubTag.WOOD)) && (!aMaterial.contains(SubTag.BOUNCY))
&& (!aMaterial.contains(SubTag.NO_SMASHING))
&& (!aMaterial.contains(SubTag.TRANSPARENT))
&& (!aMaterial.contains(SubTag.FLAMMABLE))
@@ -83,8 +74,11 @@ public class ProcessingAngleGrinder implements Interface_OreRecipeRegistrator, R
} else {
Logger.MATERIALS(
"Unable to generate Angle Grinder from " + MaterialUtils.getMaterialName(aMaterial)
- + ", Plate or Long Rod may be invalid. Invalid | Plate? " + (plate == null)
- + " | Rod? " + (longrod == null) + " |");
+ + ", Plate or Long Rod may be invalid. Invalid | Plate? "
+ + (plate == null)
+ + " | Rod? "
+ + (longrod == null)
+ + " |");
}
// GT_ModHandler.addCraftingRecipe(,
// GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS |
@@ -113,38 +107,27 @@ public class ProcessingAngleGrinder implements Interface_OreRecipeRegistrator, R
public boolean addRecipe(Materials aMaterial, long aBatteryStorage, int aVoltageTier, ItemStack aBattery) {
ItemStack aOutputStack = MetaGeneratedGregtechTools.INSTANCE.getToolWithStats(
- MetaGeneratedGregtechTools.ANGLE_GRINDER, 1, aMaterial, Materials.Titanium, new long[] {
- aBatteryStorage, GT_Values.V[aVoltageTier], 3L, -1L
- });
+ MetaGeneratedGregtechTools.ANGLE_GRINDER,
+ 1,
+ aMaterial,
+ Materials.Titanium,
+ new long[] { aBatteryStorage, GT_Values.V[aVoltageTier], 3L, -1L });
long aDura = MetaGeneratedGregtechTools.getToolMaxDamage(aOutputStack);
if (aDura <= 32000) {
- Logger.MATERIALS("Unable to generate Angle Grinder from " + MaterialUtils.getMaterialName(aMaterial)
- + ", Durability: " + aDura);
+ Logger.MATERIALS(
+ "Unable to generate Angle Grinder from " + MaterialUtils.getMaterialName(aMaterial)
+ + ", Durability: "
+ + aDura);
return false;
}
return GT_ModHandler.addCraftingRecipe(
aOutputStack,
RecipeBits.DISMANTLEABLE | RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | RecipeBits.BUFFERED,
- new Object[] {
- "SXL",
- "GMG",
- "PBP",
- 'X',
- ItemList.Component_Grinder_Tungsten.get(1),
- 'M',
- CI.getElectricMotor(aVoltageTier, 1),
- 'S',
- OrePrefixes.screw.get(Materials.Titanium),
- 'L',
- OrePrefixes.stickLong.get(aMaterial),
- 'P',
- OrePrefixes.plate.get(aMaterial),
- 'G',
- ELEMENT.STANDALONE.BLACK_METAL.getGear(1),
- 'B',
- aBattery
- });
+ new Object[] { "SXL", "GMG", "PBP", 'X', ItemList.Component_Grinder_Tungsten.get(1), 'M',
+ CI.getElectricMotor(aVoltageTier, 1), 'S', OrePrefixes.screw.get(Materials.Titanium), 'L',
+ OrePrefixes.stickLong.get(aMaterial), 'P', OrePrefixes.plate.get(aMaterial), 'G',
+ ELEMENT.STANDALONE.BLACK_METAL.getGear(1), 'B', aBattery });
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingElectricButcherKnife.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingElectricButcherKnife.java
index 43c9d31727..f1493f2e63 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingElectricButcherKnife.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingElectricButcherKnife.java
@@ -1,5 +1,7 @@
package gtPlusPlus.xmod.gregtech.loaders;
+import net.minecraft.item.ItemStack;
+
import gregtech.api.enums.GT_Values;
import gregtech.api.enums.ItemList;
import gregtech.api.enums.Materials;
@@ -15,36 +17,27 @@ import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes;
import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
import gtPlusPlus.xmod.gregtech.api.interfaces.internal.Interface_OreRecipeRegistrator;
import gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedGregtechTools;
-import net.minecraft.item.ItemStack;
public class ProcessingElectricButcherKnife implements Interface_OreRecipeRegistrator, Runnable {
+
public ProcessingElectricButcherKnife() {
GregtechOrePrefixes.toolElectricButcherKnife.add(this);
}
@Override
- public void registerOre(
- final GregtechOrePrefixes aPrefix,
- final Materials aMaterial,
- final String aOreDictName,
- final String aModName,
- final ItemStack aStack) {
+ public void registerOre(final GregtechOrePrefixes aPrefix, final Materials aMaterial, final String aOreDictName,
+ final String aModName, final ItemStack aStack) {
if ((aMaterial != Materials.Stone) && (aMaterial != Materials.Flint)) {
if (aMaterial != Materials.Rubber) {
- if ((!aMaterial.contains(SubTag.WOOD))
- && (!aMaterial.contains(SubTag.BOUNCY))
+ if ((!aMaterial.contains(SubTag.WOOD)) && (!aMaterial.contains(SubTag.BOUNCY))
&& (!aMaterial.contains(SubTag.NO_SMASHING))) {}
}
}
}
@Override
- public void registerOre(
- final GregtechOrePrefixes aPrefix,
- final GT_Materials aMaterial,
- final String aOreDictName,
- final String aModName,
- final ItemStack aStack) {
+ public void registerOre(final GregtechOrePrefixes aPrefix, final GT_Materials aMaterial, final String aOreDictName,
+ final String aModName, final ItemStack aStack) {
// TODO Auto-generated method stub
}
@@ -57,12 +50,10 @@ public class ProcessingElectricButcherKnife implements Interface_OreRecipeRegist
Materials aMaterial = null;
for (int r = 0; r < size; r++) {
aMaterial = i[r];
- if ((aMaterial != Materials.Stone)
- && (aMaterial != Materials.Flint)
+ if ((aMaterial != Materials.Stone) && (aMaterial != Materials.Flint)
&& (aMaterial != Materials.Rubber)
&& (aMaterial != Materials._NULL)) {
- if ((!aMaterial.contains(SubTag.WOOD))
- && (!aMaterial.contains(SubTag.BOUNCY))
+ if ((!aMaterial.contains(SubTag.WOOD)) && (!aMaterial.contains(SubTag.BOUNCY))
&& (!aMaterial.contains(SubTag.NO_SMASHING))
&& (!aMaterial.contains(SubTag.TRANSPARENT))
&& (!aMaterial.contains(SubTag.FLAMMABLE))
@@ -81,10 +72,13 @@ public class ProcessingElectricButcherKnife implements Interface_OreRecipeRegist
addRecipe(aMaterial, 800000L, 3, ItemList.Battery_RE_HV_Sodium.get(1));
used++;
} else {
- Logger.MATERIALS("Unable to generate Electric Butcher Knife from "
- + MaterialUtils.getMaterialName(aMaterial)
- + ", Plate or Long Rod may be invalid. Invalid | Plate? " + (plate == null) + " | Rod? "
- + " |");
+ Logger.MATERIALS(
+ "Unable to generate Electric Butcher Knife from "
+ + MaterialUtils.getMaterialName(aMaterial)
+ + ", Plate or Long Rod may be invalid. Invalid | Plate? "
+ + (plate == null)
+ + " | Rod? "
+ + " |");
}
// GT_ModHandler.addCraftingRecipe(,
// GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS |
@@ -93,8 +87,9 @@ public class ProcessingElectricButcherKnife implements Interface_OreRecipeRegist
// Character.valueOf('P'), OrePrefixes.plate.get(aMaterial),
// Character.valueOf('H'), OrePrefixes.toolHeadHammer.get(aMaterial)});
} else {
- Logger.MATERIALS("Unable to generate Electric Butcher Knife from "
- + MaterialUtils.getMaterialName(aMaterial));
+ Logger.MATERIALS(
+ "Unable to generate Electric Butcher Knife from "
+ + MaterialUtils.getMaterialName(aMaterial));
}
} else {
Logger.MATERIALS(
@@ -114,17 +109,21 @@ public class ProcessingElectricButcherKnife implements Interface_OreRecipeRegist
public boolean addRecipe(Materials aMaterial, long aBatteryStorage, int aVoltageTier, ItemStack aBattery) {
ItemStack aOutputStack = MetaGeneratedGregtechTools.INSTANCE.getToolWithStats(
- MetaGeneratedGregtechTools.ELECTRIC_BUTCHER_KNIFE, 1, aMaterial, Materials.Titanium, new long[] {
- aBatteryStorage, GT_Values.V[aVoltageTier], 3L, -1L
- });
+ MetaGeneratedGregtechTools.ELECTRIC_BUTCHER_KNIFE,
+ 1,
+ aMaterial,
+ Materials.Titanium,
+ new long[] { aBatteryStorage, GT_Values.V[aVoltageTier], 3L, -1L });
- ItemStack aInputCutter = GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(
- GT_MetaGenerated_Tool_01.BUTCHERYKNIFE, 1, aMaterial, aMaterial, null);
+ ItemStack aInputCutter = GT_MetaGenerated_Tool_01.INSTANCE
+ .getToolWithStats(GT_MetaGenerated_Tool_01.BUTCHERYKNIFE, 1, aMaterial, aMaterial, null);
long aDura = MetaGeneratedGregtechTools.getToolMaxDamage(aOutputStack);
if (aDura <= 32000) {
- Logger.MATERIALS("Unable to generate Electric Butcher Knife from "
- + MaterialUtils.getMaterialName(aMaterial) + ", Durability: " + aDura);
+ Logger.MATERIALS(
+ "Unable to generate Electric Butcher Knife from " + MaterialUtils.getMaterialName(aMaterial)
+ + ", Durability: "
+ + aDura);
return false;
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingElectricLighter.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingElectricLighter.java
index 5d6e87b204..ee1cbc2744 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingElectricLighter.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingElectricLighter.java
@@ -1,5 +1,7 @@
package gtPlusPlus.xmod.gregtech.loaders;
+import net.minecraft.item.ItemStack;
+
import gregtech.api.enums.GT_Values;
import gregtech.api.enums.ItemList;
import gregtech.api.enums.Materials;
@@ -16,36 +18,27 @@ import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes;
import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
import gtPlusPlus.xmod.gregtech.api.interfaces.internal.Interface_OreRecipeRegistrator;
import gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedGregtechTools;
-import net.minecraft.item.ItemStack;
public class ProcessingElectricLighter implements Interface_OreRecipeRegistrator, Runnable {
+
public ProcessingElectricLighter() {
GregtechOrePrefixes.toolElectricLighter.add(this);
}
@Override
- public void registerOre(
- final GregtechOrePrefixes aPrefix,
- final Materials aMaterial,
- final String aOreDictName,
- final String aModName,
- final ItemStack aStack) {
+ public void registerOre(final GregtechOrePrefixes aPrefix, final Materials aMaterial, final String aOreDictName,
+ final String aModName, final ItemStack aStack) {
if ((aMaterial != Materials.Stone) && (aMaterial != Materials.Flint)) {
if (aMaterial != Materials.Rubber) {
- if ((!aMaterial.contains(SubTag.WOOD))
- && (!aMaterial.contains(SubTag.BOUNCY))
+ if ((!aMaterial.contains(SubTag.WOOD)) && (!aMaterial.contains(SubTag.BOUNCY))
&& (!aMaterial.contains(SubTag.NO_SMASHING))) {}
}
}
}
@Override
- public void registerOre(
- final GregtechOrePrefixes aPrefix,
- final GT_Materials aMaterial,
- final String aOreDictName,
- final String aModName,
- final ItemStack aStack) {
+ public void registerOre(final GregtechOrePrefixes aPrefix, final GT_Materials aMaterial, final String aOreDictName,
+ final String aModName, final ItemStack aStack) {
// TODO Auto-generated method stub
}
@@ -58,12 +51,10 @@ public class ProcessingElectricLighter implements Interface_OreRecipeRegistrator
Materials aMaterial = null;
for (int r = 0; r < size; r++) {
aMaterial = i[r];
- if ((aMaterial != Materials.Stone)
- && (aMaterial != Material