Merge branch '1.20.2' into 1.20.4

* 1.20.2:
  Translations
  Added missing event to neo
  United event
  Dont run build on master

# Conflicts:
#	neoforge/src/main/java/com/faboslav/friendsandfoes/neoforge/FriendsAndFoesNeoForge.java

.github/workflows/build.yml

@@ -4,6 +4,7 @@ on:
     push:
         branches:
             - "**"
+            - "!master"
     pull_request:
         branches:
             - "**"

CHANGELOG.md

@@ -3,6 +3,8 @@
 - Improved internal registries logic (Might fix some crashes)
 - Fixed crashes with mods like Caverns & Chasms, Unvoted & Shelved and Sinytra Connector
 - Fixed block flammability
+- Fixed white texture on buttercup
+- Updated es_cl translations (Thanks to Ganbare-Lucifer)
 
 ## 3.0.3
 

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

@@ -58,8 +58,11 @@ public final class FriendsAndFoesBlocks
 
 	@Environment(EnvType.CLIENT)
 	public static void registerRenderLayers(RegisterRenderLayersEvent event) {
-		event.register(RenderLayer.getCutout(), FriendsAndFoesBlocks.BUTTERCUP.get());
-		event.register(RenderLayer.getCutout(), FriendsAndFoesBlocks.POTTED_BUTTERCUP.get());
+		event.register(
+			RenderLayer.getCutout(),
+			FriendsAndFoesBlocks.BUTTERCUP.get(),
+			FriendsAndFoesBlocks.POTTED_BUTTERCUP.get()
+		);
 	}
 
 	public static void registerFlammablity(RegisterFlammabilityEvent event) {

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

@@ -53,30 +53,41 @@
 	"block.friendsandfoes.waxed_weathered_lightning_rod": "Pararrayos degradado encerado",
 	"block.friendsandfoes.waxed_oxidized_lightning_rod": "Pararrayos oxidado encerado",
 	"block.friendsandfoes.potted_buttercup": "Macetero con ranúnculo",
+	"block.friendsandfoes.crab_egg": "Huevo de cangrejo",
 	"entity.minecraft.villager.beekeeper": "Apicultor",
 	"entity.minecraft.villager.friendsandfoes.beekeeper": "Apicultor",
 	"entity.friendsandfoes.copper_golem": "Gólem de cobre",
+	"entity.friendsandfoes.crab": "Cangrejo",
 	"entity.friendsandfoes.glare": "Glare",
 	"entity.friendsandfoes.iceologer": "Glaciólogo",
 	"entity.friendsandfoes.moobloom": "Moobloom",
 	"entity.friendsandfoes.rascal": "Rascal",
 	"entity.friendsandfoes.mauler": "Mauler",
 	"entity.friendsandfoes.tuff_golem": "Gólem de toba",
 	"entity.friendsandfoes.wildfire": "Wildfire",
+	"effect.friendsandfoes.reach": "Alcance",
+	"effect.friendsandfoes.reach.description": "Aumenta el rango de interacción del bloque.",
+	"item_group.friendsandfoes.main_tab": "Friends & Foes",
 	"item.friendsandfoes.buttercup": "Ranúnculo",
 	"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 glaciólogo",
 	"item.friendsandfoes.illusioner_spawn_egg": "Generar ilusionista",
 	"item.friendsandfoes.mauler_spawn_egg": "Generar mauler",
 	"item.friendsandfoes.moobloom_spawn_egg": "Generar moobloom",
 	"item.friendsandfoes.rascal_spawn_egg": "Generar rascal",
 	"item.friendsandfoes.tuff_golem_spawn_egg": "Generar gólem de toba",
 	"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 deambula",
 	"subtitle.entity.friendsandfoes.glare.death": "Glare muere",
 	"subtitle.entity.friendsandfoes.glare.eat": "Glare come",
@@ -89,14 +100,15 @@
 	"subtitle.entity.friendsandfoes.copper_golem.head_spin": "Gólem de cobre retuerce su cabeza",
 	"subtitle.entity.friendsandfoes.copper_golem.hurt": "Gólem de cobre herido",
 	"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 herido",
 	"subtitle.entity.friendsandfoes.iceologer.ambient": "Glaciólogo murmura",
 	"subtitle.entity.friendsandfoes.iceologer.cast_spell": "Glaciólogo pronuncia conjuro",
 	"subtitle.entity.friendsandfoes.iceologer.death": "Glaciólogo muere",
 	"subtitle.entity.friendsandfoes.iceologer.hurt": "Glaciólogo herido",
 	"subtitle.entity.friendsandfoes.iceologer.prepare_slowness": "Musitación lenta",
 	"subtitle.entity.friendsandfoes.iceologer.prepare_summon": "Musitación poderosa",
-	"subtitle.entity.friendsandfoes.ice_chunk.ambient": "Chasquido gélido ",
+	"subtitle.entity.friendsandfoes.ice_chunk.ambient": "Chasquido gélido",
 	"subtitle.entity.friendsandfoes.ice_chunk.hit": "Estallido de témpano",
 	"subtitle.entity.friendsandfoes.ice_chunk.summon": "Chasquido gélido",
 	"subtitle.entity.friendsandfoes.mauler.bite": "Mordisco",
@@ -120,14 +132,14 @@
 	"subtitle.entity.friendsandfoes.tuff_golem.repair": "Gólem de toba reparado",
 	"subtitle.entity.friendsandfoes.tuff_golem.wake": "Gólem de toba se despierta",
 	"subtitle.entity.friendsandfoes.tuff_golem.sleep": "Gólem de toba 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 herido",
 	"subtitle.entity.friendsandfoes.wildfire.shield_break": "El escudo del Wildfire se rompe",
 	"subtitle.entity.friendsandfoes.wildfire.shockwave": "Ondas de choque del Wildfire",
 	"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"
+	"trinkets.slot.charm.charm": "Amuleto",
+	"text.betterf3.line.glares": "Glares",
+	"text.betterf3.line.rascals": "Rascals"
 }

