v2.0.0-alpha2

Classic36-Media · Jun 21, 2024 · 6d18cc8 · 6d18cc8
1 parent f052eda
commit 6d18cc8
Show file tree

Hide file tree

Showing 23 changed files with 249 additions and 463 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -18,7 +18,7 @@ body:
       label: Version
       description: Which version of Better Craftables are you using? If it's not listed, please update!
       options:
-        - v2.0.0-alpha1
+        - v2.0.0-alpha2
         - v1.6.0+mod
         - v1.6.0
         - v1.5.1+mod

diff --git a/README.md b/README.md
@@ -21,7 +21,7 @@ Recipes in this data pack/mod can be found on the wiki.
 
 | Minecraft Version | Better Craftables Version |
 | :--: | :--: |
-| 1.21+ |  [v2.0.0-alpha1](https://github.com/TheClassic36/Better-Craftables/releases/tag/v2.0.0-alpha1) |
+| 1.21+ |  [v2.0.0-alpha2](https://github.com/TheClassic36/Better-Craftables/releases/tag/v2.0.0-alpha2) |
 | 1.21 |  [v1.6.0](https://github.com/TheClassic36/Better-Craftables/releases/tag/v1.6.0) |
 | 1.20.5 - 1.20.6 |  [v1.5.1](https://github.com/TheClassic36/Better-Craftables/releases/tag/v1.5.1) |
 | 1.20.2 - 1.20.4 | [v1.4.0](https://github.com/TheClassic36/Better-Craftables/releases/tag/v1.4.0) |
@@ -37,7 +37,5 @@ Please open any support or feature requests [here on GitHub](https://github.com/
 * [Vanilla Tweaks](https://vanillatweaks.net/)
 	* Craftable Name Tag
 	* Unpackable Wool
-* [HexedHero](https://github.com/TheClassic36/Better-Craftables/issues/1)
-	* Cobweb recipe suggestion
-* [babarsc](https://github.com/TheClassic36/Better-Craftables/issues/4)
-	* Wool to String recipe suggestion
+
+Other contributors can be found [here](https://github.com/TheClassic36/Better-Craftables/wiki/Credits).
diff --git a/credits.txt b/credits.txt
@@ -5,10 +5,16 @@ Vanilla Tweaks
 - Unpackable Wool
 https://vanillatweaks.net
 
+ACCEPTED SUGGESTIONS:
+
 HexedHero
-- Cobweb recipe suggestion
+- Cobweb recipe
 https://github.com/TheClassic36/Better-Craftables/issues/1
 
 babarsc
-- Wool to String recipe suggestion
-https://github.com/TheClassic36/Better-Craftables/issues/4
+- Wool to String recipe
+https://github.com/TheClassic36/Better-Craftables/issues/4
+
+vgtom4
+- Honey Bottle in Sticky Piston recipe
+https://github.com/TheClassic36/Better-Craftables/issues/6
diff --git a/data/crafting/tags/item/alternate_stones.json b/data/crafting/tags/item/alternate_stones.json
@@ -0,0 +1,15 @@
+{
+  "replace": false,
+  "values": [
+    "minecraft:blackstone",
+    "minecraft:cobbled_deepslate",
+	"minecraft:andesite",
+	"minecraft:granite",
+	"minecraft:diorite",
+	"minecraft:deepslate",
+	"minecraft:cobblestone",
+	"minecraft:stone",
+	"minecraft:tuff",
+	"minecraft:dripstone_block"
+  ]
+}
diff --git a/data/minecraft/recipe/armor_stand.json b/data/minecraft/recipe/armor_stand.json
@@ -63,6 +63,15 @@
 			},
 			{
 				"item": "minecraft:polished_blackstone_brick_slab"
+			},
+			{
+				"item": "minecraft:tuff_slab"
+			},
+			{
+				"item": "minecraft:polished_tuff_slab"
+			},
+			{
+				"item": "minecraft:tuff_brick_slab"
 			}
 		],
         "/": [

diff --git a/data/minecraft/recipe/blast_furnace.json b/data/minecraft/recipe/blast_furnace.json
@@ -6,51 +6,15 @@
         "###"
     ],
     "key": {
-        "#": [
-			{
-				"item": "minecraft:smooth_stone"
-			},
-			{
-				"item": "minecraft:blackstone"
-			},
-			{
-				"item": "minecraft:cobbled_deepslate"
-			},
-			{
-				"item": "minecraft:andesite"
-			},
-			{
-				"item": "minecraft:granite"
-			},
-			{
-				"item": "minecraft:diorite"
-			},
-			{
-				"item": "minecraft:deepslate"
-			},
-			{
-				"item": "minecraft:cobblestone"
-			},
-			{
-				"item": "minecraft:stone"
-			},
-			{
-				"item": "minecraft:tuff"
-			},
-			{
-				"item": "minecraft:dripstone_block"
-			}
-		],
-        "I": [
-			{
-				"item": "minecraft:iron_ingot"
-			}
-		],
-        "F": [
-			{
-				"item": "minecraft:furnace"
-			}
-		]
+        "#": {
+            "tag": "crafting:alternate_stones"
+        },
+        "I": {
+			"item": "minecraft:iron_ingot"
+		},
+        "F": {
+			"item": "minecraft:furnace"
+		}
     },
     "result": {
         "id": "minecraft:blast_furnace",

diff --git a/data/minecraft/recipe/brewing_stand.json b/data/minecraft/recipe/brewing_stand.json
@@ -6,40 +6,11 @@
     ],
     "key": {
         "/": {
-				"item": "minecraft:blaze_rod"
+			"item": "minecraft:blaze_rod"
         },
-        "#": [
-			{
-				"item": "minecraft:blackstone"
-			},
-			{
-				"item": "minecraft:cobbled_deepslate"
-			},
-			{
-				"item": "minecraft:andesite"
-			},
-			{
-				"item": "minecraft:granite"
-			},
-			{
-				"item": "minecraft:diorite"
-			},
-			{
-				"item": "minecraft:deepslate"
-			},
-			{
-				"item": "minecraft:cobblestone"
-			},
-			{
-				"item": "minecraft:stone"
-			},
-			{
-				"item": "minecraft:tuff"
-			},
-			{
-				"item": "minecraft:dripstone_block"
-			}
-		]
+        "#": {
+            "tag": "crafting:alternate_stones"
+        }
     },
     "result": {
         "id": "minecraft:brewing_stand",

diff --git a/data/minecraft/recipe/comparator.json b/data/minecraft/recipe/comparator.json
@@ -0,0 +1,52 @@
+{
+    "type": "minecraft:crafting_shaped",
+    "pattern": [
+        " T ",
+		"TQT",
+        "###"
+    ],
+    "key": {
+        "#": [
+			{
+				"item": "minecraft:blackstone"
+			},
+			{
+				"item": "minecraft:cobbled_deepslate"
+			},
+			{
+				"item": "minecraft:andesite"
+			},
+			{
+				"item": "minecraft:granite"
+			},
+			{
+				"item": "minecraft:diorite"
+			},
+			{
+				"item": "minecraft:deepslate"
+			},
+			{
+				"item": "minecraft:cobblestone"
+			},
+			{
+				"item": "minecraft:stone"
+			},
+			{
+				"item": "minecraft:tuff"
+			},
+			{
+				"item": "minecraft:dripstone_block"
+			}
+		],
+		"T": {
+			"item": "minecraft:redstone_torch"
+		},
+		"Q": {
+			"item": "minecraft:quartz"
+		}
+    },
+    "result": {
+        "id": "minecraft:comparator",
+        "count": 1
+    }
+}
diff --git a/data/minecraft/recipe/dispenser.json b/data/minecraft/recipe/dispenser.json
@@ -6,48 +6,15 @@
         "#R#"
     ],
     "key": {
-        "#": [
-			{
-				"item": "minecraft:blackstone"
-			},
-			{
-				"item": "minecraft:cobbled_deepslate"
-			},
-			{
-				"item": "minecraft:andesite"
-			},
-			{
-				"item": "minecraft:granite"
-			},
-			{
-				"item": "minecraft:diorite"
-			},
-			{
-				"item": "minecraft:deepslate"
-			},
-			{
-				"item": "minecraft:cobblestone"
-			},
-			{
-				"item": "minecraft:stone"
-			},
-			{
-				"item": "minecraft:tuff"
-			},
-			{
-				"item": "minecraft:dripstone_block"
-			}
-		],
-        "B": [
-			{
-				"item": "minecraft:bow"
-			}
-		],
-        "R": [
-			{
-				"item": "minecraft:redstone"
-			}
-		]
+        "#": {
+            "tag": "crafting:alternate_stones"
+        },
+        "B": {
+			"item": "minecraft:bow"
+		},
+        "R": {
+			"item": "minecraft:redstone"
+		}
     },
     "result": {
         "id": "minecraft:dispenser",

diff --git a/data/minecraft/recipe/dropper.json b/data/minecraft/recipe/dropper.json
@@ -6,40 +6,11 @@
         "#R#"
     ],
     "key": {
-        "#": [
-			{
-				"item": "minecraft:blackstone"
-			},
-			{
-				"item": "minecraft:cobbled_deepslate"
-			},
-			{
-				"item": "minecraft:andesite"
-			},
-			{
-				"item": "minecraft:granite"
-			},
-			{
-				"item": "minecraft:diorite"
-			},
-			{
-				"item": "minecraft:deepslate"
-			},
-			{
-				"item": "minecraft:cobblestone"
-			},
-			{
-				"item": "minecraft:stone"
-			},
-			{
-				"item": "minecraft:tuff"
-			},
-			{
-				"item": "minecraft:dripstone_block"
-			}
-		],
+        "#": {
+            "tag": "crafting:alternate_stones"
+        },
         "R": {
-				"item": "minecraft:redstone"
+			"item": "minecraft:redstone"
         }
     },
     "result": {

diff --git a/data/minecraft/recipe/furnace.json b/data/minecraft/recipe/furnace.json
@@ -6,38 +6,9 @@
         "###"
     ],
     "key": {
-        "#": [
-			{
-				"item": "minecraft:blackstone"
-			},
-			{
-				"item": "minecraft:cobbled_deepslate"
-			},
-			{
-				"item": "minecraft:andesite"
-			},
-			{
-				"item": "minecraft:granite"
-			},
-			{
-				"item": "minecraft:diorite"
-			},
-			{
-				"item": "minecraft:deepslate"
-			},
-			{
-				"item": "minecraft:cobblestone"
-			},
-			{
-				"item": "minecraft:stone"
-			},
-			{
-				"item": "minecraft:tuff"
-			},
-			{
-				"item": "minecraft:dripstone_block"
-			}
-		]
+        "#": {
+            "tag": "crafting:alternate_stones"
+        }
     },
     "result": {
         "id": "minecraft:furnace",