AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-16 18:55:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup.

Browse Source
This commit is contained in:
Florian Nücke 2015-03-24 01:40:58 +01:00
parent 3625626fe5
commit a906759283
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/scala/li/cil/oc/client/renderer/block/BlockRenderer.scala
View File

@ -1,7 +1,6 @@
package li.cil.oc.client.renderer.block package li.cil.oc.client.renderer.block
import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler
import cpw.mods.fml.common.Loader
import li.cil.oc.Settings import li.cil.oc.Settings
import li.cil.oc.client.renderer.tileentity.RobotRenderer import li.cil.oc.client.renderer.tileentity.RobotRenderer
import li.cil.oc.common.block._ import li.cil.oc.common.block._
@ -141,8 +140,6 @@ object BlockRenderer extends ISimpleBlockRenderingHandler {
} }
} }
val isOneSevenTwo = Loader.instance.getMinecraftModContainer.getVersion == "1.7.2"
// I can't be bothered to adjust the screen rendering logic... so special case ahoy. // I can't be bothered to adjust the screen rendering logic... so special case ahoy.
def patchedRenderer(renderer: RenderBlocks, block: Block) = if (!block.isInstanceOf[Screen]) { def patchedRenderer(renderer: RenderBlocks, block: Block) = if (!block.isInstanceOf[Screen]) {
PatchedRenderBlocks.blockAccess = renderer.blockAccess PatchedRenderBlocks.blockAccess = renderer.blockAccess

1
src/main/scala/li/cil/oc/common/block/Print.scala
View File

@ -22,6 +22,7 @@ import scala.reflect.ClassTag
class Print(protected implicit val tileTag: ClassTag[tileentity.Print]) extends RedstoneAware with traits.SpecialBlock with traits.CustomDrops[tileentity.Print] { class Print(protected implicit val tileTag: ClassTag[tileentity.Print]) extends RedstoneAware with traits.SpecialBlock with traits.CustomDrops[tileentity.Print] {
setLightOpacity(0) setLightOpacity(0)
setHardness(1)
setCreativeTab(null) setCreativeTab(null)
NEI.hide(this) NEI.hide(this)
setBlockTextureName(Settings.resourceDomain + "GenericTop") setBlockTextureName(Settings.resourceDomain + "GenericTop")

1
src/main/scala/li/cil/oc/common/block/SimpleBlock.scala
View File

@ -27,6 +27,7 @@ import net.minecraftforge.common.util.ForgeDirection
class SimpleBlock(material: Material = Material.iron) extends Block(material) { class SimpleBlock(material: Material = Material.iron) extends Block(material) {
setHardness(2f) setHardness(2f)
setResistance(5)
setCreativeTab(CreativeTab) setCreativeTab(CreativeTab)
var showInItemList = true var showInItemList = true