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

Initial update for 1.19

Browse source
This commit is contained in:
Frank van der Heijden 2022-06-10 13:19:51 +02:00
parent 4054a3eca9
commit 25e2dc20b9
No known key found for this signature in database
GPG key ID: 4BC514A52A496F84
2 changed files with 17 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,7 +1,10 @@
package net.frankheijden.serverutils.bukkit.reflection; package net.frankheijden.serverutils.bukkit.reflection;
import dev.frankheijden.minecraftreflection.exceptions.MinecraftReflectionException;
import dev.frankheijden.minecraftreflection.MinecraftReflection; import dev.frankheijden.minecraftreflection.MinecraftReflection;
import dev.frankheijden.minecraftreflection.MinecraftReflectionVersion; import dev.frankheijden.minecraftreflection.MinecraftReflectionVersion;
import java.lang.reflect.Method;
import java.util.Arrays;
import java.util.Collection; import java.util.Collection;
import java.util.Map; import java.util.Map;
import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicBoolean;
@ -12,6 +15,7 @@ import org.bukkit.plugin.Plugin;
public class RCraftingManager { public class RCraftingManager {
private static final MinecraftReflection reflection; private static final MinecraftReflection reflection;
private static final Method getCraftingManagerMethod;
static { static {
if (MinecraftReflectionVersion.MINOR >= 17) { if (MinecraftReflectionVersion.MINOR >= 17) {
@ -19,6 +23,11 @@ public class RCraftingManager {
} else { } else {
reflection = MinecraftReflection.of("net.minecraft.server.%s.CraftingManager"); reflection = MinecraftReflection.of("net.minecraft.server.%s.CraftingManager");
} }
getCraftingManagerMethod = Arrays.stream(RMinecraftServer.getReflection().getClazz().getDeclaredMethods())
.filter(m -> m.getReturnType().equals(reflection.getClazz()))
.findAny()
.get();
} }
private RCraftingManager() {} private RCraftingManager() {}
@ -35,8 +44,12 @@ 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");
String getCraftingManagerMethod = MinecraftReflectionVersion.MINOR >= 18 ? "aC" : "getCraftingManager"; Object craftingManager;
Object craftingManager = RMinecraftServer.getReflection().invoke(server, getCraftingManagerMethod); try {
craftingManager = getCraftingManagerMethod.invoke(server);
} catch (ReflectiveOperationException ex) {
throw new MinecraftReflectionException(ex);
}
Map recipes; Map recipes;
if (MinecraftReflectionVersion.MINOR >= 17) { if (MinecraftReflectionVersion.MINOR >= 17) {

4
buildSrc/src/main/kotlin/VersionConstants.kt
View file

@ -1,7 +1,7 @@
object VersionConstants { object VersionConstants {
const val cloudVersion = "1.6.2" const val cloudVersion = "1.7.0-SNAPSHOT"
const val adventureVersion = "4.9.3" const val adventureVersion = "4.9.3"
const val adventurePlatformVersion = "4.0.1" const val adventurePlatformVersion = "4.0.1"
const val adventureMinimessageVersion = "4.2.0-SNAPSHOT" const val adventureMinimessageVersion = "4.2.0-SNAPSHOT"
const val bstatsVersion = "2.2.1" const val bstatsVersion = "3.0.0"
} }