Added fake endstone, oredicted that and normal endstone for use in drone recipe.

Because someone was nagging about vanilla MC balance. As if there were such a thing :P

src/main/resources/assets/opencomputers/lang/en_US.lang

@@ -16,6 +16,7 @@ tile.oc.chameliumBlock.name=Block of Chamelium
 tile.oc.charger.name=Charger
 tile.oc.disassembler.name=Disassembler
 tile.oc.diskDrive.name=Disk Drive
+tile.oc.endstone.name=End Stone
 tile.oc.geolyzer.name=Geolyzer
 tile.oc.hologram1.name=Hologram Projector (Tier 1)
 tile.oc.hologram2.name=Hologram Projector (Tier 2)
@@ -261,6 +262,7 @@ oc:tooltip.DiskDrive=Allows reading and writing floppies. Can be installed in ro
 oc:tooltip.Drone=Drones are light-weight, fast reconnaissance units with limited cargo space.
 oc:tooltip.DroneCase=This casing is used to build Drones in the assembler. It has room for a small amount of components and provides endstone-powered levitation.
 oc:tooltip.EEPROM=Small, programmable storage that contains the BIOS computers use to boot.
+oc:tooltip.FakeEndstone=Almost as good as the real thing, even emulates its floatiness!
 oc:tooltip.Geolyzer=Allows scanning the surrounding area's blocks' hardness. This information can be useful for generating holograms of the area or for detecting ores.
 oc:tooltip.GraphicsCard=Used to change what's displayed on screens.[nl] Maximum resolution: §f%sx%s§7[nl] Maximum color depth: §f%s§7[nl] Operations/tick: §f%s§7
 oc:tooltip.InkCartridge=Used to refill ink in 3D printers. For mysterious reasons it does not have to remain in the printer.

src/main/resources/assets/opencomputers/recipes/default.recipes

@@ -36,25 +36,16 @@ luaBios {
   type: shapeless
   input: ["oc:eeprom", "oc:manual"]
 }
