From 37e69ca6b2f74bf287fb426c12b96553bfd72268 Mon Sep 17 00:00:00 2001 From: Frank Date: Wed, 17 May 2023 14:47:13 +0200 Subject: [PATCH] `level` is a getter now --- .../betterx/bclib/client/render/CustomFogRenderer.java | 8 ++++---- .../org/betterx/bclib/items/elytra/BCLElytraItem.java | 2 +- .../org/betterx/bclib/mixin/common/AnvilMenuMixin.java | 6 +++--- .../org/betterx/bclib/mixin/common/boat/BoatMixin.java | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/main/java/org/betterx/bclib/client/render/CustomFogRenderer.java b/src/main/java/org/betterx/bclib/client/render/CustomFogRenderer.java index 45048abe..a6cf7cbd 100644 --- a/src/main/java/org/betterx/bclib/client/render/CustomFogRenderer.java +++ b/src/main/java/org/betterx/bclib/client/render/CustomFogRenderer.java @@ -39,8 +39,8 @@ public class CustomFogRenderer { } Entity entity = camera.getEntity(); - if (!isForcedDimension(entity.level) && shouldIgnoreArea( - entity.level, + if (!isForcedDimension(entity.level()) && shouldIgnoreArea( + entity.level(), (int) entity.getX(), (int) entity.getEyeY(), (int) entity.getZ() @@ -50,14 +50,14 @@ public class CustomFogRenderer { } float fog = getFogDensity( - entity.level, + entity.level(), entity.getX(), entity.getEyeY(), entity.getZ() ) * Configs.CLIENT_CONFIG.fogDensity(); BackgroundInfo.fogDensity = fog; - if (thickFog(thickFog, entity.level)) { + if (thickFog(thickFog, entity.level())) { fogStart = viewDistance * 0.05F / fog; fogEnd = Math.min(viewDistance, 192.0F) * 0.5F / fog; } else { diff --git a/src/main/java/org/betterx/bclib/items/elytra/BCLElytraItem.java b/src/main/java/org/betterx/bclib/items/elytra/BCLElytraItem.java index 2671ff5f..762c9a55 100644 --- a/src/main/java/org/betterx/bclib/items/elytra/BCLElytraItem.java +++ b/src/main/java/org/betterx/bclib/items/elytra/BCLElytraItem.java @@ -20,7 +20,7 @@ public interface BCLElytraItem extends FabricElytraItem { static void vanillaElytraTick(LivingEntity entity, ItemStack chestStack) { int nextRoll = entity.getFallFlyingTicks() + 1; - if (!entity.level.isClientSide && nextRoll % 10 == 0) { + if (!entity.level().isClientSide && nextRoll % 10 == 0) { if ((nextRoll / 10) % 2 == 0) { chestStack.hurtAndBreak(1, entity, (e) -> BCLElytraUtils.onBreak.accept(e, chestStack)); } diff --git a/src/main/java/org/betterx/bclib/mixin/common/AnvilMenuMixin.java b/src/main/java/org/betterx/bclib/mixin/common/AnvilMenuMixin.java index a27eff36..eb108950 100644 --- a/src/main/java/org/betterx/bclib/mixin/common/AnvilMenuMixin.java +++ b/src/main/java/org/betterx/bclib/mixin/common/AnvilMenuMixin.java @@ -124,8 +124,8 @@ public abstract class AnvilMenuMixin extends ItemCombinerMenu implements AnvilSc @Inject(method = "createResult", at = @At("HEAD"), cancellable = true) public void bcl_updateOutput(CallbackInfo info) { - RecipeManager recipeManager = this.player.level.getRecipeManager(); - be_recipes = recipeManager.getRecipesFor(AnvilRecipe.TYPE, inputSlots, player.level); + RecipeManager recipeManager = this.player.level().getRecipeManager(); + be_recipes = recipeManager.getRecipesFor(AnvilRecipe.TYPE, inputSlots, player.level()); if (be_recipes.size() > 0) { int anvilLevel = this.anvilLevel.get(); be_recipes = be_recipes.stream() @@ -164,7 +164,7 @@ public abstract class AnvilMenuMixin extends ItemCombinerMenu implements AnvilSc private void bcl_updateResult() { if (bcl_currentRecipe == null) return; - resultSlots.setItem(0, bcl_currentRecipe.assemble(inputSlots, this.player.level.registryAccess())); + resultSlots.setItem(0, bcl_currentRecipe.assemble(inputSlots, this.player.level().registryAccess())); broadcastChanges(); } diff --git a/src/main/java/org/betterx/bclib/mixin/common/boat/BoatMixin.java b/src/main/java/org/betterx/bclib/mixin/common/boat/BoatMixin.java index 51be3a50..9a4bda53 100644 --- a/src/main/java/org/betterx/bclib/mixin/common/boat/BoatMixin.java +++ b/src/main/java/org/betterx/bclib/mixin/common/boat/BoatMixin.java @@ -98,7 +98,7 @@ public abstract class BoatMixin extends Entity implements CustomBoatTypeOverride void bcl_checkFallDamage(double d, boolean bl, BlockState blockState, BlockPos blockPos, CallbackInfo ci) { BoatTypeOverride type = this.bcl_getCustomType(); if (type != null) { - if (this.level.getGameRules().getBoolean(GameRules.RULE_DOENTITYDROPS)) { + if (this.level().getGameRules().getBoolean(GameRules.RULE_DOENTITYDROPS)) { for (int i = 0; i < 3; ++i) { this.spawnAtLocation(type.getPlanks()); }