diff options
Diffstat (limited to 'src/Java/gtPlusPlus')
4 files changed, 50 insertions, 13 deletions
diff --git a/src/Java/gtPlusPlus/core/client/model/ModelGiantChicken.java b/src/Java/gtPlusPlus/core/client/model/ModelGiantChicken.java index c0f5f79018..f7fb92f550 100644 --- a/src/Java/gtPlusPlus/core/client/model/ModelGiantChicken.java +++ b/src/Java/gtPlusPlus/core/client/model/ModelGiantChicken.java @@ -50,33 +50,43 @@ public class ModelGiantChicken extends ModelChicken{ if (this.isChild) { - float f6 = 2.0F; + float f6 = 1.0F; GL11.glPushMatrix(); - GL11.glTranslatef(0.0F, 5.0F * p_78088_7_, 2.0F * p_78088_7_); + GL11.glTranslatef(0.0F, 0F, 0F); this.head.render(p_78088_7_); this.bill.render(p_78088_7_); this.chin.render(p_78088_7_); GL11.glPopMatrix(); GL11.glPushMatrix(); - GL11.glScalef(1.0F / f6, 1.0F / f6, 1.0F / f6); - GL11.glTranslatef(0.0F, 24.0F * p_78088_7_, 0.0F); + GL11.glScalef(1.0F * f6, 1.0F * f6, 1.0F * f6); + GL11.glTranslatef(0.0F, 0F, 0.0F); this.body.render(p_78088_7_); this.rightLeg.render(p_78088_7_); this.leftLeg.render(p_78088_7_); this.rightWing.render(p_78088_7_); this.leftWing.render(p_78088_7_); GL11.glPopMatrix(); + //super.render(p_78088_1_, p_78088_2_, p_78088_3_, p_78088_4_, p_78088_5_, p_78088_6_, p_78088_7_); } else { + float f6 = 2.0F; + GL11.glPushMatrix(); + GL11.glScalef(1.0F * f6, 1.0F * f6, 1.0F * f6); + GL11.glTranslatef(0.0F, -0.85F, 0F); this.head.render(p_78088_7_); this.bill.render(p_78088_7_); this.chin.render(p_78088_7_); + GL11.glPopMatrix(); + GL11.glPushMatrix(); + GL11.glScalef(1.0F * f6, 1.0F * f6, 1.0F * f6); + GL11.glTranslatef(0.0F, -0.75F, 0.0F); this.body.render(p_78088_7_); this.rightLeg.render(p_78088_7_); this.leftLeg.render(p_78088_7_); this.rightWing.render(p_78088_7_); this.leftWing.render(p_78088_7_); + GL11.glPopMatrix(); } } diff --git a/src/Java/gtPlusPlus/core/entity/monster/EntityGiantChickenBase.java b/src/Java/gtPlusPlus/core/entity/monster/EntityGiantChickenBase.java index 071b893527..4313b0cc45 100644 --- a/src/Java/gtPlusPlus/core/entity/monster/EntityGiantChickenBase.java +++ b/src/Java/gtPlusPlus/core/entity/monster/EntityGiantChickenBase.java @@ -84,13 +84,13 @@ public class EntityGiantChickenBase extends EntityChicken { this.field_70886_e += this.field_70889_i * 2.0F; - if (!this.worldObj.isRemote && !this.isChild() && !this.isChickenJockey() && --this.timeUntilNextEgg <= 0) + if (!this.worldObj.isRemote && --this.timeUntilNextEgg <= 0) { this.playSound("mob.chicken.plop", 1.0F, (this.rand.nextFloat() - this.rand.nextFloat()) * 0.2F + 1.0F); this.dropItem(Items.egg, 1); this.timeUntilNextEgg = this.rand.nextInt(6000) + 6000; } - if (!this.worldObj.isRemote && !this.isChild() && !this.isChickenJockey() && --this.timeUntilNextEgg <= 0) + if (!this.worldObj.isRemote && !this.isChild() && --this.timeUntilNextEgg <= 0) { this.playSound("mob.chicken.plop", 1.0F, (this.rand.nextFloat() - this.rand.nextFloat()) * 0.2F + 1.0F); this.dropItem(ModItems.itemBigEgg, MathUtils.randInt(1, 4)); @@ -254,7 +254,7 @@ public class EntityGiantChickenBase extends EntityChicken { @Override public float getRenderSizeModifier() { - return 1.5f; + return 1.0f; } @Override diff --git a/src/Java/gtPlusPlus/core/item/general/ItemGiantEgg.java b/src/Java/gtPlusPlus/core/item/general/ItemGiantEgg.java index 155950eb75..761cbf268f 100644 --- a/src/Java/gtPlusPlus/core/item/general/ItemGiantEgg.java +++ b/src/Java/gtPlusPlus/core/item/general/ItemGiantEgg.java @@ -1,7 +1,10 @@ package gtPlusPlus.core.item.general; import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.world.World; import gtPlusPlus.core.item.base.BaseItemBurnable; import gtPlusPlus.core.util.math.MathUtils; @@ -17,15 +20,39 @@ public class ItemGiantEgg extends BaseItemBurnable { @Override public String getItemStackDisplayName(ItemStack aStack) { String localName = super.getItemStackDisplayName(aStack); + nbtWork(aStack); int size = 1; - if (NBTUtils.hasKey(aStack, "size")) { + if (NBTUtils.hasKey(aStack, "size")){ size = NBTUtils.getInteger(aStack, "size"); + return ""+size+" "+localName; } - else { - NBTUtils.setInteger(aStack, "size", MathUtils.randInt(1, 8)); - size = NBTUtils.getInteger(aStack, "size"); + return "?? "+localName; + } + + @Override + public void onUpdate(ItemStack aStack, World world, Entity entityHolding, int p_77663_4_, boolean p_77663_5_) { + if (entityHolding != null && entityHolding instanceof EntityPlayer) { + NBTUtils.setBoolean(aStack, "playerHeld", true); } - return ""+size+localName; + else { + NBTUtils.setBoolean(aStack, "playerHeld", false); + } + nbtWork(aStack); + super.onUpdate(aStack, world, entityHolding, p_77663_4_, p_77663_5_); + } + + @Override + public void onCreated(ItemStack p_77622_1_, World p_77622_2_, EntityPlayer p_77622_3_) { + // TODO Auto-generated method stub + super.onCreated(p_77622_1_, p_77622_2_, p_77622_3_); + } + + public void nbtWork(ItemStack aStack) { + if (NBTUtils.hasKey(aStack, "playerHeld")) { + if (NBTUtils.getBoolean(aStack, "playerHeld") && !NBTUtils.hasKey(aStack, "size")) { + NBTUtils.setInteger(aStack, "size", MathUtils.randInt(1, 8)); + } + } } } diff --git a/src/Java/gtPlusPlus/core/proxy/ClientProxy.java b/src/Java/gtPlusPlus/core/proxy/ClientProxy.java index 03ba920930..10ae9870ad 100644 --- a/src/Java/gtPlusPlus/core/proxy/ClientProxy.java +++ b/src/Java/gtPlusPlus/core/proxy/ClientProxy.java @@ -112,7 +112,7 @@ public class ClientProxy extends CommonProxy implements Runnable{ RenderingRegistry.registerEntityRenderingHandler(EntityTeslaTowerLightning.class, new RenderPlasmaBolt()); //Giant Chickens - RenderingRegistry.registerEntityRenderingHandler(EntityGiantChickenBase.class, new RenderGiantChicken(new ModelGiantChicken(), 1.5f)); + RenderingRegistry.registerEntityRenderingHandler(EntityGiantChickenBase.class, new RenderGiantChicken(new ModelGiantChicken(), 1f)); //ClientRegistry.bindTileEntitySpecialRenderer(TileEntityBloodSteelChest.class, new BloodSteelChestRenderer()); //MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(ModBlocks.tutChest), new ItemRenderBloodSteelChest()); |