Skip to content

Commit ed24504

Browse files
committed
spotless
1 parent 91f44b3 commit ed24504

File tree

6 files changed

+20
-17
lines changed

6 files changed

+20
-17
lines changed

src/main/java/gregtech/api/items/materialitem/MetaPrefixItem.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ public void onUpdate(@NotNull ItemStack itemStack, @NotNull World worldIn, @NotN
158158
if (metaItems.containsKey((short) itemStack.getItemDamage()) && entityIn instanceof EntityLivingBase entity) {
159159
if (entityIn.ticksExisted % 20 == 0) {
160160

161-
//Handle heat damage
161+
// Handle heat damage
162162
if (prefix.heatDamageFunction != null) {
163163
Material material = getMaterial(itemStack);
164164
if (material != null) {
@@ -183,7 +183,7 @@ public void onUpdate(@NotNull ItemStack itemStack, @NotNull World worldIn, @NotN
183183
}
184184
}
185185

186-
//Handle radiation damage
186+
// Handle radiation damage
187187
if (prefix.radiationDamageFunction != null) {
188188
Material material = getMaterial(itemStack);
189189
if (material != null) {
@@ -197,7 +197,8 @@ public void onUpdate(@NotNull ItemStack itemStack, @NotNull World worldIn, @NotN
197197
}
198198
}
199199
if (radiationDamage > 0.0) {
200-
entity.attackEntityFrom(DamageSources.getRadioactiveDamage().setDamageBypassesArmor(), radiationDamage);
200+
entity.attackEntityFrom(DamageSources.getRadioactiveDamage().setDamageBypassesArmor(),
201+
radiationDamage);
201202
}
202203
}
203204
}

src/main/java/gregtech/api/unification/material/Material.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1077,9 +1077,11 @@ public Builder fissionFuelProperties(int maxTemperature, int duration, double sl
10771077
return this;
10781078
}
10791079

1080-
public Builder coolantProperty(Material hotCoolant, Material hotHPCoolant, double moderatorFactor, double coolingFactor, double boilingPoint, double absorption, double pressure) {
1080+
public Builder coolantProperty(Material hotCoolant, Material hotHPCoolant, double moderatorFactor,
1081+
double coolingFactor, double boilingPoint, double absorption, double pressure) {
10811082
properties.ensureSet(PropertyKey.FLUID);
1082-
properties.setProperty(PropertyKey.COOLANT, new CoolantProperty(hotCoolant, hotHPCoolant, moderatorFactor, coolingFactor, boilingPoint, absorption, pressure));
1083+
properties.setProperty(PropertyKey.COOLANT, new CoolantProperty(hotCoolant, hotHPCoolant, moderatorFactor,
1084+
coolingFactor, boilingPoint, absorption, pressure));
10831085
return this;
10841086
}
10851087

src/main/java/gregtech/api/unification/material/properties/CoolantProperty.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ public class CoolantProperty implements IMaterialProperty {
1212
private double absorption;
1313
private double pressure;
1414

15-
public CoolantProperty(Material hotCoolant, Material hotHPCoolant, double moderatorFactor, double coolingFactor, double boilingPoint, double absorption, double pressure) {
15+
public CoolantProperty(Material hotCoolant, Material hotHPCoolant, double moderatorFactor, double coolingFactor,
16+
double boilingPoint, double absorption, double pressure) {
1617
this.hotCoolant = hotCoolant;
1718
this.hotHPCoolant = hotHPCoolant;
1819
this.moderatorFactor = moderatorFactor;

src/main/java/gregtech/api/unification/ore/OrePrefix.java

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -318,9 +318,12 @@ public class OrePrefix {
318318
public static final OrePrefix component = new OrePrefix("component", -1, null, null, ENABLE_UNIFICATION, null);
319319

320320
// Nuclear stuff
321-
public static final OrePrefix fuelRod = new OrePrefix("fuelRod", -1, null, MaterialIconType.fuelRod, 0, material -> material.hasProperty(PropertyKey.FISSION_FUEL));
322-
public static final OrePrefix fuelRodDepleted = new OrePrefix("fuelRodDepleted", -1, null, MaterialIconType.fuelRodDepleted, 0, material -> material.hasProperty(PropertyKey.FISSION_FUEL));
323-
public static final OrePrefix fuelRodHotDepleted = new OrePrefix("fuelRodHotDepleted", -1, null, MaterialIconType.fuelRodHotDepleted, 0, material -> material.hasProperty(PropertyKey.FISSION_FUEL));
321+
public static final OrePrefix fuelRod = new OrePrefix("fuelRod", -1, null, MaterialIconType.fuelRod, 0,
322+
material -> material.hasProperty(PropertyKey.FISSION_FUEL));
323+
public static final OrePrefix fuelRodDepleted = new OrePrefix("fuelRodDepleted", -1, null,
324+
MaterialIconType.fuelRodDepleted, 0, material -> material.hasProperty(PropertyKey.FISSION_FUEL));
325+
public static final OrePrefix fuelRodHotDepleted = new OrePrefix("fuelRodHotDepleted", -1, null,
326+
MaterialIconType.fuelRodHotDepleted, 0, material -> material.hasProperty(PropertyKey.FISSION_FUEL));
324327

325328
public static class Flags {
326329

@@ -483,8 +486,8 @@ public static void init() {
483486
stick.modifyMaterialAmount(Materials.Blaze, 4);
484487
stick.modifyMaterialAmount(Materials.Bone, 5);
485488

486-
fuelRodDepleted.radiationDamageFunction = (neutrons) -> neutrons/2.f;
487-
fuelRodHotDepleted.radiationDamageFunction = (neutrons) -> neutrons/1.5f;
489+
fuelRodDepleted.radiationDamageFunction = (neutrons) -> neutrons / 2.f;
490+
fuelRodHotDepleted.radiationDamageFunction = (neutrons) -> neutrons / 1.5f;
488491
fuelRodHotDepleted.heatDamageFunction = (x) -> 2.0f;
489492
}
490493

src/main/java/gregtech/common/metatileentities/multi/MetaTileEntityFissionReactor.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,7 @@
4646
import net.minecraft.util.text.*;
4747
import net.minecraft.world.World;
4848
import net.minecraftforge.fluids.FluidStack;
49-
50-
import net.minecraftforge.fluids.IFluidTank;
5149
import net.minecraftforge.fml.relauncher.Side;
52-
5350
import net.minecraftforge.fml.relauncher.SideOnly;
5451

5552
import org.jetbrains.annotations.NotNull;
@@ -125,7 +122,8 @@ protected void updateFormedValid() {
125122
coolantImport.getFluidTank().drain(this.flowRate, true);
126123
}
127124
for (ICoolantHandler coolantExport : this.getAbilities(MultiblockAbility.EXPORT_COOLANT)) {
128-
coolantExport.getFluidTank().fill(coolantExport.getCoolant().getProperty(PropertyKey.COOLANT).getHotHPCoolant().getFluid(this.flowRate), true);
125+
coolantExport.getFluidTank().fill(coolantExport.getCoolant().getProperty(PropertyKey.COOLANT)
126+
.getHotHPCoolant().getFluid(this.flowRate), true);
129127
}
130128

131129
// Fuel handling

src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityCoolantExportHatch.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import gregtech.api.capability.ICoolantHandler;
55
import gregtech.api.capability.impl.FilteredItemHandler;
66
import gregtech.api.capability.impl.LockableFluidTank;
7-
import gregtech.api.capability.impl.NotifiableFluidTank;
87
import gregtech.api.gui.GuiTextures;
98
import gregtech.api.gui.ModularUI;
109
import gregtech.api.gui.widgets.FluidContainerSlotWidget;
@@ -24,7 +23,6 @@
2423
import net.minecraft.entity.player.EntityPlayer;
2524
import net.minecraft.util.EnumFacing;
2625
import net.minecraft.util.ResourceLocation;
27-
import net.minecraftforge.fluids.FluidTank;
2826
import net.minecraftforge.fluids.IFluidTank;
2927
import net.minecraftforge.fluids.capability.CapabilityFluidHandler;
3028
import net.minecraftforge.items.IItemHandlerModifiable;

0 commit comments

Comments
 (0)