Update for 1.18

.gitlab-ci.yml

@@ -1,32 +1,2 @@
-image: gradle:jdk17
+include:
-
+  - remote: 'https://jfmods.gitlab.io/scripts/jfmod.yml'
-variables:
-  GRADLE_OPTS: "-Dorg.gradle.daemon=false"
-
-before_script:
-  - export GRADLE_USER_HOME=`pwd`/.gradle
-
-stages:
-  - build
-  - deploy
-
-build_test:
-  stage: build
-  script:
-    - gradle --build-cache build
-    - cp build/libs/* ./
-    - mv *-dev.jar dev.zip
-    - mv *.jar latest.jar
-    - mv dev.zip latest-dev.jar
-  artifacts:
-    paths:
-      - build/libs
-      - latest.jar
-      - latest-dev.jar
-
-deploy:
-  rules:
-    - if: $CI_COMMIT_TAG && '$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME =~ /^master/'
-  stage: deploy
-  script:
-    - gradle --build-cache build curseforge modrinth

build.gradle

@@ -1,24 +1,9 @@
-apply from: "https://gitlab.com/-/snippets/2121059/raw/master/jfbase.gradle"
+apply from: "https://jfmods.gitlab.io/scripts/jfmod.gradle"
-
-repositories {
-    maven {
-        name = 'TerraformersMC'
-        url = 'https://maven.terraformersmc.com/'
-    }
-    maven {
-        url "https://gitlab.com/api/v4/projects/25805200/packages/maven"
-    }
-}
 
 dependencies {
-    //to change the versions see the gradle.properties file
-    minecraft "com.mojang:minecraft:${project.minecraft_version}"
-    mappings "net.fabricmc:yarn:${project.minecraft_version}+${project.yarn_mappings}:v2"
-    modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
-
     include modImplementation("io.gitlab.jfronny.libjf:libjf-config-v0:${project.jfapi_version}")
     include("io.gitlab.jfronny.libjf:libjf-unsafe-v0:${project.jfapi_version}")
     include("io.gitlab.jfronny.libjf:libjf-base:${project.jfapi_version}")
 
-    modImplementation "com.terraformersmc:modmenu:2.0.14"
+    modImplementation "com.terraformersmc:modmenu:3.0.0"
 }

gradle.properties

@@ -2,19 +2,18 @@
 org.gradle.jvmargs=-Xmx1G
 # Fabric Properties
 # check these on https://fabricmc.net/versions.html
-minecraft_version=1.17.1
+minecraft_version=1.18
-yarn_mappings=build.61
+yarn_mappings=build.1
-loader_version=0.12.5
+loader_version=0.12.6
 # Mod Properties
-mod_version=2.3.0
 maven_group=io.gitlab.jfronny
 archives_base_name=modsmod
 
-jfapi_version=2.1.3
+jfapi_version=2.2.0
 
 modrinth_id=4GhX11Ed
 modrinth_required_dependencies=
-modrinth_optional_dependencies=wRE7Emzz
+modrinth_optional_dependencies=JPP6w2U1
 curseforge_id=405095
 curseforge_required_dependencies=
 curseforge_optional_dependencies=modmenu