From 7555073c148ca88b98632397281ab8972a2531d4 Mon Sep 17 00:00:00 2001 From: James Seibel Date: Thu, 9 Jun 2022 21:11:52 -0500 Subject: [PATCH] Prepend "E" to all enums --- .../common/wrappers/McObjectConverter.java | 14 ++++++------ .../lod/common/wrappers/VersionConstants.java | 1 - .../wrappers/block/BlockDetailWrapper.java | 6 ++--- .../common/wrappers/chunk/ChunkWrapper.java | 4 ++-- .../minecraft/MinecraftClientWrapper.java | 5 ++--- .../common/wrappers/world/WorldWrapper.java | 16 +++++++------- .../BatchGenerationEnvironment.java | 22 +++++++++---------- .../worldGeneration/GenerationEvent.java | 7 +++--- .../mimicObject/LightedWorldGenRegion.java | 12 +++++----- core | 2 +- 10 files changed, 42 insertions(+), 47 deletions(-) diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/McObjectConverter.java b/common/src/main/java/com/seibel/lod/common/wrappers/McObjectConverter.java index c0bda1689..669840260 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/McObjectConverter.java +++ b/common/src/main/java/com/seibel/lod/common/wrappers/McObjectConverter.java @@ -24,7 +24,7 @@ import java.util.function.BiConsumer; import java.util.function.Consumer; import com.mojang.math.Matrix4f; -import com.seibel.lod.core.enums.LodDirection; +import com.seibel.lod.core.enums.ELodDirection; import com.seibel.lod.core.objects.DHBlockPos; import com.seibel.lod.core.objects.DHChunkPos; import com.seibel.lod.core.objects.math.Mat4f; @@ -54,12 +54,12 @@ public class McObjectConverter static final Direction[] directions; - static final LodDirection[] lodDirections; + static final ELodDirection[] lodDirections; static { - LodDirection[] lodDirs = LodDirection.values(); + ELodDirection[] lodDirs = ELodDirection.values(); directions = new Direction[lodDirs.length]; - lodDirections = new LodDirection[lodDirs.length]; - for (LodDirection lodDir : lodDirs) { + lodDirections = new ELodDirection[lodDirs.length]; + for (ELodDirection lodDir : lodDirs) { Direction dir = Direction.byName(lodDir.name()); directions[lodDir.ordinal()] = dir; lodDirections[dir.ordinal()] = lodDir; @@ -73,11 +73,11 @@ public class McObjectConverter return new ChunkPos(wrappedPos.x, wrappedPos.z); } - public static Direction Convert(LodDirection lodDirection) + public static Direction Convert(ELodDirection lodDirection) { return directions[lodDirection.ordinal()]; } - public static LodDirection Convert(Direction direction) + public static ELodDirection Convert(Direction direction) { return lodDirections[direction.ordinal()]; } diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/VersionConstants.java b/common/src/main/java/com/seibel/lod/common/wrappers/VersionConstants.java index 94462547e..77144803e 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/VersionConstants.java +++ b/common/src/main/java/com/seibel/lod/common/wrappers/VersionConstants.java @@ -19,7 +19,6 @@ package com.seibel.lod.common.wrappers; -import com.seibel.lod.core.enums.config.DistanceGenerationMode; import com.seibel.lod.core.wrapperInterfaces.IVersionConstants; /** diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/block/BlockDetailWrapper.java b/common/src/main/java/com/seibel/lod/common/wrappers/block/BlockDetailWrapper.java index ff4c80a03..f6693b567 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/block/BlockDetailWrapper.java +++ b/common/src/main/java/com/seibel/lod/common/wrappers/block/BlockDetailWrapper.java @@ -25,7 +25,7 @@ import java.util.Random; import com.seibel.lod.common.wrappers.McObjectConverter; import com.seibel.lod.common.wrappers.chunk.ChunkWrapper; -import com.seibel.lod.core.enums.LodDirection; +import com.seibel.lod.core.enums.ELodDirection; import com.seibel.lod.core.handlers.dependencyInjection.SingletonHandler; import com.seibel.lod.core.objects.DHBlockPos; import com.seibel.lod.core.util.ColorUtil; @@ -271,7 +271,7 @@ public class BlockDetailWrapper extends IBlockDetailWrapper } @Override - public int getAndResolveFaceColor(LodDirection dir, IChunkWrapper chunk, DHBlockPos blockPos) + public int getAndResolveFaceColor(ELodDirection dir, IChunkWrapper chunk, DHBlockPos blockPos) { // FIXME: impl per-face colors resolveColors(); @@ -284,7 +284,7 @@ public class BlockDetailWrapper extends IBlockDetailWrapper } @Override - public boolean hasFaceCullingFor(LodDirection dir) + public boolean hasFaceCullingFor(ELodDirection dir) { //resolveShapes(); return !dontOccludeFaces[dir.ordinal()]; diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/chunk/ChunkWrapper.java b/common/src/main/java/com/seibel/lod/common/wrappers/chunk/ChunkWrapper.java index d704f3b1a..8a5e7271a 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/chunk/ChunkWrapper.java +++ b/common/src/main/java/com/seibel/lod/common/wrappers/chunk/ChunkWrapper.java @@ -20,7 +20,7 @@ package com.seibel.lod.common.wrappers.chunk; import com.seibel.lod.common.wrappers.block.BlockDetailWrapper; -import com.seibel.lod.core.enums.LodDirection; +import com.seibel.lod.core.enums.ELodDirection; import com.seibel.lod.core.util.LevelPosUtil; import com.seibel.lod.core.util.LodUtil; import com.seibel.lod.core.wrapperInterfaces.block.IBlockDetailWrapper; @@ -121,7 +121,7 @@ public class ChunkWrapper implements IChunkWrapper } @Override - public IBlockDetailWrapper getBlockDetailAtFace(int x, int y, int z, LodDirection dir) { + public IBlockDetailWrapper getBlockDetailAtFace(int x, int y, int z, ELodDirection dir) { int fy = y+dir.getNormal().y; if (fy < getMinBuildHeight() || fy > getMaxBuildHeight()) return null; BlockPos pos = new BlockPos(x+dir.getNormal().x,fy,z+dir.getNormal().z); diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/minecraft/MinecraftClientWrapper.java b/common/src/main/java/com/seibel/lod/common/wrappers/minecraft/MinecraftClientWrapper.java index 8e8d462ef..7725e0923 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/minecraft/MinecraftClientWrapper.java +++ b/common/src/main/java/com/seibel/lod/common/wrappers/minecraft/MinecraftClientWrapper.java @@ -26,7 +26,7 @@ import java.util.ArrayList; import com.mojang.blaze3d.platform.NativeImage; import com.mojang.blaze3d.platform.Window; import com.seibel.lod.core.ModInfo; -import com.seibel.lod.core.enums.LodDirection; +import com.seibel.lod.core.enums.ELodDirection; import com.seibel.lod.core.logging.DhLoggerBuilder; import com.seibel.lod.core.util.LodUtil; import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper; @@ -41,7 +41,6 @@ import com.seibel.lod.common.wrappers.world.WorldWrapper; import net.minecraft.CrashReport; import net.minecraft.client.Minecraft; -import net.minecraft.client.Options; import net.minecraft.client.multiplayer.ClientLevel; import net.minecraft.client.multiplayer.ClientPacketListener; import net.minecraft.client.multiplayer.ServerData; @@ -116,7 +115,7 @@ public class MinecraftClientWrapper implements IMinecraftClientWrapper //=================// @Override - public float getShade(LodDirection lodDirection) { + public float getShade(ELodDirection lodDirection) { if (mc.level != null) { Direction mcDir = McObjectConverter.Convert(lodDirection); diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/world/WorldWrapper.java b/common/src/main/java/com/seibel/lod/common/wrappers/world/WorldWrapper.java index 6df000f7b..3a6133389 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/world/WorldWrapper.java +++ b/common/src/main/java/com/seibel/lod/common/wrappers/world/WorldWrapper.java @@ -24,7 +24,7 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import com.seibel.lod.core.objects.DHChunkPos; -import com.seibel.lod.core.enums.WorldType; +import com.seibel.lod.core.enums.EWorldType; import com.seibel.lod.core.wrapperInterfaces.chunk.IChunkWrapper; import com.seibel.lod.core.wrapperInterfaces.world.IWorldWrapper; import com.seibel.lod.common.wrappers.chunk.ChunkWrapper; @@ -50,7 +50,7 @@ public class WorldWrapper implements IWorldWrapper { private static final ConcurrentMap worldWrapperMap = new ConcurrentHashMap<>(); private final LevelAccessor world; - public final WorldType worldType; + public final EWorldType worldType; public WorldWrapper(LevelAccessor newWorld) @@ -58,11 +58,11 @@ public class WorldWrapper implements IWorldWrapper world = newWorld; if (world.getClass() == ServerLevel.class) - worldType = WorldType.ServerWorld; + worldType = EWorldType.ServerWorld; else if (world.getClass() == ClientLevel.class) - worldType = WorldType.ClientWorld; + worldType = EWorldType.ClientWorld; else - worldType = WorldType.Unknown; + worldType = EWorldType.Unknown; } @@ -89,7 +89,7 @@ public class WorldWrapper implements IWorldWrapper } @Override - public WorldType getWorldType() + public EWorldType getWorldType() { return worldType; } @@ -149,7 +149,7 @@ public class WorldWrapper implements IWorldWrapper @Override public File getSaveFolder() throws UnsupportedOperationException { - if (worldType != WorldType.ServerWorld) + if (worldType != EWorldType.ServerWorld) throw new UnsupportedOperationException("getSaveFolder can only be called for ServerWorlds."); ServerChunkCache chunkSource = ((ServerLevel) world).getChunkSource(); @@ -160,7 +160,7 @@ public class WorldWrapper implements IWorldWrapper /** @throws UnsupportedOperationException if the WorldWrapper isn't for a ServerWorld */ public ServerLevel getServerWorld() throws UnsupportedOperationException { - if (worldType != WorldType.ServerWorld) + if (worldType != EWorldType.ServerWorld) throw new UnsupportedOperationException("getSaveFolder can only be called for ServerWorlds."); return (ServerLevel) world; diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/BatchGenerationEnvironment.java b/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/BatchGenerationEnvironment.java index 4c8f03955..7994f72b9 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/BatchGenerationEnvironment.java +++ b/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/BatchGenerationEnvironment.java @@ -25,8 +25,8 @@ import com.seibel.lod.core.logging.ConfigBasedLogger; import com.seibel.lod.core.logging.ConfigBasedSpamLogger; import com.seibel.lod.core.builders.lodBuilding.LodBuilder; import com.seibel.lod.core.builders.lodBuilding.LodBuilderConfig; -import com.seibel.lod.core.enums.config.DistanceGenerationMode; -import com.seibel.lod.core.enums.config.LightGenerationMode; +import com.seibel.lod.core.enums.config.EDistanceGenerationMode; +import com.seibel.lod.core.enums.config.ELightGenerationMode; import com.seibel.lod.core.handlers.dependencyInjection.SingletonHandler; import com.seibel.lod.core.objects.lod.LodDimension; import com.seibel.lod.core.util.gridList.ArrayGridList; @@ -401,7 +401,7 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv e.pEvent.beginNano = System.nanoTime(); ArrayGridList referencedChunks; ArrayGridList genChunks; - DistanceGenerationMode generationMode; + EDistanceGenerationMode generationMode; LightedWorldGenRegion region; WorldGenLevelLightEngine lightEngine; LightGetterAdaptor adaptor; @@ -458,19 +458,19 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv case Empty: case StructureStart: case StructureReference: - generationMode = DistanceGenerationMode.NONE; + generationMode = EDistanceGenerationMode.NONE; break; case Biomes: - generationMode = DistanceGenerationMode.BIOME_ONLY; + generationMode = EDistanceGenerationMode.BIOME_ONLY; case Noise: - generationMode = DistanceGenerationMode.BIOME_ONLY_SIMULATE_HEIGHT; + generationMode = EDistanceGenerationMode.BIOME_ONLY_SIMULATE_HEIGHT; break; case Surface: case Carvers: - generationMode = DistanceGenerationMode.SURFACE; + generationMode = EDistanceGenerationMode.SURFACE; break; case Features: - generationMode = DistanceGenerationMode.FEATURES; + generationMode = EDistanceGenerationMode.FEATURES; break; case Light: case LiquidCarvers: @@ -496,7 +496,7 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv { LOAD_LOGGER.info("Detected full existing chunk at {}", target.getPos()); params.lodBuilder.generateLodNodeFromChunk(params.lodDim, wrappedChunk, - new LodBuilderConfig(DistanceGenerationMode.FULL), true, e.genAllDetails); + new LodBuilderConfig(EDistanceGenerationMode.FULL), true, e.genAllDetails); } #if POST_MC_1_18_1 else if (isPartial) @@ -506,7 +506,7 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv new LodBuilderConfig(generationMode), true, e.genAllDetails); } #endif - else if (target.getStatus() == ChunkStatus.EMPTY && generationMode == DistanceGenerationMode.NONE) + else if (target.getStatus() == ChunkStatus.EMPTY && generationMode == EDistanceGenerationMode.NONE) { params.lodBuilder.generateLodNodeFromChunk(params.lodDim,wrappedChunk, LodBuilderConfig.getFillVoidConfig(), true, e.genAllDetails); @@ -516,7 +516,7 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv params.lodBuilder.generateLodNodeFromChunk(params.lodDim, wrappedChunk, new LodBuilderConfig(generationMode), true, e.genAllDetails); } - if (e.lightMode == LightGenerationMode.FANCY || isFull) + if (e.lightMode == ELightGenerationMode.FANCY || isFull) { lightEngine.retainData(target.getPos(), false); } diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/GenerationEvent.java b/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/GenerationEvent.java index ecb1ff10e..0828657ea 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/GenerationEvent.java +++ b/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/GenerationEvent.java @@ -25,8 +25,7 @@ import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; import com.seibel.lod.common.wrappers.worldGeneration.BatchGenerationEnvironment.PrefEvent; -import com.seibel.lod.core.api.internal.InternalApiShared; -import com.seibel.lod.core.enums.config.LightGenerationMode; +import com.seibel.lod.core.enums.config.ELightGenerationMode; import com.seibel.lod.core.handlers.dependencyInjection.SingletonHandler; import com.seibel.lod.core.logging.DhLoggerBuilder; import com.seibel.lod.core.util.LodUtil; @@ -50,7 +49,7 @@ public final class GenerationEvent long creationNanotime; final int id; final Steps target; - final LightGenerationMode lightMode; + final ELightGenerationMode lightMode; final PrefEvent pEvent = new PrefEvent(); final boolean genAllDetails; @@ -65,7 +64,7 @@ public final class GenerationEvent id = generationFutureDebugIDs++; this.target = target; this.tParam = ThreadedParameters.getOrMake(generationGroup.params); - LightGenerationMode mode = CONFIG.client().worldGenerator().getLightGenerationMode(); + ELightGenerationMode mode = CONFIG.client().worldGenerator().getLightGenerationMode(); this.lightMode = mode; this.genAllDetails = genAllDetails; diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/mimicObject/LightedWorldGenRegion.java b/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/mimicObject/LightedWorldGenRegion.java index 38713c0d1..75c35d05b 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/mimicObject/LightedWorldGenRegion.java +++ b/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/mimicObject/LightedWorldGenRegion.java @@ -22,16 +22,14 @@ package com.seibel.lod.common.wrappers.worldGeneration.mimicObject; import java.lang.invoke.MethodHandles; import java.util.List; -import com.seibel.lod.core.api.internal.InternalApiShared; import com.seibel.lod.core.logging.DhLoggerBuilder; import net.minecraft.world.level.block.EntityBlock; import net.minecraft.world.level.block.SpawnerBlock; -import net.minecraft.world.level.block.entity.SpawnerBlockEntity; import org.apache.logging.log4j.Logger; import org.jetbrains.annotations.Nullable; import com.seibel.lod.common.wrappers.worldGeneration.BatchGenerationEnvironment.EmptyChunkGenerator; -import com.seibel.lod.core.enums.config.LightGenerationMode; +import com.seibel.lod.core.enums.config.ELightGenerationMode; import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap; import net.minecraft.client.Minecraft; @@ -64,7 +62,7 @@ public class LightedWorldGenRegion extends WorldGenRegion private static final Logger LOGGER = DhLoggerBuilder.getLogger(MethodHandles.lookup().lookupClass().getSimpleName()); public final WorldGenLevelLightEngine light; - public final LightGenerationMode lightMode; + public final ELightGenerationMode lightMode; public final EmptyChunkGenerator generator; public final int writeRadius; public final int size; @@ -95,7 +93,7 @@ public class LightedWorldGenRegion extends WorldGenRegion public LightedWorldGenRegion(ServerLevel serverLevel, WorldGenLevelLightEngine lightEngine, List list, ChunkStatus chunkStatus, int i, - LightGenerationMode lightMode, EmptyChunkGenerator generator) + ELightGenerationMode lightMode, EmptyChunkGenerator generator) { super(serverLevel, list #if POST_MC_1_17_1, chunkStatus, i #endif); this.lightMode = lightMode; @@ -267,7 +265,7 @@ public class LightedWorldGenRegion extends WorldGenRegion // Override force use of my own light engine @Override public int getBrightness(LightLayer lightLayer, BlockPos blockPos) { - if (lightMode != LightGenerationMode.FAST) { + if (lightMode != ELightGenerationMode.FAST) { return light.getLayerListener(lightLayer).getLightValue(blockPos); } if (lightLayer == LightLayer.BLOCK) @@ -279,7 +277,7 @@ public class LightedWorldGenRegion extends WorldGenRegion // Override force use of my own light engine @Override public int getRawBrightness(BlockPos blockPos, int i) { - if (lightMode != LightGenerationMode.FAST) { + if (lightMode != ELightGenerationMode.FAST) { return light.getRawBrightness(blockPos, i); } BlockPos p = super.getHeightmapPos(Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, blockPos); diff --git a/core b/core index 8c31236cc..6a15705b5 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 8c31236ccd3ef172a06bacedae37c7d737ac9c71 +Subproject commit 6a15705b51f24cf8d435d1067d977263690ef9a4