From 31e154a98077d77e514de206aa3af2528a3a16c6 Mon Sep 17 00:00:00 2001 From: WayofTime Date: Thu, 18 Dec 2014 13:00:11 -0500 Subject: [PATCH] Added configs to have the Demon Invasion only work when using the Creative Activation Crystal (still uses LP, you scrub.). Re-fixed blood orb so that FakePlayers can't use it. Why did this get re-broken? --- .../alchemicalWizardry/AlchemicalWizardry.java | 4 +++- .../BloodMagicConfiguration.java | 3 +++ .../common/items/ActivationCrystal.java | 11 +++++++++-- .../common/items/EnergyBattery.java | 6 ++++++ .../assets/alchemicalwizardry/lang/en_US.lang | 1 + .../textures/items/activationCrystalCreative.png | Bin 0 -> 765 bytes 6 files changed, 22 insertions(+), 3 deletions(-) create mode 100644 src/main/resources/assets/alchemicalwizardry/textures/items/activationCrystalCreative.png diff --git a/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java b/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java index dc5ee3d9..16234f4c 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java +++ b/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java @@ -419,6 +419,8 @@ public class AlchemicalWizardry public static String entityMinorDemonGruntGuardianWindID = "AW022"; public static String entityMinorDemonGruntGuardianIceID = "AW023"; public static String entityMinorDemonGruntGuardianEarthID = "AW024"; + + public static boolean isDemonRitualCreativeOnly = false; public static Fluid lifeEssenceFluid; @@ -1257,7 +1259,7 @@ public class AlchemicalWizardry Rituals.registerRitual("AW028SpawnWard", 1, 150000, new RitualEffectSpawnWard(), "Ward of Sacrosanctity", new AlchemyCircleRenderer(new ResourceLocation("alchemicalwizardry:textures/models/SimpleTransCircle.png"), 0, 0, 0, 255, 0, 0.501, 0.501, 0, 1.5, false)); Rituals.registerRitual("AW029VeilOfEvil", 1, 150000, new RitualEffectVeilOfEvil(), "Veil of Evil", new AlchemyCircleRenderer(new ResourceLocation("alchemicalwizardry:textures/models/SimpleTransCircle.png"), 0, 0, 0, 255, 0, 0.501, 0.501, 0, 1.5, false)); Rituals.registerRitual("AW030FullStomach", 1, 100000, new RitualEffectFullStomach(), "Requiem of the Satiated Stomach", new AlchemyCircleRenderer(new ResourceLocation("alchemicalwizardry:textures/models/SimpleTransCircle.png"), 0, 0, 0, 255, 0, 0.501, 0.501, 0, 1.5, false)); - Rituals.registerRitual("AW031Convocation", 2, 15000000, new RitualEffectDemonPortal(), "Convocation of the Damned", new AlchemyCircleRenderer(new ResourceLocation("alchemicalwizardry:textures/models/TransCircleDemon.png"), 220, 22, 22, 255, 0, 0.501, 0.501, 0, 5, false)); + Rituals.registerRitual("AW031Convocation",isDemonRitualCreativeOnly ? 10 : 2, 15000000, new RitualEffectDemonPortal(), "Convocation of the Damned", new AlchemyCircleRenderer(new ResourceLocation("alchemicalwizardry:textures/models/TransCircleDemon.png"), 220, 22, 22, 255, 0, 0.501, 0.501, 0, 5, false)); //Rituals.registerRitual(1,100,new RitualEffectApiaryOverclock(),"Apiary Overclock")); } diff --git a/src/main/java/WayofTime/alchemicalWizardry/BloodMagicConfiguration.java b/src/main/java/WayofTime/alchemicalWizardry/BloodMagicConfiguration.java index 57bb63e0..901f681d 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/BloodMagicConfiguration.java +++ b/src/main/java/WayofTime/alchemicalWizardry/BloodMagicConfiguration.java @@ -151,6 +151,9 @@ public class BloodMagicConfiguration DemonVillagePath.createBridgeInAirIfObstructed = config.get(tempDemonConfigs, "createBridgeInAirIfObstructed", false).getBoolean(); TEDemonPortal.limit = config.get(tempDemonConfigs, "demonGridSpaceLimit", 100).getInt(); + + AlchemicalWizardry.isDemonRitualCreativeOnly = config.get(tempDemonConfigs, "IsDemonRitualCreativeOnly", false).getBoolean(); + BoundArmour.tryComplexRendering = config.get("WimpySettings", "UseFancyBoundArmour", true).getBoolean(true); Side side = FMLCommonHandler.instance().getSide(); diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/ActivationCrystal.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/ActivationCrystal.java index 63de5092..ea6f74cf 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/ActivationCrystal.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/ActivationCrystal.java @@ -19,7 +19,7 @@ import java.util.List; public class ActivationCrystal extends EnergyItems { - private static final String[] ACTIVATION_CRYSTAL_NAMES = new String[]{"Weak", "Awakened"}; + private static final String[] ACTIVATION_CRYSTAL_NAMES = new String[]{"Weak", "Awakened", "Creative"}; @SideOnly(Side.CLIENT) private IIcon[] icons; @@ -83,6 +83,13 @@ public class ActivationCrystal extends EnergyItems break; } + + case 2: + { + par3List.add("Creative only - activates any ritual"); + + break; + } } if (!(par1ItemStack.stackTagCompound == null)) @@ -100,7 +107,7 @@ public class ActivationCrystal extends EnergyItems public int getCrystalLevel(ItemStack itemStack) { - return itemStack.getItemDamage() + 1; + return itemStack.getItemDamage() > 1 ? Integer.MAX_VALUE : itemStack.getItemDamage() + 1; } @Override diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBattery.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBattery.java index 23fc6dde..a8148393 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBattery.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBattery.java @@ -56,6 +56,7 @@ public class EnergyBattery extends Item implements ArmourUpgrade, IBindable, IBl { EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer); World world = par3EntityPlayer.worldObj; + if (world != null) { double posX = par3EntityPlayer.posX; @@ -66,6 +67,11 @@ public class EnergyBattery extends Item implements ArmourUpgrade, IBindable, IBl } NBTTagCompound itemTag = par1ItemStack.stackTagCompound; + if(SpellHelper.isFakePlayer(par2World, par3EntityPlayer)) + { + return par1ItemStack; + } + if (itemTag == null || itemTag.getString("ownerName").equals("")) { return par1ItemStack; diff --git a/src/main/resources/assets/alchemicalwizardry/lang/en_US.lang b/src/main/resources/assets/alchemicalwizardry/lang/en_US.lang index 869bf546..077a71fd 100644 --- a/src/main/resources/assets/alchemicalwizardry/lang/en_US.lang +++ b/src/main/resources/assets/alchemicalwizardry/lang/en_US.lang @@ -87,6 +87,7 @@ item.airScribeTool.name=Elemental Inscription Tool: Air item.duskScribeTool.name=Elemental Inscription Tool: Dusk item.activationCrystalWeak.name=Weak Activation Crystal item.activationCrystalAwakened.name=Awakened Activation Crystal +item.activationCrystalCreative.name=Creative Activation Crystal item.boundPickaxe.name=Bound Pickaxe item.boundAxe.name=Bound Axe item.boundShovel.name=Bound Shovel diff --git a/src/main/resources/assets/alchemicalwizardry/textures/items/activationCrystalCreative.png b/src/main/resources/assets/alchemicalwizardry/textures/items/activationCrystalCreative.png new file mode 100644 index 0000000000000000000000000000000000000000..d6ee0b77fd428f8916f9d9370494a9fd8e41d964 GIT binary patch literal 765 zcmVd4I8pr?u03B&m zSad^gZEa<4bN~PV002XBWnpw>WFU8GbZ8()Nlj2>E@cM*00Lo2L_t(I%cYacPZMDj z#ed&0Gi`xBpinSWgklI3B9ux%UEoF&mM%<;(ZroQ{umZ)NR06n6XVY48WM?#yyX3m zfFfX9pmc0IFrD^u;S&X7;@#exlaq6QM@T98pHYuntVM1~Beze9s$-$hJo!i*btnFG zu-ly{053ekcHcgDZ z6na-T6_X|%(@(`;0?TbTWFlNde0G7F>Hux^wP0B&m6f1ryc&9g$XjG90z}sxG)z7b zKQqYNHhanU>`YlW91bGUc4R8W=U5z>HL;|i+2bOyoyA_5W8N&K;dcj%t=Hsk@PML? zPuTtd0*PPRgrZUA-p%l(xP&vsI*Fvgrjfy|72!%&&^hx=r~ujY7W%FvW94wBc0p08 zztl}3lcBk-6~*mF8U|I>)qEHpA+eoC7Bo5m1weC^W6J_*b0553qPiyDtut z=nUYi@=%DyY3#iMx{f>CiuV1@b>}-+i^m}t#FcO#4bt1z>vFG2#avxQN$#M!im9yh z~wk2v0s1$D+Izy(2T(IPpjYRx*jYpG5(3OS^