Bugfix for github.com//issues/6 and add gradle configs (#7)

* Add missing World params in HardcoreSpawnUtils mixins

* Update README.md

* Add gradle config/jar and update dev instructions.

* Readme typo.

* Fix issue where maximum radius <1000 would crash

Validation of config settings during initial load now only happens after all settings have been loaded, not once after each setting. Behavior using the in-game command is unchanged.

github.com//issues/6

.gitignore

@@ -18,7 +18,6 @@ run
 BTW_dev
 custom_mappings
 dev_run
-gradle
 release
 
 # BTW Files

README.md

@@ -2,6 +2,8 @@
 
 Want to be able to change HC Spawn mechanics? Want to disable lightning fires? This addon is for you!
 
+Currently updated for BTW CE 2.1.4. Compatibility with is untested and not guaranteed.
+
 [Download](https://github.com/BTW-Community/Tweaker/releases/latest)
 
 ## Installation
@@ -69,3 +71,14 @@ lightningFire=true
 ```
 
 </details>
+
+## Dev Instructions
+
+For 2.1.4 mod dev, you'll need to obtain the BTW-sources. See https://github.com/BTW-Community/BTW-gradle for
+instructions; the source should be copied to `./src/btw`. Gradle version must be <8 (version 7.2 is configured in
+`gradle-wrapper.properties`).
+
+There is a known issue with this dev environment causing the error `Caused by: java.io.IOException: The account being
+accessed does not support http. for 
+http://resources.download.minecraft.net/99/991b421dfd401f115241601b2b373140a8d78572`. As a workaround, you may need
+to manually copy assets from an existing minecraft jar.

gradle.properties

@@ -5,6 +5,6 @@ minecraft_version = 1.5.2
 yarn_mappings = 1.5.2+build.202201092137
 loader_version = 1.0.0
 
-mod_version = 1.4.1
+mod_version = 1.4.2
 maven_group = issame
 archives_base_name = tweaker

gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists

src/main/java/issame/tweaker/Config.java

@@ -17,7 +17,7 @@ public class Config {
     private static Map<String, Boolean> configBooleans = getDefaultBooleans();
 
     public static void loadConfig(Map<String, String> configProperties) {
-        configProperties.forEach(Config::putValue);
+        configProperties.forEach((k, v) -> putValue(k, v, false));
     }
 
     public static void resetConfig() {
@@ -26,6 +26,7 @@ public static void resetConfig() {
         configBooleans = getDefaultBooleans();
 
         loadConfig(tweaker.loadConfigProperties());
+        verifyConfig();
     }
 
     private static void verifyConfig() {
@@ -167,25 +168,27 @@ public static Boolean getBoolean(String key) {
 
     // === Putters ===
 
-    public static void putValue(String key, String value) {
+    public static void putValue(String key, String value, boolean validate) {
         if (configDoubles.containsKey(key)) {
-            putType(configDoubles, key, parseDouble(value));
+            putType(configDoubles, key, parseDouble(value), validate);
         } else if (configIntegers.containsKey(key)) {
-            putType(configIntegers, key, parseInteger(value));
+            putType(configIntegers, key, parseInteger(value), validate);
         } else if (configBooleans.containsKey(key)) {
-            putType(configBooleans, key, parseBoolean(value));
+            putType(configBooleans, key, parseBoolean(value), validate);
         } else {
             throw new CommandNotFoundException("Could not find command " + key);
         }
     }
 
-    private static <T> void putType(Map<String, T> configType, String key, T value) {
+    private static <T> void putType(Map<String, T> configType, String key, T value, boolean validate) {
         T prevValue = configType.put(key, value);
-        try {
-            verifyConfig();
-        } catch (CommandException e) {
-            configType.put(key, prevValue);
-            throw e;
+        if (validate) {
+            try {
+                verifyConfig();
+            } catch (CommandException e) {
+                configType.put(key, prevValue);
+                throw e;
+            }
         }
     }
 

src/main/java/issame/tweaker/TweakerCommand.java

@@ -53,7 +53,7 @@ private void processCommand(ICommandSender commandSender, String key) {
     }
 
     private void processCommand(ICommandSender commandSender, String key, String value) {
-        Config.putValue(key, value);
+        Config.putValue(key, value, true);
         notifyAdmins(commandSender, key + " set to " + value, key, value);
     }
 }