1.20.1 new recipes and data gens

nanite · Jun 14, 2023 · 79718b4 · 79718b4
1 parent c948d85
commit 79718b4
Show file tree

Hide file tree

Showing 79 changed files with 928 additions and 504 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,32 +2,13 @@
 
 All notable changes to this project will be documented in this file.
 
-## [2.4.1]
+## [3.0.1]
 
-- Update architectury loom
+- Updated to 1.20.1
+- Changed some recipes to use stonecutter
+  - Changes the mod to add new variants of bamboo blocks
+- Data gens
 
-## [2.4.0]
+## [3.0.0]
 
-- Update to 1.19.4
-
-## [2.3.3]
-
-- Update build script
-
-## [2.3.1]
-
-- Update build script
-
-## [2.3.0]
-
-- Updated to 1.19.3, removed raft as a bamboo boat is better, has nothing to do with item rendering issues
-
-## [2.2.4]
-
-- Fix forge server crash [#46](https://github.com/nanite/Bamboo-Everything/pull/46)
-
-## [2.2.3]
-
-### Fixed
-
-- Fixed de lang file [#45](https://github.com/nanite/Bamboo-Everything/pull/45)
+- Update to 1.20
diff --git a/common/build.gradle b/common/build.gradle
@@ -16,6 +16,8 @@ dependencies {
     modApi "dev.architectury:architectury:${rootProject.architectury_version}"
 }
 
+sourceSets.main.resources.srcDir 'src/generated/resources'
+
 publishing {
     publications {
         mavenCommon(MavenPublication) {

diff --git a/common/src/generated/resources/.cache/0b9fb7f4824fb006885bf28f54084e2475f91bcc b/common/src/generated/resources/.cache/0b9fb7f4824fb006885bf28f54084e2475f91bcc
@@ -0,0 +1,39 @@
+// 1.20.1	2023-06-14T15:43:39.5034781	Bamboo Everything/Recipes
+155805a15051079dca20d6215760e46d4717685d data\bambooeverything\advancements\recipes\misc\dry_bamboo.json
+857a149a5ad149290e7d64d3007cd4d2f5dc7637 data\bambooeverything\advancements\recipes\building_blocks\bamboo_block.json
+a88f3d4c90be00e31e7539e4181c277322d4e4a2 data\bambooeverything\recipes\bamboo_fence_gate.json
+1e446d060dc6897ddd748f9f1a7c3d609c58c513 data\bambooeverything\recipes\bamboo_dry_door.json
+af616ecc5c6b0b07fd1df1dbeb29a3934b39c07c data\bambooeverything\recipes\bamboo_dry_slab.json
+337c5f2e3ca6ebcf0ef120e1ab0cba777b5cd92b data\bambooeverything\recipes\bamboo_dry_fence_gate.json
+85aacb222efd654edfe01ff0bce7ee65ef4e167e data\bambooeverything\recipes\bamboo_slab.json
+ab74741e73461e78f9ee35710047594dd1e4ac9f data\bambooeverything\advancements\recipes\building_blocks\bamboo_dry_ladder.json
+be8c0fe3e6a1616a3737442bcc970a271b8d2a3a data\bambooeverything\recipes\bamboo_trapdoor.json
+c1ea1d1daf1fb7e8f94a7ed7abedd7d4549e8a6c data\bambooeverything\recipes\bamboo_dry_torch.json
+6101759b31ca8e67849356b7633432fc1312f5eb data\bambooeverything\recipes\bamboo_dry_fence.json
+2ad4ed59d057391e9ae5f9a7ed86bcb49b2042c5 data\bambooeverything\recipes\bamboo_block.json
+81fdea8222d9f591bbb39fc83910110d6a73280c data\bambooeverything\advancements\recipes\building_blocks\bamboo_dry_block.json
+2fb4770c954d7862621b73cd095bee7c6ae57280 data\bambooeverything\advancements\recipes\building_blocks\bamboo_dry_slab.json
+4ccf40cbb8a1d10c7f3e5963aaab91e617352684 data\bambooeverything\recipes\bamboo_dry_trapdoor.json
+a494d4678723616950255e94e8ec4819097656f4 data\bambooeverything\advancements\recipes\building_blocks\bamboo_torch.json
+0d753ccdfba3accbded3254b9a136781438f90d0 data\bambooeverything\advancements\recipes\building_blocks\bamboo_fence_gate.json
+832a219048d5d714c04f3a44999a097afc4fe42a data\bambooeverything\recipes\bamboo_dry_block.json
+6f6253e49f31637747dfa29ef9ea1ac80dbb0370 data\bambooeverything\recipes\bamboo_dry_stairs.json
+29a7bacf53dbfa40cf4018bd1e5b8054a3c87412 data\bambooeverything\advancements\recipes\building_blocks\bamboo_dry_stairs.json
+f0ca67db40dd705bc04b7d2fb11ca71354166730 data\bambooeverything\recipes\bamboo_fence.json
+c69c30fec4ec824702286df5e0cc48f9b95e1f96 data\bambooeverything\advancements\recipes\building_blocks\bamboo_dry_fence.json
+2a17dc35e2c9197260d752c8efe646aed878e196 data\bambooeverything\advancements\recipes\building_blocks\bamboo_dry_torch.json
+6853d8d5f010ce341ccb78594da909d6d56ddac5 data\bambooeverything\recipes\bamboo_torch.json
+c9844eb877c3ad5acb8862b0443c14bb953252f2 data\bambooeverything\advancements\recipes\building_blocks\bamboo_slab.json
+743e1a88f666384330433fb25ea373a55c3e7529 data\bambooeverything\recipes\bamboo_ladder.json
+d66c6d99ca436f17fed091caf9680e3e3f963b9d data\bambooeverything\advancements\recipes\building_blocks\bamboo_dry_door.json
+a895719d86b01dc59a98b708f798610763b598cf data\bambooeverything\advancements\recipes\building_blocks\bamboo_dry_trapdoor.json
+3601145bc76caf49c170d8f9d42ac6201146dcba data\bambooeverything\recipes\dry_bamboo.json
+85cc42917921c83192aef10dcc7c8991898eea16 data\bambooeverything\advancements\recipes\building_blocks\bamboo_trapdoor.json
+9094b8193a4edce48d9d98fb7e2013e28156796e data\bambooeverything\recipes\bamboo_stairs.json
+85393c737794e7e1a79a340083ff862a7c8b75e8 data\bambooeverything\advancements\recipes\building_blocks\bamboo_ladder.json
+bf0b6a18ea31205e3d50f92d51ca4423a5f749b5 data\bambooeverything\advancements\recipes\building_blocks\bamboo_dry_fence_gate.json
+ca270b94ee38583ec64553164ee14f6b9c16a075 data\bambooeverything\advancements\recipes\building_blocks\bamboo_door.json
+ab369c8b45a08ed9be33953b6c1b55acd0503891 data\bambooeverything\recipes\bamboo_door.json
+f37f49e933d5840e09336c34626d78210b0b1c11 data\bambooeverything\advancements\recipes\building_blocks\bamboo_fence.json
+da6970de49afd1191947a9e77c4ca3db00301dc5 data\bambooeverything\advancements\recipes\building_blocks\bamboo_stairs.json
+3c4946855525d88b831a4941b2ee7d5b507c879f data\bambooeverything\recipes\bamboo_dry_ladder.json
diff --git a/...ed/resources/data/bambooeverything/advancements/recipes/building_blocks/bamboo_block.json b/...ed/resources/data/bambooeverything/advancements/recipes/building_blocks/bamboo_block.json
@@ -0,0 +1,35 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_bamboo": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "minecraft:bamboo_block"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "bambooeverything:bamboo_block"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_bamboo",
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "bambooeverything:bamboo_block"
+    ]
+  },
+  "sends_telemetry_event": false
+}
diff --git a/...ing/advancements/recipes/bamboo_door.json → .../recipes/building_blocks/bamboo_door.json b/...ing/advancements/recipes/bamboo_door.json → .../recipes/building_blocks/bamboo_door.json
@@ -1,32 +1,35 @@
 {
   "parent": "minecraft:recipes/root",
-  "rewards": {
-    "recipes": [
-      "bambooeverything:bamboo_door"
-    ]
-  },
   "criteria": {
-    "has_bundle": {
-      "trigger": "minecraft:inventory_changed",
+    "has_bamboo": {
       "conditions": {
         "items": [
           {
-            "item": "bambooeverything:bamboo_bundle"
+            "items": [
+              "minecraft:bamboo_door"
+            ]
           }
         ]
-      }
+      },
+      "trigger": "minecraft:inventory_changed"
     },
     "has_the_recipe": {
-      "trigger": "minecraft:recipe_unlocked",
       "conditions": {
         "recipe": "bambooeverything:bamboo_door"
-      }
+      },
+      "trigger": "minecraft:recipe_unlocked"
     }
   },
   "requirements": [
     [
-      "has_bundle",
+      "has_bamboo",
       "has_the_recipe"
     ]
-  ]
-}
+  ],
+  "rewards": {
+    "recipes": [
+      "bambooeverything:bamboo_door"
+    ]
+  },
+  "sends_telemetry_event": false
+}
diff --git a/...esources/data/bambooeverything/advancements/recipes/building_blocks/bamboo_dry_block.json b/...esources/data/bambooeverything/advancements/recipes/building_blocks/bamboo_dry_block.json
@@ -0,0 +1,35 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_bamboo": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "minecraft:bamboo_block"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "bambooeverything:bamboo_dry_block"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_bamboo",
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "bambooeverything:bamboo_dry_block"
+    ]
+  },
+  "sends_telemetry_event": false
+}
diff --git a/...resources/data/bambooeverything/advancements/recipes/building_blocks/bamboo_dry_door.json b/...resources/data/bambooeverything/advancements/recipes/building_blocks/bamboo_dry_door.json
@@ -0,0 +1,35 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_bamboo": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "minecraft:bamboo_door"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "bambooeverything:bamboo_dry_door"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_bamboo",
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "bambooeverything:bamboo_dry_door"
+    ]
+  },
+  "sends_telemetry_event": false
+}
diff --git a/...esources/data/bambooeverything/advancements/recipes/building_blocks/bamboo_dry_fence.json b/...esources/data/bambooeverything/advancements/recipes/building_blocks/bamboo_dry_fence.json
@@ -0,0 +1,35 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_bamboo": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "minecraft:bamboo_fence"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "bambooeverything:bamboo_dry_fence"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_bamboo",
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "bambooeverything:bamboo_dry_fence"
+    ]
+  },
+  "sends_telemetry_event": false
+}
diff --git a/...ces/data/bambooeverything/advancements/recipes/building_blocks/bamboo_dry_fence_gate.json b/...ces/data/bambooeverything/advancements/recipes/building_blocks/bamboo_dry_fence_gate.json
@@ -0,0 +1,35 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_bamboo": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "minecraft:bamboo_fence_gate"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "bambooeverything:bamboo_dry_fence_gate"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_bamboo",
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "bambooeverything:bamboo_dry_fence_gate"
+    ]
+  },
+  "sends_telemetry_event": false
+}
diff --git a/...sources/data/bambooeverything/advancements/recipes/building_blocks/bamboo_dry_ladder.json b/...sources/data/bambooeverything/advancements/recipes/building_blocks/bamboo_dry_ladder.json
@@ -0,0 +1,35 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_bamboo": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "bambooeverything:dry_bamboo"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "bambooeverything:bamboo_dry_ladder"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_bamboo",
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "bambooeverything:bamboo_dry_ladder"
+    ]
+  },
+  "sends_telemetry_event": false
+}
diff --git a/...resources/data/bambooeverything/advancements/recipes/building_blocks/bamboo_dry_slab.json b/...resources/data/bambooeverything/advancements/recipes/building_blocks/bamboo_dry_slab.json
@@ -0,0 +1,35 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_bamboo": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "minecraft:bamboo_slab"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "bambooeverything:bamboo_dry_slab"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_bamboo",
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "bambooeverything:bamboo_dry_slab"
+    ]
+  },
+  "sends_telemetry_event": false
+}