Move dim blacklist config to AlchemicalWizardry.java

GTNewHorizons · Aug 12, 2022 · 5b1be24 · 5b1be24
1 parent 04baecf
commit 5b1be24
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java b/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java
@@ -404,6 +404,7 @@ public Item getTabIconItem()
 	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
@@ -203,7 +203,7 @@ public static void syncConfig()
 		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
@@ -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 void createRandomLightning(World world, int x, int y, int z)
     @Override
     public boolean startRitual(IMasterRitualStone ritualStone, EntityPlayer player)
     {
-        for (int dim: dimensionBlacklist){
+        for (int dim : AlchemicalWizardry.demonRitualDimensionBlacklist) {
             if (player.dimension == dim) return false;
         }