applied spotless

RecursivePineapple · Sep 29, 2024 · 619e148 · 619e148
1 parent a995dd6
commit 619e148
Show file tree

Hide file tree

Showing 20 changed files with 95 additions and 79 deletions.
diff --git a/.../recursive_pineapple/nuclear_horizons/reactors/components/adapters/BreederRodAdapter.java b/.../recursive_pineapple/nuclear_horizons/reactors/components/adapters/BreederRodAdapter.java
@@ -1,12 +1,12 @@
 package com.recursive_pineapple.nuclear_horizons.reactors.components.adapters;
 
+import net.minecraft.item.ItemStack;
+
 import com.recursive_pineapple.nuclear_horizons.reactors.components.IComponentAdapter;
 import com.recursive_pineapple.nuclear_horizons.reactors.components.IReactorGrid;
 import com.recursive_pineapple.nuclear_horizons.reactors.components.InventoryDirection;
 import com.recursive_pineapple.nuclear_horizons.reactors.items.interfaces.IBreederRod;
 
-import net.minecraft.item.ItemStack;
-
 public class BreederRodAdapter implements IComponentAdapter {
 
     private final IReactorGrid reactor;
@@ -39,7 +39,7 @@ public ItemStack getItemStack() {
 
     @Override
     public void onHeatTick() {
-        if(!reactor.isActive()) {
+        if (!reactor.isActive()) {
             return;
         }
 
@@ -60,7 +60,8 @@ public void onHeatTick() {
             }
         }
 
-        int heatMultiplier = 1 + reactor.getHullHeat() / breederRod.getReactorHeatDivisor(itemStack) * breederRod.getHeatMultiplier(itemStack);
+        int heatMultiplier = 1 + reactor.getHullHeat() / breederRod.getReactorHeatDivisor(itemStack)
+            * breederRod.getHeatMultiplier(itemStack);
 
         int storedNeutrons = breederRod.getStoredNeutrons(itemStack);
 

diff --git a/...com/recursive_pineapple/nuclear_horizons/reactors/components/adapters/FuelRodAdapter.java b/...com/recursive_pineapple/nuclear_horizons/reactors/components/adapters/FuelRodAdapter.java
@@ -52,7 +52,7 @@ protected double getEUMultiplier() {
 
     protected double getHeatMultiplier() {
         double mult = Config.ROD_HU_MULTIPLIER;
-        
+
         if (fuelRod.isMox(itemStack) && reactor.isFluid() && reactor.getHeatRatio() >= 0.5) {
             mult *= fuelRod.getMoxHeatCoefficient(itemStack);
         }
@@ -72,7 +72,11 @@ public void onHeatTick() {
         }
 
         int pulses = this.getPulseCount();
-        int heat = (int) (fuelRod.getHeatMult(itemStack) * fuelRod.getRodCount(itemStack) * getHeatMultiplier() * pulses * (pulses + 1) / 2);
+        int heat = (int) (fuelRod.getHeatMult(itemStack) * fuelRod.getRodCount(itemStack)
+            * getHeatMultiplier()
+            * pulses
+            * (pulses + 1)
+            / 2);
 
         var heatableNeighbours = this.getHeatableNeighbours();
 
@@ -85,7 +89,8 @@ public void onHeatTick() {
                 int heatToTransfer = heat / remainingNeighbours;
                 heat -= heatToTransfer;
 
-                int rejected = heatableNeighbours.get(i).addHeat(heatToTransfer);
+                int rejected = heatableNeighbours.get(i)
+                    .addHeat(heatToTransfer);
 
                 heat += rejected;
             }

diff --git a/...m/recursive_pineapple/nuclear_horizons/reactors/components/adapters/HeatMoverAdapter.java b/...m/recursive_pineapple/nuclear_horizons/reactors/components/adapters/HeatMoverAdapter.java
@@ -64,7 +64,7 @@ public int addHeat(int delta) {
 
     @Override
     public void onSimulationFinished(SimulationResult result, int componentIndex) {
-        
+
     }
 
     @Override

diff --git a/src/main/java/com/recursive_pineapple/nuclear_horizons/reactors/items/ForeignItems.java b/src/main/java/com/recursive_pineapple/nuclear_horizons/reactors/items/ForeignItems.java
@@ -7,6 +7,9 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+
 import com.recursive_pineapple.nuclear_horizons.reactors.components.ComponentRegistry;
 import com.recursive_pineapple.nuclear_horizons.reactors.components.IComponentAdapter;
 import com.recursive_pineapple.nuclear_horizons.reactors.components.IComponentAdapterFactory;
@@ -24,11 +27,9 @@
 import gregtech.api.items.ItemCoolantCell;
 import gregtech.api.items.ItemCoolantCellIC;
 import gregtech.api.items.ItemRadioactiveCellIC;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
 
 public class ForeignItems {
-    
+
     public static void registerForeignReactorItems() {
         registerCoolantCell((ItemCoolantCellIC) gregtech.api.enums.ItemList.Reactor_Coolant_He_1.getItem());
         registerCoolantCell((ItemCoolantCellIC) gregtech.api.enums.ItemList.Reactor_Coolant_He_3.getItem());
@@ -107,11 +108,17 @@ public static void registerFuelRod(ItemFuelRod item) {
 
     private static <T> Object getField(@Nonnull T object, String name) {
         try {
-            Field field = object.getClass().getDeclaredField(name);
+            Field field = object.getClass()
+                .getDeclaredField(name);
             field.setAccessible(true);
             return field.get(object);
         } catch (NoSuchFieldException | SecurityException | IllegalArgumentException | IllegalAccessException e) {
-            throw new RuntimeException("could not read field '" + name + "' on class " + object.getClass().getCanonicalName(), e);
+            throw new RuntimeException(
+                "could not read field '" + name
+                    + "' on class "
+                    + object.getClass()
+                        .getCanonicalName(),
+                e);
         }
     }
 
@@ -132,12 +139,13 @@ public static class GTCoolantCellAdapter extends ForeignHeatAbsorberItem {
         static {
             try {
                 var lookup = MethodHandles.lookup();
-    
+
                 var getHeatOfStack = ItemCoolantCell.class.getDeclaredMethod("getHeatOfStack", ItemStack.class);
                 getHeatOfStack.setAccessible(true);
                 GET_HEAT_OF_STACK = lookup.unreflect(getHeatOfStack);
 
-                var setHeatForStack = ItemCoolantCell.class.getDeclaredMethod("setHeatForStack", ItemStack.class, int.class);
+                var setHeatForStack = ItemCoolantCell.class
+                    .getDeclaredMethod("setHeatForStack", ItemStack.class, int.class);
                 setHeatForStack.setAccessible(true);
                 SET_HEAT_FOR_STACK = lookup.unreflect(setHeatForStack);
             } catch (NoSuchMethodException | IllegalAccessException e) {
@@ -146,15 +154,15 @@ public static class GTCoolantCellAdapter extends ForeignHeatAbsorberItem {
         }
 
         public GTCoolantCellAdapter(ItemCoolantCellIC item) {
-            super(item, (int)getField(ItemCoolantCell.class, item, "heatStorage"), false);
+            super(item, (int) getField(ItemCoolantCell.class, item, "heatStorage"), false);
         }
 
         @Override
         public int addHeat(@Nonnull ItemStack itemStack, int heat) {
             int consumed = HeatUtils.getConsumableHeat(this.maxHeat, getStoredHeat(itemStack), heat);
-    
+
             setStoredHeat(itemStack, getStoredHeat(itemStack) + consumed);
-    
+
             return heat - consumed;
         }
 
@@ -169,7 +177,7 @@ public void setStoredHeat(@Nonnull ItemStack itemStack, int heat) {
         @Override
         public int getStoredHeat(@Nonnull ItemStack itemStack) {
             try {
-                return (int)GET_HEAT_OF_STACK.invoke(itemStack);
+                return (int) GET_HEAT_OF_STACK.invoke(itemStack);
             } catch (Throwable e) {
                 throw new RuntimeException(e);
             }
@@ -183,7 +191,7 @@ private static class GTBreederCellAdapter extends ForeignBreederRodItem {
         static {
             try {
                 var lookup = MethodHandles.lookup();
-    
+
                 var mProduct = ItemBreederCell.class.getDeclaredField("mProduct");
                 mProduct.setAccessible(true);
                 PRODUCT = lookup.unreflectGetter(mProduct);
@@ -193,7 +201,8 @@ private static class GTBreederCellAdapter extends ForeignBreederRodItem {
         }
 
         public GTBreederCellAdapter(ItemBreederCell item) {
-            super(item,
+            super(
+                item,
                 (int) getField(item, "mHeatBonusStep"),
                 (int) getField(item, "mHeatBonusMultiplier"),
                 item.getMaxDamage());
@@ -202,7 +211,7 @@ public GTBreederCellAdapter(ItemBreederCell item) {
         @Override
         public ItemStack getProduct(@Nonnull ItemStack itemStack) {
             try {
-                return (ItemStack)PRODUCT.invoke((ItemBreederCell)itemStack.getItem());
+                return (ItemStack) PRODUCT.invoke((ItemBreederCell) itemStack.getItem());
             } catch (Throwable e) {
                 throw new RuntimeException(e);
             }
@@ -223,7 +232,8 @@ public boolean canAdaptItem(@Nonnull ItemStack itemStack) {
         }
 
         @Override
-        public @Nonnull IComponentAdapter getAdapter(@Nonnull ItemStack itemStack, @Nonnull IReactorGrid reactor, int x, int y) {
+        public @Nonnull IComponentAdapter getAdapter(@Nonnull ItemStack itemStack, @Nonnull IReactorGrid reactor, int x,
+            int y) {
             return new FuelRodAdapter(reactor, x, y, itemStack, this);
         }
 
@@ -293,8 +303,9 @@ public boolean canAdaptItem(@Nonnull ItemStack itemStack) {
 
         @Override
         public @Nonnull IComponentAdapter getAdapter(@Nonnull ItemStack itemStack, @Nonnull IReactorGrid reactor, int x,
-                int y) {
+            int y) {
             return new FuelRodAdapter(reactor, x, y, itemStack, this) {
+
                 @Override
                 protected double getHeatMultiplier() {
                     return 1.0;

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,6 +1,5 @@
 package com.recursive_pineapple.nuclear_horizons.reactors.items;
 
-import com.recursive_pineapple.nuclear_horizons.reactors.components.ComponentRegistry;
 import com.recursive_pineapple.nuclear_horizons.reactors.items.basic.BasicFuelRodItem;
 import com.recursive_pineapple.nuclear_horizons.reactors.items.basic.BasicHeatAbsorberItem;
 import com.recursive_pineapple.nuclear_horizons.reactors.items.basic.BasicHeatExchangerItem;
@@ -9,8 +8,6 @@
 import com.recursive_pineapple.nuclear_horizons.reactors.items.basic.BasicReactorPlatingItem;
 import com.recursive_pineapple.nuclear_horizons.reactors.items.basic.DebugHeatAbsorber;
 
-import cpw.mods.fml.common.registry.GameRegistry;
-
 public class ItemList {
 
     public static final BasicFuelRodItem URANIUM_1X_ROD = new BasicFuelRodItem(

diff --git a/...va/com/recursive_pineapple/nuclear_horizons/reactors/items/basic/BasicBreederRodItem.java b/...va/com/recursive_pineapple/nuclear_horizons/reactors/items/basic/BasicBreederRodItem.java
@@ -6,6 +6,11 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
+import net.minecraft.client.resources.I18n;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+
 import org.lwjgl.input.Keyboard;
 
 import com.recursive_pineapple.nuclear_horizons.NuclearHorizons;
@@ -18,10 +23,6 @@
 import com.recursive_pineapple.nuclear_horizons.reactors.items.interfaces.IBreederRod;
 
 import cpw.mods.fml.common.registry.GameRegistry;
-import net.minecraft.client.resources.I18n;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
 
 public class BasicBreederRodItem extends Item implements IBreederRod, IComponentAdapterFactory {
 
@@ -61,7 +62,7 @@ public void setDamage(ItemStack stack, int damage) {
 
     @Override
     public double getDurabilityForDisplay(ItemStack stack) {
-        return 1.0 - ((double)(stack.getItemDamage())) / ((double)maxNeutrons);
+        return 1.0 - ((double) (stack.getItemDamage())) / ((double) maxNeutrons);
     }
 
     @Override
@@ -71,7 +72,7 @@ public boolean canAdaptItem(@Nonnull ItemStack itemStack) {
 
     @Override
     public @Nonnull IComponentAdapter getAdapter(@Nonnull ItemStack itemStack, @Nonnull IReactorGrid reactor, int x,
-            int y) {
+        int y) {
         return new BreederRodAdapter(reactor, x, y, itemStack, this);
     }
 
@@ -123,7 +124,7 @@ public void addInformation(ItemStack itemStack, EntityPlayer player, List<String
 
         if (Keyboard.isKeyDown(Keyboard.KEY_LSHIFT) || Keyboard.isKeyDown(Keyboard.KEY_RSHIFT)) {
             var product = this.product;
-            
+
             if (product != null) {
                 desc.add(I18n.format("nh_tooltip.breeder.produces", product.stackSize, product.getDisplayName()));
             }

diff --git a/.../java/com/recursive_pineapple/nuclear_horizons/reactors/items/basic/BasicFuelRodItem.java b/.../java/com/recursive_pineapple/nuclear_horizons/reactors/items/basic/BasicFuelRodItem.java
@@ -6,6 +6,11 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
+import net.minecraft.client.resources.I18n;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+
 import org.lwjgl.input.Keyboard;
 
 import com.recursive_pineapple.nuclear_horizons.Config;
@@ -19,10 +24,6 @@
 import com.recursive_pineapple.nuclear_horizons.reactors.items.interfaces.IBasicFuelRod;
 
 import cpw.mods.fml.common.registry.GameRegistry;
-import net.minecraft.client.resources.I18n;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
 
 public class BasicFuelRodItem extends Item implements IBasicFuelRod, IComponentAdapterFactory {
 
@@ -47,7 +48,7 @@ public BasicFuelRodItem(String name, String textureName, double energyMult, doub
         this.isMox = isMox;
         this.maxHealth = maxHealth;
     }
-    
+
     public void register() {
         GameRegistry.registerItem(this, name);
         ComponentRegistry.registerAdapter(this, this);

diff --git a/.../com/recursive_pineapple/nuclear_horizons/reactors/items/basic/BasicHeatAbsorberItem.java b/.../com/recursive_pineapple/nuclear_horizons/reactors/items/basic/BasicHeatAbsorberItem.java
@@ -9,7 +9,6 @@
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
 
 import com.recursive_pineapple.nuclear_horizons.NuclearHorizons;
 import com.recursive_pineapple.nuclear_horizons.reactors.components.ComponentRegistry;

diff --git a/...java/com/recursive_pineapple/nuclear_horizons/reactors/items/basic/BasicHeatVentItem.java b/...java/com/recursive_pineapple/nuclear_horizons/reactors/items/basic/BasicHeatVentItem.java
@@ -70,7 +70,7 @@ public int getRemainingHealth(@Nonnull ItemStack itemStack) {
         if (this.getMaxHeat(itemStack) == 0) {
             return 1;
         }
-        
+
         return HeatUtils.getNBTInt(itemStack, "head", 0);
     }
 
@@ -83,7 +83,7 @@ public int addHeat(@Nonnull ItemStack itemStack, int heat) {
         int consumed = HeatUtils.getConsumableHeat(this.maxHeat, stored, heat);
 
         tag.setInteger("heat", stored + consumed);
-        
+
         return heat - consumed;
     }
 

diff --git a/.../recursive_pineapple/nuclear_horizons/reactors/items/basic/BasicNeutronReflectorItem.java b/.../recursive_pineapple/nuclear_horizons/reactors/items/basic/BasicNeutronReflectorItem.java
@@ -26,7 +26,7 @@ public class BasicNeutronReflectorItem extends Item implements INeutronReflector
 
     private final String name;
     private final Optional<Integer> maxHealth;
-    
+
     @Nullable
     private ItemStack product;
 

diff --git a/...java/com/recursive_pineapple/nuclear_horizons/reactors/items/basic/DebugHeatAbsorber.java b/...java/com/recursive_pineapple/nuclear_horizons/reactors/items/basic/DebugHeatAbsorber.java
@@ -5,6 +5,11 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+
 import com.recursive_pineapple.nuclear_horizons.NuclearHorizons;
 import com.recursive_pineapple.nuclear_horizons.reactors.components.ComponentRegistry;
 import com.recursive_pineapple.nuclear_horizons.reactors.components.IComponentAdapter;
@@ -14,13 +19,9 @@
 import com.recursive_pineapple.nuclear_horizons.reactors.items.interfaces.IHeatContainer;
 
 import cpw.mods.fml.common.registry.GameRegistry;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
 
 public class DebugHeatAbsorber extends Item implements IHeatContainer, IComponentAdapterFactory {
-    
+
     private final String name;
 
     public DebugHeatAbsorber(String name, String textureName) {
@@ -44,6 +45,7 @@ public boolean canAdaptItem(@Nonnull ItemStack itemStack) {
     public @Nonnull IComponentAdapter getAdapter(@Nonnull ItemStack itemStack, @Nonnull IReactorGrid reactor, int x,
         int y) {
         return new HeatAbsorberAdapter(reactor, x, y, itemStack, this) {
+
             @Override
             public void onEnergyTick() {
                 super.onEnergyTick();
-Original file line number
+Diff line change
@@ Expand Up / @@ -64,7 +64,7 @@ public int addHeat(int delta) { @@
         @Override
         public void onSimulationFinished(SimulationResult result, int componentIndex) {
         }
         @Override
@@ Expand Down @@