Merge pull request #10 from manmaed/neo/1.20.4-feat-fct

implements #9 and  Down ports  Modrinth Auto  Deploy

build.gradle

@@ -51,31 +51,23 @@ sourceSets.main.resources {
 
 dependencies {
     implementation "net.neoforged:neoforge:${neo_version}"
-}
-tasks.withType(ProcessResources).configureEach {
-    var replaceProperties = [
-            version: version
-    ]
-    inputs.properties replaceProperties
+    implementation "curse.maven:fusion-connected-textures-${fusion_id}:${fusion_fileid}"
+    //implementation "curse.maven:ctm-${ctm_id}:${ctm_file_id}"
 
-    filesMatching(['META-INF/mods.toml', 'pack.mcmeta']) {
-        expand replaceProperties + [project: project]
-    }
 }
-
 /*tasks.withType(ProcessResources).configureEach {
     var replaceProperties = [
             version: version
     ]
     inputs.properties replaceProperties
 
-    filesMatching(['META-INF/mods.toml']) {
+    filesMatching(['META-INF/mods.toml', 'pack.mcmeta']) {
         expand replaceProperties + [project: project]
     }
 }*/
 
 publishMods {
-    dryRun = providers.environmentVariable("CURSE_DEPLOY").getOrNull() == null
+    dryRun = (providers.environmentVariable("CURSE_DEPLOY").getOrNull() || providers.environmentVariable("MODRINTH_DEPLOY").getOrNull()) == null
     file = jar.archiveFile
     modLoaders.add("neoforge")
     type = BETA
@@ -87,6 +79,11 @@ publishMods {
         minecraftVersions.add("Java 17")
         minecraftVersions.add("${minecraft_version}")
     }
+    modrinth {
+        accessToken = providers.environmentVariable("MODRINTH_DEPLOY")
+        projectId  = "${modrinth_id}"
+        minecraftVersions.add("${minecraft_version}")
+    }
 }
 
 tasks.withType(JavaCompile).configureEach {

gradle.properties

@@ -5,19 +5,23 @@ org.gradle.daemon=false
 
 # Neo Stuff
 minecraft_version=1.20.4
-neo_version=20.4.3-beta
+neo_version=20.4.200
 minecraft_mappings=official
 
 # Mod Properties
-	maven_group = net.manmaed
-	archives_base_name = antiblocksrechiseled
+maven_group = net.manmaed
+archives_base_name = antiblocksrechiseled
 
 # Mod Stuff
-mod_name=antiblocksrechiseled
+mod_name=AntiBlocksReChiseled
 mod_version=0.7
 
 #CurseForge Stuff
 curseforge_id=715567
-curseforge_releasetype=beta
 ctm_id=267602
 ctm_file_id=4377961
+fusion_id=854949
+fusion_fileid=5129341
+
+#Modrinth Stuff
+modrinth_id=uLWeFJiL

src/main/resources/META-INF/mods.toml

@@ -12,7 +12,7 @@ logoFile="abrc.logo.png"
 description='''Readds The AnitBlocks From Chsiel'''
 [[dependencies.antiblocksrechiseled]]
 modId="neoforge"
-mandatory=true
-versionRange="[20.4.3-beta,)"
+required=true
+versionRange="[20.4.200,)"
 ordering="NONE"
 side="BOTH"

src/main/resources/fusion-overrides/assets/antiblocksrechiseled/models/block/bright/black_border.json

@@ -0,0 +1,16 @@
+{
+  "type": "fusion:connecting",
+  "parent": "antiblocksrechiseled:block/full_bright",
+  "connections": {
+    "type": "fusion:or",
+    "predicates": [
+      {
+        "type": "fusion:is_same_block"
+      }
+    ]
+  },
+  "loader": "fusion:model",
+  "textures": {
+    "color": "antiblocksrechiseled:block/bright/black_border"
+  }
+}

src/main/resources/fusion-overrides/assets/antiblocksrechiseled/models/block/bright/blue_border.json

@@ -0,0 +1,16 @@
+{
+  "type": "fusion:connecting",
+  "parent": "antiblocksrechiseled:block/full_bright",
+  "connections": {
+    "type": "fusion:or",
+    "predicates": [
+      {
+        "type": "fusion:is_same_block"
+      }
+    ]
+  },
+  "loader": "fusion:model",
+  "textures": {
+    "color": "antiblocksrechiseled:block/bright/blue_border"
+  }
+}

src/main/resources/fusion-overrides/assets/antiblocksrechiseled/models/block/bright/cyan_border.json

@@ -0,0 +1,16 @@
+{
+  "type": "fusion:connecting",
+  "parent": "antiblocksrechiseled:block/full_bright",
+  "connections": {
+    "type": "fusion:or",
+    "predicates": [
+      {
+        "type": "fusion:is_same_block"
+      }
+    ]
+  },
+  "loader": "fusion:model",
+  "textures": {
+    "color": "antiblocksrechiseled:block/bright/cyan_border"
+  }
+}

src/main/resources/fusion-overrides/assets/antiblocksrechiseled/models/block/bright/green_border.json

@@ -0,0 +1,16 @@
+{
+  "type": "fusion:connecting",
+  "parent": "antiblocksrechiseled:block/full_bright",
+  "connections": {
+    "type": "fusion:or",
+    "predicates": [
+      {
+        "type": "fusion:is_same_block"
+      }
+    ]
+  },
+  "loader": "fusion:model",
+  "textures": {
+    "color": "antiblocksrechiseled:block/bright/green_border"
+  }
+}

src/main/resources/fusion-overrides/assets/antiblocksrechiseled/models/block/bright/magenta_border.json

@@ -0,0 +1,16 @@
+{
+  "type": "fusion:connecting",
+  "parent": "antiblocksrechiseled:block/full_bright",
+  "connections": {
+    "type": "fusion:or",
+    "predicates": [
+      {
+        "type": "fusion:is_same_block"
+      }
+    ]
+  },
+  "loader": "fusion:model",
+  "textures": {
+    "color": "antiblocksrechiseled:block/bright/magenta_border"
+  }
+}

src/main/resources/fusion-overrides/assets/antiblocksrechiseled/models/block/bright/orange_border.json

@@ -0,0 +1,16 @@
+{
+  "type": "fusion:connecting",
+  "parent": "antiblocksrechiseled:block/full_bright",
+  "connections": {
+    "type": "fusion:or",
+    "predicates": [
+      {
+        "type": "fusion:is_same_block"
+      }
+    ]
+  },
+  "loader": "fusion:model",
+  "textures": {
+    "color": "antiblocksrechiseled:block/bright/orange_border"
+  }
+}

src/main/resources/fusion-overrides/assets/antiblocksrechiseled/models/block/bright/red_border.json

@@ -0,0 +1,16 @@
+{
+  "type": "fusion:connecting",
+  "parent": "antiblocksrechiseled:block/full_bright",
+  "connections": {
+    "type": "fusion:or",
+    "predicates": [
+      {
+        "type": "fusion:is_same_block"
+      }
+    ]
+  },
+  "loader": "fusion:model",
+  "textures": {
+    "color": "antiblocksrechiseled:block/bright/red_border"
+  }
+}

src/main/resources/fusion-overrides/assets/antiblocksrechiseled/models/block/bright/white_border.json

@@ -0,0 +1,16 @@
+{
+  "type": "fusion:connecting",
+  "parent": "antiblocksrechiseled:block/full_bright",
+  "connections": {
+    "type": "fusion:or",
+    "predicates": [
+      {
+        "type": "fusion:is_same_block"
+      }
+    ]
+  },
+  "loader": "fusion:model",
+  "textures": {
+    "color": "antiblocksrechiseled:block/bright/white_border"
+  }
+}

src/main/resources/fusion-overrides/assets/antiblocksrechiseled/models/block/bright/yellow_border.json

@@ -0,0 +1,16 @@
+{
+  "type": "fusion:connecting",
+  "parent": "antiblocksrechiseled:block/full_bright",
+  "connections": {
+    "type": "fusion:or",
+    "predicates": [
+      {
+        "type": "fusion:is_same_block"
+      }
+    ]
+  },
+  "loader": "fusion:model",
+  "textures": {
+    "color": "antiblocksrechiseled:block/bright/yellow_border"
+  }
+}

src/main/resources/fusion-overrides/assets/antiblocksrechiseled/models/block/wool/blue_border.json

@@ -0,0 +1,16 @@
+{
+  "type": "fusion:connecting",
+  "parent": "antiblocksrechiseled:block/full_bright",
+  "connections": {
+    "type": "fusion:or",
+    "predicates": [
+      {
+        "type": "fusion:is_same_block"
+      }
+    ]
+  },
+  "loader": "fusion:model",
+  "textures": {
+    "color": "antiblocksrechiseled:block/wool/blue_border"
+  }
+}

src/main/resources/fusion-overrides/assets/antiblocksrechiseled/models/block/wool/brown_border.json

@@ -0,0 +1,16 @@
+{
+  "type": "fusion:connecting",
+  "parent": "antiblocksrechiseled:block/full_bright",
+  "connections": {
+    "type": "fusion:or",
+    "predicates": [
+      {
+        "type": "fusion:is_same_block"
+      }
+    ]
+  },
+  "loader": "fusion:model",
+  "textures": {
+    "color": "antiblocksrechiseled:block/wool/brown_border"
+  }
+}

src/main/resources/fusion-overrides/assets/antiblocksrechiseled/models/block/wool/cyan_border.json

@@ -0,0 +1,16 @@
+{
+  "type": "fusion:connecting",
+  "parent": "antiblocksrechiseled:block/full_bright",
+  "connections": {
+    "type": "fusion:or",
+    "predicates": [
+      {
+        "type": "fusion:is_same_block"
+      }
+    ]
+  },
+  "loader": "fusion:model",
+  "textures": {
+    "color": "antiblocksrechiseled:block/wool/cyan_border"
+  }
+}

src/main/resources/fusion-overrides/assets/antiblocksrechiseled/models/block/wool/gray_border.json

@@ -0,0 +1,16 @@
+{
+  "type": "fusion:connecting",
+  "parent": "antiblocksrechiseled:block/full_bright",
+  "connections": {
+    "type": "fusion:or",
+    "predicates": [
+      {
+        "type": "fusion:is_same_block"
+      }
+    ]
+  },
+  "loader": "fusion:model",
+  "textures": {
+    "color": "antiblocksrechiseled:block/wool/gray_border"
+  }
+}

src/main/resources/fusion-overrides/assets/antiblocksrechiseled/models/block/wool/green_border.json

@@ -0,0 +1,16 @@
+{
+  "type": "fusion:connecting",
+  "parent": "antiblocksrechiseled:block/full_bright",
+  "connections": {
+    "type": "fusion:or",
+    "predicates": [
+      {
+        "type": "fusion:is_same_block"
+      }
+    ]
+  },
+  "loader": "fusion:model",
+  "textures": {
+    "color": "antiblocksrechiseled:block/wool/green_border"
+  }
+}

src/main/resources/fusion-overrides/assets/antiblocksrechiseled/models/block/wool/light_blue_border.json

@@ -0,0 +1,16 @@
+{
+  "type": "fusion:connecting",
+  "parent": "antiblocksrechiseled:block/full_bright",
+  "connections": {
+    "type": "fusion:or",
+    "predicates": [
+      {
+        "type": "fusion:is_same_block"
+      }
+    ]
+  },
+  "loader": "fusion:model",
+  "textures": {
+    "color": "antiblocksrechiseled:block/wool/light_blue_border"
+  }
+}

src/main/resources/fusion-overrides/assets/antiblocksrechiseled/models/block/wool/light_gray_border.json

@@ -0,0 +1,16 @@
+{
+  "type": "fusion:connecting",
+  "parent": "antiblocksrechiseled:block/full_bright",
+  "connections": {
+    "type": "fusion:or",
+    "predicates": [
+      {
+        "type": "fusion:is_same_block"
+      }
+    ]
+  },
+  "loader": "fusion:model",
+  "textures": {
+    "color": "antiblocksrechiseled:block/wool/light_gray_border"
+  }
+}

src/main/resources/fusion-overrides/assets/antiblocksrechiseled/models/block/wool/lime_border.json

@@ -0,0 +1,16 @@
+{
+  "type": "fusion:connecting",
+  "parent": "antiblocksrechiseled:block/full_bright",
+  "connections": {
+    "type": "fusion:or",
+    "predicates": [
+      {
+        "type": "fusion:is_same_block"
+      }
+    ]
+  },
+  "loader": "fusion:model",
+  "textures": {
+    "color": "antiblocksrechiseled:block/wool/lime_border"
+  }
+}