Merge pull request #3 from manmaed/neo/1.21-feat-multirocks

Neo/1.21 feat multirocks

.github/workflows/neo.1.21.build.yml

@@ -0,0 +1,36 @@
+name: Build & Release For Minecraft 1.21 - Neo
+
+on:
+  push:
+    tags:
+      - 'v*-neo'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Setup JDK 21
+        uses: actions/setup-java@v2
+        with:
+          java-version: '21'
+          distribution: 'temurin'
+      - uses: actions/cache@v3
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
+      - name: Cleanup Gradle Cache
+        run: |
+          rm -f ~/.gradle/caches/modules-2/modules-2.lock
+          rm -f ~/.gradle/caches/modules-2/gc.properties
+      - name: Build & release to curseforge & modrinth
+        env:
+          CURSE_DEPLOY: ${{ secrets.CURSE_DEPLOY }}
+          MODRINTH_DEPLOY: ${{ secrets.MODRINTH_DEPLOY }}
+        run: |
+          chmod +x ./gradlew
+          ./gradlew build publishMods --stacktrace --no-daemon

build.gradle

@@ -19,6 +19,9 @@ repositories {
     maven { 
         url 'https://maven.blamejared.com' 
     }
+    maven {
+        url 'https://maven.nanite.dev/'
+    }
 }
 
 base {
@@ -55,10 +58,11 @@ sourceSets.main.resources {
 dependencies {
     implementation "net.neoforged:neoforge:${neo_version}"
     runtimeOnly "curse.maven:jei-238222:5781938" //Just Enough Items
-    //compileOnly "vazkii.patchouli:Patchouli:${minecraft_version}-${patchouli_version}:api"
-    //runtimeOnly "vazkii.patchouli:Patchouli:${minecraft_version}-${patchouli_version}"
+    compileOnly "vazkii.patchouli:Patchouli:${minecraft_version}-${patchouli_version}:api"
+    runtimeOnly "vazkii.patchouli:Patchouli:${minecraft_version}-${patchouli_version}"
     //runtimeOnly "curse.maven:CP-267193:3915811"
-    //runtimeOnly "curse.maven:${tk_slug}-${tk_pid}:${tk_fid}"
+    runtimeOnly "curse.maven:architectury-419699:5786327"
+    runtimeOnly "curse.maven:toolkit-324888:5521502"
 }
 tasks.withType(ProcessResources).configureEach {
     var replaceProperties = [

gradle.properties

@@ -20,7 +20,6 @@ mod_version=0.18
 curseforge_id=230556
 
 #Other Mods
-patchouli_version=77-SNAPSHOT
-tk_slug=tk
-tk_pid=324888
-tk_fid=3827921
+patchouli_version=87-NEOFORGE-SNAPSHOT
+toolkit_version=87.0.1
+jei_version=19.8.2.99

src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924

@@ -0,0 +1,4 @@
+// 1.21	2024-10-11T16:44:14.9784635	Registries
+c34d991a19c0ba5698aab824c367216c8002b112 data/petrock/neoforge/biome_modifier/ore_stoneium.json
+02a2ce55d768e52abc0580b791c03b427edd5b00 data/petrock/worldgen/configured_feature/ore_stoneium.json
+e63883e11583307b102ba58f572dfef314534797 data/petrock/worldgen/placed_feature/ore_stoneium.json

src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d

@@ -0,0 +1,4 @@
+// 1.21	2024-10-11T13:52:02.8043814	Loot Tables
+82e8b556e28d2d3cd59de1a08a9033160533fcf1 data/petrock/loot_table/blocks/deepslate_stoneium_ore.json
+7af679161757b5d38fbc7b53505d81db5897b607 data/petrock/loot_table/blocks/stoneium_block.json
+36f68e1fb18bcc0348c84bd867f7637ad2ab3262 data/petrock/loot_table/blocks/stoneium_ore.json

src/generated/resources/.cache/6b877f43ad97d9ede9f5cbaa413888619ff304d5

@@ -0,0 +1,8 @@
+// 1.21	2024-10-11T17:06:45.9812272	Tags for minecraft:block mod id petrock
+7e101ad3299254dc0037fcc9f2240591195d8e51 data/c/tags/block/ores.json
+0300e8ad8dfb7929984fb736bd69075e92ce2059 data/minecraft/tags/block/mineable/pickaxe.json
+ec6f2f7823e9f0ae5d79667cc6788305addb1eea data/minecraft/tags/block/needs_iron_tool.json
+2dc35104a8823ca5e88f6f58c133a8a8288d8bdb data/minecraft/tags/block/needs_stone_tool.json
+7e101ad3299254dc0037fcc9f2240591195d8e51 data/minecraft/tags/block/overworld_carver_replaceables.json
+db058be6ec8fa77e6f040ec4045273da87b01316 data/minecraft/tags/block/snaps_goat_horn.json
+0300e8ad8dfb7929984fb736bd69075e92ce2059 data/petrock/tags/block/stoneium_ores.json

src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e

@@ -0,0 +1,27 @@
+// 1.21	2024-10-11T19:00:29.1028386	Recipes
+d91bf3d2aa2087d700a7382fa2052d35dfea05ad data/patchouli/advancement/recipes/misc/petrock_care_guide.json
+6fa05df0797e4637b5bf03ba72f1605d5ed9def5 data/patchouli/recipe/petrock_care_guide.json
+daeded4e6f345cea445154262efc4a5521be786a data/petrock/advancement/recipes/building_blocks/stoneium_block.json
+4220705455e8113890613d8ff1c2d3e761dddaef data/petrock/advancement/recipes/food/kibble.json
+dacb8316598457a4bfa8eb3946f9c233e4338054 data/petrock/advancement/recipes/misc/orderform.json
+b6c3e059eeae7df4c8f5d0aa32656555e764bd6b data/petrock/advancement/recipes/misc/petrockwithlegsbox.json
+56d93ce5bb0a4f148f61b70be0da7b7925c2618d data/petrock/advancement/recipes/misc/stoneium.json
+e39bceb30dc2bf3923ab4a57d113105505ec7c86 data/petrock/advancement/recipes/misc/stoneium_from_blasting_deepslate_stoneium_ore.json
+318387f7da7c249eba3d9d3d0d2b8120873b0556 data/petrock/advancement/recipes/misc/stoneium_from_blasting_raw_stoneium.json
+d248c0be779d3848c045466ac8e2971cca3daa13 data/petrock/advancement/recipes/misc/stoneium_from_blasting_stoneium_ore.json
+d162002958809390062d5428f3666a074c9f5ca9 data/petrock/advancement/recipes/misc/stoneium_from_smelting_deepslate_stoneium_ore.json
+fe44d466200e4d951b932fec788a5a6ac058e667 data/petrock/advancement/recipes/misc/stoneium_from_smelting_raw_stoneium.json
+ee3f5f2120e112be968e3038fd11b62369de6d35 data/petrock/advancement/recipes/misc/stoneium_from_smelting_stoneium_ore.json
+fcbde02033683cf034b03993dce5a903bed079f7 data/petrock/advancement/recipes/misc/stone_legs.json
+4f0c5c18baeddc15d25b570534865362676a0019 data/petrock/recipe/kibble.json
+f1c7cfa16f035cbd63984b249f9f76bc05abc63e data/petrock/recipe/orderform.json
+30eb8210f7c12062cdd75ccb31d8e97cdcd46799 data/petrock/recipe/petrockwithlegsbox.json
+f08412e8aa01050a02ee166be85121774234942d data/petrock/recipe/stoneium.json
+2a7cda24738954a5e20a768f7279ef38d3ff851b data/petrock/recipe/stoneium_block.json
+4b599e1fab599649eaf0dcf44c8f0f992ae6c2cd data/petrock/recipe/stoneium_from_blasting_deepslate_stoneium_ore.json
+dc4c1031e840543dccdf6843472e22ab0c81b68d data/petrock/recipe/stoneium_from_blasting_raw_stoneium.json
+1c165e19a82324517584d4150b90a5bc0da2a3e7 data/petrock/recipe/stoneium_from_blasting_stoneium_ore.json
+61e213364139a509f4ede73cf3ced9cf02f2aaa0 data/petrock/recipe/stoneium_from_smelting_deepslate_stoneium_ore.json
+e0402ecc4449dd2d6144e1164c2557d410d2c048 data/petrock/recipe/stoneium_from_smelting_raw_stoneium.json
+e57bf3c37c1a12843114e2e49e695184ee3b86a3 data/petrock/recipe/stoneium_from_smelting_stoneium_ore.json
+b21169132ddb0b9541d7d0419e3998466fbfad99 data/petrock/recipe/stone_legs.json

src/generated/resources/.cache/b653864d8b7efe6192261aa3b1668a7607668265

@@ -0,0 +1,3 @@
+// 1.21	2024-10-11T18:52:23.8796269	Tags for minecraft:item mod id petrock
+783a0c67afdaf913fb65384c166c8207f82b4c5e data/c/tags/item/raw_materials.json
+65ce974f8e75d5c69cf514b2953fd88f66c79c8b data/petrock/tags/item/raw_materials_stoneium.json

src/generated/resources/data/c/tags/block/ores.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "#petrock:stoneium_ores"
+  ]
+}

src/generated/resources/data/c/tags/item/raw_materials.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "#petrock:raw_materials_stoneium"
+  ]
+}

