Upstream
/
PlotSquared
mirror of https://github.com/IntellectualSites/PlotSquared.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Well, started working on something totally uneeded... /p setup {world} 

Fixed SQLite errors.
This commit is contained in:
Sauilitired 2014-09-26 22:53:42 +02:00
parent 241a70e648
commit ebe636047f
6 changed files with 613 additions and 347 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

792
.idea/workspace.xml
View File

File diff suppressed because it is too large Load Diff

20
PlotSquared/src/com/intellectualcrafters/plot/C.java
View File

@ -18,6 +18,16 @@ import org.bukkit.ChatColor;
*
*/
public enum C {
/*
* Setup Stuff
*/
SETUP_INIT("&6PlotSquared Setup -> Setup a new plotworld"),
SETUP_STEP("&cStep &6%s&c: %s"),
SETUP_INVALID_ARG("&c%s is not a valid argument for step %s"),
SETUP_VALID_ARG("&cValue &6%s &cset for step %s"),
SETUP_FINISHED("&cFinished setup for world &c%s"),
SETUP_WORLD_TAKEN("&c%s is already a registered plotworld"),
SETUP_MISSING_WORLD("&cYou need to specify a world name (&6/p setup {world}&c)"),
/*
* Schematic Stuff
*/
@ -53,7 +63,7 @@ public enum C {
/*
* Permission
*/
NO_PERMISSION("&cYou don't have the permissions required to use this command."), NO_PLOT_PERMS("&cYou don't have the permissions to do that in this plot"), CANT_CLAIM_MORE_PLOTS("&cYou can't claim more plots."), YOU_BE_DENIED("&cYou are not allowed to enter this plot"),
NO_PERMISSION("&cYou don't have the permissions required to use this command."), NO_PLOT_PERMS("&cYou don't have the permissions to do that in this plot"), CANT_CLAIM_MORE_PLOTS("&cYou can't claim more plots."), YOU_BE_DENIED("&cYou are not allowed to enter this plot"),
NO_PERM_MERGE("&cYou are not the owner of the plot: &6%plot%"), UNLINK_REQUIRED("&cAn unlink is required to do this."), UNLINK_IMPOSSIBLE("&cYou can only unlink a mega-plot"),
NO_MERGE_TO_MEGA("&cMega plots cannot be merged into. Please merge from the desired mega plot."),
/*
@ -181,7 +191,7 @@ public enum C {
/**
* Constructor
*
*
* @param d
* default
*/
@ -199,7 +209,7 @@ public enum C {
/**
* Get the default string
*
*
* @return default
*/
@SuppressWarnings("unused")
@ -209,7 +219,7 @@ public enum C {
/**
* Get translated if exists
*
*
* @return translated if exists else default
*/
public String s() {
@ -220,7 +230,7 @@ public enum C {
}
/**
*
*
* @return translated and color decoded
*/
public String translated() {

3
PlotSquared/src/com/intellectualcrafters/plot/FlagManager.java
View File

@ -32,7 +32,7 @@ public class FlagManager {
* Get an AbstractFlag by a string
* Returns null if flag does not exist
* @param string
* @return AbstractFkag
* @return AbstractFlag
*/
public static AbstractFlag getFlag(String string) {
for (AbstractFlag flag : flags) {
@ -54,6 +54,7 @@ public class FlagManager {
public static AbstractFlag getFlag(String string, boolean create) {
if ((getFlag(string) == null) && create) {
AbstractFlag flag = new AbstractFlag(string);
addFlag(flag);
return flag;
}
return getFlag(string);

4
PlotSquared/src/com/intellectualcrafters/plot/XPopulator.java
View File

@ -1,11 +1,11 @@
package com.intellectualcrafters.plot;
import java.util.Random;
import org.bukkit.Chunk;
import org.bukkit.World;
import org.bukkit.generator.BlockPopulator;
import java.util.Random;
/**
* TODO recode this class Fuck you PlotMe!
*

129
PlotSquared/src/com/intellectualcrafters/plot/commands/Setup.java Normal file
View File

@ -0,0 +1,129 @@
package com.intellectualcrafters.plot.commands;
import com.intellectualcrafters.plot.C;
import com.intellectualcrafters.plot.PlotMain;
import com.intellectualcrafters.plot.PlotWorld;
import org.bukkit.Bukkit;
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.AsyncPlayerChatEvent;
import java.util.HashMap;
import java.util.Map;
/**
* Created by Citymonstret on 2014-09-26.
*/
public class Setup extends SubCommand implements Listener {
public static Map<String, SetupObject> setupMap = new HashMap<>();
/*
ROAD_HEIGHT
PLOT_HEIGHT
WALL_HEIGHT
PLOT_WIDTH
ROAD_WIDTH
PLOT_BIOME
MAIN_BLOCK
TOP_BLOCK
WALL_BLOCK
WALL_FILLING
ROAD_STRIPES
ROAD_STRIPES_ENABLED
ROAD_BLOCK
PLOT_CHAT
BLOCKS
SCHEMATIC_ON_CLAIM
SCHEMATIC_FILE
DEFAULT_FLAGS
*/
private static class SetupStep {
private String constant;
private Object default_value;
private String description;
private Object value = 0;
public SetupStep(String constant, Object default_value, String description) {
this.constant = constant;
this.default_value = default_value;
this.description = description;
}
public boolean setValue(Object o) {
}
public Object getValue() {
return this.value;
}
public String getConstant() {
return this.constant;
}
public Object getDefaultValue() {
return this.default_value;
}
public String getDescription() {
return this.description;
}
}
private static class SetupObject {
private String world;
private int current = 0;
private SetupStep[] step = new SetupStep[] {
new SetupStep("road_height", 64, "Height of road")
};
public SetupObject(String world) {
this.world = world;
PlotWorld p = new PlotWorld();
}
public SetupStep getNextStep() {
return this.step[current++];
}
public int getMax() {
return this.step.length;
}
}
public Setup() {
super("setup", "plots.admin", "Setup a PlotWorld", "/plot setup {world}", "setup", CommandCategory.ACTIONS);
}
@Override
public boolean execute(Player plr, String... args) {
if(args.length < 1) {
sendMessage(plr, C.SETUP_MISSING_WORLD);
return true;
}
String world = args[0];
if(PlotMain.isPlotWorld(Bukkit.getWorld(world))) {
sendMessage(plr, C.SETUP_WORLD_TAKEN, world);
return true;
}
setupMap.put(plr.getName(), new SetupObject(world));
sendMessage(plr, C.SETUP_INIT);
return true;
}
@EventHandler(priority = EventPriority.HIGHEST)
public void onChat(AsyncPlayerChatEvent event) {
Player player = event.getPlayer();
if(!setupMap.containsKey(player.getName())) {
return;
}
event.setCancelled(true);
SetupObject object = setupMap.get(player.getName());
}
}

12
PlotSquared/src/com/intellectualcrafters/plot/database/DBFunc.java
View File

@ -229,7 +229,7 @@ public class DBFunc {
rs = data.getColumns(null, null, "plot_settings", "merged");
if (!rs.next()) {
Statement statement = connection.createStatement();
statement.addBatch("ALTER IGNORE TABLE `plot_settings` ADD `merged` int(11) DEFAULT NULL");
statement.addBatch("ALTER TABLE `plot_settings` ADD `merged` int(11) DEFAULT NULL");
statement.executeBatch();
statement.close();
}
@ -267,9 +267,6 @@ public class DBFunc {
flags[i] = new Flag(FlagManager.getFlag(flags_string[i], true), "");
}
}
ArrayList<UUID> helpers = plotHelpers(id);
ArrayList<UUID> denied = plotDenied(id);
// boolean changeTime = ((Short) settings.get("custom_time") ==
@ -281,7 +278,12 @@ public class DBFunc {
// boolean rain =
// Integer.parseInt(settings.get("rain").toString()) == 1 ? true
// : false;
boolean rain = (int) settings.get("rain") == 1 ? true : false;
boolean rain;
try {
rain = (int) settings.get("rain") == 1 ? true : false;
} catch(Exception e) {
rain = false;
}
String alias = (String) settings.get("alias");
if ((alias == null) || alias.equalsIgnoreCase("NEW")) {
alias = "";