diff options
| author | Detrav <witalyezep@gmail.com> | 2017-05-01 00:20:40 +0300 |
|---|---|---|
| committer | Detrav <witalyezep@gmail.com> | 2017-05-01 00:20:40 +0300 |
| commit | 65decf4d314110e0235afeaa295c38e55a732992 (patch) | |
| tree | 58cd003ebcc3fccd2e420b6ea4a315c6e47198c8 | |
| parent | 6ed98c4a5b11380a328070b9d1690a0d68183846 (diff) | |
| download | GT5-Unofficial-65decf4d314110e0235afeaa295c38e55a732992.tar.gz GT5-Unofficial-65decf4d314110e0235afeaa295c38e55a732992.tar.bz2 GT5-Unofficial-65decf4d314110e0235afeaa295c38e55a732992.zip | |
- Fixed circuit configurator radius && Fixed getBlock method
3 files changed, 12 insertions, 8 deletions
diff --git a/build.properties b/build.properties index d50e647477..21fa7c2942 100644 --- a/build.properties +++ b/build.properties @@ -1,7 +1,7 @@ minecraft.version=1.7.10 forge.version=10.13.4.1566-1.7.10 -detravscanner.version=gt.9.29-0.42.0 +detravscanner.version=gt.9.29-0.42.1 ae2.version=rv2-beta-33 applecore.version=1.7.10-1.2.1+107.59407 diff --git a/src/main/java/com/detrav/items/behaviours/BehaviourDetravConfigurator.java b/src/main/java/com/detrav/items/behaviours/BehaviourDetravConfigurator.java index 8ff2f3edec..e55d3c8c31 100644 --- a/src/main/java/com/detrav/items/behaviours/BehaviourDetravConfigurator.java +++ b/src/main/java/com/detrav/items/behaviours/BehaviourDetravConfigurator.java @@ -25,7 +25,7 @@ public class BehaviourDetravConfigurator extends Behaviour_None { int circuit_config = inv.mainInventory[i].getItemDamage(); if(circuit_config > 5) circuit_config = 5; - circuit_config *= 2; + //circuit_config *= 2; circuit_config++; inv.mainInventory[i] = DetravItemList.ConfiguredCircuit.get(1); ItemStack aCircuit = inv.mainInventory[i]; diff --git a/src/main/java/com/detrav/tileentities/Detrav_MetaTileEntity_AdvMiner2.java b/src/main/java/com/detrav/tileentities/Detrav_MetaTileEntity_AdvMiner2.java index c7d6ed7608..ac5c73a0fc 100644 --- a/src/main/java/com/detrav/tileentities/Detrav_MetaTileEntity_AdvMiner2.java +++ b/src/main/java/com/detrav/tileentities/Detrav_MetaTileEntity_AdvMiner2.java @@ -109,15 +109,15 @@ public class Detrav_MetaTileEntity_AdvMiner2 extends GT_MetaTileEntity_MultiBloc World w = getBaseMetaTileEntity().getWorld(); if(w==null) return false; Chunk c = w.getChunkProvider().provideChunk(x>>4,z>>4); - x = x & 15; - z = z & 15; + int x1 = x & 15; + int z1 = z & 15; int yTo = getYTo(); for(int yLevel = getYFrom(); yLevel>=yTo; yLevel --) { - Block tBlock = c.getBlock(x,yLevel,z); - int tMetaID = c.getBlockMetadata(x,yLevel,z); + Block tBlock = c.getBlock(x1,yLevel,z1); + int tMetaID = c.getBlockMetadata(x1,yLevel,z1); if (tBlock instanceof GT_Block_Ores_Abstract) { - TileEntity tTileEntity = c.getTileEntityUnsafe(x,yLevel,z); + TileEntity tTileEntity = c.getTileEntityUnsafe(x1,yLevel,z1); if ((tTileEntity!=null) && (tTileEntity instanceof GT_TileEntity_Ores) && ((GT_TileEntity_Ores) tTileEntity).mNatural == true @@ -144,7 +144,11 @@ public class Detrav_MetaTileEntity_AdvMiner2 extends GT_MetaTileEntity_MultiBloc while ((tMineBlock==null || tMineBlock == Blocks.air) && !mMineList.isEmpty()) { mle = mMineList.get(0); mMineList.remove(0); - tMineBlock = getBaseMetaTileEntity().getBlock(mle.chunkPosX, mle.chunkPosY, mle.chunkPosZ); + tMineBlock = getBaseMetaTileEntity() + .getWorld() + .getChunkProvider() + .provideChunk( mle.chunkPosX >> 4, mle.chunkPosZ >> 4 ) + .getBlock(mle.chunkPosX&15, mle.chunkPosY, mle.chunkPosZ&15); } if (tMineBlock!=null && tMineBlock!=Blocks.air) { |