Multi-version support (1.16.5, 1.18.1, 1.18.2)

.gitignore

@@ -1,9 +1,146 @@
+# Maven
+target/
+dependency-reduced-pom.xml
+pom.xml.releaseBackup
+pom.xml.versionsBackup
+release.properties
+
+# Vim
+*.swp
+*.swo
+
+# IntelliJ IDEA
+.idea/
+*.iml
+*.ipr
+*.iws
+
 # Eclipse
+.settings/
+.classpath
 .project
+/bin/
+*/bin/
+
+# User-specific stuff
+.idea/
+
+*.iml
+*.ipr
+*.iws
+
+# IntelliJ
+out/
+
+# Eclipse
 .classpath
+.project
 .settings/
-bin/
+plugin/bin/
+api/bin/
 
-# Maven
-/target
+# Compiled class file
+*.class
+
+# Log file
+*.log
+
+# BlueJ files
+*.ctxt
+
+# Package Files #
+*.war
+*.nar
+*.ear
+*.zip
+*.tar.gz
+*.rar
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+
+*~
+
+# temporary files which can be created if a process still has a handle open of a deleted file
+.fuse_hidden*
+
+# KDE directory preferences
+.directory
+
+# Linux trash folder which might appear on any partition or disk
+.Trash-*
+
+# .nfs files are created when an open file is removed but is still being accessed
+.nfs*
+
+# General
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+
+# Windows thumbnail cache files
+Thumbs.db
+Thumbs.db:encryptable
+ehthumbs.db
+ehthumbs_vista.db
+
+# Dump file
+*.stackdump
+
+# Folder config file
+[Dd]esktop.ini
+
+# Recycle Bin used on file shares
+$RECYCLE.BIN/
+
+# Windows Installer files
+*.cab
+*.msi
+*.msix
+*.msm
+*.msp
+
+# Windows shortcuts
+*.lnk
+
+target/
+
+pom.xml.tag
+pom.xml.releaseBackup
+pom.xml.versionsBackup
+pom.xml.next
+
+release.properties
 dependency-reduced-pom.xml
