Skip to content

Furniture 1.21 #1062

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 40 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
79b92c3
add furniture datapack
TheThanathor Aug 25, 2023
a22c161
add furniture table for crafting
TheThanathor Aug 25, 2023
3d61925
fix EVERYTHING
TheThanathor Aug 30, 2023
9466202
add colourability
TheThanathor Aug 31, 2023
507a667
small fixes
TheThanathor Sep 1, 2023
f4bea4f
fix water placement
TheThanathor Sep 2, 2023
ded438e
rework python script
TheThanathor Sep 20, 2023
167bc4d
file format improvements
TheThanathor Sep 21, 2023
d8f62b1
fix player head textures
TheThanathor Sep 21, 2023
7d1ce6d
clean up some old code, add sounds
TheThanathor Sep 23, 2023
2446bb3
this wasn't pushed?
TheThanathor Sep 23, 2023
5cfc3cf
Merge branch 'master' of https://github.com/Gamemode4Dev/GM4_Datapack…
misode Oct 31, 2023
4951366
Fix formatting issue in beet.yaml
misode Oct 31, 2023
5492e86
add reworked furniture
TheThanathor Dec 19, 2023
f1b51f7
Merge remote-tracking branch 'upstream/master' into furniture
TheThanathor Dec 19, 2023
e7439b7
fix furniture placing wrong when facing north
TheThanathor Dec 19, 2023
a6bdf89
Merge remote-tracking branch 'upstream/master' into furniture
TheThanathor Jan 21, 2024
262b342
final update for PS
TheThanathor Jan 21, 2024
4e40f03
pandas have gone extinct
TheThanathor Jan 22, 2024
b32825b
add metal set
TheThanathor Jan 22, 2024
9a23e98
fix some missing headers and waterlogging
TheThanathor Jan 22, 2024
2b31c3c
Merge remote-tracking branch 'upstream/master' into furniture
TheThanathor Jan 23, 2024
c2b32b4
use new gm4.utils
TheThanathor Jan 23, 2024
65c4443
fix recipe
TheThanathor Jan 25, 2024
bd4dcbe
reapply invisibility since its lost on server restart
TheThanathor Jan 27, 2024
95bf079
improve furniture breaking logic
TheThanathor Jan 30, 2024
20e6948
replace wandering trader with villagers
TheThanathor Feb 27, 2024
7f50d3d
allow turning off furniture station
TheThanathor Feb 27, 2024
782e150
fix missing headers
TheThanathor Feb 27, 2024
e505b7d
add updated seating
TheThanathor Feb 29, 2024
8ba9f79
Merge remote-tracking branch 'upstream/master' into furniture
TheThanathor Sep 11, 2024
c964215
update to 1.21
TheThanathor Sep 12, 2024
7053f38
fix paintbrush
TheThanathor Sep 14, 2024
6c7bf31
add lantern
kyrkis Nov 17, 2024
7f651a0
update loot tables to use gm4:air
TheThanathor Dec 5, 2024
93aa950
Merge remote-tracking branch 'upstream/master' into furniture_1.21
TheThanathor Dec 5, 2024
99b177b
Fix loot table entries
misode Dec 5, 2024
c95a3e4
remove old container GUI
TheThanathor Dec 19, 2024
62b7125
make furniture hitboxes slightly bigger
TheThanathor Dec 19, 2024
d30c54f
shift furniture station GUI name
BPR02 Dec 20, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 56 additions & 1 deletion gm4/modeldata_registry.json
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,11 @@
"gm4_metallurgy:shamir/infinitas": 100
},
"command_block": {
"gm4:gui/advancement/root": 1
"gm4:gui/advancement/root": 1,
"gm4_furniture:item/furniture/set_tool/cloth_set": 2,
"gm4_furniture:item/furniture/set_tool/metal_set": 3,
"gm4_furniture:item/furniture/set_tool/stone_set": 4,
"gm4_furniture:item/furniture/set_tool/wood_set": 5
},
"compass": {
"gm4_metallurgy:shamir/sensus": 101,
Expand Down Expand Up @@ -970,6 +974,33 @@
"gm4_metallurgy:shamir/defuse": 106,
"gm4_animi_shamir:shamir/animi": 124
},
"leather_horse_armor": {
"gm4_furniture:item/furniture/paintbrush": 1,
"gm4_furniture:block/furniture/cloth_set/paper_lantern_1": 11,
"gm4_furniture:block/furniture/cloth_set/horizontal_flag_1": 16,
"gm4_furniture:block/furniture/metal_set/iron/3_candelabra_1": 18,
"gm4_furniture:block/furniture/metal_set/gold/3_candelabra_1": 30,
"gm4_furniture:block/furniture/metal_set/gold/skull_1": 31,
"gm4_furniture:block/furniture/stone_set/statues/frog": 32,
"gm4_furniture:block/furniture/stone_set/statues/bee": 33,
"gm4_furniture:block/furniture/stone_set/statues/pufferfish": 34,
"gm4_furniture:block/furniture/stone_set/statues/axolotl": 35,
"gm4_furniture:block/furniture/stone_set/statues/allay": 36,
"gm4_furniture:block/furniture/wood_set/plain/1x1_table_1": 37,
"gm4_furniture:block/furniture/wood_set/plain/2x2_table_1": 38,
"gm4_furniture:block/furniture/wood_set/plain/bench_1": 39,
"gm4_furniture:block/furniture/wood_set/plain/chair_1": 52,
"gm4_furniture:block/furniture/wood_set/plain/stool_1": 53,
"gm4_furniture:block/furniture/wood_set/plain/light_1": 59,
"gm4_furniture:block/furniture/wood_set/fancy/1x1_table_1": 60,
"gm4_furniture:block/furniture/wood_set/fancy/2x2_table_1": 62,
"gm4_furniture:block/furniture/wood_set/fancy/bench_1": 63,
"gm4_furniture:block/furniture/wood_set/fancy/chair_1": 64,
"gm4_furniture:block/furniture/wood_set/fancy/stool_1": 65,
"gm4_furniture:block/furniture/wood_set/fancy/light_1": 66,
"gm4_furniture:block/furniture/furniture_station": 67,
"gm4_furniture:block/furniture/metal_set/iron/lantern_1": 68
},
"leather_leggings": {
"gm4_washing_tanks:guidebook_icon/washing_tanks": 1,
"gm4_weighted_armour:shamir/helious": 103,
Expand Down Expand Up @@ -1256,11 +1287,14 @@
"gm4_heart_canisters:item/heart_canister_tier_2": 8,
"gm4_scuba_gear:item/scuba_helmet": 9,
"gm4_heart_canisters:guidebook_icon/heart_canisters": 10,
"gm4_furniture:block/furniture/cloth_set/paper_lantern_1": 11,
"gm4_zauber_cauldrons:item/crystal/speed": 12,
"gm4_zauber_cauldrons:item/crystal/regeneration": 13,
"gm4_end_fishing:item/enderpuff": 14,
"gm4_tinkering_compressors:gui/advancement/tinkering_compressors": 15,
"gm4_furniture:block/furniture/cloth_set/horizontal_flag_1": 16,
"gm4_metallurgy:item/lump/bismutite": 17,
"gm4_furniture:block/furniture/metal_set/iron/3_candelabra_1": 18,
"gm4_metallurgy:item/lump/baryte": 19,
"gm4_metallurgy:item/lump/thorianite": 20,
"gm4_metallurgy:item/lump/bauxite": 21,
Expand All @@ -1272,6 +1306,16 @@
"gm4_relocators:item/relocator_empty": 27,
"gm4_ender_hoppers:block/ender_hopper_side": 28,
"gm4_ender_hoppers:block/ender_hopper_minecart": 29,
"gm4_furniture:block/furniture/metal_set/gold/3_candelabra_1": 30,
"gm4_furniture:block/furniture/metal_set/gold/skull_1": 31,
"gm4_furniture:block/furniture/stone_set/statues/frog": 32,
"gm4_furniture:block/furniture/stone_set/statues/bee": 33,
"gm4_furniture:block/furniture/stone_set/statues/pufferfish": 34,
"gm4_furniture:block/furniture/stone_set/statues/axolotl": 35,
"gm4_furniture:block/furniture/stone_set/statues/allay": 36,
"gm4_furniture:block/furniture/wood_set/plain/1x1_table_1": 37,
"gm4_furniture:block/furniture/wood_set/plain/2x2_table_1": 38,
"gm4_furniture:block/furniture/wood_set/plain/bench_1": 39,
"gm4_tnt_landmines:item/tnt_landmine": 40,
"gm4_tnt_landmines:item/tnt_landmine_grass": 41,
"gm4_tnt_landmines:item/tnt_landmine_dirt": 42,
Expand All @@ -1284,12 +1328,23 @@
"gm4_metallurgy:gui/advancement/metallurgy_blast_ore": 49,
"gm4_metallurgy:gui/advancement/metallurgy_cast": 50,
"gm4_relocators:gui/advancement/relocators": 51,
"gm4_furniture:block/furniture/wood_set/plain/chair_1": 52,
"gm4_furniture:block/furniture/wood_set/plain/stool_1": 53,
"gm4_zauber_cauldrons:item/crystal/instant_damage": 54,
"gm4_zauber_cauldrons:item/crystal/instant_health": 55,
"gm4_zauber_cauldrons:item/crystal/jump_boost": 56,
"gm4_zauber_cauldrons:item/crystal/poison": 57,
"gm4_zauber_cauldrons:item/crystal/strength": 58,
"gm4_furniture:block/furniture/wood_set/plain/light_1": 59,
"gm4_furniture:block/furniture/wood_set/fancy/1x1_table_1": 60,
"gm4_relocators:item/relocator_full": 61,
"gm4_furniture:block/furniture/wood_set/fancy/2x2_table_1": 62,
"gm4_furniture:block/furniture/wood_set/fancy/bench_1": 63,
"gm4_furniture:block/furniture/wood_set/fancy/chair_1": 64,
"gm4_furniture:block/furniture/wood_set/fancy/stool_1": 65,
"gm4_furniture:block/furniture/wood_set/fancy/light_1": 66,
"gm4_furniture:block/furniture/furniture_station": 67,
"gm4_furniture:block/furniture/metal_set/iron/lantern_1": 68,
"gm4_metallurgy:shamir/infinitas": 100,
"gm4_metallurgy:shamir/sensus": 101,
"gm4_weighted_armour:shamir/helious": 103,
Expand Down
6 changes: 6 additions & 0 deletions gm4_furniture/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# Furniture<!--$headerTitle--><!--$pmc:delete-->

Add Furniture TODO: improve this readme! <!--$pmc:headerSize-->

### Features
- Add Furniture
14 changes: 14 additions & 0 deletions gm4_furniture/assets/gm4/font/container_gui.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"providers": [
{
"type": "space",
"advances": {
"\u8100": -1,
"\u8020": -224,
"\u8021": -128,
"\u8022": 39

}
}
]
}
5 changes: 5 additions & 0 deletions gm4_furniture/assets/gm4/lang/en_us.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"OLDgui.gm4.furniture_station": "\u9021\u9020\u9100\u9022\u9023",
"OLDgui.gm4.furniture_station.offset": "\u9024",
"gui.gm4.furniture_station.offset": "\u8022"
}
14 changes: 14 additions & 0 deletions gm4_furniture/assets/gm4_furniture/font/container_gui.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"providers": [
{
"type": "space",
"advances": {
"\u8100": -1,
"\u8020": -224,
"\u8021": -128,
"\u8022": 39

}
}
]
}
18 changes: 18 additions & 0 deletions gm4_furniture/assets/gm4_furniture/font/default.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"providers": [
{
"type": "space",
"advances": {
" ": 4,
"\u200c": 0
}
},
{
"type": "ttf",
"file": "gm4_furniture:minecraft.ttf",
"shift": [0,-0.5],
"size": 13,
"oversample": 7
}
]
}
Loading
Loading