fujin/Wizardry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change whitelist/blacklist storage from strings to resourcelocations to bring it in line with the registry system

Browse Source
This commit is contained in:
Electroblob
2018-06-03 22:17:57 +01:00
parent 4e6780a3cf
commit 5ba92e5de5
5 changed files with 25 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/electroblob/wizardry/entity/living/EntityEvilWizard.java
+2 -3
View File
@@ -3,7 +3,6 @@ package electroblob.wizardry.entity.living;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Locale;
import com.google.common.base.Predicate;
@@ -118,10 +117,10 @@ public class EntityEvilWizard extends EntityMob implements ISpellCaster, IEntity
|| (entity instanceof ISummonedCreature || entity instanceof EntityWizard
// ... or in the whitelist ...
|| Arrays.asList(Wizardry.settings.summonedCreatureTargetsWhitelist)
.contains(EntityList.getKey(entity.getClass()).toString().toLowerCase(Locale.ROOT)))
.contains(EntityList.getKey(entity.getClass())))
// ... and isn't in the blacklist ...
&& !Arrays.asList(Wizardry.settings.summonedCreatureTargetsBlacklist)
.contains(EntityList.getKey(entity.getClass()).toString().toLowerCase(Locale.ROOT))){
.contains(EntityList.getKey(entity.getClass()))){
// ... it can be attacked.
return true;
}
src/main/java/electroblob/wizardry/entity/living/EntityWizard.java
+2 -3
View File
@@ -5,7 +5,6 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Locale;
import java.util.Random;
import java.util.Set;
@@ -162,10 +161,10 @@ public class EntityWizard extends EntityVillager implements ISpellCaster, IEntit
if((entity instanceof IMob || entity instanceof ISummonedCreature
// ... or in the whitelist ...
|| Arrays.asList(Wizardry.settings.summonedCreatureTargetsWhitelist)
.contains(EntityList.getKey(entity.getClass()).toString().toLowerCase(Locale.ROOT)))
.contains(EntityList.getKey(entity.getClass())))
// ... and isn't in the blacklist ...
&& !Arrays.asList(Wizardry.settings.summonedCreatureTargetsBlacklist)
.contains(EntityList.getKey(entity.getClass()).toString().toLowerCase(Locale.ROOT))){
.contains(EntityList.getKey(entity.getClass()))){
// ... it can be attacked.
return true;
}
src/main/java/electroblob/wizardry/entity/living/ISummonedCreature.java
+2 -3
View File
@@ -2,7 +2,6 @@ package electroblob.wizardry.entity.living;
import java.lang.ref.WeakReference;
import java.util.Arrays;
import java.util.Locale;
import java.util.UUID;
import javax.annotation.Nullable;
@@ -190,10 +189,10 @@ public interface ISummonedCreature extends IEntityAdditionalSpawnData {
|| (entity instanceof EntityWizard && !(getCaster() instanceof EntityWizard))
// ... or in the whitelist ...
|| Arrays.asList(Wizardry.settings.summonedCreatureTargetsWhitelist)
.contains(EntityList.getKey(entity.getClass()).toString().toLowerCase(Locale.ROOT)))
.contains(EntityList.getKey(entity.getClass())))
// ... and isn't in the blacklist ...
&& !Arrays.asList(Wizardry.settings.summonedCreatureTargetsBlacklist)
.contains(EntityList.getKey(entity.getClass()).toString().toLowerCase(Locale.ROOT))){
.contains(EntityList.getKey(entity.getClass()))){
// ... it can be attacked.
return true;
}