fix most of the rest of the stuff, run data

Argent-Matter · Mar 28, 2024 · 4f69cab · 4f69cab
1 parent 58c1493
commit 4f69cab
Show file tree

Hide file tree

Showing 101 changed files with 1,659 additions and 74 deletions.
diff --git a/build.gradle b/build.gradle
@@ -96,7 +96,7 @@ dependencies {
 
     implementation "software.bernie.geckolib:geckolib-neoforge-$minecraft_version:$geckolib_version"
 
-    implementation "me.shedaniel:RoughlyEnoughItems-forge:$rei_version"
+    compileOnly "me.shedaniel:RoughlyEnoughItems-neoforge:$rei_version"
 }
 
 // This block of code expands all declared replace properties in the specified resource targets.

diff --git a/src/generated/resources/.cache/4b785813dc2d83e51b4ee2c74fbd50ea8fbb0256 b/src/generated/resources/.cache/4b785813dc2d83e51b4ee2c74fbd50ea8fbb0256
@@ -0,0 +1,8 @@
+// 1.20.4	2024-03-28T13:58:38.9269227	Tags for minecraft:item mod id sas
+edb0efb4be030132acbcad907c2a6d2e82673a99 data/forge/tags/items/gems/glint.json
+7f7d5f6cc9b5cfb39d240fc901c4ae2d2037ec14 data/forge/tags/items/glass_bottles.json
+a6fb2cc841f0c553fe59c97dfead4f1f1fc6b798 data/forge/tags/items/ingots/soulsteel.json
+81bac3084780b5096f2230efa9079709f3d1d3ee data/forge/tags/items/nuggets/soulsteel.json
+23aec45c507500c97e45b55c106c982172596d23 data/forge/tags/items/ores/glint.json
+285e0257e2bc9d7707baec95ddd4312f80a30d10 data/forge/tags/items/storage_blocks/soulsteel.json
+da4a3e408b163eb9d8ebe13892630f3bb83783e0 data/sas/tags/items/boss_summon_items.json
diff --git a/src/generated/resources/.cache/607c04a6e0fb9f4b466f9bda45fb86d7b36a6196 b/src/generated/resources/.cache/607c04a6e0fb9f4b466f9bda45fb86d7b36a6196
@@ -0,0 +1,3 @@
+// 1.20.4	2024-03-28T14:01:04.9738839	Tags for minecraft:worldgen/biome mod id sas
+67a71940ad680bad65859f2482bacdd586169aba data/sas/tags/worldgen/biome/has_structure/ritual_spot.json
+fb247e6f77d9c91d605178af41702e12c253f598 data/sas/tags/worldgen/biome/has_structure/wizard_tower.json
diff --git a/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e b/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e
@@ -0,0 +1,43 @@
+// 1.20.4	2024-03-28T15:27:00.3070082	Recipes
+1423603bd0af94bc309844c820b060dfb00ca97e data/sas/advancements/recipes/misc/palantir.json
+64b3c24a8bfae90972e7bb5368ed562eac293c52 data/sas/advancements/recipes/misc/soulsteel_block.json
+fea83993c6220060df903c4d2a611fe983eaf35b data/sas/advancements/recipes/misc/soulsteel_boots.json
+3ed30fb7051a706edb43712bc79c5fa007834db6 data/sas/advancements/recipes/misc/soulsteel_chestplate.json
+92552d862dd34809ec34f2e852ff0b718fb7ee24 data/sas/advancements/recipes/misc/soulsteel_helmet.json
+51c2a3c046c073fcfd4428c335be68cdb2950d80 data/sas/advancements/recipes/misc/soulsteel_hoe.json
+bce523ef22be880ce2d703b4a52d9e371a25907e data/sas/advancements/recipes/misc/soulsteel_ingot.json
+406df7415cfa95bae659cc2a7f842d0152119f3d data/sas/advancements/recipes/misc/soulsteel_ingot_from_nuggets.json
+2a57d8763c540fa9090af8676d4d4015d66d13a0 data/sas/advancements/recipes/misc/soulsteel_ingot_from_soulsteel_block.json
+abba91688215df29d9fc93e259021e0fe3bf2e54 data/sas/advancements/recipes/misc/soulsteel_leggings.json
+b77fb5791dc3b9df0741c16ed342ec7cee28bcc3 data/sas/advancements/recipes/misc/soulsteel_nugget.json
+184a1bc91c295d3d1f69bf965dbd64d46f979bda data/sas/advancements/recipes/misc/soulsteel_pickaxe.json
+93df7eed8ca8167c726188729abeee01514af4af data/sas/advancements/recipes/misc/soulsteel_shovel.json
+f04129e05fb406aa2e8795fc88c9bd1720d9923c data/sas/advancements/recipes/misc/soulsteel_sword.json
+153e54617eab1097c73e9944900adccb6e885013 data/sas/advancements/recipes/misc/wand_table.json
+f5492e30d52db8133f20884be59bd9613cf56a21 data/sas/advancements/recipes/wand/damage.json
+d4eecffe4218ef723d06aa95b899bd54ea7d3a9e data/sas/advancements/recipes/wand/explosion.json
+1a9df2b2642687310e37c7d1271ca01b57048aa9 data/sas/advancements/recipes/wand/heal.json
+846cffb0c91bc613ac75f7a7e2f16b2f935182b9 data/sas/advancements/recipes/wand/large_fireball.json
+10db63572309eb64599afe3f4c1738fecdc4e698 data/sas/advancements/recipes/wand/lightning.json
+6fddd5cc28efc231cdfa3d5f422f2383a895ae88 data/sas/advancements/recipes/wand/small_fireball.json
+63bb77e9864e88c697f9947726fc03508290a984 data/sas/recipes/palantir.json
+c0eda7fe4eb2c2b1370d429f927743f8aec0f03f data/sas/recipes/soulsteel_block.json
+34ec810353f49216544ee9a17aec796498c2d203 data/sas/recipes/soulsteel_boots.json
+a405b2ef0505f0a5f72110311c0cf825a7e18376 data/sas/recipes/soulsteel_chestplate.json
+1512b8b1e033bf340b9abf4c4ff1bc39898aa5bc data/sas/recipes/soulsteel_helmet.json
+830b0e7c69ade6951b2c3b142e6eded96589ba3a data/sas/recipes/soulsteel_hoe.json
+8c4b006612eb2838d3c57e0adf0328f0732882bb data/sas/recipes/soulsteel_ingot.json
+0fe19e097136cc595b629ade25c5bd4b2cdb5d60 data/sas/recipes/soulsteel_ingot_from_nuggets.json
+ac9cb98595364fe5108da562e1032fa956e89946 data/sas/recipes/soulsteel_ingot_from_soulsteel_block.json
+ea6a79edf1a318078b3f82d46bf30cb17575d930 data/sas/recipes/soulsteel_leggings.json
+65c2f5f4ae49a7571a3dbe6d1e7cecea3855d6f3 data/sas/recipes/soulsteel_nugget.json
+ed3e7260a69ca3430a3cf6894ca6c8e36cf6077a data/sas/recipes/soulsteel_pickaxe.json
+cde554ec985d38da7616ab24f6b45d8d11211f82 data/sas/recipes/soulsteel_shovel.json
+05fb4074e49ef56d6b659dcec0d56e63d095cda9 data/sas/recipes/soulsteel_sword.json
+47d572f28be6834d19e905ac6746d09ead4e8046 data/sas/recipes/wand/damage.json
+a0012015443deba0a2a5e661bb318f056dbda2fa data/sas/recipes/wand/explosion.json
+f303a196990233527364be42eb222a2e583362ec data/sas/recipes/wand/heal.json
+0a3e9ef155b3450e7943d5d31555ce4c96cca7c7 data/sas/recipes/wand/large_fireball.json
+ebed2330dc270f34aee2c1055bd95424826f6b5d data/sas/recipes/wand/lightning.json
+7872c24f903e64a495c8cd7f5291df6a3c7fd809 data/sas/recipes/wand/small_fireball.json
+b7ca46616a76a0f0dce26552da18191143f4fa53 data/sas/recipes/wand_table.json
diff --git a/src/generated/resources/.cache/dd5af00c503ac4cfccc504d45b173518db1a4ddc b/src/generated/resources/.cache/dd5af00c503ac4cfccc504d45b173518db1a4ddc
@@ -0,0 +1,12 @@
+// 1.20.4	2024-03-28T13:58:38.9259225	Eye Conversions
+029028a6d1f369c27189720bfc612784d519e374 data/sas/eye_conversions/coal_block.json
+de07657f8dbaedce45b322d915c550f690cc68fa data/sas/eye_conversions/cobbled_deepslate.json
+4bd369c6638f7d507acc6a382da4dcaeb5ff6ef2 data/sas/eye_conversions/cobblestone.json
+fad0e411d89afb9f4638ac6f279a6b9176f66314 data/sas/eye_conversions/emerald_block.json
+68d491db432d96dcbf95d6718728292a1c9110a5 data/sas/eye_conversions/gold_block.json
+176d1462f0cdcf2424c278946665f6ececd0d514 data/sas/eye_conversions/iron_block.json
+5691e9ed6bad83cefe2a8ccc0826784cfb94f5f4 data/sas/eye_conversions/raw_copper_block.json
+aea6304cb88d93295aedbb101282a4edbdf94188 data/sas/eye_conversions/skeleton_skull.json
+923792f375df3b82f231ef5d4bf9c58ed441f0ab data/sas/eye_conversions/skeleton_wall_skull.json
+84696776b3c6bd998a479f03bfebd27c71060970 data/sas/eye_conversions/zombie_head.json
+15e057822c945c00129046dea643d1edb3093a9b data/sas/eye_conversions/zombie_wall_head.json
diff --git a/src/generated/resources/.cache/fdbfab484a064d08b5349fe03c205125bee99cf6 b/src/generated/resources/.cache/fdbfab484a064d08b5349fe03c205125bee99cf6
@@ -0,0 +1,5 @@
+// 1.20.4	2024-03-28T13:58:38.9239218	Tags for minecraft:block mod id sas
+23aec45c507500c97e45b55c106c982172596d23 data/forge/tags/blocks/needs_netherite_tool.json
+23aec45c507500c97e45b55c106c982172596d23 data/forge/tags/blocks/ores/glint.json
+285e0257e2bc9d7707baec95ddd4312f80a30d10 data/forge/tags/blocks/storage_blocks/soulsteel.json
+23aec45c507500c97e45b55c106c982172596d23 data/minecraft/tags/blocks/mineable/pickaxe.json
diff --git a/src/generated/resources/data/forge/tags/blocks/needs_netherite_tool.json b/src/generated/resources/data/forge/tags/blocks/needs_netherite_tool.json
@@ -0,0 +1,5 @@
+{
+  "values": [
+    "sas:glint_ore"
+  ]
+}
diff --git a/src/generated/resources/data/forge/tags/blocks/ores/glint.json b/src/generated/resources/data/forge/tags/blocks/ores/glint.json
@@ -0,0 +1,5 @@
+{
+  "values": [
+    "sas:glint_ore"
+  ]
+}
diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/soulsteel.json b/src/generated/resources/data/forge/tags/blocks/storage_blocks/soulsteel.json
@@ -0,0 +1,5 @@
+{
+  "values": [
+    "sas:soulsteel_block"
+  ]
+}
diff --git a/src/generated/resources/data/forge/tags/items/gems/glint.json b/src/generated/resources/data/forge/tags/items/gems/glint.json
@@ -0,0 +1,5 @@
+{
+  "values": [
+    "sas:glint"
+  ]
+}
diff --git a/src/generated/resources/data/forge/tags/items/glass_bottles.json b/src/generated/resources/data/forge/tags/items/glass_bottles.json
@@ -0,0 +1,5 @@
+{
+  "values": [
+    "minecraft:glass_bottle"
+  ]
+}
diff --git a/src/generated/resources/data/forge/tags/items/ingots/soulsteel.json b/src/generated/resources/data/forge/tags/items/ingots/soulsteel.json
@@ -0,0 +1,5 @@
+{
+  "values": [
+    "sas:soulsteel_ingot"
+  ]
+}
diff --git a/src/generated/resources/data/forge/tags/items/nuggets/soulsteel.json b/src/generated/resources/data/forge/tags/items/nuggets/soulsteel.json
@@ -0,0 +1,5 @@
+{
+  "values": [
+    "sas:soulsteel_nugget"
+  ]
+}
diff --git a/src/generated/resources/data/forge/tags/items/ores/glint.json b/src/generated/resources/data/forge/tags/items/ores/glint.json
@@ -0,0 +1,5 @@
+{
+  "values": [
+    "sas:glint_ore"
+  ]
+}
diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/soulsteel.json b/src/generated/resources/data/forge/tags/items/storage_blocks/soulsteel.json
@@ -0,0 +1,5 @@
+{
+  "values": [
+    "sas:soulsteel_block"
+  ]
+}
diff --git a/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json b/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json
@@ -0,0 +1,5 @@
+{
+  "values": [
+    "sas:glint_ore"
+  ]
+}
diff --git a/src/generated/resources/data/sas/advancements/recipes/misc/palantir.json b/src/generated/resources/data/sas/advancements/recipes/misc/palantir.json
@@ -0,0 +1,45 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_eye": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "sas:cthulhu_eye"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_glass": {
+      "conditions": {
+        "items": [
+          {
+            "tag": "forge:glass/tinted"
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "sas:palantir"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_eye",
+      "has_glass"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "sas:palantir"
+    ]
+  }
+}
diff --git a/src/generated/resources/data/sas/advancements/recipes/misc/soulsteel_block.json b/src/generated/resources/data/sas/advancements/recipes/misc/soulsteel_block.json
@@ -0,0 +1,32 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_forge:ingots/soulsteel": {
+      "conditions": {
+        "items": [
+          {
+            "tag": "forge:ingots/soulsteel"
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "sas:soulsteel_block"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_forge:ingots/soulsteel"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "sas:soulsteel_block"
+    ]
+  }
+}
diff --git a/src/generated/resources/data/sas/advancements/recipes/misc/soulsteel_boots.json b/src/generated/resources/data/sas/advancements/recipes/misc/soulsteel_boots.json
@@ -0,0 +1,32 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_diamond": {
+      "conditions": {
+        "items": [
+          {
+            "tag": "forge:ingots/soulsteel"
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "sas:soulsteel_boots"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_diamond"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "sas:soulsteel_boots"
+    ]
+  }
+}
diff --git a/src/generated/resources/data/sas/advancements/recipes/misc/soulsteel_chestplate.json b/src/generated/resources/data/sas/advancements/recipes/misc/soulsteel_chestplate.json
@@ -0,0 +1,32 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_diamond": {
+      "conditions": {
+        "items": [
+          {
+            "tag": "forge:ingots/soulsteel"
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "sas:soulsteel_chestplate"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_diamond"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "sas:soulsteel_chestplate"
+    ]
+  }
+}
diff --git a/src/generated/resources/data/sas/advancements/recipes/misc/soulsteel_helmet.json b/src/generated/resources/data/sas/advancements/recipes/misc/soulsteel_helmet.json
@@ -0,0 +1,32 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_diamond": {
+      "conditions": {
+        "items": [
+          {
+            "tag": "forge:ingots/soulsteel"
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "sas:soulsteel_helmet"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_diamond"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "sas:soulsteel_helmet"
+    ]
+  }
+}
diff --git a/src/generated/resources/data/sas/advancements/recipes/misc/soulsteel_hoe.json b/src/generated/resources/data/sas/advancements/recipes/misc/soulsteel_hoe.json
@@ -0,0 +1,32 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_diamond": {
+      "conditions": {
+        "items": [
+          {
+            "tag": "forge:ingots/soulsteel"
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "sas:soulsteel_hoe"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_diamond"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "sas:soulsteel_hoe"
+    ]
+  }
+}