BrassGoggledCoders
/
SteamCraft2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move vanilla engraving stuff to BU, and make SC2 engraved metals BU dependent.

dev
Arona Jones 2016-02-04 19:45:36 +00:00
parent 9c918040c1
commit 550a56c402
11 changed files with 82 additions and 403 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/main/java/steamcraft/api/block/IEngravable.java
View File

@ -1,32 +0,0 @@
/**
* This class was created by BrassGoggledCoders modding team.
* This class is available as part of the BoilerCraft Mod for Minecraft.
*
* BoilerCraft is open-source and is distributed under the MMPL v1.0 License.
* (http://www.mod-buildcraft.com/MMPL-1.0.txt)
*
*/
package steamcraft.api.block;
import net.minecraft.block.Block;
/**
* The Interface IChiselable.
*
* @author warlordjones
*/
public interface IEngravable
{
/**
*
* @return the block created when our chisel is used on this block
*/
public Block getChiseledVariant();
/**
* @return the metadata of the block created when our chisel is used on this
* block
*/
public int getChiseledVariantMeta();
}

71
src/main/java/steamcraft/common/blocks/BlockEngravedVanilla.java
View File

@ -1,71 +0,0 @@
/**
* This class was created by BrassGoggledCoders modding team.
* This class is available as part of the Steamcraft 2 Mod for Minecraft.
*
* Steamcraft 2 is open-source and is distributed under the MMPL v1.0 License.
* (http://www.mod-buildcraft.com/MMPL-1.0.txt)
*
* Steamcraft 2 is based on the original Steamcraft Mod created by Proloe.
* Steamcraft (c) Proloe 2011
* (http://www.minecraftforum.net/topic/251532-181-steamcraft-source-code-releasedmlv054wip/)
*
*/
package steamcraft.common.blocks;
import java.util.List;
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.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
import steamcraft.common.init.InitBlocks;
import steamcraft.common.lib.ModInfo;
/**
* @author Surseance
*
*/
public class BlockEngravedVanilla extends BlockEngravedSolid {
private final IIcon[] icon = new IIcon[7];
public BlockEngravedVanilla() {
super();
}
@Override
@SideOnly(Side.CLIENT)
public IIcon getIcon(final int side, final int metadata) {
if (metadata < this.icon.length)
return this.icon[metadata];
else
return this.icon[0];
}
@Override
@SideOnly(Side.CLIENT)
public void registerBlockIcons(IIconRegister ir) {
this.icon[0] = ir.registerIcon(ModInfo.PREFIX + "blockEngravedDiamond");
this.icon[1] = ir.registerIcon(ModInfo.PREFIX + "blockEngravedGold");
this.icon[2] = ir.registerIcon(ModInfo.PREFIX + "blockEngravedIron");
this.icon[3] = ir.registerIcon(ModInfo.PREFIX + "blockEngravedLapis");
this.icon[4] = ir.registerIcon(ModInfo.PREFIX + "blockEngravedStone");
this.icon[5] = ir.registerIcon(ModInfo.PREFIX + "blockEngravedEmerald");
this.icon[6] = ir.registerIcon(ModInfo.PREFIX + "blockEngravedRedstone");
}
@SuppressWarnings({ "rawtypes", "unchecked" })
@Override
@SideOnly(Side.CLIENT)
public void getSubBlocks(Item item, CreativeTabs tab, List l) {
for (int var4 = 0; var4 < this.icon.length; ++var4)
l.add(new ItemStack(InitBlocks.blockEngravedVanilla, 1, var4));
}
@Override
public int damageDropped(int meta) {
return meta;
}
}

154
src/main/java/steamcraft/common/blocks/BlockLamp.java
View File

