Skip to content

1.20.1/dev #50

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.

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
Feb 20, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 5 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
name: Java CI - Build Release

on:
release:
types: [ published ]
push:
tags:
- 'v[0-9]+\.[0-9]+\.[0-9]+'
- 'v[0-9]+\.[0-9]+\.[0-9]+-[a-z]+'
- 'v[0-9]+\.[0-9]+\.[0-9]+-[a-z]+\.[0-9]+'

jobs:
build:
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@ 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).

[2001.1.4]

### Fixed
* Fixed the `rank_added` condition on ranks not being saved properly across server restarts

[1902.1.16]

### Fixed
Expand Down
3 changes: 2 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ plugins {
id "dev.architectury.loom" version "1.2-SNAPSHOT" apply false
}

apply from: 'https://raw.githubusercontent.com/FTBTeam/mods-meta/main/gradle/changelog.gradle'

architectury {
minecraft = rootProject.minecraft_version
}
Expand All @@ -24,7 +26,6 @@ allprojects {
apply plugin: "java"
apply plugin: "architectury-plugin"
apply plugin: "maven-publish"
apply from: "https://raw.githubusercontent.com/FTBTeam/mods-meta/main/gradle/git-md-changelog.gradle"

version = project.mod_version
group = project.maven_group
Expand Down
11 changes: 9 additions & 2 deletions common/src/main/java/dev/ftb/mods/ftbranks/FTBRanksCommands.java
Original file line number Diff line number Diff line change
Expand Up @@ -316,11 +316,18 @@ private static int showRank(CommandSourceStack source, String rankName) throws C

source.sendSuccess(() -> Component.literal("=".repeat(50)).withStyle(ChatFormatting.GREEN), false);

source.sendSuccess(() -> Component.literal(String.format("Rank ID: %s, Rank Name: %s, Power: %d", rank.getId(), rank.getName(), rank.getPower())).withStyle(ChatFormatting.YELLOW), false);
source.sendSuccess(() -> Component.literal("Rank ID: ").withStyle(ChatFormatting.YELLOW)
.append(Component.literal(rank.getId()).withStyle(ChatFormatting.WHITE))
.append(Component.literal(", Rank Name: ").withStyle(ChatFormatting.YELLOW))
.append(Component.literal(rank.getName()).withStyle(ChatFormatting.WHITE))
.append(Component.literal(", Power: ").withStyle(ChatFormatting.YELLOW))
.append(Component.literal(String.valueOf(rank.getPower())).withStyle(ChatFormatting.WHITE)),
true);

String condStr = rank.getCondition().asString();
Component c = condStr.isEmpty() ?
Component.literal("(none: players must be added)").withStyle(ChatFormatting.WHITE, ChatFormatting.ITALIC) : Component.literal(condStr);
Component.literal("(none: players must be added)").withStyle(ChatFormatting.WHITE, ChatFormatting.ITALIC) :
Component.literal(condStr).withStyle(ChatFormatting.WHITE);
source.sendSuccess(() -> Component.literal("Condition: ").append(c).withStyle(ChatFormatting.YELLOW), false);

source.sendSuccess(() -> Component.literal("Permission nodes:").withStyle(ChatFormatting.YELLOW), false);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,9 @@ public boolean isRankActive(ServerPlayer player) {
.map(rank -> rank != original && rank.isAdded(player))
.orElse(false);
}

@Override
public void save(SNBTCompoundTag tag) {
tag.putString("rank", id);
}
}
2 changes: 1 addition & 1 deletion fabric/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ if (ENV.CURSEFORGE_KEY) {
requiredDependency 'fabric-api'
requiredDependency 'ftb-library-fabric'
}
changelog = ENV.CHANGELOG // expected to exist if ENV.CURSEFORGE does
changelog = createChangelog(project)
changelogType = 'markdown'
}
}
Expand Down
2 changes: 1 addition & 1 deletion forge/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ if (ENV.CURSEFORGE_KEY) {
requiredDependency 'architectury-api'
requiredDependency 'ftb-library-forge'
}
changelog = ENV.CHANGELOG // expected to exist if ENV.CURSEFORGE does
changelog = createChangelog(project)
changelogType = 'markdown'
}
}
Expand Down
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ org.gradle.daemon=false
mod_id=ftbranks
archives_base_name=ftb-ranks
maven_group=dev.ftb.mods
mod_version=2001.1.3
mod_version=2001.1.4
mod_author=FTB Team

minecraft_version=1.20.1
architectury_version=9.0.8
fabric_loader_version=0.14.21
fabric_api_version=0.83.1+1.20.1
ftb_library_version=2001.1.2
forge_version=47.0.1
forge_version=47.3.33

curseforge_id_forge=314905
curseforge_id_fabric=472659
Expand Down