Anvilcraft/buildcraft
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Unused imports must die. Some formatting.

Browse source
This commit is contained in:
SirSengir 2013-07-06 09:41:47 +02:00
parent 1e0fa98484
commit 0cd627ce0d
17 changed files with 270 additions and 437 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
common/buildcraft/BuildCraftSilicon.java
View file

@ -36,7 +36,6 @@ import cpw.mods.fml.common.event.FMLInitializationEvent;
import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent;
import cpw.mods.fml.common.network.NetworkMod; import cpw.mods.fml.common.network.NetworkMod;
import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.network.NetworkRegistry;
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.common.registry.LanguageRegistry; import cpw.mods.fml.common.registry.LanguageRegistry;
@Mod(name = "BuildCraft Silicon", version = Version.VERSION, useMetadata = false, modid = "BuildCraft|Silicon", dependencies = DefaultProps.DEPENDENCY_TRANSPORT) @Mod(name = "BuildCraft Silicon", version = Version.VERSION, useMetadata = false, modid = "BuildCraft|Silicon", dependencies = DefaultProps.DEPENDENCY_TRANSPORT)

1
common/buildcraft/builders/BlockBuilder.java
View file

@ -25,7 +25,6 @@ import net.minecraftforge.common.ForgeDirection;
import buildcraft.BuildCraftBuilders; import buildcraft.BuildCraftBuilders;
import buildcraft.api.core.Position; import buildcraft.api.core.Position;
import buildcraft.api.tools.IToolWrench; import buildcraft.api.tools.IToolWrench;
import buildcraft.core.CreativeTabBuildCraft;
import buildcraft.core.GuiIds; import buildcraft.core.GuiIds;
import buildcraft.core.proxy.CoreProxy; import buildcraft.core.proxy.CoreProxy;
import buildcraft.core.utils.Utils; import buildcraft.core.utils.Utils;

1
common/buildcraft/builders/BlockMarker.java
View file

@ -25,7 +25,6 @@ import buildcraft.core.utils.Utils;
import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; import cpw.mods.fml.relauncher.SideOnly;
import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.common.ForgeDirection;
import static net.minecraftforge.common.ForgeDirection.*;
public class BlockMarker extends BlockContainer { public class BlockMarker extends BlockContainer {

1
common/buildcraft/core/inventory/InventoryIterator.java
View file

@ -1,6 +1,5 @@
package buildcraft.core.inventory; package buildcraft.core.inventory;
import buildcraft.core.inventory.InventoryIterator.IInvSlot;
import net.minecraft.inventory.IInventory; import net.minecraft.inventory.IInventory;
import net.minecraft.inventory.ISidedInventory; import net.minecraft.inventory.ISidedInventory;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;

1
common/buildcraft/energy/render/RenderEngine.java
View file

@ -135,6 +135,7 @@ public class RenderEngine extends TileEntitySpecialRenderer implements IInventor
break; break;
case SOUTH: case SOUTH:
case NORTH: case NORTH:
default:
angle[0] = angleMap[orientation.ordinal()]; angle[0] = angleMap[orientation.ordinal()];
break; break;
} }

512
common/buildcraft/energy/worldgen/SimplexNoise.java
View file

