From aa0cfc771093006f4e44a0c62bbe5862eabb866e Mon Sep 17 00:00:00 2001 From: phobia Date: Sat, 30 Jan 2016 19:23:59 +1100 Subject: [PATCH 01/21] Fixes to TnTGeneration Fixes to Broadsword giving Generation and slowness 42 instead of 4 --- .../tntGenerator/TntGeneratorManager.java | 77 ++++++++++++------- .../items/legendaries/GiantsBroadsword.java | 4 +- 2 files changed, 50 insertions(+), 31 deletions(-) diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/tntGenerator/TntGeneratorManager.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/tntGenerator/TntGeneratorManager.java index aa54d362a..6506f4914 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/tntGenerator/TntGeneratorManager.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/tntGenerator/TntGeneratorManager.java @@ -4,6 +4,7 @@ import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.craftbukkit.v1_8_R3.CraftWorld; import org.bukkit.craftbukkit.v1_8_R3.inventory.CraftItemStack; +import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.block.Action; @@ -167,42 +168,60 @@ public class TntGeneratorManager extends MiniPlugin ClanInfo clan = getGenerator(event.getClickedBlock()); if (clan != null) { - final TntGenerator generator = clan.getGenerator(); - final int stock = generator.getStock(); + interact(clan, event.getPlayer()); + }else { //fix tnt gen issues + //Can only place one of these in a clan location. so it must be a generator + ClanInfo owner = _clansManager.getClanUtility().getOwner(event.getClickedBlock().getLocation()); + if(owner == null) return; //Wilderness + TntGenerator generator = owner.getGenerator(); - if (stock > 0) - { - generator.setStock(stock - 1); - _clansManager.getClanDataAccess().updateGenerator(clan, new Callback() - { - @Override - public void run(Boolean data) - { - if (data) - { - updateBrewingStand(generator); - dropItem(event.getClickedBlock(), new ItemStack(Material.TNT)); - } - else - { - // failed - generator.setStock(stock); - } - } - }); - } - else - { - int secondLeft = SECONDS_PER_TNT - generator.getTicks(); - int msLeft = secondLeft * 1000; - UtilTextMiddle.display("", C.cRed + "Next TNT in " + C.cGold + UtilTime.convertString(msLeft, 1, UtilTime.TimeUnit.FIT), event.getPlayer()); - } + //Create generator if not exist + if(generator == null || !generator.getBlock().equals(event.getClickedBlock())) { + generator = new TntGenerator(event.getClickedBlock()); + generator.setStock(2); + clan.setGenerator(generator); + _clansManager.getClanDataAccess().updateGenerator(clan, null); + } + interact(owner, event.getPlayer()); } event.setCancelled(true); } } + private void interact(ClanInfo clan, Player player) { + final TntGenerator generator = clan.getGenerator(); + final int stock = generator.getStock(); + + if (stock > 0) + { + generator.setStock(stock - 1); + _clansManager.getClanDataAccess().updateGenerator(clan, new Callback() + { + @Override + public void run(Boolean data) + { + if (data) + { + updateBrewingStand(generator); + dropItem(generator.getBlock(), new ItemStack(Material.TNT)); + } + else + { + // failed + generator.setStock(stock); + } + } + }); + } + else + { + int secondLeft = SECONDS_PER_TNT - generator.getTicks(); + int msLeft = secondLeft * 1000; + UtilTextMiddle.display("", C.cRed + "Next TNT in " + C.cGold + UtilTime.convertString(msLeft, 1, UtilTime.TimeUnit.FIT), player); + } + } + @EventHandler public void onDelete(ClanDeleteEvent event) { diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/legendaries/GiantsBroadsword.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/legendaries/GiantsBroadsword.java index a04ba08c5..7e6e18f42 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/legendaries/GiantsBroadsword.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/legendaries/GiantsBroadsword.java @@ -62,7 +62,7 @@ public class GiantsBroadsword extends LegendaryItem private void buffPlayer(Player player) { - grantPotionEffect(player, PotionEffectType.SLOW, 40, 43); - grantPotionEffect(player, PotionEffectType.REGENERATION, 2, 43); + grantPotionEffect(player, PotionEffectType.SLOW, 40, 5); + grantPotionEffect(player, PotionEffectType.REGENERATION, 2, 5); //Regen 4 } } From 9c83c64d0103f721db0d91fcc048c7b4fece720b Mon Sep 17 00:00:00 2001 From: phobia Date: Sat, 30 Jan 2016 21:34:06 +1100 Subject: [PATCH 02/21] Fixed issues with Broadsword Added max building height of 100 --- .../game/clans/clans/ClansDataAccessLayer.java | 2 ++ .../clans/tntGenerator/TntGeneratorManager.java | 2 +- .../src/mineplex/game/clans/gameplay/Gameplay.java | 14 ++++++++++++-- .../clans/items/legendaries/GiantsBroadsword.java | 10 +++++----- 4 files changed, 20 insertions(+), 8 deletions(-) diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansDataAccessLayer.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansDataAccessLayer.java index b848e7d28..b3bdba522 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansDataAccessLayer.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansDataAccessLayer.java @@ -750,6 +750,8 @@ public class ClansDataAccessLayer if (callback != null) { callback.run(ran); + } else { + if(!ran) System.out.println("Tnt Gen didn't save!"); } } }); diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/tntGenerator/TntGeneratorManager.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/tntGenerator/TntGeneratorManager.java index 6506f4914..b6f4edf09 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/tntGenerator/TntGeneratorManager.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/tntGenerator/TntGeneratorManager.java @@ -174,7 +174,7 @@ public class TntGeneratorManager extends MiniPlugin ClanInfo owner = _clansManager.getClanUtility().getOwner(event.getClickedBlock().getLocation()); if(owner == null) return; //Wilderness TntGenerator generator = owner.getGenerator(); - + System.out.println("Unable to find generator"); //Create generator if not exist if(generator == null || !generator.getBlock().equals(event.getClickedBlock())) { generator = new TntGenerator(event.getClickedBlock()); diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/gameplay/Gameplay.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/gameplay/Gameplay.java index ed9bbd104..e3a425c34 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/gameplay/Gameplay.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/gameplay/Gameplay.java @@ -253,7 +253,7 @@ public class Gameplay extends MiniPlugin event.setCancelled(true); } } - + @EventHandler(priority = EventPriority.LOWEST) public void RedstoneCancel(BlockPlaceEvent event) { @@ -263,7 +263,17 @@ public class Gameplay extends MiniPlugin event.setCancelled(true); } } - + + @EventHandler(priority = EventPriority.LOWEST) + public void MaxHeight(BlockPlaceEvent event) + { + if (event.getBlock().getLocation().getBlockY() > 100) + { + UtilPlayer.message(event.getPlayer(), F.main("Game", "You cannot place blocks this high.")); + event.setCancelled(true); + } + } + /** * Disable all Piston related events in Clans * diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/legendaries/GiantsBroadsword.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/legendaries/GiantsBroadsword.java index 7e6e18f42..e7059080f 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/legendaries/GiantsBroadsword.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/legendaries/GiantsBroadsword.java @@ -13,9 +13,9 @@ import mineplex.minecraft.game.core.damage.CustomDamageEvent; public class GiantsBroadsword extends LegendaryItem { - public static final int SLOW_AMPLIFIER = 4; - public static final int REGEN_AMPLIFIER = 1; - public static final int EFFECT_DURATION = 10; // Duration of potion effect + public static final int SLOW_AMPLIFIER = 43; + public static final int REGEN_AMPLIFIER = 4; + public static final int EFFECT_DURATION = 20; // Duration of potion effect // (in ticks) public GiantsBroadsword() @@ -62,7 +62,7 @@ public class GiantsBroadsword extends LegendaryItem private void buffPlayer(Player player) { - grantPotionEffect(player, PotionEffectType.SLOW, 40, 5); - grantPotionEffect(player, PotionEffectType.REGENERATION, 2, 5); //Regen 4 + grantPotionEffect(player, PotionEffectType.SLOW, EFFECT_DURATION, SLOW_AMPLIFIER); + grantPotionEffect(player, PotionEffectType.REGENERATION, 2, REGEN_AMPLIFIER); //Regen } } From 002be01ef17058e5e0cf6590f603d2f622a87858 Mon Sep 17 00:00:00 2001 From: NewGarbo Date: Sun, 31 Jan 2016 16:21:04 +0000 Subject: [PATCH 03/21] MAVEN TEST COMMIT --- Plugins/.project | 17 +++++++++++ .../org.eclipse.core.resources.prefs | 2 ++ Plugins/.settings/org.eclipse.m2e.core.prefs | 4 +++ Plugins/Mineplex.Bungee.Mineplexer/.classpath | 20 +++++++++++++ Plugins/Mineplex.Bungee.Mineplexer/.project | 23 +++++++++++++++ .../org.eclipse.core.resources.prefs | 3 ++ .../.settings/org.eclipse.jdt.core.prefs | 5 ++++ .../.settings/org.eclipse.m2e.core.prefs | 4 +++ Plugins/Mineplex.BungeeRotator/.classpath | 20 +++++++++++++ Plugins/Mineplex.BungeeRotator/.project | 23 +++++++++++++++ .../org.eclipse.core.resources.prefs | 3 ++ .../.settings/org.eclipse.jdt.core.prefs | 5 ++++ .../.settings/org.eclipse.m2e.core.prefs | 4 +++ Plugins/Mineplex.Cache/.classpath | 20 +++++++++++++ Plugins/Mineplex.Cache/.project | 23 +++++++++++++++ .../org.eclipse.core.resources.prefs | 3 ++ .../.settings/org.eclipse.jdt.core.prefs | 5 ++++ .../.settings/org.eclipse.m2e.core.prefs | 4 +++ Plugins/Mineplex.Core.Common/.classpath | 20 +++++++++++++ Plugins/Mineplex.Core.Common/.project | 23 +++++++++++++++ .../org.eclipse.core.resources.prefs | 3 ++ .../.settings/org.eclipse.jdt.core.prefs | 5 ++++ .../.settings/org.eclipse.m2e.core.prefs | 4 +++ Plugins/Mineplex.Core/.classpath | 20 +++++++++++++ Plugins/Mineplex.Core/.project | 23 +++++++++++++++ .../org.eclipse.core.resources.prefs | 3 ++ .../.settings/org.eclipse.jdt.core.prefs | 5 ++++ .../.settings/org.eclipse.m2e.core.prefs | 4 +++ .../.classpath | 20 +++++++++++++ .../Mineplex.DDoSProtectionSwitcher/.project | 23 +++++++++++++++ .../org.eclipse.core.resources.prefs | 3 ++ .../.settings/org.eclipse.jdt.core.prefs | 5 ++++ .../.settings/org.eclipse.m2e.core.prefs | 4 +++ Plugins/Mineplex.Database/.classpath | 20 +++++++++++++ Plugins/Mineplex.Database/.project | 23 +++++++++++++++ .../org.eclipse.core.resources.prefs | 3 ++ .../.settings/org.eclipse.jdt.core.prefs | 5 ++++ .../.settings/org.eclipse.m2e.core.prefs | 4 +++ Plugins/Mineplex.EnjinTranslator/.classpath | 20 +++++++++++++ Plugins/Mineplex.EnjinTranslator/.project | 23 +++++++++++++++ .../org.eclipse.core.resources.prefs | 3 ++ .../.settings/org.eclipse.jdt.core.prefs | 5 ++++ .../.settings/org.eclipse.m2e.core.prefs | 4 +++ Plugins/Mineplex.Game.Clans.Core/.classpath | 20 +++++++++++++ Plugins/Mineplex.Game.Clans.Core/.project | 23 +++++++++++++++ .../org.eclipse.core.resources.prefs | 3 ++ .../.settings/org.eclipse.jdt.core.prefs | 5 ++++ .../.settings/org.eclipse.m2e.core.prefs | 4 +++ Plugins/Mineplex.Game.Clans/.classpath | 20 +++++++++++++ Plugins/Mineplex.Game.Clans/.project | 23 +++++++++++++++ .../org.eclipse.core.resources.prefs | 3 ++ .../.settings/org.eclipse.jdt.core.prefs | 5 ++++ .../.settings/org.eclipse.m2e.core.prefs | 4 +++ Plugins/Mineplex.Hub/.classpath | 20 +++++++++++++ Plugins/Mineplex.Hub/.project | 23 +++++++++++++++ .../org.eclipse.core.resources.prefs | 3 ++ .../.settings/org.eclipse.jdt.core.prefs | 5 ++++ .../.settings/org.eclipse.m2e.core.prefs | 4 +++ Plugins/Mineplex.MapParser/.classpath | 20 +++++++++++++ Plugins/Mineplex.MapParser/.project | 23 +++++++++++++++ .../org.eclipse.core.resources.prefs | 3 ++ .../.settings/org.eclipse.jdt.core.prefs | 5 ++++ .../.settings/org.eclipse.m2e.core.prefs | 4 +++ .../.classpath | 20 +++++++++++++ .../.project | 23 +++++++++++++++ .../org.eclipse.core.resources.prefs | 3 ++ .../.settings/org.eclipse.jdt.core.prefs | 5 ++++ .../.settings/org.eclipse.m2e.core.prefs | 4 +++ .../Mineplex.Minecraft.Game.Core/.classpath | 20 +++++++++++++ Plugins/Mineplex.Minecraft.Game.Core/.project | 23 +++++++++++++++ .../org.eclipse.core.resources.prefs | 3 ++ .../.settings/org.eclipse.jdt.core.prefs | 5 ++++ .../.settings/org.eclipse.m2e.core.prefs | 4 +++ Plugins/Mineplex.ServerData/.classpath | 20 +++++++++++++ Plugins/Mineplex.ServerData/.project | 23 +++++++++++++++ .../org.eclipse.core.resources.prefs | 3 ++ .../.settings/org.eclipse.jdt.core.prefs | 5 ++++ .../.settings/org.eclipse.m2e.core.prefs | 4 +++ Plugins/Mineplex.ServerMonitor/.classpath | 20 +++++++++++++ Plugins/Mineplex.ServerMonitor/.project | 23 +++++++++++++++ .../org.eclipse.core.resources.prefs | 3 ++ .../.settings/org.eclipse.jdt.core.prefs | 5 ++++ .../.settings/org.eclipse.m2e.core.prefs | 4 +++ Plugins/Mineplex.StaffServer/.classpath | 20 +++++++++++++ Plugins/Mineplex.StaffServer/.project | 23 +++++++++++++++ .../org.eclipse.core.resources.prefs | 3 ++ .../.settings/org.eclipse.jdt.core.prefs | 5 ++++ .../.settings/org.eclipse.m2e.core.prefs | 4 +++ Plugins/Mineplex.Votifier/.classpath | 20 +++++++++++++ Plugins/Mineplex.Votifier/.project | 23 +++++++++++++++ .../org.eclipse.core.resources.prefs | 3 ++ .../.settings/org.eclipse.jdt.core.prefs | 5 ++++ .../.settings/org.eclipse.m2e.core.prefs | 4 +++ Plugins/Nautilus.Game.Arcade/.classpath | 20 +++++++++++++ Plugins/Nautilus.Game.Arcade/.project | 23 +++++++++++++++ .../org.eclipse.core.resources.prefs | 3 ++ .../.settings/org.eclipse.jdt.core.prefs | 5 ++++ .../.settings/org.eclipse.m2e.core.prefs | 4 +++ Plugins/pom.xml | 29 +++++++++++++++++++ 99 files changed, 1097 insertions(+) create mode 100644 Plugins/.project create mode 100644 Plugins/.settings/org.eclipse.core.resources.prefs create mode 100644 Plugins/.settings/org.eclipse.m2e.core.prefs create mode 100644 Plugins/Mineplex.Bungee.Mineplexer/.classpath create mode 100644 Plugins/Mineplex.Bungee.Mineplexer/.project create mode 100644 Plugins/Mineplex.Bungee.Mineplexer/.settings/org.eclipse.core.resources.prefs create mode 100644 Plugins/Mineplex.Bungee.Mineplexer/.settings/org.eclipse.jdt.core.prefs create mode 100644 Plugins/Mineplex.Bungee.Mineplexer/.settings/org.eclipse.m2e.core.prefs create mode 100644 Plugins/Mineplex.BungeeRotator/.classpath create mode 100644 Plugins/Mineplex.BungeeRotator/.project create mode 100644 Plugins/Mineplex.BungeeRotator/.settings/org.eclipse.core.resources.prefs create mode 100644 Plugins/Mineplex.BungeeRotator/.settings/org.eclipse.jdt.core.prefs create mode 100644 Plugins/Mineplex.BungeeRotator/.settings/org.eclipse.m2e.core.prefs create mode 100644 Plugins/Mineplex.Cache/.classpath create mode 100644 Plugins/Mineplex.Cache/.project create mode 100644 Plugins/Mineplex.Cache/.settings/org.eclipse.core.resources.prefs create mode 100644 Plugins/Mineplex.Cache/.settings/org.eclipse.jdt.core.prefs create mode 100644 Plugins/Mineplex.Cache/.settings/org.eclipse.m2e.core.prefs create mode 100644 Plugins/Mineplex.Core.Common/.classpath create mode 100644 Plugins/Mineplex.Core.Common/.project create mode 100644 Plugins/Mineplex.Core.Common/.settings/org.eclipse.core.resources.prefs create mode 100644 Plugins/Mineplex.Core.Common/.settings/org.eclipse.jdt.core.prefs create mode 100644 Plugins/Mineplex.Core.Common/.settings/org.eclipse.m2e.core.prefs create mode 100644 Plugins/Mineplex.Core/.classpath create mode 100644 Plugins/Mineplex.Core/.project create mode 100644 Plugins/Mineplex.Core/.settings/org.eclipse.core.resources.prefs create mode 100644 Plugins/Mineplex.Core/.settings/org.eclipse.jdt.core.prefs create mode 100644 Plugins/Mineplex.Core/.settings/org.eclipse.m2e.core.prefs create mode 100644 Plugins/Mineplex.DDoSProtectionSwitcher/.classpath create mode 100644 Plugins/Mineplex.DDoSProtectionSwitcher/.project create mode 100644 Plugins/Mineplex.DDoSProtectionSwitcher/.settings/org.eclipse.core.resources.prefs create mode 100644 Plugins/Mineplex.DDoSProtectionSwitcher/.settings/org.eclipse.jdt.core.prefs create mode 100644 Plugins/Mineplex.DDoSProtectionSwitcher/.settings/org.eclipse.m2e.core.prefs create mode 100644 Plugins/Mineplex.Database/.classpath create mode 100644 Plugins/Mineplex.Database/.project create mode 100644 Plugins/Mineplex.Database/.settings/org.eclipse.core.resources.prefs create mode 100644 Plugins/Mineplex.Database/.settings/org.eclipse.jdt.core.prefs create mode 100644 Plugins/Mineplex.Database/.settings/org.eclipse.m2e.core.prefs create mode 100644 Plugins/Mineplex.EnjinTranslator/.classpath create mode 100644 Plugins/Mineplex.EnjinTranslator/.project create mode 100644 Plugins/Mineplex.EnjinTranslator/.settings/org.eclipse.core.resources.prefs create mode 100644 Plugins/Mineplex.EnjinTranslator/.settings/org.eclipse.jdt.core.prefs create mode 100644 Plugins/Mineplex.EnjinTranslator/.settings/org.eclipse.m2e.core.prefs create mode 100644 Plugins/Mineplex.Game.Clans.Core/.classpath create mode 100644 Plugins/Mineplex.Game.Clans.Core/.project create mode 100644 Plugins/Mineplex.Game.Clans.Core/.settings/org.eclipse.core.resources.prefs create mode 100644 Plugins/Mineplex.Game.Clans.Core/.settings/org.eclipse.jdt.core.prefs create mode 100644 Plugins/Mineplex.Game.Clans.Core/.settings/org.eclipse.m2e.core.prefs create mode 100644 Plugins/Mineplex.Game.Clans/.classpath create mode 100644 Plugins/Mineplex.Game.Clans/.project create mode 100644 Plugins/Mineplex.Game.Clans/.settings/org.eclipse.core.resources.prefs create mode 100644 Plugins/Mineplex.Game.Clans/.settings/org.eclipse.jdt.core.prefs create mode 100644 Plugins/Mineplex.Game.Clans/.settings/org.eclipse.m2e.core.prefs create mode 100644 Plugins/Mineplex.Hub/.classpath create mode 100644 Plugins/Mineplex.Hub/.project create mode 100644 Plugins/Mineplex.Hub/.settings/org.eclipse.core.resources.prefs create mode 100644 Plugins/Mineplex.Hub/.settings/org.eclipse.jdt.core.prefs create mode 100644 Plugins/Mineplex.Hub/.settings/org.eclipse.m2e.core.prefs create mode 100644 Plugins/Mineplex.MapParser/.classpath create mode 100644 Plugins/Mineplex.MapParser/.project create mode 100644 Plugins/Mineplex.MapParser/.settings/org.eclipse.core.resources.prefs create mode 100644 Plugins/Mineplex.MapParser/.settings/org.eclipse.jdt.core.prefs create mode 100644 Plugins/Mineplex.MapParser/.settings/org.eclipse.m2e.core.prefs create mode 100644 Plugins/Mineplex.Minecraft.Game.ClassCombat/.classpath create mode 100644 Plugins/Mineplex.Minecraft.Game.ClassCombat/.project create mode 100644 Plugins/Mineplex.Minecraft.Game.ClassCombat/.settings/org.eclipse.core.resources.prefs create mode 100644 Plugins/Mineplex.Minecraft.Game.ClassCombat/.settings/org.eclipse.jdt.core.prefs create mode 100644 Plugins/Mineplex.Minecraft.Game.ClassCombat/.settings/org.eclipse.m2e.core.prefs create mode 100644 Plugins/Mineplex.Minecraft.Game.Core/.classpath create mode 100644 Plugins/Mineplex.Minecraft.Game.Core/.project create mode 100644 Plugins/Mineplex.Minecraft.Game.Core/.settings/org.eclipse.core.resources.prefs create mode 100644 Plugins/Mineplex.Minecraft.Game.Core/.settings/org.eclipse.jdt.core.prefs create mode 100644 Plugins/Mineplex.Minecraft.Game.Core/.settings/org.eclipse.m2e.core.prefs create mode 100644 Plugins/Mineplex.ServerData/.classpath create mode 100644 Plugins/Mineplex.ServerData/.project create mode 100644 Plugins/Mineplex.ServerData/.settings/org.eclipse.core.resources.prefs create mode 100644 Plugins/Mineplex.ServerData/.settings/org.eclipse.jdt.core.prefs create mode 100644 Plugins/Mineplex.ServerData/.settings/org.eclipse.m2e.core.prefs create mode 100644 Plugins/Mineplex.ServerMonitor/.classpath create mode 100644 Plugins/Mineplex.ServerMonitor/.project create mode 100644 Plugins/Mineplex.ServerMonitor/.settings/org.eclipse.core.resources.prefs create mode 100644 Plugins/Mineplex.ServerMonitor/.settings/org.eclipse.jdt.core.prefs create mode 100644 Plugins/Mineplex.ServerMonitor/.settings/org.eclipse.m2e.core.prefs create mode 100644 Plugins/Mineplex.StaffServer/.classpath create mode 100644 Plugins/Mineplex.StaffServer/.project create mode 100644 Plugins/Mineplex.StaffServer/.settings/org.eclipse.core.resources.prefs create mode 100644 Plugins/Mineplex.StaffServer/.settings/org.eclipse.jdt.core.prefs create mode 100644 Plugins/Mineplex.StaffServer/.settings/org.eclipse.m2e.core.prefs create mode 100644 Plugins/Mineplex.Votifier/.classpath create mode 100644 Plugins/Mineplex.Votifier/.project create mode 100644 Plugins/Mineplex.Votifier/.settings/org.eclipse.core.resources.prefs create mode 100644 Plugins/Mineplex.Votifier/.settings/org.eclipse.jdt.core.prefs create mode 100644 Plugins/Mineplex.Votifier/.settings/org.eclipse.m2e.core.prefs create mode 100644 Plugins/Nautilus.Game.Arcade/.classpath create mode 100644 Plugins/Nautilus.Game.Arcade/.project create mode 100644 Plugins/Nautilus.Game.Arcade/.settings/org.eclipse.core.resources.prefs create mode 100644 Plugins/Nautilus.Game.Arcade/.settings/org.eclipse.jdt.core.prefs create mode 100644 Plugins/Nautilus.Game.Arcade/.settings/org.eclipse.m2e.core.prefs diff --git a/Plugins/.project b/Plugins/.project new file mode 100644 index 000000000..a6856b606 --- /dev/null +++ b/Plugins/.project @@ -0,0 +1,17 @@ + + + mineplex-parent + + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.m2e.core.maven2Nature + + diff --git a/Plugins/.settings/org.eclipse.core.resources.prefs b/Plugins/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 000000000..99f26c020 --- /dev/null +++ b/Plugins/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/Plugins/.settings/org.eclipse.m2e.core.prefs b/Plugins/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 000000000..f897a7f1c --- /dev/null +++ b/Plugins/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/Plugins/Mineplex.Bungee.Mineplexer/.classpath b/Plugins/Mineplex.Bungee.Mineplexer/.classpath new file mode 100644 index 000000000..149cb3c90 --- /dev/null +++ b/Plugins/Mineplex.Bungee.Mineplexer/.classpath @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/Plugins/Mineplex.Bungee.Mineplexer/.project b/Plugins/Mineplex.Bungee.Mineplexer/.project new file mode 100644 index 000000000..b69c0ae2c --- /dev/null +++ b/Plugins/Mineplex.Bungee.Mineplexer/.project @@ -0,0 +1,23 @@ + + + mineplex-bungee-mineplexer + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.jdt.core.javanature + org.eclipse.m2e.core.maven2Nature + + diff --git a/Plugins/Mineplex.Bungee.Mineplexer/.settings/org.eclipse.core.resources.prefs b/Plugins/Mineplex.Bungee.Mineplexer/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 000000000..7a5313928 --- /dev/null +++ b/Plugins/Mineplex.Bungee.Mineplexer/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,3 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 +encoding/src=UTF-8 diff --git a/Plugins/Mineplex.Bungee.Mineplexer/.settings/org.eclipse.jdt.core.prefs b/Plugins/Mineplex.Bungee.Mineplexer/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 000000000..714351aec --- /dev/null +++ b/Plugins/Mineplex.Bungee.Mineplexer/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,5 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/Plugins/Mineplex.Bungee.Mineplexer/.settings/org.eclipse.m2e.core.prefs b/Plugins/Mineplex.Bungee.Mineplexer/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 000000000..f897a7f1c --- /dev/null +++ b/Plugins/Mineplex.Bungee.Mineplexer/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/Plugins/Mineplex.BungeeRotator/.classpath b/Plugins/Mineplex.BungeeRotator/.classpath new file mode 100644 index 000000000..149cb3c90 --- /dev/null +++ b/Plugins/Mineplex.BungeeRotator/.classpath @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/Plugins/Mineplex.BungeeRotator/.project b/Plugins/Mineplex.BungeeRotator/.project new file mode 100644 index 000000000..129c81c53 --- /dev/null +++ b/Plugins/Mineplex.BungeeRotator/.project @@ -0,0 +1,23 @@ + + + mineplex-bungeerotator + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.jdt.core.javanature + org.eclipse.m2e.core.maven2Nature + + diff --git a/Plugins/Mineplex.BungeeRotator/.settings/org.eclipse.core.resources.prefs b/Plugins/Mineplex.BungeeRotator/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 000000000..7a5313928 --- /dev/null +++ b/Plugins/Mineplex.BungeeRotator/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,3 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 +encoding/src=UTF-8 diff --git a/Plugins/Mineplex.BungeeRotator/.settings/org.eclipse.jdt.core.prefs b/Plugins/Mineplex.BungeeRotator/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 000000000..714351aec --- /dev/null +++ b/Plugins/Mineplex.BungeeRotator/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,5 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/Plugins/Mineplex.BungeeRotator/.settings/org.eclipse.m2e.core.prefs b/Plugins/Mineplex.BungeeRotator/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 000000000..f897a7f1c --- /dev/null +++ b/Plugins/Mineplex.BungeeRotator/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/Plugins/Mineplex.Cache/.classpath b/Plugins/Mineplex.Cache/.classpath new file mode 100644 index 000000000..149cb3c90 --- /dev/null +++ b/Plugins/Mineplex.Cache/.classpath @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/Plugins/Mineplex.Cache/.project b/Plugins/Mineplex.Cache/.project new file mode 100644 index 000000000..6145fd700 --- /dev/null +++ b/Plugins/Mineplex.Cache/.project @@ -0,0 +1,23 @@ + + + mineplex-cache + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.jdt.core.javanature + org.eclipse.m2e.core.maven2Nature + + diff --git a/Plugins/Mineplex.Cache/.settings/org.eclipse.core.resources.prefs b/Plugins/Mineplex.Cache/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 000000000..7a5313928 --- /dev/null +++ b/Plugins/Mineplex.Cache/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,3 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 +encoding/src=UTF-8 diff --git a/Plugins/Mineplex.Cache/.settings/org.eclipse.jdt.core.prefs b/Plugins/Mineplex.Cache/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 000000000..714351aec --- /dev/null +++ b/Plugins/Mineplex.Cache/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,5 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/Plugins/Mineplex.Cache/.settings/org.eclipse.m2e.core.prefs b/Plugins/Mineplex.Cache/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 000000000..f897a7f1c --- /dev/null +++ b/Plugins/Mineplex.Cache/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/Plugins/Mineplex.Core.Common/.classpath b/Plugins/Mineplex.Core.Common/.classpath new file mode 100644 index 000000000..149cb3c90 --- /dev/null +++ b/Plugins/Mineplex.Core.Common/.classpath @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/Plugins/Mineplex.Core.Common/.project b/Plugins/Mineplex.Core.Common/.project new file mode 100644 index 000000000..9806b2840 --- /dev/null +++ b/Plugins/Mineplex.Core.Common/.project @@ -0,0 +1,23 @@ + + + mineplex-core-common + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.jdt.core.javanature + org.eclipse.m2e.core.maven2Nature + + diff --git a/Plugins/Mineplex.Core.Common/.settings/org.eclipse.core.resources.prefs b/Plugins/Mineplex.Core.Common/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 000000000..7a5313928 --- /dev/null +++ b/Plugins/Mineplex.Core.Common/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,3 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 +encoding/src=UTF-8 diff --git a/Plugins/Mineplex.Core.Common/.settings/org.eclipse.jdt.core.prefs b/Plugins/Mineplex.Core.Common/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 000000000..714351aec --- /dev/null +++ b/Plugins/Mineplex.Core.Common/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,5 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/Plugins/Mineplex.Core.Common/.settings/org.eclipse.m2e.core.prefs b/Plugins/Mineplex.Core.Common/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 000000000..f897a7f1c --- /dev/null +++ b/Plugins/Mineplex.Core.Common/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/Plugins/Mineplex.Core/.classpath b/Plugins/Mineplex.Core/.classpath new file mode 100644 index 000000000..149cb3c90 --- /dev/null +++ b/Plugins/Mineplex.Core/.classpath @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/Plugins/Mineplex.Core/.project b/Plugins/Mineplex.Core/.project new file mode 100644 index 000000000..6a1bf4f06 --- /dev/null +++ b/Plugins/Mineplex.Core/.project @@ -0,0 +1,23 @@ + + + mineplex-core + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.jdt.core.javanature + org.eclipse.m2e.core.maven2Nature + + diff --git a/Plugins/Mineplex.Core/.settings/org.eclipse.core.resources.prefs b/Plugins/Mineplex.Core/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 000000000..7a5313928 --- /dev/null +++ b/Plugins/Mineplex.Core/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,3 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 +encoding/src=UTF-8 diff --git a/Plugins/Mineplex.Core/.settings/org.eclipse.jdt.core.prefs b/Plugins/Mineplex.Core/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 000000000..714351aec --- /dev/null +++ b/Plugins/Mineplex.Core/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,5 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/Plugins/Mineplex.Core/.settings/org.eclipse.m2e.core.prefs b/Plugins/Mineplex.Core/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 000000000..f897a7f1c --- /dev/null +++ b/Plugins/Mineplex.Core/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/Plugins/Mineplex.DDoSProtectionSwitcher/.classpath b/Plugins/Mineplex.DDoSProtectionSwitcher/.classpath new file mode 100644 index 000000000..149cb3c90 --- /dev/null +++ b/Plugins/Mineplex.DDoSProtectionSwitcher/.classpath @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/Plugins/Mineplex.DDoSProtectionSwitcher/.project b/Plugins/Mineplex.DDoSProtectionSwitcher/.project new file mode 100644 index 000000000..a2ddab34c --- /dev/null +++ b/Plugins/Mineplex.DDoSProtectionSwitcher/.project @@ -0,0 +1,23 @@ + + + mineplex-ddosprotectionswitcher + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.jdt.core.javanature + org.eclipse.m2e.core.maven2Nature + + diff --git a/Plugins/Mineplex.DDoSProtectionSwitcher/.settings/org.eclipse.core.resources.prefs b/Plugins/Mineplex.DDoSProtectionSwitcher/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 000000000..7a5313928 --- /dev/null +++ b/Plugins/Mineplex.DDoSProtectionSwitcher/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,3 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 +encoding/src=UTF-8 diff --git a/Plugins/Mineplex.DDoSProtectionSwitcher/.settings/org.eclipse.jdt.core.prefs b/Plugins/Mineplex.DDoSProtectionSwitcher/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 000000000..714351aec --- /dev/null +++ b/Plugins/Mineplex.DDoSProtectionSwitcher/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,5 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/Plugins/Mineplex.DDoSProtectionSwitcher/.settings/org.eclipse.m2e.core.prefs b/Plugins/Mineplex.DDoSProtectionSwitcher/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 000000000..f897a7f1c --- /dev/null +++ b/Plugins/Mineplex.DDoSProtectionSwitcher/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/Plugins/Mineplex.Database/.classpath b/Plugins/Mineplex.Database/.classpath new file mode 100644 index 000000000..149cb3c90 --- /dev/null +++ b/Plugins/Mineplex.Database/.classpath @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/Plugins/Mineplex.Database/.project b/Plugins/Mineplex.Database/.project new file mode 100644 index 000000000..759b2080b --- /dev/null +++ b/Plugins/Mineplex.Database/.project @@ -0,0 +1,23 @@ + + + mineplex-database + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.jdt.core.javanature + org.eclipse.m2e.core.maven2Nature + + diff --git a/Plugins/Mineplex.Database/.settings/org.eclipse.core.resources.prefs b/Plugins/Mineplex.Database/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 000000000..7a5313928 --- /dev/null +++ b/Plugins/Mineplex.Database/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,3 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 +encoding/src=UTF-8 diff --git a/Plugins/Mineplex.Database/.settings/org.eclipse.jdt.core.prefs b/Plugins/Mineplex.Database/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 000000000..714351aec --- /dev/null +++ b/Plugins/Mineplex.Database/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,5 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/Plugins/Mineplex.Database/.settings/org.eclipse.m2e.core.prefs b/Plugins/Mineplex.Database/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 000000000..f897a7f1c --- /dev/null +++ b/Plugins/Mineplex.Database/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/Plugins/Mineplex.EnjinTranslator/.classpath b/Plugins/Mineplex.EnjinTranslator/.classpath new file mode 100644 index 000000000..149cb3c90 --- /dev/null +++ b/Plugins/Mineplex.EnjinTranslator/.classpath @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/Plugins/Mineplex.EnjinTranslator/.project b/Plugins/Mineplex.EnjinTranslator/.project new file mode 100644 index 000000000..571faeecc --- /dev/null +++ b/Plugins/Mineplex.EnjinTranslator/.project @@ -0,0 +1,23 @@ + + + mineplex-enjintranslator + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.jdt.core.javanature + org.eclipse.m2e.core.maven2Nature + + diff --git a/Plugins/Mineplex.EnjinTranslator/.settings/org.eclipse.core.resources.prefs b/Plugins/Mineplex.EnjinTranslator/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 000000000..7a5313928 --- /dev/null +++ b/Plugins/Mineplex.EnjinTranslator/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,3 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 +encoding/src=UTF-8 diff --git a/Plugins/Mineplex.EnjinTranslator/.settings/org.eclipse.jdt.core.prefs b/Plugins/Mineplex.EnjinTranslator/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 000000000..714351aec --- /dev/null +++ b/Plugins/Mineplex.EnjinTranslator/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,5 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/Plugins/Mineplex.EnjinTranslator/.settings/org.eclipse.m2e.core.prefs b/Plugins/Mineplex.EnjinTranslator/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 000000000..f897a7f1c --- /dev/null +++ b/Plugins/Mineplex.EnjinTranslator/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/Plugins/Mineplex.Game.Clans.Core/.classpath b/Plugins/Mineplex.Game.Clans.Core/.classpath new file mode 100644 index 000000000..149cb3c90 --- /dev/null +++ b/Plugins/Mineplex.Game.Clans.Core/.classpath @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/Plugins/Mineplex.Game.Clans.Core/.project b/Plugins/Mineplex.Game.Clans.Core/.project new file mode 100644 index 000000000..ab84c6a4a --- /dev/null +++ b/Plugins/Mineplex.Game.Clans.Core/.project @@ -0,0 +1,23 @@ + + + mineplex-game-clans-core + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.jdt.core.javanature + org.eclipse.m2e.core.maven2Nature + + diff --git a/Plugins/Mineplex.Game.Clans.Core/.settings/org.eclipse.core.resources.prefs b/Plugins/Mineplex.Game.Clans.Core/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 000000000..7a5313928 --- /dev/null +++ b/Plugins/Mineplex.Game.Clans.Core/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,3 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 +encoding/src=UTF-8 diff --git a/Plugins/Mineplex.Game.Clans.Core/.settings/org.eclipse.jdt.core.prefs b/Plugins/Mineplex.Game.Clans.Core/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 000000000..714351aec --- /dev/null +++ b/Plugins/Mineplex.Game.Clans.Core/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,5 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/Plugins/Mineplex.Game.Clans.Core/.settings/org.eclipse.m2e.core.prefs b/Plugins/Mineplex.Game.Clans.Core/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 000000000..f897a7f1c --- /dev/null +++ b/Plugins/Mineplex.Game.Clans.Core/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/Plugins/Mineplex.Game.Clans/.classpath b/Plugins/Mineplex.Game.Clans/.classpath new file mode 100644 index 000000000..149cb3c90 --- /dev/null +++ b/Plugins/Mineplex.Game.Clans/.classpath @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/Plugins/Mineplex.Game.Clans/.project b/Plugins/Mineplex.Game.Clans/.project new file mode 100644 index 000000000..a26211ecb --- /dev/null +++ b/Plugins/Mineplex.Game.Clans/.project @@ -0,0 +1,23 @@ + + + mineplex-game-clans + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.jdt.core.javanature + org.eclipse.m2e.core.maven2Nature + + diff --git a/Plugins/Mineplex.Game.Clans/.settings/org.eclipse.core.resources.prefs b/Plugins/Mineplex.Game.Clans/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 000000000..7a5313928 --- /dev/null +++ b/Plugins/Mineplex.Game.Clans/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,3 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 +encoding/src=UTF-8 diff --git a/Plugins/Mineplex.Game.Clans/.settings/org.eclipse.jdt.core.prefs b/Plugins/Mineplex.Game.Clans/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 000000000..714351aec --- /dev/null +++ b/Plugins/Mineplex.Game.Clans/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,5 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/Plugins/Mineplex.Game.Clans/.settings/org.eclipse.m2e.core.prefs b/Plugins/Mineplex.Game.Clans/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 000000000..f897a7f1c --- /dev/null +++ b/Plugins/Mineplex.Game.Clans/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/Plugins/Mineplex.Hub/.classpath b/Plugins/Mineplex.Hub/.classpath new file mode 100644 index 000000000..149cb3c90 --- /dev/null +++ b/Plugins/Mineplex.Hub/.classpath @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/Plugins/Mineplex.Hub/.project b/Plugins/Mineplex.Hub/.project new file mode 100644 index 000000000..24d759c40 --- /dev/null +++ b/Plugins/Mineplex.Hub/.project @@ -0,0 +1,23 @@ + + + mineplex-hub + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.jdt.core.javanature + org.eclipse.m2e.core.maven2Nature + + diff --git a/Plugins/Mineplex.Hub/.settings/org.eclipse.core.resources.prefs b/Plugins/Mineplex.Hub/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 000000000..7a5313928 --- /dev/null +++ b/Plugins/Mineplex.Hub/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,3 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 +encoding/src=UTF-8 diff --git a/Plugins/Mineplex.Hub/.settings/org.eclipse.jdt.core.prefs b/Plugins/Mineplex.Hub/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 000000000..714351aec --- /dev/null +++ b/Plugins/Mineplex.Hub/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,5 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/Plugins/Mineplex.Hub/.settings/org.eclipse.m2e.core.prefs b/Plugins/Mineplex.Hub/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 000000000..f897a7f1c --- /dev/null +++ b/Plugins/Mineplex.Hub/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/Plugins/Mineplex.MapParser/.classpath b/Plugins/Mineplex.MapParser/.classpath new file mode 100644 index 000000000..149cb3c90 --- /dev/null +++ b/Plugins/Mineplex.MapParser/.classpath @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/Plugins/Mineplex.MapParser/.project b/Plugins/Mineplex.MapParser/.project new file mode 100644 index 000000000..43bcff000 --- /dev/null +++ b/Plugins/Mineplex.MapParser/.project @@ -0,0 +1,23 @@ + + + mineplex-mapparser + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.jdt.core.javanature + org.eclipse.m2e.core.maven2Nature + + diff --git a/Plugins/Mineplex.MapParser/.settings/org.eclipse.core.resources.prefs b/Plugins/Mineplex.MapParser/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 000000000..7a5313928 --- /dev/null +++ b/Plugins/Mineplex.MapParser/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,3 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 +encoding/src=UTF-8 diff --git a/Plugins/Mineplex.MapParser/.settings/org.eclipse.jdt.core.prefs b/Plugins/Mineplex.MapParser/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 000000000..714351aec --- /dev/null +++ b/Plugins/Mineplex.MapParser/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,5 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/Plugins/Mineplex.MapParser/.settings/org.eclipse.m2e.core.prefs b/Plugins/Mineplex.MapParser/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 000000000..f897a7f1c --- /dev/null +++ b/Plugins/Mineplex.MapParser/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/.classpath b/Plugins/Mineplex.Minecraft.Game.ClassCombat/.classpath new file mode 100644 index 000000000..149cb3c90 --- /dev/null +++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/.classpath @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/.project b/Plugins/Mineplex.Minecraft.Game.ClassCombat/.project new file mode 100644 index 000000000..ec0a67356 --- /dev/null +++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/.project @@ -0,0 +1,23 @@ + + + mineplex-minecraft-game-classcombat + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.jdt.core.javanature + org.eclipse.m2e.core.maven2Nature + + diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/.settings/org.eclipse.core.resources.prefs b/Plugins/Mineplex.Minecraft.Game.ClassCombat/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 000000000..7a5313928 --- /dev/null +++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,3 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 +encoding/src=UTF-8 diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/.settings/org.eclipse.jdt.core.prefs b/Plugins/Mineplex.Minecraft.Game.ClassCombat/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 000000000..714351aec --- /dev/null +++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,5 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/.settings/org.eclipse.m2e.core.prefs b/Plugins/Mineplex.Minecraft.Game.ClassCombat/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 000000000..f897a7f1c --- /dev/null +++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/Plugins/Mineplex.Minecraft.Game.Core/.classpath b/Plugins/Mineplex.Minecraft.Game.Core/.classpath new file mode 100644 index 000000000..149cb3c90 --- /dev/null +++ b/Plugins/Mineplex.Minecraft.Game.Core/.classpath @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/Plugins/Mineplex.Minecraft.Game.Core/.project b/Plugins/Mineplex.Minecraft.Game.Core/.project new file mode 100644 index 000000000..34b626ff9 --- /dev/null +++ b/Plugins/Mineplex.Minecraft.Game.Core/.project @@ -0,0 +1,23 @@ + + + mineplex-minecraft-game-core + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.jdt.core.javanature + org.eclipse.m2e.core.maven2Nature + + diff --git a/Plugins/Mineplex.Minecraft.Game.Core/.settings/org.eclipse.core.resources.prefs b/Plugins/Mineplex.Minecraft.Game.Core/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 000000000..7a5313928 --- /dev/null +++ b/Plugins/Mineplex.Minecraft.Game.Core/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,3 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 +encoding/src=UTF-8 diff --git a/Plugins/Mineplex.Minecraft.Game.Core/.settings/org.eclipse.jdt.core.prefs b/Plugins/Mineplex.Minecraft.Game.Core/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 000000000..714351aec --- /dev/null +++ b/Plugins/Mineplex.Minecraft.Game.Core/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,5 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/Plugins/Mineplex.Minecraft.Game.Core/.settings/org.eclipse.m2e.core.prefs b/Plugins/Mineplex.Minecraft.Game.Core/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 000000000..f897a7f1c --- /dev/null +++ b/Plugins/Mineplex.Minecraft.Game.Core/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/Plugins/Mineplex.ServerData/.classpath b/Plugins/Mineplex.ServerData/.classpath new file mode 100644 index 000000000..149cb3c90 --- /dev/null +++ b/Plugins/Mineplex.ServerData/.classpath @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/Plugins/Mineplex.ServerData/.project b/Plugins/Mineplex.ServerData/.project new file mode 100644 index 000000000..cc601dfce --- /dev/null +++ b/Plugins/Mineplex.ServerData/.project @@ -0,0 +1,23 @@ + + + mineplex-serverdata + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.jdt.core.javanature + org.eclipse.m2e.core.maven2Nature + + diff --git a/Plugins/Mineplex.ServerData/.settings/org.eclipse.core.resources.prefs b/Plugins/Mineplex.ServerData/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 000000000..7a5313928 --- /dev/null +++ b/Plugins/Mineplex.ServerData/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,3 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 +encoding/src=UTF-8 diff --git a/Plugins/Mineplex.ServerData/.settings/org.eclipse.jdt.core.prefs b/Plugins/Mineplex.ServerData/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 000000000..714351aec --- /dev/null +++ b/Plugins/Mineplex.ServerData/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,5 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/Plugins/Mineplex.ServerData/.settings/org.eclipse.m2e.core.prefs b/Plugins/Mineplex.ServerData/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 000000000..f897a7f1c --- /dev/null +++ b/Plugins/Mineplex.ServerData/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/Plugins/Mineplex.ServerMonitor/.classpath b/Plugins/Mineplex.ServerMonitor/.classpath new file mode 100644 index 000000000..149cb3c90 --- /dev/null +++ b/Plugins/Mineplex.ServerMonitor/.classpath @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/Plugins/Mineplex.ServerMonitor/.project b/Plugins/Mineplex.ServerMonitor/.project new file mode 100644 index 000000000..674450760 --- /dev/null +++ b/Plugins/Mineplex.ServerMonitor/.project @@ -0,0 +1,23 @@ + + + mineplex-servermonitor + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.jdt.core.javanature + org.eclipse.m2e.core.maven2Nature + + diff --git a/Plugins/Mineplex.ServerMonitor/.settings/org.eclipse.core.resources.prefs b/Plugins/Mineplex.ServerMonitor/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 000000000..7a5313928 --- /dev/null +++ b/Plugins/Mineplex.ServerMonitor/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,3 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 +encoding/src=UTF-8 diff --git a/Plugins/Mineplex.ServerMonitor/.settings/org.eclipse.jdt.core.prefs b/Plugins/Mineplex.ServerMonitor/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 000000000..714351aec --- /dev/null +++ b/Plugins/Mineplex.ServerMonitor/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,5 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/Plugins/Mineplex.ServerMonitor/.settings/org.eclipse.m2e.core.prefs b/Plugins/Mineplex.ServerMonitor/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 000000000..f897a7f1c --- /dev/null +++ b/Plugins/Mineplex.ServerMonitor/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/Plugins/Mineplex.StaffServer/.classpath b/Plugins/Mineplex.StaffServer/.classpath new file mode 100644 index 000000000..149cb3c90 --- /dev/null +++ b/Plugins/Mineplex.StaffServer/.classpath @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/Plugins/Mineplex.StaffServer/.project b/Plugins/Mineplex.StaffServer/.project new file mode 100644 index 000000000..d237ceb58 --- /dev/null +++ b/Plugins/Mineplex.StaffServer/.project @@ -0,0 +1,23 @@ + + + mineplex-staffserver + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.jdt.core.javanature + org.eclipse.m2e.core.maven2Nature + + diff --git a/Plugins/Mineplex.StaffServer/.settings/org.eclipse.core.resources.prefs b/Plugins/Mineplex.StaffServer/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 000000000..7a5313928 --- /dev/null +++ b/Plugins/Mineplex.StaffServer/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,3 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 +encoding/src=UTF-8 diff --git a/Plugins/Mineplex.StaffServer/.settings/org.eclipse.jdt.core.prefs b/Plugins/Mineplex.StaffServer/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 000000000..714351aec --- /dev/null +++ b/Plugins/Mineplex.StaffServer/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,5 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/Plugins/Mineplex.StaffServer/.settings/org.eclipse.m2e.core.prefs b/Plugins/Mineplex.StaffServer/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 000000000..f897a7f1c --- /dev/null +++ b/Plugins/Mineplex.StaffServer/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/Plugins/Mineplex.Votifier/.classpath b/Plugins/Mineplex.Votifier/.classpath new file mode 100644 index 000000000..149cb3c90 --- /dev/null +++ b/Plugins/Mineplex.Votifier/.classpath @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/Plugins/Mineplex.Votifier/.project b/Plugins/Mineplex.Votifier/.project new file mode 100644 index 000000000..e22997649 --- /dev/null +++ b/Plugins/Mineplex.Votifier/.project @@ -0,0 +1,23 @@ + + + mineplex-votifier + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.jdt.core.javanature + org.eclipse.m2e.core.maven2Nature + + diff --git a/Plugins/Mineplex.Votifier/.settings/org.eclipse.core.resources.prefs b/Plugins/Mineplex.Votifier/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 000000000..7a5313928 --- /dev/null +++ b/Plugins/Mineplex.Votifier/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,3 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 +encoding/src=UTF-8 diff --git a/Plugins/Mineplex.Votifier/.settings/org.eclipse.jdt.core.prefs b/Plugins/Mineplex.Votifier/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 000000000..714351aec --- /dev/null +++ b/Plugins/Mineplex.Votifier/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,5 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/Plugins/Mineplex.Votifier/.settings/org.eclipse.m2e.core.prefs b/Plugins/Mineplex.Votifier/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 000000000..f897a7f1c --- /dev/null +++ b/Plugins/Mineplex.Votifier/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/Plugins/Nautilus.Game.Arcade/.classpath b/Plugins/Nautilus.Game.Arcade/.classpath new file mode 100644 index 000000000..149cb3c90 --- /dev/null +++ b/Plugins/Nautilus.Game.Arcade/.classpath @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/Plugins/Nautilus.Game.Arcade/.project b/Plugins/Nautilus.Game.Arcade/.project new file mode 100644 index 000000000..3bdc39535 --- /dev/null +++ b/Plugins/Nautilus.Game.Arcade/.project @@ -0,0 +1,23 @@ + + + nautilus-game-arcade + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.jdt.core.javanature + org.eclipse.m2e.core.maven2Nature + + diff --git a/Plugins/Nautilus.Game.Arcade/.settings/org.eclipse.core.resources.prefs b/Plugins/Nautilus.Game.Arcade/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 000000000..7a5313928 --- /dev/null +++ b/Plugins/Nautilus.Game.Arcade/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,3 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 +encoding/src=UTF-8 diff --git a/Plugins/Nautilus.Game.Arcade/.settings/org.eclipse.jdt.core.prefs b/Plugins/Nautilus.Game.Arcade/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 000000000..714351aec --- /dev/null +++ b/Plugins/Nautilus.Game.Arcade/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,5 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/Plugins/Nautilus.Game.Arcade/.settings/org.eclipse.m2e.core.prefs b/Plugins/Nautilus.Game.Arcade/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 000000000..f897a7f1c --- /dev/null +++ b/Plugins/Nautilus.Game.Arcade/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/Plugins/pom.xml b/Plugins/pom.xml index 7706ab5ee..63426e9ae 100644 --- a/Plugins/pom.xml +++ b/Plugins/pom.xml @@ -175,6 +175,35 @@ false + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + net.md-5 + + scriptus + + + [0.3.1,) + + + describe + + + + + + + + + + From 84b887fe8962c38b387c11bc7ceab8502e92f5fd Mon Sep 17 00:00:00 2001 From: NewGarbo Date: Mon, 1 Feb 2016 19:53:59 +0000 Subject: [PATCH 04/21] that's not needed --- .../src/mineplex/game/clans/clans/ClansManager.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java index 218d7947b..33e8da07d 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java @@ -213,11 +213,6 @@ public class ClansManager extends MiniClientPluginimplements IRelati { super("Clans Manager", plugin); - if (serverName.equals("GarboClans-1")) - { - addCommand(new Meow(new OutpostManager(this))); - } - _instance = this; _punish = punish; From 8a0f58543246af72fafc8e392c66f6fe7c40e76f Mon Sep 17 00:00:00 2001 From: phobia Date: Tue, 2 Feb 2016 22:11:52 +1100 Subject: [PATCH 05/21] Added fix to WarPoint evasion bug + 1 dmg bug --- .../game/clans/clans/ClansManager.java | 12 +++- .../clans/warpoints/WarPointEvasion.java | 58 +++++++++++++++++++ 2 files changed, 68 insertions(+), 2 deletions(-) create mode 100644 Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/warpoints/WarPointEvasion.java diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java index 218d7947b..e5b721b4c 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java @@ -9,6 +9,7 @@ import java.util.Set; import java.util.TimeZone; import java.util.UUID; +import mineplex.game.clans.clans.warpoints.WarPointEvasion; import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.Material; @@ -259,9 +260,9 @@ public class ClansManager extends MiniClientPluginimplements IRelati _itemMapManager = new ItemMapManager(this, _worldEvent); new TntGeneratorManager(plugin, this); new SupplyDropManager(plugin, this); - _explosion = new Explosion(plugin, blockRestore); - + new WarPointEvasion(plugin); + // new ClansLoginManager(getPlugin(), clientManager, _serverName); _clanShop = new ClanShop(this, clientManager, donationManager); @@ -608,6 +609,13 @@ public class ClansManager extends MiniClientPluginimplements IRelati { player.setOp(true); } + if(player.getInventory().getHelmet() != null) { //Reset helmet to fix 1 damage bug + ItemStack helmet = player.getInventory().getHelmet().clone(); + player.getInventory().setHelmet(null); + runSyncLater(() -> { + player.getInventory().setHelmet(helmet); + }, 5L); + } } @EventHandler diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/warpoints/WarPointEvasion.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/warpoints/WarPointEvasion.java new file mode 100644 index 000000000..fb6e9bd87 --- /dev/null +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/warpoints/WarPointEvasion.java @@ -0,0 +1,58 @@ +package mineplex.game.clans.clans.warpoints; + +import com.google.common.collect.Maps; +import mineplex.core.MiniPlugin; +import mineplex.core.common.util.F; +import mineplex.core.common.util.UtilTime; +import mineplex.core.updater.UpdateType; +import mineplex.core.updater.event.UpdateEvent; +import mineplex.game.clans.clans.event.PlayerPreClaimTerritoryEvent; +import mineplex.game.clans.clans.event.PlayerUnClaimTerritoryEvent; +import org.bukkit.Chunk; +import org.bukkit.event.EventHandler; +import org.bukkit.plugin.java.JavaPlugin; + +import java.util.HashMap; + +public class WarPointEvasion extends MiniPlugin{ + private HashMap _cooldown; + private final long COOLDOWN_TIME = 1000 * 60 * 30; + + public WarPointEvasion(JavaPlugin plugin) { + super("WP Evasion", plugin); + _cooldown = Maps.newHashMap(); + } + + @EventHandler + public void updateCooldown(UpdateEvent event) { + if(!event.getType().equals(UpdateType.SEC)) return; + + for(Chunk chunk : _cooldown.keySet()) { + if(UtilTime.elapsed(_cooldown.get(chunk), COOLDOWN_TIME)) { + _cooldown.remove(chunk); + } else { + _cooldown.put(chunk, _cooldown.get(chunk) - 1000); + } + } + } + + @EventHandler + public void onClaim(PlayerPreClaimTerritoryEvent event) { + Chunk chunk = event.getClaimedChunk(); + if(_cooldown.containsKey(chunk)) { + event.setCancelled(true); + event.getClaimer().sendMessage(F.main("Clans", "You cannot claim this chunk for another " + UtilTime.convertString(_cooldown.get(chunk), 1, UtilTime.TimeUnit.MINUTES))); + } + } + + @EventHandler + public void onunClaim(PlayerUnClaimTerritoryEvent event) { + Chunk chunk = event.getUnClaimedChunk(); + if(_cooldown.containsKey(chunk)) { + // Error maybe? + _cooldown.remove(chunk); + } + _cooldown.put(chunk, System.currentTimeMillis()); + + } +} From 59e564cdc605778082c56dd32f912df95a584c69 Mon Sep 17 00:00:00 2001 From: phobia Date: Tue, 2 Feb 2016 23:18:05 +1100 Subject: [PATCH 06/21] Fixes to war point evasion --- .../game/clans/clans/warpoints/WarPointEvasion.java | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/warpoints/WarPointEvasion.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/warpoints/WarPointEvasion.java index fb6e9bd87..74f8aefba 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/warpoints/WarPointEvasion.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/warpoints/WarPointEvasion.java @@ -27,13 +27,7 @@ public class WarPointEvasion extends MiniPlugin{ public void updateCooldown(UpdateEvent event) { if(!event.getType().equals(UpdateType.SEC)) return; - for(Chunk chunk : _cooldown.keySet()) { - if(UtilTime.elapsed(_cooldown.get(chunk), COOLDOWN_TIME)) { - _cooldown.remove(chunk); - } else { - _cooldown.put(chunk, _cooldown.get(chunk) - 1000); - } - } + _cooldown.keySet().stream().filter(chunk -> UtilTime.elapsed(_cooldown.get(chunk), COOLDOWN_TIME)).forEach(chunk -> _cooldown.remove(chunk)); } @EventHandler @@ -41,7 +35,7 @@ public class WarPointEvasion extends MiniPlugin{ Chunk chunk = event.getClaimedChunk(); if(_cooldown.containsKey(chunk)) { event.setCancelled(true); - event.getClaimer().sendMessage(F.main("Clans", "You cannot claim this chunk for another " + UtilTime.convertString(_cooldown.get(chunk), 1, UtilTime.TimeUnit.MINUTES))); + event.getClaimer().sendMessage(F.main("Clans", "You cannot claim this chunk for another " + UtilTime.convertString(System.currentTimeMillis() - _cooldown.get(chunk), 1, UtilTime.TimeUnit.MINUTES))); } } From cfbfb1fa3be2305ade73653df42fd850f97993a7 Mon Sep 17 00:00:00 2001 From: NewGarbo Date: Tue, 2 Feb 2016 08:20:11 +0000 Subject: [PATCH 07/21] raised war points for invasion to 25 --- .../mineplex/game/clans/clans/war/WarManager.java | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/war/WarManager.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/war/WarManager.java index 166693db2..e10d1070e 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/war/WarManager.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/war/WarManager.java @@ -25,9 +25,9 @@ import mineplex.core.scoreboard.elements.ScoreboardElement; import mineplex.core.updater.UpdateType; import mineplex.core.updater.event.UpdateEvent; import mineplex.game.clans.clans.ClanInfo; +import mineplex.game.clans.clans.ClanTips.TipType; import mineplex.game.clans.clans.ClansManager; import mineplex.game.clans.clans.ClansUtility; -import mineplex.game.clans.clans.ClanTips.TipType; import mineplex.game.clans.clans.event.ClanDisbandedEvent; import mineplex.game.clans.clans.event.ClansPlayerDeathEvent; import mineplex.game.clans.clans.war.command.WarPointsCommand; @@ -38,7 +38,7 @@ import mineplex.game.clans.core.war.ClanWarData; public class WarManager extends MiniPlugin implements ScoreboardElement { public static final int WAR_START_POINTS = 0; - public static final int WAR_FINISH_POINTS = 20; + public static final int WAR_FINISH_POINTS = 25; public static final long INVADE_LENGTH = 60000L * 30; // 30 Minutes public static final long WAR_COOLDOWN = 60000L * 30; // 30 Minutes @@ -117,11 +117,18 @@ public class WarManager extends MiniPlugin implements ScoreboardElement @EventHandler public void handleDeath(final ClansPlayerDeathEvent event) { - if (event.getPlayer() != null && event.getPlayer().getClan() != null) + ClanInfo deathClan = event.getPlayer().getClan(); + + if (deathClan == null) + { + deathClan = _clansManager.leftRecently(event.getPlayer().getPlayer().getUniqueId(), 60000).getLeft(); + } + + if (event.getPlayer() != null && deathClan != null) { if (event.getKiller() != null && event.getKiller().getClan() != null) { - final ClanInfo clan = event.getPlayer().getClan(); + final ClanInfo clan = deathClan; final ClanInfo killerClan = event.getKiller().getClan(); ClanWarData war = clan.getWarData(killerClan); From 23883148dda73b86b2eb187669c6dfe8cfadd7ec Mon Sep 17 00:00:00 2001 From: NewGarbo Date: Tue, 2 Feb 2016 20:55:23 +0000 Subject: [PATCH 08/21] alpha fixes --- .../mineplex/core/common/util/UtilWorld.java | 36 +++++++++++- .../mineplex/game/clans/clans/ClanInfo.java | 7 +++ .../game/clans/clans/ClansManager.java | 23 ++++++-- .../game/clans/clans/ClansUtility.java | 6 +- .../clans/clans/commands/ClansCommand.java | 56 +++++++++++++++++++ .../game/clans/items/GearManager.java | 5 +- 6 files changed, 124 insertions(+), 9 deletions(-) diff --git a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilWorld.java b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilWorld.java index c2a3c40ab..3d0d1d18a 100644 --- a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilWorld.java +++ b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilWorld.java @@ -1,15 +1,19 @@ package mineplex.core.common.util; import java.util.Collection; - +import java.util.List; +import java.util.function.Predicate; import org.bukkit.Chunk; import org.bukkit.Location; import org.bukkit.World; import org.bukkit.World.Environment; import org.bukkit.block.Block; +import org.bukkit.block.BlockFace; import org.bukkit.util.Vector; +import com.google.common.collect.Lists; + public class UtilWorld { public static World getWorld(String world) @@ -194,4 +198,34 @@ public class UtilWorld return vec.toLocation(world); } + + public static Location getNearestLocationThatMatchesNeeds(Location location, Predicate needs) + { + List branch = branch(location); + + for (Block block : branch) + { + if (needs.test(block.getLocation())) + { + return block.getLocation(); + } + else + { + return getNearestLocationThatMatchesNeeds(block.getLocation(), needs); + } + } + + return null; + } + + private static List branch(Location origin) + { + return Lists.newArrayList(origin.getBlock(), + origin.getBlock().getRelative(BlockFace.DOWN), + origin.getBlock().getRelative(BlockFace.UP), + origin.getBlock().getRelative(BlockFace.NORTH), + origin.getBlock().getRelative(BlockFace.EAST), + origin.getBlock().getRelative(BlockFace.SOUTH), + origin.getBlock().getRelative(BlockFace.WEST)); + } } diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClanInfo.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClanInfo.java index fac283def..9f20b5ec9 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClanInfo.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClanInfo.java @@ -67,6 +67,7 @@ public class ClanInfo private HashMap _warOut = new HashMap(); // Temporary + private NautHashMap _recentlyLeft = new NautHashMap<>(); private NautHashMap _inviteeMap = new NautHashMap(); private NautHashMap _inviterMap = new NautHashMap(); private List _onlinePlayers = new ArrayList(); @@ -76,6 +77,7 @@ public class ClanInfo public ClansManager Clans; private BedStatus _bedStatus = null; + public ClanInfo(ClansManager clans, ClanToken token) { @@ -800,4 +802,9 @@ public class ClanInfo { return _bedStatus == BedStatus.DESTROYED ? C.cRed + "Destroyed" : (_bedStatus == BedStatus.DOESNT_EXIST ? C.cWhite + "None" : (_bedStatus == BedStatus.EXISTS_AND_OBSTRUCTED ? C.cRed + "Obstructed" : (_bedStatus == BedStatus.EXISTS_AND_UNOBSTRUCTED ? C.cGreen + UtilWorld.locToStrClean(_home) : "N/A"))); } + + public void left(String name) + { + _recentlyLeft.put(name, System.currentTimeMillis()); + } } diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java index 6cb20f082..89cc68e01 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java @@ -9,7 +9,6 @@ import java.util.Set; import java.util.TimeZone; import java.util.UUID; -import mineplex.game.clans.clans.warpoints.WarPointEvasion; import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.Material; @@ -40,7 +39,7 @@ import mineplex.core.account.CoreClientManager; import mineplex.core.achievement.AchievementManager; import mineplex.core.blockrestore.BlockRestore; import mineplex.core.chat.Chat; -import mineplex.core.chat.MessageData; +import mineplex.core.common.Pair; import mineplex.core.common.Rank; import mineplex.core.common.util.C; import mineplex.core.common.util.F; @@ -76,10 +75,8 @@ import mineplex.game.clans.clans.commands.ClanManagementCommand; import mineplex.game.clans.clans.commands.ClansAllyChatCommand; import mineplex.game.clans.clans.commands.ClansChatCommand; import mineplex.game.clans.clans.commands.ClansCommand; -import mineplex.game.clans.clans.commands.ClansLoginManager; import mineplex.game.clans.clans.commands.KillCommand; import mineplex.game.clans.clans.commands.MapCommand; -import mineplex.game.clans.clans.commands.Meow; import mineplex.game.clans.clans.commands.RegionsCommand; import mineplex.game.clans.clans.data.PlayerClan; import mineplex.game.clans.clans.event.ClansPlayerDeathEvent; @@ -87,7 +84,6 @@ import mineplex.game.clans.clans.gui.ClanShop; import mineplex.game.clans.clans.loot.LootManager; import mineplex.game.clans.clans.map.ItemMapManager; import mineplex.game.clans.clans.observer.ObserverManager; -import mineplex.game.clans.clans.outpost.OutpostManager; import mineplex.game.clans.clans.playtime.Playtime; import mineplex.game.clans.clans.potato.PotatoManager; import mineplex.game.clans.clans.pvptimer.PvpTimer; @@ -99,6 +95,7 @@ import mineplex.game.clans.clans.stuck.StuckManager; import mineplex.game.clans.clans.supplyDrop.SupplyDropManager; import mineplex.game.clans.clans.tntGenerator.TntGeneratorManager; import mineplex.game.clans.clans.war.WarManager; +import mineplex.game.clans.clans.warpoints.WarPointEvasion; import mineplex.game.clans.clans.worldevent.WorldEventManager; import mineplex.game.clans.core.ClanDeleteCommand; import mineplex.game.clans.core.ClanLoadCommand; @@ -201,6 +198,7 @@ public class ClansManager extends MiniClientPluginimplements IRelati // private NautHashMap _clanMemberNameMap = new // NautHashMap(); private NautHashMap _clanMemberUuidMap = new NautHashMap(); + private NautHashMap> _clanMemberLeftMap = new NautHashMap<>(); private NautHashMap _claimMap = new NautHashMap(); private NautHashMap _unclaimMap = new NautHashMap(); @@ -1163,4 +1161,19 @@ public class ClansManager extends MiniClientPluginimplements IRelati ClansPlayerDeathEvent clansPlayerDeathEvent = new ClansPlayerDeathEvent(event, playerClan, killerClan); Bukkit.getServer().getPluginManager().callEvent(clansPlayerDeathEvent); } + + public void justLeft(UUID uniqueId, ClanInfo clan) + { + _clanMemberLeftMap.put(uniqueId, Pair.create(clan, System.currentTimeMillis())); + } + + public Pair leftRecently(UUID uniqueId, long time) + { + if (_clanMemberLeftMap.containsKey(uniqueId) && (System.currentTimeMillis() - _clanMemberLeftMap.get(uniqueId).getRight()) <= time) + { + return Pair.create(_clanMemberLeftMap.get(uniqueId).getLeft(), (System.currentTimeMillis() - _clanMemberLeftMap.get(uniqueId).getRight())); + } + + return null; + } } diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansUtility.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansUtility.java index 6a1356d8c..4e466128c 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansUtility.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansUtility.java @@ -632,6 +632,8 @@ public class ClansUtility // Inform Clans.getTutorials().sendTutorialMsg(caller, F.main("Clans", "You left " + F.elem("Clan " + clan.getName()) + ".")); clan.inform(F.name(caller.getName()) + " has left your Clan.", null); + + clan.left(caller.getName()); } }); } @@ -677,8 +679,8 @@ public class ClansUtility if (!data) { Clans.getTutorials().sendTutorialMsg(caller, F.main("Clans", "There was an error processing your request. Try again later")); - - }else + } + else { Clans.getTutorials().sendTutorialMsg(caller, F.main("Clans", "You disbanded your Clan.")); } diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/ClansCommand.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/ClansCommand.java index cbc4c02dc..6299268cd 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/ClansCommand.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/ClansCommand.java @@ -30,6 +30,7 @@ import mineplex.game.clans.clans.ClansManager; import mineplex.game.clans.clans.ClientClan; import mineplex.game.clans.clans.event.ClanJoinEvent; import mineplex.game.clans.clans.event.ClansCommandExecutedEvent; +import mineplex.game.clans.core.repository.ClanTerritory; import net.minecraft.server.v1_8_R3.EnumDirection; public class ClansCommand extends CommandBase @@ -105,6 +106,8 @@ public class ClansCommand extends CommandBase else if (args[0].equalsIgnoreCase("sethome")) homeSet(caller); + else if (args[0].equalsIgnoreCase("stuck")) + stuck(caller); /* * else if (args[0].equalsIgnoreCase("enemy") || args[0].equals("e")) @@ -211,6 +214,8 @@ public class ClansCommand extends CommandBase _manager.getTutorials().sendTutorialMsg(caller, F.help("/c map ", "View Clan Map", Rank.ALL)); _manager.getTutorials().sendTutorialMsg(caller, F.help("/cc (Message)", "Clan Chat (Toggle)", Rank.ALL)); + _manager.getTutorials().sendTutorialMsg(caller, F.help("/c stuck", "Teleports you to the nearest Wilderness location", Rank.ALL)); + _manager.getTutorials().sendTutorialMsg(caller, F.help("/c promote ", "Promote Player in Clan", Rank.MODERATOR)); _manager.getTutorials().sendTutorialMsg(caller, F.help("/c demote ", "Demote Player in Clan", Rank.MODERATOR)); @@ -242,6 +247,12 @@ public class ClansCommand extends CommandBase return; } + if (Plugin.leftRecently(caller.getUniqueId(), 20 * 60 * 1000).getLeft() != null) + { + _manager.getTutorials().sendTutorialMsg(caller, F.main("Clans", "You cannot create a Clan for " + C.mTime + UtilTime.MakeStr(Plugin.leftRecently(caller.getUniqueId(), 20 * 60 * 1000).getRight()) + C.mBody + ".")); + return; + } + /* * TODO if (!client.canJoin()) { _manager.getTutorials().sendTutorialMsg(caller, * F.main("Clans", "You cannot join a Clan for " + C.mTime + @@ -344,6 +355,43 @@ public class ClansCommand extends CommandBase Plugin.getClanUtility().invite(caller, clan, target); } + public void stuck(final Player caller) + { + ClanTerritory territory = Plugin.getClanUtility().getClaim(caller.getLocation()); + + String clanName = Plugin.getClanUtility().getClanByPlayer(caller) == null ? null : Plugin.getClanUtility().getClanByPlayer(caller).getName(); + + if (territory == null || territory.Safe || territory.Owner.equals(clanName)) + { + _manager.getTutorials().sendTutorialMsg(caller, F.main("Clans", "You must be in another Clan's territory to use this.")); + return; + } + + DelayedTask.Instance.doDelay(caller, "Wilderness Teleport", new Callback() { + public void run(DelayedTaskClient player) + { + // Do + player.getPlayer().teleport(UtilWorld.getNearestLocationThatMatchesNeeds(caller.getLocation(), location -> + Plugin.getClanUtility().getClaim(location) == null && UtilBlock.getHighest(location.getWorld(), location.getBlockX(), location.getBlockZ()).getY() <= location.getBlockY() + )); + + // Inform + _manager.getTutorials().sendTutorialMsg(caller, F.main("Clans", "You have been teleported to the Wilderness.")); + } + }, new Callback() { + public void run(DelayedTaskClient client) + { + UtilTextMiddle.display("", "Teleporting to Wilderness in " + F.elem(UtilTime.MakeStr(Math.max(0, client.getTimeLeft("Wilderness Teleport")))), 0, 5, 0, client.getPlayer()); + } + }, new Callback() { + public void run(DelayedTaskClient client) + { + UtilPlayer.message(client.getPlayer(), F.main("Clans", "Teleport has been cancelled due to movement.")); + } + }, 2 * 60 * 1000, false); + + } + public void join(final Player caller, String[] args) { if (Plugin.getClanMemberUuidMap().containsKey(caller.getUniqueId())) @@ -352,6 +400,12 @@ public class ClansCommand extends CommandBase return; } + if (Plugin.leftRecently(caller.getUniqueId(), 20 * 60 * 1000).getLeft() != null) + { + _manager.getTutorials().sendTutorialMsg(caller, F.main("Clans", "You cannot join a Clan for " + C.mTime + UtilTime.MakeStr(Plugin.leftRecently(caller.getUniqueId(), 20 * 60 * 1000).getRight()) + C.mBody + ".")); + return; + } + if (!Plugin.Get(caller).canJoin()) { _manager.getTutorials().sendTutorialMsg(caller, F.main("Clans", "You cannot join a Clan for " + C.mTime + UtilTime.convertString(System.currentTimeMillis() - Plugin.Get(caller).getDelay(), 1, TimeUnit.FIT) + C.mBody + ".")); @@ -438,6 +492,8 @@ public class ClansCommand extends CommandBase // Inform _manager.getTutorials().sendTutorialMsg(caller, F.main("Clans", "You left " + F.elem("Clan " + clan.getName()) + ".")); clan.inform(F.name(caller.getName()) + " has left your Clan.", null); + + _manager.justLeft(caller.getUniqueId(), clan); } }); } diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/GearManager.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/GearManager.java index b6505c23b..73242f881 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/GearManager.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/GearManager.java @@ -130,7 +130,10 @@ public class GearManager extends MiniPlugin implements IPacketHandler, Runnable // TODO: Introduce configurable non-hardcoded values for generation // weights? _attributeWeights = new WeightSet(new Weight(3, 3), new Weight(20, 2), new Weight(77, 1)); - _typeWeights = new WeightSet(new Weight(10, ItemType.LEGENDARY), new Weight(45, ItemType.ARMOR), new Weight(23, ItemType.WEAPON), new Weight(22, ItemType.BOW)); + _typeWeights = new WeightSet(new Weight(6, ItemType.LEGENDARY), + new Weight(46, ItemType.ARMOR), + new Weight(25, ItemType.WEAPON), + new Weight(23, ItemType.BOW)); // Weapon-based attributes _weaponAttributes = new WeightSet>(FrostedAttribute.class, SharpAttribute.class, JaggedAttribute.class, HasteAttribute.class, FlamingAttribute.class, ConqueringAttribute.class); From 6fea76a8e4d76de92e989b986efb98b8f3f2835a Mon Sep 17 00:00:00 2001 From: NewGarbo Date: Tue, 2 Feb 2016 21:38:38 +0000 Subject: [PATCH 09/21] finalized alpha patches --- .../mineplex/core/common/util/UtilBlock.java | 5 ++ .../mineplex/core/common/util/UtilWorld.java | 19 ------ .../game/clans/clans/ClansManager.java | 2 +- .../clans/clans/commands/ClansCommand.java | 60 +++++++++++++++++-- .../game/clans/clans/war/WarManager.java | 2 +- 5 files changed, 61 insertions(+), 27 deletions(-) diff --git a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilBlock.java b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilBlock.java index 3acb09f70..1f84fdaaa 100644 --- a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilBlock.java +++ b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilBlock.java @@ -464,6 +464,11 @@ public class UtilBlock return getHighest(world, x, z, null); } + public static Block getHighest(World world, Location location) + { + return getHighest(world, location.getBlockX(), location.getBlockZ(), null); + } + public static Block getHighest(World world, int x, int z, HashSet ignore) { Block block = world.getHighestBlockAt(x, z); diff --git a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilWorld.java b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilWorld.java index 3d0d1d18a..321ba7ee9 100644 --- a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilWorld.java +++ b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilWorld.java @@ -198,25 +198,6 @@ public class UtilWorld return vec.toLocation(world); } - - public static Location getNearestLocationThatMatchesNeeds(Location location, Predicate needs) - { - List branch = branch(location); - - for (Block block : branch) - { - if (needs.test(block.getLocation())) - { - return block.getLocation(); - } - else - { - return getNearestLocationThatMatchesNeeds(block.getLocation(), needs); - } - } - - return null; - } private static List branch(Location origin) { diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java index 89cc68e01..2224e07fc 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java @@ -1171,7 +1171,7 @@ public class ClansManager extends MiniClientPluginimplements IRelati { if (_clanMemberLeftMap.containsKey(uniqueId) && (System.currentTimeMillis() - _clanMemberLeftMap.get(uniqueId).getRight()) <= time) { - return Pair.create(_clanMemberLeftMap.get(uniqueId).getLeft(), (System.currentTimeMillis() - _clanMemberLeftMap.get(uniqueId).getRight())); + return Pair.create(_clanMemberLeftMap.get(uniqueId).getLeft(), time - (System.currentTimeMillis() - _clanMemberLeftMap.get(uniqueId).getRight())); } return null; diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/ClansCommand.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/ClansCommand.java index 6299268cd..536c29993 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/ClansCommand.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/ClansCommand.java @@ -1,10 +1,17 @@ package mineplex.game.clans.clans.commands; +import java.util.Collections; +import java.util.List; + import org.bukkit.Bukkit; +import org.bukkit.Chunk; import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.block.BlockFace; import org.bukkit.entity.Player; +import org.bukkit.plugin.Plugin; + +import com.google.common.collect.Lists; import mineplex.core.command.CommandBase; import mineplex.core.common.Rank; @@ -13,6 +20,7 @@ import mineplex.core.common.util.Callback; import mineplex.core.common.util.F; import mineplex.core.common.util.UtilBlock; import mineplex.core.common.util.UtilInput; +import mineplex.core.common.util.UtilMath; import mineplex.core.common.util.UtilPlayer; import mineplex.core.common.util.UtilServer; import mineplex.core.common.util.UtilTextMiddle; @@ -247,7 +255,7 @@ public class ClansCommand extends CommandBase return; } - if (Plugin.leftRecently(caller.getUniqueId(), 20 * 60 * 1000).getLeft() != null) + if (Plugin.leftRecently(caller.getUniqueId(), 20 * 60 * 1000) != null) { _manager.getTutorials().sendTutorialMsg(caller, F.main("Clans", "You cannot create a Clan for " + C.mTime + UtilTime.MakeStr(Plugin.leftRecently(caller.getUniqueId(), 20 * 60 * 1000).getRight()) + C.mBody + ".")); return; @@ -371,9 +379,16 @@ public class ClansCommand extends CommandBase public void run(DelayedTaskClient player) { // Do - player.getPlayer().teleport(UtilWorld.getNearestLocationThatMatchesNeeds(caller.getLocation(), location -> - Plugin.getClanUtility().getClaim(location) == null && UtilBlock.getHighest(location.getWorld(), location.getBlockX(), location.getBlockZ()).getY() <= location.getBlockY() - )); + + Location loc = getWildLoc(player.getPlayer().getLocation()); + + if (loc == null) + { + _manager.getTutorials().sendTutorialMsg(caller, F.main("Clans", "Error whilst finding location to teleport to.")); + return; + } + + player.getPlayer().teleport(loc); // Inform _manager.getTutorials().sendTutorialMsg(caller, F.main("Clans", "You have been teleported to the Wilderness.")); @@ -388,10 +403,43 @@ public class ClansCommand extends CommandBase { UtilPlayer.message(client.getPlayer(), F.main("Clans", "Teleport has been cancelled due to movement.")); } - }, 2 * 60 * 1000, false); + }, 7 * 1000, false); } + public Location getWildLoc(Location origin) + { + Chunk wildLoc = origin.getChunk(); + + List worldChunks = Lists.newArrayList(origin.getWorld().getLoadedChunks()); + + Collections.sort( + worldChunks, + (c1, c2) -> + (int) ((int) + origin.distance( + UtilBlock.getHighest(origin.getWorld(), + c1.getBlock(7, origin.getBlockY(), 7).getLocation() + ).getLocation()) + - + origin.distance( + UtilBlock.getHighest(origin.getWorld(), + c2.getBlock(7, origin.getBlockY(), 7).getLocation() + ).getLocation()) + ) + ); + + for (Chunk chunk : worldChunks) + { + if (Plugin.getClanUtility().getClaim(chunk) == null) + { + return chunk.getBlock(6, UtilBlock.getHighest(origin.getWorld(), chunk.getBlock(6, 0, 6).getLocation()).getY(), 6).getLocation(); + } + } + + return null; + } + public void join(final Player caller, String[] args) { if (Plugin.getClanMemberUuidMap().containsKey(caller.getUniqueId())) @@ -400,7 +448,7 @@ public class ClansCommand extends CommandBase return; } - if (Plugin.leftRecently(caller.getUniqueId(), 20 * 60 * 1000).getLeft() != null) + if (Plugin.leftRecently(caller.getUniqueId(), 20 * 60 * 1000) != null) { _manager.getTutorials().sendTutorialMsg(caller, F.main("Clans", "You cannot join a Clan for " + C.mTime + UtilTime.MakeStr(Plugin.leftRecently(caller.getUniqueId(), 20 * 60 * 1000).getRight()) + C.mBody + ".")); return; diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/war/WarManager.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/war/WarManager.java index e10d1070e..39a1e2680 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/war/WarManager.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/war/WarManager.java @@ -121,7 +121,7 @@ public class WarManager extends MiniPlugin implements ScoreboardElement if (deathClan == null) { - deathClan = _clansManager.leftRecently(event.getPlayer().getPlayer().getUniqueId(), 60000).getLeft(); + deathClan = _clansManager.leftRecently(event.getPlayer().getPlayer().getUniqueId(), 60000) == null ? deathClan : _clansManager.leftRecently(event.getPlayer().getPlayer().getUniqueId(), 60000).getLeft(); } if (event.getPlayer() != null && deathClan != null) From 0e0582a1a7c339a00f49fcdfabc40314327fc88f Mon Sep 17 00:00:00 2001 From: phobia Date: Wed, 3 Feb 2016 10:39:21 +1100 Subject: [PATCH 10/21] Added safe zone protection for flame --- .../src/mineplex/game/clans/clans/ClansGame.java | 4 ++-- .../mineplex/game/clans/items/attributes/AttackAttribute.java | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansGame.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansGame.java index 9db1f9d2e..01b9f4a39 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansGame.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansGame.java @@ -263,7 +263,7 @@ public class ClansGame extends MiniPlugin { // Cancel event.SetCancelled("Clans Ally"); - + // Inform if (damager != null) { @@ -538,7 +538,7 @@ public class ClansGame extends MiniPlugin ClanInfo clan = _clans.getClanUtility().getOwner(event.getEntity().getLocation()); if (clan == null) return; - + if (_clans.getWarManager().isBeingInvaded(clan)) { // Allow because of invasion diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/AttackAttribute.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/AttackAttribute.java index 836665064..58f115f2d 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/AttackAttribute.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/AttackAttribute.java @@ -30,6 +30,7 @@ public abstract class AttackAttribute extends ItemAttribute @Override public void onAttack(CustomDamageEvent event) { + if(event.GetCancellers().contains("Safe Zone")) return; _attackCount++; System.out.println("Attack count " + _attackCount + " - " + _attackLimit); if (_attackCount >= _attackLimit) From f011fdad5fd601f32fe44f4da8ca28744ceaa957 Mon Sep 17 00:00:00 2001 From: phobia Date: Wed, 3 Feb 2016 15:10:56 +1100 Subject: [PATCH 11/21] Fixes to TntProtection --- .../src/mineplex/game/clans/clans/ClanInfo.java | 8 ++++++-- .../src/mineplex/game/clans/clans/ClansGame.java | 7 ++++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClanInfo.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClanInfo.java index fac283def..d5bc9c5ba 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClanInfo.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClanInfo.java @@ -478,7 +478,7 @@ public class ClanInfo public boolean isOnline() { - return isOnlineNow();// || System.currentTimeMillis() - _lastOnline.getTime() < Clans.getOnlineTime(); + return isOnlineNow(); } public String getProtected() @@ -487,7 +487,7 @@ public class ClanInfo if (cur.isOnline()) return C.cRed + "No - Clan Members are Online"; - if (System.currentTimeMillis() - _lastOnline.getTime() > Clans.getOnlineTime()) + if (UtilTime.elapsed(_lastOnline.getTime(), Clans.getOnlineTime())) return C.cGreen + "Yes - Clan Members are Offline"; return C.cGold @@ -496,6 +496,10 @@ public class ClanInfo TimeUnit.FIT) + " to Protection"; } + public boolean isProtected() { + return getProtected().startsWith(C.cGreen + "Yes"); + } + public TntGenerator getGenerator() { return _generator; diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansGame.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansGame.java index 01b9f4a39..b1e198995 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansGame.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansGame.java @@ -520,8 +520,9 @@ public class ClansGame extends MiniPlugin { ClanInfo clan = _clans.getClanUtility().getClanByPlayer(event.getPlayer()); if (clan == null) return; - - clan.setLastOnline(new Timestamp(System.currentTimeMillis())); + + if(!clan.isOnline()) clan.setLastOnline(new Timestamp(System.currentTimeMillis())); //Noone else on + else clan.setLastOnline(new Timestamp(0)); } @EventHandler(priority = EventPriority.LOWEST) @@ -545,7 +546,7 @@ public class ClansGame extends MiniPlugin return; } - if (!clan.isOnline()) + if (!clan.isProtected()) event.setCancelled(true); else clan.inform(C.cRed + "Your Territory is under attack!", null); From e61b36f55c0a0a2d4fe703ed5513e3c02bd141e4 Mon Sep 17 00:00:00 2001 From: NewGarbo Date: Thu, 4 Feb 2016 22:55:37 +0000 Subject: [PATCH 12/21] Fixed /c stuck timer taking 7 seconds instead of 2 minutes --- .../src/mineplex/game/clans/clans/commands/ClansCommand.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/ClansCommand.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/ClansCommand.java index 536c29993..19a7c9a4a 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/ClansCommand.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/ClansCommand.java @@ -403,7 +403,7 @@ public class ClansCommand extends CommandBase { UtilPlayer.message(client.getPlayer(), F.main("Clans", "Teleport has been cancelled due to movement.")); } - }, 7 * 1000, false); + }, 2 * 60 * 1000, false); } From 6fd9cffb016fbfb5657dd758b7673501023f0ac2 Mon Sep 17 00:00:00 2001 From: phobia Date: Fri, 5 Feb 2016 10:12:18 +1100 Subject: [PATCH 13/21] Clans alpha bug fixes --- .../src/mineplex/game/clans/gameplay/Gameplay.java | 11 +++++++++++ .../game/clans/items/attributes/AttackAttribute.java | 2 +- .../items/attributes/weapon/FlamingAttribute.java | 6 ++++++ .../clans/items/legendaries/GiantsBroadsword.java | 5 ++--- 4 files changed, 20 insertions(+), 4 deletions(-) diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/gameplay/Gameplay.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/gameplay/Gameplay.java index e3a425c34..3d4320ac8 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/gameplay/Gameplay.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/gameplay/Gameplay.java @@ -14,6 +14,7 @@ import org.bukkit.Sound; import org.bukkit.block.Biome; import org.bukkit.block.Block; import org.bukkit.block.BlockFace; +import org.bukkit.block.BlockState; import org.bukkit.entity.EntityType; import org.bukkit.entity.ItemFrame; import org.bukkit.entity.Player; @@ -40,6 +41,7 @@ import org.bukkit.event.player.PlayerFishEvent.State; import org.bukkit.event.player.PlayerInteractEntityEvent; import org.bukkit.event.player.PlayerInteractEvent; import org.bukkit.event.weather.WeatherChangeEvent; +import org.bukkit.event.world.StructureGrowEvent; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.ItemMeta; import org.bukkit.material.Dye; @@ -271,9 +273,17 @@ public class Gameplay extends MiniPlugin { UtilPlayer.message(event.getPlayer(), F.main("Game", "You cannot place blocks this high.")); event.setCancelled(true); + } else if(event.getBlock().getLocation().getBlockY() == 99 && event.getBlock().getType().name().contains("DOOR") && !event.getBlock().getType().equals(Material.TRAP_DOOR)) { + UtilPlayer.message(event.getPlayer(), F.main("Game", "You cannot place blocks this high.")); + event.setCancelled(true); } } + @EventHandler(priority = EventPriority.LOWEST) + public void GrowTree(StructureGrowEvent event) { + event.getBlocks().stream().filter(blockState -> blockState.getLocation().getBlockY() > 100).forEach(blockState -> blockState.setType(Material.AIR) ); + } + /** * Disable all Piston related events in Clans * @@ -459,6 +469,7 @@ public class Gameplay extends MiniPlugin @EventHandler(priority = EventPriority.HIGHEST) public void disableSaplings(BlockPlaceEvent event) { + if(event.isCancelled()) return; //Can't place this block if (!event.getItemInHand().getType().equals(Material.SAPLING)) { return; diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/AttackAttribute.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/AttackAttribute.java index 58f115f2d..aa702ebfd 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/AttackAttribute.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/AttackAttribute.java @@ -30,7 +30,7 @@ public abstract class AttackAttribute extends ItemAttribute @Override public void onAttack(CustomDamageEvent event) { - if(event.GetCancellers().contains("Safe Zone")) return; + if(event.IsCancelled() || event.isCancelled()) return; _attackCount++; System.out.println("Attack count " + _attackCount + " - " + _attackLimit); if (_attackCount >= _attackLimit) diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/weapon/FlamingAttribute.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/weapon/FlamingAttribute.java index 84ab060c0..499c0ec03 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/weapon/FlamingAttribute.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/weapon/FlamingAttribute.java @@ -1,10 +1,13 @@ package mineplex.game.clans.items.attributes.weapon; +import mineplex.game.clans.clans.ClansManager; +import mineplex.game.clans.clans.gui.page.ClanMainPage; import mineplex.game.clans.items.attributes.AttackAttribute; import mineplex.game.clans.items.attributes.AttributeType; import mineplex.game.clans.items.generation.ValueDistribution; import org.bukkit.entity.Entity; +import org.bukkit.entity.Player; public class FlamingAttribute extends AttackAttribute { @@ -34,6 +37,9 @@ public class FlamingAttribute extends AttackAttribute @Override public void triggerAttack(Entity attacker, Entity defender) { + if(attacker instanceof Player && ClansManager.getInstance().isSafe((Player) attacker)) return; + if(defender instanceof Player && ClansManager.getInstance().isSafe((Player) defender)) return; + defender.setFireTicks(_fireDuration); } diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/legendaries/GiantsBroadsword.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/legendaries/GiantsBroadsword.java index e7059080f..c49fa95be 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/legendaries/GiantsBroadsword.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/legendaries/GiantsBroadsword.java @@ -15,8 +15,7 @@ public class GiantsBroadsword extends LegendaryItem { public static final int SLOW_AMPLIFIER = 43; public static final int REGEN_AMPLIFIER = 4; - public static final int EFFECT_DURATION = 20; // Duration of potion effect - // (in ticks) + public static final int EFFECT_DURATION = 20; // Duration of potion effect (in ticks) public GiantsBroadsword() { @@ -63,6 +62,6 @@ public class GiantsBroadsword extends LegendaryItem private void buffPlayer(Player player) { grantPotionEffect(player, PotionEffectType.SLOW, EFFECT_DURATION, SLOW_AMPLIFIER); - grantPotionEffect(player, PotionEffectType.REGENERATION, 2, REGEN_AMPLIFIER); //Regen + grantPotionEffect(player, PotionEffectType.REGENERATION, EFFECT_DURATION, REGEN_AMPLIFIER); //Regen } } From 6291decf872340ed2da516e64c981f62ff8a8eeb Mon Sep 17 00:00:00 2001 From: phobia Date: Fri, 5 Feb 2016 11:42:39 +1100 Subject: [PATCH 14/21] Fixes to flame and broadsword --- .../items/attributes/weapon/FlamingAttribute.java | 3 ++- .../clans/items/legendaries/GiantsBroadsword.java | 12 ++++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/weapon/FlamingAttribute.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/weapon/FlamingAttribute.java index 499c0ec03..ec37a112a 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/weapon/FlamingAttribute.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/weapon/FlamingAttribute.java @@ -6,6 +6,7 @@ import mineplex.game.clans.items.attributes.AttackAttribute; import mineplex.game.clans.items.attributes.AttributeType; import mineplex.game.clans.items.generation.ValueDistribution; +import org.bukkit.GameMode; import org.bukkit.entity.Entity; import org.bukkit.entity.Player; @@ -39,7 +40,7 @@ public class FlamingAttribute extends AttackAttribute { if(attacker instanceof Player && ClansManager.getInstance().isSafe((Player) attacker)) return; if(defender instanceof Player && ClansManager.getInstance().isSafe((Player) defender)) return; - + if(attacker instanceof Player && ((Player)attacker).getGameMode().equals(GameMode.CREATIVE)) return; defender.setFireTicks(_fireDuration); } diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/legendaries/GiantsBroadsword.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/legendaries/GiantsBroadsword.java index c49fa95be..bdc9c4491 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/legendaries/GiantsBroadsword.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/legendaries/GiantsBroadsword.java @@ -15,8 +15,7 @@ public class GiantsBroadsword extends LegendaryItem { public static final int SLOW_AMPLIFIER = 43; public static final int REGEN_AMPLIFIER = 4; - public static final int EFFECT_DURATION = 20; // Duration of potion effect (in ticks) - + public GiantsBroadsword() { super("Giants Broadsword", new String[]{ @@ -40,6 +39,11 @@ public class GiantsBroadsword extends LegendaryItem UtilParticle.PlayParticle(ParticleType.HEART, wielder.getEyeLocation().add(0, 0.25, 0), -.5f + (float) Math.random(), -.5f + (float) Math.random(), -.5f + (float) Math.random(), .2f, 1, ViewDist.NORMAL); wielder.playSound(wielder.getLocation(), Sound.LAVA_POP, 1f, 2f); return; + }else{ + if(wielder.hasPotionEffect(PotionEffectType.REGENERATION)) { + wielder.removePotionEffect(PotionEffectType.REGENERATION); + wielder.removePotionEffect(PotionEffectType.SLOW); + } } UtilParticle.PlayParticle(ParticleType.MAGIC_CRIT, wielder.getLocation().add(0, 1, 0), 0, 0, 0, .2f, 3, ViewDist.NORMAL); @@ -61,7 +65,7 @@ public class GiantsBroadsword extends LegendaryItem private void buffPlayer(Player player) { - grantPotionEffect(player, PotionEffectType.SLOW, EFFECT_DURATION, SLOW_AMPLIFIER); - grantPotionEffect(player, PotionEffectType.REGENERATION, EFFECT_DURATION, REGEN_AMPLIFIER); //Regen + grantPotionEffect(player, PotionEffectType.SLOW, 10000000, SLOW_AMPLIFIER); + grantPotionEffect(player, PotionEffectType.REGENERATION, 1000000, REGEN_AMPLIFIER); //Regen } } From b0888208d16998a51e7974c3f0c2dfc89d6fad20 Mon Sep 17 00:00:00 2001 From: phobia Date: Fri, 5 Feb 2016 23:55:38 +1100 Subject: [PATCH 15/21] More alphs bug fixes --- .../clans/warpoints/WarPointEvasion.java | 51 ++++++++++++++----- .../items/legendaries/GiantsBroadsword.java | 18 +++---- .../items/legendaries/LegendaryItem.java | 1 + 3 files changed, 46 insertions(+), 24 deletions(-) diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/warpoints/WarPointEvasion.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/warpoints/WarPointEvasion.java index 74f8aefba..1847fa9fb 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/warpoints/WarPointEvasion.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/warpoints/WarPointEvasion.java @@ -3,50 +3,77 @@ package mineplex.game.clans.clans.warpoints; import com.google.common.collect.Maps; import mineplex.core.MiniPlugin; import mineplex.core.common.util.F; +import mineplex.core.common.util.UtilPlayer; +import mineplex.core.common.util.UtilServer; import mineplex.core.common.util.UtilTime; import mineplex.core.updater.UpdateType; import mineplex.core.updater.event.UpdateEvent; -import mineplex.game.clans.clans.event.PlayerPreClaimTerritoryEvent; -import mineplex.game.clans.clans.event.PlayerUnClaimTerritoryEvent; +import mineplex.game.clans.clans.ClansManager; +import mineplex.game.clans.clans.event.*; +import org.bukkit.Bukkit; import org.bukkit.Chunk; +import org.bukkit.OfflinePlayer; +import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.plugin.java.JavaPlugin; import java.util.HashMap; +import java.util.UUID; public class WarPointEvasion extends MiniPlugin{ - private HashMap _cooldown; + private HashMap _chunkCooldown; + private HashMap _playerCooldown; + private final long COOLDOWN_TIME = 1000 * 60 * 30; public WarPointEvasion(JavaPlugin plugin) { super("WP Evasion", plugin); - _cooldown = Maps.newHashMap(); + _chunkCooldown = Maps.newHashMap(); + _playerCooldown = Maps.newHashMap(); } @EventHandler public void updateCooldown(UpdateEvent event) { if(!event.getType().equals(UpdateType.SEC)) return; - _cooldown.keySet().stream().filter(chunk -> UtilTime.elapsed(_cooldown.get(chunk), COOLDOWN_TIME)).forEach(chunk -> _cooldown.remove(chunk)); + _chunkCooldown.keySet().stream().filter(chunk -> UtilTime.elapsed(_chunkCooldown.get(chunk), COOLDOWN_TIME)).forEach(chunk -> _chunkCooldown.remove(chunk)); + + _playerCooldown.keySet().stream().filter(player -> UtilTime.elapsed(_playerCooldown.get(player), COOLDOWN_TIME)).forEach(player -> { + _playerCooldown.remove(player); + if(Bukkit.getOfflinePlayer(player).isOnline()) { + if(ClansManager.getInstance().getClan(Bukkit.getPlayer(player)) == null) { + Bukkit.getPlayer(player).sendMessage(F.main("Clans", "You can now create a clan.")); + } + } + }); } @EventHandler public void onClaim(PlayerPreClaimTerritoryEvent event) { Chunk chunk = event.getClaimedChunk(); - if(_cooldown.containsKey(chunk)) { + if(_chunkCooldown.containsKey(chunk)) { event.setCancelled(true); - event.getClaimer().sendMessage(F.main("Clans", "You cannot claim this chunk for another " + UtilTime.convertString(System.currentTimeMillis() - _cooldown.get(chunk), 1, UtilTime.TimeUnit.MINUTES))); + event.getClaimer().sendMessage(F.main("Clans", "You cannot claim this chunk for another " + UtilTime.convertString(System.currentTimeMillis() - _chunkCooldown.get(chunk), 1, UtilTime.TimeUnit.MINUTES))); } } @EventHandler public void onunClaim(PlayerUnClaimTerritoryEvent event) { Chunk chunk = event.getUnClaimedChunk(); - if(_cooldown.containsKey(chunk)) { - // Error maybe? - _cooldown.remove(chunk); - } - _cooldown.put(chunk, System.currentTimeMillis()); + _chunkCooldown.put(chunk, System.currentTimeMillis()); } + + @EventHandler + public void onClanLeave(ClanDisbandedEvent event) { + _playerCooldown.put(event.getDisbander().getUniqueId(), System.currentTimeMillis()); + } + + @EventHandler + public void onClanCreate(ClanCreatedEvent event) { + if (_playerCooldown.containsKey(event.getFounder().getUniqueId())) { + event.setCancelled(true); + event.getFounder().sendMessage(F.main("Clans", "You cannot create a clan for another " + UtilTime.convertString(System.currentTimeMillis() - _playerCooldown.get(event.getFounder().getUniqueId()), 1, UtilTime.TimeUnit.MINUTES))); + } + } } diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/legendaries/GiantsBroadsword.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/legendaries/GiantsBroadsword.java index bdc9c4491..d9f71353c 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/legendaries/GiantsBroadsword.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/legendaries/GiantsBroadsword.java @@ -14,7 +14,7 @@ import mineplex.minecraft.game.core.damage.CustomDamageEvent; public class GiantsBroadsword extends LegendaryItem { public static final int SLOW_AMPLIFIER = 43; - public static final int REGEN_AMPLIFIER = 4; + public static final int REGEN_AMPLIFIER = 3; public GiantsBroadsword() { @@ -32,20 +32,14 @@ public class GiantsBroadsword extends LegendaryItem @Override public void update(Player wielder) { - if (isHoldingRightClick()) - { + if (isHoldingRightClick()) { buffPlayer(wielder); - + UtilParticle.PlayParticle(ParticleType.HEART, wielder.getEyeLocation().add(0, 0.25, 0), -.5f + (float) Math.random(), -.5f + (float) Math.random(), -.5f + (float) Math.random(), .2f, 1, ViewDist.NORMAL); wielder.playSound(wielder.getLocation(), Sound.LAVA_POP, 1f, 2f); return; - }else{ - if(wielder.hasPotionEffect(PotionEffectType.REGENERATION)) { - wielder.removePotionEffect(PotionEffectType.REGENERATION); - wielder.removePotionEffect(PotionEffectType.SLOW); - } } - + UtilParticle.PlayParticle(ParticleType.MAGIC_CRIT, wielder.getLocation().add(0, 1, 0), 0, 0, 0, .2f, 3, ViewDist.NORMAL); } @@ -65,7 +59,7 @@ public class GiantsBroadsword extends LegendaryItem private void buffPlayer(Player player) { - grantPotionEffect(player, PotionEffectType.SLOW, 10000000, SLOW_AMPLIFIER); - grantPotionEffect(player, PotionEffectType.REGENERATION, 1000000, REGEN_AMPLIFIER); //Regen + grantPotionEffect(player, PotionEffectType.SLOW, 40, SLOW_AMPLIFIER); + grantPotionEffect(player, PotionEffectType.REGENERATION, 40, REGEN_AMPLIFIER); //Regen } } diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/legendaries/LegendaryItem.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/legendaries/LegendaryItem.java index 13094784a..45c32ed17 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/legendaries/LegendaryItem.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/legendaries/LegendaryItem.java @@ -92,6 +92,7 @@ public class LegendaryItem extends CustomItem */ public static void grantPotionEffect(Player player, PotionEffectType type, int tickDuration, int amplifier) { + player.removePotionEffect(type); player.addPotionEffect(new PotionEffect(type, amplifier, tickDuration)); } } From 27e4ef784c93b815aca955a42a079005019984c4 Mon Sep 17 00:00:00 2001 From: phobia Date: Sat, 6 Feb 2016 08:44:37 +1100 Subject: [PATCH 16/21] WP Evade --- .../game/clans/clans/ClansDataAccessLayer.java | 2 +- .../game/clans/clans/warpoints/WarPointEvasion.java | 12 +++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansDataAccessLayer.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansDataAccessLayer.java index b3bdba522..4fc76394e 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansDataAccessLayer.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansDataAccessLayer.java @@ -603,7 +603,7 @@ public class ClansDataAccessLayer { UtilBlock.deleteBed(clan.getHome()); clan.setHome(null); - clan.inform("Clan has lost it's Home because of a Territory loss.", null); + clan.inform("Clan has lost its Home because of a Territory loss.", null); } return true; diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/warpoints/WarPointEvasion.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/warpoints/WarPointEvasion.java index 1847fa9fb..ef92eabe7 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/warpoints/WarPointEvasion.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/warpoints/WarPointEvasion.java @@ -53,7 +53,7 @@ public class WarPointEvasion extends MiniPlugin{ Chunk chunk = event.getClaimedChunk(); if(_chunkCooldown.containsKey(chunk)) { event.setCancelled(true); - event.getClaimer().sendMessage(F.main("Clans", "You cannot claim this chunk for another " + UtilTime.convertString(System.currentTimeMillis() - _chunkCooldown.get(chunk), 1, UtilTime.TimeUnit.MINUTES))); + event.getClaimer().sendMessage(F.main("Clans", "You cannot claim this chunk for another " + UtilTime.convertString(COOLDOWN_TIME - (System.currentTimeMillis() - _chunkCooldown.get(chunk)), 1, UtilTime.TimeUnit.MINUTES))); } } @@ -65,15 +65,21 @@ public class WarPointEvasion extends MiniPlugin{ } @EventHandler - public void onClanLeave(ClanDisbandedEvent event) { + public void onClanDisband(ClanDisbandedEvent event) { _playerCooldown.put(event.getDisbander().getUniqueId(), System.currentTimeMillis()); } + @EventHandler + public void onClanLeave(ClanLeaveEvent event) { + _playerCooldown.put(event.getPlayer().getUuid(), System.currentTimeMillis()); + } + + @EventHandler public void onClanCreate(ClanCreatedEvent event) { if (_playerCooldown.containsKey(event.getFounder().getUniqueId())) { event.setCancelled(true); - event.getFounder().sendMessage(F.main("Clans", "You cannot create a clan for another " + UtilTime.convertString(System.currentTimeMillis() - _playerCooldown.get(event.getFounder().getUniqueId()), 1, UtilTime.TimeUnit.MINUTES))); + event.getFounder().sendMessage(F.main("Clans", "You cannot create a clan for another " + UtilTime.convertString(COOLDOWN_TIME - (System.currentTimeMillis() - _playerCooldown.get(event.getFounder().getUniqueId())), 1, UtilTime.TimeUnit.MINUTES))); } } } From 4f5625d63e189ff8c5b69d0c2c9853e757e97de0 Mon Sep 17 00:00:00 2001 From: Shaun Bennett Date: Fri, 5 Feb 2016 18:42:22 -0500 Subject: [PATCH 17/21] Clans Alpha 1.0 changes --- .../src/mineplex/game/clans/Clans.java | 2 +- .../mineplex/game/clans/clans/ClansAdmin.java | 21 +++++++++++++ .../clans/clans/ClansDataAccessLayer.java | 2 ++ .../game/clans/clans/ClansManager.java | 30 ++++++++----------- .../clans/clans/commands/ClansCommand.java | 4 +-- .../clans/warpoints/WarPointEvasion.java | 10 ++++++- 6 files changed, 47 insertions(+), 22 deletions(-) diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java index 69a6891d4..5dedde239 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java @@ -53,7 +53,7 @@ import net.minecraft.server.v1_8_R3.MinecraftServer; public class Clans extends JavaPlugin { - public static final String VERSION = "0.19"; + public static final String VERSION = "1.0"; private String WEB_CONFIG = "webServer"; // Modules diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansAdmin.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansAdmin.java index 13e07c1cb..a5c23d8a7 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansAdmin.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansAdmin.java @@ -85,6 +85,9 @@ public class ClansAdmin else if (args[1].equalsIgnoreCase("wp")) wp(caller, args); + else if (args[1].equalsIgnoreCase("timer")) + resetTime(caller, args); + else help(caller); } @@ -111,8 +114,26 @@ public class ClansAdmin UtilPlayer.message(caller, F.help("/c x unclaim (all)", "Unclaim Territory for Mimic", Rank.CMOD)); UtilPlayer.message(caller, F.help("/c x delete", "Delete Mimic Clan", Rank.CMOD)); UtilPlayer.message(caller, F.help("/c x autoclaim", "AutoClaim for Mimic Clan", Rank.CMOD)); + UtilPlayer.message(caller, F.help("/c x timer ", "Reset Clan Create Timer", Rank.CMOD)); UtilPlayer.message(caller, F.main("Mimic Clan", Clans.Get(caller).getMimic())); } + + private void resetTime(Player caller, String[] args) + { + if (args.length < 3) + { + UtilPlayer.message(caller, F.main("Clans Admin", "You did not enter a player name")); + return; + } + + Player player = UtilPlayer.searchOnline(caller, args[2], true); + + if (player != null) + { + Clans.resetLeftTimer(player.getUniqueId()); + UtilPlayer.message(caller, F.main("Clans Admin", "Reset Clan create timer for " + F.name(player.getName()))); + } + } private void autoclaim(Player caller) { diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansDataAccessLayer.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansDataAccessLayer.java index 4fc76394e..9ca0714f1 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansDataAccessLayer.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansDataAccessLayer.java @@ -297,6 +297,8 @@ public class ClansDataAccessLayer clan.getMembers().remove(clansPlayer.getUuid()); _manager.getClanMemberUuidMap().remove(clansPlayer.getUuid()); clan.playerOffline(clansPlayer.getPlayerName()); + + _manager.justLeft(clansPlayer.getUuid(), clan); // Log _manager.log("Removed [" + clansPlayer.getPlayerName() + "] from [" + clan.getName() + "]."); } diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java index 2224e07fc..d099eb34a 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java @@ -181,6 +181,7 @@ public class ClansManager extends MiniClientPluginimplements IRelati private NpcManager _npcManager; private Explosion _explosion; private GoldManager _goldManager; + private WarPointEvasion _warPointEvasion; private Punish _punish; @@ -254,7 +255,7 @@ public class ClansManager extends MiniClientPluginimplements IRelati new TntGeneratorManager(plugin, this); new SupplyDropManager(plugin, this); _explosion = new Explosion(plugin, blockRestore); - new WarPointEvasion(plugin); + _warPointEvasion = new WarPointEvasion(plugin); // new ClansLoginManager(getPlugin(), clientManager, _serverName); @@ -744,23 +745,9 @@ public class ClansManager extends MiniClientPluginimplements IRelati } } - @EventHandler(priority = EventPriority.HIGHEST) + @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true) public void handlePlayerChat(AsyncPlayerChatEvent event) { - event.setCancelled(false); - - _chat.HandleChat(event); - - if (event.isCancelled()) - { - return; - } - else - { - event.setCancelled(true); - } - - // PunishClient punishclient = _punish.GetClient(event.getPlayer().getName()); // // if (punishclient != null && punishclient.IsMuted()) @@ -809,7 +796,9 @@ public class ClansManager extends MiniClientPluginimplements IRelati { handleRegularChat(event, clan, rank); } - + + event.setCancelled(true); + System.out.println((clan == null ? "" : clan.getName()) + " " + _clientManager.Get(event.getPlayer()).GetRank().name() + " " + event.getPlayer().getName() + " " + event.getMessage()); } @@ -1166,6 +1155,13 @@ public class ClansManager extends MiniClientPluginimplements IRelati { _clanMemberLeftMap.put(uniqueId, Pair.create(clan, System.currentTimeMillis())); } + + public void resetLeftTimer(UUID uuid) + { + _clanMemberLeftMap.remove(uuid); + _warPointEvasion.resetCooldown(uuid); + + } public Pair leftRecently(UUID uniqueId, long time) { diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/ClansCommand.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/ClansCommand.java index 19a7c9a4a..ee20486a9 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/ClansCommand.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/ClansCommand.java @@ -255,7 +255,7 @@ public class ClansCommand extends CommandBase return; } - if (Plugin.leftRecently(caller.getUniqueId(), 20 * 60 * 1000) != null) + if (Plugin.leftRecently(caller.getUniqueId(), 5 * 60 * 1000) != null) { _manager.getTutorials().sendTutorialMsg(caller, F.main("Clans", "You cannot create a Clan for " + C.mTime + UtilTime.MakeStr(Plugin.leftRecently(caller.getUniqueId(), 20 * 60 * 1000).getRight()) + C.mBody + ".")); return; @@ -540,8 +540,6 @@ public class ClansCommand extends CommandBase // Inform _manager.getTutorials().sendTutorialMsg(caller, F.main("Clans", "You left " + F.elem("Clan " + clan.getName()) + ".")); clan.inform(F.name(caller.getName()) + " has left your Clan.", null); - - _manager.justLeft(caller.getUniqueId(), clan); } }); } diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/warpoints/WarPointEvasion.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/warpoints/WarPointEvasion.java index ef92eabe7..e3f066e3c 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/warpoints/WarPointEvasion.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/warpoints/WarPointEvasion.java @@ -24,7 +24,7 @@ public class WarPointEvasion extends MiniPlugin{ private HashMap _chunkCooldown; private HashMap _playerCooldown; - private final long COOLDOWN_TIME = 1000 * 60 * 30; + private final long COOLDOWN_TIME = 1000 * 60 * 10; public WarPointEvasion(JavaPlugin plugin) { super("WP Evasion", plugin); @@ -77,9 +77,17 @@ public class WarPointEvasion extends MiniPlugin{ @EventHandler public void onClanCreate(ClanCreatedEvent event) { + if (event.getFounder() == null) + return; + if (_playerCooldown.containsKey(event.getFounder().getUniqueId())) { event.setCancelled(true); event.getFounder().sendMessage(F.main("Clans", "You cannot create a clan for another " + UtilTime.convertString(COOLDOWN_TIME - (System.currentTimeMillis() - _playerCooldown.get(event.getFounder().getUniqueId())), 1, UtilTime.TimeUnit.MINUTES))); } } + + public void resetCooldown(UUID uuid) + { + _playerCooldown.remove(uuid); + } } From 24254635a8a47cf899505a3b39f85d47bf115326 Mon Sep 17 00:00:00 2001 From: phobia Date: Sun, 14 Feb 2016 09:51:59 +1100 Subject: [PATCH 18/21] Fixes to observer settings --- .../src/mineplex/game/clans/clans/ClansManager.java | 2 +- .../game/clans/clans/observer/ObserverManager.java | 12 ++++++++++++ .../game/clans/clans/observer/ObserverSettings.java | 2 +- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java index d099eb34a..9eb461531 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java @@ -608,7 +608,7 @@ public class ClansManager extends MiniClientPluginimplements IRelati player.getInventory().setHelmet(null); runSyncLater(() -> { player.getInventory().setHelmet(helmet); - }, 5L); + }, 20L); } } diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/observer/ObserverManager.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/observer/ObserverManager.java index 7e84a14af..3c9b12958 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/observer/ObserverManager.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/observer/ObserverManager.java @@ -10,6 +10,7 @@ import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.block.Action; +import org.bukkit.event.block.BlockBreakEvent; import org.bukkit.event.entity.EntityDamageByEntityEvent; import org.bukkit.event.inventory.InventoryClickEvent; import org.bukkit.event.player.PlayerInteractEvent; @@ -106,6 +107,17 @@ public class ObserverManager extends MiniPlugin } } + @EventHandler + public void onBreak(BlockBreakEvent event) + { + ObserverData data = _observerMap.get(event.getPlayer()); + + if (data != null) + { + if (!data.getSettings().contains(ObserverSettings.CAN_BREAK_BLOCKS)) + event.setCancelled(true); + } } + @EventHandler public void onInventoryClick(InventoryClickEvent event) { diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/observer/ObserverSettings.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/observer/ObserverSettings.java index b06c62e3c..08c0628a1 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/observer/ObserverSettings.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/observer/ObserverSettings.java @@ -16,7 +16,7 @@ public enum ObserverSettings public static EnumSet getSettings(Rank rank) { if (rank.has(Rank.DEVELOPER)) - return EnumSet.of(CAN_OPEN_CHESTS); + return EnumSet.of(CAN_OPEN_CHESTS, CAN_BREAK_BLOCKS); return EnumSet.noneOf(ObserverSettings.class); } From d7ad2cdc5885c5bc4605113b2855d6b7dc9a962c Mon Sep 17 00:00:00 2001 From: phobia Date: Sun, 14 Feb 2016 12:37:37 +1100 Subject: [PATCH 19/21] moar undead fixes --- .../src/mineplex/game/clans/clans/ClansManager.java | 10 ++++++++-- .../game/clans/clans/worldevent/undead/UndeadCamp.java | 2 ++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java index 9eb461531..7981a5a5e 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java @@ -182,7 +182,7 @@ public class ClansManager extends MiniClientPluginimplements IRelati private Explosion _explosion; private GoldManager _goldManager; private WarPointEvasion _warPointEvasion; - + private ObserverManager _observerManager; private Punish _punish; private int _inviteExpire = 2; @@ -271,7 +271,7 @@ public class ClansManager extends MiniClientPluginimplements IRelati new Spawn(plugin, this); new NPCManager(this, _hologramManager); new SafeLog(plugin, this); - new ObserverManager(plugin, _condition, this); + _observerManager = new ObserverManager(plugin, _condition, this); new ClanEnergyTracker(plugin, this); new StuckManager(this); @@ -1172,4 +1172,10 @@ public class ClansManager extends MiniClientPluginimplements IRelati return null; } + + public ObserverManager getObserverManager() + { + return _observerManager; + } + } diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/worldevent/undead/UndeadCamp.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/worldevent/undead/UndeadCamp.java index 0c98c5f45..a3a746469 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/worldevent/undead/UndeadCamp.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/worldevent/undead/UndeadCamp.java @@ -4,6 +4,7 @@ import java.util.HashSet; import java.util.Iterator; import java.util.Set; +import mineplex.game.clans.clans.ClansManager; import org.bukkit.Effect; import org.bukkit.Location; import org.bukkit.Material; @@ -474,6 +475,7 @@ public class UndeadCamp extends WorldEvent @EventHandler(priority = EventPriority.HIGHEST) public void onChestOpen(PlayerInteractEvent event) { + if(ClansManager.getInstance().getObserverManager().isObserver(event.getPlayer())) return;; Block block = event.getClickedBlock(); if (_containers.contains(block)) { From d5583b93f277458f1d04955946e824a8f642a5da Mon Sep 17 00:00:00 2001 From: NewGarbo Date: Fri, 19 Feb 2016 07:14:13 +0000 Subject: [PATCH 20/21] remove eclipse files --- .../org.eclipse.core.resources.prefs | 2 -- Plugins/.settings/org.eclipse.m2e.core.prefs | 4 ---- Plugins/Mineplex.Bungee.Mineplexer/.classpath | 20 ---------------- Plugins/Mineplex.Bungee.Mineplexer/.project | 23 ------------------- .../org.eclipse.core.resources.prefs | 3 --- .../.settings/org.eclipse.jdt.core.prefs | 5 ---- .../.settings/org.eclipse.m2e.core.prefs | 4 ---- Plugins/Mineplex.BungeeRotator/.classpath | 20 ---------------- .../org.eclipse.core.resources.prefs | 3 --- .../.settings/org.eclipse.jdt.core.prefs | 5 ---- .../.settings/org.eclipse.m2e.core.prefs | 4 ---- Plugins/Mineplex.Cache/.classpath | 20 ---------------- .../org.eclipse.core.resources.prefs | 3 --- .../.settings/org.eclipse.jdt.core.prefs | 5 ---- .../.settings/org.eclipse.m2e.core.prefs | 4 ---- Plugins/Mineplex.Core.Common/.classpath | 20 ---------------- .../org.eclipse.core.resources.prefs | 3 --- .../.settings/org.eclipse.jdt.core.prefs | 5 ---- .../.settings/org.eclipse.m2e.core.prefs | 4 ---- Plugins/Mineplex.Core/.classpath | 20 ---------------- .../org.eclipse.core.resources.prefs | 3 --- .../.settings/org.eclipse.jdt.core.prefs | 5 ---- .../.settings/org.eclipse.m2e.core.prefs | 4 ---- .../.classpath | 20 ---------------- .../org.eclipse.core.resources.prefs | 3 --- .../.settings/org.eclipse.jdt.core.prefs | 5 ---- .../.settings/org.eclipse.m2e.core.prefs | 4 ---- Plugins/Mineplex.Database/.classpath | 20 ---------------- .../org.eclipse.core.resources.prefs | 3 --- .../.settings/org.eclipse.jdt.core.prefs | 5 ---- .../.settings/org.eclipse.m2e.core.prefs | 4 ---- Plugins/Mineplex.EnjinTranslator/.classpath | 20 ---------------- .../org.eclipse.core.resources.prefs | 3 --- .../.settings/org.eclipse.jdt.core.prefs | 5 ---- .../.settings/org.eclipse.m2e.core.prefs | 4 ---- Plugins/Mineplex.Game.Clans.Core/.classpath | 20 ---------------- .../org.eclipse.core.resources.prefs | 3 --- .../.settings/org.eclipse.jdt.core.prefs | 5 ---- .../.settings/org.eclipse.m2e.core.prefs | 4 ---- Plugins/Mineplex.Game.Clans/.classpath | 20 ---------------- .../org.eclipse.core.resources.prefs | 3 --- .../.settings/org.eclipse.jdt.core.prefs | 5 ---- .../.settings/org.eclipse.m2e.core.prefs | 4 ---- Plugins/Mineplex.Hub/.classpath | 20 ---------------- .../org.eclipse.core.resources.prefs | 3 --- .../.settings/org.eclipse.jdt.core.prefs | 5 ---- .../.settings/org.eclipse.m2e.core.prefs | 4 ---- Plugins/Mineplex.MapParser/.classpath | 20 ---------------- .../org.eclipse.core.resources.prefs | 3 --- .../.settings/org.eclipse.jdt.core.prefs | 5 ---- .../.settings/org.eclipse.m2e.core.prefs | 4 ---- .../.classpath | 20 ---------------- .../org.eclipse.core.resources.prefs | 3 --- .../.settings/org.eclipse.jdt.core.prefs | 5 ---- .../.settings/org.eclipse.m2e.core.prefs | 4 ---- .../Mineplex.Minecraft.Game.Core/.classpath | 20 ---------------- .../org.eclipse.core.resources.prefs | 3 --- .../.settings/org.eclipse.jdt.core.prefs | 5 ---- .../.settings/org.eclipse.m2e.core.prefs | 4 ---- Plugins/Mineplex.ServerData/.classpath | 20 ---------------- .../org.eclipse.core.resources.prefs | 3 --- .../.settings/org.eclipse.jdt.core.prefs | 5 ---- .../.settings/org.eclipse.m2e.core.prefs | 4 ---- Plugins/Mineplex.ServerMonitor/.classpath | 20 ---------------- .../org.eclipse.core.resources.prefs | 3 --- .../.settings/org.eclipse.jdt.core.prefs | 5 ---- .../.settings/org.eclipse.m2e.core.prefs | 4 ---- Plugins/Mineplex.StaffServer/.classpath | 20 ---------------- .../org.eclipse.core.resources.prefs | 3 --- .../.settings/org.eclipse.jdt.core.prefs | 5 ---- .../.settings/org.eclipse.m2e.core.prefs | 4 ---- Plugins/Mineplex.Votifier/.classpath | 20 ---------------- .../org.eclipse.core.resources.prefs | 3 --- .../.settings/org.eclipse.jdt.core.prefs | 5 ---- .../.settings/org.eclipse.m2e.core.prefs | 4 ---- Plugins/Nautilus.Game.Arcade/.classpath | 20 ---------------- .../org.eclipse.core.resources.prefs | 3 --- .../.settings/org.eclipse.jdt.core.prefs | 5 ---- .../.settings/org.eclipse.m2e.core.prefs | 4 ---- 79 files changed, 637 deletions(-) delete mode 100644 Plugins/.settings/org.eclipse.core.resources.prefs delete mode 100644 Plugins/.settings/org.eclipse.m2e.core.prefs delete mode 100644 Plugins/Mineplex.Bungee.Mineplexer/.classpath delete mode 100644 Plugins/Mineplex.Bungee.Mineplexer/.project delete mode 100644 Plugins/Mineplex.Bungee.Mineplexer/.settings/org.eclipse.core.resources.prefs delete mode 100644 Plugins/Mineplex.Bungee.Mineplexer/.settings/org.eclipse.jdt.core.prefs delete mode 100644 Plugins/Mineplex.Bungee.Mineplexer/.settings/org.eclipse.m2e.core.prefs delete mode 100644 Plugins/Mineplex.BungeeRotator/.classpath delete mode 100644 Plugins/Mineplex.BungeeRotator/.settings/org.eclipse.core.resources.prefs delete mode 100644 Plugins/Mineplex.BungeeRotator/.settings/org.eclipse.jdt.core.prefs delete mode 100644 Plugins/Mineplex.BungeeRotator/.settings/org.eclipse.m2e.core.prefs delete mode 100644 Plugins/Mineplex.Cache/.classpath delete mode 100644 Plugins/Mineplex.Cache/.settings/org.eclipse.core.resources.prefs delete mode 100644 Plugins/Mineplex.Cache/.settings/org.eclipse.jdt.core.prefs delete mode 100644 Plugins/Mineplex.Cache/.settings/org.eclipse.m2e.core.prefs delete mode 100644 Plugins/Mineplex.Core.Common/.classpath delete mode 100644 Plugins/Mineplex.Core.Common/.settings/org.eclipse.core.resources.prefs delete mode 100644 Plugins/Mineplex.Core.Common/.settings/org.eclipse.jdt.core.prefs delete mode 100644 Plugins/Mineplex.Core.Common/.settings/org.eclipse.m2e.core.prefs delete mode 100644 Plugins/Mineplex.Core/.classpath delete mode 100644 Plugins/Mineplex.Core/.settings/org.eclipse.core.resources.prefs delete mode 100644 Plugins/Mineplex.Core/.settings/org.eclipse.jdt.core.prefs delete mode 100644 Plugins/Mineplex.Core/.settings/org.eclipse.m2e.core.prefs delete mode 100644 Plugins/Mineplex.DDoSProtectionSwitcher/.classpath delete mode 100644 Plugins/Mineplex.DDoSProtectionSwitcher/.settings/org.eclipse.core.resources.prefs delete mode 100644 Plugins/Mineplex.DDoSProtectionSwitcher/.settings/org.eclipse.jdt.core.prefs delete mode 100644 Plugins/Mineplex.DDoSProtectionSwitcher/.settings/org.eclipse.m2e.core.prefs delete mode 100644 Plugins/Mineplex.Database/.classpath delete mode 100644 Plugins/Mineplex.Database/.settings/org.eclipse.core.resources.prefs delete mode 100644 Plugins/Mineplex.Database/.settings/org.eclipse.jdt.core.prefs delete mode 100644 Plugins/Mineplex.Database/.settings/org.eclipse.m2e.core.prefs delete mode 100644 Plugins/Mineplex.EnjinTranslator/.classpath delete mode 100644 Plugins/Mineplex.EnjinTranslator/.settings/org.eclipse.core.resources.prefs delete mode 100644 Plugins/Mineplex.EnjinTranslator/.settings/org.eclipse.jdt.core.prefs delete mode 100644 Plugins/Mineplex.EnjinTranslator/.settings/org.eclipse.m2e.core.prefs delete mode 100644 Plugins/Mineplex.Game.Clans.Core/.classpath delete mode 100644 Plugins/Mineplex.Game.Clans.Core/.settings/org.eclipse.core.resources.prefs delete mode 100644 Plugins/Mineplex.Game.Clans.Core/.settings/org.eclipse.jdt.core.prefs delete mode 100644 Plugins/Mineplex.Game.Clans.Core/.settings/org.eclipse.m2e.core.prefs delete mode 100644 Plugins/Mineplex.Game.Clans/.classpath delete mode 100644 Plugins/Mineplex.Game.Clans/.settings/org.eclipse.core.resources.prefs delete mode 100644 Plugins/Mineplex.Game.Clans/.settings/org.eclipse.jdt.core.prefs delete mode 100644 Plugins/Mineplex.Game.Clans/.settings/org.eclipse.m2e.core.prefs delete mode 100644 Plugins/Mineplex.Hub/.classpath delete mode 100644 Plugins/Mineplex.Hub/.settings/org.eclipse.core.resources.prefs delete mode 100644 Plugins/Mineplex.Hub/.settings/org.eclipse.jdt.core.prefs delete mode 100644 Plugins/Mineplex.Hub/.settings/org.eclipse.m2e.core.prefs delete mode 100644 Plugins/Mineplex.MapParser/.classpath delete mode 100644 Plugins/Mineplex.MapParser/.settings/org.eclipse.core.resources.prefs delete mode 100644 Plugins/Mineplex.MapParser/.settings/org.eclipse.jdt.core.prefs delete mode 100644 Plugins/Mineplex.MapParser/.settings/org.eclipse.m2e.core.prefs delete mode 100644 Plugins/Mineplex.Minecraft.Game.ClassCombat/.classpath delete mode 100644 Plugins/Mineplex.Minecraft.Game.ClassCombat/.settings/org.eclipse.core.resources.prefs delete mode 100644 Plugins/Mineplex.Minecraft.Game.ClassCombat/.settings/org.eclipse.jdt.core.prefs delete mode 100644 Plugins/Mineplex.Minecraft.Game.ClassCombat/.settings/org.eclipse.m2e.core.prefs delete mode 100644 Plugins/Mineplex.Minecraft.Game.Core/.classpath delete mode 100644 Plugins/Mineplex.Minecraft.Game.Core/.settings/org.eclipse.core.resources.prefs delete mode 100644 Plugins/Mineplex.Minecraft.Game.Core/.settings/org.eclipse.jdt.core.prefs delete mode 100644 Plugins/Mineplex.Minecraft.Game.Core/.settings/org.eclipse.m2e.core.prefs delete mode 100644 Plugins/Mineplex.ServerData/.classpath delete mode 100644 Plugins/Mineplex.ServerData/.settings/org.eclipse.core.resources.prefs delete mode 100644 Plugins/Mineplex.ServerData/.settings/org.eclipse.jdt.core.prefs delete mode 100644 Plugins/Mineplex.ServerData/.settings/org.eclipse.m2e.core.prefs delete mode 100644 Plugins/Mineplex.ServerMonitor/.classpath delete mode 100644 Plugins/Mineplex.ServerMonitor/.settings/org.eclipse.core.resources.prefs delete mode 100644 Plugins/Mineplex.ServerMonitor/.settings/org.eclipse.jdt.core.prefs delete mode 100644 Plugins/Mineplex.ServerMonitor/.settings/org.eclipse.m2e.core.prefs delete mode 100644 Plugins/Mineplex.StaffServer/.classpath delete mode 100644 Plugins/Mineplex.StaffServer/.settings/org.eclipse.core.resources.prefs delete mode 100644 Plugins/Mineplex.StaffServer/.settings/org.eclipse.jdt.core.prefs delete mode 100644 Plugins/Mineplex.StaffServer/.settings/org.eclipse.m2e.core.prefs delete mode 100644 Plugins/Mineplex.Votifier/.classpath delete mode 100644 Plugins/Mineplex.Votifier/.settings/org.eclipse.core.resources.prefs delete mode 100644 Plugins/Mineplex.Votifier/.settings/org.eclipse.jdt.core.prefs delete mode 100644 Plugins/Mineplex.Votifier/.settings/org.eclipse.m2e.core.prefs delete mode 100644 Plugins/Nautilus.Game.Arcade/.classpath delete mode 100644 Plugins/Nautilus.Game.Arcade/.settings/org.eclipse.core.resources.prefs delete mode 100644 Plugins/Nautilus.Game.Arcade/.settings/org.eclipse.jdt.core.prefs delete mode 100644 Plugins/Nautilus.Game.Arcade/.settings/org.eclipse.m2e.core.prefs diff --git a/Plugins/.settings/org.eclipse.core.resources.prefs b/Plugins/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c020..000000000 --- a/Plugins/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/Plugins/.settings/org.eclipse.m2e.core.prefs b/Plugins/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f1c..000000000 --- a/Plugins/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/Plugins/Mineplex.Bungee.Mineplexer/.classpath b/Plugins/Mineplex.Bungee.Mineplexer/.classpath deleted file mode 100644 index 149cb3c90..000000000 --- a/Plugins/Mineplex.Bungee.Mineplexer/.classpath +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/Plugins/Mineplex.Bungee.Mineplexer/.project b/Plugins/Mineplex.Bungee.Mineplexer/.project deleted file mode 100644 index b69c0ae2c..000000000 --- a/Plugins/Mineplex.Bungee.Mineplexer/.project +++ /dev/null @@ -1,23 +0,0 @@ - - - mineplex-bungee-mineplexer - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.jdt.core.javanature - org.eclipse.m2e.core.maven2Nature - - diff --git a/Plugins/Mineplex.Bungee.Mineplexer/.settings/org.eclipse.core.resources.prefs b/Plugins/Mineplex.Bungee.Mineplexer/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 7a5313928..000000000 --- a/Plugins/Mineplex.Bungee.Mineplexer/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,3 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 -encoding/src=UTF-8 diff --git a/Plugins/Mineplex.Bungee.Mineplexer/.settings/org.eclipse.jdt.core.prefs b/Plugins/Mineplex.Bungee.Mineplexer/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 714351aec..000000000 --- a/Plugins/Mineplex.Bungee.Mineplexer/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,5 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.8 diff --git a/Plugins/Mineplex.Bungee.Mineplexer/.settings/org.eclipse.m2e.core.prefs b/Plugins/Mineplex.Bungee.Mineplexer/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f1c..000000000 --- a/Plugins/Mineplex.Bungee.Mineplexer/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/Plugins/Mineplex.BungeeRotator/.classpath b/Plugins/Mineplex.BungeeRotator/.classpath deleted file mode 100644 index 149cb3c90..000000000 --- a/Plugins/Mineplex.BungeeRotator/.classpath +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/Plugins/Mineplex.BungeeRotator/.settings/org.eclipse.core.resources.prefs b/Plugins/Mineplex.BungeeRotator/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 7a5313928..000000000 --- a/Plugins/Mineplex.BungeeRotator/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,3 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 -encoding/src=UTF-8 diff --git a/Plugins/Mineplex.BungeeRotator/.settings/org.eclipse.jdt.core.prefs b/Plugins/Mineplex.BungeeRotator/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 714351aec..000000000 --- a/Plugins/Mineplex.BungeeRotator/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,5 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.8 diff --git a/Plugins/Mineplex.BungeeRotator/.settings/org.eclipse.m2e.core.prefs b/Plugins/Mineplex.BungeeRotator/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f1c..000000000 --- a/Plugins/Mineplex.BungeeRotator/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/Plugins/Mineplex.Cache/.classpath b/Plugins/Mineplex.Cache/.classpath deleted file mode 100644 index 149cb3c90..000000000 --- a/Plugins/Mineplex.Cache/.classpath +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/Plugins/Mineplex.Cache/.settings/org.eclipse.core.resources.prefs b/Plugins/Mineplex.Cache/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 7a5313928..000000000 --- a/Plugins/Mineplex.Cache/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,3 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 -encoding/src=UTF-8 diff --git a/Plugins/Mineplex.Cache/.settings/org.eclipse.jdt.core.prefs b/Plugins/Mineplex.Cache/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 714351aec..000000000 --- a/Plugins/Mineplex.Cache/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,5 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.8 diff --git a/Plugins/Mineplex.Cache/.settings/org.eclipse.m2e.core.prefs b/Plugins/Mineplex.Cache/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f1c..000000000 --- a/Plugins/Mineplex.Cache/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/Plugins/Mineplex.Core.Common/.classpath b/Plugins/Mineplex.Core.Common/.classpath deleted file mode 100644 index 149cb3c90..000000000 --- a/Plugins/Mineplex.Core.Common/.classpath +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/Plugins/Mineplex.Core.Common/.settings/org.eclipse.core.resources.prefs b/Plugins/Mineplex.Core.Common/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 7a5313928..000000000 --- a/Plugins/Mineplex.Core.Common/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,3 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 -encoding/src=UTF-8 diff --git a/Plugins/Mineplex.Core.Common/.settings/org.eclipse.jdt.core.prefs b/Plugins/Mineplex.Core.Common/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 714351aec..000000000 --- a/Plugins/Mineplex.Core.Common/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,5 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.8 diff --git a/Plugins/Mineplex.Core.Common/.settings/org.eclipse.m2e.core.prefs b/Plugins/Mineplex.Core.Common/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f1c..000000000 --- a/Plugins/Mineplex.Core.Common/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/Plugins/Mineplex.Core/.classpath b/Plugins/Mineplex.Core/.classpath deleted file mode 100644 index 149cb3c90..000000000 --- a/Plugins/Mineplex.Core/.classpath +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/Plugins/Mineplex.Core/.settings/org.eclipse.core.resources.prefs b/Plugins/Mineplex.Core/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 7a5313928..000000000 --- a/Plugins/Mineplex.Core/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,3 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 -encoding/src=UTF-8 diff --git a/Plugins/Mineplex.Core/.settings/org.eclipse.jdt.core.prefs b/Plugins/Mineplex.Core/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 714351aec..000000000 --- a/Plugins/Mineplex.Core/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,5 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.8 diff --git a/Plugins/Mineplex.Core/.settings/org.eclipse.m2e.core.prefs b/Plugins/Mineplex.Core/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f1c..000000000 --- a/Plugins/Mineplex.Core/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/Plugins/Mineplex.DDoSProtectionSwitcher/.classpath b/Plugins/Mineplex.DDoSProtectionSwitcher/.classpath deleted file mode 100644 index 149cb3c90..000000000 --- a/Plugins/Mineplex.DDoSProtectionSwitcher/.classpath +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/Plugins/Mineplex.DDoSProtectionSwitcher/.settings/org.eclipse.core.resources.prefs b/Plugins/Mineplex.DDoSProtectionSwitcher/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 7a5313928..000000000 --- a/Plugins/Mineplex.DDoSProtectionSwitcher/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,3 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 -encoding/src=UTF-8 diff --git a/Plugins/Mineplex.DDoSProtectionSwitcher/.settings/org.eclipse.jdt.core.prefs b/Plugins/Mineplex.DDoSProtectionSwitcher/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 714351aec..000000000 --- a/Plugins/Mineplex.DDoSProtectionSwitcher/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,5 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.8 diff --git a/Plugins/Mineplex.DDoSProtectionSwitcher/.settings/org.eclipse.m2e.core.prefs b/Plugins/Mineplex.DDoSProtectionSwitcher/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f1c..000000000 --- a/Plugins/Mineplex.DDoSProtectionSwitcher/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/Plugins/Mineplex.Database/.classpath b/Plugins/Mineplex.Database/.classpath deleted file mode 100644 index 149cb3c90..000000000 --- a/Plugins/Mineplex.Database/.classpath +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/Plugins/Mineplex.Database/.settings/org.eclipse.core.resources.prefs b/Plugins/Mineplex.Database/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 7a5313928..000000000 --- a/Plugins/Mineplex.Database/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,3 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 -encoding/src=UTF-8 diff --git a/Plugins/Mineplex.Database/.settings/org.eclipse.jdt.core.prefs b/Plugins/Mineplex.Database/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 714351aec..000000000 --- a/Plugins/Mineplex.Database/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,5 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.8 diff --git a/Plugins/Mineplex.Database/.settings/org.eclipse.m2e.core.prefs b/Plugins/Mineplex.Database/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f1c..000000000 --- a/Plugins/Mineplex.Database/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/Plugins/Mineplex.EnjinTranslator/.classpath b/Plugins/Mineplex.EnjinTranslator/.classpath deleted file mode 100644 index 149cb3c90..000000000 --- a/Plugins/Mineplex.EnjinTranslator/.classpath +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/Plugins/Mineplex.EnjinTranslator/.settings/org.eclipse.core.resources.prefs b/Plugins/Mineplex.EnjinTranslator/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 7a5313928..000000000 --- a/Plugins/Mineplex.EnjinTranslator/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,3 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 -encoding/src=UTF-8 diff --git a/Plugins/Mineplex.EnjinTranslator/.settings/org.eclipse.jdt.core.prefs b/Plugins/Mineplex.EnjinTranslator/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 714351aec..000000000 --- a/Plugins/Mineplex.EnjinTranslator/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,5 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.8 diff --git a/Plugins/Mineplex.EnjinTranslator/.settings/org.eclipse.m2e.core.prefs b/Plugins/Mineplex.EnjinTranslator/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f1c..000000000 --- a/Plugins/Mineplex.EnjinTranslator/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/Plugins/Mineplex.Game.Clans.Core/.classpath b/Plugins/Mineplex.Game.Clans.Core/.classpath deleted file mode 100644 index 149cb3c90..000000000 --- a/Plugins/Mineplex.Game.Clans.Core/.classpath +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/Plugins/Mineplex.Game.Clans.Core/.settings/org.eclipse.core.resources.prefs b/Plugins/Mineplex.Game.Clans.Core/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 7a5313928..000000000 --- a/Plugins/Mineplex.Game.Clans.Core/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,3 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 -encoding/src=UTF-8 diff --git a/Plugins/Mineplex.Game.Clans.Core/.settings/org.eclipse.jdt.core.prefs b/Plugins/Mineplex.Game.Clans.Core/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 714351aec..000000000 --- a/Plugins/Mineplex.Game.Clans.Core/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,5 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.8 diff --git a/Plugins/Mineplex.Game.Clans.Core/.settings/org.eclipse.m2e.core.prefs b/Plugins/Mineplex.Game.Clans.Core/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f1c..000000000 --- a/Plugins/Mineplex.Game.Clans.Core/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/Plugins/Mineplex.Game.Clans/.classpath b/Plugins/Mineplex.Game.Clans/.classpath deleted file mode 100644 index 149cb3c90..000000000 --- a/Plugins/Mineplex.Game.Clans/.classpath +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/Plugins/Mineplex.Game.Clans/.settings/org.eclipse.core.resources.prefs b/Plugins/Mineplex.Game.Clans/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 7a5313928..000000000 --- a/Plugins/Mineplex.Game.Clans/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,3 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 -encoding/src=UTF-8 diff --git a/Plugins/Mineplex.Game.Clans/.settings/org.eclipse.jdt.core.prefs b/Plugins/Mineplex.Game.Clans/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 714351aec..000000000 --- a/Plugins/Mineplex.Game.Clans/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,5 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.8 diff --git a/Plugins/Mineplex.Game.Clans/.settings/org.eclipse.m2e.core.prefs b/Plugins/Mineplex.Game.Clans/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f1c..000000000 --- a/Plugins/Mineplex.Game.Clans/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/Plugins/Mineplex.Hub/.classpath b/Plugins/Mineplex.Hub/.classpath deleted file mode 100644 index 149cb3c90..000000000 --- a/Plugins/Mineplex.Hub/.classpath +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/Plugins/Mineplex.Hub/.settings/org.eclipse.core.resources.prefs b/Plugins/Mineplex.Hub/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 7a5313928..000000000 --- a/Plugins/Mineplex.Hub/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,3 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 -encoding/src=UTF-8 diff --git a/Plugins/Mineplex.Hub/.settings/org.eclipse.jdt.core.prefs b/Plugins/Mineplex.Hub/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 714351aec..000000000 --- a/Plugins/Mineplex.Hub/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,5 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.8 diff --git a/Plugins/Mineplex.Hub/.settings/org.eclipse.m2e.core.prefs b/Plugins/Mineplex.Hub/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f1c..000000000 --- a/Plugins/Mineplex.Hub/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/Plugins/Mineplex.MapParser/.classpath b/Plugins/Mineplex.MapParser/.classpath deleted file mode 100644 index 149cb3c90..000000000 --- a/Plugins/Mineplex.MapParser/.classpath +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/Plugins/Mineplex.MapParser/.settings/org.eclipse.core.resources.prefs b/Plugins/Mineplex.MapParser/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 7a5313928..000000000 --- a/Plugins/Mineplex.MapParser/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,3 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 -encoding/src=UTF-8 diff --git a/Plugins/Mineplex.MapParser/.settings/org.eclipse.jdt.core.prefs b/Plugins/Mineplex.MapParser/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 714351aec..000000000 --- a/Plugins/Mineplex.MapParser/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,5 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.8 diff --git a/Plugins/Mineplex.MapParser/.settings/org.eclipse.m2e.core.prefs b/Plugins/Mineplex.MapParser/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f1c..000000000 --- a/Plugins/Mineplex.MapParser/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/.classpath b/Plugins/Mineplex.Minecraft.Game.ClassCombat/.classpath deleted file mode 100644 index 149cb3c90..000000000 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/.classpath +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/.settings/org.eclipse.core.resources.prefs b/Plugins/Mineplex.Minecraft.Game.ClassCombat/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 7a5313928..000000000 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,3 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 -encoding/src=UTF-8 diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/.settings/org.eclipse.jdt.core.prefs b/Plugins/Mineplex.Minecraft.Game.ClassCombat/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 714351aec..000000000 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,5 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.8 diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/.settings/org.eclipse.m2e.core.prefs b/Plugins/Mineplex.Minecraft.Game.ClassCombat/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f1c..000000000 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/Plugins/Mineplex.Minecraft.Game.Core/.classpath b/Plugins/Mineplex.Minecraft.Game.Core/.classpath deleted file mode 100644 index 149cb3c90..000000000 --- a/Plugins/Mineplex.Minecraft.Game.Core/.classpath +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/Plugins/Mineplex.Minecraft.Game.Core/.settings/org.eclipse.core.resources.prefs b/Plugins/Mineplex.Minecraft.Game.Core/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 7a5313928..000000000 --- a/Plugins/Mineplex.Minecraft.Game.Core/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,3 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 -encoding/src=UTF-8 diff --git a/Plugins/Mineplex.Minecraft.Game.Core/.settings/org.eclipse.jdt.core.prefs b/Plugins/Mineplex.Minecraft.Game.Core/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 714351aec..000000000 --- a/Plugins/Mineplex.Minecraft.Game.Core/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,5 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.8 diff --git a/Plugins/Mineplex.Minecraft.Game.Core/.settings/org.eclipse.m2e.core.prefs b/Plugins/Mineplex.Minecraft.Game.Core/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f1c..000000000 --- a/Plugins/Mineplex.Minecraft.Game.Core/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/Plugins/Mineplex.ServerData/.classpath b/Plugins/Mineplex.ServerData/.classpath deleted file mode 100644 index 149cb3c90..000000000 --- a/Plugins/Mineplex.ServerData/.classpath +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/Plugins/Mineplex.ServerData/.settings/org.eclipse.core.resources.prefs b/Plugins/Mineplex.ServerData/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 7a5313928..000000000 --- a/Plugins/Mineplex.ServerData/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,3 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 -encoding/src=UTF-8 diff --git a/Plugins/Mineplex.ServerData/.settings/org.eclipse.jdt.core.prefs b/Plugins/Mineplex.ServerData/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 714351aec..000000000 --- a/Plugins/Mineplex.ServerData/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,5 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.8 diff --git a/Plugins/Mineplex.ServerData/.settings/org.eclipse.m2e.core.prefs b/Plugins/Mineplex.ServerData/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f1c..000000000 --- a/Plugins/Mineplex.ServerData/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/Plugins/Mineplex.ServerMonitor/.classpath b/Plugins/Mineplex.ServerMonitor/.classpath deleted file mode 100644 index 149cb3c90..000000000 --- a/Plugins/Mineplex.ServerMonitor/.classpath +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/Plugins/Mineplex.ServerMonitor/.settings/org.eclipse.core.resources.prefs b/Plugins/Mineplex.ServerMonitor/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 7a5313928..000000000 --- a/Plugins/Mineplex.ServerMonitor/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,3 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 -encoding/src=UTF-8 diff --git a/Plugins/Mineplex.ServerMonitor/.settings/org.eclipse.jdt.core.prefs b/Plugins/Mineplex.ServerMonitor/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 714351aec..000000000 --- a/Plugins/Mineplex.ServerMonitor/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,5 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.8 diff --git a/Plugins/Mineplex.ServerMonitor/.settings/org.eclipse.m2e.core.prefs b/Plugins/Mineplex.ServerMonitor/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f1c..000000000 --- a/Plugins/Mineplex.ServerMonitor/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/Plugins/Mineplex.StaffServer/.classpath b/Plugins/Mineplex.StaffServer/.classpath deleted file mode 100644 index 149cb3c90..000000000 --- a/Plugins/Mineplex.StaffServer/.classpath +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/Plugins/Mineplex.StaffServer/.settings/org.eclipse.core.resources.prefs b/Plugins/Mineplex.StaffServer/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 7a5313928..000000000 --- a/Plugins/Mineplex.StaffServer/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,3 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 -encoding/src=UTF-8 diff --git a/Plugins/Mineplex.StaffServer/.settings/org.eclipse.jdt.core.prefs b/Plugins/Mineplex.StaffServer/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 714351aec..000000000 --- a/Plugins/Mineplex.StaffServer/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,5 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.8 diff --git a/Plugins/Mineplex.StaffServer/.settings/org.eclipse.m2e.core.prefs b/Plugins/Mineplex.StaffServer/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f1c..000000000 --- a/Plugins/Mineplex.StaffServer/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/Plugins/Mineplex.Votifier/.classpath b/Plugins/Mineplex.Votifier/.classpath deleted file mode 100644 index 149cb3c90..000000000 --- a/Plugins/Mineplex.Votifier/.classpath +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/Plugins/Mineplex.Votifier/.settings/org.eclipse.core.resources.prefs b/Plugins/Mineplex.Votifier/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 7a5313928..000000000 --- a/Plugins/Mineplex.Votifier/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,3 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 -encoding/src=UTF-8 diff --git a/Plugins/Mineplex.Votifier/.settings/org.eclipse.jdt.core.prefs b/Plugins/Mineplex.Votifier/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 714351aec..000000000 --- a/Plugins/Mineplex.Votifier/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,5 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.8 diff --git a/Plugins/Mineplex.Votifier/.settings/org.eclipse.m2e.core.prefs b/Plugins/Mineplex.Votifier/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f1c..000000000 --- a/Plugins/Mineplex.Votifier/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/Plugins/Nautilus.Game.Arcade/.classpath b/Plugins/Nautilus.Game.Arcade/.classpath deleted file mode 100644 index 149cb3c90..000000000 --- a/Plugins/Nautilus.Game.Arcade/.classpath +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/Plugins/Nautilus.Game.Arcade/.settings/org.eclipse.core.resources.prefs b/Plugins/Nautilus.Game.Arcade/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 7a5313928..000000000 --- a/Plugins/Nautilus.Game.Arcade/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,3 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 -encoding/src=UTF-8 diff --git a/Plugins/Nautilus.Game.Arcade/.settings/org.eclipse.jdt.core.prefs b/Plugins/Nautilus.Game.Arcade/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 714351aec..000000000 --- a/Plugins/Nautilus.Game.Arcade/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,5 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.8 diff --git a/Plugins/Nautilus.Game.Arcade/.settings/org.eclipse.m2e.core.prefs b/Plugins/Nautilus.Game.Arcade/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f1c..000000000 --- a/Plugins/Nautilus.Game.Arcade/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 From 67c355bf652e9c802dc1e8e56b088c44cdaaac3b Mon Sep 17 00:00:00 2001 From: NewGarbo Date: Fri, 19 Feb 2016 07:22:54 +0000 Subject: [PATCH 21/21] remove more eclipse files --- Plugins/.project | 17 -------------- Plugins/Mineplex.BungeeRotator/.project | 23 ------------------- Plugins/Mineplex.Cache/.project | 23 ------------------- Plugins/Mineplex.Core.Common/.project | 23 ------------------- Plugins/Mineplex.Core/.project | 23 ------------------- .../Mineplex.DDoSProtectionSwitcher/.project | 23 ------------------- Plugins/Mineplex.Database/.project | 23 ------------------- Plugins/Mineplex.EnjinTranslator/.project | 23 ------------------- Plugins/Mineplex.Game.Clans.Core/.project | 23 ------------------- Plugins/Mineplex.Game.Clans/.project | 23 ------------------- Plugins/Mineplex.Hub/.project | 23 ------------------- Plugins/Mineplex.MapParser/.project | 23 ------------------- .../.project | 23 ------------------- Plugins/Mineplex.Minecraft.Game.Core/.project | 23 ------------------- Plugins/Mineplex.ServerData/.project | 23 ------------------- Plugins/Mineplex.ServerMonitor/.project | 23 ------------------- Plugins/Mineplex.StaffServer/.project | 23 ------------------- Plugins/Mineplex.Votifier/.project | 23 ------------------- Plugins/Nautilus.Game.Arcade/.project | 23 ------------------- 19 files changed, 431 deletions(-) delete mode 100644 Plugins/.project delete mode 100644 Plugins/Mineplex.BungeeRotator/.project delete mode 100644 Plugins/Mineplex.Cache/.project delete mode 100644 Plugins/Mineplex.Core.Common/.project delete mode 100644 Plugins/Mineplex.Core/.project delete mode 100644 Plugins/Mineplex.DDoSProtectionSwitcher/.project delete mode 100644 Plugins/Mineplex.Database/.project delete mode 100644 Plugins/Mineplex.EnjinTranslator/.project delete mode 100644 Plugins/Mineplex.Game.Clans.Core/.project delete mode 100644 Plugins/Mineplex.Game.Clans/.project delete mode 100644 Plugins/Mineplex.Hub/.project delete mode 100644 Plugins/Mineplex.MapParser/.project delete mode 100644 Plugins/Mineplex.Minecraft.Game.ClassCombat/.project delete mode 100644 Plugins/Mineplex.Minecraft.Game.Core/.project delete mode 100644 Plugins/Mineplex.ServerData/.project delete mode 100644 Plugins/Mineplex.ServerMonitor/.project delete mode 100644 Plugins/Mineplex.StaffServer/.project delete mode 100644 Plugins/Mineplex.Votifier/.project delete mode 100644 Plugins/Nautilus.Game.Arcade/.project diff --git a/Plugins/.project b/Plugins/.project deleted file mode 100644 index a6856b606..000000000 --- a/Plugins/.project +++ /dev/null @@ -1,17 +0,0 @@ - - - mineplex-parent - - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.m2e.core.maven2Nature - - diff --git a/Plugins/Mineplex.BungeeRotator/.project b/Plugins/Mineplex.BungeeRotator/.project deleted file mode 100644 index 129c81c53..000000000 --- a/Plugins/Mineplex.BungeeRotator/.project +++ /dev/null @@ -1,23 +0,0 @@ - - - mineplex-bungeerotator - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.jdt.core.javanature - org.eclipse.m2e.core.maven2Nature - - diff --git a/Plugins/Mineplex.Cache/.project b/Plugins/Mineplex.Cache/.project deleted file mode 100644 index 6145fd700..000000000 --- a/Plugins/Mineplex.Cache/.project +++ /dev/null @@ -1,23 +0,0 @@ - - - mineplex-cache - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.jdt.core.javanature - org.eclipse.m2e.core.maven2Nature - - diff --git a/Plugins/Mineplex.Core.Common/.project b/Plugins/Mineplex.Core.Common/.project deleted file mode 100644 index 9806b2840..000000000 --- a/Plugins/Mineplex.Core.Common/.project +++ /dev/null @@ -1,23 +0,0 @@ - - - mineplex-core-common - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.jdt.core.javanature - org.eclipse.m2e.core.maven2Nature - - diff --git a/Plugins/Mineplex.Core/.project b/Plugins/Mineplex.Core/.project deleted file mode 100644 index 6a1bf4f06..000000000 --- a/Plugins/Mineplex.Core/.project +++ /dev/null @@ -1,23 +0,0 @@ - - - mineplex-core - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.jdt.core.javanature - org.eclipse.m2e.core.maven2Nature - - diff --git a/Plugins/Mineplex.DDoSProtectionSwitcher/.project b/Plugins/Mineplex.DDoSProtectionSwitcher/.project deleted file mode 100644 index a2ddab34c..000000000 --- a/Plugins/Mineplex.DDoSProtectionSwitcher/.project +++ /dev/null @@ -1,23 +0,0 @@ - - - mineplex-ddosprotectionswitcher - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.jdt.core.javanature - org.eclipse.m2e.core.maven2Nature - - diff --git a/Plugins/Mineplex.Database/.project b/Plugins/Mineplex.Database/.project deleted file mode 100644 index 759b2080b..000000000 --- a/Plugins/Mineplex.Database/.project +++ /dev/null @@ -1,23 +0,0 @@ - - - mineplex-database - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.jdt.core.javanature - org.eclipse.m2e.core.maven2Nature - - diff --git a/Plugins/Mineplex.EnjinTranslator/.project b/Plugins/Mineplex.EnjinTranslator/.project deleted file mode 100644 index 571faeecc..000000000 --- a/Plugins/Mineplex.EnjinTranslator/.project +++ /dev/null @@ -1,23 +0,0 @@ - - - mineplex-enjintranslator - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.jdt.core.javanature - org.eclipse.m2e.core.maven2Nature - - diff --git a/Plugins/Mineplex.Game.Clans.Core/.project b/Plugins/Mineplex.Game.Clans.Core/.project deleted file mode 100644 index ab84c6a4a..000000000 --- a/Plugins/Mineplex.Game.Clans.Core/.project +++ /dev/null @@ -1,23 +0,0 @@ - - - mineplex-game-clans-core - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.jdt.core.javanature - org.eclipse.m2e.core.maven2Nature - - diff --git a/Plugins/Mineplex.Game.Clans/.project b/Plugins/Mineplex.Game.Clans/.project deleted file mode 100644 index a26211ecb..000000000 --- a/Plugins/Mineplex.Game.Clans/.project +++ /dev/null @@ -1,23 +0,0 @@ - - - mineplex-game-clans - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.jdt.core.javanature - org.eclipse.m2e.core.maven2Nature - - diff --git a/Plugins/Mineplex.Hub/.project b/Plugins/Mineplex.Hub/.project deleted file mode 100644 index 24d759c40..000000000 --- a/Plugins/Mineplex.Hub/.project +++ /dev/null @@ -1,23 +0,0 @@ - - - mineplex-hub - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.jdt.core.javanature - org.eclipse.m2e.core.maven2Nature - - diff --git a/Plugins/Mineplex.MapParser/.project b/Plugins/Mineplex.MapParser/.project deleted file mode 100644 index 43bcff000..000000000 --- a/Plugins/Mineplex.MapParser/.project +++ /dev/null @@ -1,23 +0,0 @@ - - - mineplex-mapparser - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.jdt.core.javanature - org.eclipse.m2e.core.maven2Nature - - diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/.project b/Plugins/Mineplex.Minecraft.Game.ClassCombat/.project deleted file mode 100644 index ec0a67356..000000000 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/.project +++ /dev/null @@ -1,23 +0,0 @@ - - - mineplex-minecraft-game-classcombat - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.jdt.core.javanature - org.eclipse.m2e.core.maven2Nature - - diff --git a/Plugins/Mineplex.Minecraft.Game.Core/.project b/Plugins/Mineplex.Minecraft.Game.Core/.project deleted file mode 100644 index 34b626ff9..000000000 --- a/Plugins/Mineplex.Minecraft.Game.Core/.project +++ /dev/null @@ -1,23 +0,0 @@ - - - mineplex-minecraft-game-core - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.jdt.core.javanature - org.eclipse.m2e.core.maven2Nature - - diff --git a/Plugins/Mineplex.ServerData/.project b/Plugins/Mineplex.ServerData/.project deleted file mode 100644 index cc601dfce..000000000 --- a/Plugins/Mineplex.ServerData/.project +++ /dev/null @@ -1,23 +0,0 @@ - - - mineplex-serverdata - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.jdt.core.javanature - org.eclipse.m2e.core.maven2Nature - - diff --git a/Plugins/Mineplex.ServerMonitor/.project b/Plugins/Mineplex.ServerMonitor/.project deleted file mode 100644 index 674450760..000000000 --- a/Plugins/Mineplex.ServerMonitor/.project +++ /dev/null @@ -1,23 +0,0 @@ - - - mineplex-servermonitor - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.jdt.core.javanature - org.eclipse.m2e.core.maven2Nature - - diff --git a/Plugins/Mineplex.StaffServer/.project b/Plugins/Mineplex.StaffServer/.project deleted file mode 100644 index d237ceb58..000000000 --- a/Plugins/Mineplex.StaffServer/.project +++ /dev/null @@ -1,23 +0,0 @@ - - - mineplex-staffserver - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.jdt.core.javanature - org.eclipse.m2e.core.maven2Nature - - diff --git a/Plugins/Mineplex.Votifier/.project b/Plugins/Mineplex.Votifier/.project deleted file mode 100644 index e22997649..000000000 --- a/Plugins/Mineplex.Votifier/.project +++ /dev/null @@ -1,23 +0,0 @@ - - - mineplex-votifier - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.jdt.core.javanature - org.eclipse.m2e.core.maven2Nature - - diff --git a/Plugins/Nautilus.Game.Arcade/.project b/Plugins/Nautilus.Game.Arcade/.project deleted file mode 100644 index 3bdc39535..000000000 --- a/Plugins/Nautilus.Game.Arcade/.project +++ /dev/null @@ -1,23 +0,0 @@ - - - nautilus-game-arcade - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.jdt.core.javanature - org.eclipse.m2e.core.maven2Nature - -