From a93d9cbbd9ed4e4c1622c3a109addedccee1538e Mon Sep 17 00:00:00 2001 From: Chicken-Bones Date: Thu, 29 Jan 2015 19:21:58 +1000 Subject: [PATCH] Added option to use MC style icons for saws. Credit wiiv for icons --- build/build.properties | 2 +- .../microblock/textures/items/sawDiamond.png | Bin 0 -> 18683 bytes .../microblock/textures/items/sawIron.png | Bin 0 -> 18516 bytes .../microblock/textures/items/sawStone.png | Bin 0 -> 18501 bytes src/codechicken/microblock/ItemSaw.scala | 13 ++++++------- .../microblock/handler/proxies.scala | 13 ++++++------- 6 files changed, 13 insertions(+), 15 deletions(-) create mode 100644 resources/assets/microblock/textures/items/sawDiamond.png create mode 100644 resources/assets/microblock/textures/items/sawIron.png create mode 100644 resources/assets/microblock/textures/items/sawStone.png diff --git a/build/build.properties b/build/build.properties index 68e16b2..b4265cd 100644 --- a/build/build.properties +++ b/build/build.properties @@ -1,5 +1,5 @@ mc_version=1.7.10 forge_version=10.13.1.1217 -ccl_version=1.1.1.110 +ccl_version=1.1.3.127 nei_version=1.0.3.+ mod_version=1.1.1 diff --git a/resources/assets/microblock/textures/items/sawDiamond.png b/resources/assets/microblock/textures/items/sawDiamond.png new file mode 100644 index 0000000000000000000000000000000000000000..8ee33a1cb3f7500b1144000a6665b9a8fc292e97 GIT binary patch literal 18683 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 literal 0 HcmV?d00001 diff --git a/resources/assets/microblock/textures/items/sawIron.png b/resources/assets/microblock/textures/items/sawIron.png new file mode 100644 index 0000000000000000000000000000000000000000..b8d28459884df735a1acc8352e0484be217f34ed GIT binary patch literal 18516 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 literal 0 HcmV?d00001 diff --git a/resources/assets/microblock/textures/items/sawStone.png b/resources/assets/microblock/textures/items/sawStone.png new file mode 100644 index 0000000000000000000000000000000000000000..e44c630b36feb9f1664406e7142648614034e399 GIT binary patch literal 18501 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 TCqDL01Aw`)wNbv|u0#I=KN^Lx literal 0 HcmV?d00001 diff --git a/src/codechicken/microblock/ItemSaw.scala b/src/codechicken/microblock/ItemSaw.scala index 6c825a1..5c230b5 100644 --- a/src/codechicken/microblock/ItemSaw.scala +++ b/src/codechicken/microblock/ItemSaw.scala @@ -5,11 +5,10 @@ import codechicken.lib.config.ConfigTag import codechicken.microblock.handler.MicroblockProxy._ import net.minecraft.item.ItemStack import net.minecraftforge.client.IItemRenderer -import codechicken.lib.render.CCModel +import codechicken.lib.render.{TextureUtils, CCModel, CCRenderState} import net.minecraftforge.client.IItemRenderer.ItemRenderType import net.minecraftforge.client.IItemRenderer.ItemRendererHelper import codechicken.lib.vec.SwapYZ -import codechicken.lib.render.CCRenderState import codechicken.lib.vec.TransformationList import codechicken.lib.vec.Translation import codechicken.lib.vec.Scale @@ -18,8 +17,9 @@ import org.lwjgl.opengl.GL11 import ItemRenderType._ import codechicken.lib.math.MathHelper._ import net.minecraft.util.ResourceLocation -import net.minecraft.client.renderer.texture.IIconRegister +import net.minecraft.client.renderer.texture.{TextureMap, IIconRegister} import codechicken.lib.render.uv.UVTranslation +import codechicken.microblock.handler.MicroblockProxy /** * Interface for items that are 'saws' @@ -58,8 +58,6 @@ class ItemSaw(sawTag:ConfigTag, val harvestLevel:Int) extends Item with Saw override def doesContainerItemLeaveCraftingGrid(stack:ItemStack) = false def getCuttingStrength(item:ItemStack) = harvestLevel - - override def registerIcons(register:IIconRegister){} } object ItemSawRenderer extends IItemRenderer @@ -69,10 +67,11 @@ object ItemSawRenderer extends IItemRenderer val holder = models.get("BladeSupport") val blade = models.get("Blade") - def handleRenderType(item:ItemStack, renderType:ItemRenderType) = true + def handleRenderType(item:ItemStack, renderType:ItemRenderType) = + !MicroblockProxy.useSawIcons || TextureUtils.isMissing(item.getIconIndex, TextureMap.locationItemsTexture) def shouldUseRenderHelper(renderType:ItemRenderType, item:ItemStack, helper:ItemRendererHelper) = true - + def renderItem(renderType:ItemRenderType, item:ItemStack, data:Object*) { val t = renderType match { diff --git a/src/codechicken/microblock/handler/proxies.scala b/src/codechicken/microblock/handler/proxies.scala index 417ba55..8e7cad0 100644 --- a/src/codechicken/microblock/handler/proxies.scala +++ b/src/codechicken/microblock/handler/proxies.scala @@ -25,18 +25,14 @@ class MicroblockProxy_serverImpl { var logger: Logger = _ - private var baseID = 24875 - 1 - - def nextItemID = { - baseID += 1; baseID - } - var itemMicro: ItemMicroPart = _ var sawStone: Item = _ var sawIron: Item = _ var sawDiamond: Item = _ var stoneRod: Item = _ + var useSawIcons: Boolean = _ + def preInit(logger: Logger) { this.logger = logger itemMicro = new ItemMicroPart @@ -49,11 +45,14 @@ class MicroblockProxy_serverImpl OreDictionary.registerOre("rodStone", stoneRod) MinecraftForge.EVENT_BUS.register(MicroblockEventHandler) + + useSawIcons = config.getTag("useSawIcons").setComment("Set to true to use mc style icons for the saw instead of the 3D model").getBooleanValue(false) } protected var saws = mutable.MutableList[Item]() def createSaw(config: ConfigFile, name: String, strength: Int) = { - val saw = new ItemSaw(config.getTag(name).useBraces(), strength).setUnlocalizedName("microblock:" + name) + val saw = new ItemSaw(config.getTag(name).useBraces(), strength) + .setUnlocalizedName("microblock:" + name).setTextureName("microblock:" + name) GameRegistry.registerItem(saw, name) saws+=saw saw