@ -17,345 +17,199 @@ package buildcraft.energy.worldgen;
* *
*/ */
public class SimplexNoise { // Simplex noise in 2D, 3D and 4D public class SimplexNoise { // Simplex noise in 2D, 3D and 4D
private static Grad grad3[] = {new Grad(1,1,0),new Grad(-1,1,0),new Grad(1,-1,0),new Grad(-1,-1,0), private static Grad grad3[] = { new Grad(1, 1, 0), new Grad(-1, 1, 0), new Grad(1, -1, 0), new Grad(-1, -1, 0), new Grad(1, 0, 1), new Grad(-1, 0, 1),
new Grad(1,0,1),new Grad(-1,0,1),new Grad(1,0,-1),new Grad(-1,0,-1), new Grad(1, 0, -1), new Grad(-1, 0, -1), new Grad(0, 1, 1), new Grad(0, -1, 1), new Grad(0, 1, -1), new Grad(0, -1, -1) };
new Grad(0,1,1),new Grad(0,-1,1),new Grad(0,1,-1),new Grad(0,-1,-1)};
// private static Grad grad4[]= {new Grad(0,1,1,1),new Grad(0,1,1,-1),new Grad(0,1,-1,1),new Grad(0,1,-1,-1), // private static Grad grad4[]= {new Grad(0,1,1,1),new Grad(0,1,1,-1),new Grad(0,1,-1,1),new Grad(0,1,-1,-1),
// new Grad(0,-1,1,1),new Grad(0,-1,1,-1),new Grad(0,-1,-1,1),new Grad(0,-1,-1,-1), // new Grad(0,-1,1,1),new Grad(0,-1,1,-1),new Grad(0,-1,-1,1),new Grad(0,-1,-1,-1),
// new Grad(1,0,1,1),new Grad(1,0,1,-1),new Grad(1,0,-1,1),new Grad(1,0,-1,-1), // new Grad(1,0,1,1),new Grad(1,0,1,-1),new Grad(1,0,-1,1),new Grad(1,0,-1,-1),
// new Grad(-1,0,1,1),new Grad(-1,0,1,-1),new Grad(-1,0,-1,1),new Grad(-1,0,-1,-1), // new Grad(-1,0,1,1),new Grad(-1,0,1,-1),new Grad(-1,0,-1,1),new Grad(-1,0,-1,-1),
// new Grad(1,1,0,1),new Grad(1,1,0,-1),new Grad(1,-1,0,1),new Grad(1,-1,0,-1), // new Grad(1,1,0,1),new Grad(1,1,0,-1),new Grad(1,-1,0,1),new Grad(1,-1,0,-1),
// new Grad(-1,1,0,1),new Grad(-1,1,0,-1),new Grad(-1,-1,0,1),new Grad(-1,-1,0,-1), // new Grad(-1,1,0,1),new Grad(-1,1,0,-1),new Grad(-1,-1,0,1),new Grad(-1,-1,0,-1),
// new Grad(1,1,1,0),new Grad(1,1,-1,0),new Grad(1,-1,1,0),new Grad(1,-1,-1,0), // new Grad(1,1,1,0),new Grad(1,1,-1,0),new Grad(1,-1,1,0),new Grad(1,-1,-1,0),
// new Grad(-1,1,1,0),new Grad(-1,1,-1,0),new Grad(-1,-1,1,0),new Grad(-1,-1,-1,0)}; // new Grad(-1,1,1,0),new Grad(-1,1,-1,0),new Grad(-1,-1,1,0),new Grad(-1,-1,-1,0)};
private static short p[] = {151,160,137,91,90,15, private static short p[] = { 151, 160, 137, 91, 90, 15, 131, 13, 201, 95, 96, 53, 194, 233, 7, 225, 140, 36, 103, 30, 69, 142, 8, 99, 37, 240, 21, 10, 23,
131,13,201,95,96,53,194,233,7,225,140,36,103,30,69,142,8,99,37,240,21,10,23, 190, 6, 148, 247, 120, 234, 75, 0, 26, 197, 62, 94, 252, 219, 203, 117, 35, 11, 32, 57, 177, 33, 88, 237, 149, 56, 87, 174, 20, 125, 136, 171, 168,
190, 6,148,247,120,234,75,0,26,197,62,94,252,219,203,117,35,11,32,57,177,33, 68, 175, 74, 165, 71, 134, 139, 48, 27, 166, 77, 146, 158, 231, 83, 111, 229, 122, 60, 211, 133, 230, 220, 105, 92, 41, 55, 46, 245, 40, 244, 102,
88,237,149,56,87,174,20,125,136,171,168, 68,175,74,165,71,134,139,48,27,166, 143, 54, 65, 25, 63, 161, 1, 216, 80, 73, 209, 76, 132, 187, 208, 89, 18, 169, 200, 196, 135, 130, 116, 188, 159, 86, 164, 100, 109, 198, 173, 186,
77,146,158,231,83,111,229,122,60,211,133,230,220,105,92,41,55,46,245,40,244, 3, 64, 52, 217, 226, 250, 124, 123, 5, 202, 38, 147, 118, 126, 255, 82, 85, 212, 207, 206, 59, 227, 47, 16, 58, 17, 182, 189, 28, 42, 223, 183,
102,143,54, 65,25,63,161, 1,216,80,73,209,76,132,187,208, 89,18,169,200,196, 170, 213, 119, 248, 152, 2, 44, 154, 163, 70, 221, 153, 101, 155, 167, 43, 172, 9, 129, 22, 39, 253, 19, 98, 108, 110, 79, 113, 224, 232, 178, 185,
135,130,116,188,159,86,164,100,109,198,173,186, 3,64,52,217,226,250,124,123, 112, 104, 218, 246, 97, 228, 251, 34, 242, 193, 238, 210, 144, 12, 191, 179, 162, 241, 81, 51, 145, 235, 249, 14, 239, 107, 49, 192, 214, 31, 181,
5,202,38,147,118,126,255,82,85,212,207,206,59,227,47,16,58,17,182,189,28,42, 199, 106, 157, 184, 84, 204, 176, 115, 121, 50, 45, 127, 4, 150, 254, 138, 236, 205, 93, 222, 114, 67, 29, 24, 72, 243, 141, 128, 195, 78, 66, 215,
223,183,170,213,119,248,152, 2,44,154,163, 70,221,153,101,155,167, 43,172,9, 61, 156, 180 };
129,22,39,253, 19,98,108,110,79,113,224,232,178,185, 112,104,218,246,97,228, // To remove the need for index wrapping, double the permutation table length
251,34,242,193,238,210,144,12,191,179,162,241, 81,51,145,235,249,14,239,107, private static short perm[] = new short[512];
49,192,214, 31,181,199,106,157,184, 84,204,176,115,121,50,45,127, 4,150,254, private static short permMod12[] = new short[512];
138,236,205,93,222,114,67,29,24,72,243,141,128,195,78,66,215,61,156,180}; static {
// To remove the need for index wrapping, double the permutation table length for (int i = 0; i < 512; i++) {
private static short perm[] = new short[512]; perm[i] = p[i & 255];
private static short permMod12[] = new short[512]; permMod12[i] = (short) (perm[i] % 12);
static { }
for(int i=0; i<512; i++) }
{
perm[i]=p[i & 255];
permMod12[i] = (short)(perm[i] % 12);
}
}
// Skewing and unskewing factors for 2, 3, and 4 dimensions // Skewing and unskewing factors for 2, 3, and 4 dimensions
private static final double F2 = 0.5*(Math.sqrt(3.0)-1.0); private static final double F2 = 0.5 * (Math.sqrt(3.0) - 1.0);
private static final double G2 = (3.0-Math.sqrt(3.0))/6.0; private static final double G2 = (3.0 - Math.sqrt(3.0)) / 6.0;
// private static final double F3 = 1.0/3.0;
// private static final double G3 = 1.0/6.0;
// private static final double F4 = (Math.sqrt(5.0)-1.0)/4.0;
// private static final double G4 = (5.0-Math.sqrt(5.0))/20.0;
// This method is a *lot* faster than using (int)Math.floor(x) // private static final double F3 = 1.0/3.0;
private static int fastfloor(double x) { // private static final double G3 = 1.0/6.0;
int xi = (int)x; // private static final double F4 = (Math.sqrt(5.0)-1.0)/4.0;
return x<xi ? xi-1 : xi; // private static final double G4 = (5.0-Math.sqrt(5.0))/20.0;
}
private static double dot(Grad g, double x, double y) { // This method is a *lot* faster than using (int)Math.floor(x)
return g.x*x + g.y*y; } private static int fastfloor(double x) {
int xi = (int) x;
return x < xi ? xi - 1 : xi;
}
// private static double dot(Grad g, double x, double y, double z) { private static double dot(Grad g, double x, double y) {
// return g.x*x + g.y*y + g.z*z; } return g.x * x + g.y * y;
// }
// private static double dot(Grad g, double x, double y, double z, double w) {
// return g.x*x + g.y*y + g.z*z + g.w*w; }
// private static double dot(Grad g, double x, double y, double z) {
// return g.x*x + g.y*y + g.z*z; }
//
// private static double dot(Grad g, double x, double y, double z, double w) {
// return g.x*x + g.y*y + g.z*z + g.w*w; }
// 2D simplex noise // 2D simplex noise
public static double noise(double xin, double yin) { public static double noise(double xin, double yin) {
double n0, n1, n2; // Noise contributions from the three corners double n0, n1, n2; // Noise contributions from the three corners
// Skew the input space to determine which simplex cell we're in // Skew the input space to determine which simplex cell we're in
double s = (xin+yin)*F2; // Hairy factor for 2D double s = (xin + yin) * F2; // Hairy factor for 2D
int i = fastfloor(xin+s); int i = fastfloor(xin + s);
int j = fastfloor(yin+s); int j = fastfloor(yin + s);
double t = (i+j)*G2; double t = (i + j) * G2;
double X0 = i-t; // Unskew the cell origin back to (x,y) space double X0 = i - t; // Unskew the cell origin back to (x,y) space
double Y0 = j-t; double Y0 = j - t;
double x0 = xin-X0; // The x,y distances from the cell origin double x0 = xin - X0; // The x,y distances from the cell origin
double y0 = yin-Y0; double y0 = yin - Y0;
// For the 2D case, the simplex shape is an equilateral triangle. // For the 2D case, the simplex shape is an equilateral triangle.
// Determine which simplex we are in. // Determine which simplex we are in.
int i1, j1; // Offsets for second (middle) corner of simplex in (i,j) coords int i1, j1; // Offsets for second (middle) corner of simplex in (i,j) coords
if(x0>y0) {i1=1; j1=0;} // lower triangle, XY order: (0,0)->(1,0)->(1,1) if (x0 > y0) {
else {i1=0; j1=1;} // upper triangle, YX order: (0,0)->(0,1)->(1,1) i1 = 1;
// A step of (1,0) in (i,j) means a step of (1-c,-c) in (x,y), and j1 = 0;
// a step of (0,1) in (i,j) means a step of (-c,1-c) in (x,y), where } // lower triangle, XY order: (0,0)->(1,0)->(1,1)
// c = (3-sqrt(3))/6 else {
double x1 = x0 - i1 + G2; // Offsets for middle corner in (x,y) unskewed coords i1 = 0;
double y1 = y0 - j1 + G2; j1 = 1;
double x2 = x0 - 1.0 + 2.0 * G2; // Offsets for last corner in (x,y) unskewed coords } // upper triangle, YX order: (0,0)->(0,1)->(1,1)
double y2 = y0 - 1.0 + 2.0 * G2; // A step of (1,0) in (i,j) means a step of (1-c,-c) in (x,y), and
// Work out the hashed gradient indices of the three simplex corners // a step of (0,1) in (i,j) means a step of (-c,1-c) in (x,y), where
int ii = i & 255; // c = (3-sqrt(3))/6
int jj = j & 255; double x1 = x0 - i1 + G2; // Offsets for middle corner in (x,y) unskewed coords
int gi0 = permMod12[ii+perm[jj]]; double y1 = y0 - j1 + G2;
int gi1 = permMod12[ii+i1+perm[jj+j1]]; double x2 = x0 - 1.0 + 2.0 * G2; // Offsets for last corner in (x,y) unskewed coords
int gi2 = permMod12[ii+1+perm[jj+1]]; double y2 = y0 - 1.0 + 2.0 * G2;
// Calculate the contribution from the three corners // Work out the hashed gradient indices of the three simplex corners
double t0 = 0.5 - x0*x0-y0*y0; int ii = i & 255;
if(t0<0) n0 = 0.0; int jj = j & 255;
else { int gi0 = permMod12[ii + perm[jj]];
t0 *= t0; int gi1 = permMod12[ii + i1 + perm[jj + j1]];
n0 = t0 * t0 * dot(grad3[gi0], x0, y0); // (x,y) of grad3 used for 2D gradient int gi2 = permMod12[ii + 1 + perm[jj + 1]];
} // Calculate the contribution from the three corners
double t1 = 0.5 - x1*x1-y1*y1; double t0 = 0.5 - x0 * x0 - y0 * y0;
if(t1<0) n1 = 0.0; if (t0 < 0)
else { n0 = 0.0;
t1 *= t1; else {
n1 = t1 * t1 * dot(grad3[gi1], x1, y1); t0 *= t0;
} n0 = t0 * t0 * dot(grad3[gi0], x0, y0); // (x,y) of grad3 used for 2D gradient
double t2 = 0.5 - x2*x2-y2*y2; }
if(t2<0) n2 = 0.0; double t1 = 0.5 - x1 * x1 - y1 * y1;
else { if (t1 < 0)
t2 *= t2; n1 = 0.0;
n2 = t2 * t2 * dot(grad3[gi2], x2, y2); else {
} t1 *= t1;
// Add contributions from each corner to get the final noise value. n1 = t1 * t1 * dot(grad3[gi1], x1, y1);
// The result is scaled to return values in the interval [-1,1]. }
return 70.0 * (n0 + n1 + n2); double t2 = 0.5 - x2 * x2 - y2 * y2;
} if (t2 < 0)
n2 = 0.0;
else {
t2 *= t2;
n2 = t2 * t2 * dot(grad3[gi2], x2, y2);
}
// Add contributions from each corner to get the final noise value.
// The result is scaled to return values in the interval [-1,1].
return 70.0 * (n0 + n1 + n2);
}
/* /*
*
* // 3D simplex noise public static double noise(double xin, double yin, double zin) { double n0, n1, n2, n3; // Noise contributions from the four corners
* // Skew the input space to determine which simplex cell we're in double s = (xin+yin+zin)*F3; // Very nice and simple skew factor for 3D int i =
* fastfloor(xin+s); int j = fastfloor(yin+s); int k = fastfloor(zin+s); double t = (i+j+k)*G3; double X0 = i-t; // Unskew the cell origin back to (x,y,z)
* space double Y0 = j-t; double Z0 = k-t; double x0 = xin-X0; // The x,y,z distances from the cell origin double y0 = yin-Y0; double z0 = zin-Z0; // For
* the 3D case, the simplex shape is a slightly irregular tetrahedron. // Determine which simplex we are in. int i1, j1, k1; // Offsets for second corner of
* simplex in (i,j,k) coords int i2, j2, k2; // Offsets for third corner of simplex in (i,j,k) coords if(x0>=y0) { if(y0>=z0) { i1=1; j1=0; k1=0; i2=1;
* j2=1; k2=0; } // X Y Z order else if(x0>=z0) { i1=1; j1=0; k1=0; i2=1; j2=0; k2=1; } // X Z Y order else { i1=0; j1=0; k1=1; i2=1; j2=0; k2=1; } // Z X Y
* order } else { // x0<y0 if(y0<z0) { i1=0; j1=0; k1=1; i2=0; j2=1; k2=1; } // Z Y X order else if(x0<z0) { i1=0; j1=1; k1=0; i2=0; j2=1; k2=1; } // Y Z X
* order else { i1=0; j1=1; k1=0; i2=1; j2=1; k2=0; } // Y X Z order } // A step of (1,0,0) in (i,j,k) means a step of (1-c,-c,-c) in (x,y,z), // a step of
* (0,1,0) in (i,j,k) means a step of (-c,1-c,-c) in (x,y,z), and // a step of (0,0,1) in (i,j,k) means a step of (-c,-c,1-c) in (x,y,z), where // c = 1/6.
* double x1 = x0 - i1 + G3; // Offsets for second corner in (x,y,z) coords double y1 = y0 - j1 + G3; double z1 = z0 - k1 + G3; double x2 = x0 - i2 +
* 2.0*G3; // Offsets for third corner in (x,y,z) coords double y2 = y0 - j2 + 2.0*G3; double z2 = z0 - k2 + 2.0*G3; double x3 = x0 - 1.0 + 3.0*G3; //
* Offsets for last corner in (x,y,z) coords double y3 = y0 - 1.0 + 3.0*G3; double z3 = z0 - 1.0 + 3.0*G3; // Work out the hashed gradient indices of the
* four simplex corners int ii = i & 255; int jj = j & 255; int kk = k & 255; int gi0 = permMod12[ii+perm[jj+perm[kk]]]; int gi1 =
* permMod12[ii+i1+perm[jj+j1+perm[kk+k1]]]; int gi2 = permMod12[ii+i2+perm[jj+j2+perm[kk+k2]]]; int gi3 = permMod12[ii+1+perm[jj+1+perm[kk+1]]]; //
* Calculate the contribution from the four corners double t0 = 0.6 - x0*x0 - y0*y0 - z0*z0; if(t0<0) n0 = 0.0; else { t0 *= t0; n0 = t0 * t0 *
* dot(grad3[gi0], x0, y0, z0); } double t1 = 0.6 - x1*x1 - y1*y1 - z1*z1; if(t1<0) n1 = 0.0; else { t1 *= t1; n1 = t1 * t1 * dot(grad3[gi1], x1, y1, z1); }
* double t2 = 0.6 - x2*x2 - y2*y2 - z2*z2; if(t2<0) n2 = 0.0; else { t2 *= t2; n2 = t2 * t2 * dot(grad3[gi2], x2, y2, z2); } double t3 = 0.6 - x3*x3 -
* y3*y3 - z3*z3; if(t3<0) n3 = 0.0; else { t3 *= t3; n3 = t3 * t3 * dot(grad3[gi3], x3, y3, z3); } // Add contributions from each corner to get the final
* noise value. // The result is scaled to stay just inside [-1,1] return 32.0*(n0 + n1 + n2 + n3); }
*
*
* // 4D simplex noise, better simplex rank ordering method 2012-03-09 public static double noise(double x, double y, double z, double w) {
*
* double n0, n1, n2, n3, n4; // Noise contributions from the five corners // Skew the (x,y,z,w) space to determine which cell of 24 simplices we're in
* double s = (x + y + z + w) * F4; // Factor for 4D skewing int i = fastfloor(x + s); int j = fastfloor(y + s); int k = fastfloor(z + s); int l =
* fastfloor(w + s); double t = (i + j + k + l) * G4; // Factor for 4D unskewing double X0 = i - t; // Unskew the cell origin back to (x,y,z,w) space double
* Y0 = j - t; double Z0 = k - t; double W0 = l - t; double x0 = x - X0; // The x,y,z,w distances from the cell origin double y0 = y - Y0; double z0 = z -
* Z0; double w0 = w - W0; // For the 4D case, the simplex is a 4D shape I won't even try to describe. // To find out which of the 24 possible simplices
* we're in, we need to // determine the magnitude ordering of x0, y0, z0 and w0. // Six pair-wise comparisons are performed between each possible pair //
* of the four coordinates, and the results are used to rank the numbers. int rankx = 0; int ranky = 0; int rankz = 0; int rankw = 0; if(x0 > y0) rankx++;
* else ranky++; if(x0 > z0) rankx++; else rankz++; if(x0 > w0) rankx++; else rankw++; if(y0 > z0) ranky++; else rankz++; if(y0 > w0) ranky++; else rankw++;
* if(z0 > w0) rankz++; else rankw++; int i1, j1, k1, l1; // The integer offsets for the second simplex corner int i2, j2, k2, l2; // The integer offsets
* for the third simplex corner int i3, j3, k3, l3; // The integer offsets for the fourth simplex corner // simplex[c] is a 4-vector with the numbers 0, 1,
* 2 and 3 in some order. // Many values of c will never occur, since e.g. x>y>z>w makes x<z, y<w and x<w // impossible. Only the 24 indices which have
* non-zero entries make any sense. // We use a thresholding to set the coordinates in turn from the largest magnitude. // Rank 3 denotes the largest
* coordinate. i1 = rankx >= 3 ? 1 : 0; j1 = ranky >= 3 ? 1 : 0; k1 = rankz >= 3 ? 1 : 0; l1 = rankw >= 3 ? 1 : 0; // Rank 2 denotes the second largest
* coordinate. i2 = rankx >= 2 ? 1 : 0; j2 = ranky >= 2 ? 1 : 0; k2 = rankz >= 2 ? 1 : 0; l2 = rankw >= 2 ? 1 : 0; // Rank 1 denotes the second smallest
* coordinate. i3 = rankx >= 1 ? 1 : 0; j3 = ranky >= 1 ? 1 : 0; k3 = rankz >= 1 ? 1 : 0; l3 = rankw >= 1 ? 1 : 0; // The fifth corner has all coordinate
* offsets = 1, so no need to compute that. double x1 = x0 - i1 + G4; // Offsets for second corner in (x,y,z,w) coords double y1 = y0 - j1 + G4; double z1 =
* z0 - k1 + G4; double w1 = w0 - l1 + G4; double x2 = x0 - i2 + 2.0*G4; // Offsets for third corner in (x,y,z,w) coords double y2 = y0 - j2 + 2.0*G4;
* double z2 = z0 - k2 + 2.0*G4; double w2 = w0 - l2 + 2.0*G4; double x3 = x0 - i3 + 3.0*G4; // Offsets for fourth corner in (x,y,z,w) coords double y3 = y0
* - j3 + 3.0*G4; double z3 = z0 - k3 + 3.0*G4; double w3 = w0 - l3 + 3.0*G4; double x4 = x0 - 1.0 + 4.0*G4; // Offsets for last corner in (x,y,z,w) coords
* double y4 = y0 - 1.0 + 4.0*G4; double z4 = z0 - 1.0 + 4.0*G4; double w4 = w0 - 1.0 + 4.0*G4; // Work out the hashed gradient indices of the five simplex
* corners int ii = i & 255; int jj = j & 255; int kk = k & 255; int ll = l & 255; int gi0 = perm[ii+perm[jj+perm[kk+perm[ll]]]] % 32; int gi1 =
* perm[ii+i1+perm[jj+j1+perm[kk+k1+perm[ll+l1]]]] % 32; int gi2 = perm[ii+i2+perm[jj+j2+perm[kk+k2+perm[ll+l2]]]] % 32; int gi3 =
* perm[ii+i3+perm[jj+j3+perm[kk+k3+perm[ll+l3]]]] % 32; int gi4 = perm[ii+1+perm[jj+1+perm[kk+1+perm[ll+1]]]] % 32; // Calculate the contribution from the
* five corners double t0 = 0.6 - x0*x0 - y0*y0 - z0*z0 - w0*w0; if(t0<0) n0 = 0.0; else { t0 *= t0; n0 = t0 * t0 * dot(grad4[gi0], x0, y0, z0, w0); }
* double t1 = 0.6 - x1*x1 - y1*y1 - z1*z1 - w1*w1; if(t1<0) n1 = 0.0; else { t1 *= t1; n1 = t1 * t1 * dot(grad4[gi1], x1, y1, z1, w1); } double t2 = 0.6 -
* x2*x2 - y2*y2 - z2*z2 - w2*w2; if(t2<0) n2 = 0.0; else { t2 *= t2; n2 = t2 * t2 * dot(grad4[gi2], x2, y2, z2, w2); } double t3 = 0.6 - x3*x3 - y3*y3 -
* z3*z3 - w3*w3; if(t3<0) n3 = 0.0; else { t3 *= t3; n3 = t3 * t3 * dot(grad4[gi3], x3, y3, z3, w3); } double t4 = 0.6 - x4*x4 - y4*y4 - z4*z4 - w4*w4;
* if(t4<0) n4 = 0.0; else { t4 *= t4; n4 = t4 * t4 * dot(grad4[gi4], x4, y4, z4, w4); } // Sum up and scale the result to cover the range [-1,1] return
* 27.0 * (n0 + n1 + n2 + n3 + n4); }
*/
// 3D simplex noise // Inner class to speed upp gradient computations
public static double noise(double xin, double yin, double zin) { // (array access is a lot slower than member access)
double n0, n1, n2, n3; // Noise contributions from the four corners private static class Grad {
// Skew the input space to determine which simplex cell we're in double x, y, z, w;
double s = (xin+yin+zin)*F3; // Very nice and simple skew factor for 3D
int i = fastfloor(xin+s);
int j = fastfloor(yin+s);
int k = fastfloor(zin+s);
double t = (i+j+k)*G3;
double X0 = i-t; // Unskew the cell origin back to (x,y,z) space
double Y0 = j-t;
double Z0 = k-t;
double x0 = xin-X0; // The x,y,z distances from the cell origin
double y0 = yin-Y0;
double z0 = zin-Z0;
// For the 3D case, the simplex shape is a slightly irregular tetrahedron.
// Determine which simplex we are in.
int i1, j1, k1; // Offsets for second corner of simplex in (i,j,k) coords
int i2, j2, k2; // Offsets for third corner of simplex in (i,j,k) coords
if(x0>=y0) {
if(y0>=z0)
{ i1=1; j1=0; k1=0; i2=1; j2=1; k2=0; } // X Y Z order
else if(x0>=z0) { i1=1; j1=0; k1=0; i2=1; j2=0; k2=1; } // X Z Y order
else { i1=0; j1=0; k1=1; i2=1; j2=0; k2=1; } // Z X Y order
}
else { // x0<y0
if(y0<z0) { i1=0; j1=0; k1=1; i2=0; j2=1; k2=1; } // Z Y X order
else if(x0<z0) { i1=0; j1=1; k1=0; i2=0; j2=1; k2=1; } // Y Z X order
else { i1=0; j1=1; k1=0; i2=1; j2=1; k2=0; } // Y X Z order
}
// A step of (1,0,0) in (i,j,k) means a step of (1-c,-c,-c) in (x,y,z),
// a step of (0,1,0) in (i,j,k) means a step of (-c,1-c,-c) in (x,y,z), and
// a step of (0,0,1) in (i,j,k) means a step of (-c,-c,1-c) in (x,y,z), where
// c = 1/6.
double x1 = x0 - i1 + G3; // Offsets for second corner in (x,y,z) coords
double y1 = y0 - j1 + G3;
double z1 = z0 - k1 + G3;
double x2 = x0 - i2 + 2.0*G3; // Offsets for third corner in (x,y,z) coords
double y2 = y0 - j2 + 2.0*G3;
double z2 = z0 - k2 + 2.0*G3;
double x3 = x0 - 1.0 + 3.0*G3; // Offsets for last corner in (x,y,z) coords
double y3 = y0 - 1.0 + 3.0*G3;
double z3 = z0 - 1.0 + 3.0*G3;
// Work out the hashed gradient indices of the four simplex corners
int ii = i & 255;
int jj = j & 255;
int kk = k & 255;
int gi0 = permMod12[ii+perm[jj+perm[kk]]];
int gi1 = permMod12[ii+i1+perm[jj+j1+perm[kk+k1]]];
int gi2 = permMod12[ii+i2+perm[jj+j2+perm[kk+k2]]];
int gi3 = permMod12[ii+1+perm[jj+1+perm[kk+1]]];
// Calculate the contribution from the four corners
double t0 = 0.6 - x0*x0 - y0*y0 - z0*z0;
if(t0<0) n0 = 0.0;
else {
t0 *= t0;
n0 = t0 * t0 * dot(grad3[gi0], x0, y0, z0);
}
double t1 = 0.6 - x1*x1 - y1*y1 - z1*z1;
if(t1<0) n1 = 0.0;
else {
t1 *= t1;
n1 = t1 * t1 * dot(grad3[gi1], x1, y1, z1);
}
double t2 = 0.6 - x2*x2 - y2*y2 - z2*z2;
if(t2<0) n2 = 0.0;
else {
t2 *= t2;
n2 = t2 * t2 * dot(grad3[gi2], x2, y2, z2);
}
double t3 = 0.6 - x3*x3 - y3*y3 - z3*z3;
if(t3<0) n3 = 0.0;
else {
t3 *= t3;
n3 = t3 * t3 * dot(grad3[gi3], x3, y3, z3);
}
// Add contributions from each corner to get the final noise value.
// The result is scaled to stay just inside [-1,1]
return 32.0*(n0 + n1 + n2 + n3);
}
Grad(double x, double y, double z) {
this.x = x;
this.y = y;
this.z = z;
}
// 4D simplex noise, better simplex rank ordering method 2012-03-09 Grad(double x, double y, double z, double w) {
public static double noise(double x, double y, double z, double w) { this.x = x;
this.y = y;
double n0, n1, n2, n3, n4; // Noise contributions from the five corners this.z = z;
// Skew the (x,y,z,w) space to determine which cell of 24 simplices we're in this.w = w;
double s = (x + y + z + w) * F4; // Factor for 4D skewing }
int i = fastfloor(x + s); }
int j = fastfloor(y + s);
int k = fastfloor(z + s);
int l = fastfloor(w + s);
double t = (i + j + k + l) * G4; // Factor for 4D unskewing
double X0 = i - t; // Unskew the cell origin back to (x,y,z,w) space
double Y0 = j - t;
double Z0 = k - t;
double W0 = l - t;
double x0 = x - X0; // The x,y,z,w distances from the cell origin
double y0 = y - Y0;
double z0 = z - Z0;
double w0 = w - W0;
// For the 4D case, the simplex is a 4D shape I won't even try to describe.
// To find out which of the 24 possible simplices we're in, we need to
// determine the magnitude ordering of x0, y0, z0 and w0.
// Six pair-wise comparisons are performed between each possible pair
// of the four coordinates, and the results are used to rank the numbers.
int rankx = 0;
int ranky = 0;
int rankz = 0;
int rankw = 0;
if(x0 > y0) rankx++; else ranky++;
if(x0 > z0) rankx++; else rankz++;
if(x0 > w0) rankx++; else rankw++;
if(y0 > z0) ranky++; else rankz++;
if(y0 > w0) ranky++; else rankw++;
if(z0 > w0) rankz++; else rankw++;
int i1, j1, k1, l1; // The integer offsets for the second simplex corner
int i2, j2, k2, l2; // The integer offsets for the third simplex corner
int i3, j3, k3, l3; // The integer offsets for the fourth simplex corner
// simplex[c] is a 4-vector with the numbers 0, 1, 2 and 3 in some order.
// Many values of c will never occur, since e.g. x>y>z>w makes x<z, y<w and x<w
// impossible. Only the 24 indices which have non-zero entries make any sense.
// We use a thresholding to set the coordinates in turn from the largest magnitude.
// Rank 3 denotes the largest coordinate.
i1 = rankx >= 3 ? 1 : 0;
j1 = ranky >= 3 ? 1 : 0;
k1 = rankz >= 3 ? 1 : 0;
l1 = rankw >= 3 ? 1 : 0;
// Rank 2 denotes the second largest coordinate.
i2 = rankx >= 2 ? 1 : 0;
j2 = ranky >= 2 ? 1 : 0;
k2 = rankz >= 2 ? 1 : 0;
l2 = rankw >= 2 ? 1 : 0;
// Rank 1 denotes the second smallest coordinate.
i3 = rankx >= 1 ? 1 : 0;
j3 = ranky >= 1 ? 1 : 0;
k3 = rankz >= 1 ? 1 : 0;
l3 = rankw >= 1 ? 1 : 0;
// The fifth corner has all coordinate offsets = 1, so no need to compute that.
double x1 = x0 - i1 + G4; // Offsets for second corner in (x,y,z,w) coords
double y1 = y0 - j1 + G4;
double z1 = z0 - k1 + G4;
double w1 = w0 - l1 + G4;
double x2 = x0 - i2 + 2.0*G4; // Offsets for third corner in (x,y,z,w) coords
double y2 = y0 - j2 + 2.0*G4;
double z2 = z0 - k2 + 2.0*G4;
double w2 = w0 - l2 + 2.0*G4;
double x3 = x0 - i3 + 3.0*G4; // Offsets for fourth corner in (x,y,z,w) coords
double y3 = y0 - j3 + 3.0*G4;
double z3 = z0 - k3 + 3.0*G4;
double w3 = w0 - l3 + 3.0*G4;
double x4 = x0 - 1.0 + 4.0*G4; // Offsets for last corner in (x,y,z,w) coords
double y4 = y0 - 1.0 + 4.0*G4;
double z4 = z0 - 1.0 + 4.0*G4;
double w4 = w0 - 1.0 + 4.0*G4;
// Work out the hashed gradient indices of the five simplex corners
int ii = i & 255;
int jj = j & 255;
int kk = k & 255;
int ll = l & 255;
int gi0 = perm[ii+perm[jj+perm[kk+perm[ll]]]] % 32;
int gi1 = perm[ii+i1+perm[jj+j1+perm[kk+k1+perm[ll+l1]]]] % 32;
int gi2 = perm[ii+i2+perm[jj+j2+perm[kk+k2+perm[ll+l2]]]] % 32;
int gi3 = perm[ii+i3+perm[jj+j3+perm[kk+k3+perm[ll+l3]]]] % 32;
int gi4 = perm[ii+1+perm[jj+1+perm[kk+1+perm[ll+1]]]] % 32;
// Calculate the contribution from the five corners
double t0 = 0.6 - x0*x0 - y0*y0 - z0*z0 - w0*w0;
if(t0<0) n0 = 0.0;
else {
t0 *= t0;
n0 = t0 * t0 * dot(grad4[gi0], x0, y0, z0, w0);
}
double t1 = 0.6 - x1*x1 - y1*y1 - z1*z1 - w1*w1;
if(t1<0) n1 = 0.0;
else {
t1 *= t1;
n1 = t1 * t1 * dot(grad4[gi1], x1, y1, z1, w1);
}
double t2 = 0.6 - x2*x2 - y2*y2 - z2*z2 - w2*w2;
if(t2<0) n2 = 0.0;
else {
t2 *= t2;
n2 = t2 * t2 * dot(grad4[gi2], x2, y2, z2, w2);
}
double t3 = 0.6 - x3*x3 - y3*y3 - z3*z3 - w3*w3;
if(t3<0) n3 = 0.0;
else {
t3 *= t3;
n3 = t3 * t3 * dot(grad4[gi3], x3, y3, z3, w3);
}
double t4 = 0.6 - x4*x4 - y4*y4 - z4*z4 - w4*w4;
if(t4<0) n4 = 0.0;
else {
t4 *= t4;
n4 = t4 * t4 * dot(grad4[gi4], x4, y4, z4, w4);
}
// Sum up and scale the result to cover the range [-1,1]
return 27.0 * (n0 + n1 + n2 + n3 + n4);
}
*/
// Inner class to speed upp gradient computations
// (array access is a lot slower than member access)
private static class Grad
{
double x, y, z, w;
Grad(double x, double y, double z)
{
this.x = x;
this.y = y;
this.z = z;
}
Grad(double x, double y, double z, double w)
{
this.x = x;
this.y = y;
this.z = z;
this.w = w;
}
}
} }

