tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Just about polished off baby skeletons, started on getting the Flamethrower to render with correct scale and orientation

Browse source
This commit is contained in:
Aidan C. Brady 2014-07-12 23:59:39 -04:00
parent 6cc7efc64b
commit 3f7de46991
4 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/main/java/mekanism/client/render/item/ItemRenderingHandler.java
View file

@ -444,6 +444,13 @@ public class ItemRenderingHandler implements IItemRenderer
GL11.glRotatef(180, 0.0F, 0.0F, 1.0F);
Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "Flamethrower.png"));
GL11.glTranslatef(0.0F, -2.0F, 0.0F);
if(type == ItemRenderType.EQUIPPED || type == ItemRenderType.EQUIPPED_FIRST_PERSON)
{
GL11.glScalef(2.0F, 2.0F, 2.0F);
}
flamethrower.render(0.0625F);
GL11.glPopMatrix();
}

2
src/main/java/mekanism/common/Mekanism.java
View file

@ -1398,7 +1398,7 @@ public class Mekanism
{
if(biome.getSpawnableList(EnumCreatureType.monster) != null && biome.getSpawnableList(EnumCreatureType.monster).size() > 0)
{
EntityRegistry.addSpawn(EntityBabySkeleton.class, 6, 1, 3, EnumCreatureType.monster, new BiomeGenBase[] {biome});
EntityRegistry.addSpawn(EntityBabySkeleton.class, 40, 1, 3, EnumCreatureType.monster, new BiomeGenBase[] {biome});
}
}
}

12
src/main/java/mekanism/common/entity/EntityBabySkeleton.java
View file

@ -17,9 +17,7 @@ public class EntityBabySkeleton extends EntitySkeleton
public EntityBabySkeleton(World world)
{
super(world);
setChild(true);
System.out.println("Spawned");
}
@Override
@ -30,14 +28,6 @@ public class EntityBabySkeleton extends EntitySkeleton
getDataWatcher().addObject(12, new Byte((byte)0));
}
@Override
public void onUpdate()
{
super.onUpdate();
System.out.println(posX + " " + posY + " " + posZ);
}
public void setChild(boolean child)
{
getDataWatcher().updateObject(12, Byte.valueOf((byte)(child ? 1 : 0)));
@ -80,6 +70,6 @@ public class EntityBabySkeleton extends EntitySkeleton
protected final void updateSize(float size)
{
super.setSize(size, size);
super.setSize(size, size+0.4F);
}
}

5
src/main/resources/assets/mekanism/lang/en_US.lang
View file

@ -293,6 +293,10 @@ update.outdated=Using outdated version on one or more modules
key.mode=Mode Switch
key.voice=Voice
//Entities
entity.Robit.name=Robit
entity.BabySkeleton.name=Baby Skeleton
//Config Gui
mekanism.configgui.ctgy.general.tooltip=General settings regarding Mekanism and all its modules
mekanism.configgui.ctgy.usage.tooltip=Settings regarding machinery and their energy usage
@ -396,7 +400,6 @@ gui.teleporter.linksCapacity=Links > 2
gui.teleporter.noLink=No link found
gui.robit=Robit
entity.Robit.name=Robit
gui.robit.smelting=Robit Smelting
gui.robit.inventory=Robit Inventory
gui.robit.crafting=Robit Crafting