From 3465c5723075bbf6ece3c98239230155faad958f Mon Sep 17 00:00:00 2001 From: bspkrs Date: Sat, 14 Dec 2013 17:59:11 -0500 Subject: maybe finished with model/render code for Briefcase Speakers --- .../briefcasespeakers/block/BlockSmelter.java | 25 ++++++++++++---------- 1 file changed, 14 insertions(+), 11 deletions(-) (limited to 'common/bspkrs/briefcasespeakers/block') diff --git a/common/bspkrs/briefcasespeakers/block/BlockSmelter.java b/common/bspkrs/briefcasespeakers/block/BlockSmelter.java index 6ad80d5..153949f 100644 --- a/common/bspkrs/briefcasespeakers/block/BlockSmelter.java +++ b/common/bspkrs/briefcasespeakers/block/BlockSmelter.java @@ -1,12 +1,12 @@ package bspkrs.briefcasespeakers.block; -import bspkrs.briefcasespeakers.tileentity.TileEntitySmelter; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; +import bspkrs.briefcasespeakers.tileentity.TileEntitySmelter; public class BlockSmelter extends BlockContainer { @@ -30,26 +30,29 @@ public class BlockSmelter extends BlockContainer @Override public boolean onBlockActivated(World world, int i, int j, int k, EntityPlayer entityPlayer, int par6, float par7, float par8, float par9) { - TileEntitySmelter te = (TileEntitySmelter)world.getBlockTileEntity(i, j, k); + TileEntitySmelter te = (TileEntitySmelter) world.getBlockTileEntity(i, j, k); ItemStack item = entityPlayer.inventory.getCurrentItem(); - if(te != null && !world.isRemote) + if (te != null && !world.isRemote) { - if(!te.hasMetal && !te.hasMoltenMetal && item != null && item.getDisplayName().contains("Ingot")) + if (!te.hasMetal && !te.hasMoltenMetal && item != null && item.getDisplayName().contains("Ingot")) { te.metalID = item.getItem().itemID; te.hasMetal = true; te.melting = 200000; --item.stackSize; } - else if(te.hasMetal && !te.hasMoltenMetal && item != null && item.getDisplayName().contains("Ingot")) entityPlayer.addChatMessage("The Smelter already contains a " + new ItemStack(te.metalID, 1, 0).getDisplayName()); - else if(te.hasMoltenMetal && item != null && item.getDisplayName().contains("Ingot")) entityPlayer.addChatMessage("The Smelter contains molten " + new ItemStack(te.moltenMetalID, 1, 0).getDisplayName().toLowerCase().replace("ingot", "")); - else if(item != null && !item.getDisplayName().contains("Ingot")) entityPlayer.addChatMessage("The item needs to be an ingot!"); + else if (te.hasMetal && !te.hasMoltenMetal && item != null && item.getDisplayName().contains("Ingot")) + entityPlayer.addChatMessage("The Smelter already contains a " + new ItemStack(te.metalID, 1, 0).getDisplayName()); + else if (te.hasMoltenMetal && item != null && item.getDisplayName().contains("Ingot")) + entityPlayer.addChatMessage("The Smelter contains molten " + new ItemStack(te.moltenMetalID, 1, 0).getDisplayName().toLowerCase().replace("ingot", "")); + else if (item != null && !item.getDisplayName().contains("Ingot")) + entityPlayer.addChatMessage("The item needs to be an ingot!"); - if(te.hasMetal && entityPlayer.isSneaking()) - { - entityPlayer.dropPlayerItem(new ItemStack(te.metalID, 1, 0)); + if (te.hasMetal && entityPlayer.isSneaking()) + { + entityPlayer.dropPlayerItem(new ItemStack(te.metalID, 1, 0)); te.hasMetal = false; - } + } world.setBlockTileEntity(i, j, k, te); } return true; -- cgit v1.2.3 From 943f1a493b27c630e95730b385e6524643d98564 Mon Sep 17 00:00:00 2001 From: bspkrs Date: Sat, 14 Dec 2013 20:51:01 -0500 Subject: changed mod back to being Jewelrycraft and removed all Briefcase Speakers code Let's face it, they don't belong together in the same mod... I'll still help you with the SMP compatibility like you originally asked me to, but I'd rather keep my mod idea for another day instead of have it be part of a mod that I'm not really that interested in. Let me know when your code is far enough that you're ready for SMP stuff. --- .../bspkrs/briefcasespeakers/block/BlockBase.java | 19 ------- .../block/BlockBriefcaseSpeakers.java | 27 ---------- .../bspkrs/briefcasespeakers/block/BlockList.java | 37 ------------- .../briefcasespeakers/block/BlockMolder.java | 27 ---------- .../briefcasespeakers/block/BlockSmelter.java | 60 ---------------------- 5 files changed, 170 deletions(-) delete mode 100644 common/bspkrs/briefcasespeakers/block/BlockBase.java delete mode 100644 common/bspkrs/briefcasespeakers/block/BlockBriefcaseSpeakers.java delete mode 100644 common/bspkrs/briefcasespeakers/block/BlockList.java delete mode 100644 common/bspkrs/briefcasespeakers/block/BlockMolder.java delete mode 100644 common/bspkrs/briefcasespeakers/block/BlockSmelter.java (limited to 'common/bspkrs/briefcasespeakers/block') diff --git a/common/bspkrs/briefcasespeakers/block/BlockBase.java b/common/bspkrs/briefcasespeakers/block/BlockBase.java deleted file mode 100644 index a895483..0000000 --- a/common/bspkrs/briefcasespeakers/block/BlockBase.java +++ /dev/null @@ -1,19 +0,0 @@ -package bspkrs.briefcasespeakers.block; - -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; - -public class BlockBase extends Block -{ - public BlockBase(int par1, Material mat) - { - super(par1, mat); - } - - @Override - public Block setUnlocalizedName(String name) - { - Block r = super.setUnlocalizedName(name); - return r.setTextureName(name.replaceAll("\\.", ":")); - } -} diff --git a/common/bspkrs/briefcasespeakers/block/BlockBriefcaseSpeakers.java b/common/bspkrs/briefcasespeakers/block/BlockBriefcaseSpeakers.java deleted file mode 100644 index 36819ea..0000000 --- a/common/bspkrs/briefcasespeakers/block/BlockBriefcaseSpeakers.java +++ /dev/null @@ -1,27 +0,0 @@ -package bspkrs.briefcasespeakers.block; - -import net.minecraft.block.BlockContainer; -import net.minecraft.block.material.Material; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; -import bspkrs.briefcasespeakers.tileentity.TileEntityBriefcaseSpeakers; - -public class BlockBriefcaseSpeakers extends BlockContainer -{ - protected BlockBriefcaseSpeakers(int par1, Material par2Material) - { - super(par1, par2Material); - } - - @Override - public TileEntity createNewTileEntity(World world) - { - return new TileEntityBriefcaseSpeakers(); - } - - @Override - public boolean renderAsNormalBlock() - { - return false; - } -} diff --git a/common/bspkrs/briefcasespeakers/block/BlockList.java b/common/bspkrs/briefcasespeakers/block/BlockList.java deleted file mode 100644 index 282134f..0000000 --- a/common/bspkrs/briefcasespeakers/block/BlockList.java +++ /dev/null @@ -1,37 +0,0 @@ -package bspkrs.briefcasespeakers.block; - -import bspkrs.briefcasespeakers.BriefcaseSpeakersMod; -import bspkrs.briefcasespeakers.config.ConfigHandler; -import bspkrs.briefcasespeakers.tileentity.TileEntitySmelter; -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import cpw.mods.fml.common.event.FMLPreInitializationEvent; -import cpw.mods.fml.common.registry.GameRegistry; - -public class BlockList -{ - public static Block shadowOre; - public static Block smelter; - public static Block molder; - public static Block jewelCraftingTable; - - private static boolean isInitialized = false; - - public static void preInit(FMLPreInitializationEvent e) - { - if (!isInitialized) - { - shadowOre = new BlockBase(ConfigHandler.idShadowOre, Material.rock).setHardness(3.0F).setResistance(5.0F).setStepSound(Block.soundStoneFootstep).setUnlocalizedName("briefcasespeakers.oreShadow").setCreativeTab(BriefcaseSpeakersMod.shadowspkrs); - smelter = new BlockSmelter(ConfigHandler.idSmelter, Material.iron).setHardness(5.0F).setResistance(6.0F).setStepSound(Block.soundMetalFootstep).setUnlocalizedName("briefcasespeakers.smelter").setCreativeTab(BriefcaseSpeakersMod.shadowspkrs); - molder = new BlockMolder(ConfigHandler.idMolder, Material.iron).setHardness(5.0F).setResistance(6.0F).setStepSound(Block.soundMetalFootstep).setUnlocalizedName("briefcasespeakers.molder").setCreativeTab(BriefcaseSpeakersMod.shadowspkrs); - jewelCraftingTable = new BlockBase(ConfigHandler.idJewelCraftingTable, Material.rock).setHardness(3.0F).setResistance(5.0F).setStepSound(Block.soundStoneFootstep).setUnlocalizedName("briefcasespeakers.jewelCraftingTable").setCreativeTab(BriefcaseSpeakersMod.shadowspkrs); - - GameRegistry.registerBlock(shadowOre, "shadowOre"); - GameRegistry.registerBlock(smelter, "Smelter"); - GameRegistry.registerBlock(molder, "Molder"); - GameRegistry.registerBlock(jewelCraftingTable, "jewelCraftingTable"); - - GameRegistry.registerTileEntity(TileEntitySmelter.class, "30"); - } - } -} diff --git a/common/bspkrs/briefcasespeakers/block/BlockMolder.java b/common/bspkrs/briefcasespeakers/block/BlockMolder.java deleted file mode 100644 index a4e4337..0000000 --- a/common/bspkrs/briefcasespeakers/block/BlockMolder.java +++ /dev/null @@ -1,27 +0,0 @@ -package bspkrs.briefcasespeakers.block; - -import bspkrs.briefcasespeakers.tileentity.TileEntityMolder; -import net.minecraft.block.BlockContainer; -import net.minecraft.block.material.Material; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; - -public class BlockMolder extends BlockContainer -{ - protected BlockMolder(int par1, Material par2Material) - { - super(par1, par2Material); - } - - @Override - public TileEntity createNewTileEntity(World world) - { - return new TileEntityMolder(); - } - - @Override - public boolean renderAsNormalBlock() - { - return false; - } -} diff --git a/common/bspkrs/briefcasespeakers/block/BlockSmelter.java b/common/bspkrs/briefcasespeakers/block/BlockSmelter.java deleted file mode 100644 index 153949f..0000000 --- a/common/bspkrs/briefcasespeakers/block/BlockSmelter.java +++ /dev/null @@ -1,60 +0,0 @@ -package bspkrs.briefcasespeakers.block; - -import net.minecraft.block.BlockContainer; -import net.minecraft.block.material.Material; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; -import bspkrs.briefcasespeakers.tileentity.TileEntitySmelter; - -public class BlockSmelter extends BlockContainer -{ - protected BlockSmelter(int par1, Material par2Material) - { - super(par1, par2Material); - } - - @Override - public TileEntity createNewTileEntity(World world) - { - return new TileEntitySmelter(); - } - - @Override - public boolean renderAsNormalBlock() - { - return false; - } - - @Override - public boolean onBlockActivated(World world, int i, int j, int k, EntityPlayer entityPlayer, int par6, float par7, float par8, float par9) - { - TileEntitySmelter te = (TileEntitySmelter) world.getBlockTileEntity(i, j, k); - ItemStack item = entityPlayer.inventory.getCurrentItem(); - if (te != null && !world.isRemote) - { - if (!te.hasMetal && !te.hasMoltenMetal && item != null && item.getDisplayName().contains("Ingot")) - { - te.metalID = item.getItem().itemID; - te.hasMetal = true; - te.melting = 200000; - --item.stackSize; - } - else if (te.hasMetal && !te.hasMoltenMetal && item != null && item.getDisplayName().contains("Ingot")) - entityPlayer.addChatMessage("The Smelter already contains a " + new ItemStack(te.metalID, 1, 0).getDisplayName()); - else if (te.hasMoltenMetal && item != null && item.getDisplayName().contains("Ingot")) - entityPlayer.addChatMessage("The Smelter contains molten " + new ItemStack(te.moltenMetalID, 1, 0).getDisplayName().toLowerCase().replace("ingot", "")); - else if (item != null && !item.getDisplayName().contains("Ingot")) - entityPlayer.addChatMessage("The item needs to be an ingot!"); - - if (te.hasMetal && entityPlayer.isSneaking()) - { - entityPlayer.dropPlayerItem(new ItemStack(te.metalID, 1, 0)); - te.hasMetal = false; - } - world.setBlockTileEntity(i, j, k, te); - } - return true; - } -} -- cgit v1.2.3