Cleaning up lots of loose ends. New comp drawers look.

This commit is contained in:
Justin Aquadro committed 2014-09-13 18:42:35 -04:00
1 parent 105188da16
commit 159ede2b92
20 files changed
+200 -35

No files matched your search

@@ -1,11 +1,18 @@
itemGroup.storageDrawers=Storage Drawers
# Items
item.upgrade.iron.name=Drawer Upgrade (II)
item.upgrade.gold.name=Drawer Upgrade (III)
item.upgrade.obsidian.name=Drawer Upgrade (IV)
item.upgrade.diamond.name=Drawer Upgrade (V)
item.upgrade.emerald.name=Drawer Upgrade (VI)
item.upgradeTemplate.name=Upgrade Template
item.upgrade.iron.name=Storage Upgrade (II)
item.upgrade.gold.name=Storage Upgrade (III)
item.upgrade.obsidian.name=Storage Upgrade (IV)
item.upgrade.diamond.name=Storage Upgrade (V)
item.upgrade.emerald.name=Storage Upgrade (VI)
item.upgradeStatus.level1.name=Status Upgrade (I)
item.upgradeStatus.level1.description=Shows full storage
item.upgradeStatus.level2.name=Status Upgrade (II)
item.upgradeStatus.level2.description=Shows near-full storage
item.upgradeStatus.level3.name=Status Upgrade (III)
item.upgradeStatus.level3.description=Shows fill level
# Blocks
tile.fullDrawers2.oak.name=Oak Drawers 1x2
Binary file not shown.

After

Width:  |  Height:  |  Size: 597 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 610 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 595 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 605 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 554 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 562 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 490 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 599 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 438 B

File renamed without changes.

Before

Width:  |  Height:  |  Size: 467 B

After

Width:  |  Height:  |  Size: 467 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 483 B

