[DEV] FTB Essentials Muting System Compat

This commit is contained in:
2024-10-09 09:04:27 +02:00
parent 6bf3af4bea
commit e3a9df65b7
76 changed files with 535 additions and 50 deletions

View File

@@ -0,0 +1,16 @@
package com.hypherionmc.craterlib.compat;
import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer;
import dev.ftb.mods.ftbessentials.util.FTBEPlayerData;
import java.util.Optional;
public class FTBEssentials {
public static boolean isPlayerMuted(BridgedPlayer player) {
FTBEPlayerData data = FTBEPlayerData.get(player.toMojang());
return data != null && data.muted;
}
}

View File

@@ -1,7 +1,7 @@
plugins { plugins {
id 'java' id 'java'
id 'com.github.johnrengelman.shadow' version '8.1.1' apply false id 'com.github.johnrengelman.shadow' version '8.1.1' apply false
id "xyz.wagyourtail.unimined" version "1.2.4" apply false id "xyz.wagyourtail.unimined" version "1.3.9" apply false
id "com.hypherionmc.modutils.modpublisher" version "2.1.6" id "com.hypherionmc.modutils.modpublisher" version "2.1.6"
id "com.hypherionmc.modutils.orion" version "1.0.+" id "com.hypherionmc.modutils.orion" version "1.0.+"
id 'maven-publish' id 'maven-publish'
@@ -49,8 +49,10 @@ subprojects {
configurations { configurations {
shade shade
modCompileOnly modCompileOnly
stupidRemapArch
implementation.extendsFrom shade implementation.extendsFrom shade
compileOnly.extendsFrom modCompileOnly compileOnly.extendsFrom modCompileOnly
compileOnly.extendsFrom stupidRemapArch
} }
dependencies { dependencies {
@@ -64,6 +66,8 @@ subprojects {
shade "net.kyori:adventure-text-serializer-gson:${adventure}" shade "net.kyori:adventure-text-serializer-gson:${adventure}"
shade "net.kyori:adventure-text-minimessage:${adventure}" shade "net.kyori:adventure-text-minimessage:${adventure}"
stupidRemapArch("dev.ftb.mods:ftb-essentials:${ftb_essentials}")
compileOnly 'net.luckperms:api:5.4' compileOnly 'net.luckperms:api:5.4'
compileOnly("org.projectlombok:lombok:${lombok}") compileOnly("org.projectlombok:lombok:${lombok}")
annotationProcessor("org.projectlombok:lombok:${lombok}") annotationProcessor("org.projectlombok:lombok:${lombok}")
@@ -98,6 +102,12 @@ subprojects {
mojmap() mojmap()
devNamespace "mojmap" devNamespace "mojmap"
} }
mods {
remap(configurations.stupidRemapArch) {
catchAWNamespaceAssertion()
}
}
} }
tasks.withType(JavaCompile).configureEach { tasks.withType(JavaCompile).configureEach {

View File

@@ -28,6 +28,7 @@ rpc_sdk=1.0
discord_formatter=2.0.0 discord_formatter=2.0.0
# Mod Dependencies # Mod Dependencies
ftb_essentials=1802.2.2-build.83
fabrictailor=1.9.0+1.18.2 fabrictailor=1.9.0+1.18.2
vanish=1.1.0 vanish=1.1.0
mod_menu_version=3.2.5 mod_menu_version=3.2.5

View File

@@ -1,7 +1,7 @@
archivesBaseName = "${mod_name.replace(" ", "")}-Common-${minecraft_version}" archivesBaseName = "${mod_name.replace(" ", "")}-Common-${minecraft_version}"
dependencies { dependencies {
stupidRemapArch("dev.ftb.mods:ftb-essentials:${ftb_essentials}")
} }
shadowJar { shadowJar {

View File

@@ -0,0 +1,16 @@
package com.hypherionmc.craterlib.compat;
import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer;
import dev.ftb.mods.ftbessentials.util.FTBEPlayerData;
import java.util.Optional;
public class FTBEssentials {
public static boolean isPlayerMuted(BridgedPlayer player) {
FTBEPlayerData data = FTBEPlayerData.get(player.toMojang());
return data != null && data.muted;
}
}

View File

@@ -9,6 +9,7 @@ dependencies {
exclude(group: "net.fabricmc.fabric-api") exclude(group: "net.fabricmc.fabric-api")
} }
stupidRemapArch("dev.ftb.mods:ftb-essentials:${ftb_essentials}")
modImplementation "maven.modrinth:fabrictailor:${fabrictailor}" modImplementation "maven.modrinth:fabrictailor:${fabrictailor}"
modImplementation "maven.modrinth:vanish:${vanish}" modImplementation "maven.modrinth:vanish:${vanish}"

View File

@@ -5,6 +5,7 @@ dependencies {
// Compat // Compat
modImplementation("maven.modrinth:vanishmod:${vanishmod}") modImplementation("maven.modrinth:vanishmod:${vanishmod}")
stupidRemapArch("dev.ftb.mods:ftb-essentials-forge:${ftb_essentials}")
// Do not edit or remove // Do not edit or remove
implementation project(":Common") implementation project(":Common")
} }

View File

@@ -1,7 +1,7 @@
plugins { plugins {
id 'java' id 'java'
id 'com.github.johnrengelman.shadow' version '8.1.1' apply false id 'com.github.johnrengelman.shadow' version '8.1.1' apply false
id "xyz.wagyourtail.unimined" version "1.2.4" apply false id "xyz.wagyourtail.unimined" version "1.3.9" apply false
id "com.hypherionmc.modutils.modpublisher" version "2.1.6" id "com.hypherionmc.modutils.modpublisher" version "2.1.6"
id "com.hypherionmc.modutils.orion" version "1.0.+" id "com.hypherionmc.modutils.orion" version "1.0.+"
id 'maven-publish' id 'maven-publish'
@@ -49,8 +49,10 @@ subprojects {
configurations { configurations {
shade shade
modCompileOnly modCompileOnly
stupidRemapArch
implementation.extendsFrom shade implementation.extendsFrom shade
compileOnly.extendsFrom modCompileOnly compileOnly.extendsFrom modCompileOnly
compileOnly.extendsFrom stupidRemapArch
} }
dependencies { dependencies {
@@ -98,6 +100,12 @@ subprojects {
mojmap() mojmap()
devNamespace "mojmap" devNamespace "mojmap"
} }
mods {
remap(configurations.stupidRemapArch) {
catchAWNamespaceAssertion()
}
}
} }
tasks.withType(JavaCompile).configureEach { tasks.withType(JavaCompile).configureEach {

View File

@@ -18,7 +18,7 @@ fabric_loader=0.15.11
fabric_api=0.76.0+1.19.2 fabric_api=0.76.0+1.19.2
# Forge # Forge
forge_version=43.2.0 forge_version=43.4.0
# Dependencies # Dependencies
moon_config=1.0.9 moon_config=1.0.9
@@ -28,6 +28,7 @@ rpc_sdk=1.0
discord_formatter=2.0.0 discord_formatter=2.0.0
# Mod Dependencies # Mod Dependencies
ftb_essentials=1902.3.5-build.135
fabrictailor=2.0.1 fabrictailor=2.0.1
vanish=1.3.2 vanish=1.3.2
mod_menu_version=4.2.0-beta.2 mod_menu_version=4.2.0-beta.2

View File

@@ -1,7 +1,7 @@
archivesBaseName = "${mod_name.replace(" ", "")}-Common-${minecraft_version}" archivesBaseName = "${mod_name.replace(" ", "")}-Common-${minecraft_version}"
dependencies { dependencies {
stupidRemapArch("dev.ftb.mods:ftb-essentials:${ftb_essentials}")
} }
shadowJar { shadowJar {

View File

@@ -0,0 +1,16 @@
package com.hypherionmc.craterlib.compat;
import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer;
import dev.ftb.mods.ftbessentials.util.FTBEPlayerData;
import java.util.Optional;
public class FTBEssentials {
public static boolean isPlayerMuted(BridgedPlayer player) {
Optional<FTBEPlayerData> data = FTBEPlayerData.getOrCreate(player.toMojang());
return data.map(FTBEPlayerData::isMuted).orElse(false);
}
}

View File

@@ -9,6 +9,7 @@ dependencies {
exclude(group: "net.fabricmc.fabric-api") exclude(group: "net.fabricmc.fabric-api")
} }
stupidRemapArch("dev.ftb.mods:ftb-essentials:${ftb_essentials}")
modImplementation "maven.modrinth:fabrictailor:${fabrictailor}" modImplementation "maven.modrinth:fabrictailor:${fabrictailor}"
modImplementation "maven.modrinth:vanish:${vanish}" modImplementation "maven.modrinth:vanish:${vanish}"

View File

@@ -5,6 +5,8 @@ dependencies {
// Compat // Compat
modImplementation("maven.modrinth:vanishmod:${vanishmod}") modImplementation("maven.modrinth:vanishmod:${vanishmod}")
stupidRemapArch("dev.ftb.mods:ftb-essentials-forge:${ftb_essentials}")
// Do not edit or remove // Do not edit or remove
implementation project(":Common") implementation project(":Common")
} }

View File

@@ -1,7 +1,7 @@
plugins { plugins {
id 'java' id 'java'
id 'com.github.johnrengelman.shadow' version '8.1.1' apply false id 'com.github.johnrengelman.shadow' version '8.1.1' apply false
id "xyz.wagyourtail.unimined" version "1.2.4" apply false id "xyz.wagyourtail.unimined" version "1.3.9" apply false
id "com.hypherionmc.modutils.modpublisher" version "2.1.6" id "com.hypherionmc.modutils.modpublisher" version "2.1.6"
id "com.hypherionmc.modutils.orion" version "1.0.+" id "com.hypherionmc.modutils.orion" version "1.0.+"
id 'maven-publish' id 'maven-publish'
@@ -49,8 +49,10 @@ subprojects {
configurations { configurations {
shade shade
modCompileOnly modCompileOnly
stupidRemapArch
implementation.extendsFrom shade implementation.extendsFrom shade
compileOnly.extendsFrom modCompileOnly compileOnly.extendsFrom modCompileOnly
compileOnly.extendsFrom stupidRemapArch
} }
dependencies { dependencies {
@@ -98,6 +100,12 @@ subprojects {
mojmap() mojmap()
devNamespace "mojmap" devNamespace "mojmap"
} }
mods {
remap(configurations.stupidRemapArch) {
catchAWNamespaceAssertion()
}
}
} }
tasks.withType(JavaCompile).configureEach { tasks.withType(JavaCompile).configureEach {

View File

@@ -28,6 +28,7 @@ rpc_sdk=1.0
discord_formatter=2.0.0 discord_formatter=2.0.0
# Mod Dependencies # Mod Dependencies
ftb_essentials=1904.1.0-build.81-SNAPSHOT
fabrictailor=2.0.2 fabrictailor=2.0.2
vanish=1.4.0+1.19.3 vanish=1.4.0+1.19.3
mod_menu_version=5.1.0-beta.4 mod_menu_version=5.1.0-beta.4

View File

@@ -1,7 +1,7 @@
archivesBaseName = "${mod_name.replace(" ", "")}-Common-${minecraft_version}" archivesBaseName = "${mod_name.replace(" ", "")}-Common-${minecraft_version}"
dependencies { dependencies {
stupidRemapArch("dev.ftb.mods:ftb-essentials:${ftb_essentials}")
} }
shadowJar { shadowJar {

View File

@@ -0,0 +1,16 @@
package com.hypherionmc.craterlib.compat;
import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer;
import dev.ftb.mods.ftbessentials.util.FTBEPlayerData;
import java.util.Optional;
public class FTBEssentials {
public static boolean isPlayerMuted(BridgedPlayer player) {
Optional<FTBEPlayerData> data = FTBEPlayerData.getOrCreate(player.toMojang());
return data.map(FTBEPlayerData::isMuted).orElse(false);
}
}

View File

@@ -9,6 +9,7 @@ dependencies {
exclude(group: "net.fabricmc.fabric-api") exclude(group: "net.fabricmc.fabric-api")
} }
stupidRemapArch("dev.ftb.mods:ftb-essentials:${ftb_essentials}")
modImplementation "maven.modrinth:fabrictailor:${fabrictailor}" modImplementation "maven.modrinth:fabrictailor:${fabrictailor}"
modImplementation "maven.modrinth:vanish:${vanish}" modImplementation "maven.modrinth:vanish:${vanish}"

View File

@@ -5,6 +5,8 @@ dependencies {
// Compat // Compat
modImplementation("maven.modrinth:vanishmod:${vanishmod}") modImplementation("maven.modrinth:vanishmod:${vanishmod}")
stupidRemapArch("dev.ftb.mods:ftb-essentials-forge:${ftb_essentials}")
// Do not edit or remove // Do not edit or remove
implementation project(":Common") implementation project(":Common")
} }

View File

@@ -1,7 +1,7 @@
plugins { plugins {
id 'java' id 'java'
id 'com.github.johnrengelman.shadow' version '8.1.1' apply false id 'com.github.johnrengelman.shadow' version '8.1.1' apply false
id "xyz.wagyourtail.unimined" version "1.2.4" apply false id "xyz.wagyourtail.unimined" version "1.3.9" apply false
id "com.hypherionmc.modutils.modpublisher" version "2.1.6" id "com.hypherionmc.modutils.modpublisher" version "2.1.6"
id "com.hypherionmc.modutils.orion" version "1.0.+" id "com.hypherionmc.modutils.orion" version "1.0.+"
id 'maven-publish' id 'maven-publish'
@@ -49,8 +49,10 @@ subprojects {
configurations { configurations {
shade shade
modCompileOnly modCompileOnly
stupidRemapArch
implementation.extendsFrom shade implementation.extendsFrom shade
compileOnly.extendsFrom modCompileOnly compileOnly.extendsFrom modCompileOnly
compileOnly.extendsFrom stupidRemapArch
} }
dependencies { dependencies {
@@ -98,6 +100,12 @@ subprojects {
mojmap() mojmap()
devNamespace "mojmap" devNamespace "mojmap"
} }
mods {
remap(configurations.stupidRemapArch) {
catchAWNamespaceAssertion()
}
}
} }
tasks.withType(JavaCompile).configureEach { tasks.withType(JavaCompile).configureEach {

View File

@@ -28,6 +28,7 @@ rpc_sdk=1.0
discord_formatter=2.0.0 discord_formatter=2.0.0
# Mod Dependencies # Mod Dependencies
ftb_essentials=2001.2.2
fabrictailor=2.2.1 fabrictailor=2.2.1
vanish=1.5.0+1.20.2 vanish=1.5.0+1.20.2
mod_menu_version=8.0.1 mod_menu_version=8.0.1

View File

@@ -1,7 +1,7 @@
archivesBaseName = "${mod_name.replace(" ", "")}-Common-${minecraft_version}" archivesBaseName = "${mod_name.replace(" ", "")}-Common-${minecraft_version}"
dependencies { dependencies {
stupidRemapArch("dev.ftb.mods:ftb-essentials:${ftb_essentials}")
} }
shadowJar { shadowJar {

View File

@@ -0,0 +1,16 @@
package com.hypherionmc.craterlib.compat;
import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer;
import dev.ftb.mods.ftbessentials.util.FTBEPlayerData;
import java.util.Optional;
public class FTBEssentials {
public static boolean isPlayerMuted(BridgedPlayer player) {
Optional<FTBEPlayerData> data = FTBEPlayerData.getOrCreate(player.toMojang());
return data.map(FTBEPlayerData::isMuted).orElse(false);
}
}

View File

@@ -9,6 +9,8 @@ dependencies {
exclude(group: "net.fabricmc.fabric-api") exclude(group: "net.fabricmc.fabric-api")
} }
stupidRemapArch("dev.ftb.mods:ftb-essentials:${ftb_essentials}")
modImplementation "maven.modrinth:fabrictailor:${fabrictailor}" modImplementation "maven.modrinth:fabrictailor:${fabrictailor}"
modImplementation "maven.modrinth:vanish:${vanish}" modImplementation "maven.modrinth:vanish:${vanish}"

View File

@@ -5,6 +5,8 @@ dependencies {
// Compat // Compat
modImplementation("maven.modrinth:vanishmod:${vanishmod}") modImplementation("maven.modrinth:vanishmod:${vanishmod}")
stupidRemapArch("dev.ftb.mods:ftb-essentials-forge:${ftb_essentials}")
// Do not edit or remove // Do not edit or remove
implementation project(":Common") implementation project(":Common")
} }

View File

@@ -4,6 +4,8 @@ dependencies {
// Compat // Compat
modImplementation("maven.modrinth:vanishmod:${vanishmod_neo}") modImplementation("maven.modrinth:vanishmod:${vanishmod_neo}")
stupidRemapArch("dev.ftb.mods:ftb-essentials-neoforge:${ftb_essentials}")
// Do not edit or remove // Do not edit or remove
implementation project(":Common") implementation project(":Common")
} }

View File

@@ -1,7 +1,7 @@
plugins { plugins {
id 'java' id 'java'
id 'com.github.johnrengelman.shadow' version '8.1.1' apply false id 'com.github.johnrengelman.shadow' version '8.1.1' apply false
id "xyz.wagyourtail.unimined" version "1.2.4" apply false id "xyz.wagyourtail.unimined" version "1.3.9" apply false
id "com.hypherionmc.modutils.modpublisher" version "2.1.6" id "com.hypherionmc.modutils.modpublisher" version "2.1.6"
id "com.hypherionmc.modutils.orion" version "1.0.+" id "com.hypherionmc.modutils.orion" version "1.0.+"
id 'maven-publish' id 'maven-publish'
@@ -49,8 +49,10 @@ subprojects {
configurations { configurations {
shade shade
modCompileOnly modCompileOnly
stupidRemapArch
implementation.extendsFrom shade implementation.extendsFrom shade
compileOnly.extendsFrom modCompileOnly compileOnly.extendsFrom modCompileOnly
compileOnly.extendsFrom stupidRemapArch
} }
dependencies { dependencies {
@@ -98,6 +100,12 @@ subprojects {
mojmap() mojmap()
devNamespace "mojmap" devNamespace "mojmap"
} }
mods {
remap(configurations.stupidRemapArch) {
catchAWNamespaceAssertion()
}
}
} }
tasks.withType(JavaCompile).configureEach { tasks.withType(JavaCompile).configureEach {

View File

@@ -36,6 +36,7 @@ vanish=1.5.4+1.20.4
mod_menu_version=9.2.0-beta.2 mod_menu_version=9.2.0-beta.2
vanishmod=1.1.15 vanishmod=1.1.15
vanishmod_neo=puxrKAMr vanishmod_neo=puxrKAMr
ftb_essentials=2004.1.3
# Publishing # Publishing
curse_id=867099 curse_id=867099

View File

@@ -1,7 +1,7 @@
archivesBaseName = "${mod_name.replace(" ", "")}-Common-${minecraft_version}" archivesBaseName = "${mod_name.replace(" ", "")}-Common-${minecraft_version}"
dependencies { dependencies {
stupidRemapArch("dev.ftb.mods:ftb-essentials:${ftb_essentials}")
} }
shadowJar { shadowJar {

View File

@@ -0,0 +1,16 @@
package com.hypherionmc.craterlib.compat;
import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer;
import dev.ftb.mods.ftbessentials.util.FTBEPlayerData;
import java.util.Optional;
public class FTBEssentials {
public static boolean isPlayerMuted(BridgedPlayer player) {
Optional<FTBEPlayerData> data = FTBEPlayerData.getOrCreate(player.toMojang());
return data.map(FTBEPlayerData::isMuted).orElse(false);
}
}

View File

@@ -9,6 +9,7 @@ dependencies {
exclude(group: "net.fabricmc.fabric-api") exclude(group: "net.fabricmc.fabric-api")
} }
stupidRemapArch("dev.ftb.mods:ftb-essentials:${ftb_essentials}")
modImplementation "maven.modrinth:fabrictailor:${fabrictailor}" modImplementation "maven.modrinth:fabrictailor:${fabrictailor}"
modImplementation "maven.modrinth:vanish:${vanish}" modImplementation "maven.modrinth:vanish:${vanish}"

View File

@@ -5,6 +5,8 @@ dependencies {
// Compat // Compat
modImplementation("maven.modrinth:vanishmod:${vanishmod}") modImplementation("maven.modrinth:vanishmod:${vanishmod}")
stupidRemapArch("dev.ftb.mods:ftb-essentials-forge:${ftb_essentials}")
// Do not edit or remove // Do not edit or remove
implementation project(":Common") implementation project(":Common")
} }

View File

@@ -1,7 +1,7 @@
plugins { plugins {
id 'java' id 'java'
id 'com.github.johnrengelman.shadow' version '8.1.1' apply false id 'com.github.johnrengelman.shadow' version '8.1.1' apply false
id "xyz.wagyourtail.unimined" version "1.2.4" apply false id "xyz.wagyourtail.unimined" version "1.3.9" apply false
id "com.hypherionmc.modutils.modpublisher" version "2.1.6" id "com.hypherionmc.modutils.modpublisher" version "2.1.6"
id "com.hypherionmc.modutils.orion" version "1.0.+" id "com.hypherionmc.modutils.orion" version "1.0.+"
id 'maven-publish' id 'maven-publish'
@@ -48,8 +48,10 @@ subprojects {
configurations { configurations {
shade shade
modCompileOnly modCompileOnly
stupidRemapArch
implementation.extendsFrom shade implementation.extendsFrom shade
compileOnly.extendsFrom modCompileOnly compileOnly.extendsFrom modCompileOnly
compileOnly.extendsFrom stupidRemapArch
} }
dependencies { dependencies {
@@ -97,6 +99,12 @@ subprojects {
mojmap() mojmap()
devNamespace "mojmap" devNamespace "mojmap"
} }
mods {
remap(configurations.stupidRemapArch) {
catchAWNamespaceAssertion()
}
}
} }
tasks.withType(JavaCompile).configureEach { tasks.withType(JavaCompile).configureEach {

View File

@@ -28,6 +28,7 @@ rpc_sdk=1.0
discord_formatter=2.0.0 discord_formatter=2.0.0
# Mod Dependencies # Mod Dependencies
ftb_essentials=2001.2.2
fabrictailor=2.2.1 fabrictailor=2.2.1
vanish=1.5.4+1.20.1 vanish=1.5.4+1.20.1
mod_menu_version=7.0.1 mod_menu_version=7.0.1

View File

@@ -1,7 +1,7 @@
archivesBaseName = "${mod_name.replace(" ", "")}-Common-${minecraft_version}" archivesBaseName = "${mod_name.replace(" ", "")}-Common-${minecraft_version}"
dependencies { dependencies {
stupidRemapArch("dev.ftb.mods:ftb-essentials:${ftb_essentials}")
} }
shadowJar { shadowJar {

View File

@@ -0,0 +1,16 @@
package com.hypherionmc.craterlib.compat;
import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer;
import dev.ftb.mods.ftbessentials.util.FTBEPlayerData;
import java.util.Optional;
public class FTBEssentials {
public static boolean isPlayerMuted(BridgedPlayer player) {
Optional<FTBEPlayerData> data = FTBEPlayerData.getOrCreate(player.toMojang());
return data.map(FTBEPlayerData::isMuted).orElse(false);
}
}

View File

@@ -9,6 +9,8 @@ dependencies {
exclude(group: "net.fabricmc.fabric-api") exclude(group: "net.fabricmc.fabric-api")
} }
stupidRemapArch("dev.ftb.mods:ftb-essentials:${ftb_essentials}")
modImplementation "maven.modrinth:fabrictailor:${fabrictailor}" modImplementation "maven.modrinth:fabrictailor:${fabrictailor}"
modImplementation "maven.modrinth:vanish:${vanish}" modImplementation "maven.modrinth:vanish:${vanish}"

View File

@@ -4,6 +4,8 @@ dependencies {
// Compat // Compat
modImplementation("maven.modrinth:vanishmod:${vanishmod_neo}") modImplementation("maven.modrinth:vanishmod:${vanishmod_neo}")
stupidRemapArch("dev.ftb.mods:ftb-essentials-neoforge:${ftb_essentials}")
// Do not edit or remove // Do not edit or remove
implementation project(":Common") implementation project(":Common")
} }

View File

@@ -1,7 +1,7 @@
plugins { plugins {
id 'java' id 'java'
id 'com.github.johnrengelman.shadow' version '8.1.1' apply false id 'com.github.johnrengelman.shadow' version '8.1.1' apply false
id "xyz.wagyourtail.unimined" version "1.2.4" apply false id "xyz.wagyourtail.unimined" version "1.3.9" apply false
id "com.hypherionmc.modutils.modpublisher" version "2.1.6" id "com.hypherionmc.modutils.modpublisher" version "2.1.6"
id "com.hypherionmc.modutils.orion" version "1.0.+" id "com.hypherionmc.modutils.orion" version "1.0.+"
id 'maven-publish' id 'maven-publish'
@@ -49,8 +49,10 @@ subprojects {
configurations { configurations {
shade shade
modCompileOnly modCompileOnly
stupidRemapArch
implementation.extendsFrom shade implementation.extendsFrom shade
compileOnly.extendsFrom modCompileOnly compileOnly.extendsFrom modCompileOnly
compileOnly.extendsFrom stupidRemapArch
} }
dependencies { dependencies {
@@ -98,11 +100,17 @@ subprojects {
mojmap() mojmap()
devNamespace "mojmap" devNamespace "mojmap"
} }
mods {
remap(configurations.stupidRemapArch) {
catchAWNamespaceAssertion()
}
}
} }
tasks.withType(JavaCompile).configureEach { tasks.withType(JavaCompile).configureEach {
it.options.encoding = 'UTF-8' it.options.encoding = 'UTF-8'
it.options.release = 17 it.options.release = 21
} }
tasks.withType(GenerateModuleMetadata).configureEach { tasks.withType(GenerateModuleMetadata).configureEach {

View File

@@ -21,7 +21,7 @@ fabric_api=0.100.1+1.21
forge_version=50.0.6 forge_version=50.0.6
# NeoForged # NeoForged
neoforge_version=0.0-beta neoforge_version=0-beta
# Dependencies # Dependencies
moon_config=1.0.9 moon_config=1.0.9
@@ -36,6 +36,7 @@ vanish=1.5.4+1.20.5
mod_menu_version=10.0.0-beta.1 mod_menu_version=10.0.0-beta.1
vanishmod=1.1.12.1 vanishmod=1.1.12.1
vanishmod_neo=puxrKAMr vanishmod_neo=puxrKAMr
ftb_essentials=2101.1.0
# Publishing # Publishing
curse_id=867099 curse_id=867099

View File

@@ -1 +1 @@
eda815c460bd236bc16f0c8066cd7c0a02deafd5 197bfaf6dffe8c31498242a89aea6c8e329174a1

View File

@@ -0,0 +1,13 @@
--- a/Common/src/main/java/com/hypherionmc/craterlib/compat/FTBEssentials.java
+++ b/Common/src/main/java/com/hypherionmc/craterlib/compat/FTBEssentials.java
@@ -8,8 +8,8 @@
public class FTBEssentials {
public static boolean isPlayerMuted(BridgedPlayer player) {
- Optional<FTBEPlayerData> data = FTBEPlayerData.getOrCreate(player.toMojang());
- return data.map(FTBEPlayerData::isMuted).orElse(false);
+ FTBEPlayerData data = FTBEPlayerData.get(player.toMojang());
+ return data != null && data.muted;
}

View File

@@ -11,7 +11,7 @@
group = rootProject.group group = rootProject.group
@@ -59,7 +59,7 @@ @@ -61,7 +61,7 @@
shade "me.hypherionmc.moon-config:toml:${moon_config}" shade "me.hypherionmc.moon-config:toml:${moon_config}"
shade "me.hypherionmc.moon-config:json:${moon_config}" shade "me.hypherionmc.moon-config:json:${moon_config}"
shade "com.hypherionmc:rpcsdk:${rpc_sdk}" shade "com.hypherionmc:rpcsdk:${rpc_sdk}"
@@ -20,3 +20,12 @@
shade "net.kyori:adventure-api:${adventure}" shade "net.kyori:adventure-api:${adventure}"
shade "net.kyori:adventure-text-serializer-gson:${adventure}" shade "net.kyori:adventure-text-serializer-gson:${adventure}"
shade "net.kyori:adventure-text-minimessage:${adventure}" shade "net.kyori:adventure-text-minimessage:${adventure}"
@@ -112,7 +112,7 @@
tasks.withType(JavaCompile).configureEach {
it.options.encoding = 'UTF-8'
- it.options.release = 21
+ it.options.release = 17
}
tasks.withType(GenerateModuleMetadata).configureEach {

View File

@@ -23,7 +23,7 @@
# Dependencies # Dependencies
moon_config=1.0.9 moon_config=1.0.9
@@ -31,16 +28,15 @@ @@ -31,17 +28,16 @@
discord_formatter=2.0.0 discord_formatter=2.0.0
# Mod Dependencies # Mod Dependencies
@@ -32,6 +32,8 @@
-mod_menu_version=10.0.0-beta.1 -mod_menu_version=10.0.0-beta.1
-vanishmod=1.1.12.1 -vanishmod=1.1.12.1
-vanishmod_neo=puxrKAMr -vanishmod_neo=puxrKAMr
-ftb_essentials=2101.1.0
+ftb_essentials=1802.2.2-build.83
+fabrictailor=1.9.0+1.18.2 +fabrictailor=1.9.0+1.18.2
+vanish=1.1.0 +vanish=1.1.0
+mod_menu_version=3.2.5 +mod_menu_version=3.2.5

View File

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

View File

@@ -0,0 +1,13 @@
--- a/Common/src/main/java/com/hypherionmc/craterlib/compat/FTBEssentials.java
+++ b/Common/src/main/java/com/hypherionmc/craterlib/compat/FTBEssentials.java
@@ -8,8 +8,8 @@
public class FTBEssentials {
public static boolean isPlayerMuted(BridgedPlayer player) {
- Optional<FTBEPlayerData> data = FTBEPlayerData.getOrCreate(player.toMojang());
- return data.map(FTBEPlayerData::isMuted).orElse(false);
+ FTBEPlayerData data = FTBEPlayerData.get(player.toMojang());
+ return data != null && data.muted;
}

View File

@@ -1,6 +1,14 @@
--- a/Fabric/build.gradle --- a/Fabric/build.gradle
+++ b/Fabric/build.gradle +++ b/Fabric/build.gradle
@@ -113,8 +113,8 @@ @@ -9,6 +9,7 @@
exclude(group: "net.fabricmc.fabric-api")
}
+ stupidRemapArch("dev.ftb.mods:ftb-essentials:${ftb_essentials}")
modImplementation "maven.modrinth:fabrictailor:${fabrictailor}"
modImplementation "maven.modrinth:vanish:${vanish}"
@@ -113,8 +114,8 @@
setVersionType("release") setVersionType("release")
setChangelog("https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-fabric.md") setChangelog("https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-fabric.md")
setProjectVersion("${minecraft_version}-${project.version}") setProjectVersion("${minecraft_version}-${project.version}")

View File

@@ -1,15 +1,17 @@
--- a/Forge/build.gradle --- a/Forge/build.gradle
+++ b/Forge/build.gradle +++ b/Forge/build.gradle
@@ -3,7 +3,7 @@ @@ -3,8 +3,9 @@
dependencies { dependencies {
// Compat // Compat
- // NOT AVAILABLE ON FORGE modImplementation("maven.modrinth:vanishmod:${vanishmod}") - // NOT AVAILABLE ON FORGE modImplementation("maven.modrinth:vanishmod:${vanishmod}")
+ modImplementation("maven.modrinth:vanishmod:${vanishmod}") + modImplementation("maven.modrinth:vanishmod:${vanishmod}")
+ stupidRemapArch("dev.ftb.mods:ftb-essentials-forge:${ftb_essentials}")
// Do not edit or remove // Do not edit or remove
implementation project(":Common") implementation project(":Common")
@@ -107,8 +107,8 @@ }
@@ -107,8 +108,8 @@
setVersionType("release") setVersionType("release")
setChangelog("https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-forge.md") setChangelog("https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-forge.md")
setProjectVersion("${minecraft_version}-${project.version}") setProjectVersion("${minecraft_version}-${project.version}")

View File

@@ -11,7 +11,7 @@
group = rootProject.group group = rootProject.group
@@ -59,7 +59,7 @@ @@ -61,13 +61,11 @@
shade "me.hypherionmc.moon-config:toml:${moon_config}" shade "me.hypherionmc.moon-config:toml:${moon_config}"
shade "me.hypherionmc.moon-config:json:${moon_config}" shade "me.hypherionmc.moon-config:json:${moon_config}"
shade "com.hypherionmc:rpcsdk:${rpc_sdk}" shade "com.hypherionmc:rpcsdk:${rpc_sdk}"
@@ -20,3 +20,18 @@
shade "net.kyori:adventure-api:${adventure}" shade "net.kyori:adventure-api:${adventure}"
shade "net.kyori:adventure-text-serializer-gson:${adventure}" shade "net.kyori:adventure-text-serializer-gson:${adventure}"
shade "net.kyori:adventure-text-minimessage:${adventure}" shade "net.kyori:adventure-text-minimessage:${adventure}"
- stupidRemapArch("dev.ftb.mods:ftb-essentials:${ftb_essentials}")
-
compileOnly 'net.luckperms:api:5.4'
compileOnly("org.projectlombok:lombok:${lombok}")
annotationProcessor("org.projectlombok:lombok:${lombok}")
@@ -112,7 +110,7 @@
tasks.withType(JavaCompile).configureEach {
it.options.encoding = 'UTF-8'
- it.options.release = 21
+ it.options.release = 17
}
tasks.withType(GenerateModuleMetadata).configureEach {

View File

@@ -19,11 +19,11 @@
- -
-# NeoForged -# NeoForged
-neoforge_version=0.0-beta -neoforge_version=0.0-beta
+forge_version=43.2.0 +forge_version=43.4.0
# Dependencies # Dependencies
moon_config=1.0.9 moon_config=1.0.9
@@ -31,16 +28,15 @@ @@ -31,17 +28,16 @@
discord_formatter=2.0.0 discord_formatter=2.0.0
# Mod Dependencies # Mod Dependencies
@@ -32,6 +32,8 @@
-mod_menu_version=10.0.0-beta.1 -mod_menu_version=10.0.0-beta.1
-vanishmod=1.1.12.1 -vanishmod=1.1.12.1
-vanishmod_neo=puxrKAMr -vanishmod_neo=puxrKAMr
-ftb_essentials=2101.1.0
+ftb_essentials=1902.3.5-build.135
+fabrictailor=2.0.1 +fabrictailor=2.0.1
+vanish=1.3.2 +vanish=1.3.2
+mod_menu_version=4.2.0-beta.2 +mod_menu_version=4.2.0-beta.2

View File

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

View File

@@ -1,6 +1,14 @@
--- a/Fabric/build.gradle --- a/Fabric/build.gradle
+++ b/Fabric/build.gradle +++ b/Fabric/build.gradle
@@ -113,8 +113,8 @@ @@ -9,6 +9,7 @@
exclude(group: "net.fabricmc.fabric-api")
}
+ stupidRemapArch("dev.ftb.mods:ftb-essentials:${ftb_essentials}")
modImplementation "maven.modrinth:fabrictailor:${fabrictailor}"
modImplementation "maven.modrinth:vanish:${vanish}"
@@ -113,8 +114,8 @@
setVersionType("release") setVersionType("release")
setChangelog("https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-fabric.md") setChangelog("https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-fabric.md")
setProjectVersion("${minecraft_version}-${project.version}") setProjectVersion("${minecraft_version}-${project.version}")

View File

@@ -1,15 +1,17 @@
--- a/Forge/build.gradle --- a/Forge/build.gradle
+++ b/Forge/build.gradle +++ b/Forge/build.gradle
@@ -3,7 +3,7 @@ @@ -3,7 +3,9 @@
dependencies { dependencies {
// Compat // Compat
- // NOT AVAILABLE ON FORGE modImplementation("maven.modrinth:vanishmod:${vanishmod}") - // NOT AVAILABLE ON FORGE modImplementation("maven.modrinth:vanishmod:${vanishmod}")
+ modImplementation("maven.modrinth:vanishmod:${vanishmod}") + modImplementation("maven.modrinth:vanishmod:${vanishmod}")
+
+ stupidRemapArch("dev.ftb.mods:ftb-essentials-forge:${ftb_essentials}")
// Do not edit or remove // Do not edit or remove
implementation project(":Common") implementation project(":Common")
@@ -107,8 +107,8 @@ @@ -107,8 +109,8 @@
setVersionType("release") setVersionType("release")
setChangelog("https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-forge.md") setChangelog("https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-forge.md")
setProjectVersion("${minecraft_version}-${project.version}") setProjectVersion("${minecraft_version}-${project.version}")

View File

@@ -11,7 +11,7 @@
group = rootProject.group group = rootProject.group
@@ -59,7 +59,7 @@ @@ -61,13 +61,11 @@
shade "me.hypherionmc.moon-config:toml:${moon_config}" shade "me.hypherionmc.moon-config:toml:${moon_config}"
shade "me.hypherionmc.moon-config:json:${moon_config}" shade "me.hypherionmc.moon-config:json:${moon_config}"
shade "com.hypherionmc:rpcsdk:${rpc_sdk}" shade "com.hypherionmc:rpcsdk:${rpc_sdk}"
@@ -20,3 +20,18 @@
shade "net.kyori:adventure-api:${adventure}" shade "net.kyori:adventure-api:${adventure}"
shade "net.kyori:adventure-text-serializer-gson:${adventure}" shade "net.kyori:adventure-text-serializer-gson:${adventure}"
shade "net.kyori:adventure-text-minimessage:${adventure}" shade "net.kyori:adventure-text-minimessage:${adventure}"
- stupidRemapArch("dev.ftb.mods:ftb-essentials:${ftb_essentials}")
-
compileOnly 'net.luckperms:api:5.4'
compileOnly("org.projectlombok:lombok:${lombok}")
annotationProcessor("org.projectlombok:lombok:${lombok}")
@@ -112,7 +110,7 @@
tasks.withType(JavaCompile).configureEach {
it.options.encoding = 'UTF-8'
- it.options.release = 21
+ it.options.release = 17
}
tasks.withType(GenerateModuleMetadata).configureEach {

View File

@@ -23,7 +23,7 @@
# Dependencies # Dependencies
moon_config=1.0.9 moon_config=1.0.9
@@ -31,16 +28,15 @@ @@ -31,17 +28,16 @@
discord_formatter=2.0.0 discord_formatter=2.0.0
# Mod Dependencies # Mod Dependencies
@@ -32,6 +32,8 @@
-mod_menu_version=10.0.0-beta.1 -mod_menu_version=10.0.0-beta.1
-vanishmod=1.1.12.1 -vanishmod=1.1.12.1
-vanishmod_neo=puxrKAMr -vanishmod_neo=puxrKAMr
-ftb_essentials=2101.1.0
+ftb_essentials=1904.1.0-build.81-SNAPSHOT
+fabrictailor=2.0.2 +fabrictailor=2.0.2
+vanish=1.4.0+1.19.3 +vanish=1.4.0+1.19.3
+mod_menu_version=5.1.0-beta.4 +mod_menu_version=5.1.0-beta.4

View File

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

View File

@@ -1,6 +1,14 @@
--- a/Fabric/build.gradle --- a/Fabric/build.gradle
+++ b/Fabric/build.gradle +++ b/Fabric/build.gradle
@@ -113,8 +113,8 @@ @@ -9,6 +9,7 @@
exclude(group: "net.fabricmc.fabric-api")
}
+ stupidRemapArch("dev.ftb.mods:ftb-essentials:${ftb_essentials}")
modImplementation "maven.modrinth:fabrictailor:${fabrictailor}"
modImplementation "maven.modrinth:vanish:${vanish}"
@@ -113,8 +114,8 @@
setVersionType("release") setVersionType("release")
setChangelog("https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-fabric.md") setChangelog("https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-fabric.md")
setProjectVersion("${minecraft_version}-${project.version}") setProjectVersion("${minecraft_version}-${project.version}")

View File

@@ -1,15 +1,17 @@
--- a/Forge/build.gradle --- a/Forge/build.gradle
+++ b/Forge/build.gradle +++ b/Forge/build.gradle
@@ -3,7 +3,7 @@ @@ -3,7 +3,9 @@
dependencies { dependencies {
// Compat // Compat
- // NOT AVAILABLE ON FORGE modImplementation("maven.modrinth:vanishmod:${vanishmod}") - // NOT AVAILABLE ON FORGE modImplementation("maven.modrinth:vanishmod:${vanishmod}")
+ modImplementation("maven.modrinth:vanishmod:${vanishmod}") + modImplementation("maven.modrinth:vanishmod:${vanishmod}")
+
+ stupidRemapArch("dev.ftb.mods:ftb-essentials-forge:${ftb_essentials}")
// Do not edit or remove // Do not edit or remove
implementation project(":Common") implementation project(":Common")
@@ -107,8 +107,8 @@ @@ -107,8 +109,8 @@
setVersionType("release") setVersionType("release")
setChangelog("https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-forge.md") setChangelog("https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-forge.md")
setProjectVersion("${minecraft_version}-${project.version}") setProjectVersion("${minecraft_version}-${project.version}")

View File

@@ -11,7 +11,7 @@
group = rootProject.group group = rootProject.group
@@ -59,7 +59,7 @@ @@ -61,13 +61,11 @@
shade "me.hypherionmc.moon-config:toml:${moon_config}" shade "me.hypherionmc.moon-config:toml:${moon_config}"
shade "me.hypherionmc.moon-config:json:${moon_config}" shade "me.hypherionmc.moon-config:json:${moon_config}"
shade "com.hypherionmc:rpcsdk:${rpc_sdk}" shade "com.hypherionmc:rpcsdk:${rpc_sdk}"
@@ -20,3 +20,18 @@
shade "net.kyori:adventure-api:${adventure}" shade "net.kyori:adventure-api:${adventure}"
shade "net.kyori:adventure-text-serializer-gson:${adventure}" shade "net.kyori:adventure-text-serializer-gson:${adventure}"
shade "net.kyori:adventure-text-minimessage:${adventure}" shade "net.kyori:adventure-text-minimessage:${adventure}"
- stupidRemapArch("dev.ftb.mods:ftb-essentials:${ftb_essentials}")
-
compileOnly 'net.luckperms:api:5.4'
compileOnly("org.projectlombok:lombok:${lombok}")
annotationProcessor("org.projectlombok:lombok:${lombok}")
@@ -112,7 +110,7 @@
tasks.withType(JavaCompile).configureEach {
it.options.encoding = 'UTF-8'
- it.options.release = 21
+ it.options.release = 17
}
tasks.withType(GenerateModuleMetadata).configureEach {

View File

@@ -23,7 +23,7 @@
# Dependencies # Dependencies
moon_config=1.0.9 moon_config=1.0.9
@@ -31,16 +28,15 @@ @@ -31,17 +28,16 @@
discord_formatter=2.0.0 discord_formatter=2.0.0
# Mod Dependencies # Mod Dependencies
@@ -32,6 +32,8 @@
-mod_menu_version=10.0.0-beta.1 -mod_menu_version=10.0.0-beta.1
-vanishmod=1.1.12.1 -vanishmod=1.1.12.1
-vanishmod_neo=puxrKAMr -vanishmod_neo=puxrKAMr
-ftb_essentials=2101.1.0
+ftb_essentials=2001.2.2
+fabrictailor=2.2.1 +fabrictailor=2.2.1
+vanish=1.5.0+1.20.2 +vanish=1.5.0+1.20.2
+mod_menu_version=8.0.1 +mod_menu_version=8.0.1

View File

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

View File

@@ -1,6 +1,15 @@
--- a/Fabric/build.gradle --- a/Fabric/build.gradle
+++ b/Fabric/build.gradle +++ b/Fabric/build.gradle
@@ -113,8 +113,8 @@ @@ -9,6 +9,8 @@
exclude(group: "net.fabricmc.fabric-api")
}
+ stupidRemapArch("dev.ftb.mods:ftb-essentials:${ftb_essentials}")
+
modImplementation "maven.modrinth:fabrictailor:${fabrictailor}"
modImplementation "maven.modrinth:vanish:${vanish}"
@@ -113,8 +115,8 @@
setVersionType("release") setVersionType("release")
setChangelog("https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-fabric.md") setChangelog("https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-fabric.md")
setProjectVersion("${minecraft_version}-${project.version}") setProjectVersion("${minecraft_version}-${project.version}")

View File

@@ -1,15 +1,17 @@
--- a/Forge/build.gradle --- a/Forge/build.gradle
+++ b/Forge/build.gradle +++ b/Forge/build.gradle
@@ -3,7 +3,7 @@ @@ -3,7 +3,9 @@
dependencies { dependencies {
// Compat // Compat
- // NOT AVAILABLE ON FORGE modImplementation("maven.modrinth:vanishmod:${vanishmod}") - // NOT AVAILABLE ON FORGE modImplementation("maven.modrinth:vanishmod:${vanishmod}")
+ modImplementation("maven.modrinth:vanishmod:${vanishmod}") + modImplementation("maven.modrinth:vanishmod:${vanishmod}")
+
+ stupidRemapArch("dev.ftb.mods:ftb-essentials-forge:${ftb_essentials}")
// Do not edit or remove // Do not edit or remove
implementation project(":Common") implementation project(":Common")
@@ -107,8 +107,8 @@ @@ -107,8 +109,8 @@
setVersionType("release") setVersionType("release")
setChangelog("https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-forge.md") setChangelog("https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-forge.md")
setProjectVersion("${minecraft_version}-${project.version}") setProjectVersion("${minecraft_version}-${project.version}")

View File

@@ -1,6 +1,15 @@
--- a/NeoForge/build.gradle --- a/NeoForge/build.gradle
+++ b/NeoForge/build.gradle +++ b/NeoForge/build.gradle
@@ -51,7 +51,7 @@ @@ -4,6 +4,8 @@
// Compat
modImplementation("maven.modrinth:vanishmod:${vanishmod_neo}")
+ stupidRemapArch("dev.ftb.mods:ftb-essentials-neoforge:${ftb_essentials}")
+
// Do not edit or remove
implementation project(":Common")
}
@@ -51,7 +53,7 @@
from project(":Common").sourceSets.main.resources from project(":Common").sourceSets.main.resources
def buildProps = project.properties.clone() def buildProps = project.properties.clone()
@@ -9,7 +18,7 @@
expand buildProps expand buildProps
} }
} }
@@ -106,8 +106,8 @@ @@ -106,8 +108,8 @@
setVersionType("release") setVersionType("release")
setChangelog("https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-forge.md") setChangelog("https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-forge.md")
setProjectVersion("${minecraft_version}-${project.version}") setProjectVersion("${minecraft_version}-${project.version}")

View File

@@ -11,3 +11,21 @@
group = rootProject.group group = rootProject.group
@@ -66,8 +66,6 @@
shade "net.kyori:adventure-text-serializer-gson:${adventure}"
shade "net.kyori:adventure-text-minimessage:${adventure}"
- stupidRemapArch("dev.ftb.mods:ftb-essentials:${ftb_essentials}")
-
compileOnly 'net.luckperms:api:5.4'
compileOnly("org.projectlombok:lombok:${lombok}")
annotationProcessor("org.projectlombok:lombok:${lombok}")
@@ -112,7 +110,7 @@
tasks.withType(JavaCompile).configureEach {
it.options.encoding = 'UTF-8'
- it.options.release = 21
+ it.options.release = 17
}
tasks.withType(GenerateModuleMetadata).configureEach {

View File

@@ -24,7 +24,7 @@
# Dependencies # Dependencies
moon_config=1.0.9 moon_config=1.0.9
@@ -32,15 +32,15 @@ @@ -32,16 +32,16 @@
# Mod Dependencies # Mod Dependencies
fabrictailor=2.3.1 fabrictailor=2.3.1
@@ -35,6 +35,8 @@
+mod_menu_version=9.2.0-beta.2 +mod_menu_version=9.2.0-beta.2
+vanishmod=1.1.15 +vanishmod=1.1.15
vanishmod_neo=puxrKAMr vanishmod_neo=puxrKAMr
-ftb_essentials=2101.1.0
+ftb_essentials=2004.1.3
# Publishing # Publishing
curse_id=867099 curse_id=867099

View File

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

View File

@@ -1,6 +1,14 @@
--- a/Fabric/build.gradle --- a/Fabric/build.gradle
+++ b/Fabric/build.gradle +++ b/Fabric/build.gradle
@@ -113,8 +113,8 @@ @@ -9,6 +9,7 @@
exclude(group: "net.fabricmc.fabric-api")
}
+ stupidRemapArch("dev.ftb.mods:ftb-essentials:${ftb_essentials}")
modImplementation "maven.modrinth:fabrictailor:${fabrictailor}"
modImplementation "maven.modrinth:vanish:${vanish}"
@@ -113,8 +114,8 @@
setVersionType("release") setVersionType("release")
setChangelog("https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-fabric.md") setChangelog("https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-fabric.md")
setProjectVersion("${minecraft_version}-${project.version}") setProjectVersion("${minecraft_version}-${project.version}")

View File

@@ -1,15 +1,17 @@
--- a/Forge/build.gradle --- a/Forge/build.gradle
+++ b/Forge/build.gradle +++ b/Forge/build.gradle
@@ -3,7 +3,7 @@ @@ -3,7 +3,9 @@
dependencies { dependencies {
// Compat // Compat
- // NOT AVAILABLE ON FORGE modImplementation("maven.modrinth:vanishmod:${vanishmod}") - // NOT AVAILABLE ON FORGE modImplementation("maven.modrinth:vanishmod:${vanishmod}")
+ modImplementation("maven.modrinth:vanishmod:${vanishmod}") + modImplementation("maven.modrinth:vanishmod:${vanishmod}")
+
+ stupidRemapArch("dev.ftb.mods:ftb-essentials-forge:${ftb_essentials}")
// Do not edit or remove // Do not edit or remove
implementation project(":Common") implementation project(":Common")
@@ -107,8 +107,8 @@ @@ -107,8 +109,8 @@
setVersionType("release") setVersionType("release")
setChangelog("https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-forge.md") setChangelog("https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-forge.md")
setProjectVersion("${minecraft_version}-${project.version}") setProjectVersion("${minecraft_version}-${project.version}")

View File

@@ -19,7 +19,7 @@
group = rootProject.group group = rootProject.group
@@ -59,7 +58,7 @@ @@ -61,13 +60,11 @@
shade "me.hypherionmc.moon-config:toml:${moon_config}" shade "me.hypherionmc.moon-config:toml:${moon_config}"
shade "me.hypherionmc.moon-config:json:${moon_config}" shade "me.hypherionmc.moon-config:json:${moon_config}"
shade "com.hypherionmc:rpcsdk:${rpc_sdk}" shade "com.hypherionmc:rpcsdk:${rpc_sdk}"
@@ -28,3 +28,18 @@
shade "net.kyori:adventure-api:${adventure}" shade "net.kyori:adventure-api:${adventure}"
shade "net.kyori:adventure-text-serializer-gson:${adventure}" shade "net.kyori:adventure-text-serializer-gson:${adventure}"
shade "net.kyori:adventure-text-minimessage:${adventure}" shade "net.kyori:adventure-text-minimessage:${adventure}"
- stupidRemapArch("dev.ftb.mods:ftb-essentials:${ftb_essentials}")
-
compileOnly 'net.luckperms:api:5.4'
compileOnly("org.projectlombok:lombok:${lombok}")
annotationProcessor("org.projectlombok:lombok:${lombok}")
@@ -112,7 +109,7 @@
tasks.withType(JavaCompile).configureEach {
it.options.encoding = 'UTF-8'
- it.options.release = 21
+ it.options.release = 17
}
tasks.withType(GenerateModuleMetadata).configureEach {

View File

@@ -23,7 +23,7 @@
# Dependencies # Dependencies
moon_config=1.0.9 moon_config=1.0.9
@@ -31,16 +28,15 @@ @@ -31,17 +28,16 @@
discord_formatter=2.0.0 discord_formatter=2.0.0
# Mod Dependencies # Mod Dependencies
@@ -32,6 +32,8 @@
-mod_menu_version=10.0.0-beta.1 -mod_menu_version=10.0.0-beta.1
-vanishmod=1.1.12.1 -vanishmod=1.1.12.1
-vanishmod_neo=puxrKAMr -vanishmod_neo=puxrKAMr
-ftb_essentials=2101.1.0
+ftb_essentials=2001.2.2
+fabrictailor=2.2.1 +fabrictailor=2.2.1
+vanish=1.5.4+1.20.1 +vanish=1.5.4+1.20.1
+mod_menu_version=7.0.1 +mod_menu_version=7.0.1

View File

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

View File

@@ -1,6 +1,15 @@
--- a/Fabric/build.gradle --- a/Fabric/build.gradle
+++ b/Fabric/build.gradle +++ b/Fabric/build.gradle
@@ -113,8 +113,8 @@ @@ -9,6 +9,8 @@
exclude(group: "net.fabricmc.fabric-api")
}
+ stupidRemapArch("dev.ftb.mods:ftb-essentials:${ftb_essentials}")
+
modImplementation "maven.modrinth:fabrictailor:${fabrictailor}"
modImplementation "maven.modrinth:vanish:${vanish}"
@@ -113,8 +115,8 @@
setVersionType("release") setVersionType("release")
setChangelog("https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-fabric.md") setChangelog("https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-fabric.md")
setProjectVersion("${minecraft_version}-${project.version}") setProjectVersion("${minecraft_version}-${project.version}")

View File

@@ -1,6 +1,15 @@
--- a/NeoForge/build.gradle --- a/NeoForge/build.gradle
+++ b/NeoForge/build.gradle +++ b/NeoForge/build.gradle
@@ -106,8 +106,8 @@ @@ -4,6 +4,8 @@
// Compat
modImplementation("maven.modrinth:vanishmod:${vanishmod_neo}")
+ stupidRemapArch("dev.ftb.mods:ftb-essentials-neoforge:${ftb_essentials}")
+
// Do not edit or remove
implementation project(":Common")
}
@@ -106,8 +108,8 @@
setVersionType("release") setVersionType("release")
setChangelog("https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-forge.md") setChangelog("https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-forge.md")
setProjectVersion("${minecraft_version}-${project.version}") setProjectVersion("${minecraft_version}-${project.version}")

View File

@@ -0,0 +1,11 @@
--- a/build.gradle
+++ b/build.gradle
@@ -66,8 +66,6 @@
shade "net.kyori:adventure-text-serializer-gson:${adventure}"
shade "net.kyori:adventure-text-minimessage:${adventure}"
- stupidRemapArch("dev.ftb.mods:ftb-essentials:${ftb_essentials}")
-
compileOnly 'net.luckperms:api:5.4'
compileOnly("org.projectlombok:lombok:${lombok}")
annotationProcessor("org.projectlombok:lombok:${lombok}")

View File

@@ -1,6 +1,6 @@
--- a/gradle.properties --- a/gradle.properties
+++ b/gradle.properties +++ b/gradle.properties
@@ -10,12 +10,12 @@ @@ -10,18 +10,18 @@
mod_name=CraterLib mod_name=CraterLib
# Shared # Shared
@@ -16,7 +16,14 @@
# Forge # Forge
forge_version=50.0.6 forge_version=50.0.6
@@ -40,7 +40,7 @@
# NeoForged
-neoforge_version=0.0-beta
+neoforge_version=0-beta
# Dependencies
moon_config=1.0.9
@@ -41,7 +41,7 @@
# Publishing # Publishing
curse_id=867099 curse_id=867099
modrinth_id=Nn8Wasaq modrinth_id=Nn8Wasaq