From da9834fdd64297d5e94ebd901f5f49e1f0be9821 Mon Sep 17 00:00:00 2001 From: Chicken-Bones Date: Wed, 1 Oct 2014 14:00:58 +1000 Subject: [PATCH] Made placement syntax more regular --- .../microblock/MicroblockPlacement.scala | 36 +++++++------------ src/codechicken/multipart/TickScheduler.scala | 6 ++-- 2 files changed, 15 insertions(+), 27 deletions(-) diff --git a/src/codechicken/microblock/MicroblockPlacement.scala b/src/codechicken/microblock/MicroblockPlacement.scala index 63620b1..3d45aa4 100644 --- a/src/codechicken/microblock/MicroblockPlacement.scala +++ b/src/codechicken/microblock/MicroblockPlacement.scala @@ -106,36 +106,24 @@ class MicroblockPlacement(val player:EntityPlayer, val hit:MovingObjectPosition, if(internal) { - if(!useOppMod) - return internalPlacement(htile, slot) - if((1-d)*8 < size) - { - if(htile.canAddPart(create(1, oslot, material))) - return externalPlacement(slot) - } - if(d < 0.5) + if(d < 0.5 || !useOppMod) { val ret = internalPlacement(htile, slot) - if(ret != null && !oppMod) - return ret - if(ret != null && oppMod || ret == null && !oppMod) - return internalPlacement(htile, oslot) - //sneaking - if(internalPlacement(htile, oslot) != null) - return externalPlacement(slot) - return null + if(ret != null) { + if(!useOppMod || !oppMod) return ret + else return internalPlacement(htile, oslot) + } } - val ret = internalPlacement(htile, oslot) - if(!oppMod) - return ret - if(ret != null) + if(useOppMod && !oppMod) + return internalPlacement(htile, oslot) + else return externalPlacement(slot) - return null } - val ret = externalPlacement(slot) - if(ret != null && oppMod && useOppMod) + + if(!useOppMod || !oppMod) + return externalPlacement(slot) + else return externalPlacement(oslot) - return ret } def expand(mpart:CommonMicroblock):ExecutablePlacement = expand(mpart, create(mpart.getSize+size, mpart.getSlot, mpart.material)) diff --git a/src/codechicken/multipart/TickScheduler.scala b/src/codechicken/multipart/TickScheduler.scala index 2075038..61b7487 100644 --- a/src/codechicken/multipart/TickScheduler.scala +++ b/src/codechicken/multipart/TickScheduler.scala @@ -88,9 +88,9 @@ object TickScheduler extends WorldExtensionInstantiator { try { - val din = new DataInputStream(new FileInputStream(saveFile)) - loadTag(CompressedStreamTools.readCompressed(din)) - din.close() + val in = new FileInputStream(saveFile) + loadTag(CompressedStreamTools.readCompressed(in)) + in.close() } catch {