diff --git a/src/main/java/gregtech/api/items/materialitem/MetaPrefixItem.java b/src/main/java/gregtech/api/items/materialitem/MetaPrefixItem.java index 5981ad18fac..cfe1c65aee4 100644 --- a/src/main/java/gregtech/api/items/materialitem/MetaPrefixItem.java +++ b/src/main/java/gregtech/api/items/materialitem/MetaPrefixItem.java @@ -158,7 +158,7 @@ public void onUpdate(@NotNull ItemStack itemStack, @NotNull World worldIn, @NotN if (metaItems.containsKey((short) itemStack.getItemDamage()) && entityIn instanceof EntityLivingBase entity) { if (entityIn.ticksExisted % 20 == 0) { - //Handle heat damage + // Handle heat damage if (prefix.heatDamageFunction != null) { Material material = getMaterial(itemStack); if (material != null) { @@ -183,7 +183,7 @@ public void onUpdate(@NotNull ItemStack itemStack, @NotNull World worldIn, @NotN } } - //Handle radiation damage + // Handle radiation damage if (prefix.radiationDamageFunction != null) { Material material = getMaterial(itemStack); if (material != null) { @@ -197,7 +197,8 @@ public void onUpdate(@NotNull ItemStack itemStack, @NotNull World worldIn, @NotN } } if (radiationDamage > 0.0) { - entity.attackEntityFrom(DamageSources.getRadioactiveDamage().setDamageBypassesArmor(), radiationDamage); + entity.attackEntityFrom(DamageSources.getRadioactiveDamage().setDamageBypassesArmor(), + radiationDamage); } } } diff --git a/src/main/java/gregtech/api/unification/material/Material.java b/src/main/java/gregtech/api/unification/material/Material.java index 026d6eddd6b..4151dab0ba5 100644 --- a/src/main/java/gregtech/api/unification/material/Material.java +++ b/src/main/java/gregtech/api/unification/material/Material.java @@ -1077,9 +1077,11 @@ public Builder fissionFuelProperties(int maxTemperature, int duration, double sl return this; } - public Builder coolantProperty(Material hotCoolant, Material hotHPCoolant, double moderatorFactor, double coolingFactor, double boilingPoint, double absorption, double pressure) { + public Builder coolantProperty(Material hotCoolant, Material hotHPCoolant, double moderatorFactor, + double coolingFactor, double boilingPoint, double absorption, double pressure) { properties.ensureSet(PropertyKey.FLUID); - properties.setProperty(PropertyKey.COOLANT, new CoolantProperty(hotCoolant, hotHPCoolant, moderatorFactor, coolingFactor, boilingPoint, absorption, pressure)); + properties.setProperty(PropertyKey.COOLANT, new CoolantProperty(hotCoolant, hotHPCoolant, moderatorFactor, + coolingFactor, boilingPoint, absorption, pressure)); return this; } diff --git a/src/main/java/gregtech/api/unification/material/properties/CoolantProperty.java b/src/main/java/gregtech/api/unification/material/properties/CoolantProperty.java index 6329216c988..d1e7d14c3d4 100644 --- a/src/main/java/gregtech/api/unification/material/properties/CoolantProperty.java +++ b/src/main/java/gregtech/api/unification/material/properties/CoolantProperty.java @@ -12,7 +12,8 @@ public class CoolantProperty implements IMaterialProperty { private double absorption; private double pressure; - public CoolantProperty(Material hotCoolant, Material hotHPCoolant, double moderatorFactor, double coolingFactor, double boilingPoint, double absorption, double pressure) { + public CoolantProperty(Material hotCoolant, Material hotHPCoolant, double moderatorFactor, double coolingFactor, + double boilingPoint, double absorption, double pressure) { this.hotCoolant = hotCoolant; this.hotHPCoolant = hotHPCoolant; this.moderatorFactor = moderatorFactor; diff --git a/src/main/java/gregtech/api/unification/ore/OrePrefix.java b/src/main/java/gregtech/api/unification/ore/OrePrefix.java index e61dca18008..47387ff05ab 100644 --- a/src/main/java/gregtech/api/unification/ore/OrePrefix.java +++ b/src/main/java/gregtech/api/unification/ore/OrePrefix.java @@ -318,9 +318,12 @@ public class OrePrefix { public static final OrePrefix component = new OrePrefix("component", -1, null, null, ENABLE_UNIFICATION, null); // Nuclear stuff - public static final OrePrefix fuelRod = new OrePrefix("fuelRod", -1, null, MaterialIconType.fuelRod, 0, material -> material.hasProperty(PropertyKey.FISSION_FUEL)); - public static final OrePrefix fuelRodDepleted = new OrePrefix("fuelRodDepleted", -1, null, MaterialIconType.fuelRodDepleted, 0, material -> material.hasProperty(PropertyKey.FISSION_FUEL)); - public static final OrePrefix fuelRodHotDepleted = new OrePrefix("fuelRodHotDepleted", -1, null, MaterialIconType.fuelRodHotDepleted, 0, material -> material.hasProperty(PropertyKey.FISSION_FUEL)); + public static final OrePrefix fuelRod = new OrePrefix("fuelRod", -1, null, MaterialIconType.fuelRod, 0, + material -> material.hasProperty(PropertyKey.FISSION_FUEL)); + public static final OrePrefix fuelRodDepleted = new OrePrefix("fuelRodDepleted", -1, null, + MaterialIconType.fuelRodDepleted, 0, material -> material.hasProperty(PropertyKey.FISSION_FUEL)); + public static final OrePrefix fuelRodHotDepleted = new OrePrefix("fuelRodHotDepleted", -1, null, + MaterialIconType.fuelRodHotDepleted, 0, material -> material.hasProperty(PropertyKey.FISSION_FUEL)); public static class Flags { @@ -483,8 +486,8 @@ public static void init() { stick.modifyMaterialAmount(Materials.Blaze, 4); stick.modifyMaterialAmount(Materials.Bone, 5); - fuelRodDepleted.radiationDamageFunction = (neutrons) -> neutrons/2.f; - fuelRodHotDepleted.radiationDamageFunction = (neutrons) -> neutrons/1.5f; + fuelRodDepleted.radiationDamageFunction = (neutrons) -> neutrons / 2.f; + fuelRodHotDepleted.radiationDamageFunction = (neutrons) -> neutrons / 1.5f; fuelRodHotDepleted.heatDamageFunction = (x) -> 2.0f; } diff --git a/src/main/java/gregtech/common/metatileentities/multi/MetaTileEntityFissionReactor.java b/src/main/java/gregtech/common/metatileentities/multi/MetaTileEntityFissionReactor.java index 0093c30be09..9a03dc3631c 100644 --- a/src/main/java/gregtech/common/metatileentities/multi/MetaTileEntityFissionReactor.java +++ b/src/main/java/gregtech/common/metatileentities/multi/MetaTileEntityFissionReactor.java @@ -46,10 +46,7 @@ import net.minecraft.util.text.*; import net.minecraft.world.World; import net.minecraftforge.fluids.FluidStack; - -import net.minecraftforge.fluids.IFluidTank; import net.minecraftforge.fml.relauncher.Side; - import net.minecraftforge.fml.relauncher.SideOnly; import org.jetbrains.annotations.NotNull; @@ -125,7 +122,8 @@ protected void updateFormedValid() { coolantImport.getFluidTank().drain(this.flowRate, true); } for (ICoolantHandler coolantExport : this.getAbilities(MultiblockAbility.EXPORT_COOLANT)) { - coolantExport.getFluidTank().fill(coolantExport.getCoolant().getProperty(PropertyKey.COOLANT).getHotHPCoolant().getFluid(this.flowRate), true); + coolantExport.getFluidTank().fill(coolantExport.getCoolant().getProperty(PropertyKey.COOLANT) + .getHotHPCoolant().getFluid(this.flowRate), true); } // Fuel handling diff --git a/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityCoolantExportHatch.java b/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityCoolantExportHatch.java index 0ae2f954220..23cb38521d9 100644 --- a/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityCoolantExportHatch.java +++ b/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityCoolantExportHatch.java @@ -4,7 +4,6 @@ import gregtech.api.capability.ICoolantHandler; import gregtech.api.capability.impl.FilteredItemHandler; import gregtech.api.capability.impl.LockableFluidTank; -import gregtech.api.capability.impl.NotifiableFluidTank; import gregtech.api.gui.GuiTextures; import gregtech.api.gui.ModularUI; import gregtech.api.gui.widgets.FluidContainerSlotWidget; @@ -24,7 +23,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fluids.FluidTank; import net.minecraftforge.fluids.IFluidTank; import net.minecraftforge.fluids.capability.CapabilityFluidHandler; import net.minecraftforge.items.IItemHandlerModifiable;