Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make end armor trimmable / add end trim materials #440

Open
wants to merge 7 commits into
base: 1.21
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/main/resources/assets/betterend/lang/de_de.json
Original file line number Diff line number Diff line change
Expand Up @@ -894,13 +894,9 @@
"item.betterend.leather_wrapped_stick": "Lederumwickelter Stock",
"item.betterend.lumecorn_rod": "Maislichtstange",
"item.betterend.music_disc_endseeker": "§bSchallplatte§r",
"item.betterend.music_disc_endseeker.desc": "§5Firel§r - §fEndseeker§r",
"item.betterend.music_disc_eo_dracona": "§bSchallplatte§r",
"item.betterend.music_disc_eo_dracona.desc": "§5Firel§r - §fEo Dracona§r",
"item.betterend.music_disc_grasping_at_stars": "§bSchallplatte§r",
"item.betterend.music_disc_grasping_at_stars.desc": "§5Firel§r - §fGrasping At Stars§r",
"item.betterend.music_disc_strange_and_alien": "§bSchallplatte§r",
"item.betterend.music_disc_strange_and_alien.desc": "§5Firel§r - §fStrange And Alien§r",
"item.betterend.netherite_hammer": "Netheritschmiedehammer",
"item.betterend.netherite_upgrade_smithing_template": "Schmiedevorlage",
"item.betterend.plate_upgrade_smithing_template": "Schmiedevorlage",
Expand Down Expand Up @@ -1011,6 +1007,10 @@
"itemGroup.betterend.blocks": "Better End: Blöcke",
"itemGroup.betterend.items": "Better End: Gegenstände",
"itemGroup.betterend.nature": "Better End: Pflanzen",
"jukebox_song.betterend.endseeker": "§5Firel§r - §fEndseeker§r",
"jukebox_song.betterend.eo_dracona": "§5Firel§r - §fEo Dracona§r",
"jukebox_song.betterend.grasping_at_stars": "§5Firel§r - §fGrasping At Stars§r",
"jukebox_song.betterend.strange_and_alien": "§5Firel§r - §fStrange And Alien§r",
"message.betterend.anvil_damage": "§cSchaden",
"message.betterend.fail_spawn": "§c§lDu musst 6 Bernsteinjuwele in der Hand halten, um deinen Einstiegspunkt zu setzen.",
"message.betterend.set_spawn": "§b§lWiedereinstiegspunkt gesetzt",
Expand Down
10 changes: 6 additions & 4 deletions src/main/resources/assets/betterend/lang/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -894,13 +894,9 @@
"item.betterend.leather_wrapped_stick": "Leather Wrapped Stick",
"item.betterend.lumecorn_rod": "Lumecorn Rod",
"item.betterend.music_disc_endseeker": "§bMusic Disc§r",
"item.betterend.music_disc_endseeker.desc": "§5Firel§r - §fEndseeker§r",
"item.betterend.music_disc_eo_dracona": "§bMusic Disc§r",
"item.betterend.music_disc_eo_dracona.desc": "§5Firel§r - §fEo Dracona§r",
"item.betterend.music_disc_grasping_at_stars": "§bMusic Disc§r",
"item.betterend.music_disc_grasping_at_stars.desc": "§5Firel§r - §fGrasping At Stars§r",
"item.betterend.music_disc_strange_and_alien": "§bMusic Disc§r",
"item.betterend.music_disc_strange_and_alien.desc": "§5Firel§r - §fStrange And Alien§r",
"item.betterend.netherite_hammer": "Netherite Smith Hammer",
"item.betterend.netherite_upgrade_smithing_template": "Smithing Template",
"item.betterend.plate_upgrade_smithing_template": "Smithing Template",
Expand Down Expand Up @@ -1011,6 +1007,10 @@
"itemGroup.betterend.blocks": "BetterEnd: Blocks",
"itemGroup.betterend.items": "BetterEnd: Items",
"itemGroup.betterend.nature": "BetterEnd: Plants",
"jukebox_song.betterend.endseeker": "§5Firel§r - §fEndseeker§r",
"jukebox_song.betterend.eo_dracona": "§5Firel§r - §fEo Dracona§r",
"jukebox_song.betterend.grasping_at_stars": "§5Firel§r - §fGrasping At Stars§r",
"jukebox_song.betterend.strange_and_alien": "§5Firel§r - §fStrange And Alien§r",
"message.betterend.anvil_damage": "§cDamage",
"message.betterend.fail_spawn": "§c§lYou need to hold 6 Amber Gems to set your spawn point",
"message.betterend.set_spawn": "§b§lYour spawn point is set here",
Expand Down Expand Up @@ -1044,6 +1044,8 @@
"title.config.betterend.generator.structure.replace_pillars": "Use BetterEnd-Style Pillars",
"title.config.betterend.generator.structure.replace_portal": "Use BetterEnd-Style Portal",
"title.config.group.betterend.generator": "End Generator",
"trim_material.betterend.amber_gem": "Amber Material",
"trim_material.betterend.crystal_shards": "Aurora Material",
"tooltip.armor.crystalite_boots": "Effect: Swiftness I",
"tooltip.armor.crystalite_chest": "Effect: Dig Speed I",
"tooltip.armor.crystalite_set": "Set bonus: Regeneration I",
Expand Down
9 changes: 5 additions & 4 deletions src/main/resources/assets/betterend/lang/es_es.json
Original file line number Diff line number Diff line change
Expand Up @@ -822,13 +822,14 @@
"item.betterend.cave_pumpkin_pie": "Tarta de Calabaza de Cueva",

