diff --git a/assets/hbm/textures/items/glitch_10.png b/assets/hbm/textures/items/glitch_10.png new file mode 100644 index 000000000..15969fcc1 Binary files /dev/null and b/assets/hbm/textures/items/glitch_10.png differ diff --git a/assets/hbm/textures/items/glitch_11.png b/assets/hbm/textures/items/glitch_11.png new file mode 100644 index 000000000..141ee0d95 Binary files /dev/null and b/assets/hbm/textures/items/glitch_11.png differ diff --git a/assets/hbm/textures/items/glitch_12.png b/assets/hbm/textures/items/glitch_12.png new file mode 100644 index 000000000..fa8ad1ed3 Binary files /dev/null and b/assets/hbm/textures/items/glitch_12.png differ diff --git a/assets/hbm/textures/items/glitch_13.png b/assets/hbm/textures/items/glitch_13.png new file mode 100644 index 000000000..2a4f327e6 Binary files /dev/null and b/assets/hbm/textures/items/glitch_13.png differ diff --git a/assets/hbm/textures/items/glitch_14.png b/assets/hbm/textures/items/glitch_14.png new file mode 100644 index 000000000..ee1f3103e Binary files /dev/null and b/assets/hbm/textures/items/glitch_14.png differ diff --git a/assets/hbm/textures/items/glitch_15.png b/assets/hbm/textures/items/glitch_15.png new file mode 100644 index 000000000..e3a41a497 Binary files /dev/null and b/assets/hbm/textures/items/glitch_15.png differ diff --git a/assets/hbm/textures/items/glitch_16.png b/assets/hbm/textures/items/glitch_16.png new file mode 100644 index 000000000..ab3a7e221 Binary files /dev/null and b/assets/hbm/textures/items/glitch_16.png differ diff --git a/assets/hbm/textures/items/glitch_17.png b/assets/hbm/textures/items/glitch_17.png new file mode 100644 index 000000000..de835be8b Binary files /dev/null and b/assets/hbm/textures/items/glitch_17.png differ diff --git a/assets/hbm/textures/items/glitch_18.png b/assets/hbm/textures/items/glitch_18.png new file mode 100644 index 000000000..d40ba7b18 Binary files /dev/null and b/assets/hbm/textures/items/glitch_18.png differ diff --git a/com/hbm/items/ModItems.java b/com/hbm/items/ModItems.java index 387fb2939..c893d7021 100644 --- a/com/hbm/items/ModItems.java +++ b/com/hbm/items/ModItems.java @@ -2105,7 +2105,7 @@ public class ModItems { record_vc = new ItemModRecord("vc").setUnlocalizedName("record_vc").setCreativeTab(CreativeTabs.tabMisc).setTextureName(RefStrings.MODID + ":record_vc"); polaroid = new ItemPolaroid().setUnlocalizedName("polaroid").setMaxStackSize(1).setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":polaroid_" + MainRegistry.polaroidID); - glitch = new ItemPolaroid().setUnlocalizedName("glitch").setMaxStackSize(1).setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":glitch_" + MainRegistry.polaroidID); + glitch = new ItemGlitch().setUnlocalizedName("glitch").setMaxStackSize(1).setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":glitch_" + MainRegistry.polaroidID); letter = new ItemStarterKit().setUnlocalizedName("letter").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":letter"); book_secret = new ItemCustomLore().setUnlocalizedName("book_secret").setCreativeTab(MainRegistry.polaroidID == 11 ? MainRegistry.tabNuke : null).setTextureName(RefStrings.MODID + ":book_secret"); burnt_bark = new ItemCustomLore().setUnlocalizedName("burnt_bark").setCreativeTab(null).setTextureName(RefStrings.MODID + ":burnt_bark"); @@ -3245,7 +3245,7 @@ public class ModItems { //GameRegistry.registerItem(remote, remote.getUnlocalizedName()); GameRegistry.registerItem(euphemium_stopper, euphemium_stopper.getUnlocalizedName()); GameRegistry.registerItem(polaroid, polaroid.getUnlocalizedName()); - //GameRegistry.registerItem(glitch, glitch.getUnlocalizedName()); + GameRegistry.registerItem(glitch, glitch.getUnlocalizedName()); GameRegistry.registerItem(book_secret, book_secret.getUnlocalizedName()); GameRegistry.registerItem(burnt_bark, burnt_bark.getUnlocalizedName()); diff --git a/com/hbm/items/special/ItemGlitch.java b/com/hbm/items/special/ItemGlitch.java new file mode 100644 index 000000000..0c47b17d3 --- /dev/null +++ b/com/hbm/items/special/ItemGlitch.java @@ -0,0 +1,92 @@ +package com.hbm.items.special; + +import java.util.List; + +import com.hbm.main.MainRegistry; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; + +public class ItemGlitch extends Item { + + public ItemGlitch() + { + this.maxStackSize = 1; + this.setMaxDamage(1); + } + + + @Override + public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { + + stack.damageItem(5, player); + + return stack; + } + + @Override + public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean bool) + { + list.add("It's a gamble!"); + list.add(""); + switch(MainRegistry.polaroidID) { + case 1: + list.add("Click-click-click!"); + break; + case 2: + list.add("Creek!"); + break; + case 3: + list.add("Bzzzt!"); + break; + case 4: + list.add("TS staring off into space."); + break; + case 5: + list.add("BANG!!"); + break; + case 6: + list.add("Woop!"); + break; + case 7: + list.add("Poow!"); + break; + case 8: + list.add("Pft!"); + break; + case 9: + list.add("GF fgnevat bss vagb fcnpr."); + break; + case 10: + list.add("Backup memory #8 on 1.44 million bytes."); + break; + case 11: + list.add("PTANG!"); + break; + case 12: + list.add("Bzzt-zrrt!"); + break; + case 13: + list.add("Clang, click-brrthththrtrtrtrtrtr!"); + break; + case 14: + list.add("KABLAM!"); + break; + case 15: + list.add("PLENG!"); + break; + case 16: + list.add("Wheeeeeeee-"); + break; + case 17: + list.add("Thump."); + break; + case 18: + list.add("BANG! Choo-chooo! B A N G ! ! !"); + break; + } + } + +} diff --git a/com/hbm/tileentity/machine/TileEntityMachineSPP.java b/com/hbm/tileentity/machine/TileEntityMachineSPP.java index e20dcb11d..42c8fcdf4 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineSPP.java +++ b/com/hbm/tileentity/machine/TileEntityMachineSPP.java @@ -26,8 +26,6 @@ public class TileEntityMachineSPP extends TileEntity implements ISource { @Override public void updateEntity() { - - MainRegistry.logger.debug("0"); age++; if(age >= 20) @@ -69,7 +67,7 @@ public class TileEntityMachineSPP extends TileEntity implements ISource { // BBB // BAB // BBB - System.out.println(y); + return (worldObj.getBlock(xCoord + 1, y, zCoord) != Blocks.air && worldObj.getBlock(xCoord + 1, y, zCoord + 1) != Blocks.air && worldObj.getBlock(xCoord + 1, y, zCoord - 1) != Blocks.air &&