2
common/buildcraft/silicon/gui/GuiAssemblyTable.java
View file

@ -26,8 +26,6 @@ import buildcraft.core.gui.GuiAdvancedInterface;
import buildcraft.core.network.PacketCoordinates; import buildcraft.core.network.PacketCoordinates;
import buildcraft.core.network.PacketIds; import buildcraft.core.network.PacketIds;
import buildcraft.core.network.PacketNBT; import buildcraft.core.network.PacketNBT;
import buildcraft.core.network.PacketPayload;
import buildcraft.core.network.PacketUpdate;
import buildcraft.core.proxy.CoreProxy; import buildcraft.core.proxy.CoreProxy;
import buildcraft.core.utils.StringUtils; import buildcraft.core.utils.StringUtils;
import buildcraft.silicon.TileAssemblyTable; import buildcraft.silicon.TileAssemblyTable;

1
common/buildcraft/silicon/network/PacketHandlerSilicon.java
View file

@ -13,7 +13,6 @@ import buildcraft.core.network.PacketCoordinates;
import buildcraft.core.network.PacketIds; import buildcraft.core.network.PacketIds;
import buildcraft.core.network.PacketNBT; import buildcraft.core.network.PacketNBT;
import buildcraft.core.network.PacketSlotChange; import buildcraft.core.network.PacketSlotChange;
import buildcraft.core.network.PacketUpdate;
import buildcraft.silicon.TileAdvancedCraftingTable; import buildcraft.silicon.TileAdvancedCraftingTable;
import buildcraft.silicon.TileAssemblyTable; import buildcraft.silicon.TileAssemblyTable;
import buildcraft.silicon.TileAssemblyTable.SelectionMessage; import buildcraft.silicon.TileAssemblyTable.SelectionMessage;

