Skip to content

Commit

Permalink
Merge branch 'master' into 1.21.2
Browse files Browse the repository at this point in the history
  • Loading branch information
@AViewFromTheTop
AViewFromTheTop committed Jan 2, 2025
2 parents 8d5b620 + 627dd3b commit 23c6c2b
Show file tree
Hide file tree
Showing 23 changed files with 906 additions and 139 deletions.
12 changes: 8 additions & 4 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,16 @@ hi
- Increased the protocol version to 2.
- Added 50 new rooms for Catacombs.
- Skulls, Bones, and Rotten Flesh are no longer archeology loot in Catacombs.
- Improved the loot tables for suspicious blocks in all of Trailier Tales' structures, providing more insight into the past.
- Ominous Bottles can now be found in Catacombs.
- Mobs spawned from Coffins now drop twice as much XP if killed by a player with Siege Omen.
- Added the Block of Ectoplasm.
- While inside this block, gravity is weaker.
- Apparitions cannot move through these blocks.
- Added plenty of new large pieces to all Ruins types.
- - Revamped how Ruins structure pieces are loaded, chosen, and offset during worldgen, being much easier and more automatic.
- As a side effect of this, all ruins pieces now have an equal chance of generating. Prior to this revamp, groups of pieces with specific offsets had a certain chance of being selected.
- Generic and Jungle ruins now generate with one more piece on average.
- Added new ruins for snowy biomes.
- Added the Embrace Armor Trim.
- Added the Aurora Pottery Sherd.
Expand All @@ -20,17 +25,16 @@ hi
- Added the Stasis Music Disc.
- Updated the Undead Armor Trim Smithing Template texture.
- Updated the Undead Armor Trim's leggings texture.
- Revamped how Ruins structure pieces are loaded, chosen, and offset during worldgen, being much easier and more automatic.
- As a side effect of this, all ruins pieces now have an equal chance of generating. Prior to this revamp, groups of pieces with specific offsets had a certain chance of being selected.
- Generic and Jungle ruins now generate with one more piece on average.
- Added compat for Enchantment Descriptions, thanks to Lufurrius! ([#12](https://github.com/FrozenBlock/TrailierTales/pull/12))
- Added Spanish translations, thanks to Kokoroto!
- Added Ukranian translations, thanks to unroman! ([#8](https://github.com/FrozenBlock/TrailierTales/pull/8))
- Updated Polish translations slightly, thanks to Eggmanplant! ([#4](https://github.com/FrozenBlock/TrailierTales/pull/4))

#### Bugfixes
#### Bug Fixes
- Fixed a massive issue facing Fabric 1.21.4.
- Fixed a critical issue with mobs suddenly vanishing.
- Fixed a vanilla bug where Powered Rails, Activator Rails, and Detector Rails wouldn't rotate properly in structure generation.
- Fixed the optional accessibility particles for suspicious blocks not working as intended.
- Cracked and Chiseled Purpur Blocks can now be broken faster with a pickaxe. ([#10](https://github.com/FrozenBlock/TrailierTales/issues/10))
- Fixed an issue where modded boats that aren't implemented the same way as vanilla cause a crash. ([#9](https://github.com/FrozenBlock/TrailierTales/issues/9))
- Fixed the Polished Calcite Wall not being craftable with a Stonecutter. ([#11](https://github.com/FrozenBlock/TrailierTales/issues/11))
Expand Down
2 changes: 1 addition & 1 deletion build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@ artifacts {
}

fun getModVersion(): String {
var version = "$mod_version+$minecraft_version"
var version = "$mod_version-mc$minecraft_version"

if (release != null && !release) {
//version += "-unstable"
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ archives_base_name = TrailierTales

# Dependencies
fabric_api_version=0.106.1+1.21.2
frozenlib_version=1.9.9-mc1.21.2
frozenlib_version=1.9.10-mc1.21.2
wilderwild_version=3.0.7-mc1.21.2

# External Mods
Expand Down
4 changes: 0 additions & 4 deletions src/datagen/java/net/frozenblock/trailiertales/datagen/TTDatagenModule.java
View file

This file was deleted.

3 changes: 0 additions & 3 deletions src/main/generated/assets/trailiertales/models/item/potted_cyan_rose.json
View file

This file was deleted.

33 changes: 32 additions & 1 deletion src/main/generated/data/trailiertales/loot_table/archaeology/badlands_ruins.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
{
"type": "minecraft:item",
"name": "minecraft:wheat_seeds",
"weight": 10
"weight": 5
},
{
"type": "minecraft:item",
Expand Down Expand Up @@ -109,6 +109,37 @@
"name": "minecraft:oak_hanging_sign",
"weight": 5
},
{
"type": "minecraft:item",
"functions": [
{
"function": "minecraft:set_potion",
"id": "minecraft:water"
}
],
"name": "minecraft:potion",
"weight": 3
},
{
"type": "minecraft:item",
"name": "minecraft:leather_helmet",
"weight": 5
},
{
"type": "minecraft:item",
"name": "minecraft:flint_and_steel",
"weight": 5
},
{
"type": "minecraft:item",
"name": "minecraft:bowl",
"weight": 4
},
{
"type": "minecraft:item",
"name": "minecraft:iron_pickaxe",
"weight": 4
},
{
"type": "minecraft:item",
"name": "trailiertales:shed_pottery_sherd",
Expand Down
81 changes: 75 additions & 6 deletions src/main/generated/data/trailiertales/loot_table/archaeology/catacombs/corridor.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,26 +7,31 @@
{
"type": "minecraft:item",
"name": "minecraft:skull_pottery_sherd",
"weight": 5
"weight": 2
},
{
"type": "minecraft:item",
"name": "trailiertales:omen_pottery_sherd",
"weight": 3
"weight": 2
},
{
"type": "minecraft:item",
"name": "minecraft:plenty_pottery_sherd",
"weight": 3
"weight": 2
},
{
"type": "minecraft:item",
"name": "trailiertales:essence_pottery_sherd",
"weight": 3
"weight": 2
},
{
"type": "minecraft:item",
"name": "trailiertales:eye_pottery_sherd",
"weight": 2
},
{
"type": "minecraft:item",
"name": "minecraft:brick",
"weight": 3
},
{
Expand Down Expand Up @@ -81,17 +86,81 @@
{
"type": "minecraft:item",
"name": "minecraft:paper",
"weight": 8
"weight": 12
},
{
"type": "minecraft:item",
"name": "minecraft:leather",
"weight": 4
"weight": 5
},
{
"type": "minecraft:item",
"name": "minecraft:candle",
"weight": 18
},
{
"type": "minecraft:item",
"name": "minecraft:rail",
"weight": 6
},
{
"type": "minecraft:item",
"name": "minecraft:minecart"
},
{
"type": "minecraft:item",
"functions": [
{
"function": "minecraft:enchant_randomly",
"options": "#minecraft:on_random_loot"
},
{
"add": false,
"damage": {
"type": "minecraft:uniform",
"max": 0.8,
"min": 0.15
},
"function": "minecraft:set_damage"
}
],
"name": "minecraft:iron_pickaxe"
},
{
"type": "minecraft:item",
"functions": [
{
"function": "minecraft:enchant_randomly",
"options": "#minecraft:on_random_loot"
},
{
"add": false,
"damage": {
"type": "minecraft:uniform",
"max": 0.8,
"min": 0.15
},
"function": "minecraft:set_damage"
}
],
"name": "minecraft:stone_shovel"
},
{
"type": "minecraft:item",
"name": "minecraft:chain",
"weight": 5
},
{
"type": "minecraft:item",
"name": "minecraft:oak_fence"
},
{
"type": "minecraft:item",
"name": "minecraft:glass_bottle"
},
{
"type": "minecraft:item",
"name": "minecraft:apple"
}
],
"rolls": 1.0
Expand Down
101 changes: 93 additions & 8 deletions src/main/generated/data/trailiertales/loot_table/archaeology/catacombs/corridor_rare.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,32 +7,37 @@
{
"type": "minecraft:item",
"name": "minecraft:skull_pottery_sherd",
"weight": 5
"weight": 2
},
{
"type": "minecraft:item",
"name": "trailiertales:omen_pottery_sherd",
"weight": 3
"weight": 2
},
{
"type": "minecraft:item",
"name": "minecraft:plenty_pottery_sherd",
"weight": 3
"weight": 2
},
{
"type": "minecraft:item",
"name": "trailiertales:essence_pottery_sherd",
"weight": 3
"weight": 2
},
{
"type": "minecraft:item",
"name": "trailiertales:eye_pottery_sherd",
"weight": 3
"weight": 2
},
{
"type": "minecraft:item",
"name": "trailiertales:bullseye_pottery_sherd",
"weight": 3
"weight": 2
},
{
"type": "minecraft:item",
"name": "minecraft:brick",
"weight": 2
},
{
"type": "minecraft:item",
Expand All @@ -42,7 +47,7 @@
{
"type": "minecraft:item",
"name": "minecraft:gold_ingot",
"weight": 2
"weight": 3
},
{
"type": "minecraft:item",
Expand Down Expand Up @@ -86,7 +91,7 @@
{
"type": "minecraft:item",
"name": "minecraft:paper",
"weight": 4
"weight": 6
},
{
"type": "minecraft:item",
Expand All @@ -97,6 +102,86 @@
"type": "minecraft:item",
"name": "minecraft:candle",
"weight": 8
},
{
"type": "minecraft:item",
"name": "minecraft:red_dye",
"weight": 3
},
{
"type": "minecraft:item",
"name": "minecraft:rail",
"weight": 7
},
{
"type": "minecraft:item",
"name": "minecraft:minecart"
},
{
"type": "minecraft:item",
"functions": [
{
"function": "minecraft:enchant_randomly",
"options": "#minecraft:on_random_loot"
},
{
"add": false,
"damage": {
"type": "minecraft:uniform",
"max": 0.8,
"min": 0.15
},
"function": "minecraft:set_damage"
}
],
"name": "minecraft:iron_pickaxe"
},
{
"type": "minecraft:item",
"functions": [
{
"function": "minecraft:enchant_randomly",
"options": "#minecraft:on_random_loot"
},
{
"add": false,
"damage": {
"type": "minecraft:uniform",
"max": 0.8,
"min": 0.15
},
"function": "minecraft:set_damage"
}
],
"name": "minecraft:stone_shovel"
},
{
"type": "minecraft:item",
"name": "minecraft:chain",
"weight": 3
},
{
"type": "minecraft:item",
"name": "minecraft:oak_fence"
},
{
"type": "minecraft:item",
"name": "minecraft:apple",
"weight": 2
},
{
"type": "minecraft:item",
"name": "minecraft:glass_bottle"
},
{
"type": "minecraft:item",
"functions": [
{
"function": "minecraft:set_potion",
"id": "minecraft:weakness"
}
],
"name": "minecraft:splash_potion"
}
],
"rolls": 1.0
Expand Down
Loading

0 comments on commit 23c6c2b

Please sign in to comment.