diff options
Diffstat (limited to 'src/Java/gtPlusPlus/xmod/gregtech')
3 files changed, 15 insertions, 15 deletions
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/TreeFarmHelper.java b/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/TreeFarmHelper.java index 9d7750d834..2bfb07ff4a 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/TreeFarmHelper.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/TreeFarmHelper.java @@ -415,7 +415,7 @@ public class TreeFarmHelper { if (h == 1) { if (TreeFarmHelper.isWoodLog(aBaseMetaTileEntity.getBlockOffset(xDir + i, h, zDir + j))) { Logger.INFO("Found a Log"); - return new BlockPos(aBaseMetaTileEntity.getXCoord()+xDir + i, aBaseMetaTileEntity.getYCoord()+h, aBaseMetaTileEntity.getZCoord()+zDir + j); + return new BlockPos(aBaseMetaTileEntity.getXCoord()+xDir + i, aBaseMetaTileEntity.getYCoord()+h, aBaseMetaTileEntity.getZCoord()+zDir + j, aBaseMetaTileEntity.getWorld()); } } } @@ -558,42 +558,42 @@ public class TreeFarmHelper { int z = P.zPos; if (checkLeaves) { if (isWoodLog(W.getBlock(x-1, y, z)) || isLeaves(W.getBlock(x-1, y, z))) { - BlockPos L = new BlockPos(x-1, y, z); + BlockPos L = new BlockPos(x-1, y, z, W); if (!checkedSpaces.contains(L)) { mConnected.add(L); Logger.INFO("Found Connected. [III]"); } } if (isWoodLog(W.getBlock(x+1, y, z)) || isLeaves(W.getBlock(x+1, y, z))) { - BlockPos L = new BlockPos(x+1, y, z); + BlockPos L = new BlockPos(x+1, y, z, W); if (!checkedSpaces.contains(L)) { mConnected.add(L); Logger.INFO("Found Connected. [III]"); } } if (isWoodLog(W.getBlock(x, y-1, z)) || isLeaves(W.getBlock(x, y-1, z))) { - BlockPos L = new BlockPos(x, y-1, z); + BlockPos L = new BlockPos(x, y-1, z, W); if (!checkedSpaces.contains(L)) { mConnected.add(L); Logger.INFO("Found Connected. [III]"); } } if (isWoodLog(W.getBlock(x, y+1, z)) || isLeaves(W.getBlock(x, y+1, z))) { - BlockPos L = new BlockPos(x, y+1, z); + BlockPos L = new BlockPos(x, y+1, z, W); if (!checkedSpaces.contains(L)) { mConnected.add(L); Logger.INFO("Found Connected. [III]"); } } if (isWoodLog(W.getBlock(x, y, z-1)) || isLeaves(W.getBlock(x, y, z-1))) { - BlockPos L = new BlockPos(x, y, z-1); + BlockPos L = new BlockPos(x, y, z-1, W); if (!checkedSpaces.contains(L)) { mConnected.add(L); Logger.INFO("Found Connected. [III]"); } } if (isWoodLog(W.getBlock(x, y, z+1)) || isLeaves(W.getBlock(x, y, z+1))) { - BlockPos L = new BlockPos(x, y, z+1); + BlockPos L = new BlockPos(x, y, z+1, W); if (!checkedSpaces.contains(L)) { mConnected.add(L); Logger.INFO("Found Connected. [III]"); @@ -602,42 +602,42 @@ public class TreeFarmHelper { } else { if (isWoodLog(W.getBlock(x-1, y, z))) { - BlockPos L = new BlockPos(x-1, y, z); + BlockPos L = new BlockPos(x-1, y, z, W); //if (!checkedSpaces.contains(L)) { mConnected.add(L); Logger.INFO("Found Connected. [III]"); //} } if (isWoodLog(W.getBlock(x+1, y, z))) { - BlockPos L = new BlockPos(x+1, y, z); + BlockPos L = new BlockPos(x+1, y, z, W); //if (!checkedSpaces.contains(L)) { mConnected.add(L); Logger.INFO("Found Connected. [III]"); //} } if (isWoodLog(W.getBlock(x, y-1, z))) { - BlockPos L = new BlockPos(x, y-1, z); + BlockPos L = new BlockPos(x, y-1, z, W); //if (!checkedSpaces.contains(L)) { mConnected.add(L); Logger.INFO("Found Connected. [III]"); //} } if (isWoodLog(W.getBlock(x, y+1, z))) { - BlockPos L = new BlockPos(x, y+1, z); + BlockPos L = new BlockPos(x, y+1, z, W); //if (!checkedSpaces.contains(L)) { mConnected.add(L); Logger.INFO("Found Connected. [III]"); //} } if (isWoodLog(W.getBlock(x, y, z-1))) { - BlockPos L = new BlockPos(x, y, z-1); + BlockPos L = new BlockPos(x, y, z-1, W); //if (!checkedSpaces.contains(L)) { mConnected.add(L); Logger.INFO("Found Connected. [III]"); //} } if (isWoodLog(W.getBlock(x, y, z+1))) { - BlockPos L = new BlockPos(x, y, z+1); + BlockPos L = new BlockPos(x, y, z+1, W); //if (!checkedSpaces.contains(L)) { mConnected.add(L); Logger.INFO("Found Connected. [III]"); diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/render/GTPP_CapeRenderer.java b/src/Java/gtPlusPlus/xmod/gregtech/common/render/GTPP_CapeRenderer.java index 895ad35a14..1bfe20810f 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/render/GTPP_CapeRenderer.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/render/GTPP_CapeRenderer.java @@ -50,7 +50,7 @@ extends RenderPlayer { if (!hasResourceChecked) { //Give Devs Dev capes. if (CORE.DEVENV) { - cachedResource = this.mCapes[4]; + cachedResource = this.mCapes[2]; hasResourceChecked = true; } else { diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaWirelessCharger.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaWirelessCharger.java index 1046b6d7dd..e18dc43a79 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaWirelessCharger.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaWirelessCharger.java @@ -460,7 +460,7 @@ public class GregtechMetaWirelessCharger extends GregtechMetaTileEntity { } public BlockPos getTileEntityPosition(){ - return new BlockPos(this.getBaseMetaTileEntity().getXCoord(), this.getBaseMetaTileEntity().getYCoord(), this.getBaseMetaTileEntity().getZCoord()); + return new BlockPos(this.getBaseMetaTileEntity().getXCoord(), this.getBaseMetaTileEntity().getYCoord(), this.getBaseMetaTileEntity().getZCoord(), this.getBaseMetaTileEntity().getWorld()); } public BlockPos getPositionOfEntity(Entity mEntity){ |