diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 437cd39..5fca094 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: windows-latest steps: - name: checkout uses: actions/checkout@v4 @@ -11,7 +11,7 @@ jobs: - name: setup java uses: actions/setup-java@v4 with: - distribution: temurin + distribution: zulu java-version: 17 - name: setup gradle @@ -20,10 +20,10 @@ 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@v3 + - name: upload artifacts + 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 1514683..aa68846 100755 --- a/build.gradle +++ b/build.gradle @@ -22,13 +22,12 @@ allprojects { tasks.withType(JavaCompile).configureEach { options.encoding = 'UTF-8' options.release.set(17) - options.compilerArgs += ['-Xplugin:Manifold'] + options.compilerArgs += ['-Xplugin:Manifold', '-implicit:none'] } } 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,11 @@ def setup() { def setupForgixAndMachete() { forgix { - group = project.group + group = rootProject.maven_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/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 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/' }