aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/loaders
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
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')
-rw-r--r--src/main/java/gregtech/loaders/ExtraIcons.java12
-rw-r--r--src/main/java/gregtech/loaders/load/GT_FuelLoader.java140
-rw-r--r--src/main/java/gregtech/loaders/load/GT_ItemIterator.java329
-rw-r--r--src/main/java/gregtech/loaders/load/GT_SonictronLoader.java3
-rw-r--r--src/main/java/gregtech/loaders/materialprocessing/ProcessingConfig.java33
-rw-r--r--src/main/java/gregtech/loaders/materialprocessing/ProcessingModSupport.java14
-rw-r--r--src/main/java/gregtech/loaders/misc/GT_Achievements.java302
-rw-r--r--src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java2815
-rw-r--r--src/main/java/gregtech/loaders/misc/GT_Bees.java60
-rw-r--r--src/main/java/gregtech/loaders/misc/GT_BranchDefinition.java61
-rw-r--r--src/main/java/gregtech/loaders/misc/GT_CoverLoader.java32
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingAll.java9
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingArrows.java101
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingBeans.java6
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java77
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingBolt.java11
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingCell.java129
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingCircuit.java31
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingCompressed.java8
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingCrafting.java408
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingCrate.java91
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingCrop.java73
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingCrushedOre.java112
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingCrystallized.java16
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingDirty.java134
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java431
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingDye.java56
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingFineWire.java27
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingFoil.java12
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingFood.java63
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingGear.java91
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingGem.java267
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingIngot.java186
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingItem.java14
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingLens.java38
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingLog.java293
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingNugget.java41
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java197
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingOrePoor.java29
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingOreSmelting.java132
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingPipe.java133
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingPlank.java130
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java382
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingPure.java23
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingRecycling.java15
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingRotor.java59
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingRound.java25
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingSand.java25
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingSaplings.java17
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingScrew.java15
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingShaping.java448
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingSlab.java18
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingStick.java54
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingStickLong.java36
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingStone.java178
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingStoneCobble.java32
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingStoneVarious.java21
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingToolHead.java1845
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingToolOther.java177
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingTransforming.java103
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingWax.java6
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingWire.java424
-rw-r--r--src/main/java/gregtech/loaders/postload/GT_BlockResistanceLoader.java4
-rw-r--r--src/main/java/gregtech/loaders/postload/GT_BookAndLootLoader.java336
-rw-r--r--src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java3840
-rw-r--r--src/main/java/gregtech/loaders/postload/GT_CropLoader.java1424
-rw-r--r--src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java26064
-rw-r--r--src/main/java/gregtech/loaders/postload/GT_PostLoad.java392
-rw-r--r--src/main/java/gregtech/loaders/postload/GT_ProcessingArrayRecipeLoader.java180
-rw-r--r--src/main/java/gregtech/loaders/postload/GT_RecyclerBlacklistLoader.java59
-rw-r--r--src/main/java/gregtech/loaders/postload/GT_UUMRecipeLoader.java3
-rw-r--r--src/main/java/gregtech/loaders/postload/GT_Worldgenloader.java1756
-rw-r--r--src/main/java/gregtech/loaders/postload/PartP2PGTPower.java26
-rw-r--r--src/main/java/gregtech/loaders/preload/GT_Loader_ItemData.java452
-rw-r--r--src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java3195
-rw-r--r--src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java15834
-rw-r--r--src/main/java/gregtech/loaders/preload/GT_Loader_MultiTileEntities.java47
-rw-r--r--src/main/java/gregtech/loaders/preload/GT_Loader_OreDictionary.java353
-rw-r--r--src/main/java/gregtech/loaders/preload/GT_Loader_OreProcessing.java3
-rw-r--r--src/main/java/gregtech/loaders/preload/GT_PreLoad.java884
80 files changed, 55658 insertions, 10244 deletions
diff --git a/src/main/java/gregtech/loaders/ExtraIcons.java b/src/main/java/gregtech/loaders/ExtraIcons.java
index ec50a7c3e2..ff867cce25 100644
--- a/src/main/java/gregtech/loaders/ExtraIcons.java
+++ b/src/main/java/gregtech/loaders/ExtraIcons.java
@@ -1,12 +1,12 @@
package gregtech.loaders;
+import static gregtech.api.enums.GT_Values.RES_PATH_ITEM;
+
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import net.minecraft.client.renderer.texture.TextureMap;
import net.minecraft.util.IIcon;
import net.minecraftforge.client.event.TextureStitchEvent;
-import static gregtech.api.enums.GT_Values.RES_PATH_ITEM;
-
public class ExtraIcons {
public static IIcon steelLargeCellInner;
public static IIcon aluminiumLargeCellInner;
@@ -21,11 +21,13 @@ public class ExtraIcons {
@SubscribeEvent
public void regIcons(TextureStitchEvent.Pre event) {
TextureMap reg = event.map;
- if (reg.getTextureType() == 1) {// are for items
+ if (reg.getTextureType() == 1) { // are for items
steelLargeCellInner = reg.registerIcon(RES_PATH_ITEM + "large_fluid_cell_custom/steel_inner");
aluminiumLargeCellInner = reg.registerIcon(RES_PATH_ITEM + "large_fluid_cell_custom/aluminium_inner");
- stainlesssteelLargeCellInner = reg.registerIcon(RES_PATH_ITEM + "large_fluid_cell_custom/stainlesssteel_inner");
- tungstensteelLargeCellInner = reg.registerIcon(RES_PATH_ITEM + "large_fluid_cell_custom/tungstensteel_inner");
+ stainlesssteelLargeCellInner =
+ reg.registerIcon(RES_PATH_ITEM + "large_fluid_cell_custom/stainlesssteel_inner");
+ tungstensteelLargeCellInner =
+ reg.registerIcon(RES_PATH_ITEM + "large_fluid_cell_custom/tungstensteel_inner");
titaniumLargeCellInner = reg.registerIcon(RES_PATH_ITEM + "large_fluid_cell_custom/titanium_inner");
chromiumLargeCellInner = reg.registerIcon(RES_PATH_ITEM + "large_fluid_cell_custom/chromium_inner");
iridiumLargeCellInner = reg.registerIcon(RES_PATH_ITEM + "large_fluid_cell_custom/iridium_inner");
diff --git a/src/main/java/gregtech/loaders/load/GT_FuelLoader.java b/src/main/java/gregtech/loaders/load/GT_FuelLoader.java
index 8cea2d25b7..463f2fff63 100644
--- a/src/main/java/gregtech/loaders/load/GT_FuelLoader.java
+++ b/src/main/java/gregtech/loaders/load/GT_FuelLoader.java
@@ -17,31 +17,135 @@ 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.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.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), new ItemStack(Blocks.obsidian), GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Copper, 1L), GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Tin, 1L), GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Electrum, 1L), 30, 2);
+ new GT_Recipe(
+ new ItemStack(Items.lava_bucket),
+ new ItemStack(Blocks.obsidian),
+ GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Copper, 1L),
+ GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Tin, 1L),
+ GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Electrum, 1L),
+ 30,
+ 2);
- GT_Recipe.GT_Recipe_Map.sSmallNaquadahReactorFuels.addRecipe(true, new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.NaquadahEnriched, 1L)}, new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Naquadah, 1L)}, null, null, null, 0, 0, 50000);
- GT_Recipe.GT_Recipe_Map.sLargeNaquadahReactorFuels.addRecipe(true, new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.stick, Materials.NaquadahEnriched, 1L)}, new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Naquadah, 1L)}, null, null, null, 0, 0, 250000);
- GT_Recipe.GT_Recipe_Map.sHugeNaquadahReactorFuels.addRecipe(true, new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.NaquadahEnriched, 1L)}, new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Naquadah, 1L)}, null, null, null, 0, 0, 500000);
- GT_Recipe.GT_Recipe_Map.sExtremeNaquadahReactorFuels.addRecipe(true, new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Naquadria, 1L)}, new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Naquadah, 1L)}, null, null, null, 0, 0, 250000);
- GT_Recipe.GT_Recipe_Map.sUltraHugeNaquadahReactorFuels.addRecipe(true, new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Naquadria, 1L)}, new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Naquadah, 1L)}, null, null, null, 0, 0, 1000000);
- GT_Recipe.GT_Recipe_Map.sFluidNaquadahReactorFuels.addRecipe(true, new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.cell, Materials.NaquadahEnriched, 1L)}, new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Naquadah, 1L)}, null, null, null, 0, 0, 1400000);
+ GT_Recipe.GT_Recipe_Map.sSmallNaquadahReactorFuels.addRecipe(
+ true,
+ new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.NaquadahEnriched, 1L)},
+ new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Naquadah, 1L)},
+ null,
+ null,
+ null,
+ 0,
+ 0,
+ 50000);
+ GT_Recipe.GT_Recipe_Map.sLargeNaquadahReactorFuels.addRecipe(
+ true,
+ new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.stick, Materials.NaquadahEnriched, 1L)},
+ new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Naquadah, 1L)},
+ null,
+ null,
+ null,
+ 0,
+ 0,
+ 250000);
+ GT_Recipe.GT_Recipe_Map.sHugeNaquadahReactorFuels.addRecipe(
+ true,
+ new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.NaquadahEnriched, 1L)},
+ new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Naquadah, 1L)},
+ null,
+ null,
+ null,
+ 0,
+ 0,
+ 500000);
+ GT_Recipe.GT_Recipe_Map.sExtremeNaquadahReactorFuels.addRecipe(
+ true,
+ new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Naquadria, 1L)},
+ new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Naquadah, 1L)},
+ null,
+ null,
+ null,
+ 0,
+ 0,
+ 250000);
+ GT_Recipe.GT_Recipe_Map.sUltraHugeNaquadahReactorFuels.addRecipe(
+ true,
+ new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Naquadria, 1L)},
+ new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Naquadah, 1L)},
+ null,
+ null,
+ null,
+ 0,
+ 0,
+ 1000000);
+ GT_Recipe.GT_Recipe_Map.sFluidNaquadahReactorFuels.addRecipe(
+ true,
+ new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.cell, Materials.NaquadahEnriched, 1L)},
+ new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Naquadah, 1L)},
+ null,
+ null,
+ null,
+ 0,
+ 0,
+ 1400000);
- //BloodMagic
- GT_Recipe.GT_Recipe_Map.sMagicFuels.addRecipe(true, new ItemStack[]{GT_ModHandler.getModItem("AWWayofTime","reinforcedSlate",1L)}, new ItemStack[]{GT_ModHandler.getModItem("AWWayofTime","blankSlate",1L)}, null, null, null, 0, 0, 400);
- GT_Recipe.GT_Recipe_Map.sMagicFuels.addRecipe(true, new ItemStack[]{GT_ModHandler.getModItem("AWWayofTime","imbuedSlate",1L)}, new ItemStack[]{GT_ModHandler.getModItem("AWWayofTime","reinforcedSlate",1L)}, null, null, null, 0, 0, 1000);
- GT_Recipe.GT_Recipe_Map.sMagicFuels.addRecipe(true, new ItemStack[]{GT_ModHandler.getModItem("AWWayofTime","demonicSlate",1L)}, new ItemStack[]{GT_ModHandler.getModItem("AWWayofTime","imbuedSlate",1L)}, null, null, null, 0, 0, 8000);
- GT_Recipe.GT_Recipe_Map.sMagicFuels.addRecipe(true, new ItemStack[]{GT_ModHandler.getModItem("AWWayofTime","bloodMagicBaseItems",1L,27)}, new ItemStack[]{GT_ModHandler.getModItem("AWWayofTime","demonicSlate",1L)}, null, null, null, 0, 0, 20000);
+ // BloodMagic
+ GT_Recipe.GT_Recipe_Map.sMagicFuels.addRecipe(
+ true,
+ new ItemStack[] {GT_ModHandler.getModItem("AWWayofTime", "reinforcedSlate", 1L)},
+ new ItemStack[] {GT_ModHandler.getModItem("AWWayofTime", "blankSlate", 1L)},
+ null,
+ null,
+ null,
+ 0,
+ 0,
+ 400);
+ GT_Recipe.GT_Recipe_Map.sMagicFuels.addRecipe(
+ true,
+ new ItemStack[] {GT_ModHandler.getModItem("AWWayofTime", "imbuedSlate", 1L)},
+ new ItemStack[] {GT_ModHandler.getModItem("AWWayofTime", "reinforcedSlate", 1L)},
+ null,
+ null,
+ null,
+ 0,
+ 0,
+ 1000);
+ GT_Recipe.GT_Recipe_Map.sMagicFuels.addRecipe(
+ true,
+ new ItemStack[] {GT_ModHandler.getModItem("AWWayofTime", "demonicSlate", 1L)},
+ new ItemStack[] {GT_ModHandler.getModItem("AWWayofTime", "imbuedSlate", 1L)},
+ null,
+ null,
+ null,
+ 0,
+ 0,
+ 8000);
+ GT_Recipe.GT_Recipe_Map.sMagicFuels.addRecipe(
+ true,
+ new ItemStack[] {GT_ModHandler.getModItem("AWWayofTime", "bloodMagicBaseItems", 1L, 27)},
+ new ItemStack[] {GT_ModHandler.getModItem("AWWayofTime", "demonicSlate", 1L)},
+ null,
+ null,
+ null,
+ 0,
+ 0,
+ 20000);
GT_Values.RA.addFuel(GT_ModHandler.getModItem("Thaumcraft", "ItemResource", 1L, 4), null, 4, 5);
GT_Values.RA.addFuel(new ItemStack(Items.experience_bottle, 1), null, 10, 5);
GT_Values.RA.addFuel(new ItemStack(Items.ghast_tear, 1), null, 50, 5);
- GT_Values.RA.addFuel(new ItemStack(Blocks.beacon, 1), null, Materials.NetherStar.mFuelPower * 2, Materials.NetherStar.mFuelType);
+ GT_Values.RA.addFuel(
+ new ItemStack(Blocks.beacon, 1),
+ null,
+ Materials.NetherStar.mFuelPower * 2,
+ Materials.NetherStar.mFuelType);
GT_Values.RA.addFuel(GT_ModHandler.getModItem("EnderIO", "bucketRocket_fuel", 1), null, 250, 1);
-
}
}
diff --git a/src/main/java/gregtech/loaders/load/GT_ItemIterator.java b/src/main/java/gregtech/loaders/load/GT_ItemIterator.java
index 9e483b05c8..3e1cf72c06 100644
--- a/src/main/java/gregtech/loaders/load/GT_ItemIterato