Merge branch '1.19.2' into 1.19.3

* 1.19.2:
  Updated pt_br translation
  Updated changelog
  Fixed carpet incompability
  Updated/added translations
  3.0.6

CHANGELOG.md

@@ -1,3 +1,15 @@
+## 3.0.6
+
+- Fixed strong potion of reaching duration
+- Fixed iceologer model
+- Fixed carpet profiler incompatibility
+- Added more config options
+- Added zh_tw translations (Thanks to Lobster0228)
+- Added fr_fr translations (Thanks to Franco227)
+- Added pt_br translations (Thanks to demorogabrtz)
+- Updated advancements
+- Updated uk_ua translations (Thanks to unroman)
+
 ## 3.0.5
 
 - Fixed server crash

common/src/main/java/com/faboslav/friendsandfoes/common/client/render/entity/renderer/IceologerEntityRenderer.java

@@ -1,13 +1,13 @@
 package com.faboslav.friendsandfoes.common.client.render.entity.renderer;
 
 import com.faboslav.friendsandfoes.common.FriendsAndFoes;
+import com.faboslav.friendsandfoes.common.init.FriendsAndFoesEntityModelLayers;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.client.render.VertexConsumerProvider;
 import net.minecraft.client.render.entity.EntityRendererFactory.Context;
 import net.minecraft.client.render.entity.IllagerEntityRenderer;
 import net.minecraft.client.render.entity.feature.HeldItemFeatureRenderer;
-import net.minecraft.client.render.entity.model.EntityModelLayers;
 import net.minecraft.client.render.entity.model.IllagerEntityModel;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.entity.mob.SpellcastingIllagerEntity;
