From 619e148f0419984a4d47e7d4770dc221b36baa47 Mon Sep 17 00:00:00 2001 From: RecursivePineapple Date: Sat, 28 Sep 2024 21:35:34 -0400 Subject: [PATCH] applied spotless --- .../adapters/BreederRodAdapter.java | 9 ++-- .../components/adapters/FuelRodAdapter.java | 11 +++-- .../components/adapters/HeatMoverAdapter.java | 2 +- .../reactors/items/ForeignItems.java | 43 ++++++++++++------- .../reactors/items/ItemList.java | 3 -- .../items/basic/BasicBreederRodItem.java | 15 ++++--- .../items/basic/BasicFuelRodItem.java | 11 ++--- .../items/basic/BasicHeatAbsorberItem.java | 1 - .../items/basic/BasicHeatVentItem.java | 4 +- .../basic/BasicNeutronReflectorItem.java | 2 +- .../items/basic/DebugHeatAbsorber.java | 12 +++--- .../items/foreign/ForeignBreederRodItem.java | 10 ++--- .../items/foreign/ForeignFuelRodItem.java | 12 +++--- .../foreign/ForeignHeatAbsorberItem.java | 10 ++--- .../foreign/ForeignNeutronReflectorItem.java | 10 ++--- .../items/interfaces/IBasicFuelRod.java | 4 +- .../items/interfaces/IBreederRod.java | 1 + .../reactors/tile/TileReactorSimulator.java | 6 +-- .../simulator/SimulationComponentResult.java | 7 +-- .../tile/simulator/SimulatorProtos.java | 1 + 20 files changed, 95 insertions(+), 79 deletions(-) diff --git a/src/main/java/com/recursive_pineapple/nuclear_horizons/reactors/components/adapters/BreederRodAdapter.java b/src/main/java/com/recursive_pineapple/nuclear_horizons/reactors/components/adapters/BreederRodAdapter.java index 2eee885..fc18458 100644 --- a/src/main/java/com/recursive_pineapple/nuclear_horizons/reactors/components/adapters/BreederRodAdapter.java +++ b/src/main/java/com/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/src/main/java/com/recursive_pineapple/nuclear_horizons/reactors/components/adapters/FuelRodAdapter.java b/src/main/java/com/recursive_pineapple/nuclear_horizons/reactors/components/adapters/FuelRodAdapter.java index 02d0851..f867b8a 100644 --- a/src/main/java/com/recursive_pineapple/nuclear_horizons/reactors/components/adapters/FuelRodAdapter.java +++ b/src/main/java/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/src/main/java/com/recursive_pineapple/nuclear_horizons/reactors/components/adapters/HeatMoverAdapter.java b/src/main/java/com/recursive_pineapple/nuclear_horizons/reactors/components/adapters/HeatMoverAdapter.java index b9b2eba..88baba0 100644 --- a/src/main/java/com/recursive_pineapple/nuclear_horizons/reactors/components/adapters/HeatMoverAdapter.java +++ b/src/main/java/com/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 index fddb816..b066de5 100644 --- 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 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 index 2891758..847a51d 100644 --- 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/src/main/java/com/recursive_pineapple/nuclear_horizons/reactors/items/basic/BasicBreederRodItem.java b/src/main/java/com/recursive_pineapple/nuclear_horizons/reactors/items/basic/BasicBreederRodItem.java index 325e9d9..692fed6 100644 --- a/src/main/java/com/recursive_pineapple/nuclear_horizons/reactors/items/basic/BasicBreederRodItem.java +++ b/src/main/java/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 maxHealth; - + @Nullable private ItemStack product; diff --git a/src/main/java/com/recursive_pineapple/nuclear_horizons/reactors/items/basic/DebugHeatAbsorber.java b/src/main/java/com/recursive_pineapple/nuclear_horizons/reactors/items/basic/DebugHeatAbsorber.java index 720941e..4e565cc 100644 --- a/src/main/java/com/recursive_pineapple/nuclear_horizons/reactors/items/basic/DebugHeatAbsorber.java +++ b/src/main/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(); diff --git a/src/main/java/com/recursive_pineapple/nuclear_horizons/reactors/items/foreign/ForeignBreederRodItem.java b/src/main/java/com/recursive_pineapple/nuclear_horizons/reactors/items/foreign/ForeignBreederRodItem.java index 270f155..a12e9b9 100644 --- a/src/main/java/com/recursive_pineapple/nuclear_horizons/reactors/items/foreign/ForeignBreederRodItem.java +++ b/src/main/java/com/recursive_pineapple/nuclear_horizons/reactors/items/foreign/ForeignBreederRodItem.java @@ -3,17 +3,17 @@ 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.IComponentAdapter; import com.recursive_pineapple.nuclear_horizons.reactors.components.IComponentAdapterFactory; import com.recursive_pineapple.nuclear_horizons.reactors.components.IReactorGrid; import com.recursive_pineapple.nuclear_horizons.reactors.components.adapters.BreederRodAdapter; import com.recursive_pineapple.nuclear_horizons.reactors.items.interfaces.IBreederRod; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; - public class ForeignBreederRodItem implements IBreederRod, IComponentAdapterFactory { - + @Nonnull private final Item item; @@ -36,7 +36,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); } diff --git a/src/main/java/com/recursive_pineapple/nuclear_horizons/reactors/items/foreign/ForeignFuelRodItem.java b/src/main/java/com/recursive_pineapple/nuclear_horizons/reactors/items/foreign/ForeignFuelRodItem.java index 9c778a0..5e30467 100644 --- a/src/main/java/com/recursive_pineapple/nuclear_horizons/reactors/items/foreign/ForeignFuelRodItem.java +++ b/src/main/java/com/recursive_pineapple/nuclear_horizons/reactors/items/foreign/ForeignFuelRodItem.java @@ -3,15 +3,15 @@ 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.IComponentAdapter; import com.recursive_pineapple.nuclear_horizons.reactors.components.IComponentAdapterFactory; import com.recursive_pineapple.nuclear_horizons.reactors.components.IReactorGrid; import com.recursive_pineapple.nuclear_horizons.reactors.components.adapters.FuelRodAdapter; import com.recursive_pineapple.nuclear_horizons.reactors.items.interfaces.IBasicFuelRod; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; - public class ForeignFuelRodItem implements IBasicFuelRod, IComponentAdapterFactory { @Nonnull @@ -21,12 +21,12 @@ public class ForeignFuelRodItem implements IBasicFuelRod, IComponentAdapterFacto protected final int rodCount; protected final boolean isMox; protected final int maxHealth; - + @Nullable protected ItemStack product; public ForeignFuelRodItem(@Nonnull Item item, double energyMult, double heatMult, int rodCount, boolean isMox, - int maxHealth) { + int maxHealth) { this.item = item; this.energyMult = energyMult; this.heatMult = heatMult; @@ -46,7 +46,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 FuelRodAdapter(reactor, x, y, itemStack, this); } diff --git a/src/main/java/com/recursive_pineapple/nuclear_horizons/reactors/items/foreign/ForeignHeatAbsorberItem.java b/src/main/java/com/recursive_pineapple/nuclear_horizons/reactors/items/foreign/ForeignHeatAbsorberItem.java index eebbaab..26c6504 100644 --- a/src/main/java/com/recursive_pineapple/nuclear_horizons/reactors/items/foreign/ForeignHeatAbsorberItem.java +++ b/src/main/java/com/recursive_pineapple/nuclear_horizons/reactors/items/foreign/ForeignHeatAbsorberItem.java @@ -3,6 +3,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.IComponentAdapter; import com.recursive_pineapple.nuclear_horizons.reactors.components.IComponentAdapterFactory; import com.recursive_pineapple.nuclear_horizons.reactors.components.IReactorGrid; @@ -10,11 +13,8 @@ import com.recursive_pineapple.nuclear_horizons.reactors.items.HeatUtils; import com.recursive_pineapple.nuclear_horizons.reactors.items.interfaces.IHeatContainer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; - public class ForeignHeatAbsorberItem implements IHeatContainer, IComponentAdapterFactory { - + @Nonnull protected final Item item; protected final int maxHeat; @@ -22,7 +22,7 @@ public class ForeignHeatAbsorberItem implements IHeatContainer, IComponentAdapte @Nullable protected ItemStack product; - + public ForeignHeatAbsorberItem(@Nonnull Item item, int maxHeat, boolean consumable) { this.item = item; this.maxHeat = maxHeat; diff --git a/src/main/java/com/recursive_pineapple/nuclear_horizons/reactors/items/foreign/ForeignNeutronReflectorItem.java b/src/main/java/com/recursive_pineapple/nuclear_horizons/reactors/items/foreign/ForeignNeutronReflectorItem.java index 3d081cc..662edfc 100644 --- a/src/main/java/com/recursive_pineapple/nuclear_horizons/reactors/items/foreign/ForeignNeutronReflectorItem.java +++ b/src/main/java/com/recursive_pineapple/nuclear_horizons/reactors/items/foreign/ForeignNeutronReflectorItem.java @@ -5,17 +5,17 @@ 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.IComponentAdapter; import com.recursive_pineapple.nuclear_horizons.reactors.components.IComponentAdapterFactory; import com.recursive_pineapple.nuclear_horizons.reactors.components.IReactorGrid; import com.recursive_pineapple.nuclear_horizons.reactors.components.adapters.NeutronReflectorAdapter; import com.recursive_pineapple.nuclear_horizons.reactors.items.interfaces.INeutronReflector; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; - public class ForeignNeutronReflectorItem implements INeutronReflector, IComponentAdapterFactory { - + @Nonnull private final Item item; @@ -51,7 +51,7 @@ public boolean canAdaptItem(@Nonnull ItemStack itemStack) { @Override public int getRemainingHealth(@Nonnull ItemStack itemStack) { - if(this.maxHealth.isPresent()) { + if (this.maxHealth.isPresent()) { return this.maxHealth.get() - itemStack.getItemDamage(); } else { return 1; diff --git a/src/main/java/com/recursive_pineapple/nuclear_horizons/reactors/items/interfaces/IBasicFuelRod.java b/src/main/java/com/recursive_pineapple/nuclear_horizons/reactors/items/interfaces/IBasicFuelRod.java index cee3cf9..094a97b 100644 --- a/src/main/java/com/recursive_pineapple/nuclear_horizons/reactors/items/interfaces/IBasicFuelRod.java +++ b/src/main/java/com/recursive_pineapple/nuclear_horizons/reactors/items/interfaces/IBasicFuelRod.java @@ -3,10 +3,10 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; -import com.recursive_pineapple.nuclear_horizons.Config; - import net.minecraft.item.ItemStack; +import com.recursive_pineapple.nuclear_horizons.Config; + public interface IBasicFuelRod { public double getEnergyMult(@Nonnull ItemStack itemStack); diff --git a/src/main/java/com/recursive_pineapple/nuclear_horizons/reactors/items/interfaces/IBreederRod.java b/src/main/java/com/recursive_pineapple/nuclear_horizons/reactors/items/interfaces/IBreederRod.java index f562aa2..6016bc9 100644 --- a/src/main/java/com/recursive_pineapple/nuclear_horizons/reactors/items/interfaces/IBreederRod.java +++ b/src/main/java/com/recursive_pineapple/nuclear_horizons/reactors/items/interfaces/IBreederRod.java @@ -5,6 +5,7 @@ import net.minecraft.item.ItemStack; public interface IBreederRod { + public ItemStack getProduct(@Nonnull ItemStack itemStack); public int getMaxNeutrons(@Nonnull ItemStack itemStack); diff --git a/src/main/java/com/recursive_pineapple/nuclear_horizons/reactors/tile/TileReactorSimulator.java b/src/main/java/com/recursive_pineapple/nuclear_horizons/reactors/tile/TileReactorSimulator.java index a972925..faa298f 100644 --- a/src/main/java/com/recursive_pineapple/nuclear_horizons/reactors/tile/TileReactorSimulator.java +++ b/src/main/java/com/recursive_pineapple/nuclear_horizons/reactors/tile/TileReactorSimulator.java @@ -338,11 +338,7 @@ private Widget resultsPage() { addResultLine(lines, "active_time", "seconds", r == null ? null : r.activeTime); addResultLine(lines, "inactive_time", "seconds", r == null ? null : r.pausedTime); - addResultLine( - lines, - "avg_power", - "eu_per_tick", - r == null ? null : (r.totalEU / 20 / r.simTime)); + addResultLine(lines, "avg_power", "eu_per_tick", r == null ? null : (r.totalEU / 20 / r.simTime)); addResultLine(lines, "min_power", "eu_per_tick", r == null ? null : r.minEUpT); addResultLine(lines, "max_power", "eu_per_tick", r == null ? null : r.maxEUpT); diff --git a/src/main/java/com/recursive_pineapple/nuclear_horizons/reactors/tile/simulator/SimulationComponentResult.java b/src/main/java/com/recursive_pineapple/nuclear_horizons/reactors/tile/simulator/SimulationComponentResult.java index 82e5241..cca458c 100644 --- a/src/main/java/com/recursive_pineapple/nuclear_horizons/reactors/tile/simulator/SimulationComponentResult.java +++ b/src/main/java/com/recursive_pineapple/nuclear_horizons/reactors/tile/simulator/SimulationComponentResult.java @@ -26,21 +26,22 @@ public class SimulationComponentResult { // spotless:on public static class CustomResult { + public String i18n; - + // MUTUALLY EXCLUSIVE! public Double double_value; public Long long_value; public String string_value; public void add(double d) { - if(double_value == null) double_value = 0d; + if (double_value == null) double_value = 0d; double_value += d; } public void add(long l) { - if(long_value == null) long_value = 0l; + if (long_value == null) long_value = 0l; long_value += l; } diff --git a/src/main/java/com/recursive_pineapple/nuclear_horizons/reactors/tile/simulator/SimulatorProtos.java b/src/main/java/com/recursive_pineapple/nuclear_horizons/reactors/tile/simulator/SimulatorProtos.java index 7db9fde..1f52145 100644 --- a/src/main/java/com/recursive_pineapple/nuclear_horizons/reactors/tile/simulator/SimulatorProtos.java +++ b/src/main/java/com/recursive_pineapple/nuclear_horizons/reactors/tile/simulator/SimulatorProtos.java @@ -1,3 +1,4 @@ +// spotless:off // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: src/main/java/com/recursive_pineapple/nuclear_horizons/reactors/tile/simulator/SimulationConfigProto.proto