+ fix inject
This commit is contained in:
@@ -2,6 +2,7 @@ package io.izzel.taboolib.module.db.local;
|
||||
|
||||
import io.izzel.taboolib.TabooLibLoader;
|
||||
import io.izzel.taboolib.module.locale.logger.TLogger;
|
||||
import io.izzel.taboolib.util.Ref;
|
||||
import org.bukkit.plugin.Plugin;
|
||||
|
||||
import java.lang.reflect.Field;
|
||||
@@ -31,7 +32,7 @@ public class LocalLoader implements TabooLibLoader.Loader {
|
||||
continue;
|
||||
}
|
||||
}
|
||||
field.setAccessible(true);
|
||||
Ref.forcedAccess(field);
|
||||
try {
|
||||
field.set(instance, Local.get(plugin.getName()).get(annotation.value()));
|
||||
} catch (IllegalAccessException ignored) {
|
||||
|
||||
@@ -3,6 +3,7 @@ package io.izzel.taboolib.module.inject;
|
||||
import io.izzel.taboolib.TabooLibLoader;
|
||||
import io.izzel.taboolib.module.lite.SimpleVersionControl;
|
||||
import io.izzel.taboolib.module.locale.logger.TLogger;
|
||||
import io.izzel.taboolib.util.Ref;
|
||||
import org.bukkit.plugin.Plugin;
|
||||
|
||||
import java.lang.reflect.Field;
|
||||
@@ -32,8 +33,8 @@ public class TInjectAsm implements TabooLibLoader.Loader {
|
||||
continue;
|
||||
}
|
||||
}
|
||||
Ref.forcedAccess(declaredField);
|
||||
try {
|
||||
declaredField.setAccessible(true);
|
||||
declaredField.set(instance, SimpleVersionControl.createNMS(annotation.asm()).useCache().translate(plugin).newInstance());
|
||||
} catch (Throwable t) {
|
||||
TLogger.getGlobalLogger().warn("Cannot translate class \"" + declaredField.getType().getName() + "\": " + t.getMessage());
|
||||
|
||||
@@ -3,6 +3,7 @@ package io.izzel.taboolib.module.inject;
|
||||
import com.google.common.collect.Maps;
|
||||
import io.izzel.taboolib.TabooLibLoader;
|
||||
import io.izzel.taboolib.module.locale.logger.TLogger;
|
||||
import io.izzel.taboolib.util.Ref;
|
||||
import io.izzel.taboolib.util.Reflection;
|
||||
import org.bukkit.plugin.Plugin;
|
||||
|
||||
@@ -69,7 +70,7 @@ public class TInjectCreator implements TabooLibLoader.Loader {
|
||||
continue;
|
||||
}
|
||||
}
|
||||
declaredField.setAccessible(true);
|
||||
Ref.forcedAccess(declaredField);
|
||||
try {
|
||||
InstanceData instanceData = new InstanceData(declaredField.getType().newInstance(), annotation);
|
||||
declaredField.set(instance, instanceData.getInstance());
|
||||
|
||||
@@ -8,6 +8,7 @@ import io.izzel.taboolib.module.config.TConfig;
|
||||
import io.izzel.taboolib.module.locale.logger.TLogger;
|
||||
import io.izzel.taboolib.module.packet.TPacketHandler;
|
||||
import io.izzel.taboolib.module.packet.TPacketListener;
|
||||
import io.izzel.taboolib.util.Ref;
|
||||
import io.izzel.taboolib.util.lite.cooldown.Cooldown;
|
||||
import io.izzel.taboolib.util.lite.cooldown.Cooldowns;
|
||||
import org.bukkit.Bukkit;
|
||||
@@ -179,8 +180,8 @@ public class TInjectLoader implements TabooLibLoader.Loader {
|
||||
}
|
||||
|
||||
public void inject(Plugin plugin, Field field, Object instance, TInject annotation, TInjectTask injectTask, Class pluginClass) {
|
||||
Ref.forcedAccess(field);
|
||||
try {
|
||||
field.setAccessible(true);
|
||||
injectTask.run(plugin, field, annotation, pluginClass, instance);
|
||||
TabooLibAPI.debug(field.getName() + " injected. (" + field.getType().getName() + ")");
|
||||
} catch (Throwable e) {
|
||||
|
||||
Reference in New Issue
Block a user