neoforge/src/main/java/com/faboslav/friendsandfoes/neoforge/FriendsAndFoesNeoForge.java

@@ -3,27 +3,26 @@
 import com.faboslav.friendsandfoes.common.FriendsAndFoes;
 import com.faboslav.friendsandfoes.common.events.AddItemGroupEntriesEvent;
 import com.faboslav.friendsandfoes.common.events.RegisterVillagerTradesEvent;
+import com.faboslav.friendsandfoes.common.events.client.RegisterRenderLayersEvent;
 import com.faboslav.friendsandfoes.common.events.lifecycle.*;
 import com.faboslav.friendsandfoes.common.init.FriendsAndFoesEntityTypes;
 import com.faboslav.friendsandfoes.common.init.FriendsAndFoesStructurePoolElements;
-import com.faboslav.friendsandfoes.common.init.registry.neoforge.ResourcefulRegistriesImpl;
 import com.faboslav.friendsandfoes.common.util.CustomRaidMember;
 import com.faboslav.friendsandfoes.common.util.ServerWorldSpawnersUtil;
 import com.faboslav.friendsandfoes.common.util.UpdateChecker;
 import com.faboslav.friendsandfoes.common.world.spawner.IceologerSpawner;
 import com.faboslav.friendsandfoes.common.world.spawner.IllusionerSpawner;
 import com.faboslav.friendsandfoes.neoforge.init.FriendsAndFoesBiomeModifiers;
 import com.faboslav.friendsandfoes.neoforge.mixin.FireBlockAccessor;
-import net.minecraft.block.BlockSetType;
 import net.minecraft.block.Blocks;
+import net.minecraft.client.render.RenderLayers;
 import net.minecraft.entity.EntityType;
 import net.minecraft.entity.mob.MobEntity;
 import net.minecraft.registry.Registries;
 import net.minecraft.server.world.ServerWorld;
 import net.minecraft.village.raid.Raid;
 import net.minecraft.world.dimension.DimensionTypes;
 import net.neoforged.api.distmarker.Dist;
-import net.neoforged.bus.api.EventPriority;
 import net.neoforged.bus.api.IEventBus;
 import net.neoforged.fml.common.Mod;
 import net.neoforged.fml.event.lifecycle.FMLCommonSetupEvent;
@@ -86,6 +85,7 @@ private static void onSetup(final FMLCommonSetupEvent event) {
 				);
 			}
 
+			RegisterRenderLayersEvent.EVENT.invoke(new RegisterRenderLayersEvent(RenderLayers::setRenderLayer, RenderLayers::setRenderLayer));
 			RegisterFlammabilityEvent.EVENT.invoke(new RegisterFlammabilityEvent((item, igniteOdds, burnOdds) ->
 				((FireBlockAccessor) Blocks.FIRE).invokeRegisterFlammableBlock(item, igniteOdds, burnOdds)));
 		});