From 5c7dfc59057f0d48153c659445bb49e2e650eb49 Mon Sep 17 00:00:00 2001 From: coolGi2007 Date: Fri, 1 Apr 2022 17:35:00 +1030 Subject: [PATCH] Downgraded stuff (removes fabric api) and updated gitlab cd --- .gitlab-ci.yml | 105 ++++------------------ core | 2 +- fabric/build.gradle | 8 +- fabric/src/main/resources/fabric.mod.json | 4 +- 4 files changed, 30 insertions(+), 89 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 852e341fa..9cb0fd6a6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,16 +3,9 @@ image: gradle:eclipse-temurin # all stages need to be defined here stages: - - gradleSetup - - build - - merge + - build_17_1 variables: - # Disable the Gradle daemon for Continuous Integration servers as correctness - # is usually a priority over speed in CI environments. Using a fresh - # runtime for each build is more reliable since the runtime is completely - # isolated from any previous builds. - GRADLE_OPTS: "-Dorg.gradle.daemon=false" # Pull core when building GIT_SUBMODULE_STRATEGY: recursive @@ -23,91 +16,30 @@ before_script: - echo GE_JOB_ID=$CI_JOB_ID >> generate_jars.env - - -# first stage -# This prevents us from re-downloading Gradle every stage -gradleSetup: - stage: gradleSetup - script: ./gradlew --build-cache --gradle-user-home cache/ check - # build using Java 17 - image: eclipse-temurin:17 - cache: - key: - files: - - gradle/wrapper/gradle-wrapper.properties - policy: push - paths: - - cache/ - - - -# second stage -build: - stage: build - script: ./gradlew build --gradle-user-home cache/ - # build using Java 17 - image: eclipse-temurin:17 - cache: - key: "$CI_COMMIT_REF_NAME" - policy: pull-push - paths: - - .architectury-transformer - - .gradle - - build - - common/.gradle - - common/build - - core/.gradle - - core/build - - fabric/.gradle - - fabric/src/generated - - forge/.gradle - - forge/src/generated - - build - - .gradle - - cache/ +# 1.17.1 build +build_17_1: + stage: build_17_1 + script: + - ./gradlew deleteMerged --gradle-user-home cache/; # make sure any previously merged jars are removed before running this job + - ./gradlew build -PmcVer=1.17.1 --gradle-user-home cache/; + - ./gradlew merge --gradle-user-home cache/; + # build using Java 16 + image: eclipse-temurin:16 artifacts: - name: "NightlyBuild-$CI_COMMIT_SHORT_SHA}-${CI_COMMIT_TIMESTAMP}" - paths: - # relative to the root directory - - fabric/build/libs - - forge/build/libs - exclude: - - fabric/build/libs/*-dev.jar - - fabric/build/libs/*-dev-shadow.jar - - fabric/build/libs/*-sources-dev.jar - - fabric/build/libs/*-sources.jar - - forge/build/libs/*-dev.jar - - forge/build/libs/*-dev-shadow.jar - - forge/build/libs/*-sources-dev.jar - - forge/build/libs/*-sources.jar - reports: - # To ensure we've access to these files in the next stage - dotenv: generate_jars.env - expire_in: 1 day - -# third stage -merge: - stage: merge - script: ./gradlew merge --gradle-user-home cache/ - # build using Java 17 - image: eclipse-temurin:17 - cache: - key: "$CI_COMMIT_REF_NAME" - policy: pull-push - paths: - - build - - .gradle - - cache/ - artifacts: - name: "Merged_NightlyBuild-${CI_COMMIT_SHORT_SHA}-${CI_COMMIT_TIMESTAMP}" + name: "Merged_NightlyBuild_1_17_1-${CI_COMMIT_SHORT_SHA}-${CI_COMMIT_TIMESTAMP}" paths: # relative to the root directory - Merged expire_in: 1 day + cache: + key: "gradleCache" + policy: pull-push + paths: + - .gradle + - cache/ -## forth stage +# unused deployment stage #deploy: # stage: deploy # image: registry.gitlab.com/gitlab-org/release-cli:latest @@ -130,3 +62,4 @@ merge: # url: 'https://gitlab.com/jeseibel/minecraft-lod-mod/cw/-/jobs/${GE_JOB_ID}/artifacts/file/fabric/build/libs' # - name: 'Forge Jars' # url: 'https://gitlab.com/jeseibel/minecraft-lod-mod/cw/-/jobs/${GE_JOB_ID}/artifacts/file/forge/build/libs' + diff --git a/core b/core index 4c984c5c1..3259f502e 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 4c984c5c102aaee9fd5a34acf94aa0ffbdbfacb1 +Subproject commit 3259f502e8a085dc6cfe720ab14e5cf8addec378 diff --git a/fabric/build.gradle b/fabric/build.gradle index 32f739e58..bddb81d6e 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -17,6 +17,10 @@ configurations { compileClasspath.extendsFrom common runtimeClasspath.extendsFrom common developmentFabric.extendsFrom common + + addModJar + include.extendsFrom addModJar + modImplementation.extendsFrom addModJar } repositories { @@ -36,7 +40,9 @@ dependencies { modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}" // Fabric API - modApi "net.fabricmc.fabric-api:fabric-api:${rootProject.fabric_api_version}" + addModJar(fabricApi.module("fabric-lifecycle-events-v1", rootProject.fabric_api_version)) + addModJar(fabricApi.module("fabric-key-binding-api-v1", rootProject.fabric_api_version)) + addModJar(fabricApi.module("fabric-networking-api-v1", rootProject.fabric_api_version)) // Mod Menu modImplementation("com.terraformersmc:modmenu:${rootProject.modmenu_version}") { diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json index 7f5921c3d..f67d3e452 100644 --- a/fabric/src/main/resources/fabric.mod.json +++ b/fabric/src/main/resources/fabric.mod.json @@ -33,7 +33,9 @@ "accessWidener" : "lod.accesswidener", "depends": { "fabricloader": "*", - "fabric": "*", + "fabric-lifecycle-events-v1": "*", + "fabric-key-binding-api-v1": "*", + "fabric-networking-api-v1": "*", "minecraft": "${minecraft_version}", "java": ">=${java_version}" },