arclight-api/src/main/java/io/izzel/arclight/api/Unsafe.java

@@ -1,7 +1,5 @@
 package io.izzel.arclight.api;
 
-import sun.reflect.CallerSensitive;
-
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.lang.reflect.Field;
@@ -46,7 +44,6 @@ public static MethodHandles.Lookup lookup() {
         return lookup;
     }
 
-    @CallerSensitive
     public static sun.misc.Unsafe getUnsafe() {
         return unsafe;
     }
@@ -123,96 +120,6 @@ public static void putDouble(Object o, long l, double v) {
         unsafe.putDouble(o, l, v);
     }
 
-    @Deprecated
-    public static int getInt(Object o, int i) {
-        return unsafe.getInt(o, i);
-    }
-
-    @Deprecated
-    public static void putInt(Object o, int i, int i1) {
-        unsafe.putInt(o, i, i1);
-    }
-
-    @Deprecated
-    public static Object getObject(Object o, int i) {
-        return unsafe.getObject(o, i);
-    }
-
-    @Deprecated
-    public static void putObject(Object o, int i, Object o1) {
-        unsafe.putObject(o, i, o1);
-    }
-
-    @Deprecated
-    public static boolean getBoolean(Object o, int i) {
-        return unsafe.getBoolean(o, i);
-    }
-
-    @Deprecated
-    public static void putBoolean(Object o, int i, boolean b) {
-        unsafe.putBoolean(o, i, b);
-    }
-
-    @Deprecated
-    public static byte getByte(Object o, int i) {
-        return unsafe.getByte(o, i);
-    }
-
-    @Deprecated
-    public static void putByte(Object o, int i, byte b) {
-        unsafe.putByte(o, i, b);
-    }
-
-    @Deprecated
-    public static short getShort(Object o, int i) {
-        return unsafe.getShort(o, i);
-    }
-
-    @Deprecated
-    public static void putShort(Object o, int i, short i1) {
-        unsafe.putShort(o, i, i1);
-    }
-
-    @Deprecated
-    public static char getChar(Object o, int i) {
-        return unsafe.getChar(o, i);
-    }
-
-    @Deprecated
-    public static void putChar(Object o, int i, char c) {
-        unsafe.putChar(o, i, c);
-    }
-
-    @Deprecated
-    public static long getLong(Object o, int i) {
-        return unsafe.getLong(o, i);
-    }
-
-    @Deprecated
-    public static void putLong(Object o, int i, long l) {
-        unsafe.putLong(o, i, l);
-    }
-
-    @Deprecated
-    public static float getFloat(Object o, int i) {
-        return unsafe.getFloat(o, i);
-    }
-
-    @Deprecated
-    public static void putFloat(Object o, int i, float v) {
-        unsafe.putFloat(o, i, v);
-    }
-
-    @Deprecated
-    public static double getDouble(Object o, int i) {
-        return unsafe.getDouble(o, i);
-    }
-
-    @Deprecated
-    public static void putDouble(Object o, int i, double v) {
-        unsafe.putDouble(o, i, v);
-    }
-
     public static byte getByte(long l) {
         return unsafe.getByte(l);
     }
@@ -305,16 +212,6 @@ public static void freeMemory(long l) {
         unsafe.freeMemory(l);
     }
 
-    @Deprecated
-    public static int fieldOffset(Field field) {
-        return unsafe.fieldOffset(field);
-    }
-
-    @Deprecated
-    public static Object staticFieldBase(Class<?> aClass) {
-        return unsafe.staticFieldBase(aClass);
-    }
-
     public static long staticFieldOffset(Field field) {
         return unsafe.staticFieldOffset(field);
     }
