Merge pull request #16 from fixrtm/newer-ngtlib-fixrtm-compatibility

feat: fixRTM 2.0.24-beta2 and KaizPatchX 1.6.0-rc.2 support

Author: anatawa12

build.gradle.kts

@@ -46,33 +46,33 @@ val rtmId = 288988
 val ngtlibId = 288989
 
 // minecraft modifications
-// KaizPatchX: 1.3.0
+// KaizPatchX: 1.6.0
 val kaizPatch by pluginPermsForNgt.mods.creatingURI(URI("https://github.com/Kai-Z-JP/KaizPatchX/releases/download/" +
-        "v1.3.0/src1.7.10_20200822+KaizPatchX-1.3.0.jar"))
-// fixRTM: SNAPSHOT-2021-08-15-06-27-14.jar
-val fixRTM by pluginPermsForNgt.mods.creatingCurse(fixRTMId, 3425891)
+        "v1.6.0/src1.7.10_20200822+KaizPatchX-1.6.0.jar"))
+// fixRTM: 2.0.24-beta2
+val fixRTM by pluginPermsForNgt.mods.creatingCurse(fixRTMId, 4053423)
 
 // RTM: 1.7.10.41
 val rtm1710 by pluginPermsForNgt.mods.creatingCurse(rtmId, 3039063)
 // RTM: 2.4.22-40
 val rtm1122 by pluginPermsForNgt.mods.creatingCurse(rtmId, 3387261)
 
-// NGTLib: 1.7.10.32
-val ngtlib1710 by pluginPermsForNgt.mods.creatingCurse(ngtlibId, 2940833)
-// NGTLib: 2.4.19-35
-val ngtlib1122 by pluginPermsForNgt.mods.creatingCurse(ngtlibId, 3387256)
+// NGTLib: 1.7.10.44
+val ngtlib1710 by pluginPermsForNgt.mods.creatingCurse(ngtlibId, 4030455)
+// NGTLib: 2.4.23-42
+val ngtlib1122 by pluginPermsForNgt.mods.creatingCurse(ngtlibId, 3873403)
 
 // LuckPerms: v5.3.64
-val luckPermsBuildNumber = 1363
-val luckPermsVersion = "5.3.64"
+val luckPermsBuildNumber = 1460
+val luckPermsVersion = "5.4.52"
 val luckPerms1710 by pluginPermsForNgt.mods.creatingURI(URI("https://ci.lucko.me/job/LuckPerms/$luckPermsBuildNumber/artifact" +
         "/bukkit-legacy/loader/build/libs/LuckPerms-Bukkit-Legacy-$luckPermsVersion.jar"))
 val luckPerms1122 by pluginPermsForNgt.mods.creatingURI(URI("https://ci.lucko.me/job/LuckPerms/$luckPermsBuildNumber/artifact" +
         "/bukkit/loader/build/libs/LuckPerms-Bukkit-$luckPermsVersion.jar"))
 
 // servers
-val mohist1710 by pluginPermsForNgt.servers.creatingMohist("1.7.10", 40)
-val mohist1122 by pluginPermsForNgt.servers.creatingMohist("1.12.2", 248)
+val mohist1710 by pluginPermsForNgt.servers.creatingMohist("1.7.10", 46)
+val mohist1122 by pluginPermsForNgt.servers.creatingMohist("1.12.2", 321)
 
 // others
 val pluginPermsForNGT by pluginPermsForNgt.mods.creatingByArchiveTask(tasks.jar)

src/api/java/jp/ngt/ngtlib/util/PermissionManager.java

@@ -14,7 +14,9 @@
 import net.minecraft.command.ICommandSender;
 
 import java.io.IOException;
+import java.util.Collection;
 import java.util.List;
+import java.util.Set;
 
 // The file only for signatures
 @Vendors({Vendor.NGT1710, Vendor.NGT1122})
@@ -45,6 +47,22 @@ public List<String> getPlayerList(String permission) {
         throw new IllegalStateException();
     }
 
