Port OreSpawn to Minecraft 1.21.1

Author: SkyBlade1978

README.md

@@ -1,6 +1,6 @@
 # MMD OreSpawn
 
-OreSpawn 4 is a provider-driven world-generation engine for Minecraft 1.20.6.
+OreSpawn 4 is a provider-driven world-generation engine for Minecraft 1.21.1.
 It gives mods and modpacks one place to configure ores, deposit shapes, optional
 rock strata and geomes, provider-owned underground fluid deposits, biome
 palettes and world materials, flat bedrock, and bounded ore retrogen.

build.gradle

@@ -36,7 +36,7 @@ minecraft {
     // Simply re-run your setup task after changing the mappings to update your workspace.
     mappings channel: mapping_channel, version: mapping_version
 
-    // Official mappings are used at runtime in Forge 50, so no reobfuscation
+    // Official mappings are used at runtime in Forge 52, so no reobfuscation
     // task is needed.
     reobf = false
 
@@ -279,7 +279,7 @@ tasks.withType(JavaCompile).configureEach {
     options.encoding = 'UTF-8' // Use the UTF-8 charset for Java compilation
 }
 
-// Forge 50 expects classes and resources in a single module output directory.
+// Forge 52 expects classes and resources in a single module output directory.
 sourceSets.each {
     def dir = layout.buildDirectory.dir("sourcesSets/$it.name")
     it.output.resourcesDir = dir
@@ -306,10 +306,10 @@ def syncEclipseRunClasspaths = tasks.register('syncEclipseRunClasspaths') {
         Set<File> classpathFiles = fileTree(classpathDir) {
             include '*_minecraftClasspath.txt'
         }.files
-        // ForgeGradle 6 on Forge 50 places the run dependencies directly on
+        // ForgeGradle 6 on Forge 52 places the run dependencies directly on
         // the Eclipse project classpath. Older ForgeGradle versions emitted
         // separate *_minecraftClasspath.txt files, so retain support for them
-        // when present without requiring them for 1.20.6 launches.
+        // when present without requiring them for 1.21.1 launches.
 
         File buildshipPreferences = file('.settings/org.eclipse.buildship.core.prefs')
         Properties buildship = new Properties()

gradle.properties

@@ -7,17 +7,17 @@ org.gradle.daemon=false
 ## Environment Properties
 
 # The Minecraft version must agree with the Forge version to get a valid artifact
-minecraft_version=1.20.6
+minecraft_version=1.21.1
 # The Minecraft version range can use any release version of Minecraft as bounds.
 # Snapshots, pre-releases, and release candidates are not guaranteed to sort properly
 # as they do not follow standard versioning conventions.
-minecraft_version_range=[1.20.6,1.21)
+minecraft_version_range=[1.21.1,1.22)
 # The Forge version must agree with the Minecraft version to get a valid artifact
-forge_version=50.2.0
+forge_version=52.1.0
 # The Forge version range can use any version of Forge as bounds or match the loader version range
-forge_version_range=[50,)
+forge_version_range=[52,)
 # The loader version range can only use the major version of Forge/FML as bounds
-loader_version_range=[50,)
+loader_version_range=[52,)
 # The mapping channel to use for mappings.
 # The default set of supported mapping channels are ["official", "snapshot", "snapshot_nodoc", "stable", "stable_nodoc"].
 # Additional mapping channels can be registered through the "channelProviders" extension in a Gradle plugin.
@@ -35,7 +35,7 @@ loader_version_range=[50,)
 mapping_channel=official
 # The mapping version to query from the mapping channel.
 # This must match the format required by the mapping channel.
-mapping_version=1.20.6
+mapping_version=1.21.1
 
 
 ## Mod Properties
@@ -48,7 +48,7 @@ mod_name=MMD OreSpawn
 # The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default.
 mod_license=LGPL-2.1
 # The mod version. See https://semver.org/
-mod_version=4.0.2
+mod_version=4.0.3
 # The group ID for the mod. It is only important when publishing as an artifact to a Maven repository.
 # This should match the base package used for the mod sources.
 # See https://maven.apache.org/guides/mini/guide-naming-conventions.html

src/main/java/zone/moddev/mc/orespawn/client/AdvancedGeologySettingsScreen.java

@@ -3,13 +3,13 @@
 import net.minecraft.network.chat.Component;
 
 import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.screens.Screen;
 
 import net.minecraft.client.gui.components.Button;
-import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.network.chat.CommonComponents;
 
 /** Less commonly changed numeric controls, kept off the world settings overview. */
-final class AdvancedGeologySettingsScreen extends Screen {
+final class AdvancedGeologySettingsScreen extends OreSpawnScreen {
 	private final Screen parent;
 	private final GeologyEditorSession session;
 
@@ -49,9 +49,9 @@ public void onClose() {
 	}
 
 	@Override
-	public void render(GuiGraphics graphics, int mouseX, int mouseY, float partialTick) {
-		renderBackground(graphics, mouseX, mouseY, partialTick);
-		graphics.drawCenteredString(font, title, width / 2, 20, 0xFFFFFF);
-		super.render(graphics, mouseX, mouseY, partialTick);
+	protected void renderForeground(GuiGraphics graphics, int mouseX, int mouseY, float partialTick) {
+
+		graphics.drawCenteredString(font, title, width / 2, 20, OreSpawnScreenLayout.TEXT_PRIMARY);
+
 	}
 }

src/main/java/zone/moddev/mc/orespawn/client/BiomePaletteScreen.java

@@ -3,13 +3,13 @@
 import java.util.List;
 
 import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.screens.Screen;
 
 import net.minecraft.client.gui.components.Button;
-import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.network.chat.CommonComponents;
 import net.minecraft.network.chat.Component;
 
-final class BiomePaletteScreen extends Screen {
+final class BiomePaletteScreen extends OreSpawnScreen {
 	private final Screen parent;
 	private final GeologyEditorSession session;
 	private final String dimension;
@@ -70,10 +70,10 @@ protected void rebuildWidgets() {
 	@Override public void onClose() { minecraft.setScreen(parent); }
 
 	@Override
-	public void render(GuiGraphics graphics, int mouseX, int mouseY, float partialTick) {
-		renderBackground(graphics, mouseX, mouseY, partialTick);
-		graphics.drawCenteredString(font, title, width / 2, 12, 0xFFFFFF);
-		graphics.drawCenteredString(font, Component.literal(dimension), width / 2, 28, 0xCCCCCC);
-		super.render(graphics, mouseX, mouseY, partialTick);
+	protected void renderForeground(GuiGraphics graphics, int mouseX, int mouseY, float partialTick) {
+
+		graphics.drawCenteredString(font, title, width / 2, 12, OreSpawnScreenLayout.TEXT_PRIMARY);
+		graphics.drawCenteredString(font, Component.literal(dimension), width / 2, 28, OreSpawnScreenLayout.TEXT_SOFT);
+
 	}
 }

src/main/java/zone/moddev/mc/orespawn/client/BiomePickerScreen.java

@@ -6,15 +6,15 @@
 import java.util.function.Consumer;
 
 import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.screens.Screen;
 
 import net.minecraft.client.gui.components.Button;
 import net.minecraft.client.gui.components.EditBox;
-import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.network.chat.CommonComponents;
 import net.minecraft.network.chat.Component;
 
 /** Registry-backed biome chooser. */
-final class BiomePickerScreen extends Screen {
+final class BiomePickerScreen extends OreSpawnScreen {
 	private final Screen parent;
 	private final GeologyEditorSession session;
 	private final Consumer<String> select;
@@ -79,9 +79,9 @@ private List<String> filtered() {
 	@Override public void onClose() { minecraft.setScreen(parent); }
 
 	@Override
-	public void render(GuiGraphics graphics, int mouseX, int mouseY, float partialTick) {
-		renderBackground(graphics, mouseX, mouseY, partialTick);
-		graphics.drawCenteredString(font, title, width / 2, 14, 0xFFFFFF);
-		super.render(graphics, mouseX, mouseY, partialTick);
+	protected void renderForeground(GuiGraphics graphics, int mouseX, int mouseY, float partialTick) {
+
+		graphics.drawCenteredString(font, title, width / 2, 14, OreSpawnScreenLayout.TEXT_PRIMARY);
+
 	}
 }

src/main/java/zone/moddev/mc/orespawn/client/BiomePlacementScreen.java

@@ -5,15 +5,15 @@
 import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
 import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.screens.Screen;
 
 import net.minecraft.client.gui.components.Button;
 import net.minecraft.client.gui.components.CycleButton;
 import net.minecraft.client.gui.components.EditBox;
-import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.network.chat.CommonComponents;
 import net.minecraft.network.chat.Component;
 
-final class BiomePlacementScreen extends Screen {
+final class BiomePlacementScreen extends OreSpawnScreen {
 	private enum Tab { PLACEMENT, CLIMATE, SURFACE }
 
 	private final Screen parent;
@@ -186,11 +186,11 @@ private static void putDouble(JsonObject root, String key, EditBox field,
 	@Override public void onClose() { minecraft.setScreen(parent); }
 
 	@Override
-	public void render(GuiGraphics graphics, int mouseX, int mouseY, float partialTick) {
-		renderBackground(graphics, mouseX, mouseY, partialTick);
-		graphics.drawCenteredString(font, title, width / 2, 10, 0xFFFFFF);
-		graphics.drawCenteredString(font, Component.literal(biomeId), width / 2, 28, 0xCCCCCC);
-		super.render(graphics, mouseX, mouseY, partialTick);
+	protected void renderForeground(GuiGraphics graphics, int mouseX, int mouseY, float partialTick) {
+
+		graphics.drawCenteredString(font, title, width / 2, 10, OreSpawnScreenLayout.TEXT_PRIMARY);
+		graphics.drawCenteredString(font, Component.literal(biomeId), width / 2, 28, OreSpawnScreenLayout.TEXT_SOFT);
+
 	}
 
 	private static JsonObject object(JsonObject root, String key) {

src/main/java/zone/moddev/mc/orespawn/client/BiomeReferenceScreen.java

@@ -10,15 +10,15 @@
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.screens.Screen;
 
 import net.minecraft.client.gui.components.Button;
 import net.minecraft.client.gui.components.EditBox;
-import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.network.chat.CommonComponents;
 import net.minecraft.network.chat.Component;
 
 /** Registry-backed multi-select list for similar-biome references. */
-final class BiomeReferenceScreen extends Screen {
+final class BiomeReferenceScreen extends OreSpawnScreen {
 	private final Screen parent;
 	private final GeologyEditorSession session;
 	private final JsonObject placement;
@@ -106,9 +106,9 @@ private JsonArray array() {
 	@Override public void onClose() { minecraft.setScreen(parent); }
 
 	@Override
-	public void render(GuiGraphics graphics, int mouseX, int mouseY, float partialTick) {
-		renderBackground(graphics, mouseX, mouseY, partialTick);
-		graphics.drawCenteredString(font, title, width / 2, 14, 0xFFFFFF);
-		super.render(graphics, mouseX, mouseY, partialTick);
+	protected void renderForeground(GuiGraphics graphics, int mouseX, int mouseY, float partialTick) {
+
+		graphics.drawCenteredString(font, title, width / 2, 14, OreSpawnScreenLayout.TEXT_PRIMARY);
+
 	}
 }

src/main/java/zone/moddev/mc/orespawn/client/BiomeWorldMaterialsScreen.java

@@ -5,15 +5,15 @@
 
 import com.google.gson.JsonObject;
 import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.screens.Screen;
 
 import net.minecraft.client.gui.components.Button;
 import net.minecraft.client.gui.components.CycleButton;
-import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.network.chat.CommonComponents;
 import net.minecraft.network.chat.Component;
 
 /** Dimension-level entry point for biome placement and world materials. */
-final class BiomeWorldMaterialsScreen extends Screen {
+final class BiomeWorldMaterialsScreen extends OreSpawnScreen {
 	private final Screen parent;
 	private final GeologyEditorSession session;
 	private String dimension;
@@ -143,10 +143,10 @@ public void onClose() {
 	}
 
 	@Override
-	public void render(GuiGraphics graphics, int mouseX, int mouseY, float partialTick) {
-		renderBackground(graphics, mouseX, mouseY, partialTick);
-		graphics.drawCenteredString(font, title, width / 2, 14, 0xFFFFFF);
-		super.render(graphics, mouseX, mouseY, partialTick);
+	protected void renderForeground(GuiGraphics graphics, int mouseX, int mouseY, float partialTick) {
+
+		graphics.drawCenteredString(font, title, width / 2, 14, OreSpawnScreenLayout.TEXT_PRIMARY);
+
 	}
 
 	private static String string(JsonObject root, String key, String fallback) {

src/main/java/zone/moddev/mc/orespawn/client/BlockAssignmentScreen.java

@@ -2,13 +2,13 @@
 
 import zone.moddev.mc.orespawn.worldgen.RockFamily;
 import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.screens.Screen;
 
 import net.minecraft.client.gui.components.Button;
-import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.network.chat.CommonComponents;
 import net.minecraft.network.chat.Component;
 
-final class BlockAssignmentScreen extends Screen {
+final class BlockAssignmentScreen extends OreSpawnScreen {
 	private final Screen parent;
 	private final GeologyEditorSession session;
 	private final String blockId;
@@ -58,11 +58,11 @@ public void onClose() {
 	}
 
 	@Override
-	public void render(GuiGraphics graphics, int mouseX, int mouseY, float partialTick) {
-		renderBackground(graphics, mouseX, mouseY, partialTick);
-		graphics.drawCenteredString(font, title, width / 2, 18, 0xFFFFFF);
-		graphics.drawCenteredString(font, Component.literal(blockId), width / 2, 42, 0xDDDDDD);
-		if (error != null) graphics.drawCenteredString(font, error, width / 2, 155, 0xFF5555);
-		super.render(graphics, mouseX, mouseY, partialTick);
+	protected void renderForeground(GuiGraphics graphics, int mouseX, int mouseY, float partialTick) {
+
+		graphics.drawCenteredString(font, title, width / 2, 18, OreSpawnScreenLayout.TEXT_PRIMARY);
+		graphics.drawCenteredString(font, Component.literal(blockId), width / 2, 42, OreSpawnScreenLayout.TEXT_SECONDARY);
+		if (error != null) graphics.drawCenteredString(font, error, width / 2, 155, OreSpawnScreenLayout.TEXT_ERROR);
+
 	}
 }