From d4f6e1e859d178ed822cc7ee8ec3f6d8c71a2ca8 Mon Sep 17 00:00:00 2001 From: Hubry Date: Mon, 13 Jul 2020 15:33:48 +0200 Subject: [PATCH] Fix criteria triggers and advanced loot tables on servers --- .../java/vazkii/botania/common/Botania.java | 13 +++------- .../advancements/ModCriteriaTriggers.java | 24 +++++++++++++++++++ 2 files changed, 27 insertions(+), 10 deletions(-) create mode 100644 src/main/java/vazkii/botania/common/advancements/ModCriteriaTriggers.java diff --git a/src/main/java/vazkii/botania/common/Botania.java b/src/main/java/vazkii/botania/common/Botania.java index ec0295f41..b0dae579a 100644 --- a/src/main/java/vazkii/botania/common/Botania.java +++ b/src/main/java/vazkii/botania/common/Botania.java @@ -187,6 +187,9 @@ public class Botania { forgeBus.addListener(ManaNetworkHandler.instance::onNetworkEvent); forgeBus.addListener(EventPriority.HIGHEST, TileCorporeaIndex.getInputHandler()::onChatMessage); forgeBus.addListener(LootHandler::lootLoad); + + ModLootModifiers.init(); + ModCriteriaTriggers.init(); } private void commonSetup(FMLCommonSetupEvent event) { @@ -222,7 +225,6 @@ public class Botania { .func_233813_a_()); ModBanners.init(); ColorHelper.init(); - ModLootModifiers.init(); PatchouliAPI.instance.registerMultiblock(Registry.BLOCK.getKey(ModBlocks.alfPortal), TileAlfPortal.MULTIBLOCK.getValue()); PatchouliAPI.instance.registerMultiblock(Registry.BLOCK.getKey(ModBlocks.terraPlate), TileTerraPlate.MULTIBLOCK.getValue()); @@ -274,15 +276,6 @@ public class Botania { ); PatchouliAPI.instance.registerMultiblock(new ResourceLocation(LibMisc.MOD_ID, "gaia_ritual"), mb); - CriteriaTriggers.register(AlfPortalTrigger.INSTANCE); - CriteriaTriggers.register(CorporeaRequestTrigger.INSTANCE); - CriteriaTriggers.register(DopplegangerNoArmorTrigger.INSTANCE); - CriteriaTriggers.register(RelicBindTrigger.INSTANCE); - CriteriaTriggers.register(UseItemSuccessTrigger.INSTANCE); - CriteriaTriggers.register(ManaGunTrigger.INSTANCE); - CriteriaTriggers.register(LokiPlaceTrigger.INSTANCE); - CriteriaTriggers.register(AlfPortalBreadTrigger.INSTANCE); - ModBlocks.addDispenserBehaviours(); ModFeatures.addWorldgen(); diff --git a/src/main/java/vazkii/botania/common/advancements/ModCriteriaTriggers.java b/src/main/java/vazkii/botania/common/advancements/ModCriteriaTriggers.java new file mode 100644 index 000000000..bc9f1b8c1 --- /dev/null +++ b/src/main/java/vazkii/botania/common/advancements/ModCriteriaTriggers.java @@ -0,0 +1,24 @@ +/* + * This class is distributed as part of the Botania Mod. + * Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + */ +package vazkii.botania.common.advancements; + +import net.minecraft.advancements.CriteriaTriggers; + +public class ModCriteriaTriggers { + public static void init() { + CriteriaTriggers.register(AlfPortalTrigger.INSTANCE); + CriteriaTriggers.register(CorporeaRequestTrigger.INSTANCE); + CriteriaTriggers.register(DopplegangerNoArmorTrigger.INSTANCE); + CriteriaTriggers.register(RelicBindTrigger.INSTANCE); + CriteriaTriggers.register(UseItemSuccessTrigger.INSTANCE); + CriteriaTriggers.register(ManaGunTrigger.INSTANCE); + CriteriaTriggers.register(LokiPlaceTrigger.INSTANCE); + CriteriaTriggers.register(AlfPortalBreadTrigger.INSTANCE); + } +}