diff options
| author | glowredman <35727266+glowredman@users.noreply.github.com> | 2023-10-14 15:23:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-14 15:23:37 +0200 |
| commit | d7dd256c7b23cb21613fa6de690d79c309f1b072 (patch) | |
| tree | 2d922853da2592c1c25a6d7121d8ba7ee1057b0b /src/main/java/kubatech/tileentity | |
| parent | 3ae4da0c3548383361ddc7c227157b764cb86d5d (diff) | |
| download | GT5-Unofficial-d7dd256c7b23cb21613fa6de690d79c309f1b072.tar.gz GT5-Unofficial-d7dd256c7b23cb21613fa6de690d79c309f1b072.tar.bz2 GT5-Unofficial-d7dd256c7b23cb21613fa6de690d79c309f1b072.zip | |
Small cleanup (#100)
* Use llamalad's `@ModifyReturnValue`
* Prefix mixin methods with "kubatech$"
* Address some warnings
* Remove dead code
Diffstat (limited to 'src/main/java/kubatech/tileentity')
2 files changed, 5 insertions, 2 deletions
diff --git a/src/main/java/kubatech/tileentity/gregtech/multiblock/GT_MetaTileEntity_ExtremeExterminationChamber.java b/src/main/java/kubatech/tileentity/gregtech/multiblock/GT_MetaTileEntity_ExtremeExterminationChamber.java index ce311dfc3a..13660c573a 100644 --- a/src/main/java/kubatech/tileentity/gregtech/multiblock/GT_MetaTileEntity_ExtremeExterminationChamber.java +++ b/src/main/java/kubatech/tileentity/gregtech/multiblock/GT_MetaTileEntity_ExtremeExterminationChamber.java @@ -484,6 +484,7 @@ public class GT_MetaTileEntity_ExtremeExterminationChamber private final WeaponCache weaponCache = new WeaponCache(); + @SuppressWarnings("unlikely-arg-type") @Override @NotNull public CheckRecipeResult checkProcessing() { @@ -520,7 +521,7 @@ public class GT_MetaTileEntity_ExtremeExterminationChamber double attackDamage = DIAMOND_SPIKES_DAMAGE; // damage from spikes GT_MetaTileEntity_Hatch_InputBus inputbus = this.mInputBusses.size() == 0 ? null : this.mInputBusses.get(0); - if (inputbus != null && !isValidMetaTileEntity(inputbus)) inputbus = null; + if (inputbus != null && !inputbus.isValid()) inputbus = null; ItemStack lootingHolder = inputbus == null ? null : inputbus.getStackInSlot(0); weaponCheck: { // noinspection EqualsBetweenInconvertibleTypes diff --git a/src/main/java/kubatech/tileentity/gregtech/multiblock/GT_MetaTileEntity_ExtremeIndustrialGreenhouse.java b/src/main/java/kubatech/tileentity/gregtech/multiblock/GT_MetaTileEntity_ExtremeIndustrialGreenhouse.java index 2e916e29e0..164ba7e7ba 100644 --- a/src/main/java/kubatech/tileentity/gregtech/multiblock/GT_MetaTileEntity_ExtremeIndustrialGreenhouse.java +++ b/src/main/java/kubatech/tileentity/gregtech/multiblock/GT_MetaTileEntity_ExtremeIndustrialGreenhouse.java @@ -459,7 +459,7 @@ public class GT_MetaTileEntity_ExtremeIndustrialGreenhouse int watercheck = waterusage; FluidStack waterStack = new FluidStack(FluidRegistry.WATER, 1); for (GT_MetaTileEntity_Hatch_Input i : fluids) { - if (!isValidMetaTileEntity(i)) continue; + if (!i.isValid()) continue; if (i instanceof GT_MetaTileEntity_Hatch_MultiInput) { int amount = ((GT_MetaTileEntity_Hatch_MultiInput) i).getFluidAmount(waterStack); if (amount == 0) continue; @@ -1667,6 +1667,8 @@ public class GT_MetaTileEntity_ExtremeIndustrialGreenhouse private static class GreenHouseRandom extends Random { + private static final long serialVersionUID = -387271808935248890L; + @Override public int nextInt(int bound) { return 0; |