1.20.6, yarn mappings

ThinkingStudios · May 15, 2024 · 2d31d26 · 2d31d26
1 parent c6312bb
commit 2d31d26
Show file tree

Hide file tree

Showing 53 changed files with 391 additions and 308 deletions.
diff --git a/.github/workflows/gradle_build.yml b/.github/workflows/gradle_build.yml
@@ -8,11 +8,11 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: 17
+          java-version: 21
       - name: Cache
         uses: actions/cache@v4
         with:

diff --git a/.github/workflows/gradle_publish.yml b/.github/workflows/gradle_publish.yml
@@ -15,11 +15,11 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-      - name: Set up JDK 20
+      - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
           distribution: 'adopt'
-          java-version: 20
+          java-version: 21
       - name: Cache
         uses: actions/cache@v4
         with:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,2 +1,2 @@
 ## Changelog
-- re-upload
+- port to 1.20.6
diff --git a/build.gradle b/build.gradle
@@ -1,6 +1,6 @@
 plugins {
     id "architectury-plugin" version "3.4-SNAPSHOT"
-    id "dev.architectury.loom" version "1.5-SNAPSHOT" apply false
+    id "dev.architectury.loom" version "1.6-SNAPSHOT" apply false
     id "com.github.johnrengelman.shadow" version "8.+" apply false
     id "com.hypherionmc.modutils.modpublisher" version "2.0.+" apply false
 }
@@ -16,7 +16,10 @@ subprojects {
 
     dependencies {
         minecraft "com.mojang:minecraft:${rootProject.minecraft_version}"
-        mappings "org.quiltmc:quilt-mappings:${rootProject.quilt_mappings}:intermediary-v2"
+        mappings loom.layered {
+            mappings "net.fabricmc:yarn:${rootProject.yarn_mappings}:v2"
+            mappings "dev.architectury:yarn-mappings-patch-neoforge:1.20.5+build.3"
+        }
     }
 }
 
@@ -30,18 +33,18 @@ allprojects {
     group = rootProject.maven_group
 
     repositories {
-        maven {
-            name = "QuiltMC"
-            url = "https://maven.quiltmc.org/repository/release"
-        }
+
     }
 
     tasks.withType(JavaCompile) {
         options.encoding = "UTF-8"
-        options.release = 17
+        options.release = 21
     }
 
     java {
+        sourceCompatibility = JavaVersion.VERSION_21
+        targetCompatibility = JavaVersion.VERSION_21
+
         withSourcesJar()
     }
 }
diff --git a/common/src/main/java/org/thinkingstudio/obsidianui/Tooltip.java b/common/src/main/java/org/thinkingstudio/obsidianui/Tooltip.java
@@ -12,8 +12,8 @@
 
 import com.google.common.collect.Queues;
 import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.gui.GuiGraphics;
-import net.minecraft.client.gui.tooltip.DefaultTooltipPositioner;
+import net.minecraft.client.gui.DrawContext;
+import net.minecraft.client.gui.tooltip.HoveredTooltipPositioner;
 import net.minecraft.text.OrderedText;
 import net.minecraft.text.StringVisitable;
 import org.jetbrains.annotations.ApiStatus;
