Several minor fixes and mapping fixes

TeamLapen · Apr 16, 2019 · d9077a7 · d9077a7
1 parent 8c99b0e
commit d9077a7
Show file tree

Hide file tree

Showing 8 changed files with 40 additions and 13 deletions.
diff --git a/src/main/java/de/teamlapen/vampirism/core/ModEntities.java b/src/main/java/de/teamlapen/vampirism/core/ModEntities.java
@@ -27,6 +27,7 @@
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.datafix.IFixableData;
 import net.minecraft.world.biome.Biome;
+import net.minecraftforge.event.RegistryEvent;
 import net.minecraftforge.fml.common.registry.EntityEntry;
 import net.minecraftforge.fml.common.registry.EntityEntryBuilder;
 import net.minecraftforge.fml.common.registry.ForgeRegistries;
@@ -283,4 +284,11 @@ private static <T extends Entity> EntityEntryBuilder<T> prepareEntityEntry(Class
     }
 
 
+    static void fixMapping(RegistryEvent.MissingMappings.Mapping<EntityEntry> m) {
+        if (new ResourceLocation("vampirism", "hunter_villager").equals(m.key)) {
+            m.ignore(); //No need to replace
+        } else if (new ResourceLocation("vampirism", "converted_villager").equals(m.key)) {
+            m.ignore();
+        }
+    }
 }
diff --git a/src/main/java/de/teamlapen/vampirism/core/RegistryManager.java b/src/main/java/de/teamlapen/vampirism/core/RegistryManager.java
@@ -28,6 +28,7 @@
 import net.minecraftforge.fml.relauncher.SideOnly;
 import net.minecraftforge.registries.ObjectHolderRegistry;
 
