Skip to content

Commit f54daf4

Browse files
SkyBlade1978SkyBlade1978
committed
Port OreSpawn to Minecraft 1.21.1
1 parent e4e3409 commit f54daf4

35 files changed

Lines changed: 281 additions & 206 deletions

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# MMD OreSpawn
22

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

‎build.gradle‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ minecraft {
3636
// Simply re-run your setup task after changing the mappings to update your workspace.
3737
mappings channel: mapping_channel, version: mapping_version
3838

39-
// Official mappings are used at runtime in Forge 50, so no reobfuscation
39+
// Official mappings are used at runtime in Forge 52, so no reobfuscation
4040
// task is needed.
4141
reobf = false
4242

@@ -279,7 +279,7 @@ tasks.withType(JavaCompile).configureEach {
279279
options.encoding = 'UTF-8' // Use the UTF-8 charset for Java compilation
280280
}
281281

282-
// Forge 50 expects classes and resources in a single module output directory.
282+
// Forge 52 expects classes and resources in a single module output directory.
283283
sourceSets.each {
284284
def dir = layout.buildDirectory.dir("sourcesSets/$it.name")
285285
it.output.resourcesDir = dir
@@ -306,10 +306,10 @@ def syncEclipseRunClasspaths = tasks.register('syncEclipseRunClasspaths') {
306306
Set<File> classpathFiles = fileTree(classpathDir) {
307307
include '*_minecraftClasspath.txt'
308308
}.files
309-
// ForgeGradle 6 on Forge 50 places the run dependencies directly on
309+
// ForgeGradle 6 on Forge 52 places the run dependencies directly on
310310
// the Eclipse project classpath. Older ForgeGradle versions emitted
311311
// separate *_minecraftClasspath.txt files, so retain support for them
312-
// when present without requiring them for 1.20.6 launches.
312+
// when present without requiring them for 1.21.1 launches.
313313

314314
File buildshipPreferences = file('.settings/org.eclipse.buildship.core.prefs')
315315
Properties buildship = new Properties()

‎gradle.properties‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,17 @@ org.gradle.daemon=false
77
## Environment Properties
88

99
# The Minecraft version must agree with the Forge version to get a valid artifact
10-
minecraft_version=1.20.6
10+
minecraft_version=1.21.1
1111
# The Minecraft version range can use any release version of Minecraft as bounds.
1212
# Snapshots, pre-releases, and release candidates are not guaranteed to sort properly
1313
# as they do not follow standard versioning conventions.
14-
minecraft_version_range=[1.20.6,1.21)
14+
minecraft_version_range=[1.21.1,1.22)
1515
# The Forge version must agree with the Minecraft version to get a valid artifact
16-
forge_version=50.2.0
16+
forge_version=52.1.0
1717
# The Forge version range can use any version of Forge as bounds or match the loader version range
18-
forge_version_range=[50,)
18+
forge_version_range=[52,)
1919
# The loader version range can only use the major version of Forge/FML as bounds
20-
loader_version_range=[50,)
20+
loader_version_range=[52,)
2121
# The mapping channel to use for mappings.
2222
# The default set of supported mapping channels are ["official", "snapshot", "snapshot_nodoc", "stable", "stable_nodoc"].
2323
# Additional mapping channels can be registered through the "channelProviders" extension in a Gradle plugin.
@@ -35,7 +35,7 @@ loader_version_range=[50,)
3535
mapping_channel=official
3636
# The mapping version to query from the mapping channel.
3737
# This must match the format required by the mapping channel.
38-
mapping_version=1.20.6
38+
mapping_version=1.21.1
3939

4040

4141
## Mod Properties
@@ -48,7 +48,7 @@ mod_name=MMD OreSpawn
4848
# The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default.
4949
mod_license=LGPL-2.1
5050
# The mod version. See https://semver.org/
51-
mod_version=4.0.2
51+
mod_version=4.0.3
5252
# The group ID for the mod. It is only important when publishing as an artifact to a Maven repository.
5353
# This should match the base package used for the mod sources.
5454
# See https://maven.apache.org/guides/mini/guide-naming-conventions.html

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
import net.minecraft.network.chat.Component;
44

55
import net.minecraft.client.gui.GuiGraphics;
6+
import net.minecraft.client.gui.screens.Screen;
67

78
import net.minecraft.client.gui.components.Button;
8-
import net.minecraft.client.gui.screens.Screen;
99
import net.minecraft.network.chat.CommonComponents;
1010

1111
/** Less commonly changed numeric controls, kept off the world settings overview. */
12-
final class AdvancedGeologySettingsScreen extends Screen {
12+
final class AdvancedGeologySettingsScreen extends OreSpawnScreen {
1313
private final Screen parent;
1414
private final GeologyEditorSession session;
1515

@@ -49,9 +49,9 @@ public void onClose() {
4949
}
5050

5151
@Override
52-
public void render(GuiGraphics graphics, int mouseX, int mouseY, float partialTick) {
53-
renderBackground(graphics, mouseX, mouseY, partialTick);
54-
graphics.drawCenteredString(font, title, width / 2, 20, 0xFFFFFF);
55-
super.render(graphics, mouseX, mouseY, partialTick);
52+
protected void renderForeground(GuiGraphics graphics, int mouseX, int mouseY, float partialTick) {
53+
54+
graphics.drawCenteredString(font, title, width / 2, 20, OreSpawnScreenLayout.TEXT_PRIMARY);
55+
5656
}
5757
}

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
import java.util.List;
44

55
import net.minecraft.client.gui.GuiGraphics;
6+
import net.minecraft.client.gui.screens.Screen;
67

78
import net.minecraft.client.gui.components.Button;
8-
import net.minecraft.client.gui.screens.Screen;
99
import net.minecraft.network.chat.CommonComponents;
1010
import net.minecraft.network.chat.Component;
1111

12-
final class BiomePaletteScreen extends Screen {
12+
final class BiomePaletteScreen extends OreSpawnScreen {
1313
private final Screen parent;
1414
private final GeologyEditorSession session;
1515
private final String dimension;
@@ -70,10 +70,10 @@ protected void rebuildWidgets() {
7070
@Override public void onClose() { minecraft.setScreen(parent); }
7171

7272
@Override
73-
public void render(GuiGraphics graphics, int mouseX, int mouseY, float partialTick) {
74-
renderBackground(graphics, mouseX, mouseY, partialTick);
75-
graphics.drawCenteredString(font, title, width / 2, 12, 0xFFFFFF);
76-
graphics.drawCenteredString(font, Component.literal(dimension), width / 2, 28, 0xCCCCCC);
77-
super.render(graphics, mouseX, mouseY, partialTick);
73+
protected void renderForeground(GuiGraphics graphics, int mouseX, int mouseY, float partialTick) {
74+
75+
graphics.drawCenteredString(font, title, width / 2, 12, OreSpawnScreenLayout.TEXT_PRIMARY);
76+
graphics.drawCenteredString(font, Component.literal(dimension), width / 2, 28, OreSpawnScreenLayout.TEXT_SOFT);
77+
7878
}
7979
}

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@
66
import java.util.function.Consumer;
77

88
import net.minecraft.client.gui.GuiGraphics;
9+
import net.minecraft.client.gui.screens.Screen;
910

1011
import net.minecraft.client.gui.components.Button;
1112
import net.minecraft.client.gui.components.EditBox;
12-
import net.minecraft.client.gui.screens.Screen;
1313
import net.minecraft.network.chat.CommonComponents;
1414
import net.minecraft.network.chat.Component;
1515

1616
/** Registry-backed biome chooser. */
17-
final class BiomePickerScreen extends Screen {
17+
final class BiomePickerScreen extends OreSpawnScreen {
1818
private final Screen parent;
1919
private final GeologyEditorSession session;
2020
private final Consumer<String> select;
@@ -79,9 +79,9 @@ private List<String> filtered() {
7979
@Override public void onClose() { minecraft.setScreen(parent); }
8080

8181
@Override
82-
public void render(GuiGraphics graphics, int mouseX, int mouseY, float partialTick) {
83-
renderBackground(graphics, mouseX, mouseY, partialTick);
84-
graphics.drawCenteredString(font, title, width / 2, 14, 0xFFFFFF);
85-
super.render(graphics, mouseX, mouseY, partialTick);
82+
protected void renderForeground(GuiGraphics graphics, int mouseX, int mouseY, float partialTick) {
83+
84+
graphics.drawCenteredString(font, title, width / 2, 14, OreSpawnScreenLayout.TEXT_PRIMARY);
85+
8686
}
8787
}

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@
55
import com.google.gson.JsonArray;
66
import com.google.gson.JsonObject;
77
import net.minecraft.client.gui.GuiGraphics;
8+
import net.minecraft.client.gui.screens.Screen;
89

910
import net.minecraft.client.gui.components.Button;
1011
import net.minecraft.client.gui.components.CycleButton;
1112
import net.minecraft.client.gui.components.EditBox;
12-
import net.minecraft.client.gui.screens.Screen;
1313
import net.minecraft.network.chat.CommonComponents;
1414
import net.minecraft.network.chat.Component;
1515

16-
final class BiomePlacementScreen extends Screen {
16+
final class BiomePlacementScreen extends OreSpawnScreen {
1717
private enum Tab { PLACEMENT, CLIMATE, SURFACE }
1818

1919
private final Screen parent;
@@ -186,11 +186,11 @@ private static void putDouble(JsonObject root, String key, EditBox field,
186186
@Override public void onClose() { minecraft.setScreen(parent); }
187187

188188
@Override
189-
public void render(GuiGraphics graphics, int mouseX, int mouseY, float partialTick) {
190-
renderBackground(graphics, mouseX, mouseY, partialTick);
191-
graphics.drawCenteredString(font, title, width / 2, 10, 0xFFFFFF);
192-
graphics.drawCenteredString(font, Component.literal(biomeId), width / 2, 28, 0xCCCCCC);
193-
super.render(graphics, mouseX, mouseY, partialTick);
189+
protected void renderForeground(GuiGraphics graphics, int mouseX, int mouseY, float partialTick) {
190+
191+
graphics.drawCenteredString(font, title, width / 2, 10, OreSpawnScreenLayout.TEXT_PRIMARY);
192+
graphics.drawCenteredString(font, Component.literal(biomeId), width / 2, 28, OreSpawnScreenLayout.TEXT_SOFT);
193+
194194
}
195195

196196
private static JsonObject object(JsonObject root, String key) {

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@
1010
import com.google.gson.JsonElement;
1111
import com.google.gson.JsonObject;
1212
import net.minecraft.client.gui.GuiGraphics;
13+
import net.minecraft.client.gui.screens.Screen;
1314

1415
import net.minecraft.client.gui.components.Button;
1516
import net.minecraft.client.gui.components.EditBox;
16-
import net.minecraft.client.gui.screens.Screen;
1717
import net.minecraft.network.chat.CommonComponents;
1818
import net.minecraft.network.chat.Component;
1919

2020
/** Registry-backed multi-select list for similar-biome references. */
21-
final class BiomeReferenceScreen extends Screen {
21+
final class BiomeReferenceScreen extends OreSpawnScreen {
2222
private final Screen parent;
2323
private final GeologyEditorSession session;
2424
private final JsonObject placement;
@@ -106,9 +106,9 @@ private JsonArray array() {
106106
@Override public void onClose() { minecraft.setScreen(parent); }
107107

108108
@Override
109-
public void render(GuiGraphics graphics, int mouseX, int mouseY, float partialTick) {
110-
renderBackground(graphics, mouseX, mouseY, partialTick);
111-
graphics.drawCenteredString(font, title, width / 2, 14, 0xFFFFFF);
112-
super.render(graphics, mouseX, mouseY, partialTick);
109+
protected void renderForeground(GuiGraphics graphics, int mouseX, int mouseY, float partialTick) {
110+
111+
graphics.drawCenteredString(font, title, width / 2, 14, OreSpawnScreenLayout.TEXT_PRIMARY);
112+
113113
}
114114
}

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@
55

66
import com.google.gson.JsonObject;
77
import net.minecraft.client.gui.GuiGraphics;
8+
import net.minecraft.client.gui.screens.Screen;
89

910
import net.minecraft.client.gui.components.Button;
1011
import net.minecraft.client.gui.components.CycleButton;
11-
import net.minecraft.client.gui.screens.Screen;
1212
import net.minecraft.network.chat.CommonComponents;
1313
import net.minecraft.network.chat.Component;
1414

1515
/** Dimension-level entry point for biome placement and world materials. */
16-
final class BiomeWorldMaterialsScreen extends Screen {
16+
final class BiomeWorldMaterialsScreen extends OreSpawnScreen {
1717
private final Screen parent;
1818
private final GeologyEditorSession session;
1919
private String dimension;
@@ -143,10 +143,10 @@ public void onClose() {
143143
}
144144

145145
@Override
146-
public void render(GuiGraphics graphics, int mouseX, int mouseY, float partialTick) {
147-
renderBackground(graphics, mouseX, mouseY, partialTick);
148-
graphics.drawCenteredString(font, title, width / 2, 14, 0xFFFFFF);
149-
super.render(graphics, mouseX, mouseY, partialTick);
146+
protected void renderForeground(GuiGraphics graphics, int mouseX, int mouseY, float partialTick) {
147+
148+
graphics.drawCenteredString(font, title, width / 2, 14, OreSpawnScreenLayout.TEXT_PRIMARY);
149+
150150
}
151151

152152
private static String string(JsonObject root, String key, String fallback) {

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22

33
import zone.moddev.mc.orespawn.worldgen.RockFamily;
44
import net.minecraft.client.gui.GuiGraphics;
5+
import net.minecraft.client.gui.screens.Screen;
56

67
import net.minecraft.client.gui.components.Button;
7-
import net.minecraft.client.gui.screens.Screen;
88
import net.minecraft.network.chat.CommonComponents;
99
import net.minecraft.network.chat.Component;
1010

11-
final class BlockAssignmentScreen extends Screen {
11+
final class BlockAssignmentScreen extends OreSpawnScreen {
1212
private final Screen parent;
1313
private final GeologyEditorSession session;
1414
private final String blockId;
@@ -58,11 +58,11 @@ public void onClose() {
5858
}
5959

6060
@Override
61-
public void render(GuiGraphics graphics, int mouseX, int mouseY, float partialTick) {
62-
renderBackground(graphics, mouseX, mouseY, partialTick);
63-
graphics.drawCenteredString(font, title, width / 2, 18, 0xFFFFFF);
64-
graphics.drawCenteredString(font, Component.literal(blockId), width / 2, 42, 0xDDDDDD);
65-
if (error != null) graphics.drawCenteredString(font, error, width / 2, 155, 0xFF5555);
66-
super.render(graphics, mouseX, mouseY, partialTick);
61+
protected void renderForeground(GuiGraphics graphics, int mouseX, int mouseY, float partialTick) {
62+
63+
graphics.drawCenteredString(font, title, width / 2, 18, OreSpawnScreenLayout.TEXT_PRIMARY);
64+
graphics.drawCenteredString(font, Component.literal(blockId), width / 2, 42, OreSpawnScreenLayout.TEXT_SECONDARY);
65+
if (error != null) graphics.drawCenteredString(font, error, width / 2, 155, OreSpawnScreenLayout.TEXT_ERROR);
66+
6767
}
6868
}

0 commit comments

Comments
 (0)