@ -1,154 +0,0 @@
/**
* This class was created by BrassGoggledCoders modding team.
* This class is available as part of the Steamcraft 2 Mod for Minecraft.
*
* Steamcraft 2 is open-source and is distributed under the MMPL v1.0 License.
* (http://www.mod-buildcraft.com/MMPL-1.0.txt)
*
* Steamcraft 2 is based on the original Steamcraft Mod created by Proloe.
* Steamcraft (c) Proloe 2011
* (http://www.minecraftforum.net/topic/251532-181-steamcraft-source-code-releasedmlv054wip/)
*
*/
package steamcraft.common.blocks;
import java.util.Random;
import net.minecraft.block.Block;
import net.minecraft.block.BlockRedstoneLight;
import net.minecraft.client.renderer.texture.IIconRegister;
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;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import steamcraft.common.Steamcraft;
import steamcraft.common.init.InitBlocks;
import steamcraft.common.lib.ModInfo;
/**
* @author Surseance (Johnny Eatmon)
*
*/
public class BlockLamp extends BlockRedstoneLight
{
private IIcon blockIconPowered;
private final boolean powered;
public BlockLamp(boolean powered)
{
super(powered);
this.powered = powered;
this.setHardness(3.0F);
this.setResistance(10.0F);
this.setStepSound(Block.soundTypeStone);
if (!powered)
this.setCreativeTab(Steamcraft.tabSC2);
if (powered)
this.setLightLevel(0.98F);
}
@Override
@SideOnly(Side.CLIENT)
public void registerBlockIcons(IIconRegister ir)
{
this.blockIcon = ir.registerIcon(ModInfo.PREFIX + "blockLampOff");
this.blockIconPowered = ir.registerIcon(ModInfo.PREFIX + "blockLampOn");
}
@Override
@SideOnly(Side.CLIENT)
public IIcon getIcon(IBlockAccess p_149673_1_, int p_149673_2_, int p_149673_3_, int p_149673_4_, int p_149673_5_)
{
if (this.powered)
return this.blockIconPowered;
else
return this.blockIcon;
}
/**
* Called whenever the block is added into the world. Args: world, x, y, z
*/
@Override
public void onBlockAdded(World p_149726_1_, int p_149726_2_, int p_149726_3_, int p_149726_4_)
{
if (!p_149726_1_.isRemote)
{
if (this.powered && !p_149726_1_.isBlockIndirectlyGettingPowered(p_149726_2_, p_149726_3_, p_149726_4_))
{
p_149726_1_.scheduleBlockUpdate(p_149726_2_, p_149726_3_, p_149726_4_, this, 4);
}
else if (!this.powered && p_149726_1_.isBlockIndirectlyGettingPowered(p_149726_2_, p_149726_3_, p_149726_4_))
{
p_149726_1_.setBlock(p_149726_2_, p_149726_3_, p_149726_4_, InitBlocks.blockLampOn, 0, 2);
}
}
}
/**
* Lets the block know when one of its neighbor changes. Doesn't know which
* neighbor changed (coordinates passed are their own) Args: x, y, z,
* neighbor Block
*/
@Override
public void onNeighborBlockChange(World p_149695_1_, int p_149695_2_, int p_149695_3_, int p_149695_4_, Block p_149695_5_)
{
if (!p_149695_1_.isRemote)
{
if (this.powered && !p_149695_1_.isBlockIndirectlyGettingPowered(p_149695_2_, p_149695_3_, p_149695_4_))
{
p_149695_1_.scheduleBlockUpdate(p_149695_2_, p_149695_3_, p_149695_4_, this, 4);
}
else if (!this.powered && p_149695_1_.isBlockIndirectlyGettingPowered(p_149695_2_, p_149695_3_, p_149695_4_))
{
p_149695_1_.setBlock(p_149695_2_, p_149695_3_, p_149695_4_, InitBlocks.blockLampOn, 0, 2);
}
}
}
/**
* Ticks the block if it's been scheduled
*/
@Override
public void updateTick(World p_149674_1_, int p_149674_2_, int p_149674_3_, int p_149674_4_, Random p_149674_5_)
{
if (!p_149674_1_.isRemote && this.powered && !p_149674_1_.isBlockIndirectlyGettingPowered(p_149674_2_, p_149674_3_, p_149674_4_))
{
p_149674_1_.setBlock(p_149674_2_, p_149674_3_, p_149674_4_, InitBlocks.blockLamp, 0, 2);
}
}
@Override
public Item getItemDropped(int p_149650_1_, Random p_149650_2_, int p_149650_3_)
{
return Item.getItemFromBlock(InitBlocks.blockLamp);
}
/**
* Gets an item for the block being called on. Args: world, x, y, z
*/
@Override
@SideOnly(Side.CLIENT)
public Item getItem(World p_149694_1_, int p_149694_2_, int p_149694_3_, int p_149694_4_)
{
return Item.getItemFromBlock(InitBlocks.blockLamp);
}
/**
* Returns an item stack containing a single instance of the current block
* type. 'i' is the block's subtype/damage and is ignored for blocks which
* do not support subtypes. Blocks which cannot be harvested should return
* null.
*/
@Override
protected ItemStack createStackedBlock(int p_149644_1_)
{
return new ItemStack(InitBlocks.blockLamp);
}
}

4
src/main/java/steamcraft/common/blocks/BlockMetal.java
View File

