Merge pull request #1 from tumuidle/ver/1.20.1

update to 1.20.1

Author: DvArcNode

README.md

@@ -2,7 +2,7 @@
 <h1>ResourceHack</h1>
 Minecraft server resource pack protection tool
 
-![Minecraft Version](https://img.shields.io/badge/Minecraft_Version-1.18.1-green?style=for-the-badge)
+![Minecraft Version](https://img.shields.io/badge/Minecraft_Version-1.20.1-green?style=for-the-badge)
 
 <img alt="paper" height="40" src="https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@3/assets/compact/supported/paper_vector.svg">
 <img alt="fabric" height="40" src="https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@3/assets/compact/supported/fabric_vector.svg">

gradle/libs.versions.toml

@@ -1,7 +1,7 @@
 [versions]
 shadow = "8.1.8"
 kotlin = "2.0.0"
-netty = "4.1.68.Final"
+netty = "4.1.82.Final"
 run-task = "2.3.0"
 
 [plugins]

mod/common/build.gradle

@@ -9,5 +9,5 @@ dependencies {
     modImplementation "net.fabricmc:fabric-loader:$parent.fabric_loader_version"
 
     implementation project(":all-common")
-//    include project(":all-common")
+    include project(":all-common")
 }

mod/common/src/main/java/arcnode/reshack/mod/mixin/MixinFilePackResource.java

@@ -5,17 +5,18 @@
 import net.minecraft.server.packs.FilePackResources;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.ModifyArg;
+import org.spongepowered.asm.mixin.injection.ModifyVariable;
 
 import java.io.File;
 import java.nio.file.Files;
 import java.util.UUID;
 
 @Mixin(FilePackResources.class)
 public class MixinFilePackResource {
-    @ModifyArg(
+    @ModifyVariable(
             method = "<init>",
-            at = @At(value = "INVOKE", target = "Lnet/minecraft/server/packs/AbstractPackResources;<init>(Ljava/io/File;)V")
+            at = @At(value = "HEAD", ordinal = 0),
+            argsOnly = true
     )
     private static File injectConstructor(File file) {
         try {

mod/fabric/build.gradle

@@ -33,6 +33,7 @@ dependencies {
     common(project(path: ':mod:common', configuration: 'namedElements')) { transitive false }
     shadowBundle project(path: ':mod:common', configuration: 'transformProductionFabric')
 
+    common project(":all-common")
     shadowBundle project(":all-common")
 }
 

mod/fabric/src/main/resources/fabric.mod.json

@@ -24,7 +24,7 @@
   ],
   "depends": {
     "fabricloader": ">=0.16.0",
-    "minecraft": "~1.18.1",
+    "minecraft": "~1.20.1",
     "java": ">=17",
     "fabric": "*"
   },

mod/forge/src/main/java/arcnode/reshack/mod/forge/ResourceHackForge.java

@@ -4,7 +4,7 @@
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
 import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.event.entity.EntityJoinWorldEvent;
+import net.minecraftforge.event.entity.EntityJoinLevelEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.common.Mod;
 
@@ -20,7 +20,7 @@ public ResourceHackForge() {
     }
 
     @SubscribeEvent
-    public void onEntityJoinWorld(EntityJoinWorldEvent event) {
+    public void onEntityJoinWorld(EntityJoinLevelEvent event) {
         if (event.getEntity() instanceof LocalPlayer)
             ResourceHack.sendRequest();
     }

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

@@ -16,13 +16,13 @@ description = '''
 [[dependencies.resourcehack]]
 modId = "forge"
 mandatory = true
-versionRange = "[39,)"
+versionRange = "[47,)"
 ordering = "NONE"
 side = "BOTH"
 
 [[dependencies.resourcehack]]
 modId = "minecraft"
 mandatory = true
-versionRange = "[1.18.1,)"
+versionRange = "[1.20.1,)"
 ordering = "NONE"
 side = "BOTH"

mod/gradle.properties

@@ -4,9 +4,9 @@ archives_name = resourcehack
 enabled_platforms = fabric,forge
 
 # Minecraft properties
-minecraft_version = 1.18.1
+minecraft_version = 1.20.1
 
 # Dependencies
 fabric_loader_version = 0.16.0
-fabric_api_version = 0.46.6+1.18
-forge_version = 1.18.1-39.1.2
+fabric_api_version = 0.92.2+1.20.1
+forge_version = 1.20.1-47.3.0

server/build.gradle

@@ -9,7 +9,7 @@ repositories {
 }
 
 dependencies {
-    compileOnly "io.papermc.paper:paper-api:1.18.1-R0.1-SNAPSHOT"
+    compileOnly "io.papermc.paper:paper-api:1.20.1-R0.1-SNAPSHOT"
 
     compileOnly libs.netty.buffer
     compileOnly 'com.github.retrooper:packetevents-spigot:2.4.0'
@@ -18,7 +18,7 @@ dependencies {
 }
 
 runServer {
-    minecraftVersion("1.18.1")
+    minecraftVersion("1.20.1")
 
     downloadPlugins {
         url("https://cdn.modrinth.com/data/HYKaKraK/versions/MfD5eOYA/packetevents-spigot-2.4.0.jar")