aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/goodgenerator/util
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/goodgenerator/util')
-rw-r--r--src/main/java/goodgenerator/util/CharExchanger.java40
-rw-r--r--src/main/java/goodgenerator/util/CrackRecipeAdder.java417
-rw-r--r--src/main/java/goodgenerator/util/DescTextLocalization.java9
-rw-r--r--src/main/java/goodgenerator/util/ItemRefer.java5
-rw-r--r--src/main/java/goodgenerator/util/Log.java1
-rw-r--r--src/main/java/goodgenerator/util/MaterialFix.java158
-rw-r--r--src/main/java/goodgenerator/util/MyRecipeAdder.java425
-rw-r--r--src/main/java/goodgenerator/util/StackUtils.java21
-rw-r--r--src/main/java/goodgenerator/util/StructureHelper.java48
9 files changed, 523 insertions, 601 deletions
diff --git a/src/main/java/goodgenerator/util/CharExchanger.java b/src/main/java/goodgenerator/util/CharExchanger.java
index 2677e3fa69..f080678d66 100644
--- a/src/main/java/goodgenerator/util/CharExchanger.java
+++ b/src/main/java/goodgenerator/util/CharExchanger.java
@@ -4,19 +4,17 @@ import net.minecraft.util.EnumChatFormatting;
public class CharExchanger {
- public static final String[] tierName = new String[] {
- EnumChatFormatting.RED + "ULV" + EnumChatFormatting.RESET,
- EnumChatFormatting.GRAY + "LV" + EnumChatFormatting.RESET,
- EnumChatFormatting.AQUA + "MV" + EnumChatFormatting.RESET,
- EnumChatFormatting.GOLD + "HV" + EnumChatFormatting.RESET,
- EnumChatFormatting.DARK_PURPLE + "EV" + EnumChatFormatting.RESET,
- EnumChatFormatting.DARK_BLUE + "IV" + EnumChatFormatting.RESET,
- EnumChatFormatting.LIGHT_PURPLE + "LuV" + EnumChatFormatting.RESET,
- EnumChatFormatting.WHITE + "ZPM" + EnumChatFormatting.RESET,
- EnumChatFormatting.DARK_AQUA + "UV" + EnumChatFormatting.RESET,
- EnumChatFormatting.DARK_RED + "UHV" + EnumChatFormatting.RESET,
- EnumChatFormatting.GREEN + "UEV" + EnumChatFormatting.RESET,
- };
+ public static final String[] tierName = new String[] { EnumChatFormatting.RED + "ULV" + EnumChatFormatting.RESET,
+ EnumChatFormatting.GRAY + "LV" + EnumChatFormatting.RESET,
+ EnumChatFormatting.AQUA + "MV" + EnumChatFormatting.RESET,
+ EnumChatFormatting.GOLD + "HV" + EnumChatFormatting.RESET,
+ EnumChatFormatting.DARK_PURPLE + "EV" + EnumChatFormatting.RESET,
+ EnumChatFormatting.DARK_BLUE + "IV" + EnumChatFormatting.RESET,
+ EnumChatFormatting.LIGHT_PURPLE + "LuV" + EnumChatFormatting.RESET,
+ EnumChatFormatting.WHITE + "ZPM" + EnumChatFormatting.RESET,
+ EnumChatFormatting.DARK_AQUA + "UV" + EnumChatFormatting.RESET,
+ EnumChatFormatting.DARK_RED + "UHV" + EnumChatFormatting.RESET,
+ EnumChatFormatting.GREEN + "UEV" + EnumChatFormatting.RESET, };
public static char shifter(int unicode) {
return (char) unicode;
@@ -51,13 +49,13 @@ public class CharExchanger {
}
/**
- * ">" : 1 <BR>
- * "<" : 2 <BR>
- * "==" : 13 <BR>
- * "!=" : 14 <BR>
- * ">=" : 11 <BR>
- * "<=" : 12 <BR>
- * INVALID : -1
+ * ">" : 1 <BR>
+ * "<" : 2 <BR>
+ * "==" : 13 <BR>
+ * "!=" : 14 <BR>
+ * ">=" : 11 <BR>
+ * "<=" : 12 <BR>
+ * INVALID : -1
*/
public static int getOperator(String exp) {
char c1, c2;
@@ -91,7 +89,7 @@ public class CharExchanger {
public static boolean compareExpression(String exp, int num) {
int op = getOperator(exp);
String NumExp = exp;
- String[] opChar = new String[] {">", "<", "=", "!"};
+ String[] opChar = new String[] { ">", "<", "=", "!" };
if (op == -1) throw new IllegalArgumentException();
for (String re : opChar) NumExp = NumExp.replace(re, "");
long num2 = 0;
diff --git a/src/main/java/goodgenerator/util/CrackRecipeAdder.java b/src/main/java/goodgenerator/util/CrackRecipeAdder.java
index 5af5773a7e..bf2779b64d 100644
--- a/src/main/java/goodgenerator/util/CrackRecipeAdder.java
+++ b/src/main/java/goodgenerator/util/CrackRecipeAdder.java
@@ -1,6 +1,12 @@
package goodgenerator.util;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.Fluid;
+import net.minecraftforge.fluids.FluidRegistry;
+import net.minecraftforge.fluids.FluidStack;
+
import com.github.bartimaeusnek.bartworks.system.material.Werkstoff;
+
import gregtech.api.enums.GT_Values;
import gregtech.api.enums.ItemList;
import gregtech.api.enums.Materials;
@@ -9,24 +15,15 @@ import gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Cable;
import gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Fluid;
import gregtech.api.util.GT_OreDictUnificator;
import gregtech.api.util.GT_Utility;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.Fluid;
-import net.minecraftforge.fluids.FluidRegistry;
-import net.minecraftforge.fluids.FluidStack;
public class CrackRecipeAdder {
- static float[] coe1 = {1.25f, 1.2f, 1.1f, 0.9f, 0.85f, 0.8f, 0.75f};
- static float[] coe2 = {1.4f, 1.25f, 1.2f, 0.8f, 0.75f, 0.7f, 0.65f};
- static float[] coe3 = {1.6f, 1.5f, 1.45f, 0.7f, 0.6f, 0.55f, 0.45f};
- public static void crackerAdder(
- FluidStack inputFluid,
- FluidStack cracker,
- FluidStack[] outputFluids,
- ItemStack outputItem,
- int num,
- int EUt,
- int Duration) {
+ static float[] coe1 = { 1.25f, 1.2f, 1.1f, 0.9f, 0.85f, 0.8f, 0.75f };
+ static float[] coe2 = { 1.4f, 1.25f, 1.2f, 0.8f, 0.75f, 0.7f, 0.65f };
+ static float[] coe3 = { 1.6f, 1.5f, 1.45f, 0.7f, 0.6f, 0.55f, 0.45f };
+
+ public static void crackerAdder(FluidStack inputFluid, FluidStack cracker, FluidStack[] outputFluids,
+ ItemStack outputItem, int num, int EUt, int Duration) {
String name;
FluidStack[] actOutput = new FluidStack[num];
@@ -40,7 +37,12 @@ public class CrackRecipeAdder {
(int) (Duration * 0.8),
EUt);
GT_Values.RA.addCrackingRecipe(
- 2, inputFluid, cracker, FluidRegistry.getFluidStack("moderatelycracked" + name, 1000), Duration, EUt);
+ 2,
+ inputFluid,
+ cracker,
+ FluidRegistry.getFluidStack("moderatelycracked" + name, 1000),
+ Duration,
+ EUt);
GT_Values.RA.addCrackingRecipe(
3,
inputFluid,
@@ -89,20 +91,40 @@ public class CrackRecipeAdder {
EUt / 3);
}
- public static void addUniversalCircuitAssemblerRecipe(
- ItemStack[] inputs, ItemStack output, int solders, int duration, int EUt, boolean isClean) {
+ public static void addUniversalCircuitAssemblerRecipe(ItemStack[] inputs, ItemStack output, int solders,
+ int duration, int EUt, boolean isClean) {
GT_Values.RA.addCircuitAssemblerRecipe(
- inputs, Materials.SolderingAlloy.getMolten(solders), output, duration, EUt, isClean);
+ inputs,
+ Materials.SolderingAlloy.getMolten(solders),
+ output,
+ duration,
+ EUt,
+ isClean);
GT_Values.RA.addCircuitAssemblerRecipe(
- inputs, Materials.Tin.getMolten(solders * 2), output, duration, EUt, isClean);
+ inputs,
+ Materials.Tin.getMolten(solders * 2),
+ output,
+ duration,
+ EUt,
+ isClean);
GT_Values.RA.addCircuitAssemblerRecipe(
- inputs, Materials.Lead.getMolten(solders * 4), output, duration, EUt, isClean);
+ inputs,
+ Materials.Lead.getMolten(solders * 4),
+ output,
+ duration,
+ EUt,
+ isClean);
}
- public static void addUniversalAssemblerRecipe(
- ItemStack[] inputs, ItemStack output, int solders, int duration, int EUt, boolean isClean) {
+ public static void addUniversalAssemblerRecipe(ItemStack[] inputs, ItemStack output, int solders, int duration,
+ int EUt, boolean isClean) {
GT_Values.RA.addAssemblerRecipe(
- inputs, Materials.SolderingAlloy.getMolten(solders), output, duration, EUt, isClean);
+ inputs,
+ Materials.SolderingAlloy.getMolten(solders),
+ output,
+ duration,
+ EUt,
+ isClean);
GT_Values.RA.addAssemblerRecipe(inputs, Materials.Tin.getMolten(solders * 2), output, duration, EUt, isClean);
GT_Values.RA.addAssemblerRecipe(inputs, Materials.Lead.getMolten(solders * 4), output, duration, EUt, isClean);
}
@@ -123,7 +145,15 @@ public class CrackRecipeAdder {
level);
} else {
GT_Values.RA.addBlastRecipe(
- input, GT_Utility.getIntegratedCircuit(1), null, null, output, null, duration, EUt, level);
+ input,
+ GT_Utility.getIntegratedCircuit(1),
+ null,
+ null,
+ output,
+ null,
+ duration,
+ EUt,
+ level);
}
}
@@ -138,63 +168,58 @@ public class CrackRecipeAdder {
GT_OreDictUnificator.registerOre(
OrePrefixes.pipeTiny.get(material.getBridgeMaterial()),
new GT_MetaPipeEntity_Fluid(
- ID,
- "GT_Pipe_" + unName + "_Tiny",
- "Tiny " + Name + " Fluid Pipe",
- 0.25F,
- material.getBridgeMaterial(),
- flow / 6,
- temp,
- gas)
- .getStackForm(1L));
+ ID,
+ "GT_Pipe_" + unName + "_Tiny",
+ "Tiny " + Name + " Fluid Pipe",
+ 0.25F,
+ material.getBridgeMaterial(),
+ flow / 6,
+ temp,
+ gas).getStackForm(1L));
GT_OreDictUnificator.registerOre(
OrePrefixes.pipeSmall.get(material.getBridgeMaterial()),
new GT_MetaPipeEntity_Fluid(
- ID + 1,
- "GT_Pipe_" + unName + "_Small",
- "Small " + Name + " Fluid Pipe",
- 0.375F,
- material.getBridgeMaterial(),
- flow / 3,
- temp,
- gas)
- .getStackForm(1L));
+ ID + 1,
+ "GT_Pipe_" + unName + "_Small",
+ "Small " + Name + " Fluid Pipe",
+ 0.375F,
+ material.getBridgeMaterial(),
+ flow / 3,
+ temp,
+ gas).getStackForm(1L));
GT_OreDictUnificator.registerOre(
OrePrefixes.pipeMedium.get(material.getBridgeMaterial()),
new GT_MetaPipeEntity_Fluid(
- ID + 2,
- "GT_Pipe_" + unName,
- Name + " Fluid Pipe",
- 0.5F,
- material.getBridgeMaterial(),
- flow,
- temp,
- gas)
- .getStackForm(1L));
+ ID + 2,
+ "GT_Pipe_" + unName,
+ Name + " Fluid Pipe",
+ 0.5F,
+ material.getBridgeMaterial(),
+ flow,
+ temp,
+ gas).getStackForm(1L));
GT_OreDictUnificator.registerOre(
OrePrefixes.pipeLarge.get(material.getBridgeMaterial()),
new GT_MetaPipeEntity_Fluid(
- ID + 3,
- "GT_Pipe_" + unName + "_Large",
- "Large " + Name + " Fluid Pipe",
- 0.75F,
- material.getBridgeMaterial(),
- flow * 2,
- temp,
- gas)
- .getStackForm(1L));
+ ID + 3,
+ "GT_Pipe_" + unName + "_Large",
+ "Large " + Name + " Fluid Pipe",
+ 0.75F,
+ material.getBridgeMaterial(),
+ flow * 2,
+ temp,
+ gas).getStackForm(1L));
GT_OreDictUnificator.registerOre(
OrePrefixes.pipeHuge.get(material.getBridgeMaterial()),
new GT_MetaPipeEntity_Fluid(
- ID + 4,
- "GT_Pipe_" + unName + "_Huge",
- "Huge " + Name + " Fluid Pipe",
- 0.875F,
- material.getBridgeMaterial(),
- flow * 4,
- temp,
- gas)
- .getStackForm(1L));
+ ID + 4,
+ "GT_Pipe_" + unName + "_Huge",
+ "Huge " + Name + " Fluid Pipe",
+ 0.875F,
+ material.getBridgeMaterial(),
+ flow * 4,
+ temp,
+ gas).getStackForm(1L));
GT_Values.RA.addExtruderRecipe(
material.get(OrePrefixes.ingot, 1),
ItemList.Shape_Extruder_Pipe_Tiny.get(0),
@@ -269,183 +294,171 @@ public class CrackRecipeAdder {
OrePrefixes.wireGt01,
material.getBridgeMaterial(),
new GT_MetaPipeEntity_Cable(
- ID + 0,
- aTextWire1 + unName + ".01",
- "1x " + Name + aTextWire2,
- 0.125F,
- material.getBridgeMaterial(),
- aLoss,
- 1L * aAmperage,
- aVoltage,
- false,
- true)
- .getStackForm(1L));
+ ID + 0,
+ aTextWire1 + unName + ".01",
+ "1x " + Name + aTextWire2,
+ 0.125F,
+ material.getBridgeMaterial(),
+ aLoss,
+ 1L * aAmperage,
+ aVoltage,
+ false,
+ true).getStackForm(1L));
GT_OreDictUnificator.registerOre(
OrePrefixes.wireGt02,
material.getBridgeMaterial(),
new GT_MetaPipeEntity_Cable(
- ID + 1,
- aTextWire1 + unName + ".02",
- "2x " + Name + aTextWire2,
- 0.25F,
- material.getBridgeMaterial(),
- aLoss,
- 2L * aAmperage,
- aVoltage,
- false,
- true)
- .getStackForm(1L));
+ ID + 1,
+ aTextWire1 + unName + ".02",
+ "2x " + Name + aTextWire2,
+ 0.25F,
+ material.getBridgeMaterial(),
+ aLoss,
+ 2L * aAmperage,
+ aVoltage,
+ false,
+ true).getStackForm(1L));
GT_OreDictUnificator.registerOre(
OrePrefixes.wireGt04,
material.getBridgeMaterial(),
new GT_MetaPipeEntity_Cable(
- ID + 2,
- aTextWire1 + unName + ".04",
- "4x " + Name + aTextWire2,
- 0.375F,
- material.getBridgeMaterial(),
- aLoss,
- 4L * aAmperage,
- aVoltage,
- false,
- true)
- .getStackForm(1L));
+ ID + 2,
+ aTextWire1 + unName + ".04",
+ "4x " + Name + aTextWire2,
+ 0.375F,
+ material.getBridgeMaterial(),
+ aLoss,
+ 4L * aAmperage,
+ aVoltage,
+ false,
+ true).getStackForm(1L));
GT_OreDictUnificator.registerOre(
OrePrefixes.wireGt08,
material.getBridgeMaterial(),
new GT_MetaPipeEntity_Cable(
- ID + 3,
- aTextWire1 + unName + ".08",
- "8x " + Name + aTextWire2,
- 0.5F,
- material.getBridgeMaterial(),
- aLoss,
- 8L * aAmperage,
- aVoltage,
- false,
- true)
- .getStackForm(1L));
+ ID + 3,
+ aTextWire1 + unName + ".08",
+ "8x " + Name + aTextWire2,
+ 0.5F,
+ material.getBridgeMaterial(),
+ aLoss,
+ 8L * aAmperage,
+ aVoltage,
+ false,
+ true).getStackForm(1L));
GT_OreDictUnificator.registerOre(
OrePrefixes.wireGt12,
material.getBridgeMaterial(),
new GT_MetaPipeEntity_Cable(
- ID + 4,
- aTextWire1 + unName + ".12",
- "12x " + Name + aTextWire2,
- 0.625F,
- material.getBridgeMaterial(),
- aLoss,
- 12L * aAmperage,
- aVoltage,
- false,
- true)
- .getStackForm(1L));
+ ID + 4,
+ aTextWire1 + unName + ".12",
+ "12x " + Name + aTextWire2,
+ 0.625F,
+ material.getBridgeMaterial(),
+ aLoss,
+ 12L * aAmperage,
+ aVoltage,
+ false,
+ true).getStackForm(1L));
GT_OreDictUnificator.registerOre(
OrePrefixes.wireGt16,
material.getBridgeMaterial(),
new GT_MetaPipeEntity_Cable(
- ID + 5,
- aTextWire1 + unName + ".16",
- "16x " + Name + aTextWire2,
- 0.75F,
- material.getBridgeMaterial(),
- aLoss,
- 16L * aAmperage,
- aVoltage,
- false,
- true)
- .getStackForm(1L));
+ ID + 5,
+ aTextWire1 + unName + ".16",
+ "16x " + Name + aTextWire2,
+ 0.75F,
+ material.getBridgeMaterial(),
+ aLoss,
+ 16L * aAmperage,
+ aVoltage,
+ false,
+ true).getStackForm(1L));
if (cover) {
GT_OreDictUnificator.registerOre(
OrePrefixes.cableGt01,
material.getBridgeMaterial(),
new GT_MetaPipeEntity_Cable(
- ID + 6,
- aTextCable1 + unName + ".01",
- "1x " + Name + aTextCable2,
- 0.25F,
- material.getBridgeMaterial(),
- aLossInsulated,
- 1L * aAmperage,
- aVoltage,
- true,
- false)
- .getStackForm(1L));
+ ID + 6,
+ aTextCable1 + unName + ".01",
+ "1x " + Name + aTextCable2,
+ 0.25F,
+ material.getBridgeMaterial(),
+ aLossInsulated,
+ 1L * aAmperage,
+ aVoltage,
+ true,
+ false).getStackForm(1L));
GT_OreDictUnificator.registerOre(
OrePrefixes.cableGt02,
material.getBridgeMaterial(),
new GT_MetaPipeEntity_Cable(
- ID + 7,
- aTextCable1 + unName + ".02",
- "2x " + Name + aTextCable2,
- 0.375F,
- material.getBridgeMaterial(),
- aLossInsulated,
- 2L * aAmperage,
- aVoltage,
- true,
- false)
- .getStackForm(1L));
+ ID + 7,
+ aTextCable1 + unName + ".02",
+ "2x " + Name + aTextCable2,
+ 0.375F,
+ material.getBridgeMaterial(),
+ aLossInsulated,
+ 2L * aAmperage,
+ aVoltage,
+ true,
+ false).getStackForm(1L));
GT_OreDictUnificator.registerOre(
OrePrefixes.cableGt04,
material.getBridgeMaterial(),
new GT_MetaPipeEntity_Cable(
- ID + 8,
- aTextCable1 + unName + ".04",
- "4x " + Name + aTextCable2,
- 0.5F,
- material.getBridgeMaterial(),
- aLossInsulated,
- 4L * aAmperage,
- aVoltage,
- true,
- false)
- .getStackForm(1L));
+ ID + 8,
+ aTextCable1 + unName + ".04",
+ "4x " + Name + aTextCable2,
+ 0.5F,
+ material.getBridgeMaterial(),
+ aLossInsulated,
+ 4L * aAmperage,
+ aVoltage,
+ true,
+ false).getStackForm(1L));
GT_OreDictUnificator.registerOre(
OrePrefixes.cableGt08,
material.getBridgeMaterial(),
new GT_MetaPipeEntity_Cable(
- ID + 9,
- aTextCable1 + unName + ".08",
- "8x " + Name + aTextCable2,
- 0.625F,
- material.getBridgeMaterial(),
- aLossInsulated,
- 8L * aAmperage,
- aVoltage,
- true,
- false)
- .getStackForm(1L));
+ ID + 9,
+ aTextCable1 + unName + ".08",
+ "8x " + Name + aTextCable2,
+ 0.625F,
+ material.getBridgeMaterial(),
+ aLossInsulated,
+ 8L * aAmperage,
+ aVoltage,
+ true,
+ false).getStackForm(1L));
GT_OreDictUnificator.registerOre(
OrePrefixes.cableGt12,
material.getBridgeMaterial(),
new GT_MetaPipeEntity_Cable(
- ID + 10,
- aTextCable1 + unName + ".12",
- "12x " + Name + aTextCable2,
- 0.75F,
- material.getBridgeMaterial(),
- aLossInsulated,
- 12L * aAmperage,
- aVoltage,
- true,
- false)
- .getStackForm(1L));
+ ID + 10,
+ aTextCable1 + unName + ".12",
+ "12x " + Name + aTextCable2,
+ 0.75F,
+ material.getBridgeMaterial(),
+ aLossInsulated,
+ 12L * aAmperage,
+ aVoltage,
+ true,
+ false).getStackForm(1L));
GT_OreDictUnificator.registerOre(
OrePrefixes.cableGt16,
material.getBridgeMaterial(),
new GT_MetaPipeEntity_Cable(
- ID + 11,
- aTextCable1 + unName + ".16",
- "16x " + Name + aTextCable2,
- 0.875F,
- material.getBridgeMaterial(),
- aLossInsulated,
- 16L * aAmperage,
- aVoltage,
- true,
- false)
- .getStackForm(1L));
+ ID + 11,
+ aTextCable1 + unName + ".16",
+ "16x " + Name + aTextCable2,
+ 0.875F,
+ material.getBridgeMaterial(),
+ aLossInsulated,
+ 16L * aAmperage,
+ aVoltage,
+ true,
+ false).getStackForm(1L));
}
GT_Values.RA.addWiremillRecipe(
material.get(OrePrefixes.ingot, 1),
diff --git a/src/main/java/goodgenerator/util/DescTextLocalization.java b/src/main/java/goodgenerator/util/DescTextLocalization.java
index b65f529475..cb015a25c9 100644
--- a/src/main/java/goodgenerator/util/DescTextLocalization.java
+++ b/src/main/java/goodgenerator/util/DescTextLocalization.java
@@ -5,9 +5,12 @@ import net.minecraft.util.StatCollector;
public class DescTextLocalization {
- public static final String BLUE_PRINT_INFO =
- "Follow the" + EnumChatFormatting.BLUE + " Structure" + EnumChatFormatting.DARK_BLUE + "Lib"
- + EnumChatFormatting.GRAY + " hologram projector to build the main structure.";
+ public static final String BLUE_PRINT_INFO = "Follow the" + EnumChatFormatting.BLUE
+ + " Structure"
+ + EnumChatFormatting.DARK_BLUE
+ + "Lib"
+ + EnumChatFormatting.GRAY
+ + " hologram projector to build the main structure.";
public static String[] addText(String preFix, int length) {
String[] text = new String[length];
diff --git a/src/main/java/goodgenerator/util/ItemRefer.java b/src/main/java/goodgenerator/util/ItemRefer.java
index 86ac3db64d..98baad7d94 100644
--- a/src/main/java/goodgenerator/util/ItemRefer.java
+++ b/src/main/java/goodgenerator/util/ItemRefer.java
@@ -3,12 +3,13 @@ package goodgenerator.util;
import static goodgenerator.loader.FuelRodLoader.*;
import static goodgenerator.loader.Loaders.*;
-import gregtech.api.util.GT_Utility;
-import ic2.core.Ic2Items;
import net.minecraft.block.Block;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
+import gregtech.api.util.GT_Utility;
+import ic2.core.Ic2Items;
+
public final class ItemRefer {
public static ItemRefer NULL = getItemStack(_null_);
diff --git a/src/main/java/goodgenerator/util/Log.java b/src/main/java/goodgenerator/util/Log.java
index 8b88ddf5f1..4cf9e40484 100644
--- a/src/main/java/goodgenerator/util/Log.java
+++ b/src/main/java/goodgenerator/util/Log.java
@@ -4,5 +4,6 @@ import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
public class Log {
+
public static final Logger LOGGER = LogManager.getLogger("GoodGenerator");
}
diff --git a/src/main/java/goodgenerator/util/MaterialFix.java b/src/main/java/goodgenerator/util/MaterialFix.java
index 795686f676..d3a0548aca 100644
--- a/src/main/java/goodgenerator/util/MaterialFix.java
+++ b/src/main/java/goodgenerator/util/MaterialFix.java
@@ -1,6 +1,7 @@
package goodgenerator.util;
import com.github.bartimaeusnek.bartworks.system.material.Werkstoff;
+
import gregtech.api.enums.GT_Values;
import gregtech.api.enums.ItemList;
import gregtech.api.enums.Materials;
@@ -10,75 +11,72 @@ import gregtech.api.util.GT_OreDictUnificator;
import gregtech.api.util.GT_Utility;
public class MaterialFix {
+
public static void MaterialFluidExtractionFix(Werkstoff material) {
if (material.hasItemType(OrePrefixes.ingot)) {
- GT_Values.RA.addFluidExtractionRecipe(
- material.get(OrePrefixes.ingot), null, material.getMolten(144), 0, 32, 8);
+ GT_Values.RA
+ .addFluidExtractionRecipe(material.get(OrePrefixes.ingot), null, material.getMolten(144), 0, 32, 8);
GT_Values.RA.addFluidSolidifierRecipe(
- ItemList.Shape_Mold_Ingot.get(0), material.getMolten(144), material.get(OrePrefixes.ingot), 32, 48);
+ ItemList.Shape_Mold_Ingot.get(0),
+ material.getMolten(144),
+ material.get(OrePrefixes.ingot),
+ 32,
+ 48);
}
if (material.hasItemType(OrePrefixes.plate)) {
- GT_Values.RA.addFluidExtractionRecipe(
- material.get(OrePrefixes.plate), null, material.getMolten(144), 0, 32, 8);
+ GT_Values.RA
+ .addFluidExtractionRecipe(material.get(OrePrefixes.plate), null, material.getMolten(144), 0, 32, 8);
GT_Values.RA.addFluidSolidifierRecipe(
- ItemList.Shape_Mold_Plate.get(0), material.getMolten(144), material.get(OrePrefixes.plate), 32, 48);
+ ItemList.Shape_Mold_Plate.get(0),
+ material.getMolten(144),
+ material.get(OrePrefixes.plate),
+ 32,
+ 48);
}
- if (material.hasItemType(OrePrefixes.gearGtSmall))
- GT_Values.RA.addFluidExtractionRecipe(
- material.get(OrePrefixes.gearGtSmall), null, material.getMolten(144), 0, 32, 8);
- if (material.hasItemType(OrePrefixes.stickLong))
- GT_Values.RA.addFluidExtractionRecipe(
- material.get(OrePrefixes.stickLong), null, material.getMolten(144), 0, 32, 8);
- if (material.hasItemType(OrePrefixes.spring))
- GT_Values.RA.addFluidExtractionRecipe(
- material.get(OrePrefixes.spring), null, material.getMolten(144), 0, 32, 8);
- if (material.hasItemType(OrePrefixes.stick))
- GT_Values.RA.addFluidExtractionRecipe(
- material.get(OrePrefixes.stick), null, material.getMolten(72), 0, 16, 8);
- if (material.hasItemType(OrePrefixes.itemCasing))
- GT_Values.RA.addFluidExtractionRecipe(
- material.get(OrePrefixes.itemCasing), null, material.getMolten(72), 0, 16, 8);
- if (material.hasItemType(OrePrefixes.wireGt01))
- GT_Values.RA.addFluidExtractionRecipe(
- material.get(OrePrefixes.wireGt01), null, material.getMolten(72), 0, 16, 8);
- if (material.hasItemType(OrePrefixes.cableGt01))
- GT_Values.RA.addFluidExtractionRecipe(
- material.get(OrePrefixes.cableGt01),
- GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Ash, 2),
- material.getMolten(72),
- 10000,
- 16,
- 8);
- if (material.hasItemType(OrePrefixes.foil))
- GT_Values.RA.addFluidExtractionRecipe(
- material.get(OrePrefixes.foil), null, material.getMolten(36), 0, 8, 8);
- if (material.hasItemType(OrePrefixes.springSmall))
- GT_Values.RA.addFluidExtractionRecipe(
- material.get(OrePrefixes.springSmall), null, material.getMolten(36), 0, 8, 8);
- if (material.hasItemType(OrePrefixes.ring))
- GT_Values.RA.addFluidExtractionRecipe(
- material.get(OrePrefixes.ring), null, material.getMolten(36), 0, 8, 8);
- if (material.hasItemType(OrePrefixes.bolt))
- GT_Values.RA.addFluidExtractionRecipe(
- material.get(OrePrefixes.bolt), null, material.getMolten(18), 0, 4, 8);
- if (material.hasItemType(OrePrefixes.wireFine))
- GT_Values.RA.addFluidExtractionRecipe(
- material.get(OrePrefixes.wireFine), null, material.getMolten(18), 0, 4, 8);
- if (material.hasItemType(OrePrefixes.round))
- GT_Values.RA.addFluidExtractionRecipe(
- material.get(OrePrefixes.round), null, material.getMolten(16), 0, 4, 8);
- if (material.hasItemType(OrePrefixes.screw))
- GT_Values.RA.addFluidExtractionRecipe(
- material.get(OrePrefixes.screw), null, material.getMolten(16), 0, 4, 8);
- if (material.hasItemType(OrePrefixes.nugget))
- GT_Values.RA.addFluidExtractionRecipe(
- material.get(OrePrefixes.nugget), null, material.getMolten(16), 0, 4, 8);
- if (material.hasItemType(OrePrefixes.rotor))
- GT_Values.RA.addFluidExtractionRecipe(
- material.get(OrePrefixes.rotor), null, material.getMolten(612), 0, 136, 8);
- if (material.hasItemType(OrePrefixes.gearGt))
- GT_Values.RA.addFluidExtractionRecipe(
- material.get(OrePrefixes.gearGt), null, material.getMolten(576), 0, 128, 8);
+ if (material.hasItemType(OrePrefixes.gearGtSmall)) GT_Values.RA.addFluidExtractionRecipe(
+ material.get(OrePrefixes.gearGtSmall),
+ null,
+ material.getMolten(144),
+ 0,
+ 32,
+ 8);
+ if (material.hasItemType(OrePrefixes.stickLong)) GT_Values.RA
+ .addFluidExtractionRecipe(material.get(OrePrefixes.stickLong), null, material.getMolten(144), 0, 32, 8);
+ if (material.hasItemType(OrePrefixes.spring)) GT_Values.RA
+ .addFluidExtractionRecipe(material.get(OrePrefixes.spring), null, material.getMolten(144), 0, 32, 8);
+ if (material.hasItemType(OrePrefixes.stick)) GT_Values.RA
+ .addFluidExtractionRecipe(material.get(OrePrefixes.stick), null, material.getMolten(72), 0, 16, 8);
+ if (material.hasItemType(OrePrefixes.itemCasing)) GT_Values.RA
+ .addFluidExtractionRecipe(material.get(OrePrefixes.itemCasing), null, material.getMolten(72), 0, 16, 8);
+ if (material.hasItemType(OrePrefixes.wireGt01)) GT_Values.RA
+ .addFluidExtractionRecipe(material.get(OrePrefixes.wireGt01), null, material.getMolten(72), 0, 16, 8);
+ if (material.hasItemType(OrePrefixes.cableGt01)) GT_Values.RA.addFluidExtractionRecipe(
+ material.get(OrePrefixes.cableGt01),
+ GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Ash, 2),
+ material.getMolten(72),
+ 10000,
+ 16,
+ 8);
+ if (material.hasItemType(OrePrefixes.foil)) GT_Values.RA
+ .addFluidExtractionRecipe(material.get(OrePrefixes.foil), null, material.getMolten(36), 0, 8, 8);
+ if (material.hasItemType(OrePrefixes.springSmall)) GT_Values.RA
+ .addFluidExtractionRecipe(material.get(OrePrefixes.springSmall), null, material.getMolten(36), 0, 8, 8);
+ if (material.hasItemType(OrePrefixes.ring)) GT_Values.RA
+ .addFluidExtractionRecipe(material.get(OrePrefixes.ring), null, material.getMolten(36), 0, 8, 8);
+ if (material.hasItemType(OrePrefixes.bolt)) GT_Values.RA
+ .addFluidExtractionRecipe(material.get(OrePrefixes.bolt), null, material.getMolten(18), 0, 4, 8);
+ if (material.hasItemType(OrePrefixes.wireFine)) GT_Values.RA
+ .addFluidExtractionRecipe(material.get(OrePrefixes.wireFine), null, material.getMolten(18), 0, 4, 8);
+ if (material.hasItemType(OrePrefixes.round)) GT_Values.RA
+ .addFluidExtractionRecipe(material.get(OrePrefixes.round), null, material.getMolten(16), 0, 4, 8);
+ if (material.hasItemType(OrePrefixes.screw)) GT_Values.RA
+ .addFluidExtractionRecipe(material.get(OrePrefixes.screw), null, material.getMolten(16), 0, 4, 8);
+ if (material.hasItemType(OrePrefixes.nugget)) GT_Values.RA
+ .addFluidExtractionRecipe(material.get(OrePrefixes.nugget), null, material.getMolten(16), 0, 4, 8);
+ if (material.hasItemType(OrePrefixes.rotor)) GT_Values.RA
+ .addFluidExtractionRecipe(material.get(OrePrefixes.rotor), null, material.getMolten(612), 0, 136, 8);
+ if (material.hasItemType(OrePrefixes.gearGt)) GT_Values.RA
+ .addFluidExtractionRecipe(material.get(OrePrefixes.gearGt), null, material.getMolten(576), 0, 128, 8);
}
public static void addRecipeForMultiItems() {
@@ -99,10 +97,10 @@ public class MaterialFix {
60);
GT_ModHandler.addCraftingRecipe(
tMaterial.get(OrePrefixes.plateDouble, 1),
- new Object[] {"P", "P", "h", 'P', tMaterial.get(OrePrefixes.plate, 1)});
+ new Object[] { "P", "P", "h", 'P', tMaterial.get(OrePrefixes.plate, 1) });
GT_ModHandler.addCraftingRecipe(
tMaterial.get(OrePrefixes.ingotDouble, 1),
- new Object[] {"P", "P", "h", 'P', tMaterial.get(OrePrefixes.ingot, 1)});
+ new Object[] { "P", "P", "h", 'P', tMaterial.get(OrePrefixes.ingot, 1) });
}
if (tMaterial.hasItemType(OrePrefixes.plateTriple) && tMaterial.hasItemType(OrePrefixes.ingotTriple)) {
GT_Values.RA.addBenderRecipe(
@@ -123,24 +121,14 @@ public class MaterialFix {
tMaterial.get(OrePrefixes.plateTriple, 1),
(int) Math.max(tMaterial.getStats().getMass(), 1L),
60);
- GT_ModHandler.addCraftingRecipe(tMaterial.get(OrePrefixes.plateTriple, 1), new Object[] {
- "B",
- "P",
- "h",
- 'P',
- tMaterial.get(OrePrefixes.plate, 1),
- 'B',
- tMaterial.get(OrePrefixes.plateDouble, 1)
- });
- GT_ModHandler.addCraftingRecipe(tMaterial.get(OrePrefixes.ingotTriple, 1), new Object[] {
- "B",
- "P",
- "h",
- 'P',
- tMaterial.get(OrePrefixes.ingot, 1),
- 'B',
- tMaterial.get(OrePrefixes.ingotDouble, 1)
- });
+ GT_ModHandler.addCraftingRecipe(
+ tMaterial.get(OrePrefixes.plateTriple, 1),
+ new Object[] { "B", "P", "h", 'P', tMaterial.get(OrePrefixes.plate, 1), 'B',
+ tMaterial.get(OrePrefixes.plateDouble, 1) });
+ GT_ModHandler.addCraftingRecipe(
+ tMaterial.get(OrePrefixes.ingotTriple, 1),
+ new Object[] { "B", "P", "h", 'P', tMaterial.get(OrePrefixes.ingot, 1), 'B',
+ tMaterial.get(OrePrefixes.ingotDouble, 1) });
}
if (tMaterial.hasItemType(OrePrefixes.plateDense)) {
GT_Values.RA.addBenderRecipe(
@@ -192,7 +180,7 @@ public class MaterialFix {
if (tMaterial.hasItemType(OrePrefixes.stick)) {
GT_ModHandler.addCraftingRecipe(
tMaterial.get(OrePrefixes.stickLong, 1),
- new Object[] {"PhP", 'P', tMaterial.get(OrePrefixes.stick, 1)});
+ new Object[] { "PhP", 'P', tMaterial.get(OrePrefixes.stick, 1) });
GT_Values.RA.addForgeHammerRecipe(
tMaterial.get(OrePrefixes.stick, 2),
tMaterial.get(OrePrefixes.stickLong, 1),
@@ -203,7 +191,7 @@ public class MaterialFix {
if (tMaterial.hasItemType(OrePrefixes.spring)) {
GT_ModHandler.addCraftingRecipe(
tMaterial.get(OrePrefixes.spring, 1),
- new Object[] {" s ", "fPx", " P ", 'P', tMaterial.get(OrePrefixes.stickLong, 1)});
+ new Object[] { " s ", "fPx", " P ", 'P', tMaterial.get(OrePrefixes.stickLong, 1) });
GT_Values.RA.addBenderRecipe(
tMaterial.get(OrePrefixes.stickLong, 1),
GT_Utility.getIntegratedCircuit(1),
@@ -214,7 +202,7 @@ public class MaterialFix {
if (tMaterial.hasItemType(OrePrefixes.springSmall)) {
GT_ModHandler.addCraftingRecipe(
tMaterial.get(OrePrefixes.springSmall, 1),
- new Object[] {" s ", "fPx", 'P', tMaterial.get(OrePrefixes.stick, 1)});
+ new Object[] { " s ", "fPx", 'P', tMaterial.get(OrePrefixes.stick, 1) });
GT_Values.RA.addBenderRecipe(
tMaterial.get(OrePrefixes.stick, 1),
GT_Utility.getIntegratedCircuit(1),
diff --git a/src/main/java/goodgenerator/util/MyRecipeAdder.java b/src/main/java/goodgenerator/util/MyRecipeAdder.java
index 548e3ef296..ce63af69ae 100644
--- a/src/main/java/goodgenerator/util/MyRecipeAdder.java
+++ b/src/main/java/goodgenerator/util/MyRecipeAdder.java
@@ -1,14 +1,5 @@
package goodgenerator.util;
-import com.gtnewhorizons.modularui.api.math.Pos2d;
-import com.gtnewhorizons.modularui.api.screen.ModularWindow;
-import com.gtnewhorizons.modularui.common.widget.DrawableWidget;
-import goodgenerator.client.GUI.GG_UITextures;
-import gregtech.api.enums.GT_Values;
-import gregtech.api.gui.modularui.GT_UITextures;
-import gregtech.api.util.GT_Recipe;
-import gregtech.api.util.GT_Utility;
-import gregtech.common.gui.modularui.UIHelper;
import java.awt.*;
import java.util.Arrays;
import java.util.Collection;
@@ -17,41 +8,52 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.function.Supplier;
+
import net.minecraft.item.ItemStack;
import net.minecraft.util.StatCollector;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidStack;
+import com.gtnewhorizons.modularui.api.math.Pos2d;
+import com.gtnewhorizons.modularui.api.screen.ModularWindow;
+import com.gtnewhorizons.modularui.common.widget.DrawableWidget;
+
+import goodgenerator.client.GUI.GG_UITextures;
+import gregtech.api.enums.GT_Values;
+import gregtech.api.gui.modularui.GT_UITextures;
+import gregtech.api.util.GT_Recipe;
+import gregtech.api.util.GT_Utility;
+import gregtech.common.gui.modularui.UIHelper;
+
public class MyRecipeAdder {
public static final MyRecipeAdder instance = new MyRecipeAdder();
- public final liquidMentalFuelMapper NqGFuels = (liquidMentalFuelMapper)
- new liquidMentalFuelMapper(
- new HashSet<>(50),
- "gg.recipe.naquadah_reactor",
- StatCollector.translateToLocal("tile.recipe.naquadah_reactor"),
- null,
- "goodgenerator:textures/gui/naquadah_reactor",
- 0,
- 0,
- 0,
- 1,
- 1,
- StatCollector.translateToLocal("value.naquadah_reactor") + " ",
- 1,
- " EU/t",
- false,
- true) {
- @Override
- public void addProgressBarUI(
- ModularWindow.Builder builder, Supplier<Float> progressSupplier, Pos2d windowOffset) {
- builder.widget(new DrawableWidget()
- .setDrawable(GG_UITextures.PICTURE_NAQUADAH_REACTOR)
- .setPos(new Pos2d(59, 20).add(windowOffset))
- .setSize(58, 42));
- }
- }.useModularUI(true);
+ public final liquidMentalFuelMapper NqGFuels = (liquidMentalFuelMapper) new liquidMentalFuelMapper(
+ new HashSet<>(50),
+ "gg.recipe.naquadah_reactor",
+ StatCollector.translateToLocal("tile.recipe.naquadah_reactor"),
+ null,
+ "goodgenerator:textures/gui/naquadah_reactor",
+ 0,
+ 0,
+ 0,
+ 1,
+ 1,
+ StatCollector.translateToLocal("value.naquadah_reactor") + " ",
+ 1,
+ " EU/t",
+ false,
+ true) {
+
+ @Override
+ public void addProgressBarUI(ModularWindow.Builder builder, Supplier<Float> progressSupplier,
+ Pos2d windowOffset) {
+ builder.widget(
+ new DrawableWidget().setDrawable(GG_UITextures.PICTURE_NAQUADAH_REACTOR)
+ .setPos(new Pos2d(59, 20).add(windowOffset)).setSize(58, 42));
+ }
+ }.useModularUI(true);
public final NaqFuelRefineMapper FRF = new NaqFuelRefineMapper(
new HashSet<>(50),
@@ -71,56 +73,53 @@ public class MyRecipeAdder {
true);
public final NeutronActivatorMapper NA = (NeutronActivatorMapper) new NeutronActivatorMapper(
- new HashSet<>(150),
- "gg.recipe.neutron_activator",
- StatCollector.translateToLocal("tile.neutron_activator"),
- null,
- "goodgenerator:textures/gui/neutron_activator",
- 9,
- 9,
- 0,
- 0,
- 0,
- null,
- 0,
- null,
- false,
- true)
- .setNEISpecialInfoFormatter((recipeInfo, applyPrefixAndSuffix) -> {
+ new HashSet<>(150),
+ "gg.recipe.neutron_activator",
+ StatCollector.translateToLocal("tile.neutron_activator"),
+ null,
+ "goodgenerator:textures/gui/neutron_activator",
+ 9,
+ 9,
+ 0,
+ 0,
+ 0,
+ null,
+ 0,
+ null,
+ false,
+ true).setNEISpecialInfoFormatter((recipeInfo, applyPrefixAndSuffix) -> {
int minNKE = recipeInfo.recipe.mSpecialValue % 10000;
int maxNKE = recipeInfo.recipe.mSpecialValue / 10000;
return Arrays.asList(
StatCollector.translateToLocal("value.neutron_activator.0"),
- GT_Utility.formatNumbers(minNKE)
- + StatCollector.translateToLocal("value.neutron_activator.2"),
+ GT_Utility.formatNumbers(minNKE) + StatCollector.translateToLocal("value.neutron_activator.2"),
StatCollector.translateToLocal("value.neutron_activator.1"),
- GT_Utility.formatNumbers(maxNKE)
- + StatCollector.translateToLocal("value.neutron_activator.2"));
+ GT_Utility.formatNumbers(maxNKE) + StatCollector.translateToLocal("value.neutron_activator.2"));
});
public final ExtremeHeatExchangerMapper XHE = (ExtremeHeatExchangerMapper) new ExtremeHeatExchangerMapper(
- new HashSet<>(50),
- "gg.recipe.extreme_heat_exchanger",
- StatCollector.translateToLocal("tile.extreme_heat_exchanger"),
- null,
- "goodgenerator:textures/gui/extreme_heat_exchanger",
- 0,
- 0,
- 0,
- 0,
- 0,
- null,
- 0,
- null,
- false,
- true)
- .setNEISpecialInfoFormatter((recipeInfo, applyPrefixAndSuffix) -> {
+ new HashSet<>(50),
+ "gg.recipe.extreme_heat_exchanger",
+ StatCollector.translateToLocal("tile.extreme_heat_exchanger"),
+ null,
+ "goodgenerator:textures/gui/extreme_heat_exchanger",
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ null,
+ 0,
+ null,
+ false,
+ true).setNEISpecialInfoFormatter((recipeInfo, applyPrefixAndSuffix) -> {
FluidStack[] Inputs = recipeInfo.recipe.mFluidInputs;
FluidStack[] Outputs = recipeInfo.recipe.mFluidOutputs;
int threshold = recipeInfo.recipe.mSpecialValue;
return Arrays.asList(
StatCollector.translateToLocal("value.extreme_heat_exchanger.0") + " "
- + GT_Utility.formatNumbers(Inputs[0].amount) + " L/s",
+ + GT_Utility.formatNumbers(Inputs[0].amount)
+ + " L/s",
StatCollector.translateToLocal("value.extreme_heat_exchanger.1"),
GT_Utility.formatNumbers(Outputs[0].amount / 160) + " L/s",
StatCollector.translateToLocal("value.extreme_heat_exchanger.2"),
@@ -146,21 +145,11 @@ public class MyRecipeAdder {
true);
public static class liquidMentalFuelMapper extends GT_Recipe.GT_Recipe_Map_Fuel {
- public liquidMentalFuelMapper(
- Collection<GT_Recipe> aRecipeList,
- String aUnlocalizedName,
- String aLocalName,
- String aNEIName,
- String aNEIGUIPath,
- int aUsualInputCount,
- int aUsualOutputCount,
- int aMinimalInputItems,
- int aMinimalInputFluids,
- int aAmperage,
- String aNEISpecialValuePre,
- int aNEISpecialValueMultiplier,
- String aNEISpecialValuePost,
- boolean aShowVoltageAmperageInNEI,
+
+ public liquidMentalFuelMapper(Collection<GT_Recipe> aRecipeList, String aUnlocalizedName, String aLocalName,
+ String aNEIName, String aNEIGUIPath, int aUsualInputCount, int aUsualOutputCount,
+ int aMinimalInputItems, int aMinimalInputFluids, int aAmperage, String aNEISpecialValuePre,
+ int aNEISpecialValueMultiplier, String aNEISpecialValuePost, boolean aShowVoltageAmperageInNEI,
boolean aNEIAllowed) {
super(
aRecipeList,
@@ -181,7 +170,16 @@ public class MyRecipeAdder {
}
public void addFuel(FluidStack input, FluidStack output, int EUt, int ticks) {
- super.addRecipe(true, null, null, null, new FluidStack[] {input}, new FluidStack[] {output}, ticks, 0, EUt);
+ super.addRecipe(
+ true,
+ null,
+ null,
+ null,
+ new FluidStack[] { input },
+ new FluidStack[] { output },
+ ticks,
+ 0,
+ EUt);
}
}
@@ -190,21 +188,11 @@ public class MyRecipeAdder {
}
public static class NaqFuelRefineMapper extends GT_Recipe.GT_Recipe_Map {
- public NaqFuelRefineMapper(
- Collection<GT_Recipe> aRecipeList,
- String aUnlocalizedName,
- String aLocalName,
- String aNEIName,
- String aNEIGUIPath,
- int aUsualInputCount,
- int aUsualOutputCount,
- int aMinimalInputItems,
- int aMinimalInputFluids,
- int aAmperage,
- String aNEISpecialValuePre,
- int aNEISpecialValueMultiplier,
- String aNEISpecialValuePost,
- boolean aShowVoltageAmperageInNEI,
+
+ public NaqFuelRefineMapper(Collection<GT_Recipe> aRecipeList, String aUnlocalizedName, String aLocalName,
+ String aNEIName, String aNEIGUIPath, int aUsualInputCount, int aUsualOutputCount,
+ int aMinimalInputItems, int aMinimalInputFluids, int aAmperage, String aNEISpecialValuePre,
+ int aNEISpecialValueMultiplier, String aNEISpecialValuePost, boolean aShowVoltageAmperageInNEI,
boolean aNEIAllowed) {
super(
aRecipeList,
@@ -225,33 +213,23 @@ public class MyRecipeAdder {
setUsualFluidInputCount(2);
}
- public void addNaqFuelRefineRecipe(
- FluidStack[] input1, ItemStack[] input2, FluidStack output, int EUt, int ticks, int tier) {
- super.addRecipe(false, input2, null, null, input1, new FluidStack[] {output}, ticks, EUt, tier);
+ public void addNaqFuelRefineRecipe(FluidStack[] input1, ItemStack[] input2, FluidStack output, int EUt,
+ int ticks, int tier) {
+ super.addRecipe(false, input2, null, null, input1, new FluidStack[] { output }, ticks, EUt, tier);
}
}
- public void addNaquadahFuelRefineRecipe(
- FluidStack[] input1, ItemStack[] input2, FluidStack output, int EUt, int ticks, int tier) {
+ public void addNaquadahFuelRefineRecipe(FluidStack[] input1, ItemStack[] input2, FluidStack output, int EUt,
+ int ticks, int tier) {
FRF.addNaqFuelRefineRecipe(input1, input2, output, EUt, ticks, tier);
}
public static class NeutronActivatorMapper extends GT_Recipe.GT_Recipe_Map {
- public NeutronActivatorMapper(
- Collection<GT_Recipe> aRecipeList,
- String aUnlocalizedName,
- String aLocalName,
- String aNEIName,
- String aNEIGUIPath,
- int aUsualInputCount,
- int aUsualOutputCount,
- int aMinimalInputItems,
- int aMinimalInputFluids,
- int aAmperage,
- String aNEISpecialValuePre,
- int aNEISpecialValueMultiplier,
- String aNEISpecialValuePost,
- boolean aShowVoltageAmperageInNEI,
+
+ public NeutronActivatorMapper(Collection<GT_Recipe> aRecipeList, String aUnlocalizedName, String aLocalName,
+ String aNEIName, String aNEIGUIPath, int aUsualInputCount, int aUsualOutputCount,
+ int aMinimalInputItems, int aMinimalInputFluids, int aAmperage, String aNEISpecialValuePre,
+ int aNEISpecialValueMultiplier, String aNEISpecialValuePost, boolean aShowVoltageAmperageInNEI,
boolean aNEIAllowed) {
super(
aRecipeList,
@@ -272,34 +250,22 @@ public class MyRecipeAdder {
useModularUI(true);
}
- public void addNARecipe(
- FluidStack[] input1,
- ItemStack[] input2,
- FluidStack[] output1,
- ItemStack[] output2,
- int ticks,
- int special) {
+ public void addNARecipe(FluidStack[] input1, ItemStack[] input2, FluidStack[] output1, ItemStack[] output2,
+ int ticks, int special) {
super.addRecipe(false, input2, output2, null, input1, output1, ticks, 0, special);
}
@Override
- public void addProgressBarUI(
- ModularWindow.Builder builder, Supplier<Float> progressSupplier, Pos2d windowOffset) {
- builder.widget(new DrawableWidget()
- .setDrawable(GG_UITextures.PICTURE_NEUTRON_ACTIVATOR)
- .setPos(new Pos2d(73, 22).add(windowOffset))
- .setSize(31, 21));
+ public void addProgressBarUI(ModularWindow.Builder builder, Supplier<Float> progressSupplier,
+ Pos2d windowOffset) {
+ builder.widget(
+ new DrawableWidget().setDrawable(GG_UITextures.PICTURE_NEUTRON_ACTIVATOR)
+ .setPos(new Pos2d(73, 22).add(windowOffset)).setSize(31, 21));
}
}
- public void addNeutronActivatorRecipe(
- FluidStack[] input1,
- ItemStack[] input2,
- FluidStack[] output1,
- ItemStack[] output2,
- int ticks,
- int maxNKE,
- int minNKE) {
+ public void addNeutronActivatorRecipe(FluidStack[] input1, ItemStack[] input2, FluidStack[] output1,
+ ItemStack[] output2, int ticks, int maxNKE, int minNKE) {
if (maxNKE <= 0) maxNKE = 1;
if (maxNKE >= 1100) maxNKE = 1100;
if (minNKE < 0) minNKE = 0;
@@ -310,21 +276,11 @@ public class MyRecipeAdder {
public static HashMap<Fluid, ExtremeHeatExchangerRecipe> mXHeatExchangerFuelMap = new HashMap<>();
public static class ExtremeHeatExchangerMapper extends GT_Recipe.GT_Recipe_Map {
- public ExtremeHeatExchangerMapper(
- Collection<GT_Recipe> aRecipeList,
- String aUnlocalizedName,
- String aLocalName,
- String aNEIName,
- String aNEIGUIPath,
- int aUsualInputCount,
- int aUsualOutputCount,
- int aMinimalInputItems,
- int aMinimalInputFluids,
- int aAmperage,
- String aNEISpecialValuePre,
- int aNEISpecialValueMultiplier,
- String aNEISpecialValuePost,
- boolean aShowVoltageAmperageInNEI,
+
+ public ExtremeHeatExchangerMapper(Collection<GT_Recipe> aRecipeList, String aUnlocalizedName, String aLocalName,
+ String aNEIName, String aNEIGUIPath, int aUsualInputCount, int aUsualOutputCount,
+ int aMinimalInputItems, int aMinimalInputFluids, int aAmperage, String aNEISpecialValuePre,
+ int aNEISpecialValueMultiplier, String aNEISpecialValuePost, boolean aShowVoltageAmperageInNEI,
boolean aNEIAllowed) {
super(
aRecipeList,
@@ -347,19 +303,13 @@ public class MyRecipeAdder {
}
@Override
- public GT_Recipe addRecipe(
- boolean aOptimize,
- ItemStack[] aInputs,
- ItemStack[] aOutputs,
- Object aSpecial,
- int[] aOutputChances,
- FluidStack[] aFluidInputs,
- FluidStack[] aFluidOutputs,
- int aDuration,
- int aEUt,
+ public GT_Recipe addRecipe(boolean aOptimize, ItemStack[] aInputs, ItemStack[] aOutputs, Object aSpecial,
+ int[] aOutputChances, FluidStack[] aFluidInputs, FluidStack[] aFluidOutputs, int aDuration, int aEUt,
int aSpecialValue) {
- ExtremeHeatExchangerRecipe tRecipe =
- new ExtremeHeatExchangerRecipe(aFluidInputs, aFluidOutputs, aSpecialValue);
+ ExtremeHeatExchangerRecipe tRecipe = new ExtremeHeatExchangerRecipe(
+ aFluidInputs,
+ aFluidOutputs,
+ aSpecialValue);
mXHeatExchangerFuelMap.put(aFluidInputs[0].getFluid(), tRecipe);
return addRecipe(tRecipe);
}
@@ -375,12 +325,11 @@ public class MyRecipeAdder {
}
@Override
- public void addProgressBarUI(
- ModularWindow.Builder builder, Supplier<Float> progressSupplier, Pos2d windowOffset) {
- builder.widget(new DrawableWidget()
- .setDrawable(GG_UITextures.PICTURE_EXTREME_HEAT_EXCHANGER)
- .setPos(new Pos2d(47, 13).add(windowOffset))
- .setSize(78, 59));
+ public void addProgressBarUI(ModularWindow.Builder builder, Supplier<Float> progressSupplier,
+ Pos2d windowOffset) {
+ builder.widget(
+ new DrawableWidget().setDrawable(GG_UITextures.PICTURE_EXTREME_HEAT_EXCHANGER)
+ .setPos(new Pos2d(47, 13).add(windowOffset)).setSize(78, 59));
}
}
@@ -444,42 +393,27 @@ public class MyRecipeAdder {
}
}
- public void addExtremeHeatExchangerRecipe(
- FluidStack HotFluid,
- FluidStack ColdFluid,
- FluidStack WorkFluid,
- FluidStack HeatedWorkFluid,
- FluidStack OverHeatedWorkFluid,
- int Threshold) {
+ public void addExtremeHeatExchangerRecipe(FluidStack HotFluid, FluidStack ColdFluid, FluidStack WorkFluid,
+ FluidStack HeatedWorkFluid, FluidStack OverHeatedWorkFluid, int Threshold) {
XHE.addRecipe(
false,
null,
null,
null,
null,
- new FluidStack[] {HotFluid, WorkFluid},
- new FluidStack[] {HeatedWorkFluid, OverHeatedWorkFluid, ColdFluid},
+ new FluidStack[] { HotFluid, WorkFluid },
+ new FluidStack[] { HeatedWorkFluid, OverHeatedWorkFluid, ColdFluid },
0,
0,
Threshold);
}
public static class PreciseAssemblerMapper extends GT_Recipe.GT_Recipe_Map {
- public PreciseAssemblerMapper(
- Collection<GT_Recipe> aRecipeList,
- String aUnlocalizedName,
- String aLocalName,
- String aNEIName,
- String aNEIGUIPath,
- int aUsualInputCount,
- int aUsualOutputCount,
- int aMinimalInputItems,
- int aMinimalInputFluids,
- int aAmperage,
- String aNEISpecialValuePre,
- int aNEISpecialValueMultiplier,
- String aNEISpecialValuePost,
- boolean aShowVoltageAmperageInNEI,
+
+ public PreciseAssemblerMapper(Collection<GT_Recipe> aRecipeList, String aUnlocalizedName, String aLocalName,
+ String aNEIName, String aNEIGUIPath, int aUsualInputCount, int aUsualOutputCount,
+ int aMinimalInputItems, int aMinimalInputFluids, int aAmperage, String aNEISpecialValuePre,
+ int aNEISpecialValueMultiplier, String aNEISpecialValuePost, boolean aShowVoltageAmperageInNEI,
boolean aNEIAllowed) {
super(
aRecipeList,
@@ -504,19 +438,16 @@ public class MyRecipeAdder {
}
@Override
- public GT_Recipe addRecipe(
- boolean aOptimize,
- ItemStack[] aInputs,
- ItemStack[] aOutputs,
- Object aSpecial,
- int[] aOutputChances,
- FluidStack[] aFluidInputs,
- FluidStack[] aFluidOutputs,
- int aDuration,
- int aEUt,
+ public GT_Recipe addRecipe(boolean aOptimize, ItemStack[] aInputs, ItemStack[] aOutputs, Object aSpecial,
+ int[] aOutputChances, FluidStack[] aFluidInputs, FluidStack[] aFluidOutputs, int aDuration, int aEUt,
int aSpecialValue) {
- PreciseAssemblerRecipe tRecipe =
- new PreciseAssemblerRecipe(aInputs, aFluidInputs, aOutputs[0], aEUt, aDuration, aSpecialValue);
+ PreciseAssemblerRecipe tRecipe = new PreciseAssemblerRecipe(
+ aInputs,
+ aFluidInputs,
+ aOutputs[0],
+ aEUt,
+ aDuration,
+ aSpecialValue);
return addRecipe(tRecipe);
}
@@ -537,36 +468,35 @@ public class MyRecipeAdder {
}
public static class PreciseAssemblerRecipe extends GT_Recipe {
- public PreciseAssemblerRecipe(
- ItemStack[] input1, FluidStack[] input2, ItemStack output, int EUt, int ticks, int tier) {
- super(false, input1, new ItemStack[] {output}, null, null, input2, null, ticks, EUt, tier);
+
+ public PreciseAssemblerRecipe(ItemStack[] input1, FluidStack[] input2, ItemStack output, int EUt, int ticks,
+ int tier) {
+ super(false, input1, new ItemStack[] { output }, null, null, input2, null, ticks, EUt, tier);
}
}
- public void addPreciseAssemblerRecipe(
- ItemStack[] aItemInputs, FluidStack[] aFluidInputs, ItemStack aOutput, int aEUt, int aDuration, int aTier) {
+ public void addPreciseAssemblerRecipe(ItemStack[] aItemInputs, FluidStack[] aFluidInputs, ItemStack aOutput,
+ int aEUt, int aDuration, int aTier) {
if (aOutput == null) return;
PA.addRecipe(
- false, aItemInputs, new ItemStack[] {aOutput}, null, null, aFluidInputs, null, aDuration, aEUt, aTier);
+ false,
+ aItemInputs,
+ new ItemStack[] { aOutput },
+ null,
+ null,
+ aFluidInputs,
+ null,
+ aDuration,
+ aEUt,
+ aTier);
}
public static class ComponentAssemblyLineMapper extends GT_Recipe.GT_Recipe_Map {
- public ComponentAssemblyLineMapper(
- Collection<GT_Recipe> aRecipeList,
- String aUnlocalizedName,
- String aLocalName,
- String aNEIName,
- String aNEIGUIPath,
- int aUsualInputCount,
- int aUsualOutputCount,
- int aMinimalInputItems,
- int aMinimalInputFluids,
- int aAmperage,
- String aNEISpecialValuePre,
- int aNEISpecialValueMultiplier,
- String aNEISpecialValuePost,
- boolean aShowVoltageAmperageInNEI,
+ public ComponentAssemblyLineMapper(Collection<GT_Recipe> aRecipeList, String aUnlocalizedName,
+ String aLocalName, String aNEIName, String aNEIGUIPath, int aUsualInputCount, int aUsualOutputCount,
+ int aMinimalInputItems, int aMinimalInputFluids, int aAmperage, String aNEISpecialValuePre,
+ int aNEISpecialValueMultiplier, String aNEISpecialValuePost, boolean aShowVoltageAmperageInNEI,
boolean aNEIAllowed) {
super(
@@ -587,8 +517,9 @@ public class MyRecipeAdder {
aNEIAllowed);
setUsualFluidInputCount(8);
setNEITransferRect(new Rectangle(70, 15, 18, 54));
- setNEISpecialInfoFormatter((recipeInfo, applyPrefixAndSuffix) -> Collections.singletonList(
- recipeInfo.recipeMap.mNEISpecialValuePre + GT_Values.VN[recipeInfo.recipe.mSpecialValue]));
+ setNEISpecialInfoFormatter(
+ (recipeInfo, applyPrefixAndSuffix) -> Collections.singletonList(
+ recipeInfo.recipeMap.mNEISpecialValuePre + GT_Values.VN[recipeInfo.recipe.mSpecialValue]));
}
@Override
@@ -610,12 +541,11 @@ public class MyRecipeAdder {
public void addGregTechLogoUI(ModularWindow.Builder builder, Pos2d windowOffset) {}
@Override
- public void addProgressBarUI(
- ModularWindow.Builder builder, Supplier<Float> progressSupplier, Pos2d windowOffset) {
- builder.widget(new DrawableWidget()
- .setDrawable(GG_UITextures.PICTURE_COMPONENT_ASSLINE)
- .setPos(new Pos2d(70, 22).add(windowOffset))
- .setSize(72, 40));
+ public void addProgressBarUI(ModularWindow.Builder builder, Supplier<Float> progressSupplier,
+ Pos2d windowOffset) {
+ builder.widget(
+ new DrawableWidget().setDrawable(GG_UITextures.PICTURE_COMPONENT_ASSLINE)
+ .setPos(new Pos2d(70, 22).add(windowOffset)).setSize(72, 40));
}
}
@@ -636,17 +566,12 @@ public class MyRecipeAdder {
false,
true);
- public GT_Recipe addComponentAssemblyLineRecipe(
- ItemStack[] ItemInputArray,
- FluidStack[] FluidInputArray,
- ItemStack OutputItem,
- int aDuration,
- int aEUt,
- int casingLevel) {
+ public GT_Recipe addComponentAssemblyLineRecipe(ItemStack[] ItemInputArray, FluidStack[] FluidInputArray,
+ ItemStack OutputItem, int aDuration, int aEUt, int casingLevel) {
return COMPASSLINE_RECIPES.addRecipe(
false,
ItemInputArray,
- new ItemStack[] {OutputItem},
+ new ItemStack[] { OutputItem },
null,
FluidInputArray,
null,
diff --git a/src/main/java/goodgenerator/util/StackUtils.java b/src/main/java/goodgenerator/util/StackUtils.java
index bf06f821ac..c4d8c4f9a1 100644
--- a/src/main/java/goodgenerator/util/StackUtils.java
+++ b/src/main/java/goodgenerator/util/StackUtils.java
@@ -1,20 +1,23 @@
package goodgenerator.util;
-import goodgenerator.items.MyMaterial;
-import gregtech.api.enums.Materials;
-import gregtech.api.util.GT_Utility;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
+
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.FluidStack;
+import goodgenerator.items.MyMaterial;
+import gregtech.api.enums.Materials;
+import gregtech.api.util.GT_Utility;
+
public class StackUtils {
/**
* Multiplies one ItemStack by a multiplier, and splits it into as many full stacks as it needs to.
- * @param stack The ItemStack you want to multiply
+ *
+ * @param stack The ItemStack you want to multiply
* @param multiplier The number the stack is multiplied by
* @return A List of stacks that, in total, are the same as the input ItemStack after it has been multiplied.
*/
@@ -34,7 +37,7 @@ public class StackUtils {
/**
* Merges the ItemStacks in the array into full stacks.
- * */
+ */
public static ArrayList<ItemStack> mergeStacks(List<ItemStack> stacks) {
ArrayList<ItemStack> output = new ArrayList<>();
for (int index = 0; index < stacks.size(); index++) {
@@ -66,12 +69,8 @@ public class StackUtils {
public static HashMap<ItemStack, Integer> getTotalItems(List<ItemStack> items) {
HashMap<ItemStack, Integer> totals = new HashMap<>();
- itemLoop:
- for (ItemStack item : items) {
- int t = items.stream()
- .filter(i2 -> GT_Utility.areStacksEqual(item, i2))
- .mapToInt(i -> i.stackSize)
- .sum();
+ itemLoop: for (ItemStack item : items) {
+ int t = items.stream().filter(i2 -> GT_Utility.areStacksEqual(item, i2)).mapToInt(i -> i.stackSize).sum();
for (ItemStack i2 : totals.keySet()) if (GT_Utility.areStacksEqual(item, i2)) continue itemLoop;
totals.put(GT_Utility.copyAmount(1, item), t);
}
diff --git a/src/main/java/goodgenerator/util/StructureHelper.java b/src/main/java/goodgenerator/util/StructureHelper.java
index 1267c357e1..6e8dab696f 100644
--- a/src/main/java/goodgenerator/util/StructureHelper.java
+++ b/src/main/java/goodgenerator/util/StructureHelper.java
@@ -1,16 +1,10 @@
package goodgenerator.util;
-import com.gtnewhorizon.structurelib.StructureLibAPI;
-import com.gtnewhorizon.structurelib.structure.IStructureElement;
-import gregtech.api.enums.Materials;
-import gregtech.api.enums.OrePrefixes;
-import gregtech.api.metatileentity.BaseMetaPipeEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Frame;
-import gregtech.api.util.GT_OreDictUnificator;
import java.util.Arrays;
import java.util.function.BiConsumer;
import java.util.function.BiPredicate;
import java.util.function.Function;
+
import net.minecraft.block.Block;
import net.minecraft.init.Items;
import net.minecraft.item.ItemBlock;
@@ -19,6 +13,15 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.IIcon;
import net.minecraft.world.World;
+import com.gtnewhorizon.structurelib.StructureLibAPI;
+import com.gtnewhorizon.structurelib.structure.IStructureElement;
+
+import gregtech.api.enums.Materials;
+import gregtech.api.enums.OrePrefixes;
+import gregtech.api.metatileentity.BaseMetaPipeEntity;
+import gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Frame;
+import gregtech.api.util.GT_OreDictUnificator;
+
public class StructureHelper {
public static <T> IStructureElement<T> addFrame(Materials aMaterials) {
@@ -54,8 +57,8 @@ public class StructureHelper {
ItemStack tFrame = GT_OreDictUnificator.get(OrePrefixes.frameGt, aMaterials, 1);
if (tFrame.getItem() instanceof ItemBlock) {
ItemBlock tFrameStackItem = (ItemBlock) tFrame.getItem();
- return tFrameStackItem.placeBlockAt(
- tFrame, null, world, x, y, z, 6, 0, 0, 0, Items.feather.getDamage(tFrame));
+ return tFrameStackItem
+ .placeBlockAt(tFrame, null, world, x, y, z, 6, 0, 0, 0, Items.feather.getDamage(tFrame));
}
return false;
}
@@ -63,28 +66,19 @@ public class StructureHelper {
}
// Only support to use meta to tier
- public static <T> IStructureElement<T> addTieredBlock(
- Block aBlock,
- BiConsumer<T, Integer> aSetTheFuckingMeta,
- Function<T, Integer> aGetTheFuckingMeta,
- int maxMeta) {
- return addTieredBlock(
- aBlock,
- (t, i) -> {
- aSetTheFuckingMeta.accept(t, i);
- return true;
- },
- aGetTheFuckingMeta,
- maxMeta);
+ public static <T> IStructureElement<T> addTieredBlock(Block aBlock, BiConsumer<T, Integer> aSetTheFuckingMeta,
+ Function<T, Integer> aGetTheFuckingMeta, int maxMeta) {
+ return addTieredBlock(aBlock, (t, i) -> {
+ aSetTheFuckingMeta.accept(t, i);
+ return true;
+ }, aGetTheFuckingMeta, maxMeta);
}
- public static <T> IStructureElement<T> addTieredBlock(
- Block aBlock,
- BiPredicate<T, Integer> aSetTheFuckingMeta,
- Function<T, Integer> aGetTheFuckingMeta,
- int maxMeta) {
+ public static <T> IStructureElement<T> addTieredBlock(Block aBlock, BiPredicate<T, Integer> aSetTheFuckingMeta,
+ Function<T, Integer> aGetTheFuckingMeta, int maxMeta) {
return new IStructureElement<T>() {
+
@Override
public boolean check(T t, World world, int x, int y, int z) {
Block tBlock = world.getBlock(x, y, z);
generated by cgit (git 2.46.0) at 2025-03-06 23:59:56 +0000