From 9e705441bacb83ce0da3c30919cd4490eff01591 Mon Sep 17 00:00:00 2001 From: Rhys <98863820+rhysdh540@users.noreply.github.com> Date: Fri, 19 Jan 2024 20:46:10 -0500 Subject: [PATCH 01/10] what does implicit mean --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 1514683..900f788 100755 --- a/build.gradle +++ b/build.gradle @@ -22,7 +22,7 @@ allprojects { tasks.withType(JavaCompile).configureEach { options.encoding = 'UTF-8' options.release.set(17) - options.compilerArgs += ['-Xplugin:Manifold'] + options.compilerArgs += ['-Xplugin:Manifold', '-implicit:none'] } } From 676742d2f5f85fb9c255da1b5bc6c9d197e1ef46 Mon Sep 17 00:00:00 2001 From: Rhys <98863820+rhysdh540@users.noreply.github.com> Date: Sun, 21 Jan 2024 14:12:50 -0500 Subject: [PATCH 02/10] is it just linux being weird? --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 437cd39..eef60dc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -3,7 +3,7 @@ on: [ workflow_dispatch, push, pull_request ] jobs: build: - runs-on: ubuntu-latest + runs-on: macos-latest steps: - name: checkout uses: actions/checkout@v4 From 23a342c66e36adeb68c9969b26263abbc231453d Mon Sep 17 00:00:00 2001 From: Rhys <98863820+rhysdh540@users.noreply.github.com> Date: Sun, 21 Jan 2024 16:31:59 -0500 Subject: [PATCH 03/10] fix forgix and update some stuff --- .github/workflows/build.yml | 2 +- .gitignore | 2 +- build.gradle | 7 +++++-- build.properties | 8 -------- gradle/platform.gradle | 2 ++ settings.gradle | 1 + 6 files changed, 10 insertions(+), 12 deletions(-) delete mode 100644 build.properties diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index eef60dc..63314db 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -23,7 +23,7 @@ jobs: run: ./gradlew clean assemble - name: Upload artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: unlimited-artifacts path: | diff --git a/.gitignore b/.gitignore index f9fca17..4aec3e8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,9 @@ build/ +!**/src/**/build/ **/run/ *.iml .gradle/ .idea/ -build.properties .DS_Store artifacts/ .architectury-transformer/ \ No newline at end of file diff --git a/build.gradle b/build.gradle index 900f788..ea1550d 100755 --- a/build.gradle +++ b/build.gradle @@ -28,7 +28,6 @@ allprojects { architectury { minecraft = minecraft_version - compileOnly() } clean { delete '.architectury-transformer' } @@ -73,6 +72,7 @@ def setup() { defineMixins() tasks.register('nukeGradleCaches') { + dependsOn clean group = 'build' doLast { allprojects.each { @@ -84,9 +84,12 @@ def setup() { def setupForgixAndMachete() { forgix { - group = project.group + group = rootProject.maven_group + println 'Group: ' + group mergedJarName = "createunlimited-${modVersion}.jar" outputDir = 'build/libs/merged' + + removeDuplicate('com.llamalad7.mixinextras') } machete { diff --git a/build.properties b/build.properties deleted file mode 100644 index 99b960c..0000000 --- a/build.properties +++ /dev/null @@ -1,8 +0,0 @@ -# DO NOT EDIT -# Generated by the build script. Change mcVer property to change minecraft version. - -PRE_CURRENT_MC_1_19_2= -MC_1_19_2= -POST_CURRENT_MC_1_19_2= -PRE_MC_1_20_1= -PRE_CURRENT_MC_1_20_1= diff --git a/gradle/platform.gradle b/gradle/platform.gradle index 1a485ce..fa71a6c 100644 --- a/gradle/platform.gradle +++ b/gradle/platform.gradle @@ -47,6 +47,8 @@ shadowJar { configurations = [project.configurations.shadowCommon, project.configurations.shade] archiveClassifier = "shadow-${project.name}" + + relocate('com.github.llamalad7.mixinextras', 'dev.rdh.createunlimited.shadow.mixinextras') } remapJar { diff --git a/settings.gradle b/settings.gradle index 10f26f3..d1fae93 100755 --- a/settings.gradle +++ b/settings.gradle @@ -1,5 +1,6 @@ pluginManagement { repositories { + mavenLocal() maven { url 'https://maven.fabricmc.net/' } maven { url 'https://maven.architectury.dev/' } maven { url 'https://maven.minecraftforge.net/' } From 3761a67d5c5c058e22f641b830984cc7591358a2 Mon Sep 17 00:00:00 2001 From: Rhys <98863820+rhysdh540@users.noreply.github.com> Date: Sun, 21 Jan 2024 16:47:06 -0500 Subject: [PATCH 04/10] discord --- .github/workflows/build.yml | 22 ++++++++++++++++++++-- build.gradle | 1 - 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 63314db..a740534 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -22,10 +22,28 @@ jobs: - name: do the build run: ./gradlew clean assemble - - name: Upload artifacts + - name: upload artifacts uses: actions/upload-artifact@v4 with: name: unlimited-artifacts path: | build/libs/merged/*.jar - */build/libs/*.jar \ No newline at end of file + */build/libs/*.jar + + - name: upload artifacts to discord + if: success() + uses: appleboy/upload-artifact-action@v1.0.0 + with: + webhook_id: ${{ secrets.WEBHOOK_ID }} + webhook_token: ${{ secrets.WEBHOOK_TOKEN }} + message: '# Build #${{ github.run_number }}' + file: | + build/libs/merged/*.jar + + - name: send failure message + if: failure() + uses: appleboy/discord-action@v1.0.0 + with: + webhook_id: ${{ secrets.WEBHOOK_ID }} + webhook_token: ${{ secrets.WEBHOOK_TOKEN }} + args: '# Build #${{ github.run_number }} failed' \ No newline at end of file diff --git a/build.gradle b/build.gradle index ea1550d..aa68846 100755 --- a/build.gradle +++ b/build.gradle @@ -85,7 +85,6 @@ def setup() { def setupForgixAndMachete() { forgix { group = rootProject.maven_group - println 'Group: ' + group mergedJarName = "createunlimited-${modVersion}.jar" outputDir = 'build/libs/merged' From 08f0dec77810de64d5c91b840d724a652d1f8e8c Mon Sep 17 00:00:00 2001 From: Rhys <98863820+rhysdh540@users.noreply.github.com> Date: Sun, 21 Jan 2024 16:47:41 -0500 Subject: [PATCH 05/10] me when copy and paste --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a740534..22241f0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -32,7 +32,7 @@ jobs: - name: upload artifacts to discord if: success() - uses: appleboy/upload-artifact-action@v1.0.0 + uses: appleboy/discord-action@v1.0.0 with: webhook_id: ${{ secrets.WEBHOOK_ID }} webhook_token: ${{ secrets.WEBHOOK_TOKEN }} From fdf7ac32b8335d30423d4f3d459b52e71078c78c Mon Sep 17 00:00:00 2001 From: Rhys <98863820+rhysdh540@users.noreply.github.com> Date: Sun, 21 Jan 2024 16:53:14 -0500 Subject: [PATCH 06/10] dum --- .github/workflows/build.yml | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 22241f0..2e8b410 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -3,7 +3,7 @@ on: [ workflow_dispatch, push, pull_request ] jobs: build: - runs-on: macos-latest + runs-on: windows-latest steps: - name: checkout uses: actions/checkout@v4 @@ -28,22 +28,4 @@ jobs: name: unlimited-artifacts path: | build/libs/merged/*.jar - */build/libs/*.jar - - - name: upload artifacts to discord - if: success() - uses: appleboy/discord-action@v1.0.0 - with: - webhook_id: ${{ secrets.WEBHOOK_ID }} - webhook_token: ${{ secrets.WEBHOOK_TOKEN }} - message: '# Build #${{ github.run_number }}' - file: | - build/libs/merged/*.jar - - - name: send failure message - if: failure() - uses: appleboy/discord-action@v1.0.0 - with: - webhook_id: ${{ secrets.WEBHOOK_ID }} - webhook_token: ${{ secrets.WEBHOOK_TOKEN }} - args: '# Build #${{ github.run_number }} failed' \ No newline at end of file + */build/libs/*.jar \ No newline at end of file From 89693b8e5ffa390c949aeff89da57394b4504cbb Mon Sep 17 00:00:00 2001 From: Rhys <98863820+rhysdh540@users.noreply.github.com> Date: Sun, 21 Jan 2024 16:54:24 -0500 Subject: [PATCH 07/10] ughhhhh windows --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2e8b410..4bd17e7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,7 +20,7 @@ jobs: cache-read-only: false - name: do the build - run: ./gradlew clean assemble + run: gradlew clean assemble - name: upload artifacts uses: actions/upload-artifact@v4 From 4ad1ba312ccf22cf5306244a01029b2dc16e9f5c Mon Sep 17 00:00:00 2001 From: Rhys <98863820+rhysdh540@users.noreply.github.com> Date: Sun, 21 Jan 2024 16:56:22 -0500 Subject: [PATCH 08/10] ughhhhh windows v2 --- .github/workflows/build.yml | 2 +- gradlew.bat | 92 +++++++++++++++++++++++++++++++++++++ 2 files changed, 93 insertions(+), 1 deletion(-) create mode 100644 gradlew.bat diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4bd17e7..2d18413 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -11,7 +11,7 @@ jobs: - name: setup java uses: actions/setup-java@v4 with: - distribution: temurin + distribution: zulu java-version: 17 - name: setup gradle diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..93e3f59 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,92 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega From 17d46c45d888f7cd6d90f45cf47e528dbd60aef6 Mon Sep 17 00:00:00 2001 From: Rhys <98863820+rhysdh540@users.noreply.github.com> Date: Sun, 21 Jan 2024 16:57:53 -0500 Subject: [PATCH 09/10] ughhhhh windows v3 --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2d18413..e3bd775 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,7 +20,7 @@ jobs: cache-read-only: false - name: do the build - run: gradlew clean assemble + run: gradlew.bat clean assemble - name: upload artifacts uses: actions/upload-artifact@v4 From 3051a640fe463a4bf14b6ca11d303fcdf744cf96 Mon Sep 17 00:00:00 2001 From: Rhys <98863820+rhysdh540@users.noreply.github.com> Date: Sun, 21 Jan 2024 17:00:59 -0500 Subject: [PATCH 10/10] ughhhhh windows v4 --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e3bd775..5fca094 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,7 +20,7 @@ jobs: cache-read-only: false - name: do the build - run: gradlew.bat clean assemble + run: .\gradlew.bat clean assemble - name: upload artifacts uses: actions/upload-artifact@v4