1
common/buildcraft/transport/BlockGenericPipe.java
View file

@ -438,6 +438,7 @@ public class BlockGenericPipe extends BlockContainer {
case WEST: case WEST:
setBlockBounds(Utils.pipeMinPos - 0.10F, min, min, Utils.pipeMinPos, max, max); setBlockBounds(Utils.pipeMinPos - 0.10F, min, min, Utils.pipeMinPos, max, max);
break; break;
default:
case EAST: case EAST:
setBlockBounds(Utils.pipeMaxPos, min, min, Utils.pipeMaxPos + 0.10F, max, max); setBlockBounds(Utils.pipeMaxPos, min, min, Utils.pipeMaxPos + 0.10F, max, max);
break; break;

4
common/buildcraft/transport/EnergyPulser.java
View file

@ -55,10 +55,6 @@ public class EnergyPulser {
return isActive; return isActive;
} }
private float getPulseSpeed() {
return 0.1F;
}
public void writeToNBT(NBTTagCompound nbttagcompound) { public void writeToNBT(NBTTagCompound nbttagcompound) {
nbttagcompound.setBoolean("SinglePulse", singlePulse); nbttagcompound.setBoolean("SinglePulse", singlePulse);
nbttagcompound.setBoolean("IsActive", isActive); nbttagcompound.setBoolean("IsActive", isActive);

1
common/buildcraft/transport/FallbackWrapper.java
View file

@ -1,6 +1,5 @@
package buildcraft.transport; package buildcraft.transport;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import com.google.common.base.Throwables; import com.google.common.base.Throwables;

174
common/buildcraft/transport/ItemFacade.java
View file

@ -18,7 +18,6 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.common.ForgeDirection;
import buildcraft.BuildCraftCore;
import buildcraft.BuildCraftTransport; import buildcraft.BuildCraftTransport;
import buildcraft.api.recipes.AssemblyRecipe; import buildcraft.api.recipes.AssemblyRecipe;
import buildcraft.core.CreativeTabBuildCraft; import buildcraft.core.CreativeTabBuildCraft;
@ -49,8 +48,8 @@ public class ItemFacade extends ItemBuildCraft {
int decodedBlockId = ItemFacade.getBlockId(itemstack); int decodedBlockId = ItemFacade.getBlockId(itemstack);
int decodedMeta = ItemFacade.getMetaData(itemstack); int decodedMeta = ItemFacade.getMetaData(itemstack);
if (decodedBlockId < Block.blocksList.length && Block.blocksList[decodedBlockId] != null && Block.blocksList[decodedBlockId].getRenderType() == 31) { if (decodedBlockId < Block.blocksList.length && Block.blocksList[decodedBlockId] != null && Block.blocksList[decodedBlockId].getRenderType() == 31) {
decodedMeta &= 0x3; decodedMeta &= 0x3;
} }
ItemStack newStack = new ItemStack(decodedBlockId, 1, decodedMeta); ItemStack newStack = new ItemStack(decodedBlockId, 1, decodedMeta);
if (Item.itemsList[decodedBlockId] != null) { if (Item.itemsList[decodedBlockId] != null) {
name += ": " + CoreProxy.proxy.getItemDisplayName(newStack); name += ": " + CoreProxy.proxy.getItemDisplayName(newStack);
@ -90,8 +89,7 @@ public class ItemFacade extends ItemBuildCraft {
pipeTile.dropFacade(ForgeDirection.VALID_DIRECTIONS[side]); pipeTile.dropFacade(ForgeDirection.VALID_DIRECTIONS[side]);
return true; return true;
} else { } else {
if (((TileGenericPipe) tile).addFacade(ForgeDirection.values()[side], ItemFacade.getBlockId(stack), if (((TileGenericPipe) tile).addFacade(ForgeDirection.values()[side], ItemFacade.getBlockId(stack), ItemFacade.getMetaData(stack))) {
ItemFacade.getMetaData(stack))) {
if (!player.capabilities.isCreativeMode) { if (!player.capabilities.isCreativeMode) {
stack.stackSize--; stack.stackSize--;
} }
@ -111,12 +109,12 @@ public class ItemFacade extends ItemBuildCraft {
continue; continue;
} }
if (!(b.blockID == 20)){ //Explicitly allow glass if (!(b.blockID == 20)) { // Explicitly allow glass
if (b.blockID == 7 //Bedrock if (b.blockID == 7 // Bedrock
|| b.blockID == 2 //Grass block || b.blockID == 2 // Grass block
|| b.blockID == 18 //Oak leaves || b.blockID == 18 // Oak leaves
|| b.blockID == 19 //Sponge || b.blockID == 19 // Sponge
|| b.blockID == 95 //Locked chest || b.blockID == 95 // Locked chest
) { ) {
continue; continue;
} }
@ -141,19 +139,19 @@ public class ItemFacade extends ItemBuildCraft {
} }
public static int getMetaData(ItemStack stack) { public static int getMetaData(ItemStack stack) {
if(stack.hasTagCompound() && stack.getTagCompound().hasKey("meta")) if (stack.hasTagCompound() && stack.getTagCompound().hasKey("meta"))
return stack.getTagCompound().getInteger("meta"); return stack.getTagCompound().getInteger("meta");
return stack.getItemDamage() & 0x0000F; return stack.getItemDamage() & 0x0000F;
} }
public static int getBlockId(ItemStack stack) { public static int getBlockId(ItemStack stack) {
if(stack.hasTagCompound() && stack.getTagCompound().hasKey("id")) if (stack.hasTagCompound() && stack.getTagCompound().hasKey("id"))
return stack.getTagCompound().getInteger("id"); return stack.getTagCompound().getInteger("id");
return ((stack.getItemDamage() & 0xFFF0) >>> 4); return ((stack.getItemDamage() & 0xFFF0) >>> 4);
} }
@Override @Override
public boolean shouldPassSneakingClickToBlock(World worldObj, int x, int y, int z ) { public boolean shouldPassSneakingClickToBlock(World worldObj, int x, int y, int z) {
// Simply send shift click to the pipe / mod block. // Simply send shift click to the pipe / mod block.
return true; return true;
} }
@ -169,98 +167,94 @@ public class ItemFacade extends ItemBuildCraft {
AssemblyRecipe.assemblyRecipes.add(new AssemblyRecipe(new ItemStack[] { new ItemStack(BuildCraftTransport.pipeStructureCobblestone, 3), itemStack }, AssemblyRecipe.assemblyRecipes.add(new AssemblyRecipe(new ItemStack[] { new ItemStack(BuildCraftTransport.pipeStructureCobblestone, 3), itemStack },
8000, facade6)); 8000, facade6));
if (itemStack.itemID < Block.blocksList.length && Block.blocksList[itemStack.itemID] != null) { if (itemStack.itemID < Block.blocksList.length && Block.blocksList[itemStack.itemID] != null) {
Block bl = Block.blocksList[itemStack.itemID]; Block bl = Block.blocksList[itemStack.itemID];
// Special handling for logs // Special handling for logs
if (bl.getRenderType() == 31) { if (bl.getRenderType() == 31) {
ItemStack mainLog = getStack(itemStack.itemID, itemStack.getItemDamage()); ItemStack rotLog1 = getStack(itemStack.itemID, itemStack.getItemDamage() | 4);
ItemStack rotLog1 = getStack(itemStack.itemID, itemStack.getItemDamage() | 4); ItemStack rotLog2 = getStack(itemStack.itemID, itemStack.getItemDamage() | 8);
ItemStack rotLog2 = getStack(itemStack.itemID, itemStack.getItemDamage() | 8); allFacades.add(rotLog1);
allFacades.add(rotLog1); allFacades.add(rotLog2);
allFacades.add(rotLog2); }
}
} }
} }
private static final ItemStack NO_MATCH = new ItemStack(0,0,0); private static final ItemStack NO_MATCH = new ItemStack(0, 0, 0);
public class FacadeRecipe implements IRecipe { public class FacadeRecipe implements IRecipe {
@Override
public boolean matches(InventoryCrafting inventorycrafting, World world) @Override
{ public boolean matches(InventoryCrafting inventorycrafting, World world) {
ItemStack slotmatch = null; ItemStack slotmatch = null;
for (int i = 0; i < inventorycrafting.getSizeInventory(); i++) { for (int i = 0; i < inventorycrafting.getSizeInventory(); i++) {
ItemStack slot = inventorycrafting.getStackInSlot(i); ItemStack slot = inventorycrafting.getStackInSlot(i);
if (slot != null && slot.itemID == ItemFacade.this.itemID && slotmatch == null) { if (slot != null && slot.itemID == ItemFacade.this.itemID && slotmatch == null) {
slotmatch = slot; slotmatch = slot;
} else if (slot != null) { } else if (slot != null) {
slotmatch = NO_MATCH; slotmatch = NO_MATCH;
} }
} }
if (slotmatch != null && slotmatch != NO_MATCH) { if (slotmatch != null && slotmatch != NO_MATCH) {
int blockId = ItemFacade.getBlockId(slotmatch); int blockId = ItemFacade.getBlockId(slotmatch);
return blockId < Block.blocksList.length && Block.blocksList[blockId] != null && Block.blocksList[blockId].getRenderType() == 31; return blockId < Block.blocksList.length && Block.blocksList[blockId] != null && Block.blocksList[blockId].getRenderType() == 31;
} }
return false; return false;
} }
@Override @Override
public ItemStack getCraftingResult(InventoryCrafting inventorycrafting) public ItemStack getCraftingResult(InventoryCrafting inventorycrafting) {
{ ItemStack slotmatch = null;
ItemStack slotmatch = null; for (int i = 0; i < inventorycrafting.getSizeInventory(); i++) {
for (int i = 0; i < inventorycrafting.getSizeInventory(); i++) { ItemStack slot = inventorycrafting.getStackInSlot(i);
ItemStack slot = inventorycrafting.getStackInSlot(i); if (slot != null && slot.itemID == ItemFacade.this.itemID && slotmatch == null) {
if (slot != null && slot.itemID == ItemFacade.this.itemID && slotmatch == null) { slotmatch = slot;
slotmatch = slot; } else if (slot != null) {
} else if (slot != null) { slotmatch = NO_MATCH;
slotmatch = NO_MATCH; }
} }
} if (slotmatch != null && slotmatch != NO_MATCH) {
if (slotmatch != null && slotmatch != NO_MATCH) { int blockId = ItemFacade.getBlockId(slotmatch);
int blockId = ItemFacade.getBlockId(slotmatch); int blockMeta = ItemFacade.getMetaData(slotmatch);
int blockMeta = ItemFacade.getMetaData(slotmatch); if (blockId >= Block.blocksList.length)
if (blockId >= Block.blocksList.length) return null;
return null; Block bl = Block.blocksList[blockId];
Block bl = Block.blocksList[blockId]; // No Meta
// No Meta if (bl != null && bl.getRenderType() == 31 && (blockMeta & 0xC) == 0)
if (bl != null && bl.getRenderType() == 31 && (blockMeta & 0xC) == 0) return getStack(blockId, (blockMeta & 0x3) | 4);
return getStack(blockId, (blockMeta & 0x3) | 4); // Meta | 4 = true
// Meta | 4 = true if (bl != null && bl.getRenderType() == 31 && (blockMeta & 0x8) == 0)
if (bl != null && bl.getRenderType() == 31 && (blockMeta & 0x8) == 0) return getStack(blockId, (blockMeta & 0x3) | 8);
return getStack(blockId, (blockMeta & 0x3) | 8); // Meta | 8 = true
// Meta | 8 = true if (bl != null && bl.getRenderType() == 31 && (blockMeta & 0x4) == 0)
if (bl != null && bl.getRenderType() == 31 && (blockMeta & 0x4) == 0) return getStack(blockId, (blockMeta & 0x3));
return getStack(blockId, (blockMeta & 0x3)); }
} return null;
return null; }
}
@Override @Override
public int getRecipeSize() public int getRecipeSize() {
{ return 1;
return 1; }
}
@Override @Override
public ItemStack getRecipeOutput() public ItemStack getRecipeOutput() {
{ return null;
return null; }
}
} }
@Override @Override
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public void registerIcons(IconRegister par1IconRegister) public void registerIcons(IconRegister par1IconRegister) {
{ // NOOP
// NOOP
} }
@Override @Override
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public int getSpriteNumber() public int getSpriteNumber() {
{ return 0;
return 0; }
}
public static ItemStack getStack(int blockID, int metadata) { public static ItemStack getStack(int blockID, int metadata) {
ItemStack stack = new ItemStack(BuildCraftTransport.facadeItem, 1, 0); ItemStack stack = new ItemStack(BuildCraftTransport.facadeItem, 1, 0);

1
common/buildcraft/transport/ItemPipe.java
View file

@ -21,7 +21,6 @@ import buildcraft.api.core.IIconProvider;
import buildcraft.core.CreativeTabBuildCraft; import buildcraft.core.CreativeTabBuildCraft;
import buildcraft.core.IItemPipe; import buildcraft.core.IItemPipe;
import buildcraft.core.ItemBuildCraft; import buildcraft.core.ItemBuildCraft;
import buildcraft.transport.pipes.PipePowerCobblestone;
import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; import cpw.mods.fml.relauncher.SideOnly;
import java.util.List; import java.util.List;

1
common/buildcraft/transport/gui/GuiGateInterface.java
View file

@ -17,7 +17,6 @@ import net.minecraft.util.Icon;
import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL11;
import buildcraft.BuildCraftCore;
import buildcraft.api.gates.IAction; import buildcraft.api.gates.IAction;
import buildcraft.api.gates.ITrigger; import buildcraft.api.gates.ITrigger;
import buildcraft.api.gates.ITriggerParameter; import buildcraft.api.gates.ITriggerParameter;

3
common/buildcraft/transport/pipes/PipePowerWood.java
View file

@ -13,15 +13,12 @@ import buildcraft.api.core.IIconProvider;
import buildcraft.api.power.IPowerProvider; import buildcraft.api.power.IPowerProvider;
import buildcraft.api.power.IPowerReceptor; import buildcraft.api.power.IPowerReceptor;
import buildcraft.api.power.PowerFramework; import buildcraft.api.power.PowerFramework;
import buildcraft.core.utils.Utils;
import buildcraft.transport.Pipe; import buildcraft.transport.Pipe;
import buildcraft.transport.PipeIconProvider; import buildcraft.transport.PipeIconProvider;
import buildcraft.transport.PipeTransportPower; import buildcraft.transport.PipeTransportPower;
import buildcraft.transport.TileGenericPipe;
import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
public class PipePowerWood extends Pipe implements IPowerReceptor { public class PipePowerWood extends Pipe implements IPowerReceptor {

1
common/buildcraft/transport/render/TileEntityPickupFX.java
View file

@ -12,7 +12,6 @@
package buildcraft.transport.render; package buildcraft.transport.render;
import net.minecraft.client.particle.EntityFX; import net.minecraft.client.particle.EntityFX;
import net.minecraft.client.particle.EntityPickupFX;
import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.OpenGlHelper;
import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.Tessellator;
import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.entity.RenderManager;

1
common/buildcraft/transport/triggers/TriggerPipeContents.java
View file

@ -130,6 +130,7 @@ public class TriggerPipeContents extends BCTrigger implements ITriggerPipe {
case RequestsEnergy: case RequestsEnergy:
PipePowerWood wood = (PipePowerWood) pipe; PipePowerWood wood = (PipePowerWood) pipe;
return wood.requestsPower(); return wood.requestsPower();
default:
case TooMuchEnergy: case TooMuchEnergy:
return transportPower.isOverloaded(); return transportPower.isOverloaded();
} }