lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Implement Entity blacklist for WoS

Browse source
This commit is contained in:
Nick 2016-01-09 18:05:21 -08:00
parent 9eee22affc
commit 351aa3e74c
3 changed files with 21 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/main/java/WayofTime/bloodmagic/ConfigHandler.java
View file

@ -14,6 +14,7 @@ import net.minecraftforge.fml.common.registry.GameRegistry;
import net.minecraftforge.oredict.OreDictionary;
import java.io.File;
import java.lang.reflect.Array;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@ -32,6 +33,9 @@ public class ConfigHandler
public static List itemBlacklist;
public static List blockBlacklist;
// Well of Suffering Blacklist
public static List<String> wellOfSufferingBlacklist;
// Potion ID's
public static int customPotionDrowningID;
public static int customPotionBoostID;
@ -112,6 +116,10 @@ public class ConfigHandler
teleposerBlacklisting = config.getStringList("teleposerBlacklist", category, new String[] { "minecraft:bedrock" }, "Stops specified blocks from being teleposed. Put entries on new lines. Valid syntax is:\nmodid:blockname:meta");
buildTeleposerBlacklist();
category = "Well of Suffering Blacklist";
config.addCustomCategoryComment(category, "Entity blacklisting from WoS");
wellOfSufferingBlacklist = Arrays.asList(config.getStringList("wellOfSufferingBlacklist", category, new String[] {}, "Use the class name of the Entity to blacklist it from usage.\nIE: EntityWolf, EntityWitch, etc"));
category = "Potions";
config.addCustomCategoryComment(category, "Potion settings");
config.addCustomCategoryComment(category + ".id", "Potion ID settings");

1
src/main/java/WayofTime/bloodmagic/client/gui/config/ConfigGui.java
View file

@ -28,6 +28,7 @@ public class ConfigGui extends GuiConfig
list.add(new ConfigElement(ConfigHandler.getConfig().getCategory("Potions".toLowerCase())));
list.add(new ConfigElement(ConfigHandler.getConfig().getCategory("Compatibility".toLowerCase())));
list.add(new ConfigElement(ConfigHandler.getConfig().getCategory("Teleposer Blacklist".toLowerCase())));
list.add(new ConfigElement(ConfigHandler.getConfig().getCategory("Well of Suffering Blacklist".toLowerCase())));
list.add(new ConfigElement(ConfigHandler.getConfig().getCategory("Item/Block Blacklisting".toLowerCase())));
list.add(new ConfigElement(ConfigHandler.getConfig().getCategory("General".toLowerCase())));
list.add(new ConfigElement(ConfigHandler.getConfig().getCategory("Rituals".toLowerCase())));

20
src/main/java/WayofTime/bloodmagic/ritual/RitualWellOfSuffering.java
View file

@ -3,6 +3,7 @@ package WayofTime.bloodmagic.ritual;
import java.util.ArrayList;
import java.util.List;
import WayofTime.bloodmagic.ConfigHandler;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity;
@ -87,17 +88,20 @@ public class RitualWellOfSuffering extends Ritual
for (EntityLivingBase entity : entities)
{
if (entity.isEntityAlive() && !(entity instanceof EntityPlayer))
if (!ConfigHandler.wellOfSufferingBlacklist.contains(entity.getClass().getSimpleName()))
{
if (entity.attackEntityFrom(DamageSource.outOfWorld, 1))
if (entity.isEntityAlive() && !(entity instanceof EntityPlayer))
{
tileAltar.sacrificialDaggerCall(SACRIFICE_AMOUNT, true);
totalEffects++;
if (totalEffects >= maxEffects)
if (entity.attackEntityFrom(DamageSource.outOfWorld, 1))
{
break;
tileAltar.sacrificialDaggerCall(SACRIFICE_AMOUNT, true);
totalEffects++;
if (totalEffects >= maxEffects)
{
break;
}
}
}
}