Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
89 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
b3fdb31
Merge branch 'master' of https://github.com/Gamemode4Dev/GM4_Datapack…
runcows Aug 23, 2025
a84f0dd
1.21.8 and other changes
runcows Aug 26, 2025
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
ca3d4af
Add cat, fox and silverfish statues.
Dinoguin-Jess Sep 14, 2025
b5b6ede
Group new statues with old
runcows Sep 14, 2025
b5430ca
Add custom interaction sounds to cat, fox, silverfish statues
runcows Sep 14, 2025
300bf13
Scale cat down to match vanilla
runcows Sep 14, 2025
7647ffa
Add cherry 1x1 table and 2x2 table. Remove spruce 1x1 table grouped c…
Dinoguin-Jess Sep 16, 2025
53097a6
Fix chicken statue Textures. Add Spruce Light starting point
Dinoguin-Jess Sep 16, 2025
8463585
Add Cherry Light. Fix all firstperson_left hand. Fix displays for fir…
Dinoguin-Jess Sep 17, 2025
856445e
Change spruce light model to be slightly larger
Dinoguin-Jess Sep 17, 2025
a9b02aa
Merge branch 'master' into furniture_1.21.8
runcows Sep 18, 2025
0db6c28
New look for spruce sconce
runcows Sep 23, 2025
6e0b033
Merge branch 'furniture_1.21.8' of https://github.com/runcows/GM4_Dat…
runcows Sep 23, 2025
a5eaabc
Add Particle System for torch sconce
runcows Sep 23, 2025
d04b844
Add Acacia wood set
Dinoguin-Jess Oct 1, 2025
94e3f71
Fix unresolved merge conflict for acacia wood set
runcows Oct 14, 2025
cd3a6e7
Hopefully fix some issues
runcows Oct 14, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions gm4/modeldata_registry.json
Original file line number Diff line number Diff line change
Expand Up @@ -985,6 +985,7 @@
"gm4_metallurgy:shamir/defuse": 106,
"gm4_animi_shamir:shamir/animi": 124
},
"leather_horse_armor": {},
"leather_leggings": {
"gm4_washing_tanks:guidebook_icon/washing_tanks": 1,
"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