updeat to 1.18

.github/workflows/gradle.yml

@@ -4,7 +4,7 @@
 name: Java CI with Gradle
 
 concurrency: 
-  group: "build-1.17"
+  group: "build-1.18"
   cancel-in-progress: true
 
 on:
@@ -18,16 +18,12 @@ jobs:
   build:
 
     runs-on: ubuntu-latest
-    strategy:
-       fail-fast: false
-       matrix:
-         java: [ '16', '16.0.1' ]
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 16
+    - name: Set up JDK 17
       uses: actions/setup-java@v2
       with:
-        java-version: ${{ matrix.Java }}
+        java-version: 17
         distribution: 'zulu'
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
@@ -36,12 +32,11 @@ jobs:
     - name: Remove *-dev.jar
       run: rm ./build/libs/*-dev.jar
     - uses: "marvinpinto/action-automatic-releases@latest"
-      if: ${{ matrix.Java == '16' }}
       with:
           repo_token: "${{ secrets.GITHUB_TOKEN }}"
-          automatic_release_tag: "latest-1.17"
+          automatic_release_tag: "latest-1.18"
           prerelease: false
-          title: "1.17 Build"
+          title: "1.18 Build"
           files: |
             ./build/libs/*.jar
     

.github/workflows/pull_request.yml

@@ -9,15 +9,12 @@ jobs:
   build:
 
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        java: [ '16', '16.0.1' ]
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 16
+    - name: Set up JDK 17
       uses: actions/setup-java@v2
       with:
-        java-version: ${{ matrix.Java }}
+        java-version: 17
         distribution: 'zulu'
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew

build.gradle

@@ -1,10 +1,9 @@
 plugins {
-	id 'fabric-loom' version '0.9-SNAPSHOT'
+	id 'fabric-loom' version '0.10-SNAPSHOT'
 	id 'maven-publish'
 }
 
-sourceCompatibility = JavaVersion.VERSION_16
+sourceCompatibility = targetCompatibility = JavaVersion.VERSION_17
-targetCompatibility = JavaVersion.VERSION_16
 
 archivesBaseName = project.archives_base_name
 version = project.mod_version

gradle.properties

@@ -2,9 +2,9 @@
 org.gradle.jvmargs=-Xmx2G
 
 # Fabric Properties
-minecraft_version=1.17.1
+minecraft_version=1.18
-yarn_version=1.17.1+build.46
+yarn_version=1.18+build.1
-loader_version=0.12.3
+loader_version=0.12.6
 
 # Mod Properties
 mod_version = 0.1

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -72,7 +72,7 @@ case "`uname`" in
   Darwin* )
     darwin=true
     ;;
-  MINGW* )
+  MSYS* | MINGW* )
     msys=true
     ;;
   NONSTOP* )
@@ -182,4 +182,4 @@ APP_ARGS=`save "$@"`
 # Collect all arguments for the java command, following the shell quoting and substitution rules
 eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 
-exec "$JAVACMD" "$@"
+exec "$JAVACMD" "$@"

gradlew.bat

@@ -86,4 +86,4 @@ exit /b 1
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal
 
-:omega
+:omega

src/main/java/anticope/rejects/modules/NewChunks.java

@@ -132,9 +132,9 @@ public class NewChunks extends Module {
             ChunkPos pos = new ChunkPos(packet.getX(), packet.getZ());
 
             if (!newChunks.contains(pos) && mc.world.getChunkManager().getChunk(packet.getX(), packet.getZ()) == null) {
-                WorldChunk chunk = new WorldChunk(mc.world, pos, null);
+                WorldChunk chunk = new WorldChunk(mc.world, pos);
                 try {
-                    chunk.loadFromPacket(null, packet.getReadBuffer(), new NbtCompound(), packet.getVerticalStripBitmask());
+                    chunk.loadFromPacket(packet.getChunkData().getSectionsDataBuf(), new NbtCompound(), packet.getChunkData().getBlockEntities(packet.getX(), packet.getZ()));
                 } catch (ArrayIndexOutOfBoundsException e) {
                     return;
                 }

src/main/java/anticope/rejects/modules/PacketFly.java

@@ -168,7 +168,7 @@ public class PacketFly extends Module {
     }
 
     private boolean checkHitBoxes() {
-        return !(mc.world.getBlockCollisions(mc.player, mc.player.getBoundingBox().expand(-0.0625,-0.0625,-0.0625)).count() == 0);
+        return !mc.world.getBlockCollisions(mc.player, mc.player.getBoundingBox().expand(-0.0625,-0.0625,-0.0625)).iterator().hasNext();
     }
 
     private boolean resetCounter(int counter) {

src/main/java/anticope/rejects/modules/SkeletonESP.java

@@ -106,7 +106,7 @@ public class SkeletonESP extends Module {
             BufferBuilder bufferBuilder = Tessellator.getInstance().getBuffer();
             bufferBuilder.begin(VertexFormat.DrawMode.DEBUG_LINES, VertexFormats.POSITION_COLOR);
 
-            Matrix4f matrix4f = matrixStack.peek().getModel();
+            Matrix4f matrix4f = matrixStack.peek().getPositionMatrix();
             bufferBuilder.vertex(matrix4f, 0, sneaking ? 0.6f : 0.7f, sneaking ? 0.23f : 0).color(skeletonColor.r, skeletonColor.g, skeletonColor.b, skeletonColor.a).next();
             bufferBuilder.vertex(matrix4f, 0, sneaking ? 1.05f : 1.4f, 0).color(skeletonColor.r, skeletonColor.g, skeletonColor.b, skeletonColor.a).next();//spine
 
@@ -119,7 +119,7 @@ public class SkeletonESP extends Module {
             matrixStack.push();//head
             matrixStack.translate(0, sneaking ? 1.05f : 1.4f, 0);
             rotate(matrixStack, head);
-            matrix4f = matrixStack.peek().getModel();
+            matrix4f = matrixStack.peek().getPositionMatrix();
             bufferBuilder.vertex(matrix4f, 0, 0, 0).color(skeletonColor.r, skeletonColor.g, skeletonColor.b, skeletonColor.a).next();
             bufferBuilder.vertex(matrix4f, 0, 0.15f, 0).color(skeletonColor.r, skeletonColor.g, skeletonColor.b, skeletonColor.a).next();
             matrixStack.pop();
@@ -127,7 +127,7 @@ public class SkeletonESP extends Module {
             matrixStack.push();//right leg
             matrixStack.translate(0.15f, sneaking ? 0.6f : 0.7f, sneaking ? 0.23f : 0);
             rotate(matrixStack, rightLeg);
-            matrix4f = matrixStack.peek().getModel();
+            matrix4f = matrixStack.peek().getPositionMatrix();
             bufferBuilder.vertex(matrix4f, 0, 0, 0).color(skeletonColor.r, skeletonColor.g, skeletonColor.b, skeletonColor.a).next();
             bufferBuilder.vertex(matrix4f, 0, -0.6f, 0).color(skeletonColor.r, skeletonColor.g, skeletonColor.b, skeletonColor.a).next();
             matrixStack.pop();
@@ -135,7 +135,7 @@ public class SkeletonESP extends Module {
             matrixStack.push();//left leg
             matrixStack.translate(-0.15f, sneaking ? 0.6f : 0.7f, sneaking ? 0.23f : 0);
             rotate(matrixStack, leftLeg);
-            matrix4f = matrixStack.peek().getModel();
+            matrix4f = matrixStack.peek().getPositionMatrix();
             bufferBuilder.vertex(matrix4f, 0, 0, 0).color(skeletonColor.r, skeletonColor.g, skeletonColor.b, skeletonColor.a).next();
             bufferBuilder.vertex(matrix4f, 0, -0.6f, 0).color(skeletonColor.r, skeletonColor.g, skeletonColor.b, skeletonColor.a).next();
             matrixStack.pop();
@@ -143,7 +143,7 @@ public class SkeletonESP extends Module {
             matrixStack.push();//right arm
             matrixStack.translate(0.37f, sneaking ? 1.05f : 1.35f, 0);
             rotate(matrixStack, rightArm);
-            matrix4f = matrixStack.peek().getModel();
+            matrix4f = matrixStack.peek().getPositionMatrix();
             bufferBuilder.vertex(matrix4f, 0, 0, 0).color(skeletonColor.r, skeletonColor.g, skeletonColor.b, skeletonColor.a).next();
             bufferBuilder.vertex(matrix4f, 0, -0.55f, 0).color(skeletonColor.r, skeletonColor.g, skeletonColor.b, skeletonColor.a).next();
             matrixStack.pop();
@@ -151,7 +151,7 @@ public class SkeletonESP extends Module {
             matrixStack.push();//left arm
             matrixStack.translate(-0.37f, sneaking ? 1.05f : 1.35f, 0);
             rotate(matrixStack, leftArm);
-            matrix4f = matrixStack.peek().getModel();
+            matrix4f = matrixStack.peek().getPositionMatrix();
             bufferBuilder.vertex(matrix4f, 0, 0, 0).color(skeletonColor.r, skeletonColor.g, skeletonColor.b, skeletonColor.a).next();
             bufferBuilder.vertex(matrix4f, 0, -0.55f, 0).color(skeletonColor.r, skeletonColor.g, skeletonColor.b, skeletonColor.a).next();
             matrixStack.pop();