More build script stuff

.gitlab-ci.yml

@@ -9,7 +9,7 @@ before_script:
 build_test:
   stage: deploy
   script:
-    - gradle --build-cache build publish -PpublicMaven
+    - gradle --build-cache build publish -PpublicMaven -Ppipeline=$CI_PIPELINE_ID
     - cp build/libs/* ./
     - rm *-maven.jar *-sources.jar *-sources-dev.jar
     - mv *-dev.jar dev.zip
@@ -25,7 +25,7 @@ deploy:
   stage: deploy
   when: manual
   script:
-    - gradle --build-cache publish modrinth curseforge -Ptype=release -PpublicMaven
+    - gradle --build-cache publish modrinth curseforge -PpublicMaven
   only:
     - master
 

build.gradle

@@ -10,11 +10,8 @@ plugins {
 }
 
 def ENV = System.getenv()
-ext.isRelease = project.hasProperty('type') && project.getProperty('type').equals("release")
 ext.isPublicMaven = project.hasProperty('publicMaven')
-version = "$project.mod_version" + (ext.isRelease
-        ? (ENV.CI_PIPELINE_ID ? "+" + ENV.CI_PIPELINE_ID : "")
-        : "")
+version = "$project.mod_version" + (project.hasProperty('pipeline') ? "+" + project.getProperty('pipeline') : "")
 
 static Node getOrCreateNode(Node node, String name) {
     Node dependencies = null

libjf-data-manipulation-v0/src/main/java/io/gitlab/jfronny/libjf/data/manipulation/HookImplementation.java

@@ -12,7 +12,6 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.util.Collection;
 import java.util.function.Predicate;
-import java.util.function.Supplier;
 
 public class HookImplementation {
     private static boolean disabled = false;