@ -23,11 +23,12 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess;
import cpw.mods.fml.common.Optional;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import boilerplate.common.baseclasses.blocks.BaseMetadataBlock;
import steamcraft.api.block.IEngravable;
import brassutils.api.IEngravable;
import steamcraft.common.Steamcraft;
import steamcraft.common.init.InitBlocks;
import steamcraft.common.lib.ModInfo;
@ -36,6 +37,7 @@ import steamcraft.common.lib.ModInfo;
* @author warlordjones
*
*/
@Optional.Interface(iface = "brassutils.api.IEngravable", modid = "brassutils")
public class BlockMetal extends BaseMetadataBlock implements IEngravable
{
public IIcon[] icon = new IIcon[8];

4
src/main/java/steamcraft/common/blocks/BlockUranium.java
View File

@ -21,17 +21,19 @@ import net.minecraft.util.DamageSource;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import cpw.mods.fml.common.Optional;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import boilerplate.client.utils.EffectUtils;
import steamcraft.api.block.IEngravable;
import brassutils.api.IEngravable;
import steamcraft.common.init.InitBlocks;
/**
* @author warlordjones
*
*/
@Optional.Interface(iface = "brassutils.api.IEngravable", modid = "brassutils")
public class BlockUranium extends BaseBlock implements IEngravable
{
public BlockUranium(Material mat)

5
src/main/java/steamcraft/common/compat/CompatabilityLayer.java
View File

@ -27,6 +27,7 @@ import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.oredict.OreDictionary;
import net.minecraftforge.oredict.ShapedOreRecipe;
import boilerplate.common.baseclasses.items.BaseItemBlockWithMetadata;
import boilerplate.common.utils.helpers.IMCHelper;
import boilerplate.common.utils.helpers.OreDictHelper;
import steamcraft.common.init.InitBiomes;
@ -324,5 +325,9 @@ public class CompatabilityLayer
* 9);
*/
}
if (Loader.isModLoaded("BrassUtils"))
{
InitBlocks.registerBlock(InitBlocks.blockEngraved, BaseItemBlockWithMetadata.class, "BlockEngravedSolid", 10);
}
}
}

2
src/main/java/steamcraft/common/blocks/BlockEngravedSolid.java → src/main/java/steamcraft/common/compat/brassutils/BlockEngravedSolid.java
View File