@@ -13,6 +13,7 @@ import net.minecraft.block.BlockWood;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
@@ -22,7 +23,15 @@ import java.util.List;
public class BlockCompDrawers extends BlockDrawers
{
@SideOnly(Side.CLIENT)
private IIcon[][] iconFront;
private IIcon[] iconFront;
@SideOnly(Side.CLIENT)
private IIcon[] iconFrontInd;
@SideOnly(Side.CLIENT)
private IIcon iconSide;
@SideOnly(Side.CLIENT)
private IIcon iconSideEtched;
public BlockCompDrawers (String blockName) {
super(blockName, 3, false);
@@ -44,47 +53,61 @@ public class BlockCompDrawers extends BlockDrawers
return new TileEntityCompDrawers();
}
@Override
public void getSubBlocks (Item item, CreativeTabs creativeTabs, List list) {
list.add(new ItemStack(item, 1, 0));
}
@Override
@SideOnly(Side.CLIENT)
public IIcon getIcon (int side, int meta) {
if (side == 4) {
meta %= BlockWood.field_150096_a.length;
return iconFront[0][meta];
switch (side) {
case 0:
case 1:
return iconSide;
case 4:
return iconFront[0];
default:
return iconSideEtched;
}
return super.getIcon(side, meta);
}
@Override
public IIcon getIcon (IBlockAccess blockAccess, int x, int y, int z, int side) {
TileEntityDrawersBase tile = getTileEntity(blockAccess, x, y, z);
if (tile == null || side == tile.getDirection()) {
int meta = blockAccess.getBlockMetadata(x, y, z) % BlockWood.field_150096_a.length;
if (tile == null)
return iconFront[0][meta];
return iconFront[0];
else if (tile.getItemStackSize(2) > 0)
return iconFront[2][meta];
return iconFront[2];
else if (tile.getItemStackSize(1) > 0)
return iconFront[1][meta];
return iconFront[1];
else
return iconFront[0][meta];
return iconFront[0];
}
return super.getIcon(blockAccess, x, y, z, side);
switch (side) {
case 0:
case 1:
return iconSide;
default:
return iconSideEtched;
}
}
@Override
public void registerBlockIcons (IIconRegister register) {
super.registerBlockIcons(register);
String[] subtex = BlockWood.field_150096_a;
iconFront = new IIcon[3][subtex.length];
iconFront = new IIcon[3];
iconFrontInd = new IIcon[3];
for (int i = 0; i < subtex.length; i++) {
iconFront[0][i] = register.registerIcon(StorageDrawers.MOD_ID + ":drawers_" + subtex[i] + "_comp_0");
iconFront[1][i] = register.registerIcon(StorageDrawers.MOD_ID + ":drawers_" + subtex[i] + "_comp_1");
iconFront[2][i] = register.registerIcon(StorageDrawers.MOD_ID + ":drawers_" + subtex[i] + "_comp_2");
for (int i = 0; i < 3; i++) {
iconFront[i] = register.registerIcon(StorageDrawers.MOD_ID + ":drawers_comp_front_" + i);
iconFrontInd[i] = register.registerIcon(StorageDrawers.MOD_ID + ":drawers_comp_front_" + i + "_ind");
}
iconSide = register.registerIcon(StorageDrawers.MOD_ID + ":drawers_comp_side");
iconSideEtched = register.registerIcon(StorageDrawers.MOD_ID + ":drawers_comp_side_2");
}
}
@@ -175,6 +175,17 @@ public class BlockDrawers extends BlockContainer implements IExtendedBlockClickH
player.inventory.setInventorySlotContents(player.inventory.currentItem, null);
}
return true;
}
else if (item.getItem() == ModItems.upgradeStatus) {
tileDrawers.setStatusLevel(item.getItemDamage());
world.markBlockForUpdate(x, y, z);
if (player != null && !player.capabilities.isCreativeMode) {
if (--item.stackSize <= 0)
player.inventory.setInventorySlotContents(player.inventory.currentItem, null);
}
return true;
}
}
@@ -15,6 +15,7 @@ public abstract class TileEntityDrawersBase extends TileEntity
private int direction;
private int drawerCapacity = 1;
private int level = 1;
private int statusLevel = 0;
protected int[] autoSides = new int[] { 0, 1 };
@@ -35,6 +36,14 @@ public abstract class TileEntityDrawersBase extends TileEntity
this.level = MathHelper.clamp_int(level, 1, 6);
}
public int getStatusLevel () {
return statusLevel;
}
public void setStatusLevel (int level) {
this.statusLevel = MathHelper.clamp_int(level, 1, 3);
}
public int getDrawerCapacity () {
return drawerCapacity;
}
@@ -65,6 +74,10 @@ public abstract class TileEntityDrawersBase extends TileEntity
drawerCapacity = tag.getByte("Cap");
level = tag.getByte("Lev");
statusLevel = 0;
if (tag.hasKey("Stat"))
statusLevel = tag.getByte("Stat");
autoSides = new int[] { 0, 1, ForgeDirection.OPPOSITES[direction] };
}
@@ -75,6 +88,9 @@ public abstract class TileEntityDrawersBase extends TileEntity
tag.setByte("Dir", (byte)direction);
tag.setByte("Cap", (byte)drawerCapacity);
tag.setByte("Lev", (byte)level);
if (statusLevel > 0)
tag.setByte("Stat", (byte)statusLevel);
}
@Override
@@ -108,7 +108,8 @@ public class DrawersRenderer implements ISimpleBlockRenderingHandler
ModularBoxRenderer.CUT_YPOS | ModularBoxRenderer.CUT_YNEG | ModularBoxRenderer.CUT_XPOS | ModularBoxRenderer.CUT_XNEG | ModularBoxRenderer.CUT_ZNEG);
}*/
renderHandleIndicator(block, x, y, z, side, renderer);
if (StorageDrawers.config.cache.enableIndicatorUpgrades)
renderHandleIndicator(block, x, y, z, side, renderer, tile.getStatusLevel());
/*boxRenderer.renderExterior(renderer, block, x, y, z, unit * 14, unit * 14, unit * 15, unit * 15, unit * 15, unit * 16, 0,
ModularBoxRenderer.CUT_YPOS | ModularBoxRenderer.CUT_XPOS | ModularBoxRenderer.CUT_ZNEG);
@@ -149,8 +150,8 @@ public class DrawersRenderer implements ISimpleBlockRenderingHandler
private static final float[] indicatorsY2 = new float[] { 14, 6 };
private static final float[] indicatorsY4 = new float[] { 14, 6, 14, 6 };
private void renderHandleIndicator (BlockDrawers block, int x, int y, int z, int side, RenderBlocks renderer) {
if (side < 2 || side > 5)
private void renderHandleIndicator (BlockDrawers block, int x, int y, int z, int side, RenderBlocks renderer, int level) {
if (level <= 0 || side < 2 || side > 5)
return;
TileEntityDrawersBase tile = block.getTileEntity(renderer.blockAccess, x, y, z);
@@ -180,8 +181,11 @@ public class DrawersRenderer implements ISimpleBlockRenderingHandler
return;
for (int i = 0; i < count; i++) {
int iconIndex = (tile.getItemCapacity(i) > 0 && tile.getItemCount(i) == tile.getItemCapacity(i)) ? 2
: (tile.getItemCapacity(i) > 0 && (float)tile.getItemCount(i) / tile.getItemCapacity(i) > .75) ? 1 : 0;
int iconIndex = 0;
if (level == 2)
iconIndex = (tile.getItemCapacity(i) > 0 && (float)tile.getItemCount(i) / tile.getItemCapacity(i) > .75) ? 1 : iconIndex;
if (level >= 1)
iconIndex = (tile.getItemCapacity(i) > 0 && tile.getItemCount(i) == tile.getItemCapacity(i)) ? 2 : iconIndex;
boxRenderer.setExteriorIcon(block.getIndicatorIcon(iconIndex));
boxRenderer.renderExterior(renderer, block, x, y, z, indX[xi][d][i] * unit, indY[i] * unit, indX[zi][d][i] * unit,
@@ -2,16 +2,26 @@ package com.jaquadro.minecraft.storagedrawers.core;
import com.jaquadro.minecraft.storagedrawers.StorageDrawers;
import com.jaquadro.minecraft.storagedrawers.item.ItemUpgrade;
import com.jaquadro.minecraft.storagedrawers.item.ItemUpgradeStatus;
import cpw.mods.fml.common.registry.GameRegistry;
import net.minecraft.item.Item;
public class ModItems
{
public static Item upgradeTemplate;
public static ItemUpgrade upgrade;
public static ItemUpgradeStatus upgradeStatus;
public void init () {
upgradeTemplate = new Item().setUnlocalizedName("upgradeTemplate").setTextureName(StorageDrawers.MOD_ID + ":upgrade_template").setCreativeTab(ModCreativeTabs.tabStorageDrawers);
upgrade = new ItemUpgrade("upgrade");
upgradeStatus = new ItemUpgradeStatus("upgradeStatus");
GameRegistry.registerItem(upgradeTemplate, "upgradeTemplate");
if (StorageDrawers.config.cache.enableStorageUpgrades)
GameRegistry.registerItem(upgrade, "upgrade");
if (StorageDrawers.config.cache.enableIndicatorUpgrades)
GameRegistry.registerItem(upgradeStatus, "upgradeStatus");
}
}
@@ -1,5 +1,6 @@
package com.jaquadro.minecraft.storagedrawers.core;
import com.jaquadro.minecraft.storagedrawers.block.BlockDrawers;
import cpw.mods.fml.common.registry.GameRegistry;
import net.minecraft.block.BlockWood;
import net.minecraft.init.Blocks;
@@ -21,15 +22,34 @@ public class ModRecipes
'x', new ItemStack(Blocks.wooden_slab, 1, i), 'y', Blocks.chest);
}
GameRegistry.addRecipe(new ItemStack(ModBlocks.compDrawers), "xxx", "zwz", "xyx",
'x', new ItemStack(Blocks.stone), 'y', Items.iron_ingot, 'z', new ItemStack(Blocks.piston), 'w', new ItemStack(ModBlocks.fullDrawers2, 1, OreDictionary.WILDCARD_VALUE));
GameRegistry.addRecipe(new ItemStack(ModItems.upgradeTemplate, 2), "xxx", "xyx", "xxx",
'x', Items.stick, 'y', new ItemStack(ModBlocks.fullDrawers2, 1, OreDictionary.WILDCARD_VALUE));
GameRegistry.addRecipe(new ItemStack(ModItems.upgradeTemplate, 2), "xxx", "xyx", "xxx",
'x', Items.stick, 'y', new ItemStack(ModBlocks.halfDrawers2, 1, OreDictionary.WILDCARD_VALUE));
GameRegistry.addRecipe(new ItemStack(ModItems.upgradeTemplate, 2), "xxx", "xyx", "xxx",
'x', Items.stick, 'y', new ItemStack(ModBlocks.fullDrawers4, 1, OreDictionary.WILDCARD_VALUE));
GameRegistry.addRecipe(new ItemStack(ModItems.upgradeTemplate, 2), "xxx", "xyx", "xxx",
'x', Items.stick, 'y', new ItemStack(ModBlocks.halfDrawers4, 1, OreDictionary.WILDCARD_VALUE));
GameRegistry.addRecipe(new ItemStack(ModItems.upgrade, 1, 2), "xyx", "yzy", "xyx",
'x', Items.iron_ingot, 'y', Items.stick, 'z', new ItemStack(ModBlocks.fullDrawers2, 1, OreDictionary.WILDCARD_VALUE));
'x', Items.iron_ingot, 'y', Items.stick, 'z', ModItems.upgradeTemplate);
GameRegistry.addRecipe(new ItemStack(ModItems.upgrade, 1, 3), "xyx", "yzy", "xyx",
'x', Items.gold_ingot, 'y', Items.stick, 'z', new ItemStack(ModBlocks.fullDrawers2, 1, OreDictionary.WILDCARD_VALUE));
'x', Items.gold_ingot, 'y', Items.stick, 'z', ModItems.upgradeTemplate);
GameRegistry.addRecipe(new ItemStack(ModItems.upgrade, 1, 4), "xyx", "yzy", "xyx",
'x', Blocks.obsidian, 'y', Items.stick, 'z', new ItemStack(ModBlocks.fullDrawers2, 1, OreDictionary.WILDCARD_VALUE));
'x', Blocks.obsidian, 'y', Items.stick, 'z', ModItems.upgradeTemplate);
GameRegistry.addRecipe(new ItemStack(ModItems.upgrade, 1, 5), "xyx", "yzy", "xyx",
'x', Items.diamond, 'y', Items.stick, 'z', new ItemStack(ModBlocks.fullDrawers2, 1, OreDictionary.WILDCARD_VALUE));
'x', Items.diamond, 'y', Items.stick, 'z', ModItems.upgradeTemplate);
GameRegistry.addRecipe(new ItemStack(ModItems.upgrade, 1, 6), "xyx", "yzy", "xyx",
'x', Items.emerald, 'y', Items.stick, 'z', new ItemStack(ModBlocks.fullDrawers2, 1, OreDictionary.WILDCARD_VALUE));
'x', Items.emerald, 'y', Items.stick, 'z', ModItems.upgradeTemplate);
GameRegistry.addRecipe(new ItemStack(ModItems.upgradeStatus, 1, 1), "xyx", "yzy", "xyx",
'x', Items.redstone, 'y', Items.stick, 'z', ModItems.upgradeTemplate);
GameRegistry.addRecipe(new ItemStack(ModItems.upgradeStatus, 1, 2), "wyw", "yzy", "xyx",
'w', new ItemStack(Blocks.redstone_torch), 'x', Items.redstone, 'y', Items.stick, 'z', ModItems.upgradeTemplate);
GameRegistry.addRecipe(new ItemStack(ModItems.upgradeStatus, 1, 3), "wyw", "yzy", "xyx",
'w', Items.comparator, 'x', Items.redstone, 'y', Items.stick, 'z', ModItems.upgradeTemplate);
}
}
@@ -47,7 +47,8 @@ public class ItemUpgrade extends Item
@Override
@SideOnly(Side.CLIENT)
public void addInformation (ItemStack itemStack, EntityPlayer player, List list, boolean par4) {
list.add(StatCollector.translateToLocalFormatted("storageDrawers.upgrade.description", itemStack.getItemDamage()));
int mult = StorageDrawers.config.getStorageUpgradeMultiplier(itemStack.getItemDamage());
list.add(StatCollector.translateToLocalFormatted("storageDrawers.upgrade.description", mult));
}
@Override
@@ -0,0 +1,73 @@
package com.jaquadro.minecraft.storagedrawers.item;
import com.jaquadro.minecraft.storagedrawers.StorageDrawers;
import com.jaquadro.minecraft.storagedrawers.core.ModCreativeTabs;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
import net.minecraft.util.MathHelper;
import net.minecraft.util.StatCollector;
import java.util.List;
public class ItemUpgradeStatus extends Item
{
public static final String[] iconNames = new String[] { null, "level1", "level2", "level3" };
@SideOnly(Side.CLIENT)
private IIcon[] icons;
public ItemUpgradeStatus (String name) {
setUnlocalizedName(name);
setHasSubtypes(true);
setMaxDamage(0);
setCreativeTab(ModCreativeTabs.tabStorageDrawers);
}
@Override
@SideOnly(Side.CLIENT)
public IIcon getIconFromDamage (int meta) {
return icons[MathHelper.clamp_int(meta, 0, iconNames.length - 1)];
}
@Override
public String getUnlocalizedName (ItemStack itemStack) {
int meta = MathHelper.clamp_int(itemStack.getItemDamage(), 0, iconNames.length - 1);
if (iconNames[meta] == null)
return super.getUnlocalizedName();
return super.getUnlocalizedName() + "." + iconNames[meta];
}
@Override
@SideOnly(Side.CLIENT)
public void addInformation (ItemStack itemStack, EntityPlayer player, List list, boolean par4) {
String name = getUnlocalizedName(itemStack);
list.add(StatCollector.translateToLocalFormatted(name + ".description"));
}
@Override
@SideOnly(Side.CLIENT)
public void getSubItems (Item item, CreativeTabs creativeTabs, List list) {
for (int i = 0; i < iconNames.length; i++) {
if (iconNames[i] != null)
list.add(new ItemStack(item, 1, i));
}
}
@Override
@SideOnly(Side.CLIENT)
public void registerIcons (IIconRegister register) {
icons = new IIcon[iconNames.length];
for (int i = 0; i < iconNames.length; i++) {
if (iconNames[i] != null)
icons[i] = register.registerIcon(StorageDrawers.MOD_ID + ":upgrade_status_" + iconNames[i]);
}
}
}