diff --git a/src/main/java/de/ellpeck/naturesaura/InternalHooks.java b/src/main/java/de/ellpeck/naturesaura/InternalHooks.java index 7f6b1032..0d82b1c7 100644 --- a/src/main/java/de/ellpeck/naturesaura/InternalHooks.java +++ b/src/main/java/de/ellpeck/naturesaura/InternalHooks.java @@ -39,9 +39,9 @@ public class InternalHooks implements NaturesAuraAPI.IInternalHooks { private boolean auraPlayerInteraction(Player player, int amount, boolean extract, boolean simulate) { if (extract && player.isCreative()) return true; - ItemStack stack = Helper.getEquippedItem(s -> s.getCapability(NaturesAuraAPI.capAuraContainer).isPresent(), player); + var stack = Helper.getEquippedItem(s -> s.getCapability(NaturesAuraAPI.capAuraContainer).isPresent(), player); if (!stack.isEmpty()) { - IAuraContainer container = stack.getCapability(NaturesAuraAPI.capAuraContainer).orElse(null); + var container = stack.getCapability(NaturesAuraAPI.capAuraContainer).orElse(null); if (extract) { amount -= container.drainAura(amount, simulate); } else { @@ -59,8 +59,8 @@ public class InternalHooks implements NaturesAuraAPI.IInternalHooks { @Override public void spawnParticleStream(float startX, float startY, float startZ, float endX, float endY, float endZ, float speed, int color, float scale) { - Vec3 dir = new Vec3(endX - startX, endY - startY, endZ - startZ); - double length = dir.length(); + var dir = new Vec3(endX - startX, endY - startY, endZ - startZ); + var length = dir.length(); if (length > 0) { dir = dir.normalize(); this.spawnMagicParticle(startX, startY, startZ, @@ -92,7 +92,7 @@ public class InternalHooks implements NaturesAuraAPI.IInternalHooks { @Override public List> getActiveEffectPowders(Level level, AABB area, ResourceLocation name) { List> found = new ArrayList<>(); - for (Tuple powder : ((LevelData) ILevelData.getLevelData(level)).effectPowders.get(name)) + for (var powder : ((LevelData) ILevelData.getLevelData(level)).effectPowders.get(name)) if (area.contains(powder.getA())) found.add(powder); return found; @@ -100,10 +100,10 @@ public class InternalHooks implements NaturesAuraAPI.IInternalHooks { @Override public boolean isEffectPowderActive(Level level, BlockPos pos, ResourceLocation name) { - Vec3 posVec = new Vec3(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5); - List> powders = this.getActiveEffectPowders(level, new AABB(pos).inflate(64), name); - for (Tuple powder : powders) { - AABB bounds = Helper.aabb(powder.getA()).inflate(powder.getB()); + var posVec = new Vec3(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5); + var powders = this.getActiveEffectPowders(level, new AABB(pos).inflate(64), name); + for (var powder : powders) { + var bounds = Helper.aabb(powder.getA()).inflate(powder.getB()); if (bounds.contains(posVec)) return true; } @@ -117,22 +117,22 @@ public class InternalHooks implements NaturesAuraAPI.IInternalHooks { @Override public int getSpotAmountInArea(Level level, BlockPos pos, int radius) { - MutableInt result = new MutableInt(); + var result = new MutableInt(); this.getAuraSpotsInArea(level, pos, radius, (blockpos, drainSpot) -> result.increment()); return result.intValue(); } @Override public int getAuraInArea(Level level, BlockPos pos, int radius) { - MutableInt result = new MutableInt(IAuraChunk.DEFAULT_AURA); + var result = new MutableInt(IAuraChunk.DEFAULT_AURA); this.getAuraSpotsInArea(level, pos, radius, (blockPos, drainSpot) -> result.add(drainSpot)); return result.intValue(); } @Override public Pair getAuraAndSpotAmountInArea(Level level, BlockPos pos, int radius) { - MutableInt spots = new MutableInt(); - MutableInt aura = new MutableInt(IAuraChunk.DEFAULT_AURA); + var spots = new MutableInt(); + var aura = new MutableInt(IAuraChunk.DEFAULT_AURA); this.getAuraSpotsInArea(level, pos, radius, (blockPos, drainSpot) -> { aura.add(drainSpot); spots.increment(); @@ -142,9 +142,9 @@ public class InternalHooks implements NaturesAuraAPI.IInternalHooks { @Override public int triangulateAuraInArea(Level level, BlockPos pos, int radius) { - MutableFloat result = new MutableFloat(IAuraChunk.DEFAULT_AURA); + var result = new MutableFloat(IAuraChunk.DEFAULT_AURA); IAuraChunk.getSpotsInArea(level, pos, radius, (blockPos, spot) -> { - float percentage = 1F - (float) Math.sqrt(pos.distSqr(blockPos)) / radius; + var percentage = 1F - (float) Math.sqrt(pos.distSqr(blockPos)) / radius; result.add(spot * percentage); }); return result.intValue(); @@ -152,15 +152,15 @@ public class InternalHooks implements NaturesAuraAPI.IInternalHooks { @Override public BlockPos getLowestAuraDrainSpot(Level level, BlockPos pos, int radius, BlockPos defaultSpot) { - MutableInt lowestAmount = new MutableInt(Integer.MAX_VALUE); - MutableObject lowestSpot = new MutableObject<>(); + var lowestAmount = new MutableInt(Integer.MAX_VALUE); + var lowestSpot = new MutableObject(); this.getAuraSpotsInArea(level, pos, radius, (blockPos, drainSpot) -> { if (drainSpot < lowestAmount.intValue()) { lowestAmount.setValue(drainSpot); lowestSpot.setValue(blockPos); } }); - BlockPos lowest = lowestSpot.getValue(); + var lowest = lowestSpot.getValue(); if (lowest == null || lowestAmount.intValue() >= 0) lowest = defaultSpot; return lowest; @@ -168,15 +168,15 @@ public class InternalHooks implements NaturesAuraAPI.IInternalHooks { @Override public BlockPos getHighestAuraDrainSpot(Level level, BlockPos pos, int radius, BlockPos defaultSpot) { - MutableInt highestAmount = new MutableInt(Integer.MIN_VALUE); - MutableObject highestSpot = new MutableObject<>(); + var highestAmount = new MutableInt(Integer.MIN_VALUE); + var highestSpot = new MutableObject(); this.getAuraSpotsInArea(level, pos, radius, (blockPos, drainSpot) -> { if (drainSpot > highestAmount.intValue()) { highestAmount.setValue(drainSpot); highestSpot.setValue(blockPos); } }); - BlockPos highest = highestSpot.getValue(); + var highest = highestSpot.getValue(); if (highest == null || highestAmount.intValue() <= 0) highest = defaultSpot; return highest; diff --git a/src/main/java/de/ellpeck/naturesaura/ModConfig.java b/src/main/java/de/ellpeck/naturesaura/ModConfig.java index 38abdbf4..a352dbd3 100644 --- a/src/main/java/de/ellpeck/naturesaura/ModConfig.java +++ b/src/main/java/de/ellpeck/naturesaura/ModConfig.java @@ -182,7 +182,7 @@ public final class ModConfig { try { for (String s : this.additionalBotanistPickaxeConversions.get()) { - String[] split = s.split("->"); + var split = s.split("->"); NaturesAuraAPI.BOTANIST_PICKAXE_CONVERSIONS.put( Objects.requireNonNull(Helper.getStateFromString(split[0]), "state1"), Objects.requireNonNull(Helper.getStateFromString(split[1]), "state2")); @@ -193,9 +193,9 @@ public final class ModConfig { try { for (String s : this.auraTypeOverrides.get()) { - String[] split = s.split("->"); - ResourceLocation dim = new ResourceLocation(split[0]); - BasicAuraType type = Objects.requireNonNull((BasicAuraType) NaturesAuraAPI.AURA_TYPES.get(new ResourceLocation(split[1])), "type"); + var split = s.split("->"); + var dim = new ResourceLocation(split[0]); + var type = Objects.requireNonNull((BasicAuraType) NaturesAuraAPI.AURA_TYPES.get(new ResourceLocation(split[1])), "type"); type.addDimensionType(dim); } } catch (Exception e) { @@ -204,9 +204,9 @@ public final class ModConfig { try { for (String s : this.additionalOres.get()) { - String[] split = s.split("->"); - WeightedOre ore = new WeightedOre(new ResourceLocation(split[0]), Integer.parseInt(split[1])); - String dimension = split[2]; + var split = s.split("->"); + var ore = new WeightedOre(new ResourceLocation(split[0]), Integer.parseInt(split[1])); + var dimension = split[2]; if ("nether".equalsIgnoreCase(dimension)) { NaturesAuraAPI.NETHER_ORES.removeIf(o -> o.tag.equals(ore.tag)); NaturesAuraAPI.NETHER_ORES.add(ore); @@ -230,10 +230,10 @@ public final class ModConfig { try { for (String s : this.additionalProjectiles.get()) { - String[] split = s.split("->"); - ResourceLocation name = new ResourceLocation(split[0]); - EntityType type = Objects.requireNonNull(ForgeRegistries.ENTITIES.getValue(name)); - int amount = Integer.parseInt(split[1]); + var split = s.split("->"); + var name = new ResourceLocation(split[0]); + var type = Objects.requireNonNull(ForgeRegistries.ENTITIES.getValue(name)); + var amount = Integer.parseInt(split[1]); NaturesAuraAPI.PROJECTILE_GENERATIONS.put(type, amount); } } catch (Exception e) { diff --git a/src/main/java/de/ellpeck/naturesaura/NaturesAura.java b/src/main/java/de/ellpeck/naturesaura/NaturesAura.java index d4bd679b..8c507d02 100644 --- a/src/main/java/de/ellpeck/naturesaura/NaturesAura.java +++ b/src/main/java/de/ellpeck/naturesaura/NaturesAura.java @@ -45,7 +45,7 @@ public final class NaturesAura { instance = this; FMLJavaModLoadingContext.get().getModEventBus().addListener(this::setup); - ForgeConfigSpec.Builder builder = new ForgeConfigSpec.Builder(); + var builder = new ForgeConfigSpec.Builder(); ModConfig.instance = new ModConfig(builder); ModLoadingContext.get().registerConfig(net.minecraftforge.fml.config.ModConfig.Type.COMMON, builder.build()); } diff --git a/src/main/java/de/ellpeck/naturesaura/api/aura/chunk/IAuraChunk.java b/src/main/java/de/ellpeck/naturesaura/api/aura/chunk/IAuraChunk.java index ea1a9c7a..c87360e2 100644 --- a/src/main/java/de/ellpeck/naturesaura/api/aura/chunk/IAuraChunk.java +++ b/src/main/java/de/ellpeck/naturesaura/api/aura/chunk/IAuraChunk.java @@ -35,7 +35,7 @@ public interface IAuraChunk extends INBTSerializable { * @return The {@link IAuraChunk} instance belonging to the chunk */ static IAuraChunk getAuraChunk(Level level, BlockPos pos) { - LevelChunk chunk = (LevelChunk) level.getChunk(pos); + var chunk = (LevelChunk) level.getChunk(pos); return chunk.getCapability(NaturesAuraAPI.capAuraChunk, null).orElse(null); } diff --git a/src/main/java/de/ellpeck/naturesaura/api/aura/container/BasicAuraContainer.java b/src/main/java/de/ellpeck/naturesaura/api/aura/container/BasicAuraContainer.java index 8150fab9..43ba067b 100644 --- a/src/main/java/de/ellpeck/naturesaura/api/aura/container/BasicAuraContainer.java +++ b/src/main/java/de/ellpeck/naturesaura/api/aura/container/BasicAuraContainer.java @@ -16,7 +16,7 @@ public class BasicAuraContainer implements IAuraContainer { @Override public int storeAura(int amountToStore, boolean simulate) { - int actual = Math.min(amountToStore, this.maxAura - this.aura); + var actual = Math.min(amountToStore, this.maxAura - this.aura); if (!simulate) { this.aura += actual; } @@ -25,7 +25,7 @@ public class BasicAuraContainer implements IAuraContainer { @Override public int drainAura(int amountToDrain, boolean simulate) { - int actual = Math.min(amountToDrain, this.aura); + var actual = Math.min(amountToDrain, this.aura); if (!simulate) { this.aura -= actual; } diff --git a/src/main/java/de/ellpeck/naturesaura/api/aura/container/ItemAuraContainer.java b/src/main/java/de/ellpeck/naturesaura/api/aura/container/ItemAuraContainer.java index 80b0079c..8dda9ebe 100644 --- a/src/main/java/de/ellpeck/naturesaura/api/aura/container/ItemAuraContainer.java +++ b/src/main/java/de/ellpeck/naturesaura/api/aura/container/ItemAuraContainer.java @@ -18,8 +18,8 @@ public class ItemAuraContainer implements IAuraContainer { @Override public int storeAura(int amountToStore, boolean simulate) { - int aura = this.getStoredAura(); - int actual = Math.min(amountToStore, this.getMaxAura() - aura); + var aura = this.getStoredAura(); + var actual = Math.min(amountToStore, this.getMaxAura() - aura); if (!simulate) { this.setAura(aura + actual); } @@ -28,8 +28,8 @@ public class ItemAuraContainer implements IAuraContainer { @Override public int drainAura(int amountToDrain, boolean simulate) { - int aura = this.getStoredAura(); - int actual = Math.min(amountToDrain, aura); + var aura = this.getStoredAura(); + var actual = Math.min(amountToDrain, aura); if (!simulate) { this.setAura(aura - actual); } diff --git a/src/main/java/de/ellpeck/naturesaura/api/aura/type/IAuraType.java b/src/main/java/de/ellpeck/naturesaura/api/aura/type/IAuraType.java index ad4a795c..58335cc8 100644 --- a/src/main/java/de/ellpeck/naturesaura/api/aura/type/IAuraType.java +++ b/src/main/java/de/ellpeck/naturesaura/api/aura/type/IAuraType.java @@ -8,7 +8,7 @@ public interface IAuraType { static IAuraType forLevel(Level level) { IAuraType highestType = NaturesAuraAPI.TYPE_OTHER; - for (IAuraType type : NaturesAuraAPI.AURA_TYPES.values()) + for (var type : NaturesAuraAPI.AURA_TYPES.values()) if (type.isPresentInLevel(level) && type.getPriority() > highestType.getPriority()) highestType = type; return highestType; diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockAncientLeaves.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockAncientLeaves.java index 7d90e746..5616046c 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockAncientLeaves.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockAncientLeaves.java @@ -53,7 +53,7 @@ public class BlockAncientLeaves extends LeavesBlock implements IModItem, IColorP public void animateTick(BlockState stateIn, Level levelIn, BlockPos pos, Random rand) { super.animateTick(stateIn, levelIn, pos, rand); if (rand.nextFloat() >= 0.95F && !levelIn.getBlockState(pos.below()).isCollisionShapeFullBlock(levelIn, pos)) { - BlockEntity tile = levelIn.getBlockEntity(pos); + var tile = levelIn.getBlockEntity(pos); if (tile instanceof BlockEntityAncientLeaves) { if (((BlockEntityAncientLeaves) tile).getAuraContainer().getStoredAura() > 0) { NaturesAuraAPI.instance().spawnMagicParticle( @@ -72,7 +72,7 @@ public class BlockAncientLeaves extends LeavesBlock implements IModItem, IColorP public void randomTick(BlockState state, ServerLevel levelIn, BlockPos pos, Random random) { super.randomTick(state, levelIn, pos, random); if (!levelIn.isClientSide) { - BlockEntity tile = levelIn.getBlockEntity(pos); + var tile = levelIn.getBlockEntity(pos); if (tile instanceof BlockEntityAncientLeaves) { if (((BlockEntityAncientLeaves) tile).getAuraContainer().getStoredAura() <= 0) { levelIn.setBlockAndUpdate(pos, ModBlocks.DECAYED_LEAVES.defaultBlockState()); diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockAnimalContainer.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockAnimalContainer.java index 8b7855d6..c279b9af 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockAnimalContainer.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockAnimalContainer.java @@ -8,7 +8,6 @@ import net.minecraft.core.BlockPos; import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.Blocks; -import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.phys.AABB; import net.minecraft.world.phys.shapes.CollisionContext; @@ -37,9 +36,9 @@ public class BlockAnimalContainer extends BlockContainerImpl implements IVisuali @Override @OnlyIn(Dist.CLIENT) public AABB getVisualizationBounds(Level level, BlockPos pos) { - BlockEntity tile = level.getBlockEntity(pos); + var tile = level.getBlockEntity(pos); if (tile instanceof BlockEntityAnimalContainer) { - int radius = ((BlockEntityAnimalContainer) tile).getRadius(); + var radius = ((BlockEntityAnimalContainer) tile).getRadius(); if (radius > 0) return new AABB(pos).inflate(radius); } diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockAnimalGenerator.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockAnimalGenerator.java index 6203b08d..1c5807bd 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockAnimalGenerator.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockAnimalGenerator.java @@ -38,42 +38,42 @@ public class BlockAnimalGenerator extends BlockContainerImpl implements IVisuali @SubscribeEvent public void onLivingUpdate(LivingEvent.LivingUpdateEvent event) { - LivingEntity entity = event.getEntityLiving(); + var entity = event.getEntityLiving(); if (entity.level.isClientSide || entity.level.getGameTime() % 40 != 0 || !(entity instanceof Animal) || entity instanceof Mob || entity instanceof Npc) return; - CompoundTag data = entity.getPersistentData(); - int timeAlive = data.getInt(NaturesAura.MOD_ID + ":time_alive"); + var data = entity.getPersistentData(); + var timeAlive = data.getInt(NaturesAura.MOD_ID + ":time_alive"); data.putInt(NaturesAura.MOD_ID + ":time_alive", timeAlive + 40); } @SubscribeEvent public void onEntityDeath(LivingDeathEvent event) { - LivingEntity entity = event.getEntityLiving(); + var entity = event.getEntityLiving(); if (entity.level.isClientSide || !(entity instanceof Animal) || entity instanceof Mob || entity instanceof Npc) return; - BlockPos pos = entity.blockPosition(); + var pos = entity.blockPosition(); Helper.getBlockEntitiesInArea(entity.level, pos, 5, tile -> { if (!(tile instanceof BlockEntityAnimalGenerator gen)) return false; - CompoundTag data = entity.getPersistentData(); + var data = entity.getPersistentData(); data.putBoolean(NaturesAura.MOD_ID + ":no_drops", true); if (gen.isBusy()) return false; - boolean child = entity.isBaby(); - float timeMod = child ? 0.5F : 1; - float amountMod = child ? 0.667F : 1; + var child = entity.isBaby(); + var timeMod = child ? 0.5F : 1; + var amountMod = child ? 0.667F : 1; - int timeAlive = data.getInt(NaturesAura.MOD_ID + ":time_alive"); - int time = Math.min(Mth.floor((timeAlive - 15000) / 500F * timeMod), 200); - int amount = Math.min(Mth.floor((timeAlive - 8000) / 2F * amountMod), 25000); + var timeAlive = data.getInt(NaturesAura.MOD_ID + ":time_alive"); + var time = Math.min(Mth.floor((timeAlive - 15000) / 500F * timeMod), 200); + var amount = Math.min(Mth.floor((timeAlive - 8000) / 2F * amountMod), 25000); if (time <= 0 || amount <= 0) return false; gen.setGenerationValues(time, amount); - BlockPos genPos = gen.getBlockPos(); + var genPos = gen.getBlockPos(); PacketHandler.sendToAllAround(entity.level, pos, 32, new PacketParticles( (float) entity.getX(), (float) entity.getY(), (float) entity.getZ(), PacketParticles.Type.ANIMAL_GEN_CONSUME, child ? 1 : 0, @@ -86,14 +86,14 @@ public class BlockAnimalGenerator extends BlockContainerImpl implements IVisuali @SubscribeEvent public void onEntityDrops(LivingDropsEvent event) { - LivingEntity entity = event.getEntityLiving(); + var entity = event.getEntityLiving(); if (entity.getPersistentData().getBoolean(NaturesAura.MOD_ID + ":no_drops")) event.setCanceled(true); } @SubscribeEvent public void onEntityExp(LivingExperienceDropEvent event) { - LivingEntity entity = event.getEntityLiving(); + var entity = event.getEntityLiving(); if (entity.getPersistentData().getBoolean(NaturesAura.MOD_ID + ":no_drops")) event.setCanceled(true); } diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockAuraBloom.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockAuraBloom.java index 47c97445..8883e60b 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockAuraBloom.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockAuraBloom.java @@ -40,7 +40,7 @@ public class BlockAuraBloom extends BushBlock implements IModItem, ICustomBlockS @Override public boolean canSurvive(BlockState state, LevelReader levelIn, BlockPos pos) { - BlockPos down = pos.below(); + var down = pos.below(); return this.mayPlaceOn(levelIn.getBlockState(down), levelIn, down); } @@ -57,7 +57,7 @@ public class BlockAuraBloom extends BushBlock implements IModItem, ICustomBlockS @Override public VoxelShape getShape(BlockState state, BlockGetter levelIn, BlockPos pos, CollisionContext context) { - Vec3 vec3d = state.getOffset(levelIn, pos); + var vec3d = state.getOffset(levelIn, pos); return SHAPE.move(vec3d.x, vec3d.y, vec3d.z); } diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockAuraDetector.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockAuraDetector.java index 5d486cc0..af8a00e0 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockAuraDetector.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockAuraDetector.java @@ -21,7 +21,7 @@ public class BlockAuraDetector extends BlockContainerImpl { @Override public int getAnalogOutputSignal(BlockState blockState, Level levelIn, BlockPos pos) { - BlockEntity tile = levelIn.getBlockEntity(pos); + var tile = levelIn.getBlockEntity(pos); if (tile instanceof BlockEntityAuraDetector detector) return detector.redstonePower; else diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockCatalyst.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockCatalyst.java index a29c7f6f..8f7f44dd 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockCatalyst.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockCatalyst.java @@ -21,7 +21,7 @@ public class BlockCatalyst extends BlockImpl implements ICustomBlockState { @Override public BlockState getStateForPlacement(BlockPlaceContext context) { - boolean nether = IAuraType.forLevel(context.getLevel()).isSimilar(NaturesAuraAPI.TYPE_NETHER); + var nether = IAuraType.forLevel(context.getLevel()).isSimilar(NaturesAuraAPI.TYPE_NETHER); return super.getStateForPlacement(context).setValue(NETHER, nether); } diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockChunkLoader.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockChunkLoader.java index 1f5da2c1..93ca727c 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockChunkLoader.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockChunkLoader.java @@ -39,9 +39,9 @@ public class BlockChunkLoader extends BlockContainerImpl implements IVisualizabl @Override @OnlyIn(Dist.CLIENT) public AABB getVisualizationBounds(Level level, BlockPos pos) { - BlockEntity tile = level.getBlockEntity(pos); + var tile = level.getBlockEntity(pos); if (tile instanceof BlockEntityChunkLoader) { - int range = ((BlockEntityChunkLoader) tile).range(); + var range = ((BlockEntityChunkLoader) tile).range(); if (range > 0) { return new AABB( (pos.getX() - range) >> 4 << 4, @@ -60,10 +60,10 @@ public class BlockChunkLoader extends BlockContainerImpl implements IVisualizabl public void animateTick(BlockState stateIn, Level levelIn, BlockPos pos, Random rand) { if (!ModConfig.instance.chunkLoader.get()) return; - BlockEntity tile = levelIn.getBlockEntity(pos); + var tile = levelIn.getBlockEntity(pos); if (tile instanceof BlockEntityChunkLoader) { - int range = ((BlockEntityChunkLoader) tile).range(); - for (int i = Mth.ceil(range / 8F); i > 0; i--) { + var range = ((BlockEntityChunkLoader) tile).range(); + for (var i = Mth.ceil(range / 8F); i > 0; i--) { NaturesAuraAPI.instance().spawnMagicParticle( pos.getX() + levelIn.random.nextFloat(), pos.getY() + levelIn.random.nextFloat(), pos.getZ() + levelIn.random.nextFloat(), 0, 0, 0, 0xa12dff, 1F + levelIn.random.nextFloat(), 100, 0, false, true); diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockContainerImpl.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockContainerImpl.java index 03b77ce1..5a4abdcc 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockContainerImpl.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockContainerImpl.java @@ -76,7 +76,7 @@ public class BlockContainerImpl extends BaseEntityBlock implements IModItem { @Nullable public BlockState getStateForPlacement(BlockPlaceContext context) { if (this.hasWaterlogging()) { - FluidState state = context.getLevel().getFluidState(context.getClickedPos()); + var state = context.getLevel().getFluidState(context.getClickedPos()); return this.defaultBlockState().setValue(BlockStateProperties.WATERLOGGED, state.is(FluidTags.WATER) && state.getAmount() == 8); } return super.getStateForPlacement(context); @@ -100,11 +100,11 @@ public class BlockContainerImpl extends BaseEntityBlock implements IModItem { @Override public List getDrops(BlockState state, LootContext.Builder builder) { - List drops = super.getDrops(state, builder); + var drops = super.getDrops(state, builder); - BlockEntity tile = builder.getParameter(LootContextParams.BLOCK_ENTITY); + var tile = builder.getParameter(LootContextParams.BLOCK_ENTITY); if (tile instanceof BlockEntityImpl) { - for (ItemStack stack : drops) { + for (var stack : drops) { if (stack.getItem() != this.asItem()) continue; ((BlockEntityImpl) tile).modifyDrop(stack); @@ -117,7 +117,7 @@ public class BlockContainerImpl extends BaseEntityBlock implements IModItem { @Override public void onPlace(BlockState state, Level levelIn, BlockPos pos, BlockState newState, boolean isMoving) { if (state.getBlock() != newState.getBlock()) { - BlockEntity tile = levelIn.getBlockEntity(pos); + var tile = levelIn.getBlockEntity(pos); if (tile instanceof BlockEntityImpl) ((BlockEntityImpl) tile).dropInventory(); } @@ -132,7 +132,7 @@ public class BlockContainerImpl extends BaseEntityBlock implements IModItem { @Override public void setPlacedBy(Level levelIn, BlockPos pos, BlockState state, LivingEntity placer, ItemStack stack) { - BlockEntity tile = levelIn.getBlockEntity(pos); + var tile = levelIn.getBlockEntity(pos); if (tile instanceof BlockEntityImpl) ((BlockEntityImpl) tile).loadDataOnPlace(stack); } @@ -144,9 +144,9 @@ public class BlockContainerImpl extends BaseEntityBlock implements IModItem { private void updateRedstoneState(Level level, BlockPos pos) { if (!level.isClientSide) { - BlockEntity tile = level.getBlockEntity(pos); + var tile = level.getBlockEntity(pos); if (tile instanceof BlockEntityImpl impl) { - int newPower = level.getBestNeighborSignal(pos); + var newPower = level.getBestNeighborSignal(pos); if (impl.redstonePower != newPower) level.scheduleTick(pos, this, 4); } @@ -156,9 +156,9 @@ public class BlockContainerImpl extends BaseEntityBlock implements IModItem { @Override public void tick(BlockState state, ServerLevel levelIn, BlockPos pos, Random random) { if (!levelIn.isClientSide) { - BlockEntity tile = levelIn.getBlockEntity(pos); + var tile = levelIn.getBlockEntity(pos); if (tile instanceof BlockEntityImpl impl) { - int newPower = levelIn.getBestNeighborSignal(pos); + var newPower = levelIn.getBestNeighborSignal(pos); if (impl.redstonePower != newPower) impl.onRedstonePowerChange(newPower); } diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockEndFlower.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockEndFlower.java index 0aa9e1b2..1d5a682c 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockEndFlower.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockEndFlower.java @@ -49,22 +49,22 @@ public class BlockEndFlower extends BushBlock implements IModItem, ICustomBlockS @Override public VoxelShape getShape(BlockState state, BlockGetter levelIn, BlockPos pos, CollisionContext context) { - Vec3 vec3d = state.getOffset(levelIn, pos); + var vec3d = state.getOffset(levelIn, pos); return SHAPE.move(vec3d.x, vec3d.y, vec3d.z); } @SubscribeEvent public void onDragonTick(LivingUpdateEvent event) { - LivingEntity living = event.getEntityLiving(); + var living = event.getEntityLiving(); if (living.level.isClientSide || !(living instanceof EnderDragon dragon)) return; if (dragon.deathTime < 150 || dragon.deathTime % 10 != 0) return; - for (int i = 0; i < 6; i++) { - int x = dragon.level.random.nextInt(256) - 128; - int z = dragon.level.random.nextInt(256) - 128; - BlockPos pos = new BlockPos(x, dragon.level.getHeight(Heightmap.Types.WORLD_SURFACE, x, z), z); + for (var i = 0; i < 6; i++) { + var x = dragon.level.random.nextInt(256) - 128; + var z = dragon.level.random.nextInt(256) - 128; + var pos = new BlockPos(x, dragon.level.getHeight(Heightmap.Types.WORLD_SURFACE, x, z), z); if (!dragon.level.isLoaded(pos)) continue; if (dragon.level.getBlockState(pos.below()).getBlock() != Blocks.END_STONE) @@ -102,7 +102,7 @@ public class BlockEndFlower extends BushBlock implements IModItem, ICustomBlockS @Override public List getDrops(BlockState state, LootContext.Builder builder) { - BlockEntity tile = builder.getParameter(LootContextParams.BLOCK_ENTITY); + var tile = builder.getParameter(LootContextParams.BLOCK_ENTITY); if (tile instanceof BlockEntityEndFlower && ((BlockEntityEndFlower) tile).isDrainMode) return NonNullList.create(); return super.getDrops(state, builder); diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockEnderCrate.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockEnderCrate.java index f425e0c2..02030485 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockEnderCrate.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockEnderCrate.java @@ -26,7 +26,6 @@ import net.minecraft.world.item.TooltipFlag; import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.SoundType; -import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.material.Material; import net.minecraft.world.phys.BlockHitResult; @@ -57,7 +56,7 @@ public class BlockEnderCrate extends BlockContainerImpl implements ITESRProvider @OnlyIn(Dist.CLIENT) public static void addEnderNameInfo(ItemStack stack, List tooltip) { - String name = getEnderName(stack); + var name = getEnderName(stack); if (name != null && !name.isEmpty()) { tooltip.add(new TextComponent(ChatFormatting.DARK_PURPLE + I18n.get("info." + NaturesAura.MOD_ID + ".ender_name", ChatFormatting.ITALIC + name + ChatFormatting.RESET))); } else { @@ -70,18 +69,18 @@ public class BlockEnderCrate extends BlockContainerImpl implements ITESRProvider var player = event.getPlayer(); if (player == null) return; - ItemStack stack = event.getLeft(); + var stack = event.getLeft(); if (stack.getItem() != this.asItem() && stack.getItem() != ModItems.ENDER_ACCESS) return; - ItemStack second = event.getRight(); + var second = event.getRight(); if (second.getItem() != Items.ENDER_EYE || second.getCount() < stack.getCount()) return; - String name = event.getName(); + var name = event.getName(); if (name == null || name.isEmpty()) return; if (ILevelData.getOverworldData(player.level).isEnderStorageLocked(name)) return; - ItemStack output = stack.copy(); + var output = stack.copy(); output.getOrCreateTag().putString(NaturesAura.MOD_ID + ":ender_name", name); event.setOutput(output); event.setMaterialCost(stack.getCount()); @@ -91,7 +90,7 @@ public class BlockEnderCrate extends BlockContainerImpl implements ITESRProvider @Override public InteractionResult use(BlockState state, Level levelIn, BlockPos pos, Player player, InteractionHand handIn, BlockHitResult hit) { if (!levelIn.isClientSide) { - BlockEntity tile = levelIn.getBlockEntity(pos); + var tile = levelIn.getBlockEntity(pos); if (tile instanceof BlockEntityEnderCrate crate && crate.canOpen()) { crate.drainAura(2500); NetworkHooks.openGui((ServerPlayer) player, crate, pos); @@ -109,14 +108,14 @@ public class BlockEnderCrate extends BlockContainerImpl implements ITESRProvider @Override @OnlyIn(Dist.CLIENT) public void animateTick(BlockState stateIn, Level levelIn, BlockPos pos, Random rand) { - for (int i = 0; i < 3; ++i) { - int j = rand.nextInt(2) * 2 - 1; - int k = rand.nextInt(2) * 2 - 1; - double d0 = (double) pos.getX() + 0.5D + 0.25D * (double) j; + for (var i = 0; i < 3; ++i) { + var j = rand.nextInt(2) * 2 - 1; + var k = rand.nextInt(2) * 2 - 1; + var d0 = (double) pos.getX() + 0.5D + 0.25D * (double) j; double d1 = (float) pos.getY() + rand.nextFloat(); - double d2 = (double) pos.getZ() + 0.5D + 0.25D * (double) k; + var d2 = (double) pos.getZ() + 0.5D + 0.25D * (double) k; double d3 = rand.nextFloat() * (float) j; - double d4 = ((double) rand.nextFloat() - 0.5D) * 0.125D; + var d4 = ((double) rand.nextFloat() - 0.5D) * 0.125D; double d5 = rand.nextFloat() * (float) k; levelIn.addParticle(ParticleTypes.PORTAL, d0, d1, d2, d3, d4, d5); } diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockFieldCreator.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockFieldCreator.java index dc0bf0e1..f6a0c2ec 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockFieldCreator.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockFieldCreator.java @@ -33,17 +33,17 @@ public class BlockFieldCreator extends BlockContainerImpl implements ICustomBloc @Override public InteractionResult use(BlockState state, Level levelIn, BlockPos pos, Player player, InteractionHand handIn, BlockHitResult p_225533_6_) { - BlockEntity tile = levelIn.getBlockEntity(pos); + var tile = levelIn.getBlockEntity(pos); if (tile instanceof BlockEntityFieldCreator) { if (!levelIn.isClientSide) { - String key = NaturesAura.MOD_ID + ":field_creator_pos"; - CompoundTag compound = player.getPersistentData(); + var key = NaturesAura.MOD_ID + ":field_creator_pos"; + var compound = player.getPersistentData(); if (!player.isCrouching() && compound.contains(key)) { - BlockPos stored = BlockPos.of(compound.getLong(key)); - BlockEntityFieldCreator creator = (BlockEntityFieldCreator) tile; + var stored = BlockPos.of(compound.getLong(key)); + var creator = (BlockEntityFieldCreator) tile; if (!pos.equals(stored)) { if (creator.isCloseEnough(stored)) { - BlockEntity otherTile = levelIn.getBlockEntity(stored); + var otherTile = levelIn.getBlockEntity(stored); if (otherTile instanceof BlockEntityFieldCreator otherCreator) { creator.connectionOffset = stored.subtract(pos); creator.isMain = true; @@ -74,9 +74,9 @@ public class BlockFieldCreator extends BlockContainerImpl implements ICustomBloc @Override @OnlyIn(Dist.CLIENT) public void animateTick(BlockState stateIn, Level levelIn, BlockPos pos, Random rand) { - BlockEntity tile = levelIn.getBlockEntity(pos); + var tile = levelIn.getBlockEntity(pos); if (tile instanceof BlockEntityFieldCreator creator && creator.isCharged) { - BlockPos connected = creator.getConnectedPos(); + var connected = creator.getConnectedPos(); if (connected != null) NaturesAuraAPI.instance().spawnParticleStream( pos.getX() + 0.25F + rand.nextFloat() * 0.5F, diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockFurnaceHeater.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockFurnaceHeater.java index a84e4cd3..f1b456eb 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockFurnaceHeater.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockFurnaceHeater.java @@ -49,9 +49,9 @@ public class BlockFurnaceHeater extends BlockContainerImpl implements ICustomBlo @Override @OnlyIn(Dist.CLIENT) public void animateTick(BlockState stateIn, Level levelIn, BlockPos pos, Random rand) { - BlockEntity tile = levelIn.getBlockEntity(pos); + var tile = levelIn.getBlockEntity(pos); if (tile instanceof BlockEntityFurnaceHeater heater && heater.isActive) { - Direction facing = stateIn.getValue(FACING); + var facing = stateIn.getValue(FACING); float x; float y; diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockGoldPowder.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockGoldPowder.java index f991e9b1..7a3c0a23 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockGoldPowder.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockGoldPowder.java @@ -43,11 +43,11 @@ public class BlockGoldPowder extends BlockImpl implements IColorProvidingBlock, } private static int getShapeIndex(BlockState state) { - int i = 0; - boolean n = state.getValue(NORTH) != RedstoneSide.NONE; - boolean e = state.getValue(EAST) != RedstoneSide.NONE; - boolean s = state.getValue(SOUTH) != RedstoneSide.NONE; - boolean w = state.getValue(WEST) != RedstoneSide.NONE; + var i = 0; + var n = state.getValue(NORTH) != RedstoneSide.NONE; + var e = state.getValue(EAST) != RedstoneSide.NONE; + var s = state.getValue(SOUTH) != RedstoneSide.NONE; + var w = state.getValue(WEST) != RedstoneSide.NONE; if (n || s && !n && !e && !w) { i |= 1 << Direction.NORTH.ordinal(); @@ -82,7 +82,7 @@ public class BlockGoldPowder extends BlockImpl implements IColorProvidingBlock, @Override public BlockState getStateForPlacement(BlockPlaceContext context) { BlockGetter iblockreader = context.getLevel(); - BlockPos blockpos = context.getClickedPos(); + var blockpos = context.getClickedPos(); return this.defaultBlockState().setValue(WEST, this.getSide(iblockreader, blockpos, Direction.WEST)).setValue(EAST, this.getSide(iblockreader, blockpos, Direction.EAST)).setValue(NORTH, this.getSide(iblockreader, blockpos, Direction.NORTH)).setValue(SOUTH, this.getSide(iblockreader, blockpos, Direction.SOUTH)); } @@ -96,12 +96,12 @@ public class BlockGoldPowder extends BlockImpl implements IColorProvidingBlock, } private RedstoneSide getSide(BlockGetter levelIn, BlockPos pos, Direction face) { - BlockPos blockpos = pos.relative(face); - BlockState blockstate = levelIn.getBlockState(blockpos); - BlockPos blockpos1 = pos.above(); - BlockState blockstate1 = levelIn.getBlockState(blockpos1); + var blockpos = pos.relative(face); + var blockstate = levelIn.getBlockState(blockpos); + var blockpos1 = pos.above(); + var blockstate1 = levelIn.getBlockState(blockpos1); if (!blockstate1.isCollisionShapeFullBlock(levelIn, blockpos1)) { - boolean flag = blockstate.isFaceSturdy(levelIn, blockpos, Direction.UP) || blockstate.getBlock() == Blocks.HOPPER; + var flag = blockstate.isFaceSturdy(levelIn, blockpos, Direction.UP) || blockstate.getBlock() == Blocks.HOPPER; if (flag && this.canConnectTo(levelIn.getBlockState(blockpos.above()))) { if (blockstate.isCollisionShapeFullBlock(levelIn, blockpos)) { return RedstoneSide.UP; @@ -115,14 +115,14 @@ public class BlockGoldPowder extends BlockImpl implements IColorProvidingBlock, } protected boolean canConnectTo(BlockState blockState) { - Block block = blockState.getBlock(); + var block = blockState.getBlock(); return block == this; } @Override public boolean canSurvive(BlockState state, LevelReader levelIn, BlockPos pos) { - BlockPos blockpos = pos.below(); - BlockState blockstate = levelIn.getBlockState(blockpos); + var blockpos = pos.below(); + var blockstate = levelIn.getBlockState(blockpos); return blockstate.isFaceSturdy(levelIn, blockpos, Direction.UP) || blockstate.getBlock() == Blocks.HOPPER; } @@ -134,14 +134,14 @@ public class BlockGoldPowder extends BlockImpl implements IColorProvidingBlock, @Override public void onPlace(BlockState state, Level levelIn, BlockPos pos, BlockState oldState, boolean isMoving) { if (oldState.getBlock() != state.getBlock() && !levelIn.isClientSide) { - for (Direction direction : Direction.Plane.VERTICAL) { + for (var direction : Direction.Plane.VERTICAL) { levelIn.updateNeighborsAt(pos.relative(direction), this); } - for (Direction direction1 : Direction.Plane.HORIZONTAL) { + for (var direction1 : Direction.Plane.HORIZONTAL) { this.notifyWireNeighborsOfStateChange(levelIn, pos.relative(direction1)); } - for (Direction direction2 : Direction.Plane.HORIZONTAL) { - BlockPos blockpos = pos.relative(direction2); + for (var direction2 : Direction.Plane.HORIZONTAL) { + var blockpos = pos.relative(direction2); if (levelIn.getBlockState(blockpos).isCollisionShapeFullBlock(levelIn, blockpos)) { this.notifyWireNeighborsOfStateChange(levelIn, blockpos.above()); } else { @@ -157,14 +157,14 @@ public class BlockGoldPowder extends BlockImpl implements IColorProvidingBlock, if (!isMoving && state.getBlock() != newState.getBlock()) { super.onRemove(state, levelIn, pos, newState, isMoving); if (!levelIn.isClientSide) { - for (Direction direction : Direction.values()) { + for (var direction : Direction.values()) { levelIn.updateNeighborsAt(pos.relative(direction), this); } - for (Direction direction1 : Direction.Plane.HORIZONTAL) { + for (var direction1 : Direction.Plane.HORIZONTAL) { this.notifyWireNeighborsOfStateChange(levelIn, pos.relative(direction1)); } - for (Direction direction2 : Direction.Plane.HORIZONTAL) { - BlockPos blockpos = pos.relative(direction2); + for (var direction2 : Direction.Plane.HORIZONTAL) { + var blockpos = pos.relative(direction2); if (levelIn.getBlockState(blockpos).isCollisionShapeFullBlock(levelIn, blockpos)) { this.notifyWireNeighborsOfStateChange(levelIn, blockpos.above()); } else { @@ -188,23 +188,23 @@ public class BlockGoldPowder extends BlockImpl implements IColorProvidingBlock, @Override public void updateIndirectNeighbourShapes(BlockState state, LevelAccessor levelIn, BlockPos pos, int flags, int recursionLeft) { - BlockPos.MutableBlockPos pool = new BlockPos.MutableBlockPos(); - for (Direction direction : Direction.Plane.HORIZONTAL) { - RedstoneSide redstoneside = state.getValue(RedStoneWireBlock.PROPERTY_BY_DIRECTION.get(direction)); + var pool = new BlockPos.MutableBlockPos(); + for (var direction : Direction.Plane.HORIZONTAL) { + var redstoneside = state.getValue(RedStoneWireBlock.PROPERTY_BY_DIRECTION.get(direction)); if (redstoneside != RedstoneSide.NONE && levelIn.getBlockState(pool.set(pos).move(direction)).getBlock() != this) { pool.move(Direction.DOWN); - BlockState blockstate = levelIn.getBlockState(pool); + var blockstate = levelIn.getBlockState(pool); if (blockstate.getBlock() != Blocks.OBSERVER) { - BlockPos blockpos = pool.relative(direction.getOpposite()); - BlockState blockstate1 = blockstate.updateShape(direction.getOpposite(), levelIn.getBlockState(blockpos), levelIn, pool, blockpos); + var blockpos = pool.relative(direction.getOpposite()); + var blockstate1 = blockstate.updateShape(direction.getOpposite(), levelIn.getBlockState(blockpos), levelIn, pool, blockpos); updateOrDestroy(blockstate, blockstate1, levelIn, pool, flags); } pool.set(pos).move(direction).move(Direction.UP); - BlockState blockstate3 = levelIn.getBlockState(pool); + var blockstate3 = levelIn.getBlockState(pool); if (blockstate3.getBlock() != Blocks.OBSERVER) { - BlockPos blockpos1 = pool.relative(direction.getOpposite()); - BlockState blockstate2 = blockstate3.updateShape(direction.getOpposite(), levelIn.getBlockState(blockpos1), levelIn, pool, blockpos1); + var blockpos1 = pool.relative(direction.getOpposite()); + var blockstate2 = blockstate3.updateShape(direction.getOpposite(), levelIn.getBlockState(blockpos1), levelIn, pool, blockpos1); updateOrDestroy(blockstate3, blockstate2, levelIn, pool, flags); } } @@ -216,7 +216,7 @@ public class BlockGoldPowder extends BlockImpl implements IColorProvidingBlock, if (levelIn.getBlockState(pos).getBlock() == this) { levelIn.updateNeighborsAt(pos, this); - for (Direction direction : Direction.values()) { + for (var direction : Direction.values()) { levelIn.updateNeighborsAt(pos.relative(direction), this); } } diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockGoldenLeaves.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockGoldenLeaves.java index 7a0917e9..612a8625 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockGoldenLeaves.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockGoldenLeaves.java @@ -35,7 +35,7 @@ public class BlockGoldenLeaves extends LeavesBlock implements IModItem, IColorPr } public static boolean convert(Level level, BlockPos pos) { - BlockState state = level.getBlockState(pos); + var state = level.getBlockState(pos); if (state.getBlock() instanceof LeavesBlock && !(state.getBlock() instanceof BlockAncientLeaves || state.getBlock() instanceof BlockGoldenLeaves)) { if (!level.isClientSide) { level.setBlockAndUpdate(pos, ModBlocks.GOLDEN_LEAVES.defaultBlockState() @@ -74,9 +74,9 @@ public class BlockGoldenLeaves extends LeavesBlock implements IModItem, IColorPr @OnlyIn(Dist.CLIENT) public BlockColor getBlockColor() { return (state, levelIn, pos, tintIndex) -> { - int color = 0xF2FF00; + var color = 0xF2FF00; if (state != null && levelIn != null && pos != null) { - int foliage = BiomeColors.getAverageFoliageColor(levelIn, pos); + var foliage = BiomeColors.getAverageFoliageColor(levelIn, pos); return Helper.blendColors(color, foliage, state.getValue(STAGE) / (float) HIGHEST_STAGE); } else { return color; @@ -100,7 +100,7 @@ public class BlockGoldenLeaves extends LeavesBlock implements IModItem, IColorPr } if (stage > 1) { - BlockPos offset = pos.relative(Direction.getRandom(random)); + var offset = pos.relative(Direction.getRandom(random)); if (levelIn.isLoaded(offset)) convert(levelIn, offset); } diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockGratedChute.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockGratedChute.java index 28b718d2..faaee362 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockGratedChute.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockGratedChute.java @@ -89,7 +89,7 @@ public class BlockGratedChute extends BlockContainerImpl implements ICustomBlock public InteractionResult use(BlockState state, Level levelIn, BlockPos pos, Player player, InteractionHand handIn, BlockHitResult hit) { if (!player.isCrouching()) return InteractionResult.FAIL; - BlockEntity tile = levelIn.getBlockEntity(pos); + var tile = levelIn.getBlockEntity(pos); if (!(tile instanceof BlockEntityGratedChute chute)) return InteractionResult.FAIL; if (!levelIn.isClientSide) { @@ -102,7 +102,7 @@ public class BlockGratedChute extends BlockContainerImpl implements ICustomBlock @Nullable @Override public BlockState getStateForPlacement(BlockPlaceContext context) { - Direction newFacing = context.getClickedFace().getOpposite(); + var newFacing = context.getClickedFace().getOpposite(); if (newFacing == Direction.UP) newFacing = Direction.DOWN; return super.getStateForPlacement(context).setValue(FACING, newFacing); @@ -120,10 +120,10 @@ public class BlockGratedChute extends BlockContainerImpl implements ICustomBlock @Override public int getAnalogOutputSignal(BlockState blockState, Level levelIn, BlockPos pos) { - BlockEntity tile = levelIn.getBlockEntity(pos); + var tile = levelIn.getBlockEntity(pos); if (tile instanceof BlockEntityGratedChute) { IItemHandler handler = ((BlockEntityGratedChute) tile).getItemHandler(); - ItemStack stack = handler.getStackInSlot(0); + var stack = handler.getStackInSlot(0); if (stack.isEmpty()) return 0; return Mth.ceil(stack.getCount() / (float) stack.getMaxStackSize() * 15); diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockItemDistributor.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockItemDistributor.java index 076ce3d3..25a4c70f 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockItemDistributor.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockItemDistributor.java @@ -23,11 +23,11 @@ public class BlockItemDistributor extends BlockContainerImpl implements ICustomB public InteractionResult use(BlockState state, Level levelIn, BlockPos pos, Player player, InteractionHand handIn, BlockHitResult hit) { if (!player.isCrouching()) return InteractionResult.FAIL; - BlockEntity tile = levelIn.getBlockEntity(pos); + var tile = levelIn.getBlockEntity(pos); if (!(tile instanceof BlockEntityItemDistributor)) return InteractionResult.FAIL; if (!levelIn.isClientSide) { - BlockEntityItemDistributor distributor = (BlockEntityItemDistributor) tile; + var distributor = (BlockEntityItemDistributor) tile; distributor.isRandomMode = !distributor.isRandomMode; distributor.sendToClients(); } diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockLight.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockLight.java index 848c4d42..4967299e 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockLight.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockLight.java @@ -31,7 +31,7 @@ public class BlockLight extends BlockImpl implements ICustomBlockState, INoItemB @Override @OnlyIn(Dist.CLIENT) public void animateTick(BlockState stateIn, Level levelIn, BlockPos pos, Random rand) { - for (int i = 0; i < 2; i++) + for (var i = 0; i < 2; i++) NaturesAuraAPI.instance().spawnMagicParticle( pos.getX() + 0.5F, pos.getY() + 0.5F, pos.getZ() + 0.5F, rand.nextGaussian() * 0.015F, 0, rand.nextGaussian() * 0.015F, diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockNatureAltar.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockNatureAltar.java index 093132ab..e98b1f33 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockNatureAltar.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockNatureAltar.java @@ -69,7 +69,7 @@ public class BlockNatureAltar extends BlockContainerImpl implements ITESRProvide @Nullable @Override public BlockState getStateForPlacement(BlockPlaceContext context) { - boolean nether = IAuraType.forLevel(context.getLevel()).isSimilar(NaturesAuraAPI.TYPE_NETHER); + var nether = IAuraType.forLevel(context.getLevel()).isSimilar(NaturesAuraAPI.TYPE_NETHER); return super.getStateForPlacement(context).setValue(NETHER, nether); } diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockNetherGrass.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockNetherGrass.java index 4356471f..b9a28eb7 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockNetherGrass.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockNetherGrass.java @@ -21,8 +21,8 @@ public class BlockNetherGrass extends BlockImpl implements ICustomBlockState, Bo @Override public void randomTick(BlockState state, ServerLevel levelIn, BlockPos pos, Random random) { - BlockPos up = pos.above(); - BlockState upState = levelIn.getBlockState(up); + var up = pos.above(); + var upState = levelIn.getBlockState(up); if (upState.isFaceSturdy(levelIn, up, Direction.DOWN)) levelIn.setBlockAndUpdate(pos, Blocks.NETHERRACK.defaultBlockState()); } @@ -47,16 +47,16 @@ public class BlockNetherGrass extends BlockImpl implements ICustomBlockState, Bo @Override public void performBonemeal(ServerLevel level, Random rand, BlockPos pos, BlockState state) { - BlockPos blockpos = pos.above(); - BlockState blockstate = Blocks.GRASS.defaultBlockState(); + var blockpos = pos.above(); + var blockstate = Blocks.GRASS.defaultBlockState(); - for (int i = 0; i < 128; ++i) { - BlockPos blockpos1 = blockpos; - int j = 0; + for (var i = 0; i < 128; ++i) { + var blockpos1 = blockpos; + var j = 0; while (true) { if (j >= i / 16) { - BlockState blockstate2 = level.getBlockState(blockpos1); + var blockstate2 = level.getBlockState(blockpos1); if (blockstate2.getBlock() == blockstate.getBlock() && rand.nextInt(10) == 0) { ((BonemealableBlock) blockstate.getBlock()).performBonemeal(level, rand, blockpos1, blockstate2); } diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockOakGenerator.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockOakGenerator.java index 960ce26b..9396e380 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockOakGenerator.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockOakGenerator.java @@ -32,14 +32,14 @@ public class BlockOakGenerator extends BlockContainerImpl implements IVisualizab @SubscribeEvent public void onTreeGrow(SaplingGrowTreeEvent event) { var level = event.getWorld(); - BlockPos pos = event.getPos(); + var pos = event.getPos(); if (level instanceof Level && !level.isClientSide() && IAuraType.forLevel((Level) level).isSimilar(NaturesAuraAPI.TYPE_OVERWORLD) && level.getBlockState(pos).getBlock() instanceof SaplingBlock) { Helper.getBlockEntitiesInArea(level, pos, 10, tile -> { if (!(tile instanceof BlockEntityOakGenerator)) return false; - Random rand = event.getRand(); + var rand = event.getRand(); if (rand.nextInt(10) == 0) ((BlockEntityOakGenerator) tile).scheduledBigTrees.add(pos); diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockPickupStopper.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockPickupStopper.java index 6ec915c0..9983f52b 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockPickupStopper.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockPickupStopper.java @@ -31,17 +31,17 @@ public class BlockPickupStopper extends BlockContainerImpl implements IVisualiza @SubscribeEvent public void onPickup(EntityItemPickupEvent event) { - Player player = event.getPlayer(); + var player = event.getPlayer(); if (player != null && !player.isCrouching()) { - ItemEntity item = event.getItem(); - BlockPos pos = item.blockPosition(); + var item = event.getItem(); + var pos = item.blockPosition(); Helper.getBlockEntitiesInArea(item.level, pos, 8, tile -> { if (!(tile instanceof BlockEntityPickupStopper stopper)) return false; - float radius = stopper.getRadius(); + var radius = stopper.getRadius(); if (radius <= 0F) return false; - BlockPos stopperPos = stopper.getBlockPos(); + var stopperPos = stopper.getBlockPos(); if (!new AABB(stopperPos).inflate(radius).intersects(item.getBoundingBox())) return false; @@ -58,7 +58,7 @@ public class BlockPickupStopper extends BlockContainerImpl implements IVisualiza @Override @OnlyIn(Dist.CLIENT) public AABB getVisualizationBounds(Level level, BlockPos pos) { - BlockEntity tile = level.getBlockEntity(pos); + var tile = level.getBlockEntity(pos); if (tile instanceof BlockEntityPickupStopper) { double radius = ((BlockEntityPickupStopper) tile).getRadius(); if (radius > 0) diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockProjectileGenerator.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockProjectileGenerator.java index 8211f2b7..9b1b7ba3 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockProjectileGenerator.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockProjectileGenerator.java @@ -45,7 +45,7 @@ public class BlockProjectileGenerator extends BlockContainerImpl implements ITES @Override protected Projectile getProjectile(Level levelIn, Position position, ItemStack stackIn) { - ThrownEnderpearl ret = new ThrownEnderpearl(EntityType.ENDER_PEARL, levelIn); + var ret = new ThrownEnderpearl(EntityType.ENDER_PEARL, levelIn); ret.setPos(position.x(), position.y(), position.z()); return ret; } @@ -53,7 +53,7 @@ public class BlockProjectileGenerator extends BlockContainerImpl implements ITES DispenserBlock.registerBehavior(Items.TRIDENT, new AbstractProjectileDispenseBehavior() { @Override protected Projectile getProjectile(Level levelIn, Position position, ItemStack stackIn) { - ThrownTrident ret = new ThrownTrident(EntityType.TRIDENT, levelIn); + var ret = new ThrownTrident(EntityType.TRIDENT, levelIn); ret.setPos(position.x(), position.y(), position.z()); ObfuscationReflectionHelper.setPrivateValue(ThrownTrident.class, ret, stackIn.copy(), "tridentItem"); ret.pickup = AbstractArrow.Pickup.ALLOWED; @@ -64,21 +64,21 @@ public class BlockProjectileGenerator extends BlockContainerImpl implements ITES @SubscribeEvent public void onProjectileImpact(ProjectileImpactEvent event) { - Entity entity = event.getEntity(); + var entity = event.getEntity(); if (entity.level.isClientSide) return; - HitResult ray = event.getRayTraceResult(); + var ray = event.getRayTraceResult(); if (!(ray instanceof BlockHitResult blockRay)) return; - BlockPos pos = blockRay.getBlockPos(); + var pos = blockRay.getBlockPos(); if (pos == null) return; - BlockEntity tile = entity.level.getBlockEntity(pos); + var tile = entity.level.getBlockEntity(pos); if (!(tile instanceof BlockEntityProjectileGenerator generator)) return; if (generator.nextSide != blockRay.getDirection()) return; - Integer amount = NaturesAuraAPI.PROJECTILE_GENERATIONS.get(entity.getType()); + var amount = NaturesAuraAPI.PROJECTILE_GENERATIONS.get(entity.getType()); if (amount == null || amount <= 0) return; if (!generator.canGenerateRightNow(amount)) diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockSlimeSplitGenerator.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockSlimeSplitGenerator.java index de69778f..06922700 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockSlimeSplitGenerator.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockSlimeSplitGenerator.java @@ -48,10 +48,10 @@ public class BlockSlimeSplitGenerator extends BlockContainerImpl implements IVis @SubscribeEvent public void onLivingDeath(LivingDeathEvent event) { - LivingEntity entity = event.getEntityLiving(); + var entity = event.getEntityLiving(); if (!(entity instanceof Slime slime) || entity.level.isClientSide) return; - int size = slime.getSize(); + var size = slime.getSize(); if (size <= 1) return; Helper.getBlockEntitiesInArea(entity.level, entity.blockPosition(), 8, tile -> { diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockSnowCreator.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockSnowCreator.java index 3aa3630a..78ac1107 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockSnowCreator.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockSnowCreator.java @@ -21,9 +21,9 @@ public class BlockSnowCreator extends BlockContainerImpl implements IVisualizabl @Override @OnlyIn(Dist.CLIENT) public AABB getVisualizationBounds(Level level, BlockPos pos) { - BlockEntity tile = level.getBlockEntity(pos); + var tile = level.getBlockEntity(pos); if (tile instanceof BlockEntitySnowCreator) { - int radius = ((BlockEntitySnowCreator) tile).getRange(); + var radius = ((BlockEntitySnowCreator) tile).getRange(); if (radius > 0) return new AABB(pos).inflate(radius); } diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockSpawnLamp.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockSpawnLamp.java index 4d276a00..a44c1097 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockSpawnLamp.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockSpawnLamp.java @@ -53,26 +53,26 @@ public class BlockSpawnLamp extends BlockContainerImpl implements IVisualizable, public void onSpawn(LivingSpawnEvent.CheckSpawn event) { if (event.getSpawner() != null) return; - LevelAccessor level = event.getWorld(); - BlockPos pos = new BlockPos(event.getX(), event.getY(), event.getZ()); + var level = event.getWorld(); + var pos = new BlockPos(event.getX(), event.getY(), event.getZ()); if (!(level instanceof Level)) return; - LevelData data = (LevelData) ILevelData.getLevelData((Level) level); - for (BlockEntitySpawnLamp lamp : data.spawnLamps) { + var data = (LevelData) ILevelData.getLevelData((Level) level); + for (var lamp : data.spawnLamps) { if (lamp.isRemoved()) continue; - int range = lamp.getRadius(); + var range = lamp.getRadius(); if (range <= 0) continue; - BlockPos lampPos = lamp.getBlockPos(); + var lampPos = lamp.getBlockPos(); if (!new AABB(lampPos).inflate(range).contains(new Vec3(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5))) continue; - Mob entity = (Mob) event.getEntityLiving(); + var entity = (Mob) event.getEntityLiving(); if (entity.checkSpawnRules(level, event.getSpawnReason()) && entity.checkSpawnObstruction(level)) { - BlockPos spot = IAuraChunk.getHighestSpot((Level) level, lampPos, 32, lampPos); + var spot = IAuraChunk.getHighestSpot((Level) level, lampPos, 32, lampPos); IAuraChunk.getAuraChunk((Level) level, spot).drainAura(spot, 200); PacketHandler.sendToAllAround((ServerLevel) level, lampPos, 32, @@ -92,9 +92,9 @@ public class BlockSpawnLamp extends BlockContainerImpl implements IVisualizable, @Override @OnlyIn(Dist.CLIENT) public AABB getVisualizationBounds(Level level, BlockPos pos) { - BlockEntity tile = level.getBlockEntity(pos); + var tile = level.getBlockEntity(pos); if (tile instanceof BlockEntitySpawnLamp) { - int radius = ((BlockEntitySpawnLamp) tile).getRadius(); + var radius = ((BlockEntitySpawnLamp) tile).getRadius(); if (radius > 0) return new AABB(pos).inflate(radius); } diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockSpring.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockSpring.java index 7b79c657..e92fc343 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockSpring.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockSpring.java @@ -66,7 +66,7 @@ public class BlockSpring extends BlockContainerImpl implements ICustomBlockState @Override public ItemStack pickupBlock(LevelAccessor levelIn, BlockPos pos, BlockState state) { - BlockEntity tile = levelIn.getBlockEntity(pos); + var tile = levelIn.getBlockEntity(pos); if (tile instanceof BlockEntitySpring) ((BlockEntitySpring) tile).consumeAura(2500); return new ItemStack(Items.WATER_BUCKET); } diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockWoodStand.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockWoodStand.java index 1c75f50a..f9ac9597 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockWoodStand.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockWoodStand.java @@ -58,25 +58,25 @@ public class BlockWoodStand extends BlockContainerImpl implements ITESRProvider< @SubscribeEvent public void onTreeGrow(SaplingGrowTreeEvent event) { - LevelAccessor level = event.getWorld(); - BlockPos pos = event.getPos(); + var level = event.getWorld(); + var pos = event.getPos(); if (!level.isClientSide() && level instanceof Level) { if (Multiblocks.TREE_RITUAL.isComplete((Level) level, pos)) { - BlockState sapling = level.getBlockState(pos); - ItemStack saplingStack = sapling.getBlock().getCloneItemStack(level, pos, sapling); + var sapling = level.getBlockState(pos); + var saplingStack = sapling.getBlock().getCloneItemStack(level, pos, sapling); if (!saplingStack.isEmpty()) { - for (TreeRitualRecipe recipe : ((Level) level).getRecipeManager().getRecipesFor(ModRecipes.TREE_RITUAL_TYPE, null, null)) { + for (var recipe : ((Level) level).getRecipeManager().getRecipesFor(ModRecipes.TREE_RITUAL_TYPE, null, null)) { if (recipe.saplingType.test(saplingStack)) { List required = new ArrayList<>(Arrays.asList(recipe.ingredients)); - MutableObject toPick = new MutableObject<>(); + var toPick = new MutableObject(); - boolean fine = Multiblocks.TREE_RITUAL.forEach(pos, 'W', (tilePos, matcher) -> { - BlockEntity tile = level.getBlockEntity(tilePos); + var fine = Multiblocks.TREE_RITUAL.forEach(pos, 'W', (tilePos, matcher) -> { + var tile = level.getBlockEntity(tilePos); if (tile instanceof BlockEntityWoodStand stand) { - ItemStack stack = stand.items.getStackInSlot(0); + var stack = stand.items.getStackInSlot(0); if (!stack.isEmpty()) { - for (int i = required.size() - 1; i >= 0; i--) { - Ingredient req = required.get(i); + for (var i = required.size() - 1; i >= 0; i--) { + var req = required.get(i); if (req.test(stack)) { required.remove(i); diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/multi/Multiblock.java b/src/main/java/de/ellpeck/naturesaura/blocks/multi/Multiblock.java index dea05b6b..c45b1dbe 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/multi/Multiblock.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/multi/Multiblock.java @@ -29,24 +29,24 @@ public class Multiblock implements IMultiblock { public Multiblock(ResourceLocation name, String[][] pattern, Object... rawMatchers) { this.name = name; - int width = -1; + var width = -1; this.height = pattern.length; - int depth = -1; - int xOff = 0; - int yOff = 0; - int zOff = 0; + var depth = -1; + var xOff = 0; + var yOff = 0; + var zOff = 0; char[][][] raw = null; - for (int i = 0; i < pattern.length; i++) { - String[] row = pattern[i]; + for (var i = 0; i < pattern.length; i++) { + var row = pattern[i]; if (width < 0) width = row.length; else if (row.length != width) throw new IllegalArgumentException(); - for (int j = 0; j < row.length; j++) { - String column = row[j]; + for (var j = 0; j < row.length; j++) { + var column = row[j]; if (depth < 0) depth = column.length(); else if (column.length() != depth) @@ -54,8 +54,8 @@ public class Multiblock implements IMultiblock { if (raw == null) raw = new char[width][this.height][depth]; - for (int k = 0; k < column.length(); k++) { - char c = column.charAt(k); + for (var k = 0; k < column.length(); k++) { + var c = column.charAt(k); raw[k][this.height - 1 - i][j] = c; if (c == '0') { @@ -74,12 +74,12 @@ public class Multiblock implements IMultiblock { this.rawPattern = raw; Map matchers = new HashMap<>(); - for (int i = 0; i < rawMatchers.length; i += 2) { - char c = (char) rawMatchers[i]; + for (var i = 0; i < rawMatchers.length; i += 2) { + var c = (char) rawMatchers[i]; if (matchers.containsKey(c)) continue; - Object value = rawMatchers[i + 1]; + var value = rawMatchers[i + 1]; if (value instanceof BlockState state) { matchers.put(c, new Matcher(state, (level, start, offset, pos, other, otherC) -> other == state)); @@ -90,10 +90,10 @@ public class Multiblock implements IMultiblock { matchers.put(c, (Matcher) value); } - for (int x = 0; x < this.width; x++) - for (int y = 0; y < this.height; y++) - for (int z = 0; z < this.depth; z++) { - Matcher matcher = matchers.get(this.rawPattern[x][y][z]); + for (var x = 0; x < this.width; x++) + for (var y = 0; y < this.height; y++) + for (var z = 0; z < this.depth; z++) { + var matcher = matchers.get(this.rawPattern[x][y][z]); if (matcher == null) throw new IllegalStateException(); if (matcher.check() != null) @@ -106,18 +106,18 @@ public class Multiblock implements IMultiblock { @Override public boolean isComplete(Level level, BlockPos center) { - BlockPos start = this.getStart(center); + var start = this.getStart(center); return this.forEach(center, (char) 0, (pos, matcher) -> { - BlockPos offset = pos.subtract(start); + var offset = pos.subtract(start); return matcher.check().matches(level, start, offset, pos, level.getBlockState(pos), this.getChar(offset)); }); } @Override public boolean forEach(BlockPos center, char c, BiFunction function) { - BlockPos start = this.getStart(center); - for (Map.Entry entry : this.matchers.entrySet()) { - BlockPos offset = entry.getKey(); + var start = this.getStart(center); + for (var entry : this.matchers.entrySet()) { + var offset = entry.getKey(); if (c == 0 || this.getChar(offset) == c) if (!function.apply(start.offset(offset), entry.getValue())) return false; diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/multi/Multiblocks.java b/src/main/java/de/ellpeck/naturesaura/blocks/multi/Multiblocks.java index 53a61acc..ac67d9e5 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/multi/Multiblocks.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/multi/Multiblocks.java @@ -53,7 +53,7 @@ public final class Multiblocks { return true; // try-catch to prevent blocks that need to have been placed crashing here try { - ItemStack stack = state.getBlock().getCloneItemStack(level, pos, state); + var stack = state.getBlock().getCloneItemStack(level, pos, state); return !stack.isEmpty() && level.getRecipeManager().getRecipesFor(ModRecipes.TREE_RITUAL_TYPE, null, null).stream().anyMatch(r -> r.saplingType.test(stack)); } catch (Exception e) { return false; diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityAncientLeaves.java b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityAncientLeaves.java index 32b8b4c3..229b6c99 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityAncientLeaves.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityAncientLeaves.java @@ -17,7 +17,7 @@ public class BlockEntityAncientLeaves extends BlockEntityImpl { @Override public int drainAura(int amountToDrain, boolean simulate) { - int amount = super.drainAura(amountToDrain, simulate); + var amount = super.drainAura(amountToDrain, simulate); if (amount > 0 && !simulate) { BlockEntityAncientLeaves.this.sendToClients(); } diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityAnimalGenerator.java b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityAnimalGenerator.java index e6bf2024..9ba11a4f 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityAnimalGenerator.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityAnimalGenerator.java @@ -22,7 +22,7 @@ public class BlockEntityAnimalGenerator extends BlockEntityImpl implements ITick if (this.timeRemaining <= 0) return; - int remain = this.amountToRelease; + var remain = this.amountToRelease; if (this.canGenerateRightNow(remain)) { this.generateAura(remain); PacketHandler.sendToAllAround(this.level, this.worldPosition, 32, diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityAnimalSpawner.java b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityAnimalSpawner.java index 68127b4e..c3b73522 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityAnimalSpawner.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityAnimalSpawner.java @@ -51,13 +51,13 @@ public class BlockEntityAnimalSpawner extends BlockEntityImpl implements ITickab } if (this.currentRecipe != null) { - int drain = Mth.ceil(this.currentRecipe.aura / (float) this.currentRecipe.time * 10F); - BlockPos spot = IAuraChunk.getHighestSpot(this.level, this.worldPosition, 35, this.worldPosition); + var drain = Mth.ceil(this.currentRecipe.aura / (float) this.currentRecipe.time * 10F); + var spot = IAuraChunk.getHighestSpot(this.level, this.worldPosition, 35, this.worldPosition); IAuraChunk.getAuraChunk(this.level, spot).drainAura(spot, drain); this.time += 10; if (this.time >= this.currentRecipe.time) { - Entity entity = this.currentRecipe.makeEntity(this.level, new BlockPos(this.spawnX, this.worldPosition.getY() + 1, this.spawnZ)); + var entity = this.currentRecipe.makeEntity(this.level, new BlockPos(this.spawnX, this.worldPosition.getY() + 1, this.spawnZ)); this.level.addFreshEntity(entity); this.currentRecipe = null; @@ -65,20 +65,20 @@ public class BlockEntityAnimalSpawner extends BlockEntityImpl implements ITickab this.sendToClients(); } } else { - List items = this.level.getEntitiesOfClass(ItemEntity.class, + var items = this.level.getEntitiesOfClass(ItemEntity.class, new AABB(this.worldPosition).inflate(2)); - for (AnimalSpawnerRecipe recipe : this.level.getRecipeManager().getRecipesFor(ModRecipes.ANIMAL_SPAWNER_TYPE, null, null)) { + for (var recipe : this.level.getRecipeManager().getRecipesFor(ModRecipes.ANIMAL_SPAWNER_TYPE, null, null)) { if (recipe.ingredients.length != items.size()) continue; List required = new ArrayList<>(Arrays.asList(recipe.ingredients)); - for (ItemEntity item : items) { + for (var item : items) { if (!item.isAlive() || item.hasPickUpDelay()) break; - ItemStack stack = item.getItem(); + var stack = item.getItem(); if (stack.isEmpty()) break; - for (Ingredient ingredient : required) { + for (var ingredient : required) { if (ingredient.test(stack) && Helper.getIngredientAmount(ingredient) == stack.getCount()) { required.remove(ingredient); break; @@ -88,7 +88,7 @@ public class BlockEntityAnimalSpawner extends BlockEntityImpl implements ITickab if (!required.isEmpty()) continue; - for (ItemEntity item : items) { + for (var item : items) { item.remove(Entity.RemovalReason.KILLED); PacketHandler.sendToAllAround(this.level, this.worldPosition, 32, new PacketParticles((float) item.getX(), (float) item.getY(), (float) item.getZ(), PacketParticles.Type.ANIMAL_SPAWNER)); @@ -124,8 +124,8 @@ public class BlockEntityAnimalSpawner extends BlockEntityImpl implements ITickab this.entityClient = this.currentRecipe.makeEntity(this.level, BlockPos.ZERO); this.entityClient.setPos(this.spawnX, this.worldPosition.getY() + 1, this.spawnZ); } - AABB bounds = this.entityClient.getBoundingBox(); - for (int i = this.level.random.nextInt(5) + 5; i >= 0; i--) + var bounds = this.entityClient.getBoundingBox(); + for (var i = this.level.random.nextInt(5) + 5; i >= 0; i--) NaturesAuraAPI.instance().spawnMagicParticle( bounds.minX + this.level.random.nextFloat() * (bounds.maxX - bounds.minX), bounds.minY + this.level.random.nextFloat() * (bounds.maxY - bounds.minY), @@ -153,7 +153,7 @@ public class BlockEntityAnimalSpawner extends BlockEntityImpl implements ITickab if (type != SaveType.BLOCK) { if (compound.contains("recipe")) { if (this.hasLevel()) { - ResourceLocation name = new ResourceLocation(compound.getString("recipe")); + var name = new ResourceLocation(compound.getString("recipe")); this.currentRecipe = (AnimalSpawnerRecipe) this.level.getRecipeManager().byKey(name).orElse(null); } this.spawnX = compound.getDouble("spawn_x"); diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityAuraDetector.java b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityAuraDetector.java index db5a9bcd..61250415 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityAuraDetector.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityAuraDetector.java @@ -16,8 +16,8 @@ public class BlockEntityAuraDetector extends BlockEntityImpl implements ITickabl @Override public void tick() { if (!this.level.isClientSide && this.level.getGameTime() % 20 == 0) { - int totalAmount = IAuraChunk.triangulateAuraInArea(this.level, this.worldPosition, 25); - int power = Mth.clamp(Mth.ceil(totalAmount / (IAuraChunk.DEFAULT_AURA * 2F) * 15F), 0, 15); + var totalAmount = IAuraChunk.triangulateAuraInArea(this.level, this.worldPosition, 25); + var power = Mth.clamp(Mth.ceil(totalAmount / (IAuraChunk.DEFAULT_AURA * 2F) * 15F), 0, 15); if (this.redstonePower != power) { this.redstonePower = power; this.level.updateNeighbourForOutputSignal(this.worldPosition, this.getBlockState().getBlock()); diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityAuraTimer.java b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityAuraTimer.java index 261e790d..86d6b2c9 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityAuraTimer.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityAuraTimer.java @@ -38,7 +38,7 @@ public class BlockEntityAuraTimer extends BlockEntityImpl implements ITickableBl public void onRedstonePowerChange(int newPower) { if (this.redstonePower <= 0 && newPower > 0) { this.timer = 0; - int color = ItemAuraBottle.getType(this.itemHandler.getStackInSlot(0)).getColor(); + var color = ItemAuraBottle.getType(this.itemHandler.getStackInSlot(0)).getColor(); PacketHandler.sendToAllAround(this.level, this.worldPosition, 32, new PacketParticles(this.worldPosition.getX(), this.worldPosition.getY(), this.worldPosition.getZ(), PacketParticles.Type.TIMER_RESET, color)); this.sendToClients(); } @@ -47,7 +47,7 @@ public class BlockEntityAuraTimer extends BlockEntityImpl implements ITickableBl @Override public void tick() { - int total = this.getTotalTime(); + var total = this.getTotalTime(); if (total <= 0) { this.timer = 0; return; @@ -55,7 +55,7 @@ public class BlockEntityAuraTimer extends BlockEntityImpl implements ITickableBl if (this.level.isClientSide) { if (this.level.getGameTime() % 8 == 0) { - int color = ItemAuraBottle.getType(this.itemHandler.getStackInSlot(0)).getColor(); + var color = ItemAuraBottle.getType(this.itemHandler.getStackInSlot(0)).getColor(); NaturesAuraAPI.instance().spawnMagicParticle( this.worldPosition.getX() + 1 / 16F + this.level.random.nextFloat() * 14 / 16F, this.worldPosition.getY() + 1 / 16F + this.level.random.nextFloat() * 14 / 16F, @@ -69,11 +69,11 @@ public class BlockEntityAuraTimer extends BlockEntityImpl implements ITickableBl if (this.timer >= total) { this.timer = 0; - BlockState state = this.getBlockState(); + var state = this.getBlockState(); this.level.setBlock(this.worldPosition, state.setValue(BlockStateProperties.POWERED, true), 1); this.level.scheduleTick(this.worldPosition, state.getBlock(), 4); - int color = ItemAuraBottle.getType(this.itemHandler.getStackInSlot(0)).getColor(); + var color = ItemAuraBottle.getType(this.itemHandler.getStackInSlot(0)).getColor(); PacketHandler.sendToAllAround(this.level, this.worldPosition, 32, new PacketParticles(this.worldPosition.getX(), this.worldPosition.getY(), this.worldPosition.getZ(), PacketParticles.Type.TIMER_RESET, color)); } if (this.timer % 2 == 0) @@ -81,10 +81,10 @@ public class BlockEntityAuraTimer extends BlockEntityImpl implements ITickableBl } public int getTotalTime() { - ItemStack stack = this.itemHandler.getStackInSlot(0); + var stack = this.itemHandler.getStackInSlot(0); if (stack.isEmpty()) return 0; - Integer amount = TIMES.get(ItemAuraBottle.getType(stack)); + var amount = TIMES.get(ItemAuraBottle.getType(stack)); if (amount == null) return 0; return amount * stack.getCount(); diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityAutoCrafter.java b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityAutoCrafter.java index df390110..e49af731 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityAutoCrafter.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityAutoCrafter.java @@ -38,7 +38,7 @@ public class BlockEntityAutoCrafter extends BlockEntityImpl implements ITickable this.crafting.clearContent(); var state = this.level.getBlockState(this.worldPosition); - Direction facing = state.getValue(BlockAutoCrafter.FACING); + var facing = state.getValue(BlockAutoCrafter.FACING); var middlePos = this.worldPosition.above(); var topPos = middlePos.relative(facing, 2); var bottomPos = middlePos.relative(facing.getOpposite(), 2); diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityBlastFurnaceBooster.java b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityBlastFurnaceBooster.java index a8b1e6af..068e2dd8 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityBlastFurnaceBooster.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityBlastFurnaceBooster.java @@ -30,7 +30,7 @@ public class BlockEntityBlastFurnaceBooster extends BlockEntityImpl implements I if (this.level.isClientSide) return; - BlockEntity below = this.level.getBlockEntity(this.worldPosition.below()); + var below = this.level.getBlockEntity(this.worldPosition.below()); if (!(below instanceof BlastFurnaceBlockEntity tile)) return; Recipe recipe = this.level.getRecipeManager().getRecipeFor(BlockEntityFurnaceHeater.getRecipeType(tile), tile, this.level).orElse(null); @@ -39,8 +39,8 @@ public class BlockEntityBlastFurnaceBooster extends BlockEntityImpl implements I if (!this.isApplicable(recipe.getIngredients())) return; - ContainerData data = BlockEntityFurnaceHeater.getFurnaceData(tile); - int doneDiff = data.get(3) - data.get(2); + var data = BlockEntityFurnaceHeater.getFurnaceData(tile); + var doneDiff = data.get(3) - data.get(2); if (doneDiff > 1) return; @@ -50,18 +50,18 @@ public class BlockEntityBlastFurnaceBooster extends BlockEntityImpl implements I return; } - ItemStack output = tile.getItem(2); + var output = tile.getItem(2); if (output.getCount() >= output.getMaxStackSize()) return; if (output.isEmpty()) { - ItemStack result = recipe.getResultItem(); + var result = recipe.getResultItem(); tile.setItem(2, result.copy()); } else { output.grow(1); } - BlockPos pos = IAuraChunk.getHighestSpot(this.level, this.worldPosition, 30, this.worldPosition); + var pos = IAuraChunk.getHighestSpot(this.level, this.worldPosition, 30, this.worldPosition); IAuraChunk.getAuraChunk(this.level, pos).drainAura(pos, 6500); PacketHandler.sendToAllAround(this.level, this.worldPosition, 32, @@ -69,8 +69,8 @@ public class BlockEntityBlastFurnaceBooster extends BlockEntityImpl implements I } private boolean isApplicable(List ingredients) { - for (Ingredient ing : ingredients) { - for (ItemStack stack : ing.getItems()) { + for (var ing : ingredients) { + for (var stack : ing.getItems()) { if (stack.getItem().getTags().stream().anyMatch(t -> t.getPath().startsWith("ores/"))) return true; } @@ -80,10 +80,10 @@ public class BlockEntityBlastFurnaceBooster extends BlockEntityImpl implements I @Override public IItemHandlerModifiable getItemHandler() { - BlockEntity below = this.level.getBlockEntity(this.worldPosition.below()); + var below = this.level.getBlockEntity(this.worldPosition.below()); if (!(below instanceof BlastFurnaceBlockEntity)) return null; - IItemHandler handler = below.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, Direction.UP).orElse(null); + var handler = below.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, Direction.UP).orElse(null); if (handler == null) return null; return new IItemHandlerModifiable() { diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityChorusGenerator.java b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityChorusGenerator.java index 65955bdb..60d46a55 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityChorusGenerator.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityChorusGenerator.java @@ -34,8 +34,8 @@ public class BlockEntityChorusGenerator extends BlockEntityImpl implements ITick return; if (this.currentlyBreaking.isEmpty()) return; - BlockPos pos = this.currentlyBreaking.removeLast(); - BlockState state = this.level.getBlockState(pos); + var pos = this.currentlyBreaking.removeLast(); + var state = this.level.getBlockState(pos); if (state.getBlock() != Blocks.CHORUS_PLANT && state.getBlock() != Blocks.CHORUS_FLOWER) { this.currentlyBreaking.clear(); return; @@ -50,16 +50,16 @@ public class BlockEntityChorusGenerator extends BlockEntityImpl implements ITick @Override public void onRedstonePowerChange(int newPower) { if (this.redstonePower <= 0 && newPower > 0 && this.currentlyBreaking.isEmpty()) { - int range = 2; + var range = 2; xyz: - for (int x = -range; x <= range; x++) { - for (int y = -range; y <= range; y++) { - for (int z = -range; z <= range; z++) { - BlockPos offset = this.worldPosition.offset(x, y, z); - BlockState below = this.level.getBlockState(offset.below()); + for (var x = -range; x <= range; x++) { + for (var y = -range; y <= range; y++) { + for (var z = -range; z <= range; z++) { + var offset = this.worldPosition.offset(x, y, z); + var below = this.level.getBlockState(offset.below()); if (below.getBlock() != Blocks.END_STONE) continue; - BlockState state = this.level.getBlockState(offset); + var state = this.level.getBlockState(offset); if (state.getBlock() != Blocks.CHORUS_PLANT) continue; @@ -70,7 +70,7 @@ public class BlockEntityChorusGenerator extends BlockEntityImpl implements ITick this.currentlyBreaking.addAll(plants); this.currentlyBreaking.addFirst(offset); - int aura = plants.size() * plants.size() * 300; + var aura = plants.size() * plants.size() * 300; this.auraPerBlock = aura / plants.size(); break xyz; @@ -82,13 +82,13 @@ public class BlockEntityChorusGenerator extends BlockEntityImpl implements ITick } private void collectChorusPlant(BlockPos pos, List blocks) { - for (Direction dir : Direction.values()) { + for (var dir : Direction.values()) { if (dir == Direction.DOWN) continue; - BlockPos offset = pos.relative(dir); + var offset = pos.relative(dir); if (blocks.contains(offset)) continue; - BlockState state = this.level.getBlockState(offset); + var state = this.level.getBlockState(offset); if (state.getBlock() != Blocks.CHORUS_PLANT && state.getBlock() != Blocks.CHORUS_FLOWER) continue; blocks.add(offset); @@ -100,8 +100,8 @@ public class BlockEntityChorusGenerator extends BlockEntityImpl implements ITick public void writeNBT(CompoundTag compound, SaveType type) { super.writeNBT(compound, type); if (type == SaveType.TILE) { - ListTag list = new ListTag(); - for (BlockPos pos : this.currentlyBreaking) + var list = new ListTag(); + for (var pos : this.currentlyBreaking) list.add(NbtUtils.writeBlockPos(pos)); compound.put("breaking", list); compound.putInt("aura", this.auraPerBlock); @@ -113,8 +113,8 @@ public class BlockEntityChorusGenerator extends BlockEntityImpl implements ITick super.readNBT(compound, type); if (type == SaveType.TILE) { this.currentlyBreaking.clear(); - ListTag list = compound.getList("breaking", 10); - for (int i = 0; i < list.size(); i++) + var list = compound.getList("breaking", 10); + for (var i = 0; i < list.size(); i++) this.currentlyBreaking.add(NbtUtils.readBlockPos(list.getCompound(i))); this.auraPerBlock = compound.getInt("aura"); } diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityChunkLoader.java b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityChunkLoader.java index f3db12c4..bf773939 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityChunkLoader.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityChunkLoader.java @@ -45,15 +45,15 @@ public class BlockEntityChunkLoader extends BlockEntityImpl implements ITickable private void loadChunks(boolean unload) { if (this.level.isClientSide || !ModConfig.instance.chunkLoader.get()) return; - ServerLevel level = (ServerLevel) this.level; + var level = (ServerLevel) this.level; List shouldBeForced = new ArrayList<>(); if (!unload) { - int range = this.range(); + var range = this.range(); if (range > 0) { - for (int x = (this.worldPosition.getX() - range) >> 4; x <= (this.worldPosition.getX() + range) >> 4; x++) { - for (int z = (this.worldPosition.getZ() - range) >> 4; z <= (this.worldPosition.getZ() + range) >> 4; z++) { - ChunkPos pos = new ChunkPos(x, z); + for (var x = (this.worldPosition.getX() - range) >> 4; x <= (this.worldPosition.getX() + range) >> 4; x++) { + for (var z = (this.worldPosition.getZ() - range) >> 4; z <= (this.worldPosition.getZ() + range) >> 4; z++) { + var pos = new ChunkPos(x, z); // Only force chunks that we're already forcing or that nobody else is forcing if (this.forcedChunks.contains(pos) || !level.getForcedChunks().contains(pos.toLong())) shouldBeForced.add(pos); @@ -63,14 +63,14 @@ public class BlockEntityChunkLoader extends BlockEntityImpl implements ITickable } // Unforce all the chunks that shouldn't be forced anymore - for (ChunkPos pos : this.forcedChunks) { + for (var pos : this.forcedChunks) { if (!shouldBeForced.contains(pos)) level.setChunkForced(pos.x, pos.z, false); } this.forcedChunks.clear(); // Force all chunks that should be forced - for (ChunkPos pos : shouldBeForced) { + for (var pos : shouldBeForced) { level.setChunkForced(pos.x, pos.z, true); this.forcedChunks.add(pos); } @@ -88,9 +88,9 @@ public class BlockEntityChunkLoader extends BlockEntityImpl implements ITickable if (this.level.getGameTime() % 20 != 0) return; - int toUse = Mth.ceil(this.range() / 2F); + var toUse = Mth.ceil(this.range() / 2F); if (toUse > 0) { - BlockPos spot = IAuraChunk.getHighestSpot(this.level, this.worldPosition, 35, this.worldPosition); + var spot = IAuraChunk.getHighestSpot(this.level, this.worldPosition, 35, this.worldPosition); IAuraChunk.getAuraChunk(this.level, spot).drainAura(spot, toUse); } } diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityEndFlower.java b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityEndFlower.java index 2246adaa..420f9987 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityEndFlower.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityEndFlower.java @@ -31,7 +31,7 @@ public class BlockEntityEndFlower extends BlockEntityImpl implements ITickableBl @Override public int drainAura(int amountToDrain, boolean simulate) { - int amount = super.drainAura(amountToDrain, simulate); + var amount = super.drainAura(amountToDrain, simulate); if (amount > 0 && !simulate) BlockEntityEndFlower.this.sendToClients(); return amount; @@ -56,11 +56,11 @@ public class BlockEntityEndFlower extends BlockEntityImpl implements ITickableBl return; if (!this.isDrainMode) { - List items = this.level.getEntitiesOfClass(ItemEntity.class, new AABB(this.worldPosition).inflate(1), Entity::isAlive); - for (ItemEntity item : items) { + var items = this.level.getEntitiesOfClass(ItemEntity.class, new AABB(this.worldPosition).inflate(1), Entity::isAlive); + for (var item : items) { if (item.hasPickUpDelay()) continue; - ItemStack stack = item.getItem(); + var stack = item.getItem(); if (stack.getCount() != 1) continue; if (stack.getItem() != Items.ENDER_EYE) @@ -74,7 +74,7 @@ public class BlockEntityEndFlower extends BlockEntityImpl implements ITickableBl break; } } else { - int toDrain = Math.min(5000, this.container.getStoredAura()); + var toDrain = Math.min(5000, this.container.getStoredAura()); this.container.drainAura(toDrain, false); this.generateAura(toDrain); diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityEnderCrate.java b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityEnderCrate.java index 74aa6fba..71ae1710 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityEnderCrate.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityEnderCrate.java @@ -45,7 +45,7 @@ public class BlockEntityEnderCrate extends BlockEntityImpl implements MenuProvid @Nonnull @Override public ItemStack insertItem(int slot, @Nonnull ItemStack stack, boolean simulate) { - ItemStack remain = this.getStorage().insertItem(slot, stack, simulate); + var remain = this.getStorage().insertItem(slot, stack, simulate); if (!simulate) BlockEntityEnderCrate.this.drainAura((stack.getCount() - remain.getCount()) * 20); return remain; @@ -54,7 +54,7 @@ public class BlockEntityEnderCrate extends BlockEntityImpl implements MenuProvid @Nonnull @Override public ItemStack extractItem(int slot, int amount, boolean simulate) { - ItemStack extracted = this.getStorage().extractItem(slot, amount, simulate); + var extracted = this.getStorage().extractItem(slot, amount, simulate); if (!simulate) BlockEntityEnderCrate.this.drainAura(extracted.getCount() * 20); return extracted; @@ -107,7 +107,7 @@ public class BlockEntityEnderCrate extends BlockEntityImpl implements MenuProvid public void loadDataOnPlace(ItemStack stack) { super.loadDataOnPlace(stack); if (!this.level.isClientSide) { - String name = BlockEnderCrate.getEnderName(stack); + var name = BlockEnderCrate.getEnderName(stack); if (name != null && !name.isEmpty()) this.name = name; } @@ -133,7 +133,7 @@ public class BlockEntityEnderCrate extends BlockEntityImpl implements MenuProvid public void drainAura(int amount) { if (amount > 0) { - BlockPos spot = IAuraChunk.getHighestSpot(this.level, this.worldPosition, 35, this.worldPosition); + var spot = IAuraChunk.getHighestSpot(this.level, this.worldPosition, 35, this.worldPosition); IAuraChunk.getAuraChunk(this.level, spot).drainAura(spot, amount); } } diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityFieldCreator.java b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityFieldCreator.java index 2400997b..a76f8228 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityFieldCreator.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityFieldCreator.java @@ -42,11 +42,11 @@ public class BlockEntityFieldCreator extends BlockEntityImpl implements ITickabl if (this.level.isClientSide || this.level.getGameTime() % 10 != 0) return; - BlockPos connectedPos = this.getConnectedPos(); + var connectedPos = this.getConnectedPos(); if (connectedPos == null || !this.level.isLoaded(connectedPos)) return; - BlockEntity other = this.level.getBlockEntity(connectedPos); + var other = this.level.getBlockEntity(connectedPos); if (!this.isCloseEnough(connectedPos) || !(other instanceof BlockEntityFieldCreator) || !this.worldPosition.equals(((BlockEntityFieldCreator) other).getConnectedPos())) { @@ -61,7 +61,7 @@ public class BlockEntityFieldCreator extends BlockEntityImpl implements ITickabl if (!this.isMain) return; - BlockEntityFieldCreator creator = (BlockEntityFieldCreator) other; + var creator = (BlockEntityFieldCreator) other; if (this.redstonePower <= 0 && creator.redstonePower <= 0) { this.chargeTimer = 0; if (this.isCharged) { @@ -73,8 +73,8 @@ public class BlockEntityFieldCreator extends BlockEntityImpl implements ITickabl return; } - BlockPos spot = IAuraChunk.getHighestSpot(this.level, this.worldPosition, 32, this.worldPosition); - IAuraChunk chunk = IAuraChunk.getAuraChunk(this.level, spot); + var spot = IAuraChunk.getHighestSpot(this.level, this.worldPosition, 32, this.worldPosition); + var chunk = IAuraChunk.getAuraChunk(this.level, spot); if (!this.isCharged) { this.chargeTimer += 10; @@ -93,17 +93,17 @@ public class BlockEntityFieldCreator extends BlockEntityImpl implements ITickabl if (this.level.getGameTime() % 40 == 0) chunk.drainAura(spot, 20); - ItemStack tool = this.getToolUsed(creator); - Vec3 dist = new Vec3( + var tool = this.getToolUsed(creator); + var dist = new Vec3( this.worldPosition.getX() - connectedPos.getX(), this.worldPosition.getY() - connectedPos.getY(), this.worldPosition.getZ() - connectedPos.getZ() ); - double length = dist.length(); - Vec3 normal = new Vec3(dist.x / length, dist.y / length, dist.z / length); + var length = dist.length(); + var normal = new Vec3(dist.x / length, dist.y / length, dist.z / length); for (float i = Mth.floor(length); i > 0; i -= 0.5F) { - Vec3 scaled = normal.scale(i); - BlockPos pos = connectedPos.offset( + var scaled = normal.scale(i); + var pos = connectedPos.offset( Mth.floor(scaled.x + 0.5F), Mth.floor(scaled.y + 0.5F), Mth.floor(scaled.z + 0.5F)); @@ -111,19 +111,19 @@ public class BlockEntityFieldCreator extends BlockEntityImpl implements ITickabl if (pos.equals(this.worldPosition) || pos.equals(connectedPos)) continue; - BlockState state = this.level.getBlockState(pos); - Block block = state.getBlock(); + var state = this.level.getBlockState(pos); + var block = state.getBlock(); if (!state.isAir() && state.getDestroySpeed(this.level, pos) >= 0F) { - FakePlayer fake = FakePlayerFactory.getMinecraft((ServerLevel) this.level); + var fake = FakePlayerFactory.getMinecraft((ServerLevel) this.level); if (!MinecraftForge.EVENT_BUS.post(new BlockEvent.BreakEvent(this.level, pos, state, fake))) { - List drops = state.getDrops(new LootContext.Builder((ServerLevel) this.level) + var drops = state.getDrops(new LootContext.Builder((ServerLevel) this.level) .withParameter(LootContextParams.THIS_ENTITY, fake) .withParameter(LootContextParams.ORIGIN, Vec3.atCenterOf(pos)) .withParameter(LootContextParams.BLOCK_STATE, state) .withParameter(LootContextParams.TOOL, tool.isEmpty() ? new ItemStack(Items.DIAMOND_PICKAXE) : tool) .withOptionalParameter(LootContextParams.BLOCK_ENTITY, this.level.getBlockEntity(pos))); this.level.destroyBlock(pos, false); - for (ItemStack stack : drops) + for (var stack : drops) Block.popResource(this.level, pos, stack); chunk.drainAura(spot, !tool.isEmpty() ? 300 : 100); this.sendParticles(); @@ -134,8 +134,8 @@ public class BlockEntityFieldCreator extends BlockEntityImpl implements ITickabl } private ItemStack getToolUsed(BlockEntityFieldCreator other) { - ItemStack myTool = this.getMyTool(); - ItemStack otherTool = other.getMyTool(); + var myTool = this.getMyTool(); + var otherTool = other.getMyTool(); if (!myTool.isEmpty()) { // if both have tools, choose randomly if (!otherTool.isEmpty()) @@ -146,9 +146,9 @@ public class BlockEntityFieldCreator extends BlockEntityImpl implements ITickabl } private ItemStack getMyTool() { - List frames = Helper.getAttachedItemFrames(this.level, this.worldPosition); - for (ItemFrame frame : frames) { - ItemStack stack = frame.getItem(); + var frames = Helper.getAttachedItemFrames(this.level, this.worldPosition); + for (var frame : frames) { + var stack = frame.getItem(); if (!stack.isEmpty()) return stack; } @@ -156,8 +156,8 @@ public class BlockEntityFieldCreator extends BlockEntityImpl implements ITickabl } private void sendParticles() { - for (int j = 0; j < 2; j++) { - BlockPos p = j == 0 ? this.worldPosition : this.getConnectedPos(); + for (var j = 0; j < 2; j++) { + var p = j == 0 ? this.worldPosition : this.getConnectedPos(); PacketHandler.sendToAllAround(this.level, p, 32, new PacketParticleStream( p.getX() + (float) this.level.random.nextGaussian() * 3F, p.getY() + 1 + this.level.random.nextFloat() * 3F, @@ -171,7 +171,7 @@ public class BlockEntityFieldCreator extends BlockEntityImpl implements ITickabl } public boolean isCloseEnough(BlockPos pos) { - int range = ModConfig.instance.fieldCreatorRange.get() + 1; + var range = ModConfig.instance.fieldCreatorRange.get() + 1; return this.worldPosition.distSqr(pos) <= range * range; } diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityFireworkGenerator.java b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityFireworkGenerator.java index 3ad6be4d..288f1368 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityFireworkGenerator.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityFireworkGenerator.java @@ -36,15 +36,15 @@ public class BlockEntityFireworkGenerator extends BlockEntityImpl implements ITi public void tick() { if (!this.level.isClientSide) { if (this.level.getGameTime() % 10 == 0) { - List items = this.level.getEntitiesOfClass(ItemEntity.class, new AABB(this.worldPosition).inflate(4), Entity::isAlive); - for (ItemEntity item : items) { + var items = this.level.getEntitiesOfClass(ItemEntity.class, new AABB(this.worldPosition).inflate(4), Entity::isAlive); + for (var item : items) { if (item.hasPickUpDelay()) continue; - ItemStack stack = item.getItem(); + var stack = item.getItem(); if (stack.isEmpty() || stack.getItem() != Items.FIREWORK_ROCKET) continue; if (this.trackedEntity == null && this.releaseTimer <= 0) { - FireworkRocketEntity entity = new FireworkRocketEntity(this.level, item.getX(), item.getY(), item.getZ(), stack); + var entity = new FireworkRocketEntity(this.level, item.getX(), item.getY(), item.getZ(), stack); this.trackedEntity = entity; this.trackedItem = stack.copy(); this.level.addFreshEntity(entity); @@ -63,31 +63,31 @@ public class BlockEntityFireworkGenerator extends BlockEntityImpl implements ITi float generateFactor = 0; Set usedColors = new HashSet<>(); - CompoundTag compound = this.trackedItem.getTag(); - CompoundTag fireworks = compound.getCompound("Fireworks"); + var compound = this.trackedItem.getTag(); + var fireworks = compound.getCompound("Fireworks"); - int flightTime = fireworks.getInt("Flight"); - ListTag explosions = fireworks.getList("Explosions", 10); + var flightTime = fireworks.getInt("Flight"); + var explosions = fireworks.getList("Explosions", 10); if (!explosions.isEmpty()) { generateFactor += flightTime; - for (Tag base : explosions) { - CompoundTag explosion = (CompoundTag) base; + for (var base : explosions) { + var explosion = (CompoundTag) base; generateFactor += 1.5F; - boolean flicker = explosion.getBoolean("Flicker"); + var flicker = explosion.getBoolean("Flicker"); if (flicker) generateFactor += 1; - boolean trail = explosion.getBoolean("Trail"); + var trail = explosion.getBoolean("Trail"); if (trail) generateFactor += 8; - byte type = explosion.getByte("Type"); + var type = explosion.getByte("Type"); generateFactor += new float[]{0, 1, 0.5F, 20, 0.5F}[type]; Set colors = new HashSet<>(); - for (int color : explosion.getIntArray("Colors")) { + for (var color : explosion.getIntArray("Colors")) { usedColors.add(color); colors.add(color); } @@ -96,7 +96,7 @@ public class BlockEntityFireworkGenerator extends BlockEntityImpl implements ITi } if (generateFactor > 0) { - int toAdd = Mth.ceil(generateFactor * 10000F); + var toAdd = Mth.ceil(generateFactor * 10000F); if (this.canGenerateRightNow(toAdd)) { this.toRelease = toAdd; this.releaseTimer = 15 * flightTime + 40; diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityFlowerGenerator.java b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityFlowerGenerator.java index def3b629..bc1d24f9 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityFlowerGenerator.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityFlowerGenerator.java @@ -34,12 +34,12 @@ public class BlockEntityFlowerGenerator extends BlockEntityImpl implements ITick public void tick() { if (!this.level.isClientSide && this.level.getGameTime() % 10 == 0) { List possible = new ArrayList<>(); - int range = 3; - for (int x = -range; x <= range; x++) { - for (int y = -1; y <= 1; y++) { - for (int z = -range; z <= range; z++) { - BlockPos offset = this.worldPosition.offset(x, y, z); - BlockState state = this.level.getBlockState(offset); + var range = 3; + for (var x = -range; x <= range; x++) { + for (var y = -1; y <= 1; y++) { + for (var z = -range; z <= range; z++) { + var offset = this.worldPosition.offset(x, y, z); + var state = this.level.getBlockState(offset); if (BlockTags.SMALL_FLOWERS.contains(state.getBlock())) possible.add(offset); } @@ -49,12 +49,12 @@ public class BlockEntityFlowerGenerator extends BlockEntityImpl implements ITick if (possible.isEmpty()) return; - BlockPos pos = possible.get(this.level.random.nextInt(possible.size())); - BlockState state = this.level.getBlockState(pos); - MutableInt curr = this.consumedRecently.computeIfAbsent(state, s -> new MutableInt()); + var pos = possible.get(this.level.random.nextInt(possible.size())); + var state = this.level.getBlockState(pos); + var curr = this.consumedRecently.computeIfAbsent(state, s -> new MutableInt()); - int addAmount = 25000; - int toAdd = Math.max(0, addAmount - curr.getValue() * 100); + var addAmount = 25000; + var toAdd = Math.max(0, addAmount - curr.getValue() * 100); if (toAdd > 0) { if (IAuraType.forLevel(this.level).isSimilar(NaturesAuraAPI.TYPE_OVERWORLD) && this.canGenerateRightNow(toAdd)) { this.generateAura(toAdd); @@ -63,9 +63,9 @@ public class BlockEntityFlowerGenerator extends BlockEntityImpl implements ITick } } - for (Map.Entry entry : this.consumedRecently.entrySet()) { + for (var entry : this.consumedRecently.entrySet()) { if (entry.getKey() != state) { - MutableInt val = entry.getValue(); + var val = entry.getValue(); if (val.getValue() > 0) val.subtract(1); } @@ -74,9 +74,9 @@ public class BlockEntityFlowerGenerator extends BlockEntityImpl implements ITick this.level.removeBlock(pos, false); - int color = Helper.blendColors(0x5ccc30, 0xe53c16, toAdd / (float) addAmount); + var color = Helper.blendColors(0x5ccc30, 0xe53c16, toAdd / (float) addAmount); if (toAdd > 0) { - for (int i = this.level.random.nextInt(5) + 5; i >= 0; i--) + for (var i = this.level.random.nextInt(5) + 5; i >= 0; i--) PacketHandler.sendToAllAround(this.level, this.worldPosition, 32, new PacketParticleStream( pos.getX() + 0.25F + this.level.random.nextFloat() * 0.5F, pos.getY() + 0.25F + this.level.random.nextFloat() * 0.5F, @@ -102,12 +102,12 @@ public class BlockEntityFlowerGenerator extends BlockEntityImpl implements ITick super.writeNBT(compound, type); if (type != SaveType.SYNC && !this.consumedRecently.isEmpty()) { - ListTag list = new ListTag(); - for (Map.Entry entry : this.consumedRecently.entrySet()) { - BlockState state = entry.getKey(); - Block block = state.getBlock(); + var list = new ListTag(); + for (var entry : this.consumedRecently.entrySet()) { + var state = entry.getKey(); + var block = state.getBlock(); - CompoundTag tag = new CompoundTag(); + var tag = new CompoundTag(); tag.putString("block", block.getRegistryName().toString()); tag.putInt("amount", entry.getValue().intValue()); list.add(tag); @@ -121,10 +121,10 @@ public class BlockEntityFlowerGenerator extends BlockEntityImpl implements ITick super.readNBT(compound, type); if (type != SaveType.SYNC) { this.consumedRecently.clear(); - ListTag list = compound.getList("consumed_recently", 10); - for (Tag base : list) { - CompoundTag tag = (CompoundTag) base; - Block block = ForgeRegistries.BLOCKS.getValue(new ResourceLocation(tag.getString("block"))); + var list = compound.getList("consumed_recently", 10); + for (var base : list) { + var tag = (CompoundTag) base; + var block = ForgeRegistries.BLOCKS.getValue(new ResourceLocation(tag.getString("block"))); if (block != null) this.consumedRecently.put(block.defaultBlockState(), new MutableInt(tag.getInt("amount"))); } diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityFurnaceHeater.java b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityFurnaceHeater.java index 2dca6b5b..162a1750 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityFurnaceHeater.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityFurnaceHeater.java @@ -56,14 +56,14 @@ public class BlockEntityFurnaceHeater extends BlockEntityImpl implements ITickab @Override public void tick() { if (!this.level.isClientSide && this.level.getGameTime() % 5 == 0) { - boolean did = false; + var did = false; - Direction facing = this.level.getBlockState(this.worldPosition).getValue(BlockFurnaceHeater.FACING); - BlockPos tilePos = this.worldPosition.relative(facing.getOpposite()); - BlockEntity tile = this.level.getBlockEntity(tilePos); + var facing = this.level.getBlockState(this.worldPosition).getValue(BlockFurnaceHeater.FACING); + var tilePos = this.worldPosition.relative(facing.getOpposite()); + var tile = this.level.getBlockEntity(tilePos); if (tile instanceof AbstractFurnaceBlockEntity furnace && this.isReady(furnace)) { - ContainerData data = getFurnaceData(furnace); - int burnTime = data.get(0); + var data = getFurnaceData(furnace); + var burnTime = data.get(0); if (burnTime <= 0) this.level.setBlockAndUpdate(tilePos, this.level.getBlockState(tilePos).setValue(AbstractFurnaceBlock.LIT, true)); @@ -71,8 +71,8 @@ public class BlockEntityFurnaceHeater extends BlockEntityImpl implements ITickab //if set higher than 199, it'll never finish because the furnace does ++ and then == data.set(2, Math.min(data.get(3) - 1, data.get(2) + 5)); - BlockPos spot = IAuraChunk.getHighestSpot(this.level, this.worldPosition, 20, this.worldPosition); - IAuraChunk chunk = IAuraChunk.getAuraChunk(this.level, spot); + var spot = IAuraChunk.getHighestSpot(this.level, this.worldPosition, 20, this.worldPosition); + var chunk = IAuraChunk.getAuraChunk(this.level, spot); chunk.drainAura(spot, Mth.ceil((200 - burnTime) * 16.6F)); did = true; @@ -100,13 +100,13 @@ public class BlockEntityFurnaceHeater extends BlockEntityImpl implements ITickab if (!furnace.getItem(1).isEmpty()) return false; - ItemStack input = furnace.getItem(0); + var input = furnace.getItem(0); if (!input.isEmpty()) { - AbstractCookingRecipe recipe = this.level.getRecipeManager().getRecipeFor(getRecipeType(furnace), furnace, this.level).orElse(null); + var recipe = this.level.getRecipeManager().getRecipeFor(getRecipeType(furnace), furnace, this.level).orElse(null); if (recipe == null) return false; - ItemStack output = recipe.getResultItem(); - ItemStack currOutput = furnace.getItem(2); + var output = recipe.getResultItem(); + var currOutput = furnace.getItem(2); return currOutput.isEmpty() || Helper.areItemsEqual(currOutput, output, true) && currOutput.getCount() + output.getCount() <= output.getMaxStackSize(); } else return false; diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityGratedChute.java b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityGratedChute.java index c51632b4..fdf94dc0 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityGratedChute.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityGratedChute.java @@ -45,22 +45,22 @@ public class BlockEntityGratedChute extends BlockEntityImpl implements ITickable if (this.redstonePower > 0) return; - ItemStack curr = this.items.getStackInSlot(0); + var curr = this.items.getStackInSlot(0); push: if (!curr.isEmpty()) { - BlockState state = this.level.getBlockState(this.worldPosition); - Direction facing = state.getValue(BlockGratedChute.FACING); - BlockEntity tile = this.level.getBlockEntity(this.worldPosition.relative(facing)); + var state = this.level.getBlockState(this.worldPosition); + var facing = state.getValue(BlockGratedChute.FACING); + var tile = this.level.getBlockEntity(this.worldPosition.relative(facing)); if (tile == null) break push; - IItemHandler handler = tile.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, + var handler = tile.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, facing.getOpposite()).orElse(null); if (handler == null) break push; - for (int i = 0; i < handler.getSlots(); i++) { - ItemStack theoreticalDrain = this.items.extractItem(0, 1, true); + for (var i = 0; i < handler.getSlots(); i++) { + var theoreticalDrain = this.items.extractItem(0, 1, true); if (!theoreticalDrain.isEmpty()) { - ItemStack left = handler.insertItem(i, theoreticalDrain, false); + var left = handler.insertItem(i, theoreticalDrain, false); if (left.isEmpty()) { this.items.extractItem(0, 1, false); break push; @@ -70,16 +70,16 @@ public class BlockEntityGratedChute extends BlockEntityImpl implements ITickable } pull: if (curr.isEmpty() || curr.getCount() < curr.getMaxStackSize()) { - List items = this.level.getEntitiesOfClass(ItemEntity.class, new AABB( + var items = this.level.getEntitiesOfClass(ItemEntity.class, new AABB( this.worldPosition.getX(), this.worldPosition.getY() + 0.5, this.worldPosition.getZ(), this.worldPosition.getX() + 1, this.worldPosition.getY() + 2, this.worldPosition.getZ() + 1)); - for (ItemEntity item : items) { + for (var item : items) { if (!item.isAlive()) continue; - ItemStack stack = item.getItem(); + var stack = item.getItem(); if (stack.isEmpty()) continue; - ItemStack left = this.items.insertItem(0, stack, false); + var left = this.items.insertItem(0, stack, false); if (!ItemStack.isSame(stack, left)) { if (left.isEmpty()) { item.kill(); @@ -90,16 +90,16 @@ public class BlockEntityGratedChute extends BlockEntityImpl implements ITickable } } - BlockEntity tileUp = this.level.getBlockEntity(this.worldPosition.above()); + var tileUp = this.level.getBlockEntity(this.worldPosition.above()); if (tileUp == null) break pull; - IItemHandler handlerUp = tileUp.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, Direction.DOWN).orElse(null); + var handlerUp = tileUp.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, Direction.DOWN).orElse(null); if (handlerUp == null) break pull; - for (int i = 0; i < handlerUp.getSlots(); i++) { - ItemStack theoreticalDrain = handlerUp.extractItem(i, 1, true); + for (var i = 0; i < handlerUp.getSlots(); i++) { + var theoreticalDrain = handlerUp.extractItem(i, 1, true); if (!theoreticalDrain.isEmpty()) { - ItemStack left = this.items.insertItem(0, theoreticalDrain, false); + var left = this.items.insertItem(0, theoreticalDrain, false); if (left.isEmpty()) { handlerUp.extractItem(i, 1, false); break pull; @@ -113,11 +113,11 @@ public class BlockEntityGratedChute extends BlockEntityImpl implements ITickable } private boolean isItemInFrame(ItemStack stack) { - List frames = Helper.getAttachedItemFrames(this.level, this.worldPosition); + var frames = Helper.getAttachedItemFrames(this.level, this.worldPosition); if (frames.isEmpty()) return false; - for (ItemFrame frame : frames) { - ItemStack frameStack = frame.getItem(); + for (var frame : frames) { + var frameStack = frame.getItem(); if (Helper.areItemsEqual(stack, frameStack, true)) { return true; } diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityHopperUpgrade.java b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityHopperUpgrade.java index 2c994684..330665ea 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityHopperUpgrade.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityHopperUpgrade.java @@ -36,26 +36,26 @@ public class BlockEntityHopperUpgrade extends BlockEntityImpl implements ITickab if (!this.level.isClientSide && this.level.getGameTime() % 10 == 0) { if (IAuraChunk.getAuraInArea(this.level, this.worldPosition, 25) < 100000) return; - BlockEntity tile = this.level.getBlockEntity(this.worldPosition.below()); + var tile = this.level.getBlockEntity(this.worldPosition.below()); if (!isValidHopper(tile)) return; - IItemHandler handler = tile.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, Direction.UP).orElse(null); + var handler = tile.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, Direction.UP).orElse(null); if (handler == null) return; - List items = this.level.getEntitiesOfClass(ItemEntity.class, new AABB(this.worldPosition).inflate(7)); + var items = this.level.getEntitiesOfClass(ItemEntity.class, new AABB(this.worldPosition).inflate(7)); if (items.isEmpty()) return; - for (ItemEntity item : items) { + for (var item : items) { if (!item.isAlive() || item.hasPickUpDelay()) continue; - ItemStack stack = item.getItem(); + var stack = item.getItem(); if (stack.isEmpty()) continue; - ItemStack copy = stack.copy(); + var copy = stack.copy(); - for (int i = 0; i < handler.getSlots(); i++) { + for (var i = 0; i < handler.getSlots(); i++) { copy = handler.insertItem(i, copy, false); if (copy.isEmpty()) { break; @@ -67,7 +67,7 @@ public class BlockEntityHopperUpgrade extends BlockEntityImpl implements ITickab if (copy.isEmpty()) item.kill(); - BlockPos spot = IAuraChunk.getHighestSpot(this.level, this.worldPosition, 25, this.worldPosition); + var spot = IAuraChunk.getHighestSpot(this.level, this.worldPosition, 25, this.worldPosition); IAuraChunk.getAuraChunk(this.level, spot).drainAura(spot, 500); PacketHandler.sendToAllAround(this.level, this.worldPosition, 32, diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityImpl.java b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityImpl.java index 006303cd..1777f6d2 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityImpl.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityImpl.java @@ -65,7 +65,7 @@ public class BlockEntityImpl extends BlockEntity { @Override public final ClientboundBlockEntityDataPacket getUpdatePacket() { return ClientboundBlockEntityDataPacket.create(this, e -> { - CompoundTag compound = new CompoundTag(); + var compound = new CompoundTag(); this.writeNBT(compound, SaveType.SYNC); return compound; }); @@ -73,7 +73,7 @@ public class BlockEntityImpl extends BlockEntity { @Override public final CompoundTag getUpdateTag() { - CompoundTag compound = new CompoundTag(); + var compound = new CompoundTag(); this.writeNBT(compound, SaveType.SYNC); return compound; } @@ -92,7 +92,7 @@ public class BlockEntityImpl extends BlockEntity { public void sendToClients() { var world = (ServerLevel) this.getLevel(); var entities = world.getChunkSource().chunkMap.getPlayers(new ChunkPos(this.getBlockPos()), false); - ClientboundBlockEntityDataPacket packet = this.getUpdatePacket(); + var packet = this.getUpdatePacket(); for (var e : entities) e.connection.send(packet); } @@ -116,7 +116,7 @@ public class BlockEntityImpl extends BlockEntity { return this.itemHandler.cast(); } else if (capability == NaturesAuraAPI.capAuraContainer) { if (this.auraContainer == null) { - IAuraContainer container = this.getAuraContainer(); + var container = this.getAuraContainer(); this.auraContainer = container == null ? LazyOptional.empty() : LazyOptional.of(() -> container); } return this.auraContainer.cast(); @@ -137,10 +137,10 @@ public class BlockEntityImpl extends BlockEntity { public void dropInventory() { IItemHandler handler = this.getItemHandler(); if (handler != null) { - for (int i = 0; i < handler.getSlots(); i++) { - ItemStack stack = handler.getStackInSlot(i); + for (var i = 0; i < handler.getSlots(); i++) { + var stack = handler.getStackInSlot(i); if (!stack.isEmpty()) { - ItemEntity item = new ItemEntity(this.level, this.worldPosition.getX() + 0.5, this.worldPosition.getY() + 0.5, this.worldPosition.getZ() + 0.5, stack); + var item = new ItemEntity(this.level, this.worldPosition.getX() + 0.5, this.worldPosition.getY() + 0.5, this.worldPosition.getZ() + 0.5, stack); this.level.addFreshEntity(item); } } @@ -148,7 +148,7 @@ public class BlockEntityImpl extends BlockEntity { } public void modifyDrop(ItemStack regularItem) { - CompoundTag compound = new CompoundTag(); + var compound = new CompoundTag(); this.writeNBT(compound, SaveType.BLOCK); if (!compound.isEmpty()) { if (!regularItem.hasTag()) regularItem.setTag(new CompoundTag()); @@ -158,18 +158,18 @@ public class BlockEntityImpl extends BlockEntity { public void loadDataOnPlace(ItemStack stack) { if (stack.hasTag()) { - CompoundTag compound = stack.getTag().getCompound("data"); + var compound = stack.getTag().getCompound("data"); if (compound != null) this.readNBT(compound, SaveType.BLOCK); } } public boolean canGenerateRightNow(int toAdd) { if (this.wantsLimitRemover()) { - BlockState below = this.level.getBlockState(this.worldPosition.below()); + var below = this.level.getBlockState(this.worldPosition.below()); if (below.getBlock() == ModBlocks.GENERATOR_LIMIT_REMOVER) return true; } - int aura = IAuraChunk.getAuraInArea(this.level, this.worldPosition, 35); + var aura = IAuraChunk.getAuraInArea(this.level, this.worldPosition, 35); return aura + toAdd <= IAuraChunk.DEFAULT_AURA * 2; } @@ -179,7 +179,7 @@ public class BlockEntityImpl extends BlockEntity { public void generateAura(int amount) { while (amount > 0) { - BlockPos spot = IAuraChunk.getLowestSpot(this.level, this.worldPosition, 35, this.worldPosition); + var spot = IAuraChunk.getLowestSpot(this.level, this.worldPosition, 35, this.worldPosition); amount -= IAuraChunk.getAuraChunk(this.level, spot).storeAura(spot, amount); } } diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityItemDistributor.java b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityItemDistributor.java index fcec0c3a..3b5e9d2b 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityItemDistributor.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityItemDistributor.java @@ -32,18 +32,18 @@ public class BlockEntityItemDistributor extends BlockEntityImpl implements ITick } this.cooldown = 1; - IItemHandler above = this.getHandler(Direction.UP); + var above = this.getHandler(Direction.UP); if (above == null) return; - IItemHandler dest = this.getNextSide(); + var dest = this.getNextSide(); if (dest == null) return; - for (int i = 0; i < above.getSlots(); i++) { - ItemStack stack = above.extractItem(i, 1, true); + for (var i = 0; i < above.getSlots(); i++) { + var stack = above.extractItem(i, 1, true); if (stack.isEmpty()) continue; - for (int j = 0; j < dest.getSlots(); j++) { - ItemStack remain = dest.insertItem(j, stack, false); + for (var j = 0; j < dest.getSlots(); j++) { + var remain = dest.insertItem(j, stack, false); if (!ItemStack.isSame(remain, stack)) { above.extractItem(i, 1, false); this.cooldown = 3; @@ -54,8 +54,8 @@ public class BlockEntityItemDistributor extends BlockEntityImpl implements ITick } private IItemHandler getHandler(Direction direction) { - BlockPos offset = this.worldPosition.relative(direction); - BlockEntity tile = this.level.getBlockEntity(offset); + var offset = this.worldPosition.relative(direction); + var tile = this.level.getBlockEntity(offset); if (tile == null) return null; return tile.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, direction.getOpposite()).orElse(null); @@ -64,8 +64,8 @@ public class BlockEntityItemDistributor extends BlockEntityImpl implements ITick private IItemHandler getNextSide() { if (this.isRandomMode) { List handlers = new ArrayList<>(); - for (int i = 0; i < 4; i++) { - IItemHandler handler = this.getHandler(Direction.values()[i]); + for (var i = 0; i < 4; i++) { + var handler = this.getHandler(Direction.values()[i]); if (handler != null) handlers.add(handler); } @@ -73,9 +73,9 @@ public class BlockEntityItemDistributor extends BlockEntityImpl implements ITick return null; return handlers.get(this.level.random.nextInt(handlers.size())); } else { - for (int i = 0; i < 4; i++) { + for (var i = 0; i < 4; i++) { this.currentSide = this.currentSide.getClockWise(); - IItemHandler handler = this.getHandler(this.currentSide); + var handler = this.getHandler(this.currentSide); if (handler != null) return handler; } diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityMossGenerator.java b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityMossGenerator.java index 57985426..dd90d657 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityMossGenerator.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityMossGenerator.java @@ -23,16 +23,16 @@ public class BlockEntityMossGenerator extends BlockEntityImpl implements ITickab if (!this.level.isClientSide) { if (this.level.getGameTime() % 20 != 0) return; - LevelData data = (LevelData) ILevelData.getLevelData(this.level); + var data = (LevelData) ILevelData.getLevelData(this.level); List possibleOffsets = new ArrayList<>(); - int range = 2; - for (int x = -range; x <= range; x++) - for (int y = -range; y <= range; y++) - for (int z = -range; z <= range; z++) { - BlockPos offset = this.worldPosition.offset(x, y, z); - boolean isRecent = data.recentlyConvertedMossStones.contains(offset); - BlockState state = this.level.getBlockState(offset); + var range = 2; + for (var x = -range; x <= range; x++) + for (var y = -range; y <= range; y++) + for (var z = -range; z <= range; z++) { + var offset = this.worldPosition.offset(x, y, z); + var isRecent = data.recentlyConvertedMossStones.contains(offset); + var state = this.level.getBlockState(offset); if (NaturesAuraAPI.BOTANIST_PICKAXE_CONVERSIONS.inverse().containsKey(state)) { if (isRecent) continue; @@ -44,11 +44,11 @@ public class BlockEntityMossGenerator extends BlockEntityImpl implements ITickab if (possibleOffsets.isEmpty()) return; - BlockPos offset = possibleOffsets.get(this.level.random.nextInt(possibleOffsets.size())); - BlockState state = this.level.getBlockState(offset); - BlockState result = NaturesAuraAPI.BOTANIST_PICKAXE_CONVERSIONS.inverse().get(state); + var offset = possibleOffsets.get(this.level.random.nextInt(possibleOffsets.size())); + var state = this.level.getBlockState(offset); + var result = NaturesAuraAPI.BOTANIST_PICKAXE_CONVERSIONS.inverse().get(state); - int toAdd = 7000; + var toAdd = 7000; if (this.canGenerateRightNow(toAdd)) { this.generateAura(toAdd); PacketHandler.sendToAllAround(this.level, this.worldPosition, 32, diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityOakGenerator.java b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityOakGenerator.java index fcdd38d5..05f53595 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityOakGenerator.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityOakGenerator.java @@ -21,10 +21,10 @@ public class BlockEntityOakGenerator extends BlockEntityImpl implements ITickabl public void tick() { if (!this.level.isClientSide) while (!this.scheduledBigTrees.isEmpty()) { - BlockPos pos = this.scheduledBigTrees.remove(); + var pos = this.scheduledBigTrees.remove(); if (this.level.getBlockState(pos).getBlock().getTags().contains(BlockTags.LOGS.getName())) { - int toAdd = 100000; - boolean canGen = this.canGenerateRightNow(toAdd); + var toAdd = 100000; + var canGen = this.canGenerateRightNow(toAdd); if (canGen) this.generateAura(toAdd); diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityOfferingTable.java b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityOfferingTable.java index 821fefc4..5102f898 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityOfferingTable.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityOfferingTable.java @@ -41,7 +41,7 @@ public class BlockEntityOfferingTable extends BlockEntityImpl implements ITickab } private OfferingRecipe getRecipe(ItemStack input) { - for (OfferingRecipe recipe : this.level.getRecipeManager().getRecipesFor(ModRecipes.OFFERING_TYPE, null, null)) + for (var recipe : this.level.getRecipeManager().getRecipesFor(ModRecipes.OFFERING_TYPE, null, null)) if (recipe.input.test(input)) return recipe; return null; @@ -54,44 +54,44 @@ public class BlockEntityOfferingTable extends BlockEntityImpl implements ITickab if (!Multiblocks.OFFERING_TABLE.isComplete(this.level, this.worldPosition)) return; - ItemStack stack = this.items.getStackInSlot(0); + var stack = this.items.getStackInSlot(0); if (stack.isEmpty()) return; - List items = this.level.getEntitiesOfClass(ItemEntity.class, new AABB(this.worldPosition).inflate(1)); + var items = this.level.getEntitiesOfClass(ItemEntity.class, new AABB(this.worldPosition).inflate(1)); if (items.isEmpty()) return; - OfferingRecipe recipe = this.getRecipe(stack); + var recipe = this.getRecipe(stack); if (recipe == null) return; - for (ItemEntity item : items) { + for (var item : items) { if (!item.isAlive() || item.hasPickUpDelay()) continue; - ItemStack itemStack = item.getItem(); + var itemStack = item.getItem(); if (itemStack.isEmpty() || itemStack.getCount() != 1) continue; if (!recipe.startItem.test(itemStack)) continue; - int amount = Helper.getIngredientAmount(recipe.input); - int recipeCount = stack.getCount() / amount; + var amount = Helper.getIngredientAmount(recipe.input); + var recipeCount = stack.getCount() / amount; stack.shrink(recipeCount * amount); item.kill(); this.sendToClients(); - for (int i = 0; i < recipeCount; i++) + for (var i = 0; i < recipeCount; i++) this.itemsToSpawn.add(recipe.output.copy()); if (Multiblocks.OFFERING_TABLE.forEach(this.worldPosition, 'R', (pos, m) -> this.level.getBlockState(pos).getBlock() == Blocks.WITHER_ROSE)) { - for (int i = this.level.random.nextInt(5) + 3; i >= 0; i--) + for (var i = this.level.random.nextInt(5) + 3; i >= 0; i--) this.itemsToSpawn.add(new ItemStack(Items.BLACK_DYE)); } - LightningBolt lightningboltentity = EntityType.LIGHTNING_BOLT.create(this.level); + var lightningboltentity = EntityType.LIGHTNING_BOLT.create(this.level); lightningboltentity.setVisualOnly(true); lightningboltentity.moveTo(Vec3.atCenterOf(this.worldPosition)); this.level.addFreshEntity(lightningboltentity); @@ -115,8 +115,8 @@ public class BlockEntityOfferingTable extends BlockEntityImpl implements ITickab compound.put("items", this.items.serializeNBT()); if (type != SaveType.SYNC) { - ListTag list = new ListTag(); - for (ItemStack stack : this.itemsToSpawn) + var list = new ListTag(); + for (var stack : this.itemsToSpawn) list.add(stack.serializeNBT()); compound.put("items_to_spawn", list); } @@ -131,8 +131,8 @@ public class BlockEntityOfferingTable extends BlockEntityImpl implements ITickab if (type != SaveType.SYNC) { this.itemsToSpawn.clear(); - ListTag list = compound.getList("items_to_spawn", 10); - for (Tag base : list) + var list = compound.getList("items_to_spawn", 10); + for (var base : list) this.itemsToSpawn.add(ItemStack.of((CompoundTag) base)); } } diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityPlacer.java b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityPlacer.java index 37c0e9b8..de045718 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityPlacer.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityPlacer.java @@ -37,45 +37,45 @@ public class BlockEntityPlacer extends BlockEntityImpl implements ITickableBlock if (!this.level.isClientSide && this.level.getGameTime() % 15 == 0) { if (this.redstonePower > 0) return; - BlockEntity tileUp = this.level.getBlockEntity(this.worldPosition.above()); + var tileUp = this.level.getBlockEntity(this.worldPosition.above()); if (tileUp == null) return; - IItemHandler handler = tileUp.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, Direction.DOWN).orElse(null); + var handler = tileUp.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, Direction.DOWN).orElse(null); if (handler == null) return; - List frames = Helper.getAttachedItemFrames(this.level, this.worldPosition); + var frames = Helper.getAttachedItemFrames(this.level, this.worldPosition); if (frames.isEmpty()) return; List validPositions = new ArrayList<>(); - int range = 5; - for (int x = -range; x <= range; x++) - for (int y = -range; y <= range; y++) - for (int z = -range; z <= range; z++) { - BlockPos pos = this.worldPosition.offset(x, y, z); + var range = 5; + for (var x = -range; x <= range; x++) + for (var y = -range; y <= range; y++) + for (var z = -range; z <= range; z++) { + var pos = this.worldPosition.offset(x, y, z); if (!this.framesContain(frames, pos, this.level.getBlockState(pos))) continue; - BlockPos up = pos.above(); - BlockState state = this.level.getBlockState(up); + var up = pos.above(); + var state = this.level.getBlockState(up); if (state.getMaterial().isReplaceable()) validPositions.add(up); } if (validPositions.isEmpty()) return; - for (int i = 0; i < handler.getSlots(); i++) { - ItemStack stack = handler.extractItem(i, 1, true); + for (var i = 0; i < handler.getSlots(); i++) { + var stack = handler.extractItem(i, 1, true); if (stack.isEmpty()) continue; - BlockPos pos = validPositions.get(this.level.random.nextInt(validPositions.size())); - ItemStack left = this.tryPlace(stack.copy(), pos); + var pos = validPositions.get(this.level.random.nextInt(validPositions.size())); + var left = this.tryPlace(stack.copy(), pos); if (ItemStack.isSame(stack, left)) continue; handler.extractItem(i, 1, false); - BlockPos spot = IAuraChunk.getHighestSpot(this.level, this.worldPosition, 10, this.worldPosition); + var spot = IAuraChunk.getHighestSpot(this.level, this.worldPosition, 10, this.worldPosition); IAuraChunk.getAuraChunk(this.level, spot).drainAura(spot, 1000); PacketHandler.sendToAllAround(this.level, this.worldPosition, 32, new PacketParticles(pos.getX(), pos.getY(), pos.getZ(), PacketParticles.Type.PLACER_PLACING)); @@ -86,12 +86,12 @@ public class BlockEntityPlacer extends BlockEntityImpl implements ITickableBlock } private boolean framesContain(List frames, BlockPos pos, BlockState state) { - ItemStack stack = state.getBlock().getCloneItemStack(this.level, pos, state); + var stack = state.getBlock().getCloneItemStack(this.level, pos, state); if (stack.isEmpty()) return false; - for (ItemFrame frame : frames) { - ItemStack frameStack = frame.getItem(); + for (var frame : frames) { + var frameStack = frame.getItem(); if (frameStack.isEmpty()) continue; if (Helper.areItemsEqual(stack, frameStack, false)) @@ -106,9 +106,9 @@ public class BlockEntityPlacer extends BlockEntityImpl implements ITickableBlock private ItemStack tryPlace(ItemStack stack, BlockPos pos) { if (!(this.level instanceof ServerLevel)) return stack; - FakePlayer fake = FakePlayerFactory.getMinecraft((ServerLevel) this.level); + var fake = FakePlayerFactory.getMinecraft((ServerLevel) this.level); fake.getInventory().items.set(fake.getInventory().selected, stack); - BlockHitResult ray = new BlockHitResult(Vec3.atCenterOf(pos), Direction.UP, pos, false); + var ray = new BlockHitResult(Vec3.atCenterOf(pos), Direction.UP, pos, false); ForgeHooks.onPlaceItemIntoWorld(new UseOnContext(fake, InteractionHand.MAIN_HAND, ray)); return fake.getMainHandItem().copy(); } diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityPotionGenerator.java b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityPotionGenerator.java index a4be7baf..487d4b23 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityPotionGenerator.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityPotionGenerator.java @@ -24,26 +24,26 @@ public class BlockEntityPotionGenerator extends BlockEntityImpl implements ITick public void tick() { if (!this.level.isClientSide && this.level.getGameTime() % 10 == 0) { if (Multiblocks.POTION_GENERATOR.isComplete(this.level, this.worldPosition)) { - boolean addedOne = false; + var addedOne = false; - List clouds = this.level.getEntitiesOfClass(AreaEffectCloud.class, new AABB(this.worldPosition).inflate(2)); - for (AreaEffectCloud cloud : clouds) { + var clouds = this.level.getEntitiesOfClass(AreaEffectCloud.class, new AABB(this.worldPosition).inflate(2)); + for (var cloud : clouds) { if (!cloud.isAlive()) continue; if (!addedOne) { - Potion type = cloud.getPotion(); + var type = cloud.getPotion(); if (type == null) continue; - for (MobEffectInstance effect : type.getEffects()) { - MobEffect potion = effect.getEffect(); + for (var effect : type.getEffects()) { + var potion = effect.getEffect(); if (!potion.isBeneficial() || potion.isInstantenous()) { continue; } - int toAdd = (effect.getAmplifier() * 7 + 1) * (effect.getDuration() / 25) * 100; - boolean canGen = this.canGenerateRightNow(toAdd); + var toAdd = (effect.getAmplifier() * 7 + 1) * (effect.getDuration() / 25) * 100; + var canGen = this.canGenerateRightNow(toAdd); if (canGen) this.generateAura(toAdd); @@ -56,7 +56,7 @@ public class BlockEntityPotionGenerator extends BlockEntityImpl implements ITick } } - float newRadius = cloud.getRadius() - 0.25F; + var newRadius = cloud.getRadius() - 0.25F; if (newRadius < 0.5F) { cloud.kill(); } else { diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityPowderPlacer.java b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityPowderPlacer.java index cc02ce9d..27584c59 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityPowderPlacer.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityPowderPlacer.java @@ -23,22 +23,22 @@ public class BlockEntityPowderPlacer extends BlockEntityImpl { @Override public void onRedstonePowerChange(int newPower) { if (this.redstonePower <= 0 && newPower > 0) { - List powders = this.level.getEntitiesOfClass(EntityEffectInhibitor.class, new AABB(this.worldPosition, this.worldPosition.offset(1, 2, 1)), Entity::isAlive); - for (Direction facing : Direction.values()) { + var powders = this.level.getEntitiesOfClass(EntityEffectInhibitor.class, new AABB(this.worldPosition, this.worldPosition.offset(1, 2, 1)), Entity::isAlive); + for (var facing : Direction.values()) { if (!facing.getAxis().isHorizontal()) continue; - BlockEntity tile = this.level.getBlockEntity(this.worldPosition.relative(facing)); + var tile = this.level.getBlockEntity(this.worldPosition.relative(facing)); if (tile == null) continue; - IItemHandler handler = tile.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, facing.getOpposite()).orElse(null); + var handler = tile.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, facing.getOpposite()).orElse(null); if (handler == null) continue; if (!powders.isEmpty()) { - for (EntityEffectInhibitor powder : powders) { - ItemStack drop = powder.getDrop(); - for (int i = 0; i < handler.getSlots(); i++) { - ItemStack remain = handler.insertItem(i, drop, false); + for (var powder : powders) { + var drop = powder.getDrop(); + for (var i = 0; i < handler.getSlots(); i++) { + var remain = handler.insertItem(i, drop, false); if (remain.isEmpty()) { powder.kill(); break; @@ -48,8 +48,8 @@ public class BlockEntityPowderPlacer extends BlockEntityImpl { } } } else { - for (int i = 0; i < handler.getSlots(); i++) { - ItemStack stack = handler.extractItem(i, Integer.MAX_VALUE, true); + for (var i = 0; i < handler.getSlots(); i++) { + var stack = handler.extractItem(i, Integer.MAX_VALUE, true); if (stack.isEmpty() || stack.getItem() != ModItems.EFFECT_POWDER) continue; EntityEffectInhibitor.place(this.level, stack, this.worldPosition.getX() + 0.5, this.worldPosition.getY() + 1, this.worldPosition.getZ() + 0.5); diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityRFConverter.java b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityRFConverter.java index 67372c17..14e68a0a 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityRFConverter.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityRFConverter.java @@ -49,24 +49,24 @@ public class BlockEntityRFConverter extends BlockEntityImpl implements ITickable this.lastEnergy = this.storage.getEnergyStored(); } - for (Direction facing : Direction.values()) { - BlockEntity tile = this.level.getBlockEntity(this.worldPosition.relative(facing)); + for (var facing : Direction.values()) { + var tile = this.level.getBlockEntity(this.worldPosition.relative(facing)); if (tile == null) continue; - IEnergyStorage storage = tile.getCapability(CapabilityEnergy.ENERGY, facing.getOpposite()).orElse(null); + var storage = tile.getCapability(CapabilityEnergy.ENERGY, facing.getOpposite()).orElse(null); if (storage == null) continue; - int canStore = storage.receiveEnergy(Integer.MAX_VALUE, true); + var canStore = storage.receiveEnergy(Integer.MAX_VALUE, true); if (canStore <= 0) continue; - int extracted = this.storage.extractEnergy(canStore, false); + var extracted = this.storage.extractEnergy(canStore, false); if (extracted <= 0) continue; storage.receiveEnergy(extracted, false); break; } - int emptyPart = this.storage.getMaxEnergyStored() - this.storage.getEnergyStored(); + var emptyPart = this.storage.getMaxEnergyStored() - this.storage.getEnergyStored(); if (emptyPart <= 0) return; if (this.level.getGameTime() % 20 != 0) @@ -74,14 +74,14 @@ public class BlockEntityRFConverter extends BlockEntityImpl implements ITickable if (!Multiblocks.RF_CONVERTER.isComplete(this.level, this.worldPosition)) return; - int aura = IAuraChunk.getAuraInArea(this.level, this.worldPosition, 45); + var aura = IAuraChunk.getAuraInArea(this.level, this.worldPosition, 45); if (aura <= IAuraChunk.DEFAULT_AURA) return; - int amountToGen = Math.min(Math.min(10000, aura / 1000), emptyPart); - int amountToUse = Mth.ceil(amountToGen / ModConfig.instance.auraToRFRatio.get()); + var amountToGen = Math.min(Math.min(10000, aura / 1000), emptyPart); + var amountToUse = Mth.ceil(amountToGen / ModConfig.instance.auraToRFRatio.get()); this.storage.setEnergy(this.storage.getEnergyStored() + amountToGen); - BlockPos pos = IAuraChunk.getHighestSpot(this.level, this.worldPosition, 45, this.worldPosition); + var pos = IAuraChunk.getHighestSpot(this.level, this.worldPosition, 45, this.worldPosition); IAuraChunk.getAuraChunk(this.level, pos).drainAura(pos, amountToUse); PacketHandler.sendToAllAround(this.level, this.worldPosition, 32, diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntitySlimeSplitGenerator.java b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntitySlimeSplitGenerator.java index 96b2fa03..f0a67da8 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntitySlimeSplitGenerator.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntitySlimeSplitGenerator.java @@ -23,7 +23,7 @@ public class BlockEntitySlimeSplitGenerator extends BlockEntityImpl implements I if (this.level.isClientSide || this.level.getGameTime() % 10 != 0) return; if (this.generationTimer > 0) { - int amount = this.amountToRelease * 10; + var amount = this.amountToRelease * 10; if (this.canGenerateRightNow(amount)) { this.generateAura(amount); PacketHandler.sendToAllAround(this.level, this.worldPosition, 32, new PacketParticles(this.worldPosition.getX(), this.worldPosition.getY(), this.worldPosition.getZ(), PacketParticles.Type.SLIME_SPLIT_GEN_CREATE, this.color)); @@ -42,7 +42,7 @@ public class BlockEntitySlimeSplitGenerator extends BlockEntityImpl implements I } public void startGenerating(Slime slime) { - int size = slime.getSize(); + var size = slime.getSize(); this.generationTimer = size * 30; this.amountToRelease = (size * this.getGenerationAmount(slime)) / this.generationTimer; this.color = this.getSlimeColor(slime); diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntitySnowCreator.java b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntitySnowCreator.java index 03054c8b..ee7d4b45 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntitySnowCreator.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntitySnowCreator.java @@ -36,7 +36,7 @@ public class BlockEntitySnowCreator extends BlockEntityImpl implements ITickable @Override public void tick() { - int range = this.getRange(); + var range = this.getRange(); if (range <= 0) return; @@ -44,13 +44,13 @@ public class BlockEntitySnowCreator extends BlockEntityImpl implements ITickable if (this.level.getGameTime() % 10 != 0) return; - for (int i = 0; i < 10; i++) { - double angle = this.level.random.nextFloat() * Math.PI * 2; - BlockPos pos = this.worldPosition.offset(Math.cos(angle) * range * this.level.random.nextFloat(), 0, Math.sin(angle) * range * this.level.random.nextFloat()); + for (var i = 0; i < 10; i++) { + var angle = this.level.random.nextFloat() * Math.PI * 2; + var pos = this.worldPosition.offset(Math.cos(angle) * range * this.level.random.nextFloat(), 0, Math.sin(angle) * range * this.level.random.nextFloat()); pos = this.level.getHeightmapPos(Heightmap.Types.MOTION_BLOCKING, pos); - BlockPos down = pos.below(); + var down = pos.below(); - Fluid fluid = this.level.getFluidState(down).getType(); + var fluid = this.level.getFluidState(down).getType(); if (fluid == Fluids.WATER) { if (this.level.getBlockState(down).getMaterial().isReplaceable()) this.level.setBlockAndUpdate(down, Blocks.ICE.defaultBlockState()); @@ -67,7 +67,7 @@ public class BlockEntitySnowCreator extends BlockEntityImpl implements ITickable continue; } - BlockPos auraPos = IAuraChunk.getHighestSpot(this.level, this.worldPosition, 30, this.worldPosition); + var auraPos = IAuraChunk.getHighestSpot(this.level, this.worldPosition, 30, this.worldPosition); IAuraChunk.getAuraChunk(this.level, auraPos).drainAura(auraPos, 300); PacketHandler.sendToAllAround(this.level, this.worldPosition, 32, @@ -77,9 +77,9 @@ public class BlockEntitySnowCreator extends BlockEntityImpl implements ITickable } else { if (this.level.getGameTime() % 30 != 0) return; - for (int i = range * 4; i >= 0; i--) { - double angle = this.level.random.nextFloat() * Math.PI * 2; - BlockPos pos = this.worldPosition.offset( + for (var i = range * 4; i >= 0; i--) { + var angle = this.level.random.nextFloat() * Math.PI * 2; + var pos = this.worldPosition.offset( Math.cos(angle) * range * this.level.random.nextFloat(), Mth.nextInt(this.level.random, range / 2, range), Math.sin(angle) * range * this.level.random.nextFloat()); diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntitySpawnLamp.java b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntitySpawnLamp.java index 097b468e..31ef5ada 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntitySpawnLamp.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntitySpawnLamp.java @@ -19,7 +19,7 @@ public class BlockEntitySpawnLamp extends BlockEntityImpl { public void onLoad() { super.onLoad(); if (!this.level.isClientSide) { - LevelData data = (LevelData) ILevelData.getLevelData(this.level); + var data = (LevelData) ILevelData.getLevelData(this.level); data.spawnLamps.add(this); } } @@ -28,7 +28,7 @@ public class BlockEntitySpawnLamp extends BlockEntityImpl { public void setRemoved() { super.setRemoved(); if (!this.level.isClientSide) { - LevelData data = (LevelData) ILevelData.getLevelData(this.level); + var data = (LevelData) ILevelData.getLevelData(this.level); data.spawnLamps.remove(this); } } diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntitySpring.java b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntitySpring.java index 340da895..7cee7a8b 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntitySpring.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntitySpring.java @@ -38,7 +38,7 @@ public class BlockEntitySpring extends BlockEntityImpl implements ITickableBlock super.onLoad(); if (!this.level.isClientSide) { // add a ticket to water crops - AABB area = new AABB(this.worldPosition).inflate(5, 1, 5); + var area = new AABB(this.worldPosition).inflate(5, 1, 5); this.waterTicket = FarmlandWaterManager.addAABBTicket(this.level, area); } } @@ -59,8 +59,8 @@ public class BlockEntitySpring extends BlockEntityImpl implements ITickableBlock return; // fill cauldrons - BlockPos up = this.worldPosition.above(); - BlockState upState = this.level.getBlockState(up); + var up = this.worldPosition.above(); + var upState = this.level.getBlockState(up); if (upState.hasProperty(BlockStateProperties.LEVEL_CAULDRON)) { int level = upState.getValue(BlockStateProperties.LEVEL_CAULDRON); if (level < 3) { @@ -72,12 +72,12 @@ public class BlockEntitySpring extends BlockEntityImpl implements ITickableBlock } // wet sponges - int spongeRadius = 2; - for (int x = -spongeRadius; x <= spongeRadius; x++) { - for (int y = -spongeRadius; y <= spongeRadius; y++) { - for (int z = -spongeRadius; z <= spongeRadius; z++) { - BlockPos pos = this.worldPosition.offset(x, y, z); - BlockState state = this.level.getBlockState(pos); + var spongeRadius = 2; + for (var x = -spongeRadius; x <= spongeRadius; x++) { + for (var y = -spongeRadius; y <= spongeRadius; y++) { + for (var z = -spongeRadius; z <= spongeRadius; z++) { + var pos = this.worldPosition.offset(x, y, z); + var state = this.level.getBlockState(pos); if (state.getBlock() == Blocks.SPONGE) { this.level.setBlock(pos, Blocks.WET_SPONGE.defaultBlockState(), 2); this.level.levelEvent(2001, pos, Block.getId(Blocks.WATER.defaultBlockState())); @@ -89,8 +89,8 @@ public class BlockEntitySpring extends BlockEntityImpl implements ITickableBlock } // generate obsidian - for (Direction dir : Direction.Plane.HORIZONTAL) { - BlockPos side = this.worldPosition.relative(dir); + for (var dir : Direction.Plane.HORIZONTAL) { + var side = this.worldPosition.relative(dir); if (this.isLava(side, true)) { this.level.setBlockAndUpdate(side, ForgeEventFactory.fireFluidPlaceBlockEvent(this.level, side, side, Blocks.OBSIDIAN.defaultBlockState())); this.level.levelEvent(1501, side, 0); @@ -100,7 +100,7 @@ public class BlockEntitySpring extends BlockEntityImpl implements ITickableBlock } // generate stone - BlockPos twoUp = this.worldPosition.above(2); + var twoUp = this.worldPosition.above(2); if (this.isLava(twoUp, false) && (this.level.getBlockState(up).isAir() || this.isLava(up, false))) { this.level.setBlockAndUpdate(up, ForgeEventFactory.fireFluidPlaceBlockEvent(this.level, up, twoUp, Blocks.STONE.defaultBlockState())); this.level.levelEvent(1501, up, 0); @@ -109,9 +109,9 @@ public class BlockEntitySpring extends BlockEntityImpl implements ITickableBlock } // generate cobblestone - for (Direction dir : Direction.Plane.HORIZONTAL) { - BlockPos twoSide = this.worldPosition.relative(dir, 2); - BlockPos side = this.worldPosition.relative(dir); + for (var dir : Direction.Plane.HORIZONTAL) { + var twoSide = this.worldPosition.relative(dir, 2); + var side = this.worldPosition.relative(dir); if (this.isLava(twoSide, false) && (this.level.getBlockState(side).isAir() || this.isLava(side, false))) { this.level.setBlockAndUpdate(side, ForgeEventFactory.fireFluidPlaceBlockEvent(this.level, side, twoSide, Blocks.COBBLESTONE.defaultBlockState())); this.level.levelEvent(1501, side, 0); @@ -130,13 +130,13 @@ public class BlockEntitySpring extends BlockEntityImpl implements ITickableBlock public void consumeAura(int amount) { while (amount > 0) { - BlockPos pos = IAuraChunk.getHighestSpot(this.level, this.worldPosition, 35, this.worldPosition); + var pos = IAuraChunk.getHighestSpot(this.level, this.worldPosition, 35, this.worldPosition); amount -= IAuraChunk.getAuraChunk(this.level, pos).drainAura(pos, amount); } } private boolean isLava(BlockPos offset, boolean source) { - FluidState state = this.level.getFluidState(offset); + var state = this.level.getFluidState(offset); return (!source || state.isSource()) && state.getType().is(FluidTags.LAVA); } @@ -169,7 +169,7 @@ public class BlockEntitySpring extends BlockEntityImpl implements ITickableBlock @Override public FluidStack drain(int maxDrain, IFluidHandler.FluidAction action) { - int drain = Math.min(maxDrain, 1000); + var drain = Math.min(maxDrain, 1000); if (action.execute()) BlockEntitySpring.this.consumeAura(Mth.ceil(drain / 2F)); return new FluidStack(Fluids.WATER, drain); diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityTimeChanger.java b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityTimeChanger.java index 150d7907..67afa3d2 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityTimeChanger.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityTimeChanger.java @@ -34,15 +34,15 @@ public class BlockEntityTimeChanger extends BlockEntityImpl implements ITickable @Override public void tick() { if (!this.level.isClientSide) { - List frames = Helper.getAttachedItemFrames(this.level, this.worldPosition); - for (ItemFrame frame : frames) { - ItemStack frameStack = frame.getItem(); + var frames = Helper.getAttachedItemFrames(this.level, this.worldPosition); + for (var frame : frames) { + var frameStack = frame.getItem(); if (frameStack.isEmpty() || frameStack.getItem() != ModItems.CLOCK_HAND) continue; if (this.goalTime > 0) { - long current = this.level.getDayTime(); - long toAdd = Math.min(75, this.goalTime - current); + var current = this.level.getDayTime(); + var toAdd = Math.min(75, this.goalTime - current); if (toAdd <= 0) { this.goalTime = 0; this.sendToClients(); @@ -50,11 +50,11 @@ public class BlockEntityTimeChanger extends BlockEntityImpl implements ITickable } ((ServerLevelData) this.level.getLevelData()).setDayTime(current + toAdd); - BlockPos spot = IAuraChunk.getHighestSpot(this.level, this.worldPosition, 35, this.worldPosition); + var spot = IAuraChunk.getHighestSpot(this.level, this.worldPosition, 35, this.worldPosition); IAuraChunk.getAuraChunk(this.level, spot).drainAura(spot, (int) toAdd * 20); if (this.level instanceof ServerLevel) { - PlayerList list = this.level.getServer().getPlayerList(); + var list = this.level.getServer().getPlayerList(); list.broadcastAll(new ClientboundSetTimePacket( this.level.getGameTime(), this.level.getDayTime(), this.level.getGameRules().getBoolean(GameRules.RULE_DAYLIGHT))); @@ -65,17 +65,17 @@ public class BlockEntityTimeChanger extends BlockEntityImpl implements ITickable if (this.level.getGameTime() % 20 != 0) return; - List items = this.level.getEntitiesOfClass(ItemEntity.class, new AABB(this.worldPosition).inflate(1), Entity::isAlive); - for (ItemEntity item : items) { + var items = this.level.getEntitiesOfClass(ItemEntity.class, new AABB(this.worldPosition).inflate(1), Entity::isAlive); + for (var item : items) { if (item.hasPickUpDelay()) continue; - ItemStack stack = item.getItem(); + var stack = item.getItem(); if (stack.isEmpty() || stack.getItem() != Items.CLOCK) continue; - int dayGoal = Mth.floor((frame.getRotation() / 8F) * 24000F) + 18000; - long current = this.level.getDayTime(); - long toMove = (24000 - current % 24000 + dayGoal) % 24000; + var dayGoal = Mth.floor((frame.getRotation() / 8F) * 24000F) + 18000; + var current = this.level.getDayTime(); + var toMove = (24000 - current % 24000 + dayGoal) % 24000; this.goalTime = current + toMove; this.sendToClients(); @@ -93,10 +93,10 @@ public class BlockEntityTimeChanger extends BlockEntityImpl implements ITickable this.sendToClients(); } } else if (this.goalTime > 0 && this.level.random.nextFloat() >= 0.25F) { - double angle = Math.toRadians(this.level.getDayTime() * 5F % 360); - double x = this.worldPosition.getX() + 0.5 + Math.sin(angle) * 3F; - double z = this.worldPosition.getZ() + 0.5 + Math.cos(angle) * 3F; - int color = this.goalTime % 24000 > 12000 ? 0xe2e2e2 : 0xffe926; + var angle = Math.toRadians(this.level.getDayTime() * 5F % 360); + var x = this.worldPosition.getX() + 0.5 + Math.sin(angle) * 3F; + var z = this.worldPosition.getZ() + 0.5 + Math.cos(angle) * 3F; + var color = this.goalTime % 24000 > 12000 ? 0xe2e2e2 : 0xffe926; NaturesAuraAPI.instance().spawnMagicParticle( x, this.worldPosition.getY() + 0.1F, z, 0F, 0.12F, 0F, diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityWeatherChanger.java b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityWeatherChanger.java index 36c6bcd1..f229da7d 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityWeatherChanger.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityWeatherChanger.java @@ -34,11 +34,11 @@ public class BlockEntityWeatherChanger extends BlockEntityImpl implements ITicka return; if (this.processTime <= 0) return; - int color = this.type == WeatherType.SUN ? 0xf5d742 : this.type == WeatherType.RAIN ? 0x4d5ae3 : 0x373247; - for (int r = 0; r < 360; r += 20) { - double xOff = Math.cos(Math.toRadians(r)) * 3F; - double zOff = Math.sin(Math.toRadians(r)) * 3F; - for (int i = this.level.random.nextInt(3); i > 0; i--) { + var color = this.type == WeatherType.SUN ? 0xf5d742 : this.type == WeatherType.RAIN ? 0x4d5ae3 : 0x373247; + for (var r = 0; r < 360; r += 20) { + var xOff = Math.cos(Math.toRadians(r)) * 3F; + var zOff = Math.sin(Math.toRadians(r)) * 3F; + for (var i = this.level.random.nextInt(3); i > 0; i--) { NaturesAuraAPI.instance().spawnMagicParticle( this.worldPosition.getX() + 0.5F + xOff, this.worldPosition.getY(), @@ -54,15 +54,15 @@ public class BlockEntityWeatherChanger extends BlockEntityImpl implements ITicka if (this.processTime > 0) { if (this.processTime % 20 == 0) { - BlockPos spot = IAuraChunk.getHighestSpot(this.level, this.worldPosition, 35, this.worldPosition); + var spot = IAuraChunk.getHighestSpot(this.level, this.worldPosition, 35, this.worldPosition); IAuraChunk.getAuraChunk(this.level, spot).drainAura(spot, 30000 * this.itemAmount); } this.processTime--; if (this.processTime <= 0) { this.sendToClients(); - int time = 6000 * this.itemAmount; - ServerLevel server = (ServerLevel) this.level; + var time = 6000 * this.itemAmount; + var server = (ServerLevel) this.level; switch (this.type) { case SUN -> server.setWeatherParameters(time, 0, false, false); case RAIN -> server.setWeatherParameters(0, time, true, false); @@ -72,7 +72,7 @@ public class BlockEntityWeatherChanger extends BlockEntityImpl implements ITicka } else { if (this.level.getGameTime() % 20 != 0) return; - Pair type = this.getNextWeatherType(); + var type = this.getNextWeatherType(); if (type == null) return; this.type = type.getLeft(); @@ -104,13 +104,13 @@ public class BlockEntityWeatherChanger extends BlockEntityImpl implements ITicka } private Pair getNextWeatherType() { - AABB area = new AABB(this.worldPosition).inflate(2); - List items = this.level.getEntitiesOfClass(ItemEntity.class, area, Entity::isAlive); - for (ItemEntity entity : items) { + var area = new AABB(this.worldPosition).inflate(2); + var items = this.level.getEntitiesOfClass(ItemEntity.class, area, Entity::isAlive); + for (var entity : items) { if (entity.hasPickUpDelay()) continue; - ItemStack stack = entity.getItem(); - for (Map.Entry entry : NaturesAuraAPI.WEATHER_CHANGER_CONVERSIONS.entrySet()) { + var stack = entity.getItem(); + for (var entry : NaturesAuraAPI.WEATHER_CHANGER_CONVERSIONS.entrySet()) { if (!Helper.areItemsEqual(stack, entry.getKey(), true)) continue; entity.setItem(ItemStack.EMPTY); diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityWoodStand.java b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityWoodStand.java index 5ca6203a..4693d683 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityWoodStand.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityWoodStand.java @@ -54,13 +54,13 @@ public class BlockEntityWoodStand extends BlockEntityImpl implements ITickableBl if (this.ritualPos != null && this.recipe != null) { if (this.level.getGameTime() % 5 == 0) { if (this.isRitualOkay()) { - boolean wasOverHalf = this.timer >= this.recipe.time / 2; + var wasOverHalf = this.timer >= this.recipe.time / 2; this.timer += 5; - boolean isOverHalf = this.timer >= this.recipe.time / 2; + var isOverHalf = this.timer >= this.recipe.time / 2; if (!isOverHalf) Multiblocks.TREE_RITUAL.forEach(this.ritualPos, 'W', (pos, matcher) -> { - BlockEntity tile = this.level.getBlockEntity(pos); + var tile = this.level.getBlockEntity(pos); if (tile instanceof BlockEntityWoodStand && !((BlockEntityWoodStand) tile).items.getStackInSlot(0).isEmpty()) { PacketHandler.sendToAllAround(this.level, this.worldPosition, 32, new PacketParticleStream( (float) pos.getX() + 0.2F + this.level.random.nextFloat() * 0.6F, @@ -83,7 +83,7 @@ public class BlockEntityWoodStand extends BlockEntityImpl implements ITickableBl }); recurseTreeDestruction(this.level, this.ritualPos, this.ritualPos, true, false); - ItemEntity item = new ItemEntity(this.level, + var item = new ItemEntity(this.level, this.ritualPos.getX() + 0.5, this.ritualPos.getY() + 4.5, this.ritualPos.getZ() + 0.5, this.recipe.result.copy()); this.level.addFreshEntity(item); @@ -98,7 +98,7 @@ public class BlockEntityWoodStand extends BlockEntityImpl implements ITickableBl this.timer = 0; } else if (isOverHalf && !wasOverHalf) { Multiblocks.TREE_RITUAL.forEach(this.ritualPos, 'W', (pos, matcher) -> { - BlockEntity tile = this.level.getBlockEntity(pos); + var tile = this.level.getBlockEntity(pos); if (tile instanceof BlockEntityWoodStand stand && !stand.items.getStackInSlot(0).isEmpty()) { PacketHandler.sendToAllAround(this.level, this.worldPosition, 32, new PacketParticles(stand.worldPosition.getX(), stand.worldPosition.getY(), stand.worldPosition.getZ(), PacketParticles.Type.TR_CONSUME_ITEM)); @@ -129,11 +129,11 @@ public class BlockEntityWoodStand extends BlockEntityImpl implements ITickableBl return; } - for (int x = -1; x <= 1; x++) { - for (int y = -1; y <= 1; y++) { - for (int z = -1; z <= 1; z++) { - BlockPos offset = pos.offset(x, y, z); - BlockState state = level.getBlockState(offset); + for (var x = -1; x <= 1; x++) { + for (var y = -1; y <= 1; y++) { + for (var z = -1; z <= 1; z++) { + var offset = pos.offset(x, y, z); + var state = level.getBlockState(offset); if (state.getBlock().getTags().contains(BlockTags.LOGS.getName()) || includeLeaves && state.getBlock() instanceof LeavesBlock) { if (drop) { level.destroyBlock(offset, true); @@ -153,20 +153,20 @@ public class BlockEntityWoodStand extends BlockEntityImpl implements ITickableBl if (!Multiblocks.TREE_RITUAL.isComplete(this.level, this.ritualPos)) { return false; } - for (int i = 0; i < 2; i++) { - BlockState state = this.level.getBlockState(this.ritualPos.above(i)); + for (var i = 0; i < 2; i++) { + var state = this.level.getBlockState(this.ritualPos.above(i)); if (!(state.getBlock().getTags().contains(BlockTags.LOGS.getName()))) return false; } if (this.timer < this.recipe.time / 2) { List required = new ArrayList<>(Arrays.asList(this.recipe.ingredients)); - boolean fine = Multiblocks.TREE_RITUAL.forEach(this.ritualPos, 'W', (pos, matcher) -> { - BlockEntity tile = this.level.getBlockEntity(pos); + var fine = Multiblocks.TREE_RITUAL.forEach(this.ritualPos, 'W', (pos, matcher) -> { + var tile = this.level.getBlockEntity(pos); if (tile instanceof BlockEntityWoodStand) { - ItemStack stack = ((BlockEntityWoodStand) tile).items.getStackInSlot(0); + var stack = ((BlockEntityWoodStand) tile).items.getStackInSlot(0); if (!stack.isEmpty()) { - for (int i = required.size() - 1; i >= 0; i--) { - Ingredient req = required.get(i); + for (var i = required.size() - 1; i >= 0; i--) { + var req = required.get(i); if (req.test(stack)) { required.remove(i); return true; diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/render/RenderAuraTimer.java b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/render/RenderAuraTimer.java index a4a766fd..d37a88f2 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/render/RenderAuraTimer.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/render/RenderAuraTimer.java @@ -22,19 +22,19 @@ public class RenderAuraTimer implements BlockEntityRenderer> 16 & 255) / 255F; - float g = (type.getColor() >> 8 & 255) / 255F; - float b = (type.getColor() & 255) / 255F; + var type = ItemAuraBottle.getType(bottle); + var r = (type.getColor() >> 16 & 255) / 255F; + var g = (type.getColor() >> 8 & 255) / 255F; + var b = (type.getColor() & 255) / 255F; //this.model.render(stack, buffer.getBuffer(this.model.getRenderType(RES)), combinedLightIn, combinedOverlayIn, r, g, b, 0.75F); stack.popPose(); diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/render/RenderEnderCrate.java b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/render/RenderEnderCrate.java index 727b3d52..1c4e3150 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/render/RenderEnderCrate.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/render/RenderEnderCrate.java @@ -20,8 +20,8 @@ public class RenderEnderCrate implements BlockEntityRenderer= 0) return false; - int aura = IAuraChunk.getAuraInArea(level, pos, 50); + var aura = IAuraChunk.getAuraInArea(level, pos, 50); if (aura > 0) return false; - int dist = Math.min(Math.abs(aura) / 50000, 75); + var dist = Math.min(Math.abs(aura) / 50000, 75); if (dist < 10) return false; this.bb = new AABB(pos).inflate(dist); @@ -58,11 +58,11 @@ public class AngerEffect implements IDrainSpotEffect { return; if (!this.calcValues(level, pos, spot)) return; - List entities = level.getEntitiesOfClass(LivingEntity.class, this.bb); - for (LivingEntity entity : entities) { + var entities = level.getEntitiesOfClass(LivingEntity.class, this.bb); + for (var entity : entities) { if (!(entity instanceof NeutralMob)) continue; - Player player = level.getNearestPlayer(entity, 25); + var player = level.getNearestPlayer(entity, 25); if (player == null) continue; ((NeutralMob) entity).setTarget(player); diff --git a/src/main/java/de/ellpeck/naturesaura/chunk/effect/AnimalEffect.java b/src/main/java/de/ellpeck/naturesaura/chunk/effect/AnimalEffect.java index fb52e9d1..fde7d3af 100644 --- a/src/main/java/de/ellpeck/naturesaura/chunk/effect/AnimalEffect.java +++ b/src/main/java/de/ellpeck/naturesaura/chunk/effect/AnimalEffect.java @@ -37,14 +37,14 @@ public class AnimalEffect implements IDrainSpotEffect { private boolean calcValues(Level level, BlockPos pos, Integer spot) { if (spot <= 0) return false; - Pair auraAndSpots = IAuraChunk.getAuraAndSpotAmountInArea(level, pos, 30); + var auraAndSpots = IAuraChunk.getAuraAndSpotAmountInArea(level, pos, 30); int aura = auraAndSpots.getLeft(); if (aura < 1500000) return false; this.chance = Math.min(50, Mth.ceil(Math.abs(aura) / 500000F / auraAndSpots.getRight())); if (this.chance <= 0) return false; - int dist = Mth.clamp(Math.abs(aura) / 150000, 5, 35); + var dist = Mth.clamp(Math.abs(aura) / 150000, 5, 35); this.bb = new AABB(pos).inflate(dist); return true; } @@ -72,18 +72,18 @@ public class AnimalEffect implements IDrainSpotEffect { if (!this.calcValues(level, pos, spot)) return; - List animals = level.getEntitiesOfClass(Animal.class, this.bb); + var animals = level.getEntitiesOfClass(Animal.class, this.bb); if (animals.size() >= ModConfig.instance.maxAnimalsAroundPowder.get()) return; - List items = level.getEntitiesOfClass(ItemEntity.class, this.bb); - for (ItemEntity item : items) { + var items = level.getEntitiesOfClass(ItemEntity.class, this.bb); + for (var item : items) { if (!item.isAlive()) continue; if (!NaturesAuraAPI.instance().isEffectPowderActive(level, item.blockPosition(), NAME)) continue; - ItemStack stack = item.getItem(); + var stack = item.getItem(); if (!(stack.getItem() instanceof EggItem)) continue; if (item.getAge() < item.lifespan / 2) @@ -96,44 +96,44 @@ public class AnimalEffect implements IDrainSpotEffect { item.setItem(stack); } - Chicken chicken = new Chicken(EntityType.CHICKEN, level); + var chicken = new Chicken(EntityType.CHICKEN, level); chicken.setAge(-24000); chicken.setPos(item.getX(), item.getY(), item.getZ()); level.addFreshEntity(chicken); - BlockPos closestSpot = IAuraChunk.getHighestSpot(level, item.blockPosition(), 35, pos); + var closestSpot = IAuraChunk.getHighestSpot(level, item.blockPosition(), 35, pos); IAuraChunk.getAuraChunk(level, closestSpot).drainAura(closestSpot, 2000); } if (level.random.nextInt(20) <= this.chance) { if (animals.size() < 2) return; - Animal first = animals.get(level.random.nextInt(animals.size())); + var first = animals.get(level.random.nextInt(animals.size())); if (first.isBaby() || first.isInLove()) return; if (!NaturesAuraAPI.instance().isEffectPowderActive(level, first.blockPosition(), NAME)) return; - Optional secondOptional = animals.stream() + var secondOptional = animals.stream() .filter(e -> e != first && !e.isInLove() && !e.isBaby()) .min(Comparator.comparingDouble(e -> e.distanceToSqr(first))); if (secondOptional.isEmpty()) return; - Animal second = secondOptional.get(); + var second = secondOptional.get(); if (second.distanceToSqr(first) > 5 * 5) return; this.setInLove(first); this.setInLove(second); - BlockPos closestSpot = IAuraChunk.getHighestSpot(level, first.blockPosition(), 35, pos); + var closestSpot = IAuraChunk.getHighestSpot(level, first.blockPosition(), 35, pos); IAuraChunk.getAuraChunk(level, closestSpot).drainAura(closestSpot, 3500); } } private void setInLove(Animal animal) { animal.setInLove(null); - for (int j = 0; j < 7; j++) + for (var j = 0; j < 7; j++) animal.level.addParticle(ParticleTypes.HEART, animal.getX() + (double) (animal.level.random.nextFloat() * animal.getBbWidth() * 2.0F) - animal.getBbWidth(), animal.getY() + 0.5D + (double) (animal.level.random.nextFloat() * animal.getBbHeight()), diff --git a/src/main/java/de/ellpeck/naturesaura/chunk/effect/BalanceEffect.java b/src/main/java/de/ellpeck/naturesaura/chunk/effect/BalanceEffect.java index 4d59d99e..ed1a64b7 100644 --- a/src/main/java/de/ellpeck/naturesaura/chunk/effect/BalanceEffect.java +++ b/src/main/java/de/ellpeck/naturesaura/chunk/effect/BalanceEffect.java @@ -20,17 +20,17 @@ public class BalanceEffect implements IDrainSpotEffect { return; if (level.getGameTime() % 200 != 0) return; - int searchRadius = Math.min(45, spot / 10000); - MutableInt positiveAura = new MutableInt(); + var searchRadius = Math.min(45, spot / 10000); + var positiveAura = new MutableInt(); IAuraChunk.getSpotsInArea(level, pos, searchRadius, (otherPos, otherSpot) -> { if (otherSpot > 0) positiveAura.add(otherSpot); }); - int radius = Math.min(80, positiveAura.intValue() / 5000); - BlockPos lowestPos = IAuraChunk.getLowestSpot(level, pos, radius, null); + var radius = Math.min(80, positiveAura.intValue() / 5000); + var lowestPos = IAuraChunk.getLowestSpot(level, pos, radius, null); if (lowestPos == null) return; - int stored = IAuraChunk.getAuraChunk(level, lowestPos).storeAura(lowestPos, spot / 50); + var stored = IAuraChunk.getAuraChunk(level, lowestPos).storeAura(lowestPos, spot / 50); auraChunk.drainAura(pos, stored); } diff --git a/src/main/java/de/ellpeck/naturesaura/chunk/effect/BreathlessEffect.java b/src/main/java/de/ellpeck/naturesaura/chunk/effect/BreathlessEffect.java index b10e57a6..6b48fdb6 100644 --- a/src/main/java/de/ellpeck/naturesaura/chunk/effect/BreathlessEffect.java +++ b/src/main/java/de/ellpeck/naturesaura/chunk/effect/BreathlessEffect.java @@ -30,10 +30,10 @@ public class BreathlessEffect implements IDrainSpotEffect { private boolean calcValues(Level level, BlockPos pos, Integer spot) { if (spot >= 0) return false; - int aura = IAuraChunk.getAuraInArea(level, pos, 50); + var aura = IAuraChunk.getAuraInArea(level, pos, 50); if (aura > 0) return false; - int dist = Math.min(Math.abs(aura) / 50000, 75); + var dist = Math.min(Math.abs(aura) / 50000, 75); if (dist < 10) return false; this.amp = Math.min(Mth.floor(Math.abs(aura) / 2500000F), 3); @@ -61,8 +61,8 @@ public class BreathlessEffect implements IDrainSpotEffect { return; if (!this.calcValues(level, pos, spot)) return; - List entities = level.getEntitiesOfClass(LivingEntity.class, this.bb); - for (LivingEntity entity : entities) + var entities = level.getEntitiesOfClass(LivingEntity.class, this.bb); + for (var entity : entities) entity.addEffect(new MobEffectInstance(ModPotions.BREATHLESS, 300, this.amp)); } diff --git a/src/main/java/de/ellpeck/naturesaura/chunk/effect/CacheRechargeEffect.java b/src/main/java/de/ellpeck/naturesaura/chunk/effect/CacheRechargeEffect.java index 180fbce9..e664b664 100644 --- a/src/main/java/de/ellpeck/naturesaura/chunk/effect/CacheRechargeEffect.java +++ b/src/main/java/de/ellpeck/naturesaura/chunk/effect/CacheRechargeEffect.java @@ -29,11 +29,11 @@ public class CacheRechargeEffect implements IDrainSpotEffect { private boolean calcValues(Level level, BlockPos pos, Integer spot) { if (spot < 100000) return false; - Pair auraAndSpots = IAuraChunk.getAuraAndSpotAmountInArea(level, pos, 20); + var auraAndSpots = IAuraChunk.getAuraAndSpotAmountInArea(level, pos, 20); int aura = auraAndSpots.getLeft(); if (aura < 1500000) return false; - int dist = Mth.clamp(aura / 3500, 3, 15); + var dist = Mth.clamp(aura / 3500, 3, 15); this.bb = new AABB(pos).inflate(dist); this.amount = Mth.ceil(aura / 250F / auraAndSpots.getRight()); return true; @@ -59,8 +59,8 @@ public class CacheRechargeEffect implements IDrainSpotEffect { public void update(Level level, LevelChunk chunk, IAuraChunk auraChunk, BlockPos pos, Integer spot) { if (!this.calcValues(level, pos, spot)) return; - List players = level.getEntitiesOfClass(Player.class, this.bb); - for (Player player : players) { + var players = level.getEntitiesOfClass(Player.class, this.bb); + for (var player : players) { if (NaturesAuraAPI.instance().isEffectPowderActive(level, player.blockPosition(), NAME)) continue; if (NaturesAuraAPI.instance().insertAuraIntoPlayer(player, this.amount, true)) { diff --git a/src/main/java/de/ellpeck/naturesaura/chunk/effect/ExplosionEffect.java b/src/main/java/de/ellpeck/naturesaura/chunk/effect/ExplosionEffect.java index 060f99d4..d9a27ffa 100644 --- a/src/main/java/de/ellpeck/naturesaura/chunk/effect/ExplosionEffect.java +++ b/src/main/java/de/ellpeck/naturesaura/chunk/effect/ExplosionEffect.java @@ -26,10 +26,10 @@ public class ExplosionEffect implements IDrainSpotEffect { private boolean calcValues(Level level, BlockPos pos, Integer spot) { if (spot >= 0) return false; - int aura = IAuraChunk.getAuraInArea(level, pos, 85); + var aura = IAuraChunk.getAuraInArea(level, pos, 85); if (aura > -5000000) return false; - int chance = 140 - Math.abs(aura) / 200000; + var chance = 140 - Math.abs(aura) / 200000; if (chance > 1 && level.random.nextInt(chance) != 0) return false; this.strength = Math.min(Math.abs(aura) / 5000000F, 5F); @@ -60,9 +60,9 @@ public class ExplosionEffect implements IDrainSpotEffect { if (!this.calcValues(level, pos, spot)) return; - int x = Mth.floor(pos.getX() + level.random.nextGaussian() * this.dist); - int z = Mth.floor(pos.getZ() + level.random.nextGaussian() * this.dist); - BlockPos chosenPos = new BlockPos(x, level.getHeight(Heightmap.Types.WORLD_SURFACE, x, z), z); + var x = Mth.floor(pos.getX() + level.random.nextGaussian() * this.dist); + var z = Mth.floor(pos.getZ() + level.random.nextGaussian() * this.dist); + var chosenPos = new BlockPos(x, level.getHeight(Heightmap.Types.WORLD_SURFACE, x, z), z); if (chosenPos.distSqr(pos) <= this.dist * this.dist && level.isLoaded(chosenPos)) { level.explode(null, chosenPos.getX() + 0.5, chosenPos.getY() + 0.5, chosenPos.getZ() + 0.5, diff --git a/src/main/java/de/ellpeck/naturesaura/chunk/effect/GrassDieEffect.java b/src/main/java/de/ellpeck/naturesaura/chunk/effect/GrassDieEffect.java index f0eba779..d26acaa6 100644 --- a/src/main/java/de/ellpeck/naturesaura/chunk/effect/GrassDieEffect.java +++ b/src/main/java/de/ellpeck/naturesaura/chunk/effect/GrassDieEffect.java @@ -27,7 +27,7 @@ public class GrassDieEffect implements IDrainSpotEffect { private boolean calcValues(Level level, BlockPos pos, Integer spot) { if (spot < 0) { - Pair auraAndSpots = IAuraChunk.getAuraAndSpotAmountInArea(level, pos, 50); + var auraAndSpots = IAuraChunk.getAuraAndSpotAmountInArea(level, pos, 50); int aura = auraAndSpots.getLeft(); if (aura < 0) { this.amount = Math.min(300, Mth.ceil(Math.abs(aura) / 100000F / auraAndSpots.getRight())); @@ -58,15 +58,15 @@ public class GrassDieEffect implements IDrainSpotEffect { public void update(Level level, LevelChunk chunk, IAuraChunk auraChunk, BlockPos pos, Integer spot) { if (!this.calcValues(level, pos, spot)) return; - for (int i = this.amount / 2 + level.random.nextInt(this.amount / 2); i >= 0; i--) { - BlockPos grassPos = new BlockPos( + for (var i = this.amount / 2 + level.random.nextInt(this.amount / 2); i >= 0; i--) { + var grassPos = new BlockPos( pos.getX() + level.random.nextGaussian() * this.dist, pos.getY() + level.random.nextGaussian() * this.dist, pos.getZ() + level.random.nextGaussian() * this.dist ); if (grassPos.distSqr(pos) <= this.dist * this.dist && level.isLoaded(grassPos)) { - BlockState state = level.getBlockState(grassPos); - Block block = state.getBlock(); + var state = level.getBlockState(grassPos); + var block = state.getBlock(); BlockState newState = null; if (block instanceof LeavesBlock) { diff --git a/src/main/java/de/ellpeck/naturesaura/chunk/effect/NetherDecayEffect.java b/src/main/java/de/ellpeck/naturesaura/chunk/effect/NetherDecayEffect.java index 168f98bd..c10c46fe 100644 --- a/src/main/java/de/ellpeck/naturesaura/chunk/effect/NetherDecayEffect.java +++ b/src/main/java/de/ellpeck/naturesaura/chunk/effect/NetherDecayEffect.java @@ -32,7 +32,7 @@ public class NetherDecayEffect implements IDrainSpotEffect { private boolean calcValues(Level level, BlockPos pos, Integer spot) { if (spot >= 0) return false; - Pair auraAndSpots = IAuraChunk.getAuraAndSpotAmountInArea(level, pos, 50); + var auraAndSpots = IAuraChunk.getAuraAndSpotAmountInArea(level, pos, 50); int aura = auraAndSpots.getLeft(); if (aura >= 0) return false; @@ -61,8 +61,8 @@ public class NetherDecayEffect implements IDrainSpotEffect { public void update(Level level, LevelChunk chunk, IAuraChunk auraChunk, BlockPos pos, Integer spot) { if (!this.calcValues(level, pos, spot)) return; - for (int i = this.amount / 2 + level.random.nextInt(this.amount / 2); i >= 0; i--) { - BlockPos offset = new BlockPos( + for (var i = this.amount / 2 + level.random.nextInt(this.amount / 2); i >= 0; i--) { + var offset = new BlockPos( pos.getX() + level.random.nextGaussian() * this.dist, pos.getY() + level.random.nextGaussian() * this.dist, pos.getZ() + level.random.nextGaussian() * this.dist); @@ -71,7 +71,7 @@ public class NetherDecayEffect implements IDrainSpotEffect { // degrade blocks Block degraded = null; - BlockState state = level.getBlockState(offset); + var state = level.getBlockState(offset); if (state.getBlock() == Blocks.GLOWSTONE) { degraded = Blocks.NETHERRACK; } else if (state.is(BlockTags.NYLIUM) || state.getBlock() == Blocks.NETHERRACK) { @@ -86,7 +86,7 @@ public class NetherDecayEffect implements IDrainSpotEffect { // ignite blocks if (BaseFireBlock.canBePlacedAt(level, offset, Direction.NORTH)) { - BlockState fire = BaseFireBlock.getState(level, offset); + var fire = BaseFireBlock.getState(level, offset); level.setBlockAndUpdate(offset, fire); level.levelEvent(1009, offset, 0); } diff --git a/src/main/java/de/ellpeck/naturesaura/chunk/effect/NetherGrassEffect.java b/src/main/java/de/ellpeck/naturesaura/chunk/effect/NetherGrassEffect.java index f3a881ac..be87e0a9 100644 --- a/src/main/java/de/ellpeck/naturesaura/chunk/effect/NetherGrassEffect.java +++ b/src/main/java/de/ellpeck/naturesaura/chunk/effect/NetherGrassEffect.java @@ -32,7 +32,7 @@ public class NetherGrassEffect implements IDrainSpotEffect { private boolean calcValues(Level level, BlockPos pos, Integer spot) { if (spot <= 0) return false; - Pair auraAndSpots = IAuraChunk.getAuraAndSpotAmountInArea(level, pos, 30); + var auraAndSpots = IAuraChunk.getAuraAndSpotAmountInArea(level, pos, 30); int aura = auraAndSpots.getLeft(); if (aura < 1500000) return false; @@ -65,26 +65,26 @@ public class NetherGrassEffect implements IDrainSpotEffect { return; if (!this.calcValues(level, pos, spot)) return; - for (int i = this.amount / 2 + level.random.nextInt(this.amount / 2); i >= 0; i--) { - int x = Mth.floor(pos.getX() + level.random.nextGaussian() * this.dist); - int y = Mth.floor(pos.getY() + level.random.nextGaussian() * this.dist); - int z = Mth.floor(pos.getZ() + level.random.nextGaussian() * this.dist); + for (var i = this.amount / 2 + level.random.nextInt(this.amount / 2); i >= 0; i--) { + var x = Mth.floor(pos.getX() + level.random.nextGaussian() * this.dist); + var y = Mth.floor(pos.getY() + level.random.nextGaussian() * this.dist); + var z = Mth.floor(pos.getZ() + level.random.nextGaussian() * this.dist); - for (int yOff = -5; yOff <= 5; yOff++) { - BlockPos goalPos = new BlockPos(x, y + yOff, z); + for (var yOff = -5; yOff <= 5; yOff++) { + var goalPos = new BlockPos(x, y + yOff, z); if (goalPos.distSqr(pos) <= this.dist * this.dist && level.isLoaded(goalPos)) { if (NaturesAuraAPI.instance().isEffectPowderActive(level, goalPos, NAME)) continue; - BlockPos up = goalPos.above(); + var up = goalPos.above(); if (level.getBlockState(up).isFaceSturdy(level, up, Direction.DOWN)) continue; - BlockState state = level.getBlockState(goalPos); - Block block = state.getBlock(); + var state = level.getBlockState(goalPos); + var block = state.getBlock(); if (Tags.Blocks.NETHERRACK.contains(block)) { level.setBlockAndUpdate(goalPos, ModBlocks.NETHER_GRASS.defaultBlockState()); - BlockPos closestSpot = IAuraChunk.getHighestSpot(level, goalPos, 25, pos); + var closestSpot = IAuraChunk.getHighestSpot(level, goalPos, 25, pos); IAuraChunk.getAuraChunk(level, closestSpot).drainAura(closestSpot, 500); PacketHandler.sendToAllAround(level, goalPos, 32, diff --git a/src/main/java/de/ellpeck/naturesaura/chunk/effect/OreSpawnEffect.java b/src/main/java/de/ellpeck/naturesaura/chunk/effect/OreSpawnEffect.java index c483eccb..faa351fb 100644 --- a/src/main/java/de/ellpeck/naturesaura/chunk/effect/OreSpawnEffect.java +++ b/src/main/java/de/ellpeck/naturesaura/chunk/effect/OreSpawnEffect.java @@ -48,7 +48,7 @@ public class OreSpawnEffect implements IDrainSpotEffect { private boolean calcValues(Level level, BlockPos pos, Integer spot) { if (spot <= 0) return false; - Pair auraAndSpots = IAuraChunk.getAuraAndSpotAmountInArea(level, pos, 30); + var auraAndSpots = IAuraChunk.getAuraAndSpotAmountInArea(level, pos, 30); int aura = auraAndSpots.getLeft(); if (aura <= 2000000) return false; @@ -81,7 +81,7 @@ public class OreSpawnEffect implements IDrainSpotEffect { return; if (!this.calcValues(level, pos, spot)) return; - IAuraType type = auraChunk.getType(); + var type = auraChunk.getType(); Block requiredBlock; List ores; if (type.isSimilar(NaturesAuraAPI.TYPE_OVERWORLD)) { @@ -91,51 +91,51 @@ public class OreSpawnEffect implements IDrainSpotEffect { requiredBlock = Blocks.NETHERRACK; ores = NaturesAuraAPI.NETHER_ORES; } - int totalWeight = WeightedRandom.getTotalWeight(ores); + var totalWeight = WeightedRandom.getTotalWeight(ores); - List> powders = NaturesAuraAPI.instance().getActiveEffectPowders(level, + var powders = NaturesAuraAPI.instance().getActiveEffectPowders(level, new AABB(pos).inflate(this.dist), NAME); if (powders.isEmpty()) return; - for (int i = 0; i < this.amount; i++) { - Tuple powder = powders.get(i % powders.size()); - Vec3 powderPos = powder.getA(); + for (var i = 0; i < this.amount; i++) { + var powder = powders.get(i % powders.size()); + var powderPos = powder.getA(); int range = powder.getB(); - int x = Mth.floor(powderPos.x + level.random.nextGaussian() * range); - int y = Mth.floor(powderPos.y + level.random.nextGaussian() * range); - int z = Mth.floor(powderPos.z + level.random.nextGaussian() * range); - BlockPos orePos = new BlockPos(x, y, z); + var x = Mth.floor(powderPos.x + level.random.nextGaussian() * range); + var y = Mth.floor(powderPos.y + level.random.nextGaussian() * range); + var z = Mth.floor(powderPos.z + level.random.nextGaussian() * range); + var orePos = new BlockPos(x, y, z); if (orePos.distSqr(powderPos.x, powderPos.y, powderPos.z, true) <= range * range && orePos.distSqr(pos) <= this.dist * this.dist && level.isLoaded(orePos)) { - BlockState state = level.getBlockState(orePos); + var state = level.getBlockState(orePos); if (state.getBlock() != requiredBlock) continue; outer: while (true) { - WeightedOre ore = WeightedRandom.getRandomItem(level.random, ores, totalWeight).orElse(null); + var ore = WeightedRandom.getRandomItem(level.random, ores, totalWeight).orElse(null); if (ore == null) continue; - Tag tag = level.getTagManager().getOrEmpty(Registry.BLOCK_REGISTRY).getTag(ore.tag); + var tag = level.getTagManager().getOrEmpty(Registry.BLOCK_REGISTRY).getTag(ore.tag); if (tag == null) continue; - for (Block toPlace : tag.getValues()) { + for (var toPlace : tag.getValues()) { if (toPlace == null || toPlace == Blocks.AIR) continue; - FakePlayer player = FakePlayerFactory.getMinecraft((ServerLevel) level); + var player = FakePlayerFactory.getMinecraft((ServerLevel) level); player.setItemInHand(InteractionHand.MAIN_HAND, ItemStack.EMPTY); - BlockHitResult ray = new BlockHitResult(Vec3.atCenterOf(pos), Direction.UP, pos, false); - BlockPlaceContext context = new BlockPlaceContext(new UseOnContext(player, InteractionHand.MAIN_HAND, ray)); - BlockState stateToPlace = toPlace.getStateForPlacement(context); + var ray = new BlockHitResult(Vec3.atCenterOf(pos), Direction.UP, pos, false); + var context = new BlockPlaceContext(new UseOnContext(player, InteractionHand.MAIN_HAND, ray)); + var stateToPlace = toPlace.getStateForPlacement(context); if (SPAWN_EXCEPTIONS.contains(stateToPlace)) continue; level.setBlockAndUpdate(orePos, stateToPlace); level.levelEvent(2001, orePos, Block.getId(stateToPlace)); - int toDrain = (20000 - ore.getWeight().asInt() * 2) * 2; - BlockPos highestSpot = IAuraChunk.getHighestSpot(level, orePos, 30, pos); + var toDrain = (20000 - ore.getWeight().asInt() * 2) * 2; + var highestSpot = IAuraChunk.getHighestSpot(level, orePos, 30, pos); IAuraChunk.getAuraChunk(level, highestSpot).drainAura(highestSpot, toDrain); break outer; } diff --git a/src/main/java/de/ellpeck/naturesaura/chunk/effect/PlantBoostEffect.java b/src/main/java/de/ellpeck/naturesaura/chunk/effect/PlantBoostEffect.java index e1165999..27c5e032 100644 --- a/src/main/java/de/ellpeck/naturesaura/chunk/effect/PlantBoostEffect.java +++ b/src/main/java/de/ellpeck/naturesaura/chunk/effect/PlantBoostEffect.java @@ -32,7 +32,7 @@ public class PlantBoostEffect implements IDrainSpotEffect { private boolean calcValues(Level level, BlockPos pos, Integer spot) { if (spot <= 0) return false; - Pair auraAndSpots = IAuraChunk.getAuraAndSpotAmountInArea(level, pos, 30); + var auraAndSpots = IAuraChunk.getAuraAndSpotAmountInArea(level, pos, 30); int aura = auraAndSpots.getLeft(); if (aura < 1500000) return false; @@ -63,16 +63,16 @@ public class PlantBoostEffect implements IDrainSpotEffect { public void update(Level level, LevelChunk chunk, IAuraChunk auraChunk, BlockPos pos, Integer spot) { if (!this.calcValues(level, pos, spot)) return; - for (int i = this.amount / 2 + level.random.nextInt(this.amount / 2); i >= 0; i--) { - int x = Mth.floor(pos.getX() + (2 * level.random.nextFloat() - 1) * this.dist); - int z = Mth.floor(pos.getZ() + (2 * level.random.nextFloat() - 1) * this.dist); - BlockPos plantPos = new BlockPos(x, level.getHeight(Heightmap.Types.WORLD_SURFACE, x, z), z).below(); + for (var i = this.amount / 2 + level.random.nextInt(this.amount / 2); i >= 0; i--) { + var x = Mth.floor(pos.getX() + (2 * level.random.nextFloat() - 1) * this.dist); + var z = Mth.floor(pos.getZ() + (2 * level.random.nextFloat() - 1) * this.dist); + var plantPos = new BlockPos(x, level.getHeight(Heightmap.Types.WORLD_SURFACE, x, z), z).below(); if (plantPos.distSqr(pos) <= this.dist * this.dist && level.isLoaded(plantPos)) { if (NaturesAuraAPI.instance().isEffectPowderActive(level, plantPos, NAME)) continue; - BlockState state = level.getBlockState(plantPos); - Block block = state.getBlock(); + var state = level.getBlockState(plantPos); + var block = state.getBlock(); if (block instanceof BonemealableBlock growable && !(block instanceof DoublePlantBlock) && !(block instanceof TallGrassBlock) && block != Blocks.GRASS_BLOCK) { if (growable.isValidBonemealTarget(level, plantPos, state, false)) { try { @@ -81,7 +81,7 @@ public class PlantBoostEffect implements IDrainSpotEffect { // a lot of stuff throws here (double plants where generation only caused half of it to exist, bamboo at level height...) // so just catch all, bleh } - BlockPos closestSpot = IAuraChunk.getHighestSpot(level, plantPos, 25, pos); + var closestSpot = IAuraChunk.getHighestSpot(level, plantPos, 25, pos); IAuraChunk.getAuraChunk(level, closestSpot).drainAura(closestSpot, 3500); PacketHandler.sendToAllAround(level, plantPos, 32, diff --git a/src/main/java/de/ellpeck/naturesaura/chunk/effect/ReplenishingEffect.java b/src/main/java/de/ellpeck/naturesaura/chunk/effect/ReplenishingEffect.java index 931e67a7..a69465ee 100644 --- a/src/main/java/de/ellpeck/naturesaura/chunk/effect/ReplenishingEffect.java +++ b/src/main/java/de/ellpeck/naturesaura/chunk/effect/ReplenishingEffect.java @@ -25,18 +25,18 @@ public class ReplenishingEffect implements IDrainSpotEffect { if (spot < 0) { List tiles = new ArrayList<>(); Helper.getBlockEntitiesInArea(level, pos, 25, tile -> { - IAuraContainer container = tile.getCapability(NaturesAuraAPI.capAuraContainer, null).orElse(null); + var container = tile.getCapability(NaturesAuraAPI.capAuraContainer, null).orElse(null); if (container instanceof ISpotDrainable) tiles.add((ISpotDrainable) container); return false; }); if (!tiles.isEmpty()) { - IAuraType type = IAuraType.forLevel(level); - for (int i = level.random.nextInt(6); i >= 0; i--) { - ISpotDrainable tile = tiles.get(level.random.nextInt(tiles.size())); + var type = IAuraType.forLevel(level); + for (var i = level.random.nextInt(6); i >= 0; i--) { + var tile = tiles.get(level.random.nextInt(tiles.size())); if (!tile.isAcceptableType(type)) continue; - int drained = tile.drainAuraPassively(-spot, false); + var drained = tile.drainAuraPassively(-spot, false); if (drained <= 0) continue; auraChunk.storeAura(pos, drained); diff --git a/src/main/java/de/ellpeck/naturesaura/chunk/effect/SpreadEffect.java b/src/main/java/de/ellpeck/naturesaura/chunk/effect/SpreadEffect.java index 171e487e..89cbc1da 100644 --- a/src/main/java/de/ellpeck/naturesaura/chunk/effect/SpreadEffect.java +++ b/src/main/java/de/ellpeck/naturesaura/chunk/effect/SpreadEffect.java @@ -19,16 +19,16 @@ public class SpreadEffect implements IDrainSpotEffect { public void update(Level level, LevelChunk chunk, IAuraChunk auraChunk, BlockPos pos, Integer spot) { if (Math.abs(spot) < 500000 || Math.abs(IAuraChunk.getAuraInArea(level, pos, 25)) < 2000000) return; - boolean drain = spot > 0; - int toMove = Mth.ceil(Math.abs(spot) * 0.72F); - int perSide = toMove / 6; + var drain = spot > 0; + var toMove = Mth.ceil(Math.abs(spot) * 0.72F); + var perSide = toMove / 6; while (toMove > 0) { BlockPos bestOffset = null; - int bestAmount = drain ? Integer.MAX_VALUE : Integer.MIN_VALUE; - for (Direction facing : Direction.values()) { - BlockPos offset = pos.relative(facing, 15); + var bestAmount = drain ? Integer.MAX_VALUE : Integer.MIN_VALUE; + for (var facing : Direction.values()) { + var offset = pos.relative(facing, 15); if (level.isLoaded(offset) && offset.getY() >= 0 && offset.getY() <= level.getHeight()) { - int amount = IAuraChunk.getAuraInArea(level, offset, 14); + var amount = IAuraChunk.getAuraInArea(level, offset, 14); if (drain ? amount < bestAmount : amount > bestAmount) { bestAmount = amount; bestOffset = offset; @@ -38,9 +38,9 @@ public class SpreadEffect implements IDrainSpotEffect { if (bestOffset == null) break; - BlockPos bestPos = drain ? IAuraChunk.getLowestSpot(level, bestOffset, 14, bestOffset) + var bestPos = drain ? IAuraChunk.getLowestSpot(level, bestOffset, 14, bestOffset) : IAuraChunk.getHighestSpot(level, bestOffset, 14, bestOffset); - IAuraChunk bestChunk = IAuraChunk.getAuraChunk(level, bestPos); + var bestChunk = IAuraChunk.getAuraChunk(level, bestPos); int moved; if (drain) { diff --git a/src/main/java/de/ellpeck/naturesaura/commands/CommandAura.java b/src/main/java/de/ellpeck/naturesaura/commands/CommandAura.java index c846d1a0..61f5a276 100644 --- a/src/main/java/de/ellpeck/naturesaura/commands/CommandAura.java +++ b/src/main/java/de/ellpeck/naturesaura/commands/CommandAura.java @@ -13,32 +13,32 @@ public final class CommandAura { public static void register(CommandDispatcher dispatcher) { dispatcher.register(Commands.literal("naaura").requires(s -> s.hasPermission(2)) .then(Commands.literal("add").then(Commands.argument("amount", IntegerArgumentType.integer(1)).executes(context -> { - int amount = IntegerArgumentType.getInteger(context, "amount"); - CommandSourceStack source = context.getSource(); - BlockPos pos = new BlockPos(source.getPosition()); + var amount = IntegerArgumentType.getInteger(context, "amount"); + var source = context.getSource(); + var pos = new BlockPos(source.getPosition()); while (amount > 0) { - BlockPos spot = IAuraChunk.getLowestSpot(source.getLevel(), pos, 35, pos); + var spot = IAuraChunk.getLowestSpot(source.getLevel(), pos, 35, pos); amount -= IAuraChunk.getAuraChunk(source.getLevel(), spot).storeAura(spot, amount); } source.sendSuccess(new TextComponent("Added aura to area"), true); return 0; }))) .then(Commands.literal("remove").then(Commands.argument("amount", IntegerArgumentType.integer(1)).executes(context -> { - int amount = IntegerArgumentType.getInteger(context, "amount"); - CommandSourceStack source = context.getSource(); - BlockPos pos = new BlockPos(source.getPosition()); + var amount = IntegerArgumentType.getInteger(context, "amount"); + var source = context.getSource(); + var pos = new BlockPos(source.getPosition()); while (amount > 0) { - BlockPos spot = IAuraChunk.getHighestSpot(source.getLevel(), pos, 35, pos); + var spot = IAuraChunk.getHighestSpot(source.getLevel(), pos, 35, pos); amount -= IAuraChunk.getAuraChunk(source.getLevel(), spot).drainAura(spot, amount); } source.sendSuccess(new TextComponent("Removed aura from area"), true); return 0; }))) .then(Commands.literal("reset").executes(context -> { - CommandSourceStack source = context.getSource(); - BlockPos pos = new BlockPos(source.getPosition()); + var source = context.getSource(); + var pos = new BlockPos(source.getPosition()); IAuraChunk.getSpotsInArea(source.getLevel(), pos, 35, (spot, amount) -> { - IAuraChunk chunk = IAuraChunk.getAuraChunk(source.getLevel(), spot); + var chunk = IAuraChunk.getAuraChunk(source.getLevel(), spot); if (amount > 0) chunk.drainAura(spot, amount); else diff --git a/src/main/java/de/ellpeck/naturesaura/compat/Compat.java b/src/main/java/de/ellpeck/naturesaura/compat/Compat.java index f819c734..5bc9499c 100644 --- a/src/main/java/de/ellpeck/naturesaura/compat/Compat.java +++ b/src/main/java/de/ellpeck/naturesaura/compat/Compat.java @@ -41,8 +41,8 @@ public final class Compat { } private static void populateModules(Predicate isLoaded) { - for (Map.Entry> entry : MODULE_TYPES.entrySet()) { - String id = entry.getKey(); + for (var entry : MODULE_TYPES.entrySet()) { + var id = entry.getKey(); if (isLoaded.test(id)) { MODULES.put(id, entry.getValue().get()); NaturesAura.LOGGER.info("Loading compat module for mod " + id); diff --git a/src/main/java/de/ellpeck/naturesaura/compat/patchouli/PatchouliCompat.java b/src/main/java/de/ellpeck/naturesaura/compat/patchouli/PatchouliCompat.java index 31cc0169..469c6b09 100644 --- a/src/main/java/de/ellpeck/naturesaura/compat/patchouli/PatchouliCompat.java +++ b/src/main/java/de/ellpeck/naturesaura/compat/patchouli/PatchouliCompat.java @@ -35,9 +35,9 @@ public class PatchouliCompat implements ICompat { @SuppressWarnings("unchecked") public static > T getRecipe(String type, String name) { - RecipeManager manager = Minecraft.getInstance().level.getRecipeManager(); - ResourceLocation res = new ResourceLocation(name); - ResourceLocation pre = new ResourceLocation(res.getNamespace(), type + "/" + res.getPath()); + var manager = Minecraft.getInstance().level.getRecipeManager(); + var res = new ResourceLocation(name); + var pre = new ResourceLocation(res.getNamespace(), type + "/" + res.getPath()); return (T) manager.byKey(pre).orElse(null); } diff --git a/src/main/java/de/ellpeck/naturesaura/data/BlockLootProvider.java b/src/main/java/de/ellpeck/naturesaura/data/BlockLootProvider.java index 96875fc5..375a54a0 100644 --- a/src/main/java/de/ellpeck/naturesaura/data/BlockLootProvider.java +++ b/src/main/java/de/ellpeck/naturesaura/data/BlockLootProvider.java @@ -48,7 +48,7 @@ public class BlockLootProvider implements DataProvider { public BlockLootProvider(DataGenerator generator) { this.generator = generator; - for (IModItem item : ModRegistry.ALL_ITEMS) { + for (var item : ModRegistry.ALL_ITEMS) { if (!(item instanceof Block block)) continue; if (block instanceof Slab) { @@ -73,11 +73,11 @@ public class BlockLootProvider implements DataProvider { @Override public void run(HashCache cache) throws IOException { - for (Map.Entry> function : this.lootFunctions.entrySet()) { - Block block = function.getKey(); - Function func = function.getValue(); - LootTable table = func.apply(block).setParamSet(LootContextParamSets.BLOCK).build(); - Path path = getPath(this.generator.getOutputFolder(), block.getRegistryName()); + for (var function : this.lootFunctions.entrySet()) { + var block = function.getKey(); + var func = function.getValue(); + var table = func.apply(block).setParamSet(LootContextParamSets.BLOCK).build(); + var path = getPath(this.generator.getOutputFolder(), block.getRegistryName()); DataProvider.save(GSON, cache, LootTables.serialize(table), path); } } diff --git a/src/main/java/de/ellpeck/naturesaura/data/BlockStateGenerator.java b/src/main/java/de/ellpeck/naturesaura/data/BlockStateGenerator.java index dbd85a4c..eb348e8f 100644 --- a/src/main/java/de/ellpeck/naturesaura/data/BlockStateGenerator.java +++ b/src/main/java/de/ellpeck/naturesaura/data/BlockStateGenerator.java @@ -17,7 +17,7 @@ public class BlockStateGenerator extends BlockStateProvider { @Override protected void registerStatesAndModels() { - for (IModItem item : ModRegistry.ALL_ITEMS) { + for (var item : ModRegistry.ALL_ITEMS) { if (!(item instanceof Block block)) continue; if (block instanceof ICustomBlockState custom) { diff --git a/src/main/java/de/ellpeck/naturesaura/data/ItemModelGenerator.java b/src/main/java/de/ellpeck/naturesaura/data/ItemModelGenerator.java index 4665360d..6d84f857 100644 --- a/src/main/java/de/ellpeck/naturesaura/data/ItemModelGenerator.java +++ b/src/main/java/de/ellpeck/naturesaura/data/ItemModelGenerator.java @@ -19,8 +19,8 @@ public class ItemModelGenerator extends ItemModelProvider { @Override protected void registerModels() { - for (IModItem modItem : ModRegistry.ALL_ITEMS) { - String name = modItem.getBaseName(); + for (var modItem : ModRegistry.ALL_ITEMS) { + var name = modItem.getBaseName(); if (modItem instanceof ICustomItemModel) { ((ICustomItemModel) modItem).generateCustomItemModel(this); } else if (modItem instanceof Item) { diff --git a/src/main/java/de/ellpeck/naturesaura/data/ModData.java b/src/main/java/de/ellpeck/naturesaura/data/ModData.java index abcf7f0f..ebf075ba 100644 --- a/src/main/java/de/ellpeck/naturesaura/data/ModData.java +++ b/src/main/java/de/ellpeck/naturesaura/data/ModData.java @@ -11,9 +11,9 @@ public final class ModData { @SubscribeEvent public static void gatherData(GatherDataEvent event) { - DataGenerator generator = event.getGenerator(); - ExistingFileHelper ex = event.getExistingFileHelper(); - BlockTagProvider blockTags = new BlockTagProvider(generator); + var generator = event.getGenerator(); + var ex = event.getExistingFileHelper(); + var blockTags = new BlockTagProvider(generator); generator.addProvider(blockTags); generator.addProvider(new ItemTagProvider(generator, blockTags, ex)); generator.addProvider(new BlockLootProvider(generator)); diff --git a/src/main/java/de/ellpeck/naturesaura/entities/EntityLightProjectile.java b/src/main/java/de/ellpeck/naturesaura/entities/EntityLightProjectile.java index c7339b3a..df378c70 100644 --- a/src/main/java/de/ellpeck/naturesaura/entities/EntityLightProjectile.java +++ b/src/main/java/de/ellpeck/naturesaura/entities/EntityLightProjectile.java @@ -47,8 +47,8 @@ public class EntityLightProjectile extends ThrowableProjectile { protected void onHit(HitResult result) { if (!this.level.isClientSide) { if (result instanceof BlockHitResult res) { - BlockPos pos = res.getBlockPos().relative(res.getDirection()); - BlockState state = this.level.getBlockState(pos); + var pos = res.getBlockPos().relative(res.getDirection()); + var state = this.level.getBlockState(pos); if (state.getMaterial().isReplaceable()) this.level.setBlockAndUpdate(pos, ModBlocks.LIGHT.defaultBlockState()); } else if (result instanceof EntityHitResult entity) { diff --git a/src/main/java/de/ellpeck/naturesaura/entities/EntityMoverMinecart.java b/src/main/java/de/ellpeck/naturesaura/entities/EntityMoverMinecart.java index 15fcc392..b53128ee 100644 --- a/src/main/java/de/ellpeck/naturesaura/entities/EntityMoverMinecart.java +++ b/src/main/java/de/ellpeck/naturesaura/entities/EntityMoverMinecart.java @@ -49,7 +49,7 @@ public class EntityMoverMinecart extends AbstractMinecart { super.moveMinecartOnRail(railPos); if (!this.isActive) return; - BlockPos pos = this.blockPosition(); + var pos = this.blockPosition(); if (!this.spotOffsets.isEmpty() && this.level.getGameTime() % 10 == 0) PacketHandler.sendToAllAround(this.level, pos, 32, new PacketParticles( @@ -64,18 +64,18 @@ public class EntityMoverMinecart extends AbstractMinecart { } private void moveAura(Level oldLevel, BlockPos oldPos, Level newLevel, BlockPos newPos) { - for (BlockPos offset : this.spotOffsets) { - BlockPos spot = oldPos.offset(offset); - IAuraChunk chunk = IAuraChunk.getAuraChunk(oldLevel, spot); - int amount = chunk.getDrainSpot(spot); + for (var offset : this.spotOffsets) { + var spot = oldPos.offset(offset); + var chunk = IAuraChunk.getAuraChunk(oldLevel, spot); + var amount = chunk.getDrainSpot(spot); if (amount <= 0) continue; - int toMove = Math.min(amount, 300000); - int drained = chunk.drainAura(spot, toMove, false, false); + var toMove = Math.min(amount, 300000); + var drained = chunk.drainAura(spot, toMove, false, false); if (drained <= 0) continue; - int toLose = Mth.ceil(drained / 250F); - BlockPos newSpot = newPos.offset(offset); + var toLose = Mth.ceil(drained / 250F); + var newSpot = newPos.offset(offset); IAuraChunk.getAuraChunk(newLevel, newSpot).storeAura(newSpot, drained - toLose, false, false); } } @@ -85,7 +85,7 @@ public class EntityMoverMinecart extends AbstractMinecart { if (this.isActive != receivingPower) { this.isActive = receivingPower; - BlockPos pos = this.blockPosition(); + var pos = this.blockPosition(); if (!this.isActive) { this.moveAura(this.level, this.lastPosition, this.level, pos); this.spotOffsets.clear(); @@ -110,12 +110,12 @@ public class EntityMoverMinecart extends AbstractMinecart { @Override public CompoundTag serializeNBT() { - CompoundTag compound = super.serializeNBT(); + var compound = super.serializeNBT(); compound.putBoolean("active", this.isActive); compound.putLong("last_pos", this.lastPosition.asLong()); - ListTag list = new ListTag(); - for (BlockPos offset : this.spotOffsets) + var list = new ListTag(); + for (var offset : this.spotOffsets) list.add(LongTag.valueOf(offset.asLong())); compound.put("offsets", list); return compound; @@ -128,17 +128,17 @@ public class EntityMoverMinecart extends AbstractMinecart { this.lastPosition = BlockPos.of(compound.getLong("last_pos")); this.spotOffsets.clear(); - ListTag list = compound.getList("offsets", Tag.TAG_LONG); - for (Tag base : list) + var list = compound.getList("offsets", Tag.TAG_LONG); + for (var base : list) this.spotOffsets.add(BlockPos.of(((LongTag) base).getAsLong())); } @Nullable @Override public Entity changeDimension(ServerLevel destination, ITeleporter teleporter) { - Entity entity = super.changeDimension(destination, teleporter); + var entity = super.changeDimension(destination, teleporter); if (entity instanceof EntityMoverMinecart) { - BlockPos pos = entity.blockPosition(); + var pos = entity.blockPosition(); this.moveAura(this.level, this.lastPosition, entity.level, pos); ((EntityMoverMinecart) entity).lastPosition = pos; } @@ -172,7 +172,7 @@ public class EntityMoverMinecart extends AbstractMinecart { @Override protected void applyNaturalSlowdown() { - Vec3 motion = this.getDeltaMovement(); + var motion = this.getDeltaMovement(); this.setDeltaMovement(motion.x * 0.99F, 0, motion.z * 0.99F); } diff --git a/src/main/java/de/ellpeck/naturesaura/entities/EntityStructureFinder.java b/src/main/java/de/ellpeck/naturesaura/entities/EntityStructureFinder.java index 98da1dd2..2dc4ead2 100644 --- a/src/main/java/de/ellpeck/naturesaura/entities/EntityStructureFinder.java +++ b/src/main/java/de/ellpeck/naturesaura/entities/EntityStructureFinder.java @@ -52,10 +52,10 @@ public class EntityStructureFinder extends EyeOfEnder { @Override public void signalTo(BlockPos pos) { double d0 = pos.getX(); - int i = pos.getY(); + var i = pos.getY(); double d1 = pos.getZ(); - double d2 = d0 - this.getX(); - double d3 = d1 - this.getZ(); + var d2 = d0 - this.getX(); + var d3 = d1 - this.getZ(); var f = Math.sqrt(d2 * d2 + d3 * d3); if (f > 12.0F) { this.targetX = this.getX() + d2 / (double) f * 12.0D; @@ -75,10 +75,10 @@ public class EntityStructureFinder extends EyeOfEnder { public void tick() { this.baseTick(); - Vec3 vec3d = this.getDeltaMovement(); - double d0 = this.getX() + vec3d.x; - double d1 = this.getY() + vec3d.y; - double d2 = this.getZ() + vec3d.z; + var vec3d = this.getDeltaMovement(); + var d0 = this.getX() + vec3d.x; + var d1 = this.getY() + vec3d.y; + var d2 = this.getZ() + vec3d.z; var f = Math.sqrt(vec3d.horizontalDistance()); this.setYRot((float) (Mth.atan2(vec3d.x, vec3d.z) * (double) (180F / (float) Math.PI))); this.setXRot((float) (Mth.atan2(vec3d.y, f) * (double) (180F / (float) Math.PI))); @@ -93,24 +93,24 @@ public class EntityStructureFinder extends EyeOfEnder { this.setXRot(Mth.lerp(0.2F, this.xRotO, this.getXRot())); this.setYRot(Mth.lerp(0.2F, this.yRotO, this.getYRot())); if (!this.level.isClientSide) { - double d3 = this.targetX - d0; - double d4 = this.targetZ - d2; - float f1 = (float) Math.sqrt(d3 * d3 + d4 * d4); - float f2 = (float) Mth.atan2(d4, d3); - double d5 = Mth.lerp(0.0025D, f, f1); - double d6 = vec3d.y; + var d3 = this.targetX - d0; + var d4 = this.targetZ - d2; + var f1 = (float) Math.sqrt(d3 * d3 + d4 * d4); + var f2 = (float) Mth.atan2(d4, d3); + var d5 = Mth.lerp(0.0025D, f, f1); + var d6 = vec3d.y; if (f1 < 1.0F) { d5 *= 0.8D; d6 *= 0.8D; } - int j = this.getY() < this.targetY ? 1 : -1; + var j = this.getY() < this.targetY ? 1 : -1; vec3d = new Vec3(Math.cos(f2) * d5, d6 + ((double) j - d6) * (double) 0.015F, Math.sin(f2) * d5); this.setDeltaMovement(vec3d); } if (this.isInWater()) { - for (int i = 0; i < 4; ++i) + for (var i = 0; i < 4; ++i) this.level.addParticle(ParticleTypes.BUBBLE, d0 - vec3d.x * 0.25D, d1 - vec3d.y * 0.25D, d2 - vec3d.z * 0.25D, vec3d.x, vec3d.y, vec3d.z); } else if (this.level.isClientSide) { NaturesAuraAPI.instance().spawnMagicParticle(d0 - vec3d.x * 0.25D + this.random.nextDouble() * 0.6D - 0.3D, d1 - vec3d.y * 0.25D - 0.5D, d2 - vec3d.z * 0.25D + this.random.nextDouble() * 0.6D - 0.3D, vec3d.x * 0.25F, vec3d.y * 0.25F, vec3d.z * 0.25F, this.entityData.get(COLOR), 1, 50, 0, false, true); diff --git a/src/main/java/de/ellpeck/naturesaura/entities/render/RenderEffectInhibitor.java b/src/main/java/de/ellpeck/naturesaura/entities/render/RenderEffectInhibitor.java index 102fcc76..8c6962d2 100644 --- a/src/main/java/de/ellpeck/naturesaura/entities/render/RenderEffectInhibitor.java +++ b/src/main/java/de/ellpeck/naturesaura/entities/render/RenderEffectInhibitor.java @@ -37,12 +37,12 @@ public class RenderEffectInhibitor extends EntityRenderer @Override public void render(EntityEffectInhibitor entity, float entityYaw, float partialTicks, PoseStack matrixStackIn, MultiBufferSource bufferIn, int packedLightIn) { matrixStackIn.pushPose(); - float time = entity.renderTicks + entity.getId() + partialTicks; - float bob = (float) Math.sin(time / 10F) * 0.05F; + var time = entity.renderTicks + entity.getId() + partialTicks; + var bob = (float) Math.sin(time / 10F) * 0.05F; matrixStackIn.translate(0, 0.15F + bob, 0); matrixStackIn.mulPose(Vector3f.YP.rotationDegrees(time * 3 % 360)); - ResourceLocation effect = entity.getInhibitedEffect(); - ItemStack stack = this.items.computeIfAbsent(effect, + var effect = entity.getInhibitedEffect(); + var stack = this.items.computeIfAbsent(effect, res -> ItemEffectPowder.setEffect(new ItemStack(ModItems.EFFECT_POWDER), effect)); Minecraft.getInstance().getItemRenderer().renderStatic(stack, ItemTransforms.TransformType.GROUND, packedLightIn, OverlayTexture.NO_OVERLAY, matrixStackIn, bufferIn, 0); matrixStackIn.popPose(); diff --git a/src/main/java/de/ellpeck/naturesaura/events/ClientEvents.java b/src/main/java/de/ellpeck/naturesaura/events/ClientEvents.java index a15b2cae..e6022493 100644 --- a/src/main/java/de/ellpeck/naturesaura/events/ClientEvents.java +++ b/src/main/java/de/ellpeck/naturesaura/events/ClientEvents.java @@ -52,21 +52,21 @@ public class ClientEvents { @SubscribeEvent public void onDebugRender(RenderGameOverlayEvent.Text event) { - Minecraft mc = Minecraft.getInstance(); + var mc = Minecraft.getInstance(); if (mc.options.renderDebug && ModConfig.instance.debugText.get()) { - String prefix = ChatFormatting.GREEN + "[" + NaturesAura.MOD_NAME + "]" + ChatFormatting.RESET + " "; + var prefix = ChatFormatting.GREEN + "[" + NaturesAura.MOD_NAME + "]" + ChatFormatting.RESET + " "; List left = event.getLeft(); if (mc.player.isCreative()) { left.add(""); - MutableInt amount = new MutableInt(IAuraChunk.DEFAULT_AURA); - MutableInt spots = new MutableInt(); - MutableInt chunks = new MutableInt(); + var amount = new MutableInt(IAuraChunk.DEFAULT_AURA); + var spots = new MutableInt(); + var chunks = new MutableInt(); IAuraChunk.getSpotsInArea(mc.level, mc.player.blockPosition(), 35, (blockPos, drainSpot) -> { spots.increment(); amount.add(drainSpot); }); Helper.getAuraChunksWithSpotsInArea(mc.level, mc.player.blockPosition(), 35, c -> chunks.increment()); - NumberFormat format = NumberFormat.getInstance(); + var format = NumberFormat.getInstance(); left.add(prefix + "A: " + format.format(amount.intValue()) + " (S: " + spots.intValue() + ", C: " + chunks.intValue() + ")"); left.add(prefix + "AT: " + IAuraType.forLevel(mc.level).getName()); } @@ -80,7 +80,7 @@ public class ClientEvents { heldEye = ItemStack.EMPTY; heldOcular = ItemStack.EMPTY; - Minecraft mc = Minecraft.getInstance(); + var mc = Minecraft.getInstance(); if (mc.level == null) { ItemRangeVisualizer.clear(); PENDING_AURA_CHUNKS.clear(); @@ -89,17 +89,17 @@ public class ClientEvents { if (!mc.isPaused()) { if (mc.level.getGameTime() % 20 == 0) { - int amount = Mth.floor(190 * ModConfig.instance.excessParticleAmount.get()); - for (int i = 0; i < amount; i++) { - int x = Mth.floor(mc.player.getX()) + mc.level.random.nextInt(64) - 32; - int z = Mth.floor(mc.player.getZ()) + mc.level.random.nextInt(64) - 32; - BlockPos pos = new BlockPos(x, mc.level.getHeight(Heightmap.Types.WORLD_SURFACE, x, z) - 1, z); - BlockState state = mc.level.getBlockState(pos); - Block block = state.getBlock(); + var amount = Mth.floor(190 * ModConfig.instance.excessParticleAmount.get()); + for (var i = 0; i < amount; i++) { + var x = Mth.floor(mc.player.getX()) + mc.level.random.nextInt(64) - 32; + var z = Mth.floor(mc.player.getZ()) + mc.level.random.nextInt(64) - 32; + var pos = new BlockPos(x, mc.level.getHeight(Heightmap.Types.WORLD_SURFACE, x, z) - 1, z); + var state = mc.level.getBlockState(pos); + var block = state.getBlock(); if (block instanceof BonemealableBlock || block instanceof IPlantable || block instanceof LeavesBlock || block instanceof MyceliumBlock) { - int excess = IAuraChunk.triangulateAuraInArea(mc.level, pos, 45) - IAuraChunk.DEFAULT_AURA; + var excess = IAuraChunk.triangulateAuraInArea(mc.level, pos, 45) - IAuraChunk.DEFAULT_AURA; if (excess > 0) { - int chance = Math.max(10, 50 - excess / 25000); + var chance = Math.max(10, 50 - excess / 25000); if (mc.level.random.nextInt(chance) <= 0) NaturesAuraAPI.instance().spawnMagicParticle( pos.getX() + mc.level.random.nextFloat(), @@ -118,10 +118,10 @@ public class ClientEvents { } if (Helper.isHoldingItem(mc.player, ModItems.RANGE_VISUALIZER) && mc.level.getGameTime() % 5 == 0) { - NaturesAuraAPI.IInternalHooks inst = NaturesAuraAPI.instance(); + var inst = NaturesAuraAPI.instance(); inst.setParticleSpawnRange(512); inst.setParticleDepth(false); - for (BlockPos pos : ItemRangeVisualizer.VISUALIZED_RAILS.get(mc.level.dimension().location())) { + for (var pos : ItemRangeVisualizer.VISUALIZED_RAILS.get(mc.level.dimension().location())) { NaturesAuraAPI.instance().spawnMagicParticle( pos.getX() + mc.level.random.nextFloat(), pos.getY() + mc.level.random.nextFloat(), @@ -417,10 +417,10 @@ public class ClientEvents { } private String createTimeString(int totalTicks) { - int ticks = totalTicks % 20; - int seconds = totalTicks / 20 % 60; - int minutes = totalTicks / 20 / 60 % 60; - int hours = totalTicks / 20 / 60 / 60; + var ticks = totalTicks % 20; + var seconds = totalTicks / 20 % 60; + var minutes = totalTicks / 20 / 60 % 60; + var hours = totalTicks / 20 / 60 / 60; return String.format("%02d:%02d:%02d.%02d", hours, minutes, seconds, ticks); } diff --git a/src/main/java/de/ellpeck/naturesaura/events/CommonEvents.java b/src/main/java/de/ellpeck/naturesaura/events/CommonEvents.java index 57d4be3c..c8f56018 100644 --- a/src/main/java/de/ellpeck/naturesaura/events/CommonEvents.java +++ b/src/main/java/de/ellpeck/naturesaura/events/CommonEvents.java @@ -65,7 +65,7 @@ public class CommonEvents { @SubscribeEvent public void onChunkCapsAttach(AttachCapabilitiesEvent event) { - LevelChunk chunk = event.getObject(); + var chunk = event.getObject(); event.addCapability(new ResourceLocation(NaturesAura.MOD_ID, "aura"), new AuraChunkProvider(chunk)); } @@ -76,11 +76,11 @@ public class CommonEvents { @SubscribeEvent public void onChunkUnload(ChunkEvent.Unload event) { - ChunkAccess iChunk = event.getChunk(); + var iChunk = event.getChunk(); if (iChunk instanceof LevelChunk chunk) { - IAuraChunk auraChunk = chunk.getCapability(NaturesAuraAPI.capAuraChunk).orElse(null); + var auraChunk = chunk.getCapability(NaturesAuraAPI.capAuraChunk).orElse(null); if (auraChunk instanceof AuraChunk) { - LevelData data = (LevelData) ILevelData.getLevelData(chunk.getLevel()); + var data = (LevelData) ILevelData.getLevelData(chunk.getLevel()); data.auraChunksWithSpots.remove(chunk.getPos().toLong()); } } @@ -88,14 +88,14 @@ public class CommonEvents { @SubscribeEvent public void onItemUse(PlayerInteractEvent.RightClickBlock event) { - Player player = event.getPlayer(); + var player = event.getPlayer(); if (player.level.isClientSide) return; - ItemStack held = event.getItemStack(); + var held = event.getItemStack(); if (!held.isEmpty() && held.getItem().getRegistryName().getPath().contains("chisel")) { - BlockState state = player.level.getBlockState(event.getPos()); + var state = player.level.getBlockState(event.getPos()); if (NaturesAuraAPI.BOTANIST_PICKAXE_CONVERSIONS.containsKey(state)) { - LevelData data = (LevelData) ILevelData.getLevelData(player.level); + var data = (LevelData) ILevelData.getLevelData(player.level); data.addMossStone(event.getPos()); } } @@ -108,13 +108,13 @@ public class CommonEvents { if (event.world.getGameTime() % 20 == 0) { event.world.getProfiler().push(NaturesAura.MOD_ID + ":onLevelTick"); try { - ChunkMap manager = ((ServerChunkCache) event.world.getChunkSource()).chunkMap; - Iterable chunks = (Iterable) GET_LOADED_CHUNKS_METHOD.invoke(manager); - for (ChunkHolder holder : chunks) { - LevelChunk chunk = holder.getTickingChunk(); + var manager = ((ServerChunkCache) event.world.getChunkSource()).chunkMap; + var chunks = (Iterable) GET_LOADED_CHUNKS_METHOD.invoke(manager); + for (var holder : chunks) { + var chunk = holder.getTickingChunk(); if (chunk == null) continue; - AuraChunk auraChunk = (AuraChunk) chunk.getCapability(NaturesAuraAPI.capAuraChunk, null).orElse(null); + var auraChunk = (AuraChunk) chunk.getCapability(NaturesAuraAPI.capAuraChunk, null).orElse(null); if (auraChunk != null) auraChunk.update(); } @@ -130,14 +130,14 @@ public class CommonEvents { public void onPlayerTick(TickEvent.PlayerTickEvent event) { if (!event.player.level.isClientSide && event.phase == TickEvent.Phase.END) { if (event.player.level.getGameTime() % 10 == 0) { - List pending = PENDING_AURA_CHUNKS.get(event.player.getUUID()); + var pending = PENDING_AURA_CHUNKS.get(event.player.getUUID()); pending.removeIf(p -> this.handleChunkWatchDeferred(event.player, p)); } if (event.player.level.getGameTime() % 200 != 0) return; - int aura = IAuraChunk.triangulateAuraInArea(event.player.level, event.player.blockPosition(), 25); + var aura = IAuraChunk.triangulateAuraInArea(event.player.level, event.player.blockPosition(), 25); if (aura <= 0) Helper.addAdvancement(event.player, new ResourceLocation(NaturesAura.MOD_ID, "negative_imbalance"), "triggered_in_code"); else if (aura >= 1500000) @@ -151,10 +151,10 @@ public class CommonEvents { } private boolean handleChunkWatchDeferred(Player player, ChunkPos pos) { - LevelChunk chunk = Helper.getLoadedChunk(player.level, pos.x, pos.z); + var chunk = Helper.getLoadedChunk(player.level, pos.x, pos.z); if (chunk == null) return false; - AuraChunk auraChunk = (AuraChunk) chunk.getCapability(NaturesAuraAPI.capAuraChunk, null).orElse(null); + var auraChunk = (AuraChunk) chunk.getCapability(NaturesAuraAPI.capAuraChunk, null).orElse(null); if (auraChunk == null) return false; PacketHandler.sendTo(player, auraChunk.makePacket()); diff --git a/src/main/java/de/ellpeck/naturesaura/gen/LevelGenAncientTree.java b/src/main/java/de/ellpeck/naturesaura/gen/LevelGenAncientTree.java index 125d21a8..9e1bbe6e 100644 --- a/src/main/java/de/ellpeck/naturesaura/gen/LevelGenAncientTree.java +++ b/src/main/java/de/ellpeck/naturesaura/gen/LevelGenAncientTree.java @@ -29,19 +29,19 @@ public class LevelGenAncientTree extends Feature { var level = ctx.level(); var pos = ctx.origin(); var rand = ctx.random(); - int height = rand.nextInt(3) + 5; - BlockPos trunkTop = pos.above(height); + var height = rand.nextInt(3) + 5; + var trunkTop = pos.above(height); this.setBlock(level, pos, Blocks.AIR.defaultBlockState()); //Roots - int rootsAmount = rand.nextInt(4) + 5; - for (int i = 0; i < rootsAmount; i++) { - int length = rand.nextInt(3) + 3; - float angle = 2F * (float) Math.PI * (i / (float) rootsAmount); - float x = (float) Math.sin(angle) * length; - float z = (float) Math.cos(angle) * length; + var rootsAmount = rand.nextInt(4) + 5; + for (var i = 0; i < rootsAmount; i++) { + var length = rand.nextInt(3) + 3; + var angle = 2F * (float) Math.PI * (i / (float) rootsAmount); + var x = (float) Math.sin(angle) * length; + var z = (float) Math.cos(angle) * length; - BlockPos goal = pos.offset(x, 0, z); + var goal = pos.offset(x, 0, z); while (level.isStateAtPosition(goal, state -> state.getMaterial().isReplaceable())) { goal = goal.below(); if (goal.distSqr(pos) >= 10 * 10) @@ -51,10 +51,10 @@ public class LevelGenAncientTree extends Feature { } //Trunk - for (int x = 0; x <= 1; x++) { - for (int z = 0; z <= 1; z++) { - for (int i = height - (x + z) * (rand.nextInt(2) + 2); i >= 0; i--) { - BlockPos goal = pos.offset(x, i, z); + for (var x = 0; x <= 1; x++) { + for (var z = 0; z <= 1; z++) { + for (var i = height - (x + z) * (rand.nextInt(2) + 2); i >= 0; i--) { + var goal = pos.offset(x, i, z); if (!level.isStateAtPosition(goal, s -> !TreeFeature.validTreePos(level, goal))) { this.setBlock(level, goal, ModBlocks.ANCIENT_LOG.defaultBlockState().setValue(RotatedPillarBlock.AXIS, Axis.Y)); } @@ -64,14 +64,14 @@ public class LevelGenAncientTree extends Feature { this.makeLeaves(level, trunkTop.above(rand.nextInt(2) - 1), ModBlocks.ANCIENT_LEAVES.defaultBlockState(), rand.nextInt(2) + 3, rand); //Branches - int branchAmount = rand.nextInt(3) + 4; - for (int i = 0; i < branchAmount; i++) { - int length = rand.nextInt(2) + 3; - float angle = 2F * (float) Math.PI * (i / (float) branchAmount); - float x = (float) Math.sin(angle) * length; - float z = (float) Math.cos(angle) * length; + var branchAmount = rand.nextInt(3) + 4; + for (var i = 0; i < branchAmount; i++) { + var length = rand.nextInt(2) + 3; + var angle = 2F * (float) Math.PI * (i / (float) branchAmount); + var x = (float) Math.sin(angle) * length; + var z = (float) Math.cos(angle) * length; - BlockPos goal = trunkTop.offset(x, rand.nextInt(3) + 1, z); + var goal = trunkTop.offset(x, rand.nextInt(3) + 1, z); this.makeBranch(level, trunkTop, goal, ModBlocks.ANCIENT_LOG.defaultBlockState(), true); this.makeLeaves(level, goal, ModBlocks.ANCIENT_LEAVES.defaultBlockState(), rand.nextInt(2) + 2, rand); } @@ -80,17 +80,17 @@ public class LevelGenAncientTree extends Feature { } private void makeBranch(WorldGenLevel level, BlockPos first, BlockPos second, BlockState state, boolean hasAxis) { - BlockPos pos = second.offset(-first.getX(), -first.getY(), -first.getZ()); - int length = this.getHighestCoord(pos); - float stepX = (float) pos.getX() / (float) length; - float stepY = (float) pos.getY() / (float) length; - float stepZ = (float) pos.getZ() / (float) length; + var pos = second.offset(-first.getX(), -first.getY(), -first.getZ()); + var length = this.getHighestCoord(pos); + var stepX = (float) pos.getX() / (float) length; + var stepY = (float) pos.getY() / (float) length; + var stepZ = (float) pos.getZ() / (float) length; - for (int i = 0; i <= length; i++) { - BlockPos goal = first.offset(0.5F + i * stepX, 0.5F + i * stepY, 0.5F + i * stepZ); + for (var i = 0; i <= length; i++) { + var goal = first.offset(0.5F + i * stepX, 0.5F + i * stepY, 0.5F + i * stepZ); if (!level.isStateAtPosition(goal, s -> !TreeFeature.validTreePos(level, goal))) { if (hasAxis) { - Axis axis = this.getLogAxis(first, goal); + var axis = this.getLogAxis(first, goal); this.setBlock(level, goal, state.setValue(RotatedPillarBlock.AXIS, axis)); } else { this.setBlock(level, goal, state); @@ -100,10 +100,10 @@ public class LevelGenAncientTree extends Feature { } private void makeLeaves(WorldGenLevel level, BlockPos pos, BlockState state, int radius, Random rand) { - for (int x = -radius; x <= radius; x++) { - for (int y = -radius; y <= radius; y++) { - for (int z = -radius; z <= radius; z++) { - BlockPos goal = pos.offset(x, y, z); + for (var x = -radius; x <= radius; x++) { + for (var y = -radius; y <= radius; y++) { + for (var z = -radius; z <= radius; z++) { + var goal = pos.offset(x, y, z); if (pos.distSqr(goal) <= radius * radius + rand.nextInt(3) - 1) { if (!level.isStateAtPosition(goal, s -> s.getMaterial() == Material.LEAVES)) { if (level.isStateAtPosition(goal, st -> st.getMaterial() != Material.WOOD && st.getBlock() != Blocks.DIRT && st.getBlock() != Blocks.GRASS)) @@ -120,10 +120,10 @@ public class LevelGenAncientTree extends Feature { } private Axis getLogAxis(BlockPos pos, BlockPos goal) { - Axis axis = Axis.Y; - int x = Math.abs(goal.getX() - pos.getX()); - int y = Math.abs(goal.getZ() - pos.getZ()); - int highest = Math.max(x, y); + var axis = Axis.Y; + var x = Math.abs(goal.getX() - pos.getX()); + var y = Math.abs(goal.getZ() - pos.getZ()); + var highest = Math.max(x, y); if (highest > 0) { if (x == highest) { axis = Axis.X; diff --git a/src/main/java/de/ellpeck/naturesaura/gen/LevelGenAuraBloom.java b/src/main/java/de/ellpeck/naturesaura/gen/LevelGenAuraBloom.java index e3ba1ca8..77132b0c 100644 --- a/src/main/java/de/ellpeck/naturesaura/gen/LevelGenAuraBloom.java +++ b/src/main/java/de/ellpeck/naturesaura/gen/LevelGenAuraBloom.java @@ -34,15 +34,15 @@ public class LevelGenAuraBloom extends Feature { var rand = ctx.random(); if (rand.nextInt(this.chance) != 0) return false; - int startX = pos.getX() + rand.nextInt(16); - int startZ = pos.getZ() + rand.nextInt(16); - boolean any = false; - for (int i = Mth.nextInt(rand, 3, 8); i > 0; i--) { - int offX = startX + Mth.nextInt(rand, -5, 5); - int offZ = startZ + Mth.nextInt(rand, -5, 5); + var startX = pos.getX() + rand.nextInt(16); + var startZ = pos.getZ() + rand.nextInt(16); + var any = false; + for (var i = Mth.nextInt(rand, 3, 8); i > 0; i--) { + var offX = startX + Mth.nextInt(rand, -5, 5); + var offZ = startZ + Mth.nextInt(rand, -5, 5); if (this.nether) { - int y = Mth.nextInt(rand, 0, 128); - for (int off = 0; off < 64; off++) { + var y = Mth.nextInt(rand, 0, 128); + for (var off = 0; off < 64; off++) { // try to find a good location in both directions of the random pos if (this.tryPlace(levelIn, new BlockPos(offX, y - off, offZ)) || this.tryPlace(levelIn, new BlockPos(offX, y + off, offZ))) { any = true; @@ -50,7 +50,7 @@ public class LevelGenAuraBloom extends Feature { } } } else { - BlockPos placePos = new BlockPos(offX, levelIn.getHeight(Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, offX, offZ), offZ); + var placePos = new BlockPos(offX, levelIn.getHeight(Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, offX, offZ), offZ); if (this.tryPlace(levelIn, placePos)) any = true; } @@ -59,10 +59,10 @@ public class LevelGenAuraBloom extends Feature { } private boolean tryPlace(WorldGenLevel level, BlockPos pos) { - BlockState state = this.block.defaultBlockState(); + var state = this.block.defaultBlockState(); if (this.block.canSurvive(state, level, pos)) { level.setBlock(pos, state, 3); - BlockEntity tile = level.getBlockEntity(pos); + var tile = level.getBlockEntity(pos); if (tile instanceof BlockEntityAuraBloom bloom) bloom.justGenerated = true; return true; diff --git a/src/main/java/de/ellpeck/naturesaura/gen/LevelGenNetherWartMushroom.java b/src/main/java/de/ellpeck/naturesaura/gen/LevelGenNetherWartMushroom.java index 3eceaeb9..fe177dca 100644 --- a/src/main/java/de/ellpeck/naturesaura/gen/LevelGenNetherWartMushroom.java +++ b/src/main/java/de/ellpeck/naturesaura/gen/LevelGenNetherWartMushroom.java @@ -23,28 +23,28 @@ public class LevelGenNetherWartMushroom extends Feature !TreeFeature.validTreePos(levelIn, offset))) return false; } // Place stem this.setBlock(levelIn, pos, Blocks.AIR.defaultBlockState()); - for (int i = 0; i < height; i++) + for (var i = 0; i < height; i++) this.placeIfPossible(levelIn, pos.above(i), Blocks.NETHER_WART_BLOCK); // Place hat - int rad = 3; - for (int x = -rad; x <= rad; x++) { - for (int z = -rad; z <= rad; z++) { - int absX = Math.abs(x); - int absZ = Math.abs(z); + var rad = 3; + for (var x = -rad; x <= rad; x++) { + for (var z = -rad; z <= rad; z++) { + var absX = Math.abs(x); + var absZ = Math.abs(z); if (absX <= 1 && absZ <= 1) { this.placeIfPossible(levelIn, pos.offset(x, height, z), ModBlocks.NETHER_WART_MUSHROOM); } else if (absX <= 2 && absZ <= 2 && absX != absZ) { diff --git a/src/main/java/de/ellpeck/naturesaura/gui/ContainerEnderCrate.java b/src/main/java/de/ellpeck/naturesaura/gui/ContainerEnderCrate.java index 95a031f4..062f58dc 100644 --- a/src/main/java/de/ellpeck/naturesaura/gui/ContainerEnderCrate.java +++ b/src/main/java/de/ellpeck/naturesaura/gui/ContainerEnderCrate.java @@ -12,14 +12,14 @@ public class ContainerEnderCrate extends AbstractContainerMenu { public ContainerEnderCrate(MenuType type, int id, Player player, IItemHandler handler) { super(type, id); - int i = (3 - 4) * 18; - for (int j = 0; j < 3; ++j) - for (int k = 0; k < 9; ++k) + var i = (3 - 4) * 18; + for (var j = 0; j < 3; ++j) + for (var k = 0; k < 9; ++k) this.addSlot(new SlotItemHandler(handler, k + j * 9, 8 + k * 18, 18 + j * 18)); - for (int l = 0; l < 3; ++l) - for (int j1 = 0; j1 < 9; ++j1) + for (var l = 0; l < 3; ++l) + for (var j1 = 0; j1 < 9; ++j1) this.addSlot(new Slot(player.getInventory(), j1 + l * 9 + 9, 8 + j1 * 18, 103 + l * 18 + i)); - for (int i1 = 0; i1 < 9; ++i1) + for (var i1 = 0; i1 < 9; ++i1) this.addSlot(new Slot(player.getInventory(), i1, 8 + i1 * 18, 161 + i)); } @@ -30,11 +30,11 @@ public class ContainerEnderCrate extends AbstractContainerMenu { @Override public ItemStack quickMoveStack(Player player, int index) { - ItemStack itemstack = ItemStack.EMPTY; - Slot slot = this.slots.get(index); + var itemstack = ItemStack.EMPTY; + var slot = this.slots.get(index); if (slot != null && slot.hasItem()) { - ItemStack itemstack1 = slot.getItem(); + var itemstack1 = slot.getItem(); itemstack = itemstack1.copy(); if (index < 3 * 9) { diff --git a/src/main/java/de/ellpeck/naturesaura/gui/GuiEnderCrate.java b/src/main/java/de/ellpeck/naturesaura/gui/GuiEnderCrate.java index 10d09cd9..3d33ec57 100644 --- a/src/main/java/de/ellpeck/naturesaura/gui/GuiEnderCrate.java +++ b/src/main/java/de/ellpeck/naturesaura/gui/GuiEnderCrate.java @@ -37,8 +37,8 @@ public class GuiEnderCrate extends AbstractContainerScreen protected void renderBg(PoseStack matrixStack, float partialTicks, int mouseX, int mouseY) { RenderSystem.setShader(GameRenderer::getPositionTexShader); RenderSystem.setShaderTexture(0, CHEST_GUI_TEXTURE); - int i = (this.width - this.imageWidth) / 2; - int j = (this.height - this.imageHeight) / 2; + var i = (this.width - this.imageWidth) / 2; + var j = (this.height - this.imageHeight) / 2; this.blit(matrixStack, i, j, 0, 0, this.imageWidth, 3 * 18 + 17); this.blit(matrixStack, i, j + 3 * 18 + 17, 0, 126, this.imageHeight, 96); } diff --git a/src/main/java/de/ellpeck/naturesaura/items/ItemAuraCache.java b/src/main/java/de/ellpeck/naturesaura/items/ItemAuraCache.java index 9e4ca1df..079ac70a 100644 --- a/src/main/java/de/ellpeck/naturesaura/items/ItemAuraCache.java +++ b/src/main/java/de/ellpeck/naturesaura/items/ItemAuraCache.java @@ -45,19 +45,19 @@ public class ItemAuraCache extends ItemImpl implements ITrinketItem { public void inventoryTick(ItemStack stackIn, Level levelIn, Entity entityIn, int itemSlot, boolean isSelected) { if (!levelIn.isClientSide && entityIn instanceof Player player) { if (player.isCrouching() && stackIn.getCapability(NaturesAuraAPI.capAuraContainer).isPresent()) { - IAuraContainer container = stackIn.getCapability(NaturesAuraAPI.capAuraContainer).orElse(null); + var container = stackIn.getCapability(NaturesAuraAPI.capAuraContainer).orElse(null); if (container.getStoredAura() <= 0) { return; } - for (int i = 0; i < player.getInventory().getContainerSize(); i++) { - ItemStack stack = player.getInventory().getItem(i); - IAuraRecharge recharge = stack.getCapability(NaturesAuraAPI.capAuraRecharge).orElse(null); + for (var i = 0; i < player.getInventory().getContainerSize(); i++) { + var stack = player.getInventory().getItem(i); + var recharge = stack.getCapability(NaturesAuraAPI.capAuraRecharge).orElse(null); if (recharge != null) { if (recharge.rechargeFromContainer(container, itemSlot, i, player.getInventory().selected == i)) break; } else if (EnchantmentHelper.getItemEnchantmentLevel(ModEnchantments.AURA_MENDING, stack) > 0) { - int mainSize = player.getInventory().items.size(); - boolean isArmor = i >= mainSize && i < mainSize + player.getInventory().armor.size(); + var mainSize = player.getInventory().items.size(); + var isArmor = i >= mainSize && i < mainSize + player.getInventory().armor.size(); if ((isArmor || player.getInventory().selected == i) && Helper.rechargeAuraItem(stack, container, 1000)) break; } @@ -71,7 +71,7 @@ public class ItemAuraCache extends ItemImpl implements ITrinketItem { if (this.allowdedIn(tab)) { items.add(new ItemStack(this)); - ItemStack stack = new ItemStack(this); + var stack = new ItemStack(this); stack.getCapability(NaturesAuraAPI.capAuraContainer).ifPresent(container -> { container.storeAura(container.getMaxAura(), false); items.add(stack); @@ -87,7 +87,7 @@ public class ItemAuraCache extends ItemImpl implements ITrinketItem { @Override public int getBarColor(ItemStack stack) { if (stack.getCapability(NaturesAuraAPI.capAuraContainer).isPresent()) { - IAuraContainer container = stack.getCapability(NaturesAuraAPI.capAuraContainer).orElse(null); + var container = stack.getCapability(NaturesAuraAPI.capAuraContainer).orElse(null); return (int) (1 - container.getStoredAura() / (double) container.getMaxAura()); } return 0; @@ -115,8 +115,8 @@ public class ItemAuraCache extends ItemImpl implements ITrinketItem { @OnlyIn(Dist.CLIENT) public void render(ItemStack stack, Player player, RenderType type, PoseStack matrices, MultiBufferSource buffer, int packedLight, boolean isHolding) { if (type == RenderType.BODY && !isHolding) { - boolean chest = !player.getInventory().armor.get(EquipmentSlot.CHEST.getIndex()).isEmpty(); - boolean legs = !player.getInventory().armor.get(EquipmentSlot.LEGS.getIndex()).isEmpty(); + var chest = !player.getInventory().armor.get(EquipmentSlot.CHEST.getIndex()).isEmpty(); + var legs = !player.getInventory().armor.get(EquipmentSlot.LEGS.getIndex()).isEmpty(); matrices.translate(-0.15F, 0.65F, chest ? -0.195F : legs ? -0.165F : -0.1475F); matrices.scale(0.5F, 0.5F, 0.5F); matrices.mulPose(Vector3f.XP.rotationDegrees(180F)); diff --git a/src/main/java/de/ellpeck/naturesaura/items/ItemBirthSpirit.java b/src/main/java/de/ellpeck/naturesaura/items/ItemBirthSpirit.java index e2befe75..5353578a 100644 --- a/src/main/java/de/ellpeck/naturesaura/items/ItemBirthSpirit.java +++ b/src/main/java/de/ellpeck/naturesaura/items/ItemBirthSpirit.java @@ -22,16 +22,16 @@ public class ItemBirthSpirit extends ItemGlowing { public void onBabyBorn(BabyEntitySpawnEvent event) { LivingEntity parent = event.getParentA(); if (!parent.level.isClientSide && event.getCausedByPlayer() != null) { - BlockPos pos = parent.blockPosition(); - int aura = IAuraChunk.getAuraInArea(parent.level, pos, 30); + var pos = parent.blockPosition(); + var aura = IAuraChunk.getAuraInArea(parent.level, pos, 30); if (aura < 1200000) return; - int amount = parent.level.random.nextInt(3) + 1; - ItemEntity item = new ItemEntity(parent.level, parent.getX(), parent.getY(), parent.getZ(), new ItemStack(ModItems.BIRTH_SPIRIT, amount)); + var amount = parent.level.random.nextInt(3) + 1; + var item = new ItemEntity(parent.level, parent.getX(), parent.getY(), parent.getZ(), new ItemStack(ModItems.BIRTH_SPIRIT, amount)); parent.level.addFreshEntity(item); - BlockPos spot = IAuraChunk.getHighestSpot(parent.level, pos, 30, pos); + var spot = IAuraChunk.getHighestSpot(parent.level, pos, 30, pos); IAuraChunk.getAuraChunk(parent.level, spot).drainAura(spot, 800 * amount); } } diff --git a/src/main/java/de/ellpeck/naturesaura/items/ItemBreakPrevention.java b/src/main/java/de/ellpeck/naturesaura/items/ItemBreakPrevention.java index 03efd4f9..3a169163 100644 --- a/src/main/java/de/ellpeck/naturesaura/items/ItemBreakPrevention.java +++ b/src/main/java/de/ellpeck/naturesaura/items/ItemBreakPrevention.java @@ -30,13 +30,13 @@ public class ItemBreakPrevention extends ItemImpl { @SubscribeEvent public void onAnvilUpdate(AnvilUpdateEvent event) { - ItemStack stack = event.getLeft(); + var stack = event.getLeft(); if (!stack.isDamageableItem()) return; - ItemStack second = event.getRight(); + var second = event.getRight(); if (second.getItem() != ModItems.BREAK_PREVENTION) return; - ItemStack output = stack.copy(); + var output = stack.copy(); output.getOrCreateTag().putBoolean(NaturesAura.MOD_ID + ":break_prevention", true); event.setOutput(output); event.setMaterialCost(1); @@ -45,10 +45,10 @@ public class ItemBreakPrevention extends ItemImpl { @SubscribeEvent public void onBreakSpeed(PlayerEvent.BreakSpeed event) { - Player player = event.getPlayer(); + var player = event.getPlayer(); if (player == null) return; - ItemStack stack = player.getMainHandItem(); + var stack = player.getMainHandItem(); if (!stack.hasTag() || !stack.getTag().getBoolean(NaturesAura.MOD_ID + ":break_prevention")) return; if (ElytraItem.isFlyEnabled(stack)) @@ -59,16 +59,16 @@ public class ItemBreakPrevention extends ItemImpl { @SubscribeEvent @OnlyIn(Dist.CLIENT) public void onTooltip(ItemTooltipEvent event) { - ItemStack stack = event.getItemStack(); + var stack = event.getItemStack(); if (!stack.hasTag() || !stack.getTag().getBoolean(NaturesAura.MOD_ID + ":break_prevention")) return; - List tooltip = event.getToolTip(); + var tooltip = event.getToolTip(); tooltip.add(new TranslatableComponent("info." + NaturesAura.MOD_ID + ".break_prevention").setStyle(Style.EMPTY.applyFormat(ChatFormatting.GRAY))); if (ElytraItem.isFlyEnabled(stack)) return; if (tooltip.size() < 1) return; - Component head = tooltip.get(0); + var head = tooltip.get(0); if (head instanceof MutableComponent) ((MutableComponent) head).append(new TranslatableComponent("info." + NaturesAura.MOD_ID + ".broken").setStyle(Style.EMPTY.applyFormat(ChatFormatting.GRAY))); } diff --git a/src/main/java/de/ellpeck/naturesaura/items/ItemCaveFinder.java b/src/main/java/de/ellpeck/naturesaura/items/ItemCaveFinder.java index 9dfbda1e..41235820 100644 --- a/src/main/java/de/ellpeck/naturesaura/items/ItemCaveFinder.java +++ b/src/main/java/de/ellpeck/naturesaura/items/ItemCaveFinder.java @@ -20,21 +20,21 @@ public class ItemCaveFinder extends ItemImpl { @Override public InteractionResultHolder use(Level levelIn, Player playerIn, InteractionHand handIn) { - ItemStack stack = playerIn.getItemInHand(handIn); - NaturesAuraAPI.IInternalHooks inst = NaturesAuraAPI.instance(); + var stack = playerIn.getItemInHand(handIn); + var inst = NaturesAuraAPI.instance(); if (!inst.extractAuraFromPlayer(playerIn, 20000, levelIn.isClientSide)) return new InteractionResultHolder<>(InteractionResult.FAIL, stack); if (levelIn.isClientSide) { inst.setParticleDepth(false); inst.setParticleSpawnRange(64); inst.setParticleCulling(false); - BlockPos pos = playerIn.blockPosition(); - int range = 30; - for (int x = -range; x <= range; x++) - for (int y = -range; y <= range; y++) - for (int z = -range; z <= range; z++) { - BlockPos offset = pos.offset(x, y, z); - BlockState state = levelIn.getBlockState(offset); + var pos = playerIn.blockPosition(); + var range = 30; + for (var x = -range; x <= range; x++) + for (var y = -range; y <= range; y++) + for (var z = -range; z <= range; z++) { + var offset = pos.offset(x, y, z); + var state = levelIn.getBlockState(offset); try { if (!state.getBlock().isValidSpawn(state, levelIn, offset, SpawnPlacements.Type.ON_GROUND, null)) continue; @@ -42,13 +42,13 @@ public class ItemCaveFinder extends ItemImpl { continue; } - BlockPos offUp = offset.above(); - BlockState stateUp = levelIn.getBlockState(offUp); + var offUp = offset.above(); + var stateUp = levelIn.getBlockState(offUp); if (stateUp.isCollisionShapeFullBlock(levelIn, offUp) || stateUp.getMaterial().isLiquid()) continue; - int sky = levelIn.getBrightness(LightLayer.SKY, offUp); - int block = levelIn.getBrightness(LightLayer.BLOCK, offUp); + var sky = levelIn.getBrightness(LightLayer.SKY, offUp); + var block = levelIn.getBrightness(LightLayer.BLOCK, offUp); if (sky > 7 || block > 7) continue; diff --git a/src/main/java/de/ellpeck/naturesaura/items/ItemColorChanger.java b/src/main/java/de/ellpeck/naturesaura/items/ItemColorChanger.java index 2f2fe31c..d3d3cb8a 100644 --- a/src/main/java/de/ellpeck/naturesaura/items/ItemColorChanger.java +++ b/src/main/java/de/ellpeck/naturesaura/items/ItemColorChanger.java @@ -31,13 +31,13 @@ public class ItemColorChanger extends ItemImpl implements IColorProvidingItem, I } private static boolean changeOrCopyColor(Player player, ItemStack stack, Level level, BlockPos pos, DyeColor firstColor) { - Block block = level.getBlockState(pos).getBlock(); - List blocks = ColoredBlockHelper.getBlocksContaining(block); + var block = level.getBlockState(pos).getBlock(); + var blocks = ColoredBlockHelper.getBlocksContaining(block); if (blocks == null) return false; - DyeColor color = DyeColor.byId(blocks.indexOf(block)); + var color = DyeColor.byId(blocks.indexOf(block)); if (firstColor == null || color == firstColor) { - DyeColor stored = getStoredColor(stack); + var stored = getStoredColor(stack); if (player.isCrouching()) { if (stored != color) { level.playSound(player, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, @@ -57,7 +57,7 @@ public class ItemColorChanger extends ItemImpl implements IColorProvidingItem, I level.setBlockAndUpdate(pos, blocks.get(stored.getId()).defaultBlockState()); if (isFillMode(stack)) { - for (Direction off : Direction.values()) { + for (var off : Direction.values()) { changeOrCopyColor(player, stack, level, pos.relative(off), color); } } @@ -74,7 +74,7 @@ public class ItemColorChanger extends ItemImpl implements IColorProvidingItem, I if (!stack.hasTag()) { return null; } else { - int color = stack.getTag().getInt("color"); + var color = stack.getTag().getInt("color"); return DyeColor.byId(color); } } @@ -97,7 +97,7 @@ public class ItemColorChanger extends ItemImpl implements IColorProvidingItem, I @Override public InteractionResult useOn(UseOnContext context) { - ItemStack stack = context.getPlayer().getItemInHand(context.getHand()); + var stack = context.getPlayer().getItemInHand(context.getHand()); if (changeOrCopyColor(context.getPlayer(), stack, context.getLevel(), context.getClickedPos(), null)) { return InteractionResult.SUCCESS; } else { @@ -107,7 +107,7 @@ public class ItemColorChanger extends ItemImpl implements IColorProvidingItem, I @Override public InteractionResultHolder use(Level levelIn, Player playerIn, InteractionHand handIn) { - ItemStack stack = playerIn.getItemInHand(handIn); + var stack = playerIn.getItemInHand(handIn); if (playerIn.isCrouching() && getStoredColor(stack) != null) { levelIn.playSound(playerIn, playerIn.getX(), playerIn.getY(), playerIn.getZ(), SoundEvents.BUCKET_FILL_LAVA, SoundSource.PLAYERS, 0.65F, 1F); if (!levelIn.isClientSide) { @@ -124,7 +124,7 @@ public class ItemColorChanger extends ItemImpl implements IColorProvidingItem, I public ItemColor getItemColor() { return (stack, tintIndex) -> { if (tintIndex > 0) { - DyeColor color = getStoredColor(stack); + var color = getStoredColor(stack); if (color != null) { return color.getFireworkColor(); } diff --git a/src/main/java/de/ellpeck/naturesaura/items/ItemCrimsonMeal.java b/src/main/java/de/ellpeck/naturesaura/items/ItemCrimsonMeal.java index bab3075a..b52d1824 100644 --- a/src/main/java/de/ellpeck/naturesaura/items/ItemCrimsonMeal.java +++ b/src/main/java/de/ellpeck/naturesaura/items/ItemCrimsonMeal.java @@ -19,9 +19,9 @@ public class ItemCrimsonMeal extends ItemImpl { @Override public InteractionResult useOn(UseOnContext context) { - Level level = context.getLevel(); - BlockPos pos = context.getClickedPos(); - BlockState state = level.getBlockState(pos); + var level = context.getLevel(); + var pos = context.getClickedPos(); + var state = level.getBlockState(pos); if (state.getBlock() == Blocks.NETHER_WART) { if (!level.isClientSide) { if (level.random.nextInt(5) == 0) { @@ -38,8 +38,8 @@ public class ItemCrimsonMeal extends ItemImpl { return InteractionResult.SUCCESS; } else if (level.getBlockState(pos.above()).isAir() && level.getBlockState(pos).getBlock() == Blocks.SOUL_SAND) { if (!level.isClientSide) { - for (int i = level.random.nextInt(5); i >= 0; i--) { - BlockPos offset = pos.offset(Mth.nextInt(level.random, -3, 3), 1, Mth.nextInt(level.random, -3, 3)); + for (var i = level.random.nextInt(5); i >= 0; i--) { + var offset = pos.offset(Mth.nextInt(level.random, -3, 3), 1, Mth.nextInt(level.random, -3, 3)); if (level.getBlockState(offset.below()).getBlock() == Blocks.SOUL_SAND && level.getBlockState(offset).isAir()) { level.setBlockAndUpdate(offset, Blocks.NETHER_WART.defaultBlockState()); } diff --git a/src/main/java/de/ellpeck/naturesaura/items/ItemDeathRing.java b/src/main/java/de/ellpeck/naturesaura/items/ItemDeathRing.java index e06b8f09..ab949f51 100644 --- a/src/main/java/de/ellpeck/naturesaura/items/ItemDeathRing.java +++ b/src/main/java/de/ellpeck/naturesaura/items/ItemDeathRing.java @@ -24,15 +24,15 @@ public class ItemDeathRing extends ItemImpl { @SubscribeEvent public void onDeath(LivingDeathEvent event) { - LivingEntity entity = event.getEntityLiving(); + var entity = event.getEntityLiving(); if (!entity.level.isClientSide && entity instanceof Player) { - ItemStack equipped = Helper.getEquippedItem(s -> s.getItem() == ModItems.DEATH_RING, (Player) entity); + var equipped = Helper.getEquippedItem(s -> s.getItem() == ModItems.DEATH_RING, (Player) entity); if (!equipped.isEmpty()) { entity.setHealth(entity.getMaxHealth() / 2); entity.removeAllEffects(); entity.addEffect(new MobEffectInstance(MobEffects.REGENERATION, 500, 1)); - CompoundTag data = new CompoundTag(); + var data = new CompoundTag(); data.putInt("id", entity.getId()); PacketHandler.sendToAllAround(entity.level, entity.blockPosition(), 32, new PacketClient(1, data)); diff --git a/src/main/java/de/ellpeck/naturesaura/items/ItemEffectPowder.java b/src/main/java/de/ellpeck/naturesaura/items/ItemEffectPowder.java index 3f26973b..c77348ef 100644 --- a/src/main/java/de/ellpeck/naturesaura/items/ItemEffectPowder.java +++ b/src/main/java/de/ellpeck/naturesaura/items/ItemEffectPowder.java @@ -26,7 +26,7 @@ public class ItemEffectPowder extends ItemImpl implements IColorProvidingItem { public static ResourceLocation getEffect(ItemStack stack) { if (!stack.hasTag()) return null; - String effect = stack.getTag().getString("effect"); + var effect = stack.getTag().getString("effect"); if (effect.isEmpty()) return null; return new ResourceLocation(effect); @@ -39,10 +39,10 @@ public class ItemEffectPowder extends ItemImpl implements IColorProvidingItem { @Override public InteractionResult useOn(UseOnContext context) { - Level level = context.getLevel(); + var level = context.getLevel(); if (!level.isClientSide) { - Vec3 hit = context.getClickLocation(); - ItemStack stack = context.getPlayer().getItemInHand(context.getHand()); + var hit = context.getClickLocation(); + var stack = context.getPlayer().getItemInHand(context.getHand()); EntityEffectInhibitor.place(level, stack, hit.x, hit.y + 1, hit.z); stack.setCount(0); } @@ -52,8 +52,8 @@ public class ItemEffectPowder extends ItemImpl implements IColorProvidingItem { @Override public void fillItemCategory(CreativeModeTab tab, NonNullList items) { if (this.allowdedIn(tab)) { - for (ResourceLocation effect : NaturesAuraAPI.EFFECT_POWDERS.keySet()) { - ItemStack stack = new ItemStack(this); + for (var effect : NaturesAuraAPI.EFFECT_POWDERS.keySet()) { + var stack = new ItemStack(this); setEffect(stack, effect); items.add(stack); } diff --git a/src/main/java/de/ellpeck/naturesaura/items/ItemEnderAccess.java b/src/main/java/de/ellpeck/naturesaura/items/ItemEnderAccess.java index ae7b697d..0f0dc1b7 100644 --- a/src/main/java/de/ellpeck/naturesaura/items/ItemEnderAccess.java +++ b/src/main/java/de/ellpeck/naturesaura/items/ItemEnderAccess.java @@ -39,8 +39,8 @@ public class ItemEnderAccess extends ItemImpl { public InteractionResultHolder use(Level levelIn, Player playerIn, InteractionHand handIn) { if (handIn != InteractionHand.MAIN_HAND) return new InteractionResultHolder<>(InteractionResult.PASS, playerIn.getItemInHand(handIn)); - ItemStack stack = playerIn.getMainHandItem(); - String name = BlockEnderCrate.getEnderName(stack); + var stack = playerIn.getMainHandItem(); + var name = BlockEnderCrate.getEnderName(stack); if (!Strings.isNullOrEmpty(name)) { if (!levelIn.isClientSide && NaturesAuraAPI.instance().extractAuraFromPlayer(playerIn, 10000, false)) { NetworkHooks.openGui((ServerPlayer) playerIn, new MenuProvider() { diff --git a/src/main/java/de/ellpeck/naturesaura/items/ItemEye.java b/src/main/java/de/ellpeck/naturesaura/items/ItemEye.java index 5d0ea23c..1f376732 100644 --- a/src/main/java/de/ellpeck/naturesaura/items/ItemEye.java +++ b/src/main/java/de/ellpeck/naturesaura/items/ItemEye.java @@ -23,7 +23,7 @@ public class ItemEye extends ItemImpl implements ITrinketItem { @OnlyIn(Dist.CLIENT) public void render(ItemStack stack, Player player, RenderType type, PoseStack matrices, MultiBufferSource buffer, int packedLight, boolean isHolding) { if (type == RenderType.BODY && !isHolding) { - boolean armor = !player.getInventory().armor.get(EquipmentSlot.CHEST.getIndex()).isEmpty(); + var armor = !player.getInventory().armor.get(EquipmentSlot.CHEST.getIndex()).isEmpty(); matrices.translate(0.1F, 0.225F, armor ? -0.195F : -0.1475F); matrices.scale(0.3F, 0.3F, 0.3F); matrices.mulPose(Vector3f.XP.rotationDegrees(180)); diff --git a/src/main/java/de/ellpeck/naturesaura/items/ItemGoldFiber.java b/src/main/java/de/ellpeck/naturesaura/items/ItemGoldFiber.java index 369a3c67..9c1b8be5 100644 --- a/src/main/java/de/ellpeck/naturesaura/items/ItemGoldFiber.java +++ b/src/main/java/de/ellpeck/naturesaura/items/ItemGoldFiber.java @@ -20,7 +20,7 @@ public class ItemGoldFiber extends ItemImpl implements IColorProvidingItem { @Override public InteractionResult useOn(UseOnContext context) { - ItemStack stack = context.getPlayer().getItemInHand(context.getHand()); + var stack = context.getPlayer().getItemInHand(context.getHand()); if (BlockGoldenLeaves.convert(context.getLevel(), context.getClickedPos())) { if (!context.getLevel().isClientSide) { stack.shrink(1); diff --git a/src/main/java/de/ellpeck/naturesaura/items/ItemLightStaff.java b/src/main/java/de/ellpeck/naturesaura/items/ItemLightStaff.java index e2f68ba9..68c921ac 100644 --- a/src/main/java/de/ellpeck/naturesaura/items/ItemLightStaff.java +++ b/src/main/java/de/ellpeck/naturesaura/items/ItemLightStaff.java @@ -18,9 +18,9 @@ public class ItemLightStaff extends ItemImpl { @Override public InteractionResultHolder use(Level levelIn, Player playerIn, InteractionHand handIn) { - ItemStack stack = playerIn.getItemInHand(handIn); + var stack = playerIn.getItemInHand(handIn); if (!levelIn.isClientSide && NaturesAuraAPI.instance().extractAuraFromPlayer(playerIn, 1000, false)) { - EntityLightProjectile projectile = new EntityLightProjectile(ModEntities.LIGHT_PROJECTILE, playerIn, levelIn); + var projectile = new EntityLightProjectile(ModEntities.LIGHT_PROJECTILE, playerIn, levelIn); projectile.shootFromRotation(playerIn, playerIn.getXRot(), playerIn.getYRot(), 0, 1.5F, 0); levelIn.addFreshEntity(projectile); } diff --git a/src/main/java/de/ellpeck/naturesaura/items/ItemLootFinder.java b/src/main/java/de/ellpeck/naturesaura/items/ItemLootFinder.java index 93f296d0..43255a38 100644 --- a/src/main/java/de/ellpeck/naturesaura/items/ItemLootFinder.java +++ b/src/main/java/de/ellpeck/naturesaura/items/ItemLootFinder.java @@ -23,8 +23,8 @@ public class ItemLootFinder extends ItemImpl { @Override public InteractionResultHolder use(Level levelIn, Player playerIn, InteractionHand handIn) { - ItemStack stack = playerIn.getItemInHand(handIn); - NaturesAuraAPI.IInternalHooks inst = NaturesAuraAPI.instance(); + var stack = playerIn.getItemInHand(handIn); + var inst = NaturesAuraAPI.instance(); if (!inst.extractAuraFromPlayer(playerIn, 100000, false)) return new InteractionResultHolder<>(InteractionResult.FAIL, stack); if (levelIn.isClientSide) { @@ -32,7 +32,7 @@ public class ItemLootFinder extends ItemImpl { inst.setParticleSpawnRange(64); inst.setParticleCulling(false); - BlockPos pos = playerIn.blockPosition(); + var pos = playerIn.blockPosition(); Helper.getBlockEntitiesInArea(levelIn, pos, 64, tile -> { if (tile.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY).isPresent() || tile instanceof SpawnerBlockEntity) { inst.spawnMagicParticle( @@ -41,7 +41,7 @@ public class ItemLootFinder extends ItemImpl { } return false; }); - for (Entity entity : levelIn.getEntitiesOfClass(Entity.class, new AABB(pos).inflate(64))) { + for (var entity : levelIn.getEntitiesOfClass(Entity.class, new AABB(pos).inflate(64))) { if (!(entity instanceof LivingEntity) && entity.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY).isPresent()) { inst.spawnMagicParticle( entity.getX(), entity.getEyeY(), entity.getZ(), diff --git a/src/main/java/de/ellpeck/naturesaura/items/ItemMoverMinecart.java b/src/main/java/de/ellpeck/naturesaura/items/ItemMoverMinecart.java index 310c62c4..c8a055b2 100644 --- a/src/main/java/de/ellpeck/naturesaura/items/ItemMoverMinecart.java +++ b/src/main/java/de/ellpeck/naturesaura/items/ItemMoverMinecart.java @@ -20,8 +20,8 @@ public class ItemMoverMinecart extends ItemImpl { @Nonnull @Override public InteractionResult useOn(UseOnContext context) { - Level level = context.getLevel(); - BlockPos pos = context.getClickedPos(); + var level = context.getLevel(); + var pos = context.getClickedPos(); if (BaseRailBlock.isRail(level.getBlockState(pos))) { if (!level.isClientSide) { AbstractMinecart cart = new EntityMoverMinecart(ModEntities.MOVER_CART, level, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5); diff --git a/src/main/java/de/ellpeck/naturesaura/items/ItemMultiblockMaker.java b/src/main/java/de/ellpeck/naturesaura/items/ItemMultiblockMaker.java index 25c786f2..d558871f 100644 --- a/src/main/java/de/ellpeck/naturesaura/items/ItemMultiblockMaker.java +++ b/src/main/java/de/ellpeck/naturesaura/items/ItemMultiblockMaker.java @@ -39,10 +39,10 @@ public class ItemMultiblockMaker extends ItemImpl { @Override public InteractionResultHolder use(Level levelIn, Player playerIn, InteractionHand handIn) { - ItemStack stack = playerIn.getItemInHand(handIn); + var stack = playerIn.getItemInHand(handIn); if (!levelIn.isClientSide && playerIn.isCreative()) { - int curr = getMultiblock(stack); - int next = (curr + 1) % multiblocks().size(); + var curr = getMultiblock(stack); + var next = (curr + 1) % multiblocks().size(); stack.getOrCreateTag().putInt("multiblock", next); } return new InteractionResultHolder<>(InteractionResult.SUCCESS, stack); @@ -50,12 +50,12 @@ public class ItemMultiblockMaker extends ItemImpl { @Override public InteractionResult useOn(UseOnContext context) { - Player player = context.getPlayer(); + var player = context.getPlayer(); if (player.isCreative()) { - int id = getMultiblock(player.getItemInHand(context.getHand())); + var id = getMultiblock(player.getItemInHand(context.getHand())); if (id < 0) return InteractionResult.PASS; - IMultiblock multi = multiblocks().get(id); + var multi = multiblocks().get(id); if (multi == null) return InteractionResult.PASS; @@ -72,11 +72,11 @@ public class ItemMultiblockMaker extends ItemImpl { @Override public Component getName(ItemStack stack) { - MutableComponent name = (MutableComponent) super.getName(stack); - int id = getMultiblock(stack); + var name = (MutableComponent) super.getName(stack); + var id = getMultiblock(stack); if (id < 0) return name; - IMultiblock multi = multiblocks().get(id); + var multi = multiblocks().get(id); return multi == null ? name : name.append(" (" + multi.getName() + ")"); } diff --git a/src/main/java/de/ellpeck/naturesaura/items/ItemNetheriteFinder.java b/src/main/java/de/ellpeck/naturesaura/items/ItemNetheriteFinder.java index 9a977f01..57a59df0 100644 --- a/src/main/java/de/ellpeck/naturesaura/items/ItemNetheriteFinder.java +++ b/src/main/java/de/ellpeck/naturesaura/items/ItemNetheriteFinder.java @@ -19,8 +19,8 @@ public class ItemNetheriteFinder extends ItemImpl { @Override public InteractionResultHolder use(Level levelIn, Player playerIn, InteractionHand handIn) { - ItemStack stack = playerIn.getItemInHand(handIn); - NaturesAuraAPI.IInternalHooks inst = NaturesAuraAPI.instance(); + var stack = playerIn.getItemInHand(handIn); + var inst = NaturesAuraAPI.instance(); if (!inst.extractAuraFromPlayer(playerIn, 200000, false)) return new InteractionResultHolder<>(InteractionResult.FAIL, stack); if (levelIn.isClientSide) { @@ -28,13 +28,13 @@ public class ItemNetheriteFinder extends ItemImpl { inst.setParticleSpawnRange(64); inst.setParticleCulling(false); - BlockPos pos = playerIn.blockPosition(); - int range = 12; - for (int x = -range; x <= range; x++) { - for (int y = 0; y <= 128; y++) { - for (int z = -range; z <= range; z++) { - BlockPos offset = new BlockPos(pos.getX() + x, y, pos.getZ() + z); - BlockState state = levelIn.getBlockState(offset); + var pos = playerIn.blockPosition(); + var range = 12; + for (var x = -range; x <= range; x++) { + for (var y = 0; y <= 128; y++) { + for (var z = -range; z <= range; z++) { + var offset = new BlockPos(pos.getX() + x, y, pos.getZ() + z); + var state = levelIn.getBlockState(offset); if (state.getBlock() == Blocks.ANCIENT_DEBRIS || state.getBlock().getRegistryName().toString().contains("netherite")) { inst.spawnMagicParticle( offset.getX() + 0.5F, offset.getY() + 0.5F, offset.getZ() + 0.5F, diff --git a/src/main/java/de/ellpeck/naturesaura/items/ItemPetReviver.java b/src/main/java/de/ellpeck/naturesaura/items/ItemPetReviver.java index 796b242e..9db89e55 100644 --- a/src/main/java/de/ellpeck/naturesaura/items/ItemPetReviver.java +++ b/src/main/java/de/ellpeck/naturesaura/items/ItemPetReviver.java @@ -38,12 +38,12 @@ public class ItemPetReviver extends ItemImpl { @SubscribeEvent public void onEntityTick(LivingEvent.LivingUpdateEvent event) { - LivingEntity entity = event.getEntityLiving(); + var entity = event.getEntityLiving(); if (entity.level.isClientSide || entity.level.getGameTime() % 20 != 0 || !(entity instanceof TamableAnimal tameable)) return; if (!tameable.isTame() || !tameable.getPersistentData().getBoolean(NaturesAura.MOD_ID + ":pet_reviver")) return; - LivingEntity owner = tameable.getOwner(); + var owner = tameable.getOwner(); if (owner == null || owner.distanceToSqr(tameable) > 5 * 5) return; if (entity.level.random.nextFloat() >= 0.65F) { @@ -58,12 +58,12 @@ public class ItemPetReviver extends ItemImpl { // we need to use the event since the item doesn't receive the interaction for tamed pets... @SubscribeEvent public void onEntityInteract(PlayerInteractEvent.EntityInteractSpecific event) { - Entity target = event.getTarget(); + var target = event.getTarget(); if (!(target instanceof TamableAnimal) || !((TamableAnimal) target).isTame()) return; if (target.getPersistentData().getBoolean(NaturesAura.MOD_ID + ":pet_reviver")) return; - ItemStack stack = event.getPlayer().getItemInHand(event.getHand()); + var stack = event.getPlayer().getItemInHand(event.getHand()); if (stack.getItem() != ModItems.PET_REVIVER) return; target.getPersistentData().putBoolean(NaturesAura.MOD_ID + ":pet_reviver", true); @@ -76,24 +76,24 @@ public class ItemPetReviver extends ItemImpl { // we want to be sure that the pet is really dying, so we want to receive the event last @SubscribeEvent(priority = EventPriority.LOWEST) public void onLivingDeath(LivingDeathEvent event) { - LivingEntity entity = event.getEntityLiving(); + var entity = event.getEntityLiving(); if (entity.level.isClientSide || !(entity instanceof TamableAnimal tameable)) return; if (!tameable.isTame() || !tameable.getPersistentData().getBoolean(NaturesAura.MOD_ID + ":pet_reviver")) return; // get the overworld, and the overworld's spawn point, by default - ServerLevel spawnLevel = tameable.level.getServer().overworld(); - Vec3 spawn = Vec3.atBottomCenterOf(spawnLevel.getSharedSpawnPos()); + var spawnLevel = tameable.level.getServer().overworld(); + var spawn = Vec3.atBottomCenterOf(spawnLevel.getSharedSpawnPos()); // check if the owner is online, and respawn at the bed if they are - LivingEntity owner = tameable.getOwner(); + var owner = tameable.getOwner(); if (owner instanceof ServerPlayer player) { - BlockPos pos = player.getRespawnPosition(); + var pos = player.getRespawnPosition(); if (pos != null) { - float f = player.getRespawnAngle(); - boolean b = player.isRespawnForced(); - Optional bed = Player.findRespawnPositionAndUseSpawnBlock((ServerLevel) player.level, pos, f, b, false); + var f = player.getRespawnAngle(); + var b = player.isRespawnForced(); + var bed = Player.findRespawnPositionAndUseSpawnBlock((ServerLevel) player.level, pos, f, b, false); if (bed.isPresent()) { spawnLevel = (ServerLevel) player.level; spawn = bed.get(); @@ -103,7 +103,7 @@ public class ItemPetReviver extends ItemImpl { PacketHandler.sendToAllAround(tameable.level, tameable.blockPosition(), 32, new PacketParticles((float) tameable.getX(), (float) tameable.getEyeY(), (float) tameable.getZ(), PacketParticles.Type.PET_REVIVER, 0xc2461d)); - TamableAnimal spawnedPet = tameable; + var spawnedPet = tameable; if (tameable.level != spawnLevel) { ((ServerLevel) tameable.level).removeEntity(tameable, true); spawnedPet = (TamableAnimal) tameable.getType().create(spawnLevel); @@ -126,7 +126,7 @@ public class ItemPetReviver extends ItemImpl { } // drain aura - BlockPos auraPos = IAuraChunk.getHighestSpot(spawnLevel, spawnedPet.blockPosition(), 35, spawnedPet.blockPosition()); + var auraPos = IAuraChunk.getHighestSpot(spawnLevel, spawnedPet.blockPosition(), 35, spawnedPet.blockPosition()); IAuraChunk.getAuraChunk(spawnLevel, auraPos).drainAura(auraPos, 200000); PacketHandler.sendToAllAround(spawnedPet.level, spawnedPet.blockPosition(), 32, new PacketParticles((float) spawnedPet.getX(), (float) spawnedPet.getEyeY(), (float) spawnedPet.getZ(), PacketParticles.Type.PET_REVIVER, 0x4dba2f)); diff --git a/src/main/java/de/ellpeck/naturesaura/items/ItemRangeVisualizer.java b/src/main/java/de/ellpeck/naturesaura/items/ItemRangeVisualizer.java index 82b35363..ae1d196d 100644 --- a/src/main/java/de/ellpeck/naturesaura/items/ItemRangeVisualizer.java +++ b/src/main/java/de/ellpeck/naturesaura/items/ItemRangeVisualizer.java @@ -53,7 +53,7 @@ public class ItemRangeVisualizer extends ItemImpl { @Override public InteractionResultHolder use(Level levelIn, Player playerIn, InteractionHand handIn) { - ItemStack stack = playerIn.getItemInHand(handIn); + var stack = playerIn.getItemInHand(handIn); if (playerIn.isCrouching()) { clear(); playerIn.displayClientMessage(new TranslatableComponent("info." + NaturesAura.MOD_ID + ".range_visualizer.end_all"), true); @@ -64,10 +64,10 @@ public class ItemRangeVisualizer extends ItemImpl { @Override public InteractionResult useOn(UseOnContext context) { - Level level = context.getLevel(); - BlockPos pos = context.getClickedPos(); - BlockState state = level.getBlockState(pos); - Block block = state.getBlock(); + var level = context.getLevel(); + var pos = context.getClickedPos(); + var state = level.getBlockState(pos); + var block = state.getBlock(); if (block instanceof IVisualizable) { if (level.isClientSide) visualize(context.getPlayer(), VISUALIZED_BLOCKS, level.dimension().location(), pos); @@ -80,13 +80,13 @@ public class ItemRangeVisualizer extends ItemImpl { @SubscribeEvent public void onInteract(PlayerInteractEvent.EntityInteractSpecific event) { - ItemStack stack = event.getItemStack(); + var stack = event.getItemStack(); if (stack.isEmpty() || stack.getItem() != ItemRangeVisualizer.this) return; - Entity entity = event.getTarget(); + var entity = event.getTarget(); if (entity instanceof IVisualizable) { if (entity.level.isClientSide) { - ResourceLocation dim = entity.level.dimension().location(); + var dim = entity.level.dimension().location(); visualize(event.getPlayer(), VISUALIZED_ENTITIES, dim, entity); } event.getPlayer().swing(event.getHand()); diff --git a/src/main/java/de/ellpeck/naturesaura/items/ItemShockwaveCreator.java b/src/main/java/de/ellpeck/naturesaura/items/ItemShockwaveCreator.java index 09d7ad96..84d73d90 100644 --- a/src/main/java/de/ellpeck/naturesaura/items/ItemShockwaveCreator.java +++ b/src/main/java/de/ellpeck/naturesaura/items/ItemShockwaveCreator.java @@ -44,7 +44,7 @@ public class ItemShockwaveCreator extends ItemImpl implements ITrinketItem { if (levelIn.isClientSide || !(entityIn instanceof LivingEntity living)) return; if (!living.isOnGround()) { - CompoundTag compound = stack.getOrCreateTag(); + var compound = stack.getOrCreateTag(); if (compound.getBoolean("air")) return; @@ -55,7 +55,7 @@ public class ItemShockwaveCreator extends ItemImpl implements ITrinketItem { } else { if (!stack.hasTag()) return; - CompoundTag compound = stack.getTag(); + var compound = stack.getTag(); if (!compound.getBoolean("air")) return; @@ -73,13 +73,13 @@ public class ItemShockwaveCreator extends ItemImpl implements ITrinketItem { source = DamageSource.playerAttack((Player) living); else source = DamageSource.MAGIC; - boolean infusedSet = ItemArmor.isFullSetEquipped(living, ModArmorMaterial.INFUSED); + var infusedSet = ItemArmor.isFullSetEquipped(living, ModArmorMaterial.INFUSED); - int range = 5; - List mobs = levelIn.getEntitiesOfClass(LivingEntity.class, new AABB( + var range = 5; + var mobs = levelIn.getEntitiesOfClass(LivingEntity.class, new AABB( living.getX() - range, living.getY() - 0.5, living.getZ() - range, living.getX() + range, living.getY() + 0.5, living.getZ() + range)); - for (LivingEntity mob : mobs) { + for (var mob : mobs) { if (!mob.isAlive() || mob == living) continue; if (living.distanceToSqr(mob) > range * range) @@ -92,12 +92,12 @@ public class ItemShockwaveCreator extends ItemImpl implements ITrinketItem { mob.addEffect(new MobEffectInstance(MobEffects.WITHER, 120)); } - BlockPos pos = living.blockPosition(); - BlockPos down = pos.below(); - BlockState downState = levelIn.getBlockState(down); + var pos = living.blockPosition(); + var down = pos.below(); + var downState = levelIn.getBlockState(down); if (downState.getMaterial() != Material.AIR) { - SoundType type = downState.getBlock().getSoundType(downState, levelIn, down, null); + var type = downState.getBlock().getSoundType(downState, levelIn, down, null); levelIn.playSound(null, pos, type.getBreakSound(), SoundSource.BLOCKS, type.getVolume() * 0.5F, type.getPitch() * 0.8F); } @@ -109,7 +109,7 @@ public class ItemShockwaveCreator extends ItemImpl implements ITrinketItem { @OnlyIn(Dist.CLIENT) public void render(ItemStack stack, Player player, RenderType type, PoseStack matrices, MultiBufferSource buffer, int packedLight, boolean isHolding) { if (type == RenderType.BODY && !isHolding) { - boolean armor = !player.getInventory().armor.get(EquipmentSlot.CHEST.getIndex()).isEmpty(); + var armor = !player.getInventory().armor.get(EquipmentSlot.CHEST.getIndex()).isEmpty(); matrices.translate(0, 0.125F, armor ? -0.195F : -0.1475F); matrices.scale(0.3F, 0.3F, 0.3F); matrices.mulPose(Vector3f.XP.rotationDegrees(180)); diff --git a/src/main/java/de/ellpeck/naturesaura/items/ItemStructureFinder.java b/src/main/java/de/ellpeck/naturesaura/items/ItemStructureFinder.java index 552f07dd..b3cd6e0e 100644 --- a/src/main/java/de/ellpeck/naturesaura/items/ItemStructureFinder.java +++ b/src/main/java/de/ellpeck/naturesaura/items/ItemStructureFinder.java @@ -27,11 +27,11 @@ public class ItemStructureFinder extends ItemImpl { @Override public InteractionResultHolder use(Level levelIn, Player playerIn, InteractionHand handIn) { - ItemStack stack = playerIn.getItemInHand(handIn); + var stack = playerIn.getItemInHand(handIn); if (!levelIn.isClientSide && ((ServerLevel) levelIn).structureFeatureManager().shouldGenerateFeatures()) { - BlockPos pos = ((ServerLevel) levelIn).getChunkSource().getGenerator().findNearestMapFeature((ServerLevel) levelIn, this.structureName, playerIn.blockPosition(), this.radius, false); + var pos = ((ServerLevel) levelIn).getChunkSource().getGenerator().findNearestMapFeature((ServerLevel) levelIn, this.structureName, playerIn.blockPosition(), this.radius, false); if (pos != null) { - EntityStructureFinder entity = new EntityStructureFinder(ModEntities.STRUCTURE_FINDER, levelIn); + var entity = new EntityStructureFinder(ModEntities.STRUCTURE_FINDER, levelIn); entity.setPos(playerIn.getX(), playerIn.getY(0.5D), playerIn.getZ()); entity.setItem(stack); entity.getEntityData().set(EntityStructureFinder.COLOR, this.color); diff --git a/src/main/java/de/ellpeck/naturesaura/items/tools/ItemHoe.java b/src/main/java/de/ellpeck/naturesaura/items/tools/ItemHoe.java index 4d5f0e75..acc90b34 100644 --- a/src/main/java/de/ellpeck/naturesaura/items/tools/ItemHoe.java +++ b/src/main/java/de/ellpeck/naturesaura/items/tools/ItemHoe.java @@ -39,16 +39,16 @@ public class ItemHoe extends HoeItem implements IModItem, ICustomItemModel { @Override public InteractionResult useOn(UseOnContext context) { if (this == ModItems.INFUSED_IRON_HOE) { - Level level = context.getLevel(); - InteractionResult result = super.useOn(context); + var level = context.getLevel(); + var result = super.useOn(context); if (!level.isClientSide && result.consumesAction()) { - ItemStack seed = ItemStack.EMPTY; - Random random = level.getRandom(); - BlockPos pos = context.getClickedPos(); + var seed = ItemStack.EMPTY; + var random = level.getRandom(); + var pos = context.getClickedPos(); if (random.nextInt(5) == 0) { seed = new ItemStack(Items.WHEAT_SEEDS); } else if (random.nextInt(10) == 0) { - int rand = random.nextInt(3); + var rand = random.nextInt(3); if (rand == 0) { seed = new ItemStack(Items.MELON_SEEDS); } else if (rand == 1) { @@ -59,18 +59,18 @@ public class ItemHoe extends HoeItem implements IModItem, ICustomItemModel { } if (!seed.isEmpty()) { - ItemEntity item = new ItemEntity(level, pos.getX() + random.nextFloat(), pos.getY() + 1F, pos.getZ() + random.nextFloat(), seed); + var item = new ItemEntity(level, pos.getX() + random.nextFloat(), pos.getY() + 1F, pos.getZ() + random.nextFloat(), seed); level.addFreshEntity(item); } } return result; } else if (this == ModItems.SKY_HOE) { - boolean success = false; - for (int x = -1; x <= 1; x++) { - for (int z = -1; z <= 1; z++) { - BlockPos offset = context.getClickedPos().offset(x, 0, z); - BlockHitResult newResult = new BlockHitResult(context.getClickLocation(), context.getClickedFace(), offset, context.isInside()); - UseOnContext newContext = new UseOnContext(context.getPlayer(), context.getHand(), newResult); + var success = false; + for (var x = -1; x <= 1; x++) { + for (var z = -1; z <= 1; z++) { + var offset = context.getClickedPos().offset(x, 0, z); + var newResult = new BlockHitResult(context.getClickLocation(), context.getClickedFace(), offset, context.isInside()); + var newContext = new UseOnContext(context.getPlayer(), context.getHand(), newResult); success |= super.useOn(newContext) == InteractionResult.SUCCESS; } } @@ -85,14 +85,14 @@ public class ItemHoe extends HoeItem implements IModItem, ICustomItemModel { if (!(player.level.getBlockState(pos).getBlock() instanceof BushBlock)) return false; if (!player.level.isClientSide) { - int range = 3; - for (int x = -range; x <= range; x++) { - for (int y = -range; y <= range; y++) { - for (int z = -range; z <= range; z++) { + var range = 3; + for (var x = -range; x <= range; x++) { + for (var y = -range; y <= range; y++) { + for (var z = -range; z <= range; z++) { if (x == 0 && y == 0 && z == 0) continue; - BlockPos offset = pos.offset(x, y, z); - BlockState otherState = player.level.getBlockState(offset); + var offset = pos.offset(x, y, z); + var otherState = player.level.getBlockState(offset); if (otherState.getBlock() instanceof BushBlock) player.level.destroyBlock(offset, true); } diff --git a/src/main/java/de/ellpeck/naturesaura/items/tools/ItemPickaxe.java b/src/main/java/de/ellpeck/naturesaura/items/tools/ItemPickaxe.java index af1697ab..34029711 100644 --- a/src/main/java/de/ellpeck/naturesaura/items/tools/ItemPickaxe.java +++ b/src/main/java/de/ellpeck/naturesaura/items/tools/ItemPickaxe.java @@ -47,17 +47,17 @@ public class ItemPickaxe extends PickaxeItem implements IModItem, ICustomItemMod @Override public InteractionResult useOn(UseOnContext context) { if (this == ModItems.INFUSED_IRON_PICKAXE) { - Player player = context.getPlayer(); - Level level = context.getLevel(); - BlockPos pos = context.getClickedPos(); - ItemStack stack = player.getItemInHand(context.getHand()); - BlockState state = level.getBlockState(pos); - BlockState result = NaturesAuraAPI.BOTANIST_PICKAXE_CONVERSIONS.get(state); + var player = context.getPlayer(); + var level = context.getLevel(); + var pos = context.getClickedPos(); + var stack = player.getItemInHand(context.getHand()); + var state = level.getBlockState(pos); + var result = NaturesAuraAPI.BOTANIST_PICKAXE_CONVERSIONS.get(state); if (result != null) { if (!level.isClientSide) { level.setBlockAndUpdate(pos, result); - LevelData data = (LevelData) ILevelData.getLevelData(level); + var data = (LevelData) ILevelData.getLevelData(level); data.addMossStone(pos); } level.playSound(player, pos, SoundEvents.STONE_PLACE, SoundSource.BLOCKS, 1.0F, 1.0F); @@ -75,8 +75,8 @@ public class ItemPickaxe extends PickaxeItem implements IModItem, ICustomItemMod return; if (!isSelected || levelIn.isClientSide) return; - AABB bounds = new AABB(entityIn.blockPosition()).inflate(3.5F); - for (ItemEntity item : levelIn.getEntitiesOfClass(ItemEntity.class, bounds)) { + var bounds = new AABB(entityIn.blockPosition()).inflate(3.5F); + for (var item : levelIn.getEntitiesOfClass(ItemEntity.class, bounds)) { // only pick up freshly dropped items if (item.tickCount >= 5 || !item.isAlive()) continue; diff --git a/src/main/java/de/ellpeck/naturesaura/items/tools/ItemShovel.java b/src/main/java/de/ellpeck/naturesaura/items/tools/ItemShovel.java index 9c49fdc1..7687dbc5 100644 --- a/src/main/java/de/ellpeck/naturesaura/items/tools/ItemShovel.java +++ b/src/main/java/de/ellpeck/naturesaura/items/tools/ItemShovel.java @@ -43,24 +43,24 @@ public class ItemShovel extends ShovelItem implements IModItem, ICustomItemModel @Override public InteractionResult useOn(UseOnContext context) { - Level level = context.getLevel(); - Player player = context.getPlayer(); - ItemStack stack = player.getItemInHand(context.getHand()); - BlockPos pos = context.getClickedPos(); - BlockState state = level.getBlockState(pos); + var level = context.getLevel(); + var player = context.getPlayer(); + var stack = player.getItemInHand(context.getHand()); + var pos = context.getClickedPos(); + var state = level.getBlockState(pos); if (this == ModItems.INFUSED_IRON_SHOVEL) { - int damage = 0; + var damage = 0; if (state.getBlock() == Blocks.DIRT || state.getBlock() == Blocks.MYCELIUM) { if (level.getBlockState(pos.above()).getMaterial() == Material.AIR) { level.setBlockAndUpdate(pos, Blocks.GRASS_BLOCK.defaultBlockState()); damage = 5; } } else { - int range = player.isCrouching() ? 0 : 1; - for (int x = -range; x <= range; x++) { - for (int y = -range; y <= range; y++) { - BlockPos actualPos = pos.offset(x, 0, y); - Direction facing = context.getClickedFace(); + var range = player.isCrouching() ? 0 : 1; + for (var x = -range; x <= range; x++) { + for (var y = -range; y <= range; y++) { + var actualPos = pos.offset(x, 0, y); + var facing = context.getClickedFace(); if (player.mayUseItemAt(actualPos.relative(facing), facing, stack)) { if (facing != Direction.DOWN && level.getBlockState(actualPos.above()).getMaterial() == Material.AIR @@ -82,14 +82,14 @@ public class ItemShovel extends ShovelItem implements IModItem, ICustomItemModel } else if (this == ModItems.SKY_SHOVEL) { if (this.getDestroySpeed(stack, state) <= 1) return super.useOn(context); - InteractionHand otherHand = context.getHand() == InteractionHand.MAIN_HAND ? InteractionHand.OFF_HAND : InteractionHand.MAIN_HAND; - ItemStack other = player.getItemInHand(otherHand); + var otherHand = context.getHand() == InteractionHand.MAIN_HAND ? InteractionHand.OFF_HAND : InteractionHand.MAIN_HAND; + var other = player.getItemInHand(otherHand); if (other.isEmpty() || !(other.getItem() instanceof BlockItem)) return super.useOn(context); level.removeBlock(pos, false); - BlockEntity tile = state.hasBlockEntity() ? level.getBlockEntity(pos) : null; + var tile = state.hasBlockEntity() ? level.getBlockEntity(pos) : null; Block.dropResources(state, level, pos, tile, null, ItemStack.EMPTY); - UseOnContext newContext = new UseOnContext(player, otherHand, new BlockHitResult(context.getClickLocation(), context.getClickedFace(), context.getClickedPos(), context.isInside())); + var newContext = new UseOnContext(player, otherHand, new BlockHitResult(context.getClickLocation(), context.getClickedFace(), context.getClickedPos(), context.isInside())); other.useOn(newContext); stack.hurtAndBreak(1, player, p -> p.broadcastBreakEvent(context.getHand())); return InteractionResult.SUCCESS; diff --git a/src/main/java/de/ellpeck/naturesaura/misc/ColoredBlockHelper.java b/src/main/java/de/ellpeck/naturesaura/misc/ColoredBlockHelper.java index 4b369251..97d86225 100644 --- a/src/main/java/de/ellpeck/naturesaura/misc/ColoredBlockHelper.java +++ b/src/main/java/de/ellpeck/naturesaura/misc/ColoredBlockHelper.java @@ -23,13 +23,13 @@ public final class ColoredBlockHelper { private static List collectBlocks(String name) { List blocks = new ArrayList<>(); - for (DyeColor color : DyeColor.values()) + for (var color : DyeColor.values()) blocks.add(ForgeRegistries.BLOCKS.getValue(new ResourceLocation(color.getName() + '_' + name))); return Collections.unmodifiableList(blocks); } public static List getBlocksContaining(Block block) { - for (List list : LISTS) { + for (var list : LISTS) { if (list.contains(block)) return list; } diff --git a/src/main/java/de/ellpeck/naturesaura/misc/LevelData.java b/src/main/java/de/ellpeck/naturesaura/misc/LevelData.java index 900a80f3..e3db9488 100644 --- a/src/main/java/de/ellpeck/naturesaura/misc/LevelData.java +++ b/src/main/java/de/ellpeck/naturesaura/misc/LevelData.java @@ -44,21 +44,21 @@ public class LevelData implements ILevelData { @Override public CompoundTag serializeNBT() { - CompoundTag compound = new CompoundTag(); + var compound = new CompoundTag(); - ListTag storages = new ListTag(); - for (Map.Entry entry : this.enderStorages.entrySet()) { - ItemStackHandlerNA handler = entry.getValue(); + var storages = new ListTag(); + for (var entry : this.enderStorages.entrySet()) { + var handler = entry.getValue(); if (Helper.isEmpty(handler)) continue; - CompoundTag storageComp = handler.serializeNBT(); + var storageComp = handler.serializeNBT(); storageComp.putString("name", entry.getKey()); storages.add(storageComp); } compound.put("storages", storages); - ListTag moss = new ListTag(); - for (BlockPos pos : this.recentlyConvertedMossStones) + var moss = new ListTag(); + for (var pos : this.recentlyConvertedMossStones) moss.add(LongTag.valueOf(pos.asLong())); compound.put("converted_moss", moss); @@ -68,14 +68,14 @@ public class LevelData implements ILevelData { @Override public void deserializeNBT(CompoundTag compound) { this.enderStorages.clear(); - for (Tag base : compound.getList("storages", 10)) { - CompoundTag storageComp = (CompoundTag) base; - ItemStackHandlerNA storage = this.getEnderStorage(storageComp.getString("name")); + for (var base : compound.getList("storages", 10)) { + var storageComp = (CompoundTag) base; + var storage = this.getEnderStorage(storageComp.getString("name")); storage.deserializeNBT(storageComp); } this.recentlyConvertedMossStones.clear(); - for (Tag base : compound.getList("converted_moss", Tag.TAG_LONG)) + for (var base : compound.getList("converted_moss", Tag.TAG_LONG)) this.recentlyConvertedMossStones.add(BlockPos.of(((LongTag) base).getAsLong())); } @@ -86,9 +86,9 @@ public class LevelData implements ILevelData { @Override public boolean isEnderStorageLocked(String name) { - ItemStackHandlerNA handler = this.getEnderStorage(name); - for (int i = 0; i < handler.getSlots(); i++) { - ItemStack stack = handler.getStackInSlot(i); + var handler = this.getEnderStorage(name); + for (var i = 0; i < handler.getSlots(); i++) { + var stack = handler.getStackInSlot(i); if (!stack.isEmpty() && stack.getItem() == ModItems.TOKEN_TERROR) return true; } diff --git a/src/main/java/de/ellpeck/naturesaura/packet/PacketAuraChunk.java b/src/main/java/de/ellpeck/naturesaura/packet/PacketAuraChunk.java index 7f4f11d2..dedb8427 100644 --- a/src/main/java/de/ellpeck/naturesaura/packet/PacketAuraChunk.java +++ b/src/main/java/de/ellpeck/naturesaura/packet/PacketAuraChunk.java @@ -31,13 +31,13 @@ public class PacketAuraChunk { } public static PacketAuraChunk fromBytes(FriendlyByteBuf buf) { - PacketAuraChunk packet = new PacketAuraChunk(); + var packet = new PacketAuraChunk(); packet.chunkX = buf.readInt(); packet.chunkZ = buf.readInt(); packet.drainSpots = new HashMap<>(); - int amount = buf.readInt(); - for (int i = 0; i < amount; i++) { + var amount = buf.readInt(); + for (var i = 0; i < amount; i++) { packet.drainSpots.put( BlockPos.of(buf.readLong()), new MutableInt(buf.readInt()) @@ -52,7 +52,7 @@ public class PacketAuraChunk { buf.writeInt(packet.chunkZ); buf.writeInt(packet.drainSpots.size()); - for (Map.Entry entry : packet.drainSpots.entrySet()) { + for (var entry : packet.drainSpots.entrySet()) { buf.writeLong(entry.getKey().asLong()); buf.writeInt(entry.getValue().intValue()); } @@ -65,10 +65,10 @@ public class PacketAuraChunk { public boolean tryHandle(Level level) { try { - LevelChunk chunk = level.getChunk(this.chunkX, this.chunkZ); + var chunk = level.getChunk(this.chunkX, this.chunkZ); if (chunk.isEmpty()) return false; - AuraChunk auraChunk = (AuraChunk) chunk.getCapability(NaturesAuraAPI.capAuraChunk).orElse(null); + var auraChunk = (AuraChunk) chunk.getCapability(NaturesAuraAPI.capAuraChunk).orElse(null); if (auraChunk == null) return false; auraChunk.setSpots(this.drainSpots); diff --git a/src/main/java/de/ellpeck/naturesaura/packet/PacketClient.java b/src/main/java/de/ellpeck/naturesaura/packet/PacketClient.java index 30835505..3b6ed11e 100644 --- a/src/main/java/de/ellpeck/naturesaura/packet/PacketClient.java +++ b/src/main/java/de/ellpeck/naturesaura/packet/PacketClient.java @@ -30,7 +30,7 @@ public class PacketClient { } public static PacketClient fromBytes(FriendlyByteBuf buf) { - PacketClient client = new PacketClient(); + var client = new PacketClient(); client.type = buf.readByte(); client.data = buf.readNbt(); return client; @@ -47,15 +47,15 @@ public class PacketClient { ctx.get().enqueueWork(new Runnable() { @Override public void run() { - Minecraft mc = Minecraft.getInstance(); + var mc = Minecraft.getInstance(); if (mc.level != null) { switch (message.type) { case 0: // dimension rail visualization - ResourceLocation goalDim = new ResourceLocation(message.data.getString("dim")); - BlockPos goalPos = BlockPos.of(message.data.getLong("pos")); + var goalDim = new ResourceLocation(message.data.getString("dim")); + var goalPos = BlockPos.of(message.data.getLong("pos")); ItemRangeVisualizer.visualize(mc.player, ItemRangeVisualizer.VISUALIZED_RAILS, goalDim, goalPos); case 1: - Entity entity = mc.level.getEntity(message.data.getInt("id")); + var entity = mc.level.getEntity(message.data.getInt("id")); mc.particleEngine.createTrackingEmitter(entity, ParticleTypes.TOTEM_OF_UNDYING, 30); mc.level.playLocalSound(entity.getX(), entity.getY(), entity.getZ(), SoundEvents.TOTEM_USE, entity.getSoundSource(), 1.0F, 1.0F, false); if (entity == mc.player) { diff --git a/src/main/java/de/ellpeck/naturesaura/packet/PacketParticleStream.java b/src/main/java/de/ellpeck/naturesaura/packet/PacketParticleStream.java index 03f0b504..89b655dd 100644 --- a/src/main/java/de/ellpeck/naturesaura/packet/PacketParticleStream.java +++ b/src/main/java/de/ellpeck/naturesaura/packet/PacketParticleStream.java @@ -36,7 +36,7 @@ public class PacketParticleStream { } public static PacketParticleStream fromBytes(FriendlyByteBuf buf) { - PacketParticleStream packet = new PacketParticleStream(); + var packet = new PacketParticleStream(); packet.startX = buf.readFloat(); packet.startY = buf.readFloat(); diff --git a/src/main/java/de/ellpeck/naturesaura/particles/ParticleHandler.java b/src/main/java/de/ellpeck/naturesaura/particles/ParticleHandler.java index a934f49c..972eff0a 100644 --- a/src/main/java/de/ellpeck/naturesaura/particles/ParticleHandler.java +++ b/src/main/java/de/ellpeck/naturesaura/particles/ParticleHandler.java @@ -67,11 +67,11 @@ public final class ParticleHandler { public static boolean culling = true; public static void spawnParticle(Supplier particle, double x, double y, double z) { - Minecraft mc = Minecraft.getInstance(); + var mc = Minecraft.getInstance(); if (mc.player.distanceToSqr(x, y, z) <= range * range) { if (culling) { if (ModConfig.instance.respectVanillaParticleSettings.get()) { - ParticleStatus setting = mc.options.particles; + var setting = mc.options.particles; if (setting != ParticleStatus.ALL && (setting != ParticleStatus.DECREASED || mc.level.random.nextInt(3) != 0) && (setting != ParticleStatus.MINIMAL || mc.level.random.nextInt(10) != 0)) diff --git a/src/main/java/de/ellpeck/naturesaura/particles/ParticleMagic.java b/src/main/java/de/ellpeck/naturesaura/particles/ParticleMagic.java index 237b2ad7..c86dac7e 100644 --- a/src/main/java/de/ellpeck/naturesaura/particles/ParticleMagic.java +++ b/src/main/java/de/ellpeck/naturesaura/particles/ParticleMagic.java @@ -40,9 +40,9 @@ public class ParticleMagic extends Particle { this.yd = motionY; this.zd = motionZ; - float r = (color >> 16 & 255) / 255F * (1F - this.random.nextFloat() * 0.25F); - float g = (color >> 8 & 255) / 255F * (1F - this.random.nextFloat() * 0.25F); - float b = (color & 255) / 255F * (1F - this.random.nextFloat() * 0.25F); + var r = (color >> 16 & 255) / 255F * (1F - this.random.nextFloat() * 0.25F); + var g = (color >> 8 & 255) / 255F * (1F - this.random.nextFloat() * 0.25F); + var b = (color & 255) / 255F * (1F - this.random.nextFloat() * 0.25F); this.setColor(r, g, b); this.alpha = 1F; @@ -62,7 +62,7 @@ public class ParticleMagic extends Particle { this.yd -= 0.04D * (double) this.gravity; this.move(this.xd, this.yd, this.zd); - float lifeRatio = (float) this.age / (float) this.lifetime; + var lifeRatio = (float) this.age / (float) this.lifetime; if (this.fade && lifeRatio > 0.75F) this.alpha = 1F - (lifeRatio - 0.75F) / 0.25F; if (lifeRatio <= 0.25F) @@ -74,9 +74,9 @@ public class ParticleMagic extends Particle { @Override public void move(double x, double y, double z) { - double lastY = y; + var lastY = y; if (this.hasPhysics && (x != 0 || y != 0 || z != 0)) { - Vec3 motion = Entity.collideBoundingBox(null, new Vec3(x, y, z), this.getBoundingBox(), this.level, Collections.emptyList()); + var motion = Entity.collideBoundingBox(null, new Vec3(x, y, z), this.getBoundingBox(), this.level, Collections.emptyList()); x = motion.x; y = motion.y; z = motion.z; @@ -94,22 +94,22 @@ public class ParticleMagic extends Particle { @Override public void render(VertexConsumer buffer, Camera renderInfo, float partialTicks) { - Vec3 vec3d = renderInfo.getPosition(); - float f = (float) (Mth.lerp(partialTicks, this.xo, this.x) - vec3d.x); - float f1 = (float) (Mth.lerp(partialTicks, this.yo, this.y) - vec3d.y); - float f2 = (float) (Mth.lerp(partialTicks, this.zo, this.z) - vec3d.z); - Quaternion quaternion = renderInfo.rotation(); - Vector3f[] avector3f = new Vector3f[]{new Vector3f(-1.0F, -1.0F, 0.0F), new Vector3f(-1.0F, 1.0F, 0.0F), new Vector3f(1.0F, 1.0F, 0.0F), new Vector3f(1.0F, -1.0F, 0.0F)}; - float f4 = 0.1F * this.particleScale; + var vec3d = renderInfo.getPosition(); + var f = (float) (Mth.lerp(partialTicks, this.xo, this.x) - vec3d.x); + var f1 = (float) (Mth.lerp(partialTicks, this.yo, this.y) - vec3d.y); + var f2 = (float) (Mth.lerp(partialTicks, this.zo, this.z) - vec3d.z); + var quaternion = renderInfo.rotation(); + var avector3f = new Vector3f[]{new Vector3f(-1.0F, -1.0F, 0.0F), new Vector3f(-1.0F, 1.0F, 0.0F), new Vector3f(1.0F, 1.0F, 0.0F), new Vector3f(1.0F, -1.0F, 0.0F)}; + var f4 = 0.1F * this.particleScale; - for (int i = 0; i < 4; ++i) { - Vector3f vector3f = avector3f[i]; + for (var i = 0; i < 4; ++i) { + var vector3f = avector3f[i]; vector3f.transform(quaternion); vector3f.mul(f4); vector3f.add(f, f1, f2); } - int j = this.getLightColor(partialTicks); + var j = this.getLightColor(partialTicks); buffer.vertex(avector3f[0].x(), avector3f[0].y(), avector3f[0].z()).uv(0, 1).color(this.rCol, this.gCol, this.bCol, this.alpha).uv2(j).endVertex(); buffer.vertex(avector3f[1].x(), avector3f[1].y(), avector3f[1].z()).uv(1, 1).color(this.rCol, this.gCol, this.bCol, this.alpha).uv2(j).endVertex(); buffer.vertex(avector3f[2].x(), avector3f[2].y(), avector3f[2].z()).uv(1, 0).color(this.rCol, this.gCol, this.bCol, this.alpha).uv2(j).endVertex(); diff --git a/src/main/java/de/ellpeck/naturesaura/potion/PotionBreathless.java b/src/main/java/de/ellpeck/naturesaura/potion/PotionBreathless.java index ce2aa959..24180a26 100644 --- a/src/main/java/de/ellpeck/naturesaura/potion/PotionBreathless.java +++ b/src/main/java/de/ellpeck/naturesaura/potion/PotionBreathless.java @@ -21,10 +21,10 @@ public class PotionBreathless extends PotionImpl { @SubscribeEvent public void onHeal(LivingHealEvent event) { - MobEffectInstance effect = event.getEntityLiving().getEffect(this); + var effect = event.getEntityLiving().getEffect(this); if (effect == null) return; - float chance = (effect.getAmplifier() + 1) / 15F; + var chance = (effect.getAmplifier() + 1) / 15F; if (this.random.nextFloat() <= chance) { event.setAmount(event.getAmount() / 4F); } @@ -32,7 +32,7 @@ public class PotionBreathless extends PotionImpl { @Override public boolean isDurationEffectTick(int duration, int amplifier) { - int mod = 200 >> amplifier; + var mod = 200 >> amplifier; return mod > 0 && duration % mod == 0 && this.random.nextBoolean(); } diff --git a/src/main/java/de/ellpeck/naturesaura/proxy/ClientProxy.java b/src/main/java/de/ellpeck/naturesaura/proxy/ClientProxy.java index 8c774a15..ce4880b8 100644 --- a/src/main/java/de/ellpeck/naturesaura/proxy/ClientProxy.java +++ b/src/main/java/de/ellpeck/naturesaura/proxy/ClientProxy.java @@ -59,7 +59,7 @@ public class ClientProxy implements IProxy { @Override public void postInit(FMLCommonSetupEvent event) { - for (IModItem item : ModRegistry.ALL_ITEMS) { + for (var item : ModRegistry.ALL_ITEMS) { if (item instanceof ICustomRenderType) ItemBlockRenderTypes.setRenderLayer((Block) item, ((ICustomRenderType) item).getRenderType().get()); } @@ -67,8 +67,8 @@ public class ClientProxy implements IProxy { @Override public void addColorProvidingItem(IColorProvidingItem item) { - ItemColors colors = Minecraft.getInstance().getItemColors(); - ItemColor color = item.getItemColor(); + var colors = Minecraft.getInstance().getItemColors(); + var color = item.getItemColor(); if (item instanceof Item) { colors.register(color, (Item) item); diff --git a/src/main/java/de/ellpeck/naturesaura/recipes/AltarRecipe.java b/src/main/java/de/ellpeck/naturesaura/recipes/AltarRecipe.java index 6a52bf5c..ba94fe2d 100644 --- a/src/main/java/de/ellpeck/naturesaura/recipes/AltarRecipe.java +++ b/src/main/java/de/ellpeck/naturesaura/recipes/AltarRecipe.java @@ -53,7 +53,7 @@ public class AltarRecipe extends ModRecipe { } public ItemStack getDimensionBottle() { - ItemStack bottle = ItemAuraBottle.setType(new ItemStack(ModItems.AURA_BOTTLE), this.requiredType); + var bottle = ItemAuraBottle.setType(new ItemStack(ModItems.AURA_BOTTLE), this.requiredType); bottle.setHoverName(new TranslatableComponent("info." + NaturesAura.MOD_ID + ".required_aura_type." + this.requiredType.getName())); return bottle; } diff --git a/src/main/java/de/ellpeck/naturesaura/recipes/AnimalSpawnerRecipe.java b/src/main/java/de/ellpeck/naturesaura/recipes/AnimalSpawnerRecipe.java index d2712215..896cdbbf 100644 --- a/src/main/java/de/ellpeck/naturesaura/recipes/AnimalSpawnerRecipe.java +++ b/src/main/java/de/ellpeck/naturesaura/recipes/AnimalSpawnerRecipe.java @@ -63,7 +63,7 @@ public class AnimalSpawnerRecipe extends ModRecipe { @Override public AnimalSpawnerRecipe fromJson(ResourceLocation recipeId, JsonObject json) { List ingredients = new ArrayList<>(); - for (JsonElement e : json.getAsJsonArray("ingredients")) + for (var e : json.getAsJsonArray("ingredients")) ingredients.add(Ingredient.fromJson(e)); return new AnimalSpawnerRecipe(recipeId, ForgeRegistries.ENTITIES.getValue(new ResourceLocation(json.get("entity").getAsString())), @@ -75,8 +75,8 @@ public class AnimalSpawnerRecipe extends ModRecipe { @Nullable @Override public AnimalSpawnerRecipe fromNetwork(ResourceLocation recipeId, FriendlyByteBuf buffer) { - Ingredient[] ings = new Ingredient[buffer.readInt()]; - for (int i = 0; i < ings.length; i++) + var ings = new Ingredient[buffer.readInt()]; + for (var i = 0; i < ings.length; i++) ings[i] = Ingredient.fromNetwork(buffer); return new AnimalSpawnerRecipe( recipeId, @@ -89,7 +89,7 @@ public class AnimalSpawnerRecipe extends ModRecipe { @Override public void toNetwork(FriendlyByteBuf buffer, AnimalSpawnerRecipe recipe) { buffer.writeInt(recipe.ingredients.length); - for (Ingredient ing : recipe.ingredients) + for (var ing : recipe.ingredients) ing.toNetwork(buffer); buffer.writeResourceLocation(recipe.entity.getRegistryName()); buffer.writeInt(recipe.aura); diff --git a/src/main/java/de/ellpeck/naturesaura/recipes/ModRecipes.java b/src/main/java/de/ellpeck/naturesaura/recipes/ModRecipes.java index 9cbbfa7c..57f1d289 100644 --- a/src/main/java/de/ellpeck/naturesaura/recipes/ModRecipes.java +++ b/src/main/java/de/ellpeck/naturesaura/recipes/ModRecipes.java @@ -126,31 +126,31 @@ public final class ModRecipes { } private static void ore(List list, String name, int weight) { - ResourceLocation res = new ResourceLocation("forge", name); + var res = new ResourceLocation("forge", name); list.add(new WeightedOre(res, weight)); } private static void register(IForgeRegistry> registry, String name, RecipeType type, RecipeSerializer serializer) { - ResourceLocation res = new ResourceLocation(NaturesAura.MOD_ID, name); + var res = new ResourceLocation(NaturesAura.MOD_ID, name); Registry.register(Registry.RECIPE_TYPE, res, type); registry.register(serializer.setRegistryName(res)); } public static JsonObject serializeStack(ItemStack stack) { - CompoundTag nbt = stack.save(new CompoundTag()); - byte c = nbt.getByte("Count"); + var nbt = stack.save(new CompoundTag()); + var c = nbt.getByte("Count"); if (c != 1) { nbt.putByte("count", c); } nbt.remove("Count"); renameTag(nbt, "id", "item"); renameTag(nbt, "tag", "nbt"); - Dynamic dyn = new Dynamic<>(NbtOps.INSTANCE, nbt); + var dyn = new Dynamic(NbtOps.INSTANCE, nbt); return dyn.convert(JsonOps.INSTANCE).getValue().getAsJsonObject(); } private static void renameTag(CompoundTag nbt, String oldName, String newName) { - Tag tag = nbt.get(oldName); + var tag = nbt.get(oldName); if (tag != null) { nbt.remove(oldName); nbt.put(newName, tag); diff --git a/src/main/java/de/ellpeck/naturesaura/recipes/TreeRitualRecipe.java b/src/main/java/de/ellpeck/naturesaura/recipes/TreeRitualRecipe.java index 4497b95e..e00b22be 100644 --- a/src/main/java/de/ellpeck/naturesaura/recipes/TreeRitualRecipe.java +++ b/src/main/java/de/ellpeck/naturesaura/recipes/TreeRitualRecipe.java @@ -50,7 +50,7 @@ public class TreeRitualRecipe extends ModRecipe { @Override public TreeRitualRecipe fromJson(ResourceLocation recipeId, JsonObject json) { List ings = new ArrayList<>(); - for (JsonElement element : json.getAsJsonArray("ingredients")) + for (var element : json.getAsJsonArray("ingredients")) ings.add(Ingredient.fromJson(element)); return new TreeRitualRecipe( recipeId, @@ -63,8 +63,8 @@ public class TreeRitualRecipe extends ModRecipe { @Nullable @Override public TreeRitualRecipe fromNetwork(ResourceLocation recipeId, FriendlyByteBuf buffer) { - Ingredient[] ings = new Ingredient[buffer.readInt()]; - for (int i = 0; i < ings.length; i++) + var ings = new Ingredient[buffer.readInt()]; + for (var i = 0; i < ings.length; i++) ings[i] = Ingredient.fromNetwork(buffer); return new TreeRitualRecipe( recipeId, @@ -77,7 +77,7 @@ public class TreeRitualRecipe extends ModRecipe { @Override public void toNetwork(FriendlyByteBuf buffer, TreeRitualRecipe recipe) { buffer.writeInt(recipe.ingredients.length); - for (Ingredient ing : recipe.ingredients) + for (var ing : recipe.ingredients) ing.toNetwork(buffer); recipe.saplingType.toNetwork(buffer); buffer.writeItem(recipe.result); diff --git a/src/main/java/de/ellpeck/naturesaura/reg/ModTileType.java b/src/main/java/de/ellpeck/naturesaura/reg/ModTileType.java index c873922a..c34ec4e2 100644 --- a/src/main/java/de/ellpeck/naturesaura/reg/ModTileType.java +++ b/src/main/java/de/ellpeck/naturesaura/reg/ModTileType.java @@ -18,7 +18,7 @@ public class ModTileType implements IModItem { public ModTileType(BlockEntityType.BlockEntitySupplier supplier, String name, IModItem... items) { this.name = name; - Block[] blocks = Arrays.stream(items).map(i -> (Block) i).toArray(Block[]::new); + var blocks = Arrays.stream(items).map(i -> (Block) i).toArray(Block[]::new); this.type = BlockEntityType.Builder.of(supplier, blocks).build(null); }