clean up some API and world gen TODOs

2026-01-29 07:14:40 -06:00
parent 00abfb735a
commit f1deb7e592
8 changed files with 18 additions and 20 deletions
@@ -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+"].");
@@ -67,8 +67,8 @@ public final class StepBiomes extends AbstractWorldGenStep
 			ThreadWorldGenParams tParams, DhLitWorldGenRegion worldGenRegion, 
 			ArrayGridList<ChunkWrapper> chunkWrappers)
 	{
-		ArrayList<ChunkWrapper> chunksToDo = this.getChunkWrappersToGenerate(chunkWrappers);
-		for (ChunkWrapper chunkWrapper : chunksToDo)
+		ArrayList<ChunkWrapper> chunksToGen = this.getChunkWrappersToGenerate(chunkWrappers);
+		for (ChunkWrapper chunkWrapper : chunksToGen)
 		{
 			ChunkAccess chunk = chunkWrapper.getChunk();
 			
@@ -70,8 +70,8 @@ public final class StepFeatures extends AbstractWorldGenStep
 			ThreadWorldGenParams tParams, DhLitWorldGenRegion worldGenRegion,
 			ArrayGridList<ChunkWrapper> chunkWrappers)
 	{
-		ArrayList<ChunkWrapper> chunksToDo = this.getChunkWrappersToGenerate(chunkWrappers);
-		for (ChunkWrapper chunkWrapper : chunksToDo)
+		ArrayList<ChunkWrapper> chunksToGen = this.getChunkWrappersToGenerate(chunkWrappers);
+		for (ChunkWrapper chunkWrapper : chunksToGen)
 		{
 			ChunkAccess chunk = chunkWrapper.getChunk();
 			
@@ -67,8 +67,8 @@ public final class StepNoise extends AbstractWorldGenStep
 			ThreadWorldGenParams tParams, DhLitWorldGenRegion worldGenRegion,
 			ArrayGridList<ChunkWrapper> chunkWrappers)
 	{
-		ArrayList<ChunkWrapper> chunksToDo = this.getChunkWrappersToGenerate(chunkWrappers);
-		for (ChunkWrapper chunkWrapper : chunksToDo)
+		ArrayList<ChunkWrapper> chunksToGen = this.getChunkWrappersToGenerate(chunkWrappers);
+		for (ChunkWrapper chunkWrapper : chunksToGen)
 		{
 			ChunkAccess chunk = chunkWrapper.getChunk();
 			
@@ -64,8 +64,8 @@ public final class StepStructureReference extends AbstractWorldGenStep
 			ThreadWorldGenParams tParams, DhLitWorldGenRegion worldGenRegion,
 			ArrayGridList<ChunkWrapper> chunkWrappers)
 	{
-		ArrayList<ChunkWrapper> chunksToDo = this.getChunkWrappersToGenerate(chunkWrappers);
-		for (ChunkWrapper chunkWrapper : chunksToDo)
+		ArrayList<ChunkWrapper> chunksToGen = this.getChunkWrappersToGenerate(chunkWrappers);
+		for (ChunkWrapper chunkWrapper : chunksToGen)
 		{
 			ChunkAccess chunk = chunkWrapper.getChunk();
 			this.environment.globalParams.generator.createReferences(worldGenRegion, tParams.structFeatManager.forWorldGenRegion(worldGenRegion), chunk);
@@ -69,10 +69,8 @@ public final class StepStructureStart extends AbstractWorldGenStep
 			ThreadWorldGenParams tParams, DhLitWorldGenRegion worldGenRegion,
 			ArrayGridList<ChunkWrapper> chunkWrappers)
 	{
-		ArrayList<ChunkWrapper> chunksToDo = this.getChunkWrappersToGenerate(chunkWrappers);
+		ArrayList<ChunkWrapper> 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();
@@ -64,8 +64,8 @@ public final class StepSurface extends AbstractWorldGenStep
 			ThreadWorldGenParams tParams, DhLitWorldGenRegion worldGenRegion,
 			ArrayGridList<ChunkWrapper> chunkWrappers)
 	{
-		ArrayList<ChunkWrapper> chunksToDo = this.getChunkWrappersToGenerate(chunkWrappers);
-		for (ChunkWrapper chunkWrapper : chunksToDo)
+		ArrayList<ChunkWrapper> chunksToGen = this.getChunkWrappersToGenerate(chunkWrappers);
+		for (ChunkWrapper chunkWrapper : chunksToGen)
 		{
 			ChunkAccess chunk = chunkWrapper.getChunk();