diff --git a/src/main/java/carpet/helpers/HopperCounter.java b/src/main/java/carpet/helpers/HopperCounter.java index d4fa1fcd..f7520679 100644 --- a/src/main/java/carpet/helpers/HopperCounter.java +++ b/src/main/java/carpet/helpers/HopperCounter.java @@ -406,6 +406,6 @@ public class HopperCounter */ public long getTotalItems() { - return counter.isEmpty()?0:counter.values().stream().mapToLong(Long::longValue).sum(); + return counter.isEmpty()?0:counter.values().longStream().sum(); } } diff --git a/src/main/java/carpet/mixins/BoundTickingBlockEntity_tickMixin.java b/src/main/java/carpet/mixins/BoundTickingBlockEntity_tickMixin.java index 31578084..7e0383d2 100644 --- a/src/main/java/carpet/mixins/BoundTickingBlockEntity_tickMixin.java +++ b/src/main/java/carpet/mixins/BoundTickingBlockEntity_tickMixin.java @@ -32,7 +32,7 @@ public class BoundTickingBlockEntity_tickMixin value = "INVOKE", target = "Lnet/minecraft/world/level/block/entity/BlockEntityTicker;tick(Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/block/entity/BlockEntity;)V" )) - private void checkProcessTEs(BlockEntityTicker blockEntityTicker, Level world, BlockPos pos, BlockState state, T blockEntity) + private void checkProcessBEs(BlockEntityTicker blockEntityTicker, Level world, BlockPos pos, BlockState state, T blockEntity) { if (TickSpeed.process_entities) blockEntityTicker.tick(world, pos, state, blockEntity); } diff --git a/src/main/java/carpet/mixins/PistonBaseBlock_movableBEMixin.java b/src/main/java/carpet/mixins/PistonBaseBlock_movableBEMixin.java index aa49beb2..4aef5956 100644 --- a/src/main/java/carpet/mixins/PistonBaseBlock_movableBEMixin.java +++ b/src/main/java/carpet/mixins/PistonBaseBlock_movableBEMixin.java @@ -82,8 +82,8 @@ public abstract class PistonBaseBlock_movableBEMixin extends DirectionalBlock @Inject(method = "moveBlocks", at = @At(value = "INVOKE", shift = At.Shift.BEFORE, target = "Ljava/util/List;size()I", ordinal = 4),locals = LocalCapture.CAPTURE_FAILHARD) private void onMove(Level world_1, BlockPos blockPos_1, Direction direction_1, boolean boolean_1, - CallbackInfoReturnable cir, BlockPos blockPos_2, PistonStructureResolver pistonHandler_1, Map map_1, - List list_1, List list_2, List list_3, BlockState[] blockStates_1, + CallbackInfoReturnable cir, BlockPos blockPos_2, PistonStructureResolver pistonHandler_1, Map map_1, + List list_1, List list_2, List list_3, BlockState[] blockStates_1, Direction direction_2, int int_2) { //Get the blockEntities and remove them from the world before any magic starts to happen @@ -110,11 +110,11 @@ public abstract class PistonBaseBlock_movableBEMixin extends DirectionalBlock target = "Lnet/minecraft/world/level/Level;setBlockEntity(Lnet/minecraft/world/level/block/entity/BlockEntity;)V", ordinal = 0), locals = LocalCapture.CAPTURE_FAILHARD) private void setBlockEntityWithCarried(Level world_1, BlockPos blockPos_1, Direction direction_1, boolean boolean_1, - CallbackInfoReturnable cir, BlockPos blockPos_2, PistonStructureResolver pistonHandler_1, Map map_1, List list_1, - List list_2, List list_3, BlockState[] blockStates_1, Direction direction_2, int int_2, + CallbackInfoReturnable cir, BlockPos blockPos_2, PistonStructureResolver pistonHandler_1, Map map_1, List list_1, + List list_2, List list_3, BlockState[] blockStates_1, Direction direction_2, int int_2, int int_3, BlockPos blockPos_4, BlockState blockState9, BlockState blockState4) { - BlockEntity blockEntityPiston = MovingPistonBlock.newMovingBlockEntity(blockPos_4, blockState4, (BlockState) list_2.get(int_3), + BlockEntity blockEntityPiston = MovingPistonBlock.newMovingBlockEntity(blockPos_4, blockState4, list_2.get(int_3), direction_1, boolean_1, false); if (CarpetSettings.movableBlockEntities) ((PistonBlockEntityInterface) blockEntityPiston).setCarriedBlockEntity(list1_BlockEntities.get().get(int_3)); diff --git a/src/main/java/carpet/script/value/NBTSerializableValue.java b/src/main/java/carpet/script/value/NBTSerializableValue.java index e8465945..3bd290e4 100644 --- a/src/main/java/carpet/script/value/NBTSerializableValue.java +++ b/src/main/java/carpet/script/value/NBTSerializableValue.java @@ -373,7 +373,7 @@ public class NBTSerializableValue extends Value implements ContainerValueInterfa if (t instanceof CollectionTag) { List elems = new ArrayList<>(); - CollectionTag ltag = (CollectionTag)t; + CollectionTag ltag = (CollectionTag)t; for (Tag elem: ltag) { elems.add(decodeTagDeep(elem)); diff --git a/src/main/java/carpet/script/value/ValueConversions.java b/src/main/java/carpet/script/value/ValueConversions.java index f11cebe6..dc5e631f 100644 --- a/src/main/java/carpet/script/value/ValueConversions.java +++ b/src/main/java/carpet/script/value/ValueConversions.java @@ -274,7 +274,7 @@ public class ValueConversions } if (v instanceof Set) { - v = new ArrayList(((Set) v)); + v = new ArrayList<>(((Set) v)); } if (v instanceof List l) { diff --git a/src/main/java/carpet/utils/PerimeterDiagnostics.java b/src/main/java/carpet/utils/PerimeterDiagnostics.java index eed13910..c24dd384 100644 --- a/src/main/java/carpet/utils/PerimeterDiagnostics.java +++ b/src/main/java/carpet/utils/PerimeterDiagnostics.java @@ -85,7 +85,7 @@ public class PerimeterDiagnostics } } PerimeterDiagnostics diagnostic = new PerimeterDiagnostics(worldserver,ctype,el); - EntityType type = EntityType.ZOMBIE; + EntityType type = EntityType.ZOMBIE; if (el != null) type = el.getType(); int minY = worldserver.getMinBuildHeight(); int maxY = worldserver.getMaxBuildHeight(); @@ -180,7 +180,7 @@ public class PerimeterDiagnostics if (NaturalSpawner.isSpawnPositionOk(spt, worldServer, pos, sle.type)) { - el.moveTo((float)pos.getX() + 0.5F, (float)pos.getY(), (float)pos.getZ()+0.5F, 0.0F, 0.0F); + el.moveTo(pos.getX() + 0.5F, pos.getY(), pos.getZ()+0.5F, 0.0F, 0.0F); return el.checkSpawnObstruction(worldServer) && el.checkSpawnRules(worldServer, MobSpawnType.NATURAL) && SpawnPlacements.checkSpawnRules(el.getType(),(ServerLevel)el.getCommandSenderWorld(), MobSpawnType.NATURAL, el.blockPosition(), el.getCommandSenderWorld().random) && worldServer.noCollision(el); // check collision rules once they stop fiddling with them after 1.14.1 diff --git a/src/main/java/carpet/utils/SpawnReporter.java b/src/main/java/carpet/utils/SpawnReporter.java index b5751570..eb97968e 100644 --- a/src/main/java/carpet/utils/SpawnReporter.java +++ b/src/main/java/carpet/utils/SpawnReporter.java @@ -52,7 +52,7 @@ public class SpawnReporter public static Long track_spawns = 0L; public static final HashMap, Integer> chunkCounts = new HashMap<>(); - public static final HashMap, MobCategory>, Object2LongMap> spawn_stats = new HashMap<>(); + public static final HashMap, MobCategory>, Object2LongMap>> spawn_stats = new HashMap<>(); public static double mobcap_exponent = 0.0D; public static final HashMap, MobCategory>, Long> spawn_attempts = new HashMap<>(); @@ -62,7 +62,7 @@ public class SpawnReporter public static final HashMap, MobCategory>, Long> spawn_ticks_succ = new HashMap<>(); public static final HashMap, MobCategory>, Long> spawn_ticks_spawns = new HashMap<>(); public static final HashMap, MobCategory>, Long> spawn_cap_count = new HashMap<>(); - public static final HashMap, MobCategory>, EvictingQueue>> spawned_mobs = new HashMap<>(); + public static final HashMap, MobCategory>, EvictingQueue, BlockPos>>> spawned_mobs = new HashMap<>(); public static final HashMap spawn_tries = new HashMap<>(); public static BlockPos lower_spawning_limit = null; public static BlockPos upper_spawning_limit = null; @@ -170,7 +170,7 @@ public class SpawnReporter String type_code = creature_type.getName(); lst.add(Messenger.s(String.format("Recent %s spawns:",type_code))); - for (Pair pair : spawned_mobs.get(Pair.of(world.dimension(), creature_type)).keySet()) // getDImTYpe + for (Pair, BlockPos> pair : spawned_mobs.get(Pair.of(world.dimension(), creature_type)).keySet()) // getDImTYpe { lst.add( Messenger.c( "w - ", @@ -291,7 +291,7 @@ public class SpawnReporter if (!all && persistent) continue; - EntityType type = entity.getType(); + EntityType type = entity.getType(); BlockPos pos = entity.blockPosition(); lst.add( Messenger.c( "w - ", @@ -387,7 +387,7 @@ public class SpawnReporter (100.0D*spawn_ticks_succ.get(code))/ spawn_attempts.get(code), (1.0D*spawn_ticks_spawns.get(code))/(spawn_ticks_fail.get(code)+spawn_ticks_succ.get(code)) ))); - for (EntityType type: spawn_stats.get(code).keySet()) + for (EntityType type: spawn_stats.get(code).keySet()) { report.add(Messenger.s(String.format(" - %s: %d spawns, %d per hour", type.getDescription().getString(), @@ -559,4 +559,4 @@ public class SpawnReporter } return rep; } -} \ No newline at end of file +}