1.20 port

Author: gdavid04

build.gradle

@@ -7,10 +7,12 @@ buildscript {
 	dependencies {
 		classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1+', changing: true
 		classpath group: 'org.spongepowered', name: 'mixingradle', version: '0.7-SNAPSHOT'
+		classpath 'org.parchmentmc:librarian:1.+'
 	}
 }
 
 apply plugin: 'net.minecraftforge.gradle'
+apply plugin: 'org.parchmentmc.librarian.forgegradle'
 apply plugin: 'org.spongepowered.mixin'
 apply plugin: 'eclipse'
 apply plugin: 'maven-publish'
@@ -22,7 +24,7 @@ archivesBaseName = 'psionicutilities'
 java.toolchain.languageVersion = JavaLanguageVersion.of(17)
 
 minecraft {
-	mappings channel: 'official', version: '1.19.2'
+	mappings channel: "parchment", version: "2023.09.03-1.20.1"
 	accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')
 	runs {
 		client {
@@ -41,7 +43,7 @@ repositories {
 }
 
 dependencies {
-	minecraft group: 'net.minecraftforge', name: 'forge', version: "1.19.2-43.3.0"
+	minecraft group: 'net.minecraftforge', name: 'forge', version: "1.20.1-47.3.0"
 	annotationProcessor 'org.spongepowered:mixin:0.8.5:processor'
 
 	compileOnly fg.deobf("vazkii.psi:Psi:${psi_version}")

gradle.properties

@@ -3,6 +3,6 @@
 org.gradle.jvmargs=-Xmx3G
 
 # Use -Pversion=mc_version-mod_version on release
-version=1.19-DEV
-psi_version=1.19-101.519
-patchouli_version=1.19.2-77
+version=1.20-DEV
+psi_version=1.20.1-105.547
+patchouli_version=1.20.1-83-FORGE

src/main/java/gdavid/psionicutilities/mixin/SpellPieceMixin.java

@@ -1,22 +1,23 @@
 package gdavid.psionicutilities.mixin;
 
 import com.mojang.blaze3d.vertex.*;
-import com.mojang.math.Matrix4f;
 import gdavid.psionicutilities.PieceAnnotation;
 import gdavid.psionicutilities.PsionicUtilities;
+import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.client.renderer.MultiBufferSource;
+import net.minecraft.client.renderer.texture.TextureAtlas;
 import net.minecraft.client.resources.model.Material;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
+import org.joml.Matrix4f;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.*;
 
 import gdavid.psionicutilities.ConnectorColor;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-import vazkii.psi.api.ClientPsiAPI;
 import vazkii.psi.api.spell.IGenericRedirector;
 import vazkii.psi.api.spell.SpellParam;
 import vazkii.psi.api.spell.SpellPiece;
@@ -54,7 +55,7 @@ private void drawComment(PoseStack ms, MultiBufferSource buffers, int light, Cal
 
 	@OnlyIn(Dist.CLIENT)
 	@Inject(method = "drawCommentText", at = @At("HEAD"))
-	private void visibleCommentText(PoseStack ms, int tooltipX, int tooltipY, List<Component> commentText, Screen screen, CallbackInfo callback) {
+	private void visibleCommentText(GuiGraphics graphics, int tooltipX, int tooltipY, List<Component> commentText, Screen screen, CallbackInfo callback) {
 		PieceAnnotation.filterComment(commentText);
 	}
 
@@ -63,7 +64,7 @@ private void drawHighlight(PoseStack ms, MultiBufferSource buffers, int light, i
 		int r = (value >> 16) & 0xFF;
 		int g = (value >> 8) & 0xFF;
 		int b = value & 0xFF;
-		Material material = new Material(ClientPsiAPI.PSI_PIECE_TEXTURE_ATLAS, new ResourceLocation(PsionicUtilities.modId, "spell/highlight"));
+		Material material = new Material(TextureAtlas.LOCATION_BLOCKS, new ResourceLocation(PsionicUtilities.modId, "spell/highlight"));
 		VertexConsumer buf = material.buffer(buffers, ignore -> SpellPiece.getLayer());
 		Matrix4f mat = ms.last().pose();
 		buf.vertex(mat, -1, 17, 0).color(r, g, b, 128);

src/main/java/gdavid/psionicutilities/mixin/StatWidgetMixin.java

@@ -2,7 +2,7 @@
 
 import java.util.Iterator;
 
-import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.ItemStack;
 import org.spongepowered.asm.mixin.Final;
@@ -31,16 +31,16 @@ public class StatWidgetMixin {
 
 	@Shadow @Final private GuiProgrammer parent;
 
-	@Inject(method = "lambda$renderButton$0",
+	@Inject(method = "lambda$renderWidget$0",
 			at = @At(value = "INVOKE", target = "Lvazkii/psi/api/spell/SpellMetadata;getStat(Lvazkii/psi/api/spell/EnumSpellStat;)I"),
 			locals = LocalCapture.CAPTURE_FAILHARD)
-	private void capture(PoseStack ms, int mouseX, int mouseY, CompiledSpell compiledSpell, CallbackInfo callback,
+	private void capture(GuiGraphics graphics, int mouseX, int mouseY, CompiledSpell compiledSpell, CallbackInfo callback,
 			int i, int statX, SpellMetadata meta, ItemStack cad, Iterator<?> var9, EnumSpellStat stat) {
 		currentStat.set(stat);
 	}
 
-	@ModifyArg(method = "lambda$renderButton$0",
-			at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/Font;draw(Lcom/mojang/blaze3d/vertex/PoseStack;Ljava/lang/String;FFI)I", remap = true),
+	@ModifyArg(method = "lambda$renderWidget$0",
+			at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/GuiGraphics;drawString(Lnet/minecraft/client/gui/Font;Ljava/lang/String;IIIZ)I", remap = true),
 			index = 4)
 	private int setColor(int color) {
 		if (currentStat.get() == EnumSpellStat.COST) {

src/main/resources/META-INF/mods.toml

@@ -15,19 +15,19 @@ A Psi addon to make spell programming easier
 [[dependencies.psionicutilities]]
 	modId="forge"
     mandatory=true
-    versionRange="[43.3.0,)"
+    versionRange="[47.3.0,)"
     ordering="NONE"
     side="BOTH"
 [[dependencies.psionicutilities]]
     modId="minecraft"
     mandatory=true
-    versionRange="[1.19.2,1.20)"
+    versionRange="[1.20.1,1.21)"
     ordering="NONE"
     side="BOTH"
 [[dependencies.psionicutilities]]
     modId="psi"
     mandatory=true
-    versionRange="[1.19-101,)"
+    versionRange="[1.20.1-105.547,)"
     ordering="AFTER"
     side="BOTH"
 [[dependencies.psionicutilities]]

src/main/resources/pack.mcmeta

@@ -1,6 +1,6 @@
 {
     "pack": {
         "description": "Psionic Utilities resources",
-        "pack_format": 9
+        "pack_format": 15
     }
 }