From 7f80250b329417234cfbabbd227f0b0a3540d1cf Mon Sep 17 00:00:00 2001 From: "Werner, Colin" Date: Tue, 12 Aug 2025 18:18:27 -0500 Subject: [PATCH 1/2] basic 1.21.8 working --- .../screen/presetconfig/PresetEditorPage.java | 64 +++++++++---------- .../worldgen/preset/PresetDimensionTypes.java | 3 +- .../worldgen/tags/RTFBlockTagsProvider.java | 5 +- .../tags/RTFDensityFunctionTagsProvider.java | 7 +- gradle.properties | 8 +-- 5 files changed, 47 insertions(+), 40 deletions(-) diff --git a/common/src/main/java/raccoonman/reterraforged/client/gui/screen/presetconfig/PresetEditorPage.java b/common/src/main/java/raccoonman/reterraforged/client/gui/screen/presetconfig/PresetEditorPage.java index 5ea02a67..2c387bba 100644 --- a/common/src/main/java/raccoonman/reterraforged/client/gui/screen/presetconfig/PresetEditorPage.java +++ b/common/src/main/java/raccoonman/reterraforged/client/gui/screen/presetconfig/PresetEditorPage.java @@ -91,7 +91,7 @@ public void init() { this.right.addWidget(this.zoom); this.right.addWidget(this.renderMode); this.right.addWidget(this.seed); - this.right.addWidget(this.preview); +// this.right.addWidget(this.preview); } @Override @@ -218,7 +218,7 @@ public void renderWidget(GuiGraphics guiGraphics, int mx, int my, float partialT int y = this.getY(); this.height = this.getWidth(); - guiGraphics.blit(RenderType::guiTextured, this.textureId, x, y, 0, 0, this.width, this.height, this.width, this.height); +// guiGraphics.blit(RenderType::guiTextured, this.textureId, x, y, 0, 0, this.width, this.height, this.width, this.height); this.updateLegend(mx, my); @@ -269,37 +269,37 @@ private float getLegendScale() { private void renderLegend(GuiGraphics guiGraphics, int mx, int my, Component[] labels, String[] values, int left, int top, int lineHeight, int color) { float scale = this.getLegendScale(); - PoseStack pose = guiGraphics.pose(); +// PoseStack pose = guiGraphics.pose(); - pose.pushPose(); - pose.translate(left + 3.75F * scale, top - lineHeight * (3.2F * scale), 0); - pose.scale(scale, scale, 1); - - Minecraft mc = Minecraft.getInstance(); - Font renderer = mc.font; - int spacing = 0; - for (Component s : labels) { - spacing = Math.max(spacing, renderer.width(s)); - } - - float maxWidth = (this.width - 4) / scale; - for (int i = 0; i < labels.length && i < values.length; i++) { - Component label = labels[i]; - String value = values[i]; - - while (value.length() > 0 && spacing + renderer.width(value) > maxWidth) { - value = value.substring(0, value.length() - 1); - } - - guiGraphics.drawString(renderer, label, 0, i * lineHeight, color); - guiGraphics.drawString(renderer, value, spacing, i * lineHeight, color); - } - - pose.popPose(); - - if (!this.hoveredCoords.isEmpty()) { - guiGraphics.drawCenteredString(renderer, this.hoveredCoords, mx, my - 10, 0xFFFFFF); - } +// pose.pushPose(); +// pose.translate(left + 3.75F * scale, top - lineHeight * (3.2F * scale), 0); +// pose.scale(scale, scale, 1); +// +// Minecraft mc = Minecraft.getInstance(); +// Font renderer = mc.font; +// int spacing = 0; +// for (Component s : labels) { +// spacing = Math.max(spacing, renderer.width(s)); +// } +// +// float maxWidth = (this.width - 4) / scale; +// for (int i = 0; i < labels.length && i < values.length; i++) { +// Component label = labels[i]; +// String value = values[i]; +// +// while (value.length() > 0 && spacing + renderer.width(value) > maxWidth) { +// value = value.substring(0, value.length() - 1); +// } +// +// guiGraphics.drawString(renderer, label, 0, i * lineHeight, color); +// guiGraphics.drawString(renderer, value, spacing, i * lineHeight, color); +// } +// +// pose.popPose(); +// +// if (!this.hoveredCoords.isEmpty()) { +// guiGraphics.drawCenteredString(renderer, this.hoveredCoords, mx, my - 10, 0xFFFFFF); +// } } private int getZoom() { diff --git a/common/src/main/java/raccoonman/reterraforged/data/worldgen/preset/PresetDimensionTypes.java b/common/src/main/java/raccoonman/reterraforged/data/worldgen/preset/PresetDimensionTypes.java index 6360f128..dfc2bf1a 100644 --- a/common/src/main/java/raccoonman/reterraforged/data/worldgen/preset/PresetDimensionTypes.java +++ b/common/src/main/java/raccoonman/reterraforged/data/worldgen/preset/PresetDimensionTypes.java @@ -1,5 +1,6 @@ package raccoonman.reterraforged.data.worldgen.preset; +import java.util.Optional; import java.util.OptionalLong; import net.minecraft.data.worldgen.BootstrapContext; @@ -19,6 +20,6 @@ public static void bootstrap(Preset preset, BootstrapContext ctx) int worldDepth = properties.worldDepth; int totalHeight = worldDepth + worldHeight; - ctx.register(BuiltinDimensionTypes.OVERWORLD, new DimensionType(OptionalLong.empty(), true, false, false, true, 1.0, true, false, -worldDepth, totalHeight, totalHeight, BlockTags.INFINIBURN_OVERWORLD, BuiltinDimensionTypes.OVERWORLD_EFFECTS, 0.0f, new DimensionType.MonsterSettings(false, true, UniformInt.of(0, 7), 0))); + ctx.register(BuiltinDimensionTypes.OVERWORLD, new DimensionType(OptionalLong.empty(), true, false, false, true, 1.0, true, false, -worldDepth, totalHeight, totalHeight, BlockTags.INFINIBURN_OVERWORLD, BuiltinDimensionTypes.OVERWORLD_EFFECTS, 0.0f, Optional.of(300), new DimensionType.MonsterSettings(false, true, UniformInt.of(0, 7), 0))); } } diff --git a/common/src/main/java/raccoonman/reterraforged/data/worldgen/tags/RTFBlockTagsProvider.java b/common/src/main/java/raccoonman/reterraforged/data/worldgen/tags/RTFBlockTagsProvider.java index 63b7f09b..e21cabf5 100644 --- a/common/src/main/java/raccoonman/reterraforged/data/worldgen/tags/RTFBlockTagsProvider.java +++ b/common/src/main/java/raccoonman/reterraforged/data/worldgen/tags/RTFBlockTagsProvider.java @@ -30,8 +30,9 @@ protected void addTags(HolderLookup.Provider provider) { this.tag(RTFBlockTags.SOIL).add(Blocks.DIRT, Blocks.COARSE_DIRT); this.tag(RTFBlockTags.CLAY).add(Blocks.CLAY); this.tag(RTFBlockTags.SEDIMENT).add(Blocks.SAND, Blocks.GRAVEL); - this.tag(RTFBlockTags.ERODIBLE).add(Blocks.SNOW_BLOCK).add(Blocks.POWDER_SNOW).add(Blocks.GRAVEL).addOptionalTag(BlockTags.DIRT.location()); - +// this.tag(RTFBlockTags.ERODIBLE).add(Blocks.SNOW_BLOCK).add(Blocks.POWDER_SNOW).add(Blocks.GRAVEL).addOptionalTag(BlockTags.DIRT.location()); + this.tag(RTFBlockTags.ERODIBLE).add(Blocks.SNOW_BLOCK).add(Blocks.POWDER_SNOW).add(Blocks.GRAVEL).addOptionalTag(BlockTags.DIRT); + // if(!miscellaneousSettings.oreCompatibleStoneOnly) { this.tag(RTFBlockTags.ROCK).add(Blocks.GRANITE, Blocks.ANDESITE, Blocks.STONE, Blocks.DIORITE); // } else{ diff --git a/common/src/main/java/raccoonman/reterraforged/data/worldgen/tags/RTFDensityFunctionTagsProvider.java b/common/src/main/java/raccoonman/reterraforged/data/worldgen/tags/RTFDensityFunctionTagsProvider.java index 9d266c38..74ddd37c 100644 --- a/common/src/main/java/raccoonman/reterraforged/data/worldgen/tags/RTFDensityFunctionTagsProvider.java +++ b/common/src/main/java/raccoonman/reterraforged/data/worldgen/tags/RTFDensityFunctionTagsProvider.java @@ -19,6 +19,11 @@ public RTFDensityFunctionTagsProvider(PackOutput packOutput, CompletableFuture Date: Tue, 12 Aug 2025 20:55:01 -0500 Subject: [PATCH 2/2] fixed tags, customize screen doesn't crash anymore --- .../client/gui/screen/page/LinkedPageScreen.java | 2 +- .../worldgen/tags/RTFDensityFunctionTagsProvider.java | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/common/src/main/java/raccoonman/reterraforged/client/gui/screen/page/LinkedPageScreen.java b/common/src/main/java/raccoonman/reterraforged/client/gui/screen/page/LinkedPageScreen.java index d3abf881..c592849c 100644 --- a/common/src/main/java/raccoonman/reterraforged/client/gui/screen/page/LinkedPageScreen.java +++ b/common/src/main/java/raccoonman/reterraforged/client/gui/screen/page/LinkedPageScreen.java @@ -68,7 +68,7 @@ public void init() { @Override public void render(GuiGraphics guiGraphics, int mouseX, int mouseY, float partialTicks) { - super.renderBackground(guiGraphics, mouseY, mouseY, partialTicks); +// super.renderBackground(guiGraphics, mouseY, mouseY, partialTicks); super.render(guiGraphics, mouseX, mouseY, partialTicks); } diff --git a/common/src/main/java/raccoonman/reterraforged/data/worldgen/tags/RTFDensityFunctionTagsProvider.java b/common/src/main/java/raccoonman/reterraforged/data/worldgen/tags/RTFDensityFunctionTagsProvider.java index 74ddd37c..24b946f5 100644 --- a/common/src/main/java/raccoonman/reterraforged/data/worldgen/tags/RTFDensityFunctionTagsProvider.java +++ b/common/src/main/java/raccoonman/reterraforged/data/worldgen/tags/RTFDensityFunctionTagsProvider.java @@ -21,9 +21,10 @@ public RTFDensityFunctionTagsProvider(PackOutput packOutput, CompletableFuture