diff options
Diffstat (limited to 'src/main/java/gregtech/api')
106 files changed, 1316 insertions, 2095 deletions
diff --git a/src/main/java/gregtech/api/enums/ConfigCategories.java b/src/main/java/gregtech/api/enums/ConfigCategories.java index e4a647db22..a85d569d74 100644 --- a/src/main/java/gregtech/api/enums/ConfigCategories.java +++ b/src/main/java/gregtech/api/enums/ConfigCategories.java @@ -9,14 +9,14 @@ public enum ConfigCategories { public enum IDs { crops, - enchantments; + enchantments } public enum Materials { heatdamage, oreprocessingoutputmultiplier, blastfurnacerequirements, - blastinductionsmelter,; + blastinductionsmelter, } public enum Recipes { @@ -27,7 +27,7 @@ public enum ConfigCategories { recipereplacements, storageblockcrafting, storageblockdecrafting, - crops; + crops } public enum Machines { @@ -47,11 +47,11 @@ public enum ConfigCategories { massfabamplifier, maceration, rockcrushing, - pulverization; + pulverization } public enum Fuels { - boilerfuels; + boilerfuels } public enum Tools { @@ -62,6 +62,6 @@ public enum ConfigCategories { hammertripleplate, hammerquadrupleplate, hammerquintupleplate, - scoop; + scoop } } diff --git a/src/main/java/gregtech/api/enums/Dyes.java b/src/main/java/gregtech/api/enums/Dyes.java index a0b9f87593..165545b26c 100644 --- a/src/main/java/gregtech/api/enums/Dyes.java +++ b/src/main/java/gregtech/api/enums/Dyes.java @@ -48,7 +48,7 @@ public enum Dyes implements IColorModulationContainer { public final String mName; public final short[] mRGBa; public final short[] mOriginalRGBa; - private final ArrayList<Fluid> mFluidDyes = new GT_ArrayList<Fluid>(false, 1); + private final ArrayList<Fluid> mFluidDyes = new GT_ArrayList<>(false, 1); Dyes(int aIndex, int aR, int aG, int aB, String aName) { mIndex = (byte) aIndex; diff --git a/src/main/java/gregtech/api/enums/GT_Values.java b/src/main/java/gregtech/api/enums/GT_Values.java index eb742c902f..1a9422f374 100644 --- a/src/main/java/gregtech/api/enums/GT_Values.java +++ b/src/main/java/gregtech/api/enums/GT_Values.java @@ -170,13 +170,10 @@ public class GT_Values { EnumChatFormatting.DARK_GREEN.toString(), // UV, 8 EnumChatFormatting.DARK_RED.toString(), // UHV, 9 EnumChatFormatting.DARK_PURPLE.toString(), // UEV, 10 - EnumChatFormatting.DARK_BLUE.toString() + EnumChatFormatting.BOLD.toString(), // UIV, 11 - EnumChatFormatting.RED.toString() + EnumChatFormatting.BOLD.toString() - + EnumChatFormatting.UNDERLINE.toString(), // UMV, 12 - EnumChatFormatting.DARK_RED.toString() + EnumChatFormatting.BOLD.toString() - + EnumChatFormatting.UNDERLINE.toString(), // UXV, 13 - EnumChatFormatting.WHITE.toString() + EnumChatFormatting.BOLD.toString() - + EnumChatFormatting.UNDERLINE.toString(), // MAX, 14 + EnumChatFormatting.DARK_BLUE.toString() + EnumChatFormatting.BOLD, // UIV, 11 + EnumChatFormatting.RED.toString() + EnumChatFormatting.BOLD + EnumChatFormatting.UNDERLINE, // UMV, 12 + EnumChatFormatting.DARK_RED.toString() + EnumChatFormatting.BOLD + EnumChatFormatting.UNDERLINE, // UXV, 13 + EnumChatFormatting.WHITE.toString() + EnumChatFormatting.BOLD + EnumChatFormatting.UNDERLINE, // MAX, 14 EnumChatFormatting.OBFUSCATED.toString() // ~~~, 15 }; @@ -547,4 +544,18 @@ public class GT_Values { public static double getMaxPlasmaTurbineEfficiency() { return maxPlasmaTurbineEfficiency; } + + private static final long[] EXPLOSION_LOOKUP_V = new long[] { V[0], V[1], V[2], V[3], V[4], V[4] * 2, V[5], V[6], + |