diff --git a/Metropolis/src/main/java/com/majinnaibu/bukkit/plugins/metropolis/commands/MetropolisCommand.java b/Metropolis/src/main/java/com/majinnaibu/bukkit/plugins/metropolis/commands/MetropolisCommand.java deleted file mode 100644 index 13568ad..0000000 --- a/Metropolis/src/main/java/com/majinnaibu/bukkit/plugins/metropolis/commands/MetropolisCommand.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.majinnaibu.bukkit.plugins.metropolis.commands; - -public class MetropolisCommand { - -} diff --git a/Metropolis/src/main/java/com/majinnaibu/bukkit/plugins/metropolis/eventlisteners/PlayerLoginListener.java b/Metropolis/src/main/java/com/majinnaibu/bukkit/plugins/metropolis/eventlisteners/PlayerLoginListener.java deleted file mode 100644 index a4d289a..0000000 --- a/Metropolis/src/main/java/com/majinnaibu/bukkit/plugins/metropolis/eventlisteners/PlayerLoginListener.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.majinnaibu.bukkit.plugins.metropolis.eventlisteners; - -//import org.bukkit.entity.Player; -import org.bukkit.event.EventHandler; -import org.bukkit.event.EventPriority; -import org.bukkit.event.Listener; -import org.bukkit.event.player.PlayerLoginEvent; - -//import com.majinnaibu.bukkit.plugins.metropolis.Cuboid; -import com.majinnaibu.bukkit.plugins.metropolis.MetropolisPlugin; -//import com.majinnaibu.bukkit.plugins.metropolis.PlayerHome; - -public class PlayerLoginListener implements Listener { - //private MetropolisPlugin _plugin = null; - - public PlayerLoginListener(MetropolisPlugin plugin){ - //_plugin = plugin; - //plugin.getServer().getPluginManager().registerEvents(this, plugin); - } - - @EventHandler(priority=EventPriority.MONITOR) - public void onPlayerLogin(PlayerLoginEvent event){ - /* - Player player = event.getPlayer(); - if(player == null){ - return; - } - - PlayerHome home = _plugin.getPlayerHome(player); - if(home==null){MetropolisPlugin.log.info("home is null");} - else if(home.getCuboid() == null){MetropolisPlugin.log.info("home.getCuboid() is null");} - else if(home.getCuboid().getVolume() == 0){MetropolisPlugin.log.info("home.getCuboid().getVolume() is 0");} - - if(home == null || home.getCuboid() == null || home.getCuboid().getVolume() == 0){ - MetropolisPlugin.log.info(String.format("Metropolis: Unable to get or create home for player %s", player.getName())); - }else{ - Cuboid cuboid = home.getCuboid(); - player.sendMessage(String.format("Metropolis: Welcome %s your home is between (%d, %d, %d) and (%d, %d, %d)", player.getName(), cuboid.getMinX(), cuboid.getMinY(), cuboid.getMinZ(), cuboid.getMaxX(), cuboid.getMaxY(), cuboid.getMaxZ())); - } - */ - } -} diff --git a/Metropolis/src/main/java/com/majinnaibu/bukkit/plugins/metropolis/Cuboid.java b/Metropolis/src/main/java/com/majinnaibu/bukkitplugins/metropolis/Cuboid.java similarity index 89% rename from Metropolis/src/main/java/com/majinnaibu/bukkit/plugins/metropolis/Cuboid.java rename to Metropolis/src/main/java/com/majinnaibu/bukkitplugins/metropolis/Cuboid.java index 73f3158..df302e1 100644 --- a/Metropolis/src/main/java/com/majinnaibu/bukkit/plugins/metropolis/Cuboid.java +++ b/Metropolis/src/main/java/com/majinnaibu/bukkitplugins/metropolis/Cuboid.java @@ -1,4 +1,4 @@ -package com.majinnaibu.bukkit.plugins.metropolis; +package com.majinnaibu.bukkitplugins.metropolis; import java.util.logging.Logger; @@ -154,8 +154,20 @@ public class Cuboid implements Comparable { return outset(x, 0, z); } - private Cuboid outset(int x, int y, int z) { + public Cuboid outset(int x, int y, int z) { return new Cuboid(this.minX - x, this.minY - y, this.minZ - z, this.maxX + x, this.maxY + y, this.maxZ + z); } + public int getCenterX(){ + return (this.minX + this.maxX) /2; + } + + public int getCenterY(){ + return (this.minY + this.maxY)/2; + } + + public int getCenterZ(){ + return (this.minZ + this.maxZ)/2; + } + } diff --git a/Metropolis/src/main/java/com/majinnaibu/bukkit/plugins/metropolis/MetropolisPlugin.java b/Metropolis/src/main/java/com/majinnaibu/bukkitplugins/metropolis/MetropolisPlugin.java similarity index 80% rename from Metropolis/src/main/java/com/majinnaibu/bukkit/plugins/metropolis/MetropolisPlugin.java rename to Metropolis/src/main/java/com/majinnaibu/bukkitplugins/metropolis/MetropolisPlugin.java index 7b79a8c..65c7cc3 100644 --- a/Metropolis/src/main/java/com/majinnaibu/bukkit/plugins/metropolis/MetropolisPlugin.java +++ b/Metropolis/src/main/java/com/majinnaibu/bukkitplugins/metropolis/MetropolisPlugin.java @@ -1,4 +1,4 @@ -package com.majinnaibu.bukkit.plugins.metropolis; +package com.majinnaibu.bukkitplugins.metropolis; import java.io.IOException; import java.util.ArrayList; @@ -14,11 +14,10 @@ import org.bukkit.plugin.Plugin; import org.bukkit.plugin.PluginDescriptionFile; import org.bukkit.plugin.java.JavaPlugin; -import com.majinnaibu.bukkit.plugins.metropolis.commands.MetropolisFlagResetCommand; -import com.majinnaibu.bukkit.plugins.metropolis.commands.MetropolisHomeGenerateCommand; -import com.majinnaibu.bukkit.plugins.metropolis.commands.MetropolisHomeListCommand; -import com.majinnaibu.bukkit.plugins.metropolis.eventlisteners.PlayerJoinListener; -import com.majinnaibu.bukkit.plugins.metropolis.eventlisteners.PlayerLoginListener; +import com.majinnaibu.bukkitplugins.metropolis.commands.MetropolisFlagResetCommand; +import com.majinnaibu.bukkitplugins.metropolis.commands.MetropolisHomeGenerateCommand; +import com.majinnaibu.bukkitplugins.metropolis.commands.MetropolisHomeListCommand; +import com.majinnaibu.bukkitplugins.metropolis.eventlisteners.PlayerJoinListener; import com.sk89q.worldedit.BlockVector; import com.sk89q.worldguard.bukkit.WorldGuardPlugin; import com.sk89q.worldguard.domains.DefaultDomain; @@ -33,13 +32,11 @@ public class MetropolisPlugin extends JavaPlugin { public PluginDescriptionFile pdf = null; public WorldGuardPlugin worldGuard = null; - //public WorldEditPlugin worldEdit = null; public World world = null; public RegionManager regionManager = null; private List _occupiedHomes; - private PlayerLoginListener _playerLoginListener = null; private PlayerJoinListener _playerJoinListener = null; int size = 1; @@ -51,6 +48,8 @@ public class MetropolisPlugin extends JavaPlugin { int spaceAboveRoad = 2; int roadMaterial = 4; String worldName = "world"; + boolean generateFloor = false; + int floorMaterial = 2; @Override public void onDisable() { @@ -71,6 +70,8 @@ public class MetropolisPlugin extends JavaPlugin { roadLevel = config.getInt("road.level"); roadMaterial = config.getInt("road.material"); worldName =config.getString("worldname"); + generateFloor = config.getBoolean("plot.floor.generate"); + floorMaterial = config.getInt("plot.floor.material"); saveConfig(); log.info(String.format("Metropolis: world name is %s", worldName)); @@ -99,22 +100,13 @@ public class MetropolisPlugin extends JavaPlugin { cityRegion.setFlag(DefaultFlag.TNT, StateFlag.State.DENY); cityRegion.setFlag(DefaultFlag.LAVA_FLOW, StateFlag.State.DENY); cityRegion.setFlag(DefaultFlag.SNOW_FALL, StateFlag.State.DENY); - - regionManager.addRegion(cityRegion); - //TODO determine appropriate chest flags } - //setupDatabase(); - _occupiedHomes = new ArrayList(); fillOccupiedHomes(); resizeCityRegion(); - if(_playerLoginListener == null){ - _playerLoginListener = new PlayerLoginListener(this); - } - if(_playerJoinListener == null){ _playerJoinListener = new PlayerJoinListener(this); } @@ -126,17 +118,6 @@ public class MetropolisPlugin extends JavaPlugin { getCommand("metropolis-flag-reset").setExecutor(new MetropolisFlagResetCommand(this)); } - /* - private void setupDatabase() { - try{ - getDatabase().find(PlayerHome.class).findRowCount(); - }catch(PersistenceException ex){ - System.out.println("Installing database for " + pdf.getName() + " due to first time usage"); - installDDL(); - } - } - /**/ - private void fillOccupiedHomes() { _occupiedHomes = new ArrayList(); @@ -146,32 +127,10 @@ public class MetropolisPlugin extends JavaPlugin { PlayerHome home = new PlayerHome(cuboidRegion); _occupiedHomes.add(home); - /* - if(getDatabase().find(PlayerHome.class).where().eq("regionName", home.getRegionName()).findRowCount() == 0){ - getDatabase().insert(home); - } - /**/ } } size = calculateCitySize(); - //log.info(String.valueOf(iSize)); - - /* - for(PlayerHome home : getDatabase().find(PlayerHome.class).findList()){ - _occupiedHomes.add(home); - } - - Map map = regionManager.getRegions(); - for(String regionId : map.keySet()){ - log.info(String.format("key: %s, id: %s", regionId, map.get(regionId).getId())); - } - - - log.info(String.format("Metropolis: %d occupied homes", _occupiedHomes.size())); - /**/ - - Collections.sort(_occupiedHomes); } public PlayerHome getPlayerHome(Player player) { @@ -180,8 +139,6 @@ public class MetropolisPlugin extends JavaPlugin { String regionName = "h_" + player.getName(); ProtectedRegion homeRegion = regionManager.getRegion(regionName); - - //log.info(homeRegion == null? "null" : homeRegion.toString()); if(homeRegion == null){ log.info(String.format("Creating home for player %s", player.getName())); home = generateHome(player.getName()); @@ -192,14 +149,22 @@ public class MetropolisPlugin extends JavaPlugin { return home; } - @Override - public List> getDatabaseClasses(){ - List> list = new ArrayList>(); + private void generateFloor(Cuboid plotCuboid){ + int x=0; + int y=roadLevel; + int z=0; - list.add(PlayerHome.class); - list.add(Cuboid.class); - - return list; + for(x = plotCuboid.minX + roadWidth/2; x <= plotCuboid.maxX - roadWidth/2; x++){ + for(z=plotCuboid.minZ + roadWidth/2; z<=plotCuboid.maxZ - roadWidth/2; z++){ + Block block = world.getBlockAt(x, y, z); + block.setTypeId(floorMaterial); + + for(int i=0; i getCityBlocks() { return Collections.unmodifiableList(_occupiedHomes); } - } diff --git a/Metropolis/src/main/java/com/majinnaibu/bukkit/plugins/metropolis/PlayerHome.java b/Metropolis/src/main/java/com/majinnaibu/bukkitplugins/metropolis/PlayerHome.java similarity index 95% rename from Metropolis/src/main/java/com/majinnaibu/bukkit/plugins/metropolis/PlayerHome.java rename to Metropolis/src/main/java/com/majinnaibu/bukkitplugins/metropolis/PlayerHome.java index d516329..f6f31b5 100644 --- a/Metropolis/src/main/java/com/majinnaibu/bukkit/plugins/metropolis/PlayerHome.java +++ b/Metropolis/src/main/java/com/majinnaibu/bukkitplugins/metropolis/PlayerHome.java @@ -1,4 +1,4 @@ -package com.majinnaibu.bukkit.plugins.metropolis; +package com.majinnaibu.bukkitplugins.metropolis; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/Metropolis/src/main/java/com/majinnaibu/bukkitplugins/metropolis/commands/MetropolisCommand.java b/Metropolis/src/main/java/com/majinnaibu/bukkitplugins/metropolis/commands/MetropolisCommand.java new file mode 100644 index 0000000..1084d84 --- /dev/null +++ b/Metropolis/src/main/java/com/majinnaibu/bukkitplugins/metropolis/commands/MetropolisCommand.java @@ -0,0 +1,5 @@ +package com.majinnaibu.bukkitplugins.metropolis.commands; + +public class MetropolisCommand { + +} diff --git a/Metropolis/src/main/java/com/majinnaibu/bukkit/plugins/metropolis/commands/MetropolisFlagResetCommand.java b/Metropolis/src/main/java/com/majinnaibu/bukkitplugins/metropolis/commands/MetropolisFlagResetCommand.java similarity index 91% rename from Metropolis/src/main/java/com/majinnaibu/bukkit/plugins/metropolis/commands/MetropolisFlagResetCommand.java rename to Metropolis/src/main/java/com/majinnaibu/bukkitplugins/metropolis/commands/MetropolisFlagResetCommand.java index 93e4acd..9d934eb 100644 --- a/Metropolis/src/main/java/com/majinnaibu/bukkit/plugins/metropolis/commands/MetropolisFlagResetCommand.java +++ b/Metropolis/src/main/java/com/majinnaibu/bukkitplugins/metropolis/commands/MetropolisFlagResetCommand.java @@ -1,10 +1,10 @@ -package com.majinnaibu.bukkit.plugins.metropolis.commands; +package com.majinnaibu.bukkitplugins.metropolis.commands; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; -import com.majinnaibu.bukkit.plugins.metropolis.MetropolisPlugin; +import com.majinnaibu.bukkitplugins.metropolis.MetropolisPlugin; import com.sk89q.worldguard.protection.flags.DefaultFlag; import com.sk89q.worldguard.protection.flags.StateFlag; import com.sk89q.worldguard.protection.regions.ProtectedRegion; diff --git a/Metropolis/src/main/java/com/majinnaibu/bukkit/plugins/metropolis/commands/MetropolisHomeGenerateCommand.java b/Metropolis/src/main/java/com/majinnaibu/bukkitplugins/metropolis/commands/MetropolisHomeGenerateCommand.java similarity index 79% rename from Metropolis/src/main/java/com/majinnaibu/bukkit/plugins/metropolis/commands/MetropolisHomeGenerateCommand.java rename to Metropolis/src/main/java/com/majinnaibu/bukkitplugins/metropolis/commands/MetropolisHomeGenerateCommand.java index 1426e98..8ba27c4 100644 --- a/Metropolis/src/main/java/com/majinnaibu/bukkit/plugins/metropolis/commands/MetropolisHomeGenerateCommand.java +++ b/Metropolis/src/main/java/com/majinnaibu/bukkitplugins/metropolis/commands/MetropolisHomeGenerateCommand.java @@ -1,10 +1,10 @@ -package com.majinnaibu.bukkit.plugins.metropolis.commands; +package com.majinnaibu.bukkitplugins.metropolis.commands; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; -import com.majinnaibu.bukkit.plugins.metropolis.MetropolisPlugin; +import com.majinnaibu.bukkitplugins.metropolis.MetropolisPlugin; public class MetropolisHomeGenerateCommand implements CommandExecutor { diff --git a/Metropolis/src/main/java/com/majinnaibu/bukkit/plugins/metropolis/commands/MetropolisHomeListCommand.java b/Metropolis/src/main/java/com/majinnaibu/bukkitplugins/metropolis/commands/MetropolisHomeListCommand.java similarity index 73% rename from Metropolis/src/main/java/com/majinnaibu/bukkit/plugins/metropolis/commands/MetropolisHomeListCommand.java rename to Metropolis/src/main/java/com/majinnaibu/bukkitplugins/metropolis/commands/MetropolisHomeListCommand.java index 021002d..a8b9007 100644 --- a/Metropolis/src/main/java/com/majinnaibu/bukkit/plugins/metropolis/commands/MetropolisHomeListCommand.java +++ b/Metropolis/src/main/java/com/majinnaibu/bukkitplugins/metropolis/commands/MetropolisHomeListCommand.java @@ -1,11 +1,11 @@ -package com.majinnaibu.bukkit.plugins.metropolis.commands; +package com.majinnaibu.bukkitplugins.metropolis.commands; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; -import com.majinnaibu.bukkit.plugins.metropolis.MetropolisPlugin; -import com.majinnaibu.bukkit.plugins.metropolis.PlayerHome; +import com.majinnaibu.bukkitplugins.metropolis.MetropolisPlugin; +import com.majinnaibu.bukkitplugins.metropolis.PlayerHome; public class MetropolisHomeListCommand implements CommandExecutor { private MetropolisPlugin _plugin; diff --git a/Metropolis/src/main/java/com/majinnaibu/bukkitplugins/metropolis/eventlisteners/DebugListener.java b/Metropolis/src/main/java/com/majinnaibu/bukkitplugins/metropolis/eventlisteners/DebugListener.java new file mode 100644 index 0000000..a221cfb --- /dev/null +++ b/Metropolis/src/main/java/com/majinnaibu/bukkitplugins/metropolis/eventlisteners/DebugListener.java @@ -0,0 +1,21 @@ +package com.majinnaibu.bukkitplugins.metropolis.eventlisteners; + +import org.bukkit.event.EventHandler; +import org.bukkit.event.EventPriority; +import org.bukkit.event.Listener; +import org.bukkit.event.player.PlayerInteractEvent; + +import com.majinnaibu.bukkitplugins.metropolis.MetropolisPlugin; + +public class DebugListener implements Listener { + MetropolisPlugin _plugin; + + public DebugListener(MetropolisPlugin plugin){ + _plugin = plugin; + } + + @EventHandler(priority=EventPriority.MONITOR) + public void onEvent(PlayerInteractEvent event){ + //event. + } +} diff --git a/Metropolis/src/main/java/com/majinnaibu/bukkit/plugins/metropolis/eventlisteners/PlayerJoinListener.java b/Metropolis/src/main/java/com/majinnaibu/bukkitplugins/metropolis/eventlisteners/PlayerJoinListener.java similarity index 83% rename from Metropolis/src/main/java/com/majinnaibu/bukkit/plugins/metropolis/eventlisteners/PlayerJoinListener.java rename to Metropolis/src/main/java/com/majinnaibu/bukkitplugins/metropolis/eventlisteners/PlayerJoinListener.java index 06f799f..c0a4a1f 100644 --- a/Metropolis/src/main/java/com/majinnaibu/bukkit/plugins/metropolis/eventlisteners/PlayerJoinListener.java +++ b/Metropolis/src/main/java/com/majinnaibu/bukkitplugins/metropolis/eventlisteners/PlayerJoinListener.java @@ -1,4 +1,4 @@ -package com.majinnaibu.bukkit.plugins.metropolis.eventlisteners; +package com.majinnaibu.bukkitplugins.metropolis.eventlisteners; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; @@ -6,9 +6,9 @@ import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; import org.bukkit.event.player.PlayerJoinEvent; -import com.majinnaibu.bukkit.plugins.metropolis.Cuboid; -import com.majinnaibu.bukkit.plugins.metropolis.MetropolisPlugin; -import com.majinnaibu.bukkit.plugins.metropolis.PlayerHome; +import com.majinnaibu.bukkitplugins.metropolis.Cuboid; +import com.majinnaibu.bukkitplugins.metropolis.MetropolisPlugin; +import com.majinnaibu.bukkitplugins.metropolis.PlayerHome; public class PlayerJoinListener implements Listener { private MetropolisPlugin _plugin = null; diff --git a/Metropolis/src/main/java/com/majinnaibu/bukkitplugins/metropolis/util/Material.java b/Metropolis/src/main/java/com/majinnaibu/bukkitplugins/metropolis/util/Material.java new file mode 100644 index 0000000..1608911 --- /dev/null +++ b/Metropolis/src/main/java/com/majinnaibu/bukkitplugins/metropolis/util/Material.java @@ -0,0 +1,5 @@ +package com.majinnaibu.bukkitplugins.metropolis.util; + +public class Material { + public static final int signTypeId = 63; +} diff --git a/Metropolis/src/main/resources/Metropolis/config.yml b/Metropolis/src/main/resources/config.yml similarity index 66% rename from Metropolis/src/main/resources/Metropolis/config.yml rename to Metropolis/src/main/resources/config.yml index e4d0b54..36b129c 100644 --- a/Metropolis/src/main/resources/Metropolis/config.yml +++ b/Metropolis/src/main/resources/config.yml @@ -1,6 +1,9 @@ plot: sizeX: 24 sizeZ: 24 + floor: + generate: true + material: 2 road: width: 4 clearSpaceAbove: 66 diff --git a/Metropolis/src/main/resources/plugin.yml b/Metropolis/src/main/resources/plugin.yml index eb7f840..409b937 100644 --- a/Metropolis/src/main/resources/plugin.yml +++ b/Metropolis/src/main/resources/plugin.yml @@ -1,8 +1,8 @@ name: Metropolis -main: com.majinnaibu.bukkit.plugins.metropolis.MetropolisPlugin +main: com.majinnaibu.bukkitplugins.metropolis.MetropolisPlugin depend: [WorldGuard] -softdepend: [WorldEdit] -version: 0.4.3 +softdepend: [WorldEdit,CommandBook] +version: 0.4.5 database: false commands: metropolis-home-generate: