diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockTreasureChest.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockTreasureChest.java index c96555da3..532464d00 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockTreasureChest.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockTreasureChest.java @@ -30,7 +30,7 @@ import java.util.Random; public class BlockTreasureChest extends Block implements INameableItem{ private IIcon topIcon; - private IIcon onIcon; + private IIcon bottomIcon; private IIcon frontIcon; public BlockTreasureChest(){ @@ -65,6 +65,7 @@ public class BlockTreasureChest extends Block implements INameableItem{ @Override public IIcon getIcon(int side, int meta){ if(side == 1) return this.topIcon; + if(side == 0) return this.bottomIcon; if(side == 3) return this.frontIcon; return this.blockIcon; } @@ -73,8 +74,8 @@ public class BlockTreasureChest extends Block implements INameableItem{ public IIcon getIcon(IBlockAccess world, int x, int y, int z, int side){ int meta = world.getBlockMetadata(x, y, z); if(side == 1) return this.topIcon; - if(side == meta+2 && meta <= 3) return this.frontIcon; - else if(side == meta-2 && meta > 3) return this.onIcon; + if(side == meta+2) return this.frontIcon; + if(side == 0) return this.bottomIcon; return this.blockIcon; } @@ -83,7 +84,7 @@ public class BlockTreasureChest extends Block implements INameableItem{ public void registerBlockIcons(IIconRegister iconReg){ this.blockIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER + ":" + this.getName()); this.topIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER + ":" + this.getName() + "Top"); - this.onIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER + ":" + this.getName() + "On"); + this.bottomIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER + ":" + this.getName() + "Bottom"); this.frontIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER + ":" + this.getName() + "Front"); } diff --git a/src/main/resources/assets/actuallyadditions/textures/armor/armorEmerald1.png b/src/main/resources/assets/actuallyadditions/textures/armor/armorEmerald1.png new file mode 100644 index 000000000..44f0c2f84 Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/armor/armorEmerald1.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/armor/armorEmerald2.png b/src/main/resources/assets/actuallyadditions/textures/armor/armorEmerald2.png new file mode 100644 index 000000000..fb134eab7 Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/armor/armorEmerald2.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/armor/armorObsidian1.png b/src/main/resources/assets/actuallyadditions/textures/armor/armorObsidian1.png new file mode 100644 index 000000000..8873bb9d0 Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/armor/armorObsidian1.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/armor/armorObsidian2.png b/src/main/resources/assets/actuallyadditions/textures/armor/armorObsidian2.png new file mode 100644 index 000000000..594fd17c4 Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/armor/armorObsidian2.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockTreasureChest.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockTreasureChest.png new file mode 100644 index 000000000..3d7d3cb77 Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/blocks/blockTreasureChest.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockTreasureChestBottom.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockTreasureChestBottom.png new file mode 100644 index 000000000..84b069061 Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/blocks/blockTreasureChestBottom.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockTreasureChestFront.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockTreasureChestFront.png new file mode 100644 index 000000000..29bf0013c Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/blocks/blockTreasureChestFront.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockTreasureChestTop.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockTreasureChestTop.png new file mode 100644 index 000000000..828fffa8f Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/blocks/blockTreasureChestTop.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemBootsEmerald.png b/src/main/resources/assets/actuallyadditions/textures/items/itemBootsEmerald.png new file mode 100644 index 000000000..370a51680 Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/items/itemBootsEmerald.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemBootsObsidian.png b/src/main/resources/assets/actuallyadditions/textures/items/itemBootsObsidian.png new file mode 100644 index 000000000..149688094 Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/items/itemBootsObsidian.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemChestEmerald.png b/src/main/resources/assets/actuallyadditions/textures/items/itemChestEmerald.png new file mode 100644 index 000000000..0148ee2b2 Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/items/itemChestEmerald.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemChestObsidian.png b/src/main/resources/assets/actuallyadditions/textures/items/itemChestObsidian.png new file mode 100644 index 000000000..d72ed6dff Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/items/itemChestObsidian.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemHelmEmerald.png b/src/main/resources/assets/actuallyadditions/textures/items/itemHelmEmerald.png new file mode 100644 index 000000000..29ef83374 Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/items/itemHelmEmerald.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemHelmObsidian.png b/src/main/resources/assets/actuallyadditions/textures/items/itemHelmObsidian.png new file mode 100644 index 000000000..3b6735ba8 Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/items/itemHelmObsidian.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemPantsEmerald.png b/src/main/resources/assets/actuallyadditions/textures/items/itemPantsEmerald.png new file mode 100644 index 000000000..8e6213f7a Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/items/itemPantsEmerald.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemPantsObsidian.png b/src/main/resources/assets/actuallyadditions/textures/items/itemPantsObsidian.png new file mode 100644 index 000000000..70f440a05 Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/items/itemPantsObsidian.png differ