Compare commits
No commits in common. "master" and "Ali" have entirely different histories.
16 changed files with 789 additions and 1077 deletions
BIN
.DS_Store
vendored
BIN
.DS_Store
vendored
Binary file not shown.
|
@ -1,5 +1,3 @@
|
||||||
main: buttondevteam.perworld.main.MainPlugin
|
main: buttondevteam.perworld.main.MainPlugin
|
||||||
version: 1.0.0
|
version: 1.0.0
|
||||||
name: PerWorldInventories
|
name: PerWorldInventories
|
||||||
softdepend:
|
|
||||||
[Multiverse-Core]
|
|
BIN
src/.DS_Store
vendored
BIN
src/.DS_Store
vendored
Binary file not shown.
|
@ -1,16 +0,0 @@
|
||||||
package buttondevteam.perworld.cache;
|
|
||||||
|
|
||||||
import org.bukkit.configuration.ConfigurationSection;
|
|
||||||
|
|
||||||
public interface CacheInterface {
|
|
||||||
|
|
||||||
public static ConfigurationSection worlds = buttondevteam.perworld.main.MainPlugin.worlds;
|
|
||||||
public static ConfigurationSection players = buttondevteam.perworld.main.MainPlugin.players;
|
|
||||||
|
|
||||||
Object generateElement(String string);
|
|
||||||
|
|
||||||
void putCache(String string);
|
|
||||||
|
|
||||||
void initCache();
|
|
||||||
|
|
||||||
}
|
|
|
@ -1,7 +0,0 @@
|
||||||
package buttondevteam.perworld.cache;
|
|
||||||
|
|
||||||
public class CacheRequestHandler {
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
|
|
@ -1,10 +0,0 @@
|
||||||
package buttondevteam.perworld.cache.player;
|
|
||||||
|
|
||||||
import java.util.HashMap;
|
|
||||||
|
|
||||||
public class GameMode {
|
|
||||||
|
|
||||||
|
|
||||||
//CACHE
|
|
||||||
public static HashMap<String,Integer> cache;
|
|
||||||
}
|
|
|
@ -1,6 +0,0 @@
|
||||||
package buttondevteam.perworld.cache.player;
|
|
||||||
|
|
||||||
public class Name {
|
|
||||||
|
|
||||||
|
|
||||||
}
|
|
|
@ -1,100 +0,0 @@
|
||||||
package buttondevteam.perworld.cache.world;
|
|
||||||
|
|
||||||
import java.util.HashMap;
|
|
||||||
|
|
||||||
import buttondevteam.perworld.cache.CacheInterface;
|
|
||||||
|
|
||||||
public class ShareSettings implements CacheInterface {
|
|
||||||
|
|
||||||
|
|
||||||
/* ConfigurationSection "worlds" is a static import from main.MainPlugin.java,
|
|
||||||
* inherited from CacheInterface.
|
|
||||||
*
|
|
||||||
* It points to the section found at config.getConfigurationSection("worlds")
|
|
||||||
* and contains all world keys, child keys, and their values
|
|
||||||
*
|
|
||||||
* this is a static field backed by the actual contents of config.yml
|
|
||||||
*/
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//CACHE ELEMENT
|
|
||||||
public class E {
|
|
||||||
/* the optional share type (in or out) specifies that the world
|
|
||||||
* shares with its group in only one traffic direction.
|
|
||||||
*/
|
|
||||||
String group;
|
|
||||||
int t;
|
|
||||||
public E(String group, int type){
|
|
||||||
this.group = group;
|
|
||||||
this.t = type;//0-default, 1-in, 2-out
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
//CACHE
|
|
||||||
public static volatile HashMap<String,E[]> cache = new HashMap<String,E[]>();
|
|
||||||
/* this stores the share settings for each world
|
|
||||||
* in an easily-parsed format, mapping each world to
|
|
||||||
* an array e[] of two cache elements (inv and data)
|
|
||||||
*/
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//GENERATE ELEMENT (FROM CONFIG)
|
|
||||||
public E[] generateElement(String world){
|
|
||||||
return new E[]
|
|
||||||
{
|
|
||||||
new E(
|
|
||||||
worlds.getString(world + ".share.inventory.group"),
|
|
||||||
worlds.getInt(world + ".share.inventory.type", 0)
|
|
||||||
),
|
|
||||||
new E(
|
|
||||||
worlds.getString(world + ".share.playerdata.group"),
|
|
||||||
worlds.getInt(world + ".share.playerdata.type", 0)
|
|
||||||
)
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
//PUT CACHE
|
|
||||||
public void putCache(String world){
|
|
||||||
E[] element = generateElement(world);
|
|
||||||
if ((element[0].group != null || element[1].group != null)) cache.put(world, element);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
//INIT CACHE ( forEach -> putCache() )
|
|
||||||
public void initCache(){
|
|
||||||
worlds.getKeys(false).forEach(s -> { putCache(s); });
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//COMPARE SETTINGS
|
|
||||||
public static boolean[] compare (String worldTo, String worldFrom) {
|
|
||||||
E[][] params = new E[][] { cache.get(worldTo), cache.get(worldFrom) };
|
|
||||||
return params[0] == null || params [1] == null ?
|
|
||||||
new boolean[] {false, false} :
|
|
||||||
new boolean[]
|
|
||||||
{
|
|
||||||
params[0][0] == null || params[1][0] == null ? false :
|
|
||||||
|
|
||||||
params[0][0].group == params[1][0].group //inv
|
|
||||||
&& params[0][0].t == 0 ? true : params[0][0].t == 1
|
|
||||||
&& params[1][0].t == 0 ? true : params[1][0].t == 2
|
|
||||||
,
|
|
||||||
params[0][1] == null || params[1][1] == null ? false :
|
|
||||||
|
|
||||||
params[0][1].group == params[1][1].group //data
|
|
||||||
&& params[0][1].t == 0 ? true : params[0][1].t == 1
|
|
||||||
&& params[1][1].t == 0 ? true : params[1][1].t == 2
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,21 +0,0 @@
|
||||||
package buttondevteam.perworld.main;
|
|
||||||
|
|
||||||
import org.bukkit.event.EventHandler;
|
|
||||||
import org.bukkit.event.EventPriority;
|
|
||||||
import org.bukkit.event.Listener;
|
|
||||||
import org.bukkit.event.player.PlayerJoinEvent;
|
|
||||||
|
|
||||||
public class ListenerPlayerJoin implements Listener {
|
|
||||||
|
|
||||||
MainPlugin plugin;
|
|
||||||
public ListenerPlayerJoin(MainPlugin plugin){
|
|
||||||
this.plugin = plugin;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
@EventHandler(priority = EventPriority.MONITOR)
|
|
||||||
public void onPlayerJoin(PlayerJoinEvent event){
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
|
@ -1,32 +0,0 @@
|
||||||
package buttondevteam.perworld.main;
|
|
||||||
|
|
||||||
import static buttondevteam.perworld.main.MainPlugin.debugClock;
|
|
||||||
|
|
||||||
import org.bukkit.entity.Player;
|
|
||||||
import org.bukkit.event.EventHandler;
|
|
||||||
import org.bukkit.event.EventPriority;
|
|
||||||
import org.bukkit.event.Listener;
|
|
||||||
import org.bukkit.event.player.PlayerChangedWorldEvent;
|
|
||||||
|
|
||||||
public class ListenerPlayerWorldChange implements Listener {
|
|
||||||
|
|
||||||
MainPlugin plugin;
|
|
||||||
public ListenerPlayerWorldChange(MainPlugin plugin){
|
|
||||||
this.plugin = plugin;
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
@EventHandler(priority = EventPriority.MONITOR)
|
|
||||||
public void onWorldChange(PlayerChangedWorldEvent event){
|
|
||||||
|
|
||||||
debugClock = System.currentTimeMillis();
|
|
||||||
|
|
||||||
Player player = event.getPlayer(); player.sendMessage("updating... ");
|
|
||||||
String gamemode;
|
|
||||||
String worldTo = player.getWorld().getName();
|
|
||||||
String worldFrom = event.getFrom().getName();
|
|
||||||
|
|
||||||
PlayerUpdater.update(player, worldTo, worldFrom);
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,39 +1,61 @@
|
||||||
package buttondevteam.perworld.main;
|
package buttondevteam.perworld.main;
|
||||||
|
|
||||||
import org.bukkit.configuration.ConfigurationSection;
|
|
||||||
import org.bukkit.configuration.file.FileConfiguration;
|
|
||||||
import org.bukkit.plugin.java.JavaPlugin;
|
import org.bukkit.plugin.java.JavaPlugin;
|
||||||
|
|
||||||
import buttondevteam.lib.TBMCCoreAPI;
|
import buttondevteam.lib.TBMCCoreAPI;
|
||||||
|
|
||||||
public class MainPlugin extends JavaPlugin {
|
public class MainPlugin extends JavaPlugin {
|
||||||
|
|
||||||
|
|
||||||
public static MainPlugin plugin;
|
|
||||||
public static volatile FileConfiguration config;
|
|
||||||
|
|
||||||
public static volatile ConfigurationSection worlds;
|
|
||||||
public static volatile ConfigurationSection players;
|
|
||||||
public static long debugClock;
|
|
||||||
|
|
||||||
|
|
||||||
public void onEnable(){
|
public void onEnable(){
|
||||||
|
|
||||||
//getServer().getPluginManager().registerEvents(new WorldLoadListener(this), this);
|
//getServer().getPluginManager().registerEvents(new WorldLoadListener(this), this);
|
||||||
TBMCCoreAPI.RegisterEventsForExceptions(new WorldChangeListener(this), this);
|
TBMCCoreAPI.RegisterEventsForExceptions(new WorldChangeListener(this), this);
|
||||||
TBMCCoreAPI.RegisterEventsForExceptions(new ListenerPlayerWorldChange(this), this);
|
MainPlugin.getPlugin(this.getClass()).getServer().getListeningPluginChannels();
|
||||||
|
|
||||||
saveDefaultConfig();
|
saveDefaultConfig();
|
||||||
|
WorldChangeManager.init(this);
|
||||||
plugin = this;
|
//BukkitTask task = new initWorldSettings().runTaskLater(this, 20);
|
||||||
config = getConfig();
|
|
||||||
worlds = config.getConfigurationSection("worlds");
|
|
||||||
players = config.getConfigurationSection("players");
|
|
||||||
|
|
||||||
if (!config.contains("worlds")) config.createSection("worlds");
|
|
||||||
if (!config.contains("players")) config.createSection("players");
|
|
||||||
saveConfig();
|
|
||||||
|
|
||||||
new buttondevteam.perworld.cache.world.ShareSettings().initCache();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
/*
|
||||||
|
public void initWorldSettings(){
|
||||||
|
Bukkit.getServer().getWorlds()
|
||||||
|
.stream()
|
||||||
|
.forEach(s -> {
|
||||||
|
FileConfiguration config = getConfig();
|
||||||
|
String name = s.getName();
|
||||||
|
|
||||||
|
if (config.get(name + ".settings.shareinvgroup") == null)
|
||||||
|
config.set(name + ".settings.shareinvgroup", name);
|
||||||
|
|
||||||
|
if (config.get(name + ".settings.sharedatagroup") == null)
|
||||||
|
config.set(name + ".settings.sharedatagroup", name);
|
||||||
|
|
||||||
|
});
|
||||||
|
saveConfig();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void createConfig(){
|
||||||
|
try {
|
||||||
|
|
||||||
|
|
||||||
|
if (!getDataFolder().exists())
|
||||||
|
getDataFolder().mkdirs();
|
||||||
|
|
||||||
|
|
||||||
|
File file = new File(getDataFolder(), "config.yml");
|
||||||
|
|
||||||
|
if (!file.exists()){
|
||||||
|
getLogger().info("Config.yml not found, creating!");
|
||||||
|
saveDefaultConfig();
|
||||||
|
}else
|
||||||
|
getLogger().info("Config.yml found, loading!");
|
||||||
|
|
||||||
|
|
||||||
|
}catch (Exception e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
*/
|
|
@ -1,102 +0,0 @@
|
||||||
package buttondevteam.perworld.main;
|
|
||||||
|
|
||||||
import org.bukkit.craftbukkit.v1_10_R1.inventory.CraftInventory;
|
|
||||||
import org.bukkit.entity.Player;
|
|
||||||
|
|
||||||
import net.minecraft.server.v1_10_R1.IInventory;
|
|
||||||
|
|
||||||
import java.util.stream.Collectors;
|
|
||||||
|
|
||||||
import static buttondevteam.perworld.cache.world.ShareSettings.compare;
|
|
||||||
import static buttondevteam.perworld.main.MainPlugin.config;
|
|
||||||
import static buttondevteam.perworld.main.MainPlugin.debugClock;
|
|
||||||
import static buttondevteam.perworld.main.MainPlugin.plugin;
|
|
||||||
|
|
||||||
public class PlayerUpdater {
|
|
||||||
|
|
||||||
|
|
||||||
//VALUES USED BY THE UPDATE METHODS
|
|
||||||
public static class Values {
|
|
||||||
public String uuid;
|
|
||||||
public String worldTo;
|
|
||||||
public String worldFrom;
|
|
||||||
public String pTo;
|
|
||||||
public String pFrom;
|
|
||||||
public boolean shareinv;
|
|
||||||
public boolean sharedata;
|
|
||||||
|
|
||||||
public Values (Player player, String worldTo, String worldFrom){
|
|
||||||
|
|
||||||
this.uuid = player.getUniqueId().toString();
|
|
||||||
this.worldTo = worldTo;
|
|
||||||
this.worldFrom = worldFrom;
|
|
||||||
this.pTo = "worlds." + worldTo + ".players." + uuid;
|
|
||||||
this.pFrom = "worlds." + worldFrom + ".players." + uuid;
|
|
||||||
|
|
||||||
boolean[] compare = compare(worldTo, worldFrom);
|
|
||||||
//compare() is a static import from world.ShareSettings.java
|
|
||||||
|
|
||||||
this.shareinv = compare[0];
|
|
||||||
this.sharedata = compare[1];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//MAIN UPDATE METHOD
|
|
||||||
public static void update(Player player, String worldTo, String worldFrom){
|
|
||||||
|
|
||||||
final Values values = new Values(player, worldTo, worldFrom);
|
|
||||||
|
|
||||||
updateLocation(values, player);
|
|
||||||
updateInventories(values, player);
|
|
||||||
//updatePlayerData(values, player);
|
|
||||||
|
|
||||||
player.sendMessage("...done, " + (System.currentTimeMillis() - debugClock) + " ms");
|
|
||||||
new buttondevteam.perworld.cache.world.ShareSettings().initCache();
|
|
||||||
player.sendMessage(buttondevteam.perworld.cache.world.ShareSettings.cache.keySet().stream().collect(Collectors.joining(",")));
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
//UPDATE LOCATION
|
|
||||||
public static void updateLocation(Values values, Player player){
|
|
||||||
config.set(
|
|
||||||
values.pFrom + ".location",
|
|
||||||
buttondevteam.perworld.serializers.location.serialize(player.getLocation())
|
|
||||||
);
|
|
||||||
plugin.saveConfig();
|
|
||||||
/* players are not automatically moved to their stored location,
|
|
||||||
* this is done only on request, in a dedicated teleport method
|
|
||||||
*/
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
//UPDATE INVENTORIES
|
|
||||||
public static void updateInventories(Values values, Player player){
|
|
||||||
IInventory inventory = ((CraftInventory) player.getInventory()).getInventory();
|
|
||||||
config.set(values.pFrom + ".inventory", buttondevteam.perworld.serializers.inventory.serialize(inventory));
|
|
||||||
plugin.saveConfig();
|
|
||||||
if (!values.shareinv)
|
|
||||||
buttondevteam.perworld.serializers.inventory.setFromSerialized(
|
|
||||||
inventory, (String) config.get(values.pTo + ".inventory")
|
|
||||||
);
|
|
||||||
|
|
||||||
IInventory enderchest = ((CraftInventory) player.getEnderChest()).getInventory();
|
|
||||||
config.set(values.pFrom + ".enderchest", buttondevteam.perworld.serializers.inventory.serialize(enderchest));
|
|
||||||
plugin.saveConfig();
|
|
||||||
if (!values.sharedata)
|
|
||||||
buttondevteam.perworld.serializers.inventory.setFromSerialized(
|
|
||||||
enderchest, (String) config.get(values.pTo + ".enderchest")
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
//UPDATE PLAYERDATA
|
|
||||||
public static void updatePlayerData(Values values, Player player){
|
|
||||||
config.set(values.pFrom + ".playerdata", buttondevteam.perworld.serializers.playerdata.serialize(player));
|
|
||||||
plugin.saveConfig();
|
|
||||||
if (!values.sharedata)
|
|
||||||
;
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -2,7 +2,6 @@ package buttondevteam.perworld.main;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.Base64;
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.Map.Entry;
|
import java.util.Map.Entry;
|
||||||
|
@ -15,12 +14,8 @@ import org.bukkit.FireworkEffect;
|
||||||
import org.bukkit.Material;
|
import org.bukkit.Material;
|
||||||
import org.bukkit.block.banner.Pattern;
|
import org.bukkit.block.banner.Pattern;
|
||||||
import org.bukkit.block.banner.PatternType;
|
import org.bukkit.block.banner.PatternType;
|
||||||
import org.bukkit.craftbukkit.v1_10_R1.entity.CraftPlayer;
|
|
||||||
import org.bukkit.craftbukkit.v1_10_R1.inventory.CraftInventory;
|
import org.bukkit.craftbukkit.v1_10_R1.inventory.CraftInventory;
|
||||||
import org.bukkit.craftbukkit.v1_10_R1.inventory.CraftInventoryPlayer;
|
|
||||||
import org.bukkit.craftbukkit.v1_10_R1.inventory.CraftItemStack;
|
|
||||||
import org.bukkit.enchantments.Enchantment;
|
import org.bukkit.enchantments.Enchantment;
|
||||||
import org.bukkit.entity.Player;
|
|
||||||
import org.bukkit.event.inventory.InventoryType;
|
import org.bukkit.event.inventory.InventoryType;
|
||||||
import org.bukkit.inventory.Inventory;
|
import org.bukkit.inventory.Inventory;
|
||||||
import org.bukkit.inventory.ItemFlag;
|
import org.bukkit.inventory.ItemFlag;
|
||||||
|
@ -41,15 +36,6 @@ import org.bukkit.potion.PotionEffect;
|
||||||
import org.bukkit.potion.PotionEffectType;
|
import org.bukkit.potion.PotionEffectType;
|
||||||
import org.bukkit.potion.PotionType;
|
import org.bukkit.potion.PotionType;
|
||||||
|
|
||||||
import com.mojang.authlib.GameProfile;
|
|
||||||
|
|
||||||
import net.minecraft.server.v1_10_R1.MinecraftServer;
|
|
||||||
import net.minecraft.server.v1_10_R1.ChunkProviderServer;
|
|
||||||
import net.minecraft.server.v1_10_R1.DataConverterManager;
|
|
||||||
import net.minecraft.server.v1_10_R1.EntityPlayer;
|
|
||||||
import net.minecraft.server.v1_10_R1.PlayerList;
|
|
||||||
import net.minecraft.server.v1_10_R1.WorldServer;
|
|
||||||
|
|
||||||
public class SerializerOld {
|
public class SerializerOld {
|
||||||
|
|
||||||
//public void test(){
|
//public void test(){
|
||||||
|
|
|
@ -10,10 +10,10 @@ public class location {
|
||||||
public static String serialize(Location location){
|
public static String serialize(Location location){
|
||||||
return
|
return
|
||||||
location.getBlockX() + ","
|
location.getBlockX() + ","
|
||||||
+ location.getBlockY() + ","
|
|
||||||
+ location.getBlockZ() + ","
|
+ location.getBlockZ() + ","
|
||||||
+ location.getYaw() + ","
|
+ location.getBlockY() + ","
|
||||||
+ location.getPitch();
|
+ location.getPitch() + ","
|
||||||
|
+ location.getYaw();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue