Skip to content

Commit

Permalink
Added custom compacting recipes, changed recipes that used the tag to…
Browse files Browse the repository at this point in the history
… use the custom recipe, closes #150
  • Loading branch information
Buuz135 committed Sep 11, 2023
1 parent f6b4abc commit c7a2251
Show file tree
Hide file tree
Showing 20 changed files with 358 additions and 161 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/publish.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,6 @@ jobs:
game-versions: 1.19.2
java: 17
name: ""
changelog: "https://github.com/Buuz135/FunctionalStorage/commits/1.19/CHANGELOG.md"
changelog: "https://github.com/Buuz135/FunctionalStorage/blob/1.19/CHANGELOG.md"
dependencies: |
titanium | depends
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,5 @@
* Prevent infinite loop when drawers check for their parent stuff, closes #73
* Now having the configuration tool in the offhand it will toggle the selected action when placing a drawer, closes #156
* Fixed pushing upgrade only pushing to the first slot, closes #164
* Added Framed Simple Compacting Drawer, closes #179
* Added Framed Simple Compacting Drawer, closes #179
* Added custom compacting recipes, changed recipes that used the tag to use the custom recipe, closes #150
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
// 1.19.2 2023-09-11T16:28:07.8459027 Tags for minecraft:item
8250c4dc87ee6f6c2f21c530c8a1f2bb203c32ba data/functionalstorage/tags/items/drawer.json
a6cf5364934bad4e060980a3c7f3c091ad90a585 data/functionalstorage/tags/items/ignore_crafting_check.json
// 1.19.2 2023-09-11T20:18:35.3526175 Tags for minecraft:item
89ea5373901359c91347ffd870336f8dd4f2cc52 data/functionalstorage/tags/items/drawer.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
// 1.19.2 2023-09-11T16:28:07.8439024 Tags for minecraft:block
8250c4dc87ee6f6c2f21c530c8a1f2bb203c32ba data/minecraft/tags/blocks/mineable/axe.json
// 1.19.2 2023-09-11T20:18:35.3566154 Tags for minecraft:block
89ea5373901359c91347ffd870336f8dd4f2cc52 data/minecraft/tags/blocks/mineable/axe.json
4b6fc75faca16170a17220f0e301b16866f4bc5c data/minecraft/tags/blocks/mineable/pickaxe.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
// 1.19.2 2023-09-11T20:18:35.3561145 Titanium Serializable (functionalstorage)
a7466344fe302df75a569e4712ed02cb443c359a data/functionalstorage/recipes/custom_compacting/amethyst.json
e47b9a1342f38c4e36482fe0fe0a0bada0f875ff data/functionalstorage/recipes/custom_compacting/blue_ice.json
d24028ec840b0e7b4d100b43144e7a3f5a70283c data/functionalstorage/recipes/custom_compacting/clay.json
b3d11532f966981fbe0349b89e09cc691e8f68e4 data/functionalstorage/recipes/custom_compacting/glowstone.json
ea40f46d6a88b93ad35f6ce57cd2a391cd195abb data/functionalstorage/recipes/custom_compacting/ice.json
266466efff4179eae51a2ce4c4541d65ebd9bb60 data/functionalstorage/recipes/custom_compacting/melon.json
4d0c7b7ed927a92cef2cdb9814ca086287a363ac data/functionalstorage/recipes/custom_compacting/quartz.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"type": "functionalstorage:custom_compacting",
"higher_input": {
"count": 1,
"item": "minecraft:amethyst_block"
},
"lower_input": {
"count": 9,
"item": "minecraft:amethyst_shard"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"type": "functionalstorage:custom_compacting",
"higher_input": {
"count": 1,
"item": "minecraft:packed_ice"
},
"lower_input": {
"count": 9,
"item": "minecraft:blue_ice"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"type": "functionalstorage:custom_compacting",
"higher_input": {
"count": 1,
"item": "minecraft:clay"
},
"lower_input": {
"count": 4,
"item": "minecraft:clay_ball"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"type": "functionalstorage:custom_compacting",
"higher_input": {
"count": 1,
"item": "minecraft:glowstone"
},
"lower_input": {
"count": 4,
"item": "minecraft:glowstone_dust"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"type": "functionalstorage:custom_compacting",
"higher_input": {
"count": 1,
"item": "minecraft:blue_ice"
},
"lower_input": {
"count": 9,
"item": "minecraft:ice"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"type": "functionalstorage:custom_compacting",
"higher_input": {
"count": 1,
"item": "minecraft:melon"
},
"lower_input": {
"count": 9,
"item": "minecraft:melon_slice"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"type": "functionalstorage:custom_compacting",
"higher_input": {
"count": 1,
"item": "minecraft:quartz_block"
},
"lower_input": {
"count": 4,
"item": "minecraft:quartz"
}
}
Original file line number Diff line number Diff line change
@@ -1,15 +1,5 @@
{
"values": [
"functionalstorage:oak_1",
"functionalstorage:spruce_1",
"functionalstorage:birch_1",
"functionalstorage:jungle_1",
"functionalstorage:acacia_1",
"functionalstorage:dark_oak_1",
"functionalstorage:crimson_1",
"functionalstorage:warped_1",
"functionalstorage:framed_1",
"functionalstorage:mangrove_1",
"functionalstorage:oak_2",
"functionalstorage:spruce_2",
"functionalstorage:birch_2",
Expand All @@ -20,6 +10,16 @@
"functionalstorage:warped_2",
"functionalstorage:framed_2",
"functionalstorage:mangrove_2",
"functionalstorage:oak_1",
"functionalstorage:spruce_1",
"functionalstorage:birch_1",
"functionalstorage:jungle_1",
"functionalstorage:acacia_1",
"functionalstorage:dark_oak_1",
"functionalstorage:crimson_1",
"functionalstorage:warped_1",
"functionalstorage:framed_1",
"functionalstorage:mangrove_1",
"functionalstorage:oak_4",
"functionalstorage:spruce_4",
"functionalstorage:birch_4",
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,15 +1,5 @@
{
"values": [
"functionalstorage:oak_1",
"functionalstorage:spruce_1",
"functionalstorage:birch_1",
"functionalstorage:jungle_1",
"functionalstorage:acacia_1",
"functionalstorage:dark_oak_1",
"functionalstorage:crimson_1",
"functionalstorage:warped_1",
"functionalstorage:framed_1",
"functionalstorage:mangrove_1",
"functionalstorage:oak_2",
"functionalstorage:spruce_2",
"functionalstorage:birch_2",
Expand All @@ -20,6 +10,16 @@
"functionalstorage:warped_2",
"functionalstorage:framed_2",
"functionalstorage:mangrove_2",
"functionalstorage:oak_1",
"functionalstorage:spruce_1",
"functionalstorage:birch_1",
"functionalstorage:jungle_1",
"functionalstorage:acacia_1",
"functionalstorage:dark_oak_1",
"functionalstorage:crimson_1",
"functionalstorage:warped_1",
"functionalstorage:framed_1",
"functionalstorage:mangrove_1",
"functionalstorage:oak_4",
"functionalstorage:spruce_4",
"functionalstorage:birch_4",
Expand Down
Loading

0 comments on commit c7a2251

Please sign in to comment.