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

Merge pull request #38 from FrankHeijden/feature/1.18

Browse source 
Initial 1.18 update
This commit is contained in:
Frank van der Heijden 2021-12-01 00:36:16 +01:00 • committed by GitHub
commit 15ac8d325b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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);
} else if (MinecraftReflectionVersion.MINOR > 12) {
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;
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) {
if (MinecraftReflectionVersion.MINOR <= 13) {
return reflection.get(instance, "a");
} else if (MinecraftReflectionVersion.MINOR >= 17) {
} else if (MinecraftReflectionVersion.MINOR == 17) {
return reflection.invoke(instance, "getNamespace");
} else if (MinecraftReflectionVersion.MINOR >= 18) {
return reflection.invoke(instance, "a");
}
return reflection.get(instance, "namespace");
}