+
 /**
  * Handles registrations of all registrable things as well as a few additional
  * dependent things
@@ -87,10 +88,9 @@ public void onInitStep(Step step, FMLStateEvent event) {
     }
 
     @SubscribeEvent
-    public void onMissinMappingsPotion(RegistryEvent.MissingMappings<SoundEvent> event) {
-
-        for (RegistryEvent.MissingMappings.Mapping<SoundEvent> m : event.getMappings()) {
-            m.ignore();
+    public void onMissingMappingsEntity(RegistryEvent.MissingMappings<EntityEntry> event) {
+        for (RegistryEvent.MissingMappings.Mapping<EntityEntry> m : event.getMappings()) {
+            ModEntities.fixMapping(m);
         }
     }
 
@@ -120,6 +120,21 @@ public void onMissingMappingsPotion(RegistryEvent.MissingMappings<Potion> event)
         }
     }
 
+    @SubscribeEvent
+    public void onMissingMappingsSkill(RegistryEvent.MissingMappings<ISkill> event) {
+        for (RegistryEvent.MissingMappings.Mapping<ISkill> m : event.getMappings()) {
+            VampireSkills.fixMapping(m);
+        }
+    }
+
+    @SubscribeEvent
+    public void onMissingMappingsSoundEvent(RegistryEvent.MissingMappings<SoundEvent> event) {
+
+        for (RegistryEvent.MissingMappings.Mapping<SoundEvent> m : event.getMappings()) {
+            m.ignore();
+        }
+    }
+
     @SubscribeEvent
     public void onRegisterActions(RegistryEvent.Register<IAction> event) {
 

diff --git a/src/main/java/de/teamlapen/vampirism/entity/hunter/EntityBasicHunter.java b/src/main/java/de/teamlapen/vampirism/entity/hunter/EntityBasicHunter.java
@@ -359,7 +359,6 @@ protected ResourceLocation getLootTable() {
 
     @Override
     public void attackVillage(AxisAlignedBB area) {
-        this.setCustomNameTag("Attacking Village");
         this.village_attack_area = area;
     }
 
@@ -416,7 +415,6 @@ protected boolean processInteract(EntityPlayer player, EnumHand hand) {
 
     @Override
     public void defendVillage(AxisAlignedBB area) {
-        this.setCustomNameTag("Defending Village");
         this.village_defense_area = area;
     }
 

diff --git a/src/main/java/de/teamlapen/vampirism/entity/vampire/EntityBasicVampire.java b/src/main/java/de/teamlapen/vampirism/entity/vampire/EntityBasicVampire.java
@@ -11,8 +11,8 @@
 import de.teamlapen.vampirism.config.Balance;
 import de.teamlapen.vampirism.core.ModPotions;
 import de.teamlapen.vampirism.core.ModSounds;
-import de.teamlapen.vampirism.entity.ai.EntityAIDefendVillage;
 import de.teamlapen.vampirism.entity.action.EntityActionHandler;
+import de.teamlapen.vampirism.entity.ai.EntityAIDefendVillage;
 import de.teamlapen.vampirism.entity.ai.*;
 import de.teamlapen.vampirism.entity.hunter.EntityHunterBase;
 import de.teamlapen.vampirism.world.loot.LootHandler;
@@ -38,6 +38,7 @@
 import net.minecraft.world.EnumDifficulty;
 import net.minecraft.world.World;
 import net.minecraftforge.fml.common.FMLCommonHandler;
+
 import javax.annotation.Nullable;
 
 /**
@@ -293,14 +294,12 @@ protected ResourceLocation getLootTable() {
     public void attackVillage(AxisAlignedBB area) {
         this.tasks.removeTask(tasks_avoidHunter);
         village_attack_area = area;
-        this.setCustomNameTag("Attacking Village");//TODO Debug
     }
 
     @Override
     public void defendVillage(AxisAlignedBB area) {
         this.tasks.removeTask(tasks_avoidHunter);
         village_defense_area = area;
-        this.setCustomNameTag("Defending Village"); //TODO Debug
     }
 
     @Nullable

diff --git a/src/main/java/de/teamlapen/vampirism/player/vampire/VampirePlayer.java b/src/main/java/de/teamlapen/vampirism/player/vampire/VampirePlayer.java
@@ -226,7 +226,6 @@ public void biteEntity(int entityId) {
         if (e instanceof EntityLivingBase) {
             if (e.getDistance(player) <= player.getEntityAttribute(EntityPlayer.REACH_DISTANCE).getAttributeValue() + 1) {
                 feed_victim_bite_type = determineBiteType((EntityLivingBase) e);
-                VampirismMod.log.t("bitetype: %s", feed_victim_bite_type.name());
                 if (feed_victim_bite_type == BITE_TYPE.ATTACK || feed_victim_bite_type == BITE_TYPE.ATTACK_HUNTER || feed_victim_bite_type == BITE_TYPE.HUNTER_CREATURE) {
                     biteAttack((EntityLivingBase) e, feed_victim_bite_type == BITE_TYPE.ATTACK_HUNTER);
                 } else if (feed_victim_bite_type == BITE_TYPE.NONE) {

diff --git a/src/main/java/de/teamlapen/vampirism/player/vampire/actions/BatVampireAction.java b/src/main/java/de/teamlapen/vampirism/player/vampire/actions/BatVampireAction.java
@@ -1,6 +1,7 @@
 package de.teamlapen.vampirism.player.vampire.actions;
 
 import de.teamlapen.vampirism.advancements.VampireActionTrigger;
+import de.teamlapen.vampirism.api.EnumStrength;
 import de.teamlapen.vampirism.api.entity.player.actions.ILastingAction;
 import de.teamlapen.vampirism.api.entity.player.vampire.DefaultVampireAction;
 import de.teamlapen.vampirism.api.entity.player.vampire.IVampirePlayer;
@@ -83,7 +84,7 @@ public boolean activate(IVampirePlayer vampire) {
 
     @Override
     public boolean canBeUsedBy(IVampirePlayer vampire) {
-        return !vampire.isGettingSundamage() && !vampire.getActionHandler().isActionActive(VampireActions.vampire_rage) && !vampire.getRepresentingPlayer().isInWater() && (Configs.bat_mode_in_end || !(vampire.getRepresentingPlayer().getEntityWorld().provider instanceof WorldProviderEnd));
+        return !vampire.isGettingSundamage() && vampire.isGettingGarlicDamage() == EnumStrength.NONE && !vampire.getActionHandler().isActionActive(VampireActions.vampire_rage) && !vampire.getRepresentingPlayer().isInWater() && (Configs.bat_mode_in_end || !(vampire.getRepresentingPlayer().getEntityWorld().provider instanceof WorldProviderEnd));
     }
 
     @Override

diff --git a/src/main/java/de/teamlapen/vampirism/player/vampire/skills/VampireSkills.java b/src/main/java/de/teamlapen/vampirism/player/vampire/skills/VampireSkills.java
@@ -17,6 +17,7 @@
 import net.minecraft.entity.SharedMonsterAttributes;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.text.TextFormatting;
+import net.minecraftforge.event.RegistryEvent;
 import net.minecraftforge.fml.common.registry.GameRegistry;
 import net.minecraftforge.registries.IForgeRegistry;
 
@@ -266,4 +267,10 @@ private static void registerDefensiveSkills(ISkillManager skillManager, SkillNod
 
 
     }
+
+    public static void fixMapping(RegistryEvent.MissingMappings.Mapping<ISkill> m) {
+        if (new ResourceLocation("vampirism:bite1").equals(m.key) || new ResourceLocation("vampirism:bite2").equals(m.key)) {
+            m.ignore();
+        }
+    }
 }
diff --git a/src/main/resources/assets/vampirism/lang/en_US.lang b/src/main/resources/assets/vampirism/lang/en_US.lang
@@ -135,7 +135,7 @@ entity.vampirism.hunter_trainer.name=Vampire Hunter Trainer
 entity.vampirism.hunter_trainer_dummy.name=Undercover Hunter Trainer
 entity.vampirism.advanced_vampire.name=Advanced Vampire
 entity.vampirism.advanced_hunter.name=Advanced Hunter
-entity.vampirism.hunter_villager.name=Angry Villager
+entity.vampirism.villager_angry.name=Angry Villager
 entity.vampirism.vampire_hunter.name=Vampire Hunter
 entity.vampirism.vampire.name=Vampire
 entity.vampirism.ghost.name=Ghost
@@ -146,7 +146,7 @@ entity.vampirism.blinding_bat.name=Bat
 entity.vampirism.dracula.name=Dracula
 entity.vampirism.dead_mob.name=Dead mob
 entity.vampirism.portal_guard.name=Portal Guard
-entity.vampirism.converted_villager.name=Vampire Villager
+entity.vampirism.villager_converted.name=Vampire Villager
 entity.vampirism.villager_vampire_faction.name=Vampire Expert
 entity.vampirism.villager_hunter_faction.name=Hunter Expert
 text.vampirism.entity_level=Level