feat: Update to Minecraft 1.21

TwelveIterationMods · Jun 8, 2024 · ec9d138 · ec9d138
1 parent b7ee8d9
commit ec9d138
Show file tree

Hide file tree

Showing 10 changed files with 28 additions and 20 deletions.
diff --git a/.github/workflows/build.yml → .github/workflows/build.yml.disabled b/.github/workflows/build.yml → .github/workflows/build.yml.disabled
diff --git a/.github/workflows/publish-snapshot.yml b/.github/workflows/publish-snapshot.yml
@@ -1,8 +1,8 @@
 name: publish-snapshot
 on:
   push:
-    tags:
-      - '*'
+    branches:
+      - '**'
 
 jobs:
   publish-snapshot:
@@ -12,6 +12,7 @@ jobs:
     strategy:
       matrix:
         loader: [common, fabric, forge, neoforge]
+      fail-fast: false
     steps:
       - name: Checkout repository
         uses: actions/checkout@v3
@@ -32,7 +33,7 @@ jobs:
         uses: TwelveIterationMods/bump-version@v1
         with:
           version: ${{ steps.extract-version.outputs.version }}
-          bump: minor
+          bump: patch
         id: bump-version
       - name: Publish
         run: ./gradlew :${{ matrix.loader }}:publish '-Pversion=${{ steps.bump-version.outputs.version }}-SNAPSHOT' '-PtwelveIterationsNexusUsername=${{ secrets.NEXUS_USER }}' '-PtwelveIterationsNexusPassword=${{ secrets.NEXUS_PASSWORD }}'
diff --git a/.gitignore b/.gitignore
@@ -21,4 +21,7 @@ build
 eclipse
 run
 runs
+runserver
 logs
+
+common/src/generated/resources/.cache
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,5 @@
+Updated to Minecraft 1.21
+
 - Updated to Minecraft 1.20.6
 - Added support for Amecs modifier defaults
 - Possibly fixed a bug where default key mappings would not be applied if the game crashed before being able to save options
diff --git a/fabric/dependencies.gradle b/fabric/dependencies.gradle
@@ -2,6 +2,6 @@ dependencies {
     modImplementation("net.blay09.mods:balm-fabric:${balm_version}") {
         changing = balm_version.contains("SNAPSHOT")
     }
-    modImplementation "com.terraformersmc:modmenu:$modmenu_version"
+    modCompileOnly "com.terraformersmc:modmenu:$modmenu_version"
     modCompileOnly("de.siphalor:amecsapi-1.20:1.5.2+mc1.20-pre1")
 }
diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json
@@ -34,11 +34,11 @@
   ],
 
   "depends": {
-    "fabricloader": ">=0.14",
+    "fabricloader": ">=${fabric_loader_version}",
     "fabric-api": "*",
     "balm-fabric": "*",
-    "minecraft": ">=1.20.2",
-    "java": ">=17"
+    "minecraft": "${minecraft_version_range}",
+    "java": ">=${java_version}"
   },
   "suggests": {
   },

diff --git a/forge/build.gradle b/forge/build.gradle
@@ -1,6 +1,6 @@
 plugins {
     id 'multiloader-loader'
-    id 'net.minecraftforge.gradle' version '[6.0,6.2)'
+    id 'net.minecraftforge.gradle' version '[6.0.25,6.2)'
     id 'org.spongepowered.mixin'
     id 'net.darkhax.curseforgegradle'
     id "com.modrinth.minotaur"

diff --git a/gradle.properties b/gradle.properties
@@ -3,7 +3,7 @@ mod_id = defaultoptions
 mod_name = Default Options
 mod_main=DefaultOptions
 description=A way for modpacks to ship a default (key) configuration without having to include an options.txt file. Also allows local options from any mod .cfg file.
-version = 21.0.1
+version = 21.0.0
 group = net.blay09.mods
 homepage=https://mods.twelveiterations.com/mc/defaultoptions
 sources=https://github.com/TwelveIterationMods/DefaultOptions
@@ -18,15 +18,15 @@ modrinth_release_type = release
 modrinth_project_id = WEg59z5b
 
 # Minecraft
-minecraft_version = 1.20.6
-minecraft_versions = 1.20.6
-minecraft_version_range = [1.20.6,1.21)
+minecraft_version = 1.21-pre4
+minecraft_versions = 1.21-pre4
+minecraft_version_range = 1.21-beta.4
 pack_format_number = 18
 java_version = 21
 
 # Balm
-balm_version = 10.1.0-SNAPSHOT
-balm_version_range = [10.0.0,)
+balm_version = 21.0.1-SNAPSHOT
+balm_version_range = [21.0.0,)
 
 # Forge
 forge_version = 50.0.22
@@ -39,7 +39,7 @@ neoforge_version_range = [20.6,)
 neoforge_loader_version_range = [1,)
 
 # Fabric
-fabric_version = 0.98.0+1.20.6
+fabric_version = 0.100.0+1.21
 fabric_loader_version = 0.15.11
 
 # Dependencies
@@ -50,4 +50,5 @@ modmenu_version=9.0.0
 org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
 mod_author = BlayTheNinth
-credits = BlayTheNinth
+credits = BlayTheNinth
+kuma_version = [21.0,22)
diff --git a/repositories.gradle b/repositories.gradle
@@ -33,6 +33,7 @@ repositories {
         url = "https://maven.terraformersmc.com/releases"
         content {
             includeGroup "com.terraformersmc"
+            includeGroup "dev.emi"
         }
     }
 
@@ -56,8 +57,8 @@ repositories {
             includeGroup "us.dynmap"
         }
     }
-
-    maven {
+	
+	maven {
         url "https://maven.siphalor.de/"
         content {
             includeGroup "de.siphalor"

diff --git a/settings.gradle b/settings.gradle
@@ -57,5 +57,5 @@ plugins {
 
 include("common")
 include("fabric")
-include("forge")
-include("neoforge")
+// include("forge")
+// include("neoforge")
-Original file line number
+Diff line change
@@ Expand Up / @@ -21,4 +21,7 @@ build @@
     eclipse
     run
     runs
+    runserver
     logs
+    common/src/generated/resources/.cache