From 93c872eb3bdc54282d12485c782599ab409a86e2 Mon Sep 17 00:00:00 2001 From: Up Date: Sat, 9 Dec 2023 07:03:58 +0100 Subject: [PATCH] fix compile errors --- .../entity/SolarStrikeEntityRenderer.java | 2 +- .../client/screens/BookshelfScreen.java | 15 ++++++----- .../component/entity/PlayerMagicCaster.java | 2 +- .../arcanus/entity/ArcaneBarrierEntity.java | 8 +++--- .../arcanus/entity/MagicMissileEntity.java | 18 ++++++------- .../arcanus/entity/SolarStrikeEntity.java | 25 ++++++++++--------- .../arcanus/mixin/client/MinecraftMixin.java | 4 +-- .../arcanus/net/CastSpellPacket.java | 4 +-- .../arcanus/registry/ArcanusCommands.java | 10 ++++---- .../arcanus/spell/ArcaneBarrierSpell.java | 6 ++--- .../arcanus/spell/DiscombobulateSpell.java | 2 +- .../arcanus/spell/DreamWarpSpell.java | 2 +- .../arcanus/spell/HealSpell.java | 4 +-- .../arcanus/spell/LungeSpell.java | 4 +-- .../arcanus/spell/MagicMissileSpell.java | 6 ++--- .../arcanus/spell/SolarStrikeSpell.java | 8 +++--- .../arcanus/spell/TelekinesisSpell.java | 22 ++++++++-------- .../BookshelfReplacerStructureProcessor.java | 6 ++--- .../processor/LecternStructureProcessor.java | 6 ++--- .../arcanus/util/ArcanusHelper.java | 10 ++++---- .../arcanus/util/EventHandler.java | 22 ++++++++-------- 21 files changed, 92 insertions(+), 94 deletions(-) diff --git a/src/main/java/dev/cammiescorner/arcanus/client/renderer/entity/SolarStrikeEntityRenderer.java b/src/main/java/dev/cammiescorner/arcanus/client/renderer/entity/SolarStrikeEntityRenderer.java index 20dd87f..d935918 100644 --- a/src/main/java/dev/cammiescorner/arcanus/client/renderer/entity/SolarStrikeEntityRenderer.java +++ b/src/main/java/dev/cammiescorner/arcanus/client/renderer/entity/SolarStrikeEntityRenderer.java @@ -25,7 +25,7 @@ public SolarStrikeEntityRenderer(EntityRendererProvider.Context context) { @Override public void render(SolarStrikeEntity entity, float yaw, float tickDelta, PoseStack matrices, MultiBufferSource provider, int light) { - renderBeam(entity, matrices, provider, 0, (float) ((entity.level.getHeight() + 2048) - entity.getY()), 0, tickDelta, OverlayTexture.NO_OVERLAY, light); + renderBeam(entity, matrices, provider, 0, (float) ((entity.level().getHeight() + 2048) - entity.getY()), 0, tickDelta, OverlayTexture.NO_OVERLAY, light); } public void renderBeam(SolarStrikeEntity entity, PoseStack matrices, MultiBufferSource provider, float x, float y, float z, float tickDelta, int overlay, int light) { diff --git a/src/main/java/dev/cammiescorner/arcanus/client/screens/BookshelfScreen.java b/src/main/java/dev/cammiescorner/arcanus/client/screens/BookshelfScreen.java index f48cf3c..3de1878 100644 --- a/src/main/java/dev/cammiescorner/arcanus/client/screens/BookshelfScreen.java +++ b/src/main/java/dev/cammiescorner/arcanus/client/screens/BookshelfScreen.java @@ -1,9 +1,9 @@ package dev.cammiescorner.arcanus.client.screens; import com.mojang.blaze3d.systems.RenderSystem; -import com.mojang.blaze3d.vertex.PoseStack; import dev.cammiescorner.arcanus.Arcanus; import dev.cammiescorner.arcanus.screen.BookshelfScreenHandler; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen; import net.minecraft.client.renderer.GameRenderer; import net.minecraft.network.chat.Component; @@ -18,20 +18,19 @@ public BookshelfScreen(BookshelfScreenHandler handler, Inventory inventory, Comp } @Override - protected void renderBg(PoseStack matrices, float delta, int mouseX, int mouseY) { + protected void renderBg(GuiGraphics graphics, float delta, int mouseX, int mouseY) { RenderSystem.setShader(GameRenderer::getPositionTexShader); RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F); - RenderSystem.setShaderTexture(0, TEXTURE); int x = (width - imageWidth) / 2; int y = (height - imageHeight) / 2; - blit(matrices, x, y, 0, 0, imageWidth, imageHeight); + graphics.blit(TEXTURE, x, y, 0, 0, imageWidth, imageHeight); } @Override - public void render(PoseStack matrices, int mouseX, int mouseY, float delta) { - renderBackground(matrices); - super.render(matrices, mouseX, mouseY, delta); - renderTooltip(matrices, mouseX, mouseY); + public void render(GuiGraphics graphics, int mouseX, int mouseY, float delta) { + renderBackground(graphics); + super.render(graphics, mouseX, mouseY, delta); + renderTooltip(graphics, mouseX, mouseY); } @Override diff --git a/src/main/java/dev/cammiescorner/arcanus/component/entity/PlayerMagicCaster.java b/src/main/java/dev/cammiescorner/arcanus/component/entity/PlayerMagicCaster.java index e899476..6794d81 100644 --- a/src/main/java/dev/cammiescorner/arcanus/component/entity/PlayerMagicCaster.java +++ b/src/main/java/dev/cammiescorner/arcanus/component/entity/PlayerMagicCaster.java @@ -141,7 +141,7 @@ public Spell getActiveSpell() { @Override public void serverTick() { - Level level = player.getLevel(); + Level level = player.level(); if (activeSpell != null) { activeSpell.onActiveTick(level, this, activeSpellTimer); diff --git a/src/main/java/dev/cammiescorner/arcanus/entity/ArcaneBarrierEntity.java b/src/main/java/dev/cammiescorner/arcanus/entity/ArcaneBarrierEntity.java index 4f63232..b4d21fb 100644 --- a/src/main/java/dev/cammiescorner/arcanus/entity/ArcaneBarrierEntity.java +++ b/src/main/java/dev/cammiescorner/arcanus/entity/ArcaneBarrierEntity.java @@ -59,7 +59,7 @@ public void tick() { super.tick(); - if (!level.isClientSide()) { + if (!level().isClientSide()) { setHitTimer(Math.max(0, getHitTimer() - 1)); if (tickCount > 0 && tickCount % 600 == 0) @@ -81,7 +81,7 @@ private void moveEntities() { if (tickCount <= Math.ceil(ArcaneBarrierEntity.MAX_HEIGHT / ArcaneBarrierEntity.GROWTH_RATE)) { reapplyPosition(); - List list = level.getEntities(this, getBoundingBox(), EntitySelector.NO_SPECTATORS.and((entity) -> !entity.isPassengerOfSameVehicle(this))); + List list = level().getEntities(this, getBoundingBox(), EntitySelector.NO_SPECTATORS.and((entity) -> !entity.isPassengerOfSameVehicle(this))); for (Entity entity : list) if (!(entity instanceof Shulker || entity instanceof ArcaneBarrierEntity) && !entity.noPhysics) @@ -98,7 +98,7 @@ protected void defineSynchedData() { @Override protected void readAdditionalSaveData(CompoundTag nbt) { if (nbt.contains("Owner")) - owner = level.getPlayerByUUID(nbt.getUUID("Owner")); + owner = level().getPlayerByUUID(nbt.getUUID("Owner")); } @Override @@ -111,7 +111,7 @@ protected void addAdditionalSaveData(CompoundTag nbt) { public boolean hurt(DamageSource source, float amount) { if (this.isInvulnerableTo(source)) return false; - else if (this.level.isClientSide) + else if (this.level().isClientSide()) return false; else if (this.isRemoved()) return false; diff --git a/src/main/java/dev/cammiescorner/arcanus/entity/MagicMissileEntity.java b/src/main/java/dev/cammiescorner/arcanus/entity/MagicMissileEntity.java index 9b56376..25c7a56 100644 --- a/src/main/java/dev/cammiescorner/arcanus/entity/MagicMissileEntity.java +++ b/src/main/java/dev/cammiescorner/arcanus/entity/MagicMissileEntity.java @@ -34,16 +34,16 @@ public MagicMissileEntity(EntityType type, Level w public void tick() { super.tick(); - if (!level.isClientSide()) { + if (!level().isClientSide()) { for (int count = 0; count < 16; count++) { - double x = getX() + (level.random.nextInt(3) - 1) / 4D; - double y = getY() + 0.2F + (level.random.nextInt(3) - 1) / 4D; - double z = getZ() + (level.random.nextInt(3) - 1) / 4D; - double deltaX = (level.random.nextInt(3) - 1) * level.random.nextDouble(); - double deltaY = (level.random.nextInt(3) - 1) * level.random.nextDouble(); - double deltaZ = (level.random.nextInt(3) - 1) * level.random.nextDouble(); + double x = getX() + (random.nextInt(3) - 1) / 4D; + double y = getY() + 0.2F + (random.nextInt(3) - 1) / 4D; + double z = getZ() + (random.nextInt(3) - 1) / 4D; + double deltaX = (random.nextInt(3) - 1) * random.nextDouble(); + double deltaY = (random.nextInt(3) - 1) * random.nextDouble(); + double deltaZ = (random.nextInt(3) - 1) * random.nextDouble(); - PlayerLookup.tracking(this).forEach(player -> ((ServerLevel) level).sendParticles(player, (ParticleOptions) ArcanusParticles.MAGIC_MISSILE, true, x, y, z, 1, deltaX, deltaY, deltaZ, 0.1)); + PlayerLookup.tracking(this).forEach(player -> ((ServerLevel) level()).sendParticles(player, (ParticleOptions) ArcanusParticles.MAGIC_MISSILE, true, x, y, z, 1, deltaX, deltaY, deltaZ, 0.1)); } } @@ -72,7 +72,7 @@ protected void onHitEntity(EntityHitResult entityHitResult) { @Override public void playerTouch(Player player) { - if (!level.isClientSide && (inGround || isNoPhysics()) && shakeTime <= 0) + if (!level().isClientSide() && (inGround || isNoPhysics()) && shakeTime <= 0) discard(); } diff --git a/src/main/java/dev/cammiescorner/arcanus/entity/SolarStrikeEntity.java b/src/main/java/dev/cammiescorner/arcanus/entity/SolarStrikeEntity.java index ae17540..52448b0 100644 --- a/src/main/java/dev/cammiescorner/arcanus/entity/SolarStrikeEntity.java +++ b/src/main/java/dev/cammiescorner/arcanus/entity/SolarStrikeEntity.java @@ -3,8 +3,6 @@ import dev.cammiescorner.arcanus.registry.ArcanusDamageTypes; import dev.cammiescorner.arcanus.registry.ArcanusEntities; import dev.cammiescorner.arcanus.registry.ArcanusSoundEvents; -import java.util.ArrayList; -import java.util.List; import net.minecraft.client.Minecraft; import net.minecraft.core.particles.ParticleTypes; import net.minecraft.server.level.ServerLevel; @@ -19,6 +17,9 @@ import net.minecraft.world.phys.AABB; import net.minecraft.world.phys.Vec2; +import java.util.ArrayList; +import java.util.List; + public class SolarStrikeEntity extends AbstractArrow { public final List hasHit = new ArrayList<>(); @@ -33,12 +34,12 @@ public SolarStrikeEntity(EntityType type, Level wor @Override public void tick() { - if (!level.isClientSide()) { + if (!level().isClientSide()) { if (tickCount <= 9) { - AABB box = new AABB(getX() - 4, getY() - 1, getZ() - 4, getX() + 4, (level.getHeight() + 2048) - getY(), getZ() + 4); + AABB box = new AABB(getX() - 4, getY() - 1, getZ() - 4, getX() + 4, (level().getHeight() + 2048) - getY(), getZ() + 4); float radius = (float) (box.maxX - box.minX) / 2; - level.getEntities(null, box).forEach(entity -> { + level().getEntities(null, box).forEach(entity -> { if (!hasHit.contains(entity)) { Vec2 pos1 = new Vec2((float) getX(), (float) getZ()); Vec2 pos2 = new Vec2((float) entity.getX(), (float) entity.getZ()); @@ -59,21 +60,21 @@ public void tick() { kill(); } else { if (tickCount == 1) - level.playLocalSound(getX(), getY(), getZ(), ArcanusSoundEvents.SOLAR_STRIKE, SoundSource.PLAYERS, Mth.clamp(1 - (Minecraft.getInstance().player.distanceTo(this) / 256F), 0, 1), (1.0F + (random.nextFloat() - random.nextFloat()) * 0.2F) * 0.7F, false); + level().playLocalSound(getX(), getY(), getZ(), ArcanusSoundEvents.SOLAR_STRIKE, SoundSource.PLAYERS, Mth.clamp(1 - (Minecraft.getInstance().player.distanceTo(this) / 256F), 0, 1), (1.0F + (random.nextFloat() - random.nextFloat()) * 0.2F) * 0.7F, false); if (tickCount >= 2 && tickCount <= 5) { - level.addParticle(ParticleTypes.EXPLOSION_EMITTER, getX() + 2, getY(), getZ(), 1.0D, 0.0D, 0.0D); - level.addParticle(ParticleTypes.EXPLOSION_EMITTER, getX() - 2, getY(), getZ(), 1.0D, 0.0D, 0.0D); - level.addParticle(ParticleTypes.EXPLOSION_EMITTER, getX(), getY(), getZ() + 2, 1.0D, 0.0D, 0.0D); - level.addParticle(ParticleTypes.EXPLOSION_EMITTER, getX(), getY(), getZ() - 2, 1.0D, 0.0D, 0.0D); + level().addParticle(ParticleTypes.EXPLOSION_EMITTER, getX() + 2, getY(), getZ(), 1.0D, 0.0D, 0.0D); + level().addParticle(ParticleTypes.EXPLOSION_EMITTER, getX() - 2, getY(), getZ(), 1.0D, 0.0D, 0.0D); + level().addParticle(ParticleTypes.EXPLOSION_EMITTER, getX(), getY(), getZ() + 2, 1.0D, 0.0D, 0.0D); + level().addParticle(ParticleTypes.EXPLOSION_EMITTER, getX(), getY(), getZ() - 2, 1.0D, 0.0D, 0.0D); } } } @Override public void kill() { - if (!level.isClientSide()) - ((ServerLevel) level).setChunkForced(chunkPosition().x, chunkPosition().z, false); + if (!level().isClientSide()) + ((ServerLevel) level()).setChunkForced(chunkPosition().x, chunkPosition().z, false); super.kill(); } diff --git a/src/main/java/dev/cammiescorner/arcanus/mixin/client/MinecraftMixin.java b/src/main/java/dev/cammiescorner/arcanus/mixin/client/MinecraftMixin.java index b00d0b2..770d0cf 100644 --- a/src/main/java/dev/cammiescorner/arcanus/mixin/client/MinecraftMixin.java +++ b/src/main/java/dev/cammiescorner/arcanus/mixin/client/MinecraftMixin.java @@ -81,7 +81,7 @@ public void onRightClick(CallbackInfo info) { unfinishedSpell = true; pattern.add(Spell.Pattern.RIGHT); player.swing(InteractionHand.MAIN_HAND); - player.level.playSeededSound(player, player.getX(), player.getY(), player.getZ(), SoundEvents.UI_BUTTON_CLICK, SoundSource.PLAYERS, 1F, 1.1F, 0L); + player.level().playSeededSound(player, player.getX(), player.getY(), player.getZ(), SoundEvents.UI_BUTTON_CLICK, SoundSource.PLAYERS, 1F, 1.1F, 0L); info.cancel(); } } @@ -93,7 +93,7 @@ public void onLeftClick(CallbackInfo info) { unfinishedSpell = true; pattern.add(Spell.Pattern.LEFT); player.swing(InteractionHand.MAIN_HAND); - player.level.playSeededSound(player, player.getX(), player.getY(), player.getZ(), SoundEvents.UI_BUTTON_CLICK, SoundSource.PLAYERS, 1F, 1.3F, 0L); + player.level().playSeededSound(player, player.getX(), player.getY(), player.getZ(), SoundEvents.UI_BUTTON_CLICK, SoundSource.PLAYERS, 1F, 1.3F, 0L); info.cancel(); } } diff --git a/src/main/java/dev/cammiescorner/arcanus/net/CastSpellPacket.java b/src/main/java/dev/cammiescorner/arcanus/net/CastSpellPacket.java index ac5702e..e572e47 100644 --- a/src/main/java/dev/cammiescorner/arcanus/net/CastSpellPacket.java +++ b/src/main/java/dev/cammiescorner/arcanus/net/CastSpellPacket.java @@ -51,13 +51,13 @@ public static void handle(MinecraftServer server, ServerPlayer player, ServerGam if(!caster.cast(spell)) { return; } - caster.setLastCastTime(player.level.getGameTime()); + caster.setLastCastTime(player.level().getGameTime()); if (!player.isCreative()) { if (caster.getMana() < realManaCost && ArcanusConfig.haveBurnout) { int burnoutAmount = realManaCost - caster.getMana(); caster.addBurnout(burnoutAmount); - player.hurt(ArcanusDamageTypes.burnout(player.level), burnoutAmount); + player.hurt(ArcanusDamageTypes.burnout(player.level()), burnoutAmount); player.displayClientMessage(Arcanus.translate("error", "burnout").withStyle(ChatFormatting.RED), false); } diff --git a/src/main/java/dev/cammiescorner/arcanus/registry/ArcanusCommands.java b/src/main/java/dev/cammiescorner/arcanus/registry/ArcanusCommands.java index 70a624c..e394e45 100644 --- a/src/main/java/dev/cammiescorner/arcanus/registry/ArcanusCommands.java +++ b/src/main/java/dev/cammiescorner/arcanus/registry/ArcanusCommands.java @@ -86,7 +86,7 @@ public static int listPlayerSpells(CommandContext context, P MutableComponent knownSpells = Component.literal(""); spells.stream().sorted(Comparator.comparing(spell -> Arcanus.SPELL.getKey(spell).toString())).forEachOrdered(spell -> knownSpells.append("\n - ").append(Component.translatable(spell.getTranslationKey())).append(" (" + spell.getSpellPattern().get(0).getSymbol() + "-" + spell.getSpellPattern().get(1).getSymbol() + "-" + spell.getSpellPattern().get(2).getSymbol() + ")")); - context.getSource().sendSuccess(Arcanus.translate("commands", "spells.list", player.getScoreboardName(), knownSpells), false); + context.getSource().sendSuccess(() -> Arcanus.translate("commands", "spells.list", player.getScoreboardName(), knownSpells), false); return spells.size(); } @@ -94,7 +94,7 @@ public static int addAllSpellsToPlayer(CommandContext contex SpellMemory memory = player.getComponent(ArcanusComponents.SPELL_MEMORY); int count = (int) Arcanus.SPELL.stream().filter(memory::unlockSpell).count(); player.syncComponent(ArcanusComponents.SPELL_MEMORY); - context.getSource().sendSuccess(Arcanus.translate("commands", "spells.added_all", player.getDisplayName()), false); + context.getSource().sendSuccess(() -> Arcanus.translate("commands", "spells.added_all", player.getDisplayName()), false); return Math.max(count, 1); } @@ -103,7 +103,7 @@ public static int addSpellToPlayer(CommandContext context, S Spell spell = ResourceArgument.getResource(context, "spell", Arcanus.SPELL_KEY).value(); if (memory.unlockSpell(spell)) { - context.getSource().sendSuccess(Arcanus.translate("commands", "spells.added", Component.translatable(spell.getTranslationKey(), Arcanus.SPELL.getKey(spell)), player.getScoreboardName()), false); + context.getSource().sendSuccess(() -> Arcanus.translate("commands", "spells.added", Component.translatable(spell.getTranslationKey(), Arcanus.SPELL.getKey(spell)), player.getScoreboardName()), false); player.syncComponent(ArcanusComponents.SPELL_MEMORY); return Command.SINGLE_SUCCESS; } @@ -116,7 +116,7 @@ public static int removeAllSpellsFromPlayer(CommandContext c SpellMemory memory = player.getComponent(ArcanusComponents.SPELL_MEMORY); memory.clear(); player.syncComponent(ArcanusComponents.SPELL_MEMORY); - context.getSource().sendSuccess(Arcanus.translate("commands", "spells.cleared", player.getDisplayName()), false); + context.getSource().sendSuccess(() -> Arcanus.translate("commands", "spells.cleared", player.getDisplayName()), false); return Command.SINGLE_SUCCESS; } @@ -125,7 +125,7 @@ public static int removeSpellFromPlayer(CommandContext conte Spell spell = ResourceArgument.getResource(context, "spell", Arcanus.SPELL_KEY).value(); if (memory.removeSpell(spell)) { - context.getSource().sendSuccess(Arcanus.translate("commands", "spells.removed", Component.translatable(spell.getTranslationKey(), Arcanus.SPELL.getKey(spell)), player.getDisplayName()), false); + context.getSource().sendSuccess(() -> Arcanus.translate("commands", "spells.removed", Component.translatable(spell.getTranslationKey(), Arcanus.SPELL.getKey(spell)), player.getDisplayName()), false); player.syncComponent(ArcanusComponents.SPELL_MEMORY); return Command.SINGLE_SUCCESS; } diff --git a/src/main/java/dev/cammiescorner/arcanus/spell/ArcaneBarrierSpell.java b/src/main/java/dev/cammiescorner/arcanus/spell/ArcaneBarrierSpell.java index 3fc8c78..33dfbac 100644 --- a/src/main/java/dev/cammiescorner/arcanus/spell/ArcaneBarrierSpell.java +++ b/src/main/java/dev/cammiescorner/arcanus/spell/ArcaneBarrierSpell.java @@ -26,18 +26,18 @@ public void onCast(MagicCaster caster) { BlockHitResult blockResult = ((BlockHitResult) result); Direction side = blockResult.getDirection(); BlockPos pos = blockResult.getBlockPos().offset(side.getStepX(), side.getStepY(), side.getStepZ()); - ArcaneBarrierEntity arcaneWall = new ArcaneBarrierEntity(entity.getLevel()); + ArcaneBarrierEntity arcaneWall = new ArcaneBarrierEntity(entity.level()); if (entity instanceof Player player) { arcaneWall.setOwner(player); - if (!player.mayInteract(arcaneWall.getLevel(), pos)) { + if (!player.mayInteract(arcaneWall.level(), pos)) { player.displayClientMessage(Arcanus.translate("spell", "cannot_interact"), false); return; } } arcaneWall.setPos(pos.getX() + 0.5, pos.getY(), pos.getZ() + 0.5); - entity.getLevel().addFreshEntity(arcaneWall); + entity.level().addFreshEntity(arcaneWall); } else { if (entity instanceof Player player) { player.displayClientMessage(Arcanus.translate("spell", "no_target"), false); diff --git a/src/main/java/dev/cammiescorner/arcanus/spell/DiscombobulateSpell.java b/src/main/java/dev/cammiescorner/arcanus/spell/DiscombobulateSpell.java index c0edf7d..c62e038 100644 --- a/src/main/java/dev/cammiescorner/arcanus/spell/DiscombobulateSpell.java +++ b/src/main/java/dev/cammiescorner/arcanus/spell/DiscombobulateSpell.java @@ -30,7 +30,7 @@ public void onCast(MagicCaster caster) { Vec3 startPos = entity.getEyePosition(1F).add((entity.getRandom().nextInt(3) - 1) / startDivisor, (entity.getRandom().nextInt(3) - 1) / startDivisor, (entity.getRandom().nextInt(3) - 1) / startDivisor); Vec3 endPos = result.getLocation().add((entity.getRandom().nextInt(3) - 1) / endDivisor, (entity.getRandom().nextInt(3) - 1) / endDivisor, (entity.getRandom().nextInt(3) - 1) / endDivisor); - ArcanusHelper.drawLine(startPos, endPos, entity.getLevel(), 0.5F, (ParticleOptions) ArcanusParticles.DISCOMBOBULATE); + ArcanusHelper.drawLine(startPos, endPos, entity.level(), 0.5F, (ParticleOptions) ArcanusParticles.DISCOMBOBULATE); } if (result.getType() == HitResult.Type.ENTITY) { diff --git a/src/main/java/dev/cammiescorner/arcanus/spell/DreamWarpSpell.java b/src/main/java/dev/cammiescorner/arcanus/spell/DreamWarpSpell.java index b9d1af4..0c6812c 100644 --- a/src/main/java/dev/cammiescorner/arcanus/spell/DreamWarpSpell.java +++ b/src/main/java/dev/cammiescorner/arcanus/spell/DreamWarpSpell.java @@ -33,7 +33,7 @@ public void onCast(MagicCaster caster) { Vec3 prevPos = serverPlayer.position(); QuiltDimensions.teleport(serverPlayer, serverWorld, new PortalInfo(spawnPoint, Vec3.ZERO, (float) rotation.x, (float) rotation.y)); serverWorld.playSound(null, prevPos.x(), prevPos.y(), prevPos.z(), SoundEvents.ENDERMAN_TELEPORT, SoundSource.PLAYERS, 2F, 1F); - serverPlayer.getLevel().playSound(null, serverPlayer, SoundEvents.ENDERMAN_TELEPORT, SoundSource.PLAYERS, 2F, 1F); + serverPlayer.level().playSound(null, serverPlayer, SoundEvents.ENDERMAN_TELEPORT, SoundSource.PLAYERS, 2F, 1F); return; } } diff --git a/src/main/java/dev/cammiescorner/arcanus/spell/HealSpell.java b/src/main/java/dev/cammiescorner/arcanus/spell/HealSpell.java index 11a9223..749a223 100644 --- a/src/main/java/dev/cammiescorner/arcanus/spell/HealSpell.java +++ b/src/main/java/dev/cammiescorner/arcanus/spell/HealSpell.java @@ -18,14 +18,14 @@ public HealSpell(Pattern first, Pattern second, Pattern last, int manaCost) { public void onCast(MagicCaster caster) { LivingEntity entity = caster.asEntity(); entity.heal(10); - entity.getLevel().playSound(null, entity, ArcanusSoundEvents.HEAL, SoundSource.PLAYERS, 2F, entity.getRandom().nextFloat() * 0.2F + 1.0F); + entity.level().playSound(null, entity, ArcanusSoundEvents.HEAL, SoundSource.PLAYERS, 2F, entity.getRandom().nextFloat() * 0.2F + 1.0F); for (int amount = 0; amount < 32; amount++) { float offsetX = ((entity.getRandom().nextInt(3) - 1) * entity.getRandom().nextFloat()); float offsetY = entity.getRandom().nextFloat() * 2F; float offsetZ = ((entity.getRandom().nextInt(3) - 1) * entity.getRandom().nextFloat()); - ((ServerLevel) entity.getLevel()).sendParticles((ParticleOptions) ArcanusParticles.HEAL, entity.getX() + offsetX, entity.getY() - 0.5 + offsetY, entity.getZ() + offsetZ, 3, 0, 0, 0, 0); + ((ServerLevel) entity.level()).sendParticles((ParticleOptions) ArcanusParticles.HEAL, entity.getX() + offsetX, entity.getY() - 0.5 + offsetY, entity.getZ() + offsetZ, 3, 0, 0, 0, 0); } } } diff --git a/src/main/java/dev/cammiescorner/arcanus/spell/LungeSpell.java b/src/main/java/dev/cammiescorner/arcanus/spell/LungeSpell.java index 7b9636a..d2b6dd8 100644 --- a/src/main/java/dev/cammiescorner/arcanus/spell/LungeSpell.java +++ b/src/main/java/dev/cammiescorner/arcanus/spell/LungeSpell.java @@ -59,7 +59,7 @@ public void onActiveTick(Level level, MagicCaster caster, int remainingTicks) { entity.hurtMarked = true; } - if (entity.isOnGround() || remainingTicks == 0) { + if (entity.onGround() || remainingTicks == 0) { affectedEntities.remove(entity); } } else { @@ -88,7 +88,7 @@ public void onActiveTick(Level level, MagicCaster caster, int remainingTicks) { entity.fallDistance = 0; - if (entity.isOnGround() && remainingTicks <= 8) { + if (entity.onGround() && remainingTicks <= 8) { level.explode(entity, entity.getX(), entity.getY() + 0.5, entity.getZ(), 1, Level.ExplosionInteraction.NONE); caster.clearActiveSpell(); affectedEntities.remove(entity); diff --git a/src/main/java/dev/cammiescorner/arcanus/spell/MagicMissileSpell.java b/src/main/java/dev/cammiescorner/arcanus/spell/MagicMissileSpell.java index b0c7be1..073b5be 100644 --- a/src/main/java/dev/cammiescorner/arcanus/spell/MagicMissileSpell.java +++ b/src/main/java/dev/cammiescorner/arcanus/spell/MagicMissileSpell.java @@ -15,10 +15,10 @@ public MagicMissileSpell(Pattern first, Pattern second, Pattern last, int manaCo @Override public void onCast(MagicCaster caster) { LivingEntity entity = caster.asEntity(); - MagicMissileEntity magicMissile = new MagicMissileEntity(entity, entity.getLevel()); + MagicMissileEntity magicMissile = new MagicMissileEntity(entity, entity.level()); magicMissile.shootFromRotation(entity, entity.getXRot(), entity.getYRot(), 0, 4.5F, 0F); - entity.getLevel().addFreshEntity(magicMissile); - entity.getLevel().playSound(null, magicMissile, ArcanusSoundEvents.MAGIC_MISSILE, SoundSource.PLAYERS, 2F, entity.getRandom().nextFloat() * 0.2F + 1.0F); + entity.level().addFreshEntity(magicMissile); + entity.level().playSound(null, magicMissile, ArcanusSoundEvents.MAGIC_MISSILE, SoundSource.PLAYERS, 2F, entity.getRandom().nextFloat() * 0.2F + 1.0F); } } diff --git a/src/main/java/dev/cammiescorner/arcanus/spell/SolarStrikeSpell.java b/src/main/java/dev/cammiescorner/arcanus/spell/SolarStrikeSpell.java index 3c2b51d..7a677b1 100644 --- a/src/main/java/dev/cammiescorner/arcanus/spell/SolarStrikeSpell.java +++ b/src/main/java/dev/cammiescorner/arcanus/spell/SolarStrikeSpell.java @@ -23,16 +23,16 @@ public void onCast(MagicCaster caster) { HitResult result = ArcanusHelper.raycast(entity, 640F, false); if (result.getType() == HitResult.Type.BLOCK && result instanceof BlockHitResult blockHitResult) { - if (entity instanceof Player player && !player.mayInteract(player.getLevel(), blockHitResult.getBlockPos())) { + if (entity instanceof Player player && !player.mayInteract(player.level(), blockHitResult.getBlockPos())) { player.displayClientMessage(Arcanus.translate("spell", "cannot_interact"), false); return; } ChunkPos chunkPos = new ChunkPos(blockHitResult.getBlockPos()); - ((ServerLevel) entity.getLevel()).setChunkForced(chunkPos.x, chunkPos.z, true); - SolarStrikeEntity solarStrike = new SolarStrikeEntity(entity, entity.getLevel()); + ((ServerLevel) entity.level()).setChunkForced(chunkPos.x, chunkPos.z, true); + SolarStrikeEntity solarStrike = new SolarStrikeEntity(entity, entity.level()); solarStrike.setPos(result.getLocation()); - entity.getLevel().addFreshEntity(solarStrike); + entity.level().addFreshEntity(solarStrike); } else { if (entity instanceof Player player) { player.displayClientMessage(Arcanus.translate("spell", "no_target"), false); diff --git a/src/main/java/dev/cammiescorner/arcanus/spell/TelekinesisSpell.java b/src/main/java/dev/cammiescorner/arcanus/spell/TelekinesisSpell.java index 2b0e10f..636cab8 100644 --- a/src/main/java/dev/cammiescorner/arcanus/spell/TelekinesisSpell.java +++ b/src/main/java/dev/cammiescorner/arcanus/spell/TelekinesisSpell.java @@ -37,19 +37,19 @@ public void onCast(MagicCaster caster) { Vec3 startPos = entity.getEyePosition(1F).add((entity.getRandom().nextInt(3) - 1) / startDivisor, (entity.getRandom().nextInt(3) - 1) / startDivisor, (entity.getRandom().nextInt(3) - 1) / startDivisor); Vec3 endPos = result.getLocation().add((entity.getRandom().nextInt(3) - 1) / endDivisor, (entity.getRandom().nextInt(3) - 1) / endDivisor, (entity.getRandom().nextInt(3) - 1) / endDivisor); - ArcanusHelper.drawLine(startPos, endPos, entity.getLevel(), 0.5F, (ParticleOptions) ArcanusParticles.TELEKINETIC_SHOCK); + ArcanusHelper.drawLine(startPos, endPos, entity.level(), 0.5F, (ParticleOptions) ArcanusParticles.TELEKINETIC_SHOCK); } - entity.getLevel().playSound(null, entity, ArcanusSoundEvents.TELEKINETIC_SHOCK, SoundSource.PLAYERS, 2F, entity.getRandom().nextFloat() * 0.2F + 1.0F); + entity.level().playSound(null, entity, ArcanusSoundEvents.TELEKINETIC_SHOCK, SoundSource.PLAYERS, 2F, entity.getRandom().nextFloat() * 0.2F + 1.0F); switch (result.getType()) { case ENTITY -> { BlockPos pos = ((EntityHitResult) result).getEntity().blockPosition(); - if (entity instanceof Player player && !player.mayInteract(entity.getLevel(), pos)) { + if (entity instanceof Player player && !player.mayInteract(entity.level(), pos)) { return; } - entity.getLevel().getEntities(entity, new AABB(pos), EntitySelector.ENTITY_STILL_ALIVE).forEach(target -> { + entity.level().getEntities(entity, new AABB(pos), EntitySelector.ENTITY_STILL_ALIVE).forEach(target -> { if (target instanceof AbstractArrow projectile) projectile.startFalling(); @@ -59,29 +59,29 @@ public void onCast(MagicCaster caster) { } case BLOCK -> { BlockPos pos = ((BlockHitResult) result).getBlockPos(); - if (entity instanceof Player player && !player.mayInteract(entity.getLevel(), pos)) { + if (entity instanceof Player player && !player.mayInteract(entity.level(), pos)) { return; } - BlockState state = entity.getLevel().getBlockState(pos); + BlockState state = entity.level().getBlockState(pos); Block block = state.getBlock(); if (block instanceof TntBlock) { - TntBlock.explode(entity.getLevel(), pos, entity); - entity.getLevel().removeBlock(pos, false); + TntBlock.explode(entity.level(), pos, entity); + entity.level().removeBlock(pos, false); - entity.getLevel().getEntitiesOfClass(PrimedTnt.class, new AABB(pos), tnt -> tnt.isAlive() && tnt.getOwner() == entity).forEach(target -> { + entity.level().getEntitiesOfClass(PrimedTnt.class, new AABB(pos), tnt -> tnt.isAlive() && tnt.getOwner() == entity).forEach(target -> { target.setDeltaMovement(rotation.scale(2.5F)); target.hurtMarked = true; }); } if (block instanceof FallingBlock fallingBlock) { - FallingBlockEntity target = FallingBlockEntity.fall(entity.getLevel(), pos, state); + FallingBlockEntity target = FallingBlockEntity.fall(entity.level(), pos, state); fallingBlock.falling(target); target.setDeltaMovement(rotation.scale(2.5F)); target.hurtMarked = true; - entity.getLevel().addFreshEntity(target); + entity.level().addFreshEntity(target); } } } diff --git a/src/main/java/dev/cammiescorner/arcanus/structure/processor/BookshelfReplacerStructureProcessor.java b/src/main/java/dev/cammiescorner/arcanus/structure/processor/BookshelfReplacerStructureProcessor.java index 9bd80ad..6bab796 100644 --- a/src/main/java/dev/cammiescorner/arcanus/structure/processor/BookshelfReplacerStructureProcessor.java +++ b/src/main/java/dev/cammiescorner/arcanus/structure/processor/BookshelfReplacerStructureProcessor.java @@ -27,9 +27,9 @@ public class BookshelfReplacerStructureProcessor extends StructureProcessor { @Nullable @Override public StructureTemplate.StructureBlockInfo processBlock(LevelReader world, BlockPos pos, BlockPos pivot, StructureTemplate.StructureBlockInfo structureInfoLocal, StructureTemplate.StructureBlockInfo structureInfoWorld, StructurePlaceSettings data) { - RandomSource random = data.getRandom(structureInfoWorld.pos); + RandomSource random = data.getRandom(structureInfoWorld.pos()); - if (!structureInfoWorld.state.is(Blocks.BOOKSHELF) || random.nextInt(5) > 0) + if (!structureInfoWorld.state().is(Blocks.BOOKSHELF) || random.nextInt(5) > 0) return structureInfoWorld; int bookCount = random.nextInt(5); @@ -43,7 +43,7 @@ public StructureTemplate.StructureBlockInfo processBlock(LevelReader world, Bloc state = state.setValue(FillableBookshelfBlock.BOOK_COUNT, bookCount); ContainerHelper.saveAllItems(nbt, inventory); - return new StructureTemplate.StructureBlockInfo(structureInfoWorld.pos, state, nbt); + return new StructureTemplate.StructureBlockInfo(structureInfoWorld.pos(), state, nbt); } @Override diff --git a/src/main/java/dev/cammiescorner/arcanus/structure/processor/LecternStructureProcessor.java b/src/main/java/dev/cammiescorner/arcanus/structure/processor/LecternStructureProcessor.java index 77f1eb4..503f81b 100644 --- a/src/main/java/dev/cammiescorner/arcanus/structure/processor/LecternStructureProcessor.java +++ b/src/main/java/dev/cammiescorner/arcanus/structure/processor/LecternStructureProcessor.java @@ -21,12 +21,12 @@ public class LecternStructureProcessor extends StructureProcessor { @Nullable @Override public StructureTemplate.StructureBlockInfo processBlock(LevelReader world, BlockPos pos, BlockPos pivot, StructureTemplate.StructureBlockInfo localBlockInfo, StructureTemplate.StructureBlockInfo absoluteBlockInfo, StructurePlaceSettings placementData) { - if (!absoluteBlockInfo.state.is(Blocks.LECTERN)) + if (!absoluteBlockInfo.state().is(Blocks.LECTERN)) return absoluteBlockInfo; - absoluteBlockInfo.nbt.put("Book", SpellBooks.getRandomSpellBook(placementData.getRandom(absoluteBlockInfo.pos)).save(new CompoundTag())); + absoluteBlockInfo.nbt().put("Book", SpellBooks.getRandomSpellBook(placementData.getRandom(absoluteBlockInfo.pos())).save(new CompoundTag())); - return new StructureTemplate.StructureBlockInfo(absoluteBlockInfo.pos, absoluteBlockInfo.state.setValue(LecternBlock.HAS_BOOK, true), absoluteBlockInfo.nbt); + return new StructureTemplate.StructureBlockInfo(absoluteBlockInfo.pos(), absoluteBlockInfo.state().setValue(LecternBlock.HAS_BOOK, true), absoluteBlockInfo.nbt()); } @Override diff --git a/src/main/java/dev/cammiescorner/arcanus/util/ArcanusHelper.java b/src/main/java/dev/cammiescorner/arcanus/util/ArcanusHelper.java index 485aafc..4377951 100644 --- a/src/main/java/dev/cammiescorner/arcanus/util/ArcanusHelper.java +++ b/src/main/java/dev/cammiescorner/arcanus/util/ArcanusHelper.java @@ -4,9 +4,6 @@ import dev.cammiescorner.arcanus.component.ArcanusComponents; import dev.cammiescorner.arcanus.registry.ArcanusItems; import dev.cammiescorner.arcanus.spell.Spell; -import org.jetbrains.annotations.ApiStatus; - -import java.util.Set; import net.minecraft.core.BlockPos; import net.minecraft.core.particles.ParticleOptions; import net.minecraft.nbt.CompoundTag; @@ -29,6 +26,9 @@ import net.minecraft.world.level.block.entity.LecternBlockEntity; import net.minecraft.world.phys.HitResult; import net.minecraft.world.phys.Vec3; +import org.jetbrains.annotations.ApiStatus; + +import java.util.Set; import static dev.cammiescorner.arcanus.registry.ArcanusEntityAttributes.*; @@ -40,7 +40,7 @@ public static HitResult raycast(Entity origin, double maxDistance, boolean hitsE Vec3 startPos = origin.getEyePosition(1F); Vec3 rotation = origin.getViewVector(1F); Vec3 endPos = startPos.add(rotation.x * maxDistance, rotation.y * maxDistance, rotation.z * maxDistance); - HitResult hitResult = origin.level.clip(new ClipContext(startPos, endPos, ClipContext.Block.COLLIDER, ClipContext.Fluid.NONE, origin)); + HitResult hitResult = origin.level().clip(new ClipContext(startPos, endPos, ClipContext.Block.COLLIDER, ClipContext.Fluid.NONE, origin)); if (hitResult.getType() != HitResult.Type.MISS) endPos = hitResult.getLocation(); @@ -109,7 +109,7 @@ public static void giveOrDrop(ServerPlayer player, ItemStack stack) { if (entity != null) entity.makeFakeItem(); - player.level.playSound(null, player, SoundEvents.ITEM_PICKUP, SoundSource.PLAYERS, 0.2F, ((player.getRandom().nextFloat() - player.getRandom().nextFloat()) * 0.7F + 1.0F) * 2.0F); + player.level().playSound(null, player, SoundEvents.ITEM_PICKUP, SoundSource.PLAYERS, 0.2F, ((player.getRandom().nextFloat() - player.getRandom().nextFloat()) * 0.7F + 1.0F) * 2.0F); player.inventoryMenu.broadcastChanges(); } else { ItemEntity entity = player.drop(stack, false); diff --git a/src/main/java/dev/cammiescorner/arcanus/util/EventHandler.java b/src/main/java/dev/cammiescorner/arcanus/util/EventHandler.java index 6e0c845..3906a51 100644 --- a/src/main/java/dev/cammiescorner/arcanus/util/EventHandler.java +++ b/src/main/java/dev/cammiescorner/arcanus/util/EventHandler.java @@ -2,9 +2,9 @@ import com.mojang.blaze3d.systems.RenderSystem; import dev.cammiescorner.arcanus.Arcanus; -import dev.cammiescorner.arcanus.component.base.MagicCaster; import dev.cammiescorner.arcanus.client.ArcanusClient; import dev.cammiescorner.arcanus.component.ArcanusComponents; +import dev.cammiescorner.arcanus.component.base.MagicCaster; import dev.cammiescorner.arcanus.item.WandItem; import dev.cammiescorner.arcanus.loot.function.SetSpellBookNbtLootFunction; import dev.cammiescorner.arcanus.registry.ArcanusEntityAttributes; @@ -13,7 +13,6 @@ import net.fabricmc.fabric.api.client.rendering.v1.HudRenderCallback; import net.fabricmc.fabric.api.loot.v2.LootTableEvents; import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.GuiComponent; import net.minecraft.core.Holder; import net.minecraft.core.Registry; import net.minecraft.core.registries.Registries; @@ -44,7 +43,7 @@ public class EventHandler { public static void clientEvents() { final Minecraft client = Minecraft.getInstance(); - HudRenderCallback.EVENT.register((matrices, tickDelta) -> { + HudRenderCallback.EVENT.register((drawContext, tickDelta) -> { if (client.cameraEntity instanceof Player player && !player.isSpectator() && !player.isCreative()) { MagicCaster caster = player.getComponent(ArcanusComponents.MAGIC_CASTER); @@ -65,20 +64,19 @@ public static void clientEvents() { float alpha = ArcanusClient.manaTimer > 20 ? 1F : ArcanusClient.manaTimer / 20F; RenderSystem.enableBlend(); - RenderSystem.setShaderTexture(0, HUD_ELEMENTS); RenderSystem.setShaderColor(1F, 1F, 1F, alpha); // Draw background for (int i = 0; i < 10; i++) - GuiComponent.blit(matrices, x - (i * 8), y, 0, 15, 9, 9, 256, 256); + drawContext.blit(HUD_ELEMENTS, x - (i * 8), y, 0, 15, 9, 9, 256, 256); // Draw full mana orb for (int i = 0; i < mana / 2; i++) - GuiComponent.blit(matrices, x - (i * 8), y, 0, 0, 8, 8, 256, 256); + drawContext.blit(HUD_ELEMENTS, x - (i * 8), y, 0, 0, 8, 8, 256, 256); // Draw half mana orb if (mana % 2 == 1) - GuiComponent.blit(matrices, x - ((mana / 2) * 8), y, 8, 0, 8, 8, 256, 256); + drawContext.blit(HUD_ELEMENTS, x - ((mana / 2) * 8), y, 8, 0, 8, 8, 256, 256); boolean manaLockOdd = manaLock % 2 == 1; boolean burnoutOdd = burnout % 2 == 1; @@ -89,21 +87,21 @@ public static void clientEvents() { // Draw full burnout orb for (int i = 0; i < adjustedBurnout; i++) if (manaLockOdd && i == 0) - GuiComponent.blit(matrices, x + adjustedManaLock, y, 32, 0, 8, 8, 256, 256); + drawContext.blit(HUD_ELEMENTS, x + adjustedManaLock, y, 32, 0, 8, 8, 256, 256); else - GuiComponent.blit(matrices, x + adjustedManaLock + (i * 8), y, 16, 0, 8, 8, 256, 256); + drawContext.blit(HUD_ELEMENTS, x + adjustedManaLock + (i * 8), y, 16, 0, 8, 8, 256, 256); // Draw half burnout orb if (burnoutOdd != manaLockOdd && burnout > 0) - GuiComponent.blit(matrices, x + adjustedManaLock + (adjustedBurnout * 8), y, 24, 0, 8, 8, 256, 256); + drawContext.blit(HUD_ELEMENTS, x + adjustedManaLock + (adjustedBurnout * 8), y, 24, 0, 8, 8, 256, 256); // Draw full mana lock orb for (int i = 0; i < manaLock / 2; i++) - GuiComponent.blit(matrices, x + (i * 8), y, 40, 0, 8, 8, 256, 256); + drawContext.blit(HUD_ELEMENTS, x + (i * 8), y, 40, 0, 8, 8, 256, 256); // Draw half mana lock orb if (manaLock % 2 == 1) - GuiComponent.blit(matrices, x + adjustedManaLock, y, 48, 0, 8, 8, 256, 256); + drawContext.blit(HUD_ELEMENTS, x + adjustedManaLock, y, 48, 0, 8, 8, 256, 256); } } });