Cleanup for 1.12 mc release

Author: connection-lost

config.yml

@@ -10,6 +10,11 @@ block-item-transfer-in: false
 block-item-transfer-out: true
 block-hopper-minecart: remove
 cache-time-seconds: 0
+lock-expire: false
+lock-expire-days: 999.9
+lock-default-create-time-unix: -1
+lock-expire-string: '&3[Expired]'
+
 private-signs:
 - '[Private]'
 - '[private]'
@@ -38,4 +43,4 @@ lockables:
 - DARK_OAK_DOOR
 - IRON_DOOR_BLOCK
 protection-exempt:
-- explosion
+- nothing

src/me/crafter/mc/lockettepro/BlockDebugListener.java

@@ -34,39 +34,14 @@ public void onDebugClick(PlayerInteractEvent event){
 				p.sendMessage(" - now     : " + (int)(System.currentTimeMillis()/1000));
 			}
 
-//			p.sendMessage("isLockSign: " + formatBoolean(LocketteProAPI.isLockSign(b)));
-//			if (LocketteProAPI.isLockSign(b)){
-//				p.sendMessage(" - isOwnerOnSign: " + formatBoolean(LocketteProAPI.isOwnerOnSign(b, p.getName())));
-//			}
-//			p.sendMessage("isAdditionalSign: " + formatBoolean(LocketteProAPI.isAdditionalSign(b)));
-//			if (LocketteProAPI.isAdditionalSign(b)){
-//				p.sendMessage(" - isUserOnSign: " + formatBoolean(LocketteProAPI.isUserOnSign(b, p.getName())));
-//			}
-//			p.sendMessage("isContainer: " + formatBoolean(LocketteProAPI.isContainer(b)));
 			p.sendMessage("Block: " + b.getType().toString() + " " + b.getTypeId() + ":" + b.getData());
 
-//			if (b.getType() == Material.WALL_SIGN){
-//				for (Object line : Reflection.signToBaseComponents(b)){
-//					Bukkit.broadcastMessage(line.toString());
-//				}
-//			}
 			if (b.getType() == Material.WALL_SIGN){
-//				List<Object> basecomponents = Reflection.signToBaseComponents(b);
-//				p.sendMessage("Text:Clickable:Hoverable");
-//				for (Object basecomponent : basecomponents){
-//					//p.sendMessage(ChatColor.RED + basecomponent.toString());
-//					p.sendMessage(ChatColor.YELLOW + Reflection.baseComponentToText(basecomponent) + ":" + Reflection.baseComponentToClickable(basecomponent) + ":" + Reflection.baseComponentToHoverable(basecomponent));
-//				}
 				for (String line : ((Sign)b.getState()).getLines()){
 					p.sendMessage(ChatColor.GREEN + line);
 				}
-//				Object basecomponent = basecomponents.get(0);
-//				p.sendMessage(ChatColor.RED + basecomponent.toString());
-//				p.sendMessage(ChatColor.YELLOW + Reflection.baseComponentToText(basecomponent) + ":" + Reflection.baseComponentToClickable(basecomponent) + ":" + Reflection.baseComponentToHoverable(basecomponent));
-//				p.sendMessage(ChatColor.GREEN + ((Sign)b.getState()).getLines()[0]);
 			}
 			p.sendMessage(p.getUniqueId().toString());
-			//p.sendMessage(Utils.getUuidByUsernameFromMojang(p.getName()));
 		}	
 	}
 

src/me/crafter/mc/lockettepro/Config.java

@@ -113,7 +113,7 @@ public static void reload(){
 		}
 
 		lockexpire = config.getBoolean("lock-expire", false);
-		lockexpiredays = config.getDouble("lock-expire-days", 0D);
+		lockexpiredays = config.getDouble("lock-expire-days", 999.9D);
 		lockdefaultcreatetime = config.getLong("lock-default-create-time-unix", -1L);
 		if (lockdefaultcreatetime < -1L) lockdefaultcreatetime = -1L;
 		lockexpirestring = ChatColor.translateAlternateColorCodes('&', 
@@ -186,9 +186,9 @@ public static void initDefaultConfig(){
 		config.addDefault("protection-exempt", protection_exempt);
 
 		config.addDefault("lock-expire", false);
-		config.addDefault("lock-expire-days", 30D);
+		config.addDefault("lock-expire-days", 999.9D);
 		config.addDefault("lock-default-create-time-unix", -1L);
-		config.addDefault("lock-expire-string", ChatColor.RED + "[Expired]");
+		config.addDefault("lock-expire-string", "&3[Expired]");
 
 		config.options().copyDefaults(true);
 		try {

src/me/crafter/mc/lockettepro/LockettePro.java

@@ -8,12 +8,12 @@
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.java.JavaPlugin;
-import org.mcstats.MetricsLite;
+//import org.mcstats.MetricsLite;
 
 public class LockettePro extends JavaPlugin {
 
 	private static Plugin plugin;
-	private boolean debug = true;
+	private boolean debug = false;
 	private static Version version = Version.UNKNOWN;
 	private static boolean needcheckhand = false;
 
@@ -63,10 +63,11 @@ public void onEnable(){
 			}
     	}
     	// Metrics
-    	try {
-    		MetricsLite metrics = new MetricsLite(this);
-	        metrics.start();
-    	} catch (Exception ex){}
+    	// mcstats sucks
+//    	try {
+//    		MetricsLite metrics = new MetricsLite(this);
+//	        metrics.start();
+//    	} catch (Exception ex){}
     }
 
     public void onDisable(){
@@ -123,9 +124,6 @@ public boolean onCommand(CommandSender sender, Command cmd, String commandLabel,
     			case "4":
     				if (player.hasPermission("lockettepro.edit")){
 	    				String message = "";
-//    					if (args.length == 1){
-//    						message = "";
-//    					}
     					Block block = Utils.getSelectedSign(player);
 		    			if (block == null){
 		    				Utils.sendMessages(player, Config.getLang("no-sign-selected"));

src/me/crafter/mc/lockettepro/LocketteProAPI.java

@@ -16,6 +16,7 @@ public class LocketteProAPI {
 	public static BlockFace[] allfaces = {BlockFace.NORTH, BlockFace.EAST, BlockFace.SOUTH, BlockFace.WEST, BlockFace.UP, BlockFace.DOWN};
 
 	public static boolean isLocked(Block block){
+		if (block == null) return false;
 		switch (block.getType()){
 		// Double Doors
 		case WOODEN_DOOR:

src/me/crafter/mc/lockettepro/Utils.java

@@ -23,7 +23,6 @@
 import org.bukkit.metadata.MetadataValue;
 
 import com.comphenix.protocol.wrappers.WrappedChatComponent;
-import com.google.common.base.Strings;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 
@@ -33,9 +32,7 @@ public class Utils {
 
 	private static Map<Player, Block> selectedsign = new HashMap<Player, Block>();
 	private static Set<Player> notified = new HashSet<Player>();
-	
-	private static int SECONDSPERDAY = 86400;
-	
+		
 	// Helper functions
 	@SuppressWarnings("deprecation")
 	public static Block putSignOn(Block block, BlockFace blockface, String line1, String line2){