From f971cd5036ff3a3f2cf41c460d3ee4d5706c9624 Mon Sep 17 00:00:00 2001
From: JFronny <33260128+jfronny@users.noreply.github.com>
Date: Sat, 15 May 2021 19:01:08 +0200
Subject: [PATCH] Use custom script

---
 .gitlab-ci.yml    |  6 ++++++
 build.gradle      | 51 +++--------------------------------------------
 gradle.properties |  9 ++++++++-
 settings.gradle   |  1 -
 4 files changed, 17 insertions(+), 50 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ab11e56..53c590a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -21,3 +21,9 @@ build_test:
       - latest-dev.jar
   only:
     - master
+
+deploy:
+  stage: deploy
+  when: manual
+  script:
+    - gradle --build-cache publishModrinth curseforge
diff --git a/build.gradle b/build.gradle
index 989b15b..71e6927 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,18 +1,4 @@
-import net.fabricmc.loom.configuration.ide.RunConfigSettings
-import net.fabricmc.loom.task.RunGameTask
-import net.fabricmc.loom.LoomGradleExtension
-
-plugins {
-    id 'fabric-loom' version '0.7-SNAPSHOT'
-    id 'maven-publish'
-}
-
-sourceCompatibility = JavaVersion.VERSION_1_8
-targetCompatibility = JavaVersion.VERSION_1_8
-
-archivesBaseName = project.archives_base_name
-version = project.mod_version
-group = project.maven_group
+apply from: "https://gitlab.com/-/snippets/2121059/raw/master/jfbase.gradle"
 
 repositories {
     maven { url = 'https://maven.terraformersmc.com/'; name = "ModMenu" }
@@ -34,41 +20,10 @@ dependencies {
     modImplementation "com.terraformersmc:modmenu:1.16.9"
 }
 
-task runTestmodClient(type: RunGameTask, constructorArgs: [getExtensions().getByType(LoomGradleExtension.class).getRunConfigs().getByName("client")]) {
+task runTestmodClient(type: TestmodTask, constructorArgs: ["client"]) {
     classpath sourceSets.testmod.runtimeClasspath
 }
 
-task runTestmodServer(type: RunGameTask, constructorArgs: [getExtensions().getByType(LoomGradleExtension.class).getRunConfigs().getByName("server")]) {
+task runTestmodServer(type: TestmodTask, constructorArgs: ["server"]) {
     classpath sourceSets.testmod.runtimeClasspath
 }
-
-processResources {
-    inputs.property "version", project.version
-
-    filesMatching("fabric.mod.json") {
-        expand "version": project.version
-    }
-}
-
-// 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
-tasks.withType(JavaCompile) {
-    options.encoding = "UTF-8"
-    def targetVersion = 8
-    if (JavaVersion.current().isJava9Compatible()) {
-        it.options.release = targetVersion
-    }
-}
-
-// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
-// if it is present.
-// If you remove this task, sources will not be generated.
-task sourcesJar(type: Jar, dependsOn: classes) {
-    classifier = "sources"
-    from sourceSets.main.allSource
-}
-
-jar {
-    from "LICENSE"
-}
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index 272d591..07f4adb 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -8,4 +8,11 @@ loader_version=0.11.3
 # Mod Properties
 mod_version=1.0.0
 maven_group=io.gitlab.jfronny
-archives_base_name=libjf
\ No newline at end of file
+archives_base_name=libjf
+
+modrinth_id=WKwQAwke
+modrinth_required_dependencies=
+modrinth_optional_dependencies=
+curseforge_id=482600
+curseforge_required_dependencies=
+curseforge_optional_dependencies=
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
index 5b60df3..f91a4fe 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,6 +1,5 @@
 pluginManagement {
     repositories {
-        jcenter()
         maven {
             name = 'Fabric'
             url = 'https://maven.fabricmc.net/'