aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/loaders/materialprocessing
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/loaders/materialprocessing
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/loaders/materialprocessing')
-rw-r--r--src/main/java/gregtech/loaders/materialprocessing/ProcessingConfig.java33
-rw-r--r--src/main/java/gregtech/loaders/materialprocessing/ProcessingModSupport.java14
2 files changed, 37 insertions, 10 deletions
diff --git a/src/main/java/gregtech/loaders/materialprocessing/ProcessingConfig.java b/src/main/java/gregtech/loaders/materialprocessing/ProcessingConfig.java
index 23bc718bb4..d8fc898cf4 100644
--- a/src/main/java/gregtech/loaders/materialprocessing/ProcessingConfig.java
+++ b/src/main/java/gregtech/loaders/materialprocessing/ProcessingConfig.java
@@ -2,8 +2,8 @@ package gregtech.loaders.materialprocessing;
import gregtech.api.GregTech_API;
import gregtech.api.enums.Dyes;
-import gregtech.api.enums.Materials;
import gregtech.api.enums.GTNH_ExtraMaterials;
+import gregtech.api.enums.Materials;
import gregtech.api.enums.TextureSet;
public class ProcessingConfig implements gregtech.api.interfaces.IMaterialHandler {
@@ -17,9 +17,36 @@ public class ProcessingConfig implements gregtech.api.interfaces.IMaterialHandle
/** This is just left here as an example of how to add new materials. **/
if (false) {
int i = 0;
- for (int j = GregTech_API.sMaterialProperties.get("general", "AmountOfCustomMaterialSlots", 16); i < j; i++) {
+ for (int j = GregTech_API.sMaterialProperties.get("general", "AmountOfCustomMaterialSlots", 16);
+ i < j;
+ i++) {
String aID = (i < 10 ? "0" : "") + i;
- new Materials(-1, TextureSet.SET_METALLIC, 1.0F, 0, 0, 0, 255, 255, 255, 0, "CustomMat" + aID, "CustomMat" + aID, 0, 0, 0, 0, false, false, 1, 1, 1, Dyes._NULL, "custom", true, aID);
+ new Materials(
+ -1,
+ TextureSet.SET_METALLIC,
+ 1.0F,
+ 0,
+ 0,
+ 0,
+ 255,
+ 255,
+ 255,
+ 0,
+ "CustomMat" + aID,
+ "CustomMat" + aID,
+ 0,
+ 0,
+ 0,
+ 0,
+ false,
+ false,
+ 1,
+ 1,
+ 1,
+ Dyes._NULL,
+ "custom",
+ true,
+ aID);
}
}
}
diff --git a/src/main/java/gregtech/loaders/materialprocessing/ProcessingModSupport.java b/src/main/java/gregtech/loaders/materialprocessing/ProcessingModSupport.java
index 12299e3eca..d1c7d48f3a 100644
--- a/src/main/java/gregtech/loaders/materialprocessing/ProcessingModSupport.java
+++ b/src/main/java/gregtech/loaders/materialprocessing/ProcessingModSupport.java
@@ -1,12 +1,12 @@
package gregtech.loaders.materialprocessing;
+import static gregtech.api.enums.GT_Values.MOD_ID_DC;
+
import cpw.mods.fml.common.Loader;
import gregtech.api.enums.GT_Values;
import gregtech.api.enums.Materials;
import gregtech.api.enums.OrePrefixes;
-import static gregtech.api.enums.GT_Values.MOD_ID_DC;
-
public class ProcessingModSupport implements gregtech.api.interfaces.IMaterialHandler {
public static boolean aTGregSupport = Loader.isModLoaded("TGregworks") || Loader.isModLoaded(MOD_ID_DC);
public static boolean aEnableUBCMats = Loader.isModLoaded("UndergroundBiomes") || aTGregSupport;
@@ -26,7 +26,7 @@ public class ProcessingModSupport implements gregtech.api.interfaces.IMaterialHa
@Override
public void onMaterialsInit() {
- //Disable Materials if Parent Mod is not loaded
+ // Disable Materials if Parent Mod is not loaded
if (!aTGregSupport) {
Materials.Dysprosium.mHasParentMod = false;
Materials.Erbium.mHasParentMod = false;
@@ -49,7 +49,7 @@ public class ProcessingModSupport implements gregtech.api.interfaces.IMaterialHa
Materials.DarkIron.mHasParentMod = false;
Materials.ElectrumFlux.mHasParentMod = false;
Materials.Force.mHasParentMod = false;
- //Materials.Nikolite.mHasParentMod = false;
+ // Materials.Nikolite.mHasParentMod = false;
Materials.Sunnarium.mHasParentMod = false;
Materials.BlueAlloy.mHasParentMod = false;
Materials.Vinteum.mHasParentMod = false;
@@ -134,11 +134,11 @@ public class ProcessingModSupport implements gregtech.api.interfaces.IMaterialHa
if (!aEnableRailcraftMats) {
Materials.Firestone.mHasParentMod = false;
}
- if(!aEnableProjectRedMats){
+ if (!aEnableProjectRedMats) {
Materials.Electrotine.mHasParentMod = false;
}
- //Enable Materials if correct mod is Loaded
+ // Enable Materials if correct mod is Loaded
Materials.ChromiumDioxide.mHasParentMod = Loader.isModLoaded("computronics");
}
@@ -157,6 +157,6 @@ public class ProcessingModSupport implements gregtech.api.interfaces.IMaterialHa
@Override
public void onComponentIteration(Materials aMaterial) {
- //NOP
+ // NOP
}
}