Skip to content

Commit

Permalink
Add workbench items
Browse files Browse the repository at this point in the history
  • Loading branch information
@AlexNijjar
AlexNijjar committed Feb 4, 2024
1 parent 50015c8 commit 6658a4d
Show file tree
Hide file tree
Showing 57 changed files with 259 additions and 229 deletions.
2 changes: 1 addition & 1 deletion changelog.md
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
- Cleaned up GUI.
- Added workbench items, allowing you to chip items without needing the workbench block.
- Fixed crash on startup when Architectury API is not installed due to accessing protected TransparentBlock class.
4 changes: 2 additions & 2 deletions common/src/main/generated/resources/.cache/090418e8027c120589721b86514d627d1aeb9a8a
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
// 1.20.4 2024-02-02T21:07:26.0496 Languages: en_us for mod: chipped
01dde2a254719e4be15e0aa26019b70f9c4c92aa assets/chipped/lang/en_us.json
// 1.20.4 2024-02-04T15:36:28.110901 Languages: en_us for mod: chipped
0a4675b1ddd38ff844d2e8aa596b49f200edc562 assets/chipped/lang/en_us.json
28 changes: 27 additions & 1 deletion common/src/main/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
// 1.20.4 2024-02-02T14:18:16.918649 Recipes
// 1.20.4 2024-02-04T16:08:41.881716 Recipes
15c10dae93b8acac00ed06bbc610e85e51bfabc2 data/chipped/advancements/recipes/misc/alchemy_book.json
e7675da12773d3e3c4c6b5ace0d1fae1f848f58a data/chipped/advancements/recipes/misc/chisel.json
d95b08149e523c817f3dde457b984ceead0b84a1 data/chipped/advancements/recipes/misc/multimeter.json
466619db28b4b7773170fb4abab5b5ccb3450510 data/chipped/advancements/recipes/misc/needles.json
23200229b267db080737fdd2f166b3a0b5188680 data/chipped/advancements/recipes/misc/saw.json
5a65cf26b210249d3fa2262c89df9c868268d284 data/chipped/advancements/recipes/misc/watering_can.json
02b9edf9b7e825e4af60401966e0d68667383102 data/chipped/advancements/recipes/workbench/alchemy_bench.json
e2af1991ebc01b668e2edd389d97f63cb5d9a82b data/chipped/advancements/recipes/workbench/botanist_workbench.json
db3df410de4c8ba20711bd2a9e1f8cddc984c5ba data/chipped/advancements/recipes/workbench/carpenters_table.json
Expand All @@ -7,9 +13,29 @@ d34c31caadb6ca6397aaa72d764f7a76e584497c data/chipped/advancements/recipes/workb
064208aacdb803fb946a32e6e0e9fa98ea5a117f data/chipped/advancements/recipes/workbench/mason_table.json
7b6a11a1dc8a11a57ab33971591259ece24c57c9 data/chipped/advancements/recipes/workbench/tinkering_table.json
556c98fe63213166f34e3ff90170045e295fbf11 data/chipped/recipes/alchemy_bench.json
5a9bc011603f6d1b353dd83f165b3f150f49d41b data/chipped/recipes/alchemy_book.json
139fdaffcce2ea991aebd5cf8d1f8764561afc8e data/chipped/recipes/botanist_workbench.json
3296707e0edeea96a41d97d978b80179cc7a4d05 data/chipped/recipes/carpenters_table.json
e85319cc5c83195a1e0a3de9e40c1b801cea8b1d data/chipped/recipes/chisel.json
f5d0e7503e6daeff695c0bf0a667595f45c0d6da data/chipped/recipes/glassblower.json
464091d6f562ee011a09da07d860bc119ca45e95 data/chipped/recipes/loom_table.json
9f3c270f8781820110c573496bb84083b7d4f0aa data/chipped/recipes/mason_table.json
a97c33f6b6ab1164437f104f4d988d850d5e4404 data/chipped/recipes/multimeter.json
321d31436c42e26f1cafe0afae89d9ca65acefbf data/chipped/recipes/needles.json
151e588140be23ada48f10712617a4359649a4ad data/chipped/recipes/saw.json
be21b9feeb5f360b4ddcf702cd46bccc6227275b data/chipped/recipes/tinkering_table.json
3ace032dca41947b629bf60f0bdc051c57a2956e data/chipped/recipes/watering_can.json
078d386ed32aa393e5b299ae2b859888bfe1b813 data/minecraft/advancements/recipes/misc/workbench/alchemy_bench.json
7371ef0e909ba6f52c4685647b43f79a35654437 data/minecraft/advancements/recipes/misc/workbench/botanist_workbench.json
01ce044ce638c3c6b925b2533ec7af3619a392c1 data/minecraft/advancements/recipes/misc/workbench/carpenters_table.json
0da85350df729e26b73a42adc1aa44675afdb4f1 data/minecraft/advancements/recipes/misc/workbench/glassblower.json
a740710ec10dab00377faba57a5ac940d606e996 data/minecraft/advancements/recipes/misc/workbench/loom_table.json
949b29b77c94ca64b486380363f5f8488b950509 data/minecraft/advancements/recipes/misc/workbench/mason_table.json
0999e5ad78f09f74de1fc9166d8f8607df301e40 data/minecraft/advancements/recipes/misc/workbench/tinkering_table.json
faf360699eaeedb3774acc5562102e104893e854 data/minecraft/recipes/workbench/alchemy_bench.json
bee2a1614480c3534b2e88916e34ba6b242261b2 data/minecraft/recipes/workbench/botanist_workbench.json
44d74606478dda802195b9dda1d3ba5184786142 data/minecraft/recipes/workbench/carpenters_table.json
18bf2884a407c5e2f4f57be1c761b024c9cf9774 data/minecraft/recipes/workbench/glassblower.json
a2216565c55ca9c9be5ad72f460ab4b6973ca9ef data/minecraft/recipes/workbench/loom_table.json
cc7b67d46ebfb56a80d1a8e4dce746c22ed1cb45 data/minecraft/recipes/workbench/mason_table.json
c0e00261312a975a2381b6b67beee5e94dc7fff5 data/minecraft/recipes/workbench/tinkering_table.json
7 changes: 6 additions & 1 deletion common/src/main/generated/resources/.cache/f12516052d9910b54f6e8bf2640f305ec2c3685f
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
// 1.20.4 2024-02-02T14:07:46.951015 Item Models: chipped
// 1.20.4 2024-02-04T16:08:41.865295 Item Models: chipped
883d41ccbbcb47bb4303628701183c3ec3d403d5 assets/chipped/models/item/acacia_torch.json
98830b5a85db396b35364a3ee4e383711fcd4a98 assets/chipped/models/item/alchemy_book.json
516277799b28242a8b6a2c2addb7b8d12f4aed76 assets/chipped/models/item/andesite_pointed_dripstone.json
f5e53176a803aab3174583d8e270f840a5c52f61 assets/chipped/models/item/arched_black_stained_glass_pane_pillar.json
f4b7de9e6228060909e2cf9b9fa83b5bd2188e47 assets/chipped/models/item/arched_blue_stained_glass_pane_pillar.json
Expand Down Expand Up @@ -289,6 +290,8 @@ a6415f13c6c0d87b361dd6c04ac361596b1d6fbd assets/chipped/models/item/mini_crimson
986d6b3ac3fb2c534d43bb456e431069032d9c7a assets/chipped/models/item/mini_red_mushroom.json
b5001a9da7d1c89d7cf31f8ca32a61c6fdf99860 assets/chipped/models/item/mini_warped_fungus.json
ded452cd2413b7769bd04313621074f547b3a1f2 assets/chipped/models/item/mossy_ladder.json
ee4a81d5690d78a87ab6ee6a790f28ef500b6586 assets/chipped/models/item/multimeter.json
cb322ddefcd312b1282d68b84739293a9d7f0ab3 assets/chipped/models/item/needles.json
decd6b74b36a71f7413b9960d6b2c90974fd47a0 assets/chipped/models/item/nether_sprouts_weeds.json
d2c49aa25528ef7c87c5cbf28d3ff525efbe3078 assets/chipped/models/item/netherrack_pointed_dripstone.json
2d094fd74584510674572c67699c69bd80baccfa assets/chipped/models/item/oak_bared_glass_pane.json
Expand Down Expand Up @@ -393,6 +396,7 @@ ae86f71bec972fb57805ba52ff4776eee5555a85 assets/chipped/models/item/raster_pink_
2da002d958b768125281e02f148dda498222a534 assets/chipped/models/item/rope_planked_ladder.json
13d672f7dba996bf4ab9dd19669073843cb09ceb assets/chipped/models/item/roped_ladder.json
c44f8f5697b684381bb3a7df98562bb9018bd201 assets/chipped/models/item/rough_lily_pad.json
2d6699ccba59d4334d235bd7736878e45a4e09c5 assets/chipped/models/item/saw.json
4d32885df2dd7d4dfadcf61263fc939707349aba assets/chipped/models/item/scattered_cobweb.json
1405511c1823c22769b9393258f81e6d46d58a79 assets/chipped/models/item/screen_acacia_door.json
777a9176760a604a7f6b0308a18464c574b511ac assets/chipped/models/item/screen_bamboo_door.json
Expand Down Expand Up @@ -573,6 +577,7 @@ bff5d7390346f49dc7ddcf9ed262bda35851ac23 assets/chipped/models/item/warped_fungu
885b533c6fc9f813610e76ee3a17c73b20865f72 assets/chipped/models/item/warped_fungus_trio.json
a640fd17dfd8cd03f5fc4335f37eff96119b27a1 assets/chipped/models/item/warped_torch.json
dac276226f5fe80c2da30df0afdd1a9a5091febc assets/chipped/models/item/warty_nether_sprouts.json
e29c7f24ad359b7b80d1018e438967abceb4edd6 assets/chipped/models/item/watering_can.json
d37667a2ace872b4c112957eab3e08c7e8cb85ac assets/chipped/models/item/white_paper_lantern.json
a19b8a13cd183f417ec1342d00fc6733140b4af4 assets/chipped/models/item/wicked_brown_mushroom.json
1a69e6fd55c66964f84f05ae6aa91119402a544d assets/chipped/models/item/wicked_crimson_fungus.json
Expand Down
2 changes: 1 addition & 1 deletion common/src/main/generated/resources/assets/chipped/lang/en_us.json
View file

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions common/src/main/generated/resources/assets/chipped/models/item/alchemy_book.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"parent":"minecraft:item/generated","textures":{"layer0":"chipped:item/alchemy_book"}}
1 change: 1 addition & 0 deletions common/src/main/generated/resources/assets/chipped/models/item/multimeter.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"parent":"minecraft:item/generated","textures":{"layer0":"chipped:item/multimeter"}}
1 change: 1 addition & 0 deletions common/src/main/generated/resources/assets/chipped/models/item/needles.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"parent":"minecraft:item/generated","textures":{"layer0":"chipped:item/needles"}}
1 change: 1 addition & 0 deletions common/src/main/generated/resources/assets/chipped/models/item/saw.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"parent":"minecraft:item/generated","textures":{"layer0":"chipped:item/saw"}}
1 change: 1 addition & 0 deletions common/src/main/generated/resources/assets/chipped/models/item/watering_can.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"parent":"minecraft:item/generated","textures":{"layer0":"chipped:item/watering_can"}}
1 change: 1 addition & 0 deletions common/src/main/generated/resources/data/chipped/advancements/recipes/misc/alchemy_book.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"parent":"minecraft:recipes/root","criteria":{"has_alchemy_book":{"conditions":{"items":[{"items":["chipped:alchemy_bench"]}]},"trigger":"minecraft:inventory_changed"},"has_the_recipe":{"conditions":{"recipe":"chipped:alchemy_book"},"trigger":"minecraft:recipe_unlocked"}},"requirements":[["has_the_recipe","has_alchemy_book"]],"rewards":{"recipes":["chipped:alchemy_book"]}}
1 change: 1 addition & 0 deletions common/src/main/generated/resources/data/chipped/advancements/recipes/misc/chisel.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"parent":"minecraft:recipes/root","criteria":{"has_chisel":{"conditions":{"items":[{"items":["chipped:mason_table"]}]},"trigger":"minecraft:inventory_changed"},"has_the_recipe":{"conditions":{"recipe":"chipped:chisel"},"trigger":"minecraft:recipe_unlocked"}},"requirements":[["has_the_recipe","has_chisel"]],"rewards":{"recipes":["chipped:chisel"]}}
1 change: 1 addition & 0 deletions common/src/main/generated/resources/data/chipped/advancements/recipes/misc/multimeter.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"parent":"minecraft:recipes/root","criteria":{"has_multimeter":{"conditions":{"items":[{"items":["chipped:tinkering_table"]}]},"trigger":"minecraft:inventory_changed"},"has_the_recipe":{"conditions":{"recipe":"chipped:multimeter"},"trigger":"minecraft:recipe_unlocked"}},"requirements":[["has_the_recipe","has_multimeter"]],"rewards":{"recipes":["chipped:multimeter"]}}
1 change: 1 addition & 0 deletions common/src/main/generated/resources/data/chipped/advancements/recipes/misc/needles.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"parent":"minecraft:recipes/root","criteria":{"has_needles":{"conditions":{"items":[{"items":["chipped:loom_table"]}]},"trigger":"minecraft:inventory_changed"},"has_the_recipe":{"conditions":{"recipe":"chipped:needles"},"trigger":"minecraft:recipe_unlocked"}},"requirements":[["has_the_recipe","has_needles"]],"rewards":{"recipes":["chipped:needles"]}}
1 change: 1 addition & 0 deletions common/src/main/generated/resources/data/chipped/advancements/recipes/misc/saw.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"parent":"minecraft:recipes/root","criteria":{"has_saw":{"conditions":{"items":[{"items":["chipped:carpenters_table"]}]},"trigger":"minecraft:inventory_changed"},"has_the_recipe":{"conditions":{"recipe":"chipped:saw"},"trigger":"minecraft:recipe_unlocked"}},"requirements":[["has_the_recipe","has_saw"]],"rewards":{"recipes":["chipped:saw"]}}
1 change: 1 addition & 0 deletions common/src/main/generated/resources/data/chipped/advancements/recipes/misc/watering_can.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"parent":"minecraft:recipes/root","criteria":{"has_the_recipe":{"conditions":{"recipe":"chipped:watering_can"},"trigger":"minecraft:recipe_unlocked"},"has_watering_can":{"conditions":{"items":[{"items":["chipped:botanist_workbench"]}]},"trigger":"minecraft:inventory_changed"}},"requirements":[["has_the_recipe","has_watering_can"]],"rewards":{"recipes":["chipped:watering_can"]}}
1 change: 1 addition & 0 deletions common/src/main/generated/resources/data/chipped/recipes/alchemy_book.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"type":"minecraft:crafting_shapeless","category":"misc","ingredients":[{"item":"chipped:alchemy_bench"},{"item":"minecraft:book"}],"result":{"item":"chipped:alchemy_book"}}
1 change: 1 addition & 0 deletions common/src/main/generated/resources/data/chipped/recipes/chisel.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"type":"minecraft:crafting_shapeless","category":"misc","ingredients":[{"item":"chipped:mason_table"},{"item":"minecraft:iron_ingot"}],"result":{"item":"chipped:chisel"}}
1 change: 1 addition & 0 deletions common/src/main/generated/resources/data/chipped/recipes/multimeter.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"type":"minecraft:crafting_shapeless","category":"misc","ingredients":[{"item":"chipped:tinkering_table"},{"item":"minecraft:redstone"}],"result":{"item":"chipped:multimeter"}}
1 change: 1 addition & 0 deletions common/src/main/generated/resources/data/chipped/recipes/needles.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"type":"minecraft:crafting_shapeless","category":"misc","ingredients":[{"item":"chipped:loom_table"},{"item":"minecraft:stick"}],"result":{"item":"chipped:needles"}}
1 change: 1 addition & 0 deletions common/src/main/generated/resources/data/chipped/recipes/saw.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"type":"minecraft:crafting_shapeless","category":"misc","ingredients":[{"item":"chipped:carpenters_table"},{"item":"minecraft:iron_ingot"}],"result":{"item":"chipped:saw"}}
1 change: 1 addition & 0 deletions common/src/main/generated/resources/data/chipped/recipes/watering_can.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"type":"minecraft:crafting_shapeless","category":"misc","ingredients":[{"item":"chipped:botanist_workbench"},{"item":"minecraft:bucket"}],"result":{"item":"chipped:watering_can"}}
1 change: 1 addition & 0 deletions ...generated/resources/data/minecraft/advancements/recipes/misc/workbench/alchemy_bench.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"parent":"minecraft:recipes/root","criteria":{"has_alchemy_bench":{"conditions":{"items":[{"items":["minecraft:crafting_table"]}]},"trigger":"minecraft:inventory_changed"},"has_the_recipe":{"conditions":{"recipe":"minecraft:workbench/alchemy_bench"},"trigger":"minecraft:recipe_unlocked"}},"requirements":[["has_the_recipe","has_alchemy_bench"]],"rewards":{"recipes":["minecraft:workbench/alchemy_bench"]}}
1 change: 1 addition & 0 deletions ...ated/resources/data/minecraft/advancements/recipes/misc/workbench/botanist_workbench.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"parent":"minecraft:recipes/root","criteria":{"has_botanist_workbench":{"conditions":{"items":[{"items":["minecraft:crafting_table"]}]},"trigger":"minecraft:inventory_changed"},"has_the_recipe":{"conditions":{"recipe":"minecraft:workbench/botanist_workbench"},"trigger":"minecraft:recipe_unlocked"}},"requirements":[["has_the_recipe","has_botanist_workbench"]],"rewards":{"recipes":["minecraft:workbench/botanist_workbench"]}}
1 change: 1 addition & 0 deletions ...erated/resources/data/minecraft/advancements/recipes/misc/workbench/carpenters_table.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"parent":"minecraft:recipes/root","criteria":{"has_carpenters_table":{"conditions":{"items":[{"items":["minecraft:crafting_table"]}]},"trigger":"minecraft:inventory_changed"},"has_the_recipe":{"conditions":{"recipe":"minecraft:workbench/carpenters_table"},"trigger":"minecraft:recipe_unlocked"}},"requirements":[["has_the_recipe","has_carpenters_table"]],"rewards":{"recipes":["minecraft:workbench/carpenters_table"]}}
1 change: 1 addition & 0 deletions ...n/generated/resources/data/minecraft/advancements/recipes/misc/workbench/glassblower.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"parent":"minecraft:recipes/root","criteria":{"has_glassblower":{"conditions":{"items":[{"items":["minecraft:crafting_table"]}]},"trigger":"minecraft:inventory_changed"},"has_the_recipe":{"conditions":{"recipe":"minecraft:workbench/glassblower"},"trigger":"minecraft:recipe_unlocked"}},"requirements":[["has_the_recipe","has_glassblower"]],"rewards":{"recipes":["minecraft:workbench/glassblower"]}}
1 change: 1 addition & 0 deletions ...in/generated/resources/data/minecraft/advancements/recipes/misc/workbench/loom_table.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"parent":"minecraft:recipes/root","criteria":{"has_loom_table":{"conditions":{"items":[{"items":["minecraft:crafting_table"]}]},"trigger":"minecraft:inventory_changed"},"has_the_recipe":{"conditions":{"recipe":"minecraft:workbench/loom_table"},"trigger":"minecraft:recipe_unlocked"}},"requirements":[["has_the_recipe","has_loom_table"]],"rewards":{"recipes":["minecraft:workbench/loom_table"]}}
1 change: 1 addition & 0 deletions ...n/generated/resources/data/minecraft/advancements/recipes/misc/workbench/mason_table.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"parent":"minecraft:recipes/root","criteria":{"has_mason_table":{"conditions":{"items":[{"items":["minecraft:crafting_table"]}]},"trigger":"minecraft:inventory_changed"},"has_the_recipe":{"conditions":{"recipe":"minecraft:workbench/mason_table"},"trigger":"minecraft:recipe_unlocked"}},"requirements":[["has_the_recipe","has_mason_table"]],"rewards":{"recipes":["minecraft:workbench/mason_table"]}}
1 change: 1 addition & 0 deletions ...nerated/resources/data/minecraft/advancements/recipes/misc/workbench/tinkering_table.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"parent":"minecraft:recipes/root","criteria":{"has_the_recipe":{"conditions":{"recipe":"minecraft:workbench/tinkering_table"},"trigger":"minecraft:recipe_unlocked"},"has_tinkering_table":{"conditions":{"items":[{"items":["minecraft:crafting_table"]}]},"trigger":"minecraft:inventory_changed"}},"requirements":[["has_the_recipe","has_tinkering_table"]],"rewards":{"recipes":["minecraft:workbench/tinkering_table"]}}
1 change: 1 addition & 0 deletions common/src/main/generated/resources/data/minecraft/recipes/workbench/alchemy_bench.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"type":"minecraft:crafting_shaped","category":"misc","key":{"#":{"item":"minecraft:crafting_table"},"B":{"item":"minecraft:brewing_stand"},"E":{"item":"minecraft:enchanting_table"},"S":{"tag":"minecraft:wooden_slabs"}},"pattern":[" B ","S#S","SES"],"result":{"item":"chipped:alchemy_bench"}}
1 change: 1 addition & 0 deletions common/src/main/generated/resources/data/minecraft/recipes/workbench/botanist_workbench.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"type":"minecraft:crafting_shaped","category":"misc","key":{"#":{"item":"minecraft:crafting_table"},"/":{"item":"minecraft:stick"},"F":{"item":"minecraft:flower_pot"},"S":{"tag":"minecraft:wooden_slabs"}},"pattern":["FFF","S#S","/ /"],"result":{"item":"chipped:botanist_workbench"}}
1 change: 1 addition & 0 deletions common/src/main/generated/resources/data/minecraft/recipes/workbench/carpenters_table.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"type":"minecraft:crafting_shaped","category":"misc","key":{"#":{"item":"minecraft:crafting_table"},"A":{"item":"minecraft:iron_axe"},"I":{"item":"minecraft:iron_ingot"},"P":{"tag":"minecraft:planks"}},"pattern":["A I","P#P","PPP"],"result":{"item":"chipped:carpenters_table"}}
1 change: 1 addition & 0 deletions common/src/main/generated/resources/data/minecraft/recipes/workbench/glassblower.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"type":"minecraft:crafting_shaped","category":"misc","key":{"#":{"item":"minecraft:crafting_table"},"B":{"item":"minecraft:bricks"},"F":{"item":"minecraft:blast_furnace"},"G":{"item":"minecraft:glass"},"I":{"item":"minecraft:iron_ingot"}},"pattern":["IGI","B#B","BFB"],"result":{"item":"chipped:glassblower"}}
1 change: 1 addition & 0 deletions common/src/main/generated/resources/data/minecraft/recipes/workbench/loom_table.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"type":"minecraft:crafting_shaped","category":"misc","key":{"#":{"item":"minecraft:crafting_table"},"/":{"item":"minecraft:stick"},"L":{"tag":"minecraft:logs"},"W":{"tag":"minecraft:wool"}},"pattern":["WWW","/#/","LLL"],"result":{"item":"chipped:loom_table"}}
1 change: 1 addition & 0 deletions common/src/main/generated/resources/data/minecraft/recipes/workbench/mason_table.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"type":"minecraft:crafting_shaped","category":"misc","key":{"#":{"item":"minecraft:crafting_table"},"B":{"item":"minecraft:brick"},"I":{"item":"minecraft:iron_ingot"},"L":{"tag":"minecraft:logs"}},"pattern":["BBB","I#I","LLL"],"result":{"item":"chipped:mason_table"}}
1 change: 1 addition & 0 deletions common/src/main/generated/resources/data/minecraft/recipes/workbench/tinkering_table.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"type":"minecraft:crafting_shaped","category":"misc","key":{"#":{"item":"minecraft:crafting_table"},"I":{"item":"minecraft:iron_ingot"},"L":{"tag":"minecraft:logs"},"R":{"item":"minecraft:redstone"},"T":{"item":"minecraft:redstone_torch"}},"pattern":["TRT","I#I","L L"],"result":{"item":"chipped:tinkering_table"}}
20 changes: 2 additions & 18 deletions common/src/main/java/earth/terrarium/chipped/common/blocks/WorkbenchBlock.java
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,15 @@
package earth.terrarium.chipped.common.blocks;

