Merge pull request #82 from QUT-MC-Club/2.2.0

Add Fabric 1.21.4 support

Author: WildBamaBoy

build.gradle.kts

@@ -91,4 +91,15 @@ fabric1211Project.configure<JavaPluginExtension> {
             }
         }
     }
+}
+
+val fabric1214Project = project(":fabric-1.21.4")
+fabric1214Project.configure<JavaPluginExtension> {
+    sourceSets {
+        getByName("main") {
+            java {
+                srcDir("src/main/kotlin")
+            }
+        }
+    }
 }

build.sh

@@ -12,5 +12,6 @@ mv bungeecord/build/libs/tebex*.jar build/libs/
 mv fabric-1.20.1/build/libs/tebex*.jar build/libs/
 mv fabric-1.20.4/build/libs/tebex*.jar build/libs/
 mv fabric-1.21.1/build/libs/tebex*.jar build/libs/
+mv fabric-1.21.4/build/libs/tebex*.jar build/libs/
 mv velocity/build/libs/tebex*.jar build/libs/
 mv sdk/build/libs/tebex*.jar build/libs/

fabric-1.21.4/.gitignore

@@ -0,0 +1,42 @@
+.gradle
+build/
+!gradle/wrapper/gradle-wrapper.jar
+!**/src/main/**/build/
+!**/src/test/**/build/
+
+### IntelliJ IDEA ###
+.idea/modules.xml
+.idea/jarRepositories.xml
+.idea/compiler.xml
+.idea/libraries/
+*.iws
+*.iml
+*.ipr
+out/
+!**/src/main/**/out/
+!**/src/test/**/out/
+
+### Eclipse ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+bin/
+!**/src/main/**/bin/
+!**/src/test/**/bin/
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+
+### VS Code ###
+.vscode/
+
+### Mac OS ###
+.DS_Store

fabric-1.21.4/build.gradle.kts

@@ -0,0 +1,67 @@
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+
+group = rootProject.group
+version = rootProject.version
+
+plugins {
+    java
+    id("com.gradleup.shadow")
+    id("fabric-loom") version "1.7-SNAPSHOT" apply(true)
+}
+
+var minecraftVersion = properties["minecraft_version"] as String
+var yarnMappings = properties["yarn_mappings"] as String
+var loaderVersion = properties["loader_version"] as String
+var fabricVersion = properties["fabric_version"] as String
+
+java {
+    toolchain.languageVersion.set(JavaLanguageVersion.of(21))
+    sourceCompatibility = JavaVersion.VERSION_21
+    targetCompatibility = JavaVersion.VERSION_21
+}
+
+dependencies {
+    shadow(project(":sdk"))
+
+    shadow("com.github.cryptomorin:XSeries:9.3.1") {
+        isTransitive = false
+    }
+
+    minecraft("com.mojang:minecraft:${minecraftVersion}")
+    mappings("net.fabricmc:yarn:${yarnMappings}:v2")
+
+    modImplementation("net.fabricmc:fabric-loader:${loaderVersion}")
+    modImplementation("net.fabricmc.fabric-api:fabric-api:${fabricVersion}")
+
+    compileOnly("dev.dejvokep:boosted-yaml:1.3")
+
+    modImplementation("me.lucko:fabric-permissions-api:0.3.1")
+    include("me.lucko:fabric-permissions-api:0.3.1")
+}
+
+
+tasks.named("shadowJar", ShadowJar::class.java) {
+    configurations = listOf(project.configurations.shadow.get())
+
+    relocate("okhttp3", "io.tebex.plugin.libs.okhttp3")
+    relocate("okio", "io.tebex.plugin.libs.okio")
+    relocate("dev.dejvokep.boostedyaml", "io.tebex.plugin.libs.boostedyaml")
+    relocate("org.jetbrains.annotations", "io.tebex.plugin.libs.jetbrains")
+    relocate("kotlin", "io.tebex.plugin.libs.kotlin")
+    relocate("com.google.gson", "io.tebex.plugin.libs.gson")
+    minimize()
+
+    archiveFileName.set("${project.name}-${project.version}-shadow.jar")
+
+    finalizedBy("remapJar")
+}
+
+tasks.remapJar {
+    dependsOn("shadowJar")
+    val shadowJar = tasks.shadowJar.get()
+
+    inputFile.set(shadowJar.archiveFile)
+    archiveFileName.set("tebex-${project.name}-${project.version}.jar")
+    archiveClassifier.set(shadowJar.archiveClassifier)
+    delete(shadowJar.archiveFile)
+}

fabric-1.21.4/gradle.properties

@@ -0,0 +1,14 @@
+# Fabric Properties
+# check these on https://fabricmc.net/develop
+minecraft_version=1.21.4
+yarn_mappings=1.21.4+build.8
+loader_version=0.16.10
+
+#Fabric api
+fabric_version=0.118.5+1.21.4
+
+# Mod Properties
+mod_version=2.1.0-hotfix.1
+maven_group=io.tebex.plugin
+archives_base_name=tebexplugin
+