Fusion (Connected Textures) and Tags

manmaed · Aug 18, 2024 · 973b41a · 973b41a
1 parent 71068aa
commit 973b41a
Show file tree

Hide file tree

Showing 89 changed files with 1,117 additions and 385 deletions.
diff --git a/.github/workflows/forge.1.20.build.yml b/.github/workflows/forge.1.20.build.yml
@@ -3,7 +3,7 @@ name: Build & Release For Minecraft 1.20 - Forge
 on:
   push:
     tags:
-      - 'v*'
+      - 'v*-forge'
 
 jobs:
   build:
@@ -27,9 +27,10 @@ jobs:
         run: |
           rm -f ~/.gradle/caches/modules-2/modules-2.lock
           rm -f ~/.gradle/caches/modules-2/gc.properties
-      - name: Build & release to curseforge
+      - name: Build & release to curseforge & modrinth
         env:
           CURSE_DEPLOY: ${{ secrets.CURSE_DEPLOY }}
+          MODRINTH_DEPLOY: ${{ secrets.MODRINTH_DEPLOY }}
         run: |
           chmod +x ./gradlew
-          ./gradlew build curseforge --stacktrace --no-daemon
+          ./gradlew build publishMods --stacktrace --no-daemon
diff --git a/build.gradle b/build.gradle
@@ -3,7 +3,7 @@ plugins {
     id 'idea'
     id 'maven-publish'
     id 'net.minecraftforge.gradle' version '[6.0,6.2)'
-    id 'com.matthewprenger.cursegradle' version '1.4.0'
+    id "me.modmuss50.mod-publish-plugin" version "0.4.5"
 }
 
 repositories {
@@ -115,23 +115,28 @@ publishing {
     }
 }
 
