upstream/TinkersConstruct
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/TinkersConstruct.git synced 2026-11-13 00:47:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updating to 1.7.10_pre4

Browse Source
This commit is contained in:
Alexander Behrhof committed 2014-06-25 21:01:20 -04:00
1 parent 3a127a7bf0
commit caf084edca
9 files changed
+31 -30
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/tconstruct/TConstruct.java
+1 -1
View File
@@ -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();
src/main/java/tconstruct/client/TClientEvents.java
+1 -1
View File
@@ -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;
src/main/java/tconstruct/client/event/EventCloakRender.java
+6 -6
View File
@@ -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)
{
src/main/java/tconstruct/entity/CartEntity.java
+4 -4
View File
@@ -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));
src/main/java/tconstruct/entity/projectile/ArrowEntity.java
+6 -6
View File
@@ -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;
src/main/java/tconstruct/library/tools/AbilityHelper.java
+3 -3
View File
@@ -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);
src/main/java/tconstruct/util/MiningExplosion.java
+2 -2
View File
@@ -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));
}
}
}