From 25dc76a7399c50abd19cb68be206af14c7047218 Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Fri, 9 Jan 2015 02:09:22 -0500 Subject: [PATCH] Revert Futura change for now --- .../chisel/block/BlockCarvableGlow.java | 11 ++++++-- .../tileentity/TileEntityAutoChisel.java | 26 ++++++------------- .../chisel/init/ChiselBlocks.java | 7 +++-- .../cricketcraft/chisel/init/Features.java | 7 ++--- 4 files changed, 24 insertions(+), 27 deletions(-) diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableGlow.java b/src/main/java/com/cricketcraft/chisel/block/BlockCarvableGlow.java index 916da3e7..da98ead3 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableGlow.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockCarvableGlow.java @@ -1,9 +1,11 @@ package com.cricketcraft.chisel.block; +import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.util.IIcon; + import com.cricketcraft.chisel.Chisel; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.util.IIcon; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -19,6 +21,11 @@ public class BlockCarvableGlow extends BlockCarvable { this.glowTexturePath = glowTexture; } + public BlockCarvableGlow(Material mat, String glowTexture) { + super(mat); + this.glowTexturePath = glowTexture; + } + @Override public void registerBlockIcons(IIconRegister register) { super.registerBlockIcons(register); diff --git a/src/main/java/com/cricketcraft/chisel/block/tileentity/TileEntityAutoChisel.java b/src/main/java/com/cricketcraft/chisel/block/tileentity/TileEntityAutoChisel.java index 05d5f856..b28ef8e9 100644 --- a/src/main/java/com/cricketcraft/chisel/block/tileentity/TileEntityAutoChisel.java +++ b/src/main/java/com/cricketcraft/chisel/block/tileentity/TileEntityAutoChisel.java @@ -36,7 +36,7 @@ public class TileEntityAutoChisel extends TileEntity implements ISidedInventory } public static final int BASE = 0, TARGET = 1, OUTPUT = 2, CHISEL = 3, MIN_UPGRADE = 4; - + private static EntityItem ghostItem; boolean equal = false; private ItemStack[] inventory = new ItemStack[7]; @@ -245,7 +245,7 @@ public class TileEntityAutoChisel extends TileEntity implements ISidedInventory @Override public int[] getAccessibleSlotsFromSide(int side) { - return new int[6]; + return new int[] { BASE, OUTPUT }; } @Override @@ -253,14 +253,14 @@ public class TileEntityAutoChisel extends TileEntity implements ISidedInventory if (itemStack == null) { return false; } - - switch(slot) { - case BASE: + + switch (slot) { + case BASE: case TARGET: return !Carving.chisel.getItems(itemStack).isEmpty(); case OUTPUT: return false; - case CHISEL: + case CHISEL: return itemStack.getItem() instanceof IChiselItem; default: return itemStack.getItem() == ChiselItems.upgrade && Upgrade.values()[slot - MIN_UPGRADE].ordinal() == itemStack.getItemDamage(); @@ -269,22 +269,12 @@ public class TileEntityAutoChisel extends TileEntity implements ISidedInventory @Override public boolean canInsertItem(int slot, ItemStack itemStack, int side) { - if (hasUpgrade(Upgrade.AUTOMATION)) { - if (slot == BASE) { - return true; - } - } - return false; + return hasUpgrade(Upgrade.AUTOMATION) && slot == BASE; } @Override public boolean canExtractItem(int slot, ItemStack itemStack, int side) { - if (hasUpgrade(Upgrade.AUTOMATION)) { - if (slot == OUTPUT) { - return true; - } - } - return false; + return hasUpgrade(Upgrade.AUTOMATION) && slot == OUTPUT; } @Override diff --git a/src/main/java/com/cricketcraft/chisel/init/ChiselBlocks.java b/src/main/java/com/cricketcraft/chisel/init/ChiselBlocks.java index 246ecc08..628b9a77 100644 --- a/src/main/java/com/cricketcraft/chisel/init/ChiselBlocks.java +++ b/src/main/java/com/cricketcraft/chisel/init/ChiselBlocks.java @@ -5,11 +5,12 @@ import net.minecraft.block.Block; import com.cricketcraft.chisel.Chisel; import com.cricketcraft.chisel.block.BlockCarvable; import com.cricketcraft.chisel.block.BlockCarvableGlass; -import com.cricketcraft.chisel.block.BlockCarvableGlow; import com.cricketcraft.chisel.block.BlockCarvablePane; import com.cricketcraft.chisel.block.BlockCarvablePowered; import com.cricketcraft.chisel.block.BlockCarvablePumpkin; import com.cricketcraft.chisel.block.BlockCarvableSand; +import com.cricketcraft.chisel.block.BlockCarvableSlab; +import com.cricketcraft.chisel.block.BlockCarvableStairs; import com.cricketcraft.chisel.block.BlockCloud; import com.cricketcraft.chisel.block.BlockConcrete; import com.cricketcraft.chisel.block.BlockGrimstone; @@ -21,8 +22,6 @@ import com.cricketcraft.chisel.block.BlockMarbleIce; import com.cricketcraft.chisel.block.BlockMarbleIceStairs; import com.cricketcraft.chisel.block.BlockMarblePackedIce; import com.cricketcraft.chisel.block.BlockMarblePackedIceStairs; -import com.cricketcraft.chisel.block.BlockCarvableSlab; -import com.cricketcraft.chisel.block.BlockCarvableStairs; import com.cricketcraft.chisel.block.BlockMarbleTexturedOre; import com.cricketcraft.chisel.block.BlockMarbleWall; import com.cricketcraft.chisel.block.BlockPresent; @@ -104,7 +103,7 @@ public final class ChiselBlocks { public static final BlockCarvable hexPlating = null; public static final BlockCarvable technical = null; public static final BlockCarvableGlass technical2 = null; - public static final BlockCarvableGlow futura = null; + public static final BlockCarvable futura = null; public static final BlockCarvable bone = null; public static final BlockCarvable scorching = null; public static final BlockCarvable brickCustom = null; diff --git a/src/main/java/com/cricketcraft/chisel/init/Features.java b/src/main/java/com/cricketcraft/chisel/init/Features.java index 113fbc01..9bffdd18 100644 --- a/src/main/java/com/cricketcraft/chisel/init/Features.java +++ b/src/main/java/com/cricketcraft/chisel/init/Features.java @@ -23,6 +23,8 @@ import com.cricketcraft.chisel.block.BlockCarvablePane; import com.cricketcraft.chisel.block.BlockCarvablePowered; import com.cricketcraft.chisel.block.BlockCarvablePumpkin; import com.cricketcraft.chisel.block.BlockCarvableSand; +import com.cricketcraft.chisel.block.BlockCarvableSlab; +import com.cricketcraft.chisel.block.BlockCarvableStairs; import com.cricketcraft.chisel.block.BlockCloud; import com.cricketcraft.chisel.block.BlockConcrete; import com.cricketcraft.chisel.block.BlockEldritch; @@ -38,8 +40,6 @@ import com.cricketcraft.chisel.block.BlockMarbleIceStairs; import com.cricketcraft.chisel.block.BlockMarblePackedIce; import com.cricketcraft.chisel.block.BlockMarblePackedIceStairs; import com.cricketcraft.chisel.block.BlockMarblePillar; -import com.cricketcraft.chisel.block.BlockCarvableSlab; -import com.cricketcraft.chisel.block.BlockCarvableStairs; import com.cricketcraft.chisel.block.BlockMarbleStairsMaker; import com.cricketcraft.chisel.block.BlockMarbleStairsMakerCreator; import com.cricketcraft.chisel.block.BlockMarbleTexturedOre; @@ -69,6 +69,7 @@ import com.cricketcraft.chisel.item.chisel.ItemChisel.ChiselType; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.registry.EntityRegistry; import cpw.mods.fml.common.registry.GameRegistry; + import static com.cricketcraft.chisel.init.ChiselBlocks.*; import static com.cricketcraft.chisel.utils.General.*; @@ -665,7 +666,7 @@ public enum Features { // TODO Overlay is WIP @Override void addBlocks() { - BlockCarvable futura = (BlockCarvable) new BlockCarvable(Material.rock).setCreativeTab(ChiselTabs.tabMetalChiselBlocks).setHardness(2.0F).setResistance(10F); + BlockCarvable futura = (BlockCarvable) new BlockCarvable(Material.rock/*, "futura/screenOverlay-ctm"*/).setCreativeTab(ChiselTabs.tabMetalChiselBlocks).setHardness(2.0F).setResistance(10F); futura.carverHelper.addVariation(StatCollector.translateToLocal("tile.futura.0.desc"), 0, "futura/screenMetallicWIP"); futura.carverHelper.addVariation(StatCollector.translateToLocal("tile.futura.1.desc"), 1, "futura/screenCyanWIP"); futura.carverHelper.addVariation(StatCollector.translateToLocal("tile.futura.2.desc"), 2, "futura/controllerWIP");