-if (ENV.CURSE_DEPLOY) {
+publishMods {
+    dryRun = (providers.environmentVariable("CURSE_DEPLOY").getOrNull() || providers.environmentVariable("MODRINTH_DEPLOY").getOrNull()) == null
+    file = jar.archiveFile
+    modLoaders.add("forge")
+    type = BETA
+    changelog = "changeme"
+    displayName = "${mod_name} v${project.version} - Forge - ${minecraft_version}"
     curseforge {
-        apiKey = ENV.CURSE_DEPLOY
-        project {
-            id = project.curseforge_id
-            releaseType = "${curseforge_releasetype}"
-            addGameVersion "Forge"
-            addGameVersion "Java 17"
-            addGameVersion "${minecraft_version}"
-            mainArtifact(jar) {
-                displayName = "${mod_name} v${version} - Forge - ${minecraft_version}"
-                relations {
-                    optionalDependency 'ctm'
-                }
-            }
-            changelog = "changeme"
-
+        accessToken = providers.environmentVariable("CURSE_DEPLOY")
+        projectId = project.curseforge_id
+        minecraftVersions.add("Java 17")
+        minecraftVersions.add("${minecraft_version}")
+        optional {
+            slug = 'fusion-connected-textures'
+        }
+    }
+    modrinth {
+        accessToken = providers.environmentVariable("MODRINTH_DEPLOY")
+        projectId  = project.modrinth_id
+        minecraftVersions.add("${minecraft_version}")
+        optional {
+            slug = 'fusion-connected-textures'
         }
     }
 }

diff --git a/gradle.properties b/gradle.properties
@@ -17,3 +17,6 @@ curseforge_id=715567
 curseforge_releasetype=beta
 ctm_id=267602
 ctm_file_id=4377961
+
+#Modrinth Stuff
+modrinth_id=uLWeFJiL
diff --git a/src/generated/resources/.cache/24248c47e4f890e59c8abec99e4f37cb8e68e13f b/src/generated/resources/.cache/24248c47e4f890e59c8abec99e4f37cb8e68e13f
@@ -1,3 +1,11 @@
-// 1.20	2023-06-09T14:49:54.1724795	Tags for minecraft:block mod id antiblocksrechiseled
-e8a51ccff6897210007da67c225cacf32ce2af40 data/minecraft/tags/blocks/mineable/pickaxe.json
-e8a51ccff6897210007da67c225cacf32ce2af40 data/minecraft/tags/blocks/needs_iron_tool.json
+// 1.20	2024-08-18T22:32:02.789308	Tags for minecraft:block mod id antiblocksrechiseled
+0e28f3b1d50e042f07a3b712c88bc2caab68968e data/antiblocksrechiseled/tags/blocks/antiblock_bright_colors.json
+daa3875b6c723ed549d5b536e1f96a948c0e8476 data/antiblocksrechiseled/tags/blocks/antiblock_without_borders.json
+a9bb53db5ca978058be3cdd8293b688fb437d902 data/antiblocksrechiseled/tags/blocks/antiblock_with_borders.json
+84491f0873be093b737fd9267dd0ed606ed4ab51 data/antiblocksrechiseled/tags/blocks/antiblock_wool_colors.json
+0298961f202469594d99d6749585a3df5e6c9654 data/minecraft/tags/blocks/buttons.json
+23f195bdbfc5ed4974c279bb937e7fc08975c3bd data/minecraft/tags/blocks/mineable/pickaxe.json
+23f195bdbfc5ed4974c279bb937e7fc08975c3bd data/minecraft/tags/blocks/needs_iron_tool.json
+51100bb256af613505c9d2a0caaae978dbf50452 data/minecraft/tags/blocks/pressure_plates.json
+776e37935e00306758e40c7f1052089ff3243f50 data/minecraft/tags/blocks/slabs.json
+35508908209834b62fe88bb6dea0018ef6fa2ded data/minecraft/tags/blocks/stairs.json
diff --git a/src/generated/resources/data/antiblocksrechiseled/tags/blocks/antiblock_bright_colors.json b/src/generated/resources/data/antiblocksrechiseled/tags/blocks/antiblock_bright_colors.json
@@ -0,0 +1,22 @@
+{
+  "values": [
+    "antiblocksrechiseled:bright_white_border",
+    "antiblocksrechiseled:bright_orange_border",
+    "antiblocksrechiseled:bright_magenta_border",
+    "antiblocksrechiseled:bright_yellow_border",
+    "antiblocksrechiseled:bright_cyan_border",
+    "antiblocksrechiseled:bright_blue_border",
+    "antiblocksrechiseled:bright_green_border",
+    "antiblocksrechiseled:bright_red_border",
+    "antiblocksrechiseled:bright_black_border",
+    "antiblocksrechiseled:bright_white_border",
+    "antiblocksrechiseled:bright_orange_border",
+    "antiblocksrechiseled:bright_magenta_border",
+    "antiblocksrechiseled:bright_yellow_border",
+    "antiblocksrechiseled:bright_cyan_border",
+    "antiblocksrechiseled:bright_blue_border",
+    "antiblocksrechiseled:bright_green_border",
+    "antiblocksrechiseled:bright_red_border",
+    "antiblocksrechiseled:bright_black_border"
+  ]
+}
diff --git a/src/generated/resources/data/antiblocksrechiseled/tags/blocks/antiblock_with_borders.json b/src/generated/resources/data/antiblocksrechiseled/tags/blocks/antiblock_with_borders.json
@@ -0,0 +1,28 @@
+{
+  "values": [
+    "antiblocksrechiseled:bright_white_border",
+    "antiblocksrechiseled:bright_orange_border",
+    "antiblocksrechiseled:bright_magenta_border",
+    "antiblocksrechiseled:bright_yellow_border",
+    "antiblocksrechiseled:bright_cyan_border",
+    "antiblocksrechiseled:bright_blue_border",
+    "antiblocksrechiseled:bright_green_border",
+    "antiblocksrechiseled:bright_red_border",
+    "antiblocksrechiseled:bright_black_border",
+    "antiblocksrechiseled:wool_white_border",
+    "antiblocksrechiseled:wool_orange_border",
+    "antiblocksrechiseled:wool_magenta_border",
+    "antiblocksrechiseled:wool_light_blue_border",
+    "antiblocksrechiseled:wool_yellow_border",
+    "antiblocksrechiseled:wool_lime_border",
+    "antiblocksrechiseled:wool_pink_border",
+    "antiblocksrechiseled:wool_gray_border",
+    "antiblocksrechiseled:wool_light_gray_border",
+    "antiblocksrechiseled:wool_cyan_border",
+    "antiblocksrechiseled:wool_purple_border",
+    "antiblocksrechiseled:wool_blue_border",
+    "antiblocksrechiseled:wool_brown_border",
+    "antiblocksrechiseled:wool_green_border",
+    "antiblocksrechiseled:wool_red_border"
+  ]
+}
diff --git a/src/generated/resources/data/antiblocksrechiseled/tags/blocks/antiblock_without_borders.json b/src/generated/resources/data/antiblocksrechiseled/tags/blocks/antiblock_without_borders.json
@@ -0,0 +1,28 @@
+{
+  "values": [
+    "antiblocksrechiseled:bright_white",
+    "antiblocksrechiseled:bright_orange",
+    "antiblocksrechiseled:bright_magenta",
+    "antiblocksrechiseled:bright_yellow",
+    "antiblocksrechiseled:bright_cyan",
+    "antiblocksrechiseled:bright_blue",
+    "antiblocksrechiseled:bright_green",
+    "antiblocksrechiseled:bright_red",
+    "antiblocksrechiseled:bright_black",
+    "antiblocksrechiseled:wool_white",
+    "antiblocksrechiseled:wool_orange",
+    "antiblocksrechiseled:wool_magenta",
+    "antiblocksrechiseled:wool_light_blue",
+    "antiblocksrechiseled:wool_yellow",
+    "antiblocksrechiseled:wool_lime",
+    "antiblocksrechiseled:wool_pink",
+    "antiblocksrechiseled:wool_gray",
+    "antiblocksrechiseled:wool_light_gray",
+    "antiblocksrechiseled:wool_cyan",
+    "antiblocksrechiseled:wool_purple",
+    "antiblocksrechiseled:wool_blue",
+    "antiblocksrechiseled:wool_brown",
+    "antiblocksrechiseled:wool_green",
+    "antiblocksrechiseled:wool_red"
+  ]
+}
diff --git a/src/generated/resources/data/antiblocksrechiseled/tags/blocks/antiblock_wool_colors.json b/src/generated/resources/data/antiblocksrechiseled/tags/blocks/antiblock_wool_colors.json
@@ -0,0 +1,34 @@
+{
+  "values": [
+    "antiblocksrechiseled:wool_white_border",
+    "antiblocksrechiseled:wool_orange_border",
+    "antiblocksrechiseled:wool_magenta_border",
+    "antiblocksrechiseled:wool_light_blue_border",
+    "antiblocksrechiseled:wool_yellow_border",
+    "antiblocksrechiseled:wool_lime_border",
+    "antiblocksrechiseled:wool_pink_border",
+    "antiblocksrechiseled:wool_gray_border",
+    "antiblocksrechiseled:wool_light_gray_border",
+    "antiblocksrechiseled:wool_cyan_border",
+    "antiblocksrechiseled:wool_purple_border",
+    "antiblocksrechiseled:wool_blue_border",
+    "antiblocksrechiseled:wool_brown_border",
+    "antiblocksrechiseled:wool_green_border",
+    "antiblocksrechiseled:wool_red_border",
+    "antiblocksrechiseled:wool_white",
+    "antiblocksrechiseled:wool_orange",
+    "antiblocksrechiseled:wool_magenta",
+    "antiblocksrechiseled:wool_light_blue",
+    "antiblocksrechiseled:wool_yellow",
+    "antiblocksrechiseled:wool_lime",
+    "antiblocksrechiseled:wool_pink",
+    "antiblocksrechiseled:wool_gray",
+    "antiblocksrechiseled:wool_light_gray",
+    "antiblocksrechiseled:wool_cyan",
+    "antiblocksrechiseled:wool_purple",
+    "antiblocksrechiseled:wool_blue",
+    "antiblocksrechiseled:wool_brown",
+    "antiblocksrechiseled:wool_green",
+    "antiblocksrechiseled:wool_red"
+  ]
+}
diff --git a/src/generated/resources/data/minecraft/tags/blocks/buttons.json b/src/generated/resources/data/minecraft/tags/blocks/buttons.json
@@ -0,0 +1,28 @@
+{
+  "values": [
+    "antiblocksrechiseled:button_bright_white",
+    "antiblocksrechiseled:button_bright_orange",
+    "antiblocksrechiseled:button_bright_magenta",
+    "antiblocksrechiseled:button_bright_yellow",
+    "antiblocksrechiseled:button_bright_cyan",
+    "antiblocksrechiseled:button_bright_blue",
+    "antiblocksrechiseled:button_bright_green",
+    "antiblocksrechiseled:button_bright_red",
+    "antiblocksrechiseled:button_bright_black",
+    "antiblocksrechiseled:button_wool_white",
+    "antiblocksrechiseled:button_wool_orange",
+    "antiblocksrechiseled:button_wool_magenta",
+    "antiblocksrechiseled:button_wool_light_blue",
+    "antiblocksrechiseled:button_wool_yellow",
+    "antiblocksrechiseled:button_wool_lime",
+    "antiblocksrechiseled:button_wool_pink",
+    "antiblocksrechiseled:button_wool_gray",
+    "antiblocksrechiseled:button_wool_light_gray",
+    "antiblocksrechiseled:button_wool_cyan",
+    "antiblocksrechiseled:button_wool_purple",
+    "antiblocksrechiseled:button_wool_blue",
+    "antiblocksrechiseled:button_wool_brown",
+    "antiblocksrechiseled:button_wool_green",
+    "antiblocksrechiseled:button_wool_red"
+  ]
+}
diff --git a/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json b/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json
@@ -1,14 +1,5 @@
 {
   "values": [
-    "antiblocksrechiseled:bright_white",
-    "antiblocksrechiseled:bright_orange",
-    "antiblocksrechiseled:bright_magenta",
-    "antiblocksrechiseled:bright_yellow",
-    "antiblocksrechiseled:bright_cyan",
-    "antiblocksrechiseled:bright_blue",
-    "antiblocksrechiseled:bright_green",
-    "antiblocksrechiseled:bright_red",
-    "antiblocksrechiseled:bright_black",
     "antiblocksrechiseled:bright_white_border",
     "antiblocksrechiseled:bright_orange_border",
     "antiblocksrechiseled:bright_magenta_border",
@@ -18,21 +9,15 @@
     "antiblocksrechiseled:bright_green_border",
     "antiblocksrechiseled:bright_red_border",
     "antiblocksrechiseled:bright_black_border",
-    "antiblocksrechiseled:wool_white",
-    "antiblocksrechiseled:wool_orange",
-    "antiblocksrechiseled:wool_magenta",
-    "antiblocksrechiseled:wool_light_blue",
-    "antiblocksrechiseled:wool_yellow",
-    "antiblocksrechiseled:wool_lime",
-    "antiblocksrechiseled:wool_pink",
-    "antiblocksrechiseled:wool_gray",
-    "antiblocksrechiseled:wool_light_gray",
-    "antiblocksrechiseled:wool_cyan",
-    "antiblocksrechiseled:wool_purple",
-    "antiblocksrechiseled:wool_blue",
-    "antiblocksrechiseled:wool_brown",
-    "antiblocksrechiseled:wool_green",
-    "antiblocksrechiseled:wool_red",
+    "antiblocksrechiseled:bright_white",
+    "antiblocksrechiseled:bright_orange",
+    "antiblocksrechiseled:bright_magenta",
+    "antiblocksrechiseled:bright_yellow",
+    "antiblocksrechiseled:bright_cyan",
+    "antiblocksrechiseled:bright_blue",
+    "antiblocksrechiseled:bright_green",
+    "antiblocksrechiseled:bright_red",
+    "antiblocksrechiseled:bright_black",
     "antiblocksrechiseled:wool_white_border",
     "antiblocksrechiseled:wool_orange_border",
     "antiblocksrechiseled:wool_magenta_border",
@@ -48,6 +33,21 @@
     "antiblocksrechiseled:wool_brown_border",
     "antiblocksrechiseled:wool_green_border",
     "antiblocksrechiseled:wool_red_border",
+    "antiblocksrechiseled:wool_white",
+    "antiblocksrechiseled:wool_orange",
+    "antiblocksrechiseled:wool_magenta",
+    "antiblocksrechiseled:wool_light_blue",
+    "antiblocksrechiseled:wool_yellow",
+    "antiblocksrechiseled:wool_lime",
+    "antiblocksrechiseled:wool_pink",
+    "antiblocksrechiseled:wool_gray",
+    "antiblocksrechiseled:wool_light_gray",
+    "antiblocksrechiseled:wool_cyan",
+    "antiblocksrechiseled:wool_purple",
+    "antiblocksrechiseled:wool_blue",
+    "antiblocksrechiseled:wool_brown",
+    "antiblocksrechiseled:wool_green",
+    "antiblocksrechiseled:wool_red",
     "antiblocksrechiseled:slab_white_bright",
     "antiblocksrechiseled:slab_black",
     "antiblocksrechiseled:slab_orange_bright",

diff --git a/src/generated/resources/data/minecraft/tags/blocks/needs_iron_tool.json b/src/generated/resources/data/minecraft/tags/blocks/needs_iron_tool.json
@@ -1,14 +1,5 @@
 {
   "values": [
-    "antiblocksrechiseled:bright_white",
-    "antiblocksrechiseled:bright_orange",
-    "antiblocksrechiseled:bright_magenta",
-    "antiblocksrechiseled:bright_yellow",
-    "antiblocksrechiseled:bright_cyan",
-    "antiblocksrechiseled:bright_blue",
-    "antiblocksrechiseled:bright_green",
-    "antiblocksrechiseled:bright_red",
-    "antiblocksrechiseled:bright_black",
     "antiblocksrechiseled:bright_white_border",
     "antiblocksrechiseled:bright_orange_border",
     "antiblocksrechiseled:bright_magenta_border",
@@ -18,21 +9,15 @@
     "antiblocksrechiseled:bright_green_border",
     "antiblocksrechiseled:bright_red_border",
     "antiblocksrechiseled:bright_black_border",
-    "antiblocksrechiseled:wool_white",
-    "antiblocksrechiseled:wool_orange",
-    "antiblocksrechiseled:wool_magenta",
-    "antiblocksrechiseled:wool_light_blue",
-    "antiblocksrechiseled:wool_yellow",
-    "antiblocksrechiseled:wool_lime",
-    "antiblocksrechiseled:wool_pink",
-    "antiblocksrechiseled:wool_gray",
-    "antiblocksrechiseled:wool_light_gray",
-    "antiblocksrechiseled:wool_cyan",
-    "antiblocksrechiseled:wool_purple",
-    "antiblocksrechiseled:wool_blue",
-    "antiblocksrechiseled:wool_brown",
-    "antiblocksrechiseled:wool_green",
-    "antiblocksrechiseled:wool_red",
+    "antiblocksrechiseled:bright_white",
+    "antiblocksrechiseled:bright_orange",
+    "antiblocksrechiseled:bright_magenta",
+    "antiblocksrechiseled:bright_yellow",
+    "antiblocksrechiseled:bright_cyan",
+    "antiblocksrechiseled:bright_blue",
+    "antiblocksrechiseled:bright_green",
+    "antiblocksrechiseled:bright_red",
+    "antiblocksrechiseled:bright_black",
     "antiblocksrechiseled:wool_white_border",
     "antiblocksrechiseled:wool_orange_border",
     "antiblocksrechiseled:wool_magenta_border",
@@ -48,6 +33,21 @@
     "antiblocksrechiseled:wool_brown_border",
     "antiblocksrechiseled:wool_green_border",
     "antiblocksrechiseled:wool_red_border",
+    "antiblocksrechiseled:wool_white",
+    "antiblocksrechiseled:wool_orange",
+    "antiblocksrechiseled:wool_magenta",
+    "antiblocksrechiseled:wool_light_blue",
+    "antiblocksrechiseled:wool_yellow",
+    "antiblocksrechiseled:wool_lime",
+    "antiblocksrechiseled:wool_pink",
+    "antiblocksrechiseled:wool_gray",
+    "antiblocksrechiseled:wool_light_gray",
+    "antiblocksrechiseled:wool_cyan",
+    "antiblocksrechiseled:wool_purple",
+    "antiblocksrechiseled:wool_blue",
+    "antiblocksrechiseled:wool_brown",
+    "antiblocksrechiseled:wool_green",
+    "antiblocksrechiseled:wool_red",
     "antiblocksrechiseled:slab_white_bright",
     "antiblocksrechiseled:slab_black",
     "antiblocksrechiseled:slab_orange_bright",