[WIP] FTB Ranks/LuckPerms API's

This commit is contained in:
2024-11-25 17:24:45 +02:00
parent bd73d19674
commit b1c7a9de7f
136 changed files with 2420 additions and 820 deletions

View File

@@ -1,10 +1,11 @@
--- a/Common/build.gradle
+++ b/Common/build.gradle
@@ -1,7 +1,7 @@
@@ -1,8 +1,8 @@
archivesBaseName = "${mod_name.replace(" ", "")}-Common-${minecraft_version}"
dependencies {
- stupidRemapArch("dev.ftb.mods:ftb-essentials:${ftb_essentials}")
stupidRemapArch("dev.ftb.mods:ftb-ranks:${ftb_ranks}")
+
}

View File

@@ -0,0 +1,36 @@
--- a/Common/src/main/java/com/hypherionmc/craterlib/compat/ftbranks/FTBRanks.java
+++ b/Common/src/main/java/com/hypherionmc/craterlib/compat/ftbranks/FTBRanks.java
@@ -24,13 +24,13 @@
public List<BridgedRank> getPlayerRanks(BridgedGameProfile profile) {
List<BridgedRank> ranks = new ArrayList<>();
- FTBRanksAPI.manager().getAddedRanks(profile.toMojang()).forEach(rank -> ranks.add(BridgedRank.of(rank)));
+ FTBRanksAPI.INSTANCE.getManager().getAddedRanks(profile.toMojang()).forEach(rank -> ranks.add(BridgedRank.of(rank)));
return ranks;
}
public List<BridgedRank> getAllRanks() {
List<BridgedRank> ranks = new ArrayList<>();
- FTBRanksAPI.manager().getAllRanks().forEach(r -> ranks.add(BridgedRank.of(r)));
+ FTBRanksAPI.INSTANCE.getManager().getAllRanks().forEach(r -> ranks.add(BridgedRank.of(r)));
return ranks;
}
@@ -42,7 +42,7 @@
rank = rank.toLowerCase();
AtomicBoolean didAddRank = new AtomicBoolean(false);
- FTBRanksAPI.manager().getRank(rank).ifPresent(r -> {
+ FTBRanksAPI.INSTANCE.getManager().getRank(rank).ifPresent(r -> {
r.add(profile.toMojang());
didAddRank.set(true);
});
@@ -54,7 +54,7 @@
rank = rank.toLowerCase();
AtomicBoolean didRemoveRank = new AtomicBoolean(false);
- FTBRanksAPI.manager().getRank(rank).ifPresent(r -> {
+ FTBRanksAPI.INSTANCE.getManager().getRank(rank).ifPresent(r -> {
r.remove(profile.toMojang());
didRemoveRank.set(true);
});

View File

@@ -1,15 +1,16 @@
--- a/Fabric/build.gradle
+++ b/Fabric/build.gradle
@@ -9,8 +9,6 @@
@@ -9,9 +9,6 @@
exclude(group: "net.fabricmc.fabric-api")
}
- stupidRemapArch("dev.ftb.mods:ftb-essentials:${ftb_essentials}")
- stupidRemapArch("dev.ftb.mods:ftb-ranks:${ftb_ranks}")
-
modImplementation "maven.modrinth:fabrictailor:${fabrictailor}"
modImplementation "maven.modrinth:vanish:${vanish}"
@@ -115,8 +113,8 @@
@@ -116,8 +113,8 @@
setVersionType("release")
setChangelog(rootProject.file("changelog.md"))
setProjectVersion("${minecraft_version}-${project.version}")

View File

@@ -1,6 +1,6 @@
--- a/NeoForge/build.gradle
+++ /dev/null
@@ -1,122 +1,0 @@
@@ -1,123 +1,0 @@
-archivesBaseName = "${mod_name.replace(" ", "")}-NeoForge-${minecraft_version}"
-
-dependencies {
@@ -8,6 +8,7 @@
- modImplementation("maven.modrinth:vanishmod:${vanishmod_neo}")
-
- stupidRemapArch("dev.ftb.mods:ftb-essentials-neoforge:${ftb_essentials}")
- stupidRemapArch("dev.ftb.mods:ftb-ranks-neoforge:${ftb_ranks}")
-
- // Do not edit or remove
- implementation project(":Common")

View File

@@ -40,7 +40,7 @@
maven {
name = "Modrinth"
@@ -73,11 +66,13 @@
@@ -73,11 +66,14 @@
shade "me.hypherionmc.moon-config:toml:${moon_config}"
shade "me.hypherionmc.moon-config:json:${moon_config}"
shade "com.hypherionmc:rpcsdk:${rpc_sdk}"
@@ -51,11 +51,12 @@
shade "net.kyori:adventure-text-minimessage:${adventure}"
+ stupidRemapArch("dev.ftb.mods:ftb-essentials:${ftb_essentials}")
+ stupidRemapArch("dev.ftb.mods:ftb-ranks:${ftb_ranks}")
+
compileOnly 'net.luckperms:api:5.4'
compileOnly("org.projectlombok:lombok:${lombok}")
annotationProcessor("org.projectlombok:lombok:${lombok}")
@@ -124,7 +119,7 @@
@@ -124,7 +120,7 @@
tasks.withType(JavaCompile).configureEach {
it.options.encoding = 'UTF-8'

View File

@@ -23,7 +23,7 @@
# Dependencies
moon_config=1.0.10
@@ -31,17 +28,16 @@
@@ -31,18 +28,17 @@
discord_formatter=2.0.0
# Mod Dependencies
@@ -33,6 +33,8 @@
-vanishmod=1.1.12.1
-vanishmod_neo=puxrKAMr
-ftb_essentials=2101.1.0
-ftb_ranks=2101.1.1
+ftb_ranks=1802.1.11-build.71
+ftb_essentials=1802.2.2-build.83
+fabrictailor=1.9.0+1.18.2
+vanish=1.1.0

View File

@@ -0,0 +1,36 @@
--- a/Common/src/main/java/com/hypherionmc/craterlib/compat/ftbranks/FTBRanks.java
+++ b/Common/src/main/java/com/hypherionmc/craterlib/compat/ftbranks/FTBRanks.java
@@ -24,13 +24,13 @@
public List<BridgedRank> getPlayerRanks(BridgedGameProfile profile) {
List<BridgedRank> ranks = new ArrayList<>();
- FTBRanksAPI.manager().getAddedRanks(profile.toMojang()).forEach(rank -> ranks.add(BridgedRank.of(rank)));
+ FTBRanksAPI.INSTANCE.getManager().getAddedRanks(profile.toMojang()).forEach(rank -> ranks.add(BridgedRank.of(rank)));
return ranks;
}
public List<BridgedRank> getAllRanks() {
List<BridgedRank> ranks = new ArrayList<>();
- FTBRanksAPI.manager().getAllRanks().forEach(r -> ranks.add(BridgedRank.of(r)));
+ FTBRanksAPI.INSTANCE.getManager().getAllRanks().forEach(r -> ranks.add(BridgedRank.of(r)));
return ranks;
}
@@ -42,7 +42,7 @@
rank = rank.toLowerCase();
AtomicBoolean didAddRank = new AtomicBoolean(false);
- FTBRanksAPI.manager().getRank(rank).ifPresent(r -> {
+ FTBRanksAPI.INSTANCE.getManager().getRank(rank).ifPresent(r -> {
r.add(profile.toMojang());
didAddRank.set(true);
});
@@ -54,7 +54,7 @@
rank = rank.toLowerCase();
AtomicBoolean didRemoveRank = new AtomicBoolean(false);
- FTBRanksAPI.manager().getRank(rank).ifPresent(r -> {
+ FTBRanksAPI.INSTANCE.getManager().getRank(rank).ifPresent(r -> {
r.remove(profile.toMojang());
didRemoveRank.set(true);
});

View File

@@ -1,14 +1,14 @@
--- a/Fabric/build.gradle
+++ b/Fabric/build.gradle
@@ -10,7 +10,6 @@
}
@@ -11,7 +11,6 @@
stupidRemapArch("dev.ftb.mods:ftb-essentials:${ftb_essentials}")
stupidRemapArch("dev.ftb.mods:ftb-ranks:${ftb_ranks}")
-
modImplementation "maven.modrinth:fabrictailor:${fabrictailor}"
modImplementation "maven.modrinth:vanish:${vanish}"
@@ -115,8 +114,8 @@
@@ -116,8 +115,8 @@
setVersionType("release")
setChangelog(rootProject.file("changelog.md"))
setProjectVersion("${minecraft_version}-${project.version}")

View File

@@ -1,17 +1,18 @@
--- a/Forge/build.gradle
+++ b/Forge/build.gradle
@@ -3,8 +3,9 @@
@@ -3,7 +3,10 @@
dependencies {
// Compat
- // NOT AVAILABLE ON FORGE modImplementation("maven.modrinth:vanishmod:${vanishmod}")
+ modImplementation("maven.modrinth:vanishmod:${vanishmod}")
+
+ stupidRemapArch("dev.ftb.mods:ftb-essentials-forge:${ftb_essentials}")
+ stupidRemapArch("dev.ftb.mods:ftb-ranks-forge:${ftb_ranks}")
// Do not edit or remove
implementation project(":Common")
}
@@ -107,8 +108,8 @@
@@ -107,8 +110,8 @@
setVersionType("release")
setChangelog(rootProject.file("changelog.md"))
setProjectVersion("${minecraft_version}-${project.version}")

View File

@@ -1,6 +1,6 @@
--- a/NeoForge/build.gradle
+++ /dev/null
@@ -1,122 +1,0 @@
@@ -1,123 +1,0 @@
-archivesBaseName = "${mod_name.replace(" ", "")}-NeoForge-${minecraft_version}"
-
-dependencies {
@@ -8,6 +8,7 @@
- modImplementation("maven.modrinth:vanishmod:${vanishmod_neo}")
-
- stupidRemapArch("dev.ftb.mods:ftb-essentials-neoforge:${ftb_essentials}")
- stupidRemapArch("dev.ftb.mods:ftb-ranks-neoforge:${ftb_ranks}")
-
- // Do not edit or remove
- implementation project(":Common")

View File

@@ -23,7 +23,7 @@
# Dependencies
moon_config=1.0.10
@@ -31,17 +28,16 @@
@@ -31,18 +28,17 @@
discord_formatter=2.0.0
# Mod Dependencies
@@ -33,6 +33,8 @@
-vanishmod=1.1.12.1
-vanishmod_neo=puxrKAMr
-ftb_essentials=2101.1.0
-ftb_ranks=2101.1.1
+ftb_ranks=1902.1.16-build.114
+ftb_essentials=1902.3.5-build.135
+fabrictailor=2.0.1
+vanish=1.3.2

View File

@@ -1,14 +1,14 @@
--- a/Fabric/build.gradle
+++ b/Fabric/build.gradle
@@ -10,7 +10,6 @@
}
@@ -11,7 +11,6 @@
stupidRemapArch("dev.ftb.mods:ftb-essentials:${ftb_essentials}")
stupidRemapArch("dev.ftb.mods:ftb-ranks:${ftb_ranks}")
-
modImplementation "maven.modrinth:fabrictailor:${fabrictailor}"
modImplementation "maven.modrinth:vanish:${vanish}"
@@ -115,8 +114,8 @@
@@ -116,8 +115,8 @@
setVersionType("release")
setChangelog(rootProject.file("changelog.md"))
setProjectVersion("${minecraft_version}-${project.version}")

View File

@@ -1,6 +1,6 @@
--- a/Forge/build.gradle
+++ b/Forge/build.gradle
@@ -3,7 +3,9 @@
@@ -3,7 +3,10 @@
dependencies {
// Compat
@@ -8,10 +8,11 @@
+ modImplementation("maven.modrinth:vanishmod:${vanishmod}")
+
+ stupidRemapArch("dev.ftb.mods:ftb-essentials-forge:${ftb_essentials}")
+ stupidRemapArch("dev.ftb.mods:ftb-ranks-forge:${ftb_ranks}")
// Do not edit or remove
implementation project(":Common")
@@ -107,8 +109,8 @@
@@ -107,8 +110,8 @@
setVersionType("release")
setChangelog(rootProject.file("changelog.md"))
setProjectVersion("${minecraft_version}-${project.version}")

View File

@@ -1,6 +1,6 @@
--- a/NeoForge/build.gradle
+++ /dev/null
@@ -1,122 +1,0 @@
@@ -1,123 +1,0 @@
-archivesBaseName = "${mod_name.replace(" ", "")}-NeoForge-${minecraft_version}"
-
-dependencies {
@@ -8,6 +8,7 @@
- modImplementation("maven.modrinth:vanishmod:${vanishmod_neo}")
-
- stupidRemapArch("dev.ftb.mods:ftb-essentials-neoforge:${ftb_essentials}")
- stupidRemapArch("dev.ftb.mods:ftb-ranks-neoforge:${ftb_ranks}")
-
- // Do not edit or remove
- implementation project(":Common")

View File

@@ -23,7 +23,7 @@
# Dependencies
moon_config=1.0.10
@@ -31,17 +28,16 @@
@@ -31,18 +28,17 @@
discord_formatter=2.0.0
# Mod Dependencies
@@ -33,6 +33,8 @@
-vanishmod=1.1.12.1
-vanishmod_neo=puxrKAMr
-ftb_essentials=2101.1.0
-ftb_ranks=2101.1.1
+ftb_ranks=1904.1.1-build.82
+ftb_essentials=1904.1.0-build.81-SNAPSHOT
+fabrictailor=2.0.2
+vanish=1.4.0+1.19.3

View File

@@ -1,14 +1,14 @@
--- a/Fabric/build.gradle
+++ b/Fabric/build.gradle
@@ -10,7 +10,6 @@
}
@@ -11,7 +11,6 @@
stupidRemapArch("dev.ftb.mods:ftb-essentials:${ftb_essentials}")
stupidRemapArch("dev.ftb.mods:ftb-ranks:${ftb_ranks}")
-
modImplementation "maven.modrinth:fabrictailor:${fabrictailor}"
modImplementation "maven.modrinth:vanish:${vanish}"
@@ -115,8 +114,8 @@
@@ -116,8 +115,8 @@
setVersionType("release")
setChangelog(rootProject.file("changelog.md"))
setProjectVersion("${minecraft_version}-${project.version}")

View File

@@ -1,6 +1,6 @@
--- a/Forge/build.gradle
+++ b/Forge/build.gradle
@@ -3,7 +3,9 @@
@@ -3,7 +3,10 @@
dependencies {
// Compat
@@ -8,10 +8,11 @@
+ modImplementation("maven.modrinth:vanishmod:${vanishmod}")
+
+ stupidRemapArch("dev.ftb.mods:ftb-essentials-forge:${ftb_essentials}")
+ stupidRemapArch("dev.ftb.mods:ftb-ranks-forge:${ftb_ranks}")
// Do not edit or remove
implementation project(":Common")
@@ -107,8 +109,8 @@
@@ -107,8 +110,8 @@
setVersionType("release")
setChangelog(rootProject.file("changelog.md"))
setProjectVersion("${minecraft_version}-${project.version}")

View File

@@ -1,6 +1,6 @@
--- a/NeoForge/build.gradle
+++ /dev/null
@@ -1,122 +1,0 @@
@@ -1,123 +1,0 @@
-archivesBaseName = "${mod_name.replace(" ", "")}-NeoForge-${minecraft_version}"
-
-dependencies {
@@ -8,6 +8,7 @@
- modImplementation("maven.modrinth:vanishmod:${vanishmod_neo}")
-
- stupidRemapArch("dev.ftb.mods:ftb-essentials-neoforge:${ftb_essentials}")
- stupidRemapArch("dev.ftb.mods:ftb-ranks-neoforge:${ftb_ranks}")
-
- // Do not edit or remove
- implementation project(":Common")

View File

@@ -23,7 +23,7 @@
# Dependencies
moon_config=1.0.10
@@ -31,17 +28,16 @@
@@ -31,18 +28,17 @@
discord_formatter=2.0.0
# Mod Dependencies
@@ -33,6 +33,8 @@
-vanishmod=1.1.12.1
-vanishmod_neo=puxrKAMr
-ftb_essentials=2101.1.0
-ftb_ranks=2101.1.1
+ftb_ranks=2001.1.3
+ftb_essentials=2001.2.2
+fabrictailor=2.2.1
+vanish=1.5.0+1.20.2

View File

@@ -1,6 +1,6 @@
--- a/Fabric/build.gradle
+++ b/Fabric/build.gradle
@@ -115,8 +115,8 @@
@@ -116,8 +116,8 @@
setVersionType("release")
setChangelog(rootProject.file("changelog.md"))
setProjectVersion("${minecraft_version}-${project.version}")

View File

@@ -1,6 +1,6 @@
--- a/Forge/build.gradle
+++ b/Forge/build.gradle
@@ -3,7 +3,9 @@
@@ -3,7 +3,10 @@
dependencies {
// Compat
@@ -8,10 +8,11 @@
+ modImplementation("maven.modrinth:vanishmod:${vanishmod}")
+
+ stupidRemapArch("dev.ftb.mods:ftb-essentials-forge:${ftb_essentials}")
+ stupidRemapArch("dev.ftb.mods:ftb-ranks-forge:${ftb_ranks}")
// Do not edit or remove
implementation project(":Common")
@@ -107,8 +109,8 @@
@@ -107,8 +110,8 @@
setVersionType("release")
setChangelog(rootProject.file("changelog.md"))
setProjectVersion("${minecraft_version}-${project.version}")

View File

@@ -1,6 +1,6 @@
--- a/NeoForge/build.gradle
+++ b/NeoForge/build.gradle
@@ -34,12 +34,7 @@
@@ -35,12 +35,7 @@
unimined.minecraft {
neoForged {
@@ -14,7 +14,7 @@
mixinConfig("${mod_id}.mixins.json", "${mod_id}.neoforge.mixins.json")
}
}
@@ -58,7 +53,7 @@
@@ -59,7 +54,7 @@
from project(":Common").sourceSets.main.resources
def buildProps = project.properties.clone()
@@ -23,7 +23,7 @@
expand buildProps
}
}
@@ -113,8 +108,8 @@
@@ -114,8 +109,8 @@
setVersionType("release")
setChangelog(rootProject.file("changelog.md"))
setProjectVersion("${minecraft_version}-${project.version}")

View File

@@ -24,7 +24,7 @@
# Dependencies
moon_config=1.0.10
@@ -32,16 +32,16 @@
@@ -32,17 +32,17 @@
# Mod Dependencies
fabrictailor=2.3.1
@@ -36,6 +36,8 @@
+vanishmod=1.1.15
vanishmod_neo=puxrKAMr
-ftb_essentials=2101.1.0
-ftb_ranks=2101.1.1
+ftb_ranks=2004.2.0
+ftb_essentials=2004.1.3
# Publishing

View File

@@ -1,14 +1,14 @@
--- a/Fabric/build.gradle
+++ b/Fabric/build.gradle
@@ -10,7 +10,6 @@
}
@@ -11,7 +11,6 @@
stupidRemapArch("dev.ftb.mods:ftb-essentials:${ftb_essentials}")
stupidRemapArch("dev.ftb.mods:ftb-ranks:${ftb_ranks}")
-
modImplementation "maven.modrinth:fabrictailor:${fabrictailor}"
modImplementation "maven.modrinth:vanish:${vanish}"
@@ -115,8 +114,8 @@
@@ -116,8 +115,8 @@
setVersionType("release")
setChangelog(rootProject.file("changelog.md"))
setProjectVersion("${minecraft_version}-${project.version}")

View File

@@ -1,6 +1,6 @@
--- a/Forge/build.gradle
+++ b/Forge/build.gradle
@@ -3,7 +3,9 @@
@@ -3,7 +3,10 @@
dependencies {
// Compat
@@ -8,10 +8,11 @@
+ modImplementation("maven.modrinth:vanishmod:${vanishmod}")
+
+ stupidRemapArch("dev.ftb.mods:ftb-essentials-forge:${ftb_essentials}")
+ stupidRemapArch("dev.ftb.mods:ftb-ranks-forge:${ftb_ranks}")
// Do not edit or remove
implementation project(":Common")
@@ -107,8 +109,8 @@
@@ -107,8 +110,8 @@
setVersionType("release")
setChangelog(rootProject.file("changelog.md"))
setProjectVersion("${minecraft_version}-${project.version}")

View File

@@ -1,6 +1,6 @@
--- a/NeoForge/build.gradle
+++ /dev/null
@@ -1,122 +1,0 @@
@@ -1,123 +1,0 @@
-archivesBaseName = "${mod_name.replace(" ", "")}-NeoForge-${minecraft_version}"
-
-dependencies {
@@ -8,6 +8,7 @@
- modImplementation("maven.modrinth:vanishmod:${vanishmod_neo}")
-
- stupidRemapArch("dev.ftb.mods:ftb-essentials-neoforge:${ftb_essentials}")
- stupidRemapArch("dev.ftb.mods:ftb-ranks-neoforge:${ftb_ranks}")
-
- // Do not edit or remove
- implementation project(":Common")

View File

@@ -23,7 +23,7 @@
# Dependencies
moon_config=1.0.10
@@ -31,17 +28,16 @@
@@ -31,18 +28,17 @@
discord_formatter=2.0.0
# Mod Dependencies
@@ -33,6 +33,8 @@
-vanishmod=1.1.12.1
-vanishmod_neo=puxrKAMr
-ftb_essentials=2101.1.0
-ftb_ranks=2101.1.1
+ftb_ranks=2001.1.3
+ftb_essentials=2001.2.2
+fabrictailor=2.2.1
+vanish=1.5.4+1.20.1

View File

@@ -1,6 +1,6 @@
--- a/NeoForge/build.gradle
+++ b/NeoForge/build.gradle
@@ -34,12 +34,7 @@
@@ -35,12 +35,7 @@
unimined.minecraft {
neoForged {

View File

@@ -1,6 +1,6 @@
--- a/gradle.properties
+++ b/gradle.properties
@@ -41,7 +41,7 @@
@@ -42,7 +42,7 @@
# Publishing
curse_id=867099
modrinth_id=Nn8Wasaq

View File

@@ -1,6 +1,6 @@
--- a/Fabric/build.gradle
+++ b/Fabric/build.gradle
@@ -115,8 +115,8 @@
@@ -116,8 +116,8 @@
setVersionType("release")
setChangelog(rootProject.file("changelog.md"))
setProjectVersion("${minecraft_version}-${project.version}")

View File

@@ -1,6 +1,6 @@
--- a/NeoForge/build.gradle
+++ b/NeoForge/build.gradle
@@ -34,12 +34,7 @@
@@ -35,12 +35,7 @@
unimined.minecraft {
neoForged {
@@ -14,7 +14,7 @@
mixinConfig("${mod_id}.mixins.json", "${mod_id}.neoforge.mixins.json")
}
}
@@ -113,8 +108,8 @@
@@ -114,8 +109,8 @@
setVersionType("release")
setChangelog(rootProject.file("changelog.md"))
setProjectVersion("${minecraft_version}-${project.version}")

View File

@@ -16,7 +16,7 @@
# Forge
forge_version=50.0.6
@@ -41,7 +41,7 @@
@@ -42,7 +42,7 @@
# Publishing
curse_id=867099
modrinth_id=Nn8Wasaq