maj/Metropolis
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Converted to maven

Browse Source
This commit is contained in:
Tom Hicks
2012-02-19 03:02:58 -08:00
parent 910773f95f
commit c5884501fd
14 changed files with 92 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Metropolis/src/main/java/com/majinnaibu/bukkit/plugins/metropolis/commands/MetropolisCommand.java
View File

@@ -1,5 +0,0 @@
package com.majinnaibu.bukkit.plugins.metropolis.commands;
public class MetropolisCommand {
}

42
Metropolis/src/main/java/com/majinnaibu/bukkit/plugins/metropolis/eventlisteners/PlayerLoginListener.java
View File

@@ -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()));
}
*/
}
}

16
Metropolis/src/main/java/com/majinnaibu/bukkit/plugins/metropolis/Cuboid.java → Metropolis/src/main/java/com/majinnaibu/bukkitplugins/metropolis/Cuboid.java
View File

@@ -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<Cuboid> {
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;
}
}

94
Metropolis/src/main/java/com/majinnaibu/bukkit/plugins/metropolis/MetropolisPlugin.java → Metropolis/src/main/java/com/majinnaibu/bukkitplugins/metropolis/MetropolisPlugin.java
View File

@@ -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<PlayerHome> _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<PlayerHome>();
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<PlayerHome>();
@@ -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<String, ProtectedRegion> 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<Class<?>> getDatabaseClasses(){
List<Class<?>> list = new ArrayList<Class<?>>();
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<spaceAboveRoad; i++){
block = world.getBlockAt(x, y+i, z);
block.setTypeId(0);
}
}
}
}
private void createRoads(Cuboid plotCuboid) {
@@ -209,7 +174,7 @@ public class MetropolisPlugin extends JavaPlugin {
int z=0;
if(plotCuboid == null){
log.info("plotCuboid is null");
log.warning("plotCuboid is null");
return;
}
@@ -335,12 +300,9 @@ public class MetropolisPlugin extends JavaPlugin {
for(PlayerHome home: _occupiedHomes){
int plotCol=Math.abs(getPlotXFromMin(home.getCuboid()));
int plotRow=Math.abs(getPlotZFromMin(home.getCuboid()));
//log.info(String.format("iSize: %d, plotRow: %d, plotCol: %d", iSize, plotCol, plotRow));
iSize = Math.max(Math.max(plotRow*2+1, plotCol*2+1), iSize);
}
//log.info(String.format("iSize: %d", iSize));
return iSize;
}
@@ -399,7 +361,6 @@ public class MetropolisPlugin extends JavaPlugin {
try {
regionManager.save();
} catch (IOException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
@@ -407,6 +368,10 @@ public class MetropolisPlugin extends JavaPlugin {
createRoads(plotCuboid);
if(generateFloor){
generateFloor(plotCuboid);
}
log.info(String.format("Done generating home for %s", playerName));
return new PlayerHome(homeRegion);
@@ -415,5 +380,4 @@ public class MetropolisPlugin extends JavaPlugin {
public List<PlayerHome> getCityBlocks() {
return Collections.unmodifiableList(_occupiedHomes);
}
}

2
Metropolis/src/main/java/com/majinnaibu/bukkit/plugins/metropolis/PlayerHome.java → Metropolis/src/main/java/com/majinnaibu/bukkitplugins/metropolis/PlayerHome.java
View File

@@ -1,4 +1,4 @@
package com.majinnaibu.bukkit.plugins.metropolis;
package com.majinnaibu.bukkitplugins.metropolis;
import javax.persistence.Entity;
import javax.persistence.Id;

5
Metropolis/src/main/java/com/majinnaibu/bukkitplugins/metropolis/commands/MetropolisCommand.java Normal file
View File

@@ -0,0 +1,5 @@
package com.majinnaibu.bukkitplugins.metropolis.commands;
public class MetropolisCommand {
}

4
Metropolis/src/main/java/com/majinnaibu/bukkit/plugins/metropolis/commands/MetropolisFlagResetCommand.java → Metropolis/src/main/java/com/majinnaibu/bukkitplugins/metropolis/commands/MetropolisFlagResetCommand.java
View File

@@ -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;

4
Metropolis/src/main/java/com/majinnaibu/bukkit/plugins/metropolis/commands/MetropolisHomeGenerateCommand.java → Metropolis/src/main/java/com/majinnaibu/bukkitplugins/metropolis/commands/MetropolisHomeGenerateCommand.java
View File

@@ -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 {

6
Metropolis/src/main/java/com/majinnaibu/bukkit/plugins/metropolis/commands/MetropolisHomeListCommand.java → Metropolis/src/main/java/com/majinnaibu/bukkitplugins/metropolis/commands/MetropolisHomeListCommand.java
View File

@@ -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;

21
Metropolis/src/main/java/com/majinnaibu/bukkitplugins/metropolis/eventlisteners/DebugListener.java Normal file
View File

@@ -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.
}
}

8
Metropolis/src/main/java/com/majinnaibu/bukkit/plugins/metropolis/eventlisteners/PlayerJoinListener.java → Metropolis/src/main/java/com/majinnaibu/bukkitplugins/metropolis/eventlisteners/PlayerJoinListener.java
View File

@@ -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;

5
Metropolis/src/main/java/com/majinnaibu/bukkitplugins/metropolis/util/Material.java Normal file
View File

@@ -0,0 +1,5 @@
package com.majinnaibu.bukkitplugins.metropolis.util;
public class Material {
public static final int signTypeId = 63;
}

3
Metropolis/src/main/resources/Metropolis/config.yml → Metropolis/src/main/resources/config.yml
View File

@@ -1,6 +1,9 @@
plot:
sizeX: 24
sizeZ: 24
floor:
generate: true
material: 2
road:
width: 4
clearSpaceAbove: 66

6
Metropolis/src/main/resources/plugin.yml
View File

@@ -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: