From ec9c3f67ff54ed38259d34f5104fd8e09a07941d Mon Sep 17 00:00:00 2001 From: DianeXD <64360468+DianeXD@users.noreply.github.com> Date: Mon, 15 Aug 2022 18:04:18 +0800 Subject: [PATCH] Move dim blacklist config to AlchemicalWizardry.java (#29) --- .../java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java | 1 + .../WayofTime/alchemicalWizardry/BloodMagicConfiguration.java | 2 +- .../common/rituals/RitualEffectDemonPortal.java | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java b/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java index 8dd8d8d0..89444234 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java +++ b/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java @@ -404,6 +404,7 @@ public class AlchemicalWizardry public static String entityMinorDemonGruntGuardianEarthID = "AW024"; public static boolean isDemonRitualCreativeOnly = false; + public static int[] demonRitualDimensionBlacklist = new int[]{0}; public static Fluid lifeEssenceFluid; diff --git a/src/main/java/WayofTime/alchemicalWizardry/BloodMagicConfiguration.java b/src/main/java/WayofTime/alchemicalWizardry/BloodMagicConfiguration.java index f148f5f5..558270ec 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/BloodMagicConfiguration.java +++ b/src/main/java/WayofTime/alchemicalWizardry/BloodMagicConfiguration.java @@ -203,7 +203,7 @@ public class BloodMagicConfiguration TEDemonPortal.demonLimit = config.get(tempDemonConfigs, "demonHoardLimit", 100).getInt(); AlchemicalWizardry.isDemonRitualCreativeOnly = config.get(tempDemonConfigs, "IsDemonRitualCreativeOnly", false).getBoolean(); - RitualEffectDemonPortal.dimensionBlacklist = config.get(tempDemonConfigs, "dimension blacklist for the demon portal activation", new int[]{0}).getIntList(); + AlchemicalWizardry.demonRitualDimensionBlacklist = config.get(tempDemonConfigs, "dimension blacklist for the demon portal activation", new int[]{0}).getIntList(); BoundArmour.tryComplexRendering = config.get("WimpySettings", "UseFancyBoundArmour", true).getBoolean(true); // ItemIncense.itemDuration = config.get("TestIncenseSettings", "ItemDuration", 100).getInt(); diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectDemonPortal.java b/src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectDemonPortal.java index e44f7f2a..41d3dd36 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectDemonPortal.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectDemonPortal.java @@ -30,7 +30,7 @@ public class RitualEffectDemonPortal extends RitualEffect public static final int drainRate = 50; public static final Reagent[] reagents = new Reagent[]{ReagentRegistry.aetherReagent, ReagentRegistry.aquasalusReagent, ReagentRegistry.terraeReagent, ReagentRegistry.incendiumReagent, ReagentRegistry.sanctusReagent, ReagentRegistry.tenebraeReagent, ReagentRegistry.magicalesReagent, ReagentRegistry.potentiaReagent}; public static final Int3[] jarLocations = new Int3[]{new Int3(4, 5, 4), new Int3(-4, 5, 4), new Int3(4, 5, -4), new Int3(-4, 5, -4), new Int3(0, 5, 6), new Int3(0, 5, -6), new Int3(6, 5, 0), new Int3(-6, 5, 0)}; - public static int[] dimensionBlacklist = new int[]{0}; + @Override public void performEffect(IMasterRitualStone ritualStone) { @@ -123,7 +123,7 @@ public class RitualEffectDemonPortal extends RitualEffect @Override public boolean startRitual(IMasterRitualStone ritualStone, EntityPlayer player) { - for (int dim: dimensionBlacklist){ + for (int dim : AlchemicalWizardry.demonRitualDimensionBlacklist) { if (player.dimension == dim) return false; }