Update to 1.20.6

tr7zw · May 18, 2024 · 264f83c · 264f83c
1 parent c9e7336
commit 264f83c
Show file tree

Hide file tree

Showing 8 changed files with 113 additions and 28 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -10,11 +10,11 @@ jobs:
     steps:
       - name: checkout repository
         uses: actions/checkout@v2
-      - name: setup jdk 17
+      - name: setup jdk 21
         uses: actions/setup-java@v4
         with:
           distribution: temurin
-          java-version: 17
+          java-version: 21
       # to cache gradle files
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v3

diff --git a/.github/workflows/tag.yml b/.github/workflows/tag.yml
@@ -8,10 +8,10 @@ jobs:
     steps:
       - name: checkout repository
         uses: actions/checkout@v2
-      - name: setup jdk 17
+      - name: setup jdk 21
         uses: actions/setup-java@v1
         with:
-          java-version: 17
+          java-version: 21
       - name: make gradle wrapper executable
         run: chmod +x ./gradlecw
       - name: build
@@ -391,3 +391,59 @@ jobs:
           name: ${{github.ref_name}}-1.20.4 - Fabric
           files: 'versions/1.20.4-fabric/build/libs/!(*-@(dev|sources|javadoc|all)).jar'
           game-versions: 1.20.4
+      - name: Publish-1.20.6-forge-Curseforge
+        uses: Kir-Antipov/[email protected]
+        with:
+          curseforge-id: 333287
+          curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}
+          loaders: forge
+          name: ${{github.ref_name}}-1.20.6 - Forge
+          version-type: beta
+          files: 'versions/1.20.6-forge/build/libs/!(*-@(dev|sources|javadoc)).jar'
+          game-versions: 1.20.6
+      - name: Publish-1.20.6-forge-Modrinth
+        uses: Kir-Antipov/[email protected]
+        with:
+          modrinth-id: H5XMjpHi
+          modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
+          loaders: forge
+          name: ${{github.ref_name}}-1.20.6 - Forge
+          files: 'versions/1.20.6-forge/build/libs/!(*-@(dev|sources|javadoc)).jar'
+          game-versions: 1.20.6
+      - name: Publish-1.20.6-neoforge-Curseforge
+        uses: Kir-Antipov/[email protected]
+        with:
+          curseforge-id: 333287
+          curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}
+          loaders: neoforge
+          name: ${{github.ref_name}}-1.20.6 - NeoForge
+          version-type: beta
+          files: 'versions/1.20.6-neoforge/build/libs/!(*-@(dev|sources|javadoc|all)).jar'
+          game-versions: 1.20.6
+      - name: Publish-1.20.6-neoforge-Modrinth
+        uses: Kir-Antipov/[email protected]
+        with:
+          modrinth-id: H5XMjpHi
+          modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
+          loaders: neoforge
+          name: ${{github.ref_name}}-1.20.6 - NeoForge
+          files: 'versions/1.20.6-neoforge/build/libs/!(*-@(dev|sources|javadoc|all)).jar'
+          game-versions: 1.20.6
+      - name: Publish-1.20.6-fabric-Curseforge
+        uses: Kir-Antipov/[email protected]
+        with:
+          curseforge-id: 333287
+          curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}
+          loaders: fabric
+          name: ${{github.ref_name}}-1.20.6 - Fabric
+          files: 'versions/1.20.6-fabric/build/libs/!(*-@(dev|sources|javadoc|all)).jar'
+          game-versions: 1.20.6
+      - name: Publish-1.20.6-fabric-Modrinth
+        uses: Kir-Antipov/[email protected]
+        with:
+          modrinth-id: H5XMjpHi
+          modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
+          loaders: fabric
+          name: ${{github.ref_name}}-1.20.6 - Fabric
+          files: 'versions/1.20.6-fabric/build/libs/!(*-@(dev|sources|javadoc|all)).jar'
+          game-versions: 1.20.6
diff --git a/.gitignore b/.gitignore
@@ -51,3 +51,4 @@ src/main/resources/pack.mcmeta
 src/main/java/dev/tr7zw/util/NMSHelper.java
 src/main/java/dev/tr7zw/util/ModLoaderUtil.java
 *.log
+src/main/neoforge-resources/META-INF/neoforge.mods.toml
diff --git a/gradle/gradle-compose.jar b/gradle/gradle-compose.jar
diff --git a/settings.json b/settings.json
@@ -19,6 +19,9 @@
         "1.20.2-fabric",
         "1.20.4-forge",
         "1.20.4-neoforge",
-        "1.20.4-fabric"
+        "1.20.4-fabric",
+        "1.20.6-forge",
+        "1.20.6-neoforge",
+        "1.20.6-fabric"
     ]
 }
diff --git a/src/main/java/dev/tr7zw/firstperson/mixins/FishingBobberRendererMixin.java b/src/main/java/dev/tr7zw/firstperson/mixins/FishingBobberRendererMixin.java
@@ -5,6 +5,7 @@
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.Redirect;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 import com.mojang.blaze3d.vertex.PoseStack;
 
@@ -28,7 +29,13 @@ private boolean doCorrect() {
                 && Minecraft.getInstance().options.getCameraType() == CameraType.FIRST_PERSON;
     }
 
