From dc3c55e1282db6f5bb364826e6317090041e822d Mon Sep 17 00:00:00 2001 From: RecursivePineapple Date: Wed, 14 Aug 2024 21:06:23 -0400 Subject: [PATCH] applied spotless --- .../nuclear_horizons/ServerProxy.java | 4 +- .../networking/PacketDispatcher.java | 5 +- .../reactors/blocks/FluidBlock.java | 5 +- .../adapters/ReactorPlatingAdapter.java | 6 +- .../reactors/fluids/CoolantRegistry.java | 14 ++- .../reactors/fluids/FluidList.java | 5 +- .../items/BasicReactorPlatingItem.java | 24 ++-- .../reactors/items/IReactorPlating.java | 1 + .../reactors/tile/TileFluidPort.java | 15 ++- .../reactors/tile/TileReactorCore.java | 118 ++++++++++-------- 10 files changed, 111 insertions(+), 86 deletions(-) diff --git a/src/main/java/com/recursive_pineapple/nuclear_horizons/ServerProxy.java b/src/main/java/com/recursive_pineapple/nuclear_horizons/ServerProxy.java index c75e30e..a5b8107 100644 --- a/src/main/java/com/recursive_pineapple/nuclear_horizons/ServerProxy.java +++ b/src/main/java/com/recursive_pineapple/nuclear_horizons/ServerProxy.java @@ -3,10 +3,10 @@ import cpw.mods.fml.relauncher.Side; public class ServerProxy extends CommonProxy { - + @Override public Side getSide() { return Side.SERVER; } - + } diff --git a/src/main/java/com/recursive_pineapple/nuclear_horizons/networking/PacketDispatcher.java b/src/main/java/com/recursive_pineapple/nuclear_horizons/networking/PacketDispatcher.java index 829f8a6..c95e370 100644 --- a/src/main/java/com/recursive_pineapple/nuclear_horizons/networking/PacketDispatcher.java +++ b/src/main/java/com/recursive_pineapple/nuclear_horizons/networking/PacketDispatcher.java @@ -1,5 +1,8 @@ package com.recursive_pineapple.nuclear_horizons.networking; +import net.minecraft.server.MinecraftServer; +import net.minecraft.world.WorldServer; + import com.recursive_pineapple.nuclear_horizons.NuclearHorizons; import com.recursive_pineapple.nuclear_horizons.reactors.tile.TileReactorSimulator; import com.recursive_pineapple.nuclear_horizons.reactors.tile.simulator.SimulationResult; @@ -10,8 +13,6 @@ import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper; import cpw.mods.fml.relauncher.Side; import io.netty.buffer.ByteBuf; -import net.minecraft.server.MinecraftServer; -import net.minecraft.world.WorldServer; public class PacketDispatcher { diff --git a/src/main/java/com/recursive_pineapple/nuclear_horizons/reactors/blocks/FluidBlock.java b/src/main/java/com/recursive_pineapple/nuclear_horizons/reactors/blocks/FluidBlock.java index 8c17205..e0cf605 100644 --- a/src/main/java/com/recursive_pineapple/nuclear_horizons/reactors/blocks/FluidBlock.java +++ b/src/main/java/com/recursive_pineapple/nuclear_horizons/reactors/blocks/FluidBlock.java @@ -1,7 +1,5 @@ package com.recursive_pineapple.nuclear_horizons.reactors.blocks; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.DamageSource; @@ -10,6 +8,9 @@ import net.minecraftforge.fluids.BlockFluidClassic; import net.minecraftforge.fluids.Fluid; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class FluidBlock extends BlockFluidClassic { public static final DamageSource HOT_FLUID_DAMAGE = new DamageSource("nh_hot_fluid"); diff --git a/src/main/java/com/recursive_pineapple/nuclear_horizons/reactors/components/adapters/ReactorPlatingAdapter.java b/src/main/java/com/recursive_pineapple/nuclear_horizons/reactors/components/adapters/ReactorPlatingAdapter.java index aa3c2a3..2229eb5 100644 --- a/src/main/java/com/recursive_pineapple/nuclear_horizons/reactors/components/adapters/ReactorPlatingAdapter.java +++ b/src/main/java/com/recursive_pineapple/nuclear_horizons/reactors/components/adapters/ReactorPlatingAdapter.java @@ -1,11 +1,11 @@ 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.items.IReactorPlating; -import net.minecraft.item.ItemStack; - public class ReactorPlatingAdapter implements IComponentAdapter { @SuppressWarnings("unused") @@ -41,7 +41,7 @@ public ItemStack getItemStack() { public double getExplosionRadiusMultiplier() { return plating.getExplosionRadiusMultiplier(itemStack); } - + @Override public int getReactorMaxHeatIncrease() { return plating.getReactorMaxHeatIncrease(itemStack); diff --git a/src/main/java/com/recursive_pineapple/nuclear_horizons/reactors/fluids/CoolantRegistry.java b/src/main/java/com/recursive_pineapple/nuclear_horizons/reactors/fluids/CoolantRegistry.java index e5a05db..dd7c11b 100644 --- a/src/main/java/com/recursive_pineapple/nuclear_horizons/reactors/fluids/CoolantRegistry.java +++ b/src/main/java/com/recursive_pineapple/nuclear_horizons/reactors/fluids/CoolantRegistry.java @@ -6,25 +6,26 @@ import net.minecraftforge.fluids.Fluid; public class CoolantRegistry { - + private static final HashMap coolantsByColdFluid = new HashMap<>(); private static final HashMap coolantsByHotFluid = new HashMap<>(); private static final HashMap coolantsByFluid = new HashMap<>(); - + private CoolantRegistry() { - + } /** * Registers a coolant that can be used to cool a nuclear reactor - * @param cold The cold input coolant - * @param hot The heated output coolant + * + * @param cold The cold input coolant + * @param hot The heated output coolant * @param specificHeatCapacity The amount of HU that can be stored in one mB of coolant */ public static void registerCoolant(Fluid cold, Fluid hot, int specificHeatCapacity) { Objects.requireNonNull(cold); Objects.requireNonNull(hot); - if(specificHeatCapacity <= 0) throw new IllegalArgumentException("specificHeatCapacity"); + if (specificHeatCapacity <= 0) throw new IllegalArgumentException("specificHeatCapacity"); Coolant coolant = new Coolant(cold, hot, specificHeatCapacity); @@ -47,6 +48,7 @@ public static Coolant getCoolantInfo(Fluid fluid) { } public static class Coolant { + public final Fluid cold, hot; public final int specificHeatCapacity; diff --git a/src/main/java/com/recursive_pineapple/nuclear_horizons/reactors/fluids/FluidList.java b/src/main/java/com/recursive_pineapple/nuclear_horizons/reactors/fluids/FluidList.java index 85c6f6f..e1a8342 100644 --- a/src/main/java/com/recursive_pineapple/nuclear_horizons/reactors/fluids/FluidList.java +++ b/src/main/java/com/recursive_pineapple/nuclear_horizons/reactors/fluids/FluidList.java @@ -1,11 +1,10 @@ package com.recursive_pineapple.nuclear_horizons.reactors.fluids; -import com.recursive_pineapple.nuclear_horizons.reactors.blocks.BlockList; - -// import gregtech.api.enums.Materials; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; +import com.recursive_pineapple.nuclear_horizons.reactors.blocks.BlockList; + public class FluidList { public static final String COOLANT_NAME = "nh_coolant"; diff --git a/src/main/java/com/recursive_pineapple/nuclear_horizons/reactors/items/BasicReactorPlatingItem.java b/src/main/java/com/recursive_pineapple/nuclear_horizons/reactors/items/BasicReactorPlatingItem.java index 8d438cc..2e827d2 100644 --- a/src/main/java/com/recursive_pineapple/nuclear_horizons/reactors/items/BasicReactorPlatingItem.java +++ b/src/main/java/com/recursive_pineapple/nuclear_horizons/reactors/items/BasicReactorPlatingItem.java @@ -4,6 +4,11 @@ import javax.annotation.Nonnull; +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; @@ -12,17 +17,13 @@ import com.recursive_pineapple.nuclear_horizons.reactors.components.IReactorGrid; import com.recursive_pineapple.nuclear_horizons.reactors.components.adapters.ReactorPlatingAdapter; -import net.minecraft.client.resources.I18n; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; - public class BasicReactorPlatingItem extends Item implements IReactorPlating, IComponentAdapterFactory { private final double explosionRadiusMultiplier; private final int maxHeatIncrease; - public BasicReactorPlatingItem(String name, String textureName, double explosionRadiusMultiplier, int maxHeatIncrease) { + public BasicReactorPlatingItem(String name, String textureName, double explosionRadiusMultiplier, + int maxHeatIncrease) { setUnlocalizedName(name); setTextureName(NuclearHorizons.MODID + ":" + textureName); @@ -34,7 +35,7 @@ public BasicReactorPlatingItem(String name, String textureName, double explosion public double getExplosionRadiusMultiplier(@Nonnull ItemStack itemStack) { return explosionRadiusMultiplier; } - + @Override public int getReactorMaxHeatIncrease(@Nonnull ItemStack itemStack) { return maxHeatIncrease; @@ -47,7 +48,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 ReactorPlatingAdapter(reactor, x, y, itemStack, this); } @@ -58,9 +59,12 @@ public void addInformation(ItemStack itemStack, EntityPlayer player, List= 0.4) { + if (heatRatio >= 0.4) { spawnSmoke(xCoord, yCoord, zCoord); for (var d : DirectionUtil.values()) { @@ -364,11 +369,19 @@ public void updateEntity() { } private void spawnSmoke(int x, int y, int z) { - if(worldObj.getBlock(x, y + 1, z).isBlockNormalCube()) { + if (worldObj.getBlock(x, y + 1, z) + .isBlockNormalCube()) { return; } - - worldObj.spawnParticle("smoke", x + Math.random() * 0.8 + 0.1, y + 1.1, z + Math.random() * 0.8 + 0.1, 0, 0.01 * (Math.random() * 0.5 + 1), 0); + + worldObj.spawnParticle( + "smoke", + x + Math.random() * 0.8 + 0.1, + y + 1.1, + z + Math.random() * 0.8 + 0.1, + 0, + 0.01 * (Math.random() * 0.5 + 1), + 0); } @Override @@ -653,7 +666,8 @@ public void resetHullHeatCache() { private void doHeatTick() { this.addedHeat = 0; - // a component could change their hull heat increase each tick, so we have to invalidate this here and not when components change + // a component could change their hull heat increase each tick, so we have to invalidate this here and not when + // components change resetHullHeatCache(); for (int row = 0; row < ROW_COUNT; row++) { @@ -711,8 +725,8 @@ private void doHeatDamage() { final int DAMAGE_RADIUS = 3; // flames - if(heatRatio >= 0.4) { - for(int i = 0; i < 10; i++) { + if (heatRatio >= 0.4) { + for (int i = 0; i < 10; i++) { int x = xCoord + (int) map(Math.random(), 0, 1, -DAMAGE_RADIUS, DAMAGE_RADIUS); int y = yCoord + (int) map(Math.random(), 0, 1, -DAMAGE_RADIUS, DAMAGE_RADIUS); int z = zCoord + (int) map(Math.random(), 0, 1, -DAMAGE_RADIUS, DAMAGE_RADIUS); @@ -726,17 +740,18 @@ private void doHeatDamage() { } } } - + // evaporation if (heatRatio >= 0.5) { - for(int i = 0; i < 10; i++) { + for (int i = 0; i < 10; i++) { int x = xCoord + (int) map(Math.random(), 0, 1, -DAMAGE_RADIUS, DAMAGE_RADIUS); int y = yCoord + (int) map(Math.random(), 0, 1, -DAMAGE_RADIUS, DAMAGE_RADIUS); int z = zCoord + (int) map(Math.random(), 0, 1, -DAMAGE_RADIUS, DAMAGE_RADIUS); var block = worldObj.getBlock(x, y, z); - if (block instanceof IFluidBlock fluidBlock && fluidBlock.getFluid().getTemperature() < 375) { + if (block instanceof IFluidBlock fluidBlock && fluidBlock.getFluid() + .getTemperature() < 375) { worldObj.setBlock(x, y, z, Blocks.air, 0, 3); // fire hiss worldObj.playAuxSFX(1004, x, y, z, 0); @@ -744,7 +759,7 @@ private void doHeatDamage() { } } } - + // damage if (heatRatio >= 0.7) { var entities = worldObj.getEntitiesWithinAABB( @@ -757,20 +772,20 @@ private void doHeatDamage() { yCoord + DAMAGE_RADIUS, zCoord + DAMAGE_RADIUS)); - for(var entity : entities) { + for (var entity : entities) { entity.attackEntityFrom(RADIATION_DAMAGE, 4); } } - + // lava if (heatRatio >= 0.85) { - for(int i = 0; i < 10; i++) { + for (int i = 0; i < 10; i++) { int x = xCoord + (int) map(Math.random(), 0, 1, -DAMAGE_RADIUS, DAMAGE_RADIUS); int y = yCoord + (int) map(Math.random(), 0, 1, -DAMAGE_RADIUS, DAMAGE_RADIUS); int z = zCoord + (int) map(Math.random(), 0, 1, -DAMAGE_RADIUS, DAMAGE_RADIUS); // don't melt the reactor or its chambers, because why would we want to do that? :tootroll: - if((Math.abs(x - xCoord) + Math.abs(y - yCoord) + Math.abs(z - zCoord)) <= 1) { + if ((Math.abs(x - xCoord) + Math.abs(y - yCoord) + Math.abs(z - zCoord)) <= 1) { continue; } @@ -784,16 +799,17 @@ private void doHeatDamage() { } } } - + // explosion if (heatRatio >= 1) { worldObj.newExplosion( null, - xCoord + 0.5, yCoord + 0.5, zCoord + 0.5, + xCoord + 0.5, + yCoord + 0.5, + zCoord + 0.5, (float) (30 * getExplosionRadiusMultiplier()), true, - true - ); + true); } } @@ -932,20 +948,23 @@ public void addHullHeat(int delta) { @Override public int addAirHeat(int airHeat) { if (this.isFluid) { - if(this.coolantTank.getFluidAmount() == 0) { + if (this.coolantTank.getFluidAmount() == 0) { return airHeat; } // cache this because it will be called several times a second - may not be completely necessary though - if((coolantCache == null || coolantCache.cold != this.coolantTank.getFluid().getFluid())) { - if(this.coolantTank.getFluidAmount() == 0) { + if ((coolantCache == null || coolantCache.cold != this.coolantTank.getFluid() + .getFluid())) { + if (this.coolantTank.getFluidAmount() == 0) { coolantCache = null; } else { - coolantCache = CoolantRegistry.getCoolantInfo(this.coolantTank.getFluid().getFluid()); + coolantCache = CoolantRegistry.getCoolantInfo( + this.coolantTank.getFluid() + .getFluid()); } } - if(coolantCache == null) { + if (coolantCache == null) { return airHeat; } @@ -953,9 +972,8 @@ public int addAirHeat(int airHeat) { int heatableCoolant = Math.min( this.coolantTank.getFluidAmount(), - this.hotCoolantTank.getCapacity() - this.hotCoolantTank.getFluidAmount() - ); - + this.hotCoolantTank.getCapacity() - this.hotCoolantTank.getFluidAmount()); + int consumedCoolant = Math.min(roundedHeat / coolantCache.specificHeatCapacity, heatableCoolant); this.roundedHeat -= consumedCoolant * coolantCache.specificHeatCapacity; this.addedHeat += consumedCoolant * coolantCache.specificHeatCapacity;