feat: rename package to imprex.dev and support mojang mappings

pom.xml

@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
-	<groupId>net.imprex</groupId>
+	<groupId>dev.imprex</groupId>
 	<artifactId>zip</artifactId>
 	<version>${revision}</version>
 	<packaging>pom</packaging>
@@ -68,7 +68,7 @@
 					<relocations>
 						<relocation>
 							<pattern>org.bstats</pattern>
-							<shadedPattern>net.imprex.zip.metrics</shadedPattern>
+							<shadedPattern>dev.imprex.zip.metrics</shadedPattern>
 						</relocation>
 					</relocations>
 					<filters>

zip-api/pom.xml

@@ -2,7 +2,7 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>net.imprex</groupId>
+		<groupId>dev.imprex</groupId>
 		<artifactId>zip</artifactId>
 		<version>${revision}</version>
 	</parent>

zip-api/src/main/java/net/imprex/zip/api/ZIPBackpack.java

@@ -1,4 +1,4 @@
-package net.imprex.zip.api;
+package dev.imprex.zip.api;
 
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;

zip-api/src/main/java/net/imprex/zip/api/ZIPBackpackType.java

@@ -1,4 +1,4 @@
-package net.imprex.zip.api;
+package dev.imprex.zip.api;
 
 import java.util.List;
 

zip-api/src/main/java/net/imprex/zip/api/ZIPHandler.java

@@ -1,4 +1,4 @@
-package net.imprex.zip.api;
+package dev.imprex.zip.api;
 
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.ItemStack;

zip-api/src/main/java/net/imprex/zip/api/ZIPRecipe.java

@@ -1,4 +1,4 @@
-package net.imprex.zip.api;
+package dev.imprex.zip.api;
 
 import org.bukkit.Keyed;
 import org.bukkit.inventory.Recipe;

zip-api/src/main/java/net/imprex/zip/api/ZIPRegistry.java

@@ -1,4 +1,4 @@
-package net.imprex.zip.api;
+package dev.imprex.zip.api;
 
 import java.util.Collection;
 

zip-api/src/main/java/net/imprex/zip/api/ZIPService.java

