diff --git a/src/main/java/mekanism/client/render/item/ItemRenderingHandler.java b/src/main/java/mekanism/client/render/item/ItemRenderingHandler.java index acc5564bc..1f7d7437b 100644 --- a/src/main/java/mekanism/client/render/item/ItemRenderingHandler.java +++ b/src/main/java/mekanism/client/render/item/ItemRenderingHandler.java @@ -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(); } diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index e49e182ce..e780da8b7 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -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}); } } } diff --git a/src/main/java/mekanism/common/entity/EntityBabySkeleton.java b/src/main/java/mekanism/common/entity/EntityBabySkeleton.java index afee33af3..2a1237bdc 100644 --- a/src/main/java/mekanism/common/entity/EntityBabySkeleton.java +++ b/src/main/java/mekanism/common/entity/EntityBabySkeleton.java @@ -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); } } diff --git a/src/main/resources/assets/mekanism/lang/en_US.lang b/src/main/resources/assets/mekanism/lang/en_US.lang index 855986a14..3fe3adfbb 100644 --- a/src/main/resources/assets/mekanism/lang/en_US.lang +++ b/src/main/resources/assets/mekanism/lang/en_US.lang @@ -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