aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/loaders/load
diff options
context:
space:
mode:
authorboubou19 <miisterunknown@gmail.com>2023-04-01 18:11:43 +0200
committerGitHub <noreply@github.com>2023-04-01 18:11:43 +0200
commit5f50e4a36ec000657b0a1664784acf00275293c6 (patch)
tree5ef81441032735438c9fd9c620224ca58e46e537 /src/main/java/gregtech/loaders/load
parent6b77557e0e87cf5afd9ebd3985323ff1249e615c (diff)
downloadGT5-Unofficial-5f50e4a36ec000657b0a1664784acf00275293c6.tar.gz
GT5-Unofficial-5f50e4a36ec000657b0a1664784acf00275293c6.tar.bz2
GT5-Unofficial-5f50e4a36ec000657b0a1664784acf00275293c6.zip
update spotless formatting (#1827)
Diffstat (limited to 'src/main/java/gregtech/loaders/load')
-rw-r--r--src/main/java/gregtech/loaders/load/GT_FuelLoader.java40
-rw-r--r--src/main/java/gregtech/loaders/load/GT_ItemIterator.java286
-rw-r--r--src/main/java/gregtech/loaders/load/GT_SonictronLoader.java4
3 files changed, 222 insertions, 108 deletions
diff --git a/src/main/java/gregtech/loaders/load/GT_FuelLoader.java b/src/main/java/gregtech/loaders/load/GT_FuelLoader.java
index 470924053f..9a9837aae9 100644
--- a/src/main/java/gregtech/loaders/load/GT_FuelLoader.java
+++ b/src/main/java/gregtech/loaders/load/GT_FuelLoader.java
@@ -19,16 +19,36 @@ public class GT_FuelLoader implements Runnable {
@Override
public void run() {
GT_Log.out.println("GT_Mod: Initializing various Fuels.");
- ItemList.sBlueVitriol = GT_Mod.gregtechproxy
- .addFluid("solution.bluevitriol", "Blue Vitriol water solution", null, 1, 295);
- ItemList.sNickelSulfate = GT_Mod.gregtechproxy
- .addFluid("solution.nickelsulfate", "Nickel sulfate water solution", null, 1, 295);
- ItemList.sGreenVitriol = GT_Mod.gregtechproxy
- .addFluid("solution.greenvitriol", "Green Vitriol water solution", null, 1, 295);
- ItemList.sIndiumConcentrate = GT_Mod.gregtechproxy
- .addFluid("indiumconcentrate", "Indium Concentrate", null, 1, 295); // TODO CHECK NEW x3
- ItemList.sLeadZincSolution = GT_Mod.gregtechproxy
- .addFluid("leadzincsolution", "Lead-Zinc solution", null, 1, 295);
+ ItemList.sBlueVitriol = GT_Mod.gregtechproxy.addFluid(
+ "solution.bluevitriol",
+ "Blue Vitriol water solution",
+ null,
+ 1,
+ 295);
+ ItemList.sNickelSulfate = GT_Mod.gregtechproxy.addFluid(
+ "solution.nickelsulfate",
+ "Nickel sulfate water solution",
+ null,
+ 1,
+ 295);
+ ItemList.sGreenVitriol = GT_Mod.gregtechproxy.addFluid(
+ "solution.greenvitriol",
+ "Green Vitriol water solution",
+ null,
+ 1,
+ 295);
+ ItemList.sIndiumConcentrate = GT_Mod.gregtechproxy.addFluid(
+ "indiumconcentrate",
+ "Indium Concentrate",
+ null,
+ 1,
+ 295); // TODO CHECK NEW x3
+ ItemList.sLeadZincSolution = GT_Mod.gregtechproxy.addFluid(
+ "leadzincsolution",
+ "Lead-Zinc solution",
+ null,
+ 1,
+ 295);
ItemList.sRocketFuel = GT_Mod.gregtechproxy.addFluid("rocket_fuel", "Rocket Fuel", null, 1, 295);
new GT_Recipe(
new ItemStack(Items.lava_bucket),
diff --git a/src/main/java/gregtech/loaders/load/GT_ItemIterator.java b/src/main/java/gregtech/loaders/load/GT_ItemIterator.java
index e894acf4be..8e6130eccb 100644
--- a/src/main/java/gregtech/loaders/load/GT_ItemIterator.java
+++ b/src/main/java/gregtech/loaders/load/GT_ItemIterator.java
@@ -298,122 +298,215 @@ public class GT_ItemIterator implements Runnable {
GT_OreDictUnificator.set(OrePrefixes.gem, Materials.Lignite, new ItemStack(tItem, 1, 0));
}
if ((tName.equals("tile.extrabiomes.redrock")) || (tName.equals("tile.bop.redRocks"))) {
- GT_OreDictUnificator
- .registerOre(OrePrefixes.stone, Materials.Redrock, new ItemStack(tItem, 1, 0));
- GT_OreDictUnificator
- .registerOre(OrePrefixes.stone, Materials.Redrock, new ItemStack(tItem, 1, 1));
- GT_OreDictUnificator
- .registerOre(OrePrefixes.stone, Materials.Redrock, new ItemStack(tItem, 1, 2));
+ GT_OreDictUnificator.registerOre(
+ OrePrefixes.stone,
+ Materials.Redrock,
+ new ItemStack(tItem, 1, 0));
+ GT_OreDictUnificator.registerOre(
+ OrePrefixes.stone,
+ Materials.Redrock,
+ new ItemStack(tItem, 1, 1));
+ GT_OreDictUnificator.registerOre(
+ OrePrefixes.stone,
+ Materials.Redrock,
+ new ItemStack(tItem, 1, 2));
}
if (tName.equals("tile.rpstone")) {
- GT_OreDictUnificator
- .registerOre(OrePrefixes.stone, Materials.Marble, new ItemStack(tItem, 1, 0));
- GT_OreDictUnificator
- .registerOre(OrePrefixes.stone, Materials.Basalt, new ItemStack(tItem, 1, 1));
- GT_OreDictUnificator
- .registerOre(OrePrefixes.stone, Materials.Marble, new ItemStack(tItem, 1, 2));
- GT_OreDictUnificator
- .registerOre(OrePrefixes.stone, Materials.Basalt, new ItemStack(tItem, 1, 3));
- GT_OreDictUnificator
- .registerOre(OrePrefixes.stone, Materials.Basalt, new ItemStack(tItem, 1, 4));
- GT_OreDictUnificator
- .registerOre(OrePrefixes.stone, Materials.Basalt, new ItemStack(tItem, 1, 5));
- GT_OreDictUnificator
- .registerOre(OrePrefixes.stone, Materials.Basalt, new ItemStack(tItem, 1, 6));
+ GT_OreDictUnificator.registerOre(
+ OrePrefixes.stone,
+ Materials.Marble,
+ new ItemStack(tItem, 1, 0));
+ GT_OreDictUnificator.registerOre(
+ OrePrefixes.stone,
+ Materials.Basalt,
+ new ItemStack(tItem, 1, 1));
+ GT_OreDictUnificator.registerOre(
+ OrePrefixes.stone,
+ Materials.Marble,
+ new ItemStack(tItem, 1, 2));
+ GT_OreDictUnificator.registerOre(
+ OrePrefixes.stone,
+ Materials.Basalt,
+ new ItemStack(tItem, 1, 3));
+ GT_OreDictUnificator.registerOre(
+ OrePrefixes.stone,
+ Materials.Basalt,
+ new ItemStack(tItem, 1, 4));
+ GT_OreDictUnificator.registerOre(
+ OrePrefixes.stone,
+ Materials.Basalt,
+ new ItemStack(tItem, 1, 5));
+ GT_OreDictUnificator.registerOre(
+ OrePrefixes.stone,
+ Materials.Basalt,
+ new ItemStack(tItem, 1, 6));
}
if (
/** (tName.equals("tile.sedimentaryStone")) || **/
((tName.equals("tile.igneousStone")) || (tName.equals("tile.igneousStoneBrick"))
|| (tName.equals("tile.igneousCobblestone")))) {
- GT_OreDictUnificator
- .registerOre(OrePrefixes.stone, Materials.GraniteRed, new ItemStack(tItem, 1, 0));
- GT_OreDictUnificator
- .registerOre(OrePrefixes.stone, Materials.GraniteBlack, new ItemStack(tItem, 1, 1));
- GT_OreDictUnificator
- .registerOre(OrePrefixes.stone, Materials.Rhyolite, new ItemStack(tItem, 1, 2));
- GT_OreDictUnificator
- .registerOre(OrePrefixes.stone, Materials.Andesite, new ItemStack(tItem, 1, 3));
- GT_OreDictUnificator
- .registerOre(OrePrefixes.stone, Materials.Gabbro, new ItemStack(tItem, 1, 4));
- GT_OreDictUnificator
- .registerOre(OrePrefixes.stone, Materials.Basalt, new ItemStack(tItem, 1, 5));
- GT_OreDictUnificator
- .registerOre(OrePrefixes.stone, Materials.Komatiite, new ItemStack(tItem, 1, 6));
- GT_OreDictUnificator
- .registerOre(OrePrefixes.stone, Materials.Dacite, new ItemStack(tItem, 1, 7));
+ GT_OreDictUnificator.registerOre(
+ OrePrefixes.stone,
+ Materials.GraniteRed,
+ new ItemStack(tItem, 1, 0));
+ GT_OreDictUnificator.registerOre(
+ OrePrefixes.stone,
+ Materials.GraniteBlack,
+ new ItemStack(tItem, 1, 1));
+ GT_OreDictUnificator.registerOre(
+ OrePrefixes.stone,
+ Materials.Rhyolite,
+ new ItemStack(tItem, 1, 2));
+ GT_OreDictUnificator.registerOre(
+ OrePrefixes.stone,
+ Materials.Andesite,
+ new ItemStack(tItem, 1, 3));
+ GT_OreDictUnificator.registerOre(
+ OrePrefixes.stone,
+ Materials.Gabbro,
+ new ItemStack(tItem, 1, 4));
+ GT_OreDictUnificator.registerOre(
+ OrePrefixes.stone,
+ Materials.Basalt,
+ new ItemStack(tItem, 1, 5));
+ GT_OreDictUnificator.registerOre(
+ OrePrefixes.stone,
+ Materials.Komatiite,
+ new ItemStack(tItem, 1, 6));
+ GT_OreDictUnificator.registerOre(
+ OrePrefixes.stone,
+ Materials.Dacite,
+ new ItemStack(tItem, 1, 7));
- GT_OreDictUnificator
- .registerOre(OrePrefixes.stone, Materials.GraniteRed, new ItemStack(tItem, 1, 8));
- GT_OreDictUnificator
- .registerOre(OrePrefixes.stone, Materials.GraniteBlack, new ItemStack(tItem, 1, 9));
- GT_OreDictUnificator
- .registerOre(OrePrefixes.stone, Materials.Rhyolite, new ItemStack(tItem, 1, 10));
- GT_OreDictUnificator
- .registerOre(OrePrefixes.stone, Materials.Andesite, new ItemStack(tItem, 1, 11));
- GT_OreDictUnificator
- .registerOre(OrePrefixes.stone, Materials.Gabbro, new ItemStack(tItem, 1, 12));
- GT_OreDictUnificator
- .registerOre(OrePrefixes.stone, Materials.Basalt, new ItemStack(tItem, 1, 13));
- GT_OreDictUnificator
- .registerOre(OrePrefixes.stone, Materials.Komatiite, new ItemStack(tItem, 1, 14));
- GT_OreDictUnificator
- .registerOre(OrePrefixes.stone, Materials.Dacite, new ItemStack(tItem, 1, 15));
+ GT_OreDictUnificator.registerOre(
+ OrePrefixes.stone,
+ Materials.GraniteRed,
+ new ItemStack(tItem, 1, 8));
+ GT_OreDictUnificator.registerOre(
+ OrePrefixes.stone,
+ Materials.GraniteBlack,
+ new ItemStack(tItem, 1, 9));
+ GT_OreDictUnificator.registerOre(
+ OrePrefixes.stone,
+ Materials.Rhyolite,
+ new ItemStack(tItem, 1, 10));
+ GT_OreDictUnificator.registerOre(
+ OrePrefixes.stone,
+ Materials.Andesite,
+ new ItemStack(tItem, 1, 11));
+ GT_OreDictUnificator.registerOre(
+ OrePrefixes.stone,
+ Materials.Gabbro,
+ new ItemStack(tItem, 1, 12));
+ GT_OreDictUnificator.registerOre(
+ OrePrefixes.stone,
+ Materials.Basalt,
+ new ItemStack(tItem, 1, 13));
+ GT_OreDictUnificator.registerOre(
+ OrePrefixes.stone,
+ Materials.Komatiite,
+ new ItemStack(tItem, 1, 14));
+ GT_OreDictUnificator.registerOre(
+ OrePrefixes.stone,
+ Materials.Dacite,
+ new ItemStack(tItem, 1, 15));
}
if ((tName.equals("tile.metamorphicStone")) || (tName.equals("tile.metamorphicStoneBrick"))
|| (tName.equals("tile.metamorphicCobblestone"))) {
- GT_OreDictUnificator
- .registerOre(OrePrefixes.stone, Materials.Gneiss, new ItemStack(tItem, 1, 0));
- GT_OreDictUnificator
- .registerOre(OrePrefixes.stone, Materials.Eclogite, new ItemStack(tItem, 1, 1));
- GT_OreDictUnificator
- .registerOre(OrePrefixes.stone, Materials.Marble, new ItemStack(tItem, 1, 2));
- GT_OreDictUnificator
- .registerOre(OrePrefixes.stone, Materials.Quartzite, new ItemStack(tItem, 1, 3));
- GT_OreDictUnificator
- .registerOre(OrePrefixes.stone, Materials.Blueschist, new ItemStack(tItem, 1, 4));
- GT_OreDictUnificator
- .registerOre(OrePrefixes.stone, Materials.Greenschist, new ItemStack(tItem, 1, 5));
- GT_OreDictUnificator
- .registerOre(OrePrefixes.stone, Materials.Soapstone, new ItemStack(tItem, 1, 6));
- GT_OreDictUnificator
- .registerOre(OrePrefixes.stone, Materials.Migmatite, new ItemStack(tItem, 1, 7));
+ GT_OreDictUnificator.registerOre(
+ OrePrefixes.stone,
+ Materials.Gneiss,
+ new ItemStack(tItem, 1, 0));
+ GT_OreDictUnificator.registerOre(
+ OrePrefixes.stone,
+ Materials.Eclogite,
+ new ItemStack(tItem, 1, 1));
+ GT_OreDictUnificator.registerOre(
+ OrePrefixes.stone,
+ Materials.Marble,
+ new ItemStack(tItem, 1, 2));
+ GT_OreDictUnificator.registerOre(
+ OrePrefixes.stone,
+ Materials.Quartzite,
+ new ItemStack(tItem, 1, 3));
+ GT_OreDictUnificator.registerOre(
+ OrePrefixes.stone,
+ Materials.Blueschist,
+ new ItemStack(tItem, 1, 4));
+ GT_OreDictUnificator.registerOre(
+ OrePrefixes.stone,
+ Materials.Greenschist,
+ new ItemStack(tItem, 1, 5));
+ GT_OreDictUnificator.registerOre(
+ OrePrefixes.stone,
+ Materials.Soapstone,
+ new ItemStack(tItem, 1, 6));
+ GT_OreDictUnificator.registerOre(
+ OrePrefixes.stone,
+ Materials.Migmatite,
+ new ItemStack(tItem, 1, 7));
- GT_OreDictUnificator
- .registerOre(OrePrefixes.stone, Materials.Gneiss, new ItemStack(tItem, 1, 8));
- GT_OreDictUnificator
- .registerOre(OrePrefixes.stone, Materials.Eclogite, new ItemStack(tItem, 1, 9));
- GT_OreDictUnificator
- .registerOre(OrePrefixes.stone, Materials.Marble, new ItemStack(tItem, 1, 10));
- GT_OreDictUnificator
- .registerOre(OrePrefixes.stone, Materials.Quartzite, new ItemStack(tItem, 1, 11));
- GT_OreDictUnificator
- .registerOre(OrePrefixes.stone, Materials.Blueschist, new ItemStack(tItem, 1, 12));
- GT_OreDictUnificator
- .registerOre(OrePrefixes.stone, Materials.Greenschist, new ItemStack(tItem, 1, 13));
- GT_OreDictUnificator
- .registerOre(OrePrefixes.stone, Materials.Soapstone, new ItemStack(tItem, 1, 14));
- GT_OreDictUnificator
- .registerOre(OrePrefixes.stone, Materials.Migmatite, new ItemStack(tItem, 1, 15));
+ GT_OreDictUnificator.registerOre(
+ OrePrefixes.stone,
+ Materials.Gneiss,
+ new ItemStack(tItem, 1, 8));
+ GT_OreDictUnificator.registerOre(
+ OrePrefixes.stone,
+ Materials.Eclogite,
+ new ItemStack(tItem, 1, 9));
+ GT_OreDictUnificator.registerOre(
+ OrePrefixes.stone,
+ Materials.Marble,
+ new ItemStack(tItem, 1, 10));
+ GT_OreDictUnificator.registerOre(
+ OrePrefixes.stone,
+ Materials.Quartzite,
+ new ItemStack(tItem, 1, 11));
+ GT_OreDictUnificator.registerOre(
+ OrePrefixes.stone,
+ Materials.Blueschist,
+ new ItemStack(tItem, 1, 12));
+ GT_OreDictUnificator.registerOre(
+ OrePrefixes.stone,
+ Materials.Greenschist,
+ new ItemStack(tItem, 1, 13));
+ GT_OreDictUnificator.registerOre(
+ OrePrefixes.stone,
+ Materials.Soapstone,
+ new ItemStack(tItem, 1, 14));
+ GT_OreDictUnificator.registerOre(
+ OrePrefixes.stone,
+ Materials.Migmatite,
+ new ItemStack(tItem, 1, 15));
}
if (tName.equals("tile.blockCosmeticSolid")) {
- GT_OreDictUnificator
- .registerOre(OrePrefixes.stone, Materials.Obsidian, new ItemStack(tItem, 1, 0));
- GT_OreDictUnificator
- .registerOre(OrePrefixes.stone, Materials.Obsidian, new ItemStack(tItem, 1, 1));
- GT_OreDictUnificator
- .registerOre(OrePrefixes.block, Materials.Thaumium, new ItemStack(tItem, 1, 4));
+ GT_OreDictUnificator.registerOre(
+ OrePrefixes.stone,
+ Materials.Obsidian,
+ new ItemStack(tItem, 1, 0));
+ GT_OreDictUnificator.registerOre(
+ OrePrefixes.stone,
+ Materials.Obsidian,
+ new ItemStack(tItem, 1, 1));
+ GT_OreDictUnificator.registerOre(
+ OrePrefixes.block,
+ Materials.Thaumium,
+ new ItemStack(tItem, 1, 4));
}
if (tName.equals("tile.enderchest")) {
GT_OreDictUnificator.registerOre(OreDictNames.enderChest, new ItemStack(tItem, 1, 32767));
}
if (tName.equals("tile.autoWorkbenchBlock")) {
- GT_OreDictUnificator
- .registerOre(OreDictNames.craftingWorkBench, new ItemStack(tItem, 1, 0));
+ GT_OreDictUnificator.registerOre(
+ OreDictNames.craftingWorkBench,
+ new ItemStack(tItem, 1, 0));
}
if (tName.equals("tile.pumpBlock")) {
GT_OreDictUnificator.registerOre(OreDictNames.craftingPump, new ItemStack(tItem, 1, 0));
- if (GregTech_API.sRecipeFile
- .get(ConfigCategories.Recipes.disabledrecipes, "BCPump", false)) {
+ if (GregTech_API.sRecipeFile.get(
+ ConfigCategories.Recipes.disabledrecipes,
+ "BCPump",
+ false)) {
GT_ModHandler.removeRecipeByOutput(new ItemStack(tItem, 1, 0));
}
}
@@ -421,8 +514,9 @@ public class GT_ItemIterator implements Runnable {
GT_OreDictUnificator.registerOre(OreDictNames.craftingTank, new ItemStack(tItem, 1, 0));
}
if (tName.equals("item.drawplateDiamond")) {
- GT_OreDictUnificator
- .registerOre(ToolDictNames.craftingToolDrawplate, new ItemStack(tItem, 1, 32767));
+ GT_OreDictUnificator.registerOre(
+ ToolDictNames.craftingToolDrawplate,
+ new ItemStack(tItem, 1, 32767));
}
}
}
diff --git a/src/main/java/gregtech/loaders/load/GT_SonictronLoader.java b/src/main/java/gregtech/loaders/load/GT_SonictronLoader.java
index ce66b80a55..115e95a6d3 100644
--- a/src/main/java/gregtech/loaders/load/GT_SonictronLoader.java
+++ b/src/main/java/gregtech/loaders/load/GT_SonictronLoader.java
@@ -112,8 +112,8 @@ public class GT_SonictronLoader implements Runnable {
GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Items.glass_bottle, 1));
GT_Mod.gregtechproxy.mSoundNames.add(SoundResource.RANDOM_BURP.toString());
GT_Mod.gregtechproxy.mSoundCounts.add(1);
- GT_Mod.gregtechproxy.mSoundItems
- .add(new ItemStack(Blocks.ender_chest == null ? Blocks.obsidian : Blocks.ender_chest, 1));
+ GT_Mod.gregtechproxy.mSoundItems.add(
+ new ItemStack(Blocks.ender_chest == null ? Blocks.obsidian : Blocks.ender_chest, 1));
GT_Mod.gregtechproxy.mSoundNames.add(SoundResource.RANDOM_CHESTOPEN.toString());
GT_Mod.gregtechproxy.mSoundCounts.add(1);
GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Blocks.chest, 1));
generated by cgit (git 2.46.0) at 2025-11-20 17:34:29 +0000