Skip to content

Commit

Permalink
Update 2.1.0-dev.1
Browse files Browse the repository at this point in the history
- Updated libraries
- Rewritten to the new DiscordIPC library, for possible support of ARM architecture [#11, #14]
- Bug fixes voice mods [#10]
- Rewrote the interface from YACL to AlinLib 1.1 (Not published at the time of writing)
- Removed Music Player support (only WaterPlayer)
- Added support for album cards from WaterPlayer (1.1.0-alpha.7, Not published at the time of writing)
  • Loading branch information
kel-cu committed Jan 20, 2024
1 parent e1d4e57 commit 5fd0554
Show file tree
Hide file tree
Showing 40 changed files with 756 additions and 1,665 deletions.
46 changes: 18 additions & 28 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id 'fabric-loom' version '1.2-SNAPSHOT'
id 'dev.architectury.loom' version '1.4-SNAPSHOT'
id 'com.github.johnrengelman.shadow' version '7.1.2'
id 'maven-publish'
}
Expand All @@ -9,46 +9,40 @@ version = project.mod_version
group = project.maven_group

repositories {
// Add repositories to retrieve artifacts from in here.
// You should only use this when depending on other mods because
// Loom adds the essential maven repositories to download Minecraft and libraries from automatically.
// See https://docs.gradle.org/current/userguide/declaring_repositories.html
// for more information about repositories.
jcenter()
mavenCentral()
maven { url = "https://jitpack.io/" }
maven { url = "https://maven.terraformersmc.com/releases" }
maven { url = "https://maven.isxander.dev/releases" }
maven { url = "https://oss.sonatype.org/content/repositories/snapshots" }
// maven { url = 'https://repo.kelcuprum.ru/releases' }
maven { url = "https://maven.meteordev.org/releases" }
maven { url = "https://repo.u-team.info" }
maven { url = 'https://repo.kelcuprum.ru/releases' }
maven { url = 'https://repo.kelcuprum.ru/snapshot' }
maven { url = 'https://repo.kelcuprum.ru/forks' }
maven { url = 'https://repo.kelcuprum.ru/test' }
maven { url = "https://api.modrinth.com/maven" }
maven { url = "https://maven.parchmentmc.org" } // MAPPINGS
maven { url = "https://jitpack.io/" }
}

configurations { shade }
dependencies {
// Minecraft/Fabric libs
minecraft "com.mojang:minecraft:${project.minecraft_version}"
mappings loom.officialMojangMappings()
mappings loom.layered() {
officialMojangMappings()
parchment "org.parchmentmc.data:parchment-${project.minecraft_version}:${project.parchment_version}@zip"
}
modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
// Discord Integration
include(implementation("com.kohlschutter.junixsocket:junixsocket-common:2.7.0"))
include(implementation("com.kohlschutter.junixsocket:junixsocket-native-common:2.7.0"))
include(implementation("com.jagrosh.discordipc:DiscordIPC:0.6.0"))
// Mods libs
modImplementation "com.terraformersmc:modmenu:${project.modmenu_version}"
modImplementation "dev.isxander.yacl:yet-another-config-lib-fabric:${project.yacl}"
modImplementation "maven.modrinth:fastload:${project.fastload}"
modImplementation "maven.modrinth:replaymod:${project.replaymod}"
modImplementation "info.u-team:music_player-fabric-${project.musicplayer}";
modImplementation "maven.modrinth:plasmo-voice:${project.plasmovoice}"
modImplementation "maven.modrinth:simple-voice-chat:${project.svc}"
// modImplementation "ru.kelcuprum:waterplayer:1.0.0"
modImplementation(files("offlineLibs/WaterPlayer-1.0.0.jar"))
// Discord Libs
include(implementation "club.minnced:discord-rpc-release:v3.4.0")
include(implementation "com.github.MinnDevelopment:java-discord-rpc:v2.0.2")
// JSON Lib
include(implementation "org.json:json:${project.JSON}")
include(implementation "meteordevelopment:starscript:0.2.2")
modImplementation "ru.kelcuprum.alinlib:AlinLib:${project.alinlib}"
modImplementation "ru.kelcuprum.waterplayer:WaterPlayer:${project.waterplayer}"
include(implementation("meteordevelopment:starscript:0.2.2"))

subprojects.each {
implementation project(path: ":${it.name}", configuration: 'namedElements')
Expand All @@ -73,10 +67,6 @@ processResources {

def targetJavaVersion = 17
tasks.withType(JavaCompile).configureEach {
// ensure that the encoding is set to UTF-8, no matter what the system default is
// this fixes some edge cases with special characters not displaying correctly
// see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html
// If Javadoc is generated, this must be specified in that task too.
it.options.encoding = "UTF-8"
if (targetJavaVersion >= 10 || JavaVersion.current().isJava10Compatible()) {
it.options.release = targetJavaVersion
Expand Down
30 changes: 12 additions & 18 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,28 +1,22 @@
# Done to increase the memory available to gradle.
org.gradle.jvmargs=-Xmx1G
org.gradle.jvmargs=-Xmx2G

# Fabric Properties
# check these on https://modmuss50.me/fabric.html
minecraft_version=1.20.1
yarn_mappings=1.20.1+build.10
loader_version=0.14.22
minecraft_version=1.20.3
parchment_version=2023.12.31
fabric_version=0.83.1+1.20.1
loader_version=0.15.3

# Mod Properties
mod_version = 2.0.0
mod_version = 2.1.0-dev.1
maven_group = ru.kelcuprum
archives_base_name = SimplyStatus

# Dependencies
# check this on https://modmuss50.me/fabric.html
fabric_version=0.83.1+1.20.1

# Mods
modmenu_version=8.0.0
musicplayer=1.19.4:2.6.0.206
replaymod=1.20.1-2.6.13
plasmovoice=fabric-1.20.1-2.0.6
svc=fabric-1.20.1-2.4.16
fastload=3.4.0
waterplayer=1.0.0
yacl=3.1.0+1.20
JSON=20230618
modmenu_version=9.0.0
replaymod=1.20.4-2.6.14
plasmovoice=fabric-1.20.3-2.0.8
svc=fabric-1.20.4-2.4.32
waterplayer=1.1.0-alpha.7-t1
alinlib=1.1.0-dev.5+git.8db9a8b
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Binary file removed offlineLibs/WaterPlayer-1.0.0.jar
Binary file not shown.
8 changes: 4 additions & 4 deletions settings.gradle
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
pluginManagement {
repositories {
maven {
name = 'Fabric'
url = 'https://maven.fabricmc.net/'
}
maven { url "https://maven.fabricmc.net/" }
maven { url "https://maven.architectury.dev/" }
maven { url "https://maven.minecraftforge.net/" }
maven { url "https://maven.neoforged.net/releases" }
gradlePluginPortal()
}
}

0 comments on commit 5fd0554

Please sign in to comment.