Skip to content

1.19/dev #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Oct 3, 2023
Merged

1.19/dev #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cffbb83
fix: when ranks.snbt or players.snbt fail to load, report properly
desht Apr 3, 2023
676d276
build: use extra-local-mods from mods-meta
desht Apr 3, 2023
5d0476b
build: version -> 1902.1.16, changelog updated
desht Apr 3, 2023
e0ada4a
chore: removed ftbranks-fabric.mixins.json
desht Apr 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,5 @@ logs
# other
eclipse
run
.vscode
.vscode
**/extra-mods-*/
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions common/src/main/java/dev/ftb/mods/ftbranks/impl/RankManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down
2 changes: 2 additions & 0 deletions fabric/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
3 changes: 1 addition & 2 deletions fabric/src/main/resources/fabric.mod.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
"ftblibrary": ">=1902.3.16-build.191"
},
"mixins": [
"ftbranks-common.mixins.json",
"ftbranks-fabric.mixins.json"
"ftbranks-common.mixins.json"
]
}
13 changes: 0 additions & 13 deletions fabric/src/main/resources/ftbranks-fabric.mixins.json
View file
Open in desktop

This file was deleted.

2 changes: 2 additions & 0 deletions forge/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'

Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down