Skip to content

Commit

Permalink
applied spotless
Browse files Browse the repository at this point in the history
  • Loading branch information
RecursivePineapple committed Aug 15, 2024
1 parent 21dd6d6 commit dc3c55e
Show file tree
Hide file tree
Showing 10 changed files with 111 additions and 86 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
import cpw.mods.fml.relauncher.Side;

public class ServerProxy extends CommonProxy {

@Override
public Side getSide() {
return Side.SERVER;
}

}
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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 {

Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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");
Expand Down
Original file line number Diff line number Diff line change
@@ -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")
Expand Down Expand Up @@ -41,7 +41,7 @@ public ItemStack getItemStack() {
public double getExplosionRadiusMultiplier() {
return plating.getExplosionRadiusMultiplier(itemStack);
}

@Override
public int getReactorMaxHeatIncrease() {
return plating.getReactorMaxHeatIncrease(itemStack);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,25 +6,26 @@
import net.minecraftforge.fluids.Fluid;

public class CoolantRegistry {

private static final HashMap<Fluid, Coolant> coolantsByColdFluid = new HashMap<>();
private static final HashMap<Fluid, Coolant> coolantsByHotFluid = new HashMap<>();
private static final HashMap<Fluid, Coolant> 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);

Expand All @@ -47,6 +48,7 @@ public static Coolant getCoolantInfo(Fluid fluid) {
}

public static class Coolant {

public final Fluid cold, hot;
public final int specificHeatCapacity;

Expand Down
Original file line number Diff line number Diff line change
@@ -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";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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);

Expand All @@ -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;
Expand All @@ -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);
}

Expand All @@ -58,9 +59,12 @@ public void addInformation(ItemStack itemStack, EntityPlayer player, List<String

if (Keyboard.isKeyDown(Keyboard.KEY_LSHIFT) || Keyboard.isKeyDown(Keyboard.KEY_RSHIFT)) {
if (explosionRadiusMultiplier != 1) {
desc.add(I18n.format("nh_tooltip.plating_explosion", (int) Math.round((1 - explosionRadiusMultiplier) * 100)));
desc.add(
I18n.format(
"nh_tooltip.plating_explosion",
(int) Math.round((1 - explosionRadiusMultiplier) * 100)));
}

if (maxHeatIncrease != 0) {
desc.add(I18n.format("nh_tooltip.plating_heat", maxHeatIncrease));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import net.minecraft.item.ItemStack;

public interface IReactorPlating {

public default double getExplosionRadiusMultiplier(@Nonnull ItemStack itemStack) {
return 1.0;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,13 +95,14 @@ public int fill(ForgeDirection from, FluidStack resource, boolean doFill) {
}

// this should only be called a few times a second, so we don't need to cache it
if(!CoolantRegistry.isColdCoolant(resource.getFluid())) {
if (!CoolantRegistry.isColdCoolant(resource.getFluid())) {
return 0;
}

var tank = reactor.coolantTank;

if(tank.getFluid() == null || resource.getFluid() == tank.getFluid().getFluid()) {
if (tank.getFluid() == null || resource.getFluid() == tank.getFluid()
.getFluid()) {
return tank.fill(resource, doFill);
} else {
return 0;
Expand All @@ -118,7 +119,8 @@ public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrai

var tank = reactor.hotCoolantTank;

if(tank.getFluid() != null && resource.getFluid() == tank.getFluid().getFluid()) {
if (tank.getFluid() != null && resource.getFluid() == tank.getFluid()
.getFluid()) {
return tank.drain(resource.amount, doDrain);
} else {
return null;
Expand All @@ -135,7 +137,7 @@ public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) {

var tank = reactor.hotCoolantTank;

if(tank.getFluid() != null) {
if (tank.getFluid() != null) {
return tank.drain(maxDrain, doDrain);
} else {
return null;
Expand All @@ -160,9 +162,6 @@ public FluidTankInfo[] getTankInfo(ForgeDirection from) {
return new FluidTankInfo[0];
}

return new FluidTankInfo[] {
reactor.coolantTank.getInfo(),
reactor.hotCoolantTank.getInfo()
};
return new FluidTankInfo[] { reactor.coolantTank.getInfo(), reactor.hotCoolantTank.getInfo() };
}
}
Loading

0 comments on commit dc3c55e

Please sign in to comment.