aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/com
diff options
context:
space:
mode:
authorTechnus <daniel112092@gmail.com>2017-08-19 18:26:15 +0200
committerTechnus <daniel112092@gmail.com>2017-08-19 18:26:15 +0200
commit8e7a5c1a31e95c10e0499c5733c8afe81112e105 (patch)
tree6b5bbdde23414b94b9b1bbe80af4ac608131c2e2 /src/main/java/com
parent235b693442a698f48ffdcecebb209ea96ab3557b (diff)
downloadGT5-Unofficial-8e7a5c1a31e95c10e0499c5733c8afe81112e105.tar.gz
GT5-Unofficial-8e7a5c1a31e95c10e0499c5733c8afe81112e105.tar.bz2
GT5-Unofficial-8e7a5c1a31e95c10e0499c5733c8afe81112e105.zip
fix quantum stuff issue
Diffstat (limited to 'src/main/java/com')
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java19
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_microwave.java6
2 files changed, 12 insertions, 13 deletions
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java
index 989256d7d3..0ef6618372 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java
@@ -131,9 +131,9 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa
@Override
public void onPreTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {
if(aBaseMetaTileEntity.isActive() && (aTick & 0x2)==0 && aBaseMetaTileEntity.isClientSide()){
- int xDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetX*3;
- int yDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetY*3;
- int zDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetZ*3;
+ int xDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetX*4+aBaseMetaTileEntity.getXCoord();
+ int yDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetY*4+aBaseMetaTileEntity.getYCoord();
+ int zDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetZ*4+aBaseMetaTileEntity.getZCoord();
aBaseMetaTileEntity.getWorld().markBlockRangeForRenderUpdate(xDir,yDir,zDir,xDir,yDir,zDir);
}
}
@@ -306,19 +306,18 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa
private void quantumStuff(boolean shouldExist){
IGregTechTileEntity base=getBaseMetaTileEntity();
if(base!=null && base.getWorld()!=null) {
- int xDir = ForgeDirection.getOrientation(base.getBackFacing()).offsetX * 3;
- int yDir = ForgeDirection.getOrientation(base.getBackFacing()).offsetY * 3;
- int zDir = ForgeDirection.getOrientation(base.getBackFacing()).offsetZ * 3;
+ int xDir = ForgeDirection.getOrientation(base.getBackFacing()).offsetX * 4+base.getXCoord();
+ int yDir = ForgeDirection.getOrientation(base.getBackFacing()).offsetY * 4+base.getYCoord();
+ int zDir = ForgeDirection.getOrientation(base.getBackFacing()).offsetZ * 4+base.getZCoord();
Block block = base.getWorld().getBlock(xDir, yDir, zDir);
if (shouldExist) {
- if (block != null && block.getMaterial() == Material.air)
- getBaseMetaTileEntity().getWorld().setBlock(xDir, yDir, zDir, QuantumStuffBlock.INSTANCE);
+ if(block != null && block.getMaterial()== Material.air)
+ base.getWorld().setBlock(xDir, yDir, zDir, QuantumStuffBlock.INSTANCE,0,2);
} else {
if (block instanceof QuantumStuffBlock)
- getBaseMetaTileEntity().getWorld().setBlock(xDir, yDir, zDir, Blocks.air);
+ base.getWorld().setBlock(xDir, yDir, zDir, Blocks.air,0,2);
}
}
- if(eOutputHatches!=null && !eOutputHatches.isEmpty()) eOutputHatches.get(0).getBaseMetaTileEntity().setActive(shouldExist);
eDismatleBoom=shouldExist;
}
}
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_microwave.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_microwave.java
index ac9e7b95d0..c7816192c2 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_microwave.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_microwave.java
@@ -42,9 +42,9 @@ public class GT_MetaTileEntity_TM_microwave extends GT_MetaTileEntity_Multiblock
//use multi A energy inputs, use less power the longer it runs
private static final String[][] shape = new String[][]{
{"00000", "00000", "00.00", "0 0",},
- {"0C0", "0C0", "0C0", " 000 ",},
- {"0C0", "0C0", "0C0", " 000 ",},
- {"0C0", "0C0", "0C0", " 000 ",},
+ {"0---0", "0---0", "0---0", " 000 ",},
+ {"0---0", "0---0", "0---0", " 000 ",},
+ {"0---0", "0---0", "0---0", " 000 ",},
{"00000", "00000", "00000", "0 0",},
};
private static final String[][] shapeFlipped = new String[][]{