diff --git a/Artifacts/SubServers.Bungee.jar b/Artifacts/SubServers.Bungee.jar index e5538c2d..d8ff6585 100644 Binary files a/Artifacts/SubServers.Bungee.jar and b/Artifacts/SubServers.Bungee.jar differ diff --git a/Artifacts/SubServers.Client.Bukkit.jar b/Artifacts/SubServers.Client.Bukkit.jar index 15b5bf3c..1e661e6b 100644 Binary files a/Artifacts/SubServers.Client.Bukkit.jar and b/Artifacts/SubServers.Client.Bukkit.jar differ diff --git a/Artifacts/SubServers.Host.jar b/Artifacts/SubServers.Host.jar index 84dc06de..295e65f5 100644 Binary files a/Artifacts/SubServers.Host.jar and b/Artifacts/SubServers.Host.jar differ diff --git a/Artifacts/SubServers.Sync.jar b/Artifacts/SubServers.Sync.jar index 0643bcb5..6869bf09 100644 Binary files a/Artifacts/SubServers.Sync.jar and b/Artifacts/SubServers.Sync.jar differ diff --git a/Javadoc/SubServers.Bungee.jar b/Javadoc/SubServers.Bungee.jar index 152699c2..6db0b7d8 100644 Binary files a/Javadoc/SubServers.Bungee.jar and b/Javadoc/SubServers.Bungee.jar differ diff --git a/Javadoc/SubServers.Client.Bukkit.jar b/Javadoc/SubServers.Client.Bukkit.jar index 51f1abfd..b2cccc75 100644 Binary files a/Javadoc/SubServers.Client.Bukkit.jar and b/Javadoc/SubServers.Client.Bukkit.jar differ diff --git a/Javadoc/SubServers.Host.jar b/Javadoc/SubServers.Host.jar index 5c6dd6ff..39a91b02 100644 Binary files a/Javadoc/SubServers.Host.jar and b/Javadoc/SubServers.Host.jar differ diff --git a/Javadoc/SubServers.Sync.jar b/Javadoc/SubServers.Sync.jar index 34769ebc..8100adb5 100644 Binary files a/Javadoc/SubServers.Sync.jar and b/Javadoc/SubServers.Sync.jar differ diff --git a/SubServers.Bungee/src.jar b/SubServers.Bungee/src.jar index 05bad73b..0e437ef3 100644 Binary files a/SubServers.Bungee/src.jar and b/SubServers.Bungee/src.jar differ diff --git a/SubServers.Bungee/src/META-INF/MANIFEST.MF b/SubServers.Bungee/src/META-INF/MANIFEST.MF index b0abdc0e..415939a1 100644 --- a/SubServers.Bungee/src/META-INF/MANIFEST.MF +++ b/SubServers.Bungee/src/META-INF/MANIFEST.MF @@ -2,4 +2,4 @@ Manifest-Version: 1.0 Class-Path: BungeeCord.jar Waterfall.jar Main-Class: net.ME1312.SubServers.Bungee.Launch Implementation-Title: SubServers.Bungee -Specification-Title: 18w29m +Specification-Title: 18w29s diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Files/Templates/vanilla.zip b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Files/Templates/vanilla.zip index 20346019..ab21f34b 100644 Binary files a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Files/Templates/vanilla.zip and b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Files/Templates/vanilla.zip differ diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubPlugin.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubPlugin.java index 35bd51d5..883a67b4 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubPlugin.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubPlugin.java @@ -58,8 +58,8 @@ public final class SubPlugin extends BungeeCord implements Listener { public final SubAPI api = new SubAPI(this); public SubDataServer subdata = null; public SubServer sudo = null; - public static final Version version = Version.fromString("2.13a/pr4"); - //public static final Version version = new Version(Version.fromString("2.13a/pr5"), VersionType.SNAPSHOT, (SubPlugin.class.getPackage().getSpecificationTitle() == null)?"?":SubPlugin.class.getPackage().getSpecificationTitle()); // TODO Snapshot Version + //public static final Version version = Version.fromString("2.13a/pr4"); + public static final Version version = new Version(Version.fromString("2.13a/pr5"), VersionType.SNAPSHOT, (SubPlugin.class.getPackage().getSpecificationTitle() == null)?"?":SubPlugin.class.getPackage().getSpecificationTitle()); // TODO Snapshot Version public boolean redis = false; public boolean canSudo = true; diff --git a/SubServers.Client/Bukkit/src.jar b/SubServers.Client/Bukkit/src.jar index 3eee2ab8..c28f0bc6 100644 Binary files a/SubServers.Client/Bukkit/src.jar and b/SubServers.Client/Bukkit/src.jar differ diff --git a/SubServers.Client/Bukkit/src/META-INF/MANIFEST.MF b/SubServers.Client/Bukkit/src/META-INF/MANIFEST.MF index ec852cef..5ea6dd2f 100644 --- a/SubServers.Client/Bukkit/src/META-INF/MANIFEST.MF +++ b/SubServers.Client/Bukkit/src/META-INF/MANIFEST.MF @@ -1,3 +1,3 @@ Manifest-Version: 1.0 Implementation-Title: SubServers.Client.Bukkit -Specification-Title: 18w29m +Specification-Title: 18w29s diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Graphic/UIRenderer.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Graphic/UIRenderer.java index 5284f980..c3f4d10e 100644 --- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Graphic/UIRenderer.java +++ b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Graphic/UIRenderer.java @@ -224,11 +224,28 @@ public abstract class UIRenderer { // minecraft:name if (item.get().toLowerCase().startsWith("minecraft:")) { item.set(item.get().substring(10)); + } else + + // bukkit:name + if (item.get().toLowerCase().startsWith("bukkit:")) { + item.set(item.get().substring(7)); + + if (!Util.isException(() -> Material.valueOf(item.get().toUpperCase()))) { + return new ItemStack(Material.valueOf(item.get().toUpperCase()), 1); + } } - // bukkit name - if (!Util.isException(() -> Material.valueOf(item.get().toUpperCase()))) { - return new ItemStack(Material.valueOf(item.get().toUpperCase()), 1); - } + + // material name + if (plugin.api.getGameVersion().compareTo(new Version("1.13")) < 0) { + if (!Util.isException(() -> Material.valueOf(item.get().toUpperCase()))) { + return new ItemStack(Material.valueOf(item.get().toUpperCase()), 1); + } + } else try { + if (Material.class.getMethod("getMaterial", String.class, boolean.class).invoke(null, item.get().toUpperCase(), false) != null) { + return new ItemStack((Material) Material.class.getMethod("getMaterial", String.class, boolean.class).invoke(null, item.get().toUpperCase(), false), 1); + } + } catch (Exception e) {} + // vault name if (!Util.isException(() -> Class.forName("net.milkbowl.vault.item.Items"))) { net.milkbowl.vault.item.ItemInfo info = net.milkbowl.vault.item.Items.itemByString(item.get()); diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/SubPlugin.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/SubPlugin.java index ebc5d147..406cbd40 100644 --- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/SubPlugin.java +++ b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/SubPlugin.java @@ -46,8 +46,8 @@ public final class SubPlugin extends JavaPlugin { public SubPlugin() { super(); - version = Version.fromString(getDescription().getVersion()); - //version = new Version(Version.fromString(getDescription().getVersion()), VersionType.SNAPSHOT, (SubPlugin.class.getPackage().getSpecificationTitle() == null)?"?":SubPlugin.class.getPackage().getSpecificationTitle()); // TODO Snapshot Version + //version = Version.fromString(getDescription().getVersion()); + version = new Version(Version.fromString(getDescription().getVersion()), VersionType.SNAPSHOT, (SubPlugin.class.getPackage().getSpecificationTitle() == null)?"?":SubPlugin.class.getPackage().getSpecificationTitle()); // TODO Snapshot Version } /** diff --git a/SubServers.Client/Bukkit/src/plugin.yml b/SubServers.Client/Bukkit/src/plugin.yml index e9424d91..e4c17947 100644 --- a/SubServers.Client/Bukkit/src/plugin.yml +++ b/SubServers.Client/Bukkit/src/plugin.yml @@ -1,6 +1,6 @@ name: 'SubServers-Client-Bukkit' main: 'net.ME1312.SubServers.Client.Bukkit.SubPlugin' -version: '2.13a/pr4' +version: '2.13a/pr5' authors: [ME1312] softdepend: [Vault, TitleManager] website: 'http://www.ME1312.net/' diff --git a/SubServers.Host/src.jar b/SubServers.Host/src.jar index 9218aaf6..a96dae5d 100644 Binary files a/SubServers.Host/src.jar and b/SubServers.Host/src.jar differ diff --git a/SubServers.Host/src/META-INF/MANIFEST.MF b/SubServers.Host/src/META-INF/MANIFEST.MF index 517226b6..c5fe5d47 100644 --- a/SubServers.Host/src/META-INF/MANIFEST.MF +++ b/SubServers.Host/src/META-INF/MANIFEST.MF @@ -1,4 +1,4 @@ Manifest-Version: 1.0 Main-Class: net.ME1312.SubServers.Host.ExHost Implementation-Title: SubServers.Host -Specification-Title: 18w29m +Specification-Title: 18w29s diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/ExHost.java b/SubServers.Host/src/net/ME1312/SubServers/Host/ExHost.java index 96509d78..2130b4f7 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/ExHost.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/ExHost.java @@ -54,8 +54,8 @@ public final class ExHost { public SubDataClient subdata = null; public final SubAPI api = new SubAPI(this); - public static final Version version = Version.fromString("2.13a/pr4"); - //public static final Version version = new Version(Version.fromString("2.13a/pr5"), VersionType.SNAPSHOT, (ExHost.class.getPackage().getSpecificationTitle() == null)?"?":ExHost.class.getPackage().getSpecificationTitle()); // TODO Snapshot Version + //public static final Version version = Version.fromString("2.13a/pr4"); + public static final Version version = new Version(Version.fromString("2.13a/pr5"), VersionType.SNAPSHOT, (ExHost.class.getPackage().getSpecificationTitle() == null)?"?":ExHost.class.getPackage().getSpecificationTitle()); // TODO Snapshot Version private ConsoleReader jline; private boolean running = false; diff --git a/SubServers.Sync/src.jar b/SubServers.Sync/src.jar index ad64dce0..709dbbe5 100644 Binary files a/SubServers.Sync/src.jar and b/SubServers.Sync/src.jar differ diff --git a/SubServers.Sync/src/META-INF/MANIFEST.MF b/SubServers.Sync/src/META-INF/MANIFEST.MF index 351ada1f..91474f1f 100644 --- a/SubServers.Sync/src/META-INF/MANIFEST.MF +++ b/SubServers.Sync/src/META-INF/MANIFEST.MF @@ -2,4 +2,4 @@ Manifest-Version: 1.0 Class-Path: BungeeCord.jar Waterfall.jar Main-Class: net.ME1312.SubServers.Sync.Launch Implementation-Title: SubServers.Sync -Specification-Title: 18w29m +Specification-Title: 18w29s diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/SubPlugin.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/SubPlugin.java index 0cd05a03..05bdf4af 100644 --- a/SubServers.Sync/src/net/ME1312/SubServers/Sync/SubPlugin.java +++ b/SubServers.Sync/src/net/ME1312/SubServers/Sync/SubPlugin.java @@ -48,8 +48,8 @@ public final class SubPlugin extends BungeeCord implements Listener { public boolean redis = false; public final SubAPI api = new SubAPI(this); public SubDataClient subdata = null; - public static final Version version = Version.fromString("2.13a/pr4"); - //public static final Version version = new Version(Version.fromString("2.13a/pr5"), VersionType.SNAPSHOT, (SubPlugin.class.getPackage().getSpecificationTitle() == null)?"?":SubPlugin.class.getPackage().getSpecificationTitle()); // TODO Snapshot Version + //public static final Version version = Version.fromString("2.13a/pr4"); + public static final Version version = new Version(Version.fromString("2.13a/pr5"), VersionType.SNAPSHOT, (SubPlugin.class.getPackage().getSpecificationTitle() == null)?"?":SubPlugin.class.getPackage().getSpecificationTitle()); // TODO Snapshot Version public final boolean isPatched; public long lastReload = -1;