src/generated/resources/data/minecraft/tags/block/mineable/pickaxe.json

@@ -0,0 +1,6 @@
+{
+  "values": [
+    "petrock:stoneium_ore",
+    "petrock:deepslate_stoneium_ore"
+  ]
+}

src/generated/resources/data/minecraft/tags/block/needs_iron_tool.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "petrock:deepslate_stoneium_ore"
+  ]
+}

src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json → src/generated/resources/data/minecraft/tags/block/needs_stone_tool.json

@@ -1,7 +1,6 @@
 {
   "values": [
     "petrock:stoneium_ore",
-    "petrock:deepslate_stoneium_ore",
     "petrock:stoneium_block"
   ]
 }

src/generated/resources/data/minecraft/tags/block/overworld_carver_replaceables.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "#petrock:stoneium_ores"
+  ]
+}

src/generated/resources/data/minecraft/tags/block/snaps_goat_horn.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "petrock:stoneium_ore"
+  ]
+}

src/generated/resources/data/patchouli/advancement/recipes/misc/petrock_care_guide.json

@@ -0,0 +1,32 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_stoneium_ingot": {
+      "conditions": {
+        "items": [
+          {
+            "items": "petrock:stoneium"
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "patchouli:petrock_care_guide"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_stoneium_ingot"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "patchouli:petrock_care_guide"
+    ]
+  }
+}

