zhdev/bukman
1
0
Fork 0
Code Issues Pull requests Releases 1 Activity

Initial 1.18 update

Browse source
This commit is contained in:
Frank van der Heijden 2021-11-30 23:01:26 +01:00
parent b8b28bcdc0
commit 1133c3077d
No known key found for this signature in database
GPG key ID: B808721C2DD5B5B8
2 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Bukkit/src/main/java/net/frankheijden/serverutils/bukkit/reflection/RCraftingManager.java
View file

@ -35,7 +35,8 @@ public class RCraftingManager {
RRegistryMaterials.removeKeysFor(reflection.get(null, "recipes"), plugin); RRegistryMaterials.removeKeysFor(reflection.get(null, "recipes"), plugin);
} else if (MinecraftReflectionVersion.MINOR > 12) { } else if (MinecraftReflectionVersion.MINOR > 12) {
Object server = RMinecraftServer.getReflection().invoke(null, "getServer"); Object server = RMinecraftServer.getReflection().invoke(null, "getServer");
Object craftingManager = RMinecraftServer.getReflection().invoke(server, "getCraftingManager"); String getCraftingManagerMethod = MinecraftReflectionVersion.MINOR >= 18 ? "aC" : "getCraftingManager";
Object craftingManager = RMinecraftServer.getReflection().invoke(server, getCraftingManagerMethod);
Map recipes; Map recipes;
if (MinecraftReflectionVersion.MINOR >= 17) { if (MinecraftReflectionVersion.MINOR >= 17) {

4
Bukkit/src/main/java/net/frankheijden/serverutils/bukkit/reflection/RMinecraftKey.java
View file

@ -33,8 +33,10 @@ public class RMinecraftKey {
public static String getNameSpace(Object instance) { public static String getNameSpace(Object instance) {
if (MinecraftReflectionVersion.MINOR <= 13) { if (MinecraftReflectionVersion.MINOR <= 13) {
return reflection.get(instance, "a"); return reflection.get(instance, "a");
} else if (MinecraftReflectionVersion.MINOR >= 17) { } else if (MinecraftReflectionVersion.MINOR == 17) {
return reflection.invoke(instance, "getNamespace"); return reflection.invoke(instance, "getNamespace");
} else if (MinecraftReflectionVersion.MINOR >= 18) {
return reflection.invoke(instance, "a");
} }
return reflection.get(instance, "namespace"); return reflection.get(instance, "namespace");
} }