Civ14

.gitignore

@@ -3,4 +3,6 @@
 /bin/
 .project
 .classpath
-.metadata
+.metadata
+.idea/
+*.iml

README.md

@@ -65,11 +65,12 @@ Similar to Game Fixes, but distinct in that the intent here is on hacks that _tu
 or alter existing mechanics without fully disabling them or without fixing them. 
 Things like altering armor damage reduction or tool impact would be good fits.
 
-### HackBot
+### ~~HackBot~~
 
-An experimental module whose complexity is approaching divorce from SAH, this is
+(Removed in 1.2.4)
+~~An experimental module whose complexity is approaching divorce from SAH, this is
 a bit of mid-work code that allows operators to define static Bots that show up
-like "real" players but aren't.
+like "real" players but aren't.~~
 
 ### Introbook
 
@@ -84,12 +85,13 @@ Host of the `/invsee` command, gives insight into active player inventory, armor
 health and more. I hope / intend to add another portion to this that allows online
 and offline inventory management via `/invmod` but this is as of now not started.
 
-### InvisibleFix and InvisibleFixTwo
+### ~~InvisibleFix and InvisibleFixTwo~~
 
-My hope is to remove these in time, but for 1.9 and 1.10 minecraft players
+(Removed in 1.3.0)
+~~My hope is to remove these in time, but for 1.9 and 1.10 minecraft players
 go invisible all the time. Both of these hacks use different approaches to help
 preserve the visiblity of players. The second hack is the more invasive, sending
-explicit location packets when the situation indicates its usefulness.
+explicit location packets when the situation indicates its usefulness.~~
 
 ### NewfriendAssist
 
@@ -107,6 +109,23 @@ are actively breaking reinforced containers.
 This one is pretty Devoted iteration 3 specific. Allows tracking server wide of
 all breaks or builds under a specific y level.
 
+### ToggleLamp
+
+A solid piece of contributed code, this hack lets redstone lamps be used as
+clickable-on, clickable-off light sources without additional redstone infrastructure.
+
+### HumbugBatchOne
+
+A new BasicHack (thanks Maxopoly) which encompasses a number of previously unincluded
+Humbug gameplay modifications. Specifically, sheep wool dying, anvil use, enchanting table use,
+cauldrons sourcing infinite water, disabling ender dragon, disabling iron farms,
+disabling ender crystal damage, disable mining fatigue, and equipping banners as hats.
+
+
+### PortalSpawnModifier
+
+Another new BasicHack which allows control of the spawn of creatures rate from nether portals
+
 ### TimingsHack
 
 This is mature enough to be its own plugin now, but for the moment I'm leaving it in

pom.xml

@@ -6,7 +6,7 @@
   <groupId>com.programmerdan.minecraft</groupId>
   <artifactId>SimpleAdminHacks</artifactId>
   <packaging>jar</packaging>
-  <version>1.2.4</version>
+  <version>1.3.0</version>
   <name>SimpleAdminHacks</name>
   <url>https://github.com/DevotedMC/SimpleAdminHacks</url>
 
@@ -89,10 +89,6 @@
       <id>spigot-repo</id>
       <url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
     </repository>
-    <repository>
-      <id>byteflux-repo</id>
-      <url>http://repo.byteflux.net/repository/maven-snapshots/</url>
-    </repository>
     <repository>
       <id>dmulloy2-repo</id>
       <url>http://repo.dmulloy2.net/content/groups/public/</url>
@@ -107,7 +103,7 @@
     <dependency>
       <groupId>org.spigotmc</groupId>
       <artifactId>spigot</artifactId>
-      <version>1.12.2-R0.1-SNAPSHOT</version>
+      <version>1.14.4-R0.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -137,24 +133,24 @@
     <dependency>
       <groupId>com.comphenix.protocol</groupId>
       <artifactId>ProtocolLib-API</artifactId>
-      <version>4.3.0</version>
+      <version>4.4.0</version>
     </dependency>
     <dependency>
       <groupId>vg.civcraft.mc.namelayer</groupId>
       <artifactId>NameLayer</artifactId>
-      <version>2.11.0</version>
+      <version>2.12.0</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>vg.civcraft.mc.citadel</groupId>
       <artifactId>Citadel</artifactId>
