Skip to content

Commit

Permalink
Added Fluid Framed Drawers
Browse files Browse the repository at this point in the history
  • Loading branch information
Buuz135 committed Oct 30, 2024
1 parent faa6f73 commit c57370c
Show file tree
Hide file tree
Showing 48 changed files with 1,320 additions and 67 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# VERSION 1.3.5
* Increased controller range render a bit to avoid Z-Fighting
* Fixed Framing recipe changing the original value
* Added Fluid Framed Drawers

# VERSION 1.3.4
* fix: fixed #322 by making copyIndex variable
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
org.gradle.jvmargs=-Xmx2048M
modGroup=com.buuz135
mod_version=1.3.4
mod_version=1.3.5
modBaseName=functionalstorage

neo_version=21.1.40
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.21.1 2024-10-28T12:48:31.6590249 Item Models: functionalstorage
// 1.21.1 2024-10-30T13:30:53.1701181 Item Models: functionalstorage
e0f7b66a84e6588f01abbbce75b1803ffe5d46e2 assets/functionalstorage/models/item/acacia_1.json
e0f7b66a84e6588f01abbbce75b1803ffe5d46e2 assets/functionalstorage/models/item/acacia_2.json
e0f7b66a84e6588f01abbbce75b1803ffe5d46e2 assets/functionalstorage/models/item/acacia_4.json
Expand Down Expand Up @@ -31,6 +31,9 @@ e0f7b66a84e6588f01abbbce75b1803ffe5d46e2 assets/functionalstorage/models/item/fr
e0f7b66a84e6588f01abbbce75b1803ffe5d46e2 assets/functionalstorage/models/item/framed_2.json
e0f7b66a84e6588f01abbbce75b1803ffe5d46e2 assets/functionalstorage/models/item/framed_4.json
bffd40ac50ca20c358e2c93b57104a9858242e52 assets/functionalstorage/models/item/framed_controller_extension.json
e0f7b66a84e6588f01abbbce75b1803ffe5d46e2 assets/functionalstorage/models/item/framed_fluid_1.json
e0f7b66a84e6588f01abbbce75b1803ffe5d46e2 assets/functionalstorage/models/item/framed_fluid_2.json
e0f7b66a84e6588f01abbbce75b1803ffe5d46e2 assets/functionalstorage/models/item/framed_fluid_4.json
e0f7b66a84e6588f01abbbce75b1803ffe5d46e2 assets/functionalstorage/models/item/framed_simple_compacting_drawer.json
c6248c7ce7bb9aa88c7e75b2545a40f346f112e1 assets/functionalstorage/models/item/framed_storage_controller.json
1f165509c733e747c26d4c6a60306988b130dbee assets/functionalstorage/models/item/gold_upgrade.json
Expand Down
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
// 1.21.1 2024-10-28T12:48:31.6519826 Languages: en_us for mod: functionalstorage
4ce44e7063049d3b70c4c7db24c7e58e5a07f169 assets/functionalstorage/lang/en_us.json
// 1.21.1 2024-10-30T14:38:49.2895994 Languages: en_us for mod: functionalstorage
adc466c5fc5cdfefd095c7ea37a8e1a9020f4b17 assets/functionalstorage/lang/en_us.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.21.1 2024-09-21T14:04:15.9487606 Block States: functionalstorage
// 1.21.1 2024-10-30T13:30:53.1621686 Block States: functionalstorage
b1f76f1b67016350af532beb6de3ffdc4d9a07be assets/functionalstorage/blockstates/acacia_1.json
a4e462d9775fd4aefa673952d4d69f9d90b2e823 assets/functionalstorage/blockstates/acacia_2.json
ecd77b58fb3d746ab8e2109adf686ea01cf5d96a assets/functionalstorage/blockstates/acacia_4.json
Expand Down Expand Up @@ -26,6 +26,9 @@ b66e872170929f7d24af6720167749014a9cd16f assets/functionalstorage/blockstates/fr
ea5c1b0de1f8102d561e1669a42b4ae9145d4b8c assets/functionalstorage/blockstates/framed_2.json
251a4112ccff54b28ef878d0f31b320c7cf12c11 assets/functionalstorage/blockstates/framed_4.json
1dff325fb33d3ffbbba975e022b219fad229d15f assets/functionalstorage/blockstates/framed_controller_extension.json
9447d8196bfe7af38780ba6b7eb27020a41df9bb assets/functionalstorage/blockstates/framed_fluid_1.json
710a11871caad26c638f4eddf9684aff29a5a6e0 assets/functionalstorage/blockstates/framed_fluid_2.json
4b7e1f484c6eb60c79564a80c2e9a75720049c49 assets/functionalstorage/blockstates/framed_fluid_4.json
6ad215edb261487c389408d15a1434a81549c35c assets/functionalstorage/blockstates/framed_simple_compacting_drawer.json
27bc9e9477a0287cdc0c5bec8830c8012e6302c8 assets/functionalstorage/blockstates/framed_storage_controller.json
ae3be1b76f15453d6905a0ac71d240df0ce3d868 assets/functionalstorage/blockstates/jungle_1.json
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// 1.21.1 2024-10-28T13:04:03.6655641 Functional Storage Item Tags
dce1fbc7d93ffd0f6dca91d6e15795d982c6e62e data/functionalstorage/tags/item/drawer.json
// 1.21.1 2024-10-30T14:44:51.893763 Functional Storage Item Tags
835e427d83a22d7d095d867d36357b6578bec083 data/functionalstorage/tags/item/drawer.json
0f4059ebc0b8af722c3f50b447456cc984ac7aef data/functionalstorage/tags/item/drawer_1x1.json
e720d099ebe08a625a2c4e30d8d49b2c1a29251b data/functionalstorage/tags/item/drawer_1x2.json
f001be17000f3dca8d2f189631b3ee9804911422 data/functionalstorage/tags/item/drawer_2x2.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.21.1 2024-09-21T14:04:15.9520286 Loot Tables
// 1.21.1 2024-10-30T13:30:53.1646686 Loot Tables
d78cf8442a9d36bff4abc1107f1217f4a4418c8e data/functionalstorage/loot_table/blocks/acacia_1.json
47f3265cef09634f6f2d136757304488a7cf1c75 data/functionalstorage/loot_table/blocks/acacia_2.json
769595131ba5623e061d1fada4a22af5fd00cb69 data/functionalstorage/loot_table/blocks/acacia_4.json
Expand Down Expand Up @@ -26,6 +26,9 @@ e78f6a5085f22199a5f7e9cf6f7fae5cd6e28c72 data/functionalstorage/loot_table/block
799b3dc4a002bbf0ac20a3c8b1827cf42673affb data/functionalstorage/loot_table/blocks/framed_2.json
2faf0c684a20da3cd731b56685903ca1724f67d7 data/functionalstorage/loot_table/blocks/framed_4.json
a07bc575d23810ae47f9f157a164302ee728c5f2 data/functionalstorage/loot_table/blocks/framed_controller_extension.json
f918874be4f95a73d42022c969aea4fcf0b22ad4 data/functionalstorage/loot_table/blocks/framed_fluid_1.json
fcf61678369f3bde385a0af3c00ada39d2d99f41 data/functionalstorage/loot_table/blocks/framed_fluid_2.json
a30ef5cf5cdb75335a8151d783447ec50b4a0c40 data/functionalstorage/loot_table/blocks/framed_fluid_4.json
cf1bb3214330e19fee50cbc3a71f7704751239d4 data/functionalstorage/loot_table/blocks/framed_simple_compacting_drawer.json
41acd837bd91f3e02c3ae90b4f632c6b33d8d302 data/functionalstorage/loot_table/blocks/framed_storage_controller.json
bdef97337c16c1ad48d8a807785621750eace79f data/functionalstorage/loot_table/blocks/jungle_1.json
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
// 1.21.1 2024-10-28T13:04:03.6700649 Tags for minecraft:block mod id functionalstorage
dce1fbc7d93ffd0f6dca91d6e15795d982c6e62e data/minecraft/tags/block/mineable/axe.json
4b6fc75faca16170a17220f0e301b16866f4bc5c data/minecraft/tags/block/mineable/pickaxe.json
// 1.21.1 2024-10-30T14:44:51.8942631 Tags for minecraft:block mod id functionalstorage
835e427d83a22d7d095d867d36357b6578bec083 data/minecraft/tags/block/mineable/axe.json
553cd3e13a4f372ac8a1b749645a08cbb0948d05 data/minecraft/tags/block/mineable/pickaxe.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.21.1 2024-10-28T13:04:03.6670651 Recipes
// 1.21.1 2024-10-30T14:38:49.291684 Recipes
f07485f3ee5257c2b12fcf149c60ddd20ed73fe1 data/functionalstorage/advancement/recipes/misc/acacia_1.json
8cce3aada48266b5e41df6e04b01ab1fd2224a4c data/functionalstorage/advancement/recipes/misc/acacia_2.json
8bc6f134a188d7ec701a472feeb93bccc9a115f3 data/functionalstorage/advancement/recipes/misc/acacia_4.json
Expand Down Expand Up @@ -35,6 +35,9 @@ e336f9fead981cf7a763bf8d7f7b90d875de1201 data/functionalstorage/advancement/reci
260ef23a3d16b545eaf546d751ac894683f7d0cd data/functionalstorage/advancement/recipes/misc/framed_4.json
ecc2a25f451f87a6ce84b61ac0748df1e13aff8a data/functionalstorage/advancement/recipes/misc/framed_4_from_simple.json
6ffe3c05a0e63ee88797c1e7bf424a727feb6e59 data/functionalstorage/advancement/recipes/misc/framed_controller_extension.json
fa30fac4aafa734727678769b6b3ceff3edd942b data/functionalstorage/advancement/recipes/misc/framed_fluid_1.json
b4410b77706c26e14c7e1f86ef7a90842e37ed71 data/functionalstorage/advancement/recipes/misc/framed_fluid_2.json
a83959537e786a167f9255e6664a6efe2d638486 data/functionalstorage/advancement/recipes/misc/framed_fluid_4.json
286e7b93e8853d20a27cd6afc108975edb0f3ee3 data/functionalstorage/advancement/recipes/misc/framed_simple_compacting_drawer.json
c7e3939a3d41d0bbed2777ba6d570de731f7b1d6 data/functionalstorage/advancement/recipes/misc/framed_simple_compacting_drawer_from_simple.json
e5b83d8acfe3d3a8bd64ac4f1fa71aefc0057f18 data/functionalstorage/advancement/recipes/misc/framed_storage_controller.json
Expand Down Expand Up @@ -107,6 +110,9 @@ fd38720c28a543ff250af3e94f2d22337acd4c01 data/functionalstorage/recipe/framed_1.
ad44f7b469f3f40e2d0ac09c3194d393d054557d data/functionalstorage/recipe/framed_4.json
ae0b2ad2e7a1f41cc977aa99063160d80f0887f8 data/functionalstorage/recipe/framed_4_from_simple.json
84fc39ed6bcf643a7fe4840e5eaeff6b88331d15 data/functionalstorage/recipe/framed_controller_extension.json
6312265546746f5b6f27e2436495688cc0737b03 data/functionalstorage/recipe/framed_fluid_1.json
3f596e6fa498247d5997ac4cb7fcc27c009cc0f5 data/functionalstorage/recipe/framed_fluid_2.json
ce5f5764024309ad6b78f57dc573840099785106 data/functionalstorage/recipe/framed_fluid_4.json
edb9e1fe3911c45ef063082efffb36b842525abc data/functionalstorage/recipe/framed_simple_compacting_drawer.json
20de5824fa1639738d100099e9ea883d4c758089 data/functionalstorage/recipe/framed_simple_compacting_drawer_from_simple.json
38521176076e502f53a47cb412cf17f385160b3b data/functionalstorage/recipe/framed_storage_controller.json
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.21.1 2024-09-21T14:04:15.9507754 Block Models: functionalstorage
// 1.21.1 2024-10-30T14:44:51.8912623 Block Models: functionalstorage
9a3565a126dac6771b78fa3f5f3f2b6e3c858dd8 assets/functionalstorage/models/block/acacia_1_locked.json
fb054b9a925853b52f05fc4402de2b58b2d3a72f assets/functionalstorage/models/block/acacia_2_locked.json
b8c2c3e1a316d39c881a4532b04a18d19d6d9c55 assets/functionalstorage/models/block/acacia_4_locked.json
Expand All @@ -19,6 +19,9 @@ cb959dc23ee41d96246e3e398ef7024e1315aceb assets/functionalstorage/models/block/d
538e32181db72b1d0f9849711b5a7eaed7f41682 assets/functionalstorage/models/block/fluid_1_locked.json
25d9cab6fc436845d17a75daf7fc7de6ea326ad0 assets/functionalstorage/models/block/fluid_2_locked.json
3b094843acbbb1317d80f37266730d63fbb1124f assets/functionalstorage/models/block/fluid_4_locked.json
f7525efbb9a74e37c7e8fc738b933491c40e6603 assets/functionalstorage/models/block/framed_fluid_1_locked.json
b5f88c49ca8b230878e475567f4536a63b6f5c57 assets/functionalstorage/models/block/framed_fluid_2_locked.json
c3085519b39627444081080e0148021da1080ece assets/functionalstorage/models/block/framed_fluid_4_locked.json
8ecb3eef0f754f28f34c94971a4679e06cf11694 assets/functionalstorage/models/block/jungle_1_locked.json
efcb03885d4fc0d73ba446938f891e8e5a1ff919 assets/functionalstorage/models/block/jungle_2_locked.json
684cf354dea1b5429aea7767b145ff875692eedf assets/functionalstorage/models/block/jungle_4_locked.json
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
{
"variants": {
"locked=false,subfacing=east": {
"model": "functionalstorage:block/framed_fluid_1",
"uvlock": true,
"y": 90
},
"locked=false,subfacing=north": {
"model": "functionalstorage:block/framed_fluid_1",
"uvlock": true
},
"locked=false,subfacing=south": {
"model": "functionalstorage:block/framed_fluid_1",
"uvlock": true,
"y": 180
},
"locked=false,subfacing=west": {
"model": "functionalstorage:block/framed_fluid_1",
"uvlock": true,
"y": 270
},
"locked=true,subfacing=east": {
"model": "functionalstorage:block/framed_fluid_1_locked",
"uvlock": true,
"y": 90
},
"locked=true,subfacing=north": {
"model": "functionalstorage:block/framed_fluid_1_locked",
"uvlock": true
},
"locked=true,subfacing=south": {
"model": "functionalstorage:block/framed_fluid_1_locked",
"uvlock": true,
"y": 180
},
"locked=true,subfacing=west": {
"model": "functionalstorage:block/framed_fluid_1_locked",
"uvlock": true,
"y": 270
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
{
"variants": {
"locked=false,subfacing=east": {
"model": "functionalstorage:block/framed_fluid_2",
"uvlock": true,
"y": 90
},
"locked=false,subfacing=north": {
"model": "functionalstorage:block/framed_fluid_2",
"uvlock": true
},
"locked=false,subfacing=south": {
"model": "functionalstorage:block/framed_fluid_2",
"uvlock": true,
"y": 180
},
"locked=false,subfacing=west": {
"model": "functionalstorage:block/framed_fluid_2",
"uvlock": true,
"y": 270
},
"locked=true,subfacing=east": {
"model": "functionalstorage:block/framed_fluid_2_locked",
"uvlock": true,
"y": 90
},
"locked=true,subfacing=north": {
"model": "functionalstorage:block/framed_fluid_2_locked",
"uvlock": true
},
"locked=true,subfacing=south": {
"model": "functionalstorage:block/framed_fluid_2_locked",
"uvlock": true,
"y": 180
},
"locked=true,subfacing=west": {
"model": "functionalstorage:block/framed_fluid_2_locked",
"uvlock": true,
"y": 270
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
{
"variants": {
"locked=false,subfacing=east": {
"model": "functionalstorage:block/framed_fluid_4",
"uvlock": true,
"y": 90
},
"locked=false,subfacing=north": {
"model": "functionalstorage:block/framed_fluid_4",
"uvlock": true
},
"locked=false,subfacing=south": {
"model": "functionalstorage:block/framed_fluid_4",
"uvlock": true,
"y": 180
},
"locked=false,subfacing=west": {
"model": "functionalstorage:block/framed_fluid_4",
"uvlock": true,
"y": 270
},
"locked=true,subfacing=east": {
"model": "functionalstorage:block/framed_fluid_4_locked",
"uvlock": true,
"y": 90
},
"locked=true,subfacing=north": {
"model": "functionalstorage:block/framed_fluid_4_locked",
"uvlock": true
},
"locked=true,subfacing=south": {
"model": "functionalstorage:block/framed_fluid_4_locked",
"uvlock": true,
"y": 180
},
"locked=true,subfacing=west": {
"model": "functionalstorage:block/framed_fluid_4_locked",
"uvlock": true,
"y": 270
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@
"block.functionalstorage.framed_2": "Framed Drawer (1x2)",
"block.functionalstorage.framed_4": "Framed Drawer (2x2)",
"block.functionalstorage.framed_controller_extension": "Framed Controller Access Point",
"block.functionalstorage.framed_fluid_1": "Framed Fluid Drawer (1x1)",
"block.functionalstorage.framed_fluid_2": "Framed Drawer (1x2)",
"block.functionalstorage.framed_fluid_4": "Framed Drawer (2x2)",
"block.functionalstorage.framed_simple_compacting_drawer": "Framed Simple Compacting Drawer",
"block.functionalstorage.framed_storage_controller": "Framed Storage Controller",
"block.functionalstorage.jungle_1": "Jungle Drawer (1x1)",
Expand All @@ -37,7 +40,6 @@
"block.functionalstorage.oak_1": "Oak Drawer (1x1)",
"block.functionalstorage.oak_2": "Oak Drawer (1x2)",
"block.functionalstorage.oak_4": "Oak Drawer (2x2)",
"block.functionalstorage.simple_compacting_drawer": "Simple Compacting Drawer",
"block.functionalstorage.spruce_1": "Spruce Drawer (1x1)",
"block.functionalstorage.spruce_2": "Spruce Drawer (1x2)",
"block.functionalstorage.spruce_4": "Spruce Drawer (2x2)",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "functionalstorage:block/framed_fluid_1",
"textures": {
"lock_icon": "functionalstorage:block/lock"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "functionalstorage:block/framed_fluid_2",
"textures": {
"lock_icon": "functionalstorage:block/lock"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "functionalstorage:block/framed_fluid_4",
"textures": {
"lock_icon": "functionalstorage:block/lock"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "minecraft:builtin/entity"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "minecraft:builtin/entity"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "minecraft:builtin/entity"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"neoforge:conditions": [
{
"type": "neoforge:item_exists",
"item": "functionalstorage:framed_fluid_1"
}
],
"parent": "minecraft:recipes/root",
"criteria": {
"has_item": {
"conditions": {
"items": [
{
"items": "minecraft:iron_nugget"
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "functionalstorage:framed_fluid_1"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_the_recipe",
"has_item"
]
],
"rewards": {
"recipes": [
"functionalstorage:framed_fluid_1"
]
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"neoforge:conditions": [
{
"type": "neoforge:item_exists",
"item": "functionalstorage:framed_fluid_2"
}
],
"parent": "minecraft:recipes/root",
"criteria": {
"has_item": {
"conditions": {
"items": [
{
"items": "minecraft:iron_nugget"
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "functionalstorage:framed_fluid_2"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_the_recipe",
"has_item"
]
],
"rewards": {
"recipes": [
"functionalstorage:framed_fluid_2"
]
}
}
Loading

0 comments on commit c57370c

Please sign in to comment.