"item.betterend.music_disc_strange_and_alien": "§bDisco Musical§r",
"item.betterend.music_disc_strange_and_alien.desc": "§5Firel§r - §fStrange And Alien§r",
"item.betterend.music_disc_grasping_at_stars": "§bDisco Musical§r",
"item.betterend.music_disc_grasping_at_stars.desc": "§5Firel§r - §fGrasping At Stars§r",
"item.betterend.music_disc_endseeker": "§bDisco Musical§r",
"item.betterend.music_disc_endseeker.desc": "§5Firel§r - §fEndseeker§r",
"item.betterend.music_disc_eo_dracona": "§bDisco Musical§r",
"item.betterend.music_disc_eo_dracona.desc": "§5Firel§r - §fEo Dracona§r",

"jukebox_song.betterend.strange_and_alien": "§5Firel§r - §fStrange And Alien§r",
"jukebox_song.betterend.grasping_at_stars": "§5Firel§r - §fGrasping At Stars§r",
"jukebox_song.betterend.endseeker": "§5Firel§r - §fEndseeker§r",
"jukebox_song.betterend.eo_dracona": "§5Firel§r - §fEo Dracona§r",

"block.betterend.hydralux_petal_block_amber": "Bloque de Pétalo Ámbar",
"block.betterend.hydralux_petal_block_beige": "Bloque de Pétalo Beige",
Expand Down
9 changes: 5 additions & 4 deletions src/main/resources/assets/betterend/lang/ko_kr.json
Original file line number Diff line number Diff line change
Expand Up @@ -823,13 +823,14 @@
"item.betterend.cave_pumpkin_pie": "동굴 호박 파이",

"item.betterend.music_disc_strange_and_alien": "§b음반§r",
"item.betterend.music_disc_strange_and_alien.desc": "§5Firel§r - §fStrange And Alien§r",
"item.betterend.music_disc_grasping_at_stars": "§b음반§r",
"item.betterend.music_disc_grasping_at_stars.desc": "§5Firel§r - §fGrasping At Stars§r",
"item.betterend.music_disc_endseeker": "§b음반§r",
"item.betterend.music_disc_endseeker.desc": "§5Firel§r - §fEndseeker§r",
"item.betterend.music_disc_eo_dracona": "§b음반§r",
"item.betterend.music_disc_eo_dracona.desc": "§5Firel§r - §fEo Dracona§r",

"jukebox_song.betterend.strange_and_alien": "§5Firel§r - §fStrange And Alien§r",
"jukebox_song.betterend.grasping_at_stars": "§5Firel§r - §fGrasping At Stars§r",
"jukebox_song.betterend.endseeker": "§5Firel§r - §fEndseeker§r",
"jukebox_song.betterend.eo_dracona": "§5Firel§r - §fEo Dracona§r",

"block.betterend.hydralux_petal_block_amber": "호박색 꽃잎 블록",
"block.betterend.hydralux_petal_block_beige": "베이지색 꽃잎 블록",
Expand Down
9 changes: 5 additions & 4 deletions src/main/resources/assets/betterend/lang/pt_br.json
Original file line number Diff line number Diff line change
Expand Up @@ -827,13 +827,14 @@
"item.betterend.cave_pumpkin_pie": "Torta de Abóbora de Caverna",

"item.betterend.music_disc_strange_and_alien": "§bDisco de Música§r",
"item.betterend.music_disc_strange_and_alien.desc": "§5Firel§r - §fEstranho e Alienígena§r",
"item.betterend.music_disc_grasping_at_stars": "§bDisco de Música§r",
"item.betterend.music_disc_grasping_at_stars.desc": "§5Firel§r - §fAgarrando-se às Estrelas§r",
"item.betterend.music_disc_endseeker": "§bDisco de Música§r",
"item.betterend.music_disc_endseeker.desc": "§5Firel§r - §fCaçador do End§r",
"item.betterend.music_disc_eo_dracona": "§bDisco de Música§r",
"item.betterend.music_disc_eo_dracona.desc": "§5Firel§r - §fEo Dracona§r",

