From 9c9974de5baf0cc269605da599e0dd4caf507bd1 Mon Sep 17 00:00:00 2001
From: TomTheFurry <tomlee92502@yahoo.com>
Date: Thu, 7 Jul 2022 21:16:58 +0800
Subject: [PATCH] Update CI??? And also start 1.6.5a release.

---
 .gitlab-ci.yml    | 35 ++++++++++++++++++++---------------
 gradle.properties |  4 ++--
 2 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6d73eb2c3..e7b19314a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -26,9 +26,10 @@ build_16_5:
   stage: build_16_5
   script:
     - echo "Building 1.16.5..."
-    - ./gradlew deleteMerged --gradle-user-home cache/;
-    - ./gradlew build -PmcVer=1.16.5 --gradle-user-home cache/;
-    - ./gradlew merge --gradle-user-home cache/;
+    - ./gradlew deleteMerged -PmcVer="1.16.5" --gradle-user-home cache/;
+    - ./gradlew clean -PmcVer="1.16.5"
+    - ./gradlew build -PmcVer="1.16.5" --gradle-user-home cache/;
+    - ./gradlew merge -PmcVer="1.16.5" --gradle-user-home cache/;
   image: eclipse-temurin:16
   artifacts:
     name: "Merged_NightlyBuild_1_16_5-${CI_COMMIT_SHORT_SHA}-${CI_COMMIT_TIMESTAMP}"
@@ -49,9 +50,10 @@ build_17_1:
   stage: build_17_1
   script:
     - echo "Building 1.17.1..."
-    - ./gradlew deleteMerged --gradle-user-home cache/;
-    - ./gradlew build -PmcVer=1.17.1 --gradle-user-home cache/;
-    - ./gradlew merge --gradle-user-home cache/;
+    - ./gradlew deleteMerged -PmcVer="1.17.1" --gradle-user-home cache/;
+    - ./gradlew clean -PmcVer="1.17.1"
+    - ./gradlew build -PmcVer="1.17.1" --gradle-user-home cache/;
+    - ./gradlew merge -PmcVer="1.17.1" --gradle-user-home cache/;
   image: eclipse-temurin:16
   artifacts:
     name: "Merged_NightlyBuild_1_17_1-${CI_COMMIT_SHORT_SHA}-${CI_COMMIT_TIMESTAMP}"
@@ -73,9 +75,10 @@ build_18_1:
   stage: build_18_1
   script: 
     - echo "Building 1.18.1..."
-    - ./gradlew deleteMerged --gradle-user-home cache/; # make sure any previously merged jars are removed before running this job
-    - ./gradlew build -PmcVer=1.18.1 --gradle-user-home cache/; 
-    - ./gradlew merge --gradle-user-home cache/;
+    - ./gradlew deleteMerged -PmcVer="1.18.1" --gradle-user-home cache/; # make sure any previously merged jars are removed before running this job
+    - ./gradlew clean -PmcVer="1.18.1"
+    - ./gradlew build -PmcVer="1.18.1" --gradle-user-home cache/;
+    - ./gradlew merge -PmcVer="1.18.1" --gradle-user-home cache/;
   # build using Java 17
   image: eclipse-temurin:17
   artifacts:
@@ -98,9 +101,10 @@ build_18_2:
   stage: build_18_2
   script:
     - echo "Building 1.18.2..."
-    - ./gradlew deleteMerged --gradle-user-home cache/;
-    - ./gradlew build -PmcVer=1.18.2 --gradle-user-home cache/;
-    - ./gradlew merge --gradle-user-home cache/;
+    - ./gradlew deleteMerged -PmcVer="1.18.2" --gradle-user-home cache/;
+    - ./gradlew clean -PmcVer="1.18.2"
+    - ./gradlew build -PmcVer="1.18.2" --gradle-user-home cache/;
+    - ./gradlew merge -PmcVer="1.18.2" --gradle-user-home cache/;
   image: eclipse-temurin:17
   artifacts:
     name: "Merged_NightlyBuild_1_18_2-${CI_COMMIT_SHORT_SHA}-${CI_COMMIT_TIMESTAMP}"
@@ -121,9 +125,10 @@ build_19:
   stage: build_19
   script:
     - echo "Building 1.19..."
-    - ./gradlew deleteMerged --gradle-user-home cache/;
-    - ./gradlew build -PmcVer=1.19 --gradle-user-home cache/;
-    - ./gradlew merge --gradle-user-home cache/;
+    - ./gradlew deleteMerged -PmcVer="1.19" --gradle-user-home cache/;
+    - ./gradlew clean -PmcVer="1.19"
+    - ./gradlew build -PmcVer="1.19" --gradle-user-home cache/;
+    - ./gradlew merge -PmcVer="1.19" --gradle-user-home cache/;
   image: eclipse-temurin:17
   artifacts:
     name: "Merged_NightlyBuild_1_19-${CI_COMMIT_SHORT_SHA}-${CI_COMMIT_TIMESTAMP}"
diff --git a/gradle.properties b/gradle.properties
index 697c08828..394f60901 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -5,7 +5,7 @@ maven_group=com.seibel.lod
 archives_base_name=DistantHorizons
 
 # Mod info
-mod_version=1.6.4a
+mod_version=1.6.5a
 mod_name=Distant Horizons
 mod_description=This mod generates and renders simplified terrain beyond the normal view distance at a low performance cost. Allowing you to see much farther without turning your game into a slideshow.
 mod_authors=["James Seibel", "Leonardo Amato", "Cola", "coolGi", "Ran", "Leetom"]
@@ -20,4 +20,4 @@ enabled_platforms=fabric,forge
 mcVersions=1.16.5,1.17.1,1.18.1,1.18.2,1.19
 
 ##### FOR IDE SUPPORT AND TELL IDE TO USE CERTIAN MC VERSION: SWITCH THIS:
-mcVer=1.19
\ No newline at end of file
+mcVer=1.16.5
\ No newline at end of file