-    @Redirect(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/Options;getCameraType()Lnet/minecraft/client/CameraType;"))
+    // spotless:off
+    //#if MC <= 12004
+    //$$ @Redirect(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/Options;getCameraType()Lnet/minecraft/client/CameraType;"))
+    //#else
+    @Redirect(method = "getPlayerHandPos", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/Options;getCameraType()Lnet/minecraft/client/CameraType;"))
+    //#endif
+    //spotless:on
     private CameraType redirect(Options gameOptions) {
         return doCorrect() ? CameraType.THIRD_PERSON_BACK : gameOptions.getCameraType();
     }
@@ -45,24 +52,33 @@ private void calcOffset(FishingHook fishingBobberEntity, float f, float g, PoseS
         }
     }
 
-    @Redirect(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/player/Player;getX()D"))
-    private double offsetX(Player playerEntity) {
-        return playerEntity.getX() + offsetvec3d.x();
-    }
-
-    @Redirect(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/player/Player;getZ()D"))
-    private double offsetZ(Player playerEntity) {
-        return playerEntity.getZ() + offsetvec3d.z();
-    }
-
-    @Redirect(method = "render", at = @At(value = "FIELD", target = "Lnet/minecraft/world/entity/player/Player;xo:D"))
-    private double prevOffsetX(Player playerEntity) {
-        return playerEntity.xo + offsetvec3d.x();
-    }
-
-    @Redirect(method = "render", at = @At(value = "FIELD", target = "Lnet/minecraft/world/entity/player/Player;zo:D"))
-    private double prevOffsetZ(Player playerEntity) {
-        return playerEntity.zo + offsetvec3d.z();
+    // spotless:off
+    //#if MC <= 12004
+//$$    @Redirect(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/player/Player;getX()D"))
+//$$    private double offsetX(Player playerEntity) {
+//$$        return playerEntity.getX() + offsetvec3d.x();
+//$$    }
+//$$
+//$$    @Redirect(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/player/Player;getZ()D"))
+//$$    private double offsetZ(Player playerEntity) {
+//$$        return playerEntity.getZ() + offsetvec3d.z();
+//$$    }
+//$$
+//$$    @Redirect(method = "render", at = @At(value = "FIELD", target = "Lnet/minecraft/world/entity/player/Player;xo:D"))
+//$$    private double prevOffsetX(Player playerEntity) {
+//$$        return playerEntity.xo + offsetvec3d.x();
+//$$    }
+//$$
+//$$    @Redirect(method = "render", at = @At(value = "FIELD", target = "Lnet/minecraft/world/entity/player/Player;zo:D"))
+//$$    private double prevOffsetZ(Player playerEntity) {
+//$$        return playerEntity.zo + offsetvec3d.z();
+//$$    }
+  //#else
+    @Inject(method = "getPlayerHandPos", at = @At("RETURN"), cancellable = true)
+    private void getPlayerHandPosOffset(Player player, float f, float g, CallbackInfoReturnable<Vec3> ci) {
+        ci.setReturnValue(ci.getReturnValue().add(offsetvec3d));
     }
+    //#endif
+    //spotless:on
 
 }
diff --git a/src/main/java/dev/tr7zw/firstperson/mixins/WorldRendererMixin.java b/src/main/java/dev/tr7zw/firstperson/mixins/WorldRendererMixin.java
@@ -35,9 +35,18 @@ public class WorldRendererMixin {
     @Shadow
     private RenderBuffers renderBuffers;
 
-    @Inject(method = "renderLevel", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/LevelRenderer;checkPoseStack(Lcom/mojang/blaze3d/vertex/PoseStack;)V", ordinal = 0))
-    public void render(PoseStack matrices, float tickDelta, long limitTime, boolean renderBlockOutline, Camera camera,
-            GameRenderer gameRenderer, LightTexture lightmapTextureManager, Matrix4f matrix4f, CallbackInfo info) {
+    // spotless:off
+    //#if MC <= 12004
+//$$    @Inject(method = "renderLevel", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/LevelRenderer;checkPoseStack(Lcom/mojang/blaze3d/vertex/PoseStack;)V", ordinal = 0))
+//$$    public void render(PoseStack matrices, float tickDelta, long limitTime, boolean renderBlockOutline, Camera camera,
+//$$            GameRenderer gameRenderer, LightTexture lightmapTextureManager, Matrix4f matrix4f, CallbackInfo info) {
+        //#else
+        @Inject(method = "renderLevel", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/LevelRenderer;checkPoseStack(Lcom/mojang/blaze3d/vertex/PoseStack;)V", ordinal = 0))
+        public void render(float tickDelta, long limitTime, boolean renderBlockOutline, Camera camera,
+                GameRenderer gameRenderer, LightTexture lightmapTextureManager, Matrix4f matrix4f, Matrix4f matrix4f2, CallbackInfo info) {
+        PoseStack matrices = new PoseStack();
+        //#endif
+        //spotless:on
         if (camera.isDetached() || !FirstPersonModelCore.instance.getLogicHandler().shouldApplyThirdPerson(false)) {
             return;
         }

diff --git a/versions/mainProject b/versions/mainProject
@@ -1 +1 @@
-1.20.4-fabric
+1.20.6-fabric