xUpgrade to 1.20.6

.github/workflows/gradle.yml

@@ -10,10 +10,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 17
+    - name: Set up JDK 21
       uses: actions/setup-java@v1
       with:
-        java-version: 17
+        java-version: 21
     - name: Build artifacts
       run: ./gradlew build
     - name: Upload build artifacts

.github/workflows/publish.yml

@@ -13,10 +13,10 @@ jobs:
     steps:
       - name: Checkout sources
         uses: actions/checkout@v2
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v1
         with:
-          java-version: 17
+          java-version: 21
       - name: Build artifacts
         run: ./gradlew build
       - name: Upload assets to GitHub

.gitignore

@@ -156,4 +156,4 @@ gradle-app.setting
 run/
 
 # Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
-!gradle-wrapper.jar
+!gradle-wrapper.jar

build.gradle

@@ -1,17 +1,28 @@
 plugins {
-    id 'fabric-loom' version '0.12-SNAPSHOT'
-    id 'org.ajoberstar.grgit' version '4.1.0'
+    id 'base'
+    id 'java'
+    id 'fabric-loom' version '1.7-SNAPSHOT'
+    id 'org.ajoberstar.grgit' version '5.2.2'
 }
 repositories {
     maven { url 'https://maven.shedaniel.me/' }
     maven { url 'https://maven.terraformersmc.com/releases'}
     maven { url = "https://jitpack.io" }
 }
 
-sourceCompatibility = JavaVersion.VERSION_17
-targetCompatibility = JavaVersion.VERSION_17
+java {
+    // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
+    // if it is present.
+    // If you remove this line, sources will not be generated.
+    withSourcesJar()
+
+    sourceCompatibility = JavaVersion.VERSION_21
+    targetCompatibility = JavaVersion.VERSION_21
+}
 
-archivesBaseName = "${project.archives_base_name}-mc${project.minecraft_version}"
+base {
+    archivesName = "${project.archives_base_name}-mc${project.minecraft_version}"
+}
 version = "${project.mod_version}+${getVersionMetadata()}"
 group = project.maven_group
 
@@ -54,7 +65,7 @@ tasks.withType(JavaCompile).configureEach {
     it.options.encoding = "UTF-8"
 
     // Minecraft 1.18 (1.18-pre2) upwards uses Java 17.
-    it.options.release = 17
+    it.options.release = 21
 }
 
 jar {
@@ -66,7 +77,7 @@ java {
     // if it is present.
     // If you remove this line, sources will not be generated.
     toolchain {
-        languageVersion.set(JavaLanguageVersion.of(17))
+        languageVersion.set(JavaLanguageVersion.of(21))
     }
     withSourcesJar()
 

gradle.properties

@@ -1,19 +1,20 @@
 # Done to increase the memory available to gradle.
 org.gradle.jvmargs=-Xmx1G
+org.gradle.parallel=true
 # Fabric Properties
 # check these on https://modmuss50.me/fabric.html
 
-minecraft_version=1.20.1
-yarn_mappings=1.20.1+build.9
-loader_version=0.14.21
+minecraft_version=1.20.6
+yarn_mappings=1.20.6+build.1
+loader_version=0.15.10
 
 #Fabric api
-fabric_version=0.86.0+1.20.1
+fabric_version=0.97.8+1.20.6
 
 # Mod Properties
-mod_version=1.2.3
+mod_version=1.2.5
 maven_group=autotorch
 archives_base_name=autotorch
 #Cloth config
-cloth_version=11.1.106
-modmenu_version=7.2.1
+cloth_version=14.0.126
+modmenu_version=10.0.0

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

settings.gradle

@@ -1,10 +1,10 @@
 pluginManagement {
     repositories {
-        jcenter()
         maven {
             name = 'Fabric'
             url = 'https://maven.fabricmc.net/'
         }
+        mavenCentral()
         gradlePluginPortal()
     }
-}
+}

src/main/java/autotorch/autotorch/client/AutotorchClient.java

@@ -71,7 +71,7 @@ public void tick(MinecraftClient client) {
             }
         }
     }
-    private boolean offHandRightClickBlock(BlockPos pos) {
+    private void offHandRightClickBlock(BlockPos pos) {
         Vec3d hitVec = Vec3d.ofBottomCenter(pos);
         if (CDATA.accuratePlacement) {
             PlayerMoveC2SPacket.LookAndOnGround packet = new PlayerMoveC2SPacket.LookAndOnGround(client.player.getYaw(), 90.0F, true);
@@ -80,7 +80,6 @@ private boolean offHandRightClickBlock(BlockPos pos) {
         ActionResult one = client.interactionManager.interactBlock(client.player,Hand.OFF_HAND,
                 new BlockHitResult(hitVec, Direction.DOWN, pos, false));
         ActionResult two = client.interactionManager.interactItem(client.player,Hand.OFF_HAND);
-        return (one.isAccepted() && two.isAccepted());
     }
     public boolean canPlaceTorch(BlockPos pos) {
         return (client.world.getBlockState(pos).getFluidState().isEmpty() &&

src/main/resources/fabric.mod.json

@@ -24,8 +24,9 @@
     ]
   },
   "depends": {
-    "fabricloader": ">=0.11.1",
-    "minecraft": ">=1.17",
-    "fabric": ">=0.30.0"
+    "fabricloader": ">=0.15.10",
+    "minecraft": "~1.20.6",
+    "java": ">=21",
+    "fabric-api": "*"
   }
 }