From 4638f1b239ca71ba6aba5686b798384c8c4f7a47 Mon Sep 17 00:00:00 2001
From: TehNut <tehnut@tehnut.com>
Date: Mon, 3 Nov 2014 16:11:10 -0800
Subject: [PATCH 1/2] Switch to real logger, create ConfigGui, remove random
debug thing
-Uses an actual logger instead of System.out.println.
-ConfigGui for ingame editing of configs.
-Some random leftover debug was being sent to console at startup. This
removes that.
---
.../AlchemicalWizardry.java | 217 ++---
.../BloodMagicConfiguration.java | 208 ++---
.../client/gui/ConfigGui.java | 35 +
.../client/gui/ConfigGuiFactory.java | 30 +
.../common/AlchemicalWizardryEventHooks.java | 831 +++++++++---------
.../common/demonVillage/GridSpaceHolder.java | 11 +-
.../tileEntity/TEDemonPortal.java | 62 +-
.../common/items/sigil/ItemFluidSigil.java | 2 +-
.../impactEffects/tool/DigAreaTunnel.java | 7 +-
.../common/tileEntity/TESchematicSaver.java | 7 +-
10 files changed, 693 insertions(+), 717 deletions(-)
create mode 100644 src/main/java/WayofTime/alchemicalWizardry/client/gui/ConfigGui.java
create mode 100644 src/main/java/WayofTime/alchemicalWizardry/client/gui/ConfigGuiFactory.java
diff --git a/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java b/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java
index 5e82274e..6ba0281b 100644
--- a/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java
+++ b/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java
@@ -1,14 +1,53 @@
package WayofTime.alchemicalWizardry;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.InputStream;
-import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
-import java.util.List;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipInputStream;
-
+import WayofTime.alchemicalWizardry.api.alchemy.AlchemicalPotionCreationHandler;
+import WayofTime.alchemicalWizardry.api.alchemy.AlchemyRecipeRegistry;
+import WayofTime.alchemicalWizardry.api.alchemy.energy.ReagentRegistry;
+import WayofTime.alchemicalWizardry.api.alchemy.energy.ReagentStack;
+import WayofTime.alchemicalWizardry.api.altarRecipeRegistry.AltarRecipeRegistry;
+import WayofTime.alchemicalWizardry.api.bindingRegistry.BindingRegistry;
+import WayofTime.alchemicalWizardry.api.harvest.HarvestRegistry;
+import WayofTime.alchemicalWizardry.api.items.ShapedBloodOrbRecipe;
+import WayofTime.alchemicalWizardry.api.items.ShapelessBloodOrbRecipe;
+import WayofTime.alchemicalWizardry.api.rituals.Rituals;
+import WayofTime.alchemicalWizardry.api.summoningRegistry.SummoningRegistry;
+import WayofTime.alchemicalWizardry.common.*;
+import WayofTime.alchemicalWizardry.common.alchemy.CombinedPotionRegistry;
+import WayofTime.alchemicalWizardry.common.block.ArmourForge;
+import WayofTime.alchemicalWizardry.common.bloodAltarUpgrade.UpgradedAltars;
+import WayofTime.alchemicalWizardry.common.book.BUEntries;
+import WayofTime.alchemicalWizardry.common.demonVillage.demonHoard.DemonPacketAngel;
+import WayofTime.alchemicalWizardry.common.demonVillage.demonHoard.DemonPacketRegistry;
+import WayofTime.alchemicalWizardry.common.demonVillage.tileEntity.TEDemonPortal;
+import WayofTime.alchemicalWizardry.common.entity.mob.*;
+import WayofTime.alchemicalWizardry.common.harvest.BloodMagicHarvestHandler;
+import WayofTime.alchemicalWizardry.common.harvest.CactusReedHarvestHandler;
+import WayofTime.alchemicalWizardry.common.harvest.GourdHarvestHandler;
+import WayofTime.alchemicalWizardry.common.harvest.PamHarvestCompatRegistry;
+import WayofTime.alchemicalWizardry.common.items.ItemRitualDiviner;
+import WayofTime.alchemicalWizardry.common.items.sigil.SigilOfHolding;
+import WayofTime.alchemicalWizardry.common.items.thaumcraft.ItemSanguineArmour;
+import WayofTime.alchemicalWizardry.common.potion.*;
+import WayofTime.alchemicalWizardry.common.renderer.AlchemyCircleRenderer;
+import WayofTime.alchemicalWizardry.common.rituals.*;
+import WayofTime.alchemicalWizardry.common.spell.simple.*;
+import WayofTime.alchemicalWizardry.common.summoning.SummoningHelperAW;
+import WayofTime.alchemicalWizardry.common.summoning.meteor.MeteorRegistry;
+import WayofTime.alchemicalWizardry.common.tileEntity.*;
+import WayofTime.alchemicalWizardry.common.tileEntity.gui.GuiHandler;
+import WayofTime.alchemicalWizardry.common.tweaker.MineTweakerIntegration;
+import cpw.mods.fml.common.FMLCommonHandler;
+import cpw.mods.fml.common.Loader;
+import cpw.mods.fml.common.Mod;
+import cpw.mods.fml.common.Mod.EventHandler;
+import cpw.mods.fml.common.Mod.Instance;
+import cpw.mods.fml.common.SidedProxy;
+import cpw.mods.fml.common.event.FMLInitializationEvent;
+import cpw.mods.fml.common.event.FMLPostInitializationEvent;
+import cpw.mods.fml.common.event.FMLPreInitializationEvent;
+import cpw.mods.fml.common.network.NetworkRegistry;
+import cpw.mods.fml.common.registry.EntityRegistry;
+import cpw.mods.fml.common.registry.GameRegistry;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
@@ -28,150 +67,23 @@ import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.oredict.OreDictionary;
import net.minecraftforge.oredict.RecipeSorter;
import net.minecraftforge.oredict.RecipeSorter.Category;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import thaumcraft.api.ItemApi;
import thaumcraft.api.ThaumcraftApi;
import thaumcraft.api.aspects.Aspect;
import thaumcraft.api.aspects.AspectList;
-import WayofTime.alchemicalWizardry.api.alchemy.AlchemicalPotionCreationHandler;
-import WayofTime.alchemicalWizardry.api.alchemy.AlchemyRecipeRegistry;
-import WayofTime.alchemicalWizardry.api.alchemy.energy.ReagentRegistry;
-import WayofTime.alchemicalWizardry.api.alchemy.energy.ReagentStack;
-import WayofTime.alchemicalWizardry.api.altarRecipeRegistry.AltarRecipeRegistry;
-import WayofTime.alchemicalWizardry.api.bindingRegistry.BindingRegistry;
-import WayofTime.alchemicalWizardry.api.harvest.HarvestRegistry;
-import WayofTime.alchemicalWizardry.api.items.ShapedBloodOrbRecipe;
-import WayofTime.alchemicalWizardry.api.items.ShapelessBloodOrbRecipe;
-import WayofTime.alchemicalWizardry.api.rituals.Rituals;
-import WayofTime.alchemicalWizardry.api.summoningRegistry.SummoningRegistry;
-import WayofTime.alchemicalWizardry.common.AlchemicalWizardryEventHooks;
-import WayofTime.alchemicalWizardry.common.AlchemicalWizardryFuelHandler;
-import WayofTime.alchemicalWizardry.common.CommonProxy;
-import WayofTime.alchemicalWizardry.common.EntityAirElemental;
-import WayofTime.alchemicalWizardry.common.LifeBucketHandler;
-import WayofTime.alchemicalWizardry.common.LifeEssence;
-import WayofTime.alchemicalWizardry.common.ModLivingDropsEvent;
-import WayofTime.alchemicalWizardry.common.NewPacketHandler;
-import WayofTime.alchemicalWizardry.common.alchemy.CombinedPotionRegistry;
-import WayofTime.alchemicalWizardry.common.block.ArmourForge;
-import WayofTime.alchemicalWizardry.common.bloodAltarUpgrade.UpgradedAltars;
-import WayofTime.alchemicalWizardry.common.book.BUEntries;
-import WayofTime.alchemicalWizardry.common.demonVillage.demonHoard.DemonPacketAngel;
-import WayofTime.alchemicalWizardry.common.demonVillage.demonHoard.DemonPacketRegistry;
-import WayofTime.alchemicalWizardry.common.demonVillage.tileEntity.TEDemonPortal;
-import WayofTime.alchemicalWizardry.common.entity.mob.EntityBileDemon;
-import WayofTime.alchemicalWizardry.common.entity.mob.EntityBoulderFist;
-import WayofTime.alchemicalWizardry.common.entity.mob.EntityEarthElemental;
-import WayofTime.alchemicalWizardry.common.entity.mob.EntityFallenAngel;
-import WayofTime.alchemicalWizardry.common.entity.mob.EntityFireElemental;
-import WayofTime.alchemicalWizardry.common.entity.mob.EntityHolyElemental;
-import WayofTime.alchemicalWizardry.common.entity.mob.EntityIceDemon;
-import WayofTime.alchemicalWizardry.common.entity.mob.EntityLowerGuardian;
-import WayofTime.alchemicalWizardry.common.entity.mob.EntityShade;
-import WayofTime.alchemicalWizardry.common.entity.mob.EntityShadeElemental;
-import WayofTime.alchemicalWizardry.common.entity.mob.EntitySmallEarthGolem;
-import WayofTime.alchemicalWizardry.common.entity.mob.EntityWaterElemental;
-import WayofTime.alchemicalWizardry.common.entity.mob.EntityWingedFireDemon;
-import WayofTime.alchemicalWizardry.common.harvest.BloodMagicHarvestHandler;
-import WayofTime.alchemicalWizardry.common.harvest.CactusReedHarvestHandler;
-import WayofTime.alchemicalWizardry.common.harvest.GourdHarvestHandler;
-import WayofTime.alchemicalWizardry.common.harvest.PamHarvestCompatRegistry;
-import WayofTime.alchemicalWizardry.common.items.ItemRitualDiviner;
-import WayofTime.alchemicalWizardry.common.items.sigil.SigilOfHolding;
-import WayofTime.alchemicalWizardry.common.items.thaumcraft.ItemSanguineArmour;
-import WayofTime.alchemicalWizardry.common.potion.PotionBoost;
-import WayofTime.alchemicalWizardry.common.potion.PotionDeaf;
-import WayofTime.alchemicalWizardry.common.potion.PotionDrowning;
-import WayofTime.alchemicalWizardry.common.potion.PotionFeatherFall;
-import WayofTime.alchemicalWizardry.common.potion.PotionFireFuse;
-import WayofTime.alchemicalWizardry.common.potion.PotionFlameCloak;
-import WayofTime.alchemicalWizardry.common.potion.PotionFlight;
-import WayofTime.alchemicalWizardry.common.potion.PotionHeavyHeart;
-import WayofTime.alchemicalWizardry.common.potion.PotionIceCloak;
-import WayofTime.alchemicalWizardry.common.potion.PotionInhibit;
-import WayofTime.alchemicalWizardry.common.potion.PotionPlanarBinding;
-import WayofTime.alchemicalWizardry.common.potion.PotionProjectileProtect;
-import WayofTime.alchemicalWizardry.common.potion.PotionReciprocation;
-import WayofTime.alchemicalWizardry.common.potion.PotionSoulFray;
-import WayofTime.alchemicalWizardry.common.potion.PotionSoulHarden;
-import WayofTime.alchemicalWizardry.common.renderer.AlchemyCircleRenderer;
-import WayofTime.alchemicalWizardry.common.rituals.RitualEffectAnimalGrowth;
-import WayofTime.alchemicalWizardry.common.rituals.RitualEffectAutoAlchemy;
-import WayofTime.alchemicalWizardry.common.rituals.RitualEffectBiomeChanger;
-import WayofTime.alchemicalWizardry.common.rituals.RitualEffectContainment;
-import WayofTime.alchemicalWizardry.common.rituals.RitualEffectCrushing;
-import WayofTime.alchemicalWizardry.common.rituals.RitualEffectEllipsoid;
-import WayofTime.alchemicalWizardry.common.rituals.RitualEffectEvaporation;
-import WayofTime.alchemicalWizardry.common.rituals.RitualEffectExpulsion;
-import WayofTime.alchemicalWizardry.common.rituals.RitualEffectFeatheredEarth;
-import WayofTime.alchemicalWizardry.common.rituals.RitualEffectFeatheredKnife;
-import WayofTime.alchemicalWizardry.common.rituals.RitualEffectFlight;
-import WayofTime.alchemicalWizardry.common.rituals.RitualEffectFullStomach;
-import WayofTime.alchemicalWizardry.common.rituals.RitualEffectGrowth;
-import WayofTime.alchemicalWizardry.common.rituals.RitualEffectHarvest;
-import WayofTime.alchemicalWizardry.common.rituals.RitualEffectHealing;
-import WayofTime.alchemicalWizardry.common.rituals.RitualEffectInterdiction;
-import WayofTime.alchemicalWizardry.common.rituals.RitualEffectItemSuction;
-import WayofTime.alchemicalWizardry.common.rituals.RitualEffectJumping;
-import WayofTime.alchemicalWizardry.common.rituals.RitualEffectLava;
-import WayofTime.alchemicalWizardry.common.rituals.RitualEffectLeap;
-import WayofTime.alchemicalWizardry.common.rituals.RitualEffectLifeConduit;
-import WayofTime.alchemicalWizardry.common.rituals.RitualEffectMagnetic;
-import WayofTime.alchemicalWizardry.common.rituals.RitualEffectSoulBound;
-import WayofTime.alchemicalWizardry.common.rituals.RitualEffectSpawnWard;
-import WayofTime.alchemicalWizardry.common.rituals.RitualEffectSummonMeteor;
-import WayofTime.alchemicalWizardry.common.rituals.RitualEffectSupression;
-import WayofTime.alchemicalWizardry.common.rituals.RitualEffectUnbinding;
-import WayofTime.alchemicalWizardry.common.rituals.RitualEffectVeilOfEvil;
-import WayofTime.alchemicalWizardry.common.rituals.RitualEffectWater;
-import WayofTime.alchemicalWizardry.common.rituals.RitualEffectWellOfSuffering;
-import WayofTime.alchemicalWizardry.common.spell.simple.HomSpellRegistry;
-import WayofTime.alchemicalWizardry.common.spell.simple.SpellEarthBender;
-import WayofTime.alchemicalWizardry.common.spell.simple.SpellExplosions;
-import WayofTime.alchemicalWizardry.common.spell.simple.SpellFireBurst;
-import WayofTime.alchemicalWizardry.common.spell.simple.SpellFrozenWater;
-import WayofTime.alchemicalWizardry.common.spell.simple.SpellHolyBlast;
-import WayofTime.alchemicalWizardry.common.spell.simple.SpellLightningBolt;
-import WayofTime.alchemicalWizardry.common.spell.simple.SpellTeleport;
-import WayofTime.alchemicalWizardry.common.spell.simple.SpellWateryGrave;
-import WayofTime.alchemicalWizardry.common.spell.simple.SpellWindGust;
-import WayofTime.alchemicalWizardry.common.summoning.SummoningHelperAW;
-import WayofTime.alchemicalWizardry.common.summoning.meteor.MeteorRegistry;
-import WayofTime.alchemicalWizardry.common.tileEntity.TEAlchemicCalcinator;
-import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar;
-import WayofTime.alchemicalWizardry.common.tileEntity.TEBellJar;
-import WayofTime.alchemicalWizardry.common.tileEntity.TEConduit;
-import WayofTime.alchemicalWizardry.common.tileEntity.TEHomHeart;
-import WayofTime.alchemicalWizardry.common.tileEntity.TEMasterStone;
-import WayofTime.alchemicalWizardry.common.tileEntity.TEOrientable;
-import WayofTime.alchemicalWizardry.common.tileEntity.TEPedestal;
-import WayofTime.alchemicalWizardry.common.tileEntity.TEPlinth;
-import WayofTime.alchemicalWizardry.common.tileEntity.TEReagentConduit;
-import WayofTime.alchemicalWizardry.common.tileEntity.TESchematicSaver;
-import WayofTime.alchemicalWizardry.common.tileEntity.TESocket;
-import WayofTime.alchemicalWizardry.common.tileEntity.TESpectralBlock;
-import WayofTime.alchemicalWizardry.common.tileEntity.TESpectralContainer;
-import WayofTime.alchemicalWizardry.common.tileEntity.TESpellEffectBlock;
-import WayofTime.alchemicalWizardry.common.tileEntity.TESpellEnhancementBlock;
-import WayofTime.alchemicalWizardry.common.tileEntity.TESpellModifierBlock;
-import WayofTime.alchemicalWizardry.common.tileEntity.TESpellParadigmBlock;
-import WayofTime.alchemicalWizardry.common.tileEntity.TETeleposer;
-import WayofTime.alchemicalWizardry.common.tileEntity.TEWritingTable;
-import WayofTime.alchemicalWizardry.common.tileEntity.gui.GuiHandler;
-import WayofTime.alchemicalWizardry.common.tweaker.MineTweakerIntegration;
-import cpw.mods.fml.common.FMLCommonHandler;
-import cpw.mods.fml.common.Loader;
-import cpw.mods.fml.common.Mod;
-import cpw.mods.fml.common.Mod.EventHandler;
-import cpw.mods.fml.common.Mod.Instance;
-import cpw.mods.fml.common.SidedProxy;
-import cpw.mods.fml.common.event.FMLInitializationEvent;
-import cpw.mods.fml.common.event.FMLPostInitializationEvent;
-import cpw.mods.fml.common.event.FMLPreInitializationEvent;
-import cpw.mods.fml.common.network.NetworkRegistry;
-import cpw.mods.fml.common.registry.EntityRegistry;
-import cpw.mods.fml.common.registry.GameRegistry;
-@Mod(modid = "AWWayofTime", name = "AlchemicalWizardry", version = "v1.2.0b (Beta1)")
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.InputStream;
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+import java.util.List;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipInputStream;
+
+@Mod(modid = "AWWayofTime", name = "AlchemicalWizardry", version = "v1.2.0b (Beta1)", guiFactory = "WayofTime.alchemicalWizardry.client.gui.ConfigGuiFactory")
public class AlchemicalWizardry
{
@@ -230,6 +142,7 @@ public class AlchemicalWizardry
public static List<Class> wellBlacklist;
+ public static Logger logger = LogManager.getLogger("BloodMagic");
public static CreativeTabs tabBloodMagic = new CreativeTabs("tabBloodMagic")
{
@Override
@@ -294,10 +207,10 @@ public class AlchemicalWizardry
try
{
InputStream in = AlchemicalWizardry.class.getResourceAsStream("/assets/alchemicalwizardry/schematics/building/buildings.zip");
- System.out.println("none yet!");
+ logger.info("none yet!");
if (in != null)
{
- System.out.println("I have found a zip!");
+ logger.info("I have found a zip!");
ZipInputStream zipStream = new ZipInputStream(in);
ZipEntry entry = null;
@@ -948,12 +861,12 @@ public class AlchemicalWizardry
if (Loader.isModLoaded("harvestcraft"))
{
PamHarvestCompatRegistry.registerPamHandlers();
- System.out.println("Loaded Harvestcraft Handlers!");
+ AlchemicalWizardry.logger.info("Loaded Harvestcraft Handlers!");
}
if(Loader.isModLoaded("MineTweaker3")) {
MineTweakerIntegration.register();
- System.out.println("Loaded MineTweaker 3 Integration");
+ AlchemicalWizardry.logger.info("Loaded MineTweaker 3 Integration");
}
this.isBotaniaLoaded = Loader.isModLoaded("Botania");
diff --git a/src/main/java/WayofTime/alchemicalWizardry/BloodMagicConfiguration.java b/src/main/java/WayofTime/alchemicalWizardry/BloodMagicConfiguration.java
index 2f2ff607..ef4d1eb1 100644
--- a/src/main/java/WayofTime/alchemicalWizardry/BloodMagicConfiguration.java
+++ b/src/main/java/WayofTime/alchemicalWizardry/BloodMagicConfiguration.java
@@ -23,125 +23,127 @@ import java.util.Map.Entry;
*/
public class BloodMagicConfiguration
{
- private static final String DEFAULT_COLOR_LIST = "100,f; 80,7; 60,e; 40,6; 25,c; 10,4";
- public static final List<ColourThreshold> colorList = new ArrayList<ColourThreshold>();
+ private static final String DEFAULT_COLOR_LIST = "100,f; 80,7; 60,e; 40,6; 25,c; 10,4";
+ public static final List<ColourThreshold> colorList = new ArrayList<ColourThreshold>();
- public static Configuration config;
- public static final String CATEGORY_GAMEPLAY = "gameplay";
+ public static Configuration config;
+ public static final String CATEGORY_GAMEPLAY = "gameplay";
- public static void init(File configFile)
- {
- for (String s : DEFAULT_COLOR_LIST.split(";"))
- {
- String[] ct = s.split(",");
- colorList.add(new ColourThreshold(Integer.valueOf(ct[0].trim()), ct[1].trim()));
- }
+ public static void init(File configFile)
+ {
+ for (String s : DEFAULT_COLOR_LIST.split(";"))
+ {
+ String[] ct = s.split(",");
+ colorList.add(new ColourThreshold(Integer.valueOf(ct[0].trim()), ct[1].trim()));
+ }
- config = new Configuration(configFile);
+ config = new Configuration(configFile);
- try
- {
+ try
+ {
+ config.load();
+ syncConfig();
- config.load();
+ } catch (Exception e)
+ {
+ AlchemicalWizardry.logger.error("There has been a problem loading the configuration, go ask on the forums :p");
- AlchemicalWizardry.standardBindingAgentDungeonChance = config.get("Dungeon Loot Chances", "standardBindingAgent", 30).getInt();
- AlchemicalWizardry.mundanePowerCatalystDungeonChance = config.get("Dungeon Loot Chances", "mundanePowerCatalyst", 20).getInt();
- AlchemicalWizardry.averagePowerCatalystDungeonChance = config.get("Dungeon Loot Chances", "averagePowerCatalyst", 10).getInt();
- AlchemicalWizardry.greaterPowerCatalystDungeonChance = config.get("Dungeon Loot Chances", "greaterPowerCatalyst", 05).getInt();
- AlchemicalWizardry.mundaneLengtheningCatalystDungeonChance = config.get("Dungeon Loot Chances", "mundaneLengtheningCatalyst", 20).getInt();
- AlchemicalWizardry.averageLengtheningCatalystDungeonChance = config.get("Dungeon Loot Chances", "averageLengtheningCatalyst", 10).getInt();
- AlchemicalWizardry.greaterLengtheningCatalystDungeonChance = config.get("Dungeon Loot Chances", "greaterLengtheningCatalyst", 05).getInt();
- AlchemicalWizardry.customPotionDrowningID = config.get("Potion ID", "Drowning", 100).getInt();
- AlchemicalWizardry.customPotionBoostID = config.get("Potion ID", "Boost", 101).getInt();
- AlchemicalWizardry.customPotionProjProtID = config.get("Potion ID", "ProjProt", 102).getInt();
- AlchemicalWizardry.customPotionInhibitID = config.get("Potion ID", "Inhibit", 103).getInt();
- AlchemicalWizardry.customPotionFlightID = config.get("Potion ID", "Flight", 104).getInt();
- AlchemicalWizardry.customPotionReciprocationID = config.get("Potion ID", "Reciprocation", 105).getInt();
- AlchemicalWizardry.customPotionFlameCloakID = config.get("Potion ID", "FlameCloak", 106).getInt();
- AlchemicalWizardry.customPotionIceCloakID = config.get("Potion ID", "IceCloak", 107).getInt();
- AlchemicalWizardry.customPotionHeavyHeartID = config.get("Potion ID", "HeavyHeart", 108).getInt();
- AlchemicalWizardry.customPotionFireFuseID = config.get("Potion ID", "FireFuse", 109).getInt();
- AlchemicalWizardry.customPotionPlanarBindingID = config.get("Potion ID", "PlanarBinding", 110).getInt();
- AlchemicalWizardry.customPotionSoulFrayID = config.get("Potion ID", "SoulFray", 111).getInt();
- AlchemicalWizardry.customPotionSoulHardenID = config.get("Potion ID", "SoulHarden", 112).getInt();
- AlchemicalWizardry.customPotionDeafID = config.get("Potion ID", "Deaf", 113).getInt();
- AlchemicalWizardry.customPotionFeatherFallID = config.get("Potion ID", "FeatherFall", 114).getInt();
+ } finally
+ {
+ config.save();
+ }
+ }
- MeteorParadigm.maxChance = config.get("meteor", "maxChance", 1000).getInt();
- AlchemicalWizardry.doMeteorsDestroyBlocks = config.get("meteor", "doMeteorsDestroyBlocks", true).getBoolean(true);
- AlchemicalWizardry.diamondMeteorArray = config.get("meteor", "diamondMeteor", new String[]{"oreDiamond", "100", "oreEmerald", "75", "oreCinnabar", "200", "oreAmber", "200"}).getStringList();
- AlchemicalWizardry.diamondMeteorRadius = config.get("meteor", "diamondMeteorRadius", 5).getInt();
- AlchemicalWizardry.stoneMeteorArray = config.get("meteor", "stoneBlockMeteor", new String[]{"oreCoal", "150", "oreApatite", "50", "oreIron", "50"}).getStringList();
- AlchemicalWizardry.stoneMeteorRadius = config.get("meteor", "stoneMeteorRadius", 16).getInt();
- AlchemicalWizardry.ironBlockMeteorArray = config.get("meteor", "ironBlockMeteor", new String[]{"oreIron", "400", "oreGold", "30", "oreCopper", "200", "oreTin", "140", "oreSilver", "70", "oreLead", "80", "oreLapis", "60", "oreRedstone", "100"}).getStringList();
- AlchemicalWizardry.ironBlockMeteorRadius = config.get("meteor", "ironBlockMeteorRadius", 7).getInt();
- AlchemicalWizardry.netherStarMeteorArray = config.get("meteor", "netherStarMeteor", new String[]{"oreDiamond", "150", "oreEmerald", "100", "oreQuartz", "250", "oreSunstone", "5", "oreMoonstone", "50", "oreIridium", "5", "oreCertusQuartz", "150"}).getStringList();
- AlchemicalWizardry.netherStarMeteorRadius = config.get("meteor", "netherStarMeteorRadius", 3).getInt();
+ public static void syncConfig()
+ {
+ AlchemicalWizardry.standardBindingAgentDungeonChance = config.get("Dungeon Loot Chances", "standardBindingAgent", 30).getInt();
+ AlchemicalWizardry.mundanePowerCatalystDungeonChance = config.get("Dungeon Loot Chances", "mundanePowerCatalyst", 20).getInt();
+ AlchemicalWizardry.averagePowerCatalystDungeonChance = config.get("Dungeon Loot Chances", "averagePowerCatalyst", 10).getInt();
+ AlchemicalWizardry.greaterPowerCatalystDungeonChance = config.get("Dungeon Loot Chances", "greaterPowerCatalyst", 05).getInt();
+ AlchemicalWizardry.mundaneLengtheningCatalystDungeonChance = config.get("Dungeon Loot Chances", "mundaneLengtheningCatalyst", 20).getInt();
+ AlchemicalWizardry.averageLengtheningCatalystDungeonChance = config.get("Dungeon Loot Chances", "averageLengtheningCatalyst", 10).getInt();
+ AlchemicalWizardry.greaterLengtheningCatalystDungeonChance = config.get("Dungeon Loot Chances", "greaterLengtheningCatalyst", 05).getInt();
+ AlchemicalWizardry.customPotionDrowningID = config.get("Potion ID", "Drowning", 100).getInt();
+ AlchemicalWizardry.customPotionBoostID = config.get("Potion ID", "Boost", 101).getInt();
+ AlchemicalWizardry.customPotionProjProtID = config.get("Potion ID", "ProjProt", 102).getInt();
+ AlchemicalWizardry.customPotionInhibitID = config.get("Potion ID", "Inhibit", 103).getInt();
+ AlchemicalWizardry.customPotionFlightID = config.get("Potion ID", "Flight", 104).getInt();
+ AlchemicalWizardry.customPotionReciprocationID = config.get("Potion ID", "Reciprocation", 105).getInt();
+ AlchemicalWizardry.customPotionFlameCloakID = config.get("Potion ID", "FlameCloak", 106).getInt();
+ AlchemicalWizardry.customPotionIceCloakID = config.get("Potion ID", "IceCloak", 107).getInt();
+ AlchemicalWizardry.customPotionHeavyHeartID = config.get("Potion ID", "HeavyHeart", 108).getInt();
+ AlchemicalWizardry.customPotionFireFuseID = config.get("Potion ID", "FireFuse", 109).getInt();
+ AlchemicalWizardry.customPotionPlanarBindingID = config.get("Potion ID", "PlanarBinding", 110).getInt();
+ AlchemicalWizardry.customPotionSoulFrayID = config.get("Potion ID", "SoulFray", 111).getInt();
+ AlchemicalWizardry.customPotionSoulHardenID = config.get("Potion ID", "SoulHarden", 112).getInt();
+ AlchemicalWizardry.customPotionDeafID = config.get("Potion ID", "Deaf", 113).getInt();
+ AlchemicalWizardry.customPotionFeatherFallID = config.get("Potion ID", "FeatherFall", 114).getInt();
- AlchemicalWizardry.allowedCrushedOresArray = config.get("oreCrushing", "allowedOres", new String[]{"iron", "gold", "copper", "tin", "lead", "silver", "osmium"}).getStringList();
+ MeteorParadigm.maxChance = config.get("meteor", "maxChance", 1000).getInt();
+ AlchemicalWizardry.doMeteorsDestroyBlocks = config.get("meteor", "doMeteorsDestroyBlocks", true).getBoolean(true);
+ AlchemicalWizardry.diamondMeteorArray = config.get("meteor", "diamondMeteor", new String[]{"oreDiamond", "100", "oreEmerald", "75", "oreCinnabar", "200", "oreAmber", "200"}).getStringList();
+ AlchemicalWizardry.diamondMeteorRadius = config.get("meteor", "diamondMeteorRadius", 5).getInt();
+ AlchemicalWizardry.stoneMeteorArray = config.get("meteor", "stoneBlockMeteor", new String[]{"oreCoal", "150", "oreApatite", "50", "oreIron", "50"}).getStringList();
+ AlchemicalWizardry.stoneMeteorRadius = config.get("meteor", "stoneMeteorRadius", 16).getInt();
+ AlchemicalWizardry.ironBlockMeteorArray = config.get("meteor", "ironBlockMeteor", new String[]{"oreIron", "400", "oreGold", "30", "oreCopper", "200", "oreTin", "140", "oreSilver", "70", "oreLead", "80", "oreLapis", "60", "oreRedstone", "100"}).getStringList();
+ AlchemicalWizardry.ironBlockMeteorRadius = config.get("meteor", "ironBlockMeteorRadius", 7).getInt();
+ AlchemicalWizardry.netherStarMeteorArray = config.get("meteor", "netherStarMeteor", new String[]{"oreDiamond", "150", "oreEmerald", "100", "oreQuartz", "250", "oreSunstone", "5", "oreMoonstone", "50", "oreIridium", "5", "oreCertusQuartz", "150"}).getStringList();
+ AlchemicalWizardry.netherStarMeteorRadius = config.get("meteor", "netherStarMeteorRadius", 3).getInt();
- AlchemicalWizardry.wimpySettings = config.get("WimpySettings", "IDontLikeFun", false).getBoolean(false);
- AlchemicalWizardry.respawnWithDebuff = config.get("WimpySettings", "RespawnWithDebuff", true).getBoolean();
- AlchemicalWizardry.causeHungerWithRegen = config.get("WimpySettings", "causeHungerWithRegen", true).getBoolean();
-// AlchemicalWizardry.lockdownAltar = config.get("WimpySettings", "LockdownAltarWithRegen", true).getBoolean();
- AlchemicalWizardry.lockdownAltar = false;
+ AlchemicalWizardry.allowedCrushedOresArray = config.get("oreCrushing", "allowedOres", new String[]{"iron", "gold", "copper", "tin", "lead", "silver", "osmium"}).getStringList();
- Side side = FMLCommonHandler.instance().getSide();
- if (side == Side.CLIENT)
- {
- RenderHelper.xOffset = config.get("ClientSettings", "AlchemyHUDxOffset", 50).getInt();
- RenderHelper.yOffset = config.get("ClientSettings", "AlchemyHUDyOffset", 2).getInt();
- }
+ AlchemicalWizardry.wimpySettings = config.get("WimpySettings", "IDontLikeFun", false).getBoolean(false);
+ AlchemicalWizardry.respawnWithDebuff = config.get("WimpySettings", "RespawnWithDebuff", true).getBoolean();
+ AlchemicalWizardry.causeHungerWithRegen = config.get("WimpySettings", "causeHungerWithRegen", true).getBoolean();
+// AlchemicalWizardry.lockdownAltar = config.get("WimpySettings", "LockdownAltarWithRegen", true).getBoolean();
+ AlchemicalWizardry.lockdownAltar = false;
+
+ Side side = FMLCommonHandler.instance().getSide();
+ if (side == Side.CLIENT)
+ {
+ RenderHelper.xOffset = config.get("ClientSettings", "AlchemyHUDxOffset", 50).getInt();
+ RenderHelper.yOffset = config.get("ClientSettings", "AlchemyHUDyOffset", 2).getInt();
+ }
+
+ config.save();
+ }
+
+ public static void set(String categoryName, String propertyName, String newValue)
+ {
+
+ config.load();
+ if (config.getCategoryNames().contains(categoryName))
+ {
+ if (config.getCategory(categoryName).containsKey(propertyName))
+ {
+ config.getCategory(categoryName).get(propertyName).set(newValue);
+ }
+ }
+ config.save();
- } catch (Exception e)
- {
+ }
- //TODO Log
- //FMLLog.log(Level.SEVERE, e, "Blood Magic" + " has had a problem loading its configuration, go ask on the forums :p");
+ public static void loadBlacklist()
+ {
+ AlchemicalWizardry.wellBlacklist = new ArrayList<Class>();
+ for (Object o : EntityList.stringToClassMapping.entrySet())
+ {
+ Entry entry = (Entry) o;
+ Class curClass = (Class) entry.getValue();
+ boolean valid = EntityLivingBase.class.isAssignableFrom(curClass) && !Modifier.isAbstract(curClass.getModifiers());
+ if (valid)
+ {
+ boolean blacklisted = config.get("wellOfSufferingBlackList", entry.getKey().toString(), false).getBoolean();
+ if (blacklisted)
+ AlchemicalWizardry.wellBlacklist.add(curClass);
+ }
- } finally
- {
- config.save();
- }
- }
-
- public static void set(String categoryName, String propertyName, String newValue)
- {
-
- config.load();
- if (config.getCategoryNames().contains(categoryName))
- {
- if (config.getCategory(categoryName).containsKey(propertyName))
- {
- config.getCategory(categoryName).get(propertyName).set(newValue);
- }
- }
- config.save();
-
-
- }
-
- public static void loadBlacklist()
- {
- AlchemicalWizardry.wellBlacklist = new ArrayList<Class>();
- for (Object o : EntityList.stringToClassMapping.entrySet())
- {
- Entry entry = (Entry) o;
- Class curClass = (Class) entry.getValue();
- boolean valid = EntityLivingBase.class.isAssignableFrom(curClass) && !Modifier.isAbstract(curClass.getModifiers());
- if (valid)
- {
- boolean blacklisted = config.get("wellOfSufferingBlackList", entry.getKey().toString(), false).getBoolean();
- if (blacklisted)
- AlchemicalWizardry.wellBlacklist.add(curClass);
- }
-
- }
- config.save();
- }
+ }
+ config.save();
+ }
}
diff --git a/src/main/java/WayofTime/alchemicalWizardry/client/gui/ConfigGui.java b/src/main/java/WayofTime/alchemicalWizardry/client/gui/ConfigGui.java
new file mode 100644
index 00000000..3976c8d4
--- /dev/null
+++ b/src/main/java/WayofTime/alchemicalWizardry/client/gui/ConfigGui.java
@@ -0,0 +1,35 @@
+package WayofTime.alchemicalWizardry.client.gui;
+
+import cpw.mods.fml.client.config.GuiConfig;
+import cpw.mods.fml.client.config.IConfigElement;
+import net.minecraft.client.gui.GuiScreen;
+import net.minecraftforge.common.config.ConfigCategory;
+import net.minecraftforge.common.config.ConfigElement;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static WayofTime.alchemicalWizardry.BloodMagicConfiguration.config;
+
+public class ConfigGui extends GuiConfig {
+
+ public ConfigGui(GuiScreen parentScreen) {
+ super(parentScreen, getConfigElements(parentScreen), "AWWayofTime", false, false, "Blood Magic Configuration");
+ }
+
+ @SuppressWarnings("rawtypes")
+ private static List<IConfigElement> getConfigElements(GuiScreen parent) {
+ List<IConfigElement> list = new ArrayList<IConfigElement>();
+
+ // adds sections declared in ConfigHandler. toLowerCase() is used because the configuration class automatically does this, so must we.
+ list.add(new ConfigElement<ConfigCategory>(config.getCategory("clientsettings".toLowerCase())));
+ list.add(new ConfigElement<ConfigCategory>(config.getCategory("dungeon loot chances".toLowerCase())));
+ list.add(new ConfigElement<ConfigCategory>(config.getCategory("meteor".toLowerCase())));
+ list.add(new ConfigElement<ConfigCategory>(config.getCategory("orecrushing".toLowerCase())));
+ list.add(new ConfigElement<ConfigCategory>(config.getCategory("potion id".toLowerCase())));
+ list.add(new ConfigElement<ConfigCategory>(config.getCategory("wellofsufferingblacklist".toLowerCase())));
+ list.add(new ConfigElement<ConfigCategory>(config.getCategory("wimpysettings".toLowerCase())));
+
+ return list;
+ }
+}
diff --git a/src/main/java/WayofTime/alchemicalWizardry/client/gui/ConfigGuiFactory.java b/src/main/java/WayofTime/alchemicalWizardry/client/gui/ConfigGuiFactory.java
new file mode 100644
index 00000000..e4705728
--- /dev/null
+++ b/src/main/java/WayofTime/alchemicalWizardry/client/gui/ConfigGuiFactory.java
@@ -0,0 +1,30 @@
+package WayofTime.alchemicalWizardry.client.gui;
+
+import cpw.mods.fml.client.IModGuiFactory;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiScreen;
+
+import java.util.Set;
+
+public class ConfigGuiFactory implements IModGuiFactory {
+
+ @Override
+ public void initialize(Minecraft minecraftInstance) {
+
+ }
+
+ @Override
+ public Class<? extends GuiScreen> mainConfigGuiClass() {
+ return ConfigGui.class;
+ }
+
+ @Override
+ public Set<RuntimeOptionCategoryElement> runtimeGuiCategories() {
+ return null;
+ }
+
+ @Override
+ public RuntimeOptionGuiHandler getHandlerFor(RuntimeOptionCategoryElement element) {
+ return null;
+ }
+}
diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/AlchemicalWizardryEventHooks.java b/src/main/java/WayofTime/alchemicalWizardry/common/AlchemicalWizardryEventHooks.java
index 9dc7769f..67a2c0a4 100644
--- a/src/main/java/WayofTime/alchemicalWizardry/common/AlchemicalWizardryEventHooks.java
+++ b/src/main/java/WayofTime/alchemicalWizardry/common/AlchemicalWizardryEventHooks.java
@@ -1,11 +1,18 @@
package WayofTime.alchemicalWizardry.common;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
+import WayofTime.alchemicalWizardry.AlchemicalWizardry;
+import WayofTime.alchemicalWizardry.BloodMagicConfiguration;
+import WayofTime.alchemicalWizardry.common.entity.projectile.EnergyBlastProjectile;
+import WayofTime.alchemicalWizardry.common.items.BoundArmour;
+import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper;
+import WayofTime.alchemicalWizardry.common.tileEntity.TEMasterStone;
+import cpw.mods.fml.client.event.ConfigChangedEvent;
+import cpw.mods.fml.common.ObfuscationReflectionHelper;
+import cpw.mods.fml.common.Optional;
+import cpw.mods.fml.common.eventhandler.Event.Result;
+import cpw.mods.fml.common.eventhandler.SubscribeEvent;
+import cpw.mods.fml.common.gameevent.PlayerEvent.PlayerRespawnEvent;
+import cpw.mods.fml.common.registry.GameRegistry;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.IProjectile;
@@ -28,476 +35,476 @@ import net.minecraftforge.event.entity.living.LivingEvent.LivingJumpEvent;
import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent;
import net.minecraftforge.event.entity.living.LivingSpawnEvent.CheckSpawn;
import vazkii.botania.api.internal.IManaBurst;
-import WayofTime.alchemicalWizardry.AlchemicalWizardry;
-import WayofTime.alchemicalWizardry.common.entity.projectile.EnergyBlastProjectile;
-import WayofTime.alchemicalWizardry.common.items.BoundArmour;
-import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper;
-import WayofTime.alchemicalWizardry.common.tileEntity.TEMasterStone;
-import cpw.mods.fml.common.ObfuscationReflectionHelper;
-import cpw.mods.fml.common.Optional;
-import cpw.mods.fml.common.eventhandler.Event.Result;
-import cpw.mods.fml.common.eventhandler.SubscribeEvent;
-import cpw.mods.fml.common.gameevent.PlayerEvent.PlayerRespawnEvent;
-import cpw.mods.fml.common.registry.GameRegistry;
+
+import java.util.*;
public class AlchemicalWizardryEventHooks
{
- public static Map<String, Boolean> playerFlightBuff = new HashMap();
- public static Map<String, Boolean> playerBoostStepHeight = new HashMap();
- public static List<String> playersWith1Step = new ArrayList();
+ public static Map<String, Boolean> playerFlightBuff = new HashMap();
+ public static Map<String, Boolean> playerBoostStepHeight = new HashMap();
+ public static List<String> playersWith1Step = new ArrayList();
- public static Map<Integer, List<CoordAndRange>> respawnMap = new HashMap();
- public static Map<Integer, List<CoordAndRange>> forceSpawnMap = new HashMap();
+ public static Map<Integer, List<CoordAndRange>> respawnMap = new HashMap();
+ public static Map<Integer, List<CoordAndRange>> forceSpawnMap = new HashMap();
-
- @SubscribeEvent
- public void onAnvilUpdateEvent(AnvilUpdateEvent event)
- {
- if(event.isCancelable() && event.left != null && event.left.getItem() instanceof BoundArmour && event.right != null)
- {
- event.setCanceled(true);
- }
- }
-
- @SubscribeEvent
- public void onPlayerDamageEvent(LivingAttackEvent event)
- {
- if (event.source.isProjectile())
- {
- if (event.entityLiving.isPotionActive(AlchemicalWizardry.customPotionProjProt) && event.isCancelable())
- {
- event.setCanceled(true);
- }
- }
- }
- @SubscribeEvent
- public void onLivingSpawnEvent(CheckSpawn event)
- {
- if (!(event.entityLiving instanceof EntityMob))
- {
- return;
- }
+ @SubscribeEvent
+ public void onAnvilUpdateEvent(AnvilUpdateEvent event)
+ {
+ if(event.isCancelable() && event.left != null && event.left.getItem() instanceof BoundArmour && event.right != null)
+ {
+ event.setCanceled(true);
+ }
+ }
- String respawnRitual = "AW028SpawnWard";
+ @SubscribeEvent
+ public void onPlayerDamageEvent(LivingAttackEvent event)
+ {
+ if (event.source.isProjectile())
+ {
+ if (event.entityLiving.isPotionActive(AlchemicalWizardry.customPotionProjProt) && event.isCancelable())
+ {
+ event.setCanceled(true);
+ }
+ }
+ }
- Integer dimension = new Integer(event.world.provider.dimensionId);
- if (respawnMap.containsKey(dimension))
- {
- List<CoordAndRange> list = respawnMap.get(dimension);
+ @SubscribeEvent
+ public void onLivingSpawnEvent(CheckSpawn event)
+ {
+ if (!(event.entityLiving instanceof EntityMob))
+ {
+ return;
+ }
- if (list != null)
- {
- for (CoordAndRange coords : list)
- {
- TileEntity tile = event.world.getTileEntity(coords.xCoord, coords.yCoord, coords.zCoord);
+ String respawnRitual = "AW028SpawnWard";
- if (tile instanceof TEMasterStone && ((TEMasterStone) tile).isRunning && ((TEMasterStone) tile).getCurrentRitual().equals(respawnRitual))
- {
- if (event.x > coords.xCoord - coords.horizRadius && event.x < coords.xCoord + coords.horizRadius && event.z > coords.zCoord - coords.horizRadius && event.z < coords.zCoord + coords.horizRadius && event.y > coords.yCoord - coords.vertRadius && event.y < coords.yCoord + coords.vertRadius)
- {
- switch (event.getResult())
- {
- case ALLOW:
- event.setResult(Result.DEFAULT);
- break;
- case DEFAULT:
- event.setResult(Result.DENY);
- break;
- case DENY:
- break;
- default:
- break;
- }
- break;
- }
- } else
- {
- list.remove(coords);
- }
- }
- }
- }
+ Integer dimension = new Integer(event.world.provider.dimensionId);
+ if (respawnMap.containsKey(dimension))
+ {
+ List<CoordAndRange> list = respawnMap.get(dimension);
- if (event.entityLiving instanceof EntityCreeper)
- {
- GameRegistry d;
- return;
- }
+ if (list != null)
+ {
+ for (CoordAndRange coords : list)
+ {
+ TileEntity tile = event.world.getTileEntity(coords.xCoord, coords.yCoord, coords.zCoord);
- String forceSpawnRitual = "AW029VeilOfEvil";
+ if (tile instanceof TEMasterStone && ((TEMasterStone) tile).isRunning && ((TEMasterStone) tile).getCurrentRitual().equals(respawnRitual))
+ {
+ if (event.x > coords.xCoord - coords.horizRadius && event.x < coords.xCoord + coords.horizRadius && event.z > coords.zCoord - coords.horizRadius && event.z < coords.zCoord + coords.horizRadius && event.y > coords.yCoord - coords.vertRadius && event.y < coords.yCoord + coords.vertRadius)
+ {
+ switch (event.getResult())
+ {
+ case ALLOW:
+ event.setResult(Result.DEFAULT);
+ break;
+ case DEFAULT:
+ event.setResult(Result.DENY);
+ break;
+ case DENY:
+ break;
+ default:
+ break;
+ }
+ break;
+ }
+ } else
+ {
+ list.remove(coords);
+ }
+ }
+ }
+ }
- if (forceSpawnMap.containsKey(dimension))
- {
- List<CoordAndRange> list = forceSpawnMap.get(dimension);
+ if (event.entityLiving instanceof EntityCreeper)
+ {
+ GameRegistry d;
+ return;
+ }
- if (list != null)
- {
- for (CoordAndRange coords : list)
- {
- TileEntity tile = event.world.getTileEntity(coords.xCoord, coords.yCoord, coords.zCoord);
+ String forceSpawnRitual = "AW029VeilOfEvil";
- if (tile instanceof TEMasterStone && ((TEMasterStone) tile).isRunning && ((TEMasterStone) tile).getCurrentRitual().equals(forceSpawnRitual))
- {
- if (event.x > coords.xCoord - coords.horizRadius && event.x < coords.xCoord + coords.horizRadius && event.z > coords.zCoord - coords.horizRadius && event.z < coords.zCoord + coords.horizRadius && event.y > coords.yCoord - coords.vertRadius && event.y < coords.yCoord + coords.vertRadius)
- {
- switch (event.getResult())
- {
- case ALLOW:
- break;
- case DEFAULT:
- event.setResult(Result.ALLOW);
- break;
- case DENY:
- event.setResult(Result.DEFAULT);
- break;
- default:
- break;
- }
- break;
- }
- } else
- {
- list.remove(coords);
- }
- }
- }
- }
- }
+ if (forceSpawnMap.containsKey(dimension))
+ {
+ List<CoordAndRange> list = forceSpawnMap.get(dimension);
- @SubscribeEvent
- public void onPlayerRespawnEvent(PlayerRespawnEvent event)
- {
- if (AlchemicalWizardry.respawnWithDebuff)
- {
- event.player.addPotionEffect(new PotionEffect(AlchemicalWizardry.customPotionSoulFray.id, 20 * 60 * 5, 0));
- }
- }
+ if (list != null)
+ {
+ for (CoordAndRange coords : list)
+ {
+ TileEntity tile = event.world.getTileEntity(coords.xCoord, coords.yCoord, coords.zCoord);
- @SubscribeEvent
- public void onLivingJumpEvent(LivingJumpEvent event)
- {
- if (event.entityLiving.isPotionActive(AlchemicalWizardry.customPotionBoost))
- {
- int i = event.entityLiving.getActivePotionEffect(AlchemicalWizardry.customPotionBoost).getAmplifier();
- event.entityLiving.motionY += (0.1f) * (2 + i);
- }
+ if (tile instanceof TEMasterStone && ((TEMasterStone) tile).isRunning && ((TEMasterStone) tile).getCurrentRitual().equals(forceSpawnRitual))
+ {
+ if (event.x > coords.xCoord - coords.horizRadius && event.x < coords.xCoord + coords.horizRadius && event.z > coords.zCoord - coords.horizRadius && event.z < coords.zCoord + coords.horizRadius && event.y > coords.yCoord - coords.vertRadius && event.y < coords.yCoord + coords.vertRadius)
+ {
+ switch (event.getResult())
+ {
+ case ALLOW:
+ break;
+ case DEFAULT:
+ event.setResult(Result.ALLOW);
+ break;
+ case DENY:
+ event.setResult(Result.DEFAULT);
+ break;
+ default:
+ break;
+ }
+ break;
+ }
+ } else
+ {
+ list.remove(coords);
+ }
+ }
+ }
+ }
+ }
- if (event.entityLiving.isPotionActive(AlchemicalWizardry.customPotionHeavyHeart))
- {
- event.entityLiving.motionY = 0;
- }
- }
+ @SubscribeEvent
+ public void onPlayerRespawnEvent(PlayerRespawnEvent event)
+ {
+ if (AlchemicalWizardry.respawnWithDebuff)
+ {
+ event.player.addPotionEffect(new PotionEffect(AlchemicalWizardry.customPotionSoulFray.id, 20 * 60 * 5, 0));
+ }
+ }
- @SubscribeEvent
- public void onEndermanTeleportEvent(EnderTeleportEvent event)
- {
- if (event.entityLiving.isPotionActive(AlchemicalWizardry.customPotionPlanarBinding) && event.isCancelable())
- {
- event.setCanceled(true);
- }
- }
+ @SubscribeEvent
+ public void onLivingJumpEvent(LivingJumpEvent event)
+ {
+ if (event.entityLiving.isPotionActive(AlchemicalWizardry.customPotionBoost))
+ {
+ int i = event.entityLiving.getActivePotionEffect(AlchemicalWizardry.customPotionBoost).getAmplifier();
+ event.entityLiving.motionY += (0.1f) * (2 + i);
+ }
- @SubscribeEvent
- public void onEntityDamaged(LivingAttackEvent event)
- {
- EntityLivingBase entityAttacked = event.entityLiving;
+ if (event.entityLiving.isPotionActive(AlchemicalWizardry.customPotionHeavyHeart))
+ {
+ event.entityLiving.motionY = 0;
+ }
+ }
- if (entityAttacked.isPotionActive(AlchemicalWizardry.customPotionReciprocation))
- {
- Entity entityAttacking = event.source.getSourceOfDamage();
+ @SubscribeEvent
+ public void onEndermanTeleportEvent(EnderTeleportEvent event)
+ {
+ if (event.entityLiving.isPotionActive(AlchemicalWizardry.customPotionPlanarBinding) && event.isCancelable())
+ {
+ event.setCanceled(true);
+ }
+ }
- if (entityAttacking != null && entityAttacking instanceof EntityLivingBase)
- {
- int i = event.entityLiving.getActivePotionEffect(AlchemicalWizardry.customPotionReciprocation).getAmplifier();
- float damageRecieve = event.ammount / 2 * (i + 1);
- ((EntityLivingBase) entityAttacking).attackEntityFrom(DamageSource.generic, damageRecieve);
- }
- }
+ @SubscribeEvent
+ public void onEntityDamaged(LivingAttackEvent event)
+ {
+ EntityLivingBase entityAttacked = event.entityLiving;
- if (entityAttacked.isPotionActive(AlchemicalWizardry.customPotionFlameCloak))
- {
- int i = event.entityLiving.getActivePotionEffect(AlchemicalWizardry.customPotionFlameCloak).getAmplifier();
+ if (entityAttacked.isPotionActive(AlchemicalWizardry.customPotionReciprocation))
+ {
+ Entity entityAttacking = event.source.getSourceOfDamage();
- Entity entityAttacking = event.source.getSourceOfDamage();
+ if (entityAttacking != null && entityAttacking instanceof EntityLivingBase)
+ {
+ int i = event.entityLiving.getActivePotionEffect(AlchemicalWizardry.customPotionReciprocation).getAmplifier();
+ float damageRecieve = event.ammount / 2 * (i + 1);
+ ((EntityLivingBase) entityAttacking).attackEntityFrom(DamageSource.generic, damageRecieve);
+ }
+ }
- if (entityAttacking != null && entityAttacking instanceof EntityLivingBase && !entityAttacking.isImmuneToFire() && !((EntityLivingBase) entityAttacking).isPotionActive(Potion.fireResistance))
- {
- entityAttacking.attackEntityFrom(DamageSource.inFire, 2 * i + 2);
- entityAttacking.setFire(3);
- }
- }
- }
+ if (entityAttacked.isPotionActive(AlchemicalWizardry.customPotionFlameCloak))
+ {
+ int i = event.entityLiving.getActivePotionEffect(AlchemicalWizardry.customPotionFlameCloak).getAmplifier();
-// @ForgeSubscribe
-// public void onFOVUpdate(FOVUpdateEvent event)
-// {
-// event.setResult(Result.DEFAULT);
-// }
+ Entity entityAttacking = event.source.getSourceOfDamage();
-// @SubscribeEvent
-// public void onPlayerTickEnd(PlayerTickEvent event)
-// {
-// if(event.type.equals(Type.PLAYER) && event.phase.equals(TickEvent.Phase.END))
-// {
-// ObfuscationReflectionHelper.setPrivateValue(PlayerCapabilities.class, event.player.capabilities, Float.valueOf(0.1f), new String[]{"walkSpeed", "g", "field_75097_g"});
-// }
-// }
+ if (entityAttacking != null && entityAttacking instanceof EntityLivingBase && !entityAttacking.isImmuneToFire() && !((EntityLivingBase) entityAttacking).isPotionActive(Potion.fireResistance))
+ {
+ entityAttacking.attackEntityFrom(DamageSource.inFire, 2 * i + 2);
+ entityAttacking.setFire(3);
+ }
+ }
+ }
- @SubscribeEvent
- public void onEntityUpdate(LivingUpdateEvent event)
- {
- EntityLivingBase entityLiving = event.entityLiving;
- double x = entityLiving.posX;
- double y = entityLiving.posY;
- double z = entityLiving.posZ;
+ // @ForgeSubscribe
+ // public void onFOVUpdate(FOVUpdateEvent event)
+ // {
+ // event.setResult(Result.DEFAULT);
+ // }
- Vec3 blockVector = SpellHelper.getEntityBlockVector(entityLiving);
- int xPos = (int) (blockVector.xCoord);
- int yPos = (int) (blockVector.yCoord);
- int zPos = (int) (blockVector.zCoord);
+ // @SubscribeEvent
+ // public void onPlayerTickEnd(PlayerTickEvent event)
+ // {
+ // if(event.type.equals(Type.PLAYER) && event.phase.equals(TickEvent.Phase.END))
+ // {
+ // ObfuscationReflectionHelper.setPrivateValue(PlayerCapabilities.class, event.player.capabilities, Float.valueOf(0.1f), new String[]{"walkSpeed", "g", "field_75097_g"});
+ // }
+ // }
- if (entityLiving instanceof EntityPlayer)
- {
- ObfuscationReflectionHelper.setPrivateValue(PlayerCapabilities.class, ((EntityPlayer) event.entityLiving).capabilities, Float.valueOf(0.1f), new String[]{"walkSpeed", "g", "field_75097_g"});
- }
+ @SubscribeEvent
+ public void onEntityUpdate(LivingUpdateEvent event)
+ {
+ EntityLivingBase entityLiving = event.entityLiving;
+ double x = entityLiving.posX;
+ double y = entityLiving.posY;
+ double z = entityLiving.posZ;
- if (entityLiving instanceof EntityPlayer && entityLiving.worldObj.isRemote)
- {
- EntityPlayer entityPlayer = (EntityPlayer) entityLiving;
- boolean highStepListed = playersWith1Step.contains(entityPlayer.getDisplayName());
- boolean hasHighStep = entityPlayer.isPotionActive(AlchemicalWizardry.customPotionBoost);
+ Vec3 blockVector = SpellHelper.getEntityBlockVector(entityLiving);
+ int xPos = (int) (blockVector.xCoord);
+ int yPos = (int) (blockVector.yCoord);
+ int zPos = (int) (blockVector.zCoord);
- if (hasHighStep && !highStepListed)
- {
- playersWith1Step.add(SpellHelper.getUsername(entityPlayer));
- }
+ if (entityLiving instanceof EntityPlayer)
+ {
+ ObfuscationReflectionHelper.setPrivateValue(PlayerCapabilities.class, ((EntityPlayer) event.entityLiving).capabilities, Float.valueOf(0.1f), new String[]{"walkSpeed", "g", "field_75097_g"});
+ }
- if (!hasHighStep && highStepListed)
- {
- playersWith1Step.remove(SpellHelper.getUsername(entityPlayer));
- entityPlayer.stepHeight = 0.5F;
- }
- }
+ if (entityLiving instanceof EntityPlayer && entityLiving.worldObj.isRemote)
+ {
+ EntityPlayer entityPlayer = (EntityPlayer) entityLiving;
+ boolean highStepListed = playersWith1Step.contains(entityPlayer.getDisplayName());
+ boolean hasHighStep = entityPlayer.isPotionActive(AlchemicalWizardry.customPotionBoost);
- if (event.entityLiving.isPotionActive(AlchemicalWizardry.customPotionFeatherFall))
- {
- event.entityLiving.fallDistance = 0;
- }
+ if (hasHighStep && !highStepListed)
+ {
+ playersWith1Step.add(SpellHelper.getUsername(entityPlayer));
+ }
- if (event.entityLiving.isPotionActive(AlchemicalWizardry.customPotionDrowning))
- {
- int i = event.entityLiving.getActivePotionEffect(AlchemicalWizardry.customPotionDrowning).getAmplifier();
+ if (!hasHighStep && highStepListed)
+ {
+ playersWith1Step.remove(SpellHelper.getUsername(entityPlayer));
+ entityPlayer.stepHeight = 0.5F;
+ }
+ }
- if (event.entityLiving.worldObj.getWorldTime() % ((int) (20 / (i + 1))) == 0)
- {
- event.entityLiving.attackEntityFrom(DamageSource.drown, 2);
- event.entityLiving.hurtResistantTime = Math.min(event.entityLiving.hurtResistantTime, 20 / (i + 1));
- }
- }
+ if (event.entityLiving.isPotionActive(AlchemicalWizardry.customPotionFeatherFall))
+ {
+ event.entityLiving.fallDistance = 0;
+ }
- if (event.entityLiving.isPotionActive(AlchemicalWizardry.customPotionBoost))
- {
- int i = event.entityLiving.getActivePotionEffect(AlchemicalWizardry.customPotionBoost).getAmplifier();
- EntityLivingBase entity = event.entityLiving;
- //if(!entity.isSneaking())
- {
- float percentIncrease = (i + 1) * 0.05f;
+ if (event.entityLiving.isPotionActive(AlchemicalWizardry.customPotionDrowning))
+ {
+ int i = event.entityLiving.getActivePotionEffect(AlchemicalWizardry.customPotionDrowning).getAmplifier();
- if (event.entityLiving instanceof EntityPlayer)
- {
- EntityPlayer entityPlayer = (EntityPlayer) event.entityLiving;
- entityPlayer.stepHeight = 1.0f;
+ if (event.entityLiving.worldObj.getWorldTime() % ((int) (20 / (i + 1))) == 0)
+ {
+ event.entityLiving.attackEntityFrom(DamageSource.drown, 2);
+ event.entityLiving.hurtResistantTime = Math.min(event.entityLiving.hurtResistantTime, 20 / (i + 1));
+ }
+ }
- if ((entityPlayer.onGround || entityPlayer.capabilities.isFlying) && entityPlayer.moveForward > 0F)
- entityPlayer.moveFlying(0F, 1F, entityPlayer.capabilities.isFlying ? (percentIncrease / 2.0f) : percentIncrease);
- }
- }
- }
+ if (event.entityLiving.isPotionActive(AlchemicalWizardry.customPotionBoost))
+ {
+ int i = event.entityLiving.getActivePotionEffect(AlchemicalWizardry.customPotionBoost).getAmplifier();
+ EntityLivingBase entity = event.entityLiving;
+ //if(!entity.isSneaking())
+ {
+ float percentIncrease = (i + 1) * 0.05f;
- if (event.entityLiving.isPotionActive(AlchemicalWizardry.customPotionProjProt))
- {
- int i = event.entityLiving.getActivePotionEffect(AlchemicalWizardry.customPotionProjProt).getAmplifier();
- EntityLivingBase entity = event.entityLiving;
- int posX = (int) Math.round(entity.posX - 0.5f);
- int posY = (int) Math.round(entity.posY);
- int posZ = (int) Math.round(entity.posZ - 0.5f);
- int d0 = (int) ((i + 1) * 2.5);
- AxisAlignedBB axisalignedbb = AxisAlignedBB.getBoundingBox(posX - 0.5, posY - 0.5, posZ - 0.5, posX + 0.5, posY + 0.5, posZ + 0.5).expand(d0, d0, d0);
- List list = event.entityLiving.worldObj.getEntitiesWithinAABB(Entity.class, axisalignedbb);
- Iterator iterator = list.iterator();
- EntityLivingBase livingEntity;
+ if (event.entityLiving instanceof EntityPlayer)
+ {
+ EntityPlayer entityPlayer = (EntityPlayer) event.entityLiving;
+ entityPlayer.stepHeight = 1.0f;
- while (iterator.hasNext())
- {
- Entity projectile = (Entity) iterator.next();
+ if ((entityPlayer.onGround || entityPlayer.capabilities.isFlying) && entityPlayer.moveForward > 0F)
+ entityPlayer.moveFlying(0F, 1F, entityPlayer.capabilities.isFlying ? (percentIncrease / 2.0f) : percentIncrease);
+ }
+ }
+ }
- if (projectile == null)
- {
- continue;
- }
+ if (event.entityLiving.isPotionActive(AlchemicalWizardry.customPotionProjProt))
+ {
+ int i = event.entityLiving.getActivePotionEffect(AlchemicalWizardry.customPotionProjProt).getAmplifier();
+ EntityLivingBase entity = event.entityLiving;
+ int posX = (int) Math.round(entity.posX - 0.5f);
+ int posY = (int) Math.round(entity.posY);
+ int posZ = (int) Math.round(entity.posZ - 0.5f);
+ int d0 = (int) ((i + 1) * 2.5);
+ AxisAlignedBB axisalignedbb = AxisAlignedBB.getBoundingBox(posX - 0.5, posY - 0.5, posZ - 0.5, posX + 0.5, posY + 0.5, posZ + 0.5).expand(d0, d0, d0);
+ List list = event.entityLiving.worldObj.getEntitiesWithinAABB(Entity.class, axisalignedbb);
+ Iterator iterator = list.iterator();
+ EntityLivingBase livingEntity;
- if (!(projectile instanceof IProjectile) || (AlchemicalWizardry.isBotaniaLoaded && isManaBurst(projectile)))
- {
- continue;
- }
+ while (iterator.hasNext())
+ {
+ Entity projectile = (Entity) iterator.next();
- Entity throwingEntity = null;
+ if (projectile == null)
+ {
+ continue;
+ }
- if (projectile instanceof EntityArrow)
- {
- throwingEntity = ((EntityArrow) projectile).shootingEntity;
- } else if (projectile instanceof EnergyBlastProjectile)
- {
- throwingEntity = ((EnergyBlastProjectile) projectile).shootingEntity;
- } else if (projectile instanceof EntityThrowable)
- {
- throwingEntity = ((EntityThrowable) projectile).getThrower();
- }
+ if (!(projectile instanceof IProjectile) || (AlchemicalWizardry.isBotaniaLoaded && isManaBurst(projectile)))
+ {
+ continue;
+ }
- if (throwingEntity != null && throwingEntity.equals(entity))
- {
- continue;
- }
+ Entity throwingEntity = null;
- double delX = projectile.posX - entity.posX;
- double delY = projectile.posY - entity.posY;
- double delZ = projectile.posZ - entity.posZ;
+ if (projectile instanceof EntityArrow)
+ {
+ throwingEntity = ((EntityArrow) projectile).shootingEntity;
+ } else if (projectile instanceof EnergyBlastProjectile)
+ {
+ throwingEntity = ((EnergyBlastProjectile) projectile).shootingEntity;
+ } else if (projectile instanceof EntityThrowable)
+ {
+ throwingEntity = ((EntityThrowable) projectile).getThrower();
+ }
- if (throwingEntity != null)
- {
- delX = -projectile.posX + throwingEntity.posX;
- delY = -projectile.posY + (throwingEntity.posY + throwingEntity.getEyeHeight());
- delZ = -projectile.posZ + throwingEntity.posZ;
- }
+ if (throwingEntity != null && throwingEntity.equals(entity))
+ {
+ continue;
+ }
- double curVel = Math.sqrt(delX * delX + delY * delY + delZ * delZ);
+ double delX = projectile.posX - entity.posX;
+ double delY = projectile.posY - entity.posY;
+ double delZ = projectile.posZ - entity.posZ;
- delX /= curVel;
- delY /= curVel;
- delZ /= curVel;
- double newVel = Math.sqrt(projectile.motionX * projectile.motionX + projectile.motionY * projectile.motionY + projectile.motionZ * projectile.motionZ);
- projectile.motionX = newVel * delX;
- projectile.motionY = newVel * delY;
- projectile.motionZ = newVel * delZ;
- //TODO make this not affect player's projectiles
- }
- }
+ if (throwingEntity != null)
+ {
+ delX = -projectile.posX + throwingEntity.posX;
+ delY = -projectile.posY + (throwingEntity.posY + throwingEntity.getEyeHeight());
+ delZ = -projectile.posZ + throwingEntity.posZ;
+ }
- if (event.entityLiving.isPotionActive(AlchemicalWizardry.customPotionFlight))
- {
- if (event.entityLiving instanceof EntityPlayer)
- {
- EntityPlayer entityPlayer = (EntityPlayer) event.entityLiving;
- String ownerName = SpellHelper.getUsername(entityPlayer);
- playerFlightBuff.put(ownerName, true);
- entityPlayer.capabilities.allowFlying = true;
- }
- } else
- {
- if (event.entityLiving instanceof EntityPlayer)
- {
- EntityPlayer entityPlayer = (EntityPlayer) event.entityLiving;
- String ownerName = SpellHelper.getUsername(entityPlayer);
+ double curVel = Math.sqrt(delX * delX + delY * delY + delZ * delZ);
- if (!playerFlightBuff.containsKey(ownerName))
- {
- playerFlightBuff.put(ownerName, false);
- }
+ delX /= curVel;
+ delY /= curVel;
+ delZ /= curVel;
+ double newVel = Math.sqrt(projectile.motionX * projectile.motionX + projectile.motionY * projectile.motionY + projectile.motionZ * projectile.motionZ);
+ projectile.motionX = newVel * delX;
+ projectile.motionY = newVel * delY;
+ projectile.motionZ = newVel * delZ;
+ //TODO make this not affect player's projectiles
+ }
+ }
- if (playerFlightBuff.get(ownerName))
- {
- playerFlightBuff.put(ownerName, false);
+ if (event.entityLiving.isPotionActive(AlchemicalWizardry.customPotionFlight))
+ {
+ if (event.entityLiving instanceof EntityPlayer)
+ {
+ EntityPlayer entityPlayer = (EntityPlayer) event.entityLiving;
+ String ownerName = SpellHelper.getUsername(entityPlayer);
+ playerFlightBuff.put(ownerName, true);
+ entityPlayer.capabilities.allowFlying = true;
+ }
+ } else
+ {
+ if (event.entityLiving instanceof EntityPlayer)
+ {
+ EntityPlayer entityPlayer = (EntityPlayer) event.entityLiving;
+ String ownerName = SpellHelper.getUsername(entityPlayer);
- if (!entityPlayer.capabilities.isCreativeMode)
- {
- entityPlayer.capabilities.allowFlying = false;
- entityPlayer.capabilities.isFlying = false;
- entityPlayer.sendPlayerAbilities();
- }
- }
- }
- }
+ if (!playerFlightBuff.containsKey(ownerName))
+ {
+ playerFlightBuff.put(ownerName, false);
+ }
- if (entityLiving.isPotionActive(AlchemicalWizardry.customPotionFlameCloak))
- {
- entityLiving.worldObj.spawnParticle("flame", x + SpellHelper.gaussian(1), y - 1.3 + SpellHelper.gaussian(0.3), z + SpellHelper.gaussian(1), 0, 0.06d, 0);
+ if (playerFlightBuff.get(ownerName))
+ {
+ playerFlightBuff.put(ownerName, false);
- int i = event.entityLiving.getActivePotionEffect(AlchemicalWizardry.customPotionFlameCloak).getAmplifier();
- double range = i * 0.5;
+ if (!entityPlayer.capabilities.isCreativeMode)
+ {
+ entityPlayer.capabilities.allowFlying = false;
+ entityPlayer.capabilities.isFlying = false;
+ entityPlayer.sendPlayerAbilities();
+ }
+ }
+ }
+ }
- List<Entity> entities = SpellHelper.getEntitiesInRange(entityLiving.worldObj, x, y, z, range, range);
- if (entities != null)
- {
- for (Entity entity : entities)
- {
- if (!entity.equals(entityLiving) && !entity.isImmuneToFire() && !(entity instanceof EntityLivingBase && ((EntityLivingBase) entity).isPotionActive(Potion.fireResistance)))
- {
- entity.setFire(3);
- }
- }
- }
- }
+ if (entityLiving.isPotionActive(AlchemicalWizardry.customPotionFlameCloak))
+ {
+ entityLiving.worldObj.spawnParticle("flame", x + SpellHelper.gaussian(1), y - 1.3 + SpellHelper.gaussian(0.3), z + SpellHelper.gaussian(1), 0, 0.06d, 0);
- if (entityLiving.isPotionActive(AlchemicalWizardry.customPotionIceCloak))
- {
- if (entityLiving.worldObj.getWorldTime() % 2 == 0)
- entityLiving.worldObj.spawnParticle("reddust", x + SpellHelper.gaussian(1), y - 1.3 + SpellHelper.gaussian(0.3), z + SpellHelper.gaussian(1), 0x74, 0xbb, 0xfb);
+ int i = event.entityLiving.getActivePotionEffect(AlchemicalWizardry.customPotionFlameCloak).getAmplifier();
+ double range = i * 0.5;
- int r = event.entityLiving.getActivePotionEffect(AlchemicalWizardry.customPotionIceCloak).getAmplifier();
- int horizRange = r + 1;
- int vertRange = 1;
+ List<Entity> entities = SpellHelper.getEntitiesInRange(entityLiving.worldObj, x, y, z, range, range);
+ if (entities != null)
+ {
+ for (Entity entity : entities)
+ {
+ if (!entity.equals(entityLiving) && !entity.isImmuneToFire() && !(entity instanceof EntityLivingBase && ((EntityLivingBase) entity).isPotionActive(Potion.fireResistance)))
+ {
+ entity.setFire(3);
+ }
+ }
+ }
+ }
- if (!entityLiving.worldObj.isRemote)
- {
- for (int i = -horizRange; i <= horizRange; i++)
- {
- for (int k = -horizRange; k <= horizRange; k++)
- {
- for (int j = -vertRange - 1; j <= vertRange - 1; j++)
- {
- SpellHelper.freezeWaterBlock(entityLiving.worldObj, xPos + i, yPos + j, zPos + k);
- }
- }
- }
- }
- }
+ if (entityLiving.isPotionActive(AlchemicalWizardry.customPotionIceCloak))
+ {
+ if (entityLiving.worldObj.getWorldTime() % 2 == 0)
+ entityLiving.worldObj.spawnParticle("reddust", x + SpellHelper.gaussian(1), y - 1.3 + SpellHelper.gaussian(0.3), z + SpellHelper.gaussian(1), 0x74, 0xbb, 0xfb);
- if (entityLiving.isPotionActive(AlchemicalWizardry.customPotionHeavyHeart))
- {
- entityLiving.worldObj.spawnParticle("flame", x + SpellHelper.gaussian(1), y - 1.3 + SpellHelper.gaussian(0.3), z + SpellHelper.gaussian(1), 0, 0.06d, 0);
+ int r = event.entityLiving.getActivePotionEffect(AlchemicalWizardry.customPotionIceCloak).getAmplifier();
+ int horizRange = r + 1;
+ int vertRange = 1;
- int i = event.entityLiving.getActivePotionEffect(AlchemicalWizardry.customPotionHeavyHeart).getAmplifier();
- double decrease = 0.025 * (i + 1);
+ if (!entityLiving.worldObj.isRemote)
+ {
+ for (int i = -horizRange; i <= horizRange; i++)
+ {
+ for (int k = -horizRange; k <= horizRange; k++)
+ {
+ for (int j = -vertRange - 1; j <= vertRange - 1; j++)
+ {
+ SpellHelper.freezeWaterBlock(entityLiving.worldObj, xPos + i, yPos + j, zPos + k);
+ }
+ }
+ }
+ }
+ }
- if (entityLiving.motionY > -0.9)
- {
- entityLiving.motionY -= decrease;
- }
-
- if(entityLiving instanceof EntityPlayer)
- {
- SpellHelper.setPlayerSpeedFromServer((EntityPlayer)entityLiving, entityLiving.motionX, entityLiving.motionY - decrease, entityLiving.motionZ);
- }
- }
+ if (entityLiving.isPotionActive(AlchemicalWizardry.customPotionHeavyHeart))
+ {
+ entityLiving.worldObj.spawnParticle("flame", x + SpellHelper.gaussian(1), y - 1.3 + SpellHelper.gaussian(0.3), z + SpellHelper.gaussian(1), 0, 0.06d, 0);
- if (entityLiving.isPotionActive(AlchemicalWizardry.customPotionFireFuse))
- {
- entityLiving.worldObj.spawnParticle("flame", x + SpellHelper.gaussian(1), y - 1.3 + SpellHelper.gaussian(0.3), z + SpellHelper.gaussian(1), 0, 0.06d, 0);
+ int i = event.entityLiving.getActivePotionEffect(AlchemicalWizardry.customPotionHeavyHeart).getAmplifier();
+ double decrease = 0.025 * (i + 1);
- int r = event.entityLiving.getActivePotionEffect(AlchemicalWizardry.customPotionFireFuse).getAmplifier();
- int radius = r + 1;
+ if (entityLiving.motionY > -0.9)
+ {
+ entityLiving.motionY -= decrease;
+ }
- if (entityLiving.getActivePotionEffect(AlchemicalWizardry.customPotionFireFuse).getDuration() <= 2)
- {
- entityLiving.worldObj.createExplosion(null, x, y, z, radius, false);
- }
- }
- }
-
- @Optional.Method(modid = "Botania")
- private boolean isManaBurst(Entity projectile)
- {
- return projectile instanceof IManaBurst;
- }
+ if(entityLiving instanceof EntityPlayer)
+ {
+ SpellHelper.setPlayerSpeedFromServer((EntityPlayer)entityLiving, entityLiving.motionX, entityLiving.motionY - decrease, entityLiving.motionZ);
+ }
+ }
+
+ if (entityLiving.isPotionActive(AlchemicalWizardry.customPotionFireFuse))
+ {
+ entityLiving.worldObj.spawnParticle("flame", x + SpellHelper.gaussian(1), y - 1.3 + SpellHelper.gaussian(0.3), z + SpellHelper.gaussian(1), 0, 0.06d, 0);
+
+ int r = event.entityLiving.getActivePotionEffect(AlchemicalWizardry.customPotionFireFuse).getAmplifier();
+ int radius = r + 1;
+
+ if (entityLiving.getActivePotionEffect(AlchemicalWizardry.customPotionFireFuse).getDuration() <= 2)
+ {
+ entityLiving.worldObj.createExplosion(null, x, y, z, radius, false);
+ }
+ }
+ }
+
+ @SubscribeEvent
+ public void onConfigChanged(ConfigChangedEvent.OnConfigChangedEvent event) {
+ if (event.modID.equals("AWWayofTime")) {
+ BloodMagicConfiguration.syncConfig();
+ AlchemicalWizardry.logger.info("Refreshing configuration file.");
+ BloodMagicConfiguration.syncConfig();
+ }
+ }
+
+ @Optional.Method(modid = "Botania")
+ private boolean isManaBurst(Entity projectile)
+ {
+ return projectile instanceof IManaBurst;
+ }
}
diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/GridSpaceHolder.java b/src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/GridSpaceHolder.java
index 414ee130..858a5af4 100644
--- a/src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/GridSpaceHolder.java
+++ b/src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/GridSpaceHolder.java
@@ -1,5 +1,6 @@
package WayofTime.alchemicalWizardry.common.demonVillage;
+import WayofTime.alchemicalWizardry.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.ModBlocks;
import net.minecraft.block.Block;
import net.minecraft.world.World;
@@ -64,8 +65,6 @@ public class GridSpaceHolder
{
GridSpace[][] newGrid = new GridSpace[negXRadius + posXRadius + 1][negZRadius + posZRadius + 2];
- System.out.println("x " + newGrid.length + "z " + newGrid[0].length);
-
for (int i = 0; i <= negXRadius + posXRadius; i++)
{
newGrid[i][0] = new GridSpace();
@@ -147,7 +146,7 @@ public class GridSpaceHolder
{
if (master != null)
{
- System.out.println("negXRadius: " + negXRadius + " posXRadius: " + posXRadius + " negZRadius: " + negZRadius + " posZRadius: " + posZRadius);
+ AlchemicalWizardry.logger.info("negXRadius: " + negXRadius + " posXRadius: " + posXRadius + " negZRadius: " + negZRadius + " posZRadius: " + posZRadius);
for (int i = -negXRadius; i <= posXRadius; i++)
{
for (int j = -negZRadius; j <= posZRadius; j++)
@@ -158,7 +157,7 @@ public class GridSpaceHolder
continue;
}
- System.out.println("x: " + i + " z: " + j);
+ AlchemicalWizardry.logger.info("x: " + i + " z: " + j);
int xOff = 0;
int zOff = 0;
@@ -195,7 +194,7 @@ public class GridSpaceHolder
public void setAllGridSpaces(int xInit, int zInit, int yLevel, ForgeDirection dir, int type, GridSpaceHolder master)
{
- System.out.println("Grid space selected: (" + xInit + "," + zInit + ")");
+ AlchemicalWizardry.logger.info("Grid space selected: (" + xInit + "," + zInit + ")");
if (master != null)
{
for (int i = -negXRadius; i <= posXRadius; i++)
@@ -231,7 +230,7 @@ public class GridSpaceHolder
break;
}
- System.out.println("Grid space (" + (xInit + xOff) + "," + (zInit + zOff) + ")");
+ AlchemicalWizardry.logger.info("Grid space (" + (xInit + xOff) + "," + (zInit + zOff) + ")");
master.setGridSpace(xInit + xOff, zInit + zOff, new GridSpace(type, yLevel));
}
diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/tileEntity/TEDemonPortal.java b/src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/tileEntity/TEDemonPortal.java
index bf1aa1fa..b49415a5 100644
--- a/src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/tileEntity/TEDemonPortal.java
+++ b/src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/tileEntity/TEDemonPortal.java
@@ -1,19 +1,14 @@
package WayofTime.alchemicalWizardry.common.demonVillage.tileEntity;
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Random;
-import java.util.Set;
-
+import WayofTime.alchemicalWizardry.AlchemicalWizardry;
+import WayofTime.alchemicalWizardry.common.Int3;
+import WayofTime.alchemicalWizardry.common.block.BlockTeleposer;
+import WayofTime.alchemicalWizardry.common.demonVillage.*;
+import WayofTime.alchemicalWizardry.common.demonVillage.demonHoard.DemonPacketRegistry;
+import WayofTime.alchemicalWizardry.common.demonVillage.demonHoard.DemonType;
+import WayofTime.alchemicalWizardry.common.demonVillage.demonHoard.demon.IHoardDemon;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
import net.minecraft.block.Block;
import net.minecraft.entity.EntityCreature;
import net.minecraft.entity.EntityLivingBase;
@@ -24,20 +19,13 @@ import net.minecraft.nbt.NBTTagList;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.util.Constants;
import net.minecraftforge.common.util.ForgeDirection;
-import WayofTime.alchemicalWizardry.common.Int3;
-import WayofTime.alchemicalWizardry.common.block.BlockTeleposer;
-import WayofTime.alchemicalWizardry.common.demonVillage.BuildingSchematic;
-import WayofTime.alchemicalWizardry.common.demonVillage.DemonBuilding;
-import WayofTime.alchemicalWizardry.common.demonVillage.DemonCrosspath;
-import WayofTime.alchemicalWizardry.common.demonVillage.DemonVillagePath;
-import WayofTime.alchemicalWizardry.common.demonVillage.GridSpace;
-import WayofTime.alchemicalWizardry.common.demonVillage.GridSpaceHolder;
-import WayofTime.alchemicalWizardry.common.demonVillage.demonHoard.DemonPacketRegistry;
-import WayofTime.alchemicalWizardry.common.demonVillage.demonHoard.DemonType;
-import WayofTime.alchemicalWizardry.common.demonVillage.demonHoard.demon.IHoardDemon;
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.util.*;
+import java.util.Map.Entry;
public class TEDemonPortal extends TileEntity
{
@@ -240,11 +228,11 @@ public class TEDemonPortal extends TileEntity
this.incrementPoints();
this.assignPoints();
- System.out.println("Roads: " + roadCooldown + " Buildings: " + houseCooldown);
+ AlchemicalWizardry.logger.info("Roads: " + roadCooldown + " Buildings: " + houseCooldown);
if(buildingStage >= 0 && buildingStage <=2)
{
- System.out.println("BuildingStage = " + buildingStage);
+ AlchemicalWizardry.logger.info("BuildingStage = " + buildingStage);
this.createPortalBuilding(buildingStage, nextDemonPortalName, tier);
buildingStage++;
return;
@@ -463,7 +451,7 @@ public class TEDemonPortal extends TileEntity
int z = road.zCoord;
if(printDebug)
- System.out.println("X: " + x + " Z: " + z + " Direction: " + dir.toString());
+ AlchemicalWizardry.logger.info("X: " + x + " Z: " + z + " Direction: " + dir.toString());
List<ForgeDirection> directions = this.findValidExtentionDirection(x, z);
@@ -495,9 +483,9 @@ public class TEDemonPortal extends TileEntity
return 0;
}
if(printDebug)
- System.out.println("I got here!");
+ AlchemicalWizardry.logger.info("I got here!");
if(printDebug)
- System.out.println("Distance: " + distance + " Direction: " + dominantDirection.toString() + " yLevel: " + yLevel);
+ AlchemicalWizardry.logger.info("Distance: " + distance + " Direction: " + dominantDirection.toString() + " yLevel: " + yLevel);
this.createGriddedRoad(x, yLevel, z, dominantDirection, distance + 1, true);
@@ -859,7 +847,7 @@ public class TEDemonPortal extends TileEntity
{
initY = next.yCoord;
if(printDebug)
- System.out.println("" + initY);
+ AlchemicalWizardry.logger.info("" + initY);
}
initGridX += dir.offsetX;
@@ -918,7 +906,7 @@ public class TEDemonPortal extends TileEntity
GridSpace[][] newGrid = new GridSpace[negXRadius + posXRadius + 1][negZRadius + posZRadius + 2];
if(printDebug)
- System.out.println("x " + newGrid.length + "z " + newGrid[0].length);
+ AlchemicalWizardry.logger.info("x " + newGrid.length + "z " + newGrid[0].length);
for (int i = 0; i <= negXRadius + posXRadius; i++)
{
@@ -1033,7 +1021,7 @@ public class TEDemonPortal extends TileEntity
public int createPortalBuilding(int buildingTier) //TODO Telepose block next time, then build the new building.
{
- System.out.println("Hello, I am here!");
+ AlchemicalWizardry.logger.info("Hello, I am here!");
int x = 0;
int z = 0;
@@ -1189,7 +1177,7 @@ public class TEDemonPortal extends TileEntity
int yLevel = space.yCoord;
if(printDebug)
- System.out.println("Road space - x: " + x + " z: " + z);
+ AlchemicalWizardry.logger.info("Road space - x: " + x + " z: " + z);
GridSpaceHolder grid = this.createGSH();
@@ -1240,7 +1228,7 @@ public class TEDemonPortal extends TileEntity
}
} else
{
- System.out.println("This ISN'T valid!");
+ AlchemicalWizardry.logger.info("This ISN'T valid!");
}
}
}
diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/ItemFluidSigil.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/ItemFluidSigil.java
index 38331762..451cbef5 100644
--- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/ItemFluidSigil.java
+++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/ItemFluidSigil.java
@@ -356,7 +356,7 @@ public class ItemFluidSigil extends Item implements IFluidContainerItem
}
Fluid fluid = FluidRegistry.lookupFluidForBlock(block);
- System.out.println("x: " + (i - range) + " y: " + (j - range) + " z: " + (k - range));
+ AlchemicalWizardry.logger.info("x: " + (i - range) + " y: " + (j - range) + " z: " + (k - range));
if (fluid == null || world.getBlockMetadata(x + i - range, y + j - range, z + k - range) != 0)
diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/tool/DigAreaTunnel.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/tool/DigAreaTunnel.java
index b0b3cc83..e18317f4 100644
--- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/tool/DigAreaTunnel.java
+++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/tool/DigAreaTunnel.java
@@ -1,5 +1,6 @@
package WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.tool;
+import WayofTime.alchemicalWizardry.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.items.spell.ItemSpellMultiTool;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
@@ -37,7 +38,7 @@ public class DigAreaTunnel extends DigAreaEffect
ForgeDirection sidehit = ForgeDirection.getOrientation(blockPos.sideHit);
ForgeDirection opposite = sidehit.getOpposite();
- System.out.println(opposite.toString());
+ AlchemicalWizardry.logger.info(opposite.toString());
double initialLength = this.getRandomVectorLength();
@@ -149,7 +150,7 @@ public class DigAreaTunnel extends DigAreaEffect
public void travelVector(Vec3 vector, World world, double x, double y, double z)
{
double vecLength = vector.lengthVector();
- System.out.println(vecLength);
+ AlchemicalWizardry.logger.info(vecLength);
Vec3 normVec = Vec3.createVectorHelper(vector.xCoord, vector.yCoord, vector.zCoord);
normVec = normVec.normalize();
@@ -158,7 +159,7 @@ public class DigAreaTunnel extends DigAreaEffect
while (distanceTravelled < vecLength)
{
- System.out.println(distanceTravelled);
+ AlchemicalWizardry.logger.info(distanceTravelled);
double stepLength = this.getRandomStepLength();
prevVec = prevVec.addVector(stepLength * normVec.xCoord, stepLength * normVec.yCoord, normVec.zCoord);
diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TESchematicSaver.java b/src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TESchematicSaver.java
index de8d6967..b1aa3e94 100644
--- a/src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TESchematicSaver.java
+++ b/src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TESchematicSaver.java
@@ -1,5 +1,6 @@
package WayofTime.alchemicalWizardry.common.tileEntity;
+import WayofTime.alchemicalWizardry.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.ModBlocks;
import WayofTime.alchemicalWizardry.common.demonVillage.BuildingSchematic;
import com.google.gson.Gson;
@@ -45,13 +46,13 @@ public class TESchematicSaver extends TileEntity
}
}
- System.out.println("" + i);
+ AlchemicalWizardry.logger.info("" + i);
}
- System.out.println("I got here!");
+ AlchemicalWizardry.logger.info("I got here!");
Gson gson = new GsonBuilder().setPrettyPrinting().create();
String json = gson.toJson(schematic);
- System.out.println("Here, too!");
+ AlchemicalWizardry.logger.info("Here, too!");
Writer writer;
try
{
From aa16a13057fb06a58a1037656b158780d93c42cf Mon Sep 17 00:00:00 2001
From: TehNut <tehnut@tehnut.com>
Date: Mon, 3 Nov 2014 16:27:51 -0800
Subject: [PATCH 2/2] Include @Arcratus's config changes
---
.../AlchemicalWizardry.java | 32 +++
.../BloodMagicConfiguration.java | 186 +++++++++++++++++-
.../client/gui/ConfigGui.java | 1 +
3 files changed, 218 insertions(+), 1 deletion(-)
diff --git a/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java b/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java
index 6ba0281b..c603c20a 100644
--- a/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java
+++ b/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java
@@ -131,6 +131,37 @@ public class AlchemicalWizardry
public static int customPotionDeafID;
public static int customPotionFeatherFallID;
+ public static boolean ritualDisabledWater;
+ public static boolean ritualDisabledLava;
+ public static boolean ritualDisabledGreenGrove;
+ public static boolean ritualDisabledInterdiction;
+ public static boolean ritualDisabledContainment;
+ public static boolean ritualDisabledBinding;
+ public static boolean ritualDisabledUnbinding;
+ public static boolean ritualDisabledHighJump;
+ public static boolean ritualDisabledMagnetism;
+ public static boolean ritualDisabledCrusher;
+ public static boolean ritualDisabledSpeed;
+ public static boolean ritualDisabledAnimalGrowth;
+ public static boolean ritualDisabledSuffering;
+ public static boolean ritualDisabledRegen;
+ public static boolean ritualDisabledFeatheredKnife;
+ public static boolean ritualDisabledFeatheredEarth;
+ public static boolean ritualDisabledGaia;
+ public static boolean ritualDisabledCondor;
+ public static boolean ritualDisabledFallingTower;
+ public static boolean ritualDisabledBalladOfAlchemy;
+ public static boolean ritualDisabledExpulsion;
+ public static boolean ritualDisabledSuppression;
+ public static boolean ritualDisabledZephyr;
+ public static boolean ritualDisabledHarvest;
+ public static boolean ritualDisabledConduit;
+ public static boolean ritualDisabledEllipsoid;
+ public static boolean ritualDisabledEvaporation;
+ public static boolean ritualDisabledSpawnWard;
+ public static boolean ritualDisabledVeilOfEvil;
+ public static boolean ritualDisabledFullStomach;
+
public static boolean isThaumcraftLoaded;
public static boolean isForestryLoaded;
public static boolean isBotaniaLoaded;
@@ -872,6 +903,7 @@ public class AlchemicalWizardry
this.isBotaniaLoaded = Loader.isModLoaded("Botania");
BloodMagicConfiguration.loadBlacklist();
+ BloodMagicConfiguration.blacklistRituals();
}
public static void initAlchemyPotionRecipes()
diff --git a/src/main/java/WayofTime/alchemicalWizardry/BloodMagicConfiguration.java b/src/main/java/WayofTime/alchemicalWizardry/BloodMagicConfiguration.java
index ef4d1eb1..887e2119 100644
--- a/src/main/java/WayofTime/alchemicalWizardry/BloodMagicConfiguration.java
+++ b/src/main/java/WayofTime/alchemicalWizardry/BloodMagicConfiguration.java
@@ -1,5 +1,6 @@
package WayofTime.alchemicalWizardry;
+import WayofTime.alchemicalWizardry.api.rituals.Rituals;
import WayofTime.alchemicalWizardry.client.renderer.ColourThreshold;
import WayofTime.alchemicalWizardry.client.renderer.RenderHelper;
import WayofTime.alchemicalWizardry.common.summoning.meteor.MeteorParadigm;
@@ -100,6 +101,37 @@ public class BloodMagicConfiguration
// AlchemicalWizardry.lockdownAltar = config.get("WimpySettings", "LockdownAltarWithRegen", true).getBoolean();
AlchemicalWizardry.lockdownAltar = false;
+ AlchemicalWizardry.ritualDisabledWater = config.get("Ritual Blacklist", "Ritual of the Full Spring", false).getBoolean(false);
+ AlchemicalWizardry.ritualDisabledLava = config.get("Ritual Blacklist", "Serenade of the Nether", false).getBoolean(false);
+ AlchemicalWizardry.ritualDisabledGreenGrove = config.get("Ritual Blacklist", "Ritual of the Green Grove", false).getBoolean(false);
+ AlchemicalWizardry.ritualDisabledInterdiction = config.get("Ritual Blacklist", "Interdiction Ritual", false).getBoolean(false);
+ AlchemicalWizardry.ritualDisabledContainment = config.get("Ritual Blacklist", "Ritual of Containment", false).getBoolean(false);
+ AlchemicalWizardry.ritualDisabledBinding = config.get("Ritual Blacklist", "Ritual of Binding", false).getBoolean(false);
+ AlchemicalWizardry.ritualDisabledUnbinding = config.get("Ritual Blacklist", "Ritual of Unbinding", false).getBoolean(false);
+ AlchemicalWizardry.ritualDisabledHighJump = config.get("Ritual Blacklist", "Ritual of the High Jump", false).getBoolean(false);
+ AlchemicalWizardry.ritualDisabledMagnetism = config.get("Ritual Blacklist", "Ritual of Magnetism", false).getBoolean(false);
+ AlchemicalWizardry.ritualDisabledCrusher = config.get("Ritual Blacklist", "Ritual of the Crusher", false).getBoolean(false);
+ AlchemicalWizardry.ritualDisabledSpeed = config.get("Ritual Blacklist", "Ritual of Speed", false).getBoolean(false);
+ AlchemicalWizardry.ritualDisabledAnimalGrowth = config.get("Ritual Blacklist", "Ritual of the Shepherd", false).getBoolean(false);
+ AlchemicalWizardry.ritualDisabledSuffering = config.get("Ritual Blacklist", "Well of Suffering", false).getBoolean(false);
+ AlchemicalWizardry.ritualDisabledRegen = config.get("Ritual Blacklist", "Ritual of Regeneration", false).getBoolean(false);
+ AlchemicalWizardry.ritualDisabledFeatheredKnife = config.get("Ritual Blacklist", "Ritual of the Feathered Knife", false).getBoolean(false);
+ AlchemicalWizardry.ritualDisabledFeatheredEarth = config.get("Ritual Blacklist", "Ritual of the Feathered Earth", false).getBoolean(false);
+ AlchemicalWizardry.ritualDisabledGaia = config.get("Ritual Blacklist", "Ritual of Gaia's Transformation", false).getBoolean(false);
+ AlchemicalWizardry.ritualDisabledCondor = config.get("Ritual Blacklist", "Reverence of the Condor", false).getBoolean(false);
+ AlchemicalWizardry.ritualDisabledFallingTower = config.get("Ritual Blacklist", "Mark of the Falling Tower", false).getBoolean(false);
+ AlchemicalWizardry.ritualDisabledBalladOfAlchemy = config.get("Ritual Blacklist", "Ballad of Alchemy", false).getBoolean(false);
+ AlchemicalWizardry.ritualDisabledExpulsion = config.get("Ritual Blacklist", "Aura of Expulsion", false).getBoolean(false);
+ AlchemicalWizardry.ritualDisabledSuppression = config.get("Ritual Blacklist", "Dome of Supression", false).getBoolean(false);
+ AlchemicalWizardry.ritualDisabledZephyr = config.get("Ritual Blacklist", "Call of the Zephyr", false).getBoolean(false);
+ AlchemicalWizardry.ritualDisabledHarvest = config.get("Ritual Blacklist", "Reap of the Harvest Moon", false).getBoolean(false);
+ AlchemicalWizardry.ritualDisabledConduit = config.get("Ritual Blacklist", "Cry of the Eternal Soul", false).getBoolean(false);
+ AlchemicalWizardry.ritualDisabledEllipsoid = config.get("Ritual Blacklist", "Focus of the Ellipsoid", false).getBoolean(false);
+ AlchemicalWizardry.ritualDisabledEvaporation = config.get("Ritual Blacklist", "Song of Evaporation", false).getBoolean(false);
+ AlchemicalWizardry.ritualDisabledSpawnWard = config.get("Ritual Blacklist", "Ward of Sacrosanctity", false).getBoolean(false);
+ AlchemicalWizardry.ritualDisabledVeilOfEvil = config.get("Ritual Blacklist", "Veil of Evil", false).getBoolean(false);
+ AlchemicalWizardry.ritualDisabledFullStomach = config.get("Ritual Blacklist", "Requiem of the Satiated Stomach", false).getBoolean(false);
+
Side side = FMLCommonHandler.instance().getSide();
if (side == Side.CLIENT)
{
@@ -145,5 +177,157 @@ public class BloodMagicConfiguration
config.save();
}
-
+ public static void blacklistRituals()
+ {
+ if (AlchemicalWizardry.ritualDisabledWater)
+ {
+ Rituals.ritualMap.remove("AW001Water");
+ Rituals.keyList.remove("AW001Water");
+ }
+ if (AlchemicalWizardry.ritualDisabledLava)
+ {
+ Rituals.ritualMap.remove("AW002Lava");
+ Rituals.keyList.remove("AW002Lava");
+ }
+ if (AlchemicalWizardry.ritualDisabledGreenGrove)
+ {
+ Rituals.ritualMap.remove("AW003GreenGrove");
+ Rituals.keyList.remove("AW003GreenGrove");
+ }
+ if (AlchemicalWizardry.ritualDisabledInterdiction)
+ {
+ Rituals.ritualMap.remove("AW004Interdiction");
+ Rituals.keyList.remove("AW004Interdiction");
+ }
+ if (AlchemicalWizardry.ritualDisabledContainment)
+ {
+ Rituals.ritualMap.remove("AW005Containment");
+ Rituals.keyList.remove("AW005Containment");
+ }
+ if (AlchemicalWizardry.ritualDisabledBinding)
+ {
+ Rituals.ritualMap.remove("AW006Binding");
+ Rituals.keyList.remove("AW006Binding");
+ }
+ if (AlchemicalWizardry.ritualDisabledUnbinding)
+ {
+ Rituals.ritualMap.remove("AW007Unbinding");//007 reporting for duty
+ Rituals.keyList.remove("AW007Unbinding");
+ }
+ if (AlchemicalWizardry.ritualDisabledHighJump)
+ {
+ Rituals.ritualMap.remove("AW008HighJump");
+ Rituals.keyList.remove("AW008HighJump");
+ }
+ if (AlchemicalWizardry.ritualDisabledMagnetism)
+ {
+ Rituals.ritualMap.remove("AW009Magnetism");
+ Rituals.keyList.remove("AW009Magnetism");
+ }
+ if (AlchemicalWizardry.ritualDisabledCrusher)
+ {
+ Rituals.ritualMap.remove("AW010Crusher");
+ Rituals.keyList.remove("AW010Crusher");
+ }
+ if (AlchemicalWizardry.ritualDisabledSpeed)
+ {
+ Rituals.ritualMap.remove("AW011Speed");
+ Rituals.keyList.remove("AW011Speed");
+ }
+ if (AlchemicalWizardry.ritualDisabledAnimalGrowth)
+ {
+ Rituals.ritualMap.remove("AW012AnimalGrowth");
+ Rituals.keyList.remove("AW012AnimalGrowth");
+ }
+ if (AlchemicalWizardry.ritualDisabledSuffering)
+ {
+ Rituals.ritualMap.remove("AW013Suffering");
+ Rituals.keyList.remove("AW013Suffering");
+ }
+ if (AlchemicalWizardry.ritualDisabledRegen)
+ {
+ Rituals.ritualMap.remove("AW014Regen");
+ Rituals.keyList.remove("AW014Regen");
+ }
+ if (AlchemicalWizardry.ritualDisabledFeatheredKnife)
+ {
+ Rituals.ritualMap.remove("AW015FeatheredKnife");
+ Rituals.keyList.remove("AW015FeatheredKnife");
+ }
+ if (AlchemicalWizardry.ritualDisabledFeatheredEarth)
+ {
+ Rituals.ritualMap.remove("AW016FeatheredEarth");
+ Rituals.keyList.remove("AW016FeatheredEarth");
+ }
+ if (AlchemicalWizardry.ritualDisabledGaia)
+ {
+ Rituals.ritualMap.remove("AW017Gaia");
+ Rituals.keyList.remove("AW017Gaia");
+ }
+ if (AlchemicalWizardry.ritualDisabledCondor)
+ {
+ Rituals.ritualMap.remove("AW018Condor");
+ Rituals.keyList.remove("AW018Condor");
+ }
+ if (AlchemicalWizardry.ritualDisabledFallingTower)
+ {
+ Rituals.ritualMap.remove("AW019FallingTower");
+ Rituals.keyList.remove("AW019FallingTower");
+ }
+ if (AlchemicalWizardry.ritualDisabledBalladOfAlchemy)
+ {
+ Rituals.ritualMap.remove("AW020BalladOfAlchemy");
+ Rituals.keyList.remove("AW020BalladOfAlchemy");
+ }
+ if (AlchemicalWizardry.ritualDisabledExpulsion)
+ {
+ Rituals.ritualMap.remove("AW021Expulsion");
+ Rituals.keyList.remove("AW021Expulsion");
+ }
+ if (AlchemicalWizardry.ritualDisabledSuppression)
+ {
+ Rituals.ritualMap.remove("AW022Suppression");
+ Rituals.keyList.remove("AW022Suppression");
+ }
+ if (AlchemicalWizardry.ritualDisabledZephyr)
+ {
+ Rituals.ritualMap.remove("AW023Zephyr");
+ Rituals.keyList.remove("AW023Zephyr");
+ }
+ if (AlchemicalWizardry.ritualDisabledHarvest)
+ {
+ Rituals.ritualMap.remove("AW024Harvest");
+ Rituals.keyList.remove("AW024Harvest");
+ }
+ if (AlchemicalWizardry.ritualDisabledConduit)
+ {
+ Rituals.ritualMap.remove("AW025Conduit");
+ Rituals.keyList.remove("AW025Conduit");
+ }
+ if (AlchemicalWizardry.ritualDisabledEllipsoid)
+ {
+ Rituals.ritualMap.remove("AW026Ellipsoid");
+ Rituals.keyList.remove("AW026Ellipsoid");
+ }
+ if (AlchemicalWizardry.ritualDisabledEvaporation)
+ {
+ Rituals.ritualMap.remove("AW027Evaporation");
+ Rituals.keyList.remove("AW027Evaporation");
+ }
+ if (AlchemicalWizardry.ritualDisabledSpawnWard)
+ {
+ Rituals.ritualMap.remove("AW028SpawnWard");
+ Rituals.keyList.remove("AW028SpawnWard");
+ }
+ if (AlchemicalWizardry.ritualDisabledVeilOfEvil)
+ {
+ Rituals.ritualMap.remove("AW029VeilOfEvil");
+ Rituals.keyList.remove("AW029VeilOfEvil");
+ }
+ if (AlchemicalWizardry.ritualDisabledFullStomach)
+ {
+ Rituals.ritualMap.remove("AW030FullStomach");
+ Rituals.keyList.remove("AW030FullStomach");
+ }
+ }
}
diff --git a/src/main/java/WayofTime/alchemicalWizardry/client/gui/ConfigGui.java b/src/main/java/WayofTime/alchemicalWizardry/client/gui/ConfigGui.java
index 3976c8d4..ace56f5f 100644
--- a/src/main/java/WayofTime/alchemicalWizardry/client/gui/ConfigGui.java
+++ b/src/main/java/WayofTime/alchemicalWizardry/client/gui/ConfigGui.java
@@ -29,6 +29,7 @@ public class ConfigGui extends GuiConfig {
list.add(new ConfigElement<ConfigCategory>(config.getCategory("potion id".toLowerCase())));
list.add(new ConfigElement<ConfigCategory>(config.getCategory("wellofsufferingblacklist".toLowerCase())));
list.add(new ConfigElement<ConfigCategory>(config.getCategory("wimpysettings".toLowerCase())));
+ list.add(new ConfigElement<ConfigCategory>(config.getCategory("ritual blacklist".toLowerCase())));
return list;
}