502647092/TabooLib
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

1.14 supported

Browse Source
This commit is contained in:
坏黑
2019-06-24 16:59:45 +08:00
parent f66b32a2ac
commit 483bba8f0a
8 changed files with 111 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/scala/com/ilummc/tlib/TLib.java
View File

@@ -87,7 +87,7 @@ public class TLib {
public static void injectPluginManager() {
if (!tLib.isInjectEnabled() || tLib.isBlackListPluginExists()) {
TLocale.Logger.fatal("TLIB.INJECTION-DISABLED");
TLocale.Logger.warn("TLIB.INJECTION-DISABLED");
Arrays.stream(Bukkit.getPluginManager().getPlugins()).filter(plugin -> plugin != Main.getInst()).forEach(plugin -> TDependencyInjector.inject(plugin, plugin));
return;
}

83
src/main/scala/me/skymc/taboolib/common/io/IOUtils.java Normal file
View File

@@ -0,0 +1,83 @@
package me.skymc.taboolib.common.io;
import java.io.*;
import java.net.HttpURLConnection;
import java.net.ServerSocket;
import java.net.Socket;
import java.net.URLConnection;
import java.nio.channels.Selector;
/**
* from org.apache.commons.io
* support for 1.14
*/
public class IOUtils {
public static void close(URLConnection v) {
if (v instanceof HttpURLConnection) {
((HttpURLConnection)v).disconnect();
}
}
public static void closeQuietly(Reader v) {
closeQuietly((Closeable)v);
}
public static void closeQuietly(Writer v) {
closeQuietly((Closeable)v);
}
public static void closeQuietly(InputStream v) {
closeQuietly((Closeable)v);
}
public static void closeQuietly(OutputStream v) {
closeQuietly((Closeable)v);
}
public static void closeQuietly(Closeable v) {
try {
if (v != null) {
v.close();
}
} catch (IOException ignored) {
}
}
public static void closeQuietly(Closeable... v) {
if (v != null) {
int var2 = v.length;
for (Closeable var4 : v) {
closeQuietly(var4);
}
}
}
public static void closeQuietly(Socket v) {
if (v != null) {
try {
v.close();
} catch (IOException ignored) {
}
}
}
public static void closeQuietly(Selector v) {
if (v != null) {
try {
v.close();
} catch (IOException ignored) {
}
}
}
public static void closeQuietly(ServerSocket v) {
if (v != null) {
try {
v.close();
} catch (IOException ignored) {
}
}
}
}

10
src/main/scala/me/skymc/taboolib/common/nms/NMSHandlerImpl.java
View File

@@ -73,10 +73,16 @@ public class NMSHandlerImpl extends NMSHandler {
name += ".effect." + ((net.minecraft.server.v1_8_R3.ItemStack) nmsItem).getTag().getString("Potion").replaceAll("minecraft:(strong_|long_)?", "");
}
return name;
} else {
} else if (TabooLib.getVersionNumber() >= 11100) {
String name = ((net.minecraft.server.v1_12_R1.ItemStack) nmsItem).getItem().a((net.minecraft.server.v1_12_R1.ItemStack) nmsItem);
if (itemStack.getItemMeta() instanceof PotionMeta) {
return name.replace("item.", "") + ".effect." + ((net.minecraft.server.v1_8_R3.ItemStack) nmsItem).getTag().getString("Potion").replaceAll("minecraft:(strong_|long_)?", "");
return name.replace("item.", "") + ".effect." + ((net.minecraft.server.v1_8_R3.ItemStack) nmsItem).getTag().getString("Potion").replaceAll("(minecraft:)?(strong_|long_)?", "");
}
return name + ".name";
} else {
String name = ((net.minecraft.server.v1_8_R3.ItemStack) nmsItem).getItem().getName();
if (itemStack.getItemMeta() instanceof PotionMeta) {
return name.replace("item.", "") + ".effect." + ((net.minecraft.server.v1_8_R3.ItemStack) nmsItem).getTag().getString("Potion").replaceAll("(minecraft:)?(strong_|long_)?", "");
}
return name + ".name";
}

17
src/main/scala/me/skymc/taboolib/common/util/SimpleI18n.java
View File

@@ -5,12 +5,14 @@ import me.skymc.taboolib.Main;
import me.skymc.taboolib.TabooLib;
import me.skymc.taboolib.common.function.TFunction;
import me.skymc.taboolib.common.nms.NMSHandler;
import me.skymc.taboolib.common.nms.nbt.NBTCompound;
import me.skymc.taboolib.fileutils.ConfigUtils;
import me.skymc.taboolib.fileutils.FileUtils;
import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.entity.Entity;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.BookMeta;
import org.bukkit.inventory.meta.ItemMeta;
import org.bukkit.inventory.meta.SpawnEggMeta;
import org.bukkit.plugin.Plugin;
@@ -62,8 +64,19 @@ public class SimpleI18n {
if (item == null) {
return "-";
}
if (TabooLib.getVersionNumber() < 11300) {
ItemMeta itemMeta = item.getItemMeta();
ItemMeta itemMeta = item.getItemMeta();
if (itemMeta instanceof BookMeta && ((BookMeta) itemMeta).getTitle() != null) {
return ((BookMeta) itemMeta).getTitle();
}
if (TabooLib.getVersionNumber() < 11100) {
if (item.getType().name().equals("MONSTER_EGG")) {
NBTCompound nbtCompound = NMSHandler.getHandler().loadNBT(item);
if (nbtCompound.containsKey("EntityTag")) {
return lang.getString("item_monsterPlacer_name") + " " + lang.getString("entity_" + nbtCompound.get("EntityTag").asCompound().get("id").asString() + "_name");
}
return lang.getString("item_monsterPlacer_name");
}
} else if (TabooLib.getVersionNumber() < 11300) {
if (itemMeta instanceof SpawnEggMeta) {
String spawnEggType = lang.getString("entity_" + ((SpawnEggMeta) itemMeta).getSpawnedType().getEntityClass().getSimpleName().replace(".", "_") + "_name");
if (spawnEggType != null) {

2
src/main/scala/me/skymc/taboolib/fileutils/FileUtils.java
View File

@@ -5,7 +5,7 @@ import com.ilummc.eagletdl.EagletTask;
import com.ilummc.eagletdl.ProgressEvent;
import com.ilummc.tlib.resources.TLocale;
import me.skymc.taboolib.Main;
import org.apache.commons.io.IOUtils;
import me.skymc.taboolib.common.io.IOUtils;
import org.bukkit.plugin.Plugin;
import java.io.*;