diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/GetConfigScreen.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/GetConfigScreen.java index 39fc001f8..772dfad2d 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/GetConfigScreen.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/GetConfigScreen.java @@ -21,11 +21,11 @@ public class GetConfigScreen public static Screen getScreen(Screen parent) { - // TODO it'd be nice to have this run automatically on startup - // but this will only work once MC has added our lang file, - // which won't be for sure added until we request a GUI if (ModInfo.IS_DEV_BUILD) { + // it'd be nice to have this run automatically on startup + // but this will only work once MC has added our lang file, + // which won't be for sure added until we request a GUI String missingLangEntries = ConfigHandler.INSTANCE.generateLang(true, true); // trim to remove any newlines/spaces @@ -45,7 +45,6 @@ public class GetConfigScreen case Classic: return ClassicConfigGUI.getScreen(parent, "client"); case JavaSwing: - //return MinecraftScreen.getScreen(parent, new JavaScreenHandlerScreen(new ConfigScreen()), ModInfo.ID + ".title"); return MinecraftScreen.getScreen(parent, new JavaScreenHandlerScreen(new JavaScreenHandlerScreen.ExampleScreen()), ModInfo.ID + ".title"); default: throw new IllegalArgumentException("No config screen implementation defined for ["+useScreen+"]."); diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepBiomes.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepBiomes.java index a4fa04f80..411d95be7 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepBiomes.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepBiomes.java @@ -67,8 +67,8 @@ public final class StepBiomes extends AbstractWorldGenStep ThreadWorldGenParams tParams, DhLitWorldGenRegion worldGenRegion, ArrayGridList chunkWrappers) { - ArrayList chunksToDo = this.getChunkWrappersToGenerate(chunkWrappers); - for (ChunkWrapper chunkWrapper : chunksToDo) + ArrayList chunksToGen = this.getChunkWrappersToGenerate(chunkWrappers); + for (ChunkWrapper chunkWrapper : chunksToGen) { ChunkAccess chunk = chunkWrapper.getChunk(); diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepFeatures.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepFeatures.java index 24542b106..3ee9bfccb 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepFeatures.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepFeatures.java @@ -70,8 +70,8 @@ public final class StepFeatures extends AbstractWorldGenStep ThreadWorldGenParams tParams, DhLitWorldGenRegion worldGenRegion, ArrayGridList chunkWrappers) { - ArrayList chunksToDo = this.getChunkWrappersToGenerate(chunkWrappers); - for (ChunkWrapper chunkWrapper : chunksToDo) + ArrayList chunksToGen = this.getChunkWrappersToGenerate(chunkWrappers); + for (ChunkWrapper chunkWrapper : chunksToGen) { ChunkAccess chunk = chunkWrapper.getChunk(); diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepNoise.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepNoise.java index f6b7625cd..fd3b4677f 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepNoise.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepNoise.java @@ -67,8 +67,8 @@ public final class StepNoise extends AbstractWorldGenStep ThreadWorldGenParams tParams, DhLitWorldGenRegion worldGenRegion, ArrayGridList chunkWrappers) { - ArrayList chunksToDo = this.getChunkWrappersToGenerate(chunkWrappers); - for (ChunkWrapper chunkWrapper : chunksToDo) + ArrayList chunksToGen = this.getChunkWrappersToGenerate(chunkWrappers); + for (ChunkWrapper chunkWrapper : chunksToGen) { ChunkAccess chunk = chunkWrapper.getChunk(); diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepStructureReference.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepStructureReference.java index 4a0bf6ddd..5fd9e7dfc 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepStructureReference.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepStructureReference.java @@ -64,8 +64,8 @@ public final class StepStructureReference extends AbstractWorldGenStep ThreadWorldGenParams tParams, DhLitWorldGenRegion worldGenRegion, ArrayGridList chunkWrappers) { - ArrayList chunksToDo = this.getChunkWrappersToGenerate(chunkWrappers); - for (ChunkWrapper chunkWrapper : chunksToDo) + ArrayList chunksToGen = this.getChunkWrappersToGenerate(chunkWrappers); + for (ChunkWrapper chunkWrapper : chunksToGen) { ChunkAccess chunk = chunkWrapper.getChunk(); this.environment.globalParams.generator.createReferences(worldGenRegion, tParams.structFeatManager.forWorldGenRegion(worldGenRegion), chunk); diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepStructureStart.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepStructureStart.java index 340bbf683..ef70ea69b 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepStructureStart.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepStructureStart.java @@ -69,10 +69,8 @@ public final class StepStructureStart extends AbstractWorldGenStep ThreadWorldGenParams tParams, DhLitWorldGenRegion worldGenRegion, ArrayGridList chunkWrappers) { - ArrayList chunksToDo = this.getChunkWrappersToGenerate(chunkWrappers); + ArrayList chunksToGen = this.getChunkWrappersToGenerate(chunkWrappers); - // TODO should be put in wrapped environment so we can skip some other world gen steps - // SURFACE wouldn't need structure generation either #if MC_VER < MC_1_19_2 if (!this.environment.globalParams.worldGenSettings.generateFeatures()) #elif MC_VER < MC_1_19_4 @@ -86,7 +84,7 @@ public final class StepStructureStart extends AbstractWorldGenStep - for (ChunkWrapper chunkWrapper : chunksToDo) + for (ChunkWrapper chunkWrapper : chunksToGen) { ChunkAccess chunk = chunkWrapper.getChunk(); @@ -111,6 +109,8 @@ public final class StepStructureStart extends AbstractWorldGenStep this.environment.globalParams.mcServerLevel.dimension()); #endif + + #if MC_VER >= MC_1_18_2 try { @@ -120,7 +120,6 @@ public final class StepStructureStart extends AbstractWorldGenStep { // There's a rare issue with StructStart where it throws ArrayIndexOutOfBounds // This means the structFeat is corrupted (For some reason) and I need to reset it. - // TODO: Figure out in the future why this happens even though I am using new structFeat - OLD // reset the structureStart tParams.recreateStructureCheck(); diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepSurface.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepSurface.java index 92c5bd1da..839723999 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepSurface.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepSurface.java @@ -64,8 +64,8 @@ public final class StepSurface extends AbstractWorldGenStep ThreadWorldGenParams tParams, DhLitWorldGenRegion worldGenRegion, ArrayGridList chunkWrappers) { - ArrayList chunksToDo = this.getChunkWrappersToGenerate(chunkWrappers); - for (ChunkWrapper chunkWrapper : chunksToDo) + ArrayList chunksToGen = this.getChunkWrappersToGenerate(chunkWrappers); + for (ChunkWrapper chunkWrapper : chunksToGen) { ChunkAccess chunk = chunkWrapper.getChunk(); diff --git a/coreSubProjects b/coreSubProjects index 11cd36cde..c30e41013 160000 --- a/coreSubProjects +++ b/coreSubProjects @@ -1 +1 @@ -Subproject commit 11cd36cdec01b0731e8dd8e5b9e0b5f26dae2666 +Subproject commit c30e410132f752c234531f141e9a33cfd4d5e8f4