4HEADmaster

5 files changed, 20 insertions, 45 deletions

diff --git a/data/fmc/functions/hunger/load.mcfunction b/data/fmc/functions/hunger/load.mcfunction
index 7c56a87..3208f4c 100644
--- a/data/fmc/functions/hunger/load.mcfunction
+++ b/data/fmc/functions/hunger/load.mcfunction
@@ -32,14 +32,10 @@ forceload add -4872 139
 forceload add -4670 -379
 forceload add -4592 -265
 forceload add -5075 -423
-forceload add -4672 -379
 forceload add -4443 -463
 forceload add -4632 -276
 forceload add -4637 -275
-forceload add -5053 -288
-forceload add -5057 -300
 forceload add -4983 -495
-forceload add -5057 -278
 forceload add -4566 174
 forceload add -4846 -97
 forceload add -4640 -178
@@ -48,6 +44,8 @@ forceload add -4342 4
 forceload add -4407 -23
 forceload add -4972 -5
 forceload add -4396 -616
+forceload add -4833 -715
+forceload add -4631 -206
 
 # Furnaces:
 forceload add -4442 -483
@@ -55,13 +53,11 @@ forceload add -4973 -45
 forceload add -4542 -322
 forceload add -4761 -310
 forceload add -4804 -281
-forceload add -4630 -764
-forceload add -4636 -764
-forceload add -4671 -381
-forceload add -4673 -381
 forceload add -5080 -426
 forceload add -4635 -276
 forceload add -4640 -178
+forceload add -4833 -714
+forceload add -4629 -204
 
 # Anvils:
 forceload add -4971 -51
diff --git a/data/fmc/functions/hunger/main.mcfunction b/data/fmc/functions/hunger/main.mcfunction
index ee6e9f4..0bd36c9 100644
--- a/data/fmc/functions/hunger/main.mcfunction
+++ b/data/fmc/functions/hunger/main.mcfunction
@@ -11,6 +11,7 @@ clear @a
 item replace entity @a armor.head from block -4695 76 -287 container.1
 item replace entity 2776320c-cba8-484c-bd2e-83e06d9e3ced armor.head from block -4695 76 -287 container.0
 item replace entity 46c08288-0cdc-442f-a414-83f1a0810b52 armor.head from block -4695 76 -287 container.0
+item replace entity 4d52cc6d-6140-42d7-b58e-eddf1c798c07 armor.head from block -4695 76 -287 container.5
 item replace entity 733ca570-edd0-4c6b-9a15-9cc408291a78 armor.head from block -4695 76 -287 container.0
 item replace entity 9ee38483-32ee-4e5a-b1db-d6526f3659e3 armor.head from block -4695 76 -287 container.3
 item replace entity a01383f0-f620-4877-baa8-82fc71fe1c13 armor.head from block -4695 76 -287 container.4
