Updated Upstream

.github/workflows/build.yml

@@ -21,8 +21,8 @@ jobs:
           distribution: temurin
           java-version: 17
 
-      - name: Grant ALL permissions to theme
-        run: sudo chmod -R 777 theme
+      - name: Grant permissions to src-theme
+        run: sudo chmod -R 777 src-theme
 
       - name: Setup and build
         uses: gradle/gradle-build-action@v2

README.md

@@ -35,7 +35,7 @@ For those who are unfamiliar with the license, here is a summary of its main poi
 LiquidBounce uses Gradle, to make sure that it is installed properly you can check [Gradle's website](https://gradle.org/install/).
 1. Clone the repository using `git clone --recurse-submodules https://github.com/CCBlueX/LiquidBounce`. 
 2. CD into the local repository.
-3. Run `gradlew genSources`.
+3. Run `./gradlew genSources`.
 4. Open the folder as a Gradle project in your preferred IDE.
 5. Run the client.
 

build.gradle

@@ -21,11 +21,9 @@ plugins {
     id "fabric-loom"
     id "org.jetbrains.kotlin.jvm"
     id "com.github.johnrengelman.shadow" version "7.1.2"
-    id "org.jlleitschuh.gradle.ktlint" version "11.0.0"
+    id "org.jlleitschuh.gradle.ktlint" version "11.1.0"
 }
 
-import net.fabricmc.loom.task.RemapJarTask
-
 ktlint {
     enableExperimentalRules = true
     ignoreFailures = true
@@ -83,16 +81,6 @@ dependencies {
     // modRuntimeOnly "com.github.CaffeineMC:lithium-fabric:${project.lithium_version}"
     // modRuntime "com.github.CaffeineMC:phosphor-fabric:${project.phosphor_version}"
 
-    // Baritone
-//    modRuntime ("com.github.CCBlueX:baritone:${project.minecraft_version}-SNAPSHOT") {
-//        exclude group: "org.ow2.asm", module: "asm-debug-all"
-//        exclude group: "org.lwjgl.lwjgl", module: "lwjgl"
-//        exclude group: "org.lwjgl.lwjgl", module: "lwjgl-platform"
-//        exclude group: "net.java.jinput", module: "jinput"
-//        exclude group: "net.java.jinput", module: "jinput-platform"
-//        exclude group: "net.sf.jopt-simple", module: "jopt-simple"
-//    }
-
     // fix nullable imports
     implementation "com.google.code.findbugs:jsr305:3.0.2"
 
@@ -109,11 +97,9 @@ dependencies {
 
     implementation fileTree(include: ['*.jar'], dir: 'libs')
 
-    implementation project(":theme")
-
     // Test libraries
 
-    testImplementation "org.junit.jupiter:junit-jupiter:5.9.1"
+    testImplementation "org.junit.jupiter:junit-jupiter:5.9.2"
 }
 
 processResources {
@@ -124,6 +110,26 @@ processResources {
     }
 }
 
+// The following code will include the theme into the build
+
+task makeTheme(type: Exec) {
+    workingDir file("src-theme")
+    commandLine "python", "build.py"
+    doLast {
+        println "Successfully exported theme.zip"
+    }
+}
+
+sourceSets {
+    main {
+        resources {
+            srcDirs "src-theme/resources"
+        }
+    }
+}
+
+processResources.dependsOn makeTheme
+
 // 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
@@ -168,22 +174,18 @@ shadowJar {
         include(dependency('com.labymedia:ultralight-java-gpu'))
         include(dependency('com.thealtening.api:api'))
         include(dependency('com.github.CCBlueX:Elixir'))
-        include(project(":theme"))
     }
+
 }
 
 jar {
     from "LICENSE"
 }
 
-task remapShadow(type: RemapJarTask, dependsOn: shadowJar) {
-    setInput(shadowJar.archiveFile)
-    remapAccessWidener.set(true)
-    addNestedDependencies.set(remapJar.addNestedDependencies)
+remapJar {
+    inputFile = shadowJar.archiveFile
 }
 
-build.dependsOn remapShadow
-
 task copyZipInclude(type: Copy) {
     from 'zip_include/'
     into 'build/libs/zip'

gradle.properties

@@ -30,7 +30,7 @@ loader_version=0.14.10
 fabric_version=0.59.1+1.18.2
 
 # Loom
-loom_version=0.10-SNAPSHOT
+loom_version=1.1-SNAPSHOT
 
 # Mod Properties
 mod_version=1.0.0

settings.gradle

@@ -33,5 +33,3 @@ pluginManagement {
     }
 
 }
-
-include "theme"

src-theme/.gitignore

@@ -0,0 +1,10 @@
+.idea/*
+*.iml
+*.ipr
+*.iws
+/.settings/
+/.gradle/
+/build/
+/out/
+/resources
+/theme.zip