src/generated/resources/data/patchouli/recipe/petrock_care_guide.json

@@ -0,0 +1,19 @@
+{
+  "type": "minecraft:crafting_shapeless",
+  "category": "misc",
+  "ingredients": [
+    {
+      "item": "minecraft:book"
+    },
+    {
+      "item": "petrock:stoneium"
+    }
+  ],
+  "result": {
+    "components": {
+      "patchouli:book": "petrock:petrock_care_guide"
+    },
+    "count": 1,
+    "id": "patchouli:guide_book"
+  }
+}

src/generated/resources/data/petrock/advancement/recipes/building_blocks/stoneium_block.json

@@ -0,0 +1,32 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_stoneium_ingot": {
+      "conditions": {
+        "items": [
+          {
+            "items": "petrock:stoneium"
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "petrock:stoneium_block"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_stoneium_ingot"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "petrock:stoneium_block"
+    ]
+  }
+}

src/generated/resources/data/petrock/advancement/recipes/food/kibble.json

@@ -0,0 +1,32 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_cookie": {
+      "conditions": {
+        "items": [
+          {
+            "items": "minecraft:cookie"
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "petrock:kibble"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_cookie"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "petrock:kibble"
+    ]
+  }
+}

src/generated/resources/data/petrock/advancement/recipes/misc/orderform.json

@@ -0,0 +1,32 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_ink": {
+      "conditions": {
+        "items": [
+          {
+            "items": "minecraft:ink_sac"
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "petrock:orderform"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_ink"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "petrock:orderform"
+    ]
+  }
+}