Permalink
Browse files

Fixed WAILA integration and mob names.

  • Loading branch information...
1 parent ffdf669 commit c994008eff3fa6253fa20fcd06a53024e15f17a4 @CrazyPants CrazyPants committed Jan 11, 2016
View
@@ -21,4 +21,5 @@ bin
*.bak
/run
/*.launch
-/build/tmp/makeStart/extracted
+/build
+
View
@@ -5,6 +5,6 @@ mod_version=1.1
#Comment out this line to get rid of the appendix
#mod_appendix=beta
-waila_version=1.6.0_B1_1.8.1
+waila_version=1.6.0-B3_1.8.8
curse_projectId=225247
@@ -84,7 +84,7 @@ dimensionExclude attributes:
-->
<SpawnConfig>
- <entry id="ConcussionCreeper" mobName="EnderZoo.enderzoo.ConcussionCreeper" creatureType="MONSTER" rate="40"
+ <entry id="ConcussionCreeper" mobName="EnderZoo.ConcussionCreeper" creatureType="MONSTER" rate="40"
minGroupSize="1" maxGroupSize="3" remove="false">
<biomeFilter type="any">
<biome type="BASE_LAND_TYPES" />
@@ -96,7 +96,7 @@ dimensionExclude attributes:
<dimensionExclude name="Dungeon"/>
</entry>
- <entry id="EnderMiny" mobName="EnderZoo.enderzoo.Enderminy" rate="30">
+ <entry id="EnderMiny" mobName="EnderZoo.Enderminy" rate="30">
<biomeFilter type="any">
<biome type="FOREST" />
<biome type="SWAMP" />
@@ -107,7 +107,7 @@ dimensionExclude attributes:
<dimensionExclude name="Twilight Forest"/>
</entry>
- <entry id="FallenKnight" mobName="EnderZoo.enderzoo.FallenKnight" rate="30" minGroupSize="1" maxGroupSize="4">
+ <entry id="FallenKnight" mobName="EnderZoo.FallenKnight" rate="30" minGroupSize="1" maxGroupSize="4">
<biomeFilter type="any">
<biome type="PLAINS" />
<biome type="NETHER" exclude="true" />
@@ -116,7 +116,7 @@ dimensionExclude attributes:
<dimensionExclude name="Twilight Forest"/>
</entry>
- <entry id="WitherWitch" mobName="EnderZoo.enderzoo.WitherWitch" rate="5" minGroupSize="1" maxGroupSize="1">
+ <entry id="WitherWitch" mobName="EnderZoo.WitherWitch" rate="5" minGroupSize="1" maxGroupSize="1">
<biomeFilter type="any">
<biome type="FOREST" />
<biome type="SWAMP" />
@@ -129,7 +129,7 @@ dimensionExclude attributes:
<dimensionExclude name="Twilight Forest"/>
</entry>
- <entry id="DireWolf" mobName="EnderZoo.enderzoo.DireWolf" rate="30" minGroupSize="2" maxGroupSize="6">
+ <entry id="DireWolf" mobName="EnderZoo.DireWolf" rate="30" minGroupSize="2" maxGroupSize="6">
<biomeFilter type="all">
<biome type="SNOWY" />
<biome type="CONIFEROUS" />
@@ -9,7 +9,7 @@
<!-- Enabling this section will remove the default wither witch spawn config and replace it with
a new config with a higher spawn rate
- <entry id="WitherWitch" mobName="EnderZoo.enderzoo.WitherWitch" rate="5" remove="true">
+ <entry id="WitherWitch" mobName="EnderZoo.WitherWitch" rate="5" remove="true">
<biomeFilter type="any">
<biome type="FOREST" />
<biome type="SWAMP" />
@@ -22,7 +22,7 @@
<dimensionExclude name="Twilight Forest"/>
</entry>
- <entry id="WitherWitch" mobName="EnderZoo.enderzoo.WitherWitch" rate="20" minGroupSize="1" maxGroupSize="1">
+ <entry id="WitherWitch" mobName="EnderZoo.WitherWitch" rate="20" minGroupSize="1" maxGroupSize="1">
<biomeFilter type="any">
<biome type="FOREST" />
<biome type="SWAMP" />
@@ -9,25 +9,25 @@ item.guardiansBow.name=Guardians Bow
//Mobs
-entity.enderzoo.Enderminy.name=Enderminy
-entity.enderzoo.ConcussionCreeper.name=Concussion Creeper
-entity.enderzoo.FallenKnight.name=Fallen Knight
-entity.enderzoo.FallenMount.name=Fallen Steed
-entity.enderzoo.WitherWitch.name=Wither Witch
-entity.enderzoo.WitherCat.name=Wither Cat
-entity.enderzoo.DireWolf.name=Dire Wolf
-entity.enderzoo.DireSlime.name=Khndrel Keght
+entity.EnderZoo.Enderminy.name=Enderminy
+entity.EnderZoo.ConcussionCreeper.name=Concussion Creeper
+entity.EnderZoo.FallenKnight.name=Fallen Knight
+entity.EnderZoo.FallenMount.name=Fallen Steed
+entity.EnderZoo.WitherWitch.name=Wither Witch
+entity.EnderZoo.WitherCat.name=Wither Cat
+entity.EnderZoo.DireWolf.name=Dire Wolf
+entity.EnderZoo.DireSlime.name=Khndrel Keght
//Waila
-entity.enderzoo.Enderminy.desc.1=Neutral Mob,
-entity.enderzoo.Enderminy.desc.2=Attacks creepers
+entity.EnderZoo.Enderminy.desc.1=Neutral Mob,
+entity.EnderZoo.Enderminy.desc.2=Attacks creepers
-entity.enderzoo.ConcussionCreeper.desc.1=Does no block damage.
-entity.enderzoo.ConcussionCreeper.desc.2=Teleports nearby entities
-entity.enderzoo.ConcussionCreeper.desc.3=When it explodes.
+entity.EnderZoo.ConcussionCreeper.desc.1=Does no block damage.
+entity.EnderZoo.ConcussionCreeper.desc.2=Teleports nearby entities
+entity.EnderZoo.ConcussionCreeper.desc.3=When it explodes.
-entity.enderzoo.FallenKnight.desc.1=Ranged armored zombie
-entity.enderzoo.WitherWitch.desc.1=Throws wither potions
+entity.EnderZoo.FallenKnight.desc.1=Ranged armored zombie
+entity.EnderZoo.WitherWitch.desc.1=Throws wither potions
//Enchants
enchantment.enderzoo.witherArrow=Withering
@@ -18,7 +18,7 @@
public class EntityConcussionCreeper extends EntityCreeper implements IEnderZooMob {
- public static final String NAME = "enderzoo.ConcussionCreeper";
+ public static final String NAME = "ConcussionCreeper";
public static final int EGG_BG_COL = 0x56FF8E;
public static final int EGG_FG_COL = 0xFF0A22;
@@ -16,7 +16,7 @@
public class EntityDireSlime extends EntityMagmaCube implements IEnderZooMob {
- public static final String NAME = "enderzoo.DireSlime";
+ public static final String NAME = "DireSlime";
public static final int EGG_BG_COL = 0xb9855c;
public static final int EGG_FG_COL = 0x593d29;
@@ -24,7 +24,7 @@
public class EntityDireWolf extends EntityMob implements IEnderZooMob {
- public static final String NAME = "enderzoo.DireWolf";
+ public static final String NAME = "DireWolf";
public static final int EGG_BG_COL = 0x606060;
public static final int EGG_FG_COL = 0xA0A0A0;
@@ -40,7 +40,7 @@
public class EntityEnderminy extends EntityMob implements IEnderZooMob {
- public static String NAME = "enderzoo.Enderminy";
+ public static String NAME = "Enderminy";
public static final int EGG_BG_COL = 0x27624D;
public static final int EGG_FG_COL = 0x212121;
@@ -28,7 +28,7 @@
public static final int EGG_FG_COL = 0x365A25;
public static final int EGG_BG_COL = 0xA0A0A0;
- public static String NAME = "enderzoo.FallenKnight";
+ public static String NAME = "FallenKnight";
private static final double ATTACK_MOVE_SPEED = Config.fallenKnightChargeSpeed;
@@ -29,7 +29,7 @@
public static final int EGG_BG_COL = 0x365A25;
public static final int EGG_FG_COL = 0xA0A0A0;
- public static String NAME = "enderzoo.FallenMount";
+ public static String NAME = "FallenMount";
public static final double MOUNTED_ATTACK_MOVE_SPEED = Config.fallenMountChargeSpeed;;
@@ -32,7 +32,7 @@
NONE, GROW, SHRINK
};
- public static final String NAME = "enderzoo.WitherCat";
+ public static final String NAME = "WitherCat";
public static final int EGG_BG_COL = 0x303030;
public static final int EGG_FG_COL = 0xFFFFFF;
@@ -38,7 +38,7 @@
public class EntityWitherWitch extends EntityMob implements IRangedAttackMob, IEnderZooMob {
- public static final String NAME = "enderzoo.WitherWitch";
+ public static final String NAME = "WitherWitch";
public static final int EGG_BG_COL = 0x26520D;
public static final int EGG_FG_COL = 0x905E43;
@@ -40,25 +40,11 @@ private void init() {
GameRegistry.registerItem(this, NAME);
}
- // @Override
- // public void registerIcons(IIconRegister iconRegister) {
- // }
- //
- // @Override
- // public boolean requiresMultipleRenderPasses() {
- // return true;
- // }
- //
- // @Override
- // public IIcon getIconFromDamageForRenderPass(int par1, int par2) {
- // return Items.spawn_egg.getIconFromDamageForRenderPass(par1, par2);
- // }
-
@Override
public String getItemStackDisplayName(ItemStack stack) {
int damage = MathHelper.clamp_int(stack.getItemDamage(), 0, MobInfo.values().length - 1);
String s = ("" + StatCollector.translateToLocal(getUnlocalizedName() + ".name")).trim();
- String s1 = MobInfo.values()[damage].getName();
+ String s1 = EnderZoo.MODID + "." + MobInfo.values()[damage].getName();
if(s1 != null) {
s = s + " " + StatCollector.translateToLocal("entity." + s1 + ".name");
}
@@ -3,16 +3,16 @@
import java.util.List;
import crazypants.enderzoo.entity.IEnderZooMob;
-import mcp.mobius.waila.api.ITaggedList.ITipList;
import mcp.mobius.waila.api.IWailaConfigHandler;
import mcp.mobius.waila.api.IWailaEntityAccessor;
-import mcp.mobius.waila.api.IWailaEntityAccessorServer;
import mcp.mobius.waila.api.IWailaEntityProvider;
import mcp.mobius.waila.api.IWailaRegistrar;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityList;
+import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.StatCollector;
+import net.minecraft.world.World;
public class WailaCompat implements IWailaEntityProvider {
@@ -28,33 +28,29 @@ public Entity getWailaOverride(IWailaEntityAccessor accessor, IWailaConfigHandle
}
@Override
- public ITipList getWailaHead(Entity entity, ITipList currenttip, IWailaEntityAccessor accessor, IWailaConfigHandler config) {
- return null;
- }
-
public List<String> getWailaHead(Entity entity, List<String> currenttip, IWailaEntityAccessor accessor, IWailaConfigHandler config) {
return null; // not used
}
@Override
- public ITipList getWailaTail(Entity entity, ITipList currenttip, IWailaEntityAccessor accessor, IWailaConfigHandler config) {
- return null;
- }
-
- @Override
- public NBTTagCompound getNBTData(Entity ent, NBTTagCompound tag, IWailaEntityAccessorServer accessor) {
- return tag;
- }
-
- @Override
- public ITipList getWailaBody(Entity entity, ITipList currenttip, IWailaEntityAccessor accessor,
- IWailaConfigHandler config) {
+ public List<String> getWailaBody(Entity entity, List<String> currenttip, IWailaEntityAccessor accessor, IWailaConfigHandler config) {
String name = EntityList.getEntityString(entity);
+ //name = name.substring(EnderZoo.MODID.length() + 1, name.length());
String locKey = "entity." + name + ".desc.";
String loc = null;
for (int line = 1; !(loc = StatCollector.translateToLocal(locKey + line)).equals(locKey + line); line++) {
currenttip.add(loc);
}
return currenttip;
}
+
+ @Override
+ public List<String> getWailaTail(Entity entity, List<String> currenttip, IWailaEntityAccessor accessor, IWailaConfigHandler config) {
+ return null;
+ }
+
+ @Override
+ public NBTTagCompound getNBTData(EntityPlayerMP player, Entity ent, NBTTagCompound tag, World world) {
+ return tag;
+ }
}

0 comments on commit c994008

Please sign in to comment.