Merge pull request #2 from FTBTeam/feature/new-blocks

Feature/new blocks

.gitignore

@@ -31,3 +31,6 @@ bin/
 # fabric
 
 run/
+
+# datagen caches
+**/.cache

gradle.properties

@@ -2,15 +2,15 @@ org.gradle.jvmargs=-Xmx1G
 loom.platform=forge
 
 minecraft_version=1.19.2
-forge_version=1.19.2-43.2.6
+forge_version=1.19.2-43.3.7
 
 mod_version=1.1.0
 maven_group=dev.ftb.mods
 archives_base_name=ftb-skyblock-addons
 mod_id=ftbsba
 mod_author=FTB Team
 
-jei_version=11.6.0.1016
+jei_version=11.6.0.1018
 rhino_version=1902.2.2-build.264
 kubejs_version=1902.6.1-build.337
 jade_version=4375714

src/generated/resources/.cache/03e4de26f1265135874f8cdcaebc09d9c08eb42b

@@ -0,0 +1,3 @@
+// 1.19.2	2024-02-07T15:29:25.340982	Tags for minecraft:item
+fb8208eabf5b52787d17b10f56e91b3e1271e4d6 data/ftbsba/tags/items/crooks.json
+789251c96a2a2f469b885b225673d95423f634da data/ftbsba/tags/items/hammers.json

src/generated/resources/.cache/1160a324a61ad140c8f8efec97f747ce2b42b9ec

@@ -0,0 +1,4 @@
+// 1.19.2	2024-02-07T15:29:25.34058	Global Loot Modifiers : ftbsba
+3654bb09969b06cc29a8322f1b2cc7416595ea6f data/forge/loot_modifiers/global_loot_modifiers.json
+fc28af48c265f03a878222d6b65a7ac3718e31dd data/ftbsba/loot_modifiers/crook_loot_modifier.json
+92c99d7dd9b113ed4bcd78a3ecf89a42560e38af data/ftbsba/loot_modifiers/hammer_loot_modifier.json

src/generated/resources/.cache/67cce32b1c3cbbcb1f646605f4914e3f196986c2

@@ -0,0 +1,5 @@
+// 1.19.2	2024-02-07T15:29:25.340708	LootTables
+948f46db810742aa1f7a45ae4e85f496eef43dc5 data/ftbsba/loot_tables/blocks/diamond_auto_hammer.json
+2ee44a638c38aa0d31cdf3a43e6c6040ec920072 data/ftbsba/loot_tables/blocks/gold_auto_hammer.json
+37d636b97fda22b1184b90a1908464d23aaac528 data/ftbsba/loot_tables/blocks/iron_auto_hammer.json
+fab496672f8e1dff5dc8c4219be5758a0dce3038 data/ftbsba/loot_tables/blocks/netherite_auto_hammer.json

src/generated/resources/.cache/75bcd4dba6ca7d365462b0ec45e291d1056349c4

@@ -0,0 +1,3 @@
+// 1.19.2	2024-02-11T17:06:30.745768	Tags for minecraft:block
+e4c5cf37f90c4d531461944a5bbc59b8bdf6049b data/forge/tags/blocks/needs_wood_tool.json
+e4c5cf37f90c4d531461944a5bbc59b8bdf6049b data/ftbsba/tags/blocks/auto_hammers.json

src/generated/resources/.cache/79b05178e4fcdf2c5a9a3d711df7e12b0a8ae01b

@@ -0,0 +1,5 @@
+// 1.19.2	2024-02-07T15:29:25.340286	Block States: ftbsba
+44c77f4f45b3c162963b1bd55ce3364532392b36 assets/ftbsba/blockstates/diamond_auto_hammer.json
+feea77a065b8559d6347fc4af26dc563a0490db3 assets/ftbsba/blockstates/gold_auto_hammer.json
+33a2acda3b0348e90200100f2e9f28ad8ba3de3d assets/ftbsba/blockstates/iron_auto_hammer.json
+654e5f2f61b4cdd8aa679a11dda333a24218339d assets/ftbsba/blockstates/netherite_auto_hammer.json

src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e

