Skip to content

Commit 5fb5de9

Browse files
committed
Temporarily mark ResourceKeys as valid for component validation
1 parent db89c8d commit 5fb5de9

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

src/main/java/mekanism/common/Mekanism.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@
1212
import mekanism.api.MekanismIMC;
1313
import mekanism.api.providers.IItemProvider;
1414
import mekanism.common.advancements.MekanismCriteriaTriggers;
15-
import mekanism.common.base.holiday.HolidayManager;
1615
import mekanism.common.base.IModModule;
1716
import mekanism.common.base.KeySync;
1817
import mekanism.common.base.MekFakePlayer;
1918
import mekanism.common.base.MekanismPermissions;
2019
import mekanism.common.base.PlayerState;
2120
import mekanism.common.base.TagCache;
21+
import mekanism.common.base.holiday.HolidayManager;
2222
import mekanism.common.capabilities.Capabilities;
2323
import mekanism.common.command.CommandMek;
2424
import mekanism.common.command.builders.BuildCommand;
@@ -104,6 +104,7 @@
104104
import net.minecraft.core.GlobalPos;
105105
import net.minecraft.core.cauldron.CauldronInteraction;
106106
import net.minecraft.core.dispenser.DispenseItemBehavior;
107+
import net.minecraft.resources.ResourceKey;
107108
import net.minecraft.resources.ResourceLocation;
108109
import net.minecraft.server.level.ServerLevel;
109110
import net.minecraft.world.item.Item;
@@ -118,6 +119,7 @@
118119
import net.neoforged.fml.event.lifecycle.FMLCommonSetupEvent;
119120
import net.neoforged.fml.event.lifecycle.InterModEnqueueEvent;
120121
import net.neoforged.fml.event.lifecycle.InterModProcessEvent;
122+
import net.neoforged.neoforge.common.CommonHooks;
121123
import net.neoforged.neoforge.common.NeoForge;
122124
import net.neoforged.neoforge.common.NeoForgeMod;
123125
import net.neoforged.neoforge.common.world.chunk.RegisterTicketControllersEvent;
@@ -242,6 +244,9 @@ public Mekanism(ModContainer modContainer, IEventBus modEventBus) {
242244
packetHandler = new PacketHandler(modEventBus, versionNumber);
243245
//Super early hooks, only reliable thing is for checking dependencies that we declare we are after
244246
hooks.hookConstructor(modEventBus);
247+
248+
//TODO - 1.20.5: Remove this after bumping to https://github.com/neoforged/NeoForge/pull/878
249+
CommonHooks.markComponentClassAsValid(ResourceKey.class);
245250
}
246251

247252
public static synchronized void addModule(IModModule modModule) {

0 commit comments

Comments
 (0)