+buildNumber.properties
+.mvn/timing.properties
+.mvn/wrapper/maven-wrapper.jar
+.flattened-pom.xml
+
+# Common working directory
+run/
+build
+.gradle
+/*.jar

adapter_api/.gitignore

@@ -0,0 +1,2 @@
+upload*.sh
+.factorypath

adapter_api/build.gradle.kts

@@ -0,0 +1,10 @@
+plugins {
+    id("com.goncalomb.bukkit.java-conventions")
+}
+
+dependencies {
+    compileOnly("org.spigotmc:spigot-api:1.16.3-R0.1-SNAPSHOT")
+}
+
+description = "adapter_api"
+version = rootProject.version

src/main/java/com/goncalomb/bukkit/mylib/namemaps/EnchantmentsMap.java → adapter_api/src/main/java/com/goncalomb/bukkit/mylib/namemaps/EnchantmentsMap.java

@@ -70,6 +70,7 @@ public final class EnchantmentsMap {
 		_enchantments.put("Multishot", Enchantment.MULTISHOT);
 		_enchantments.put("Piercing", Enchantment.PIERCING);
 		_enchantments.put("QuickCharge", Enchantment.QUICK_CHARGE);
+		_enchantments.put("SoulSpeed", Enchantment.SOUL_SPEED);
 
 		List<String> enchantmentNames = new ArrayList<String>(_enchantments.names());
 		Collections.sort(enchantmentNames, String.CASE_INSENSITIVE_ORDER);

src/main/java/com/goncalomb/bukkit/mylib/namemaps/EntityTypeMap.java → adapter_api/src/main/java/com/goncalomb/bukkit/mylib/namemaps/EntityTypeMap.java

@@ -71,7 +71,7 @@ public final class EntityTypeMap {
 		_legacyNames.put("Zombie".toLowerCase(), EntityType.ZOMBIE);
 		_legacyNames.put("Slime".toLowerCase(), EntityType.SLIME);
 		_legacyNames.put("Ghast".toLowerCase(), EntityType.GHAST);
-		_legacyNames.put("PigZombie".toLowerCase(), EntityType.PIG_ZOMBIE);
+		_legacyNames.put("PigZombie".toLowerCase(), EntityType.ZOMBIFIED_PIGLIN);
 		_legacyNames.put("Enderman".toLowerCase(), EntityType.ENDERMAN);
 		_legacyNames.put("CaveSpider".toLowerCase(), EntityType.CAVE_SPIDER);
 		_legacyNames.put("Silverfish".toLowerCase(), EntityType.SILVERFISH);

src/main/java/com/goncalomb/bukkit/mylib/namemaps/SpawnEggMap.java → adapter_api/src/main/java/com/goncalomb/bukkit/mylib/namemaps/SpawnEggMap.java

@@ -15,7 +15,7 @@ public class SpawnEggMap {
 				if (entityName.equals("MOOSHROOM")) {
 					_spawnEggs.put(EntityTypeMap.getName(EntityType.MUSHROOM_COW), mat);
 				} else if (entityName.equals("ZOMBIE_PIGMAN")) {
-					_spawnEggs.put(EntityTypeMap.getName(EntityType.PIG_ZOMBIE), mat);
+					_spawnEggs.put(EntityTypeMap.getName(EntityType.ZOMBIFIED_PIGLIN), mat);
 				} else {
 					EntityType entityType = EntityType.valueOf(entityName);
 					if (entityType != null) {

adapter_api/src/main/java/com/goncalomb/bukkit/mylib/reflect/BukkitReflect.java

@@ -0,0 +1,60 @@
+/*
+ * Copyright (C) 2013-2018 Gonçalo Baltazar <me@goncalomb.com>
+ *
+ * This file is part of NBTEditor.
+ *
+ * NBTEditor is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * NBTEditor is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with NBTEditor.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.goncalomb.bukkit.mylib.reflect;
+
+import java.util.logging.Logger;
+
+import org.bukkit.command.SimpleCommandMap;
+
+public final class BukkitReflect {
+
+	private static BukkitReflectAdapter adapter = null;
+
+	public static void prepareReflection(Class<?> serverClass, Logger logger) throws Exception {
+		String packageName = serverClass.getPackage().getName();
+		String version = packageName.substring(packageName.lastIndexOf('.') + 1);
+
+		Class<?> clazz = Class.forName("com.goncalomb.bukkit.mylib.reflect.BukkitReflectAdapter_" + version);
+		adapter = (BukkitReflectAdapter) clazz.getConstructor().newInstance();
+		logger.info("Loaded BukkitReflect adapter for " + version);
+	}
+
+
+	public static SimpleCommandMap getCommandMap() {
+		ensureAdapter(adapter);
+		return adapter.getCommandMap();
+	}
+
+	public static boolean isValidRawJSON(String text) {
+		ensureAdapter(adapter);
+		return adapter.isValidRawJSON(text);
+	}
+
+	public static String textToRawJSON(String text) {
+		ensureAdapter(adapter);
+		return adapter.textToRawJSON(text);
+	}
+
+	public static void ensureAdapter(Object adapter) throws RuntimeException {
+		if (adapter == null) {
+			throw new RuntimeException("Version adapter is not loaded");
+		}
+	}
+}

adapter_api/src/main/java/com/goncalomb/bukkit/mylib/reflect/BukkitReflectAdapter.java

@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2013-2018 Gonçalo Baltazar <me@goncalomb.com>
+ *
+ * This file is part of NBTEditor.
+ *
+ * NBTEditor is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * NBTEditor is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with NBTEditor.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.goncalomb.bukkit.mylib.reflect;
+
+import org.bukkit.command.SimpleCommandMap;
+
+public interface BukkitReflectAdapter {
+	SimpleCommandMap getCommandMap();
+
+	boolean isValidRawJSON(String text);
+
+	String textToRawJSON(String text);
+}

adapter_api/src/main/java/com/goncalomb/bukkit/mylib/reflect/BukkitVersion.java

@@ -0,0 +1,37 @@
+package com.goncalomb.bukkit.mylib.reflect;
+
+import java.util.logging.Logger;
+
+public final class BukkitVersion {
+
+	private static BukkitVersionAdapter adapter = null;
+
+	public static void prepareReflection(Class<?> serverClass, Logger logger) throws Exception {
+		String packageName = serverClass.getPackage().getName();
+		String version = packageName.substring(packageName.lastIndexOf('.') + 1);
+
+		Class<?> clazz = Class.forName("com.goncalomb.bukkit.mylib.reflect.BukkitVersionAdapter_" + version);
+		adapter = (BukkitVersionAdapter) clazz.getConstructor().newInstance();
+		logger.info("Loaded BukkitVersion adapter for " + version);
+	}
+
+	public static void prepareForTest() throws Exception {
+		Class<?> clazz = Class.forName("com.goncalomb.bukkit.mylib.reflect.BukkitVersionAdapter_v1_18_R2");
+		adapter = (BukkitVersionAdapter) clazz.getConstructor().newInstance();
+	}
+
+	public static boolean isVersion(int minor) {
+		return isVersion(minor, 1);
+	}
+
+	public static boolean isVersion(int minor, int major) {
+		ensureAdapter(adapter);
+		return adapter.isVersion(minor, major);
+	}
+
+	private static void ensureAdapter(Object adapter) throws RuntimeException {
+		if (adapter == null) {
+			throw new RuntimeException("Version adapter is not loaded");
+		}
+	}
+}

adapter_api/src/main/java/com/goncalomb/bukkit/mylib/reflect/BukkitVersionAdapter.java

@@ -0,0 +1,24 @@
+/*
+ * Copyright (C) 2013-2018 Gonçalo Baltazar <me@goncalomb.com>
+ *
+ * This file is part of NBTEditor.
+ *
+ * NBTEditor is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * NBTEditor is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with NBTEditor.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.goncalomb.bukkit.mylib.reflect;
+
+public interface BukkitVersionAdapter {
+	boolean isVersion(int minor, int major);
+}