import com.mojang.serialization.MapCodec;
import earth.terrarium.chipped.common.menus.WorkbenchMenu;
import earth.terrarium.chipped.common.menus.WorkbenchMenuProvider;
import net.minecraft.MethodsReturnNonnullByDefault;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
import net.minecraft.network.chat.Component;
import net.minecraft.util.StringRepresentable;
import net.minecraft.world.InteractionHand;
import net.minecraft.world.InteractionResult;
import net.minecraft.world.MenuProvider;
import net.minecraft.world.entity.LivingEntity;
import net.minecraft.world.entity.player.Inventory;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.inventory.AbstractContainerMenu;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.context.BlockPlaceContext;
import net.minecraft.world.level.Level;
Expand Down Expand Up @@ -54,7 +50,7 @@ public BlockState getStateForPlacement(BlockPlaceContext context) {

@Override
public @NotNull InteractionResult use(@NotNull BlockState state, Level level, @NotNull BlockPos pos, @NotNull Player player, @NotNull InteractionHand handIn, @NotNull BlockHitResult hit) {
player.openMenu(new WorkbenchMenuProvider());
player.openMenu(new WorkbenchMenuProvider(getName()));
return InteractionResult.sidedSuccess(level.isClientSide);
}

Expand Down Expand Up @@ -125,16 +121,4 @@ public String toString() {
return getSerializedName();
}
}

public class WorkbenchMenuProvider implements MenuProvider {
@Override
public Component getDisplayName() {
return getName();
}

@Override
public AbstractContainerMenu createMenu(int id, Inventory inventory, Player player) {
return new WorkbenchMenu(id, inventory);
}
}
}
23 changes: 23 additions & 0 deletions common/src/main/java/earth/terrarium/chipped/common/items/WorkbenchItem.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
package earth.terrarium.chipped.common.items;

import earth.terrarium.chipped.common.menus.WorkbenchMenuProvider;
import net.minecraft.world.InteractionHand;
import net.minecraft.world.InteractionResultHolder;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.level.Level;

public class WorkbenchItem extends Item {

public WorkbenchItem(Properties properties) {
super(properties);
}

@Override
public InteractionResultHolder<ItemStack> use(Level level, Player player, InteractionHand usedHand) {
var stack = player.getItemInHand(usedHand);
player.openMenu(new WorkbenchMenuProvider(getName(stack)));
return InteractionResultHolder.sidedSuccess(stack, level.isClientSide());
}
}
Loading

0 comments on commit 6658a4d

Please sign in to comment.