diff --git a/data/fmc/functions/hunger/refill.mcfunction b/data/fmc/functions/hunger/refill.mcfunction
index 8427d78..1efe142 100644
--- a/data/fmc/functions/hunger/refill.mcfunction
+++ b/data/fmc/functions/hunger/refill.mcfunction
@@ -110,20 +110,10 @@ item replace block -4919 43 53 container.14 with minecraft:tipped_arrow{CustomPo
 setblock -4589 101 122 minecraft:barrel[facing=up]
 item replace block -4589 101 122 container.13 with minecraft:elytra{Damage:416,Enchantments:[{id:"minecraft:binding_curse",lvl:1}]}
 
-#setblock -4638 43 -764 minecraft:chest[facing=south]
-#item replace block -4638 43 -764 container.13 with minecraft:stone_axe{Damage:123,display:{Name:"\"Butcher's Knife\""}}
-
-#setblock -4632 43 -764 minecraft:chest[facing=south]
-#item replace block -4632 43 -764 container.11 with minecraft:cooked_mutton{display:{Name:"\"Sus Meat\""}} 3
-#item replace block -4632 43 -764 container.14 with minecraft:enchanted_book{StoredEnchantments:[{id:"minecraft:depth_strider",lvl:2}]}
-
 setblock -4872 49 139 minecraft:chest[facing=east]
 item replace block -4872 49 139 container.12 with minecraft:iron_sword{Damage:234,display:{Name:"\"Othello Sværdet\""}}
 item replace block -4872 49 139 container.14 with minecraft:enchanted_book{StoredEnchantments:[{id:"minecraft:fire_aspect",lvl:2}]}
 
-setblock -4670 43 -379 minecraft:barrel[facing=up]
-item replace block -4670 43 -379 container.13 with minecraft:enchanted_book{StoredEnchantments:[{id:"minecraft:quick_charge",lvl:1}]}
-
 setblock -4592 47 -265 minecraft:barrel[facing=up]
 item replace block -4592 47 -265 container.12 with minecraft:enchanted_book{StoredEnchantments:[{id:"minecraft:power",lvl:1}]}
 item replace block -4592 47 -265 container.13 with minecraft:enchanted_book{StoredEnchantments:[{id:"minecraft:channeling",lvl:1}]}
@@ -134,9 +124,6 @@ item replace block -5075 41 -423 container.12 with minecraft:bread 4
 item replace block -5075 41 -423 container.13 with minecraft:cooked_beef{Enchantments:[{}],display:{Name:"\"Stegt Flæsk med Persillesovs\""}} 2
 item replace block -5075 41 -423 container.14 with minecraft:potato 4
 
-setblock -4672 40 -379 minecraft:chest
-item replace block -4672 40 -379 container.13 with minecraft:crossbow{Damage:310,display:{Name:"\"Silver-Ready\""}}
-
 setblock -4443 16 -463 minecraft:chest
 item replace block -4443 16 -463 container.12 with minecraft:salmon 4
 item replace block -4443 16 -463 container.14 with minecraft:coal 2
@@ -150,21 +137,9 @@ setblock -4637 70 -275 minecraft:chest[facing=east]
 item replace block -4637 70 -275 container.12 with minecraft:stone_sword{Damage:115,display:{Name:"\"stdc's Sword\""}}
 item replace block -4637 70 -275 container.14 with minecraft:shield{BlockEntityTag:{Base:15,Patterns:[{Pattern:"rd",Color:0},{Pattern:"cs",Color:13},{Pattern:"flo",Color:1},{Pattern:"mc",Color:4}]},Damage:304,display:{Name:"\"stdc's Shield\""}}
 
-setblock -5053 48 -288 minecraft:barrel[facing=up]
-item replace block -5053 48 -288 container.4 with minecraft:chainmail_helmet{Damage:101}
-item replace block -5053 48 -288 container.12 with minecraft:chainmail_chestplate{Damage:176}
-item replace block -5053 48 -288 container.14 with minecraft:chainmail_leggings{Damage:161}
-item replace block -5053 48 -288 container.22 with minecraft:chainmail_boots{Damage:131}
-
-setblock -5057 48 -300 minecraft:barrel[facing=up]
-item replace block -5057 48 -300 container.13 with minecraft:bread 8
-
 setblock -4983 31 -495 minecraft:barrel[facing=up]
 item replace block -4983 31 -495 container.13 with minecraft:shield{Damage:304,display:{Name:"\"Dead Meme Defender\""}}
 
-setblock -5057 45 -278 minecraft:barrel[facing=up]
-item replace block -5057 45 -278 container.13 with minecraft:shield{BlockEntityTag:{Base:15},Damage:304,display:{Name:"\"Tactical Shield\""}}
-
 setblock -4566 28 174 minecraft:barrel[facing=up]
 item replace block -4566 28 174 container.4 with minecraft:bread 2
 item replace block -4566 28 174 container.12 with minecraft:beef 4
@@ -197,4 +172,12 @@ item replace block -4407 87 -23 container.13 with minecraft:golden_axe{Damage:24
 setblock -4972 40 -5 minecraft:barrel[facing=up]
 
 setblock -4396 18 -616 minecraft:trapped_chest
-item replace block -4396 18 -616 container.13 with minecraft:diamond_chestplate{Damage:520,Enchantments:[{id:"minecraft:binding_curse",lvl:1}],display:{Name:"\"Zora's Armour\""}}
\ No newline at end of file
+item replace block -4396 18 -616 container.13 with minecraft:diamond_chestplate{Damage:520,Enchantments:[{id:"minecraft:binding_curse",lvl:1}],display:{Name:"\"Zora's Armour\""}}
+
+setblock -4833 66 -715 minecraft:chest[facing=east]
+item replace block -4833 66 -715 container.11 with minecraft:stone_axe{Damage:123,display:{Name:"\"Butcher's Knife\""}}
+item replace block -4833 66 -715 container.13 with minecraft:cooked_mutton{display:{Name:"\"Sus Meat\""}} 3
+
+setblock -4631 31 -206 minecraft:barrel[facing=up]
+item replace block -4631 31 -206 container.12 with minecraft:coal 4
+item replace block -4631 31 -206 container.14 with minecraft:porkchop 8
\ No newline at end of file
diff --git a/data/fmc/functions/hunger/reset_interactives.mcfunction b/data/fmc/functions/hunger/reset_interactives.mcfunction
index 65a1315..0591379 100644
--- a/data/fmc/functions/hunger/reset_interactives.mcfunction
+++ b/data/fmc/functions/hunger/reset_interactives.mcfunction
@@ -4,13 +4,11 @@ setblock -4973 27 -45 minecraft:furnace[facing=east]
 setblock -4542 21 -322 minecraft:furnace[facing=west]
 setblock -4761 57 -310 minecraft:furnace[facing=east]
 setblock -4804 41 -281 minecraft:furnace[facing=south]
-setblock -4630 43 -764 minecraft:furnace[facing=south]
-setblock -4636 43 -764 minecraft:furnace[facing=south]
-setblock -4671 36 -381 minecraft:furnace[facing=south]
-setblock -4673 36 -381 minecraft:smoker[facing=south]
 setblock -5080 41 -426 minecraft:smoker[facing=south]
 setblock -4635 65 -276 minecraft:furnace[facing=south]
 setblock -4640 46 -178 minecraft:furnace[facing=west]
+setblock -4833 66 -714 minecraft:furnace[facing=east]
+setblock -4629 31 -204 minecraft:furnace
 
 # Anvils:
 setblock -4971 27 -51 minecraft:anvil[facing=west]
diff --git a/data/fmc/functions/hunger/unload.mcfunction b/data/fmc/functions/hunger/unload.mcfunction
index 750dad9..15d10df 100644
--- a/data/fmc/functions/hunger/unload.mcfunction
+++ b/data/fmc/functions/hunger/unload.mcfunction
@@ -34,10 +34,7 @@ forceload remove -5075 -423
 forceload remove -4443 -463
 forceload remove -4632 -276
 forceload remove -4637 -275
-forceload remove -5053 -288
-forceload remove -5057 -300
 forceload remove -4983 -495
-forceload remove -5057 -278
 forceload remove -4566 174
 forceload remove -4846 -97
 forceload remove -4640 -178
@@ -46,6 +43,8 @@ forceload remove -4342 4
 forceload remove -4407 -23
 forceload remove -4972 -5
 forceload remove -4396 -616
+forceload remove -4833 -715
+forceload remove -4631 -206
 
 # Furnaces:
 forceload remove -4442 -483
@@ -53,13 +52,11 @@ forceload remove -4973 -45
 forceload remove -4542 -322
 forceload remove -4761 -310
 forceload remove -4804 -281
-forceload remove -4630 -764
-forceload remove -4636 -764
-forceload remove -4671 -381
-forceload remove -4673 -381
 forceload remove -5080 -426
 forceload remove -4635 -276
 forceload remove -4640 -178
+forceload remove -4833 -714
+forceload remove -4629 -204
 
 # Anvils:
 forceload remove -4971 -51