@@ -353,7 +250,7 @@ public static int pageSize() {
 
     public static Class<?> defineClass(String s, byte[] bytes, int i, int i1, ClassLoader classLoader, ProtectionDomain protectionDomain) {
         try {
-            return (Class<?>) defineClass.bindTo(classLoader).invoke(s, bytes, i , i1, protectionDomain);
+            return (Class<?>) defineClass.bindTo(classLoader).invoke(s, bytes, i, i1, protectionDomain);
         } catch (Throwable throwable) {
             throwException(throwable);
             return null;
@@ -368,21 +265,6 @@ public static Object allocateInstance(Class<?> aClass) throws InstantiationExcep
         return unsafe.allocateInstance(aClass);
     }
 
-    @Deprecated
-    public static void monitorEnter(Object o) {
-        unsafe.monitorEnter(o);
-    }
-
-    @Deprecated
-    public static void monitorExit(Object o) {
-        unsafe.monitorExit(o);
-    }
-
-    @Deprecated
-    public static boolean tryMonitorEnter(Object o) {
-        return unsafe.tryMonitorEnter(o);
-    }
-
     public static void throwException(Throwable throwable) {
         unsafe.throwException(throwable);
     }
@@ -526,4 +408,18 @@ public static void storeFence() {
     public static void fullFence() {
         unsafe.fullFence();
     }
+
+    public static Class<?> getCallerClass() {
+        return INSTANCE.getClassContext()[3];
+    }
+
+    private static final CallerClass INSTANCE = new CallerClass();
+
+    private static class CallerClass extends SecurityManager {
+
+        @Override
+        public Class<?>[] getClassContext() {
+            return super.getClassContext();
+        }
+    }
 }

arclight-common/build.gradle

@@ -2,14 +2,13 @@ buildscript {
     repositories {
         maven { url = 'https://files.minecraftforge.net/maven' }
         maven { url = 'https://repo.spongepowered.org/maven' }
-        jcenter()
         mavenCentral()
-        maven { url = 'https://jitpack.io' }
+        maven { url = 'https://maven.izzel.io/releases' }
     }
     dependencies {
         classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '3.+', changing: true
         classpath 'org.spongepowered:mixingradle:0.7-SNAPSHOT'
-        classpath "com.github.ArclightTeam:arclight-gradle-plugin:$agpVersion"
+        classpath "io.izzel.arclight:arclight-gradle-plugin:$agpVersion"
     }
 }
 
@@ -21,7 +20,7 @@ apply plugin: 'io.izzel.arclight'
 
 ext {
     minecraftVersion = '1.15.2'
-    forgeVersion = '31.2.45'
+    forgeVersion = '31.2.48'
 }
 
 arclight {
@@ -41,12 +40,11 @@ minecraft {
 }
 
 repositories {
-    jcenter()
     maven { url = 'https://repo.spongepowered.org/maven' }
     maven { url = 'https://oss.sonatype.org/content/repositories/snapshots/' }
     maven { url = 'https://hub.spigotmc.org/nexus/content/repositories/snapshots/' }
-    maven { url = 'https://repo.codemc.io/repository/nms/' }
     maven { url = 'https://files.minecraftforge.net/maven/' }
+    maven { url = 'https://maven.izzel.io/releases' }
 }
 
 dependencies {
@@ -60,6 +58,7 @@ dependencies {
     compile 'net.md-5:bungeecord-chat:1.13-SNAPSHOT'
     compile 'mysql:mysql-connector-java:5.1.47'
     compile 'org.yaml:snakeyaml:1.23'
+    compile 'io.izzel:tools:1.0.+'
     compile project(':arclight-api')
     compile project(':i18n-config')
 }

arclight-common/bukkit.at

@@ -25,4 +25,5 @@ public org/bukkit/craftbukkit/v/inventory/CraftMetaKnowledgeBook/<init>(Lorg/buk
 public org/bukkit/craftbukkit/v/inventory/CraftMetaTropicalFishBucket
 public org/bukkit/craftbukkit/v/inventory/CraftMetaTropicalFishBucket/<init>(Lorg/bukkit/craftbukkit/v/inventory/CraftMetaItem;)V
 public org/bukkit/craftbukkit/v/inventory/CraftMetaCrossbow/<init>(Lorg/bukkit/craftbukkit/v/inventory/CraftMetaItem;)V
-public org/bukkit/craftbukkit/v/inventory/CraftMetaSuspiciousStew/<init>(Lorg/bukkit/craftbukkit/v/inventory/CraftMetaItem;)V
+public org/bukkit/craftbukkit/v/inventory/CraftMetaSuspiciousStew/<init>(Lorg/bukkit/craftbukkit/v/inventory/CraftMetaItem;)V
+public org/bukkit/craftbukkit/v/inventory/CraftMetaItem/<init>(Lnet/minecraft/nbt/CompoundNBT;)V

arclight-common/src/main/java/io/izzel/arclight/common/ArclightMain.java

@@ -1,5 +1,6 @@
 package io.izzel.arclight.common;
 
+import com.google.common.collect.ImmutableMap;
 import com.google.gson.internal.bind.TypeAdapters;
 import com.google.gson.reflect.TypeToken;
 import io.izzel.arclight.api.EnumHelper;
@@ -13,6 +14,10 @@
 
 import java.io.InputStream;
 import java.lang.reflect.Field;
+import java.net.URI;
+import java.nio.file.FileSystem;
+import java.nio.file.FileSystems;
+import java.nio.file.Files;
 import java.util.jar.Attributes;
 import java.util.jar.Manifest;
 
@@ -54,7 +59,9 @@ private void dirtyHacks() throws Exception {
     }
 
     private void printLogo() throws Exception {
-        try (InputStream stream = getClass().getResourceAsStream("/META-INF/MANIFEST.MF")) {
+        URI uri = getClass().getProtectionDomain().getCodeSource().getLocation().toURI();
+        FileSystem fs = FileSystems.newFileSystem(URI.create("jar:" + uri), ImmutableMap.of("create", "true"));
+        try (InputStream stream = Files.newInputStream(fs.getPath("/META-INF/MANIFEST.MF"))) {
             Manifest manifest = new Manifest(stream);
             Attributes attributes = manifest.getMainAttributes();
             String version = attributes.getValue(Attributes.Name.IMPLEMENTATION_VERSION);

arclight-common/src/main/java/io/izzel/arclight/common/asm/ArclightImplementer.java

@@ -42,6 +42,7 @@ public void initializeLaunch(ITransformerLoader transformerLoader, Path[] specia
         this.implementers.put("inventory", new InventoryImplementer());
         this.implementers.put("switch", SwitchTableFixer.INSTANCE);
         this.implementers.put("async", AsyncCatcher.INSTANCE);
+        this.implementers.put("entitytype", EntityTypePatcher.INSTANCE);
     }
 
     @Override

arclight-common/src/main/java/io/izzel/arclight/common/asm/EntityTypePatcher.java

@@ -0,0 +1,21 @@
+package io.izzel.arclight.common.asm;
+
+import cpw.mods.modlauncher.serviceapi.ILaunchPluginService;
+import io.izzel.arclight.api.ArclightVersion;
+import org.objectweb.asm.tree.ClassNode;
+
+public class EntityTypePatcher implements Implementer {
+
+    public static final EntityTypePatcher INSTANCE = new EntityTypePatcher();
+
+    private final String entityPackage = "org/bukkit/craftbukkit/" + ArclightVersion.current().packageName() + "/entity";
+
+    @Override
+    public boolean processClass(ClassNode node, ILaunchPluginService.ITransformerLoader transformerLoader) {
+        if (node.name.startsWith(entityPackage) && !node.name.endsWith("CraftEntity")) {
+            return node.methods.removeIf(methodNode -> methodNode.name.equals("getType")
+                && methodNode.desc.equals("()Lorg/bukkit/entity/EntityType;"));
+        }
+        return false;
+    }
+}