-generic: [
-  {
-    result: {block="minecraft:end_stone"}
-    input: [[enderPearl, sandstone, enderPearl]
-            [sandstone, blockCoal, sandstone]
-            [enderPearl, sandstone, enderPearl]]
-    output: 4
-  }
-]
 
 droneCase1 {
-  input: [[{block="minecraft:end_stone"}, compass, {block="minecraft:end_stone"}]
+  input: [["oc:stoneEndstone", compass, "oc:stoneEndstone"]
           ["oc:circuitChip1", "oc:microcontrollerCase1", "oc:circuitChip1"]
-          [{block="minecraft:end_stone"}, "oc:componentBus2", {block="minecraft:end_stone"}]]
+          ["oc:stoneEndstone", "oc:componentBus2", "oc:stoneEndstone"]]
 }
 droneCase2 {
-  input: [[{block="minecraft:end_stone"}, compass, {block="minecraft:end_stone"}]
+  input: [["oc:stoneEndstone", compass, "oc:stoneEndstone"]
           ["oc:circuitChip2", "oc:microcontrollerCase2", "oc:circuitChip2"]
-          [{block="minecraft:end_stone"}, "oc:componentBus3", {block="minecraft:end_stone"}]]
+          ["oc:stoneEndstone", "oc:componentBus3", "oc:stoneEndstone"]]
 }
 microcontrollerCase1 {
   input: [[nuggetIron, "oc:circuitChip1", nuggetIron]
@@ -373,6 +364,13 @@ chameliumBlock {
           ["oc:chamelium", "oc:chamelium", "oc:chamelium"],
           ["oc:chamelium", "oc:chamelium", "oc:chamelium"]]
 }
+
+endstone {
+  input: [[enderPearl, "oc:chameliumBlock", enderPearl]
+          ["oc:chameliumBlock", enderPearl, "oc:chameliumBlock"]
+          [enderPearl, "oc:chameliumBlock", enderPearl]]
+  output: 4
+}
 inkCartridgeEmpty {
   input: [[nuggetIron, dispenser, nuggetIron],
           ["oc:materialTransistor", bucket, "oc:materialTransistor"],

src/main/scala/li/cil/oc/Constants.scala

@@ -18,6 +18,7 @@ object Constants {
     final val Charger = "charger"
     final val Disassembler = "disassembler"
     final val DiskDrive = "diskDrive"
+    final val Endstone = "endstone"
     final val Geolyzer = "geolyzer"
     final val HologramTier1 = "hologram1"
     final val HologramTier2 = "hologram2"

src/main/scala/li/cil/oc/common/Proxy.scala

@@ -55,6 +55,9 @@ class Proxy {
     // oredict entry, but not normal obsidian, breaking some recipes.
     OreDictionary.registerOre("obsidian", net.minecraft.init.Blocks.obsidian)
 
+    // To still allow using normal endstone for crafting drones.
+    OreDictionary.registerOre("oc:stoneEndstone", net.minecraft.init.Blocks.end_stone)
+
     OpenComputers.log.info("Initializing OpenComputers API.")
 
     api.CreativeTab.instance = CreativeTab

src/main/scala/li/cil/oc/common/block/ChameliumBlock.scala

@@ -1,8 +1,9 @@
 package li.cil.oc.common.block
 
 import li.cil.oc.util.Color
+import net.minecraft.block.material.Material
 
-class ChameliumBlock extends SimpleBlock {
+class ChameliumBlock extends SimpleBlock(Material.rock) {
   override protected def customTextures = Array(
     Some("White"),
     Some("White"),

src/main/scala/li/cil/oc/common/block/FakeEndstone.scala

@@ -0,0 +1,17 @@
+package li.cil.oc.common.block
+
+import net.minecraft.block.material.Material
+
+class FakeEndstone extends SimpleBlock(Material.rock) {
+  setHardness(3)
+  setResistance(15)
+
+  override protected def customTextures = Array(
+    Some("minecraft:end_stone"),
+    Some("minecraft:end_stone"),
+    Some("minecraft:end_stone"),
+    Some("minecraft:end_stone"),
+    Some("minecraft:end_stone"),
+    Some("minecraft:end_stone")
+  )
+}

src/main/scala/li/cil/oc/common/block/Keyboard.scala

@@ -7,13 +7,14 @@ import li.cil.oc.common.tileentity
 import li.cil.oc.util.BlockPosition
 import li.cil.oc.util.ExtendedWorld._
 import net.minecraft.block.Block
+import net.minecraft.block.material.Material
 import net.minecraft.entity.player.EntityPlayer
 import net.minecraft.world.IBlockAccess
 import net.minecraft.world.World
 import net.minecraftforge.common.util.ForgeDirection
 import org.lwjgl.opengl.GL11
 
-class Keyboard extends SimpleBlock with traits.SpecialBlock {
+class Keyboard extends SimpleBlock(Material.rock) with traits.SpecialBlock {
   setLightOpacity(0)
 
   // For Immibis Microblock support.

src/main/scala/li/cil/oc/common/block/SimpleBlock.scala

@@ -77,7 +77,9 @@ class SimpleBlock(material: Material = Material.iron) extends Block(material) {
     val custom = customTextures
     for (side <- ForgeDirection.VALID_DIRECTIONS) {
       custom(side.ordinal) match {
-        case Some(name) => icons(side.ordinal) = iconRegister.registerIcon(Settings.resourceDomain + ":" + name)
+        case Some(name) =>
+          if (name.contains(":")) icons(side.ordinal) = iconRegister.registerIcon(name)
+          else icons(side.ordinal) = iconRegister.registerIcon(Settings.resourceDomain + ":" + name)
         case _ =>
       }
     }

src/main/scala/li/cil/oc/common/init/Blocks.scala

@@ -72,5 +72,8 @@ object Blocks {
     Recipes.addBlock(new Printer(), "printer", "oc:printer")
     Recipes.addBlock(new ChameliumBlock(), "chameliumBlock", "oc:chameliumBlock")
     Recipes.addBlock(new Waypoint(), Constants.BlockName.Waypoint, "oc:waypoint")
+
+    // v1.5.10
+    Recipes.addBlock(new FakeEndstone(), Constants.BlockName.Endstone, "oc:stoneEndstone")
   }
 }