Merge branch '1.21.1'

* 1.21.1: fixed import Removed unused RegisterBlockSetTypeEvent
Faboslav · Sep 27, 2024 · def2999 · def2999
2 parents f1aa84c + 1787d46
commit def2999
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 69 deletions.
diff --git a/common/src/main/java/com/faboslav/friendsandfoes/common/FriendsAndFoes.java b/common/src/main/java/com/faboslav/friendsandfoes/common/FriendsAndFoes.java
@@ -4,7 +4,6 @@
 import com.faboslav.friendsandfoes.common.config.FriendsAndFoesConfig;
 import com.faboslav.friendsandfoes.common.config.omegaconfig.OmegaConfig;
 import com.faboslav.friendsandfoes.common.events.AddItemGroupEntriesEvent;
-import com.faboslav.friendsandfoes.common.events.block.RegisterBlockSetTypeEvent;
 import com.faboslav.friendsandfoes.common.events.entity.RegisterVillagerTradesEvent;
 import com.faboslav.friendsandfoes.common.events.item.RegisterBrewingRecipesEvent;
 import com.faboslav.friendsandfoes.common.events.lifecycle.*;
@@ -49,7 +48,6 @@ public static void init() {
 		RegisterReloadListenerEvent.EVENT.addListener(FriendsAndFoes::registerServerDataListeners);
 		SetupEvent.EVENT.addListener(FriendsAndFoes::setup);
 		DatapackSyncEvent.EVENT.addListener(MoobloomVariantsSyncPacket::sendToClient);
-		RegisterBlockSetTypeEvent.EVENT.addListener(FriendsAndFoesBlockSetTypes::registerBlockSetTypes);
 		RegisterFlammabilityEvent.EVENT.addListener(FriendsAndFoesBlocks::registerFlammablity);
 		RegisterEntityAttributesEvent.EVENT.addListener(FriendsAndFoesEntityTypes::registerEntityAttributes);
 		RegisterEntitySpawnRestrictionsEvent.EVENT.addListener(FriendsAndFoesEntityTypes::registerEntitySpawnRestrictions);

diff --git a/common/src/main/java/com/faboslav/friendsandfoes/common/block/CopperButtonBlock.java b/common/src/main/java/com/faboslav/friendsandfoes/common/block/CopperButtonBlock.java
@@ -1,6 +1,6 @@
 package com.faboslav.friendsandfoes.common.block;
 
-import com.faboslav.friendsandfoes.common.init.FriendsAndFoesBlockSetTypes;
+import net.minecraft.block.BlockSetType;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.ButtonBlock;
 import net.minecraft.entity.player.PlayerEntity;
@@ -18,7 +18,7 @@
 public class CopperButtonBlock extends ButtonBlock
 {
 	public CopperButtonBlock(Settings settings, int pressTicks) {
-		super(FriendsAndFoesBlockSetTypes.COPPER, pressTicks, settings);
+		super(BlockSetType.COPPER, pressTicks, settings);
 	}
 
 	@Override

diff --git a/.../main/java/com/faboslav/friendsandfoes/common/events/block/RegisterBlockSetTypeEvent.java b/.../main/java/com/faboslav/friendsandfoes/common/events/block/RegisterBlockSetTypeEvent.java
diff --git a/...on/src/main/java/com/faboslav/friendsandfoes/common/init/FriendsAndFoesBlockSetTypes.java b/...on/src/main/java/com/faboslav/friendsandfoes/common/init/FriendsAndFoesBlockSetTypes.java
diff --git a/fabric/src/main/java/com/faboslav/friendsandfoes/fabric/FriendsAndFoesFabric.java b/fabric/src/main/java/com/faboslav/friendsandfoes/fabric/FriendsAndFoesFabric.java
@@ -2,7 +2,6 @@
 
 import com.faboslav.friendsandfoes.common.FriendsAndFoes;
 import com.faboslav.friendsandfoes.common.events.AddItemGroupEntriesEvent;
-import com.faboslav.friendsandfoes.common.events.block.RegisterBlockSetTypeEvent;
 import com.faboslav.friendsandfoes.common.events.entity.RegisterVillagerTradesEvent;
 import com.faboslav.friendsandfoes.common.events.item.RegisterBrewingRecipesEvent;
 import com.faboslav.friendsandfoes.common.events.lifecycle.*;
@@ -68,7 +67,6 @@ private static void initEvents() {
 			ServerWorldSpawnersUtil.register(world, new IllusionerSpawner());
 		}));
 
-		RegisterBlockSetTypeEvent.EVENT.invoke(new RegisterBlockSetTypeEvent(BlockSetType::register));
 		RegisterBrewingRecipesEvent.EVENT.invoke(new RegisterBrewingRecipesEvent((input, item, output) ->
 			FabricBrewingRecipeRegistryBuilder.BUILD.register(builder -> builder.registerPotionRecipe(input, item, output))));
 

diff --git a/neoforge/src/main/java/com/faboslav/friendsandfoes/neoforge/FriendsAndFoesNeoForge.java b/neoforge/src/main/java/com/faboslav/friendsandfoes/neoforge/FriendsAndFoesNeoForge.java
@@ -2,7 +2,6 @@
 
 import com.faboslav.friendsandfoes.common.FriendsAndFoes;
 import com.faboslav.friendsandfoes.common.events.AddItemGroupEntriesEvent;
-import com.faboslav.friendsandfoes.common.events.block.RegisterBlockSetTypeEvent;
 import com.faboslav.friendsandfoes.common.events.entity.RegisterVillagerTradesEvent;
 import com.faboslav.friendsandfoes.common.events.lifecycle.*;
 import com.faboslav.friendsandfoes.common.init.FriendsAndFoesStructurePoolElements;
@@ -13,7 +12,6 @@
 import com.faboslav.friendsandfoes.neoforge.init.FriendsAndFoesBiomeModifiers;
 import com.faboslav.friendsandfoes.neoforge.mixin.FireBlockAccessor;
 import com.faboslav.friendsandfoes.neoforge.network.NeoForgeNetworking;
-import net.minecraft.block.BlockSetType;
 import net.minecraft.block.Blocks;
 import net.minecraft.entity.EntityType;
 import net.minecraft.entity.mob.MobEntity;
@@ -72,7 +70,6 @@ private static void onSetup(final FMLCommonSetupEvent event) {
 		event.enqueueWork(() -> {
 			FriendsAndFoes.lateInit();
 
-			RegisterBlockSetTypeEvent.EVENT.invoke(new RegisterBlockSetTypeEvent(BlockSetType::register));
 			RegisterFlammabilityEvent.EVENT.invoke(new RegisterFlammabilityEvent((item, igniteOdds, burnOdds) ->
 				((FireBlockAccessor) Blocks.FIRE).invokeRegisterFlammableBlock(item, igniteOdds, burnOdds)));
 		});