-      <version>3.9.0</version>
+      <version>4.0.1</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>vg.civcraft.mc.civmodcore</groupId>
       <artifactId>CivModCore</artifactId>
-      <version>1.6.0</version>
+      <version>1.7.8</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>

src/main/java/com/programmerdan/minecraft/simpleadminhacks/BasicHack.java

@@ -0,0 +1,76 @@
+package com.programmerdan.minecraft.simpleadminhacks;
+
+import java.lang.reflect.Field;
+import java.util.logging.Level;
+
+import org.bukkit.event.HandlerList;
+import org.bukkit.event.Listener;
+
+/**
+ * Utility automating a lot of the boiler plate required by SimpleHack and thus allowing easier creation
+ * of small hacks
+ *
+ */
+public abstract class BasicHack extends SimpleHack<BasicHackConfig> implements Listener {
+
+	public BasicHack(SimpleAdminHacks plugin, BasicHackConfig config) {
+		super(plugin, config);
+	}
+
+	@Override
+	public void registerListeners() {
+		SimpleAdminHacks.instance().registerListener(this);
+	}
+
+	@Override
+	public void registerCommands() {
+		//override in subclass if needed
+	}
+
+	@Override
+	public void dataBootstrap() {
+		//override in subclass if needed
+	}
+
+	@Override
+	public void unregisterListeners() {
+		HandlerList.unregisterAll(this);
+
+	}
+
+	@Override
+	public void unregisterCommands() {
+		//override in subclass if needed
+	}
+
+	@Override
+	public void dataCleanup() {
+		//override in subclass if needed
+
+	}
+
+	@Override
+	public String status() {
+		StringBuilder genStatus = new StringBuilder();
+		genStatus.append(this.getClass().getSimpleName());
+		genStatus.append(" is ");
+		if (config == null || !config.isEnabled()) {
+			genStatus.append("disabled");
+			return genStatus.toString();
+		}
+		genStatus.append("enabled\n");
+		for(Field field : this.getClass().getDeclaredFields()) {
+			genStatus.append(field.getName());
+			genStatus.append(" = ");
+			field.setAccessible(true);
+			try {
+				genStatus.append(field.get(this));
+			} catch (IllegalArgumentException | IllegalAccessException e) {
+				plugin().log(Level.WARNING, "Failed to read field", e);
+			}
+			genStatus.append('\n');
+		}
+		return genStatus.toString();
+	}
+
+}

src/main/java/com/programmerdan/minecraft/simpleadminhacks/BasicHackConfig.java

@@ -0,0 +1,20 @@
+package com.programmerdan.minecraft.simpleadminhacks;
+
+import org.bukkit.configuration.ConfigurationSection;
+
+public class BasicHackConfig extends SimpleHackConfig {
+
+	public BasicHackConfig(SimpleAdminHacks plugin, ConfigurationSection base) {
+		super(plugin, base);
+	}
+
+	@Override
+	protected void wireup(ConfigurationSection config) {
+		//not needed
+	}
+
+	public static BasicHackConfig generate(SimpleAdminHacks plugin, ConfigurationSection config) {
+		return new BasicHackConfig(plugin, config);
+	}
+
+}

src/main/java/com/programmerdan/minecraft/simpleadminhacks/CommandListener.java

@@ -67,7 +67,7 @@ private boolean showHacks(CommandSender sender) {
 
 		sb.append(ChatColor.WHITE).append("List of hacks:\n");
 
-		for (SimpleHack<?> hack : plugin.getHacks()) {
+		for (SimpleHack<?> hack : plugin.getHackManager().getHacks()) {
 			sb.append("  ")
 				.append(ChatColor.AQUA).append(hack.getName())
 				.append(ChatColor.WHITE).append(": ");
@@ -87,7 +87,7 @@ private boolean showHacks(CommandSender sender) {
 	 * Internal utility to get a hack from name.
 	 */
 	private SimpleHack<?> findHack(String hackName) {
-		for (SimpleHack<?> candidate : plugin.getHacks()) {
+		for (SimpleHack<?> candidate : plugin.getHackManager().getHacks()) {
 			if (candidate.getName().equals(hackName)) {
 				return candidate;
 			}