@@ -1,4 +1,4 @@
-package net.imprex.zip.api;
+package dev.imprex.zip.api;
 
 public interface ZIPService {
 

zip-api/src/main/java/net/imprex/zip/api/ZIPUniqueId.java

@@ -1,4 +1,4 @@
-package net.imprex.zip.api;
+package dev.imprex.zip.api;
 
 public interface ZIPUniqueId {
 

zip-common/pom.xml

@@ -2,7 +2,7 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>net.imprex</groupId>
+		<groupId>dev.imprex</groupId>
 		<artifactId>zip</artifactId>
 		<version>${revision}</version>
 	</parent>
@@ -24,7 +24,7 @@
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
-			<groupId>net.imprex</groupId>
+			<groupId>dev.imprex</groupId>
 			<artifactId>zip-api</artifactId>
 			<version>${revision}</version>
 			<scope>compile</scope>

zip-common/src/main/java/net/imprex/zip/common/BPConstants.java → zip-common/src/main/java/dev/imprex/zip/common/BPConstants.java

@@ -1,4 +1,4 @@
-package net.imprex.zip.common;
+package dev.imprex.zip.common;
 
 public class BPConstants {
 

zip-common/src/main/java/net/imprex/zip/common/Ingrim4Buffer.java → zip-common/src/main/java/dev/imprex/zip/common/Ingrim4Buffer.java

@@ -1,4 +1,4 @@
-package net.imprex.zip.common;
+package dev.imprex.zip.common;
 
 import java.io.IOException;
 import java.io.InputStream;

zip-common/src/main/java/net/imprex/zip/common/MinecraftVersion.java → zip-common/src/main/java/dev/imprex/zip/common/MinecraftVersion.java

@@ -2,7 +2,7 @@
  * @author Imprex-Development
  * @see <a href="https://github.com/Imprex-Development/orebfuscator/blob/master/orebfuscator-common/src/main/java/net/imprex/orebfuscator/util/MinecraftVersion.java">MinecraftVersion.java</a>
  */
-package net.imprex.zip.common;
+package dev.imprex.zip.common;
 
 import java.util.ArrayList;
 import java.util.List;

zip-common/src/main/java/net/imprex/zip/common/ReflectionUtil.java → zip-common/src/main/java/dev/imprex/zip/common/ReflectionUtil.java

@@ -1,4 +1,4 @@
-package net.imprex.zip.common;
+package dev.imprex.zip.common;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;

zip-common/src/main/java/net/imprex/zip/common/ServerVersion.java → zip-common/src/main/java/dev/imprex/zip/common/ServerVersion.java

@@ -2,7 +2,7 @@
  * @author Imprex-Development
  * @see <a href="https://github.com/Imprex-Development/orebfuscator/blob/master/orebfuscator-nms/orebfuscator-nms-api/src/main/java/net/imprex/orebfuscator/util/ServerVersion.java">ServerVersion.java</a>
  */
-package net.imprex.zip.common;
+package dev.imprex.zip.common;
 
 public class ServerVersion {
 

zip-common/src/main/java/net/imprex/zip/common/UniqueId.java → zip-common/src/main/java/dev/imprex/zip/common/UniqueId.java

@@ -1,4 +1,4 @@
-package net.imprex.zip.common;
+package dev.imprex.zip.common;
 
 import java.net.NetworkInterface;
 import java.net.SocketException;
@@ -9,7 +9,7 @@
 import java.util.Enumeration;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import net.imprex.zip.api.ZIPUniqueId;
+import dev.imprex.zip.api.ZIPUniqueId;
 
 /**
  * 

zip-common/src/main/java/net/imprex/zip/common/Version.java → zip-common/src/main/java/dev/imprex/zip/common/Version.java

@@ -2,7 +2,7 @@
  * @author Imprex-Development
  * @see <a href="https://github.com/Imprex-Development/orebfuscator/blob/master/orebfuscator-common/src/main/java/net/imprex/orebfuscator/util/Version.java">Version.java</a>
  */
-package net.imprex.zip.common;
+package dev.imprex.zip.common;
 
 import java.io.IOException;
 import java.util.Objects;

zip-common/src/main/java/net/imprex/zip/common/ZIPLogger.java → zip-common/src/main/java/dev/imprex/zip/common/ZIPLogger.java

@@ -1,4 +1,4 @@
-package net.imprex.zip.common;
+package dev.imprex.zip.common;
 
 import java.util.logging.Level;
 import java.util.logging.Logger;

zip-nms/pom.xml

@@ -2,7 +2,7 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>net.imprex</groupId>
+		<groupId>dev.imprex</groupId>
 		<artifactId>zip</artifactId>
 		<version>${revision}</version>
 	</parent>

zip-nms/zip-nms-api/pom.xml

@@ -2,7 +2,7 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>net.imprex</groupId>
+		<groupId>dev.imprex</groupId>
 		<artifactId>zip-nms</artifactId>
 		<version>${revision}</version>
 	</parent>
@@ -18,7 +18,7 @@
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
-			<groupId>net.imprex</groupId>
+			<groupId>dev.imprex</groupId>
 			<artifactId>zip-common</artifactId>
 			<version>${revision}</version>
 			<scope>compile</scope>

zip-nms/zip-nms-api/src/main/java/net/imprex/zip/nms/api/ItemStackContainerResult.java → zip-nms/zip-nms-api/src/main/java/dev/imprex/zip/nms/api/ItemStackContainerResult.java

@@ -1,4 +1,4 @@
-package net.imprex.zip.nms.api;
+package dev.imprex.zip.nms.api;
 
 import java.util.List;
 

zip-nms/zip-nms-api/src/main/java/net/imprex/zip/nms/api/ItemStackWithSlot.java → zip-nms/zip-nms-api/src/main/java/dev/imprex/zip/nms/api/ItemStackWithSlot.java

@@ -1,4 +1,4 @@
-package net.imprex.zip.nms.api;
+package dev.imprex.zip.nms.api;
 
 import org.bukkit.inventory.ItemStack;
 

zip-nms/zip-nms-api/src/main/java/dev/imprex/zip/nms/api/NmsManager.java

@@ -0,0 +1,73 @@
+package dev.imprex.zip.nms.api;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+import org.bukkit.Bukkit;
+import org.bukkit.Material;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.SkullMeta;
+
+import com.google.gson.JsonObject;
+
+import dev.imprex.zip.common.ReflectionUtil;
+
+public abstract class NmsManager {
+
+	private static final Class<?> CRAFT_ITEM_STACK_CLASS;
+
+	private static Method craftItemStackAsNmsCopy;
+	private static Method craftItemStackAsCraftMirror;
+
+	static {
+		try {
+			CRAFT_ITEM_STACK_CLASS = Class.forName(Bukkit.getServer().getClass().getPackageName() + ".inventory.CraftItemStack");
+		} catch (ClassNotFoundException e) {
+			throw new IllegalStateException(e);
+		}
+	}
+
+	protected static <T> T asNmsCopy(ItemStack bukkitItem, Class<T> minecraftItemClass) {
+		try {
+			if (craftItemStackAsNmsCopy == null) {
+				Method method = ReflectionUtil.searchMethod(
+						CRAFT_ITEM_STACK_CLASS,
+						minecraftItemClass,
+						ItemStack.class);
+				method.setAccessible(true);
+				craftItemStackAsNmsCopy = method;
+			}
+
+			return minecraftItemClass.cast(craftItemStackAsNmsCopy.invoke(null, bukkitItem));
+		} catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
+			throw new IllegalStateException(e);
+		}
+	}
+
+	protected static <T> ItemStack asCraftMirror(T minecraftItem) {
+		try {
+			if (craftItemStackAsCraftMirror == null) {
+				Method method = ReflectionUtil.searchMethod(
+						CRAFT_ITEM_STACK_CLASS,
+						CRAFT_ITEM_STACK_CLASS,
+						minecraftItem.getClass());
+				method.setAccessible(true);
+				craftItemStackAsCraftMirror = method;
+			}
+
+			return (ItemStack) craftItemStackAsCraftMirror.invoke(null, minecraftItem);
+		} catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
+			throw new IllegalStateException(e);
+		}
+	}
+
+	public abstract JsonObject itemstackToJsonElement(ItemStack[] items);
+
+	public abstract ItemStackContainerResult jsonElementToItemStack(JsonObject jsonElement);
+
+	public abstract JsonObject migrateToJsonElement(byte[] binary);
+
+	public abstract void setSkullProfile(SkullMeta meta, String texture);
+
+	public abstract boolean isAir(Material material);
+}

zip-nms/zip-nms-v1_19_R1/pom.xml

@@ -2,7 +2,7 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>net.imprex</groupId>
+		<groupId>dev.imprex</groupId>
 		<artifactId>zip-nms</artifactId>
 		<version>${revision}</version>
 	</parent>
@@ -12,7 +12,7 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>net.imprex</groupId>
+			<groupId>dev.imprex</groupId>
 			<artifactId>zip-nms-api</artifactId>
 			<version>${revision}</version>
 			<scope>provided</scope>
@@ -28,6 +28,20 @@
 
 	<build>
 		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-shade-plugin</artifactId>
+				<configuration>
+					<shadedArtifactAttached>true</shadedArtifactAttached>
+					<shadedClassifierName>mojang-mapped</shadedClassifierName>
+					<relocations>
+						<relocation>
+							<pattern>dev.imprex.zip.nms.v1_19_R1</pattern>
+							<shadedPattern>dev.imprex.zip.nms.v1_19_R1_mojang</shadedPattern>
+						</relocation>
+					</relocations>
+				</configuration>
+			</plugin>
 			<plugin>
 				<groupId>net.md-5</groupId>
 				<artifactId>specialsource-maven-plugin</artifactId>

zip-nms/zip-nms-v1_20_R1/src/main/java/net/imprex/zip/nms/v1_20_R1/ZipNmsManager.java → zip-nms/zip-nms-v1_19_R1/src/main/java/dev/imprex/zip/nms/v1_19_R1/ZipNmsManager.java

@@ -1,4 +1,4 @@
-package net.imprex.zip.nms.v1_20_R1;
+package dev.imprex.zip.nms.v1_19_R1;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -8,7 +8,6 @@
 import java.util.UUID;
 
 import org.bukkit.Material;
-import org.bukkit.craftbukkit.v1_20_R1.inventory.CraftItemStack;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.SkullMeta;
 
@@ -22,11 +21,11 @@
 import com.mojang.serialization.DynamicOps;
 import com.mojang.serialization.JsonOps;
 
-import net.imprex.zip.common.BPConstants;
-import net.imprex.zip.common.ReflectionUtil;
-import net.imprex.zip.nms.api.ItemStackContainerResult;
-import net.imprex.zip.nms.api.ItemStackWithSlot;
-import net.imprex.zip.nms.api.NmsManager;
+import dev.imprex.zip.common.BPConstants;
+import dev.imprex.zip.common.ReflectionUtil;
+import dev.imprex.zip.nms.api.ItemStackContainerResult;
+import dev.imprex.zip.nms.api.ItemStackWithSlot;
+import dev.imprex.zip.nms.api.NmsManager;
 import net.minecraft.SharedConstants;
 import net.minecraft.core.RegistryAccess;
 import net.minecraft.nbt.CompoundTag;
@@ -39,7 +38,7 @@
 import net.minecraft.util.datafix.DataFixers;
 import net.minecraft.util.datafix.fixes.References;
 
-public class ZipNmsManager implements NmsManager {
+public class ZipNmsManager extends NmsManager {
 
 	private static final Class<?> CRAFTMETASKULL_CLASS = ReflectionUtil.getCraftBukkitClass("inventory.CraftMetaSkull");
 	private static final Method CRAFTMETASKULL_SET_PROFILE = ReflectionUtil.getMethod(CRAFTMETASKULL_CLASS,
@@ -61,7 +60,7 @@ public JsonObject itemstackToJsonElement(ItemStack[] items) {
 			if (item == null || item.getType() == Material.AIR) {
 				continue;
 			}
-			net.minecraft.world.item.ItemStack minecraftItem = CraftItemStack.asNMSCopy(item);
+			net.minecraft.world.item.ItemStack minecraftItem = asNmsCopy(item, net.minecraft.world.item.ItemStack.class);
 
 			DataResult<JsonElement> result = net.minecraft.world.item.ItemStack.CODEC.encodeStart(DYNAMIC_OPS_JSON, minecraftItem);
 			JsonObject resultJson = result.getOrThrow(false, error -> {}).getAsJsonObject();
@@ -100,7 +99,7 @@ public ItemStackContainerResult jsonElementToItemStack(JsonObject json) {
 					.parse(DYNAMIC_OPS_JSON, dynamicItemFixed.getValue())
 					.getOrThrow(false, error -> {});
 
-			ItemStack bukkitItem = CraftItemStack.asCraftMirror(minecraftItem);
+			ItemStack bukkitItem = asCraftMirror(minecraftItem);
 			int slot = item.getAsJsonObject().get(BPConstants.KEY_INVENTORY_SLOT).getAsInt();
 
 			items.add(new ItemStackWithSlot(slot, bukkitItem));