Merge pull request #40 from FTBTeam/1.19/dev

1.19/dev

Author: desht

.gitignore

@@ -21,4 +21,5 @@ logs
 # other
 eclipse
 run
-.vscode
+.vscode
+**/extra-mods-*/

CHANGELOG.md

@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+[1902.1.16]
+
+### Fixed
+* Correctly report errors and stop when a syntax error in ranks.snbt or players.snbt prevents the file from loading
+  * Don't tell the player it loaded OK then wipe the current runtime config...
+
 [1902.1.15]
 
 ### Added

common/src/main/java/dev/ftb/mods/ftbranks/impl/RankManagerImpl.java

@@ -364,6 +364,8 @@ public void reload() throws Exception {
 			if (tempRanks.isEmpty()) {
 				FTBRanks.LOGGER.warn("No ranks found!");
 			}
+		} else {
+			throw new RuntimeException("ranks.snbt failed to load! check your server log for errors");
 		}
 
 		SNBTCompoundTag playerFileTag = SNBT.read(playerFile);
@@ -401,6 +403,8 @@ public void reload() throws Exception {
 
 				tempPlayerData.put(data.uuid, data);
 			}
+		} else {
+			throw new RuntimeException("players.snbt failed to load! check your server log for errors");
 		}
 
 		ranks = new LinkedHashMap<>(tempRanks);

fabric/build.gradle

@@ -34,6 +34,8 @@ dependencies {
 	shadowCommon(project(path: ":common", configuration: "transformProductionFabric")) { transitive false }
 }
 
+apply from: "https://raw.githubusercontent.com/FTBTeam/mods-meta/main/gradle/extra-local-mods.gradle"
+
 processResources {
 	inputs.property "version", project.version
 

fabric/src/main/resources/fabric.mod.json

@@ -24,7 +24,6 @@
 		"ftblibrary": ">=1902.3.16-build.191"
 	},
 	"mixins": [
-		"ftbranks-common.mixins.json",
-		"ftbranks-fabric.mixins.json"
+		"ftbranks-common.mixins.json"
 	]
 }

fabric/src/main/resources/ftbranks-fabric.mixins.json

@@ -34,6 +34,8 @@ dependencies {
 	shadowCommon(project(path: ":common", configuration: "transformProductionForge")) { transitive false }
 }
 
+apply from: "https://raw.githubusercontent.com/FTBTeam/mods-meta/main/gradle/extra-local-mods.gradle"
+
 processResources {
 	exclude '.cache'
 

forge/build.gradle

@@ -3,7 +3,7 @@ org.gradle.daemon=false
 mod_id=ftbranks
 archives_base_name=ftb-ranks
 maven_group=dev.ftb.mods
-mod_version=1902.1.15
+mod_version=1902.1.16
 mod_author=FTB Team
 
 minecraft_version=1.19.2