This commit is contained in:
Xanadu13
2024-03-17 20:40:08 +08:00
parent 3d617506d3
commit f4a1bc13da
27 changed files with 81 additions and 115 deletions
@@ -1,12 +1,12 @@
package pers.xanadu.enderdragon.nms.BossBar;
import org.bukkit.World;
import pers.xanadu.enderdragon.metadata.MyDragon;
import java.util.List;
public interface I_BossBarManager {
void saveBossBarData(List<World> worlds);
void loadBossBarData(List<World> worlds);
void setBossBar(World world, final MyDragon myDragon);
}
package pers.xanadu.enderdragon.nms.BossBar;
import org.bukkit.World;
import pers.xanadu.enderdragon.metadata.MyDragon;
import java.util.List;
public interface IBossBarManager {
void saveBossBarData(List<World> worlds);
void loadBossBarData(List<World> worlds);
void setBossBar(World world, final MyDragon myDragon);
}
@@ -9,7 +9,7 @@ import org.bukkit.craftbukkit.v1_12_R1.util.CraftChatMessage;
import pers.xanadu.enderdragon.config.Lang;
import pers.xanadu.enderdragon.manager.DragonManager;
import pers.xanadu.enderdragon.metadata.MyDragon;
import pers.xanadu.enderdragon.nms.BossBar.I_BossBarManager;
import pers.xanadu.enderdragon.nms.BossBar.IBossBarManager;
import java.io.File;
import java.io.IOException;
@@ -18,7 +18,7 @@ import java.util.List;
import static pers.xanadu.enderdragon.EnderDragon.plugin;
public class BossBarManager implements I_BossBarManager {
public class BossBarManager implements IBossBarManager {
private Field BossBattleServer = null;
public void saveBossBarData(List<World> worlds){
File file = new File(plugin.getDataFolder(),"world_data.yml");
@@ -9,7 +9,7 @@ import org.bukkit.craftbukkit.v1_13_R1.util.CraftChatMessage;
import pers.xanadu.enderdragon.config.Lang;
import pers.xanadu.enderdragon.manager.DragonManager;
import pers.xanadu.enderdragon.metadata.MyDragon;
import pers.xanadu.enderdragon.nms.BossBar.I_BossBarManager;
import pers.xanadu.enderdragon.nms.BossBar.IBossBarManager;
import java.io.File;
import java.io.IOException;
@@ -18,7 +18,7 @@ import java.util.List;
import static pers.xanadu.enderdragon.EnderDragon.plugin;
public class BossBarManager implements I_BossBarManager {
public class BossBarManager implements IBossBarManager {
private Field BossBattleServer = null;
public void saveBossBarData(List<World> worlds){
File file = new File(plugin.getDataFolder(),"world_data.yml");
@@ -9,7 +9,7 @@ import org.bukkit.craftbukkit.v1_13_R2.util.CraftChatMessage;
import pers.xanadu.enderdragon.config.Lang;
import pers.xanadu.enderdragon.manager.DragonManager;
import pers.xanadu.enderdragon.metadata.MyDragon;
import pers.xanadu.enderdragon.nms.BossBar.I_BossBarManager;
import pers.xanadu.enderdragon.nms.BossBar.IBossBarManager;
import java.io.File;
import java.io.IOException;
@@ -18,7 +18,7 @@ import java.util.List;
import static pers.xanadu.enderdragon.EnderDragon.plugin;
public class BossBarManager implements I_BossBarManager {
public class BossBarManager implements IBossBarManager {
private Field BossBattleServer = null;
public void saveBossBarData(List<World> worlds){
File file = new File(plugin.getDataFolder(),"world_data.yml");
@@ -9,7 +9,7 @@ import org.bukkit.craftbukkit.v1_14_R1.util.CraftChatMessage;
import pers.xanadu.enderdragon.config.Lang;
import pers.xanadu.enderdragon.manager.DragonManager;
import pers.xanadu.enderdragon.metadata.MyDragon;
import pers.xanadu.enderdragon.nms.BossBar.I_BossBarManager;
import pers.xanadu.enderdragon.nms.BossBar.IBossBarManager;
import java.io.File;
import java.io.IOException;
@@ -18,7 +18,7 @@ import java.util.List;
import static pers.xanadu.enderdragon.EnderDragon.plugin;
public class BossBarManager implements I_BossBarManager {
public class BossBarManager implements IBossBarManager {
private Field BossBattleServer = null;
public void saveBossBarData(List<World> worlds){
File file = new File(plugin.getDataFolder(),"world_data.yml");
@@ -9,7 +9,7 @@ import org.bukkit.craftbukkit.v1_15_R1.util.CraftChatMessage;
import pers.xanadu.enderdragon.config.Lang;
import pers.xanadu.enderdragon.manager.DragonManager;
import pers.xanadu.enderdragon.metadata.MyDragon;
import pers.xanadu.enderdragon.nms.BossBar.I_BossBarManager;
import pers.xanadu.enderdragon.nms.BossBar.IBossBarManager;
import java.io.File;
import java.io.IOException;
@@ -18,7 +18,7 @@ import java.util.List;
import static pers.xanadu.enderdragon.EnderDragon.plugin;
public class BossBarManager implements I_BossBarManager {
public class BossBarManager implements IBossBarManager {
private Field BossBattleServer = null;
public void saveBossBarData(List<World> worlds){
File file = new File(plugin.getDataFolder(),"world_data.yml");
@@ -6,7 +6,7 @@ import org.bukkit.configuration.InvalidConfigurationException;
import org.bukkit.configuration.file.YamlConfiguration;
import pers.xanadu.enderdragon.config.Lang;
import pers.xanadu.enderdragon.metadata.MyDragon;
import pers.xanadu.enderdragon.nms.BossBar.I_BossBarManager;
import pers.xanadu.enderdragon.nms.BossBar.IBossBarManager;
import java.io.File;
import java.io.IOException;
@@ -14,7 +14,7 @@ import java.util.List;
import static pers.xanadu.enderdragon.EnderDragon.plugin;
public class BossBarManager implements I_BossBarManager {
public class BossBarManager implements IBossBarManager {
public void saveBossBarData(List<World> worlds){
File file = new File(plugin.getDataFolder(),"world_data.yml");
YamlConfiguration yml = new YamlConfiguration();
@@ -1,15 +1,9 @@
package pers.xanadu.enderdragon.nms.NMSItem;
import org.bukkit.inventory.ItemStack;
import org.jetbrains.annotations.TestOnly;
public interface I_NMSItemManager {
ItemStack readAsItem(String nbt);
ItemStack cpdToItem(Object cpd);
@TestOnly
Object parseNBT(Object nbt_base);
@TestOnly
Object readAsNBTBase(String raw);
@TestOnly
Object getNBTBase(Object obj);
}
package pers.xanadu.enderdragon.nms.NMSItem;
import org.bukkit.inventory.ItemStack;
import org.jetbrains.annotations.TestOnly;
public interface INMSItemManager {
ItemStack readAsItem(String nbt);
ItemStack cpdToItem(Object cpd);
}
@@ -4,9 +4,9 @@ import net.minecraft.server.v1_12_R1.*;
import org.bukkit.Material;
import org.bukkit.craftbukkit.v1_12_R1.inventory.CraftItemStack;
import pers.xanadu.enderdragon.config.Lang;
import pers.xanadu.enderdragon.nms.NMSItem.I_NMSItemManager;
import pers.xanadu.enderdragon.nms.NMSItem.INMSItemManager;
public class NMSItemManager implements I_NMSItemManager {
public class NMSItemManager implements INMSItemManager {
public org.bukkit.inventory.ItemStack readAsItem(String nbt){
try {
@@ -22,14 +22,5 @@ public class NMSItemManager implements I_NMSItemManager {
ItemStack ei = new ItemStack((NBTTagCompound) cpd);
return CraftItemStack.asBukkitCopy(ei);
}
public Object parseNBT(Object nbt_base){
return CraftNBTTagConfigSerializer.serialize((NBTBase) nbt_base);
}
public Object readAsNBTBase(String raw){
return CraftNBTTagConfigSerializer.v1_12_R1_c(raw);
}
public Object getNBTBase(Object obj){
return CraftNBTTagConfigSerializer.deserialize(obj);
}
}
@@ -3,14 +3,13 @@ package pers.xanadu.enderdragon.nms.NMSItem.v1_13_R1;
import com.mojang.brigadier.exceptions.CommandSyntaxException;
import net.minecraft.server.v1_13_R1.ItemStack;
import net.minecraft.server.v1_13_R1.MojangsonParser;
import net.minecraft.server.v1_13_R1.NBTBase;
import net.minecraft.server.v1_13_R1.NBTTagCompound;
import org.bukkit.Material;
import org.bukkit.craftbukkit.v1_13_R1.inventory.CraftItemStack;
import pers.xanadu.enderdragon.config.Lang;
import pers.xanadu.enderdragon.nms.NMSItem.I_NMSItemManager;
import pers.xanadu.enderdragon.nms.NMSItem.INMSItemManager;
public class NMSItemManager implements I_NMSItemManager {
public class NMSItemManager implements INMSItemManager {
public org.bukkit.inventory.ItemStack readAsItem(String nbt){
try {
NBTTagCompound cpd = MojangsonParser.parse(nbt);
@@ -25,13 +24,4 @@ public class NMSItemManager implements I_NMSItemManager {
ItemStack ei = ItemStack.a((NBTTagCompound) cpd);
return CraftItemStack.asBukkitCopy(ei);
}
public Object parseNBT(Object nbt_base){
return CraftNBTTagConfigSerializer.serialize((NBTBase) nbt_base);
}
public Object readAsNBTBase(String raw){
return CraftNBTTagConfigSerializer.v1_13_R1_b(raw);
}
public Object getNBTBase(Object obj){
return CraftNBTTagConfigSerializer.deserialize(obj);
}
}
@@ -4,9 +4,9 @@ import org.bukkit.Material;
import org.bukkit.inventory.ItemStack;
import pers.xanadu.enderdragon.EnderDragon;
import pers.xanadu.enderdragon.config.Lang;
import pers.xanadu.enderdragon.nms.NMSItem.I_NMSItemManager;
import pers.xanadu.enderdragon.nms.NMSItem.INMSItemManager;
public class NMSItemManager implements I_NMSItemManager {
public class NMSItemManager implements INMSItemManager {
public ItemStack readAsItem(String nbt){
try {
return EnderDragon.getInstance().getNMSManager().getItemStack(nbt);
@@ -18,13 +18,4 @@ public class NMSItemManager implements I_NMSItemManager {
public ItemStack cpdToItem(Object cpd){
return EnderDragon.getInstance().getNMSManager().getItemStack(cpd);
}
public Object parseNBT(Object nbt_base){
return EnderDragon.getInstance().getNMSManager().serializeNBTBase(nbt_base);
}
public Object readAsNBTBase(String raw){
return EnderDragon.getInstance().getNMSManager().StringParseLiteral(raw);
}
public Object getNBTBase(Object obj){
return EnderDragon.getInstance().getNMSManager().deserializeObject(obj);
}
}
@@ -1,7 +1,7 @@
package pers.xanadu.enderdragon.nms.RespawnAnchor;
import org.bukkit.World;
public interface I_RespawnAnchorManager {
boolean isRespawnAnchorWorks(World world);
}
package pers.xanadu.enderdragon.nms.RespawnAnchor;
import org.bukkit.World;
public interface IRespawnAnchorManager {
boolean isRespawnAnchorWorks(World world);
}
@@ -3,9 +3,9 @@ package pers.xanadu.enderdragon.nms.RespawnAnchor.v1_16_R1;
import net.minecraft.server.v1_16_R1.DimensionManager;
import org.bukkit.World;
import org.bukkit.craftbukkit.v1_16_R1.CraftWorld;
import pers.xanadu.enderdragon.nms.RespawnAnchor.I_RespawnAnchorManager;
import pers.xanadu.enderdragon.nms.RespawnAnchor.IRespawnAnchorManager;
public class RespawnAnchorManager implements I_RespawnAnchorManager {
public class RespawnAnchorManager implements IRespawnAnchorManager {
public boolean isRespawnAnchorWorks(World world){
CraftWorld cw = (CraftWorld) world;
net.minecraft.server.v1_16_R1.World ew = cw.getHandle();
@@ -3,9 +3,9 @@ package pers.xanadu.enderdragon.nms.RespawnAnchor.v1_16_R2;
import net.minecraft.server.v1_16_R2.DimensionManager;
import org.bukkit.World;
import org.bukkit.craftbukkit.v1_16_R2.CraftWorld;
import pers.xanadu.enderdragon.nms.RespawnAnchor.I_RespawnAnchorManager;
import pers.xanadu.enderdragon.nms.RespawnAnchor.IRespawnAnchorManager;
public class RespawnAnchorManager implements I_RespawnAnchorManager {
public class RespawnAnchorManager implements IRespawnAnchorManager {
public boolean isRespawnAnchorWorks(World world){
CraftWorld cw = (CraftWorld) world;
net.minecraft.server.v1_16_R2.World ew = cw.getHandle();
@@ -3,9 +3,9 @@ package pers.xanadu.enderdragon.nms.RespawnAnchor.v1_16_R3;
import net.minecraft.server.v1_16_R3.DimensionManager;
import org.bukkit.World;
import org.bukkit.craftbukkit.v1_16_R3.CraftWorld;
import pers.xanadu.enderdragon.nms.RespawnAnchor.I_RespawnAnchorManager;
import pers.xanadu.enderdragon.nms.RespawnAnchor.IRespawnAnchorManager;
public class RespawnAnchorManager implements I_RespawnAnchorManager {
public class RespawnAnchorManager implements IRespawnAnchorManager {
public boolean isRespawnAnchorWorks(World world){
CraftWorld cw = (CraftWorld) world;
net.minecraft.server.v1_16_R3.World ew = cw.getHandle();
@@ -3,9 +3,9 @@ package pers.xanadu.enderdragon.nms.RespawnAnchor.v1_17_R1;
import net.minecraft.world.level.dimension.DimensionManager;
import org.bukkit.World;
import org.bukkit.craftbukkit.v1_17_R1.CraftWorld;
import pers.xanadu.enderdragon.nms.RespawnAnchor.I_RespawnAnchorManager;
import pers.xanadu.enderdragon.nms.RespawnAnchor.IRespawnAnchorManager;
public class RespawnAnchorManager implements I_RespawnAnchorManager {
public class RespawnAnchorManager implements IRespawnAnchorManager {
public boolean isRespawnAnchorWorks(World world){
CraftWorld cw = (CraftWorld) world;
net.minecraft.world.level.World ew = cw.getHandle();
@@ -1,9 +1,9 @@
package pers.xanadu.enderdragon.nms.RespawnAnchor.v1_18_above;
import org.bukkit.World;
import pers.xanadu.enderdragon.nms.RespawnAnchor.I_RespawnAnchorManager;
import pers.xanadu.enderdragon.nms.RespawnAnchor.IRespawnAnchorManager;
public class RespawnAnchorManager implements I_RespawnAnchorManager {
public class RespawnAnchorManager implements IRespawnAnchorManager {
public boolean isRespawnAnchorWorks(World world){
return world.isRespawnAnchorWorks();
}
@@ -1,7 +1,7 @@
package pers.xanadu.enderdragon.nms.WorldData;
import org.bukkit.World;
public interface I_WorldDataManager {
long getGameTime(World world);
}
package pers.xanadu.enderdragon.nms.WorldData;
import org.bukkit.World;
public interface IWorldDataManager {
long getGameTime(World world);
}
@@ -3,9 +3,9 @@ package pers.xanadu.enderdragon.nms.WorldData.v1_12_R1;
import net.minecraft.server.v1_12_R1.WorldServer;
import org.bukkit.World;
import org.bukkit.craftbukkit.v1_12_R1.CraftWorld;
import pers.xanadu.enderdragon.nms.WorldData.I_WorldDataManager;
import pers.xanadu.enderdragon.nms.WorldData.IWorldDataManager;
public class WorldDataManager implements I_WorldDataManager {
public class WorldDataManager implements IWorldDataManager {
public long getGameTime(World world){
CraftWorld cw = (CraftWorld) world;
WorldServer ws = cw.getHandle();
@@ -3,9 +3,9 @@ package pers.xanadu.enderdragon.nms.WorldData.v1_13_R1;
import net.minecraft.server.v1_13_R1.WorldServer;
import org.bukkit.World;
import org.bukkit.craftbukkit.v1_13_R1.CraftWorld;
import pers.xanadu.enderdragon.nms.WorldData.I_WorldDataManager;
import pers.xanadu.enderdragon.nms.WorldData.IWorldDataManager;
public class WorldDataManager implements I_WorldDataManager {
public class WorldDataManager implements IWorldDataManager {
public long getGameTime(World world){
CraftWorld cw = (CraftWorld) world;
WorldServer ws = cw.getHandle();
@@ -3,9 +3,9 @@ package pers.xanadu.enderdragon.nms.WorldData.v1_13_R2;
import net.minecraft.server.v1_13_R2.WorldServer;
import org.bukkit.World;
import org.bukkit.craftbukkit.v1_13_R2.CraftWorld;
import pers.xanadu.enderdragon.nms.WorldData.I_WorldDataManager;
import pers.xanadu.enderdragon.nms.WorldData.IWorldDataManager;
public class WorldDataManager implements I_WorldDataManager {
public class WorldDataManager implements IWorldDataManager {
public long getGameTime(World world){
CraftWorld cw = (CraftWorld) world;
WorldServer ws = cw.getHandle();
@@ -3,9 +3,9 @@ package pers.xanadu.enderdragon.nms.WorldData.v1_14_R1;
import net.minecraft.server.v1_14_R1.WorldServer;
import org.bukkit.World;
import org.bukkit.craftbukkit.v1_14_R1.CraftWorld;
import pers.xanadu.enderdragon.nms.WorldData.I_WorldDataManager;
import pers.xanadu.enderdragon.nms.WorldData.IWorldDataManager;
public class WorldDataManager implements I_WorldDataManager {
public class WorldDataManager implements IWorldDataManager {
public long getGameTime(World world){
CraftWorld cw = (CraftWorld) world;
WorldServer ws = cw.getHandle();
@@ -3,9 +3,9 @@ package pers.xanadu.enderdragon.nms.WorldData.v1_15_R1;
import net.minecraft.server.v1_15_R1.WorldServer;
import org.bukkit.World;
import org.bukkit.craftbukkit.v1_15_R1.CraftWorld;
import pers.xanadu.enderdragon.nms.WorldData.I_WorldDataManager;
import pers.xanadu.enderdragon.nms.WorldData.IWorldDataManager;
public class WorldDataManager implements I_WorldDataManager {
public class WorldDataManager implements IWorldDataManager {
public long getGameTime(World world){
CraftWorld cw = (CraftWorld) world;
WorldServer ws = cw.getHandle();
@@ -3,9 +3,9 @@ package pers.xanadu.enderdragon.nms.WorldData.v1_16_R1;
import net.minecraft.server.v1_16_R1.WorldServer;
import org.bukkit.World;
import org.bukkit.craftbukkit.v1_16_R1.CraftWorld;
import pers.xanadu.enderdragon.nms.WorldData.I_WorldDataManager;
import pers.xanadu.enderdragon.nms.WorldData.IWorldDataManager;
public class WorldDataManager implements I_WorldDataManager {
public class WorldDataManager implements IWorldDataManager {
public long getGameTime(World world){
CraftWorld cw = (CraftWorld) world;
WorldServer ws = cw.getHandle();
@@ -3,9 +3,9 @@ package pers.xanadu.enderdragon.nms.WorldData.v1_16_R2;
import net.minecraft.server.v1_16_R2.WorldServer;
import org.bukkit.World;
import org.bukkit.craftbukkit.v1_16_R2.CraftWorld;
import pers.xanadu.enderdragon.nms.WorldData.I_WorldDataManager;
import pers.xanadu.enderdragon.nms.WorldData.IWorldDataManager;
public class WorldDataManager implements I_WorldDataManager {
public class WorldDataManager implements IWorldDataManager {
public long getGameTime(World world){
CraftWorld cw = (CraftWorld) world;
WorldServer ws = cw.getHandle();
@@ -3,9 +3,9 @@ package pers.xanadu.enderdragon.nms.WorldData.v1_16_R3;
import net.minecraft.server.v1_16_R3.WorldServer;
import org.bukkit.World;
import org.bukkit.craftbukkit.v1_16_R3.CraftWorld;
import pers.xanadu.enderdragon.nms.WorldData.I_WorldDataManager;
import pers.xanadu.enderdragon.nms.WorldData.IWorldDataManager;
public class WorldDataManager implements I_WorldDataManager {
public class WorldDataManager implements IWorldDataManager {
public long getGameTime(World world){
CraftWorld cw = (CraftWorld) world;
WorldServer ws = cw.getHandle();
@@ -1,9 +1,9 @@
package pers.xanadu.enderdragon.nms.WorldData.v1_17_above;
import org.bukkit.World;
import pers.xanadu.enderdragon.nms.WorldData.I_WorldDataManager;
import pers.xanadu.enderdragon.nms.WorldData.IWorldDataManager;
public class WorldDataManager implements I_WorldDataManager {
public class WorldDataManager implements IWorldDataManager {
public long getGameTime(World world){
return world.getGameTime();
}