Move dim blacklist config to AlchemicalWizardry.java (#29)

This commit is contained in:
DianeXD authored and GitHub committed 2022-08-15 12:04:18 +02:00
1 parent 04baecf5ef
commit ec9c3f67ff
3 files changed
+4 -3

No files matched your search

@@ -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;
@@ -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();
@@ -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;
}