"jukebox_song.betterend.strange_and_alien": "§5Firel§r - §fEstranho e Alienígena§r",
"jukebox_song.betterend.grasping_at_stars": "§5Firel§r - §fAgarrando-se às Estrelas§r",
"jukebox_song.betterend.endseeker": "§5Firel§r - §fCaçador do End§r",
"jukebox_song.betterend.eo_dracona": "§5Firel§r - §fEo Dracona§r",

"block.betterend.hydralux_petal_block_amber": "Bloco de Pétalas Âmbar",
"block.betterend.hydralux_petal_block_beige": "Bloco de pétalas bege",
Expand Down
8 changes: 4 additions & 4 deletions src/main/resources/assets/betterend/lang/thai_th.json
Original file line number Diff line number Diff line change
Expand Up @@ -740,13 +740,13 @@
"block.betterend.neon_cactus": "Neon Cactus",
"item.betterend.cave_pumpkin_pie": "Cave Pumpkin Pie",
"item.betterend.music_disc_strange_and_alien": "§bMusic Disc§r",
"item.betterend.music_disc_strange_and_alien.desc": "§5Firel§r - §fStrange And Alien§r",
"item.betterend.music_disc_grasping_at_stars": "§bMusic Disc§r",
"item.betterend.music_disc_grasping_at_stars.desc": "§5Firel§r - §fGrasping At Stars§r",
"item.betterend.music_disc_endseeker": "§bMusic Disc§r",
"item.betterend.music_disc_endseeker.desc": "§5Firel§r - §fEndseeker§r",
"item.betterend.music_disc_eo_dracona": "§bMusic Disc§r",
"item.betterend.music_disc_eo_dracona.desc": "§5Firel§r - §fEo Dracona§r",
"jukebox_song.betterend.strange_and_alien": "§5Firel§r - §fStrange And Alien§r",
"jukebox_song.betterend.grasping_at_stars": "§5Firel§r - §fGrasping At Stars§r",
"jukebox_song.betterend.endseeker": "§5Firel§r - §fEndseeker§r",
"jukebox_song.betterend.eo_dracona": "§5Firel§r - §fEo Dracona§r",
"block.betterend.hydralux_petal_block_amber": "Amber Petal Block",
"block.betterend.hydralux_petal_block_beige": "Beige Petal Block",
"block.betterend.hydralux_petal_block_cream": "Cream Petal Block",
Expand Down
8 changes: 4 additions & 4 deletions src/main/resources/assets/betterend/lang/tr_tr.json
Original file line number Diff line number Diff line change
Expand Up @@ -743,13 +743,13 @@
"block.betterend.neon_cactus": "Neon Kaktüsü",
"item.betterend.cave_pumpkin_pie": "Mağara Kabağı Turtası",
"item.betterend.music_disc_strange_and_alien": "§bMüzik Diski§r",
"item.betterend.music_disc_strange_and_alien.desc": "§5Firel§r - §fStrange And Alien§r",
"item.betterend.music_disc_grasping_at_stars": "§bMusic Disc§r",
"item.betterend.music_disc_grasping_at_stars.desc": "§5Firel§r - §fGrasping At Stars§r",
"item.betterend.music_disc_endseeker": "§bMusic Disc§r",
"item.betterend.music_disc_endseeker.desc": "§5Firel§r - §fEndseeker§r",
"item.betterend.music_disc_eo_dracona": "§bMusic Disc§r",
"item.betterend.music_disc_eo_dracona.desc": "§5Firel§r - §fEo Dracona§r",
"jukebox_song.betterend.strange_and_alien": "§5Firel§r - §fStrange And Alien§r",
"jukebox_song.betterend.grasping_at_stars": "§5Firel§r - §fGrasping At Stars§r",
"jukebox_song.betterend.endseeker": "§5Firel§r - §fEndseeker§r",
"jukebox_song.betterend.eo_dracona": "§5Firel§r - §fEo Dracona§r",
"block.betterend.hydralux_petal_block_amber": "Kehribar Çiçek Bloğu",
"block.betterend.hydralux_petal_block_beige": "Bej Çiçek Bloğu",
"block.betterend.hydralux_petal_block_cream": "Krem Çiçek Bloğu",
Expand Down
8 changes: 4 additions & 4 deletions src/main/resources/assets/betterend/lang/zh_cn.json
Original file line number Diff line number Diff line change
Expand Up @@ -878,13 +878,13 @@
"item.betterend.leather_wrapped_stick": "皮革包层木棍",
"item.betterend.lumecorn_rod": "流明玉米棒",
"item.betterend.music_disc_endseeker": "§b音乐唱片§r",
"item.betterend.music_disc_endseeker.desc": "§5Firel§r - §fEndseeker§r",
"item.betterend.music_disc_eo_dracona": "§b音乐唱片§r",
"item.betterend.music_disc_eo_dracona.desc": "§5Firel§r - §fEo Dracona§r",
"item.betterend.music_disc_grasping_at_stars": "§b音乐唱片§r",
"item.betterend.music_disc_grasping_at_stars.desc": "§5Firel§r - §fGrasping At Stars§r",
"item.betterend.music_disc_strange_and_alien": "§b音乐唱片§r",
"item.betterend.music_disc_strange_and_alien.desc": "§5Firel§r - §fStrange And Alien§r",
"jukebox_song.betterend.endseeker": "§5Firel§r - §fEndseeker§r",
"jukebox_song.betterend.eo_dracona": "§5Firel§r - §fEo Dracona§r",
"jukebox_song.betterend.grasping_at_stars": "§5Firel§r - §fGrasping At Stars§r",
"jukebox_song.betterend.strange_and_alien": "§5Firel§r - §fStrange And Alien§r",
"item.betterend.netherite_hammer": "下界合金锻锤",
"item.betterend.raw_amber": "粗琥珀",
"item.betterend.shadow_berry_cooked": "熟黯影浆果",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
{
"overrides": [
{
"model": "betterend:item/trimmed/aeternium_boots_quartz_trim",
"predicate": {
"trim_type": 0.1
}
},
{
"model": "betterend:item/trimmed/aeternium_boots_iron_trim",
"predicate": {
"trim_type": 0.2
}
},
{
"model": "betterend:item/trimmed/aeternium_boots_netherite_trim",
"predicate": {
"trim_type": 0.3
}
},
{
"model": "betterend:item/trimmed/aeternium_boots_amber_gem_trim",
"predicate": {
"trim_type": 0.333
}
},
{
"model": "betterend:item/trimmed/aeternium_boots_crystal_shards_trim",
"predicate": {
"trim_type": 0.334
}
},
{
"model": "betterend:item/trimmed/aeternium_boots_redstone_trim",
"predicate": {
"trim_type": 0.4
}
},
{
"model": "betterend:item/trimmed/aeternium_boots_copper_trim",
"predicate": {
"trim_type": 0.5
}
},
{
"model": "betterend:item/trimmed/aeternium_boots_gold_trim",
"predicate": {
"trim_type": 0.6
}
},
{
"model": "betterend:item/trimmed/aeternium_boots_emerald_trim",
"predicate": {
"trim_type": 0.7
}
},
{
"model": "betterend:item/trimmed/aeternium_boots_diamond_trim",
"predicate": {
"trim_type": 0.8
}
},
{
"model": "betterend:item/trimmed/aeternium_boots_lapis_trim",
"predicate": {
"trim_type": 0.9
}
},
{
"model": "betterend:item/trimmed/aeternium_boots_amethyst_trim",
"predicate": {
"trim_type": 1.0
}
}
],
"parent": "minecraft:item/generated",
"textures": {
"layer0": "betterend:item/aeternium_boots"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
{
"overrides": [
{
"model": "betterend:item/trimmed/aeternium_chestplate_quartz_trim",
"predicate": {
"trim_type": 0.1
}
},
{
"model": "betterend:item/trimmed/aeternium_chestplate_iron_trim",
"predicate": {
"trim_type": 0.2
}
},
{
"model": "betterend:item/trimmed/aeternium_chestplate_netherite_trim",
"predicate": {
"trim_type": 0.3
}
},
{
"model": "betterend:item/trimmed/aeternium_chestplate_amber_gem_trim",
"predicate": {
"trim_type": 0.333
}
},
{
"model": "betterend:item/trimmed/aeternium_chestplate_crystal_shards_trim",
"predicate": {
"trim_type": 0.334
}
},
{
"model": "betterend:item/trimmed/aeternium_chestplate_redstone_trim",
"predicate": {
"trim_type": 0.4
}
},
{
"model": "betterend:item/trimmed/aeternium_chestplate_copper_trim",
"predicate": {
"trim_type": 0.5
}
},
{
"model": "betterend:item/trimmed/aeternium_chestplate_gold_trim",
"predicate": {
"trim_type": 0.6
}
},
{
"model": "betterend:item/trimmed/aeternium_chestplate_emerald_trim",
"predicate": {
"trim_type": 0.7
}
},
{
"model": "betterend:item/trimmed/aeternium_chestplate_diamond_trim",
"predicate": {
"trim_type": 0.8
}
},
{
"model": "betterend:item/trimmed/aeternium_chestplate_lapis_trim",
"predicate": {
"trim_type": 0.9
}
},
{
"model": "betterend:item/trimmed/aeternium_chestplate_amethyst_trim",
"predicate": {
"trim_type": 1.0
}
}
],
"parent": "minecraft:item/generated",
"textures": {
"layer0": "betterend:item/aeternium_chestplate"
}
}
Loading