diff --git a/build.gradle b/build.gradle index 63b7909..8685b10 100644 --- a/build.gradle +++ b/build.gradle @@ -17,8 +17,8 @@ buildscript { apply plugin: 'forge' -version = "1.1.3" -group= "com.jaquadro.storagedrawers" // http://maven.apache.org/guides/mini/guide-naming-conventions.html +version = "1.7.10-1.1.4" +group= "com.jaquadro.minecraft.storagedrawers" // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = "StorageDrawers" minecraft { diff --git a/resources/assets/storagedrawers/textures/blocks/drawers_acacia_trim.png b/resources/assets/storagedrawers/textures/blocks/drawers_acacia_trim.png new file mode 100644 index 0000000..8298f60 Binary files /dev/null and b/resources/assets/storagedrawers/textures/blocks/drawers_acacia_trim.png differ diff --git a/resources/assets/storagedrawers/textures/blocks/drawers_big_oak_trim.png b/resources/assets/storagedrawers/textures/blocks/drawers_big_oak_trim.png new file mode 100644 index 0000000..641054c Binary files /dev/null and b/resources/assets/storagedrawers/textures/blocks/drawers_big_oak_trim.png differ diff --git a/resources/assets/storagedrawers/textures/blocks/drawers_birch_trim.png b/resources/assets/storagedrawers/textures/blocks/drawers_birch_trim.png new file mode 100644 index 0000000..7c34b29 Binary files /dev/null and b/resources/assets/storagedrawers/textures/blocks/drawers_birch_trim.png differ diff --git a/resources/assets/storagedrawers/textures/blocks/drawers_comp_trim.png b/resources/assets/storagedrawers/textures/blocks/drawers_comp_trim.png new file mode 100644 index 0000000..e9084c3 Binary files /dev/null and b/resources/assets/storagedrawers/textures/blocks/drawers_comp_trim.png differ diff --git a/resources/assets/storagedrawers/textures/blocks/drawers_jungle_trim.png b/resources/assets/storagedrawers/textures/blocks/drawers_jungle_trim.png new file mode 100644 index 0000000..8d5b98d Binary files /dev/null and b/resources/assets/storagedrawers/textures/blocks/drawers_jungle_trim.png differ diff --git a/resources/assets/storagedrawers/textures/blocks/drawers_oak_front_2.png b/resources/assets/storagedrawers/textures/blocks/drawers_oak_front_2.png index 0454032..8440a1e 100644 Binary files a/resources/assets/storagedrawers/textures/blocks/drawers_oak_front_2.png and b/resources/assets/storagedrawers/textures/blocks/drawers_oak_front_2.png differ diff --git a/resources/assets/storagedrawers/textures/blocks/drawers_oak_trim.png b/resources/assets/storagedrawers/textures/blocks/drawers_oak_trim.png new file mode 100644 index 0000000..6bd4cca Binary files /dev/null and b/resources/assets/storagedrawers/textures/blocks/drawers_oak_trim.png differ diff --git a/resources/assets/storagedrawers/textures/blocks/drawers_spruce_trim.png b/resources/assets/storagedrawers/textures/blocks/drawers_spruce_trim.png new file mode 100644 index 0000000..14c1c35 Binary files /dev/null and b/resources/assets/storagedrawers/textures/blocks/drawers_spruce_trim.png differ diff --git a/resources/assets/storagedrawers/textures/blocks/overlay_diamond_cross.png b/resources/assets/storagedrawers/textures/blocks/overlay_diamond_cross.png deleted file mode 100644 index b9d2ec3..0000000 Binary files a/resources/assets/storagedrawers/textures/blocks/overlay_diamond_cross.png and /dev/null differ diff --git a/resources/assets/storagedrawers/textures/blocks/overlay_diamond_trim.png b/resources/assets/storagedrawers/textures/blocks/overlay_diamond_trim.png new file mode 100644 index 0000000..1f74446 Binary files /dev/null and b/resources/assets/storagedrawers/textures/blocks/overlay_diamond_trim.png differ diff --git a/resources/assets/storagedrawers/textures/blocks/overlay_emerald_cross.png b/resources/assets/storagedrawers/textures/blocks/overlay_emerald_cross.png deleted file mode 100644 index 88d4a29..0000000 Binary files a/resources/assets/storagedrawers/textures/blocks/overlay_emerald_cross.png and /dev/null differ diff --git a/resources/assets/storagedrawers/textures/blocks/overlay_emerald_trim.png b/resources/assets/storagedrawers/textures/blocks/overlay_emerald_trim.png new file mode 100644 index 0000000..779868d Binary files /dev/null and b/resources/assets/storagedrawers/textures/blocks/overlay_emerald_trim.png differ diff --git a/resources/assets/storagedrawers/textures/blocks/overlay_gold_cross.png b/resources/assets/storagedrawers/textures/blocks/overlay_gold_cross.png deleted file mode 100644 index 07d0846..0000000 Binary files a/resources/assets/storagedrawers/textures/blocks/overlay_gold_cross.png and /dev/null differ diff --git a/resources/assets/storagedrawers/textures/blocks/overlay_gold_trim.png b/resources/assets/storagedrawers/textures/blocks/overlay_gold_trim.png new file mode 100644 index 0000000..5a3ad5a Binary files /dev/null and b/resources/assets/storagedrawers/textures/blocks/overlay_gold_trim.png differ diff --git a/resources/assets/storagedrawers/textures/blocks/overlay_iron_cross.png b/resources/assets/storagedrawers/textures/blocks/overlay_iron_cross.png deleted file mode 100644 index c655273..0000000 Binary files a/resources/assets/storagedrawers/textures/blocks/overlay_iron_cross.png and /dev/null differ diff --git a/resources/assets/storagedrawers/textures/blocks/overlay_iron_trim.png b/resources/assets/storagedrawers/textures/blocks/overlay_iron_trim.png new file mode 100644 index 0000000..3416091 Binary files /dev/null and b/resources/assets/storagedrawers/textures/blocks/overlay_iron_trim.png differ diff --git a/resources/assets/storagedrawers/textures/blocks/overlay_obsidian_cross.png b/resources/assets/storagedrawers/textures/blocks/overlay_obsidian_cross.png deleted file mode 100644 index 2ba3bdf..0000000 Binary files a/resources/assets/storagedrawers/textures/blocks/overlay_obsidian_cross.png and /dev/null differ diff --git a/resources/assets/storagedrawers/textures/blocks/overlay_obsidian_trim.png b/resources/assets/storagedrawers/textures/blocks/overlay_obsidian_trim.png new file mode 100644 index 0000000..500b2d5 Binary files /dev/null and b/resources/assets/storagedrawers/textures/blocks/overlay_obsidian_trim.png differ diff --git a/resources/mcmod.info b/resources/mcmod.info index ab7285a..01e98a7 100644 --- a/resources/mcmod.info +++ b/resources/mcmod.info @@ -3,7 +3,7 @@ "modid": "StorageDrawers", "name": "Storage Drawers", "description": "Multi-drawer storage blocks for quick storage and retrieval.", - "version": "1.1.3", + "version": "1.1.4", "credits": "By jaquadro", "logoFile": "", "url": "http://www.jaquadro.com/", diff --git a/src/com/jaquadro/minecraft/storagedrawers/StorageDrawers.java b/src/com/jaquadro/minecraft/storagedrawers/StorageDrawers.java index 90732e6..828cd52 100644 --- a/src/com/jaquadro/minecraft/storagedrawers/StorageDrawers.java +++ b/src/com/jaquadro/minecraft/storagedrawers/StorageDrawers.java @@ -26,7 +26,7 @@ public class StorageDrawers { public static final String MOD_ID = "StorageDrawers"; public static final String MOD_NAME = "Storage Drawers"; - public static final String MOD_VERSION = "1.1.3"; + public static final String MOD_VERSION = "1.1.4"; static final String SOURCE_PATH = "com.jaquadro.minecraft.storagedrawers."; public static final ModBlocks blocks = new ModBlocks(); diff --git a/src/com/jaquadro/minecraft/storagedrawers/block/BlockCompDrawers.java b/src/com/jaquadro/minecraft/storagedrawers/block/BlockCompDrawers.java index 1e54dec..243cd0e 100644 --- a/src/com/jaquadro/minecraft/storagedrawers/block/BlockCompDrawers.java +++ b/src/com/jaquadro/minecraft/storagedrawers/block/BlockCompDrawers.java @@ -31,6 +31,8 @@ public class BlockCompDrawers extends BlockDrawers @SideOnly(Side.CLIENT) private IIcon[][] iconFrontInd; + @SideOnly(Side.CLIENT) + private IIcon iconTrim; @SideOnly(Side.CLIENT) private IIcon iconSide; @SideOnly(Side.CLIENT) @@ -63,6 +65,12 @@ public class BlockCompDrawers extends BlockDrawers list.add(new ItemStack(item, 1, 0)); } + @Override + @SideOnly(Side.CLIENT) + public IIcon getIconTrim (int meta) { + return iconTrim; + } + @Override @SideOnly(Side.CLIENT) public IIcon getIcon (int side, int meta) { @@ -131,6 +139,7 @@ public class BlockCompDrawers extends BlockDrawers iconFrontInd[i][j] = register.registerIcon(StorageDrawers.MOD_ID + ":drawers_comp_front_" + i + "_ind" + j); } + iconTrim = register.registerIcon(StorageDrawers.MOD_ID + ":drawers_comp_trim"); iconSide = register.registerIcon(StorageDrawers.MOD_ID + ":drawers_comp_side"); iconSideEtched = register.registerIcon(StorageDrawers.MOD_ID + ":drawers_comp_side_2"); } diff --git a/src/com/jaquadro/minecraft/storagedrawers/block/BlockDrawers.java b/src/com/jaquadro/minecraft/storagedrawers/block/BlockDrawers.java index d66a4e7..a83f326 100644 --- a/src/com/jaquadro/minecraft/storagedrawers/block/BlockDrawers.java +++ b/src/com/jaquadro/minecraft/storagedrawers/block/BlockDrawers.java @@ -49,6 +49,8 @@ public class BlockDrawers extends BlockContainer implements IExtendedBlockClickH private IIcon[] iconFront2; @SideOnly(Side.CLIENT) private IIcon[] iconFront4; + @SideOnly(Side.CLIENT) + private IIcon[] iconTrim; @SideOnly(Side.CLIENT) private IIcon[] iconOverlay; @@ -57,7 +59,7 @@ public class BlockDrawers extends BlockContainer implements IExtendedBlockClickH @SideOnly(Side.CLIENT) private IIcon[] iconOverlayH; @SideOnly(Side.CLIENT) - private IIcon[] iconOverlayCross; + private IIcon[] iconOverlayTrim; @SideOnly(Side.CLIENT) private IIcon iconIndicatorOn; @@ -392,6 +394,12 @@ public class BlockDrawers extends BlockContainer implements IExtendedBlockClickH } } + @SideOnly(Side.CLIENT) + public IIcon getIconTrim (int meta) { + meta %= BlockWood.field_150096_a.length; + return iconTrim[meta]; + } + @Override @SideOnly(Side.CLIENT) public IIcon getIcon (int side, int meta) { @@ -427,6 +435,14 @@ public class BlockDrawers extends BlockContainer implements IExtendedBlockClickH return getIcon(blockAccess, x, y, z, side, level); } + @SideOnly(Side.CLIENT) + public IIcon getOverlayIconTrim (int level) { + if (level == 0) + return null; + + return iconOverlayTrim[level]; + } + @SideOnly(Side.CLIENT) public IIcon getIndicatorIcon (boolean on) { return on ? iconIndicatorOn : iconIndicatorAmber; @@ -453,9 +469,9 @@ public class BlockDrawers extends BlockContainer implements IExtendedBlockClickH TileEntityDrawersBase tile = getTileEntity(blockAccess, x, y, z); if (tile == null || side == tile.getDirection()) { if (drawerCount == 2) - return (level > 0) ? iconOverlayH[level] : iconFront2[meta]; + return iconFront2[meta]; else - return (level > 0) ? iconOverlayCross[level] : iconFront4[meta]; + return iconFront4[meta]; } switch (side) { @@ -491,6 +507,7 @@ public class BlockDrawers extends BlockContainer implements IExtendedBlockClickH iconSideV = new IIcon[subtex.length]; iconFront2 = new IIcon[subtex.length]; iconFront4 = new IIcon[subtex.length]; + iconTrim = new IIcon[subtex.length]; for (int i = 0; i < subtex.length; i++) { iconFront2[i] = register.registerIcon(StorageDrawers.MOD_ID + ":drawers_" + subtex[i] + "_front_2"); @@ -498,6 +515,7 @@ public class BlockDrawers extends BlockContainer implements IExtendedBlockClickH iconSide[i] = register.registerIcon(StorageDrawers.MOD_ID + ":drawers_" + subtex[i] + "_side"); iconSideV[i] = register.registerIcon(StorageDrawers.MOD_ID + ":drawers_" + subtex[i] + "_side_v"); iconSideH[i] = register.registerIcon(StorageDrawers.MOD_ID + ":drawers_" + subtex[i] + "_side_h"); + iconTrim[i] = register.registerIcon(StorageDrawers.MOD_ID + ":drawers_" + subtex[i] + "_trim"); } String[] overlays = new String[] { null, null, "iron", "gold", "obsidian", "diamond", "emerald" }; @@ -505,13 +523,13 @@ public class BlockDrawers extends BlockContainer implements IExtendedBlockClickH iconOverlay = new IIcon[overlays.length]; iconOverlayH = new IIcon[overlays.length]; iconOverlayV = new IIcon[overlays.length]; - iconOverlayCross = new IIcon[overlays.length]; + iconOverlayTrim = new IIcon[overlays.length]; for (int i = 2; i < overlays.length; i++) { iconOverlay[i] = register.registerIcon(StorageDrawers.MOD_ID + ":overlay_" + overlays[i]); iconOverlayV[i] = register.registerIcon(StorageDrawers.MOD_ID + ":overlay_" + overlays[i] + "_v"); iconOverlayH[i] = register.registerIcon(StorageDrawers.MOD_ID + ":overlay_" + overlays[i] + "_h"); - iconOverlayCross[i] = register.registerIcon(StorageDrawers.MOD_ID + ":overlay_" + overlays[i] + "_cross"); + iconOverlayTrim[i] = register.registerIcon(StorageDrawers.MOD_ID + ":overlay_" + overlays[i] + "_trim"); } iconIndicatorOff = register.registerIcon(StorageDrawers.MOD_ID + ":indicator_off"); diff --git a/src/com/jaquadro/minecraft/storagedrawers/client/renderer/DrawersRenderer.java b/src/com/jaquadro/minecraft/storagedrawers/client/renderer/DrawersRenderer.java index 9dc8975..ea65238 100644 --- a/src/com/jaquadro/minecraft/storagedrawers/client/renderer/DrawersRenderer.java +++ b/src/com/jaquadro/minecraft/storagedrawers/client/renderer/DrawersRenderer.java @@ -70,18 +70,25 @@ public class DrawersRenderer implements ISimpleBlockRenderingHandler return false; int side = tile.getDirection(); + int meta = world.getBlockMetadata(x, y, z); double unit = .0625; boxRenderer.setUnit(unit); boxRenderer.setColor(ModularBoxRenderer.COLOR_WHITE); for (int i = 0; i < 6; i++) - boxRenderer.setIcon(block.getIcon(world, x, y, z, i), i); + boxRenderer.setExteriorIcon(block.getIcon(world, x, y, z, i), i); + + boxRenderer.setCutIcon(block.getIconTrim(meta)); + boxRenderer.setInteriorIcon(block.getIconTrim(meta)); renderExterior(block, x, y, z, side, renderer); if (tile.getLevel() > 1 && StorageDrawers.config.cache.renderStorageUpgrades) { for (int i = 0; i < 6; i++) - boxRenderer.setIcon(block.getOverlayIcon(world, x, y, z, i, tile.getLevel()), i); + boxRenderer.setExteriorIcon(block.getOverlayIcon(world, x, y, z, i, tile.getLevel()), i); + + boxRenderer.setCutIcon(block.getOverlayIconTrim(tile.getLevel())); + boxRenderer.setInteriorIcon(block.getOverlayIconTrim(tile.getLevel())); renderExterior(block, x, y, z, side, renderer); }