Many fixes from Humbug and elsewhere, other cleanup

Author: ProgrammerDan

.editorconfig

@@ -0,0 +1,25 @@
+# Editorconfig is awesome: http://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+
+# Unix-style newlines with a newline ending every file
+[*]
+charset = utf-8
+indent_style = tab
+indent_size = 4
+end_of_line = lf
+insert_final_newline = true
+continuation_indent_size = 8
+
+[*.java]
+indent_style = tab
+indent_size = 4
+
+[*.xml]
+indent_style = tab
+indent_size = 2
+
+[*.yml]
+indent_style = space
+indent_size = 2

pom.xml

@@ -6,7 +6,7 @@
   <groupId>com.programmerdan.minecraft</groupId>
   <artifactId>SimpleAdminHacks</artifactId>
   <packaging>jar</packaging>
-  <version>1.1.2</version>
+  <version>1.2.1</version>
   <name>SimpleAdminHacks</name>
   <url>https://github.com/DevotedMC/SimpleAdminHacks</url>
 
@@ -107,13 +107,13 @@
     <dependency>
       <groupId>org.spigotmc</groupId>
       <artifactId>spigot</artifactId>
-      <version>1.10.2-R0.1-SNAPSHOT</version>
+      <version>1.12-R0.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>net.minelink</groupId>
       <artifactId>CombatTagPlus</artifactId>
-      <version>1.2.4-SNAPSHOT</version>
+      <version>1.3.1-SNAPSHOT</version>
       <scope>provided</scope>
       <exclusions>
         <exclusion>
@@ -142,24 +142,24 @@
     <dependency>
       <groupId>com.comphenix.protocol</groupId>
       <artifactId>ProtocolLib-API</artifactId>
-      <version>4.0-SNAPSHOT</version>
+      <version>4.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>vg.civcraft.mc.namelayer</groupId>
       <artifactId>NameLayer</artifactId>
-      <version>2.9.08</version>
+      <version>2.11.0</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>vg.civcraft.mc.citadel</groupId>
       <artifactId>Citadel</artifactId>
-      <version>3.7.02</version>
+      <version>3.9.0</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>vg.civcraft.mc.civmodcore</groupId>
       <artifactId>CivModCore</artifactId>
-      <version>1.5.09</version>
+      <version>1.6.0</version>
       <scope>provided</scope>
     </dependency>
 <!--  Note: CrazyCrates isn't distributed in POM form.

src/main/java/com/programmerdan/minecraft/simpleadminhacks/configs/GameFeaturesConfig.java

