WorldWrapper -> LevelWrapper
This commit is contained in:
@@ -42,7 +42,7 @@ import com.seibel.lod.wrappers.Block.BlockShapeWrapper;
|
||||
import com.seibel.lod.wrappers.Chunk.ChunkPosWrapper;
|
||||
import com.seibel.lod.wrappers.Chunk.ChunkWrapper;
|
||||
import com.seibel.lod.wrappers.World.BiomeWrapper;
|
||||
import com.seibel.lod.wrappers.World.WorldWrapper;
|
||||
import com.seibel.lod.wrappers.World.LevelWrapper;
|
||||
|
||||
import net.minecraft.world.DimensionType;
|
||||
import net.minecraft.world.IWorld;
|
||||
@@ -386,7 +386,7 @@ public class LodBuilder
|
||||
// 1 means the lighting is a guess
|
||||
int isDefault = 0;
|
||||
|
||||
WorldWrapper world = MinecraftWrapper.INSTANCE.getWrappedServerLevel();
|
||||
LevelWrapper world = MinecraftWrapper.INSTANCE.getWrappedServerLevel();
|
||||
|
||||
int blockBrightness = chunk.getEmittedBrightness(blockPos);
|
||||
// get the air block above or below this block
|
||||
|
||||
@@ -24,7 +24,7 @@ import java.io.File;
|
||||
import com.seibel.lod.util.LodUtil;
|
||||
import com.seibel.lod.wrappers.MinecraftWrapper;
|
||||
|
||||
import com.seibel.lod.wrappers.World.WorldWrapper;
|
||||
import com.seibel.lod.wrappers.World.LevelWrapper;
|
||||
import net.minecraft.util.math.ChunkPos;
|
||||
import net.minecraft.world.chunk.IChunk;
|
||||
import net.minecraft.world.chunk.storage.ChunkSerializer;
|
||||
@@ -39,7 +39,7 @@ public class ChunkLoader
|
||||
{
|
||||
public static IChunk getChunkFromFile(ChunkPos pos){
|
||||
|
||||
WorldWrapper clientLevel = MinecraftWrapper.INSTANCE.getWrappedClientLevel();
|
||||
LevelWrapper clientLevel = MinecraftWrapper.INSTANCE.getWrappedClientLevel();
|
||||
if (clientLevel == null)
|
||||
return null;
|
||||
ServerWorld serverWorld = LodUtil.getServerWorldFromDimension(clientLevel.getWorld().dimensionType());
|
||||
|
||||
@@ -28,7 +28,7 @@ import com.seibel.lod.util.LodUtil;
|
||||
|
||||
import com.seibel.lod.wrappers.Block.BlockPosWrapper;
|
||||
import com.seibel.lod.wrappers.Chunk.ChunkPosWrapper;
|
||||
import com.seibel.lod.wrappers.World.WorldWrapper;
|
||||
import com.seibel.lod.wrappers.World.LevelWrapper;
|
||||
import net.minecraft.client.GameSettings;
|
||||
import net.minecraft.client.MainWindow;
|
||||
import net.minecraft.client.Minecraft;
|
||||
@@ -199,12 +199,12 @@ public class MinecraftWrapper
|
||||
return mc.level;
|
||||
}
|
||||
|
||||
public WorldWrapper getWrappedClientLevel()
|
||||
public LevelWrapper getWrappedClientLevel()
|
||||
{
|
||||
return WorldWrapper.getWorldWrapper(mc.level);
|
||||
return LevelWrapper.getLevelWrapper(mc.level);
|
||||
}
|
||||
|
||||
public WorldWrapper getWrappedServerLevel()
|
||||
public LevelWrapper getWrappedServerLevel()
|
||||
{
|
||||
|
||||
if (mc.level == null)
|
||||
@@ -226,7 +226,7 @@ public class MinecraftWrapper
|
||||
}
|
||||
}
|
||||
|
||||
return WorldWrapper.getWorldWrapper(returnWorld);
|
||||
return LevelWrapper.getLevelWrapper(returnWorld);
|
||||
}
|
||||
|
||||
/** Measured in chunks */
|
||||
|
||||
@@ -7,18 +7,18 @@ import net.minecraft.world.biome.BiomeColors;
|
||||
public class BiomeColorWrapper
|
||||
{
|
||||
|
||||
public static int getGrassColor(WorldWrapper worldWrapper, BlockPosWrapper blockPosWrapper)
|
||||
public static int getGrassColor(LevelWrapper levelWrapper, BlockPosWrapper blockPosWrapper)
|
||||
{
|
||||
return BiomeColors.getAverageGrassColor(worldWrapper.getWorld(), blockPosWrapper.getBlockPos());
|
||||
return BiomeColors.getAverageGrassColor(levelWrapper.getWorld(), blockPosWrapper.getBlockPos());
|
||||
}
|
||||
public static int getWaterColor(WorldWrapper worldWrapper, BlockPosWrapper blockPosWrapper)
|
||||
public static int getWaterColor(LevelWrapper levelWrapper, BlockPosWrapper blockPosWrapper)
|
||||
{
|
||||
|
||||
return BiomeColors.getAverageWaterColor(worldWrapper.getWorld(), blockPosWrapper.getBlockPos());
|
||||
return BiomeColors.getAverageWaterColor(levelWrapper.getWorld(), blockPosWrapper.getBlockPos());
|
||||
}
|
||||
public static int getFoliageColor(WorldWrapper worldWrapper, BlockPosWrapper blockPosWrapper)
|
||||
public static int getFoliageColor(LevelWrapper levelWrapper, BlockPosWrapper blockPosWrapper)
|
||||
{
|
||||
|
||||
return BiomeColors.getAverageFoliageColor(worldWrapper.getWorld(), blockPosWrapper.getBlockPos());
|
||||
return BiomeColors.getAverageFoliageColor(levelWrapper.getWorld(), blockPosWrapper.getBlockPos());
|
||||
}
|
||||
}
|
||||
|
||||
+7
-7
@@ -6,18 +6,18 @@ import net.minecraft.world.IWorld;
|
||||
import java.util.concurrent.ConcurrentHashMap;
|
||||
import java.util.concurrent.ConcurrentMap;
|
||||
|
||||
public class WorldWrapper
|
||||
public class LevelWrapper
|
||||
{
|
||||
private static final ConcurrentMap<IWorld, WorldWrapper> worldWrapperMap = new ConcurrentHashMap<>();
|
||||
private static final ConcurrentMap<IWorld, LevelWrapper> worldWrapperMap = new ConcurrentHashMap<>();
|
||||
private final IWorld world;
|
||||
|
||||
public WorldWrapper(IWorld world)
|
||||
public LevelWrapper(IWorld world)
|
||||
{
|
||||
this.world = world;
|
||||
}
|
||||
|
||||
|
||||
public static WorldWrapper getWorldWrapper(IWorld world)
|
||||
public static LevelWrapper getLevelWrapper(IWorld world)
|
||||
{
|
||||
//first we check if the biome has already been wrapped
|
||||
if(worldWrapperMap.containsKey(world) && worldWrapperMap.get(world) != null)
|
||||
@@ -25,11 +25,11 @@ public class WorldWrapper
|
||||
|
||||
|
||||
//if it hasn't been created yet, we create it and save it in the map
|
||||
WorldWrapper worldWrapper = new WorldWrapper(world);
|
||||
worldWrapperMap.put(world, worldWrapper);
|
||||
LevelWrapper levelWrapper = new LevelWrapper(world);
|
||||
worldWrapperMap.put(world, levelWrapper);
|
||||
|
||||
//we return the newly created wrapper
|
||||
return worldWrapper;
|
||||
return levelWrapper;
|
||||
}
|
||||
|
||||
public static void clearMap()
|
||||
Reference in New Issue
Block a user