diff --git a/resources/TConstruct_at.cfg b/resources/TConstruct_at.cfg index 4b89f8c2..a9ac60b8 100644 --- a/resources/TConstruct_at.cfg +++ b/resources/TConstruct_at.cfg @@ -15,8 +15,6 @@ public net.minecraft.entity.projectile.EntityArrow field_70256_ap public net.minecraft.entity.projectile.EntityArrow *() #we need waaaaaaay to much in here to bother going through it # RenderGlobal public net.minecraft.client.renderer.RenderGlobal field_147592_B -# Entity -public net.minecraft.entity.Entity field_145783_c # Blocks public-f net.minecraft.block.Block field_149764_J public net.minecraft.block.BlockLeavesBase field_150121_P @@ -29,7 +27,6 @@ public net.minecraft.client.gui.GuiScreen field_146292_n #buttonList # ThreadDownloadImageData public net.minecraft.client.renderer.ThreadDownloadImageData field_110559_g #field_110559_g public net.minecraft.client.renderer.ThreadDownloadImageData field_110560_d #field_110560_d -public net.minecraft.potion.PotionEffect field_76460_b public net.minecraft.world.gen.structure.StructureVillagePieces$Village #cant make village houses w/o this public net.minecraft.client.renderer.Tessellator field_78415_z # needs to have a space at the end of every line or SS will derp \ No newline at end of file diff --git a/src/main/java/tconstruct/blocks/GlueBlock.java b/src/main/java/tconstruct/blocks/GlueBlock.java index 20ea0a36..a87d8e9d 100644 --- a/src/main/java/tconstruct/blocks/GlueBlock.java +++ b/src/main/java/tconstruct/blocks/GlueBlock.java @@ -25,26 +25,12 @@ public class GlueBlock extends TConstructBlock if (entity instanceof EntityLivingBase) { - EntityLivingBase lvb = (EntityLivingBase) entity; + EntityLivingBase living = (EntityLivingBase) entity; // Well you'd feel ill too standing on glue... - if (lvb.isPotionActive(Potion.hunger)) - { - lvb.getActivePotionEffect(Potion.hunger).duration = 20; - } - else - { - lvb.addPotionEffect(new PotionEffect(Potion.hunger.getId(), 20, 4)); - } + living.addPotionEffect(new PotionEffect(Potion.hunger.getId(), 20, 4)); // Glue is sticky stuff - if (lvb.isPotionActive(Potion.moveSlowdown)) - { - lvb.getActivePotionEffect(Potion.moveSlowdown).duration = 30; - } - else - { - lvb.addPotionEffect(new PotionEffect(Potion.moveSlowdown.getId(), 30, 4)); - } + living.addPotionEffect(new PotionEffect(Potion.moveSlowdown.getId(), 30, 4)); } } diff --git a/src/main/java/tconstruct/blocks/GlueFluid.java b/src/main/java/tconstruct/blocks/GlueFluid.java index 64f5ed9a..d5a3618e 100644 --- a/src/main/java/tconstruct/blocks/GlueFluid.java +++ b/src/main/java/tconstruct/blocks/GlueFluid.java @@ -49,26 +49,12 @@ public class GlueFluid extends BlockFluidFinite if (entity instanceof EntityLivingBase) { - EntityLivingBase lvb = (EntityLivingBase) entity; + EntityLivingBase living = (EntityLivingBase) entity; // Well you'd feel ill too standing in glue... - if (lvb.isPotionActive(Potion.hunger)) - { - lvb.getActivePotionEffect(Potion.hunger).duration = 20; - } - else - { - lvb.addPotionEffect(new PotionEffect(Potion.hunger.getId(), 20, 4)); - } + living.addPotionEffect(new PotionEffect(Potion.hunger.getId(), 20, 4)); // Glue is sticky stuff - if (lvb.isPotionActive(Potion.moveSlowdown)) - { - lvb.getActivePotionEffect(Potion.moveSlowdown).duration = 30; - } - else - { - lvb.addPotionEffect(new PotionEffect(Potion.moveSlowdown.getId(), 30, 4)); - } + living.addPotionEffect(new PotionEffect(Potion.moveSlowdown.getId(), 30, 4)); } } } diff --git a/src/main/java/tconstruct/client/entity/CartRender.java b/src/main/java/tconstruct/client/entity/CartRender.java index 1019b177..ac3c8d74 100644 --- a/src/main/java/tconstruct/client/entity/CartRender.java +++ b/src/main/java/tconstruct/client/entity/CartRender.java @@ -31,7 +31,7 @@ public class CartRender extends Render public void renderPullcart (CartEntity cart, double posX, double posY, double posZ, float par8, float par9) { GL11.glPushMatrix(); - long var10 = (long) cart.entityId * 493286711L; + long var10 = (long) cart.hashCode() * 493286711L; var10 = var10 * var10 * 4392167121L + var10 * 98761L; float var12 = (((float) (var10 >> 16 & 7L) + 0.5F) / 8.0F - 0.5F) * 0.004F; float var13 = (((float) (var10 >> 20 & 7L) + 0.5F) / 8.0F - 0.5F) * 0.004F; diff --git a/src/main/java/tconstruct/entity/projectile/ArrowEntity.java b/src/main/java/tconstruct/entity/projectile/ArrowEntity.java index 6fcd5ebc..4e82cf64 100644 --- a/src/main/java/tconstruct/entity/projectile/ArrowEntity.java +++ b/src/main/java/tconstruct/entity/projectile/ArrowEntity.java @@ -206,7 +206,7 @@ public class ArrowEntity extends EntityArrow implements IEntityAdditionalSpawnDa if (movingobjectposition.entityHit != null) { speed = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionY * this.motionY + this.motionZ * this.motionZ); - double damageSpeed = (double) speed * this.damage; + double damageSpeed = (double) speed * this.getDamage(); damageSpeed *= baseDamage; damageSpeed /= 5D; int damageInflicted = MathHelper.ceiling_double_int(damageSpeed);