@@ -28,11 +28,18 @@ public class GameFeaturesConfig extends SimpleHackConfig {
 	private boolean villagerTrading;
 	private boolean witherSpawning;
 	private boolean enderChestPlacement;
+	private boolean enderChestUse;
+	private boolean shulkerBoxUse;
+	private boolean totemPowers;
+	private boolean elytraUse;
+	private boolean chorusFruitUse;
 
 	private boolean weepingAngel;
 	private int weepingAngelEnv;
 	private int weepingAngelPlayer;
 
+	private boolean blockWaterInHell;
+	
 	public GameFeaturesConfig(SimpleAdminHacks plugin, ConfigurationSection base) {
 		super(plugin, base);
 	}
@@ -43,22 +50,39 @@ protected void wireup(ConfigurationSection config) {
 		if (!this.potatoXPEnabled) plugin().log("  Potato XP Disabled");
 
 		this.villagerTrading = config.getBoolean("villagerTrading", false);
-		if (!villagerTrading) plugin().log("VillagerTrading is disabled");
+		if (!villagerTrading) plugin().log("  VillagerTrading is disabled");
 
 		this.witherSpawning = config.getBoolean("witherSpawning", false);
-		if (!this.witherSpawning) plugin().log("Wither Spawning is disabled");
-
-		this.enderChestPlacement = config.getBoolean("enderChestPlacement", false);
-		if (!this.enderChestPlacement) plugin().log("Placeing EnderChests is disabled");
-
-		this.weepingAngel = config.getBoolean("weepingAngel.enabled", false);
+		if (!this.witherSpawning) plugin().log("  Wither Spawning is disabled");
+
+		this.enderChestPlacement = config.getBoolean("enderChestPlacement", true);
+		if (!this.enderChestPlacement) plugin().log("  Placing EnderChests is disabled");
+		
+		this.enderChestUse = config.getBoolean("enderChestUse", false);
+		if (!this.enderChestUse) plugin().log("  Using EnderChests is disabled");
+		
+		this.shulkerBoxUse = config.getBoolean("shulkerBoxUse", false);
+		if (!this.shulkerBoxUse) plugin().log("  Using Shulker Boxes is disabled");
+		
+		this.totemPowers = config.getBoolean("totemPower", false);
+		if (!this.totemPowers) plugin().log("  Undeath via totems is disabled");
+		
+		this.elytraUse = config.getBoolean("elytraUse", true);
+		if (!this.elytraUse) plugin().log("  Elytra use is disabled");
+		
+		this.chorusFruitUse = config.getBoolean("chorusFruitTeleportation", false);
+		if (!this.chorusFruitUse) plugin().log("  Chorus Fruit Teleportation is disabled");
+
+ 		this.weepingAngel = config.getBoolean("weepingAngel.enabled", false);
 		if (this.weepingAngel) {
 			this.weepingAngelEnv = config.getInt("weepingAngel.environment", 1);
 			this.weepingAngelPlayer = config.getInt("weepingAngel.playerKill", 5);
 
-			plugin().log("Weeping Angel is enabled. Times | Env[" + weepingAngelEnv + "] PK[" + weepingAngelPlayer + "]");
+			plugin().log("  Weeping Angel is enabled. Times | Env[" + weepingAngelEnv + "] PK[" + weepingAngelPlayer + "]");
 		}
 
+		this.blockWaterInHell = config.getBoolean("blockWaterInHell", true);
+		if (this.blockWaterInHell) plugin().log("  Blocking bucket use in hell biomes");
 
 		/* Add additional feature config grabs here. */
 	}
@@ -82,6 +106,26 @@ public boolean isEnderChestPlacement() {
 		return this.enderChestPlacement;
 	}
 
+	public boolean isEnderChestUse() {
+		return this.enderChestUse;
+	}
+	
+	public boolean isShulkerBoxUse() {
+		return this.shulkerBoxUse;
+	}
+	
+	public boolean isTotemPowers() {
+		return this.totemPowers;
+	}
+	
+	public boolean isElytraUse() {
+		return this.elytraUse;
+	}
+	
+	public boolean isChorusFruitTeleportation() {
+		return this.chorusFruitUse;
+	}
+	
 	public boolean isWeepingAngel() {
 		return this.weepingAngel;
 	}
@@ -94,5 +138,9 @@ public int getWeepingAngelPlayer() {
 		return this.weepingAngelPlayer;
 	}
 
+	public boolean isBlockWaterInHell() {
+		return this.blockWaterInHell;
+	}
+	
 }
 

src/main/java/com/programmerdan/minecraft/simpleadminhacks/configs/GameFixesConfig.java

@@ -8,6 +8,7 @@
 import com.programmerdan.minecraft.simpleadminhacks.SimpleHackConfig;
 
 import java.util.ArrayList;
