aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api/enums
diff options
context:
space:
mode:
authorRaven Szewczyk <git@eigenraven.me>2022-08-27 10:19:57 +0100
committerGitHub <noreply@github.com>2022-08-27 11:19:57 +0200
commit6f31720697bcc351421a4d86ba3bf749375dd12c (patch)
tree3adf8f318f22c892d74cd7c9d30b6dd3f11f11bd /src/main/java/gregtech/api/enums
parentc3eac50decd33ee2be8703dfb2ecf9cdc31c2b67 (diff)
downloadGT5-Unofficial-6f31720697bcc351421a4d86ba3bf749375dd12c.tar.gz
GT5-Unofficial-6f31720697bcc351421a4d86ba3bf749375dd12c.tar.bz2
GT5-Unofficial-6f31720697bcc351421a4d86ba3bf749375dd12c.zip
Update buildscript & apply spotless (#1306)
* Update dependencies * Update buildscript, apply spotless
Diffstat (limited to 'src/main/java/gregtech/api/enums')
-rw-r--r--src/main/java/gregtech/api/enums/ConfigCategories.java7
-rw-r--r--src/main/java/gregtech/api/enums/Dyes.java24
-rw-r--r--src/main/java/gregtech/api/enums/Element.java9
-rw-r--r--src/main/java/gregtech/api/enums/GTNH_ExtraMaterials.java637
-rw-r--r--src/main/java/gregtech/api/enums/GT_HatchElement.java8
-rw-r--r--src/main/java/gregtech/api/enums/GT_Values.java352
-rw-r--r--src/main/java/gregtech/api/enums/HeatingCoilLevel.java112
-rw-r--r--src/main/java/gregtech/api/enums/ItemList.java370
-rw-r--r--src/main/java/gregtech/api/enums/MaterialBuilder.java518
-rw-r--r--src/main/java/gregtech/api/enums/Materials.java18509
-rw-r--r--src/main/java/gregtech/api/enums/MaterialsBotania.java194
-rw-r--r--src/main/java/gregtech/api/enums/MaterialsKevlar.java597
-rw-r--r--src/main/java/gregtech/api/enums/OreDictNames.java1
-rw-r--r--src/main/java/gregtech/api/enums/OrePrefixes.java4026
-rw-r--r--src/main/java/gregtech/api/enums/ParticleFX.java1
-rw-r--r--src/main/java/gregtech/api/enums/SoundResource.java12
-rw-r--r--src/main/java/gregtech/api/enums/SubTag.java23
-rw-r--r--src/main/java/gregtech/api/enums/TC_Aspects.java2
-rw-r--r--src/main/java/gregtech/api/enums/TextureSet.java7
-rw-r--r--src/main/java/gregtech/api/enums/Textures.java1387
-rw-r--r--src/main/java/gregtech/api/enums/Tier.java506
-rw-r--r--src/main/java/gregtech/api/enums/ToolDictNames.java2
22 files changed, 24286 insertions, 3018 deletions
diff --git a/src/main/java/gregtech/api/enums/ConfigCategories.java b/src/main/java/gregtech/api/enums/ConfigCategories.java
index 513872ce38..ae4b425e5e 100644
--- a/src/main/java/gregtech/api/enums/ConfigCategories.java
+++ b/src/main/java/gregtech/api/enums/ConfigCategories.java
@@ -15,7 +15,8 @@ public enum ConfigCategories {
heatdamage,
oreprocessingoutputmultiplier,
blastfurnacerequirements,
- blastinductionsmelter,;
+ blastinductionsmelter,
+ ;
}
public enum Recipes {
@@ -25,7 +26,7 @@ public enum ConfigCategories {
disabledrecipes,
recipereplacements,
storageblockcrafting,
- storageblockdecrafting,
+ storageblockdecrafting,
crops;
}
@@ -61,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 6b1ce244c0..46207ee781 100644
--- a/src/main/java/gregtech/api/enums/Dyes.java
+++ b/src/main/java/gregtech/api/enums/Dyes.java
@@ -3,11 +3,10 @@ package gregtech.api.enums;
import gregtech.api.interfaces.IColorModulationContainer;
import gregtech.api.objects.GT_ArrayList;
import gregtech.api.util.GT_Utility;
+import java.util.ArrayList;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidStack;
-import java.util.ArrayList;
-
public enum Dyes implements IColorModulationContainer {
/**
* The valid Colors, see VALUES Array below
@@ -39,7 +38,24 @@ public enum Dyes implements IColorModulationContainer {
CONSTRUCTION_FOAM(-1, 64, 64, 64, "Construction Foam"),
MACHINE_METAL(-1, 210, 220, 255, "Machine Metal");
- public static final Dyes[] VALUES = {dyeBlack, dyeRed, dyeGreen, dyeBrown, dyeBlue, dyePurple, dyeCyan, dyeLightGray, dyeGray, dyePink, dyeLime, dyeYellow, dyeLightBlue, dyeMagenta, dyeOrange, dyeWhite};
+ public static final Dyes[] VALUES = {
+ dyeBlack,
+ dyeRed,
+ dyeGreen,
+ dyeBrown,
+ dyeBlue,
+ dyePurple,
+ dyeCyan,
+ dyeLightGray,
+ dyeGray,
+ dyePink,
+ dyeLime,
+ dyeYellow,
+ dyeLightBlue,
+ dyeMagenta,
+ dyeOrange,
+ dyeWhite
+ };
public final byte mIndex;
public final String mName;
@@ -50,7 +66,7 @@ public enum Dyes implements IColorModulationContainer {
Dyes(int aIndex, int aR, int aG, int aB, String aName) {
mIndex = (byte) aIndex;
mName = aName;
- mRGBa = new short[]{(short) aR, (short) aG, (short) aB, 0};
+ mRGBa = new short[] {(short) aR, (short) aG, (short) aB, 0};
mOriginalRGBa = mRGBa.clone();
}
diff --git a/src/main/java/gregtech/api/enums/Element.java b/src/main/java/gregtech/api/enums/Element.java
index eddb9fbce5..d60a25024f 100644
--- a/src/main/java/gregtech/api/enums/Element.java
+++ b/src/main/java/gregtech/api/enums/Element.java
@@ -293,7 +293,14 @@ public enum Element {
* @param aDecayTo String representing the Elements it decays to. Separated by an '&' Character.
* @param aName Name of the Element
*/
- Element(long aProtons, long aNeutrons, long aAdditionalMass, long aHalfLifeSeconds, String aDecayTo, String aName, boolean aIsIsotope) {
+ Element(
+ long aProtons,
+ long aNeutrons,
+ long aAdditionalMass,
+ long aHalfLifeSeconds,
+ String aDecayTo,
+ String aName,
+ boolean aIsIsotope) {
mProtons = aProtons;
mNeutrons = aNeutrons;
mAdditionalMass = aAdditionalMass;
diff --git a/src/main/java/gregtech/api/enums/GTNH_ExtraMaterials.java b/src/main/java/gregtech/api/enums/GTNH_ExtraMaterials.java
index 517b9beac8..c0a259197e 100644
--- a/src/main/java/gregtech/api/enums/GTNH_ExtraMaterials.java
+++ b/src/main/java/gregtech/api/enums/GTNH_ExtraMaterials.java
@@ -1,12 +1,12 @@
package gregtech.api.enums;
-import gregtech.api.interfaces.IMaterialHandler;
-
import static gregtech.GT_Mod.GT_FML_LOGGER;
+import gregtech.api.interfaces.IMaterialHandler;
+
public class GTNH_ExtraMaterials implements IMaterialHandler {
- public GTNH_ExtraMaterials(){
+ public GTNH_ExtraMaterials() {
GT_FML_LOGGER.info("Registering GTNH-Materials (post Java 64kb limit)");
Materials.add(this);
}
@@ -14,33 +14,605 @@ public class GTNH_ExtraMaterials implements IMaterialHandler {
/**
* This Class is for adding new Materials since Java has a Limiation of 64kb per Method / Class header
*/
+ public static Materials Signalum = new Materials(
+ -1,
+ TextureSet.SET_NONE,
+ 1.0F,
+ 0,
+ 2,
+ 1 | 2,
+ 255,
+ 255,
+ 255,
+ 0,
+ "Signalum",
+ "Signalum",
+ 0,
+ 0,
+ -1,
+ 0,
+ false,
+ false,
+ 3,
+ 1,
+ 1,
+ Dyes._NULL);
- public static Materials Signalum = new Materials( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 1|2 , 255, 255, 255, 0, "Signalum" , "Signalum" , 0, 0, -1, 0, false, false, 3, 1, 1, Dyes._NULL );
- public static Materials Lumium = new Materials( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 1|2 , 255, 255, 255, 0, "Lumium" , "Lumium" , 0, 0, -1, 0, false, false, 3, 1, 1, Dyes._NULL );
- public static Materials EnrichedCopper = new Materials( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 1|2 , 255, 255, 255, 0, "EnrichedCopper" , "Enriched Copper" , 0, 0, -1, 0, false, false, 3, 1, 1, Dyes._NULL );
- public static Materials DiamondCopper = new Materials( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 1|2 , 255, 255, 255, 0, "DiamondCopper" , "Diamond Copper" , 0, 0, -1, 0, false, false, 3, 1, 1, Dyes._NULL );
- public static Materials TarPitch = new Materials( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 1|2 , 255, 255, 255, 0, "TarPitch" , "Tar Pitch" , 0, 0, -1, 0, false, false, 3, 1, 1, Dyes._NULL );
- public static Materials LimePure = new Materials( -1, TextureSet.SET_NONE , 1.0F, 0, 0, 0 , 255, 255, 255, 0, "LimePure" , "Pure Lime" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeLime );
- public static Materials Wimalite = new Materials( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 8 , 255, 255, 255, 0, "Wimalite" , "Wimalite" , 0, 0, -1, 0, false, false, 3, 1, 1, Dyes.dyeYellow );
- public static Materials Yellorite = new Materials( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 8 , 255, 255, 255, 0, "Yellorite" , "Yellorite" , 0, 0, -1, 0, false, false, 3, 1, 1, Dyes.dyeYellow );
- public static Materials Quantum = new Materials( -1, TextureSet.SET_NONE , 1.0F, 0, 0, 0 , 255, 255, 255, 0, "Quantum" , "Quantum" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeWhite );
- public static Materials Turquoise = new Materials( -1, TextureSet.SET_NONE , 1.0F, 0, 1, 1 , 255, 255, 255, 0, "Turquoise" , "Turquoise" , 0, 0, -1, 0, false, false, 3, 1, 1, Dyes._NULL );
- public static Materials Tapazite = new Materials( -1, TextureSet.SET_NONE , 1.0F, 0, 1, 1 , 255, 255, 255, 0, "Tapazite" , "Tapazite" , 0, 0, -1, 0, false, false, 3, 1, 1, Dyes.dyeGreen );
- public static Materials Thyrium = new Materials( -1, TextureSet.SET_NONE , 1.0F, 0, 1, 1|2 |8 , 255, 255, 255, 0, "Thyrium" , "Thyrium" , 0, 0, -1, 0, false, false, 3, 1, 1, Dyes._NULL );
- public static Materials Tourmaline = new Materials( -1, TextureSet.SET_RUBY , 1.0F, 0, 1, 1 , 255, 255, 255, 0, "Tourmaline" , "Tourmaline" , 0, 0, -1, 0, false, false, 3, 1, 1, Dyes._NULL );
- public static Materials Spinel = new Materials( -1, TextureSet.SET_NONE , 1.0F, 0, 1, 0 , 255, 255, 255, 0, "Spinel" , "Spinel" , 0, 0, -1, 0, false, false, 3, 1, 1, Dyes._NULL );
- public static Materials Starconium = new Materials( -1, TextureSet.SET_NONE , 1.0F, 0, 1, 1|2 |8 , 255, 255, 255, 0, "Starconium" , "Starconium" , 0, 0, -1, 0, false, false, 3, 1, 1, Dyes._NULL );
- public static Materials Sugilite = new Materials( -1, TextureSet.SET_NONE , 1.0F, 0, 1, 1 , 255, 255, 255, 0, "Sugilite" , "Sugilite" , 0, 0, -1, 0, false, false, 3, 1, 1, Dyes._NULL );
- public static Materials Prismarine = new Materials( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 1 |4 , 255, 255, 255, 0, "Prismarine" , "Prismarine" , 0, 0, -1, 0, false, false, 3, 1, 1, Dyes._NULL );
- public static Materials GraveyardDirt = new Materials( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 1 , 255, 255, 255, 0, "GraveyardDirt" , "Graveyard Dirt" , 0, 0, -1, 0, false, false, 3, 1, 1, Dyes._NULL );
- public static Materials Tennantite = new Materials( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 1 , 255, 255, 255, 0, "Tennantite" , "Tennantite" , 0, 0, -1, 0, false, false, 3, 1, 1, Dyes._NULL );
- public static Materials Fairy = new Materials( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 1|2 , 255, 255, 255, 0, "Fairy" , "Fairy" , 0, 0, -1, 0, false, false, 3, 1, 1, Dyes._NULL );
- public static Materials Ludicrite = new Materials( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 1|2 , 255, 255, 255, 0, "Ludicrite" , "Ludicrite" , 0, 0, -1, 0, false, false, 3, 1, 1, Dyes._NULL );
- public static Materials AquaRegia = new Materials( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 0 , 255, 255, 255, 0, "AquaRegia" , "Aqua Regia" , 0, 0, -1, 0, false, false, 3, 1, 1, Dyes._NULL );
- public static Materials SolutionBlueVitriol = new Materials( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 0 , 255, 255, 255, 0, "SolutionBlueVitriol" , "Blue Vitriol Solution" , 0, 0, -1, 0, false, false, 3, 1, 1, Dyes._NULL );
- public static Materials SolutionNickelSulfate = new Materials( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 0 , 255, 255, 255, 0, "SolutionNickelSulfate" , "Nickel Sulfate Solution" , 0, 0, -1, 0, false, false, 3, 1, 1, Dyes._NULL );
- public static Materials Lodestone = new Materials( -1, TextureSet.SET_NONE , 1.0F, 0, 1, 1 |8 , 255, 255, 255, 0, "Lodestone" , "Lodestone" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes._NULL );
- public static Materials Luminite = new Materials( -1, TextureSet.SET_NONE , 1.0F, 0, 1, 1 |8 , 250, 250, 250, 0, "Luminite" , "Luminite" , 0, 0, -1, 0, false, false, 3, 1, 1, Dyes.dyeWhite );
+ public static Materials Lumium = new Materials(
+ -1,
+ TextureSet.SET_NONE,
+ 1.0F,
+ 0,
+ 2,
+ 1 | 2,
+ 255,
+ 255,
+ 255,
+ 0,
+ "Lumium",
+ "Lumium",
+ 0,
+ 0,
+ -1,
+ 0,
+ false,
+ false,
+ 3,
+ 1,
+ 1,
+ Dyes._NULL);
+ public static Materials EnrichedCopper = new Materials(
+ -1,
+ TextureSet.SET_NONE,
+ 1.0F,
+ 0,
+ 2,
+ 1 | 2,
+ 255,
+ 255,
+ 255,
+ 0,
+ "EnrichedCopper",
+ "Enriched Copper",
+ 0,
+ 0,
+ -1,
+ 0,
+ false,
+ false,
+ 3,
+ 1,
+ 1,
+ Dyes._NULL);
+ public static Materials DiamondCopper = new Materials(
+ -1,
+ TextureSet.SET_NONE,
+ 1.0F,
+ 0,
+ 2,
+ 1 | 2,
+ 255,
+ 255,
+ 255,
+ 0,
+ "DiamondCopper",
+ "Diamond Copper",
+ 0,
+ 0,
+ -1,
+ 0,
+ false,
+ false,
+ 3,
+ 1,
+ 1,
+ Dyes._NULL);
+ public static Materials TarPitch = new Materials(
+ -1,
+ TextureSet.SET_NONE,
+ 1.0F,
+ 0,
+ 2,
+ 1 | 2,
+ 255,
+ 255,
+ 255,
+ 0,
+ "TarPitch",
+ "Tar Pitch",
+ 0,
+ 0,
+ -1,
+ 0,
+ false,
+ false,
+ 3,
+ 1,
+ 1,
+ Dyes._NULL);
+ public static Materials LimePure = new Materials(
+ -1,
+ TextureSet.SET_NONE,
+ 1.0F,
+ 0,
+ 0,
+ 0,
+ 255,
+ 255,
+ 255,
+ 0,
+ "LimePure",
+ "Pure Lime",
+ 0,
+ 0,
+ -1,
+ 0,
+ false,
+ false,
+ 1,
+ 1,
+ 1,
+ Dyes.dyeLime);
+ public static Materials Wimalite = new Materials(
+ -1,
+ TextureSet.SET_NONE,
+ 1.0F,
+ 0,
+ 2,
+ 8,
+ 255,
+ 255,
+ 255,
+ 0,
+ "Wimalite",
+ "Wimalite",
+ 0,
+ 0,
+ -1,
+ 0,
+ false,
+ false,
+ 3,
+ 1,
+ 1,
+ Dyes.dyeYellow);
+ public static Materials Yellorite = new Materials(
+ -1,
+ TextureSet.SET_NONE,
+ 1.0F,
+ 0,
+ 2,
+ 8,
+ 255,
+ 255,
+ 255,
+ 0,
+ "Yellorite",
+ "Yellorite",
+ 0,
+ 0,
+ -1,
+ 0,
+ false,
+ false,
+ 3,
+ 1,
+ 1,
+ Dyes.dyeYellow);
+ public static Materials Quantum = new Materials(
+ -1,
+ TextureSet.SET_NONE,
+ 1.0F,
+ 0,
+ 0,
+ 0,
+ 255,
+ 255,
+ 255,
+ 0,
+ "Quantum",
+ "Quantum",
+ 0,
+ 0,
+ -1,
+ 0,
+ false,
+ false,
+ 1,
+ 1,
+ 1,
+ Dyes.dyeWhite);
+ public static Materials Turquoise = new Materials(
+ -1,
+ TextureSet.SET_NONE,
+ 1.0F,
+ 0,
+ 1,
+ 1,
+ 255,
+ 255,
+ 255,
+ 0,
+ "Turquoise",
+ "Turquoise",
+ 0,
+ 0,
+ -1,
+ 0,
+ false,
+ false,
+ 3,
+ 1,
+ 1,
+ Dyes._NULL);
+ public static Materials Tapazite = new Materials(
+ -1,
+ TextureSet.SET_NONE,
+ 1.0F,
+ 0,
+ 1,
+ 1,
+ 255,
+ 255,
+ 255,
+ 0,
+ "Tapazite",
+ "Tapazite",
+ 0,
+ 0,
+ -1,
+ 0,
+ false,
+ false,
+ 3,
+ 1,
+ 1,
+ Dyes.dyeGreen);
+ public static Materials Thyrium = new Materials(
+ -1,
+ TextureSet.SET_NONE,
+ 1.0F,
+ 0,
+ 1,
+ 1 | 2 | 8,
+ 255,
+ 255,
+ 255,
+ 0,
+ "Thyrium",
+ "Thyrium",
+ 0,
+ 0,
+ -1,
+ 0,
+ false,
+ false,
+ 3,
+ 1,
+ 1,
+ Dyes._NULL);
+ public static Materials Tourmaline = new Materials(
+ -1,
+ TextureSet.SET_RUBY,
+ 1.0F,
+ 0,
+ 1,
+ 1,
+ 255,
+ 255,
+ 255,
+ 0,
+ "Tourmaline",
+ "Tourmaline",
+ 0,
+ 0,
+ -1,
+ 0,
+ false,
+ false,
+ 3,
+ 1,
+ 1,
+ Dyes._NULL);
+ public static Materials Spinel = new Materials(
+ -1,
+ TextureSet.SET_NONE,
+ 1.0F,
+ 0,
+ 1,
+ 0,
+ 255,
+ 255,
+ 255,
+ 0,
+ "Spinel",
+ "Spinel",
+ 0,
+ 0,
+ -1,
+ 0,
+ false,
+ false,
+ 3,
+ 1,
+ 1,
+ Dyes._NULL);
+ public static Materials Starconium = new Materials(
+ -1,
+ TextureSet.SET_NONE,
+ 1.0F,
+ 0,
+ 1,
+ 1 | 2 | 8,
+ 255,
+ 255,
+ 255,
+ 0,
+ "Starconium",
+ "Starconium",
+ 0,
+ 0,
+ -1,
+ 0,
+ false,
+ false,
+ 3,
+ 1,
+ 1,
+ Dyes._NULL);
+ public static Materials Sugilite = new Materials(
+ -1,
+ TextureSet.SET_NONE,
+ 1.0F,
+ 0,
+ 1,
+ 1,
+ 255,
+ 255,
+ 255,
+ 0,
+ "Sugilite",
+ "Sugilite",
+ 0,
+ 0,
+ -1,
+ 0,
+ false,
+ false,
+ 3,
+ 1,
+ 1,
+ Dyes._NULL);
+ public static Materials Prismarine = new Materials(
+ -1,
+ TextureSet.SET_NONE,
+ 1.0F,
+ 0,
+ 2,
+ 1 | 4,
+ 255,
+ 255,
+ 255,
+ 0,
+ "Prismarine",
+ "Prismarine",
+ 0,
+ 0,
+ -1,
+ 0,
+ false,
+ false,
+ 3,
+ 1,
+ 1,
+ Dyes._NULL);
+ public static Materials GraveyardDirt = new Materials(
+ -1,
+ TextureSet.SET_NONE,
+ 1.0F,
+ 0,
+ 2,
+ 1,
+ 255,
+ 255,
+ 255,
+ 0,
+ "GraveyardDirt",
+ "Graveyard Dirt",
+ 0,
+ 0,
+ -1,
+ 0,
+ false,
+ false,
+ 3,
+ 1,
+ 1,
+ Dyes._NULL);
+ public static Materials Tennantite = new Materials(
+ -1,
+ TextureSet.SET_NONE,
+ 1.0F,
+ 0,
+ 2,
+ 1,
+ 255,
+ 255,
+ 255,
+ 0,
+ "Tennantite",
+ "Tennantite",
+ 0,
+ 0,
+ -1,
+ 0,
+ false,
+ false,
+ 3,
+ 1,
+ 1,
+ Dyes._NULL);
+ public static Materials Fairy = new Materials(
+ -1,
+ TextureSet.SET_NONE,
+ 1.0F,
+ 0,
+ 2,
+ 1 | 2,
+ 255,
+ 255,
+ 255,
+ 0,
+ "Fairy",
+ "Fairy",
+ 0,
+ 0,
+ -1,
+ 0,
+ false,
+ false,
+ 3,
+ 1,
+ 1,
+ Dyes._NULL);
+ public static Materials Ludicrite = new Materials(
+ -1,
+ TextureSet.SET_NONE,
+ 1.0F,
+ 0,
+ 2,
+ 1 | 2,
+ 255,
+ 255,
+ 255,
+ 0,
+ "Ludicrite",
+ "Ludicrite",
+ 0,
+ 0,
+ -1,
+ 0,
+ false,
+ false,
+ 3,
+ 1,
+ 1,
+ Dyes._NULL);
+ public static Materials AquaRegia = new Materials(
+ -1,
+ TextureSet.SET_NONE,
+ 1.0F,
+ 0,
+ 2,
+ 0,
+ 255,
+ 255,
+ 255,
+ 0,
+ "AquaRegia",
+ "Aqua Regia",
+ 0,
+ 0,
+ -1,
+ 0,
+ false,
+ false,
+ 3,
+ 1,
+ 1,
+ Dyes._NULL);
+ public static Materials SolutionBlueVitriol = new Materials(
+ -1,
+ TextureSet.SET_NONE,
+ 1.0F,
+ 0,
+ 2,
+ 0,
+ 255,
+ 255,
+ 255,
+ 0,
+ "SolutionBlueVitriol",
+ "Blue Vitriol Solution",
+ 0,
+ 0,
+ -1,
+ 0,
+ false,
+ false,
+ 3,
+ 1,
+ 1,
+ Dyes._NULL);
+ public static Materials SolutionNickelSulfate = new Materials(
+ -1,
+ TextureSet.SET_NONE,
+ 1.0F,
+ 0,
+ 2,
+ 0,
+ 255,
+ 255,
+ 255,
+ 0,
+ "SolutionNickelSulfate",
+ "Nickel Sulfate Solution",
+ 0,
+ 0,
+ -1,
+ 0,
+ false,
+ false,
+ 3,
+ 1,
+ 1,
+ Dyes._NULL);
+ public static Materials Lodestone = new Materials(
+ -1,
+ TextureSet.SET_NONE,
+ 1.0F,
+ 0,
+ 1,
+ 1 | 8,
+ 255,
+ 255,
+ 255,
+ 0,
+ "Lodestone",
+ "Lodestone",
+ 0,
+ 0,
+ -1,
+ 0,
+ false,
+ false,
+ 1,
+ 1,
+ 1,
+ Dyes._NULL);
+ public static Materials Luminite = new Materials(
+ -1,
+ TextureSet.SET_NONE,
+ 1.0F,
+ 0,
+ 1,
+ 1 | 8,
+ 250,
+ 250,
+ 250,
+ 0,
+ "Luminite",
+ "Luminite",
+ 0,
+ 0,
+ -1,
+ 0,
+ false,
+ false,
+ 3,
+ 1,
+ 1,
+ Dyes.dyeWhite);
private static void initSubTags() {
SubTag.METAL.addTo(Signalum, Lumium, EnrichedCopper, DiamondCopper);
@@ -53,11 +625,8 @@ public class GTNH_ExtraMaterials implements IMaterialHandler {
}
@Override
- public void onComponentInit() {
- }
+ public void onComponentInit() {}
@Override
- public void onComponentIteration(Materials aMaterial) {
-
- }
+ public void onComponentIteration(Materials aMaterial) {}
}
diff --git a/src/main/java/gregtech/api/enums/GT_HatchElement.java b/src/main/java/gregtech/api/enums/GT_HatchElement.java
index 1bc94340bb..68702f5eb5 100644
--- a/src/main/java/gregtech/api/enums/GT_HatchElement.java
+++ b/src/main/java/gregtech/api/enums/GT_HatchElement.java
@@ -2,7 +2,6 @@ package gregtech.api.enums;
import gregtech.api.interfaces.IHatchElement;
import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_EnhancedMultiBlockBase;
import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Dynamo;
import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Energy;
import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input;
@@ -14,7 +13,6 @@ import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Outpu
import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockBase;
import gregtech.api.util.GT_ExoticEnergyInputHelper;
import gregtech.api.util.IGT_HatchAdder;
-
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
@@ -26,7 +24,8 @@ public enum GT_HatchElement implements IHatchElement<GT_MetaTileEntity_MultiBloc
return t.mMufflerHatches.size();
}
},
- Maintenance(GT_MetaTileEntity_MultiBlockBase::addMaintenanceToMachineList, GT_MetaTileEntity_Hatch_Maintenance.class) {
+ Maintenance(
+ GT_MetaTileEntity_MultiBlockBase::addMaintenanceToMachineList, GT_MetaTileEntity_Hatch_Maintenance.class) {
@Override
public long count(GT_MetaTileEntity_MultiBlockBase t) {
return t.mMaintenanceHatches.size();
@@ -84,7 +83,8 @@ public enum GT_HatchElement implements IHatchElement<GT_MetaTileEntity_MultiBloc
private final IGT_HatchAdder<GT_MetaTileEntity_MultiBlockBase> adder;
@SafeVarargs
- GT_HatchElement(IGT_HatchAdder<GT_MetaTileEntity_MultiBlockBase> adder, Class<? extends IMetaTileEntity>... mteClasses) {
+ GT_HatchElement(
+ IGT_HatchAdder<GT_MetaTileEntity_MultiBlockBase> adder, Class<? extends IMetaTileEntity>... mteClasses) {
this.mteClasses = Collections.unmodifiableList(Arrays.asList(mteClasses));
this.adder = adder;
}
diff --git