Merge branch 'master' into 1.21.2

CHANGELOG.txt

@@ -4,367 +4,5 @@ Make sure to clear after release
 
 Put changelog here:
 -----------------
-# Minecraft: Java Edition - Trailier Tales
-After the Wild Update controversy passed, Trails & Tales came along and effectively accomplished the same thing. Although it didn't overpromise, it felt as though it had under-delivered on the content side of things.
-We're back once again to hopefully remedy this, with Trailier Tales!
-
-**DISCLAIMER**
-Do not use this mod in attempt to harass Mojang. They are hard workers and know what's best for their game; We're simply adding and changing features as we see fit.
-
-# NEW FEATURES
-- Added new Ruins structures
-- Added new Pottery Sherds
-- Added new Armor Trims
-- Added Suspicious Red Sand
-- Added Suspicious Clay
-- Added Suspicious Dirt
-- Added Cyan Roses
-- Added Manedrops
-- Added Dawntrails
-- Added the Surveyor block
-- Added Catacombs
-- Added Haunt mob effect
-- Added Transfiguring mobb effect
-- Added Siege Omen
-- Added the Coffin block
-- Added Apparition mob
-- Added the Rebrush enchantment
-- Added the Reaping enchantment
-- Added Music Disc Fausse Vie
-- Expanded and finished many building block sets
-- Banners can now be placed on Boats
-
-## RUINS
-- Added Ruins in all Plains and Forest biomes
-- Added Jungle Ruins in all Jungle biomes
-- Added Savanna Ruins in Savanna and Savanna Plateau biomes
-- Added Desert Ruins in all Desert biomes
-- Added Badlands Ruins in Badlands, Wooded Badlands, and Eroded Badlands biomes
-- Added Deepslate Ruins in the Deep Dark biome
-- Will usually generate in clusters
-- Suspicious blocks will these structures contain new pottery sherds
-- From most to least common, each building can be either partially buried, on the surface, or completely buried
-- New structure pieces for each ruin type can easily be added by dragging and dropping a piece in `.nbt` format into one of the existing subfolders in their respective `trailiertales:structure/ruins/` folder
-
-## POTTERY SHERDS
-- Added Bait Pottery Sherd
-- Added Bloom Pottery Sherd
-- Added Bolt Pottery Sherd
-- Added Bullseye Pottery Sherd
-- Added Cluck Pottery Sherd
-- Added Crawl Pottery Sherd
-- Added Crescent Pottery Sherd
-- Added Cultivator Pottery Sherd
-- Added Essence Pottery Sherd
-- Added Eye Pottery Sherd
-- Added Focus Pottery Sherd
-- Added Height Pottery Sherd
-- Added Hump Pottery Sherd
-- Added Illuminator Pottery Sherd
-- Added Incidence Pottery Sherd
-- Added Lumber Pottery Sherd
-- Added Navigator Pottery Sherd
-- Added Needles Pottery Sherd
-- Added Omen Pottery Sherd
-- Added Plume Pottery Sherd
-- Added Protection Pottery Sherd
-- Added Shed Pottery Sherd
-- Added Shine Pottery Sherd
-- Added Shower Pottery Sherd
-- Added Spade Pottery Sherd
-- Added Sprout Pottery Sherd
-- Added Vessel Pottery Sherd
-- Added Wither Pottery Sherd
-
-## ARMOR TRIMS
-- Added Undead Armor Trim, found in Catacombs
-- Added Matrix Armor Trim, found in Catacombs
-- Added Martyr Armor Trim, found in Badlands Ruins
-- Added Zephyr Armor Trim, found in Desert Ruins
-- Added Cot Armor Trim, found in Savanna Ruins
-- Added Overgrowth Armor Trim, found in Jungle Ruins
-- Added Geode Armor Trim, found in Deepslate Ruins
-
-## CYAN ROSE
-- Sniffers can now dig up Cyan Rose Seeds
-- Seeds can be planted, growing into the Cyan Rose flower
-- Can be crafted into Cyan Dye
-
-## MANEDROP
-- Sniffers can now dig up Manedrop Germs
-- Germs can be planted, and grow into the Manedrop flower
-- Can be crafted into Purple Dye
-
-## DAWNTRAIL
-- Sniffers can now dig up Dawntrail Seeds
-- Seeds can be planted, growing into the Dawntrail
-- Dawntrails will slowly spread outwards at a maximum of 3 blocks
-    - Each new Dawntrail will not have flowers, as those grow randomly with time
-- A Dawntrail with flowers can be sheared to obtain Dawntrail Seeds
-- Seeds can be crafted into Purple Dye
-
-## SURVEYOR
-- A new redstone component that detects a player in its line of sight
-- Will output a full signal when detecting a player, and a decreasing signal based on the player's distance when used with a Redstone Comparator
-- Other mobs can block the Surveyor's view of the player
-- Invisible players cannot be detected, unless wearing armor
-
-## CATACOMBS
-- A maze-like, difficult underground structure from a long-lost civilization
-- Skeleton skulls line the walls of the Catacombs
-- Supicious Gravel occasionally generates on the floor
-- Contains many corridors and tombs
-    - Each tomb contains at least one Coffin, and may contain a Chest
-    - Each Chest has a chance to reward very valuable loot, including but not limited to the new Rebrush enchantment, Reaping enchantment, Undead armor trim, and the new "Fausse Vie" music disc by Zhen
-    - Some tombs are laid out as puzzles, while others strictly focus on combat
-- Being so difficult and dark, it is recommended to bring strong tools, armor, and a lot of torches
-- Catacombs Explorer Maps can be found in Trail Ruins, and traded for with Cartographer Villagers
-
-## HAUNT
-- A new mob effect
-- Much like the Darkness mob effect, brings dark fog inwards and dampens light
-- Blocks out health, armor, hunger, and air supply stats, becoming either invisible or unreadable to the player
-- Halves the distance sounds can be heard from
-- Coffins can detect any player with this mob effect
-
-## TRANSFIGURING
-- A new mob effect obtained through brewing
-    - Potion is brewed with Ectoplasm and an Awkward Potion
-- Spawns an Apparition upon the effected mob's death
-    - If used on an Apparition, vanquishes it
-
-## SIEGE OMEN
-- Triggered when being close to a Coffin with Bad Omen
-- Each nearby Coffin will activate and spawn up to two mobs per-player simultaneously
-    - Spawned mobs will constantly track the closest player
-    - Coffins will have a spawning cooldown of only 150 ticks
-    - Coffins will also be able to spawn two Apparitions
-
-## COFFIN
-- A new block that spawns mobs
-    - The mob can be changed by using a spawn egg on the Coffin
-- Is inactive by default, but will spawn an Apparition occasionally
-    - One the Apparition has targeted a player, the Coffin will activate and begin spawning mobs
-    - Once the Apparition has been killed, the Coffin will become inactive and the cycle will repeat
-- Each time a spawned mob its killed, will increase the Coffin's power along three stages
-    - Active
-        - The default strength
-        - 400 ticks between spawns
-        - Only one mob can spawn at a time
-    - Irritated
-        - An intermediate strength triggered at a power of 4
-        - 300 ticks between spawns
-        - The amount of simultaneous spawned mobs per extra player increases to one
-    - Irritated
-        - The highest strength triggered at a power of 12
-        - 200 ticks between spawns
-    - A Coffin's power will reset after 12000 ticks, or 10 minutes
-- If all spawned mobs from each stage are defeated in a timely manner, the Coffin will remain inactive for the next 30 minutes
-
-## APPARITION
-- A new mysterious mob that spawns from Coffins
-- Can travel through blocks and other mobs
-- Detects players at relatively far distances
-- Will occasionally "hypnotize" nearby mobs, causing them to target the player
-- Finds dropped items and throws them to damage the player
-- Is invisible in the darkness, aside from a particle trail
-- Will apply the Haunt mob effect if it has been in direct contact with a player for long enough
-- Drops Ectoplasm upon death, which can be used as a potion ingredient or to craft the Surveyor block
-
-## REBRUSH
-- A new enchantment found from Chests in Catacombs
-- At a rate of 10% per level, has a chance to let a Suspicious block be looted again
-    - Has a 3% chance per level to let a Suspicious block be looted again after the first excavation
-- Goes up to level 3
-
-## REAPING
-- A new enchantment found from Chests in Catacombs
-- Increases XP drops from mobs by 20%
-    - An additional 30% is applied per-level past the first
-- Goes up to level 3
-
-## BUILDING BLOCKS
-- Added Polished Granite Wall
-- Added Granite Bricks
-    - Added Chiseled Granite Bricks
-    - Added Cracked Granite Bricks
-    - Added Granite Brick Stairs
-    - Added Granite Brick Slab
-    - Added Granite Brick Wall
-    - Added Mossy Granite Bricks
-        - Added Mossy Granite Brick Stairs
-        - Added Mossy Granite Brick Slab
-        - Added Mossy Granite Brick Wall
-- Added Polished Diorite Wall
-- Added Diorite Bricks
-    - Added Chiseled Diorite Bricks
-    - Added Cracked Diorite Bricks
-    - Added Diorite Brick Stairs
-    - Added Diorite Brick Slab
-    - Added Diorite Brick Wall
-    - Added Mossy Diorite Bricks
-        - Added Mossy Diorite Brick Stairs
-        - Added Mossy Diorite Brick Slab
-        - Added Mossy Diorite Brick Wall
-- Added Polished Andesite Wall
-- Added Andesite Bricks
-    - Added Chiseled Andesite Bricks
-    - Added Cracked Andesite Bricks
-    - Added Andesite Brick Stairs
-    - Added Andesite Brick Slab
-    - Added Andesite Brick Wall
-    - Added Mossy Andesite Bricks
-        - Added Mossy Andesite Brick Stairs
-        - Added Mossy Andesite Brick Slab
-        - Added Mossy Andesite Brick Wall
-- Added the Calcite block family
-    - Added Calcite Stairs
-    - Added Calcite Slab
-    - Added Calcite wall
-    - Added Polished Calcite
-        - Added Polished Calcite Stairs
-        - Added Polished Calcite Slab
-        - Added Polished Calcite wall
-    - Added Calcite Bricks
-        - Added Chiseled Calcite Bricks
-        - Added Cracked Calcite Bricks
-        - Added Calcite Brick Stairs
-        - Added Calcite Brick Slab
-        - Added Calcite Brick Wall
-        - Added Mossy Calcite Bricks
-            - Added Mossy Calcite Brick Stairs
-            - Added Mossy Calcite Brick Slab
-            - Added Mossy Calcite Brick Wall
-- Finished the Tuff block family
-    - Added Cracked Tuff Bricks
-    - Added Mossy Tuff Bricks
-        - Added Mossy Tuff Brick Stairs
-        - Added Mossy Tuff Brick Slab
-        - Added Mossy Tuff Brick Wall
-- Finished the Bricks block family
-    - Added Cracked Bricks
-    - Added Mossy Bricks
-        - Added Mossy Brick Stairs
-        - Added Mossy Brick Slab
-        - Added Mossy Brick Wall
-- Finished the Cobbled Deepslate block family
-    - Added Mossy Cobbled Deepslate
-        - Added Mossy Cobbled Deepslate Stairs
-        - Added Mossy Cobbled Deepslate Slab
-        - Added Mossy Cobbled Deepslate Wall
-- Finished the Deepslate Bricks block family
-    - Added Mossy Deepslate Bricks
-        - Added Mossy Deepslate Brick Stairs
-        - Added Mossy Deepslate Brick Slab
-        - Added Mossy Deepslate Brick Wall
-- Finished the Deepslate Tiles block family
-    - Added Mossy Deepslate Tiles
-        - Added Mossy Deepslate Tile Stairs
-        - Added Mossy Deepslate Tile Slab
-        - Added Mossy Deepslate Tile Wall
-- Finished the Sandstone block family
-    - Added Smooth Sandstone Wall
-    - Added Cut Sandstone Stairs
-    - Added Cut Sandstone Wall
-- Finished the Red Sandstone block family
-    - Added Smooth Red Sandstone Wall
-    - Added Cut Red Sandstone Stairs
-    - Added Cut Red Sandstone Wall
-- Added Prismarine Brick Wall
-- Added Dark Prismarine Wall
-- Finished the End Stone block family
-    - Added End Stone Stairs
-    - Added End Stone Slab
-    - Added End Stone Wall
-    - Added Choral End Stone
-        - Added Choral End Stone Stairs
-        - Added Choral End Stone Slab
-        - Added Choral End Stone Wall
-- Finished the End Stone Bricks block family
-    - Added Cracked End Stone Bricks
-    - Added Chiseled End Stone Bricks
-        - Added Choral End Stone Bricks
-        - Added Choral End Stone Brick Stairs
-        - Added Choral End Stone Brick Slab
-        - Added Choral End Stone Brick Wall
-- Finished the Purpur block family
-    - Added Cracked Purpur Block
-    - Added Chiseled Purpur Block
-    - Added Purpur Wall
-
-## BANNER BOATS
-- Created by sneaking and using a Banner item on a Boat
-    - Banner can be taken off by sneaking and interacting with the Boat a second time
-- Increases the Boat's speed by 20%
-
-# CHANGES
-
-## ARCHAEOLOGY
-- The third person brushing animation is now smooth
-- Items now smoothly inch out of suspicious blocks
-- Particles are now created when a brush is moving backwards
-- A softer sound is now played when a brush is moving backwards
-- Revamped the distribution of pottery sherds
-    - Angler Pottery Sherd -> Warm Ocean Ruins (No Change)
-    - Archer Pottery Sherd -> Desert Pyramid (No Change)
-    - Arms Up Pottery Sherd -> Desert Pyramid
-    - Bait Pottery Sherd -> Warm Ocean Ruins
-    - Blade Pottery Sherd -> Ruins
-    - Bloom Pottery Sherd -> Jungle Ruins
-    - Bolt Pottery Sherd -> Jungle Ruins
-    - Brewer Pottery Sherd -> Desert Well (No Change)
-    - Bullseye Pottery Sherd -> Catacombs
-    - Burn Pottery Sherd -> Badlands Ruins
-    - Carrier Pottery Sherd -> Desert Well
-    - Cluck Pottery Sherd -> Savanna Ruins
-    - Crawl Pottery Sherd -> Savanna Ruins
-    - Crescent Pottery Sherd -> Trail Ruins
-    - Cultivator Pottery Sherd -> Ruins
-    - Danger Pottery Sherd -> Desert Ruins
-    - Drought Pottery Sherd -> Badlands Ruins
-    - Eye Pottery Sherd -> Catacombs
-    - Explorer Pottery Sherd -> Cold Ocean Ruins (No Change)
-    - Focus Pottery Sherd -> Cold Ocean Ruins
-    - Friend Pottery Sherd -> Trail Ruins (No Change)
-    - Heart Pottery Sherd -> Trail Ruins (No Change)
-    - Heartbreak Pottery Sherd -> Trail Ruins (No Change)
-    - Height Pottery Sherd -> Deepslate Ruins
-    - Howl Pottery Sherd -> Trail Ruins (No Change)
-    - Hump Pottery Sherd -> Desert Ruins
-    - Illuminator Pottery Sherd -> Deepslate Ruins
-    - Incidence Pottery Sherd -> Cold Ocean Ruins
-    - Lumber Pottery Sherd -> Ruins
-    - Miner Pottery Sherd -> Deepslate Ruins
-    - Mourner Pottery Sherd -> Deepslate Ruins
-    - Navigator Pottery Sherd -> Jungle Ruins
-    - Needles Pottery Sherd -> Desert Ruins
-    - Omen Pottery Sherd -> Catacombs
-    - Plenty Pottery Sherd -> Catacombs
-    - Plume Pottery Sherd -> Savanna Ruins
-    - Prize Pottery Sherd -> Desert Pyramid (No Change)
-    - Protection Pottery Sherd -> Trail Ruins
-    - Sheaf Pottery Sherd -> Trail Ruins (No Change)
-    - Shed Pottery Sherd -> Badlands Ruins
-    - Shelter Pottery Sherd -> Savanna Ruins
-    - Shine Pottery Sherd -> Desert Ruins
-    - Shower Pottery Sherd -> Jungle Ruins
-    - Spade Pottery Sherd -> Desert Pyramid
-    - Sprout Pottery Sherd - Ruins
-    - Skull Pottery Sherd -> Catacombs
-    - Snort Pottery Sherd -> Warm Ocean Ruins (No Change)
-    - Vessel Pottery Sherd -> Cold Ocean Ruins
-    - Wither Pottery Sherd -> Badlands Ruins
-
-## DECORATED POTS
-- The wobbling animation now mirrors each time it plays
-
-## END CITIES
-- Choral End Stone Bricks will now generate
-- Cracked End Stone Bricks will now generate
-- Chiseled Purpur Blocks will now generate
-
-## ARMOR STANDS
-- Armor Stands now have their arms enabled by default
-
-## CAMELS
-- Now rarely spawn in Desert biomes
+- Fixed a few wall blocks not connecting.
+- Fixed Armor Trim textures being broken on 1.21.2+.

gradle.properties

@@ -16,7 +16,7 @@ loader_version=0.16.7
 
 # Mod Properties
 mod_id = trailiertales
-mod_version = 1.0
+mod_version = 1.0.1
 # protocol version must be changed after each update with dual env changes
 protocol_version = 1
 maven_group = net.frozenblock