+    // the function to get list of players the permission have
+    // in the kaizPatchX, this is named getPlayerList but due to signature conflict, renamed to 
+    // getPlayerList0 here. will be renamed in ClassTransformer for NGTPermissionManagerBukkit.
+    // see https://github.com/Kai-Z-JP/KaizPatchX/pull/312
+    @Vendors({Vendor.KaizPatch})
+    public Collection<String> getPlayerList0(String permission) {
+        throw new IllegalStateException();
+    }
+
+    // the function to get list of players the permission have
+    // see https://github.com/fixrtm/fixRTM/pull/550
+    @Vendors({Vendor.FixRTM})
+    public Set<String> getPlayerSet(String permission) {
+        throw new IllegalStateException();
+    }
+
     // the function to register permission for completion
     @Vendors(Vendor.KaizPatch)
     public void registerPermission(String per1) {

src/main/java/com/anatawa12/pluginPermsForNgt/NGTPermissionManagerBukkit.java

@@ -20,8 +20,10 @@
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
+import java.util.Set;
 
 import static com.anatawa12.pluginPermsForNgt.PluginPermsForNgtMain.PERM_PREFIX;
 
@@ -46,6 +48,20 @@ public List<String> getPlayerList(String par1) {
         return Collections.emptyList();
     }
 
+    @Vendors(Vendor.KaizPatch)
+    @Override
+    public Collection<String> getPlayerList0(String permission) {
+        PluginPermsForNgtMain.log("calling getPlayerList of KaizPatch by " + new Throwable().getStackTrace()[1]);
+        // In the KaizPatch's implementation, returns set so use set here.
+        return Collections.emptySet();
+    }
+
+    @Override
+    public Set<String> getPlayerSet(String permission) {
+        PluginPermsForNgtMain.log("calling getPlayerList of fixRTM by " + new Throwable().getStackTrace()[1]);
+        return Collections.emptySet();
+    }
+
     // KaizPatchX
     @Vendors(Vendor.KaizPatch)
     public void registerPermission(String per1) {

src/main/java/com/anatawa12/pluginPermsForNgt/coreMod/ClassTransformer.java

@@ -33,6 +33,8 @@ public byte[] transform(String name, String transformedName, byte[] basicClass)
             return transformFixRTMPermissionManager(basicClass);
         if ("com.anatawa12.pluginPermsForNgt.PluginPermsForNgtMain".equals(name))
             return transformPluginPermsForNgtMain(basicClass);
+        if (nameOfNGTPermissionManagerBukkit.equals(name))
+            return transformNGTPermissionManagerBukkit(basicClass);
         return basicClass;
     }
 
@@ -66,6 +68,23 @@ private byte[] transformNGTPermissionManager(byte[] basicClass) {
         return writer.toByteArray();
     }
 
+    private byte[] transformNGTPermissionManagerBukkit(byte[] basicClass) {
+        ClassNode node = new ClassNode();
+        new ClassReader(basicClass).accept(node, 0);
+
+        // remove final flag
+        node.access = node.access & ~Opcodes.ACC_FINAL;
+        for (MethodNode method : node.methods) {
+            if ("getPlayerList0".equals(method.name) && "(Ljava/lang/String;)Ljava/util/Collection;".equals(method.desc)) {
+                method.name = "getPlayerList";
+            }
+        }
+
+        ClassWriter writer = new ClassWriter(0);
+        node.accept(writer);
+        return writer.toByteArray();
+    }
+
     private byte[] transformFixRTMPermissionManager(byte[] basicClass) {
         ClassNode node = new ClassNode();
         new ClassReader(basicClass).accept(node, 0);
@@ -109,6 +128,8 @@ public String map(String typeName) {
 
     private static final String internalNameOfNGTPermissionManagerBukkit
             = "com/anatawa12/pluginPermsForNgt/NGTPermissionManagerBukkit";
+    private static final String nameOfNGTPermissionManagerBukkit
+            = "com.anatawa12.pluginPermsForNgt.NGTPermissionManagerBukkit";
 
     private static class FmlPackageNameFinder {
         private static final String fmlPackage;