From 52252107a0b9b7a54372ed1561784cc2b3681eb4 Mon Sep 17 00:00:00 2001
From: Tschipp <11649893+Tschipp@users.noreply.github.com>
Date: Mon, 26 Feb 2024 23:25:16 +0100
Subject: [PATCH] Fixed tags not loading, updated configs

---
 .../java/tschipp/carryon/common/config/CarryConfig.java  | 2 +-
 .../main/java/tschipp/carryon/events/CommonEvents.java   | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/Common/src/main/java/tschipp/carryon/common/config/CarryConfig.java b/Common/src/main/java/tschipp/carryon/common/config/CarryConfig.java
index 78548c1..474a9c6 100644
--- a/Common/src/main/java/tschipp/carryon/common/config/CarryConfig.java
+++ b/Common/src/main/java/tschipp/carryon/common/config/CarryConfig.java
@@ -242,7 +242,7 @@ public class CarryConfig
 					"mekanismgenerators:wind_generator", "cookingforblockheads:cabinet", "cookingforblockheads:corner", "cookingforblockheads:counter",
 					"cookingforblockheads:oven", "cookingforblockheads:toaster", "cookingforblockheads:milk_jar", "cookingforblockheads:cow_jar",
 					"cookingforblockheads:fruit_basket", "cookingforblockheads:cooking_table", "cookingforblockheads:fridge", "cookingforblockheads:sink",
-					"powah:*", "advancementtrophies:trophy", "mekanismgenerators:heat_generator", "mna:filler_block"
+					"powah:*", "advancementtrophies:trophy", "mekanismgenerators:heat_generator", "mna:filler_block", "create_enchantment_industry:*", "graveyard:*", "immersivepetroleum:*", "tardis:interior_door"
 			};
 
 			@Property(
diff --git a/Forge/src/main/java/tschipp/carryon/events/CommonEvents.java b/Forge/src/main/java/tschipp/carryon/events/CommonEvents.java
index de6c2d9..6db6e64 100644
--- a/Forge/src/main/java/tschipp/carryon/events/CommonEvents.java
+++ b/Forge/src/main/java/tschipp/carryon/events/CommonEvents.java
@@ -14,6 +14,7 @@ import net.minecraftforge.common.util.BlockSnapshot;
 import net.minecraftforge.event.AddReloadListenerEvent;
 import net.minecraftforge.event.OnDatapackSyncEvent;
 import net.minecraftforge.event.RegisterCommandsEvent;
+import net.minecraftforge.event.TagsUpdatedEvent;
 import net.minecraftforge.event.TickEvent.Phase;
 import net.minecraftforge.event.TickEvent.ServerTickEvent;
 import net.minecraftforge.event.entity.living.LivingAttackEvent;
@@ -38,6 +39,7 @@ import tschipp.carryon.common.carry.CarryOnDataManager;
 import tschipp.carryon.common.carry.PickupHandler;
 import tschipp.carryon.common.carry.PlacementHandler;
 import tschipp.carryon.common.scripting.ScriptReloadListener;
+import tschipp.carryon.config.ConfigLoader;
 
 @Mod.EventBusSubscriber(bus = Mod.EventBusSubscriber.Bus.FORGE, modid = Constants.MOD_ID)
 public class CommonEvents
@@ -115,7 +117,6 @@ public class CommonEvents
 				MinecraftForge.EVENT_BUS.post(pickupEvent);
 				return !pickupEvent.isCanceled();
 			})) {
-				event.setResult(Result.DENY);
 				event.setCancellationResult(InteractionResult.SUCCESS);
 				event.setCanceled(true);
 				return;
@@ -148,6 +149,12 @@ public class CommonEvents
 			ScriptReloadListener.syncScriptsWithClient(player);
 	}
 
+	@SubscribeEvent
+	public static void onTagsUpdate(TagsUpdatedEvent event)
+	{
+		ConfigLoader.onConfigLoaded();
+	}
+
 	@SubscribeEvent
 	public static void onServerTick(ServerTickEvent event)
 	{