Updated to 1.7.10
This version isn't backwards compatiable because of changes in the CompressedStreamTools. I don't know if you want to push an update to the 5.0.x branch, but I thought I'd do it, just in case you did.
This commit is contained in:
parent
917feacad8
commit
341ff4e972
11 changed files with 25 additions and 20 deletions
3
.gitignore
vendored
3
.gitignore
vendored
|
@ -17,3 +17,6 @@ build
|
||||||
|
|
||||||
#runtime
|
#runtime
|
||||||
run
|
run
|
||||||
|
|
||||||
|
#mac
|
||||||
|
.DS_Store
|
||||||
|
|
|
@ -21,12 +21,12 @@ buildscript {
|
||||||
apply plugin: 'forge' // adds the forge dependency
|
apply plugin: 'forge' // adds the forge dependency
|
||||||
apply plugin: 'maven' // for uploading to a maven repo
|
apply plugin: 'maven' // for uploading to a maven repo
|
||||||
|
|
||||||
version = "5.0.6"
|
version = "5.0.7"
|
||||||
group= "com.mod-buildcraft"
|
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]
|
archivesBaseName = "buildcraft" // the name that all artifacts will use as a base. artifacts names follow this pattern: [baseName]-[appendix]-[version]-[classifier].[extension]
|
||||||
|
|
||||||
minecraft {
|
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
|
assetDir = "run/assets" // the place for ForgeGradle to download the assets. The assets that the launcher gets and stuff
|
||||||
|
|
||||||
|
|
|
@ -45,17 +45,17 @@ public class BlockMarker extends BlockContainer {
|
||||||
ForgeDirection dir = ForgeDirection.getOrientation(meta);
|
ForgeDirection dir = ForgeDirection.getOrientation(meta);
|
||||||
switch (dir) {
|
switch (dir) {
|
||||||
case DOWN:
|
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:
|
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:
|
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:
|
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:
|
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:
|
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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -31,7 +31,7 @@ public class GuiToggleButton extends GuiBetterButton {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected int getHoverState(boolean mouseOver) {
|
public int getHoverState(boolean mouseOver) {
|
||||||
int state = 1;
|
int state = 1;
|
||||||
if (!enabled) {
|
if (!enabled) {
|
||||||
state = 0;
|
state = 0;
|
||||||
|
|
|
@ -15,6 +15,7 @@ import java.io.DataOutputStream;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
|
||||||
import net.minecraft.nbt.CompressedStreamTools;
|
import net.minecraft.nbt.CompressedStreamTools;
|
||||||
|
import net.minecraft.nbt.NBTSizeTracker;
|
||||||
import net.minecraft.nbt.NBTTagCompound;
|
import net.minecraft.nbt.NBTTagCompound;
|
||||||
|
|
||||||
public class PacketNBT extends PacketCoordinates {
|
public class PacketNBT extends PacketCoordinates {
|
||||||
|
@ -52,7 +53,7 @@ public class PacketNBT extends PacketCoordinates {
|
||||||
data.readBytes(compressed);
|
data.readBytes(compressed);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
this.nbttagcompound = CompressedStreamTools.decompress(compressed);
|
this.nbttagcompound = CompressedStreamTools.func_152457_a(compressed, NBTSizeTracker.field_152451_a);
|
||||||
} catch (IOException e) {
|
} catch (IOException e) {
|
||||||
// TODO Auto-generated catch block
|
// TODO Auto-generated catch block
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
|
|
|
@ -24,6 +24,7 @@ import net.minecraft.entity.EntityLivingBase;
|
||||||
import net.minecraft.inventory.IInventory;
|
import net.minecraft.inventory.IInventory;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
import net.minecraft.nbt.CompressedStreamTools;
|
import net.minecraft.nbt.CompressedStreamTools;
|
||||||
|
import net.minecraft.nbt.NBTSizeTracker;
|
||||||
import net.minecraft.nbt.NBTTagCompound;
|
import net.minecraft.nbt.NBTTagCompound;
|
||||||
import net.minecraft.tileentity.TileEntity;
|
import net.minecraft.tileentity.TileEntity;
|
||||||
import net.minecraft.util.MathHelper;
|
import net.minecraft.util.MathHelper;
|
||||||
|
@ -447,7 +448,7 @@ public class Utils {
|
||||||
short length = data.readShort();
|
short length = data.readShort();
|
||||||
byte[] compressed = new byte[length];
|
byte[] compressed = new byte[length];
|
||||||
data.readBytes(compressed);
|
data.readBytes(compressed);
|
||||||
return CompressedStreamTools.decompress(compressed);
|
return CompressedStreamTools.func_152457_a(compressed, NBTSizeTracker.field_152451_a);
|
||||||
} catch (IOException e) {
|
} catch (IOException e) {
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
return null;
|
return null;
|
||||||
|
|
|
@ -277,7 +277,7 @@ public class BlockGenericPipe extends BlockBuildCraft {
|
||||||
|
|
||||||
double eyeHeight = world.isRemote ? player.getEyeHeight() - player.getDefaultEyeHeight() : player.getEyeHeight();
|
double eyeHeight = world.isRemote ? player.getEyeHeight() - player.getDefaultEyeHeight() : player.getEyeHeight();
|
||||||
Vec3 lookVec = player.getLookVec();
|
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);
|
Vec3 direction = origin.addVector(lookVec.xCoord * reachDistance, lookVec.yCoord * reachDistance, lookVec.zCoord * reachDistance);
|
||||||
|
|
||||||
return doRayTrace(world, x, y, z, origin, direction);
|
return doRayTrace(world, x, y, z, origin, direction);
|
||||||
|
@ -422,7 +422,7 @@ public class BlockGenericPipe extends BlockBuildCraft {
|
||||||
bounds[2][1] = max;
|
bounds[2][1] = max;
|
||||||
|
|
||||||
MatrixTranformations.transform(bounds, side);
|
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) {
|
private AxisAlignedBB getFacadeBoundingBox(ForgeDirection side) {
|
||||||
|
@ -438,7 +438,7 @@ public class BlockGenericPipe extends BlockBuildCraft {
|
||||||
bounds[2][1] = 1.0F;
|
bounds[2][1] = 1.0F;
|
||||||
|
|
||||||
MatrixTranformations.transform(bounds, side);
|
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) {
|
private AxisAlignedBB getPlugBoundingBox(ForgeDirection side) {
|
||||||
|
@ -454,7 +454,7 @@ public class BlockGenericPipe extends BlockBuildCraft {
|
||||||
bounds[2][1] = 0.75F;
|
bounds[2][1] = 0.75F;
|
||||||
|
|
||||||
MatrixTranformations.transform(bounds, side);
|
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) {
|
private AxisAlignedBB getPipeBoundingBox(ForgeDirection side) {
|
||||||
|
@ -462,7 +462,7 @@ public class BlockGenericPipe extends BlockBuildCraft {
|
||||||
float max = CoreConstants.PIPE_MAX_POS;
|
float max = CoreConstants.PIPE_MAX_POS;
|
||||||
|
|
||||||
if (side == ForgeDirection.UNKNOWN) {
|
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];
|
float[][] bounds = new float[3][2];
|
||||||
|
@ -477,7 +477,7 @@ public class BlockGenericPipe extends BlockBuildCraft {
|
||||||
bounds[2][1] = max;
|
bounds[2][1] = max;
|
||||||
|
|
||||||
MatrixTranformations.transform(bounds, side);
|
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) {
|
public static void removePipe(Pipe pipe) {
|
||||||
|
|
|
@ -145,7 +145,7 @@ public class PipeItemsObsidian extends Pipe<PipeTransportItems> implements IPowe
|
||||||
Position min = p1.min(p2);
|
Position min = p1.min(p2);
|
||||||
Position max = p1.max(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
|
@Override
|
||||||
|
|
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
Binary file not shown.
4
gradle/wrapper/gradle-wrapper.properties
vendored
4
gradle/wrapper/gradle-wrapper.properties
vendored
|
@ -1,6 +1,6 @@
|
||||||
#Sun Feb 16 13:39:47 CST 2014
|
#Tue May 06 21:57:37 CEST 2014
|
||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
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
|
||||||
|
|
0
gradlew
vendored
Normal file → Executable file
0
gradlew
vendored
Normal file → Executable file
Loading…
Reference in a new issue