diff --git a/src/client/java/wtf/hak/survivalfabric/mixin/client/BackgroundRendererMixin.java b/src/client/java/wtf/hak/survivalfabric/mixin/client/BackgroundRendererMixin.java index 9cb66a0..56cb7f5 100644 --- a/src/client/java/wtf/hak/survivalfabric/mixin/client/BackgroundRendererMixin.java +++ b/src/client/java/wtf/hak/survivalfabric/mixin/client/BackgroundRendererMixin.java @@ -8,6 +8,7 @@ import net.minecraft.client.render.FogShape; import net.minecraft.world.World; import org.joml.Vector4f; import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Unique; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; @@ -17,6 +18,7 @@ import static wtf.hak.survivalfabric.config.client.ClientConfigManager.getConfig @Mixin(value = BackgroundRenderer.class, priority = 910) public abstract class BackgroundRendererMixin { + @Unique private static final Fog EMPTY_FOG = new Fog(-8.0f, 1_000_000.0F, FogShape.CYLINDER, 0,0,0,0); @Inject(method = "applyFog", at = @At("RETURN"), cancellable = true) diff --git a/src/main/java/wtf/hak/survivalfabric/features/sharedenderchest/SharedInventory.java b/src/main/java/wtf/hak/survivalfabric/features/sharedenderchest/SharedInventory.java index 3f859b8..614675b 100644 --- a/src/main/java/wtf/hak/survivalfabric/features/sharedenderchest/SharedInventory.java +++ b/src/main/java/wtf/hak/survivalfabric/features/sharedenderchest/SharedInventory.java @@ -57,8 +57,7 @@ public class SharedInventory implements Inventory { @Override public ItemStack removeStack(int int_1, int int_2) { - ItemStack itemStack_1 = Inventories.splitStack(this.stacks, int_1, int_2); - return itemStack_1; + return Inventories.splitStack(this.stacks, int_1, int_2); } @Override diff --git a/src/main/java/wtf/hak/survivalfabric/features/veinminer/VeinMinerSession.java b/src/main/java/wtf/hak/survivalfabric/features/veinminer/VeinMinerSession.java index 08e6eb1..431e065 100644 --- a/src/main/java/wtf/hak/survivalfabric/features/veinminer/VeinMinerSession.java +++ b/src/main/java/wtf/hak/survivalfabric/features/veinminer/VeinMinerSession.java @@ -9,7 +9,7 @@ import net.minecraft.server.world.ServerWorld; import net.minecraft.util.math.BlockPos; public class VeinMinerSession { - private static ArrayList sessions = new ArrayList<>(); + private static final ArrayList sessions = new ArrayList<>(); public ServerPlayerEntity player; public ServerWorld world; diff --git a/src/main/java/wtf/hak/survivalfabric/features/veinminer/drills/WoodDrill.java b/src/main/java/wtf/hak/survivalfabric/features/veinminer/drills/WoodDrill.java index 3540621..cbb75a6 100644 --- a/src/main/java/wtf/hak/survivalfabric/features/veinminer/drills/WoodDrill.java +++ b/src/main/java/wtf/hak/survivalfabric/features/veinminer/drills/WoodDrill.java @@ -33,8 +33,8 @@ public class WoodDrill extends DrillBase { public boolean drill(BlockPos startPos) { ServerWorld world = session.world; int broken = 0; - ArrayDeque pendingLogs = new ArrayDeque(); - ArrayDeque logBlocks = new ArrayDeque(); + ArrayDeque pendingLogs = new ArrayDeque<>(); + ArrayDeque logBlocks = new ArrayDeque<>(); pendingLogs.add(startPos); String leavesBlockId = Registries.BLOCK.getId(world.getBlockState(startPos).getBlock()).toString().replace("_log", "_leaves"); @@ -57,11 +57,8 @@ public class WoodDrill extends DrillBase { } } - // second round, leaves - // The pending blocks are all air now, ArrayDeque pendingLeaves = logBlocks; while (!pendingLeaves.isEmpty() && broken < getConfig().maxVeinSize) { - // remove the immediately surrounding leaves around the log blocks broken += forXYZ(pendingLeaves.remove(), 1, newPos -> { int brokenLeaves = 0; Block newBlock = world.getBlockState(newPos).getBlock();