getComplex() {
- return type.getComplexWrapped();
- }
-
- @Override
- public Class getPrimitive() {
- return type.getPrimitiveWrapped();
- }
-
- @Override
- public P toPrimitive(DataAdapterContext context, C complex) {
- return type.wrapToPrimitive(complex, VersionControl.get().getBukkitConversion().createContext(context));
- }
-
- @Override
- public C fromPrimitive(DataAdapterContext context, P primitive) {
- return type.wrapToComplex(primitive, VersionControl.get().getBukkitConversion().createContext(context));
- }
-
-}
\ No newline at end of file
diff --git a/src/main/java/net/sourcewriters/minecraft/vcompat/reflection/entity/NmsEntityType.java b/src/main/java/net/sourcewriters/minecraft/vcompat/reflection/entity/NmsEntityType.java
deleted file mode 100644
index ef8849e..0000000
--- a/src/main/java/net/sourcewriters/minecraft/vcompat/reflection/entity/NmsEntityType.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package net.sourcewriters.minecraft.vcompat.reflection.entity;
-
-public enum NmsEntityType {
-
- ARMOR_STAND;
-
-}
\ No newline at end of file
diff --git a/src/main/java/net/sourcewriters/minecraft/vcompat/reflection/packet/NmsPacket.java b/src/main/java/net/sourcewriters/minecraft/vcompat/reflection/packet/NmsPacket.java
deleted file mode 100644
index e5d020e..0000000
--- a/src/main/java/net/sourcewriters/minecraft/vcompat/reflection/packet/NmsPacket.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package net.sourcewriters.minecraft.vcompat.reflection.packet;
-
-import com.syntaxphoenix.syntaxapi.utils.key.IKeyed;
-
-public interface NmsPacket extends IKeyed {
-
-}
\ No newline at end of file
diff --git a/src/main/java/net/sourcewriters/minecraft/vcompat/reflection/provider/v1_10_R1/PacketHandler1_10_R1.java b/src/main/java/net/sourcewriters/minecraft/vcompat/reflection/provider/v1_10_R1/PacketHandler1_10_R1.java
deleted file mode 100644
index 105dc93..0000000
--- a/src/main/java/net/sourcewriters/minecraft/vcompat/reflection/provider/v1_10_R1/PacketHandler1_10_R1.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package net.sourcewriters.minecraft.vcompat.reflection.provider.v1_10_R1;
-
-import net.sourcewriters.minecraft.vcompat.reflection.PacketHandler;
-
-public class PacketHandler1_10_R1 extends PacketHandler {
-
- protected PacketHandler1_10_R1(VersionControl1_10_R1 versionControl) {
- super(versionControl);
- }
-
-}
\ No newline at end of file
diff --git a/src/main/java/net/sourcewriters/minecraft/vcompat/reflection/provider/v1_10_R1/reflection/NmsReflection1_10_R1.java b/src/main/java/net/sourcewriters/minecraft/vcompat/reflection/provider/v1_10_R1/reflection/NmsReflection1_10_R1.java
deleted file mode 100644
index 9c21f88..0000000
--- a/src/main/java/net/sourcewriters/minecraft/vcompat/reflection/provider/v1_10_R1/reflection/NmsReflection1_10_R1.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package net.sourcewriters.minecraft.vcompat.reflection.provider.v1_10_R1.reflection;
-
-import net.minecraft.server.v1_10_R1.NBTTagEnd;
-import net.minecraft.server.v1_10_R1.NBTTagList;
-import net.minecraft.server.v1_10_R1.PacketPlayOutPlayerListHeaderFooter;
-import net.sourcewriters.minecraft.vcompat.reflection.reflect.ReflectionProvider;
-import net.sourcewriters.minecraft.vcompat.reflection.reflect.Reflections;
-
-public class NmsReflection1_10_R1 extends Reflections {
-
- public static NmsReflection1_10_R1 INSTANCE = new NmsReflection1_10_R1();
-
- private NmsReflection1_10_R1() {}
-
- @Override
- public void setup(ReflectionProvider provider) {
-
- //
- //
- // Create Reflects
- //
-
- //
- // Minecraft
-
- provider.createReflect("nmsPacketPlayOutPlayerListHeaderFooter", PacketPlayOutPlayerListHeaderFooter.class)
- .searchField("header", "a").searchField("header", "b");
-
- provider.createReflect("nmsNBTTagEnd", NBTTagEnd.class);
- provider.createReflect("nmsNBTTagList", NBTTagList.class).searchField("value", "list");
-
- }
-
-}
\ No newline at end of file
diff --git a/src/main/java/net/sourcewriters/minecraft/vcompat/reflection/provider/v1_11_R1/PacketHandler1_11_R1.java b/src/main/java/net/sourcewriters/minecraft/vcompat/reflection/provider/v1_11_R1/PacketHandler1_11_R1.java
deleted file mode 100644
index 8423e5a..0000000
--- a/src/main/java/net/sourcewriters/minecraft/vcompat/reflection/provider/v1_11_R1/PacketHandler1_11_R1.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package net.sourcewriters.minecraft.vcompat.reflection.provider.v1_11_R1;
-
-import net.sourcewriters.minecraft.vcompat.reflection.PacketHandler;
-
-public class PacketHandler1_11_R1 extends PacketHandler {
-
- protected PacketHandler1_11_R1(VersionControl1_11_R1 versionControl) {
- super(versionControl);
- }
-
-}
\ No newline at end of file
diff --git a/src/main/java/net/sourcewriters/minecraft/vcompat/reflection/provider/v1_11_R1/reflection/NmsReflection1_11_R1.java b/src/main/java/net/sourcewriters/minecraft/vcompat/reflection/provider/v1_11_R1/reflection/NmsReflection1_11_R1.java
deleted file mode 100644
index 09c2c88..0000000
--- a/src/main/java/net/sourcewriters/minecraft/vcompat/reflection/provider/v1_11_R1/reflection/NmsReflection1_11_R1.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package net.sourcewriters.minecraft.vcompat.reflection.provider.v1_11_R1.reflection;
-
-import net.minecraft.server.v1_11_R1.NBTTagEnd;
-import net.minecraft.server.v1_11_R1.NBTTagList;
-import net.minecraft.server.v1_11_R1.PacketPlayOutPlayerListHeaderFooter;
-import net.sourcewriters.minecraft.vcompat.reflection.reflect.ReflectionProvider;
-import net.sourcewriters.minecraft.vcompat.reflection.reflect.Reflections;
-
-public class NmsReflection1_11_R1 extends Reflections {
-
- public static NmsReflection1_11_R1 INSTANCE = new NmsReflection1_11_R1();
-
- private NmsReflection1_11_R1() {}
-
- @Override
- public void setup(ReflectionProvider provider) {
-
- //
- //
- // Create Reflects
- //
-
- //
- // Minecraft
-
- provider.createReflect("nmsPacketPlayOutPlayerListHeaderFooter", PacketPlayOutPlayerListHeaderFooter.class)
- .searchField("header", "a").searchField("header", "b");
-
- provider.createReflect("nmsNBTTagEnd", NBTTagEnd.class);
- provider.createReflect("nmsNBTTagList", NBTTagList.class).searchField("value", "list");
-
- }
-
-}
\ No newline at end of file
diff --git a/src/main/java/net/sourcewriters/minecraft/vcompat/reflection/provider/v1_12_R1/PacketHandler1_12_R1.java b/src/main/java/net/sourcewriters/minecraft/vcompat/reflection/provider/v1_12_R1/PacketHandler1_12_R1.java
deleted file mode 100644
index 468b6c0..0000000
--- a/src/main/java/net/sourcewriters/minecraft/vcompat/reflection/provider/v1_12_R1/PacketHandler1_12_R1.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package net.sourcewriters.minecraft.vcompat.reflection.provider.v1_12_R1;
-
-import net.sourcewriters.minecraft.vcompat.reflection.PacketHandler;
-
-public class PacketHandler1_12_R1 extends PacketHandler {
-
- protected PacketHandler1_12_R1(VersionControl1_12_R1 versionControl) {
- super(versionControl);
- }
-
-}
\ No newline at end of file
diff --git a/src/main/java/net/sourcewriters/minecraft/vcompat/reflection/provider/v1_12_R1/reflection/NmsReflection1_12_R1.java b/src/main/java/net/sourcewriters/minecraft/vcompat/reflection/provider/v1_12_R1/reflection/NmsReflection1_12_R1.java
deleted file mode 100644
index 1ef4826..0000000
--- a/src/main/java/net/sourcewriters/minecraft/vcompat/reflection/provider/v1_12_R1/reflection/NmsReflection1_12_R1.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package net.sourcewriters.minecraft.vcompat.reflection.provider.v1_12_R1.reflection;
-
-import net.minecraft.server.v1_12_R1.NBTTagEnd;
-import net.minecraft.server.v1_12_R1.NBTTagList;
-import net.minecraft.server.v1_12_R1.NBTTagLongArray;
-import net.minecraft.server.v1_12_R1.PacketPlayOutPlayerListHeaderFooter;
-import net.sourcewriters.minecraft.vcompat.reflection.reflect.ReflectionProvider;
-import net.sourcewriters.minecraft.vcompat.reflection.reflect.Reflections;
-
-public class NmsReflection1_12_R1 extends Reflections {
-
- public static NmsReflection1_12_R1 INSTANCE = new NmsReflection1_12_R1();
-
- private NmsReflection1_12_R1() {}
-
- @Override
- public void setup(ReflectionProvider provider) {
-
- //
- //
- // Create Reflects
- //
-
- //
- // Minecraft
-
- provider.createReflect("nmsPacketPlayOutPlayerListHeaderFooter", PacketPlayOutPlayerListHeaderFooter.class)
- .searchField("header", "a").searchField("header", "b");
-
- provider.createReflect("nmsNBTTagEnd", NBTTagEnd.class);
- provider.createReflect("nmsNBTTagLongArray", NBTTagLongArray.class).searchField("value", "b");
- provider.createReflect("nmsNBTTagList", NBTTagList.class).searchField("value", "list");
-
- }
-
-}
\ No newline at end of file
diff --git a/src/main/java/net/sourcewriters/minecraft/vcompat/reflection/provider/v1_13_R1/PacketHandler1_13_R1.java b/src/main/java/net/sourcewriters/minecraft/vcompat/reflection/provider/v1_13_R1/PacketHandler1_13_R1.java
deleted file mode 100644
index f358a95..0000000
--- a/src/main/java/net/sourcewriters/minecraft/vcompat/reflection/provider/v1_13_R1/PacketHandler1_13_R1.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package net.sourcewriters.minecraft.vcompat.reflection.provider.v1_13_R1;
-
-import net.sourcewriters.minecraft.vcompat.reflection.PacketHandler;
-
-public class PacketHandler1_13_R1 extends PacketHandler {
-
- protected PacketHandler1_13_R1(VersionControl1_13_R1 versionControl) {
- super(versionControl);
- }
-
-}
\ No newline at end of file
diff --git a/src/main/java/net/sourcewriters/minecraft/vcompat/reflection/provider/v1_13_R2/PacketHandler1_13_R2.java b/src/main/java/net/sourcewriters/minecraft/vcompat/reflection/provider/v1_13_R2/PacketHandler1_13_R2.java
deleted file mode 100644
index bcd46dc..0000000
--- a/src/main/java/net/sourcewriters/minecraft/vcompat/reflection/provider/v1_13_R2/PacketHandler1_13_R2.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package net.sourcewriters.minecraft.vcompat.reflection.provider.v1_13_R2;
-
-import net.sourcewriters.minecraft.vcompat.reflection.PacketHandler;
-
-public class PacketHandler1_13_R2 extends PacketHandler {
-
- protected PacketHandler1_13_R2(VersionControl1_13_R2 versionControl) {
- super(versionControl);
- }
-
-}
\ No newline at end of file
diff --git a/src/main/java/net/sourcewriters/minecraft/vcompat/reflection/provider/v1_14_R1/PacketHandler1_14_R1.java b/src/main/java/net/sourcewriters/minecraft/vcompat/reflection/provider/v1_14_R1/PacketHandler1_14_R1.java
deleted file mode 100644
index 3fe559a..0000000
--- a/src/main/java/net/sourcewriters/minecraft/vcompat/reflection/provider/v1_14_R1/PacketHandler1_14_R1.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package net.sourcewriters.minecraft.vcompat.reflection.provider.v1_14_R1;
-
-import net.sourcewriters.minecraft.vcompat.reflection.PacketHandler;
-
-public class PacketHandler1_14_R1 extends PacketHandler {
-
- protected PacketHandler1_14_R1(VersionControl1_14_R1 versionControl) {
- super(versionControl);
- }
-
-}
\ No newline at end of file
diff --git a/src/main/java/net/sourcewriters/minecraft/vcompat/reflection/provider/v1_14_R1/data/BukkitContext1_14_R1.java b/src/main/java/net/sourcewriters/minecraft/vcompat/reflection/provider/v1_14_R1/data/BukkitContext1_14_R1.java
deleted file mode 100644
index d3bb430..0000000
--- a/src/main/java/net/sourcewriters/minecraft/vcompat/reflection/provider/v1_14_R1/data/BukkitContext1_14_R1.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package net.sourcewriters.minecraft.vcompat.reflection.provider.v1_14_R1.data;
-
-import org.bukkit.persistence.PersistentDataAdapterContext;
-import org.bukkit.persistence.PersistentDataContainer;
-
-import com.syntaxphoenix.syntaxapi.data.DataAdapterContext;
-import com.syntaxphoenix.syntaxapi.data.IDataContainer;
-
-import net.sourcewriters.minecraft.vcompat.reflection.data.WrappedContext;
-
-public final class BukkitContext1_14_R1 extends WrappedContext implements PersistentDataAdapterContext {
-
- private final DataAdapterContext context;
-
- public BukkitContext1_14_R1(DataAdapterContext context) {
- this.context = context;
- }
-
- @Override
- public DataAdapterContext getHandle() {
- return context;
- }
-
- @Override
- public PersistentDataContainer newPersistentDataContainer() {
- return newContainer();
- }
-
- @Override
- public IDataContainer newDataContainer() {
- return context.newDataContainer();
- }
-
- @Override
- public BukkitContainer1_14_R1 newContainer() {
- return new BukkitContainer1_14_R1(context.newDataContainer());
- }
-
-}
\ No newline at end of file
diff --git a/src/main/java/net/sourcewriters/minecraft/vcompat/reflection/provider/v1_15_R1/PacketHandler1_15_R1.java b/src/main/java/net/sourcewriters/minecraft/vcompat/reflection/provider/v1_15_R1/PacketHandler1_15_R1.java
deleted file mode 100644
index f0d5ee6..0000000
--- a/src/main/java/net/sourcewriters/minecraft/vcompat/reflection/provider/v1_15_R1/PacketHandler1_15_R1.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package net.sourcewriters.minecraft.vcompat.reflection.provider.v1_15_R1;
-
-import net.sourcewriters.minecraft.vcompat.reflection.PacketHandler;
-
-public class PacketHandler1_15_R1 extends PacketHandler {
-
- protected PacketHandler1_15_R1(VersionControl1_15_R1 versionControl) {
- super(versionControl);
- }
-
-}
\ No newline at end of file
diff --git a/src/main/java/net/sourcewriters/minecraft/vcompat/reflection/provider/v1_15_R1/data/BukkitContext1_15_R1.java b/src/main/java/net/sourcewriters/minecraft/vcompat/reflection/provider/v1_15_R1/data/BukkitContext1_15_R1.java
deleted file mode 100644
index 165f155..0000000
--- a/src/main/java/net/sourcewriters/minecraft/vcompat/reflection/provider/v1_15_R1/data/BukkitContext1_15_R1.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package net.sourcewriters.minecraft.vcompat.reflection.provider.v1_15_R1.data;
-
-import org.bukkit.persistence.PersistentDataAdapterContext;
-import org.bukkit.persistence.PersistentDataContainer;
-
-import com.syntaxphoenix.syntaxapi.data.DataAdapterContext;
-import com.syntaxphoenix.syntaxapi.data.IDataContainer;
-
-import net.sourcewriters.minecraft.vcompat.reflection.data.WrappedContext;
-
-public final class BukkitContext1_15_R1 extends WrappedContext implements PersistentDataAdapterContext {
-
- private final DataAdapterContext context;
-
- public BukkitContext1_15_R1(DataAdapterContext context) {
- this.context = context;
- }
-
- @Override
- public DataAdapterContext getHandle() {
- return context;
- }
-
- @Override
- public PersistentDataContainer newPersistentDataContainer() {
- return newContainer();
- }
-
- @Override
- public IDataContainer newDataContainer() {
- return context.newDataContainer();
- }
-
- @Override
- public BukkitContainer1_15_R1 newContainer() {
- return new BukkitContainer1_15_R1(context.newDataContainer());
- }
-
-}
\ No newline at end of file
diff --git a/src/main/java/net/sourcewriters/minecraft/vcompat/reflection/provider/v1_16_R1/PacketHandler1_16_R1.java b/src/main/java/net/sourcewriters/minecraft/vcompat/reflection/provider/v1_16_R1/PacketHandler1_16_R1.java
deleted file mode 100644
index 6b0ec00..0000000
--- a/src/main/java/net/sourcewriters/minecraft/vcompat/reflection/provider/v1_16_R1/PacketHandler1_16_R1.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package net.sourcewriters.minecraft.vcompat.reflection.provider.v1_16_R1;
-
-import net.sourcewriters.minecraft.vcompat.reflection.PacketHandler;
-
-public class PacketHandler1_16_R1 extends PacketHandler {
-
- protected PacketHandler1_16_R1(VersionControl1_16_R1 versionControl) {
- super(versionControl);
- }
-
-}
\ No newline at end of file
diff --git a/src/main/java/net/sourcewriters/minecraft/vcompat/reflection/provider/v1_16_R1/data/BukkitContext1_16_R1.java b/src/main/java/net/sourcewriters/minecraft/vcompat/reflection/provider/v1_16_R1/data/BukkitContext1_16_R1.java
deleted file mode 100644
index 56b88d3..0000000
--- a/src/main/java/net/sourcewriters/minecraft/vcompat/reflection/provider/v1_16_R1/data/BukkitContext1_16_R1.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package net.sourcewriters.minecraft.vcompat.reflection.provider.v1_16_R1.data;
-
-import org.bukkit.persistence.PersistentDataAdapterContext;
-import org.bukkit.persistence.PersistentDataContainer;
-
-import com.syntaxphoenix.syntaxapi.data.DataAdapterContext;
-import com.syntaxphoenix.syntaxapi.data.IDataContainer;
-
-import net.sourcewriters.minecraft.vcompat.reflection.data.WrappedContext;
-
-public final class BukkitContext1_16_R1 extends WrappedContext implements PersistentDataAdapterContext {
-
- private final DataAdapterContext context;
-
- public BukkitContext1_16_R1(DataAdapterContext context) {
- this.context = context;
- }
-
- @Override
- public DataAdapterContext getHandle() {
- return context;
- }
-
- @Override
- public PersistentDataContainer newPersistentDataContainer() {
- return newContainer();
- }
-
- @Override
- public IDataContainer newDataContainer() {
- return context.newDataContainer();
- }
-
- @Override
- public BukkitContainer1_16_R1 newContainer() {
- return new BukkitContainer1_16_R1(context.newDataContainer());
- }
-
-}
\ No newline at end of file
diff --git a/src/main/java/net/sourcewriters/minecraft/vcompat/reflection/provider/v1_16_R2/PacketHandler1_16_R2.java b/src/main/java/net/sourcewriters/minecraft/vcompat/reflection/provider/v1_16_R2/PacketHandler1_16_R2.java
deleted file mode 100644
index 9a34899..0000000
--- a/src/main/java/net/sourcewriters/minecraft/vcompat/reflection/provider/v1_16_R2/PacketHandler1_16_R2.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package net.sourcewriters.minecraft.vcompat.reflection.provider.v1_16_R2;
-
-import net.sourcewriters.minecraft.vcompat.reflection.PacketHandler;
-
-public class PacketHandler1_16_R2 extends PacketHandler {
-
- protected PacketHandler1_16_R2(VersionControl1_16_R2 versionControl) {
- super(versionControl);
- }
-
-}
\ No newline at end of file
diff --git a/src/main/java/net/sourcewriters/minecraft/vcompat/reflection/provider/v1_16_R2/data/BukkitContext1_16_R2.java b/src/main/java/net/sourcewriters/minecraft/vcompat/reflection/provider/v1_16_R2/data/BukkitContext1_16_R2.java
deleted file mode 100644
index da08fc2..0000000
--- a/src/main/java/net/sourcewriters/minecraft/vcompat/reflection/provider/v1_16_R2/data/BukkitContext1_16_R2.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package net.sourcewriters.minecraft.vcompat.reflection.provider.v1_16_R2.data;
-
-import org.bukkit.persistence.PersistentDataAdapterContext;
-import org.bukkit.persistence.PersistentDataContainer;
-
-import com.syntaxphoenix.syntaxapi.data.DataAdapterContext;
-import com.syntaxphoenix.syntaxapi.data.IDataContainer;
-
-import net.sourcewriters.minecraft.vcompat.reflection.data.WrappedContext;
-
-public final class BukkitContext1_16_R2 extends WrappedContext implements PersistentDataAdapterContext {
-
- private final DataAdapterContext context;
-
- public BukkitContext1_16_R2(DataAdapterContext context) {
- this.context = context;
- }
-
- @Override
- public DataAdapterContext getHandle() {
- return context;
- }
-
- @Override
- public PersistentDataContainer newPersistentDataContainer() {
- return newContainer();
- }
-
- @Override
- public IDataContainer newDataContainer() {
- return context.newDataContainer();
- }
-
- @Override
- public BukkitContainer1_16_R2 newContainer() {
- return new BukkitContainer1_16_R2(context.newDataContainer());
- }
-
-}
\ No newline at end of file
diff --git a/src/main/java/net/sourcewriters/minecraft/vcompat/reflection/provider/v1_16_R3/PacketHandler1_16_R3.java b/src/main/java/net/sourcewriters/minecraft/vcompat/reflection/provider/v1_16_R3/PacketHandler1_16_R3.java
deleted file mode 100644
index ff5ae81..0000000
--- a/src/main/java/net/sourcewriters/minecraft/vcompat/reflection/provider/v1_16_R3/PacketHandler1_16_R3.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package net.sourcewriters.minecraft.vcompat.reflection.provider.v1_16_R3;
-
-import net.sourcewriters.minecraft.vcompat.reflection.PacketHandler;
-
-public class PacketHandler1_16_R3 extends PacketHandler {
-
- protected PacketHandler1_16_R3(VersionControl1_16_R3 versionControl) {
- super(versionControl);
- }
-
-}
\ No newline at end of file
diff --git a/src/main/java/net/sourcewriters/minecraft/vcompat/reflection/provider/v1_16_R3/data/BukkitContext1_16_R3.java b/src/main/java/net/sourcewriters/minecraft/vcompat/reflection/provider/v1_16_R3/data/BukkitContext1_16_R3.java
deleted file mode 100644
index 41d494f..0000000
--- a/src/main/java/net/sourcewriters/minecraft/vcompat/reflection/provider/v1_16_R3/data/BukkitContext1_16_R3.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package net.sourcewriters.minecraft.vcompat.reflection.provider.v1_16_R3.data;
-
-import org.bukkit.persistence.PersistentDataAdapterContext;
-import org.bukkit.persistence.PersistentDataContainer;
-
-import com.syntaxphoenix.syntaxapi.data.DataAdapterContext;
-import com.syntaxphoenix.syntaxapi.data.IDataContainer;
-
-import net.sourcewriters.minecraft.vcompat.reflection.data.WrappedContext;
-
-public final class BukkitContext1_16_R3 extends WrappedContext implements PersistentDataAdapterContext {
-
- private final DataAdapterContext context;
-
- public BukkitContext1_16_R3(DataAdapterContext context) {
- this.context = context;
- }
-
- @Override
- public DataAdapterContext getHandle() {
- return context;
- }
-
- @Override
- public PersistentDataContainer newPersistentDataContainer() {
- return newContainer();
- }
-
- @Override
- public IDataContainer newDataContainer() {
- return context.newDataContainer();
- }
-
- @Override
- public BukkitContainer1_16_R3 newContainer() {
- return new BukkitContainer1_16_R3(context.newDataContainer());
- }
-
-}
\ No newline at end of file
diff --git a/src/main/java/net/sourcewriters/minecraft/vcompat/reflection/provider/v1_8_R1/PacketHandler1_8_R1.java b/src/main/java/net/sourcewriters/minecraft/vcompat/reflection/provider/v1_8_R1/PacketHandler1_8_R1.java
deleted file mode 100644
index c648cb5..0000000
--- a/src/main/java/net/sourcewriters/minecraft/vcompat/reflection/provider/v1_8_R1/PacketHandler1_8_R1.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package net.sourcewriters.minecraft.vcompat.reflection.provider.v1_8_R1;
-
-import net.sourcewriters.minecraft.vcompat.reflection.PacketHandler;
-
-public class PacketHandler1_8_R1 extends PacketHandler {
-
- protected PacketHandler1_8_R1(VersionControl1_8_R1 versionControl) {
- super(versionControl);
- }
-
-}
\ No newline at end of file
diff --git a/src/main/java/net/sourcewriters/minecraft/vcompat/reflection/provider/v1_8_R1/reflection/NmsReflection1_8_R1.java b/src/main/java/net/sourcewriters/minecraft/vcompat/reflection/provider/v1_8_R1/reflection/NmsReflection1_8_R1.java
deleted file mode 100644
index e38ae76..0000000
--- a/src/main/java/net/sourcewriters/minecraft/vcompat/reflection/provider/v1_8_R1/reflection/NmsReflection1_8_R1.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package net.sourcewriters.minecraft.vcompat.reflection.provider.v1_8_R1.reflection;
-
-import net.minecraft.server.v1_8_R1.NBTTagEnd;
-import net.minecraft.server.v1_8_R1.NBTTagList;
-import net.minecraft.server.v1_8_R1.PacketPlayOutPlayerListHeaderFooter;
-import net.sourcewriters.minecraft.vcompat.reflection.reflect.ReflectionProvider;
-import net.sourcewriters.minecraft.vcompat.reflection.reflect.Reflections;
-
-public class NmsReflection1_8_R1 extends Reflections {
-
- public static NmsReflection1_8_R1 INSTANCE = new NmsReflection1_8_R1();
-
- private NmsReflection1_8_R1() {}
-
- @Override
- public void setup(ReflectionProvider provider) {
-
- //
- //
- // Create Reflects
- //
-
- //
- // Minecraft
-
- provider.createReflect("nmsPacketPlayOutPlayerListHeaderFooter", PacketPlayOutPlayerListHeaderFooter.class)
- .searchField("header", "a").searchField("header", "b");
-
- provider.createReflect("nmsNBTTagEnd", NBTTagEnd.class);
- provider.createReflect("nmsNBTTagList", NBTTagList.class).searchField("value", "list");
-
- }
-
-}
\ No newline at end of file
diff --git a/src/main/java/net/sourcewriters/minecraft/vcompat/reflection/provider/v1_8_R2/PacketHandler1_8_R2.java b/src/main/java/net/sourcewriters/minecraft/vcompat/reflection/provider/v1_8_R2/PacketHandler1_8_R2.java
deleted file mode 100644
index 227d58e..0000000
--- a/src/main/java/net/sourcewriters/minecraft/vcompat/reflection/provider/v1_8_R2/PacketHandler1_8_R2.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package net.sourcewriters.minecraft.vcompat.reflection.provider.v1_8_R2;
-
-import net.sourcewriters.minecraft.vcompat.reflection.PacketHandler;
-
-public class PacketHandler1_8_R2 extends PacketHandler {
-
- protected PacketHandler1_8_R2(VersionControl1_8_R2 versionControl) {
- super(versionControl);
- }
-
-}
\ No newline at end of file
diff --git a/src/main/java/net/sourcewriters/minecraft/vcompat/reflection/provider/v1_8_R2/reflection/NmsReflection1_8_R2.java b/src/main/java/net/sourcewriters/minecraft/vcompat/reflection/provider/v1_8_R2/reflection/NmsReflection1_8_R2.java
deleted file mode 100644
index 8be7889..0000000
--- a/src/main/java/net/sourcewriters/minecraft/vcompat/reflection/provider/v1_8_R2/reflection/NmsReflection1_8_R2.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package net.sourcewriters.minecraft.vcompat.reflection.provider.v1_8_R2.reflection;
-
-import net.minecraft.server.v1_8_R2.NBTTagEnd;
-import net.minecraft.server.v1_8_R2.NBTTagList;
-import net.minecraft.server.v1_8_R2.PacketPlayOutPlayerListHeaderFooter;
-import net.sourcewriters.minecraft.vcompat.reflection.reflect.ReflectionProvider;
-import net.sourcewriters.minecraft.vcompat.reflection.reflect.Reflections;
-
-public class NmsReflection1_8_R2 extends Reflections {
-
- public static NmsReflection1_8_R2 INSTANCE = new NmsReflection1_8_R2();
-
- private NmsReflection1_8_R2() {}
-
- @Override
- public void setup(ReflectionProvider provider) {
-
- //
- //
- // Create Reflects
- //
-
- //
- // Minecraft
-
- provider.createReflect("nmsPacketPlayOutPlayerListHeaderFooter", PacketPlayOutPlayerListHeaderFooter.class)
- .searchField("header", "a").searchField("header", "b");
-
- provider.createReflect("nmsNBTTagEnd", NBTTagEnd.class);
- provider.createReflect("nmsNBTTagList", NBTTagList.class).searchField("value", "list");
-
- }
-
-}
\ No newline at end of file
diff --git a/src/main/java/net/sourcewriters/minecraft/vcompat/reflection/provider/v1_8_R3/PacketHandler1_8_R3.java b/src/main/java/net/sourcewriters/minecraft/vcompat/reflection/provider/v1_8_R3/PacketHandler1_8_R3.java
deleted file mode 100644
index 66e13ad..0000000
--- a/src/main/java/net/sourcewriters/minecraft/vcompat/reflection/provider/v1_8_R3/PacketHandler1_8_R3.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package net.sourcewriters.minecraft.vcompat.reflection.provider.v1_8_R3;
-
-import net.sourcewriters.minecraft.vcompat.reflection.PacketHandler;
-
-public class PacketHandler1_8_R3 extends PacketHandler {
-
- protected PacketHandler1_8_R3(VersionControl1_8_R3 versionControl) {
- super(versionControl);
- }
-
-}
\ No newline at end of file
diff --git a/src/main/java/net/sourcewriters/minecraft/vcompat/reflection/provider/v1_8_R3/reflection/NmsReflection1_8_R3.java b/src/main/java/net/sourcewriters/minecraft/vcompat/reflection/provider/v1_8_R3/reflection/NmsReflection1_8_R3.java
deleted file mode 100644
index f746394..0000000
--- a/src/main/java/net/sourcewriters/minecraft/vcompat/reflection/provider/v1_8_R3/reflection/NmsReflection1_8_R3.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package net.sourcewriters.minecraft.vcompat.reflection.provider.v1_8_R3.reflection;
-
-import net.minecraft.server.v1_8_R3.NBTTagEnd;
-import net.minecraft.server.v1_8_R3.NBTTagList;
-import net.minecraft.server.v1_8_R3.PacketPlayOutPlayerListHeaderFooter;
-import net.sourcewriters.minecraft.vcompat.reflection.reflect.ReflectionProvider;
-import net.sourcewriters.minecraft.vcompat.reflection.reflect.Reflections;
-
-public class NmsReflection1_8_R3 extends Reflections {
-
- public static NmsReflection1_8_R3 INSTANCE = new NmsReflection1_8_R3();
-
- private NmsReflection1_8_R3() {}
-
- @Override
- public void setup(ReflectionProvider provider) {
-
- //
- //
- // Create Reflects
- //
-
- //
- // Minecraft
-
- provider.createReflect("nmsPacketPlayOutPlayerListHeaderFooter", PacketPlayOutPlayerListHeaderFooter.class)
- .searchField("header", "a").searchField("header", "b");
-
- provider.createReflect("nmsNBTTagEnd", NBTTagEnd.class);
- provider.createReflect("nmsNBTTagList", NBTTagList.class).searchField("value", "list");
-
- }
-
-}
\ No newline at end of file
diff --git a/src/main/java/net/sourcewriters/minecraft/vcompat/reflection/provider/v1_9_R1/PacketHandler1_9_R1.java b/src/main/java/net/sourcewriters/minecraft/vcompat/reflection/provider/v1_9_R1/PacketHandler1_9_R1.java
deleted file mode 100644
index 1ab5bfc..0000000
--- a/src/main/java/net/sourcewriters/minecraft/vcompat/reflection/provider/v1_9_R1/PacketHandler1_9_R1.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package net.sourcewriters.minecraft.vcompat.reflection.provider.v1_9_R1;
-
-import net.sourcewriters.minecraft.vcompat.reflection.PacketHandler;
-
-public class PacketHandler1_9_R1 extends PacketHandler {
-
- protected PacketHandler1_9_R1(VersionControl1_9_R1 versionControl) {
- super(versionControl);
- }
-
-}
\ No newline at end of file
diff --git a/src/main/java/net/sourcewriters/minecraft/vcompat/reflection/provider/v1_9_R1/reflection/NmsReflection1_9_R1.java b/src/main/java/net/sourcewriters/minecraft/vcompat/reflection/provider/v1_9_R1/reflection/NmsReflection1_9_R1.java
deleted file mode 100644
index 2231ece..0000000
--- a/src/main/java/net/sourcewriters/minecraft/vcompat/reflection/provider/v1_9_R1/reflection/NmsReflection1_9_R1.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package net.sourcewriters.minecraft.vcompat.reflection.provider.v1_9_R1.reflection;
-
-import net.minecraft.server.v1_9_R1.NBTTagEnd;
-import net.minecraft.server.v1_9_R1.NBTTagList;
-import net.minecraft.server.v1_9_R1.PacketPlayOutPlayerListHeaderFooter;
-import net.sourcewriters.minecraft.vcompat.reflection.reflect.ReflectionProvider;
-import net.sourcewriters.minecraft.vcompat.reflection.reflect.Reflections;
-
-public class NmsReflection1_9_R1 extends Reflections {
-
- public static NmsReflection1_9_R1 INSTANCE = new NmsReflection1_9_R1();
-
- private NmsReflection1_9_R1() {}
-
- @Override
- public void setup(ReflectionProvider provider) {
-
- //
- //
- // Create Reflects
- //
-
- //
- // Minecraft
-
- provider.createReflect("nmsPacketPlayOutPlayerListHeaderFooter", PacketPlayOutPlayerListHeaderFooter.class)
- .searchField("header", "a").searchField("header", "b");
-
- provider.createReflect("nmsNBTTagEnd", NBTTagEnd.class);
- provider.createReflect("nmsNBTTagList", NBTTagList.class).searchField("value", "list");
-
- }
-
-}
\ No newline at end of file
diff --git a/src/main/java/net/sourcewriters/minecraft/vcompat/reflection/provider/v1_9_R2/PacketHandler1_9_R2.java b/src/main/java/net/sourcewriters/minecraft/vcompat/reflection/provider/v1_9_R2/PacketHandler1_9_R2.java
deleted file mode 100644
index 744764f..0000000
--- a/src/main/java/net/sourcewriters/minecraft/vcompat/reflection/provider/v1_9_R2/PacketHandler1_9_R2.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package net.sourcewriters.minecraft.vcompat.reflection.provider.v1_9_R2;
-
-import net.sourcewriters.minecraft.vcompat.reflection.PacketHandler;
-
-public class PacketHandler1_9_R2 extends PacketHandler {
-
- protected PacketHandler1_9_R2(VersionControl1_9_R2 versionControl) {
- super(versionControl);
- }
-
-}
\ No newline at end of file
diff --git a/src/main/java/net/sourcewriters/minecraft/vcompat/reflection/provider/v1_9_R2/reflection/NmsReflection1_9_R2.java b/src/main/java/net/sourcewriters/minecraft/vcompat/reflection/provider/v1_9_R2/reflection/NmsReflection1_9_R2.java
deleted file mode 100644
index 4df52a7..0000000
--- a/src/main/java/net/sourcewriters/minecraft/vcompat/reflection/provider/v1_9_R2/reflection/NmsReflection1_9_R2.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package net.sourcewriters.minecraft.vcompat.reflection.provider.v1_9_R2.reflection;
-
-import net.minecraft.server.v1_9_R2.NBTTagEnd;
-import net.minecraft.server.v1_9_R2.NBTTagList;
-import net.minecraft.server.v1_9_R2.PacketPlayOutPlayerListHeaderFooter;
-import net.sourcewriters.minecraft.vcompat.reflection.reflect.ReflectionProvider;
-import net.sourcewriters.minecraft.vcompat.reflection.reflect.Reflections;
-
-public class NmsReflection1_9_R2 extends Reflections {
-
- public static NmsReflection1_9_R2 INSTANCE = new NmsReflection1_9_R2();
-
- private NmsReflection1_9_R2() {}
-
- @Override
- public void setup(ReflectionProvider provider) {
-
- //
- //
- // Create Reflects
- //
-
- //
- // Minecraft
-
- provider.createReflect("nmsPacketPlayOutPlayerListHeaderFooter", PacketPlayOutPlayerListHeaderFooter.class)
- .searchField("header", "a").searchField("header", "b");
-
- provider.createReflect("nmsNBTTagEnd", NBTTagEnd.class);
- provider.createReflect("nmsNBTTagList", NBTTagList.class).searchField("value", "list");
-
- }
-
-}
\ No newline at end of file
diff --git a/src/main/java/net/sourcewriters/minecraft/vcompat/reflection/reflect/FakeReflect.java b/src/main/java/net/sourcewriters/minecraft/vcompat/reflection/reflect/FakeReflect.java
deleted file mode 100644
index 22bfdcf..0000000
--- a/src/main/java/net/sourcewriters/minecraft/vcompat/reflection/reflect/FakeReflect.java
+++ /dev/null
@@ -1,240 +0,0 @@
-package net.sourcewriters.minecraft.vcompat.reflection.reflect;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.function.Predicate;
-
-import com.syntaxphoenix.syntaxapi.reflection.AbstractReflect;
-import com.syntaxphoenix.syntaxapi.reflection.Reflect;
-
-public class FakeReflect extends Reflect {
-
- public static final FakeReflect FAKE = new FakeReflect();
-
- @SuppressWarnings("rawtypes")
- private final Collection collection = Collections.unmodifiableCollection(Arrays.asList());
-
- private FakeReflect() {
- super((Class) null);
- }
-
- /*
- *
- */
-
- @Override
- public Class getOwner() {
- return null;
- }
-
- /*
- *
- */
-
- @Override
- public void delete() {}
-
- /*
- *
- */
-
- @SuppressWarnings("unchecked")
- @Override
- public Collection> getConstructors() {
- return collection;
- }
-
- @SuppressWarnings("unchecked")
- @Override
- public Collection getMethods() {
- return collection;
- }
-
- @SuppressWarnings("unchecked")
- @Override
- public Collection getFields() {
- return collection;
- }
-
- /*
- *
- */
-
- @Override
- public boolean putConstructor(String name, Constructor constructor) {
- return true;
- }
-
- @Override
- public boolean putMethod(String name, Method method) {
- return true;
- }
-
- @Override
- public boolean putField(String name, Field field) {
- return true;
- }
-
- /*
- *
- */
-
- @Override
- public boolean containsMethod(String name) {
- return false;
- }
-
- @Override
- public boolean containsField(String name) {
- return false;
- }
-
- /*
- *
- */
-
- @Override
- public Object init() {
- return null;
- }
-
- @Override
- public Object init(String name, Object... args) {
- return null;
- }
-
- /*
- *
- */
-
- @Override
- public FakeReflect execute(String name, Object... args) {
- return this;
- }
-
- @Override
- public FakeReflect execute(Object source, String name, Object... args) {
- return this;
- }
-
- @Override
- public Object run(String name, Object... args) {
- return null;
- }
-
- @Override
- public Object run(Object source, String name, Object... args) {
- return null;
- }
-
- /*
- *
- */
-
- @Override
- public Object getFieldValue(String name) {
- return null;
- }
-
- @Override
- public Object getFieldValue(String name, Object source) {
- return null;
- }
-
- @Override
- public void setFieldValue(String name, Object value) {}
-
- @Override
- public void setFieldValue(Object source, String name, Object value) {}
-
- /*
- *
- */
-
- @Override
- public Constructor getConstructor(String name) {
- return null;
- }
-
- @Override
- public Method getMethod(String name) {
- return null;
- }
-
- @Override
- public Field getField(String name) {
- return null;
- }
-
- /*
- *
- */
-
- @Override
- public FakeReflect searchConstructor(Predicate predicate, String name, Class... args) {
- return this;
- }
-
- @Override
- public FakeReflect searchConstructor(String name, Class... args) {
- return this;
- }
-
- @Override
- public FakeReflect searchConstructorsByArguments(String base, Class... arguments) {
- return this;
- }
-
- /*
- *
- */
-
- @Override
- public FakeReflect searchMethod(Predicate predicate, String name, String methodName, Class... arguments) {
- return this;
- }
-
- @Override
- public FakeReflect searchMethod(String name, String methodName, Class... arguments) {
- return this;
- }
-
- @Override
- public FakeReflect searchMethodsByArguments(String base, Class... arguments) {
- return this;
- }
-
- /*
- *
- */
-
- @Override
- public FakeReflect searchField(Predicate predicate, String name, String fieldName) {
- return this;
- }
-
- @Override
- public FakeReflect searchField(String name, String fieldName) {
- return this;
- }
-
- @Override
- public FakeReflect searchFields(String name, String fieldName) {
- return this;
- }
-
- @Override
- public FakeReflect searchField(String name, Class type) {
- return this;
- }
-
- @Override
- public FakeReflect searchFields(String name, Class type) {
- return this;
- }
-
-}
\ No newline at end of file
diff --git a/src/main/java/net/sourcewriters/minecraft/vcompat/reflection/reflect/ReflectionProvider.java b/src/main/java/net/sourcewriters/minecraft/vcompat/reflection/reflect/ReflectionProvider.java
deleted file mode 100644
index a62d6ab..0000000
--- a/src/main/java/net/sourcewriters/minecraft/vcompat/reflection/reflect/ReflectionProvider.java
+++ /dev/null
@@ -1,127 +0,0 @@
-package net.sourcewriters.minecraft.vcompat.reflection.reflect;
-
-import static net.sourcewriters.minecraft.vcompat.reflection.reflect.FakeReflect.FAKE;
-
-import java.util.Optional;
-import java.util.function.Consumer;
-
-import com.syntaxphoenix.syntaxapi.reflection.ClassCache;
-import com.syntaxphoenix.syntaxapi.reflection.Reflect;
-import com.syntaxphoenix.syntaxapi.reflection.ReflectCache;
-
-import net.sourcewriters.minecraft.vcompat.version.ServerVersion;
-import net.sourcewriters.minecraft.vcompat.version.Versions;
-
-public class ReflectionProvider {
-
- public static final String CB_PATH_FORMAT = "org.bukkit.craftbukkit.%s.%s";
- public static final String NMS_PATH_FORMAT = "net.minecraft.server.%s.%s";
-
- public static final ReflectionProvider DEFAULT = new ReflectionProvider(provider -> Reflections.globalSetup(provider));
-
- protected final ReflectCache cache;
-
- protected final String cbPath;
- protected final String nmsPath;
-
- protected final ServerVersion version;
-
- private boolean skip = false;
-
- public ReflectionProvider() {
- this((Consumer) null);
- }
-
- public ReflectionProvider(Consumer setup) {
- this(new ReflectCache(), setup);
- }
-
- public ReflectionProvider(ReflectCache cache) {
- this(cache, null);
- }
-
- public ReflectionProvider(ReflectCache cache, Consumer setup) {
- this.cache = cache;
- this.version = Versions.getServer();
- this.cbPath = String.format(CB_PATH_FORMAT, Versions.getServerAsString(), "%s");
- this.nmsPath = String.format(NMS_PATH_FORMAT, Versions.getServerAsString(), "%s");
- if (setup != null) {
- setup.accept(this);
- }
- }
-
- public ServerVersion getVersion() {
- return version;
- }
-
- /*
- * Skip
- */
-
- public ReflectionProvider require(boolean skip) {
- this.skip = !skip;
- return this;
- }
-
- public ReflectionProvider skip(boolean skip) {
- this.skip = skip;
- return this;
- }
-
- public boolean skip() {
- return skip;
- }
-
- /*
- * Reflection
- */
-
- public ReflectCache getReflection() {
- return cache;
- }
-
- public String getNmsPath() {
- return nmsPath;
- }
-
- public String getCbPath() {
- return cbPath;
- }
-
- public Reflect createNMSReflect(String name, String path) {
- return skip ? FAKE : cache.create(name, getNMSClass(path));
- }
-
- public Reflect createCBReflect(String name, String path) {
- return skip ? FAKE : cache.create(name, getCBClass(path));
- }
-
- public Reflect createReflect(String name, String path) {
- return skip ? FAKE : cache.create(name, getClass(path));
- }
-
- public Reflect createReflect(String name, Class clazz) {
- return skip ? FAKE : cache.create(name, clazz);
- }
-
- public Optional getOptionalReflect(String name) {
- return cache.get(name);
- }
-
- public Reflect getReflect(String name) {
- return cache.get(name).orElse(null);
- }
-
- public Class getNMSClass(String path) {
- return getClass(String.format(nmsPath, path));
- }
-
- public Class getCBClass(String path) {
- return getClass(String.format(cbPath, path));
- }
-
- public Class getClass(String path) {
- return ClassCache.getClass(path);
- }
-
-}
\ No newline at end of file
diff --git a/src/main/java/net/sourcewriters/minecraft/vcompat/reflection/reflect/provider/GeneralReflections.java b/src/main/java/net/sourcewriters/minecraft/vcompat/reflection/reflect/provider/GeneralReflections.java
deleted file mode 100644
index 828aad8..0000000
--- a/src/main/java/net/sourcewriters/minecraft/vcompat/reflection/reflect/provider/GeneralReflections.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package net.sourcewriters.minecraft.vcompat.reflection.reflect.provider;
-
-import com.mojang.authlib.GameProfile;
-
-import net.sourcewriters.minecraft.vcompat.reflection.reflect.ReflectionProvider;
-import net.sourcewriters.minecraft.vcompat.reflection.reflect.Reflections;
-
-public class GeneralReflections extends Reflections {
-
- public static GeneralReflections INSTANCE = new GeneralReflections();
-
- private GeneralReflections() {}
-
- @Override
- public void setup(ReflectionProvider provider) {
-
- //
- //
- // Needed classes to create Reflects
- //
-
- //
- //
- // Create Reflects
- //
-
- //
- // Mojang
-
- provider.createReflect("mjGameProfile", GameProfile.class).searchField("name", "name");
-
- }
-
-}
\ No newline at end of file
diff --git a/src/main/java/net/sourcewriters/minecraft/vcompat/reflection/tools/ServerTools.java b/src/main/java/net/sourcewriters/minecraft/vcompat/reflection/tools/ServerTools.java
deleted file mode 100644
index f6d136b..0000000
--- a/src/main/java/net/sourcewriters/minecraft/vcompat/reflection/tools/ServerTools.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package net.sourcewriters.minecraft.vcompat.reflection.tools;
-
-import org.bukkit.craftbukkit.libs.jline.console.ConsoleReader;
-
-public abstract class ServerTools {
-
- public abstract void setMotd(String text);
-
- public abstract String getMotd();
-
- public abstract ConsoleReader getConsole();
-
-}
\ No newline at end of file
diff --git a/src/main/java/net/sourcewriters/minecraft/vcompat/utils/java/tools/ReflectionTools.java b/src/main/java/net/sourcewriters/minecraft/vcompat/utils/java/tools/ReflectionTools.java
deleted file mode 100644
index 9dc8877..0000000
--- a/src/main/java/net/sourcewriters/minecraft/vcompat/utils/java/tools/ReflectionTools.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package net.sourcewriters.minecraft.vcompat.utils.java.tools;
-
-import java.lang.reflect.Array;
-
-public final class ReflectionTools {
-
- private ReflectionTools() {}
-
- public static Class subclass(Class clazz, String name) {
- for (Class search : clazz.getClasses()) {
- if (search.getSimpleName().split("\\.")[0].equals(name)) {
- return search;
- }
- }
- return null;
- }
-
- public static Class arrayclass(Class clazz) {
- return Array.newInstance(clazz, 1).getClass();
- }
-
-}
\ No newline at end of file
diff --git a/vcompat-1_17_R1/pom.xml b/vcompat-1_17_R1/pom.xml
new file mode 100644
index 0000000..3ff304f
--- /dev/null
+++ b/vcompat-1_17_R1/pom.xml
@@ -0,0 +1,75 @@
+
+ 4.0.0
+
+ net.sourcewriters.minecraft
+ vcompat-parent
+ 3.0.0
+
+ vcompat-1_17_R1
+
+
+ ${project.basedir}/../libraries/mapping
+ ${project.basedir}/../libraries/spigot
+ 1.17.1
+
+
+
+
+ net.sourcewriters.minecraft
+ vcompat-api
+ 3.0.0
+ provided
+
+
+
+
+
+ spigot
+ remapped
+ 0.1
+ system
+ ${spigot.libPath}/spigot-${minecraft.version}.jar
+
+
+
+
+
+
+ net.md-5
+ specialsource-maven-plugin
+ 1.2.2
+
+
+ package
+
+ remap
+
+ remap-obf
+
+ org.spigotmc:minecraft-server:${minecraft.version}-R0.1-SNAPSHOT:txt:maps-mojang
+ true
+ org.spigotmc:spigot:${minecraft.version}-R0.1-SNAPSHOT:jar:remapped-mojang
+ true
+ remapped-obf
+
+
+
+ package
+
+ remap
+
+ remap-spigot
+
+ ${project.build.directory}/${project.artifactId}-${project.version}-remapped-obf.jar
+ org.spigotmc:minecraft-server:${minecraft.version}-R0.1-SNAPSHOT:csrg:maps-spigot
+ org.spigotmc:spigot:${minecraft.version}-R0.1-SNAPSHOT:jar:remapped-obf
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/vcompat-1_17_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_17_R1/BukkitConversion1_17_R1.java b/vcompat-1_17_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_17_R1/BukkitConversion1_17_R1.java
new file mode 100644
index 0000000..d5816f4
--- /dev/null
+++ b/vcompat-1_17_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_17_R1/BukkitConversion1_17_R1.java
@@ -0,0 +1,209 @@
+package net.sourcewriters.minecraft.vcompat.provider.impl.v1_17_R1;
+
+import org.bukkit.craftbukkit.v1_17_R1.inventory.CraftItemStack;
+import org.bukkit.entity.EntityType;
+
+import net.minecraft.nbt.ByteArrayTag;
+import net.minecraft.nbt.ByteTag;
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.nbt.DoubleTag;
+import net.minecraft.nbt.EndTag;
+import net.minecraft.nbt.FloatTag;
+import net.minecraft.nbt.IntArrayTag;
+import net.minecraft.nbt.IntTag;
+import net.minecraft.nbt.ListTag;
+import net.minecraft.nbt.LongArrayTag;
+import net.minecraft.nbt.LongTag;
+import net.minecraft.nbt.ShortTag;
+import net.minecraft.nbt.StringTag;
+import net.minecraft.nbt.Tag;
+import net.minecraft.world.item.ItemStack;
+import net.sourcewriters.minecraft.vcompat.data.api.IDataAdapterContext;
+import net.sourcewriters.minecraft.vcompat.data.api.IDataType;
+import net.sourcewriters.minecraft.vcompat.provider.BukkitConversion;
+import net.sourcewriters.minecraft.vcompat.provider.data.WrapType;
+import net.sourcewriters.minecraft.vcompat.provider.data.WrappedContext;
+import net.sourcewriters.minecraft.vcompat.provider.entity.NmsEntityType;
+import net.sourcewriters.minecraft.vcompat.provider.impl.v1_17_R1.data.BukkitContext1_17_R1;
+import net.sourcewriters.minecraft.vcompat.provider.impl.v1_17_R1.data.BukkitType1_17_R1;
+import net.sourcewriters.minecraft.vcompat.shaded.syntaxapi.nbt.NbtByte;
+import net.sourcewriters.minecraft.vcompat.shaded.syntaxapi.nbt.NbtByteArray;
+import net.sourcewriters.minecraft.vcompat.shaded.syntaxapi.nbt.NbtCompound;
+import net.sourcewriters.minecraft.vcompat.shaded.syntaxapi.nbt.NbtDouble;
+import net.sourcewriters.minecraft.vcompat.shaded.syntaxapi.nbt.NbtEnd;
+import net.sourcewriters.minecraft.vcompat.shaded.syntaxapi.nbt.NbtFloat;
+import net.sourcewriters.minecraft.vcompat.shaded.syntaxapi.nbt.NbtInt;
+import net.sourcewriters.minecraft.vcompat.shaded.syntaxapi.nbt.NbtIntArray;
+import net.sourcewriters.minecraft.vcompat.shaded.syntaxapi.nbt.NbtList;
+import net.sourcewriters.minecraft.vcompat.shaded.syntaxapi.nbt.NbtLong;
+import net.sourcewriters.minecraft.vcompat.shaded.syntaxapi.nbt.NbtLongArray;
+import net.sourcewriters.minecraft.vcompat.shaded.syntaxapi.nbt.NbtShort;
+import net.sourcewriters.minecraft.vcompat.shaded.syntaxapi.nbt.NbtString;
+import net.sourcewriters.minecraft.vcompat.shaded.syntaxapi.nbt.NbtTag;
+import net.sourcewriters.minecraft.vcompat.shaded.syntaxapi.nbt.NbtType;
+
+public class BukkitConversion1_17_R1 extends BukkitConversion {
+
+ protected BukkitConversion1_17_R1(VersionControl1_17_R1 versionControl) {
+ super(versionControl);
+ }
+
+ @Override
+ public EntityType toEntityType(NmsEntityType type) {
+ try {
+ return EntityType.valueOf(type.name());
+ } catch (IllegalArgumentException ignore) {
+ return null;
+ }
+ }
+
+ @Override
+ public NmsEntityType fromEntityType(EntityType type) {
+ try {
+ return NmsEntityType.valueOf(type.name());
+ } catch (IllegalArgumentException ignore) {
+ return null;
+ }
+ }
+
+ @Override
+ public Tag toMinecraftTag(NbtTag tag) {
+ switch (tag.getType()) {
+ case END:
+ return EndTag.INSTANCE;
+ case BYTE:
+ return ByteTag.valueOf(((NbtByte) tag).getValue());
+ case BYTE_ARRAY:
+ return new ByteArrayTag(((NbtByteArray) tag).getValue());
+ case DOUBLE:
+ return DoubleTag.valueOf(((NbtDouble) tag).getValue());
+ case FLOAT:
+ return FloatTag.valueOf(((NbtFloat) tag).getValue());
+ case INT:
+ return IntTag.valueOf(((NbtInt) tag).getValue());
+ case INT_ARRAY:
+ return new IntArrayTag(((NbtIntArray) tag).getValue());
+ case LONG:
+ return LongTag.valueOf(((NbtLong) tag).getValue());
+ case LONG_ARRAY:
+ return new LongArrayTag(((NbtLongArray) tag).getValue());
+ case SHORT:
+ return ShortTag.valueOf(((NbtShort) tag).getValue());
+ case STRING:
+ return StringTag.valueOf(((NbtString) tag).getValue());
+ case LIST:
+ return toMinecraftList((NbtList) tag);
+ case COMPOUND:
+ return toMinecraftCompound((NbtCompound) tag);
+ default:
+ return null;
+ }
+ }
+
+ @Override
+ public NbtTag fromMinecraftTag(Object tag) {
+ if (tag != null && tag instanceof Tag) {
+ return fromMinecraftTag0((Tag) tag);
+ }
+ return null;
+ }
+
+ public NbtTag fromMinecraftTag0(Tag tag) {
+ switch (NbtType.getById(tag.getId())) {
+ case END:
+ return NbtEnd.INSTANCE;
+ case BYTE:
+ return new NbtByte(((ByteTag) tag).getAsByte());
+ case BYTE_ARRAY:
+ return new NbtByteArray(((ByteArrayTag) tag).getAsByteArray());
+ case DOUBLE:
+ return new NbtDouble(((DoubleTag) tag).getAsDouble());
+ case FLOAT:
+ return new NbtFloat(((FloatTag) tag).getAsFloat());
+ case INT:
+ return new NbtInt(((IntTag) tag).getAsInt());
+ case INT_ARRAY:
+ return new NbtIntArray(((IntArrayTag) tag).getAsIntArray());
+ case LONG:
+ return new NbtLong(((LongTag) tag).getAsLong());
+ case LONG_ARRAY:
+ return new NbtLongArray(((LongArrayTag) tag).getAsLongArray());
+ case SHORT:
+ return new NbtShort(((ShortTag) tag).getAsShort());
+ case STRING:
+ return new NbtString(((StringTag) tag).getAsString());
+ case LIST:
+ return fromMinecraftList(tag);
+ case COMPOUND:
+ return fromMinecraftCompound(tag);
+ default:
+ return null;
+ }
+ }
+
+ @Override
+ public ListTag toMinecraftList(NbtList list) {
+ ListTag output = new ListTag();
+ for (NbtTag tag : list) {
+ output.add(toMinecraftTag(tag));
+ }
+ return output;
+ }
+
+ @Override
+ public NbtList fromMinecraftList(Object raw) {
+ if (!(raw instanceof ListTag)) {
+ return null;
+ }
+ ListTag list = (ListTag) raw;
+ NbtList output = new NbtList<>(NbtType.getById(list.getElementType()));
+ for (Tag base : list) {
+ output.add(fromMinecraftTag(base));
+ }
+ return output;
+ }
+
+ @Override
+ public CompoundTag toMinecraftCompound(NbtCompound compound) {
+ NbtCompound compoundTag = compound;
+ CompoundTag targetCompound = new CompoundTag();
+ for (String key : compoundTag.getKeys()) {
+ targetCompound.put(key, toMinecraftTag(compoundTag.get(key)));
+ }
+ return targetCompound;
+ }
+
+ @Override
+ public NbtCompound fromMinecraftCompound(Object raw) {
+ if (!(raw instanceof CompoundTag)) {
+ return null;
+ }
+ CompoundTag compoundTag = (CompoundTag) raw;
+ NbtCompound targetCompound = new NbtCompound();
+ for (String key : compoundTag.getAllKeys()) {
+ targetCompound.set(key, fromMinecraftTag(compoundTag.get(key)));
+ }
+ return targetCompound;
+ }
+
+ @Override
+ public org.bukkit.inventory.ItemStack itemFromCompound(NbtCompound compound) {
+ return CraftItemStack.asBukkitCopy(ItemStack.of(toMinecraftCompound(compound)));
+ }
+
+ @Override
+ public NbtCompound itemToCompound(org.bukkit.inventory.ItemStack itemStack) {
+ return fromMinecraftCompound(CraftItemStack.asNMSCopy(itemStack).save(new CompoundTag()));
+ }
+
+ @Override
+ public WrappedContext createContext(IDataAdapterContext context) {
+ return new BukkitContext1_17_R1(context);
+ }
+
+ @Override
+ public WrapType wrap(IDataType dataType) {
+ return new BukkitType1_17_R1<>(dataType);
+ }
+
+}
\ No newline at end of file
diff --git a/vcompat-1_17_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_17_R1/EntityProvider1_17_R1.java b/vcompat-1_17_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_17_R1/EntityProvider1_17_R1.java
new file mode 100644
index 0000000..d21abe9
--- /dev/null
+++ b/vcompat-1_17_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_17_R1/EntityProvider1_17_R1.java
@@ -0,0 +1,48 @@
+package net.sourcewriters.minecraft.vcompat.provider.impl.v1_17_R1;
+
+import java.util.EnumMap;
+import java.util.function.Function;
+
+import org.bukkit.craftbukkit.v1_17_R1.CraftWorld;
+
+import net.minecraft.world.level.Level;
+import net.sourcewriters.minecraft.vcompat.provider.EntityProvider;
+import net.sourcewriters.minecraft.vcompat.provider.entity.NmsEntity;
+import net.sourcewriters.minecraft.vcompat.provider.entity.NmsEntityType;
+import net.sourcewriters.minecraft.vcompat.provider.impl.v1_17_R1.utils.EntityConstructors1_17_R1;
+
+
+public class EntityProvider1_17_R1 extends EntityProvider {
+
+ private final EnumMap> entityMap = new EnumMap<>(NmsEntityType.class);
+
+ protected EntityProvider1_17_R1(VersionControl1_17_R1 versionControl) {
+ super(versionControl);
+ }
+
+ @SuppressWarnings("unchecked")
+ private final Function searchConstructor(NmsEntityType type) {
+ try {
+ return (Function) EntityConstructors1_17_R1.class.getField(type.name()).get(null);
+ } catch (IllegalArgumentException | IllegalAccessException | NoSuchFieldException | SecurityException ignore) {
+ return null;
+ }
+ }
+
+ private final Function getConstructor(NmsEntityType type) {
+ return entityMap.computeIfAbsent(type, (key -> searchConstructor(key)));
+ }
+
+ @Override
+ public NmsEntity createEntity(org.bukkit.World world, NmsEntityType type) {
+ if (!(world instanceof CraftWorld)) {
+ return null;
+ }
+ Function function;
+ if ((function = getConstructor(type)) == null) {
+ return null;
+ }
+ return function.apply(((CraftWorld) world).getHandle());
+ }
+
+}
\ No newline at end of file
diff --git a/vcompat-1_17_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_17_R1/PlayerProvider1_17_R1.java b/vcompat-1_17_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_17_R1/PlayerProvider1_17_R1.java
new file mode 100644
index 0000000..fe5165b
--- /dev/null
+++ b/vcompat-1_17_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_17_R1/PlayerProvider1_17_R1.java
@@ -0,0 +1,20 @@
+package net.sourcewriters.minecraft.vcompat.provider.impl.v1_17_R1;
+
+import org.bukkit.entity.Player;
+
+import net.sourcewriters.minecraft.vcompat.provider.PlayerProvider;
+import net.sourcewriters.minecraft.vcompat.provider.entity.NmsPlayer;
+import net.sourcewriters.minecraft.vcompat.provider.impl.v1_17_R1.entity.Player1_17_R1;
+
+public class PlayerProvider1_17_R1 extends PlayerProvider {
+
+ protected PlayerProvider1_17_R1(VersionControl1_17_R1 versionControl) {
+ super(versionControl);
+ }
+
+ @Override
+ protected NmsPlayer createPlayer(Player player) {
+ return new Player1_17_R1(player);
+ }
+
+}
\ No newline at end of file
diff --git a/vcompat-1_17_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_17_R1/TextureProvider1_17_R1.java b/vcompat-1_17_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_17_R1/TextureProvider1_17_R1.java
new file mode 100644
index 0000000..027c11b
--- /dev/null
+++ b/vcompat-1_17_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_17_R1/TextureProvider1_17_R1.java
@@ -0,0 +1,101 @@
+package net.sourcewriters.minecraft.vcompat.provider.impl.v1_17_R1;
+
+import org.bukkit.Material;
+import org.bukkit.block.Block;
+import org.bukkit.craftbukkit.v1_17_R1.block.CraftBlockEntityState;
+import org.bukkit.craftbukkit.v1_17_R1.block.CraftSkull;
+import org.bukkit.craftbukkit.v1_17_R1.inventory.CraftItemStack;
+import org.bukkit.inventory.meta.ItemMeta;
+import org.bukkit.inventory.meta.SkullMeta;
+
+import com.mojang.authlib.GameProfile;
+
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.nbt.NbtUtils;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.level.block.entity.SkullBlockEntity;
+import net.sourcewriters.minecraft.vcompat.provider.TextureProvider;
+import net.sourcewriters.minecraft.vcompat.provider.lookup.handle.ClassLookup;
+
+public class TextureProvider1_17_R1 extends TextureProvider {
+
+ private final ClassLookup craftEntityStateRef = ClassLookup.of(CraftBlockEntityState.class).searchField("tileEntity", "tileEntity");
+ private final ClassLookup craftItemStackRef = ClassLookup.of(CraftItemStack.class).searchField("handle", "handle");
+ private final ClassLookup craftMetaSkullRef = ClassLookup.of("org.bukkit.craftbukkit.v1_17_R1.inventory.CraftMetaSkull")
+ .searchField("serialized", "serializedProfile").searchField("profile", "profile");
+
+ protected TextureProvider1_17_R1(VersionControl1_17_R1 versionControl) {
+ super(versionControl);
+ }
+
+ @Override
+ public GameProfile profileFromBlock(Block block) {
+ if (!(block instanceof CraftSkull)) {
+ return null;
+ }
+ SkullBlockEntity entitySkull = (SkullBlockEntity) craftEntityStateRef.getFieldValue(block, "tileEntity");
+ return entitySkull.owner;
+ }
+
+ @Override
+ public GameProfile profileFromItem(org.bukkit.inventory.ItemStack itemStack) {
+ if (!(itemStack.getItemMeta() instanceof SkullMeta)) {
+ return null;
+ }
+ SkullMeta meta = (SkullMeta) itemStack.getItemMeta();
+ GameProfile profile = (GameProfile) craftMetaSkullRef.getFieldValue(meta, "profile");
+ if (profile == null) {
+ CompoundTag compound = (CompoundTag) craftMetaSkullRef.getFieldValue(meta, "serialized");
+ if (compound == null) {
+ ItemStack stack = null;
+ if (itemStack instanceof CraftItemStack) {
+ stack = (ItemStack) craftItemStackRef.getFieldValue(itemStack, "handle");
+ }
+ if (stack == null) {
+ stack = CraftItemStack.asNMSCopy(itemStack);
+ }
+ CompoundTag stackTag = stack.getOrCreateTag();
+ if (stackTag.contains("SkullOwner", 10)) {
+ compound = stackTag.getCompound("SkullOwner");
+ } else if (stackTag.contains("SkullProfile", 10)) {
+ compound = stackTag.getCompound("SkullProfile");
+ }
+ }
+ if (compound == null) {
+ return null;
+ }
+ profile = NbtUtils.readGameProfile(compound);
+ }
+ return profile;
+ }
+
+ @Override
+ public org.bukkit.inventory.ItemStack getItem(GameProfile profile) {
+ org.bukkit.inventory.ItemStack craftStack = CraftItemStack.asCraftCopy(new org.bukkit.inventory.ItemStack(Material.PLAYER_HEAD));
+ applyItem(craftStack, profile);
+ return craftStack;
+ }
+
+ @Override
+ public boolean applyItem(org.bukkit.inventory.ItemStack itemStack, GameProfile profile) {
+ ItemMeta meta = itemStack.getItemMeta();
+ if (!(meta instanceof SkullMeta)) {
+ return false;
+ }
+ SkullMeta skullMeta = (SkullMeta) meta;
+ craftMetaSkullRef.setFieldValue(meta, "profile", profile);
+ itemStack.setItemMeta(skullMeta);
+ return true;
+ }
+
+ @Override
+ public boolean applyBlock(Block block, GameProfile profile) {
+ if (!(block instanceof CraftSkull)) {
+ return false;
+ }
+ SkullBlockEntity entitySkull = (SkullBlockEntity) craftEntityStateRef.getFieldValue(block, "tileEntity");
+ entitySkull.setOwner(profile);
+ return true;
+ }
+
+}
\ No newline at end of file
diff --git a/vcompat-1_17_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_17_R1/ToolProvider1_17_R1.java b/vcompat-1_17_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_17_R1/ToolProvider1_17_R1.java
new file mode 100644
index 0000000..834d3da
--- /dev/null
+++ b/vcompat-1_17_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_17_R1/ToolProvider1_17_R1.java
@@ -0,0 +1,33 @@
+package net.sourcewriters.minecraft.vcompat.provider.impl.v1_17_R1;
+
+import net.sourcewriters.minecraft.vcompat.provider.ToolProvider;
+import net.sourcewriters.minecraft.vcompat.provider.impl.v1_17_R1.tools.BlockTools1_17_R1;
+import net.sourcewriters.minecraft.vcompat.provider.impl.v1_17_R1.tools.ServerTools1_17_R1;
+import net.sourcewriters.minecraft.vcompat.provider.impl.v1_17_R1.tools.SkinTools1_17_R1;
+
+public class ToolProvider1_17_R1 extends ToolProvider {
+
+ private final BlockTools1_17_R1 blockTools = new BlockTools1_17_R1();
+ private final SkinTools1_17_R1 skinTools = new SkinTools1_17_R1();
+ private final ServerTools1_17_R1 serverTools = new ServerTools1_17_R1();
+
+ protected ToolProvider1_17_R1(VersionControl1_17_R1 versionControl) {
+ super(versionControl);
+ }
+
+ @Override
+ public SkinTools1_17_R1 getSkinTools() {
+ return skinTools;
+ }
+
+ @Override
+ public ServerTools1_17_R1 getServerTools() {
+ return serverTools;
+ }
+
+ @Override
+ public BlockTools1_17_R1 getBlockTools() {
+ return blockTools;
+ }
+
+}
\ No newline at end of file
diff --git a/vcompat-1_17_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_17_R1/VersionControl1_17_R1.java b/vcompat-1_17_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_17_R1/VersionControl1_17_R1.java
new file mode 100644
index 0000000..46edc5c
--- /dev/null
+++ b/vcompat-1_17_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_17_R1/VersionControl1_17_R1.java
@@ -0,0 +1,55 @@
+package net.sourcewriters.minecraft.vcompat.provider.impl.v1_17_R1;
+
+import net.sourcewriters.minecraft.vcompat.provider.VersionControl;
+import net.sourcewriters.minecraft.vcompat.provider.impl.v1_17_R1.data.hook.BukkitContainerAdapterHook1_17_R1;
+
+public class VersionControl1_17_R1 extends VersionControl {
+
+ public static VersionControl1_17_R1 INSTANCE;
+
+ public static VersionControl1_17_R1 init() {
+ return INSTANCE != null ? INSTANCE : (INSTANCE = new VersionControl1_17_R1());
+ }
+
+ private final ToolProvider1_17_R1 toolProvider = new ToolProvider1_17_R1(this);
+ private final TextureProvider1_17_R1 textureProvider = new TextureProvider1_17_R1(this);
+ private final EntityProvider1_17_R1 entityProvider = new EntityProvider1_17_R1(this);
+ private final PlayerProvider1_17_R1 playerProvider = new PlayerProvider1_17_R1(this);
+ private final BukkitConversion1_17_R1 bukkitConversion = new BukkitConversion1_17_R1(this);
+
+ private VersionControl1_17_R1() {
+ BukkitContainerAdapterHook1_17_R1.hookEntity();
+ }
+
+ @Override
+ public ToolProvider1_17_R1 getToolProvider() {
+ return toolProvider;
+ }
+
+ @Override
+ public EntityProvider1_17_R1 getEntityProvider() {
+ return entityProvider;
+ }
+
+ @Override
+ public PlayerProvider1_17_R1 getPlayerProvider() {
+ return playerProvider;
+ }
+
+ @Override
+ public TextureProvider1_17_R1 getTextureProvider() {
+ return textureProvider;
+ }
+
+ @Override
+ public BukkitConversion1_17_R1 getBukkitConversion() {
+ return bukkitConversion;
+ }
+
+ @Override
+ public void shutdown() {
+ dataProvider.getDefaultDistributor().shutdown();
+ BukkitContainerAdapterHook1_17_R1.unhookAll();
+ }
+
+}
\ No newline at end of file
diff --git a/vcompat-1_17_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_17_R1/data/BukkitContainer1_17_R1.java b/vcompat-1_17_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_17_R1/data/BukkitContainer1_17_R1.java
new file mode 100644
index 0000000..9cbca99
--- /dev/null
+++ b/vcompat-1_17_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_17_R1/data/BukkitContainer1_17_R1.java
@@ -0,0 +1,160 @@
+package net.sourcewriters.minecraft.vcompat.provider.impl.v1_17_R1.data;
+
+import java.util.Arrays;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import org.bukkit.NamespacedKey;
+import org.bukkit.persistence.PersistentDataAdapterContext;
+import org.bukkit.persistence.PersistentDataContainer;
+import org.bukkit.persistence.PersistentDataType;
+
+import net.sourcewriters.minecraft.vcompat.data.api.IDataContainer;
+import net.sourcewriters.minecraft.vcompat.provider.data.WrapType;
+import net.sourcewriters.minecraft.vcompat.provider.data.WrappedContainer;
+import net.sourcewriters.minecraft.vcompat.provider.data.WrappedKey;
+import net.sourcewriters.minecraft.vcompat.provider.data.wrap.SyntaxKey;
+
+public final class BukkitContainer1_17_R1 extends WrappedContainer implements PersistentDataContainer {
+
+ private final IDataContainer container;
+
+ public BukkitContainer1_17_R1(IDataContainer container) {
+ this.container = container;
+ }
+
+ @Override
+ public IDataContainer getHandle() {
+ return container;
+ }
+
+ @Override
+ public IDataContainer getAsSyntaxContainer() {
+ return container;
+ }
+
+ /*
+ *
+ */
+
+ @Override
+ public boolean has(NamespacedKey key, PersistentDataType type) {
+ return has(new BukkitKey1_17_R1(key), WrappedType1_17_R1.wrap(type));
+ }
+
+ @Override
+ public Z get(NamespacedKey key, PersistentDataType type) {
+ return get(new BukkitKey1_17_R1(key), WrappedType1_17_R1.wrap(type));
+ }
+
+ @Override
+ public Z getOrDefault(NamespacedKey key, PersistentDataType type, Z value) {
+ return Optional.ofNullable(get(key, type)).orElse(value);
+ }
+
+ @Override
+ public void set(NamespacedKey key, PersistentDataType type, Z value) {
+ set(new BukkitKey1_17_R1(key), value, WrappedType1_17_R1.wrap(type));
+ }
+
+ @Override
+ public void remove(NamespacedKey key) {
+ remove(new BukkitKey1_17_R1(key));
+ }
+
+ @Override
+ public Set getKeys() {
+ return Arrays.stream(container.getKeys()).map(SyntaxKey::new).map(BukkitKey1_17_R1::asBukkit).collect(Collectors.toSet());
+ }
+
+ @Override
+ public PersistentDataAdapterContext getAdapterContext() {
+ return getWrapContext();
+ }
+
+ /*
+ *
+ */
+
+ @Override
+ public BukkitContext1_17_R1 getWrapContext() {
+ return new BukkitContext1_17_R1(container.getContext());
+ }
+
+ @Override
+ public boolean has(String key) {
+ return has(wrappedKey(key));
+ }
+
+ @Override
+ public boolean has(WrappedKey key) {
+ return container.has(key.getNamespacedKey());
+ }
+
+ @Override
+ public boolean has(String key, WrapType type) {
+ return has(wrappedKey(key), type);
+ }
+
+ @Override
+ public boolean has(WrappedKey key, WrapType type) {
+ return container.has(key.getNamespacedKey(), type.syntaxType());
+ }
+
+ @Override
+ public Object get(String key) {
+ return get(wrappedKey(key));
+ }
+
+ @Override
+ public Object get(WrappedKey key) {
+ return container.get(key.getNamespacedKey());
+ }
+
+ @Override
+ public C get(String key, WrapType type) {
+ return get(wrappedKey(key), type);
+ }
+
+ @Override
+ public C get(WrappedKey key, WrapType type) {
+ return container.get(key.getNamespacedKey(), type.syntaxType());
+ }
+
+ @Override
+ public void set(String key, B value, WrapType type) {
+ set(wrappedKey(key), value, type);
+ }
+
+ @Override
+ public void set(WrappedKey key, B value, WrapType type) {
+ container.set(key.getNamespacedKey(), value, type.syntaxType());
+ }
+
+ @Override
+ public boolean remove(String key) {
+ return false;
+ }
+
+ @Override
+ public boolean remove(WrappedKey key) {
+ return container.remove(key.getNamespacedKey());
+ }
+
+ @Override
+ public Set keySet() {
+ return container.getKeyspaces();
+ }
+
+ @Override
+ public boolean isEmpty() {
+ return container.isEmpty();
+ }
+
+ @Override
+ public int size() {
+ return container.size();
+ }
+
+}
\ No newline at end of file
diff --git a/vcompat-1_17_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_17_R1/data/BukkitContext1_17_R1.java b/vcompat-1_17_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_17_R1/data/BukkitContext1_17_R1.java
new file mode 100644
index 0000000..251e230
--- /dev/null
+++ b/vcompat-1_17_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_17_R1/data/BukkitContext1_17_R1.java
@@ -0,0 +1,38 @@
+package net.sourcewriters.minecraft.vcompat.provider.impl.v1_17_R1.data;
+
+import org.bukkit.persistence.PersistentDataAdapterContext;
+import org.bukkit.persistence.PersistentDataContainer;
+
+import net.sourcewriters.minecraft.vcompat.data.api.IDataAdapterContext;
+import net.sourcewriters.minecraft.vcompat.data.api.IDataContainer;
+import net.sourcewriters.minecraft.vcompat.provider.data.WrappedContext;
+
+public final class BukkitContext1_17_R1 extends WrappedContext implements PersistentDataAdapterContext {
+
+ private final IDataAdapterContext context;
+
+ public BukkitContext1_17_R1(IDataAdapterContext context) {
+ this.context = context;
+ }
+
+ @Override
+ public IDataAdapterContext getHandle() {
+ return context;
+ }
+
+ @Override
+ public PersistentDataContainer newPersistentDataContainer() {
+ return newWrapContainer();
+ }
+
+ @Override
+ public IDataContainer newContainer() {
+ return context.newContainer();
+ }
+
+ @Override
+ public BukkitContainer1_17_R1 newWrapContainer() {
+ return new BukkitContainer1_17_R1(context.newContainer());
+ }
+
+}
\ No newline at end of file
diff --git a/vcompat-1_17_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_17_R1/data/BukkitKey1_17_R1.java b/vcompat-1_17_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_17_R1/data/BukkitKey1_17_R1.java
new file mode 100644
index 0000000..d03318e
--- /dev/null
+++ b/vcompat-1_17_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_17_R1/data/BukkitKey1_17_R1.java
@@ -0,0 +1,52 @@
+package net.sourcewriters.minecraft.vcompat.provider.impl.v1_17_R1.data;
+
+import org.bukkit.NamespacedKey;
+import org.bukkit.plugin.Plugin;
+
+import net.sourcewriters.minecraft.vcompat.provider.data.WrappedKey;
+
+public final class BukkitKey1_17_R1 extends WrappedKey {
+
+ private final NamespacedKey key;
+
+ public BukkitKey1_17_R1(Plugin plugin, String key) {
+ this.key = new NamespacedKey(plugin, key);
+ }
+
+ @SuppressWarnings("deprecation")
+ public BukkitKey1_17_R1(String name, String key) {
+ this.key = new NamespacedKey(name, key);
+ }
+
+ public BukkitKey1_17_R1(NamespacedKey key) {
+ this.key = key;
+ }
+
+ @Override
+ public NamespacedKey getHandle() {
+ return key;
+ }
+
+ @Override
+ public String getName() {
+ return key.getNamespace();
+ }
+
+ @Override
+ public String getKey() {
+ return key.getKey();
+ }
+
+ @Override
+ public String toString() {
+ return key.toString();
+ }
+
+ public static NamespacedKey asBukkit(WrappedKey key) {
+ if (key.getHandle() instanceof NamespacedKey) {
+ return (NamespacedKey) key.getHandle();
+ }
+ return new BukkitKey1_17_R1(key.getName(), key.getKey()).getHandle();
+ }
+
+}
\ No newline at end of file
diff --git a/vcompat-1_17_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_17_R1/data/BukkitType1_17_R1.java b/vcompat-1_17_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_17_R1/data/BukkitType1_17_R1.java
new file mode 100644
index 0000000..045d9f0
--- /dev/null
+++ b/vcompat-1_17_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_17_R1/data/BukkitType1_17_R1.java
@@ -0,0 +1,68 @@
+package net.sourcewriters.minecraft.vcompat.provider.impl.v1_17_R1.data;
+
+import org.bukkit.persistence.PersistentDataAdapterContext;
+import org.bukkit.persistence.PersistentDataType;
+
+import net.sourcewriters.minecraft.vcompat.data.api.IDataType;
+import net.sourcewriters.minecraft.vcompat.provider.data.WrappedContext;
+
+public class BukkitType1_17_R1 extends WrappedType1_17_R1, P0, P1, C0, C1>
+ implements PersistentDataType {
+
+ private final IDataType type;
+
+ public BukkitType1_17_R1(IDataType type) {
+ super(type.getPrimitive(), type.getComplex());
+ this.type = type;
+ }
+
+ @Override
+ public IDataType getHandle() {
+ return type;
+ }
+
+ @Override
+ public Class getPrimitiveOriginal() {
+ return type.getPrimitive();
+ }
+
+ @Override
+ public Class getComplexOriginal() {
+ return type.getComplex();
+ }
+
+ /*
+ *
+ */
+
+ @Override
+ public Class getComplexType() {
+ return complexType;
+ }
+
+ @Override
+ public Class getPrimitiveType() {
+ return primitiveType;
+ }
+
+ @Override
+ public P0 toPrimitive(C0 complex, PersistentDataAdapterContext context) {
+ return wrapToPrimitive(complex, new SyntaxContext1_17_R1(context));
+ }
+
+ @Override
+ public C0 fromPrimitive(P0 primitive, PersistentDataAdapterContext context) {
+ return wrapToComplex(primitive, new SyntaxContext1_17_R1(context));
+ }
+
+ @Override
+ public P0 wrapToPrimitive(C0 complex, WrappedContext context) {
+ return toPrimitiveWrapped(type.toPrimitive(context, toComplexOriginal(complex)));
+ }
+
+ @Override
+ public C0 wrapToComplex(P0 primitive, WrappedContext context) {
+ return toComplexWrapped(type.fromPrimitive(context, toPrimitiveOriginal(primitive)));
+ }
+
+}
\ No newline at end of file
diff --git a/vcompat-1_17_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_17_R1/data/SimpleBukkitType1_17_R1.java b/vcompat-1_17_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_17_R1/data/SimpleBukkitType1_17_R1.java
new file mode 100644
index 0000000..dd3335b
--- /dev/null
+++ b/vcompat-1_17_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_17_R1/data/SimpleBukkitType1_17_R1.java
@@ -0,0 +1,36 @@
+package net.sourcewriters.minecraft.vcompat.provider.impl.v1_17_R1.data;
+
+import org.bukkit.persistence.PersistentDataAdapterContext;
+import org.bukkit.persistence.PersistentDataType;
+
+import net.sourcewriters.minecraft.vcompat.provider.data.WrapType;
+
+public class SimpleBukkitType1_17_R1 implements PersistentDataType {
+
+ private final WrapType type;
+
+ public SimpleBukkitType1_17_R1(WrapType type) {
+ this.type = type;
+ }
+
+ @Override
+ public Class getComplexType() {
+ return type.getComplexWrapped();
+ }
+
+ @Override
+ public Class getPrimitiveType() {
+ return type.getPrimitiveWrapped();
+ }
+
+ @Override
+ public P toPrimitive(C complex, PersistentDataAdapterContext context) {
+ return type.wrapToPrimitive(complex, new SyntaxContext1_17_R1(context));
+ }
+
+ @Override
+ public C fromPrimitive(P primitive, PersistentDataAdapterContext context) {
+ return type.wrapToComplex(primitive, new SyntaxContext1_17_R1(context));
+ }
+
+}
\ No newline at end of file
diff --git a/vcompat-1_17_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_17_R1/data/SyntaxContainer1_17_R1.java b/vcompat-1_17_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_17_R1/data/SyntaxContainer1_17_R1.java
new file mode 100644
index 0000000..30cece4
--- /dev/null
+++ b/vcompat-1_17_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_17_R1/data/SyntaxContainer1_17_R1.java
@@ -0,0 +1,191 @@
+package net.sourcewriters.minecraft.vcompat.provider.impl.v1_17_R1.data;
+
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import org.bukkit.persistence.PersistentDataContainer;
+
+import net.sourcewriters.minecraft.vcompat.VersionCompatProvider;
+import net.sourcewriters.minecraft.vcompat.data.api.IDataAdapterContext;
+import net.sourcewriters.minecraft.vcompat.data.api.IDataAdapterRegistry;
+import net.sourcewriters.minecraft.vcompat.data.api.IDataContainer;
+import net.sourcewriters.minecraft.vcompat.data.api.IDataType;
+import net.sourcewriters.minecraft.vcompat.provider.data.WrapType;
+import net.sourcewriters.minecraft.vcompat.provider.data.WrappedContainer;
+import net.sourcewriters.minecraft.vcompat.provider.data.WrappedKey;
+import net.sourcewriters.minecraft.vcompat.provider.data.wrap.SyntaxKey;
+import net.sourcewriters.minecraft.vcompat.shaded.syntaxapi.utils.key.IKey;
+
+public final class SyntaxContainer1_17_R1 extends WrappedContainer implements IDataContainer {
+
+ private final PersistentDataContainer container;
+
+ public SyntaxContainer1_17_R1(PersistentDataContainer container) {
+ this.container = container;
+ }
+
+ @Override
+ public PersistentDataContainer getHandle() {
+ return container;
+ }
+
+ @Override
+ public IDataContainer getAsSyntaxContainer() {
+ return new SyntaxContainer1_17_R1(container);
+ }
+
+ @Override
+ public IDataAdapterRegistry getRegistry() {
+ return VersionCompatProvider.get().getControl().getDataProvider().getRegistry();
+ }
+
+ /*
+ *
+ */
+
+ @Override
+ public boolean has(IKey key) {
+ throw new UnsupportedOperationException("Can't be used with PersistentDataContainer of Bukkit");
+ }
+
+ @Override
+ public boolean has(String key, IDataType type) {
+ return has(syntaxKey(key), type);
+ }
+
+ @Override
+ public boolean has(IKey key, IDataType type) {
+ return has(new SyntaxKey(key), WrappedType1_17_R1.wrap(type));
+ }
+
+ @Override
+ public C get(String key, IDataType type) {
+ return get(syntaxKey(key), type);
+ }
+
+ @Override
+ public C get(IKey key, IDataType type) {
+ return get(new SyntaxKey(key), WrappedType1_17_R1.wrap(type));
+ }
+
+ @Override
+ public Object get(String key) {
+ throw new UnsupportedOperationException("Can't be used with PersistentDataContainer of Bukkit");
+ }
+
+ @Override
+ public Object get(IKey key) {
+ throw new UnsupportedOperationException("Can't be used with PersistentDataContainer of Bukkit");
+ }
+
+ @Override
+ public void set(String key, E value, IDataType type) {
+ set(wrappedKey(key), value, WrappedType1_17_R1.wrap(type));
+ }
+
+ @Override
+ public void set(IKey key, E value, IDataType type) {
+ set(new SyntaxKey(key), value, WrappedType1_17_R1.wrap(type));
+ }
+
+ @Override
+ public boolean remove(String key) {
+ return remove(wrappedKey(key));
+ }
+
+ @Override
+ public boolean remove(IKey key) {
+ return remove(new SyntaxKey(key));
+ }
+
+ @Override
+ public IKey[] getKeys() {
+ return container.getKeys().stream().map(BukkitKey1_17_R1::new).map(WrappedKey::getNamespacedKey).toArray(IKey[]::new);
+ }
+
+ @Override
+ public Set getKeyspaces() {
+ return container.getKeys().stream().map(org.bukkit.NamespacedKey::toString).collect(Collectors.toSet());
+ }
+
+ @Override
+ public IDataAdapterContext getContext() {
+ return getWrapContext();
+ }
+
+ /*
+ *
+ */
+
+ @Override
+ public SyntaxContext1_17_R1 getWrapContext() {
+ return new SyntaxContext1_17_R1(container.getAdapterContext());
+ }
+
+ @Override
+ public boolean has(String key) {
+ throw new UnsupportedOperationException("Can't be used with PersistentDataContainer of Bukkit");
+ }
+
+ @Override
+ public boolean has(WrappedKey key) {
+ throw new UnsupportedOperationException("Can't be used with PersistentDataContainer of Bukkit");
+ }
+
+ @Override
+ public boolean has(String key, WrapType type) {
+ return has(wrappedKey(key), type);
+ }
+
+ @Override
+ public boolean has(WrappedKey key, WrapType type) {
+ return container.has(BukkitKey1_17_R1.asBukkit(key), new SimpleBukkitType1_17_R1<>(type));
+ }
+
+ @Override
+ public Object get(WrappedKey key) {
+ throw new UnsupportedOperationException("Can't be used with PersistentDataContainer of Bukkit");
+ }
+
+ @Override
+ public C get(String key, WrapType type) {
+ return get(wrappedKey(key), type);
+ }
+
+ @Override
+ public C get(WrappedKey key, WrapType type) {
+ return container.get(BukkitKey1_17_R1.asBukkit(key), new SimpleBukkitType1_17_R1<>(type));
+ }
+
+ @Override
+ public void set(String key, B value, WrapType type) {
+ set(wrappedKey(key), value, type);
+ }
+
+ @Override
+ public void set(WrappedKey key, B value, WrapType type) {
+ container.set(BukkitKey1_17_R1.asBukkit(key), new SimpleBukkitType1_17_R1<>(type), value);
+ }
+
+ @Override
+ public boolean remove(WrappedKey key) {
+ container.remove(BukkitKey1_17_R1.asBukkit(key));
+ return true; // Will always return true as we don't know if it contained it
+ }
+
+ @Override
+ public Set keySet() {
+ return getKeyspaces();
+ }
+
+ @Override
+ public boolean isEmpty() {
+ return container.isEmpty();
+ }
+
+ @Override
+ public int size() {
+ return container.getKeys().size();
+ }
+
+}
\ No newline at end of file
diff --git a/vcompat-1_17_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_17_R1/data/SyntaxContext1_17_R1.java b/vcompat-1_17_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_17_R1/data/SyntaxContext1_17_R1.java
new file mode 100644
index 0000000..b2a7c61
--- /dev/null
+++ b/vcompat-1_17_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_17_R1/data/SyntaxContext1_17_R1.java
@@ -0,0 +1,37 @@
+package net.sourcewriters.minecraft.vcompat.provider.impl.v1_17_R1.data;
+
+import org.bukkit.persistence.PersistentDataAdapterContext;
+import org.bukkit.persistence.PersistentDataContainer;
+
+import net.sourcewriters.minecraft.vcompat.data.api.IDataContainer;
+import net.sourcewriters.minecraft.vcompat.provider.data.WrappedContext;
+
+public final class SyntaxContext1_17_R1 extends WrappedContext implements PersistentDataAdapterContext {
+
+ private final PersistentDataAdapterContext context;
+
+ public SyntaxContext1_17_R1(PersistentDataAdapterContext context) {
+ this.context = context;
+ }
+
+ @Override
+ public PersistentDataAdapterContext getHandle() {
+ return context;
+ }
+
+ @Override
+ public PersistentDataContainer newPersistentDataContainer() {
+ return context.newPersistentDataContainer();
+ }
+
+ @Override
+ public IDataContainer newContainer() {
+ return newWrapContainer();
+ }
+
+ @Override
+ public SyntaxContainer1_17_R1 newWrapContainer() {
+ return new SyntaxContainer1_17_R1(context.newPersistentDataContainer());
+ }
+
+}
\ No newline at end of file
diff --git a/vcompat-1_17_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_17_R1/data/SyntaxType1_17_R1.java b/vcompat-1_17_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_17_R1/data/SyntaxType1_17_R1.java
new file mode 100644
index 0000000..32be70a
--- /dev/null
+++ b/vcompat-1_17_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_17_R1/data/SyntaxType1_17_R1.java
@@ -0,0 +1,75 @@
+package net.sourcewriters.minecraft.vcompat.provider.impl.v1_17_R1.data;
+
+import org.bukkit.persistence.PersistentDataAdapterContext;
+import org.bukkit.persistence.PersistentDataType;
+
+import net.sourcewriters.minecraft.vcompat.data.api.IDataAdapterContext;
+import net.sourcewriters.minecraft.vcompat.data.api.IDataType;
+import net.sourcewriters.minecraft.vcompat.provider.data.WrappedContext;
+
+public class SyntaxType1_17_R1 extends WrappedType1_17_R1, P0, P1, C0, C1>
+ implements IDataType {
+
+ private final PersistentDataType type;
+
+ public SyntaxType1_17_R1(PersistentDataType type) {
+ super(type.getPrimitiveType(), type.getComplexType());
+ this.type = type;
+ }
+
+ @Override
+ public PersistentDataType getHandle() {
+ return type;
+ }
+
+ @Override
+ public Class getPrimitiveOriginal() {
+ return type.getPrimitiveType();
+ }
+
+ @Override
+ public Class getComplexOriginal() {
+ return type.getComplexType();
+ }
+
+ /*
+ *
+ */
+
+ @Override
+ public Class getComplex() {
+ return complexType;
+ }
+
+ @Override
+ public Class getPrimitive() {
+ return primitiveType;
+ }
+
+ @Override
+ public P0 toPrimitive(IDataAdapterContext context, C0 complex) {
+ return wrapToPrimitive(complex, new BukkitContext1_17_R1(context));
+ }
+
+ @Override
+ public C0 fromPrimitive(IDataAdapterContext context, P0 primitive) {
+ return wrapToComplex(primitive, new BukkitContext1_17_R1(context));
+ }
+
+ @Override
+ public P0 wrapToPrimitive(C0 complex, WrappedContext context) {
+ if (!(context instanceof PersistentDataAdapterContext)) {
+ return null;
+ }
+ return toPrimitiveWrapped(type.toPrimitive(toComplexOriginal(complex), (PersistentDataAdapterContext) context));
+ }
+
+ @Override
+ public C0 wrapToComplex(P0 primitive, WrappedContext context) {
+ if (!(context instanceof PersistentDataAdapterContext)) {
+ return null;
+ }
+ return toComplexWrapped(type.fromPrimitive(toPrimitiveOriginal(primitive), (PersistentDataAdapterContext) context));
+ }
+
+}
\ No newline at end of file
diff --git a/vcompat-1_17_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_17_R1/data/WrappedType1_17_R1.java b/vcompat-1_17_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_17_R1/data/WrappedType1_17_R1.java
new file mode 100644
index 0000000..9870087
--- /dev/null
+++ b/vcompat-1_17_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_17_R1/data/WrappedType1_17_R1.java
@@ -0,0 +1,149 @@
+package net.sourcewriters.minecraft.vcompat.provider.impl.v1_17_R1.data;
+
+import java.util.Arrays;
+
+import org.bukkit.persistence.PersistentDataContainer;
+import org.bukkit.persistence.PersistentDataType;
+
+import net.sourcewriters.minecraft.vcompat.data.api.IDataContainer;
+import net.sourcewriters.minecraft.vcompat.data.api.IDataType;
+import net.sourcewriters.minecraft.vcompat.provider.data.WrapType;
+
+public abstract class WrappedType1_17_R1 implements WrapType {
+
+ protected final Class primitiveType;
+ protected final Class complexType;
+
+ private final int primitiveWrap;
+ private final int complexWrap;
+
+ @SuppressWarnings("unchecked")
+ protected WrappedType1_17_R1(Class primitive, Class complex) {
+ this.primitiveWrap = WrappedType1_17_R1.internalState(primitive);
+ this.complexWrap = WrappedType1_17_R1.internalState(complex);
+ this.primitiveType = (Class) WrappedType1_17_R1.internalWrap(primitive, primitiveWrap);
+ this.complexType = (Class) WrappedType1_17_R1.internalWrap(complex, complexWrap);
+ }
+
+ public abstract H getHandle();
+
+ public Class getPrimitiveWrapped() {
+ return primitiveType;
+ }
+
+ public Class getComplexWrapped() {
+ return complexType;
+ }
+
+ public abstract Class getPrimitiveOriginal();
+
+ public abstract Class getComplexOriginal();
+
+ @SuppressWarnings("unchecked")
+ public P0 toPrimitiveWrapped(P1 primitive) {
+ switch (primitiveWrap) {
+ case 1:
+ return (P0) new SyntaxContainer1_17_R1((PersistentDataContainer) primitive);
+ case 2:
+ return (P0) Arrays.stream((PersistentDataContainer[]) primitive).map(SyntaxContainer1_17_R1::new)
+ .toArray(SyntaxContainer1_17_R1[]::new);
+ case 3:
+ return (P0) new BukkitContainer1_17_R1((IDataContainer) primitive);
+ case 4:
+ return (P0) Arrays.stream((IDataContainer[]) primitive).map(BukkitContainer1_17_R1::new)
+ .toArray(BukkitContainer1_17_R1[]::new);
+ default:
+ return (P0) primitive;
+ }
+ }
+
+ @SuppressWarnings("unchecked")
+ public C0 toComplexWrapped(C1 complex) {
+ switch (complexWrap) {
+ case 1:
+ return (C0) new SyntaxContainer1_17_R1((PersistentDataContainer) complex);
+ case 2:
+ return (C0) Arrays.stream((PersistentDataContainer[]) complex).map(SyntaxContainer1_17_R1::new).toArray(SyntaxContainer1_17_R1[]::new);
+ case 3:
+ return (C0) new BukkitContainer1_17_R1((IDataContainer) complex);
+ case 4:
+ return (C0) Arrays.stream((IDataContainer[]) complex).map(BukkitContainer1_17_R1::new).toArray(BukkitContainer1_17_R1[]::new);
+ default:
+ return (C0) complex;
+ }
+ }
+
+ @SuppressWarnings("unchecked")
+ public P1 toPrimitiveOriginal(P0 primitive) {
+ switch (primitiveWrap) {
+ case 1:
+ return (P1) new BukkitContainer1_17_R1((IDataContainer) primitive);
+ case 2:
+ return (P1) Arrays.stream((IDataContainer[]) primitive).map(BukkitContainer1_17_R1::new)
+ .toArray(BukkitContainer1_17_R1[]::new);
+ case 3:
+ return (P1) new SyntaxContainer1_17_R1((PersistentDataContainer) primitive);
+ case 4:
+ return (P1) Arrays.stream((PersistentDataContainer[]) primitive).map(SyntaxContainer1_17_R1::new)
+ .toArray(SyntaxContainer1_17_R1[]::new);
+ default:
+ return (P1) primitive;
+ }
+ }
+
+ @SuppressWarnings("unchecked")
+ public C1 toComplexOriginal(C0 complex) {
+ switch (complexWrap) {
+ case 1:
+ return (C1) new BukkitContainer1_17_R1((IDataContainer) complex);
+ case 2:
+ return (C1) Arrays.stream((IDataContainer[]) complex).map(BukkitContainer1_17_R1::new).toArray(BukkitContainer1_17_R1[]::new);
+ case 3:
+ return (C1) new SyntaxContainer1_17_R1((PersistentDataContainer) complex);
+ case 4:
+ return (C1) Arrays.stream((PersistentDataContainer[]) complex).map(SyntaxContainer1_17_R1::new).toArray(SyntaxContainer1_17_R1[]::new);
+ default:
+ return (C1) complex;
+ }
+ }
+
+ protected static Class internalWrap(Class clazz, int state) {
+ switch (state) {
+ case 1:
+ return SyntaxContainer1_17_R1.class;
+ case 2:
+ return SyntaxContainer1_17_R1[].class;
+ case 3:
+ return BukkitContainer1_17_R1.class;
+ case 4:
+ return BukkitContainer1_17_R1[].class;
+ default:
+ return clazz;
+ }
+ }
+
+ protected static int internalState(Class clazz) {
+ if (clazz.isAssignableFrom(PersistentDataContainer.class)) {
+ return 1;
+ }
+ if (clazz.isAssignableFrom(PersistentDataContainer[].class)) {
+ return 2;
+ }
+ if (clazz.isAssignableFrom(IDataContainer.class)) {
+ return 3;
+ }
+ if (clazz.isAssignableFrom(IDataContainer[].class)) {
+ return 4;
+ }
+ return 0;
+ }
+
+ public static BukkitType1_17_R1 wrap(IDataType type) {
+ return new BukkitType1_17_R1<>(type);
+ }
+
+ public static SyntaxType1_17_R1 wrap(PersistentDataType type) {
+ return new SyntaxType1_17_R1<>(type);
+ }
+
+}
\ No newline at end of file
diff --git a/vcompat-1_17_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_17_R1/data/hook/BukkitContainerAdapterHook1_17_R1.java b/vcompat-1_17_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_17_R1/data/hook/BukkitContainerAdapterHook1_17_R1.java
new file mode 100644
index 0000000..28d86a3
--- /dev/null
+++ b/vcompat-1_17_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_17_R1/data/hook/BukkitContainerAdapterHook1_17_R1.java
@@ -0,0 +1,133 @@
+package net.sourcewriters.minecraft.vcompat.provider.impl.v1_17_R1.data.hook;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+import java.util.function.Function;
+
+import org.bukkit.craftbukkit.v1_17_R1.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_17_R1.persistence.CraftPersistentDataContainer;
+import org.bukkit.craftbukkit.v1_17_R1.persistence.CraftPersistentDataTypeRegistry;
+import org.bukkit.persistence.PersistentDataContainer;
+
+import net.minecraft.nbt.CompoundTag;
+import net.sourcewriters.minecraft.vcompat.VersionCompatProvider;
+import net.sourcewriters.minecraft.vcompat.data.api.IDataContainer;
+import net.sourcewriters.minecraft.vcompat.data.nbt.NbtContainer;
+import net.sourcewriters.minecraft.vcompat.provider.VersionControl;
+import net.sourcewriters.minecraft.vcompat.provider.data.WrappedContainer;
+import net.sourcewriters.minecraft.vcompat.provider.impl.v1_17_R1.data.BukkitContainer1_17_R1;
+import net.sourcewriters.minecraft.vcompat.provider.impl.v1_17_R1.data.SyntaxContainer1_17_R1;
+import net.sourcewriters.minecraft.vcompat.provider.lookup.handle.ClassLookup;
+import net.sourcewriters.minecraft.vcompat.shaded.syntaxapi.nbt.NbtCompound;
+
+@SuppressWarnings({
+ "rawtypes",
+ "unchecked"
+})
+public final class BukkitContainerAdapterHook1_17_R1 {
+
+ private static final BukkitContainerAdapterHook1_17_R1 HOOK = new BukkitContainerAdapterHook1_17_R1();
+
+ private final ClassLookup registryRef = ClassLookup.of(CraftPersistentDataTypeRegistry.class)
+ .searchMethod("create", "createAdapter", Class.class, Class.class, Function.class, Function.class)
+ .searchField("adapters", "adapters")
+ .searchField("function", "CREATE_ADAPTER");
+ private final ClassLookup entityRef = ClassLookup.of(CraftEntity.class).searchField("registry", "DATA_TYPE_REGISTRY");
+
+ private BukkitContainerAdapterHook1_17_R1() {}
+
+ private final HashMap map = new HashMap<>();
+
+ private CraftPersistentDataTypeRegistry getEntityRegistry() {
+ return (CraftPersistentDataTypeRegistry) entityRef.getFieldValue("registry");
+ }
+
+ private void uninjectAll() {
+ for (CraftPersistentDataTypeRegistry registry : map.keySet()) {
+ Map adapters = (Map) registryRef.getFieldValue(registry, "adapters");
+ adapters.remove(BukkitContainer1_17_R1.class);
+ adapters.remove(SyntaxContainer1_17_R1.class);
+ registryRef.setFieldValue(registry, "function", map.get(registry));
+ }
+ map.clear();
+ }
+
+ private void inject(CraftPersistentDataTypeRegistry registry) {
+ if (map.containsKey(registry)) {
+ return;
+ }
+ map.put(registry, (Function) registryRef.getFieldValue(registry, "function"));
+ Function function = clazz -> createAdapter(registry, registryRef.getMethod("create").type().returnType(), (Class) clazz);
+ registryRef.setFieldValue(registry, "function", function);
+ }
+
+ private E createAdapter(CraftPersistentDataTypeRegistry registry, Class adapterType, Class type) {
+ if (Objects.equals(BukkitContainer1_17_R1.class, type)) {
+ return (E) buildAdapter(registry, BukkitContainer1_17_R1.class, tag -> fromPrimitiveSyntax(tag));
+ }
+ if (Objects.equals(SyntaxContainer1_17_R1.class, type)) {
+ return (E) buildAdapter(registry, SyntaxContainer1_17_R1.class, tag -> fromPrimitiveBukkit(registry, tag));
+ }
+ return (E) map.get(registry).apply(type);
+ }
+
+ private Object buildAdapter(Object handle, Class type, Function function) {
+ return registryRef.run(handle, "create", type, CompoundTag.class, (Function) input -> toPrimitive(input),
+ function);
+ }
+
+ private CompoundTag toPrimitive(WrappedContainer input) {
+ Object handle = findFinalContainer(input).getHandle();
+ if (handle instanceof PersistentDataContainer) {
+ if (handle instanceof CraftPersistentDataContainer) {
+ return ((CraftPersistentDataContainer) handle).toTagCompound();
+ }
+ throw new IllegalArgumentException(
+ "Expected 'CraftPersistentDataContainer' got '" + handle.getClass().getSimpleName() + " instead'!");
+ }
+ if (handle instanceof IDataContainer) {
+ if (handle instanceof NbtContainer) {
+ return (CompoundTag) VersionCompatProvider.get().getControl().getBukkitConversion().toMinecraftCompound(((NbtContainer) handle).asNbt());
+ }
+ throw new IllegalArgumentException(
+ "Expected 'CraftPersistentDataContainer' got '" + handle.getClass().getSimpleName() + " instead'!");
+ }
+ throw new IllegalArgumentException("Unknown WrappedContainer implementation!");
+ }
+
+ private BukkitContainer1_17_R1 fromPrimitiveSyntax(CompoundTag data) {
+ VersionControl control = VersionCompatProvider.get().getControl();
+ NbtContainer container = new NbtContainer(control.getDataProvider().getRegistry());
+ NbtCompound compound = control.getBukkitConversion().fromMinecraftCompound(data);
+ container.fromNbt(compound);
+ return new BukkitContainer1_17_R1(container);
+ }
+
+ private SyntaxContainer1_17_R1 fromPrimitiveBukkit(CraftPersistentDataTypeRegistry registry, CompoundTag data) {
+ CraftPersistentDataContainer container = new CraftPersistentDataContainer(registry);
+ container.putAll(data);
+ return new SyntaxContainer1_17_R1(container);
+ }
+
+ private WrappedContainer findFinalContainer(WrappedContainer container) {
+ WrappedContainer output = container;
+ while (output.getHandle() instanceof WrappedContainer) {
+ output = (WrappedContainer) output.getHandle();
+ }
+ return output;
+ }
+
+ public static void unhookAll() {
+ HOOK.uninjectAll();
+ }
+
+ public static void hookEntity() {
+ HOOK.inject(HOOK.getEntityRegistry());
+ }
+
+ public static void hook(CraftPersistentDataTypeRegistry registry) {
+ HOOK.inject(registry);
+ }
+
+}
diff --git a/vcompat-1_17_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_17_R1/entity/ArmorStand1_17_R1.java b/vcompat-1_17_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_17_R1/entity/ArmorStand1_17_R1.java
new file mode 100644
index 0000000..347a35a
--- /dev/null
+++ b/vcompat-1_17_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_17_R1/entity/ArmorStand1_17_R1.java
@@ -0,0 +1,24 @@
+package net.sourcewriters.minecraft.vcompat.provider.impl.v1_17_R1.entity;
+
+import net.minecraft.world.entity.EntityType;
+import net.minecraft.world.entity.decoration.ArmorStand;
+import net.minecraft.world.level.Level;
+import net.sourcewriters.minecraft.vcompat.provider.entity.NmsArmorStand;
+
+public class ArmorStand1_17_R1 extends EntityLiving1_17_R1 implements NmsArmorStand {
+
+ public ArmorStand1_17_R1(Level world) {
+ super(new ArmorStand(EntityType.ARMOR_STAND, world));
+ }
+
+ @Override
+ public void setSmall(boolean small) {
+ handle.setSmall(small);
+ }
+
+ @Override
+ public boolean isSmall() {
+ return handle.isSmall();
+ }
+
+}
\ No newline at end of file
diff --git a/vcompat-1_17_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_17_R1/entity/Entity1_17_R1.java b/vcompat-1_17_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_17_R1/entity/Entity1_17_R1.java
new file mode 100644
index 0000000..b919a15
--- /dev/null
+++ b/vcompat-1_17_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_17_R1/entity/Entity1_17_R1.java
@@ -0,0 +1,215 @@
+package net.sourcewriters.minecraft.vcompat.provider.impl.v1_17_R1.entity;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.UUID;
+
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.OfflinePlayer;
+import org.bukkit.craftbukkit.v1_17_R1.CraftWorld;
+import org.bukkit.craftbukkit.v1_17_R1.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_17_R1.util.CraftChatMessage;
+import org.bukkit.entity.Player;
+
+import net.minecraft.network.protocol.game.ClientboundAddEntityPacket;
+import net.minecraft.network.protocol.game.ClientboundRemoveEntitiesPacket;
+import net.minecraft.network.protocol.game.ClientboundSetEntityDataPacket;
+import net.minecraft.server.network.ServerGamePacketListenerImpl;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.phys.AABB;
+import net.minecraft.world.phys.Vec3;
+import net.sourcewriters.minecraft.vcompat.provider.entity.NmsEntity;
+import net.sourcewriters.minecraft.vcompat.provider.utils.NmsBoundingBox;
+
+public abstract class Entity1_17_R1 implements NmsEntity {
+
+ protected final E handle;
+
+ protected final List visible = Collections.synchronizedList(new ArrayList<>());
+
+ public Entity1_17_R1(E handle) {
+ this.handle = handle;
+ }
+
+ @Override
+ public final E getHandle() {
+ return handle;
+ }
+
+ @Override
+ public int getId() {
+ return handle.getId();
+ }
+
+ @Override
+ public UUID getUniqueId() {
+ return handle.getUUID();
+ }
+
+ @Override
+ public NmsBoundingBox getBoundingBox() {
+ AABB box = handle.getBoundingBox();
+ return new NmsBoundingBox(box.minX, box.minY, box.minZ, box.maxX, box.maxY, box.maxZ);
+ }
+
+ @Override
+ public void setCustomName(String name) {
+ handle.setCustomName(CraftChatMessage.fromStringOrNull(name));
+ updateVisibility();
+ }
+
+ @Override
+ public String getCustomName() {
+ return CraftChatMessage.fromComponent(handle.getCustomName());
+ }
+
+ @Override
+ public void setGravity(boolean gravity) {
+ handle.setNoGravity(!gravity);
+ }
+
+ @Override
+ public boolean hasGravity() {
+ return !handle.isNoGravity();
+ }
+
+ @Override
+ public void setCustomNameVisible(boolean visible) {
+ handle.setCustomNameVisible(visible);
+ }
+
+ @Override
+ public boolean isCustomNameVisible() {
+ return handle.isCustomNameVisible();
+ }
+
+ @Override
+ public void setInvisible(boolean invisible) {
+ handle.setInvisible(invisible);
+ }
+
+ @Override
+ public boolean isInvisible() {
+ return handle.isInvisible();
+ }
+
+ @Override
+ public boolean isInteractable() {
+ return handle.isPushable();
+ }
+
+ @Override
+ public boolean isCollidable() {
+ return handle.canBeCollidedWith();
+ }
+
+ @Override
+ public void setInvulnerable(boolean invulnerable) {
+ handle.setInvulnerable(invulnerable);
+ }
+
+ @Override
+ public boolean isInvulnerable() {
+ return handle.isInvulnerable();
+ }
+
+ @Override
+ public void setLocation(Location location) {
+ handle.moveTo(location.getX(), location.getY(), location.getZ(), location.getYaw(), location.getPitch());
+ if (location.getWorld() == null || handle.getCommandSenderWorld().getWorld() == location.getWorld()) {
+ updateVisibility();
+ return;
+ }
+ handle.level = ((CraftWorld) location.getWorld()).getHandle();
+ updateVisibility();
+ }
+
+ @Override
+ public Location getLocation() {
+ Vec3 vector = handle.position();
+ return new Location(handle.getCommandSenderWorld().getWorld(), vector.x, vector.y, vector.z);
+ }
+
+ @Override
+ public void updateVisibility() {
+ if (visible.isEmpty()) {
+ return;
+ }
+ Player[] players;
+ synchronized (visible) {
+ players = visible.stream().map(Bukkit::getOfflinePlayer).filter(OfflinePlayer::isOnline).map(OfflinePlayer::getPlayer)
+ .toArray(Player[]::new);
+ }
+ hide(players);
+ show(players);
+ }
+
+ @Override
+ public boolean isShown(Player player) {
+ synchronized (visible) {
+ return visible.contains(player.getUniqueId());
+ }
+ }
+
+ @Override
+ public void hide(Player... players) {
+ if (players.length == 0) {
+ return;
+ }
+ ClientboundRemoveEntitiesPacket packet = new ClientboundRemoveEntitiesPacket(handle.getId());
+ for (Player player : players) {
+ if (!isShown(player)) {
+ continue;
+ }
+ ((CraftPlayer) player).getHandle().connection.send(packet);
+ synchronized (visible) {
+ visible.remove(player.getUniqueId());
+ }
+ }
+ }
+
+ @Override
+ public void show(Player... players) {
+ if (players.length == 0) {
+ return;
+ }
+ ClientboundAddEntityPacket packet = new ClientboundAddEntityPacket(handle);
+ ClientboundSetEntityDataPacket metadataPacket = new ClientboundSetEntityDataPacket(handle.getId(), handle.getEntityData(), true);
+ ServerGamePacketListenerImpl connection;
+ for (Player player : players) {
+ if (isShown(player)) {
+ continue;
+ }
+ connection = ((CraftPlayer) player).getHandle().connection;
+ connection.send(packet);
+ connection.send(metadataPacket);
+ synchronized (visible) {
+ visible.add(player.getUniqueId());
+ }
+ }
+ }
+
+ @Override
+ public UUID[] getVisible() {
+ synchronized (visible) {
+ return visible.toArray(new UUID[0]);
+ }
+ }
+
+ @Override
+ public Player[] getVisibleAsPlayer() {
+ synchronized (visible) {
+ return visible.stream().map(Bukkit::getOfflinePlayer).filter(OfflinePlayer::isOnline).map(OfflinePlayer::getPlayer)
+ .toArray(Player[]::new);
+ }
+ }
+
+ @Override
+ public void kill() {
+ hide(getVisibleAsPlayer());
+ handle.kill();
+ }
+
+}
\ No newline at end of file
diff --git a/vcompat-1_17_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_17_R1/entity/EntityLiving1_17_R1.java b/vcompat-1_17_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_17_R1/entity/EntityLiving1_17_R1.java
new file mode 100644
index 0000000..0c502ff
--- /dev/null
+++ b/vcompat-1_17_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_17_R1/entity/EntityLiving1_17_R1.java
@@ -0,0 +1,17 @@
+package net.sourcewriters.minecraft.vcompat.provider.impl.v1_17_R1.entity;
+
+import net.minecraft.world.entity.LivingEntity;
+import net.sourcewriters.minecraft.vcompat.provider.entity.NmsEntityLiving;
+
+public abstract class EntityLiving1_17_R1 extends Entity1_17_R1 implements NmsEntityLiving {
+
+ public EntityLiving1_17_R1(E handle) {
+ super(handle);
+ }
+
+ @Override
+ public void setCollidable(boolean collidable) {
+ handle.collides = collidable;
+ }
+
+}
\ No newline at end of file
diff --git a/vcompat-1_17_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_17_R1/entity/Player1_17_R1.java b/vcompat-1_17_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_17_R1/entity/Player1_17_R1.java
new file mode 100644
index 0000000..1145314
--- /dev/null
+++ b/vcompat-1_17_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_17_R1/entity/Player1_17_R1.java
@@ -0,0 +1,293 @@
+package net.sourcewriters.minecraft.vcompat.provider.impl.v1_17_R1.entity;
+
+import java.util.ArrayList;
+import java.util.Collections;
+
+import org.bukkit.craftbukkit.v1_17_R1.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_17_R1.util.CraftChatMessage;
+import org.bukkit.entity.Player;
+
+import com.mojang.authlib.GameProfile;
+import com.mojang.authlib.properties.Property;
+import com.mojang.authlib.properties.PropertyMap;
+import com.mojang.datafixers.util.Pair;
+
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.protocol.game.ClientboundAddPlayerPacket;
+import net.minecraft.network.protocol.game.ClientboundEntityEventPacket;
+import net.minecraft.network.protocol.game.ClientboundPlayerInfoPacket;
+import net.minecraft.network.protocol.game.ClientboundPlayerPositionPacket;
+import net.minecraft.network.protocol.game.ClientboundRemoveEntitiesPacket;
+import net.minecraft.network.protocol.game.ClientboundRespawnPacket;
+import net.minecraft.network.protocol.game.ClientboundRotateHeadPacket;
+import net.minecraft.network.protocol.game.ClientboundSetActionBarTextPacket;
+import net.minecraft.network.protocol.game.ClientboundSetCarriedItemPacket;
+import net.minecraft.network.protocol.game.ClientboundSetEntityDataPacket;
+import net.minecraft.network.protocol.game.ClientboundSetEquipmentPacket;
+import net.minecraft.network.protocol.game.ClientboundSetSubtitleTextPacket;
+import net.minecraft.network.protocol.game.ClientboundSetTitleTextPacket;
+import net.minecraft.network.protocol.game.ClientboundSetTitlesAnimationPacket;
+import net.minecraft.network.protocol.game.ClientboundTabListPacket;
+import net.minecraft.network.protocol.game.ServerboundClientCommandPacket;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.server.network.ServerGamePacketListenerImpl;
+import net.minecraft.util.Mth;
+import net.minecraft.world.entity.EquipmentSlot;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.level.biome.BiomeManager;
+import net.sourcewriters.minecraft.vcompat.VersionCompatProvider;
+import net.sourcewriters.minecraft.vcompat.provider.data.WrapType;
+import net.sourcewriters.minecraft.vcompat.provider.data.WrappedContainer;
+import net.sourcewriters.minecraft.vcompat.provider.data.type.SkinDataType;
+import net.sourcewriters.minecraft.vcompat.provider.entity.NmsPlayer;
+import net.sourcewriters.minecraft.vcompat.provider.impl.v1_17_R1.data.SyntaxContainer1_17_R1;
+import net.sourcewriters.minecraft.vcompat.util.bukkit.Players;
+import net.sourcewriters.minecraft.vcompat.util.minecraft.MojangProfileServer;
+import net.sourcewriters.minecraft.vcompat.util.minecraft.Skin;
+import net.sourcewriters.minecraft.vcompat.util.thread.PostAsync;
+
+public class Player1_17_R1 extends EntityLiving1_17_R1 implements NmsPlayer {
+
+ private String realName;
+ private Skin realSkin;
+
+ private final WrappedContainer dataAdapter;
+
+ public Player1_17_R1(Player player) {
+ super(((CraftPlayer) player).getHandle());
+ dataAdapter = new SyntaxContainer1_17_R1(getBukkitPlayer().getPersistentDataContainer());
+ update(false);
+ }
+
+ @Override
+ public CraftPlayer getBukkitPlayer() {
+ return handle.getBukkitEntity();
+ }
+
+ @Override
+ public WrappedContainer getDataAdapter() {
+ return dataAdapter;
+ }
+
+ @Override
+ public void setSkin(Skin skin) {
+ if (skin == null) {
+ return;
+ }
+ dataAdapter.set("skin", skin, SkinDataType.WRAPPED_INSTANCE);
+ }
+
+ @Override
+ public Skin getSkin() {
+ return dataAdapter.getOrDefault("skin", SkinDataType.WRAPPED_INSTANCE, realSkin);
+ }
+
+ @Override
+ public Skin getRealSkin() {
+ return realSkin;
+ }
+
+ @Override
+ public void setName(String name) {
+ if (getName().equals(name)) {
+ return;
+ }
+ if (name == null) {
+ dataAdapter.remove("name");
+ return;
+ }
+ dataAdapter.set("name", name, WrapType.STRING);
+ }
+
+ @Override
+ public String getName() {
+ return dataAdapter.getOrDefault("name", WrapType.STRING, realName);
+ }
+
+ @Override
+ public String getRealName() {
+ return realName;
+ }
+
+ @Override
+ public void setPlayerListHeader(String text) {
+ setPlayerListHeaderAndFooter(text, getPlayerListFooter());
+ }
+
+ @Override
+ public String getPlayerListHeader() {
+ return dataAdapter.getOrDefault("header", WrapType.STRING, "");
+ }
+
+ @Override
+ public void setPlayerListFooter(String text) {
+ setPlayerListHeaderAndFooter(getPlayerListHeader(), text);
+ }
+
+ @Override
+ public String getPlayerListFooter() {
+ return dataAdapter.getOrDefault("footer", WrapType.STRING, "");
+ }
+
+ @Override
+ public int getPing() {
+ return handle.latency;
+ }
+
+ @Override
+ public void setPlayerListHeaderAndFooter(String header, String footer) {
+ dataAdapter.set("header", header, WrapType.STRING);
+ dataAdapter.set("footer", footer, WrapType.STRING);
+ sendPlayerListInfo(header, footer);
+ }
+
+ private final void sendPlayerListInfo(String header, String footer) {
+ if (handle.hasDisconnected()) {
+ return;
+ }
+
+ Component headerComponent = header.isEmpty() ? null : CraftChatMessage.fromStringOrNull(header, true);
+ Component footerComponent = footer.isEmpty() ? null : CraftChatMessage.fromStringOrNull(footer, true);
+
+ handle.connection.send(new ClientboundTabListPacket(headerComponent, footerComponent));
+ }
+
+ @Override
+ public void setTitleTimes(int fadeIn, int stay, int fadeOut) {
+ if (handle.hasDisconnected()) {
+ return;
+ }
+ handle.connection.send(new ClientboundSetTitlesAnimationPacket(fadeIn, stay, fadeOut));
+ }
+
+ @Override
+ public void sendSubtitle(String text) {
+ if (handle.hasDisconnected()) {
+ return;
+ }
+ handle.connection.send(new ClientboundSetSubtitleTextPacket(CraftChatMessage.fromStringOrNull(text)));
+ }
+
+ @Override
+ public void sendTitle(String text) {
+ if (handle.hasDisconnected()) {
+ return;
+ }
+ handle.connection.send(new ClientboundSetTitleTextPacket(CraftChatMessage.fromStringOrNull(text)));
+ }
+
+ @Override
+ public void sendActionBar(String text) {
+ if (handle.hasDisconnected()) {
+ return;
+ }
+ handle.connection.send(new ClientboundSetActionBarTextPacket(CraftChatMessage.fromStringOrNull(text)));
+ }
+
+ @Override
+ public void fakeRespawn() {
+ if (handle.hasDisconnected()) {
+ return;
+ }
+ ClientboundPlayerInfoPacket remInfoPacket = new ClientboundPlayerInfoPacket(ClientboundPlayerInfoPacket.Action.REMOVE_PLAYER,
+ handle);
+ ClientboundPlayerInfoPacket addInfoPacket = new ClientboundPlayerInfoPacket(ClientboundPlayerInfoPacket.Action.ADD_PLAYER, handle);
+
+ ClientboundRemoveEntitiesPacket destroyPacket = new ClientboundRemoveEntitiesPacket(handle.getId());
+ ClientboundAddPlayerPacket spawnPacket = new ClientboundAddPlayerPacket(handle);
+ ClientboundRotateHeadPacket rotationPacket = new ClientboundRotateHeadPacket(handle,
+ (byte) Mth.floor(handle.getYHeadRot() * 256F / 360F));
+
+ ArrayList> list = new ArrayList<>();
+ for (EquipmentSlot slot : EquipmentSlot.values()) {
+ list.add(Pair.of(slot, handle.getItemBySlot(slot)));
+ }
+ ClientboundSetEquipmentPacket equipmentPacket = new ClientboundSetEquipmentPacket(handle.getId(), list);
+
+ Player self = getBukkitPlayer();
+ Player[] players = Players.getOnlineWithout(getUniqueId());
+ for (Player player : players) {
+ if (!player.canSee(self)) {
+ continue;
+ }
+ ServerGamePacketListenerImpl connection = ((CraftPlayer) player).getHandle().connection;
+ connection.send(remInfoPacket);
+ connection.send(addInfoPacket);
+ connection.send(destroyPacket);
+ connection.send(spawnPacket);
+ connection.send(rotationPacket);
+ connection.send(equipmentPacket);
+ }
+
+ ServerLevel world = (ServerLevel) handle.level;
+
+ ClientboundRespawnPacket respawnPacket = new ClientboundRespawnPacket(world.dimensionType(), world.dimension(),
+ BiomeManager.obfuscateSeed(world.getSeed()), handle.gameMode.getGameModeForPlayer(),
+ handle.gameMode.getPreviousGameModeForPlayer(), world.isDebug(), world.isFlat(), true);
+ ClientboundPlayerPositionPacket positionPacket = new ClientboundPlayerPositionPacket(handle.getX(), handle.getY(), handle.getZ(),
+ handle.xRotO, handle.yRotO, Collections.emptySet(), 0, false);
+ ClientboundSetCarriedItemPacket itemPacket = new ClientboundSetCarriedItemPacket(handle.getInventory().selected);
+ ClientboundEntityEventPacket statusPacket = new ClientboundEntityEventPacket(handle, (byte) 28);
+ ClientboundSetEntityDataPacket metadataPacket = new ClientboundSetEntityDataPacket(handle.getId(), handle.getEntityData(), true);
+
+ ServerGamePacketListenerImpl connection = handle.connection;
+ connection.send(remInfoPacket);
+ connection.send(addInfoPacket);
+ connection.send(respawnPacket);
+ connection.send(positionPacket);
+ connection.send(itemPacket);
+ connection.send(statusPacket);
+ connection.send(metadataPacket);
+
+ handle.onUpdateAbilities();
+ handle.resetSentInfo();
+ handle.inventoryMenu.broadcastChanges();
+ handle.inventoryMenu.sendAllDataToRemote();
+ if (handle.containerMenu != handle.inventoryMenu) {
+ handle.containerMenu.broadcastChanges();
+ handle.containerMenu.sendAllDataToRemote();
+ }
+ self.recalculatePermissions();
+ }
+
+ @Override
+ public void respawn() {
+ if (handle.connection.isDisconnected()) {
+ return;
+ }
+ handle.connection.send(new ServerboundClientCommandPacket(ServerboundClientCommandPacket.Action.PERFORM_RESPAWN));
+ }
+
+ @Override
+ public void update() {
+ update(true);
+ }
+
+ private final void update(boolean flag) {
+ PostAsync.forcePost(() -> {
+ realName = MojangProfileServer.getName(getUniqueId());
+ realSkin = MojangProfileServer.getSkin(realName, getUniqueId());
+ });
+ if (flag) {
+ GameProfile profile = handle.getGameProfile();
+
+ Skin skin = getSkin();
+ if (skin != null) {
+ PropertyMap properties = profile.getProperties();
+ properties.removeAll("textures");
+ properties.put("textures", new Property("textures", skin.getValue(), skin.getSignature()));
+ }
+
+ String name = getName();
+ if (name != null) {
+ VersionCompatProvider.get().getLookupProvider().getLookup("mjGameProfile").setFieldValue(profile, "name", name);
+ }
+
+ if (!(name == null && skin == null)) {
+ fakeRespawn();
+ }
+ }
+ }
+
+}
\ No newline at end of file
diff --git a/vcompat-1_17_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_17_R1/tools/BlockTools1_17_R1.java b/vcompat-1_17_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_17_R1/tools/BlockTools1_17_R1.java
new file mode 100644
index 0000000..8beb61e
--- /dev/null
+++ b/vcompat-1_17_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_17_R1/tools/BlockTools1_17_R1.java
@@ -0,0 +1,38 @@
+package net.sourcewriters.minecraft.vcompat.provider.impl.v1_17_R1.tools;
+
+import org.bukkit.block.Block;
+import org.bukkit.craftbukkit.v1_17_R1.block.CraftSkull;
+
+import com.mojang.authlib.properties.Property;
+import com.mojang.authlib.properties.PropertyMap;
+
+import net.minecraft.world.level.block.entity.SkullBlockEntity;
+import net.sourcewriters.minecraft.vcompat.provider.lookup.handle.ClassLookup;
+import net.sourcewriters.minecraft.vcompat.provider.tools.BlockTools;
+import net.sourcewriters.minecraft.vcompat.util.constants.MinecraftConstants;
+
+public class BlockTools1_17_R1 extends BlockTools {
+
+ private final ClassLookup craftEntityStateRef = ClassLookup.of(CraftSkull.class).searchField("tileEntity", "tileEntity");
+
+ @Override
+ public void setHeadTexture(Block block, String texture) {
+ if (!(block instanceof CraftSkull)) {
+ return;
+ }
+ SkullBlockEntity entitySkull = (SkullBlockEntity) craftEntityStateRef.getFieldValue(block, "tileEntity");
+ PropertyMap map = entitySkull.owner.getProperties();
+ map.removeAll("textures");
+ map.put("textures", new Property("textures", MinecraftConstants.TEXTURE_SIGNATURE, texture));
+ }
+
+ @Override
+ public String getHeadTexture(Block block) {
+ if (!(block instanceof CraftSkull)) {
+ return null;
+ }
+ SkullBlockEntity entitySkull = (SkullBlockEntity) craftEntityStateRef.getFieldValue(block, "tileEntity");
+ return entitySkull.owner.getProperties().get("textures").iterator().next().getValue();
+ }
+
+}
\ No newline at end of file
diff --git a/vcompat-1_17_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_17_R1/tools/ServerTools1_17_R1.java b/vcompat-1_17_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_17_R1/tools/ServerTools1_17_R1.java
new file mode 100644
index 0000000..6777320
--- /dev/null
+++ b/vcompat-1_17_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_17_R1/tools/ServerTools1_17_R1.java
@@ -0,0 +1,26 @@
+package net.sourcewriters.minecraft.vcompat.provider.impl.v1_17_R1.tools;
+
+import org.bukkit.Bukkit;
+import org.bukkit.craftbukkit.v1_17_R1.CraftServer;
+
+import net.sourcewriters.minecraft.vcompat.provider.impl.v1_17_R1.wrapper.ConsoleReaderWrapper1_17_R1;
+import net.sourcewriters.minecraft.vcompat.provider.tools.ServerTools;
+
+public class ServerTools1_17_R1 extends ServerTools {
+
+ @Override
+ public void setMotd(String text) {
+ ((CraftServer) Bukkit.getServer()).getServer().setMotd(text);
+ }
+
+ @Override
+ public String getMotd() {
+ return ((CraftServer) Bukkit.getServer()).getServer().getMotd();
+ }
+
+ @Override
+ public ConsoleReaderWrapper1_17_R1 getConsole() {
+ return ConsoleReaderWrapper1_17_R1.INSTANCE;
+ }
+
+}
\ No newline at end of file
diff --git a/vcompat-1_17_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_17_R1/tools/SkinTools1_17_R1.java b/vcompat-1_17_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_17_R1/tools/SkinTools1_17_R1.java
new file mode 100644
index 0000000..69c1d2f
--- /dev/null
+++ b/vcompat-1_17_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_17_R1/tools/SkinTools1_17_R1.java
@@ -0,0 +1,16 @@
+package net.sourcewriters.minecraft.vcompat.provider.impl.v1_17_R1.tools;
+
+import org.bukkit.craftbukkit.v1_17_R1.entity.CraftPlayer;
+import org.bukkit.entity.Player;
+
+import net.sourcewriters.minecraft.vcompat.provider.tools.SkinTools;
+import net.sourcewriters.minecraft.vcompat.util.minecraft.Skin;
+
+public class SkinTools1_17_R1 extends SkinTools {
+
+ @Override
+ public Skin skinFromPlayer(Player player) {
+ return skinFromGameProfile(((CraftPlayer) player).getHandle().getGameProfile());
+ }
+
+}
\ No newline at end of file
diff --git a/vcompat-1_17_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_17_R1/utils/EntityConstructors1_17_R1.java b/vcompat-1_17_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_17_R1/utils/EntityConstructors1_17_R1.java
new file mode 100644
index 0000000..a80891f
--- /dev/null
+++ b/vcompat-1_17_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_17_R1/utils/EntityConstructors1_17_R1.java
@@ -0,0 +1,12 @@
+package net.sourcewriters.minecraft.vcompat.provider.impl.v1_17_R1.utils;
+
+import java.util.function.Function;
+
+import net.minecraft.world.level.Level;
+import net.sourcewriters.minecraft.vcompat.provider.impl.v1_17_R1.entity.ArmorStand1_17_R1;
+
+public abstract class EntityConstructors1_17_R1 {
+
+ public static final Function ARMOR_STAND = (world -> new ArmorStand1_17_R1(world));
+
+}
\ No newline at end of file
diff --git a/vcompat-1_17_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_17_R1/wrapper/ConsoleReaderWrapper1_17_R1.java b/vcompat-1_17_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_17_R1/wrapper/ConsoleReaderWrapper1_17_R1.java
new file mode 100644
index 0000000..ab2759b
--- /dev/null
+++ b/vcompat-1_17_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_17_R1/wrapper/ConsoleReaderWrapper1_17_R1.java
@@ -0,0 +1,50 @@
+package net.sourcewriters.minecraft.vcompat.provider.impl.v1_17_R1.wrapper;
+
+import java.io.IOException;
+import java.io.Writer;
+
+import org.bukkit.Bukkit;
+import org.bukkit.craftbukkit.v1_17_R1.CraftServer;
+
+import net.sourcewriters.minecraft.vcompat.provider.wrapper.ConsoleReaderWrapper;
+
+import org.bukkit.craftbukkit.Main;
+import org.bukkit.craftbukkit.libs.jline.console.ConsoleReader;
+
+public final class ConsoleReaderWrapper1_17_R1 extends ConsoleReaderWrapper {
+
+ public static final ConsoleReaderWrapper1_17_R1 INSTANCE = new ConsoleReaderWrapper1_17_R1();
+
+ private final ConsoleReader reader;
+
+ @SuppressWarnings("resource")
+ private ConsoleReaderWrapper1_17_R1() {
+ this.reader = ((CraftServer) Bukkit.getServer()).getServer().reader;
+ }
+
+ @Override
+ public Writer getOutput() {
+ return reader.getOutput();
+ }
+
+ @Override
+ public boolean isAnsiSupported() {
+ return reader.getTerminal().isAnsiSupported();
+ }
+
+ @Override
+ public void flush() throws IOException {
+ reader.flush();
+ }
+
+ @Override
+ public void drawLine() throws IOException {
+ reader.drawLine();
+ }
+
+ @Override
+ public boolean isJLineSupported() {
+ return Main.useJline;
+ }
+
+}
diff --git a/vcompat-1_18_R1/pom.xml b/vcompat-1_18_R1/pom.xml
new file mode 100644
index 0000000..6c0e105
--- /dev/null
+++ b/vcompat-1_18_R1/pom.xml
@@ -0,0 +1,100 @@
+
+ 4.0.0
+
+ net.sourcewriters.minecraft
+ vcompat-parent
+ 3.0.0
+
+ vcompat-1_18_R1
+
+
+ ${project.basedir}/../libraries/mapping
+ ${project.basedir}/../libraries/spigot
+ 1.18.1
+
+
+
+
+ minecraft-libraries
+ Minecraft Libraries
+ https://libraries.minecraft.net
+
+
+
+
+
+ net.sourcewriters.minecraft
+ vcompat-api
+ 3.0.0
+ provided
+
+
+
+
+
+ spigot
+ remapped
+ 0.1
+ system
+ ${spigot.libPath}/spigot-${minecraft.version}.jar
+
+
+ it.unimi.dsi
+ fastutil
+ 8.5.6
+ provided
+
+
+ com.mojang
+ datafixerupper
+ 1.0.20
+ provided
+
+
+ jline
+ jline
+ 2.12.1
+ provided
+
+
+
+
+
+
+ net.md-5
+ specialsource-maven-plugin
+ 1.2.2
+
+
+ package
+
+ remap
+
+ remap-obf
+
+ org.spigotmc:minecraft-server:${minecraft.version}-R0.1-SNAPSHOT:txt:maps-mojang
+ true
+ org.spigotmc:spigot:${minecraft.version}-R0.1-SNAPSHOT:jar:remapped-mojang
+ true
+ remapped-obf
+
+
+
+ package
+
+ remap
+
+ remap-spigot
+
+ ${project.build.directory}/${project.artifactId}-${project.version}-remapped-obf.jar
+ org.spigotmc:minecraft-server:${minecraft.version}-R0.1-SNAPSHOT:csrg:maps-spigot
+ org.spigotmc:spigot:${minecraft.version}-R0.1-SNAPSHOT:jar:remapped-obf
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/vcompat-1_18_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_18_R1/BukkitConversion1_18_R1.java b/vcompat-1_18_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_18_R1/BukkitConversion1_18_R1.java
new file mode 100644
index 0000000..dd6dd0d
--- /dev/null
+++ b/vcompat-1_18_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_18_R1/BukkitConversion1_18_R1.java
@@ -0,0 +1,209 @@
+package net.sourcewriters.minecraft.vcompat.provider.impl.v1_18_R1;
+
+import org.bukkit.craftbukkit.v1_18_R1.inventory.CraftItemStack;
+import org.bukkit.entity.EntityType;
+
+import net.minecraft.nbt.ByteArrayTag;
+import net.minecraft.nbt.ByteTag;
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.nbt.DoubleTag;
+import net.minecraft.nbt.EndTag;
+import net.minecraft.nbt.FloatTag;
+import net.minecraft.nbt.IntArrayTag;
+import net.minecraft.nbt.IntTag;
+import net.minecraft.nbt.ListTag;
+import net.minecraft.nbt.LongArrayTag;
+import net.minecraft.nbt.LongTag;
+import net.minecraft.nbt.ShortTag;
+import net.minecraft.nbt.StringTag;
+import net.minecraft.nbt.Tag;
+import net.minecraft.world.item.ItemStack;
+import net.sourcewriters.minecraft.vcompat.data.api.IDataAdapterContext;
+import net.sourcewriters.minecraft.vcompat.data.api.IDataType;
+import net.sourcewriters.minecraft.vcompat.provider.BukkitConversion;
+import net.sourcewriters.minecraft.vcompat.provider.data.WrapType;
+import net.sourcewriters.minecraft.vcompat.provider.data.WrappedContext;
+import net.sourcewriters.minecraft.vcompat.provider.entity.NmsEntityType;
+import net.sourcewriters.minecraft.vcompat.provider.impl.v1_18_R1.data.BukkitContext1_18_R1;
+import net.sourcewriters.minecraft.vcompat.provider.impl.v1_18_R1.data.BukkitType1_18_R1;
+import net.sourcewriters.minecraft.vcompat.shaded.syntaxapi.nbt.NbtByte;
+import net.sourcewriters.minecraft.vcompat.shaded.syntaxapi.nbt.NbtByteArray;
+import net.sourcewriters.minecraft.vcompat.shaded.syntaxapi.nbt.NbtCompound;
+import net.sourcewriters.minecraft.vcompat.shaded.syntaxapi.nbt.NbtDouble;
+import net.sourcewriters.minecraft.vcompat.shaded.syntaxapi.nbt.NbtEnd;
+import net.sourcewriters.minecraft.vcompat.shaded.syntaxapi.nbt.NbtFloat;
+import net.sourcewriters.minecraft.vcompat.shaded.syntaxapi.nbt.NbtInt;
+import net.sourcewriters.minecraft.vcompat.shaded.syntaxapi.nbt.NbtIntArray;
+import net.sourcewriters.minecraft.vcompat.shaded.syntaxapi.nbt.NbtList;
+import net.sourcewriters.minecraft.vcompat.shaded.syntaxapi.nbt.NbtLong;
+import net.sourcewriters.minecraft.vcompat.shaded.syntaxapi.nbt.NbtLongArray;
+import net.sourcewriters.minecraft.vcompat.shaded.syntaxapi.nbt.NbtShort;
+import net.sourcewriters.minecraft.vcompat.shaded.syntaxapi.nbt.NbtString;
+import net.sourcewriters.minecraft.vcompat.shaded.syntaxapi.nbt.NbtTag;
+import net.sourcewriters.minecraft.vcompat.shaded.syntaxapi.nbt.NbtType;
+
+public class BukkitConversion1_18_R1 extends BukkitConversion {
+
+ protected BukkitConversion1_18_R1(VersionControl1_18_R1 versionControl) {
+ super(versionControl);
+ }
+
+ @Override
+ public EntityType toEntityType(NmsEntityType type) {
+ try {
+ return EntityType.valueOf(type.name());
+ } catch (IllegalArgumentException ignore) {
+ return null;
+ }
+ }
+
+ @Override
+ public NmsEntityType fromEntityType(EntityType type) {
+ try {
+ return NmsEntityType.valueOf(type.name());
+ } catch (IllegalArgumentException ignore) {
+ return null;
+ }
+ }
+
+ @Override
+ public Tag toMinecraftTag(NbtTag tag) {
+ switch (tag.getType()) {
+ case END:
+ return EndTag.INSTANCE;
+ case BYTE:
+ return ByteTag.valueOf(((NbtByte) tag).getValue());
+ case BYTE_ARRAY:
+ return new ByteArrayTag(((NbtByteArray) tag).getValue());
+ case DOUBLE:
+ return DoubleTag.valueOf(((NbtDouble) tag).getValue());
+ case FLOAT:
+ return FloatTag.valueOf(((NbtFloat) tag).getValue());
+ case INT:
+ return IntTag.valueOf(((NbtInt) tag).getValue());
+ case INT_ARRAY:
+ return new IntArrayTag(((NbtIntArray) tag).getValue());
+ case LONG:
+ return LongTag.valueOf(((NbtLong) tag).getValue());
+ case LONG_ARRAY:
+ return new LongArrayTag(((NbtLongArray) tag).getValue());
+ case SHORT:
+ return ShortTag.valueOf(((NbtShort) tag).getValue());
+ case STRING:
+ return StringTag.valueOf(((NbtString) tag).getValue());
+ case LIST:
+ return toMinecraftList((NbtList) tag);
+ case COMPOUND:
+ return toMinecraftCompound((NbtCompound) tag);
+ default:
+ return null;
+ }
+ }
+
+ @Override
+ public NbtTag fromMinecraftTag(Object tag) {
+ if (tag != null && tag instanceof Tag) {
+ return fromMinecraftTag0((Tag) tag);
+ }
+ return null;
+ }
+
+ public NbtTag fromMinecraftTag0(Tag tag) {
+ switch (NbtType.getById(tag.getId())) {
+ case END:
+ return NbtEnd.INSTANCE;
+ case BYTE:
+ return new NbtByte(((ByteTag) tag).getAsByte());
+ case BYTE_ARRAY:
+ return new NbtByteArray(((ByteArrayTag) tag).getAsByteArray());
+ case DOUBLE:
+ return new NbtDouble(((DoubleTag) tag).getAsDouble());
+ case FLOAT:
+ return new NbtFloat(((FloatTag) tag).getAsFloat());
+ case INT:
+ return new NbtInt(((IntTag) tag).getAsInt());
+ case INT_ARRAY:
+ return new NbtIntArray(((IntArrayTag) tag).getAsIntArray());
+ case LONG:
+ return new NbtLong(((LongTag) tag).getAsLong());
+ case LONG_ARRAY:
+ return new NbtLongArray(((LongArrayTag) tag).getAsLongArray());
+ case SHORT:
+ return new NbtShort(((ShortTag) tag).getAsShort());
+ case STRING:
+ return new NbtString(((StringTag) tag).getAsString());
+ case LIST:
+ return fromMinecraftList(tag);
+ case COMPOUND:
+ return fromMinecraftCompound(tag);
+ default:
+ return null;
+ }
+ }
+
+ @Override
+ public ListTag toMinecraftList(NbtList list) {
+ ListTag output = new ListTag();
+ for (NbtTag tag : list) {
+ output.add(toMinecraftTag(tag));
+ }
+ return output;
+ }
+
+ @Override
+ public NbtList fromMinecraftList(Object raw) {
+ if (!(raw instanceof ListTag)) {
+ return null;
+ }
+ ListTag list = (ListTag) raw;
+ NbtList output = new NbtList<>(NbtType.getById(list.getElementType()));
+ for (Tag base : list) {
+ output.add(fromMinecraftTag(base));
+ }
+ return output;
+ }
+
+ @Override
+ public CompoundTag toMinecraftCompound(NbtCompound compound) {
+ NbtCompound compoundTag = compound;
+ CompoundTag targetCompound = new CompoundTag();
+ for (String key : compoundTag.getKeys()) {
+ targetCompound.put(key, toMinecraftTag(compoundTag.get(key)));
+ }
+ return targetCompound;
+ }
+
+ @Override
+ public NbtCompound fromMinecraftCompound(Object raw) {
+ if (!(raw instanceof CompoundTag)) {
+ return null;
+ }
+ CompoundTag compoundTag = (CompoundTag) raw;
+ NbtCompound targetCompound = new NbtCompound();
+ for (String key : compoundTag.getAllKeys()) {
+ targetCompound.set(key, fromMinecraftTag(compoundTag.get(key)));
+ }
+ return targetCompound;
+ }
+
+ @Override
+ public org.bukkit.inventory.ItemStack itemFromCompound(NbtCompound compound) {
+ return CraftItemStack.asBukkitCopy(ItemStack.of(toMinecraftCompound(compound)));
+ }
+
+ @Override
+ public NbtCompound itemToCompound(org.bukkit.inventory.ItemStack itemStack) {
+ return fromMinecraftCompound(CraftItemStack.asNMSCopy(itemStack).save(new CompoundTag()));
+ }
+
+ @Override
+ public WrappedContext createContext(IDataAdapterContext context) {
+ return new BukkitContext1_18_R1(context);
+ }
+
+ @Override
+ public WrapType wrap(IDataType dataType) {
+ return new BukkitType1_18_R1<>(dataType);
+ }
+
+}
\ No newline at end of file
diff --git a/vcompat-1_18_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_18_R1/EntityProvider1_18_R1.java b/vcompat-1_18_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_18_R1/EntityProvider1_18_R1.java
new file mode 100644
index 0000000..c8b45fc
--- /dev/null
+++ b/vcompat-1_18_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_18_R1/EntityProvider1_18_R1.java
@@ -0,0 +1,47 @@
+package net.sourcewriters.minecraft.vcompat.provider.impl.v1_18_R1;
+
+import java.util.EnumMap;
+import java.util.function.Function;
+
+import org.bukkit.craftbukkit.v1_18_R1.CraftWorld;
+
+import net.minecraft.world.level.Level;
+import net.sourcewriters.minecraft.vcompat.provider.EntityProvider;
+import net.sourcewriters.minecraft.vcompat.provider.entity.NmsEntity;
+import net.sourcewriters.minecraft.vcompat.provider.entity.NmsEntityType;
+import net.sourcewriters.minecraft.vcompat.provider.impl.v1_18_R1.utils.EntityConstructors1_18_R1;
+
+public class EntityProvider1_18_R1 extends EntityProvider {
+
+ private final EnumMap> entityMap = new EnumMap<>(NmsEntityType.class);
+
+ protected EntityProvider1_18_R1(VersionControl1_18_R1 versionControl) {
+ super(versionControl);
+ }
+
+ @SuppressWarnings("unchecked")
+ private final Function searchConstructor(NmsEntityType type) {
+ try {
+ return (Function) EntityConstructors1_18_R1.class.getField(type.name()).get(null);
+ } catch (IllegalArgumentException | IllegalAccessException | NoSuchFieldException | SecurityException ignore) {
+ return null;
+ }
+ }
+
+ private final Function getConstructor(NmsEntityType type) {
+ return entityMap.computeIfAbsent(type, (key -> searchConstructor(key)));
+ }
+
+ @Override
+ public NmsEntity createEntity(org.bukkit.World world, NmsEntityType type) {
+ if (!(world instanceof CraftWorld)) {
+ return null;
+ }
+ Function function;
+ if ((function = getConstructor(type)) == null) {
+ return null;
+ }
+ return function.apply(((CraftWorld) world).getHandle());
+ }
+
+}
\ No newline at end of file
diff --git a/vcompat-1_18_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_18_R1/PlayerProvider1_18_R1.java b/vcompat-1_18_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_18_R1/PlayerProvider1_18_R1.java
new file mode 100644
index 0000000..6a24059
--- /dev/null
+++ b/vcompat-1_18_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_18_R1/PlayerProvider1_18_R1.java
@@ -0,0 +1,20 @@
+package net.sourcewriters.minecraft.vcompat.provider.impl.v1_18_R1;
+
+import org.bukkit.entity.Player;
+
+import net.sourcewriters.minecraft.vcompat.provider.PlayerProvider;
+import net.sourcewriters.minecraft.vcompat.provider.entity.NmsPlayer;
+import net.sourcewriters.minecraft.vcompat.provider.impl.v1_18_R1.entity.Player1_18_R1;
+
+public class PlayerProvider1_18_R1 extends PlayerProvider {
+
+ protected PlayerProvider1_18_R1(VersionControl1_18_R1 versionControl) {
+ super(versionControl);
+ }
+
+ @Override
+ protected NmsPlayer createPlayer(Player player) {
+ return new Player1_18_R1(player);
+ }
+
+}
\ No newline at end of file
diff --git a/vcompat-1_18_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_18_R1/TextureProvider1_18_R1.java b/vcompat-1_18_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_18_R1/TextureProvider1_18_R1.java
new file mode 100644
index 0000000..33d39ac
--- /dev/null
+++ b/vcompat-1_18_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_18_R1/TextureProvider1_18_R1.java
@@ -0,0 +1,101 @@
+package net.sourcewriters.minecraft.vcompat.provider.impl.v1_18_R1;
+
+import org.bukkit.Material;
+import org.bukkit.block.Block;
+import org.bukkit.craftbukkit.v1_18_R1.block.CraftBlockEntityState;
+import org.bukkit.craftbukkit.v1_18_R1.block.CraftSkull;
+import org.bukkit.craftbukkit.v1_18_R1.inventory.CraftItemStack;
+import org.bukkit.inventory.meta.ItemMeta;
+import org.bukkit.inventory.meta.SkullMeta;
+
+import com.mojang.authlib.GameProfile;
+
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.nbt.NbtUtils;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.level.block.entity.SkullBlockEntity;
+import net.sourcewriters.minecraft.vcompat.provider.TextureProvider;
+import net.sourcewriters.minecraft.vcompat.provider.lookup.handle.ClassLookup;
+
+public class TextureProvider1_18_R1 extends TextureProvider {
+
+ private final ClassLookup craftEntityStateRef = ClassLookup.of(CraftBlockEntityState.class).searchField("tileEntity", "tileEntity");
+ private final ClassLookup craftItemStackRef = ClassLookup.of(CraftItemStack.class).searchField("handle", "handle");
+ private final ClassLookup craftMetaSkullRef = ClassLookup.of("org.bukkit.craftbukkit.v1_17_R1.inventory.CraftMetaSkull")
+ .searchField("serialized", "serializedProfile").searchField("profile", "profile");
+
+ protected TextureProvider1_18_R1(VersionControl1_18_R1 versionControl) {
+ super(versionControl);
+ }
+
+ @Override
+ public GameProfile profileFromBlock(Block block) {
+ if (!(block instanceof CraftSkull)) {
+ return null;
+ }
+ SkullBlockEntity entitySkull = (SkullBlockEntity) craftEntityStateRef.getFieldValue(block, "tileEntity");
+ return entitySkull.owner;
+ }
+
+ @Override
+ public GameProfile profileFromItem(org.bukkit.inventory.ItemStack itemStack) {
+ if (!(itemStack.getItemMeta() instanceof SkullMeta)) {
+ return null;
+ }
+ SkullMeta meta = (SkullMeta) itemStack.getItemMeta();
+ GameProfile profile = (GameProfile) craftMetaSkullRef.getFieldValue(meta, "profile");
+ if (profile == null) {
+ CompoundTag compound = (CompoundTag) craftMetaSkullRef.getFieldValue(meta, "serialized");
+ if (compound == null) {
+ ItemStack stack = null;
+ if (itemStack instanceof CraftItemStack) {
+ stack = (ItemStack) craftItemStackRef.getFieldValue(itemStack, "handle");
+ }
+ if (stack == null) {
+ stack = CraftItemStack.asNMSCopy(itemStack);
+ }
+ CompoundTag stackTag = stack.getOrCreateTag();
+ if (stackTag.contains("SkullOwner", 10)) {
+ compound = stackTag.getCompound("SkullOwner");
+ } else if (stackTag.contains("SkullProfile", 10)) {
+ compound = stackTag.getCompound("SkullProfile");
+ }
+ }
+ if (compound == null) {
+ return null;
+ }
+ profile = NbtUtils.readGameProfile(compound);
+ }
+ return profile;
+ }
+
+ @Override
+ public org.bukkit.inventory.ItemStack getItem(GameProfile profile) {
+ org.bukkit.inventory.ItemStack craftStack = CraftItemStack.asCraftCopy(new org.bukkit.inventory.ItemStack(Material.PLAYER_HEAD));
+ applyItem(craftStack, profile);
+ return craftStack;
+ }
+
+ @Override
+ public boolean applyItem(org.bukkit.inventory.ItemStack itemStack, GameProfile profile) {
+ ItemMeta meta = itemStack.getItemMeta();
+ if (!(meta instanceof SkullMeta)) {
+ return false;
+ }
+ SkullMeta skullMeta = (SkullMeta) meta;
+ craftMetaSkullRef.setFieldValue(meta, "profile", profile);
+ itemStack.setItemMeta(skullMeta);
+ return true;
+ }
+
+ @Override
+ public boolean applyBlock(Block block, GameProfile profile) {
+ if (!(block instanceof CraftSkull)) {
+ return false;
+ }
+ SkullBlockEntity entitySkull = (SkullBlockEntity) craftEntityStateRef.getFieldValue(block, "tileEntity");
+ entitySkull.setOwner(profile);
+ return true;
+ }
+
+}
\ No newline at end of file
diff --git a/vcompat-1_18_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_18_R1/ToolProvider1_18_R1.java b/vcompat-1_18_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_18_R1/ToolProvider1_18_R1.java
new file mode 100644
index 0000000..6970e27
--- /dev/null
+++ b/vcompat-1_18_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_18_R1/ToolProvider1_18_R1.java
@@ -0,0 +1,33 @@
+package net.sourcewriters.minecraft.vcompat.provider.impl.v1_18_R1;
+
+import net.sourcewriters.minecraft.vcompat.provider.ToolProvider;
+import net.sourcewriters.minecraft.vcompat.provider.impl.v1_18_R1.tools.BlockTools1_18_R1;
+import net.sourcewriters.minecraft.vcompat.provider.impl.v1_18_R1.tools.ServerTools1_18_R1;
+import net.sourcewriters.minecraft.vcompat.provider.impl.v1_18_R1.tools.SkinTools1_18_R1;
+
+public class ToolProvider1_18_R1 extends ToolProvider {
+
+ private final BlockTools1_18_R1 blockTools = new BlockTools1_18_R1();
+ private final SkinTools1_18_R1 skinTools = new SkinTools1_18_R1();
+ private final ServerTools1_18_R1 serverTools = new ServerTools1_18_R1();
+
+ protected ToolProvider1_18_R1(VersionControl1_18_R1 versionControl) {
+ super(versionControl);
+ }
+
+ @Override
+ public SkinTools1_18_R1 getSkinTools() {
+ return skinTools;
+ }
+
+ @Override
+ public ServerTools1_18_R1 getServerTools() {
+ return serverTools;
+ }
+
+ @Override
+ public BlockTools1_18_R1 getBlockTools() {
+ return blockTools;
+ }
+
+}
\ No newline at end of file
diff --git a/vcompat-1_18_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_18_R1/VersionControl1_18_R1.java b/vcompat-1_18_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_18_R1/VersionControl1_18_R1.java
new file mode 100644
index 0000000..87eb8b3
--- /dev/null
+++ b/vcompat-1_18_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_18_R1/VersionControl1_18_R1.java
@@ -0,0 +1,55 @@
+package net.sourcewriters.minecraft.vcompat.provider.impl.v1_18_R1;
+
+import net.sourcewriters.minecraft.vcompat.provider.VersionControl;
+import net.sourcewriters.minecraft.vcompat.provider.impl.v1_18_R1.data.hook.BukkitContainerAdapterHook1_18_R1;
+
+public class VersionControl1_18_R1 extends VersionControl {
+
+ public static VersionControl1_18_R1 INSTANCE;
+
+ public static VersionControl1_18_R1 init() {
+ return INSTANCE != null ? INSTANCE : (INSTANCE = new VersionControl1_18_R1());
+ }
+
+ private final ToolProvider1_18_R1 toolProvider = new ToolProvider1_18_R1(this);
+ private final TextureProvider1_18_R1 textureProvider = new TextureProvider1_18_R1(this);
+ private final EntityProvider1_18_R1 entityProvider = new EntityProvider1_18_R1(this);
+ private final PlayerProvider1_18_R1 playerProvider = new PlayerProvider1_18_R1(this);
+ private final BukkitConversion1_18_R1 bukkitConversion = new BukkitConversion1_18_R1(this);
+
+ private VersionControl1_18_R1() {
+ BukkitContainerAdapterHook1_18_R1.hookEntity();
+ }
+
+ @Override
+ public ToolProvider1_18_R1 getToolProvider() {
+ return toolProvider;
+ }
+
+ @Override
+ public EntityProvider1_18_R1 getEntityProvider() {
+ return entityProvider;
+ }
+
+ @Override
+ public PlayerProvider1_18_R1 getPlayerProvider() {
+ return playerProvider;
+ }
+
+ @Override
+ public TextureProvider1_18_R1 getTextureProvider() {
+ return textureProvider;
+ }
+
+ @Override
+ public BukkitConversion1_18_R1 getBukkitConversion() {
+ return bukkitConversion;
+ }
+
+ @Override
+ public void shutdown() {
+ dataProvider.getDefaultDistributor().shutdown();
+ BukkitContainerAdapterHook1_18_R1.unhookAll();
+ }
+
+}
\ No newline at end of file
diff --git a/vcompat-1_18_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_18_R1/data/BukkitContainer1_18_R1.java b/vcompat-1_18_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_18_R1/data/BukkitContainer1_18_R1.java
new file mode 100644
index 0000000..8fa244a
--- /dev/null
+++ b/vcompat-1_18_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_18_R1/data/BukkitContainer1_18_R1.java
@@ -0,0 +1,160 @@
+package net.sourcewriters.minecraft.vcompat.provider.impl.v1_18_R1.data;
+
+import java.util.Arrays;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import org.bukkit.NamespacedKey;
+import org.bukkit.persistence.PersistentDataAdapterContext;
+import org.bukkit.persistence.PersistentDataContainer;
+import org.bukkit.persistence.PersistentDataType;
+
+import net.sourcewriters.minecraft.vcompat.data.api.IDataContainer;
+import net.sourcewriters.minecraft.vcompat.provider.data.WrapType;
+import net.sourcewriters.minecraft.vcompat.provider.data.WrappedContainer;
+import net.sourcewriters.minecraft.vcompat.provider.data.WrappedKey;
+import net.sourcewriters.minecraft.vcompat.provider.data.wrap.SyntaxKey;
+
+public final class BukkitContainer1_18_R1 extends WrappedContainer implements PersistentDataContainer {
+
+ private final IDataContainer container;
+
+ public BukkitContainer1_18_R1(IDataContainer container) {
+ this.container = container;
+ }
+
+ @Override
+ public IDataContainer getHandle() {
+ return container;
+ }
+
+ @Override
+ public IDataContainer getAsSyntaxContainer() {
+ return container;
+ }
+
+ /*
+ *
+ */
+
+ @Override
+ public boolean has(NamespacedKey key, PersistentDataType type) {
+ return has(new BukkitKey1_18_R1(key), WrappedType1_18_R1.wrap(type));
+ }
+
+ @Override
+ public Z get(NamespacedKey key, PersistentDataType type) {
+ return get(new BukkitKey1_18_R1(key), WrappedType1_18_R1.wrap(type));
+ }
+
+ @Override
+ public Z getOrDefault(NamespacedKey key, PersistentDataType type, Z value) {
+ return Optional.ofNullable(get(key, type)).orElse(value);
+ }
+
+ @Override
+ public void set(NamespacedKey key, PersistentDataType type, Z value) {
+ set(new BukkitKey1_18_R1(key), value, WrappedType1_18_R1.wrap(type));
+ }
+
+ @Override
+ public void remove(NamespacedKey key) {
+ remove(new BukkitKey1_18_R1(key));
+ }
+
+ @Override
+ public Set getKeys() {
+ return Arrays.stream(container.getKeys()).map(SyntaxKey::new).map(BukkitKey1_18_R1::asBukkit).collect(Collectors.toSet());
+ }
+
+ @Override
+ public PersistentDataAdapterContext getAdapterContext() {
+ return getWrapContext();
+ }
+
+ /*
+ *
+ */
+
+ @Override
+ public BukkitContext1_18_R1 getWrapContext() {
+ return new BukkitContext1_18_R1(container.getContext());
+ }
+
+ @Override
+ public boolean has(String key) {
+ return has(wrappedKey(key));
+ }
+
+ @Override
+ public boolean has(WrappedKey key) {
+ return container.has(key.getNamespacedKey());
+ }
+
+ @Override
+ public boolean has(String key, WrapType type) {
+ return has(wrappedKey(key), type);
+ }
+
+ @Override
+ public boolean has(WrappedKey key, WrapType type) {
+ return container.has(key.getNamespacedKey(), type.syntaxType());
+ }
+
+ @Override
+ public Object get(String key) {
+ return get(wrappedKey(key));
+ }
+
+ @Override
+ public Object get(WrappedKey key) {
+ return container.get(key.getNamespacedKey());
+ }
+
+ @Override
+ public C get(String key, WrapType type) {
+ return get(wrappedKey(key), type);
+ }
+
+ @Override
+ public C get(WrappedKey key, WrapType type) {
+ return container.get(key.getNamespacedKey(), type.syntaxType());
+ }
+
+ @Override
+ public void set(String key, B value, WrapType type) {
+ set(wrappedKey(key), value, type);
+ }
+
+ @Override
+ public void set(WrappedKey key, B value, WrapType type) {
+ container.set(key.getNamespacedKey(), value, type.syntaxType());
+ }
+
+ @Override
+ public boolean remove(String key) {
+ return false;
+ }
+
+ @Override
+ public boolean remove(WrappedKey key) {
+ return container.remove(key.getNamespacedKey());
+ }
+
+ @Override
+ public Set keySet() {
+ return container.getKeyspaces();
+ }
+
+ @Override
+ public boolean isEmpty() {
+ return container.isEmpty();
+ }
+
+ @Override
+ public int size() {
+ return container.size();
+ }
+
+}
\ No newline at end of file
diff --git a/vcompat-1_18_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_18_R1/data/BukkitContext1_18_R1.java b/vcompat-1_18_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_18_R1/data/BukkitContext1_18_R1.java
new file mode 100644
index 0000000..f9b09b1
--- /dev/null
+++ b/vcompat-1_18_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_18_R1/data/BukkitContext1_18_R1.java
@@ -0,0 +1,38 @@
+package net.sourcewriters.minecraft.vcompat.provider.impl.v1_18_R1.data;
+
+import org.bukkit.persistence.PersistentDataAdapterContext;
+import org.bukkit.persistence.PersistentDataContainer;
+
+import net.sourcewriters.minecraft.vcompat.data.api.IDataAdapterContext;
+import net.sourcewriters.minecraft.vcompat.data.api.IDataContainer;
+import net.sourcewriters.minecraft.vcompat.provider.data.WrappedContext;
+
+public final class BukkitContext1_18_R1 extends WrappedContext implements PersistentDataAdapterContext {
+
+ private final IDataAdapterContext context;
+
+ public BukkitContext1_18_R1(IDataAdapterContext context) {
+ this.context = context;
+ }
+
+ @Override
+ public IDataAdapterContext getHandle() {
+ return context;
+ }
+
+ @Override
+ public PersistentDataContainer newPersistentDataContainer() {
+ return newWrapContainer();
+ }
+
+ @Override
+ public IDataContainer newContainer() {
+ return context.newContainer();
+ }
+
+ @Override
+ public BukkitContainer1_18_R1 newWrapContainer() {
+ return new BukkitContainer1_18_R1(context.newContainer());
+ }
+
+}
\ No newline at end of file
diff --git a/vcompat-1_18_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_18_R1/data/BukkitKey1_18_R1.java b/vcompat-1_18_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_18_R1/data/BukkitKey1_18_R1.java
new file mode 100644
index 0000000..4e6d179
--- /dev/null
+++ b/vcompat-1_18_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_18_R1/data/BukkitKey1_18_R1.java
@@ -0,0 +1,52 @@
+package net.sourcewriters.minecraft.vcompat.provider.impl.v1_18_R1.data;
+
+import org.bukkit.NamespacedKey;
+import org.bukkit.plugin.Plugin;
+
+import net.sourcewriters.minecraft.vcompat.provider.data.WrappedKey;
+
+public final class BukkitKey1_18_R1 extends WrappedKey {
+
+ private final NamespacedKey key;
+
+ public BukkitKey1_18_R1(Plugin plugin, String key) {
+ this.key = new NamespacedKey(plugin, key);
+ }
+
+ @SuppressWarnings("deprecation")
+ public BukkitKey1_18_R1(String name, String key) {
+ this.key = new NamespacedKey(name, key);
+ }
+
+ public BukkitKey1_18_R1(NamespacedKey key) {
+ this.key = key;
+ }
+
+ @Override
+ public NamespacedKey getHandle() {
+ return key;
+ }
+
+ @Override
+ public String getName() {
+ return key.getNamespace();
+ }
+
+ @Override
+ public String getKey() {
+ return key.getKey();
+ }
+
+ @Override
+ public String toString() {
+ return key.toString();
+ }
+
+ public static NamespacedKey asBukkit(WrappedKey key) {
+ if (key.getHandle() instanceof NamespacedKey) {
+ return (NamespacedKey) key.getHandle();
+ }
+ return new BukkitKey1_18_R1(key.getName(), key.getKey()).getHandle();
+ }
+
+}
\ No newline at end of file
diff --git a/vcompat-1_18_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_18_R1/data/BukkitType1_18_R1.java b/vcompat-1_18_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_18_R1/data/BukkitType1_18_R1.java
new file mode 100644
index 0000000..f8573fe
--- /dev/null
+++ b/vcompat-1_18_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_18_R1/data/BukkitType1_18_R1.java
@@ -0,0 +1,68 @@
+package net.sourcewriters.minecraft.vcompat.provider.impl.v1_18_R1.data;
+
+import org.bukkit.persistence.PersistentDataAdapterContext;
+import org.bukkit.persistence.PersistentDataType;
+
+import net.sourcewriters.minecraft.vcompat.data.api.IDataType;
+import net.sourcewriters.minecraft.vcompat.provider.data.WrappedContext;
+
+public class BukkitType1_18_R1 extends WrappedType1_18_R1, P0, P1, C0, C1>
+ implements PersistentDataType {
+
+ private final IDataType type;
+
+ public BukkitType1_18_R1(IDataType type) {
+ super(type.getPrimitive(), type.getComplex());
+ this.type = type;
+ }
+
+ @Override
+ public IDataType getHandle() {
+ return type;
+ }
+
+ @Override
+ public Class getPrimitiveOriginal() {
+ return type.getPrimitive();
+ }
+
+ @Override
+ public Class getComplexOriginal() {
+ return type.getComplex();
+ }
+
+ /*
+ *
+ */
+
+ @Override
+ public Class getComplexType() {
+ return complexType;
+ }
+
+ @Override
+ public Class getPrimitiveType() {
+ return primitiveType;
+ }
+
+ @Override
+ public P0 toPrimitive(C0 complex, PersistentDataAdapterContext context) {
+ return wrapToPrimitive(complex, new SyntaxContext1_18_R1(context));
+ }
+
+ @Override
+ public C0 fromPrimitive(P0 primitive, PersistentDataAdapterContext context) {
+ return wrapToComplex(primitive, new SyntaxContext1_18_R1(context));
+ }
+
+ @Override
+ public P0 wrapToPrimitive(C0 complex, WrappedContext context) {
+ return toPrimitiveWrapped(type.toPrimitive(context, toComplexOriginal(complex)));
+ }
+
+ @Override
+ public C0 wrapToComplex(P0 primitive, WrappedContext context) {
+ return toComplexWrapped(type.fromPrimitive(context, toPrimitiveOriginal(primitive)));
+ }
+
+}
\ No newline at end of file
diff --git a/vcompat-1_18_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_18_R1/data/SimpleBukkitType1_18_R1.java b/vcompat-1_18_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_18_R1/data/SimpleBukkitType1_18_R1.java
new file mode 100644
index 0000000..4be725a
--- /dev/null
+++ b/vcompat-1_18_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_18_R1/data/SimpleBukkitType1_18_R1.java
@@ -0,0 +1,36 @@
+package net.sourcewriters.minecraft.vcompat.provider.impl.v1_18_R1.data;
+
+import org.bukkit.persistence.PersistentDataAdapterContext;
+import org.bukkit.persistence.PersistentDataType;
+
+import net.sourcewriters.minecraft.vcompat.provider.data.WrapType;
+
+public class SimpleBukkitType1_18_R1 implements PersistentDataType {
+
+ private final WrapType type;
+
+ public SimpleBukkitType1_18_R1(WrapType type) {
+ this.type = type;
+ }
+
+ @Override
+ public Class getComplexType() {
+ return type.getComplexWrapped();
+ }
+
+ @Override
+ public Class getPrimitiveType() {
+ return type.getPrimitiveWrapped();
+ }
+
+ @Override
+ public P toPrimitive(C complex, PersistentDataAdapterContext context) {
+ return type.wrapToPrimitive(complex, new SyntaxContext1_18_R1(context));
+ }
+
+ @Override
+ public C fromPrimitive(P primitive, PersistentDataAdapterContext context) {
+ return type.wrapToComplex(primitive, new SyntaxContext1_18_R1(context));
+ }
+
+}
\ No newline at end of file
diff --git a/vcompat-1_18_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_18_R1/data/SyntaxContainer1_18_R1.java b/vcompat-1_18_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_18_R1/data/SyntaxContainer1_18_R1.java
new file mode 100644
index 0000000..d37883d
--- /dev/null
+++ b/vcompat-1_18_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_18_R1/data/SyntaxContainer1_18_R1.java
@@ -0,0 +1,191 @@
+package net.sourcewriters.minecraft.vcompat.provider.impl.v1_18_R1.data;
+
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import org.bukkit.persistence.PersistentDataContainer;
+
+import net.sourcewriters.minecraft.vcompat.VersionCompatProvider;
+import net.sourcewriters.minecraft.vcompat.data.api.IDataAdapterContext;
+import net.sourcewriters.minecraft.vcompat.data.api.IDataAdapterRegistry;
+import net.sourcewriters.minecraft.vcompat.data.api.IDataContainer;
+import net.sourcewriters.minecraft.vcompat.data.api.IDataType;
+import net.sourcewriters.minecraft.vcompat.provider.data.WrapType;
+import net.sourcewriters.minecraft.vcompat.provider.data.WrappedContainer;
+import net.sourcewriters.minecraft.vcompat.provider.data.WrappedKey;
+import net.sourcewriters.minecraft.vcompat.provider.data.wrap.SyntaxKey;
+import net.sourcewriters.minecraft.vcompat.shaded.syntaxapi.utils.key.IKey;
+
+public final class SyntaxContainer1_18_R1 extends WrappedContainer implements IDataContainer {
+
+ private final PersistentDataContainer container;
+
+ public SyntaxContainer1_18_R1(PersistentDataContainer container) {
+ this.container = container;
+ }
+
+ @Override
+ public PersistentDataContainer getHandle() {
+ return container;
+ }
+
+ @Override
+ public IDataContainer getAsSyntaxContainer() {
+ return new SyntaxContainer1_18_R1(container);
+ }
+
+ @Override
+ public IDataAdapterRegistry getRegistry() {
+ return VersionCompatProvider.get().getControl().getDataProvider().getRegistry();
+ }
+
+ /*
+ *
+ */
+
+ @Override
+ public boolean has(IKey key) {
+ throw new UnsupportedOperationException("Can't be used with PersistentDataContainer of Bukkit");
+ }
+
+ @Override
+ public boolean has(String key, IDataType type) {
+ return has(syntaxKey(key), type);
+ }
+
+ @Override
+ public boolean has(IKey key, IDataType type) {
+ return has(new SyntaxKey(key), WrappedType1_18_R1.wrap(type));
+ }
+
+ @Override
+ public C get(String key, IDataType type) {
+ return get(syntaxKey(key), type);
+ }
+
+ @Override
+ public C get(IKey key, IDataType type) {
+ return get(new SyntaxKey(key), WrappedType1_18_R1.wrap(type));
+ }
+
+ @Override
+ public Object get(String key) {
+ throw new UnsupportedOperationException("Can't be used with PersistentDataContainer of Bukkit");
+ }
+
+ @Override
+ public Object get(IKey key) {
+ throw new UnsupportedOperationException("Can't be used with PersistentDataContainer of Bukkit");
+ }
+
+ @Override
+ public void set(String key, E value, IDataType type) {
+ set(wrappedKey(key), value, WrappedType1_18_R1.wrap(type));
+ }
+
+ @Override
+ public void set(IKey key, E value, IDataType type) {
+ set(new SyntaxKey(key), value, WrappedType1_18_R1.wrap(type));
+ }
+
+ @Override
+ public boolean remove(String key) {
+ return remove(wrappedKey(key));
+ }
+
+ @Override
+ public boolean remove(IKey key) {
+ return remove(new SyntaxKey(key));
+ }
+
+ @Override
+ public IKey[] getKeys() {
+ return container.getKeys().stream().map(BukkitKey1_18_R1::new).map(WrappedKey::getNamespacedKey).toArray(IKey[]::new);
+ }
+
+ @Override
+ public Set getKeyspaces() {
+ return container.getKeys().stream().map(org.bukkit.NamespacedKey::toString).collect(Collectors.toSet());
+ }
+
+ @Override
+ public IDataAdapterContext getContext() {
+ return getWrapContext();
+ }
+
+ /*
+ *
+ */
+
+ @Override
+ public SyntaxContext1_18_R1 getWrapContext() {
+ return new SyntaxContext1_18_R1(container.getAdapterContext());
+ }
+
+ @Override
+ public boolean has(String key) {
+ throw new UnsupportedOperationException("Can't be used with PersistentDataContainer of Bukkit");
+ }
+
+ @Override
+ public boolean has(WrappedKey key) {
+ throw new UnsupportedOperationException("Can't be used with PersistentDataContainer of Bukkit");
+ }
+
+ @Override
+ public boolean has(String key, WrapType type) {
+ return has(wrappedKey(key), type);
+ }
+
+ @Override
+ public boolean has(WrappedKey key, WrapType type) {
+ return container.has(BukkitKey1_18_R1.asBukkit(key), new SimpleBukkitType1_18_R1<>(type));
+ }
+
+ @Override
+ public Object get(WrappedKey key) {
+ throw new UnsupportedOperationException("Can't be used with PersistentDataContainer of Bukkit");
+ }
+
+ @Override
+ public C get(String key, WrapType type) {
+ return get(wrappedKey(key), type);
+ }
+
+ @Override
+ public C get(WrappedKey key, WrapType type) {
+ return container.get(BukkitKey1_18_R1.asBukkit(key), new SimpleBukkitType1_18_R1<>(type));
+ }
+
+ @Override
+ public void set(String key, B value, WrapType type) {
+ set(wrappedKey(key), value, type);
+ }
+
+ @Override
+ public void set(WrappedKey key, B value, WrapType type) {
+ container.set(BukkitKey1_18_R1.asBukkit(key), new SimpleBukkitType1_18_R1<>(type), value);
+ }
+
+ @Override
+ public boolean remove(WrappedKey key) {
+ container.remove(BukkitKey1_18_R1.asBukkit(key));
+ return true; // Will always return true as we don't know if it contained it
+ }
+
+ @Override
+ public Set keySet() {
+ return getKeyspaces();
+ }
+
+ @Override
+ public boolean isEmpty() {
+ return container.isEmpty();
+ }
+
+ @Override
+ public int size() {
+ return container.getKeys().size();
+ }
+
+}
\ No newline at end of file
diff --git a/vcompat-1_18_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_18_R1/data/SyntaxContext1_18_R1.java b/vcompat-1_18_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_18_R1/data/SyntaxContext1_18_R1.java
new file mode 100644
index 0000000..aa5e9b1
--- /dev/null
+++ b/vcompat-1_18_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_18_R1/data/SyntaxContext1_18_R1.java
@@ -0,0 +1,37 @@
+package net.sourcewriters.minecraft.vcompat.provider.impl.v1_18_R1.data;
+
+import org.bukkit.persistence.PersistentDataAdapterContext;
+import org.bukkit.persistence.PersistentDataContainer;
+
+import net.sourcewriters.minecraft.vcompat.data.api.IDataContainer;
+import net.sourcewriters.minecraft.vcompat.provider.data.WrappedContext;
+
+public final class SyntaxContext1_18_R1 extends WrappedContext implements PersistentDataAdapterContext {
+
+ private final PersistentDataAdapterContext context;
+
+ public SyntaxContext1_18_R1(PersistentDataAdapterContext context) {
+ this.context = context;
+ }
+
+ @Override
+ public PersistentDataAdapterContext getHandle() {
+ return context;
+ }
+
+ @Override
+ public PersistentDataContainer newPersistentDataContainer() {
+ return context.newPersistentDataContainer();
+ }
+
+ @Override
+ public IDataContainer newContainer() {
+ return newWrapContainer();
+ }
+
+ @Override
+ public SyntaxContainer1_18_R1 newWrapContainer() {
+ return new SyntaxContainer1_18_R1(context.newPersistentDataContainer());
+ }
+
+}
\ No newline at end of file
diff --git a/vcompat-1_18_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_18_R1/data/SyntaxType1_18_R1.java b/vcompat-1_18_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_18_R1/data/SyntaxType1_18_R1.java
new file mode 100644
index 0000000..7759f65
--- /dev/null
+++ b/vcompat-1_18_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_18_R1/data/SyntaxType1_18_R1.java
@@ -0,0 +1,75 @@
+package net.sourcewriters.minecraft.vcompat.provider.impl.v1_18_R1.data;
+
+import org.bukkit.persistence.PersistentDataAdapterContext;
+import org.bukkit.persistence.PersistentDataType;
+
+import net.sourcewriters.minecraft.vcompat.data.api.IDataAdapterContext;
+import net.sourcewriters.minecraft.vcompat.data.api.IDataType;
+import net.sourcewriters.minecraft.vcompat.provider.data.WrappedContext;
+
+public class SyntaxType1_18_R1 extends WrappedType1_18_R1, P0, P1, C0, C1>
+ implements IDataType {
+
+ private final PersistentDataType type;
+
+ public SyntaxType1_18_R1(PersistentDataType type) {
+ super(type.getPrimitiveType(), type.getComplexType());
+ this.type = type;
+ }
+
+ @Override
+ public PersistentDataType getHandle() {
+ return type;
+ }
+
+ @Override
+ public Class getPrimitiveOriginal() {
+ return type.getPrimitiveType();
+ }
+
+ @Override
+ public Class getComplexOriginal() {
+ return type.getComplexType();
+ }
+
+ /*
+ *
+ */
+
+ @Override
+ public Class getComplex() {
+ return complexType;
+ }
+
+ @Override
+ public Class getPrimitive() {
+ return primitiveType;
+ }
+
+ @Override
+ public P0 toPrimitive(IDataAdapterContext context, C0 complex) {
+ return wrapToPrimitive(complex, new BukkitContext1_18_R1(context));
+ }
+
+ @Override
+ public C0 fromPrimitive(IDataAdapterContext context, P0 primitive) {
+ return wrapToComplex(primitive, new BukkitContext1_18_R1(context));
+ }
+
+ @Override
+ public P0 wrapToPrimitive(C0 complex, WrappedContext context) {
+ if (!(context instanceof PersistentDataAdapterContext)) {
+ return null;
+ }
+ return toPrimitiveWrapped(type.toPrimitive(toComplexOriginal(complex), (PersistentDataAdapterContext) context));
+ }
+
+ @Override
+ public C0 wrapToComplex(P0 primitive, WrappedContext context) {
+ if (!(context instanceof PersistentDataAdapterContext)) {
+ return null;
+ }
+ return toComplexWrapped(type.fromPrimitive(toPrimitiveOriginal(primitive), (PersistentDataAdapterContext) context));
+ }
+
+}
\ No newline at end of file
diff --git a/vcompat-1_18_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_18_R1/data/WrappedType1_18_R1.java b/vcompat-1_18_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_18_R1/data/WrappedType1_18_R1.java
new file mode 100644
index 0000000..3766fd2
--- /dev/null
+++ b/vcompat-1_18_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_18_R1/data/WrappedType1_18_R1.java
@@ -0,0 +1,149 @@
+package net.sourcewriters.minecraft.vcompat.provider.impl.v1_18_R1.data;
+
+import java.util.Arrays;
+
+import org.bukkit.persistence.PersistentDataContainer;
+import org.bukkit.persistence.PersistentDataType;
+
+import net.sourcewriters.minecraft.vcompat.data.api.IDataContainer;
+import net.sourcewriters.minecraft.vcompat.data.api.IDataType;
+import net.sourcewriters.minecraft.vcompat.provider.data.WrapType;
+
+public abstract class WrappedType1_18_R1 implements WrapType {
+
+ protected final Class primitiveType;
+ protected final Class complexType;
+
+ private final int primitiveWrap;
+ private final int complexWrap;
+
+ @SuppressWarnings("unchecked")
+ protected WrappedType1_18_R1(Class primitive, Class