diff --git a/src/main/scala/li/cil/oc/client/renderer/tileentity/PrinterRenderer.scala b/src/main/scala/li/cil/oc/client/renderer/tileentity/PrinterRenderer.scala index 5e1c79f92..fb62b431d 100644 --- a/src/main/scala/li/cil/oc/client/renderer/tileentity/PrinterRenderer.scala +++ b/src/main/scala/li/cil/oc/client/renderer/tileentity/PrinterRenderer.scala @@ -23,9 +23,7 @@ object PrinterRenderer extends TileEntitySpecialRenderer { GL11.glTranslated(x + 0.5, y + 0.5, z + 0.5) -// GL11.glTranslated(-0.5, -0.5, -0.5) GL11.glRotated((System.currentTimeMillis() % 20000) / 20000.0 * 360, 0, 1, 0) -// GL11.glTranslated(0.5, 0.5, 0.5) val brightness = printer.world.getLightBrightnessForSkyBlocks(printer.x, printer.y, printer.z, 0) OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, brightness % 65536, brightness / 65536) diff --git a/src/main/scala/li/cil/oc/common/block/Printer.scala b/src/main/scala/li/cil/oc/common/block/Printer.scala index 1590426fc..af552e596 100644 --- a/src/main/scala/li/cil/oc/common/block/Printer.scala +++ b/src/main/scala/li/cil/oc/common/block/Printer.scala @@ -1,10 +1,7 @@ package li.cil.oc.common.block -import li.cil.oc.Settings -import li.cil.oc.client.Textures import li.cil.oc.common.GuiType import li.cil.oc.common.tileentity -import net.minecraft.client.renderer.texture.IIconRegister import net.minecraft.world.IBlockAccess import net.minecraft.world.World import net.minecraftforge.common.util.ForgeDirection @@ -19,13 +16,6 @@ class Printer extends SimpleBlock with traits.SpecialBlock with traits.StateAwar Some("PrinterSide") ) - override def registerBlockIcons(iconRegister: IIconRegister) = { - super.registerBlockIcons(iconRegister) - Textures.Assembler.iconSideAssembling = iconRegister.registerIcon(Settings.resourceDomain + ":AssemblerSideAssembling") - Textures.Assembler.iconSideOn = iconRegister.registerIcon(Settings.resourceDomain + ":AssemblerSideOn") - Textures.Assembler.iconTopOn = iconRegister.registerIcon(Settings.resourceDomain + ":AssemblerTopOn") - } - override def isBlockSolid(world: IBlockAccess, x: Int, y: Int, z: Int, side: ForgeDirection) = side == ForgeDirection.DOWN override def isSideSolid(world: IBlockAccess, x: Int, y: Int, z: Int, side: ForgeDirection) = side == ForgeDirection.DOWN diff --git a/src/main/scala/li/cil/oc/common/tileentity/Print.scala b/src/main/scala/li/cil/oc/common/tileentity/Print.scala index ac945183a..676eca332 100644 --- a/src/main/scala/li/cil/oc/common/tileentity/Print.scala +++ b/src/main/scala/li/cil/oc/common/tileentity/Print.scala @@ -48,6 +48,9 @@ class Print extends traits.TileEntity with traits.RedstoneAware with traits.Rota state = newMaxValue > 0 world.playSoundEffect(x + 0.5, y + 0.5, z + 0.5, "random.click", 0.3F, if (state) 0.6F else 0.5F) world.markBlockForUpdate(x, y, z) + if (state && data.isButtonMode) { + world.scheduleBlockUpdate(x, y, z, block, block.tickRate(world)) + } } } diff --git a/src/main/scala/li/cil/oc/common/tileentity/Printer.scala b/src/main/scala/li/cil/oc/common/tileentity/Printer.scala index 38e8f4217..674ec0536 100644 --- a/src/main/scala/li/cil/oc/common/tileentity/Printer.scala +++ b/src/main/scala/li/cil/oc/common/tileentity/Printer.scala @@ -175,8 +175,8 @@ class Printer extends traits.Environment with traits.Inventory with traits.Rotat if (!canPrint) { return result(null, "model invalid") } - isActive = true limit = (args.optDouble(0, 1) max 0 min Integer.MAX_VALUE).toInt + isActive = limit > 0 result(true) }