+import java.util.logging.Level;
 
 public class GameFixesConfig extends SimpleHackConfig {
 
@@ -17,7 +18,8 @@ public class GameFixesConfig extends SimpleHackConfig {
 	private boolean stopHopperDupe;
 	private boolean stopRailDupe;
 	private boolean stopEndPortalDeletion;
-
+	private boolean stopBedBombing;
+	
 	private ArrayList<BlockFace> bfArray;
 	private ArrayList<Material> railArray;
 	private ArrayList<Material> pistonArray;
@@ -30,14 +32,22 @@ public GameFixesConfig(SimpleAdminHacks plugin, ConfigurationSection base) {
 	protected void wireup(ConfigurationSection config) {
 		blockElytraBreakBug = config.getBoolean("blockElytraBreakBug", true);
 		damageOnElytraBreakBug = config.getDouble("damageOnElytraBreakBug", 0.0d);
+		if (blockElytraBreakBug) plugin().log(Level.INFO, "  Block Elytra 1height break bug is enabled, doing {} damage to violators", damageOnElytraBreakBug);
+		
 		canStorageTeleport = config.getBoolean("canStorageTeleport");
+		if (!canStorageTeleport) plugin().log("  Storage holder teleportation is disabled.");
+		
 		stopHopperDupe = config.getBoolean("stopHopperDupe");
+		if (stopHopperDupe) plugin().log("  Stop Hopper self-feeding Dupe is enabled.");
 
 		stopRailDupe = config.getBoolean("stopRailDupe", true);
-		if (stopRailDupe) plugin().log("Stop Rail Dupe is enabled.");
+		if (stopRailDupe) plugin().log("  Stop Rail Dupe is enabled.");
 
 		stopEndPortalDeletion = config.getBoolean("stopEndPortalDeletion", true);
-		if (stopEndPortalDeletion) plugin().log("Stop End Portal Deletion is enabled.");
+		if (stopEndPortalDeletion) plugin().log("  Stop End Portal Deletion is enabled.");
+		
+		stopBedBombing = config.getBoolean("stopBedBombingInHellBiomes", true);
+		if (stopBedBombing) plugin().log("  Stop Bed Bombing In Hell Biomes is enabled.");
 	}
 
 	private void wireUpArrays() {
@@ -99,4 +109,8 @@ public ArrayList<Material> getRailArray() {
 	public ArrayList<Material> getPistonArray() {
 		return pistonArray;
 	}
+	
+	public boolean stopBedBombing() {
+		return this.stopBedBombing;
+	}
 }

src/main/java/com/programmerdan/minecraft/simpleadminhacks/hacks/Experimental.java

@@ -105,20 +105,23 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
 
 	@EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = false)
 	private void monitorTeleportLow(PlayerTeleportEvent event) {
+		if (!config.isEnabled()) return;
 		if (!config.isTeleportSpy()) return;
 		StringBuffer sb = new StringBuffer("[LO] ");
 		logTeleport(event, sb);
 	}
 
 	@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = false)
 	private void monitorTeleportHigh(PlayerTeleportEvent event) {
+		if (!config.isEnabled()) return;
 		if (!config.isTeleportSpy()) return;
 		StringBuffer sb = new StringBuffer("[HI] ");
 		logTeleport(event, sb);
 	}
 
 	@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
 	private void monitorTeleportTrack(PlayerPortalEvent event) {
+		if (!config.isEnabled()) return;
 		if (!config.isPostTeleportSpy()) return;
 
 		final Player player = event.getPlayer();
@@ -194,6 +197,7 @@ private void logPlayer(final Player player, StringBuffer sb) {
 
 	@EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = false)
 	private void monitorCombatLow(EntityDamageByEntityEvent event) {
+		if (!config.isEnabled()) return;
 		if (!config.isCombatSpy()) return;
 		StringBuffer sb = new StringBuffer("[LO] ");
 		logCombat(event, sb);
@@ -219,6 +223,7 @@ private void logCombat(EntityDamageByEntityEvent event, StringBuffer sb) {
 
 	@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = false)
 	private void monitorCombatHigh(EntityDamageByEntityEvent event) {
+		if (!config.isEnabled()) return;
 		if (!config.isCombatSpy()) return;
 		StringBuffer sb = new StringBuffer("[HI]: ");
 		logCombat(event, sb);