Update IWorldWrapper use

This commit is contained in:
James Seibel
2021-11-18 22:52:53 -06:00
parent defe3c3a5f
commit 7d97ddab9d
6 changed files with 18 additions and 16 deletions
@@ -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();
@@ -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);
}
@@ -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;
}
@@ -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);
}
@@ -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());
}
}
@@ -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?