From caf084edcadfa97d2757aedb59db05c8e390cefc Mon Sep 17 00:00:00 2001 From: Alexander Behrhof Date: Wed, 25 Jun 2014 21:01:20 -0400 Subject: [PATCH] Updating to 1.7.10_pre4 --- build.gradle | 8 ++++---- build.properties | 7 ++++--- src/main/java/tconstruct/TConstruct.java | 2 +- src/main/java/tconstruct/client/TClientEvents.java | 2 +- .../tconstruct/client/event/EventCloakRender.java | 12 ++++++------ src/main/java/tconstruct/entity/CartEntity.java | 8 ++++---- .../tconstruct/entity/projectile/ArrowEntity.java | 12 ++++++------ .../java/tconstruct/library/tools/AbilityHelper.java | 6 +++--- src/main/java/tconstruct/util/MiningExplosion.java | 4 ++-- 9 files changed, 31 insertions(+), 30 deletions(-) diff --git a/build.gradle b/build.gradle index acea60c1..d33b9d1b 100644 --- a/build.gradle +++ b/build.gradle @@ -65,10 +65,10 @@ configurations { dependencies { compile "mantle:Mantle:${config.minecraft_version}-${config.mantle_version}:deobf" - compile "codechicken:CodeChickenLib:${config.minecraft_version}-${config.CCLIB_version}:dev" - compile "codechicken:ForgeMultipart:${config.minecraft_version}-${config.FMP_version}:dev" - compile "codechicken:CodeChickenCore:${config.minecraft_version}-${config.ccc_version}:dev" - compile "codechicken:NotEnoughItems:${config.minecraft_version}-${config.NEI_version}:dev" + compile "codechicken:CodeChickenLib:${config.minecraft_version_old}-${config.CCLIB_version}:dev" + compile "codechicken:ForgeMultipart:${config.minecraft_version_old}-${config.FMP_version}:dev" + compile "codechicken:CodeChickenCore:${config.minecraft_version_old}-${config.ccc_version}:dev" + compile "codechicken:NotEnoughItems:${config.minecraft_version_old}-${config.NEI_version}:dev" compile "mcp.mobius.waila:Waila:${config.waila_version}:dev" deployerJars 'org.apache.maven.wagon:wagon-ssh:2.2' } diff --git a/build.properties b/build.properties index ef163b1f..d6282785 100644 --- a/build.properties +++ b/build.properties @@ -1,6 +1,7 @@ -minecraft_version=1.7.2 -forge_version=10.12.1.1101 -mantle_version=145.3a637c2 +minecraft_version=1.7.10_pre4 +minecraft_version_old=1.7.2 +forge_version=10.12.2.1143-prerelease +mantle_version=150.1d8388b FMP_version=1.1.0.268 CCLIB_version=1.1.0.77 NEI_version=1.0.1 diff --git a/src/main/java/tconstruct/TConstruct.java b/src/main/java/tconstruct/TConstruct.java index 767be6ca..de7249cc 100644 --- a/src/main/java/tconstruct/TConstruct.java +++ b/src/main/java/tconstruct/TConstruct.java @@ -182,7 +182,7 @@ public class TConstruct packetPipeline.initalise(); if (event.getSide() == Side.CLIENT) { - MinecraftForge.EVENT_BUS.register(new EventCloakRender()); + //MinecraftForge.EVENT_BUS.register(new EventCloakRender()); } DimensionBlacklist.getBadBimensions(); diff --git a/src/main/java/tconstruct/client/TClientEvents.java b/src/main/java/tconstruct/client/TClientEvents.java index 999e7496..8cb54552 100644 --- a/src/main/java/tconstruct/client/TClientEvents.java +++ b/src/main/java/tconstruct/client/TClientEvents.java @@ -111,7 +111,7 @@ public class TClientEvents { updateCounter++; - ScaledResolution scaledresolution = new ScaledResolution(this.mc.gameSettings, this.mc.displayWidth, this.mc.displayHeight); + ScaledResolution scaledresolution = new ScaledResolution(this.mc, this.mc.displayWidth, this.mc.displayHeight); int scaledWidth = scaledresolution.getScaledWidth(); int scaledHeight = scaledresolution.getScaledHeight(); int xBasePos = scaledWidth / 2 - 91; diff --git a/src/main/java/tconstruct/client/event/EventCloakRender.java b/src/main/java/tconstruct/client/event/EventCloakRender.java index 4e0e1dc8..2507d365 100644 --- a/src/main/java/tconstruct/client/event/EventCloakRender.java +++ b/src/main/java/tconstruct/client/event/EventCloakRender.java @@ -62,9 +62,9 @@ public class EventCloakRender capePlayers.add(abstractClientPlayer); - abstractClientPlayer.getTextureCape().textureUploaded = false; - new Thread(new CloakThread(abstractClientPlayer, cloakURL)).start(); - event.renderCape = true; + //abstractClientPlayer.getTextureCape().textureUploaded = false; + //new Thread(new CloakThread(abstractClientPlayer, cloakURL)).start(); + //event.renderCape = true; } } } @@ -132,9 +132,9 @@ public class EventCloakRender try { Image cape = new ImageIcon(new URL(cloakURL)).getImage(); - BufferedImage bo = new BufferedImage(cape.getWidth(null), cape.getHeight(null), BufferedImage.TYPE_INT_ARGB); - bo.getGraphics().drawImage(cape, 0, 0, null); - abstractClientPlayer.getTextureCape().setBufferedImage(bo); + //BufferedImage bo = new BufferedImage(cape.getWidth(null), cape.getHeight(null), BufferedImage.TYPE_INT_ARGB); + //bo.getGraphics().drawImage(cape, 0, 0, null); + //abstractClientPlayer.getTextureCape().setBufferedImage(bo); } catch (MalformedURLException e) { diff --git a/src/main/java/tconstruct/entity/CartEntity.java b/src/main/java/tconstruct/entity/CartEntity.java index c6b04377..8243007c 100644 --- a/src/main/java/tconstruct/entity/CartEntity.java +++ b/src/main/java/tconstruct/entity/CartEntity.java @@ -632,7 +632,7 @@ public class CartEntity extends Entity implements IInventory, IEntityAdditionalS par3 += 0.5D; } - return this.worldObj.getWorldVec3Pool().getVecFromPool(par1, par3, par5); + return Vec3.createVectorHelper(par1, par3, par5); } else { @@ -767,9 +767,9 @@ public class CartEntity extends Entity implements IInventory, IEntityAdditionalS { double var10 = par1Entity.posX - this.posX; double var12 = par1Entity.posZ - this.posZ; - Vec3 var14 = this.worldObj.getWorldVec3Pool().getVecFromPool(var10, 0.0D, var12).normalize(); - Vec3 var15 = this.worldObj.getWorldVec3Pool() - .getVecFromPool((double) MathHelper.cos(this.rotationYaw * (float) Math.PI / 180.0F), 0.0D, (double) MathHelper.sin(this.rotationYaw * (float) Math.PI / 180.0F)) + Vec3 var14 = Vec3.createVectorHelper(var10, 0.0D, var12).normalize(); + Vec3 var15 = Vec3.createVectorHelper + ((double) MathHelper.cos(this.rotationYaw * (float) Math.PI / 180.0F), 0.0D, (double) MathHelper.sin(this.rotationYaw * (float) Math.PI / 180.0F)) .normalize(); double var16 = Math.abs(var14.dotProduct(var15)); diff --git a/src/main/java/tconstruct/entity/projectile/ArrowEntity.java b/src/main/java/tconstruct/entity/projectile/ArrowEntity.java index 313a68b9..6dcfa97b 100644 --- a/src/main/java/tconstruct/entity/projectile/ArrowEntity.java +++ b/src/main/java/tconstruct/entity/projectile/ArrowEntity.java @@ -103,7 +103,7 @@ public class ArrowEntity extends EntityArrow implements IEntityAdditionalSpawnDa i.setBlockBoundsBasedOnState(this.worldObj, this.field_145791_d, this.field_145792_e, this.field_145789_f); AxisAlignedBB axisalignedbb = i.getCollisionBoundingBoxFromPool(this.worldObj, this.field_145791_d, this.field_145792_e, this.field_145789_f); - if (axisalignedbb != null && axisalignedbb.isVecInside(this.worldObj.getWorldVec3Pool().getVecFromPool(this.posX, this.posY, this.posZ))) + if (axisalignedbb != null && axisalignedbb.isVecInside(Vec3.createVectorHelper(this.posX, this.posY, this.posZ))) { this.inGround = true; } @@ -143,15 +143,15 @@ public class ArrowEntity extends EntityArrow implements IEntityAdditionalSpawnDa else { ++this.ticksInAir; - Vec3 vec3 = this.worldObj.getWorldVec3Pool().getVecFromPool(this.posX, this.posY, this.posZ); - Vec3 vec31 = this.worldObj.getWorldVec3Pool().getVecFromPool(this.posX + this.motionX, this.posY + this.motionY, this.posZ + this.motionZ); + Vec3 vec3 = Vec3.createVectorHelper(this.posX, this.posY, this.posZ); + Vec3 vec31 = Vec3.createVectorHelper(this.posX + this.motionX, this.posY + this.motionY, this.posZ + this.motionZ); MovingObjectPosition movingobjectposition = this.worldObj.func_147447_a(vec3, vec31, false, true, false); - vec3 = this.worldObj.getWorldVec3Pool().getVecFromPool(this.posX, this.posY, this.posZ); - vec31 = this.worldObj.getWorldVec3Pool().getVecFromPool(this.posX + this.motionX, this.posY + this.motionY, this.posZ + this.motionZ); + vec3 = Vec3.createVectorHelper(this.posX, this.posY, this.posZ); + vec31 = Vec3.createVectorHelper(this.posX + this.motionX, this.posY + this.motionY, this.posZ + this.motionZ); if (movingobjectposition != null) { - vec31 = this.worldObj.getWorldVec3Pool().getVecFromPool(movingobjectposition.hitVec.xCoord, movingobjectposition.hitVec.yCoord, movingobjectposition.hitVec.zCoord); + vec31 = Vec3.createVectorHelper(movingobjectposition.hitVec.xCoord, movingobjectposition.hitVec.yCoord, movingobjectposition.hitVec.zCoord); } Entity entity = null; diff --git a/src/main/java/tconstruct/library/tools/AbilityHelper.java b/src/main/java/tconstruct/library/tools/AbilityHelper.java index a8c9f880..ea69abca 100644 --- a/src/main/java/tconstruct/library/tools/AbilityHelper.java +++ b/src/main/java/tconstruct/library/tools/AbilityHelper.java @@ -300,7 +300,7 @@ public class AbilityHelper { EntityWolf var3 = (EntityWolf) living; - if (var3.isTamed() && player.getDisplayName().equals(var3.getOwnerName())) + if (var3.isTamed() && player.getDisplayName().equals(var3.func_152113_b())) { return; } @@ -316,7 +316,7 @@ public class AbilityHelper { EntityWolf var5 = (EntityWolf) var4.next(); - if (var5.isTamed() && var5.getEntityToAttack() == null && player.getDisplayName().equals(var5.getOwnerName()) && (!par2 || !var5.isSitting())) + if (var5.isTamed() && var5.getEntityToAttack() == null && player.getDisplayName().equals(var5.func_152113_b()) && (!par2 || !var5.isSitting())) { var5.setSitting(false); var5.setTarget(living); @@ -621,7 +621,7 @@ public class AbilityHelper if (!world.isRemote && player instanceof EntityPlayer) d1 += 1.62D; double d2 = player.prevPosZ + (player.posZ - player.prevPosZ) * (double) f; - Vec3 vec3 = world.getWorldVec3Pool().getVecFromPool(d0, d1, d2); + Vec3 vec3 = Vec3.createVectorHelper(d0, d1, d2); float f3 = MathHelper.cos(-f2 * 0.017453292F - (float) Math.PI); float f4 = MathHelper.sin(-f2 * 0.017453292F - (float) Math.PI); float f5 = -MathHelper.cos(-f1 * 0.017453292F); diff --git a/src/main/java/tconstruct/util/MiningExplosion.java b/src/main/java/tconstruct/util/MiningExplosion.java index b36721e4..1fe2740c 100644 --- a/src/main/java/tconstruct/util/MiningExplosion.java +++ b/src/main/java/tconstruct/util/MiningExplosion.java @@ -104,7 +104,7 @@ public class MiningExplosion extends Explosion int i2 = MathHelper.floor_double(this.explosionZ - (double) this.explosionSize - 1.0D); int j2 = MathHelper.floor_double(this.explosionZ + (double) this.explosionSize + 1.0D); List list = this.world.getEntitiesWithinAABBExcludingEntity(this.exploder, AxisAlignedBB.getBoundingBox((double) i, (double) k, (double) i2, (double) j, (double) l1, (double) j2)); - Vec3 vec3 = this.world.getWorldVec3Pool().getVecFromPool(this.explosionX, this.explosionY, this.explosionZ); + Vec3 vec3 = Vec3.createVectorHelper(this.explosionX, this.explosionY, this.explosionZ); for (int k2 = 0; k2 < list.size(); ++k2) { @@ -134,7 +134,7 @@ public class MiningExplosion extends Explosion if (entity instanceof EntityPlayer) { - this.field_77288_k.put((EntityPlayer) entity, this.world.getWorldVec3Pool().getVecFromPool(d0 * d10, d1 * d10, d2 * d10)); + this.field_77288_k.put((EntityPlayer) entity, Vec3.createVectorHelper(d0 * d10, d1 * d10, d2 * d10)); } } }