diff --git a/.gitignore b/.gitignore index be667962..9866a163 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,6 @@ build #runtime run + +#mac +.DS_Store diff --git a/build.gradle b/build.gradle index 8b6adbe6..d0c3bf68 100755 --- a/build.gradle +++ b/build.gradle @@ -21,12 +21,12 @@ buildscript { apply plugin: 'forge' // adds the forge dependency apply plugin: 'maven' // for uploading to a maven repo -version = "5.0.6" +version = "5.0.7" group= "com.mod-buildcraft" archivesBaseName = "buildcraft" // the name that all artifacts will use as a base. artifacts names follow this pattern: [baseName]-[appendix]-[version]-[classifier].[extension] minecraft { - version = "1.7.2-10.12.1.1060" // McVersion-ForgeVersion this variable is later changed to contain only the MC version, while the apiVersion variable is used for the forge version. Yeah its stupid, and will be changed eentually. + version = "1.7.10-10.13.0.1152" // McVersion-ForgeVersion this variable is later changed to contain only the MC version, while the apiVersion variable is used for the forge version. Yeah its stupid, and will be changed eentually. assetDir = "run/assets" // the place for ForgeGradle to download the assets. The assets that the launcher gets and stuff diff --git a/common/buildcraft/builders/BlockMarker.java b/common/buildcraft/builders/BlockMarker.java index bcdc0bdd..80e21cba 100644 --- a/common/buildcraft/builders/BlockMarker.java +++ b/common/buildcraft/builders/BlockMarker.java @@ -45,17 +45,17 @@ public class BlockMarker extends BlockContainer { ForgeDirection dir = ForgeDirection.getOrientation(meta); switch (dir) { case DOWN: - return AxisAlignedBB.getAABBPool().getAABB(0.5F - w, 1F - h, 0.5F - w, 0.5F + w, 1F, 0.5F + w); + return AxisAlignedBB.getBoundingBox(0.5F - w, 1F - h, 0.5F - w, 0.5F + w, 1F, 0.5F + w); case UP: - return AxisAlignedBB.getAABBPool().getAABB(0.5F - w, 0F, 0.5F - w, 0.5F + w, h, 0.5F + w); + return AxisAlignedBB.getBoundingBox(0.5F - w, 0F, 0.5F - w, 0.5F + w, h, 0.5F + w); case SOUTH: - return AxisAlignedBB.getAABBPool().getAABB(0.5F - w, 0.5F - w, 0F, 0.5F + w, 0.5F + w, h); + return AxisAlignedBB.getBoundingBox(0.5F - w, 0.5F - w, 0F, 0.5F + w, 0.5F + w, h); case NORTH: - return AxisAlignedBB.getAABBPool().getAABB(0.5F - w, 0.5F - w, 1 - h, 0.5F + w, 0.5F + w, 1); + return AxisAlignedBB.getBoundingBox(0.5F - w, 0.5F - w, 1 - h, 0.5F + w, 0.5F + w, 1); case EAST: - return AxisAlignedBB.getAABBPool().getAABB(0F, 0.5F - w, 0.5F - w, h, 0.5F + w, 0.5F + w); + return AxisAlignedBB.getBoundingBox(0F, 0.5F - w, 0.5F - w, h, 0.5F + w, 0.5F + w); default: - return AxisAlignedBB.getAABBPool().getAABB(1 - h, 0.5F - w, 0.5F - w, 1F, 0.5F + w, 0.5F + w); + return AxisAlignedBB.getBoundingBox(1 - h, 0.5F - w, 0.5F - w, 1F, 0.5F + w, 0.5F + w); } } diff --git a/common/buildcraft/core/gui/buttons/GuiToggleButton.java b/common/buildcraft/core/gui/buttons/GuiToggleButton.java index c155ed8b..11a7f2cc 100644 --- a/common/buildcraft/core/gui/buttons/GuiToggleButton.java +++ b/common/buildcraft/core/gui/buttons/GuiToggleButton.java @@ -31,7 +31,7 @@ public class GuiToggleButton extends GuiBetterButton { } @Override - protected int getHoverState(boolean mouseOver) { + public int getHoverState(boolean mouseOver) { int state = 1; if (!enabled) { state = 0; diff --git a/common/buildcraft/core/network/PacketNBT.java b/common/buildcraft/core/network/PacketNBT.java index a60d07d8..6bf58fbe 100644 --- a/common/buildcraft/core/network/PacketNBT.java +++ b/common/buildcraft/core/network/PacketNBT.java @@ -15,6 +15,7 @@ import java.io.DataOutputStream; import java.io.IOException; import net.minecraft.nbt.CompressedStreamTools; +import net.minecraft.nbt.NBTSizeTracker; import net.minecraft.nbt.NBTTagCompound; public class PacketNBT extends PacketCoordinates { @@ -52,7 +53,7 @@ public class PacketNBT extends PacketCoordinates { data.readBytes(compressed); try { - this.nbttagcompound = CompressedStreamTools.decompress(compressed); + this.nbttagcompound = CompressedStreamTools.func_152457_a(compressed, NBTSizeTracker.field_152451_a); } catch (IOException e) { // TODO Auto-generated catch block e.printStackTrace(); diff --git a/common/buildcraft/core/utils/Utils.java b/common/buildcraft/core/utils/Utils.java index f7d2524e..251e065f 100644 --- a/common/buildcraft/core/utils/Utils.java +++ b/common/buildcraft/core/utils/Utils.java @@ -24,6 +24,7 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompressedStreamTools; +import net.minecraft.nbt.NBTSizeTracker; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.MathHelper; @@ -447,7 +448,7 @@ public class Utils { short length = data.readShort(); byte[] compressed = new byte[length]; data.readBytes(compressed); - return CompressedStreamTools.decompress(compressed); + return CompressedStreamTools.func_152457_a(compressed, NBTSizeTracker.field_152451_a); } catch (IOException e) { e.printStackTrace(); return null; diff --git a/common/buildcraft/transport/BlockGenericPipe.java b/common/buildcraft/transport/BlockGenericPipe.java index b78508c5..8390bb07 100644 --- a/common/buildcraft/transport/BlockGenericPipe.java +++ b/common/buildcraft/transport/BlockGenericPipe.java @@ -277,7 +277,7 @@ public class BlockGenericPipe extends BlockBuildCraft { double eyeHeight = world.isRemote ? player.getEyeHeight() - player.getDefaultEyeHeight() : player.getEyeHeight(); Vec3 lookVec = player.getLookVec(); - Vec3 origin = world.getWorldVec3Pool().getVecFromPool(player.posX, player.posY + eyeHeight, player.posZ); + Vec3 origin = Vec3.createVectorHelper(player.posX, player.posY + eyeHeight, player.posZ); Vec3 direction = origin.addVector(lookVec.xCoord * reachDistance, lookVec.yCoord * reachDistance, lookVec.zCoord * reachDistance); return doRayTrace(world, x, y, z, origin, direction); @@ -422,7 +422,7 @@ public class BlockGenericPipe extends BlockBuildCraft { bounds[2][1] = max; MatrixTranformations.transform(bounds, side); - return AxisAlignedBB.getAABBPool().getAABB(bounds[0][0], bounds[1][0], bounds[2][0], bounds[0][1], bounds[1][1], bounds[2][1]); + return AxisAlignedBB.getBoundingBox(bounds[0][0], bounds[1][0], bounds[2][0], bounds[0][1], bounds[1][1], bounds[2][1]); } private AxisAlignedBB getFacadeBoundingBox(ForgeDirection side) { @@ -438,7 +438,7 @@ public class BlockGenericPipe extends BlockBuildCraft { bounds[2][1] = 1.0F; MatrixTranformations.transform(bounds, side); - return AxisAlignedBB.getAABBPool().getAABB(bounds[0][0], bounds[1][0], bounds[2][0], bounds[0][1], bounds[1][1], bounds[2][1]); + return AxisAlignedBB.getBoundingBox(bounds[0][0], bounds[1][0], bounds[2][0], bounds[0][1], bounds[1][1], bounds[2][1]); } private AxisAlignedBB getPlugBoundingBox(ForgeDirection side) { @@ -454,7 +454,7 @@ public class BlockGenericPipe extends BlockBuildCraft { bounds[2][1] = 0.75F; MatrixTranformations.transform(bounds, side); - return AxisAlignedBB.getAABBPool().getAABB(bounds[0][0], bounds[1][0], bounds[2][0], bounds[0][1], bounds[1][1], bounds[2][1]); + return AxisAlignedBB.getBoundingBox(bounds[0][0], bounds[1][0], bounds[2][0], bounds[0][1], bounds[1][1], bounds[2][1]); } private AxisAlignedBB getPipeBoundingBox(ForgeDirection side) { @@ -462,7 +462,7 @@ public class BlockGenericPipe extends BlockBuildCraft { float max = CoreConstants.PIPE_MAX_POS; if (side == ForgeDirection.UNKNOWN) { - return AxisAlignedBB.getAABBPool().getAABB(min, min, min, max, max, max); + return AxisAlignedBB.getBoundingBox(min, min, min, max, max, max); } float[][] bounds = new float[3][2]; @@ -477,7 +477,7 @@ public class BlockGenericPipe extends BlockBuildCraft { bounds[2][1] = max; MatrixTranformations.transform(bounds, side); - return AxisAlignedBB.getAABBPool().getAABB(bounds[0][0], bounds[1][0], bounds[2][0], bounds[0][1], bounds[1][1], bounds[2][1]); + return AxisAlignedBB.getBoundingBox(bounds[0][0], bounds[1][0], bounds[2][0], bounds[0][1], bounds[1][1], bounds[2][1]); } public static void removePipe(Pipe pipe) { diff --git a/common/buildcraft/transport/pipes/PipeItemsObsidian.java b/common/buildcraft/transport/pipes/PipeItemsObsidian.java index 7c89d8f5..e450f63a 100644 --- a/common/buildcraft/transport/pipes/PipeItemsObsidian.java +++ b/common/buildcraft/transport/pipes/PipeItemsObsidian.java @@ -145,7 +145,7 @@ public class PipeItemsObsidian extends Pipe implements IPowe Position min = p1.min(p2); Position max = p1.max(p2); - return AxisAlignedBB.getAABBPool().getAABB(min.x, min.y, min.z, max.x, max.y, max.z); + return AxisAlignedBB.getBoundingBox(min.x, min.y, min.z, max.x, max.y, max.z); } @Override diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 3c7abdf1..0087cd3b 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 99044556..662430a8 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sun Feb 16 13:39:47 CST 2014 +#Tue May 06 21:57:37 CEST 2014 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=http\://services.gradle.org/distributions/gradle-1.11-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-1.12-bin.zip diff --git a/gradlew b/gradlew old mode 100644 new mode 100755