Skip to content

Commit a25d2ba

Browse files
committed
Additional Map-making features
1 parent d3aa2a6 commit a25d2ba

File tree

48 files changed

+3955
-31
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+3955
-31
lines changed

src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// 1.21.1 2025-05-28T11:05:07.075326 Loot Tables
1+
// 1.21.1 2025-07-13T12:30:50.9075294 Loot Tables
22
30a9787333b9555c083acb2c4e8f179811c710fe data/tolkienmobs/loot_table/blocks/angainor.json
33
70af9d87acfc51ded0643ded73be3d57cde23821 data/tolkienmobs/loot_table/blocks/angainor_bricks.json
44
d6410d7b62bb688221aae2676969f6aac657b164 data/tolkienmobs/loot_table/blocks/angainor_bricks_button.json
@@ -580,41 +580,42 @@ ecb335c5f6055faad93057e7cac0e72aceda1cae data/tolkienmobs/loot_table/chests/mino
580580
a130da6e322a9614def523c29d99a2dc7dbbfe28 data/tolkienmobs/loot_table/chests/tower_chest.json
581581
586cdd4182d3f8806e04db849dfb8b2fdc36a0e1 data/tolkienmobs/loot_table/chests/warg_pit.json
582582
a1e7dc5ddf79ec07567844a2017834da92446d2a data/tolkienmobs/loot_table/entities/entityttmauroch.json
583-
b621abdeb2f750993632cea28498b6c55bf912f1 data/tolkienmobs/loot_table/entities/entityttmbalrog.json
583+
fc7d64c01803669ab9cf875d9de4a15a12361d21 data/tolkienmobs/loot_table/entities/entityttmbalrog.json
584584
e919258e0038d5459a948c7fc3c06c7ac931a84e data/tolkienmobs/loot_table/entities/entityttmbarrow.json
585585
a495e054e94eed218b79f721836eb87139937a44 data/tolkienmobs/loot_table/entities/entityttmbrigand.json
586586
bfb6f10e1b8b1bd8d2234109788814f885ac0c66 data/tolkienmobs/loot_table/entities/entityttmcrebain.json
587587
a6eb95cb70eddb62c5a10fe9f2f71e9576e19f17 data/tolkienmobs/loot_table/entities/entityttmdeepclaw.json
588588
060411af53af4ad341089eb6486f06e572a6db3d data/tolkienmobs/loot_table/entities/entityttmduergar.json
589589
c6d3c20c0aa757b7f1458b4eb3ba24355f4b8a5e data/tolkienmobs/loot_table/entities/entityttmelementalgolem.json
590+
ecde956ceca13144b40f3db6d87ab9d33acc3290 data/tolkienmobs/loot_table/entities/entityttmenragedfellspirit.json
590591
76072f25e076dcc50d27d2c8085bf9c36921861e data/tolkienmobs/loot_table/entities/entityttmfellbeast.json
591592
16a18d0a0b87bfa853fee1daad89a0fc44b128e7 data/tolkienmobs/loot_table/entities/entityttmfellspirit.json
592593
c0aa89d32c34bf5efe87759f5b03ce02f578ea5e data/tolkienmobs/loot_table/entities/entityttmfrog.json
593594
d5b324476817f0f0c5138ba5ed1f78b240aa4657 data/tolkienmobs/loot_table/entities/entityttmgecko.json
594595
11a3e6342e04900215157b3350191fab9c976f99 data/tolkienmobs/loot_table/entities/entityttmgoat.json
595596
80bbe9e78b7707eb11f08afeac4fac975b566a19 data/tolkienmobs/loot_table/entities/entityttmgoblin.json
596-
11890c853f023173efc2dd97cec5aa8d2e1ae4f4 data/tolkienmobs/loot_table/entities/entityttmgoblinking.json
597-
1328ba1145197360d716883962d5757ef7eb2376 data/tolkienmobs/loot_table/entities/entityttmgollum.json
597+
676ba6bfc1f10bad107dad63a5bdb93d9ab2b6d3 data/tolkienmobs/loot_table/entities/entityttmgoblinking.json
598+
ca765e1e69e8b0425b02105fb03a44cb264239d8 data/tolkienmobs/loot_table/entities/entityttmgollum.json
598599
8975496482eadd482ccb9e6ee499d386da70a64a data/tolkienmobs/loot_table/entities/entityttmgreateagle.json
599-
dd419ea615b3c1b0b1e464432250020cd6f350fe data/tolkienmobs/loot_table/entities/entityttmgwahir.json
600+
be0735342b1eba7caa20f544ddc5ba4c5e7d9538 data/tolkienmobs/loot_table/entities/entityttmgwahir.json
600601
a66c572857ce4efbcbd7b9d87671644bcb7abf2a data/tolkienmobs/loot_table/entities/entityttmharadrim.json
601602
020236f41addcb8f5d2f4b1365acc6abab4574cc data/tolkienmobs/loot_table/entities/entityttmhuron.json
602603
59a1c026abbbced1ad84a4dad08e50c3eaa96ff0 data/tolkienmobs/loot_table/entities/entityttmistari.json
603-
ab05e019874e388b6dc0660d8908bdefe0a9493e data/tolkienmobs/loot_table/entities/entityttmmimicchest.json
604+
5eb54b262124e9bf53a92f47ca58db1cf00cd01e data/tolkienmobs/loot_table/entities/entityttmmimicchest.json
604605
a6b2cabbaac0585a98fcc8df72072a045ab2d848 data/tolkienmobs/loot_table/entities/entityttmminotaur.json
605606
f977ab0b2f3bd0fca61a7a97afa98b2cbd1dc03e data/tolkienmobs/loot_table/entities/entityttmmirkwoodspider.json
606-
47e0ee631d42ae1f874ad1043969bbee943cc73e data/tolkienmobs/loot_table/entities/entityttmmithrilgolem.json
607+
2c04a9dbfa00953fa5e6cfe433359624b6720581 data/tolkienmobs/loot_table/entities/entityttmmithrilgolem.json
607608
ab9a25d1560ba41f766a9a0d57b7134daefa8f8f data/tolkienmobs/loot_table/entities/entityttmmordororc.json
608-
8630b814f43198a58f79af4ae035f4bb5bf8879c data/tolkienmobs/loot_table/entities/entityttmmorgulirongolem.json
609+
437fd026f803cfc212c00a0b5055635e2f2fda12 data/tolkienmobs/loot_table/entities/entityttmmorgulirongolem.json
609610
cdbb1f36173b0e27e86a432d3dff321f830665e4 data/tolkienmobs/loot_table/entities/entityttmmumakil.json
610-
b6039d286765f48f303d886ce3e59473a60ba8f8 data/tolkienmobs/loot_table/entities/entityttmnazgul.json
611+
836ad47898acc60fa75a38fcd63f0de9df6ecd71 data/tolkienmobs/loot_table/entities/entityttmnazgul.json
611612
f13467cb73bc0673a61cf5a0fb44fb623497ed83 data/tolkienmobs/loot_table/entities/entityttmnazgulsteed.json
612613
909f537907804cfa311cbcc5f77260ebd410abf5 data/tolkienmobs/loot_table/entities/entityttmoathbreaker.json
613614
7e9aec852af0f47fa658c54fd3b5a11f1ab7573f data/tolkienmobs/loot_table/entities/entityttmrat.json
614615
703ed2e95782359cda72023433b1b32df8e877b2 data/tolkienmobs/loot_table/entities/entityttmrockgolem.json
615616
baed0356a905021d45eae44d855381d6909f2b87 data/tolkienmobs/loot_table/entities/entityttmromiewalker.json
616617
5061e34a8eb9269db307d22087e1bb4fb2731e48 data/tolkienmobs/loot_table/entities/entityttmshadowfax.json
617-
bfb2ef0df4d8651b5d2beb8e11ddf405d2a02f57 data/tolkienmobs/loot_table/entities/entityttmshelob.json
618+
f96283448635bd1a01a9b352c1ab7d44d66966e1 data/tolkienmobs/loot_table/entities/entityttmshelob.json
618619
72d12bfe4a5dc0ecdb8b9adffb548bebeada83fa data/tolkienmobs/loot_table/entities/entityttmsquirrel.json
619620
3680b256b82a182eec237fc3eec605b53c784f94 data/tolkienmobs/loot_table/entities/entityttmswamphag.json
620621
a2276dedaba82a4fde63bf333e570b33c7024b94 data/tolkienmobs/loot_table/entities/entityttmswarm.json
@@ -623,5 +624,5 @@ a2276dedaba82a4fde63bf333e570b33c7024b94 data/tolkienmobs/loot_table/entities/en
623624
b649a07bcbc7e3d0b1aa4cb050a5ace2ac58b995 data/tolkienmobs/loot_table/entities/entityttmtroll.json
624625
9a3d9f947b143e0aa2afd0e0b27f1fbe0c7b1bb7 data/tolkienmobs/loot_table/entities/entityttmurukhai.json
625626
c0c040f4982cf155a7d16e1d623b70e71acf626e data/tolkienmobs/loot_table/entities/entityttmwarg.json
626-
4947a56fd2d10519fc8943a04b9a7edb5ea4db97 data/tolkienmobs/loot_table/entities/entityttmwatcher.json
627-
5b9b4cf2599fa2e65e0677b4ed1e9d7d3d5a5280 data/tolkienmobs/loot_table/entities/entityttmwitchking.json
627+
00dc7f02c785524c4aa98ceceeeace36efbfd982 data/tolkienmobs/loot_table/entities/entityttmwatcher.json
628+
e509c6879f816d89d8430b78f617343fc13dafe7 data/tolkienmobs/loot_table/entities/entityttmwitchking.json
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
{
2+
"variants": {
3+
"facing=east,waterlogged=false": {
4+
"model": "tolkienmobs:block/ancient_watcher",
5+
"y": 270
6+
},
7+
"facing=east,waterlogged=true": {
8+
"model": "tolkienmobs:block/ancient_watcher",
9+
"y": 270
10+
},
11+
"facing=north,waterlogged=false": {
12+
"model": "tolkienmobs:block/ancient_watcher",
13+
"y": 180
14+
},
15+
"facing=north,waterlogged=true": {
16+
"model": "tolkienmobs:block/ancient_watcher",
17+
"y": 180
18+
},
19+
"facing=south,waterlogged=false": {
20+
"model": "tolkienmobs:block/ancient_watcher"
21+
},
22+
"facing=south,waterlogged=true": {
23+
"model": "tolkienmobs:block/ancient_watcher"
24+
},
25+
"facing=west,waterlogged=false": {
26+
"model": "tolkienmobs:block/ancient_watcher",
27+
"y": 90
28+
},
29+
"facing=west,waterlogged=true": {
30+
"model": "tolkienmobs:block/ancient_watcher",
31+
"y": 90
32+
}
33+
}
34+
}

