mirror of
https://github.com/songoda/EpicBuckets.git
synced 2024-06-26 06:34:59 +02:00
Cleanup.
This commit is contained in:
Brianna O'Keefe
parent
2130776df9
commit
bdda96eb8e
|
|
@ -1,8 +1,8 @@
|
|||
package com.songoda.epicbuckets.util.gui;
|
||||
package com.songoda.epicbuckets.utils.gui;
|
||||
|
||||
import com.songoda.epicbuckets.EpicBuckets;
|
||||
import com.songoda.epicbuckets.util.ServerVersion;
|
||||
import com.songoda.epicbuckets.util.version.NMSUtil;
|
||||
import com.songoda.epicbuckets.utils.ServerVersion;
|
||||
import com.songoda.epicbuckets.utils.version.NMSUtil;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.Sound;
|
||||
import org.bukkit.entity.Player;
|
||||
|
|
@ -94,7 +94,8 @@ public class AbstractAnvilGUI {
|
|||
if (!inv.equals(AbstractAnvilGUI.this.inv)) return;
|
||||
inv.clear();
|
||||
OnClose onClose = getOnClose();
|
||||
if (EpicBuckets.getInstance().isServerVersionAtLeast(ServerVersion.V1_9)) player.playSound(player.getLocation(), closeSound, 1F, 1F);
|
||||
if (EpicBuckets.getInstance().isServerVersionAtLeast(ServerVersion.V1_9))
|
||||
player.playSound(player.getLocation(), closeSound, 1F, 1F);
|
||||
Bukkit.getScheduler().scheduleSyncDelayedTask(EpicBuckets.getInstance(), () -> {
|
||||
if (onClose != null) onClose.OnClose(player, inv);
|
||||
destroy();
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
package com.songoda.epicbuckets.util.gui;
|
||||
package com.songoda.epicbuckets.utils.gui;
|
||||
|
||||
import com.songoda.arconix.api.methods.formatting.TextComponent;
|
||||
import com.songoda.epicbuckets.EpicBuckets;
|
||||
import com.songoda.epicbuckets.util.ServerVersion;
|
||||
import com.songoda.epicbuckets.utils.ServerVersion;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.ChatColor;
|
||||
import org.bukkit.Material;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
package com.songoda.epicbuckets.util.gui;
|
||||
package com.songoda.epicbuckets.utils.gui;
|
||||
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.event.inventory.ClickType;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
package com.songoda.epicbuckets.util.gui;
|
||||
package com.songoda.epicbuckets.utils.gui;
|
||||
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.inventory.Inventory;
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
package com.songoda.epicbuckets.util.gui;
|
||||
package com.songoda.epicbuckets.utils.gui;
|
||||
|
||||
import com.songoda.epicbuckets.EpicBuckets;
|
||||
import com.songoda.epicbuckets.util.ServerVersion;
|
||||
import com.songoda.epicbuckets.utils.ServerVersion;
|
||||
import org.bukkit.Sound;
|
||||
import org.bukkit.event.inventory.ClickType;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
package com.songoda.epicbuckets.util.itemnbtapi;
|
||||
package com.songoda.epicbuckets.utils.itemnbtapi;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
|
||||
|
|
@ -16,9 +16,7 @@ NMS_MOJANGSONPARSER("net.minecraft.server.", ".MojangsonParser"),
|
|||
NMS_TILEENTITY("net.minecraft.server.", ".TileEntity"),
|
||||
NMS_BLOCKPOSITION("net.minecraft.server.", ".BlockPosition"),
|
||||
NMS_WORLD("net.minecraft.server.", ".WorldServer"),
|
||||
NMS_ENTITY("net.minecraft.server.", ".Entity"),
|
||||
;
|
||||
|
||||
NMS_ENTITY("net.minecraft.server.", ".Entity"),;
|
||||
|
||||
|
||||
private Class<?> clazz;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
package com.songoda.epicbuckets.util.itemnbtapi;
|
||||
package com.songoda.epicbuckets.utils.itemnbtapi;
|
||||
|
||||
import com.songoda.epicbuckets.util.itemnbtapi.utils.MinecraftVersion;
|
||||
import com.songoda.epicbuckets.utils.itemnbtapi.utils.MinecraftVersion;
|
||||
|
||||
import java.util.Set;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
package com.songoda.epicbuckets.util.itemnbtapi;
|
||||
package com.songoda.epicbuckets.utils.itemnbtapi;
|
||||
|
||||
public class NBTContainer extends NBTCompound {
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
package com.songoda.epicbuckets.util.itemnbtapi;
|
||||
package com.songoda.epicbuckets.utils.itemnbtapi;
|
||||
|
||||
import org.bukkit.entity.Entity;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
package com.songoda.epicbuckets.util.itemnbtapi;
|
||||
package com.songoda.epicbuckets.utils.itemnbtapi;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.FileInputStream;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
package com.songoda.epicbuckets.util.itemnbtapi;
|
||||
package com.songoda.epicbuckets.utils.itemnbtapi;
|
||||
|
||||
import org.bukkit.inventory.ItemStack;
|
||||
|
||||
|
|
@ -14,6 +14,14 @@ public class NBTItem extends NBTCompound {
|
|||
bukkitItem = item.clone();
|
||||
}
|
||||
|
||||
public static NBTContainer convertItemtoNBT(ItemStack item) {
|
||||
return NBTReflectionUtil.convertNMSItemtoNBTCompound(ReflectionMethod.ITEMSTACK_NMSCOPY.run(null, item));
|
||||
}
|
||||
|
||||
public static ItemStack convertNBTtoItem(NBTCompound comp) {
|
||||
return (ItemStack) ReflectionMethod.ITEMSTACK_BUKKITMIRROR.run(null, NBTReflectionUtil.convertNBTCompoundtoNMSItem(comp));
|
||||
}
|
||||
|
||||
protected Object getCompound() {
|
||||
return NBTReflectionUtil.getItemRootNBTTagCompound(ReflectionMethod.ITEMSTACK_NMSCOPY.run(null, bukkitItem));
|
||||
}
|
||||
|
|
@ -32,7 +40,6 @@ public class NBTItem extends NBTCompound {
|
|||
bukkitItem = item;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* This may return true even when the NBT is empty.
|
||||
*
|
||||
|
|
@ -42,12 +49,4 @@ public class NBTItem extends NBTCompound {
|
|||
return getCompound() != null;
|
||||
}
|
||||
|
||||
public static NBTContainer convertItemtoNBT(ItemStack item){
|
||||
return NBTReflectionUtil.convertNMSItemtoNBTCompound(ReflectionMethod.ITEMSTACK_NMSCOPY.run(null, item));
|
||||
}
|
||||
|
||||
public static ItemStack convertNBTtoItem(NBTCompound comp){
|
||||
return (ItemStack) ReflectionMethod.ITEMSTACK_BUKKITMIRROR.run(null, NBTReflectionUtil.convertNBTCompoundtoNMSItem(comp));
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
package com.songoda.epicbuckets.util.itemnbtapi;
|
||||
package com.songoda.epicbuckets.utils.itemnbtapi;
|
||||
|
||||
public class NBTList {
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
package com.songoda.epicbuckets.util.itemnbtapi;
|
||||
package com.songoda.epicbuckets.utils.itemnbtapi;
|
||||
|
||||
import java.util.HashSet;
|
||||
import java.util.Set;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,9 @@
|
|||
package com.songoda.epicbuckets.util.itemnbtapi;
|
||||
package com.songoda.epicbuckets.utils.itemnbtapi;
|
||||
|
||||
import com.songoda.epicbuckets.utils.itemnbtapi.utils.GsonWrapper;
|
||||
import com.songoda.epicbuckets.utils.itemnbtapi.utils.MinecraftVersion;
|
||||
import org.bukkit.block.BlockState;
|
||||
import org.bukkit.entity.Entity;
|
||||
|
||||
import java.io.FileInputStream;
|
||||
import java.io.FileOutputStream;
|
||||
|
|
@ -7,11 +12,6 @@ import java.lang.reflect.Method;
|
|||
import java.util.Set;
|
||||
import java.util.Stack;
|
||||
|
||||
import com.songoda.epicbuckets.util.itemnbtapi.utils.GsonWrapper;
|
||||
import com.songoda.epicbuckets.util.itemnbtapi.utils.MinecraftVersion;
|
||||
import org.bukkit.block.BlockState;
|
||||
import org.bukkit.entity.Entity;
|
||||
|
||||
public class NBTReflectionUtil {
|
||||
|
||||
public static Object getNMSEntity(Entity entity) {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
package com.songoda.epicbuckets.util.itemnbtapi;
|
||||
package com.songoda.epicbuckets.utils.itemnbtapi;
|
||||
|
||||
import org.bukkit.block.BlockState;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
package com.songoda.epicbuckets.util.itemnbtapi;
|
||||
package com.songoda.epicbuckets.utils.itemnbtapi;
|
||||
|
||||
public enum NBTType {
|
||||
NBTTagEnd(0),
|
||||
|
|
@ -14,14 +14,10 @@ public enum NBTType {
|
|||
NBTTagList(9),
|
||||
NBTTagCompound(10);
|
||||
|
||||
NBTType(int i) {
|
||||
id = i;
|
||||
}
|
||||
|
||||
private final int id;
|
||||
|
||||
public int getId() {
|
||||
return id;
|
||||
NBTType(int i) {
|
||||
id = i;
|
||||
}
|
||||
|
||||
public static NBTType valueOf(int id) {
|
||||
|
|
@ -31,4 +27,8 @@ public enum NBTType {
|
|||
return NBTType.NBTTagEnd;
|
||||
}
|
||||
|
||||
public int getId() {
|
||||
return id;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
package com.songoda.epicbuckets.util.itemnbtapi;
|
||||
package com.songoda.epicbuckets.utils.itemnbtapi;
|
||||
|
||||
import java.lang.reflect.Constructor;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
package com.songoda.epicbuckets.util.itemnbtapi;
|
||||
package com.songoda.epicbuckets.utils.itemnbtapi;
|
||||
|
||||
import com.songoda.epicbuckets.utils.itemnbtapi.utils.MinecraftVersion;
|
||||
import org.bukkit.inventory.ItemStack;
|
||||
|
||||
import java.io.InputStream;
|
||||
import java.io.OutputStream;
|
||||
import java.lang.reflect.Method;
|
||||
|
||||
import com.songoda.epicbuckets.util.itemnbtapi.utils.MinecraftVersion;
|
||||
import org.bukkit.inventory.ItemStack;
|
||||
|
||||
public enum ReflectionMethod {
|
||||
|
||||
COMPOUND_SET_FLOAT(ClassWrapper.NMS_NBTTAGCOMPOUND.getClazz(), new Class[]{String.class, float.class}, MinecraftVersion.MC1_7_R4, new Since(MinecraftVersion.MC1_7_R4, "setFloat")),
|
||||
|
|
@ -63,9 +63,7 @@ public enum ReflectionMethod {
|
|||
NBTFILE_WRITE(ClassWrapper.NMS_NBTCOMPRESSEDSTREAMTOOLS.getClazz(), new Class[]{ClassWrapper.NMS_NBTTAGCOMPOUND.getClazz(), OutputStream.class}, MinecraftVersion.MC1_7_R4, new Since(MinecraftVersion.MC1_7_R4, "a")), //FIXME: No Spigot mapping!
|
||||
|
||||
|
||||
PARSE_NBT(ClassWrapper.NMS_MOJANGSONPARSER.getClazz(), new Class[]{String.class}, MinecraftVersion.MC1_7_R4, new Since(MinecraftVersion.MC1_7_R4, "parse")),
|
||||
|
||||
;
|
||||
PARSE_NBT(ClassWrapper.NMS_MOJANGSONPARSER.getClazz(), new Class[]{String.class}, MinecraftVersion.MC1_7_R4, new Since(MinecraftVersion.MC1_7_R4, "parse")),;
|
||||
|
||||
private Since targetVersion;
|
||||
private Method method;
|
||||
|
|
@ -111,6 +109,7 @@ public enum ReflectionMethod {
|
|||
public static class Since {
|
||||
public final MinecraftVersion version;
|
||||
public final String name;
|
||||
|
||||
public Since(MinecraftVersion version, String name) {
|
||||
this.version = version;
|
||||
this.name = name;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
package com.songoda.epicbuckets.util.itemnbtapi.utils;
|
||||
package com.songoda.epicbuckets.utils.itemnbtapi.utils;
|
||||
|
||||
import com.google.gson.Gson;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
package com.songoda.epicbuckets.util.itemnbtapi.utils;
|
||||
package com.songoda.epicbuckets.utils.itemnbtapi.utils;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
|
||||
|
|
@ -23,10 +23,6 @@ public enum MinecraftVersion {
|
|||
this.versionId = versionId;
|
||||
}
|
||||
|
||||
public int getVersionId() {
|
||||
return versionId;
|
||||
}
|
||||
|
||||
public static MinecraftVersion getVersion() {
|
||||
if (version != null) {
|
||||
return version;
|
||||
|
|
@ -59,4 +55,8 @@ public enum MinecraftVersion {
|
|||
return hasGsonSupport;
|
||||
}
|
||||
|
||||
public int getVersionId() {
|
||||
return versionId;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
package com.songoda.epicbuckets.util.version;
|
||||
package com.songoda.epicbuckets.utils.version;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.entity.Player;
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user