diff --git a/src/main/java/techreborn/blockentity/generator/LightningRodBlockEntity.java b/src/main/java/techreborn/blockentity/generator/LightningRodBlockEntity.java index 8b1ee282b..7181c5176 100644 --- a/src/main/java/techreborn/blockentity/generator/LightningRodBlockEntity.java +++ b/src/main/java/techreborn/blockentity/generator/LightningRodBlockEntity.java @@ -87,10 +87,7 @@ public class LightningRodBlockEntity extends PowerAcceptorBlockEntity implements LightningEntity lightningBolt = EntityType.LIGHTNING_BOLT.create(world); lightningBolt.refreshPositionAfterTeleport(Vec3d.ofBottomCenter(world.getTopPosition(Heightmap.Type.MOTION_BLOCKING, getPos()))); - - if (!world.isClient) { - world.spawnEntity(lightningBolt); - } + world.spawnEntity(lightningBolt); addEnergy((long) (TechRebornConfig.lightningRodBaseEnergyStrike * (0.3F + weatherStrength))); machineBaseBlock.setActive(true, world, pos); onStatusHoldTicks = 400; diff --git a/src/main/java/techreborn/blockentity/generator/SolarPanelBlockEntity.java b/src/main/java/techreborn/blockentity/generator/SolarPanelBlockEntity.java index 4f73178f4..dd85b630b 100644 --- a/src/main/java/techreborn/blockentity/generator/SolarPanelBlockEntity.java +++ b/src/main/java/techreborn/blockentity/generator/SolarPanelBlockEntity.java @@ -130,7 +130,7 @@ public class SolarPanelBlockEntity extends PowerAcceptorBlockEntity implements I // At this point, we know a light source is present and it's clear weather. We need to determine // the level of generation based on % of time through the day, with peak production at noon and // a smooth transition to night production as sun rises/sets - float multiplier = 0.0f; + float multiplier; if (skyAngle > 0.75) { // Morning to noon multiplier = (0.25f - (1 - skyAngle)) / 0.25f; diff --git a/src/main/java/techreborn/blockentity/machine/iron/AbstractIronMachineBlockEntity.java b/src/main/java/techreborn/blockentity/machine/iron/AbstractIronMachineBlockEntity.java index 9617de7c7..bb23956dc 100644 --- a/src/main/java/techreborn/blockentity/machine/iron/AbstractIronMachineBlockEntity.java +++ b/src/main/java/techreborn/blockentity/machine/iron/AbstractIronMachineBlockEntity.java @@ -50,7 +50,6 @@ public abstract class AbstractIronMachineBlockEntity extends MachineBaseBlockEnt public int totalCookingTime; int fuelSlot; Block toolDrop; - boolean active = false; public AbstractIronMachineBlockEntity(BlockEntityType blockEntityTypeIn, BlockPos pos, BlockState state, int fuelSlot, Block toolDrop) { super(blockEntityTypeIn, pos, state); @@ -63,7 +62,6 @@ public abstract class AbstractIronMachineBlockEntity extends MachineBaseBlockEnt /** * Checks that we have all inputs and can put output into slot * - * @return */ protected abstract boolean canSmelt(); diff --git a/src/main/java/techreborn/blockentity/machine/iron/IronFurnaceBlockEntity.java b/src/main/java/techreborn/blockentity/machine/iron/IronFurnaceBlockEntity.java index 3819103ca..7beb5b5f2 100644 --- a/src/main/java/techreborn/blockentity/machine/iron/IronFurnaceBlockEntity.java +++ b/src/main/java/techreborn/blockentity/machine/iron/IronFurnaceBlockEntity.java @@ -91,7 +91,7 @@ public class IronFurnaceBlockEntity extends AbstractIronMachineBlockEntity imple return ItemStack.EMPTY; } - private float getExperienceFor(ItemStack stack) { + private float getExperienceFor() { Optional recipe = world.getRecipeManager().getFirstMatch(RecipeType.SMELTING, this, world); return recipe.map(AbstractCookingRecipe::getExperience).orElse(0F); } @@ -110,7 +110,7 @@ public class IronFurnaceBlockEntity extends AbstractIronMachineBlockEntity imple } else if (inventory.getStack(outputSlot).isItemEqualIgnoreDamage(resultStack)) { inventory.getStack(outputSlot).increment(resultStack.getCount()); } - experience += getExperienceFor(inputStack); + experience += getExperienceFor(); if (inputStack.getCount() > 1) { inventory.shrinkSlot(inputSlot, 1); } else { diff --git a/src/main/java/techreborn/blockentity/machine/misc/DrainBlockEntity.java b/src/main/java/techreborn/blockentity/machine/misc/DrainBlockEntity.java index b14822e66..2bb8dda86 100644 --- a/src/main/java/techreborn/blockentity/machine/misc/DrainBlockEntity.java +++ b/src/main/java/techreborn/blockentity/machine/misc/DrainBlockEntity.java @@ -27,7 +27,6 @@ package techreborn.blockentity.machine.misc; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.FluidDrainable; -import net.minecraft.block.entity.BlockEntityType; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.fluid.Fluid; import net.minecraft.item.ItemStack; @@ -52,10 +51,6 @@ public class DrainBlockEntity extends MachineBaseBlockEntity implements IToolDro super(TRBlockEntities.DRAIN, pos, state); } - public DrainBlockEntity(BlockEntityType blockEntityTypeIn, BlockPos pos, BlockState state) { - super(blockEntityTypeIn, pos, state); - } - @Override public void tick(World world, BlockPos pos, BlockState state, MachineBaseBlockEntity blockEntity) { super.tick(world, pos, state, blockEntity); diff --git a/src/main/java/techreborn/init/TRContent.java b/src/main/java/techreborn/init/TRContent.java index cc08ebcf6..8c6a5c78d 100644 --- a/src/main/java/techreborn/init/TRContent.java +++ b/src/main/java/techreborn/init/TRContent.java @@ -478,9 +478,7 @@ public class TRContent { } private List allBlocks() { - return Collections.unmodifiableList(Arrays.asList( - block, stairsBlock, slabBlock, wallBlock - )); + return List.of(block, stairsBlock, slabBlock, wallBlock); } } @@ -511,7 +509,7 @@ public class TRContent { public static ItemConvertible[] getCasings() { return Arrays.stream(MachineBlocks.values()) - .map((Function) machineBlocks -> machineBlocks.casing::asItem) + .map((Function) machineBlocks -> machineBlocks.casing) .toArray(ItemConvertible[]::new); } }