@@ -17,7 +17,7 @@
 public final class IceologerEntityRenderer<T extends SpellcastingIllagerEntity> extends IllagerEntityRenderer<T>
 {
 	public IceologerEntityRenderer(Context context) {
-		super(context, new IllagerEntityModel<>(context.getPart(EntityModelLayers.EVOKER)), 0.5F);
+		super(context, new IllagerEntityModel<>(context.getPart(FriendsAndFoesEntityModelLayers.ICEOLOGER_LAYER)), 0.5F);
 
 		this.addFeature(new HeldItemFeatureRenderer<>(this, context.getHeldItemRenderer())
 		{
@@ -45,6 +45,6 @@ public void render(
 
 	@Override
 	public Identifier getTexture(T entity) {
-		return FriendsAndFoes.makeID("textures/entity/illager/iceologer.png");
+			return FriendsAndFoes.makeID("textures/entity/illager/iceologer.png");
 	}
 }

common/src/main/java/com/faboslav/friendsandfoes/common/config/FriendsAndFoesConfig.java

@@ -144,6 +144,15 @@ public final class FriendsAndFoesConfig implements Config
 	@Description("Generate illusioner training grounds")
 	public boolean generateIllusionerTrainingGroundsStructure = true;
 
+	@Description("Maximum count of illusions")
+	public int maxIllusionsCount = 9;
+
+	@Description("Number of ticks before illusion will despawn (20 ticks = 1 second)")
+	public int illusionLifetimeTicks = 600;
+
+	@Description("Number of invisibility ticks  (20 ticks = 1 second)")
+	public int invisibilityTicks = 60;
+
 	@Category("Zombie Horse")
 	@Description("Enable trap")
 	public boolean enableZombieHorseTrap = true;

common/src/main/java/com/faboslav/friendsandfoes/common/init/FriendsAndFoesEntityModelLayers.java

@@ -8,6 +8,7 @@
 import net.minecraft.client.render.entity.model.CowEntityModel;
 import net.minecraft.client.render.entity.model.EntityModelLayer;
 import net.minecraft.client.render.entity.model.EntityModelLayers;
+import net.minecraft.client.render.entity.model.IllagerEntityModel;
 
 /**
  * @see EntityModelLayers
@@ -18,6 +19,7 @@ public final class FriendsAndFoesEntityModelLayers
 	public static final EntityModelLayer COPPER_GOLEM_LAYER = new EntityModelLayer(FriendsAndFoes.makeID("copper_golem"), "main");
 	public static final EntityModelLayer CRAB_LAYER = new EntityModelLayer(FriendsAndFoes.makeID("crab"), "main");
 	public static final EntityModelLayer GLARE_LAYER = new EntityModelLayer(FriendsAndFoes.makeID("glare"), "main");
+	public static final EntityModelLayer ICEOLOGER_LAYER = new EntityModelLayer(FriendsAndFoes.makeID("iceologer"), "main");
 	public static final EntityModelLayer ICEOLOGER_ICE_CHUNK_LAYER = new EntityModelLayer(FriendsAndFoes.makeID("iceologer_ice_chunk"), "main");
 	public static final EntityModelLayer MAULER_LAYER = new EntityModelLayer(FriendsAndFoes.makeID("mauler"), "main");
 	public static final EntityModelLayer MOOBLOOM_LAYER = new EntityModelLayer(FriendsAndFoes.makeID("moobloom"), "main");
@@ -29,6 +31,7 @@ public static void registerEntityLayers(RegisterEntityLayersEvent event) {
 		event.register(COPPER_GOLEM_LAYER, CopperGolemEntityModel::getTexturedModelData);
 		event.register(CRAB_LAYER, CrabEntityModel::getTexturedModelData);
 		event.register(GLARE_LAYER, GlareEntityModel::getTexturedModelData);
+		event.register(ICEOLOGER_LAYER, IllagerEntityModel::getTexturedModelData);
 		event.register(ICEOLOGER_ICE_CHUNK_LAYER, IceologerIceChunkModel::getTexturedModelData);
 		event.register(MAULER_LAYER, MaulerEntityModel::getTexturedModelData);
 		event.register(MOOBLOOM_LAYER, CowEntityModel::getTexturedModelData);

common/src/main/java/com/faboslav/friendsandfoes/common/init/FriendsAndFoesPotions.java

@@ -17,5 +17,5 @@ public final class FriendsAndFoesPotions
 
 	public static final RegistryEntry<Potion> REACHING = POTIONS.register("reaching", () -> new Potion(new StatusEffectInstance(FriendsAndFoesStatusEffects.REACH.get(), 72000)));
 	public static final RegistryEntry<Potion> LONG_REACHING = POTIONS.register("long_reaching", () -> new Potion("reaching", new StatusEffectInstance(FriendsAndFoesStatusEffects.REACH.get(), 144000)));
-	public static final RegistryEntry<Potion> STRONG_REACHING = POTIONS.register("strong_reaching", () -> new Potion("reaching", new StatusEffectInstance(FriendsAndFoesStatusEffects.REACH.get(), 1800, 1)));
+	public static final RegistryEntry<Potion> STRONG_REACHING = POTIONS.register("strong_reaching", () -> new Potion("reaching", new StatusEffectInstance(FriendsAndFoesStatusEffects.REACH.get(), 36000, 1)));
 }

common/src/main/java/com/faboslav/friendsandfoes/common/mixin/IllusionerEntityMixin.java

@@ -1,6 +1,7 @@
 package com.faboslav.friendsandfoes.common.mixin;
 
 import com.faboslav.friendsandfoes.common.FriendsAndFoes;
+import com.faboslav.friendsandfoes.common.config.FriendsAndFoesConfig;
 import com.faboslav.friendsandfoes.common.entity.IllusionerEntityAccess;
 import com.llamalad7.mixinextras.injector.WrapWithCondition;
 import net.minecraft.entity.Entity;
@@ -41,9 +42,9 @@
 @SuppressWarnings({"rawtypes", "unchecked"})
 public abstract class IllusionerEntityMixin extends IllusionerSpellcastingIllagerEntityMixin implements RangedAttackMob, IllusionerEntityAccess
 {
-	private static final int MAX_ILLUSIONS_COUNT = 9;
-	private static final int ILLUSION_LIFETIME_TICKS = 600;
-	private static final int INVISIBILITY_TICKS = 60;
+	private static final int MAX_ILLUSIONS_COUNT = FriendsAndFoes.getConfig().maxIllusionsCount;
+	private static final int ILLUSION_LIFETIME_TICKS = FriendsAndFoes.getConfig().illusionLifetimeTicks;
+	private static final int INVISIBILITY_TICKS =  FriendsAndFoes.getConfig().invisibilityTicks;
 
 	private static final String IS_ILLUSION_NBT_NAME = "IsIllusion";
 	private static final String WAS_ATTACKED_NBT_NAME = "WasAttacked";

common/src/main/java/com/faboslav/friendsandfoes/common/mixin/ServerWorldMixin.java

@@ -60,6 +60,7 @@ public void friendsandfoes_addZombieHorseSpawnEvent(
 			int j = chunkPos.getStartZ();
 			Profiler profiler = this.getProfiler();
 			profiler.push("thunder2");
+
 			if (
 				this.isRaining()
 				&& this.isThundering()
@@ -83,6 +84,8 @@ public void friendsandfoes_addZombieHorseSpawnEvent(
 
 				this.spawnEntity(lightningEntity);
 			}
+
+			profiler.pop();
 		}
 	}
 

common/src/main/resources/assets/friendsandfoes/lang/en_us.json

@@ -21,7 +21,7 @@
 	"advancements.nether.find_citadel.description": "Enter a Nether citadel",
 	"advancements.nether.kill_wildfire.title": "Drop it like it's hot",
 	"advancements.nether.kill_wildfire.description": "Kill the wildfire",
-	"advancements.nether.obtain_wildfire_crown.title": "Who's da New King of Hell?",
+	"advancements.nether.obtain_wildfire_crown.title": "Who's da New King of Nether?",
 	"advancements.nether.obtain_wildfire_crown.description": "Have a wildfire crown in your inventory",
 	"advancements.adventure.complete_hide_and_seek_game.title": "Hide and Seek",
 	"advancements.adventure.complete_hide_and_seek_game.description": "Find a rascal three times in its little game",
@@ -65,6 +65,7 @@
 	"entity.friendsandfoes.mauler": "Mauler",
 	"entity.friendsandfoes.tuff_golem": "Tuff Golem",
 	"entity.friendsandfoes.wildfire": "Wildfire",
+	"entity.friendsandfoes.player_illusion": "Player Illusion",
 	"effect.friendsandfoes.reach": "Reach",
 	"effect.friendsandfoes.reach.description": "Increases the range of block interaction.",
 	"item_group.friendsandfoes.main_tab": "Friends & Foes",

common/src/main/resources/assets/friendsandfoes/lang/fr_fr.json

@@ -0,0 +1,146 @@
+{
+	"advancements.husbandry.beehive.title": "Gardien des Abeilles",
+	"advancements.husbandry.beehive.description": "Obtenez tous les types de ruches",
+	"advancements.adventure.kill_iceologer.title": "J'étais là, j'ai vécu, j'ai...",
+	"advancements.adventure.kill_iceologer.description": "Tuez le cryologiste",
+	"advancements.adventure.kill_illusioner.title": "Un Monde d'Illusion",
+	"advancements.adventure.kill_illusioner.description": "Tuez l'illusionniste... si il est réel",
+	"advancements.husbandry.shear_a_moobloom.title": "MooBoom!",
+	"advancements.husbandry.shear_a_moobloom.description": "Tondez une moobloom",
+	"advancements.adventure.summon_copper_golem.title": "C'est parti!",
+	"advancements.adventure.summon_copper_golem.description": "Invoquez un golem de cuivre",
+	"advancements.husbandry.tame_a_glare.title": "Grincheux et Mignon",
+	"advancements.husbandry.tame_a_glare.description": "Apprivoisez un glare",
+	"advancements.adventure.the_magicians.title": "Les Magiciens",
+	"advancements.adventure.the_magicians.description": "Tuez les trois magiciens illageois",
+	"advancements.adventure.it_bites.title": "Il mord!",
+	"advancements.adventure.it_bites.description": "Tuez le mauleur",
+	"advancements.survival.activate_zombie_horse_trap.title": "Cavaliers Orageux",
+	"advancements.survival.activate_zombie_horse_trap.description": "Activez le piège du cheval zombie",
+	"advancements.nether.find_citadel.title": "Une forteresse? Non, une citadelle!",
+	"advancements.nether.find_citadel.description": "Entrez dans une citadelle du Nether",
+	"advancements.nether.kill_wildfire.title": "Ennemi Brûlant",
+	"advancements.nether.kill_wildfire.description": "Tuez le wildfire",
+	"advancements.nether.obtain_wildfire_crown.title": "C'est qui le Nouveau Roi de l'Enfer?",
+	"advancements.nether.obtain_wildfire_crown.description": "Obtenez la couronne du wildfire",
+	"advancements.adventure.complete_hide_and_seek_game.title": "Cache-cache",
+	"advancements.adventure.complete_hide_and_seek_game.description": "Trouvez un rascal trois fois",
+	"block.friendsandfoes.buttercup": "Bouton d'Or",
+	"block.minecraft.beehive": "Ruche en Chêne",
+	"block.friendsandfoes.acacia_beehive": "Ruche d'acacia",
+	"block.friendsandfoes.bamboo_beehive": "Ruche de bambou",
+	"block.friendsandfoes.birch_beehive": "Ruche de bouleau",
+	"block.friendsandfoes.cherry_beehive": "Ruche de cerisier",
+	"block.friendsandfoes.crimson_beehive": "Ruche carmin",
+	"block.friendsandfoes.dark_oak_beehive": "Ruche de chêne noir",
+	"block.friendsandfoes.jungle_beehive": "Ruche d'acajou",
+	"block.friendsandfoes.mangrove_beehive": "Ruche de palétuvier",
+	"block.friendsandfoes.spruce_beehive": "Ruche de sapin",
+	"block.friendsandfoes.warped_beehive": "Ruche biscornue",
+	"block.friendsandfoes.copper_button": "Bouton de cuivre",
+	"block.friendsandfoes.exposed_copper_button": "Bouton de cuivre exposé",
+	"block.friendsandfoes.weathered_copper_button": "Bouton de cuivre érodé",
+	"block.friendsandfoes.oxidized_copper_button": "Bouton de cuivre oxidé",
+	"block.friendsandfoes.waxed_copper_button": "Bouton de cuivre ciré",
+	"block.friendsandfoes.waxed_exposed_copper_button": "Bouton de cuivre exposé ciré",
+	"block.friendsandfoes.waxed_weathered_copper_button": "Bouton de cuivre érodé ciré",
+	"block.friendsandfoes.waxed_oxidized_copper_button": "Bouton de cuivre oxidé ciré",
+	"block.friendsandfoes.exposed_lightning_rod": "Paratonnerre exposé",
+	"block.friendsandfoes.weathered_lightning_rod": "Paratonnerre érodé",
+	"block.friendsandfoes.oxidized_lightning_rod": "Paratonnerre oxidé",
+	"block.friendsandfoes.waxed_lightning_rod": "Paratonnerre ciré",
+	"block.friendsandfoes.waxed_exposed_lightning_rod": "Paratonnerre exposé ciré",
+	"block.friendsandfoes.waxed_weathered_lightning_rod": "Paratonnerre érodé ciré",
+	"block.friendsandfoes.waxed_oxidized_lightning_rod": "Paratonnerre oxidé ciré",
+	"block.friendsandfoes.potted_buttercup": "Bouton d'Or en pot",
+	"block.friendsandfoes.crab_egg": "Oeuf de crabe",
+	"entity.minecraft.villager.beekeeper": "Apiculteur",
+	"entity.minecraft.villager.friendsandfoes.beekeeper": "Apiculteur",
+	"entity.friendsandfoes.copper_golem": "Golem de cuivre",
+	"entity.friendsandfoes.crab": "Crabe",
+	"entity.friendsandfoes.glare": "Glare",
+	"entity.friendsandfoes.iceologer": "Cryologiste",
+	"entity.friendsandfoes.moobloom": "Moobloom",
+	"entity.friendsandfoes.rascal": "Rascal",
+	"entity.friendsandfoes.mauler": "Mauler",
+	"entity.friendsandfoes.tuff_golem": "Golem de Tuf",
+	"entity.friendsandfoes.wildfire": "Wildfire",
+	"entity.friendsandfoes.player_illusion": "Illusion de Joueur",
+	"effect.friendsandfoes.reach": "Portée",
+	"effect.friendsandfoes.reach.description": "Augmente votre portée.",
+	"item_group.friendsandfoes.main_tab": "Friends & Foes",
+	"item.friendsandfoes.buttercup": "Bouton d'Or",
+	"item.friendsandfoes.glare_spawn_egg": "Oeuf d'apparition de glare",
+	"item.friendsandfoes.copper_golem_spawn_egg": "Oeuf d'apparition de golem de cuivre",
+	"item.friendsandfoes.crab_spawn_egg": "Oeuf d'apparition de crabe",
+	"item.friendsandfoes.iceologer_spawn_egg": "Oeuf d'apparition de cryologiste",
+	"item.friendsandfoes.illusioner_spawn_egg": "Oeuf d'apparition d'illusionniste",
+	"item.friendsandfoes.mauler_spawn_egg": "Oeuf d'apparition de mauler",
+	"item.friendsandfoes.moobloom_spawn_egg": "Oeuf d'apparition de moobloom",
+	"item.friendsandfoes.rascal_spawn_egg": "Oeuf d'apparition de rascal",
+	"item.friendsandfoes.tuff_golem_spawn_egg": "Oeuf d'apparition de golem de tuf",
+	"item.friendsandfoes.wildfire_spawn_egg": "Oeuf d'apparition de Wildfire",
+	"item.friendsandfoes.crab_claw": "Pince de crabe",
+	"item.friendsandfoes.totem_of_freezing": "Totem de Gel",
+	"item.friendsandfoes.totem_of_illusion": "Totem d'Illusion",
+	"item.friendsandfoes.wildfire_crown": "Couronne du Wildfire",
+	"item.friendsandfoes.wildfire_crown_fragment": "Fragment de Couronne du Wildfire",
+	"item.minecraft.potion.effect.reaching": "Potion de Portée",
+	"item.minecraft.splash_potion.effect.reaching": "Potion de Portée jetable",
+	"item.minecraft.lingering_potion.effect.reaching": "Potion de Portée persistante",
+	"item.minecraft.tipped_arrow.effect.reaching": "Flèche de Portée",
+	"subtitle.entity.friendsandfoes.glare.ambient": "Glare qui vole",
+	"subtitle.entity.friendsandfoes.glare.death": "Glare qui meurt",
+	"subtitle.entity.friendsandfoes.glare.eat": "Glare qui mange",
+	"subtitle.entity.friendsandfoes.glare.grumpiness": "Glare qui grogne",
+	"subtitle.entity.friendsandfoes.glare.grumpiness_short": "Glare qui grogne",
+	"subtitle.entity.friendsandfoes.glare.hurt": "Glare blessé",
+	"subtitle.entity.friendsandfoes.glare.rustle": "Glare qui grogne",
+	"subtitle.entity.friendsandfoes.glare.shake": "Glare qui se secoue",
+	"subtitle.entity.friendsandfoes.copper_golem.death": "Golem de Cuivre qui meurt",
+	"subtitle.entity.friendsandfoes.copper_golem.head_spin": "Golem de Cuivre qui fait tourner sa tête",
+	"subtitle.entity.friendsandfoes.copper_golem.hurt": "Golem de Cuivre blessé",
+	"subtitle.entity.friendsandfoes.copper_golem.repair": "Golem de Cuivre réparé",
+	"subtitle.entity.friendsandfoes.crab.death": "Crabe qui meurt",
+	"subtitle.entity.friendsandfoes.crab.hurt": "Crabe blessé",
+	"subtitle.entity.friendsandfoes.iceologer.ambient": "Murmure de Cryologiste",
+	"subtitle.entity.friendsandfoes.iceologer.cast_spell": "Cryologiste qui lance un sort",
+	"subtitle.entity.friendsandfoes.iceologer.death": "Cryologiste qui meurt",
+	"subtitle.entity.friendsandfoes.iceologer.hurt": "Cryologiste blessé",
+	"subtitle.entity.friendsandfoes.iceologer.prepare_slowness": "Cryologiste qui prépare Lenteur",
+	"subtitle.entity.friendsandfoes.iceologer.prepare_summon": "Cryologiste qui prépare Invocation",
+	"subtitle.entity.friendsandfoes.ice_chunk.ambient": "Morceau de glace qui craque",
+	"subtitle.entity.friendsandfoes.ice_chunk.hit": "Morceau de glace qui tombe",
+	"subtitle.entity.friendsandfoes.ice_chunk.summon": "Morceau de glace qui craque",
+	"subtitle.entity.friendsandfoes.mauler.bite": "Mauler qui mord",
+	"subtitle.entity.friendsandfoes.mauler.death": "Mauler qui meurt",
+	"subtitle.entity.friendsandfoes.mauler.growl": "Mauler qui grogne",
+	"subtitle.entity.friendsandfoes.mauler.hurt": "Mauler blessé",
+	"subtitle.entity.friendsandfoes.moobloom.convert": "Moobloom qui se transforme",
+	"subtitle.entity.friendsandfoes.player.mirror_move": "Joueur qui change de place",
+	"subtitle.entity.friendsandfoes.rascal.ambient": "Rascal qui nargue",
+	"subtitle.entity.friendsandfoes.rascal.disappear": "Rascal qui disparaît",
+	"subtitle.entity.friendsandfoes.rascal.nod": "Rascal qui hoche la tête",
+	"subtitle.entity.friendsandfoes.rascal.hurt": "Rascal blessé",
+	"subtitle.entity.friendsandfoes.rascal.reappear": "Rascal qui apparaît",
+	"subtitle.entity.friendsandfoes.rascal.reward": "Rascal qui donne une récompense",
+	"subtitle.entity.friendsandfoes.rascal.reward_bad": "Rascal qui donne une mauvaise récompense",
+	"subtitle.entity.friendsandfoes.shield_debris.impact": "Bouclier de débris impacté",
+	"subtitle.entity.friendsandfoes.tuff_golem.glue_on": "Golem de Tuf englué",
+	"subtitle.entity.friendsandfoes.tuff_golem.glue_off": "Golem de Tuf libéré",
+	"subtitle.entity.friendsandfoes.tuff_golem.hurt": "Golem de Tuf blessé",
+	"subtitle.entity.friendsandfoes.tuff_golem.move": "Golem de Tuf qui bouge",
+	"subtitle.entity.friendsandfoes.tuff_golem.repair": "Golem de Tuf réparé",
+	"subtitle.entity.friendsandfoes.tuff_golem.wake": "Golem de Tuf qui se réveille",
+	"subtitle.entity.friendsandfoes.tuff_golem.sleep": "Golem de Tuf qui s'endort",
+	"subtitle.entity.friendsandfoes.wildfire.ambient": "Souffle de Wildfire",
+	"subtitle.entity.friendsandfoes.wildfire.death": "Wildfire qui meurt",
+	"subtitle.entity.friendsandfoes.wildfire.hurt": "Wildfire blessé",
+	"subtitle.entity.friendsandfoes.wildfire.shield_break": "Bouclier du Wildfire qui se brise",
+	"subtitle.entity.friendsandfoes.wildfire.shockwave": "Onde de choc du Wildfire",
+	"subtitle.entity.friendsandfoes.wildfire.shoot": "Wildfire qui tire",
+	"subtitle.entity.friendsandfoes.wildfire.summon_blaze": "Wildfire qui invoque des blazes",
+	"trinkets.slot.charm.charm": "Charme",
+	"text.betterf3.line.glares": "Glares",
+	"text.betterf3.line.rascals": "Rascals"
+}