@@ -0,0 +1,23 @@
+// 1.19.2	2024-02-07T15:29:25.339159	Recipes
+76caa2ffac9a8b3c153057c82b74fd00c5758d19 data/ftbsba/advancements/recipes/ftbsba/diamond_auto_hammer.json
+971b5dab8914993196c1d2ece64d640d48db0e39 data/ftbsba/advancements/recipes/ftbsba/diamond_hammer.json
+915983f8fed15ad3ad05cd5689c2233aeda39a72 data/ftbsba/advancements/recipes/ftbsba/gold_auto_hammer.json
+de8ae2c914315e5680ebf93afd91bc2ce8c0b041 data/ftbsba/advancements/recipes/ftbsba/gold_hammer.json
+9531164e2f8cfebabd9514ad1c0b61556e5ac07b data/ftbsba/advancements/recipes/ftbsba/iron_auto_hammer.json
+f43ea1c89cd5e9f370d3fa2e825a5b47fbe35dc5 data/ftbsba/advancements/recipes/ftbsba/iron_hammer.json
+526b18110a27e8946f10144db8db9a3dbd9d83b5 data/ftbsba/advancements/recipes/ftbsba/netherite_auto_hammer.json
+5097506d55ed58376d911ab2e2a94a5d7a13b907 data/ftbsba/advancements/recipes/ftbsba/netherite_hammer.json
+ae2b5a84f5310858eb017c0ad368244851bafa4d data/ftbsba/advancements/recipes/ftbsba/stone_crook.json
+a3b4f783c559ab57fe31299071c6b04f9ce78c94 data/ftbsba/advancements/recipes/ftbsba/stone_hammer.json
+40dddc21150cbc4ecdbcbdefdf85fc678983129d data/ftbsba/advancements/recipes/ftbsba/stone_rod.json
+bbb89baa3aef2cef0f5421004afde1eb3aaf3861 data/ftbsba/recipes/diamond_auto_hammer.json
+bf0031132f35f16e142deeac2b78bcd518f6d346 data/ftbsba/recipes/diamond_hammer.json
+1486bf914fcb03d3f8ab924e7de13ea69f20a69c data/ftbsba/recipes/gold_auto_hammer.json
+29143e46f519864a51a06101b0423156cb68b375 data/ftbsba/recipes/gold_hammer.json
+1d44891d64f5149c56a59571eb72d3fb06bf8b11 data/ftbsba/recipes/iron_auto_hammer.json
+79efc25c8a2ff4ef2c0c913838f8f095942e6a50 data/ftbsba/recipes/iron_hammer.json
+15c483e692e0233b8142ad5ba8f0dd356505bdee data/ftbsba/recipes/netherite_auto_hammer.json
+ce3f056848f1f83a0f6385377987ea9570cd3f99 data/ftbsba/recipes/netherite_hammer.json
+7ee8da43c28168eb841444b40a0e8430b55ca8f6 data/ftbsba/recipes/stone_crook.json
+f06156e5586d87d4557422de469325295e99d486 data/ftbsba/recipes/stone_hammer.json
+eb65be093f0057752cf295ecf94d65dd7b920c53 data/ftbsba/recipes/stone_rod.json

src/generated/resources/.cache/a8d609cf004ffa48275df28c1350f4d44e1c7d32

@@ -0,0 +1,12 @@
+// 1.19.2	2024-02-07T15:29:25.341208	Item Models: ftbsba
+06c7c8158d6cd780f5273a97dd4b69fb083a2779 assets/ftbsba/models/item/diamond_auto_hammer.json
+0752980420170342016b03131d7710d3dca27224 assets/ftbsba/models/item/diamond_hammer.json
+593e27db03393ccc9808c1fbf9af35e50fb2df7c assets/ftbsba/models/item/gold_auto_hammer.json
+b84b9a7641dd73f858a5b9513f045b5e1d4da608 assets/ftbsba/models/item/gold_hammer.json
+7c64504a98a9a9194f214d8155472d89c058b890 assets/ftbsba/models/item/iron_auto_hammer.json
+d818091813bb988f644ad4b908cfc8a9cbd4c076 assets/ftbsba/models/item/iron_hammer.json
+95a13a5207334f3b07f31a342312c3b1b2fae48e assets/ftbsba/models/item/netherite_auto_hammer.json
+ce663f8ec723fb9d0809b3f683bcba34f5a912a9 assets/ftbsba/models/item/netherite_hammer.json
+506b5898f59fec2f3bdf6af88fb21e56f9e5a2a8 assets/ftbsba/models/item/stone_crook.json
+f7890e53e26f8b84760d3469c9a6533bbf2e166a assets/ftbsba/models/item/stone_hammer.json
+6336e7a46d2bee2475135edc21f7cb0d5bb155f6 assets/ftbsba/models/item/stone_rod.json

src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8

@@ -0,0 +1,2 @@
+// 1.19.2	2024-02-13T15:18:07.800475465	Languages: en_us
+ec5bc7afeca422d8fd3cce464432d445749ccae4 assets/ftbsba/lang/en_us.json

src/generated/resources/.cache/ca20033d77a52b2eda61a478c7fbca106d18e64c

@@ -0,0 +1 @@
+// 1.19.2	2024-02-07T15:29:25.341567	Block Models: ftbsba

src/generated/resources/assets/ftbsba/blockstates/diamond_auto_hammer.json