@ -10,7 +10,7 @@
* (http://www.minecraftforum.net/topic/251532-181-steamcraft-source-code-releasedmlv054wip/)
*
*/
package steamcraft.common.blocks;
package steamcraft.common.compat.brassutils;
import java.util.List;

23
src/main/java/steamcraft/common/init/InitBlocks.java
View File

@ -49,14 +49,11 @@ import steamcraft.common.blocks.BlockCustomSlab;
import steamcraft.common.blocks.BlockCustomStairs;
import steamcraft.common.blocks.BlockCustomWall;
import steamcraft.common.blocks.BlockDynamite;
import steamcraft.common.blocks.BlockEngravedSolid;
import steamcraft.common.blocks.BlockEngravedVanilla;
import steamcraft.common.blocks.BlockFissurePortal;
import steamcraft.common.blocks.BlockHatch;
import steamcraft.common.blocks.BlockInfestedDirt;
import steamcraft.common.blocks.BlockInfestedGrass;
import steamcraft.common.blocks.BlockInvertedCastIronLamp;
import steamcraft.common.blocks.BlockLamp;
import steamcraft.common.blocks.BlockLeafPile;
import steamcraft.common.blocks.BlockLightSlate;
import steamcraft.common.blocks.BlockMeltingIce;
@ -106,6 +103,7 @@ import steamcraft.common.blocks.machines.BlockSteelPipe;
import steamcraft.common.blocks.machines.BlockSteelWire;
import steamcraft.common.blocks.machines.BlockTeslaCoil;
import steamcraft.common.blocks.machines.BlockTurbine;
import steamcraft.common.compat.brassutils.BlockEngravedSolid;
import steamcraft.common.tiles.EmptyTiles.TileCastIronLamp;
import steamcraft.common.tiles.TileArmorEditor;
import steamcraft.common.tiles.TileBloomery;
@ -172,7 +170,6 @@ public class InitBlocks
public static Block blockFlesh;
public static Block blockInfestedGrass, blockInfestedDirt;
public static Block blockLamp, blockLampOn;
public static Block blockLightningRod, blockTeslaCoil;
public static Block blockMangroveFence, blockMangroveDoor, blockMangroveSlab, blockMangroveDoubleSlab, blockMangroveStairs;
@ -265,10 +262,6 @@ public class InitBlocks
{
// Engraved Blocks
blockEngraved = new BlockEngravedSolid().setBlockName("blockEngravedSolid");
blockEngravedVanilla = new BlockEngravedVanilla().setBlockName("blockEngravedVanilla");
registerBlock(blockEngraved, BaseItemBlockWithMetadata.class, "BlockEngravedSolid", 10);
registerBlock(blockEngravedVanilla, BaseItemBlockWithMetadata.class, "BlockEngravedVanilla", 5);
// Cast Iron
blockCastIronLamp = new BlockCastIronLamp(false).setBlockName("blockCastIronLamp");
@ -291,12 +284,6 @@ public class InitBlocks
registerBlock(blockCastIronGate, "BlockCastIronGate");
registerBlock(blockCastIronRailing, "BlockCastIronRailing");
blockLamp = new BlockLamp(false).setBlockName("blockLamp");
blockLampOn = new BlockLamp(true).setBlockName("blockLamp");
registerBlock(blockLamp, "BlockLamp");
registerBlock(blockLampOn, "BlockLampOn");
blockStonebrickWall = new BlockStonebrickWall().setBlockName("blockStonebrickWall");
registerBlock(blockStonebrickWall, BaseItemBlockWithMetadata.class, "BlockStonebrickWall", 0);
blockStoneslabWall = new BlockCustomWall(Blocks.stone_slab, 0).setBlockName("blockStoneslabWall");
@ -715,11 +702,11 @@ public class InitBlocks
registerBlock(blockBrassLeaves, "BlockBrassLeaves");
}
private static String[] blacklist = new String[] { "BlockFissurePortal", "BlockLamp", "BlockMotionSensor", "BlockMotionSensorOn",
"BlockStandardSirenOn", "BlockStandardSiren", "BlockAllClearSiren", "BlockAllClearSirenOn", "BlockNuclearSiren", "BlockNuclearSirenOn",
"BlockIntruderSiren", "BlockIntruderSirenOn", "BlockCopperTank", "BlockInfestedDirt", "BlockInfestedGrass" };
private static String[] blacklist = new String[] { "BlockFissurePortal", "BlockMotionSensor", "BlockMotionSensorOn", "BlockStandardSirenOn",
"BlockStandardSiren", "BlockAllClearSiren", "BlockAllClearSirenOn", "BlockNuclearSiren", "BlockNuclearSirenOn", "BlockIntruderSiren",
"BlockIntruderSirenOn", "BlockCopperTank", "BlockInfestedDirt", "BlockInfestedGrass" };
private static void registerBlock(Block block, Class<? extends ItemBlock> itemblock, String name, int maxMeta)
public static void registerBlock(Block block, Class<? extends ItemBlock> itemblock, String name, int maxMeta)
{
if (block.isOpaqueCube() && !Arrays.asList(blacklist).contains(name) && !block.hasTileEntity(0))
FMPCompatHandler.registerMetaFMP(block, maxMeta);

101
src/main/java/steamcraft/common/init/InitItems.java
View File

@ -12,22 +12,24 @@
*/
package steamcraft.common.init;
import boilerplate.common.utils.handlers.BucketHandler;
import boilerplate.common.utils.helpers.RegistryHelper;
import cpw.mods.fml.common.registry.GameRegistry;
import net.minecraft.init.Items;
import net.minecraft.item.Item;
import net.minecraft.item.ItemArmor;
import net.minecraft.item.ItemStack;
import net.minecraft.util.StatCollector;
import cpw.mods.fml.common.registry.GameRegistry;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.fluids.FluidContainerRegistry;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;
import boilerplate.common.utils.handlers.BucketHandler;
import boilerplate.common.utils.helpers.RegistryHelper;
import steamcraft.common.Steamcraft;
import steamcraft.common.items.BaseItem;
import steamcraft.common.items.ItemCanister;
import steamcraft.common.items.ItemChisel;
import steamcraft.common.items.ItemCoin;
import steamcraft.common.items.ItemCustomBucket;
import steamcraft.common.items.ItemCustomFood;
@ -107,7 +109,8 @@ import steamcraft.common.lib.ModInfo;
* @author Surseance
*
*/
public class InitItems {
public class InitItems
{
// Tools
public static Item drillCore, drillBase, drillWood, drillStone, drillIron, drillDiamond, drillGold, drillSteam;
@ -121,7 +124,9 @@ public class InitItems {
public static Item helmetWhalebone, chestplateWhalebone, legsWhalebone, bootsWhalebone;
// Modules
public static Item itemAqualung, itemPistonPlating, itemTank, itemWatchDisplay, itemClimbingSpikes, itemLegBraces, itemSpringHeels, itemRollerSkates, itemParachute, itemFlippers, itemLifeVest, itemPistonBoots, itemSteelPlating, itemLastResort, itemGogglesModule, itemWingpackModule, itemFreezeBoots, itemSuperFreezeBoots, itemAutofeeder;
public static Item itemAqualung, itemPistonPlating, itemTank, itemWatchDisplay, itemClimbingSpikes, itemLegBraces, itemSpringHeels,
itemRollerSkates, itemParachute, itemFlippers, itemLifeVest, itemPistonBoots, itemSteelPlating, itemLastResort, itemGogglesModule,
itemWingpackModule, itemFreezeBoots, itemSuperFreezeBoots, itemAutofeeder;
public static Item itemBoilingWaterBucket, itemBoilingMudBucket;
@ -132,8 +137,6 @@ public class InitItems {
// Containers
public static Item itemCanisterSteam, itemReinforcedCanisterSteam;
public static Item itemChisel;
public static Item itemClockworkRocketLauncher, itemRocket;
// Armor
@ -193,12 +196,14 @@ public class InitItems {
public static Item itemEmptyMobBottle, itemMobBottle;
/* Init */
public static void init() {
public static void init()
{
InitMaterials.initializeMaterials();
initializeItems();
}
private static void initializeItems() {
private static void initializeItems()
{
initializeArmor();
initializeGuns();
initializeMetals();
@ -207,7 +212,8 @@ public class InitItems {
initializeTools();
}
private static void initializeArmor() {
private static void initializeArmor()
{
// Jetpacks
itemSteamJetpack = new ItemSteamJetpack(InitMaterials.ARMOR_STEAM, 0, 1, (byte) 5).setUnlocalizedName("itemSteamJetpack");
itemClockworkWings = new ItemClockworkWings(InitMaterials.ARMOR_STEAM, 0, 1).setUnlocalizedName("itemClockworkWings");
@ -242,7 +248,8 @@ public class InitItems {
RegistryHelper.registerArmorSet(helmetWhalebone, chestplateWhalebone, legsWhalebone, bootsWhalebone, "Whalebone", ModInfo.ID);
}
private static void initializeGuns() {
private static void initializeGuns()
{
// Ammo
itemMusketBall = new BaseItem().setUnlocalizedName("itemMusketBall");
itemRifleBullet = new BaseItem().setUnlocalizedName("itemRifleBullet");
@ -253,15 +260,24 @@ public class InitItems {
registerItem(itemPercussionCap, "ItemPercussionCap");
// Guns
flintlockMusket = new ItemFirearm(5, 60, itemMusketBall, null, "steamcraft:musket", "steamcraft:reload").setUnlocalizedName("itemFlintlockMusket");
matchlockMusket = new ItemFirearm(6, 40, itemMusketBall, itemMatch, "steamcraft:musket", "steamcraft:reload").setUnlocalizedName("itemMatchlockMusket");
percussionCapMusket = new ItemFirearm(7, 20, itemMusketBall, itemPercussionCap, "steamcraft:musket", "steamcraft:reload").setUnlocalizedName("itemPercussionMusket");
flintlockRifle = new ItemFirearm(8, 60, itemRifleBullet, null, "steamcraft:rifle", "steamcraft:reload").setUnlocalizedName("itemFlintlockRifle");
matchlockRifle = new ItemFirearm(9, 40, itemRifleBullet, itemMatch, "steamcraft:rifle", "steamcraft:reload").setUnlocalizedName("itemMatchlockRifle");
percussionCapRifle = new ItemFirearm(10, 20, itemRifleBullet, itemPercussionCap, "steamcraft:rifle", "steamcraft:reload").setUnlocalizedName("itemPercussionRifle");
flintlockPistol = new ItemFirearm(3, 40, itemMusketBall, null, "steamcraft:Pistol", "steamcraft:reload").setUnlocalizedName("itemFlintlockPistol");
matchlockPistol = new ItemFirearm(3, 30, itemMusketBall, itemMatch, "steamcraft:pistol", "steamcraft:reload").setUnlocalizedName("itemMatchlockPistol");
percussionCapPistol = new ItemFirearm(3, 20, itemMusketBall, itemPercussionCap, "steamcraft:pistol", "steamcraft:reload").setUnlocalizedName("itemPercussionPistol");
flintlockMusket = new ItemFirearm(5, 60, itemMusketBall, null, "steamcraft:musket", "steamcraft:reload")
.setUnlocalizedName("itemFlintlockMusket");
matchlockMusket = new ItemFirearm(6, 40, itemMusketBall, itemMatch, "steamcraft:musket", "steamcraft:reload")
.setUnlocalizedName("itemMatchlockMusket");
percussionCapMusket = new ItemFirearm(7, 20, itemMusketBall, itemPercussionCap, "steamcraft:musket", "steamcraft:reload")
.setUnlocalizedName("itemPercussionMusket");
flintlockRifle = new ItemFirearm(8, 60, itemRifleBullet, null, "steamcraft:rifle", "steamcraft:reload")
.setUnlocalizedName("itemFlintlockRifle");
matchlockRifle = new ItemFirearm(9, 40, itemRifleBullet, itemMatch, "steamcraft:rifle", "steamcraft:reload")
.setUnlocalizedName("itemMatchlockRifle");
percussionCapRifle = new ItemFirearm(10, 20, itemRifleBullet, itemPercussionCap, "steamcraft:rifle", "steamcraft:reload")
.setUnlocalizedName("itemPercussionRifle");
flintlockPistol = new ItemFirearm(3, 40, itemMusketBall, null, "steamcraft:Pistol", "steamcraft:reload")
.setUnlocalizedName("itemFlintlockPistol");
matchlockPistol = new ItemFirearm(3, 30, itemMusketBall, itemMatch, "steamcraft:pistol", "steamcraft:reload")
.setUnlocalizedName("itemMatchlockPistol");
percussionCapPistol = new ItemFirearm(3, 20, itemMusketBall, itemPercussionCap, "steamcraft:pistol", "steamcraft:reload")
.setUnlocalizedName("itemPercussionPistol");
registerItem(flintlockMusket, "ItemFlintlockMusket");
registerItem(matchlockMusket, "ItemMatchlockMusket");
@ -287,7 +303,8 @@ public class InitItems {
registerItem(itemClockworkRocketLauncher, "ItemClockworkRocketLauncher");
}
private static void initializeMetals() {
private static void initializeMetals()
{
itemIngot = new ItemIngot().setUnlocalizedName("itemIngot");
itemNugget = new ItemNugget().setUnlocalizedName("itemNugget");
itemNuggetIron = new ItemNuggetIron().setUnlocalizedName("itemNuggetIron");
@ -315,7 +332,8 @@ public class InitItems {
registerItem(itemSteelParts, "ItemSteelParts");
}
public static void initializeModCompatItems() {
public static void initializeModCompatItems()
{
/**
* Registration of these are handled in @link={CompatibilityLayer.class}
*/
@ -324,15 +342,18 @@ public class InitItems {
itemThaumicMonocle = new ItemThaumicMonocle().setUnlocalizedName("itemThaumicMonocle");
}
private static void initializeOthers() {
private static void initializeOthers()
{
// Containers
itemCanisterSteam = new ItemCanister(10000, 20).setUnlocalizedName("itemCanisterSteam");
registerItem(itemCanisterSteam, "ItemCanisterSteam");
FluidContainerRegistry.registerFluidContainer(new FluidStack(FluidRegistry.getFluid("steam"), 10000), ((ItemCanister) itemCanisterSteam).getFilledCanister(), new ItemStack(itemCanisterSteam));
FluidContainerRegistry.registerFluidContainer(new FluidStack(FluidRegistry.getFluid("steam"), 10000),
((ItemCanister) itemCanisterSteam).getFilledCanister(), new ItemStack(itemCanisterSteam));
itemReinforcedCanisterSteam = new ItemCanister(20000, 40).setUnlocalizedName("itemReinforcedCanisterSteam");
registerItem(itemReinforcedCanisterSteam, "ItemReinforcedCanisterSteam");
FluidContainerRegistry.registerFluidContainer(new FluidStack(FluidRegistry.getFluid("steam"), 20000), ((ItemCanister) itemReinforcedCanisterSteam).getFilledCanister(), new ItemStack(itemReinforcedCanisterSteam));
FluidContainerRegistry.registerFluidContainer(new FluidStack(FluidRegistry.getFluid("steam"), 20000),
((ItemCanister) itemReinforcedCanisterSteam).getFilledCanister(), new ItemStack(itemReinforcedCanisterSteam));
itemElectricJarSmall = new ElectricItem(80, 80, 40).setUnlocalizedName("itemElectricJarSmall");
itemElectricJarMedium = new ElectricItem(400, 400, 125).setUnlocalizedName("itemElectricJarMedium");
@ -358,9 +379,6 @@ public class InitItems {
registerItem(itemTeaSeed, "ItemTeaSeed");
MinecraftForge.addGrassSeed(new ItemStack(itemTeaSeed), 8);
itemChisel = new ItemChisel().setUnlocalizedName("itemChisel").setFull3D();
registerItem(itemChisel, "ItemChisel");
itemHammer = new ItemWithCraftingDurability().setUnlocalizedName("itemHammer").setFull3D();
registerItem(itemHammer, "ItemHammer");
@ -462,7 +480,9 @@ public class InitItems {
// TODO Add a version system to allow updates. Check version on right
// click
itemLoreBook = new ItemLoreBook(StatCollector.translateToLocal("lore.steamcraft2.0.author"), StatCollector.translateToLocal("lore.steamcraft2.0.title"), new String[] { StatCollector.translateToLocal("lore.steamcraft2.0.page1") }).setUnlocalizedName("itemLoreBook");
itemLoreBook = new ItemLoreBook(StatCollector.translateToLocal("lore.steamcraft2.0.author"),
StatCollector.translateToLocal("lore.steamcraft2.0.title"),
new String[] { StatCollector.translateToLocal("lore.steamcraft2.0.page1") }).setUnlocalizedName("itemLoreBook");
registerItem(itemLoreBook, "ItemLoreBook");
itemFieldManipulator = new ItemFieldManipulator().setUnlocalizedName("itemFieldManipulator");
@ -488,11 +508,16 @@ public class InitItems {
GameRegistry.registerItem(itemWhaleOilBucket, "ItemWhaleOilBucket");
GameRegistry.registerItem(itemMoltenZincBucket, "ItemMoltenZincBucket");
GameRegistry.registerItem(itemMoltenBrassBucket, "ItemMoltenBrassBucket");
FluidContainerRegistry.registerFluidContainer(FluidRegistry.getFluidStack("boilingwater", FluidContainerRegistry.BUCKET_VOLUME), new ItemStack(itemBoilingWaterBucket), new ItemStack(Items.bucket));
FluidContainerRegistry.registerFluidContainer(FluidRegistry.getFluidStack("boilingmud", FluidContainerRegistry.BUCKET_VOLUME), new ItemStack(itemBoilingMudBucket), new ItemStack(Items.bucket));
FluidContainerRegistry.registerFluidContainer(FluidRegistry.getFluidStack("whaleoil", FluidContainerRegistry.BUCKET_VOLUME), new ItemStack(itemWhaleOilBucket), new ItemStack(Items.bucket));
FluidContainerRegistry.registerFluidContainer(FluidRegistry.getFluidStack("moltenzinc", FluidContainerRegistry.BUCKET_VOLUME), new ItemStack(itemMoltenZincBucket), new ItemStack(Items.bucket));
FluidContainerRegistry.registerFluidContainer(FluidRegistry.getFluidStack("moltenbrass", FluidContainerRegistry.BUCKET_VOLUME), new ItemStack(itemMoltenBrassBucket), new ItemStack(Items.bucket));
FluidContainerRegistry.registerFluidContainer(FluidRegistry.getFluidStack("boilingwater", FluidContainerRegistry.BUCKET_VOLUME),
new ItemStack(itemBoilingWaterBucket), new ItemStack(Items.bucket));
FluidContainerRegistry.registerFluidContainer(FluidRegistry.getFluidStack("boilingmud", FluidContainerRegistry.BUCKET_VOLUME),
new ItemStack(itemBoilingMudBucket), new ItemStack(Items.bucket));
FluidContainerRegistry.registerFluidContainer(FluidRegistry.getFluidStack("whaleoil", FluidContainerRegistry.BUCKET_VOLUME),
new ItemStack(itemWhaleOilBucket), new ItemStack(Items.bucket));
FluidContainerRegistry.registerFluidContainer(FluidRegistry.getFluidStack("moltenzinc", FluidContainerRegistry.BUCKET_VOLUME),
new ItemStack(itemMoltenZincBucket), new ItemStack(Items.bucket));
FluidContainerRegistry.registerFluidContainer(FluidRegistry.getFluidStack("moltenbrass", FluidContainerRegistry.BUCKET_VOLUME),
new ItemStack(itemMoltenBrassBucket), new ItemStack(Items.bucket));
BucketHandler.getInstance().bucketMap.put(InitBlocks.blockBoilingWater, itemBoilingWaterBucket);
BucketHandler.getInstance().bucketMap.put(InitBlocks.blockBoilingMud, itemBoilingMudBucket);
BucketHandler.getInstance().bucketMap.put(InitBlocks.blockWhaleOil, itemWhaleOilBucket);
@ -534,7 +559,8 @@ public class InitItems {
// registerItem(itemMobBottle, "ItemMobBottle");
}
private static void initializeTools() {
private static void initializeTools()
{
// Drills
drillCore = new BaseItem().setUnlocalizedName("itemDrillCore");
drillBase = new BaseItem().setUnlocalizedName("itemDrillBase");
@ -569,7 +595,8 @@ public class InitItems {
registerItem(itemElectricSword, "ItemElectricSword");
}
private static void registerItem(Item item, String name) {
private static void registerItem(Item item, String name)
{
// TODO if(ConfigGeneral.nameBlacklist != null &&
// !ConfigGeneral.nameBlacklist.contains(item.getUnlocalizedName()))
GameRegistry.registerItem(item, name, ModInfo.ID);

3
src/main/java/steamcraft/common/init/InitRecipes.java
View File

@ -59,7 +59,7 @@ public class InitRecipes
// Gun Parts
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemGunPart, 1, 0), "WWW", " WW", 'W', "plankWood"));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemGunPart, 1, 1), "III", " ", "III", 'I', "ingotIron"));
GameRegistry.addShapelessRecipe(new ItemStack(InitItems.itemGunPart, 1, 2), new ItemStack(InitItems.itemGunPart, 1, 1), InitItems.itemChisel);
GameRegistry.addShapelessRecipe(new ItemStack(InitItems.itemGunPart, 1, 2), new ItemStack(InitItems.itemGunPart, 1, 1), Items.flint);
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemGunPart, 1, 3), " I", " II", 'I', "ingotIron"));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemGunPart, 1, 4), "III", " II", 'I', "ingotBrass"));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemGunPart, 1, 5), " II", " II", " I", 'I', "ingotCastIron"));
@ -539,7 +539,6 @@ public class InitRecipes
InitBlocks.blockBrickBlueSlateStairs, InitBlocks.blockBrickBlackSlateStairs, InitBlocks.blockBrickRedSlateStairs };
for (int i = 0; i < 9; i++)
GameRegistry.addRecipe(new ItemStack(stairs[i], 4), "X ", "XX ", "XXX", 'X', new ItemStack(InitBlocks.blockSlate, 1, i));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemChisel), " I", " S", 'I', "ingotIron", 'S', "stickWood"));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemWatch), "SPS", "PMP", "SPS", 'P', "paneGlass", 'M',
"partClockworkMechanism", 'S', "plateBrass"));

86
src/main/java/steamcraft/common/items/ItemChisel.java
View File

@ -1,86 +0,0 @@
/**
* This class was created by BrassGoggledCoders modding team.
* This class is available as part of the Steamcraft 2 Mod for Minecraft.
*
* Steamcraft 2 is open-source and is distributed under the MMPL v1.0 License.
* (http://www.mod-buildcraft.com/MMPL-1.0.txt)
*
* Steamcraft 2 is based on the original Steamcraft Mod created by Proloe.
* Steamcraft (c) Proloe 2011
* (http://www.minecraftforum.net/topic/251532-181-steamcraft-source-code-releasedmlv054wip/)
*
*/
package steamcraft.common.items;
import java.util.Random;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.Block;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Blocks;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
import steamcraft.api.block.IEngravable;
import steamcraft.common.init.InitBlocks;
import steamcraft.common.lib.ModInfo;
/**
* @author Surseance
*
*/
public class ItemChisel extends BaseItem {
@Override
@SideOnly(Side.CLIENT)
public void registerIcons(IIconRegister ir) {
this.itemIcon = ir.registerIcon(ModInfo.PREFIX + "itemChisel");
}
public ItemChisel() {
this.setMaxStackSize(1);
this.setMaxDamage(20);
}
@Override
public boolean onItemUse(ItemStack is, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) {
Block block = world.getBlock(x, y, z);
if (block == Blocks.diamond_block) {
world.setBlock(x, y, z, InitBlocks.blockEngravedVanilla, 0, 2);
} else if (block == Blocks.gold_block) {
world.setBlock(x, y, z, InitBlocks.blockEngravedVanilla, 1, 2);
} else if (block == Blocks.iron_block) {
world.setBlock(x, y, z, InitBlocks.blockEngravedVanilla, 2, 2);
} else if (block == Blocks.lapis_block) {
world.setBlock(x, y, z, InitBlocks.blockEngravedVanilla, 3, 2);
} else if (block == Blocks.stone) {
world.setBlock(x, y, z, InitBlocks.blockEngravedVanilla, 4, 2);
} else if (block == Blocks.emerald_block) {
world.setBlock(x, y, z, InitBlocks.blockEngravedVanilla, 5, 2);
} else if (block == Blocks.redstone_block) {
world.setBlock(x, y, z, InitBlocks.blockEngravedVanilla, 6, 2);
} else if (block == Blocks.quartz_block) {
world.setBlock(x, y, z, Blocks.quartz_block, 1, 2);
} else if (block == Blocks.redstone_lamp) {
world.setBlock(x, y, z, InitBlocks.blockLamp, 0, 2);
} else if (block == Blocks.lit_redstone_lamp) {
world.setBlock(x, y, z, InitBlocks.blockLampOn, 0, 2);
} else if (block instanceof IEngravable)
{
Block newBlock = ((IEngravable) block).getChiseledVariant();
int meta = ((IEngravable) block).getChiseledVariantMeta();
if (meta == -1)
world.setBlock(x, y, z, newBlock, world.getBlockMetadata(x, y, z), 2);
else
world.setBlock(x, y, z, newBlock, meta, 2);
}
Random random = world.rand;
world.spawnParticle("smoke", x, y, z, 0, random.nextInt(3), 0);
is.damageItem(1, player);
return true;
}
}