From 3b20c5c21c34e133920f7ab35f9bbe7f3b860d07 Mon Sep 17 00:00:00 2001 From: Faboslav Date: Fri, 27 Sep 2024 07:49:00 +0200 Subject: [PATCH 1/7] crab can spawn on sand --- CHANGELOG.md | 5 ++++ .../common/config/FriendsAndFoesConfig.java | 4 +-- .../assets/friendsandfoes/lang/en_us.json | 1 + .../assets/friendsandfoes/lang/ru_ru.json | 26 +++++++++++++------ .../tags/blocks/crabs_spawnable_on.json | 2 +- .../tags/worldgen/biome/has_crab.json | 3 ++- gradle.properties | 2 +- 7 files changed, 30 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d706c3ba9..17c8be747 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +## 3.0.1 + +- Crab now spawns also on the beaches +- Updated ru_ru translations (Thanks to mpustovoi) + ## 3.0.0 - Added crab mob diff --git a/common/src/main/java/com/faboslav/friendsandfoes/common/config/FriendsAndFoesConfig.java b/common/src/main/java/com/faboslav/friendsandfoes/common/config/FriendsAndFoesConfig.java index 9d02780c2..5b1536c46 100644 --- a/common/src/main/java/com/faboslav/friendsandfoes/common/config/FriendsAndFoesConfig.java +++ b/common/src/main/java/com/faboslav/friendsandfoes/common/config/FriendsAndFoesConfig.java @@ -38,10 +38,10 @@ public final class FriendsAndFoesConfig implements Config public int crabSpawnWeight = 14; @Description("Minimal spawn group size") - public int crabSpawnMinGroupSize = 3; + public int crabSpawnMinGroupSize = 2; @Description("Maximal spawn group size") - public int crabSpawnMaxGroupSize = 5; + public int crabSpawnMaxGroupSize = 4; @Description("Reach status effect modifier (range in blocks)") public int reachingStatusEffectModifier = 1; diff --git a/common/src/main/resources/assets/friendsandfoes/lang/en_us.json b/common/src/main/resources/assets/friendsandfoes/lang/en_us.json index a47d9ee86..ff1d8b989 100644 --- a/common/src/main/resources/assets/friendsandfoes/lang/en_us.json +++ b/common/src/main/resources/assets/friendsandfoes/lang/en_us.json @@ -66,6 +66,7 @@ "entity.friendsandfoes.tuff_golem": "Tuff Golem", "entity.friendsandfoes.wildfire": "Wildfire", "effect.friendsandfoes.reach": "Reach", + "effect.friendsandfoes.reach.description": "Increases the range of block interaction.", "item.friendsandfoes.buttercup": "Buttercup", "item.friendsandfoes.glare_spawn_egg": "Glare Spawn Egg", "item.friendsandfoes.copper_golem_spawn_egg": "Copper Golem Spawn Egg", diff --git a/common/src/main/resources/assets/friendsandfoes/lang/ru_ru.json b/common/src/main/resources/assets/friendsandfoes/lang/ru_ru.json index e268831f7..98cfbe590 100644 --- a/common/src/main/resources/assets/friendsandfoes/lang/ru_ru.json +++ b/common/src/main/resources/assets/friendsandfoes/lang/ru_ru.json @@ -53,9 +53,11 @@ "block.friendsandfoes.waxed_weathered_lightning_rod": "Вощёный состаренный громоотвод", "block.friendsandfoes.waxed_oxidized_lightning_rod": "Вощёный окисленный громоотвод", "block.friendsandfoes.potted_buttercup": "Лютик в горшке", + "block.friendsandfoes.crab_egg": "Крабовое яйцо", "entity.minecraft.villager.beekeeper": "Пчеловод", "entity.minecraft.villager.friendsandfoes.beekeeper": "Пчеловод", "entity.friendsandfoes.copper_golem": "Медный голем", + "entity.friendsandfoes.crab": "Краб", "entity.friendsandfoes.glare": "Остроликий", "entity.friendsandfoes.iceologer": "Ледолог", "entity.friendsandfoes.moobloom": "Коровоцвет", @@ -63,9 +65,13 @@ "entity.friendsandfoes.mauler": "Прожора", "entity.friendsandfoes.tuff_golem": "Туфовый голем", "entity.friendsandfoes.wildfire": "Инферно", + "effect.friendsandfoes.reach": "Охват", + "effect.friendsandfoes.reach.description": "Увеличивает дальность взаимодействия с миром.", + "item_group.friendsandfoes.main_tab": "Друзья и Враги", "item.friendsandfoes.buttercup": "Лютик", "item.friendsandfoes.glare_spawn_egg": "Яйцо призыва остроликого", "item.friendsandfoes.copper_golem_spawn_egg": "Яйцо призыва медного голема", + "item.friendsandfoes.crab_spawn_egg": "Яйцо призыва краба", "item.friendsandfoes.iceologer_spawn_egg": "Яйцо призыва ледолога", "item.friendsandfoes.illusioner_spawn_egg": "Яйцо призыва иллюзора", "item.friendsandfoes.mauler_spawn_egg": "Яйцо призыва прожоры", @@ -73,26 +79,32 @@ "item.friendsandfoes.rascal_spawn_egg": "Яйцо призыва негодника", "item.friendsandfoes.tuff_golem_spawn_egg": "Яйцо призыва туфового голема", "item.friendsandfoes.wildfire_spawn_egg": "Яйцо призыва инферно", + "item.friendsandfoes.crab_claw": "Клешня краба", "item.friendsandfoes.totem_of_freezing": "Тотем замораживания", "item.friendsandfoes.totem_of_illusion": "Тотем иллюзии", "item.friendsandfoes.wildfire_crown": "Корона инферно", "item.friendsandfoes.wildfire_crown_fragment": "Фрагмент короны инферно", + "item.minecraft.potion.effect.reaching": "Зелье охвата", + "item.minecraft.splash_potion.effect.reaching": "Взрывное зелье охвата", + "item.minecraft.lingering_potion.effect.reaching": "Туманное зелье охвата", + "item.minecraft.tipped_arrow.effect.reaching": "Стрела охвата", "subtitle.entity.friendsandfoes.glare.ambient": "Остроликий летает", - "subtitle.entity.friendsandfoes.glare.death": "Остроликий умирает", + "subtitle.entity.friendsandfoes.glare.death": "Остроликий погибает", "subtitle.entity.friendsandfoes.glare.eat": "Остроликий ест", "subtitle.entity.friendsandfoes.glare.grumpiness": "Остроликий ворчит", "subtitle.entity.friendsandfoes.glare.grumpiness_short": "Остроликий ворчит", "subtitle.entity.friendsandfoes.glare.hurt": "Остроликий ранен", "subtitle.entity.friendsandfoes.glare.rustle": "Остроликий ворчит", "subtitle.entity.friendsandfoes.glare.shake": "Остроликий стряхивает светящиеся ягоды", - "subtitle.entity.friendsandfoes.copper_golem.death": "Медный голем умирает", + "subtitle.entity.friendsandfoes.copper_golem.death": "Медный голем погибает", "subtitle.entity.friendsandfoes.copper_golem.head_spin": "Медный голем поворачивает голову", "subtitle.entity.friendsandfoes.copper_golem.hurt": "Медный голем ранен", "subtitle.entity.friendsandfoes.copper_golem.repair": "Медный голем отремонтирован", - "subtitle.entity.friendsandfoes.copper_golem.step": "Шаги", + "subtitle.entity.friendsandfoes.crab.death": "Краб погибает", + "subtitle.entity.friendsandfoes.crab.hurt": "Краб ранен", "subtitle.entity.friendsandfoes.iceologer.ambient": "Ледолог бормочет", "subtitle.entity.friendsandfoes.iceologer.cast_spell": "Ледолог произносит заклинание", - "subtitle.entity.friendsandfoes.iceologer.death": "Ледолог умирает", + "subtitle.entity.friendsandfoes.iceologer.death": "Ледолог погибает", "subtitle.entity.friendsandfoes.iceologer.hurt": "Ледолог ранен", "subtitle.entity.friendsandfoes.iceologer.prepare_slowness": "Ледолог подготавливает замедление", "subtitle.entity.friendsandfoes.iceologer.prepare_summon": "Ледолог подготавливает призыв", @@ -100,7 +112,7 @@ "subtitle.entity.friendsandfoes.ice_chunk.hit": "Ледяная глыба падает", "subtitle.entity.friendsandfoes.ice_chunk.summon": "Ледяная глыба трещит", "subtitle.entity.friendsandfoes.mauler.bite": "Прожора кусает", - "subtitle.entity.friendsandfoes.mauler.death": "Прожора умирает", + "subtitle.entity.friendsandfoes.mauler.death": "Прожора погибает", "subtitle.entity.friendsandfoes.mauler.growl": "Прожора рычит", "subtitle.entity.friendsandfoes.mauler.hurt": "Прожора ранен", "subtitle.entity.friendsandfoes.moobloom.convert": "Коровоцвет превращается", @@ -120,14 +132,12 @@ "subtitle.entity.friendsandfoes.tuff_golem.repair": "Туфовый голем отремонтирован", "subtitle.entity.friendsandfoes.tuff_golem.wake": "Туфовый голем просыпается", "subtitle.entity.friendsandfoes.tuff_golem.sleep": "Туфовый голем засыпает", - "subtitle.entity.friendsandfoes.tuff_golem.step": "Шаги", "subtitle.entity.friendsandfoes.wildfire.ambient": "Инферно дышит", - "subtitle.entity.friendsandfoes.wildfire.death": "Инферно умирает", + "subtitle.entity.friendsandfoes.wildfire.death": "Инферно погибает", "subtitle.entity.friendsandfoes.wildfire.hurt": "Инферно ранен", "subtitle.entity.friendsandfoes.wildfire.shield_break": "Щит инферно ломается", "subtitle.entity.friendsandfoes.wildfire.shockwave": "Инферно создаёт ударные волны", "subtitle.entity.friendsandfoes.wildfire.shoot": "Инферно стреляет", - "subtitle.entity.friendsandfoes.wildfire.step": "Шаги", "subtitle.entity.friendsandfoes.wildfire.summon_blaze": "Инферно призывает всполохов", "trinkets.slot.charm.charm": "Амулет", "text.betterf3.line.glares": "Остроликие", diff --git a/common/src/main/resources/data/friendsandfoes/tags/blocks/crabs_spawnable_on.json b/common/src/main/resources/data/friendsandfoes/tags/blocks/crabs_spawnable_on.json index a499ec3c1..48236c96b 100644 --- a/common/src/main/resources/data/friendsandfoes/tags/blocks/crabs_spawnable_on.json +++ b/common/src/main/resources/data/friendsandfoes/tags/blocks/crabs_spawnable_on.json @@ -4,6 +4,6 @@ "minecraft:mud", "minecraft:mangrove_roots", "minecraft:muddy_mangrove_roots", - "minecraft:sand" + "#minecraft:sand" ] } \ No newline at end of file diff --git a/common/src/main/resources/data/friendsandfoes/tags/worldgen/biome/has_crab.json b/common/src/main/resources/data/friendsandfoes/tags/worldgen/biome/has_crab.json index 826a83aaa..88616b145 100644 --- a/common/src/main/resources/data/friendsandfoes/tags/worldgen/biome/has_crab.json +++ b/common/src/main/resources/data/friendsandfoes/tags/worldgen/biome/has_crab.json @@ -1,5 +1,6 @@ { "values": [ - "minecraft:mangrove_swamp" + "minecraft:mangrove_swamp", + "minecraft:beach" ] } diff --git a/gradle.properties b/gradle.properties index fdd0de298..90b541073 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,7 +7,7 @@ org.gradle.caching=false mod_java_version=17 mod_name=Friends & Foes mod_id=friendsandfoes -mod_version=3.0.0 +mod_version=3.0.1 mod_author=Faboslav mod_description=Adds outvoted and forgotten mobs from the mob vote, expanding on their original concepts and introducing new vanilla-like features. maven_group=com.faboslav.friendsandfoes From 5fcd0faf59ffb1e6e09ca616d011c4d0ba5adb50 Mon Sep 17 00:00:00 2001 From: Faboslav Date: Fri, 27 Sep 2024 08:39:17 +0200 Subject: [PATCH 2/7] Changed potion color, increased crab speed --- CHANGELOG.md | 1 + .../common/entity/ai/control/WallClimbNavigation.java | 2 +- .../friendsandfoes/common/init/FriendsAndFoesStatusEffects.java | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 17c8be747..5b6fdc8f4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ ## 3.0.1 - Crab now spawns also on the beaches +- Changed potion of reaching base color - Updated ru_ru translations (Thanks to mpustovoi) ## 3.0.0 diff --git a/common/src/main/java/com/faboslav/friendsandfoes/common/entity/ai/control/WallClimbNavigation.java b/common/src/main/java/com/faboslav/friendsandfoes/common/entity/ai/control/WallClimbNavigation.java index 7899baee8..71384a533 100644 --- a/common/src/main/java/com/faboslav/friendsandfoes/common/entity/ai/control/WallClimbNavigation.java +++ b/common/src/main/java/com/faboslav/friendsandfoes/common/entity/ai/control/WallClimbNavigation.java @@ -62,7 +62,7 @@ public void tick() { this.targetPos.getX(), this.targetPos.getY(), this.targetPos.getZ(), - 0.33F + 0.5F ); } else { this.targetPos = null; diff --git a/common/src/main/java/com/faboslav/friendsandfoes/common/init/FriendsAndFoesStatusEffects.java b/common/src/main/java/com/faboslav/friendsandfoes/common/init/FriendsAndFoesStatusEffects.java index 4ae9f53d1..dcdc653ab 100644 --- a/common/src/main/java/com/faboslav/friendsandfoes/common/init/FriendsAndFoesStatusEffects.java +++ b/common/src/main/java/com/faboslav/friendsandfoes/common/init/FriendsAndFoesStatusEffects.java @@ -16,5 +16,5 @@ public final class FriendsAndFoesStatusEffects { public static final ResourcefulRegistry STATUS_EFFECTS = ResourcefulRegistries.create(Registry.STATUS_EFFECT, FriendsAndFoes.MOD_ID); - public static final RegistryEntry REACH = STATUS_EFFECTS.register("reach", () -> new ReachStatusEffect(StatusEffectCategory.BENEFICIAL, 3364735)); + public static final RegistryEntry REACH = STATUS_EFFECTS.register("reach", () -> new ReachStatusEffect(StatusEffectCategory.BENEFICIAL, 0xFE984B)); } From 5e3f443d428ee167f1bfa98438b9f9074577d0b8 Mon Sep 17 00:00:00 2001 From: Faboslav Date: Fri, 27 Sep 2024 08:41:29 +0200 Subject: [PATCH 3/7] Fixed villager trades --- .../FriendsAndFoesVillagerProfessions.java | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/common/src/main/java/com/faboslav/friendsandfoes/common/init/FriendsAndFoesVillagerProfessions.java b/common/src/main/java/com/faboslav/friendsandfoes/common/init/FriendsAndFoesVillagerProfessions.java index b94c3c8a3..48c325b49 100644 --- a/common/src/main/java/com/faboslav/friendsandfoes/common/init/FriendsAndFoesVillagerProfessions.java +++ b/common/src/main/java/com/faboslav/friendsandfoes/common/init/FriendsAndFoesVillagerProfessions.java @@ -23,15 +23,17 @@ public final class FriendsAndFoesVillagerProfessions public static final RegistryEntry BEEKEEPER = VILLAGER_PROFESSIONS.register("beekeeper", () -> new VillagerProfession("beekeeper", pointOfInterest -> pointOfInterest.isIn(PointOfInterestTypeTags.BEE_HOME), pointOfInterest -> pointOfInterest.isIn(PointOfInterestTypeTags.BEE_HOME), ImmutableSet.of(Items.HONEYCOMB), ImmutableSet.of(), SoundEvents.ENTITY_ITEM_FRAME_REMOVE_ITEM)); public static void registerVillagerTrades(RegisterVillagerTradesEvent event) { - event.register(1, new TradeOffersUtil.BuyForOneEmeraldFactory(FriendsAndFoesItems.BUTTERCUP.get(), 10, 16, 2)); - event.register(1, new TradeOffersUtil.BuyForOneEmeraldFactory(Items.DANDELION, 10, 16, 2)); - event.register(1, new TradeOffersUtil.BuyForOneEmeraldFactory(Items.SUNFLOWER, 10, 16, 2)); - event.register(2, new TradeOffersUtil.BuyForOneEmeraldFactory(Items.GLASS_BOTTLE, 9, 12, 10)); - event.register(2, new TradeOffersUtil.SellItemFactory(Items.HONEY_BOTTLE, 3, 1, 12, 5)); - event.register(3, new TradeOffersUtil.BuyForOneEmeraldFactory(Items.SHEARS, 1, 12, 20)); - event.register(3, new TradeOffersUtil.SellItemFactory(Items.HONEY_BLOCK, 10, 1, 12, 10)); - event.register(4, new TradeOffersUtil.SellItemFactory(Items.HONEYCOMB, 4, 1, 12, 15)); - event.register(5, new TradeOffersUtil.SellItemFactory(Items.HONEYCOMB_BLOCK, 12, 1, 12, 30)); + if(event.type() == BEEKEEPER.get()) { + event.register(1, new TradeOffersUtil.BuyForOneEmeraldFactory(FriendsAndFoesItems.BUTTERCUP.get(), 10, 16, 2)); + event.register(1, new TradeOffersUtil.BuyForOneEmeraldFactory(Items.DANDELION, 10, 16, 2)); + event.register(1, new TradeOffersUtil.BuyForOneEmeraldFactory(Items.SUNFLOWER, 10, 16, 2)); + event.register(2, new TradeOffersUtil.BuyForOneEmeraldFactory(Items.GLASS_BOTTLE, 9, 12, 10)); + event.register(2, new TradeOffersUtil.SellItemFactory(Items.HONEY_BOTTLE, 3, 1, 12, 5)); + event.register(3, new TradeOffersUtil.BuyForOneEmeraldFactory(Items.SHEARS, 1, 12, 20)); + event.register(3, new TradeOffersUtil.SellItemFactory(Items.HONEY_BLOCK, 10, 1, 12, 10)); + event.register(4, new TradeOffersUtil.SellItemFactory(Items.HONEYCOMB, 4, 1, 12, 15)); + event.register(5, new TradeOffersUtil.SellItemFactory(Items.HONEYCOMB_BLOCK, 12, 1, 12, 30)); + } } private FriendsAndFoesVillagerProfessions() { From 5f0a0ad86818aea56ea72d2b0f9d0278be2a06fe Mon Sep 17 00:00:00 2001 From: Faboslav Date: Fri, 27 Sep 2024 08:45:35 +0200 Subject: [PATCH 4/7] Updated changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5b6fdc8f4..2544ab47d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ ## 3.0.1 +- Fixed villager trades not being specific to the beekeeper villager profession - Crab now spawns also on the beaches - Changed potion of reaching base color - Updated ru_ru translations (Thanks to mpustovoi) From 1ecb160411acaee60234ac0deee8b95d225edc9d Mon Sep 17 00:00:00 2001 From: Santiago Hernandez <73335686+TheLegendofSaram@users.noreply.github.com> Date: Fri, 27 Sep 2024 03:46:59 -0300 Subject: [PATCH 5/7] Mexican Spanish translation (#266) Added the crab lines and deleted some that were not on use --- .../assets/friendsandfoes/lang/es_mx.json | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/common/src/main/resources/assets/friendsandfoes/lang/es_mx.json b/common/src/main/resources/assets/friendsandfoes/lang/es_mx.json index 074437554..a973e2c75 100644 --- a/common/src/main/resources/assets/friendsandfoes/lang/es_mx.json +++ b/common/src/main/resources/assets/friendsandfoes/lang/es_mx.json @@ -53,9 +53,11 @@ "block.friendsandfoes.waxed_weathered_lightning_rod": "Pararrayos envejecido encerado", "block.friendsandfoes.waxed_oxidized_lightning_rod": "Pararrayos oxidado encerado", "block.friendsandfoes.potted_buttercup": "Buttercup en maceta", + "block.friendsandfoes.crab_egg": "Huevo de cangrejo", "entity.minecraft.villager.beekeeper": "Apicultor", "entity.minecraft.villager.friendsandfoes.beekeeper": "Apicultor", "entity.friendsandfoes.copper_golem": "Golem de cobre", + "entity.friendsandfoes.crab": "Cangrejo", "entity.friendsandfoes.glare": "Resplandor", "entity.friendsandfoes.iceologer": "Hielomante", "entity.friendsandfoes.moobloom": "Moobloom", @@ -63,9 +65,12 @@ "entity.friendsandfoes.mauler": "Mauler", "entity.friendsandfoes.tuff_golem": "Gólem Resistente", "entity.friendsandfoes.wildfire": "Wildfire", + "effect.friendsandfoes.reach": "Alcance", + "item_group.friendsandfoes.main_tab": "Friends & Foes", "item.friendsandfoes.buttercup": "Buttercup", "item.friendsandfoes.glare_spawn_egg": "Generar Glare", "item.friendsandfoes.copper_golem_spawn_egg": "Generar Gólem de Cobre", + "item.friendsandfoes.crab_spawn_egg": "Generar Cangrejo", "item.friendsandfoes.iceologer_spawn_egg": "Generar Hielomante", "item.friendsandfoes.illusioner_spawn_egg": "Generar Ilusionista", "item.friendsandfoes.mauler_spawn_egg": "Generar Mauler", @@ -73,10 +78,15 @@ "item.friendsandfoes.rascal_spawn_egg": "Generar Bribón", "item.friendsandfoes.tuff_golem_spawn_egg": "Generar Gólem Resistente", "item.friendsandfoes.wildfire_spawn_egg": "Generar Wildfire", + "item.friendsandfoes.crab_claw": "Pinza de cangrejo", "item.friendsandfoes.totem_of_freezing": "Tótem de Congelación", "item.friendsandfoes.totem_of_illusion": "Tótem de Ilusión", "item.friendsandfoes.wildfire_crown": "Corona de Wildfire", "item.friendsandfoes.wildfire_crown_fragment": "Fragmento de Corona de Wildfire", + "item.minecraft.potion.effect.reaching": "Poción de Alcance", + "item.minecraft.splash_potion.effect.reaching": "Poción Arrojadiza de Alcance", + "item.minecraft.lingering_potion.effect.reaching": "Poción Persistente de Alcance", + "item.minecraft.tipped_arrow.effect.reaching": "Flecha de Alcance", "subtitle.entity.friendsandfoes.glare.ambient": "Glare vuela", "subtitle.entity.friendsandfoes.glare.death": "Glare muere", "subtitle.entity.friendsandfoes.glare.eat": "Glare come", @@ -89,7 +99,8 @@ "subtitle.entity.friendsandfoes.copper_golem.head_spin": "Gólem de Cobre gira la cabeza", "subtitle.entity.friendsandfoes.copper_golem.hurt": "Gólem de Cobre se lastima", "subtitle.entity.friendsandfoes.copper_golem.repair": "Gólem de Cobre reparado", - "subtitle.entity.friendsandfoes.copper_golem.step": "Pasos", + "subtitle.entity.friendsandfoes.crab.death": "Cangrejo muere", + "subtitle.entity.friendsandfoes.crab.hurt": "Cangrejo se lastima", "subtitle.entity.friendsandfoes.iceologer.ambient": "Hielomante murmura", "subtitle.entity.friendsandfoes.iceologer.cast_spell": "Hielomante lanza hechizo", "subtitle.entity.friendsandfoes.iceologer.death": "Hielomante muere", @@ -120,14 +131,12 @@ "subtitle.entity.friendsandfoes.tuff_golem.repair": "Gólem Resistente reparado", "subtitle.entity.friendsandfoes.tuff_golem.wake": "Gólem Resistente se despierta", "subtitle.entity.friendsandfoes.tuff_golem.sleep": "Gólem Resistente se duerme", - "subtitle.entity.friendsandfoes.tuff_golem.step": "Pasos", "subtitle.entity.friendsandfoes.wildfire.ambient": "Wildfire respira", "subtitle.entity.friendsandfoes.wildfire.death": "Wildfire muere", "subtitle.entity.friendsandfoes.wildfire.hurt": "Wildfire se lastima", "subtitle.entity.friendsandfoes.wildfire.shield_break": "Escudo de Wildfire se rompe", "subtitle.entity.friendsandfoes.wildfire.shockwave": "Wildfire genera ondas de choque", "subtitle.entity.friendsandfoes.wildfire.shoot": "Wildfire dispara", - "subtitle.entity.friendsandfoes.wildfire.step": "Pasos", "subtitle.entity.friendsandfoes.wildfire.summon_blaze": "Wildfire invoca blazes", "trinkets.slot.charm.charm": "Amuleto" } From 0949d7c0eafdb4aeacbdde012979e5a815c38f55 Mon Sep 17 00:00:00 2001 From: Faboslav Date: Fri, 27 Sep 2024 08:47:13 +0200 Subject: [PATCH 6/7] Updated translations --- CHANGELOG.md | 1 + .../assets/friendsandfoes/lang/es_mx.json | 17 +++++++++++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2544ab47d..8731a395c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ - Crab now spawns also on the beaches - Changed potion of reaching base color - Updated ru_ru translations (Thanks to mpustovoi) +- Updated es_mx translations (Thanks to TheLegendofSaram) ## 3.0.0 diff --git a/common/src/main/resources/assets/friendsandfoes/lang/es_mx.json b/common/src/main/resources/assets/friendsandfoes/lang/es_mx.json index 074437554..ea98f3470 100644 --- a/common/src/main/resources/assets/friendsandfoes/lang/es_mx.json +++ b/common/src/main/resources/assets/friendsandfoes/lang/es_mx.json @@ -53,9 +53,11 @@ "block.friendsandfoes.waxed_weathered_lightning_rod": "Pararrayos envejecido encerado", "block.friendsandfoes.waxed_oxidized_lightning_rod": "Pararrayos oxidado encerado", "block.friendsandfoes.potted_buttercup": "Buttercup en maceta", + "block.friendsandfoes.crab_egg": "Huevo de cangrejo", "entity.minecraft.villager.beekeeper": "Apicultor", "entity.minecraft.villager.friendsandfoes.beekeeper": "Apicultor", "entity.friendsandfoes.copper_golem": "Golem de cobre", + "entity.friendsandfoes.crab": "Cangrejo", "entity.friendsandfoes.glare": "Resplandor", "entity.friendsandfoes.iceologer": "Hielomante", "entity.friendsandfoes.moobloom": "Moobloom", @@ -63,9 +65,12 @@ "entity.friendsandfoes.mauler": "Mauler", "entity.friendsandfoes.tuff_golem": "Gólem Resistente", "entity.friendsandfoes.wildfire": "Wildfire", + "effect.friendsandfoes.reach": "Alcance", + "item_group.friendsandfoes.main_tab": "Friends & Foes", "item.friendsandfoes.buttercup": "Buttercup", "item.friendsandfoes.glare_spawn_egg": "Generar Glare", "item.friendsandfoes.copper_golem_spawn_egg": "Generar Gólem de Cobre", + "item.friendsandfoes.crab_spawn_egg": "Generar Cangrejo", "item.friendsandfoes.iceologer_spawn_egg": "Generar Hielomante", "item.friendsandfoes.illusioner_spawn_egg": "Generar Ilusionista", "item.friendsandfoes.mauler_spawn_egg": "Generar Mauler", @@ -73,10 +78,15 @@ "item.friendsandfoes.rascal_spawn_egg": "Generar Bribón", "item.friendsandfoes.tuff_golem_spawn_egg": "Generar Gólem Resistente", "item.friendsandfoes.wildfire_spawn_egg": "Generar Wildfire", + "item.friendsandfoes.crab_claw": "Pinza de cangrejo", "item.friendsandfoes.totem_of_freezing": "Tótem de Congelación", "item.friendsandfoes.totem_of_illusion": "Tótem de Ilusión", "item.friendsandfoes.wildfire_crown": "Corona de Wildfire", "item.friendsandfoes.wildfire_crown_fragment": "Fragmento de Corona de Wildfire", + "item.minecraft.potion.effect.reaching": "Poción de Alcance", + "item.minecraft.splash_potion.effect.reaching": "Poción Arrojadiza de Alcance", + "item.minecraft.lingering_potion.effect.reaching": "Poción Persistente de Alcance", + "item.minecraft.tipped_arrow.effect.reaching": "Flecha de Alcance", "subtitle.entity.friendsandfoes.glare.ambient": "Glare vuela", "subtitle.entity.friendsandfoes.glare.death": "Glare muere", "subtitle.entity.friendsandfoes.glare.eat": "Glare come", @@ -89,7 +99,8 @@ "subtitle.entity.friendsandfoes.copper_golem.head_spin": "Gólem de Cobre gira la cabeza", "subtitle.entity.friendsandfoes.copper_golem.hurt": "Gólem de Cobre se lastima", "subtitle.entity.friendsandfoes.copper_golem.repair": "Gólem de Cobre reparado", - "subtitle.entity.friendsandfoes.copper_golem.step": "Pasos", + "subtitle.entity.friendsandfoes.crab.death": "Cangrejo muere", + "subtitle.entity.friendsandfoes.crab.hurt": "Cangrejo se lastima", "subtitle.entity.friendsandfoes.iceologer.ambient": "Hielomante murmura", "subtitle.entity.friendsandfoes.iceologer.cast_spell": "Hielomante lanza hechizo", "subtitle.entity.friendsandfoes.iceologer.death": "Hielomante muere", @@ -120,14 +131,12 @@ "subtitle.entity.friendsandfoes.tuff_golem.repair": "Gólem Resistente reparado", "subtitle.entity.friendsandfoes.tuff_golem.wake": "Gólem Resistente se despierta", "subtitle.entity.friendsandfoes.tuff_golem.sleep": "Gólem Resistente se duerme", - "subtitle.entity.friendsandfoes.tuff_golem.step": "Pasos", "subtitle.entity.friendsandfoes.wildfire.ambient": "Wildfire respira", "subtitle.entity.friendsandfoes.wildfire.death": "Wildfire muere", "subtitle.entity.friendsandfoes.wildfire.hurt": "Wildfire se lastima", "subtitle.entity.friendsandfoes.wildfire.shield_break": "Escudo de Wildfire se rompe", "subtitle.entity.friendsandfoes.wildfire.shockwave": "Wildfire genera ondas de choque", "subtitle.entity.friendsandfoes.wildfire.shoot": "Wildfire dispara", - "subtitle.entity.friendsandfoes.wildfire.step": "Pasos", "subtitle.entity.friendsandfoes.wildfire.summon_blaze": "Wildfire invoca blazes", "trinkets.slot.charm.charm": "Amuleto" -} +} \ No newline at end of file From d1b8fc6c33a0eae079fd8d92b1c30457a2845419 Mon Sep 17 00:00:00 2001 From: Faboslav Date: Fri, 27 Sep 2024 08:50:23 +0200 Subject: [PATCH 7/7] Updated tags --- .../data/friendsandfoes/tags/blocks/crab_burrow_spot_blocks.json | 1 - .../data/friendsandfoes/tags/blocks/crabs_spawnable_on.json | 1 - 2 files changed, 2 deletions(-) diff --git a/common/src/main/resources/data/friendsandfoes/tags/blocks/crab_burrow_spot_blocks.json b/common/src/main/resources/data/friendsandfoes/tags/blocks/crab_burrow_spot_blocks.json index 4fa999fa8..1bc747e08 100644 --- a/common/src/main/resources/data/friendsandfoes/tags/blocks/crab_burrow_spot_blocks.json +++ b/common/src/main/resources/data/friendsandfoes/tags/blocks/crab_burrow_spot_blocks.json @@ -1,6 +1,5 @@ { "values": [ - "minecraft:grass_block", "minecraft:mud", "#minecraft:sand" ] diff --git a/common/src/main/resources/data/friendsandfoes/tags/blocks/crabs_spawnable_on.json b/common/src/main/resources/data/friendsandfoes/tags/blocks/crabs_spawnable_on.json index 48236c96b..5d7421017 100644 --- a/common/src/main/resources/data/friendsandfoes/tags/blocks/crabs_spawnable_on.json +++ b/common/src/main/resources/data/friendsandfoes/tags/blocks/crabs_spawnable_on.json @@ -1,6 +1,5 @@ { "values": [ - "minecraft:grass_block", "minecraft:mud", "minecraft:mangrove_roots", "minecraft:muddy_mangrove_roots",