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?
This commit is contained in:
parent
d8f267b7e3
commit
31e154a980
|
@ -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"));
|
||||
}
|
||||
|
||||
|
|
|
@ -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();
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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
|
||||
|
|
Binary file not shown.
After Width: | Height: | Size: 765 B |
Loading…
Reference in a new issue