applied spotless

RecursivePineapple · Nov 17, 2024 · a13c7f5 · a13c7f5
1 parent 557651e
commit a13c7f5
Show file tree

Hide file tree

Showing 13 changed files with 148 additions and 213 deletions.
diff --git a/src/main/java/com/recursive_pineapple/nuclear_horizons/CommonProxy.java b/src/main/java/com/recursive_pineapple/nuclear_horizons/CommonProxy.java
@@ -6,16 +6,13 @@
 import com.recursive_pineapple.nuclear_horizons.reactors.items.ForeignItems;
 import com.recursive_pineapple.nuclear_horizons.reactors.items.ItemList;
 import com.recursive_pineapple.nuclear_horizons.reactors.tile.simulator.SimulationItems;
-
 import com.recursive_pineapple.nuclear_horizons.recipes.*;
+
 import cpw.mods.fml.common.event.FMLInitializationEvent;
 import cpw.mods.fml.common.event.FMLPostInitializationEvent;
 import cpw.mods.fml.common.event.FMLPreInitializationEvent;
 import cpw.mods.fml.common.event.FMLServerStartingEvent;
-import cpw.mods.fml.common.registry.GameData;
-import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.Side;
-import mcp.mobius.waila.api.IWailaRegistrar;
 
 public class CommonProxy {
 
@@ -45,9 +42,9 @@ public void postInit(FMLPostInitializationEvent event) {
         SimulationItems.registerSimulationItems();
         ForeignItems.registerForeignReactorItems();
 
-        //change the owner of werkstoff materials to this mod in waila
+        // change the owner of werkstoff materials to this mod in waila
 
-        //register recipes
+        // register recipes
         new ChemicalReactor().run();
         new Centrifuge().run();
         new ThermalCentrifuge().run();

diff --git a/src/main/java/com/recursive_pineapple/nuclear_horizons/NuclearHorizons.java b/src/main/java/com/recursive_pineapple/nuclear_horizons/NuclearHorizons.java
@@ -1,12 +1,11 @@
 package com.recursive_pineapple.nuclear_horizons;
 
-import bartworks.API.WerkstoffAPI;
-import bartworks.API.WerkstoffAdderRegistry;
-import com.recursive_pineapple.nuclear_horizons.reactors.items.material.MaterialsNuclear;
-import gregtech.api.util.GTWaila;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
+import com.recursive_pineapple.nuclear_horizons.reactors.items.material.MaterialsNuclear;
+
+import bartworks.API.WerkstoffAdderRegistry;
 import cpw.mods.fml.common.Mod;
 import cpw.mods.fml.common.Mod.Instance;
 import cpw.mods.fml.common.SidedProxy;
@@ -37,15 +36,17 @@ public class NuclearHorizons {
     // preInit "Run before anything else. Read your config, create blocks, items, etc, and register them with the
     // GameRegistry." (Remove if not needed)
     public void preInit(FMLPreInitializationEvent event) {
-        //werkstoff material registration
+        // werkstoff material registration
         WerkstoffAdderRegistry.addWerkstoffAdder(new MaterialsNuclear());
 
         proxy.preInit(event);
     }
 
     @Mod.EventHandler
     // load "Do your mod setup. Build whatever data structures you care about. Register recipes." (Remove if not needed)
-    public void init(FMLInitializationEvent event) { proxy.init(event); }
+    public void init(FMLInitializationEvent event) {
+        proxy.init(event);
+    }
 
     @Mod.EventHandler
     // postInit "Handle interaction with other mods, complete your setup based on this." (Remove if not needed)

diff --git a/src/main/java/com/recursive_pineapple/nuclear_horizons/reactors/items/ItemList.java b/src/main/java/com/recursive_pineapple/nuclear_horizons/reactors/items/ItemList.java
@@ -1,10 +1,9 @@
 package com.recursive_pineapple.nuclear_horizons.reactors.items;
 
-import com.recursive_pineapple.nuclear_horizons.NuclearHorizons;
-import com.recursive_pineapple.nuclear_horizons.reactors.items.basic.*;
-import cpw.mods.fml.common.registry.GameRegistry;
 import net.minecraft.item.ItemStack;
 
+import com.recursive_pineapple.nuclear_horizons.reactors.items.basic.*;
+
 public class ItemList {
 
     public static final BasicFuelRodItem THORIUM_1X_ROD = new BasicFuelRodItem(

diff --git a/...om/recursive_pineapple/nuclear_horizons/reactors/items/basic/BasicFuelRodProductItem.java b/...om/recursive_pineapple/nuclear_horizons/reactors/items/basic/BasicFuelRodProductItem.java
@@ -1,15 +1,18 @@
 package com.recursive_pineapple.nuclear_horizons.reactors.items.basic;
 
-import com.recursive_pineapple.nuclear_horizons.NuclearHorizons;
-import cpw.mods.fml.common.registry.GameRegistry;
+import java.util.List;
+
 import net.minecraft.client.resources.I18n;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 
-import java.util.List;
+import com.recursive_pineapple.nuclear_horizons.NuclearHorizons;
+
+import cpw.mods.fml.common.registry.GameRegistry;
 
 public class BasicFuelRodProductItem extends Item {
+
     private final String name;
 
     public BasicFuelRodProductItem(String name, String textureName) {
@@ -25,7 +28,7 @@ public void register() {
 
     @Override
     public void addInformation(ItemStack itemStack, EntityPlayer player, List<String> desc,
-                               boolean advancedItemTooltips) {
+        boolean advancedItemTooltips) {
         super.addInformation(itemStack, player, desc, advancedItemTooltips);
         desc.add(I18n.format("nh_tooltip.more_info"));
     }

diff --git a/...va/com/recursive_pineapple/nuclear_horizons/reactors/items/material/MaterialsNuclear.java b/...va/com/recursive_pineapple/nuclear_horizons/reactors/items/material/MaterialsNuclear.java
@@ -1,12 +1,9 @@
 package com.recursive_pineapple.nuclear_horizons.reactors.items.material;
 
+import static bartworks.util.BWUtil.subscriptNumbers;
+
 import bartworks.system.material.Werkstoff;
-import bartworks.util.Pair;
-import gregtech.api.enums.Materials;
 import gregtech.api.enums.TextureSet;
-import gtPlusPlus.core.material.MaterialsElements;
-
-import static bartworks.util.BWUtil.subscriptNumbers;
 
 public class MaterialsNuclear implements Runnable {
 
@@ -351,6 +348,7 @@ public static MaterialsNuclear getInstance() {
     public static void runInit() {
 
     }
+
     @Override
     public void run() {
 

diff --git a/src/main/java/com/recursive_pineapple/nuclear_horizons/recipes/AssemblingMachine.java b/src/main/java/com/recursive_pineapple/nuclear_horizons/recipes/AssemblingMachine.java
@@ -1,10 +1,13 @@
 package com.recursive_pineapple.nuclear_horizons.recipes;
 
-import com.recursive_pineapple.nuclear_horizons.NuclearHorizons;
+import static gregtech.api.recipe.RecipeMaps.assemblerRecipes;
+import static gregtech.api.util.GTRecipeBuilder.SECONDS;
+
+import net.minecraft.item.ItemStack;
+
 import com.recursive_pineapple.nuclear_horizons.reactors.blocks.BlockList;
 import com.recursive_pineapple.nuclear_horizons.reactors.items.ItemList;
-import com.recursive_pineapple.nuclear_horizons.reactors.items.material.MaterialsNuclear;
-import cpw.mods.fml.common.registry.GameRegistry;
+
 import gregtech.api.enums.GTValues;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
@@ -13,19 +16,12 @@
 import gregtech.api.util.GTUtility;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import ic2.core.Ic2Items;
-import net.minecraft.block.BlockFence;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.FluidRegistry;
-
-import static gregtech.api.enums.Mods.NewHorizonsCoreMod;
-import static gregtech.api.recipe.RecipeMaps.assemblerRecipes;
-import static gregtech.api.util.GTModHandler.getModItem;
-import static gregtech.api.util.GTRecipeBuilder.SECONDS;
 
 public class AssemblingMachine {
+
     public void run() {
 
-        //basic components
+        // basic components
         GTValues.RA.stdBuilder()
             .itemInputs(
                 GTUtility.getIntegratedCircuit(21),
@@ -145,7 +141,6 @@ public void run() {
             .eut(TierEU.RECIPE_MV)
             .addTo(assemblerRecipes);
 
-
         GTValues.RA.stdBuilder()
             .itemInputs(
                 GTUtility.getIntegratedCircuit(21),
@@ -159,7 +154,6 @@ public void run() {
             .eut(256)
             .addTo(assemblerRecipes);
 
-
         GTValues.RA.stdBuilder()
             .itemInputs(
                 GTUtility.getIntegratedCircuit(23),
@@ -200,9 +194,7 @@ public void run() {
             .addTo(assemblerRecipes);
 
         GTValues.RA.stdBuilder()
-            .itemInputs(
-                new ItemStack(Ic2Items.reinforcedStone.getItem(), 1),
-                Materials.Lead.getPlates(2))
+            .itemInputs(new ItemStack(Ic2Items.reinforcedStone.getItem(), 1), Materials.Lead.getPlates(2))
             .fluidInputs()
             .itemOutputs(new ItemStack(BlockList.PRESSURE_VESSEL, 1))
             .duration(10 * SECONDS)
@@ -239,7 +231,7 @@ public void run() {
             .eut(TierEU.RECIPE_MV)
             .addTo(assemblerRecipes);
 
-        //based on nuclear control thermal monitor recipe (the non-wireless one)
+        // based on nuclear control thermal monitor recipe (the non-wireless one)
         GTValues.RA.stdBuilder()
             .itemInputs(
                 new ItemStack(Ic2Items.reinforcedGlass.getItem(), 3),
@@ -253,7 +245,7 @@ public void run() {
             .eut(TierEU.RECIPE_HV)
             .addTo(assemblerRecipes);
 
-        //idk lol
+        // idk lol
         GTValues.RA.stdBuilder()
             .itemInputs()
             .fluidInputs()

diff --git a/src/main/java/com/recursive_pineapple/nuclear_horizons/recipes/CanningMachine.java b/src/main/java/com/recursive_pineapple/nuclear_horizons/recipes/CanningMachine.java
@@ -1,27 +1,26 @@
 package com.recursive_pineapple.nuclear_horizons.recipes;
 
-import com.recursive_pineapple.nuclear_horizons.NuclearHorizons;
+import static gregtech.api.recipe.RecipeMaps.cannerRecipes;
+import static gregtech.api.util.GTRecipeBuilder.SECONDS;
+
+import net.minecraft.item.ItemStack;
+
 import com.recursive_pineapple.nuclear_horizons.reactors.items.ItemList;
 import com.recursive_pineapple.nuclear_horizons.reactors.items.material.MaterialsNuclear;
-import cpw.mods.fml.common.registry.GameRegistry;
+
 import goodgenerator.loader.Loaders;
-import goodgenerator.main.GoodGenerator;
 import gregtech.api.enums.GTValues;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.enums.TierEU;
-import net.minecraft.item.ItemStack;
-
-import static gregtech.api.recipe.RecipeMaps.cannerRecipes;
-import static gregtech.api.util.GTRecipeBuilder.SECONDS;
 
 public class CanningMachine {
+
     public void run() {
         GTValues.RA.stdBuilder()
             .itemInputs(
                 new ItemStack(Loaders.advancedFuelRod, 1),
                 MaterialsNuclear.ENRICHED_URANIUM_FUEL.get(OrePrefixes.dust, 4))
-            .itemOutputs(
-                new ItemStack(ItemList.URANIUM_1X_ROD, 1))
+            .itemOutputs(new ItemStack(ItemList.URANIUM_1X_ROD, 1))
             .duration(20 * SECONDS)
             .eut(TierEU.RECIPE_MV)
             .addTo(cannerRecipes);
@@ -30,8 +29,7 @@ public void run() {
             .itemInputs(
                 new ItemStack(Loaders.advancedFuelRod, 1),
                 MaterialsNuclear.ENRICHED_THORIUM_FUEL.get(OrePrefixes.dust, 4))
-            .itemOutputs(
-                new ItemStack(ItemList.THORIUM_1X_ROD, 1))
+            .itemOutputs(new ItemStack(ItemList.THORIUM_1X_ROD, 1))
             .duration(20 * SECONDS)
             .eut(TierEU.RECIPE_MV)
             .addTo(cannerRecipes);

diff --git a/src/main/java/com/recursive_pineapple/nuclear_horizons/recipes/Centrifuge.java b/src/main/java/com/recursive_pineapple/nuclear_horizons/recipes/Centrifuge.java
@@ -1,56 +1,48 @@
 package com.recursive_pineapple.nuclear_horizons.recipes;
 
-import bartworks.system.material.WerkstoffLoader;
+import static gregtech.api.recipe.RecipeMaps.centrifugeRecipes;
+import static gregtech.api.util.GTRecipeBuilder.MINUTES;
+
 import com.recursive_pineapple.nuclear_horizons.reactors.items.material.MaterialsNuclear;
+
+import bartworks.system.material.WerkstoffLoader;
 import gregtech.api.enums.*;
-import gtPlusPlus.core.material.MaterialsElements;
 import gtnhlanth.common.register.WerkstoffMaterialPool;
 
-import static gregtech.api.recipe.RecipeMaps.centrifugeRecipes;
-import static gregtech.api.util.GTRecipeBuilder.MINUTES;
-
 public class Centrifuge {
+
     public void run() {
 
-        //uranium enrichment
+        // uranium enrichment
         GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Cell_Empty.get(1))
-            .fluidInputs(
-                MaterialsNuclear.NATURAL_URANIUM_HEXAFLUORIDE.getFluidOrGas(10000))
-            .itemOutputs(
-                MaterialsNuclear.ENRICHED_URANIUM_HEXAFLUORIDE.get(OrePrefixes.cell, 1))
-            .fluidOutputs(
-                MaterialsNuclear.DEPLETED_URANIUM_HEXAFLUORIDE.getFluidOrGas(9000))
+            .fluidInputs(MaterialsNuclear.NATURAL_URANIUM_HEXAFLUORIDE.getFluidOrGas(10000))
+            .itemOutputs(MaterialsNuclear.ENRICHED_URANIUM_HEXAFLUORIDE.get(OrePrefixes.cell, 1))
+            .fluidOutputs(MaterialsNuclear.DEPLETED_URANIUM_HEXAFLUORIDE.getFluidOrGas(9000))
             .duration(5 * MINUTES)
             .eut(TierEU.RECIPE_HV)
             .addTo(centrifugeRecipes);
 
-        //PUREX
+        // PUREX
         GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Cell_Empty.get(3))
-            .fluidInputs(
-                MaterialsNuclear.TREATED_DEPLETED_URANIUM_FUEL_SOLUTION.getFluidOrGas(24000))
-            .itemOutputs(
-                MaterialsNuclear.AQUEOUS_PLUTONIUM_SOLUTION.get(OrePrefixes.cell, 3))
-            .fluidOutputs(
-                MaterialsNuclear.KEROSENE_URANIUM_SOLUTION.getFluidOrGas(21000))
+            .fluidInputs(MaterialsNuclear.TREATED_DEPLETED_URANIUM_FUEL_SOLUTION.getFluidOrGas(24000))
+            .itemOutputs(MaterialsNuclear.AQUEOUS_PLUTONIUM_SOLUTION.get(OrePrefixes.cell, 3))
+            .fluidOutputs(MaterialsNuclear.KEROSENE_URANIUM_SOLUTION.getFluidOrGas(21000))
             .duration(2 * MINUTES)
             .eut(TierEU.RECIPE_HV)
             .addTo(centrifugeRecipes);
 
         GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Cell_Empty.get(9))
-            .fluidInputs(
-                MaterialsNuclear.TREATED_DEPLETED_THORIUM_FUEL_SOLUTION.getFluidOrGas(28000))
-            .itemOutputs(
-                MaterialsNuclear.KEROSENE_URANIUM233_SOLUTION.get(OrePrefixes.cell, 9))
-            .fluidOutputs(
-                MaterialsNuclear.AQUEOUS_THORIUM_SOLUTION.getFluidOrGas(22000))
+            .fluidInputs(MaterialsNuclear.TREATED_DEPLETED_THORIUM_FUEL_SOLUTION.getFluidOrGas(28000))
+            .itemOutputs(MaterialsNuclear.KEROSENE_URANIUM233_SOLUTION.get(OrePrefixes.cell, 9))
+            .fluidOutputs(MaterialsNuclear.AQUEOUS_THORIUM_SOLUTION.getFluidOrGas(22000))
             .duration(2 * MINUTES)
             .eut(TierEU.RECIPE_HV)
             .addTo(centrifugeRecipes);
 
-        //fission product waste
+        // fission product waste
         GTValues.RA.stdBuilder()
             .itemInputs(MaterialsNuclear.URANIUM_FISSION_PRODUCT_MIXTURE.get(OrePrefixes.dust, 7))
             .itemOutputs(
@@ -60,8 +52,7 @@ public void run() {
                 Materials.Lutetium.getDust(1),
                 Materials.Barium.getDust(1),
                 Materials.Molybdenum.getDust(1))
-            .fluidOutputs(
-                WerkstoffLoader.Krypton.getFluidOrGas(1000))
+            .fluidOutputs(WerkstoffLoader.Krypton.getFluidOrGas(1000))
             .duration(2 * MINUTES)
             .eut(TierEU.RECIPE_HV)
             .addTo(centrifugeRecipes);