Skip to content

More Furniture Changes #4

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.

Sign up for GitHub

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

Closed
runcows wants to merge 32 commits into from
Closed

More Furniture Changes #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
3166860
Fix paintbrush color picking for furniture placed as dyed
runcows Aug 26, 2025
8b17693
Change puffer fish sound to blow_up, since ambient doesn't exist
runcows Aug 27, 2025
5ce32bb
Big custom interaction changes
runcows Aug 28, 2025
3053ff3
Add click sound to fancy lamp interaction
runcows Aug 28, 2025
0d009ce
Change sound for axolotl statue to idle air, idle water was really qu…
runcows Aug 28, 2025
93c50a7
Simplify candle lighting item modification a little bit
runcows Aug 28, 2025
6e4aea7
nitpicking my own header
runcows Aug 28, 2025
85d8230
Add slime and chicken statues
runcows Sep 1, 2025
dc1b63b
Fix dyed color component being applied on every item display on place…
runcows Sep 1, 2025
3404ffe
Add spruce furniture
runcows Sep 3, 2025
8a2ba9f
Fix blocks being able to be placed in furniture (replacing light blocks)
runcows Sep 4, 2025
2451ae8
Change lamp shade to use redstone lamp for crafting and medieval scon…
runcows Sep 4, 2025
760bd27
Edit slime statue eyes
runcows Sep 4, 2025
814e6fc
Yoink some summit furniture and support for that
runcows Sep 4, 2025
bd2bbcc
Add GM4 foldable chair as an easter egg
runcows Sep 4, 2025
4acc994
Dyable -> Dyeable
runcows Sep 4, 2025
859de26
Remove CMD, move fully to item models, and rename wood sets to be org…
runcows Sep 4, 2025
dc159e7
Update spruce tables (#3)
Dinoguin-Jess Sep 5, 2025
d7c1ffc
Remove unneeded CMD code from generate.py
runcows Sep 6, 2025
27c96db
Fix furniture station not dropping with the item model
runcows Sep 6, 2025
0e390d1
Change furniture station set order so wood is first when placed.
runcows Sep 6, 2025
723492c
Offhand Support & some other stuff
runcows Sep 6, 2025
62247ae
Add candle extinguish sound
runcows Sep 6, 2025
4eccc15
Fix Typo
runcows Sep 7, 2025
ff93488
Lessons learned from updating rope ladders and lively lily pads
runcows Sep 7, 2025
afa92dd
Interaction doesn't need to check UUID actually
runcows Sep 7, 2025
2877b71
move gametime query to `interact/process`
runcows Sep 7, 2025
fdbf439
Change item display killing on furniture break to check id
runcows Sep 8, 2025
8acafaa
Custom placement improvements
runcows Sep 8, 2025
fa03623
Add adventure mode check to interactions
runcows Sep 8, 2025
bcd2fd8
Make gametime cherck more concise
runcows Sep 8, 2025
0ca44e5
Cherry bench, stool and chair (#4)
Dinoguin-Jess Sep 9, 2025
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
59 changes: 3 additions & 56 deletions gm4/modeldata_registry.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,11 +233,7 @@
"gm4_metallurgy:shamir/infinitas": 100
},
"command_block": {
"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
"gm4:gui/advancement/root": 1
},
"compass": {
"gm4_metallurgy:shamir/sensus": 101,
Expand Down Expand Up @@ -538,6 +534,7 @@
"fishing_rod": {
"gm4_end_fishing:gui/advancement/end_fishing": 1,
"gm4_end_fishing:guidebook_icon/end_fishing": 2,
"gm4_reeling_rods:guidebook_icon/reeling_rods": 3,
"gm4_metallurgy:shamir/hypexperia": 110,
"gm4_animi_shamir:shamir/animi": 124
},
Expand Down Expand Up @@ -988,33 +985,7 @@
"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_horse_armor": {},
"leather_leggings": {
"gm4_washing_tanks:guidebook_icon/washing_tanks": 1,
"gm4_weighted_armour:shamir/helious": 103,
Expand Down Expand Up @@ -1310,14 +1281,11 @@
"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 @@ -1329,16 +1297,6 @@
"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 @@ -1351,23 +1309,12 @@
"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
Loading
Loading