From 7d97ddab9d25b993404d272ccdc0ed7df2d61ca7 Mon Sep 17 00:00:00 2001 From: James Seibel Date: Thu, 18 Nov 2021 22:52:53 -0600 Subject: [PATCH] Update IWorldWrapper use --- .../minecraft/IMinecraftWrapper.java | 5 ++--- .../world/IBiomeColorWrapperSingleton.java | 7 +++---- .../core/wrapperAdapters/world/IWorldWrapper.java | 4 +++- .../lod/wrappers/minecraft/MinecraftWrapper.java | 4 ++-- .../wrappers/world/BiomeColorWrapperSingleton.java | 13 +++++++------ .../com/seibel/lod/wrappers/world/WorldWrapper.java | 1 + 6 files changed, 18 insertions(+), 16 deletions(-) diff --git a/src/main/java/com/seibel/lod/core/wrapperAdapters/minecraft/IMinecraftWrapper.java b/src/main/java/com/seibel/lod/core/wrapperAdapters/minecraft/IMinecraftWrapper.java index 316391ef6..1fb884172 100644 --- a/src/main/java/com/seibel/lod/core/wrapperAdapters/minecraft/IMinecraftWrapper.java +++ b/src/main/java/com/seibel/lod/core/wrapperAdapters/minecraft/IMinecraftWrapper.java @@ -29,7 +29,6 @@ import com.seibel.lod.core.wrapperAdapters.chunk.AbstractChunkPosWrapper; import com.seibel.lod.core.wrapperAdapters.misc.ILightMapWrapper; import com.seibel.lod.core.wrapperAdapters.world.IDimensionTypeWrapper; import com.seibel.lod.core.wrapperAdapters.world.IWorldWrapper; -import com.seibel.lod.wrappers.world.WorldWrapper; import net.minecraft.profiler.IProfiler; @@ -112,9 +111,9 @@ public interface IMinecraftWrapper * the user is currently in. * @returns null if no ServerWorld is available */ - public WorldWrapper getWrappedServerWorld(); + public IWorldWrapper getWrappedServerWorld(); - public WorldWrapper getWrappedClientWorld(); + public IWorldWrapper getWrappedClientWorld(); public File getGameDirectory(); diff --git a/src/main/java/com/seibel/lod/core/wrapperAdapters/world/IBiomeColorWrapperSingleton.java b/src/main/java/com/seibel/lod/core/wrapperAdapters/world/IBiomeColorWrapperSingleton.java index 2a4c680f5..023f10856 100644 --- a/src/main/java/com/seibel/lod/core/wrapperAdapters/world/IBiomeColorWrapperSingleton.java +++ b/src/main/java/com/seibel/lod/core/wrapperAdapters/world/IBiomeColorWrapperSingleton.java @@ -20,7 +20,6 @@ package com.seibel.lod.core.wrapperAdapters.world; import com.seibel.lod.core.wrapperAdapters.block.AbstractBlockPosWrapper; -import com.seibel.lod.wrappers.world.WorldWrapper; /** @@ -32,7 +31,7 @@ public interface IBiomeColorWrapperSingleton { public IBiomeColorWrapperSingleton getInstance(); - public int getGrassColor(WorldWrapper world, AbstractBlockPosWrapper blockPos); - public int getWaterColor(WorldWrapper world, AbstractBlockPosWrapper blockPos); - public int getFoliageColor(WorldWrapper world, AbstractBlockPosWrapper blockPos); + public int getGrassColor(IWorldWrapper world, AbstractBlockPosWrapper blockPos); + public int getWaterColor(IWorldWrapper world, AbstractBlockPosWrapper blockPos); + public int getFoliageColor(IWorldWrapper world, AbstractBlockPosWrapper blockPos); } diff --git a/src/main/java/com/seibel/lod/core/wrapperAdapters/world/IWorldWrapper.java b/src/main/java/com/seibel/lod/core/wrapperAdapters/world/IWorldWrapper.java index 7fed1702a..48af03712 100644 --- a/src/main/java/com/seibel/lod/core/wrapperAdapters/world/IWorldWrapper.java +++ b/src/main/java/com/seibel/lod/core/wrapperAdapters/world/IWorldWrapper.java @@ -28,8 +28,10 @@ public interface IWorldWrapper public int getHeight(); + public int getSeaLevel(); + /** @throws UnsupportedOperationException if the WorldWrapper isn't for a ServerWorld */ public File getSaveFolder() throws UnsupportedOperationException; - + } diff --git a/src/main/java/com/seibel/lod/wrappers/minecraft/MinecraftWrapper.java b/src/main/java/com/seibel/lod/wrappers/minecraft/MinecraftWrapper.java index cca551e50..2475c10f6 100644 --- a/src/main/java/com/seibel/lod/wrappers/minecraft/MinecraftWrapper.java +++ b/src/main/java/com/seibel/lod/wrappers/minecraft/MinecraftWrapper.java @@ -248,7 +248,7 @@ public class MinecraftWrapper implements IMinecraftWrapper * @returns null if no ServerWorld is available */ @Override - public WorldWrapper getWrappedServerWorld() + public IWorldWrapper getWrappedServerWorld() { if (mc.level == null) return null; @@ -273,7 +273,7 @@ public class MinecraftWrapper implements IMinecraftWrapper } @Override - public WorldWrapper getWrappedClientWorld() + public IWorldWrapper getWrappedClientWorld() { return WorldWrapper.getWorldWrapper(mc.level); } diff --git a/src/main/java/com/seibel/lod/wrappers/world/BiomeColorWrapperSingleton.java b/src/main/java/com/seibel/lod/wrappers/world/BiomeColorWrapperSingleton.java index 969e3e45e..1e184720f 100644 --- a/src/main/java/com/seibel/lod/wrappers/world/BiomeColorWrapperSingleton.java +++ b/src/main/java/com/seibel/lod/wrappers/world/BiomeColorWrapperSingleton.java @@ -21,6 +21,7 @@ package com.seibel.lod.wrappers.world; import com.seibel.lod.core.wrapperAdapters.block.AbstractBlockPosWrapper; import com.seibel.lod.core.wrapperAdapters.world.IBiomeColorWrapperSingleton; +import com.seibel.lod.core.wrapperAdapters.world.IWorldWrapper; import com.seibel.lod.wrappers.block.BlockPosWrapper; import net.minecraft.world.biome.BiomeColors; @@ -43,18 +44,18 @@ public class BiomeColorWrapperSingleton implements IBiomeColorWrapperSingleton @Override - public int getGrassColor(WorldWrapper world, AbstractBlockPosWrapper blockPos) + public int getGrassColor(IWorldWrapper world, AbstractBlockPosWrapper blockPos) { - return BiomeColors.getAverageGrassColor(world.getWorld(), ((BlockPosWrapper) blockPos).getBlockPos()); + return BiomeColors.getAverageGrassColor(((WorldWrapper)world).getWorld(), ((BlockPosWrapper) blockPos).getBlockPos()); } @Override - public int getWaterColor(WorldWrapper world, AbstractBlockPosWrapper blockPos) + public int getWaterColor(IWorldWrapper world, AbstractBlockPosWrapper blockPos) { - return BiomeColors.getAverageWaterColor(world.getWorld(), ((BlockPosWrapper) blockPos).getBlockPos()); + return BiomeColors.getAverageWaterColor(((WorldWrapper)world).getWorld(), ((BlockPosWrapper) blockPos).getBlockPos()); } @Override - public int getFoliageColor(WorldWrapper world, AbstractBlockPosWrapper blockPos) + public int getFoliageColor(IWorldWrapper world, AbstractBlockPosWrapper blockPos) { - return BiomeColors.getAverageFoliageColor(world.getWorld(), ((BlockPosWrapper) blockPos).getBlockPos()); + return BiomeColors.getAverageFoliageColor(((WorldWrapper)world).getWorld(), ((BlockPosWrapper) blockPos).getBlockPos()); } } diff --git a/src/main/java/com/seibel/lod/wrappers/world/WorldWrapper.java b/src/main/java/com/seibel/lod/wrappers/world/WorldWrapper.java index 75bff7f04..b052edb1d 100644 --- a/src/main/java/com/seibel/lod/wrappers/world/WorldWrapper.java +++ b/src/main/java/com/seibel/lod/wrappers/world/WorldWrapper.java @@ -135,6 +135,7 @@ public class WorldWrapper implements IWorldWrapper return (ServerWorld) world; } + @Override public int getSeaLevel() { // TODO this is depreciated, what should we use instead?