@@ -86,10 +86,10 @@ public boolean shouldRender() {
 	/**
 	 * Renders the tooltip.
 	 *
-	 * @param graphics The GuiGraphics instance used to render.
+	 * @param drawContext The GuiGraphics instance used to render.
 	 */
-	public void render(GuiGraphics graphics) {
-		graphics.drawTooltip(MinecraftClient.getInstance().textRenderer, this.tooltip, DefaultTooltipPositioner.INSTANCE, this.x, this.y);
+	public void render(DrawContext drawContext) {
+		drawContext.drawTooltip(MinecraftClient.getInstance().textRenderer, this.tooltip, HoveredTooltipPositioner.INSTANCE, this.x, this.y);
 	}
 
 	/**
@@ -152,16 +152,16 @@ static void setDelayedRender(boolean delayed) {
 	/**
 	 * Renders all the tooltips.
 	 *
-	 * @param graphics the GUI graphics to render from
+	 * @param drawContext the GUI graphics to render from
 	 */
-	public static void renderAll(GuiGraphics graphics) {
+	public static void renderAll(DrawContext drawContext) {
 		if (delayed)
 			return;
 		synchronized (TOOLTIPS) {
 			Tooltip tooltip;
 
 			while ((tooltip = TOOLTIPS.poll()) != null)
-				tooltip.render(graphics);
+				tooltip.render(drawContext);
 		}
 	}
 }
diff --git a/common/src/main/java/org/thinkingstudio/obsidianui/background/Background.java b/common/src/main/java/org/thinkingstudio/obsidianui/background/Background.java
@@ -10,7 +10,7 @@
 
 package org.thinkingstudio.obsidianui.background;
 
-import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.DrawContext;
 import org.thinkingstudio.obsidianui.widget.SpruceWidget;
 
 /**
@@ -21,5 +21,5 @@
  * @since 2.0.0
  */
 public interface Background {
-	void render(GuiGraphics graphics, SpruceWidget widget, int vOffset, int mouseX, int mouseY, float delta);
+	void render(DrawContext drawContext, SpruceWidget widget, int vOffset, int mouseX, int mouseY, float delta);
 }
diff --git a/common/src/main/java/org/thinkingstudio/obsidianui/background/DirtTexturedBackground.java b/common/src/main/java/org/thinkingstudio/obsidianui/background/DirtTexturedBackground.java
@@ -10,7 +10,7 @@
 
 package org.thinkingstudio.obsidianui.background;
 
-import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.DrawContext;
 import org.thinkingstudio.obsidianui.util.RenderUtil;
 import org.thinkingstudio.obsidianui.widget.SpruceWidget;
 
@@ -19,8 +19,8 @@ public record DirtTexturedBackground(int red, int green, int blue, int alpha) im
 	public static final Background DARKENED = new DirtTexturedBackground(32, 32, 32, 255);
 
 	@Override
-	public void render(GuiGraphics graphics, SpruceWidget widget, int vOffset, int mouseX, int mouseY, float delta) {
-		RenderUtil.renderBackgroundTexture(widget.getX(), widget.getY(), widget.getWidth(), widget.getHeight(),
+	public void render(DrawContext drawContext, SpruceWidget widget, int vOffset, int mouseX, int mouseY, float delta) {
+		RenderUtil.renderDirtBackgroundTexture(widget.getX(), widget.getY(), widget.getWidth(), widget.getHeight(),
 				vOffset / 32.f, this.red, this.green, this.blue, this.alpha);
 	}
 

diff --git a/common/src/main/java/org/thinkingstudio/obsidianui/background/EmptyBackground.java b/common/src/main/java/org/thinkingstudio/obsidianui/background/EmptyBackground.java
@@ -10,7 +10,7 @@
 
 package org.thinkingstudio.obsidianui.background;
 
-import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.DrawContext;
 import org.thinkingstudio.obsidianui.widget.SpruceWidget;
 
 /**
@@ -27,7 +27,7 @@ private EmptyBackground() {
 	}
 
 	@Override
-	public void render(GuiGraphics graphics, SpruceWidget widget, int vOffset, int mouseX, int mouseY, float delta) {
+	public void render(DrawContext drawContext, SpruceWidget widget, int vOffset, int mouseX, int mouseY, float delta) {
 	}
 
 	@Override

diff --git a/common/src/main/java/org/thinkingstudio/obsidianui/background/SimpleColorBackground.java b/common/src/main/java/org/thinkingstudio/obsidianui/background/SimpleColorBackground.java
@@ -10,7 +10,7 @@
 
 package org.thinkingstudio.obsidianui.background;
 
-import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.DrawContext;
 import org.thinkingstudio.obsidianui.util.ColorUtil;
 import org.thinkingstudio.obsidianui.widget.SpruceWidget;
 
@@ -26,10 +26,10 @@ public SimpleColorBackground(int red, int green, int blue, int alpha) {
 	}
 
 	@Override
-	public void render(GuiGraphics graphics, SpruceWidget widget, int vOffset, int mouseX, int mouseY, float delta) {
+	public void render(DrawContext drawContext, SpruceWidget widget, int vOffset, int mouseX, int mouseY, float delta) {
 		int x = widget.getX();
 		int y = widget.getY();
-		graphics.fill(x, y, x + widget.getWidth(), y + widget.getHeight(), this.color);
+		drawContext.fill(x, y, x + widget.getWidth(), y + widget.getHeight(), this.color);
 	}
 
 	@Override

diff --git a/common/src/main/java/org/thinkingstudio/obsidianui/border/Border.java b/common/src/main/java/org/thinkingstudio/obsidianui/border/Border.java
@@ -10,7 +10,7 @@
 
 package org.thinkingstudio.obsidianui.border;
 
-import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.DrawContext;
 import org.thinkingstudio.obsidianui.widget.SpruceWidget;
 
 /**
@@ -21,7 +21,7 @@
  * @since 2.0.0
  */
 public interface Border {
-	void render(GuiGraphics graphics, SpruceWidget widget, int mouseX, int mouseY, float delta);
+	void render(DrawContext drawContext, SpruceWidget widget, int mouseX, int mouseY, float delta);
 
 	/**
 	 * Returns the thickness of the border.

diff --git a/common/src/main/java/org/thinkingstudio/obsidianui/border/EmptyBorder.java b/common/src/main/java/org/thinkingstudio/obsidianui/border/EmptyBorder.java
@@ -10,7 +10,7 @@
 
 package org.thinkingstudio.obsidianui.border;
 
-import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.DrawContext;
 import org.thinkingstudio.obsidianui.widget.SpruceWidget;
 
 /**
@@ -27,7 +27,7 @@ private EmptyBorder() {
 	}
 
 	@Override
-	public void render(GuiGraphics graphics, SpruceWidget widget, int mouseX, int mouseY, float delta) {
+	public void render(DrawContext drawContext, SpruceWidget widget, int mouseX, int mouseY, float delta) {
 	}
 
 	@Override

diff --git a/common/src/main/java/org/thinkingstudio/obsidianui/border/SimpleBorder.java b/common/src/main/java/org/thinkingstudio/obsidianui/border/SimpleBorder.java
@@ -11,12 +11,12 @@
 package org.thinkingstudio.obsidianui.border;
 
 import com.mojang.blaze3d.systems.RenderSystem;
-import com.mojang.blaze3d.vertex.BufferBuilder;
-import com.mojang.blaze3d.vertex.Tessellator;
-import com.mojang.blaze3d.vertex.VertexFormat;
-import com.mojang.blaze3d.vertex.VertexFormats;
-import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.DrawContext;
+import net.minecraft.client.render.BufferBuilder;
 import net.minecraft.client.render.GameRenderer;
+import net.minecraft.client.render.Tessellator;
+import net.minecraft.client.render.VertexFormat;
+import net.minecraft.client.render.VertexFormats;
 import org.thinkingstudio.obsidianui.util.ColorUtil;
 import org.thinkingstudio.obsidianui.widget.SpruceWidget;
 
@@ -57,10 +57,10 @@ public SimpleBorder(int thickness, int red, int green, int blue, int alpha, int
 	}
 
 	@Override
-	public void render(GuiGraphics graphics, SpruceWidget widget, int mouseX, int mouseY, float delta) {
+	public void render(DrawContext drawContext, SpruceWidget widget, int mouseX, int mouseY, float delta) {
 		var tessellator = Tessellator.getInstance();
-		var buffer = tessellator.getBufferBuilder();
-		RenderSystem.setShader(GameRenderer::getPositionColorShader);
+		var buffer = tessellator.getBuffer();
+		RenderSystem.setShader(GameRenderer::getPositionColorProgram);
 		buffer.begin(VertexFormat.DrawMode.QUADS, VertexFormats.POSITION_COLOR);
 		int x = widget.getX();
 		int y = widget.getY();

diff --git a/common/src/main/java/org/thinkingstudio/obsidianui/hud/Hud.java b/common/src/main/java/org/thinkingstudio/obsidianui/hud/Hud.java
@@ -12,7 +12,7 @@
 
 import com.google.common.collect.ImmutableList;
 import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.DrawContext;
 import net.minecraft.util.Identifier;
 import org.jetbrains.annotations.NotNull;
 import org.thinkingstudio.obsidianui.util.Identifiable;
@@ -100,8 +100,8 @@ public void init(@NotNull MinecraftClient client, int screenWidth, int screenHei
 	 * @param tickDelta Progress for linearly interpolating between the previous and current game state.
 	 * @see #isEnabled()
 	 */
-	public void render(GuiGraphics graphics, float tickDelta) {
-		this.components.stream().filter(HudComponent::isEnabled).forEach(component -> component.render(graphics, tickDelta));
+	public void render(DrawContext drawContext, float tickDelta) {
+		this.components.stream().filter(HudComponent::isEnabled).forEach(component -> component.render(drawContext, tickDelta));
 	}
 
 	/**

diff --git a/common/src/main/java/org/thinkingstudio/obsidianui/hud/HudComponent.java b/common/src/main/java/org/thinkingstudio/obsidianui/hud/HudComponent.java
@@ -10,7 +10,7 @@
 
 package org.thinkingstudio.obsidianui.hud;
 
-import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.DrawContext;
 import net.minecraft.util.Identifier;
 import org.jetbrains.annotations.NotNull;
 import org.thinkingstudio.obsidianui.util.Identifiable;
@@ -67,7 +67,7 @@ public void setEnabled(boolean enabled) {
 	 * @param tickDelta Progress for linearly interpolating between the previous and current game state.
 	 * @see #isEnabled()
 	 */
-	public abstract void render(GuiGraphics graphics, float tickDelta);
+	public abstract void render(DrawContext drawContext, float tickDelta);
 
 	/**
 	 * Updates the HUD each tick if enabled and has tick updates.

diff --git a/common/src/main/java/org/thinkingstudio/obsidianui/hud/component/TextHudComponent.java b/common/src/main/java/org/thinkingstudio/obsidianui/hud/component/TextHudComponent.java
@@ -11,7 +11,7 @@
 package org.thinkingstudio.obsidianui.hud.component;
 
 import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.DrawContext;
 import net.minecraft.text.Text;
 import net.minecraft.util.Identifier;
 import org.thinkingstudio.obsidianui.hud.HudComponent;
@@ -76,7 +76,7 @@ public void setColor(int color) {
 	}
 
 	@Override
-	public void render(GuiGraphics graphics, float tickDelta) {
-		graphics.drawShadowedText(this.client.textRenderer, this.text, this.x, this.y, this.color);
+	public void render(DrawContext drawContext, float tickDelta) {
+		drawContext.drawTextWithShadow(this.client.textRenderer, this.text, this.x, this.y, this.color);
 	}
 }
diff --git a/common/src/main/java/org/thinkingstudio/obsidianui/option/SpruceDoubleInputOption.java b/common/src/main/java/org/thinkingstudio/obsidianui/option/SpruceDoubleInputOption.java
@@ -49,9 +49,9 @@ public SpruceWidget createWidget(Position position, int width) {
 		textField.setRenderTextProvider((displayedText, offset) -> {
 			try {
 				Double.parseDouble(textField.getText());
-				return OrderedText.forward(displayedText, Style.EMPTY);
+				return OrderedText.styledForwardsVisitedString(displayedText, Style.EMPTY);
 			} catch (NumberFormatException e) {
-				return OrderedText.forward(displayedText, Style.EMPTY.withColor(Formatting.RED));
+				return OrderedText.styledForwardsVisitedString(displayedText, Style.EMPTY.withColor(Formatting.RED));
 			}
 		});
 		textField.setChangedListener(input -> {

diff --git a/common/src/main/java/org/thinkingstudio/obsidianui/option/SpruceFloatInputOption.java b/common/src/main/java/org/thinkingstudio/obsidianui/option/SpruceFloatInputOption.java
@@ -49,9 +49,9 @@ public SpruceWidget createWidget(Position position, int width) {
 		textField.setRenderTextProvider((displayedText, offset) -> {
 			try {
 				Float.parseFloat(textField.getText());
-				return OrderedText.forward(displayedText, Style.EMPTY);
+				return OrderedText.styledForwardsVisitedString(displayedText, Style.EMPTY);
 			} catch (NumberFormatException e) {
-				return OrderedText.forward(displayedText, Style.EMPTY.withColor(Formatting.RED));
+				return OrderedText.styledForwardsVisitedString(displayedText, Style.EMPTY.withColor(Formatting.RED));
 			}
 		});
 		textField.setChangedListener(input -> {

diff --git a/common/src/main/java/org/thinkingstudio/obsidianui/option/SpruceIntegerInputOption.java b/common/src/main/java/org/thinkingstudio/obsidianui/option/SpruceIntegerInputOption.java
@@ -50,9 +50,9 @@ public SpruceWidget createWidget(Position position, int width) {
 		textField.setRenderTextProvider((displayedText, offset) -> {
 			try {
 				Integer.parseInt(textField.getText());
-				return OrderedText.forward(displayedText, Style.EMPTY);
+				return OrderedText.styledForwardsVisitedString(displayedText, Style.EMPTY);
 			} catch (NumberFormatException e) {
-				return OrderedText.forward(displayedText, Style.EMPTY.withColor(Formatting.RED));
+				return OrderedText.styledForwardsVisitedString(displayedText, Style.EMPTY.withColor(Formatting.RED));
 			}
 		});
 		textField.setChangedListener(input -> {