@@ -21,61 +21,61 @@
     {
       "apply": {
         "model": "ftbsba:block/diamond_auto_hammer",
-        "y": 180
+        "y": 90
       },
       "when": {
         "active": "false",
-        "facing": "south"
+        "facing": "east"
       }
     },
     {
       "apply": {
         "model": "ftbsba:block/diamond_auto_hammer_active",
-        "y": 180
+        "y": 90
       },
       "when": {
         "active": "true",
-        "facing": "south"
+        "facing": "east"
       }
     },
     {
       "apply": {
         "model": "ftbsba:block/diamond_auto_hammer",
-        "y": 270
+        "y": 180
       },
       "when": {
         "active": "false",
-        "facing": "west"
+        "facing": "south"
       }
     },
     {
       "apply": {
         "model": "ftbsba:block/diamond_auto_hammer_active",
-        "y": 270
+        "y": 180
       },
       "when": {
         "active": "true",
-        "facing": "west"
+        "facing": "south"
       }
     },
     {
       "apply": {
         "model": "ftbsba:block/diamond_auto_hammer",
-        "y": 90
+        "y": 270
       },
       "when": {
         "active": "false",
-        "facing": "east"
+        "facing": "west"
       }
     },
     {
       "apply": {
         "model": "ftbsba:block/diamond_auto_hammer_active",
-        "y": 90
+        "y": 270
       },
       "when": {
         "active": "true",
-        "facing": "east"
+        "facing": "west"
       }
     }
   ]

src/generated/resources/assets/ftbsba/blockstates/fusing_machine.json

@@ -0,0 +1,34 @@
+{
+  "variants": {
+    "active=false,facing=east": {
+      "model": "ftbsba:block/fusing_machine",
+      "y": 90
+    },
+    "active=false,facing=north": {
+      "model": "ftbsba:block/fusing_machine"
+    },
+    "active=false,facing=south": {
+      "model": "ftbsba:block/fusing_machine",
+      "y": 180
+    },
+    "active=false,facing=west": {
+      "model": "ftbsba:block/fusing_machine",
+      "y": 270
+    },
+    "active=true,facing=east": {
+      "model": "ftbsba:block/fusing_machine_active",
+      "y": 90
+    },
+    "active=true,facing=north": {
+      "model": "ftbsba:block/fusing_machine_active"
+    },
+    "active=true,facing=south": {
+      "model": "ftbsba:block/fusing_machine_active",
+      "y": 180
+    },
+    "active=true,facing=west": {
+      "model": "ftbsba:block/fusing_machine_active",
+      "y": 270
+    }
+  }
+}

src/generated/resources/assets/ftbsba/blockstates/gold_auto_hammer.json

@@ -21,61 +21,61 @@
     {
       "apply": {
         "model": "ftbsba:block/gold_auto_hammer",
-        "y": 180
+        "y": 90
       },
       "when": {
         "active": "false",
-        "facing": "south"
+        "facing": "east"
       }
     },
     {
       "apply": {
         "model": "ftbsba:block/gold_auto_hammer_active",
-        "y": 180
+        "y": 90
       },
       "when": {
         "active": "true",
-        "facing": "south"
+        "facing": "east"
       }
     },
     {
       "apply": {
         "model": "ftbsba:block/gold_auto_hammer",
-        "y": 270
+        "y": 180
       },
       "when": {
         "active": "false",
-        "facing": "west"
+        "facing": "south"
       }
     },
     {
       "apply": {
         "model": "ftbsba:block/gold_auto_hammer_active",
-        "y": 270
+        "y": 180
       },
       "when": {
         "active": "true",
-        "facing": "west"
+        "facing": "south"
       }
     },
     {
       "apply": {
         "model": "ftbsba:block/gold_auto_hammer",
-        "y": 90
+        "y": 270
       },
       "when": {
         "active": "false",
-        "facing": "east"
+        "facing": "west"
       }
     },
     {
       "apply": {
         "model": "ftbsba:block/gold_auto_hammer_active",
-        "y": 90
+        "y": 270
       },
       "when": {
         "active": "true",
-        "facing": "east"
+        "facing": "west"
       }
     }
   ]

src/generated/resources/assets/ftbsba/blockstates/iron_auto_hammer.json

@@ -21,61 +21,61 @@
     {
       "apply": {
         "model": "ftbsba:block/iron_auto_hammer",
-        "y": 180
+        "y": 90
       },
       "when": {
         "active": "false",
-        "facing": "south"
+        "facing": "east"
       }
     },
     {
       "apply": {
         "model": "ftbsba:block/iron_auto_hammer_active",
-        "y": 180
+        "y": 90
       },
       "when": {
         "active": "true",
-        "facing": "south"
+        "facing": "east"
       }
     },
     {
       "apply": {
         "model": "ftbsba:block/iron_auto_hammer",
-        "y": 270
+        "y": 180
       },
       "when": {
         "active": "false",
-        "facing": "west"
+        "facing": "south"
       }
     },
     {
       "apply": {
         "model": "ftbsba:block/iron_auto_hammer_active",
-        "y": 270
+        "y": 180
       },
       "when": {
         "active": "true",
-        "facing": "west"
+        "facing": "south"
       }
     },
     {
       "apply": {
         "model": "ftbsba:block/iron_auto_hammer",
-        "y": 90
+        "y": 270
       },
       "when": {
         "active": "false",
-        "facing": "east"
+        "facing": "west"
       }
     },
     {
       "apply": {
         "model": "ftbsba:block/iron_auto_hammer_active",
-        "y": 90
+        "y": 270
       },
       "when": {
         "active": "true",
-        "facing": "east"
+        "facing": "west"
       }
     }
   ]