src/generated/resources/assets/tolkienmobs/lang/en_us.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
"biome.tolkienmobs.mirkwood_spooky": "Mirkwood Spider Forest",
1515
"biome.tolkienmobs.mordor": "Mordor",
1616
"biome.tolkienmobs.shire": "The Shire",
17+
"block.tolkienmobs.ancient_watcher": "Ancient Watching-stone",
1718
"block.tolkienmobs.angainor": "Angainor Stone",
1819
"block.tolkienmobs.angainor_bricks": "Angainor Stone Bricks",
1920
"block.tolkienmobs.angainor_bricks_button": "Angainor Stone Bricks Button",
@@ -697,6 +698,7 @@
697698
"entity.tolkienmobs.entityttmelves.tolkienmobs.trinket_tailor": "Magical Tailor",
698699
"entity.tolkienmobs.entityttmelves.toolsmith": "Tool Smith",
699700
"entity.tolkienmobs.entityttmelves.weaponsmith": "Weapon Smith",
701+
"entity.tolkienmobs.entityttmenragedfellspirit": "§4Enraged Fell Spirit§r",
700702
"entity.tolkienmobs.entityttmfellbeast": "Fell Beast",
701703
"entity.tolkienmobs.entityttmfellspirit": "Fell Spirit",
702704
"entity.tolkienmobs.entityttmfrog": "Frog",
@@ -916,6 +918,7 @@
916918
"item.tolkienmobs.entityttmdwarf_spawn_egg": "Dwarf Spawn Egg",
917919
"item.tolkienmobs.entityttmelementalgolem_spawn_egg": "Elemental Golem Spawn Egg",
918920
"item.tolkienmobs.entityttmelves_spawn_egg": "Elf Spawn Egg",
921+
"item.tolkienmobs.entityttmenragedfellspirit_spawn_egg": "Enraged Fell Spirit Spawn Egg",
919922
"item.tolkienmobs.entityttmfellbeast_spawn_egg": "Fell Beast Spawn Egg",
920923
"item.tolkienmobs.entityttmfellspirit_spawn_egg": "Fell Spirit Spawn Egg",
921924
"item.tolkienmobs.entityttmfrog_spawn_egg": "Frog Spawn Egg",
@@ -1176,6 +1179,8 @@
11761179
"item.tolkienmobs.record_rivendell": "Music Disc",
11771180
"item.tolkienmobs.record_wbattle": "Music Disc",
11781181
"item.tolkienmobs.record_willow": "Music Disc",
1182+
"item.tolkienmobs.ring_of_hope": "§5Ring of Aglaral§r",
1183+
"item.tolkienmobs.ring_of_hope.lore": "§6Hope blazes within your heart.§r",
11791184
"item.tolkienmobs.shears_ammolite": "Ammolite Shears",
11801185
"item.tolkienmobs.shears_mithril": "Mithril Shears",
11811186
"item.tolkienmobs.shears_morguliron": "Morgul Iron Shears",
@@ -1577,6 +1582,8 @@
15771582
"subtitles.tolkienmobs.mob.coin_trader": "A Wild Coin Trader appears!",
15781583
"tolkienmobs.camo_fluid.fluid.instructions": "Place fluid bucket in slot",
15791584
"tolkienmobs.msg.added.entities": "Entity added...",
1585+
"tolkienmobs.msg.ancient_watcher.safe": "Oppression has no hold over you.",
1586+
"tolkienmobs.msg.ancient_watcher.warn": "The shadow of fear looms over you, causing you to cower.",
15801587
"tolkienmobs.msg.cleared.entities": "All existing entities cleared...",
15811588
"tolkienmobs.msg.deploy_campfire": "Something is blocking the Campfire.",
15821589
"tolkienmobs.msg.deploy_sleeping_bag": "Something is blocking the Sleepingbag.",
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"parent": "minecraft:item/template_spawn_egg"
3+
}
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"parent": "minecraft:item/generated",
3+
"textures": {
4+
"layer0": "tolkienmobs:item/ring_of_hope"
5+
}
6+
}

src/generated/resources/data/minecraft/tags/entity_type/undead.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
"values": [
33
"tolkienmobs:entityttmbarrow",
44
"tolkienmobs:entityttmfellspirit",
5+
"tolkienmobs:entityttmenragedfellspirit",
56
"tolkienmobs:entityttmnazgul",
67
"tolkienmobs:entityttmwitchking",
78
"tolkienmobs:entityttmoathbreaker"

src/generated/resources/data/tolkienmobs/loot_table/entities/entityttmbalrog.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"functions": [
2222
{
2323
"function": "tolkienmobs:random_trinket",
24-
"id": "minecraft:invisibility"
24+
"id": "minecraft:long_swiftness"
2525
},
2626
{
2727
"add": false,

0 commit comments

Comments
 (0)