deprecate getWorld in favor to getLevel

deirn · deirn · commit d2c8b2ce910f · 2026-01-21T02:13:06.000+07:00
(cherry picked from commit f7d89dc) (cherry picked from commit 9335a2c)
diff --git a/platform/textile/src/plugin/java/mcp/mobius/waila/plugin/textile/provider/FluidStorageProvider.java b/platform/textile/src/plugin/java/mcp/mobius/waila/plugin/textile/provider/FluidStorageProvider.java
@@ -17,7 +17,6 @@
 import net.fabricmc.fabric.api.transfer.v1.storage.StorageView;
 import net.fabricmc.fabric.api.transfer.v1.storage.base.SingleSlotStorage;
 import net.minecraft.core.Direction;
-import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import org.jetbrains.annotations.Nullable;
 
@@ -33,7 +32,7 @@ public enum FluidStorageProvider implements IDataProvider<BlockEntity> {
     public void appendData(IDataWriter data, IServerAccessor<BlockEntity> accessor, IPluginConfig config) {
         data.add(FluidData.class, res -> {
             if (cache == null || cache.getBlockEntity() != accessor.getTarget()) {
-                cache = BlockApiCache.create(FluidStorage.SIDED, (ServerLevel) accessor.getWorld(), accessor.getTarget().getBlockPos());
+                cache = BlockApiCache.create(FluidStorage.SIDED, accessor.getLevel(), accessor.getTarget().getBlockPos());
             }
 
             var storage = cache.find(accessor.getTarget().getBlockState(), null);
diff --git a/platform/textile/src/plugin/java/mcp/mobius/waila/plugin/textile/provider/ItemStorageProvider.java b/platform/textile/src/plugin/java/mcp/mobius/waila/plugin/textile/provider/ItemStorageProvider.java
@@ -17,7 +17,6 @@
 import net.fabricmc.fabric.api.transfer.v1.storage.StorageView;
 import net.fabricmc.fabric.api.transfer.v1.storage.base.SingleSlotStorage;
 import net.minecraft.core.Direction;
-import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import org.jetbrains.annotations.Nullable;
 
@@ -33,7 +32,7 @@ public enum ItemStorageProvider implements IDataProvider<BlockEntity> {
     public void appendData(IDataWriter data, IServerAccessor<BlockEntity> accessor, IPluginConfig config) {
         data.add(ItemData.class, res -> {
             if (cache == null || cache.getBlockEntity() != accessor.getTarget()) {
-                cache = BlockApiCache.create(ItemStorage.SIDED, (ServerLevel) accessor.getWorld(), accessor.getTarget().getBlockPos());
+                cache = BlockApiCache.create(ItemStorage.SIDED, accessor.getLevel(), accessor.getTarget().getBlockPos());
             }
 
             var storage = cache.find(accessor.getTarget().getBlockState(), null);
diff --git a/platform/textile/src/plugin/java/mcp/mobius/waila/plugin/trenergy/provider/EnergyStorageProvider.java b/platform/textile/src/plugin/java/mcp/mobius/waila/plugin/trenergy/provider/EnergyStorageProvider.java
@@ -7,7 +7,6 @@
 import mcp.mobius.waila.api.data.EnergyData;
 import net.fabricmc.fabric.api.lookup.v1.block.BlockApiCache;
 import net.minecraft.core.Direction;
-import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import org.jetbrains.annotations.Nullable;
 import team.reborn.energy.api.EnergyStorage;
@@ -23,7 +22,7 @@ public enum EnergyStorageProvider implements IDataProvider<BlockEntity> {
     public void appendData(IDataWriter data, IServerAccessor<BlockEntity> accessor, IPluginConfig config) {
         data.add(EnergyData.class, res -> {
             if (cache == null || cache.getBlockEntity() != accessor.getTarget()) {
-                cache = BlockApiCache.create(EnergyStorage.SIDED, (ServerLevel) accessor.getWorld(), accessor.getTarget().getBlockPos());
+                cache = BlockApiCache.create(EnergyStorage.SIDED, accessor.getLevel(), accessor.getTarget().getBlockPos());
             }
 
             var storage = cache.find(accessor.getTarget().getBlockState(), null);
diff --git a/src/api/java/mcp/mobius/waila/api/IBlockAccessor.java b/src/api/java/mcp/mobius/waila/api/IBlockAccessor.java
@@ -23,7 +23,7 @@
 @ApiStatus.NonExtendable
 public interface IBlockAccessor {
 
-    Level getWorld();
+    Level getLevel();
 
     Player getPlayer();
 
@@ -57,6 +57,10 @@ public interface IBlockAccessor {
 
     float getFrameTime();
 
+    /** @deprecated use {@link #getLevel()} */
+    @Deprecated
+    Level getWorld();
+
     // -----------------------------------------------------------------------------------------------------------------------------------------------
     // TODO: Remove
 
diff --git a/src/api/java/mcp/mobius/waila/api/ICommonAccessor.java b/src/api/java/mcp/mobius/waila/api/ICommonAccessor.java
@@ -22,7 +22,7 @@
 @ApiStatus.NonExtendable
 public interface ICommonAccessor {
 
-    Level getWorld();
+    Level getLevel();
 
     Player getPlayer();
 
@@ -60,6 +60,10 @@ public interface ICommonAccessor {
 
     float getFrameTime();
 
+    /** @deprecated use {@link #getLevel()} */
+    @Deprecated
+    Level getWorld();
+
     // -----------------------------------------------------------------------------------------------------------------------------------------------
     // TODO: Remove
 
diff --git a/src/api/java/mcp/mobius/waila/api/IEntityAccessor.java b/src/api/java/mcp/mobius/waila/api/IEntityAccessor.java
@@ -18,7 +18,7 @@
 @ApiStatus.NonExtendable
 public interface IEntityAccessor {
 
-    Level getWorld();
+    Level getLevel();
 
     Player getPlayer();
 
@@ -43,6 +43,10 @@ public interface IEntityAccessor {
 
     float getFrameTime();
 
+    /** @deprecated use {@link #getLevel()} */
+    @Deprecated
+    Level getWorld();
+
     // -----------------------------------------------------------------------------------------------------------------------------------------------
     // TODO: Remove
 
diff --git a/src/api/java/mcp/mobius/waila/api/IServerAccessor.java b/src/api/java/mcp/mobius/waila/api/IServerAccessor.java
@@ -1,6 +1,7 @@
 package mcp.mobius.waila.api;
 
 import mcp.mobius.waila.api.__internal__.ApiSide;
+import net.minecraft.server.level.ServerLevel;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.phys.HitResult;
@@ -10,13 +11,13 @@
 @ApiStatus.NonExtendable
 public interface IServerAccessor<T> {
 
-    Level getWorld();
+    ServerLevel getLevel();
 
     ServerPlayer getPlayer();
 
     <H extends HitResult> H getHitResult();
 
-    T getTarget();
+     T getTarget();
 
     /**
      * Returns additional context synced from the client.
@@ -26,4 +27,10 @@ public interface IServerAccessor<T> {
      */
     IDataReader getContext();
 
+    /** @deprecated use {@link #getLevel()} */
+    @Deprecated
+    default Level getWorld() {
+        return getLevel();
+    }
+
 }
diff --git a/src/main/java/mcp/mobius/waila/access/ClientAccessor.java b/src/main/java/mcp/mobius/waila/access/ClientAccessor.java
@@ -48,6 +48,11 @@ public enum ClientAccessor implements ICommonAccessor, IBlockAccessor, IEntityAc
     private double rayCastMaxDistance;
     private float frameTime;
 
+    @Override
+    public Level getLevel() {
+        return this.world;
+    }
+
     @Override
     public Level getWorld() {
         return this.world;
diff --git a/src/main/java/mcp/mobius/waila/access/ServerAccessor.java b/src/main/java/mcp/mobius/waila/access/ServerAccessor.java
@@ -2,22 +2,22 @@
 
 import mcp.mobius.waila.api.IDataReader;
 import mcp.mobius.waila.api.IServerAccessor;
+import net.minecraft.server.level.ServerLevel;
 import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.world.level.Level;
 import net.minecraft.world.phys.HitResult;
 
 public enum ServerAccessor implements IServerAccessor<Object> {
 
     INSTANCE;
 
-    private Level world;
+    private ServerLevel level;
     private ServerPlayer player;
     private HitResult hitResult;
     private Object target;
 
     @SuppressWarnings("unchecked")
-    public <T> IServerAccessor<T> set(Level world, ServerPlayer player, HitResult hitResult, Object target) {
-        this.world = world;
+    public <T> IServerAccessor<T> set(ServerLevel level, ServerPlayer player, HitResult hitResult, Object target) {
+        this.level = level;
         this.player = player;
         this.hitResult = hitResult;
         this.target = target;
@@ -26,8 +26,8 @@ public <T> IServerAccessor<T> set(Level world, ServerPlayer player, HitResult hi
     }
 
     @Override
-    public Level getWorld() {
-        return world;
+    public ServerLevel getLevel() {
+        return level;
     }
 
     @Override
@@ -42,6 +42,7 @@ public <H extends HitResult> H getHitResult() {
     }
 
     @Override
+    @SuppressWarnings("unchecked")
     public Object getTarget() {
         return target;
     }
diff --git a/src/pluginCore/java/mcp/mobius/waila/plugin/core/provider/BlockProvider.java b/src/pluginCore/java/mcp/mobius/waila/plugin/core/provider/BlockProvider.java
@@ -33,7 +33,7 @@ public enum BlockProvider implements IBlockComponentProvider {
 
     @Override
     public ITooltipComponent getIcon(IBlockAccessor accessor, IPluginConfig config) {
-        return new ItemComponent(accessor.getBlock().getCloneItemStack(accessor.getWorld(), accessor.getPosition(), accessor.getBlockState()));
+        return new ItemComponent(accessor.getBlock().getCloneItemStack(accessor.getLevel(), accessor.getPosition(), accessor.getBlockState()));
     }
 
     @Override
diff --git a/src/pluginHarvest/java/mcp/mobius/waila/plugin/harvest/provider/HarvestProvider.java b/src/pluginHarvest/java/mcp/mobius/waila/plugin/harvest/provider/HarvestProvider.java
@@ -1,6 +1,6 @@
 package mcp.mobius.waila.plugin.harvest.provider;
 
-import java.awt.Rectangle;
+import java.awt.*;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -60,7 +60,7 @@ public void appendBody(ITooltip tooltip, IBlockAccessor accessor, IPluginConfig
         updateId = accessor.getUpdateId();
         state = accessor.getBlockState();
 
-        var unbreakable = state.getDestroySpeed(accessor.getWorld(), accessor.getPosition()) < 0;
+        var unbreakable = state.getDestroySpeed(accessor.getLevel(), accessor.getPosition()) < 0;
 
         var tools = toolsCache.get(state);
         if (tools == null) {
diff --git a/src/pluginTest/java/mcp/mobius/waila/plugin/test/CustomIconTest.java b/src/pluginTest/java/mcp/mobius/waila/plugin/test/CustomIconTest.java
@@ -18,7 +18,7 @@ public enum CustomIconTest implements IBlockComponentProvider {
     @Nullable
     @Override
     public ITooltipComponent getIcon(IBlockAccessor accessor, IPluginConfig config) {
-        var random = (int) Mth.randomBetween(accessor.getWorld().getRandom(), 10, 30);
+        var random = (int) Mth.randomBetween(accessor.getLevel().getRandom(), 10, 30);
         return config.getBoolean(ENABLED) ? new ColorComponent(random, random, 0xFF770000) : null;
     }
 
diff --git a/src/pluginVanilla/java/mcp/mobius/waila/plugin/vanilla/provider/NoteBlockProvider.java b/src/pluginVanilla/java/mcp/mobius/waila/plugin/vanilla/provider/NoteBlockProvider.java
@@ -42,7 +42,7 @@ public void appendBody(ITooltip tooltip, IBlockAccessor accessor, IPluginConfig
 
             Component instrumentText;
             if (instrument.hasCustomSound()) {
-                var soundId = ((NoteBlockAccess) accessor.getBlock()).wthit_getCustomSoundId(accessor.getWorld(), accessor.getPosition());
+                var soundId = ((NoteBlockAccess) accessor.getBlock()).wthit_getCustomSoundId(accessor.getLevel(), accessor.getPosition());
                 instrumentText = soundId == null
                     ? Component.translatable(Tl.Tooltip.Instrument.NONE)
                     : Component.literal(soundId.toString()).withStyle(ChatFormatting.DARK_PURPLE);
diff --git a/src/pluginVanilla/java/mcp/mobius/waila/plugin/vanilla/provider/PlantProvider.java b/src/pluginVanilla/java/mcp/mobius/waila/plugin/vanilla/provider/PlantProvider.java
@@ -43,12 +43,12 @@ private static void addGrowableTooltip(ITooltip tooltip, ResourceLocation tag, S
     }
 
     private static void addCropGrowableTooltip(ITooltip tooltip, IBlockAccessor accessor) {
-        var lightLevel = accessor.getWorld().getRawBrightness(accessor.getPosition(), 0);
+        var lightLevel = accessor.getLevel().getRawBrightness(accessor.getPosition(), 0);
         addGrowableTooltip(tooltip, Options.PLANT_CROP_GROWABLE, Tl.Tooltip.CROP_GROWABLE, lightLevel >= 9);
     }
 
     private static void addTreeGrowableTooltip(ITooltip tooltip, IBlockAccessor accessor) {
-        var lightLevel = accessor.getWorld().getRawBrightness(accessor.getPosition(), 0);
+        var lightLevel = accessor.getLevel().getRawBrightness(accessor.getPosition(), 0);
         var growable = lightLevel >= 9;
         if (accessor.getBlock() instanceof MangrovePropaguleBlock
             && accessor.getBlockState().getValue(MangrovePropaguleBlock.HANGING)) {
diff --git a/src/pluginVanilla/java/mcp/mobius/waila/plugin/vanilla/provider/SpawnerProvider.java b/src/pluginVanilla/java/mcp/mobius/waila/plugin/vanilla/provider/SpawnerProvider.java
@@ -17,7 +17,7 @@ public enum SpawnerProvider implements IBlockComponentProvider {
     public void appendHead(ITooltip tooltip, IBlockAccessor accessor, IPluginConfig config) {
         if (config.getBoolean(Options.SPAWNER_TYPE)) {
             SpawnerBlockEntity spawner = accessor.getBlockEntity();
-            var entity = spawner != null ? spawner.getSpawner().getOrCreateDisplayEntity(accessor.getWorld(), accessor.getWorld().random, spawner.getBlockPos()) : null;
+            var entity = spawner != null ? spawner.getSpawner().getOrCreateDisplayEntity(accessor.getLevel(), accessor.getLevel().random, spawner.getBlockPos()) : null;
             if (entity != null) {
                 var name = entity.getDisplayName();
 
diff --git a/src/pluginVanilla/java/mcp/mobius/waila/plugin/vanilla/provider/data/HopperContainerDataProvider.java b/src/pluginVanilla/java/mcp/mobius/waila/plugin/vanilla/provider/data/HopperContainerDataProvider.java
@@ -15,7 +15,7 @@ public enum HopperContainerDataProvider implements IDataProvider<BlockEntity> {
     @Override
     public void appendData(IDataWriter data, IServerAccessor<BlockEntity> accessor, IPluginConfig config) {
         data.add(ItemData.class, res -> {
-            var container = HopperBlockEntity.getContainerAt(accessor.getWorld(), accessor.getTarget().getBlockPos());
+            var container = HopperBlockEntity.getContainerAt(accessor.getLevel(), accessor.getTarget().getBlockPos());
             if (container != null) res.add(ItemData.of(config).vanilla(container));
         });
     }

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public enum BlockProvider implements IBlockComponentProvider {`
`33`	`33`
`34`	`34`	`@Override`
`35`	`35`	`public ITooltipComponent getIcon(IBlockAccessor accessor, IPluginConfig config) {`
`36`		`- return new ItemComponent(accessor.getBlock().getCloneItemStack(accessor.getWorld(), accessor.getPosition(), accessor.getBlockState()));`
	`36`	`+ return new ItemComponent(accessor.getBlock().getCloneItemStack(accessor.getLevel(), accessor.getPosition(), accessor.getBlockState()));`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`@Override`