Use IModInfo

dev
Arona Jones 2016-02-06 23:42:13 +00:00
parent e9fb6cc6e9
commit 8a1b96eb49
9 changed files with 73 additions and 247 deletions

View File

@ -28,6 +28,7 @@ import net.minecraftforge.common.MinecraftForge;
import boilerplate.client.GuiHandler;
import boilerplate.common.IBoilerplateMod;
import boilerplate.common.IModInfo;
import boilerplate.common.compathandler.FMPCompatHandler;
import boilerplate.common.utils.handlers.BucketHandler;
import steamcraft.common.compat.CompatabilityLayer;
@ -207,9 +208,9 @@ public class Steamcraft implements IBoilerplateMod
}
@Override
public String getModID()
public IModInfo getModInfo()
{
return ModInfo.ID;
return new ModInfo();
}
@Override
@ -217,4 +218,10 @@ public class Steamcraft implements IBoilerplateMod
{
return instance;
}
@Override
public CreativeTabs getCreativeTab()
{
return Steamcraft.tabSC2;
}
}

View File

@ -5,6 +5,7 @@ import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.world.IBlockAccess;
import boilerplate.common.baseclasses.blocks.BlockCustomFence;
import steamcraft.common.Steamcraft;
import steamcraft.common.init.InitBlocks;
@ -16,7 +17,7 @@ public class BlockCastIronFence extends BlockCustomFence
{
public BlockCastIronFence()
{
super("metal/blockCastIron", Material.iron);
super("metal/blockCastIron", Material.iron, Steamcraft.instance);
this.setHardness(4.5F);
this.setResistance(20.0F);
this.setStepSound(Block.soundTypeMetal);

View File

@ -1,22 +0,0 @@
package steamcraft.common.blocks;
import net.minecraft.block.BlockDoor;
import net.minecraft.block.material.Material;
import steamcraft.common.Steamcraft;
import steamcraft.common.lib.ModInfo;
/**
* @author warlordjones
*
*/
public class BlockCustomDoor extends BlockDoor
{
public BlockCustomDoor(String type)
{
super(Material.wood);
this.setBlockTextureName(ModInfo.PREFIX + "block" + type + "Door");
this.setCreativeTab(Steamcraft.tabSC2);
}
}

View File

@ -1,59 +0,0 @@
package steamcraft.common.blocks;
import java.util.Random;
import net.minecraft.block.Block;
import net.minecraft.block.BlockSlab;
import net.minecraft.block.material.Material;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.World;
import steamcraft.common.lib.ModInfo;
/**
* @author warlordjones
*
*/
public class BlockCustomDoubleSlab extends BlockSlab
{
String type;
Block block;
Block singleslab;
public BlockCustomDoubleSlab(String type, Block block, Material mat, Block singleslab)
{
super(true, mat);
this.type = type;
this.block = block;
this.singleslab = singleslab;
this.useNeighborBrightness = true;
}
@Override
public String func_150002_b(int p_150002_1_)
{
return ModInfo.PREFIX + this.type;
}
@Override
public IIcon getIcon(int side, int meta)
{
return this.block.getIcon(side, meta);
}
@Override
public Item getItemDropped(int metadata, Random random, int fortune)
{
return Item.getItemFromBlock(this.singleslab);
}
@Override
public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z)
{
return new ItemStack(this.singleslab, 1, world.getBlockMetadata(x, y, z));
}
}

View File

@ -1,21 +0,0 @@
package steamcraft.common.blocks;
import net.minecraft.block.BlockFence;
import net.minecraft.block.material.Material;
import steamcraft.common.Steamcraft;
import steamcraft.common.lib.ModInfo;
/**
* @author warlordjones
*
*/
public class BlockCustomFence extends BlockFence
{
public BlockCustomFence(String type, Material mat)
{
super(ModInfo.PREFIX + type, mat);
this.setCreativeTab(Steamcraft.tabSC2);
}
}

View File

@ -1,59 +0,0 @@
package steamcraft.common.blocks;
import net.minecraft.block.BlockLeaves;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.util.IIcon;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import steamcraft.common.Steamcraft;
import steamcraft.common.lib.ModInfo;
/**
* @author warlordjones
*
*/
public class BlockCustomLeaves extends BlockLeaves
{
String type;
public BlockCustomLeaves(String type)
{
super();
this.type = type;
this.setCreativeTab(Steamcraft.tabSC2);
}
@Override
@SideOnly(Side.CLIENT)
public void registerBlockIcons(final IIconRegister ir)
{
this.blockIcon = ir.registerIcon(ModInfo.PREFIX + "block" + this.type + "Leaves");
}
@Override
public IIcon getIcon(int p_149691_1_, int p_149691_2_)
{
return this.blockIcon;
}
@Override
public String[] func_150125_e()
{
return new String[] { this.type };
}
@Override
public boolean isOpaqueCube()
{
return false;
}
@Override
public boolean renderAsNormalBlock()
{
return false;
}
}

View File

@ -1,53 +0,0 @@
package steamcraft.common.blocks;
import net.minecraft.block.BlockLog;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.util.IIcon;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import steamcraft.common.Steamcraft;
import steamcraft.common.lib.ModInfo;
/**
* @author warlordjones
*
*/
public class BlockCustomLog extends BlockLog
{
@SideOnly(Side.CLIENT)
private IIcon iconTop;
String type;
public BlockCustomLog(String type)
{
super();
this.type = type;
this.setCreativeTab(Steamcraft.tabSC2);
}
@Override
@SideOnly(Side.CLIENT)
protected IIcon getSideIcon(int p_150163_1_)
{
return this.blockIcon;
}
@Override
@SideOnly(Side.CLIENT)
protected IIcon getTopIcon(int p_150161_1_)
{
return this.iconTop;
}
@Override
@SideOnly(Side.CLIENT)
public void registerBlockIcons(final IIconRegister ir)
{
this.blockIcon = ir.registerIcon(ModInfo.PREFIX + "block" + this.type + "LogSide");
this.iconTop = ir.registerIcon(ModInfo.PREFIX + "block" + this.type + "LogTop");
}
}

View File

@ -13,6 +13,10 @@ import cpw.mods.fml.common.registry.GameRegistry;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidRegistry;
import boilerplate.common.baseclasses.blocks.BlockCustomDoubleSlab;
import boilerplate.common.baseclasses.blocks.BlockCustomFence;
import boilerplate.common.baseclasses.blocks.BlockCustomLeaves;
import boilerplate.common.baseclasses.blocks.BlockCustomLog;
import boilerplate.common.baseclasses.items.BaseItemBlockWithMetadata;
import boilerplate.common.compathandler.FMPCompatHandler;
import boilerplate.common.utils.helpers.RegistryHelper;
@ -29,10 +33,6 @@ import steamcraft.common.blocks.BlockCastIronLamp;
import steamcraft.common.blocks.BlockCastIronRailing;
import steamcraft.common.blocks.BlockCompressedStone;
import steamcraft.common.blocks.BlockCongealedSlime;
import steamcraft.common.blocks.BlockCustomDoubleSlab;
import steamcraft.common.blocks.BlockCustomFence;
import steamcraft.common.blocks.BlockCustomLeaves;
import steamcraft.common.blocks.BlockCustomLog;
import steamcraft.common.blocks.BlockCustomMushroom;
import steamcraft.common.blocks.BlockCustomSlab;
import steamcraft.common.blocks.BlockCustomStairs;
@ -542,52 +542,52 @@ public class InitBlocks
blockPolishedPlanks = new BlockPolishedPlanks().setBlockName("blockPolishedPlanks");
registerBlock(blockPolishedPlanks, BaseItemBlockWithMetadata.class, "BlockPolishedPlanks", 3);
blockRedwoodLog = new BlockCustomLog("Redwood").setBlockName("blockRedwoodLog");
blockRedwoodLog = new BlockCustomLog("Redwood", Steamcraft.instance).setBlockName("blockRedwoodLog");
registerBlock(blockRedwoodLog, "BlockRedwoodLog");
blockRedwoodLeaves = new BlockCustomLeaves("Redwood").setBlockName("blockRedwoodLeaves");
blockRedwoodLeaves = new BlockCustomLeaves("Redwood", Steamcraft.instance).setBlockName("blockRedwoodLeaves");
registerBlock(blockRedwoodLeaves, "BlockRedwoodLeaves");
blockRedwoodPlanks = new BaseBlock(Material.wood).setBlockName("blockRedwoodPlanks");
registerBlock(blockRedwoodPlanks, "BlockRedwoodPlanks");
blockMangroveLog = new BlockCustomLog("Mangrove").setBlockName("blockMangroveLog");
blockMangroveLog = new BlockCustomLog("Mangrove", Steamcraft.instance).setBlockName("blockMangroveLog");
registerBlock(blockMangroveLog, "BlockMangroveLog");
blockMangroveLeaves = new BlockCustomLeaves("Mangrove").setBlockName("blockMangroveLeaves");
blockMangroveLeaves = new BlockCustomLeaves("Mangrove", Steamcraft.instance).setBlockName("blockMangroveLeaves");
registerBlock(blockMangroveLeaves, "BlockMangroveLeaves");
blockMangrovePlanks = new BaseBlock(Material.wood).setBlockName("blockMangrovePlanks");
registerBlock(blockMangrovePlanks, "BlockMangrovePlanks");
blockWillowLog = new BlockCustomLog("Willow").setBlockName("blockWillowLog");
blockWillowLog = new BlockCustomLog("Willow", Steamcraft.instance).setBlockName("blockWillowLog");
registerBlock(blockWillowLog, "BlockWillowLog");
blockWillowLeaves = new BlockCustomLeaves("Willow").setBlockName("blockWillowLeaves");
blockWillowLeaves = new BlockCustomLeaves("Willow", Steamcraft.instance).setBlockName("blockWillowLeaves");
registerBlock(blockWillowLeaves, "BlockWillowLeaves");
blockWillowPlanks = new BaseBlock(Material.wood).setBlockName("blockWillowPlanks");
registerBlock(blockWillowPlanks, "BlockWillowPlanks");
blockPetrifiedLog = new BlockCustomLog("Petrified").setBlockName("blockPetrifiedLog");
blockPetrifiedLog = new BlockCustomLog("Petrified", Steamcraft.instance).setBlockName("blockPetrifiedLog");
registerBlock(blockPetrifiedLog, "BlockPetrifiedLog");
blockDeadLeaves = new BlockCustomLeaves("Dead").setBlockName("blockDeadLeaves");
blockDeadLeaves = new BlockCustomLeaves("Dead", Steamcraft.instance).setBlockName("blockDeadLeaves");
registerBlock(blockDeadLeaves, "BlockDeadLeaves");
blockPetrifiedPlanks = new BaseBlock(Material.wood).setBlockName("blockPetrifiedPlanks");
registerBlock(blockPetrifiedPlanks, "BlockPetrifiedPlanks");
blockRedwoodFence = new BlockCustomFence("blockRedwoodPlanks", Material.wood).setBlockName("blockRedwoodFence");
blockRedwoodFence = new BlockCustomFence("blockRedwoodPlanks", Material.wood, Steamcraft.instance).setBlockName("blockRedwoodFence");
registerBlock(blockRedwoodFence, "BlockRedwoodFence");
blockMangroveFence = new BlockCustomFence("blockMangrovePlanks", Material.wood).setBlockName("blockMangroveFence");
blockMangroveFence = new BlockCustomFence("blockMangrovePlanks", Material.wood, Steamcraft.instance).setBlockName("blockMangroveFence");
registerBlock(blockMangroveFence, "blockMangroveFence");
blockWillowFence = new BlockCustomFence("blockWillowPlanks", Material.wood).setBlockName("blockWillowFence");
blockWillowFence = new BlockCustomFence("blockWillowPlanks", Material.wood, Steamcraft.instance).setBlockName("blockWillowFence");
registerBlock(blockWillowFence, "blockWillowFence");
blockPetrifiedFence = new BlockCustomFence("blockPetrifiedPlanks", Material.wood).setBlockName("blockPetrifiedFence");
blockPetrifiedFence = new BlockCustomFence("blockPetrifiedPlanks", Material.wood, Steamcraft.instance).setBlockName("blockPetrifiedFence");
registerBlock(blockPetrifiedFence, "blockPetrifiedFence");
blockRedwoodStairs = new BlockCustomStairs(blockRedwoodPlanks).setBlockName("blockRedwoodStairs");
@ -614,20 +614,20 @@ public class InitBlocks
blockPetrifiedSlab = new BlockCustomSlab("blockPetrifiedPlanks", blockPetrifiedPlanks, Material.wood).setBlockName("blockPetrifiedSlab");
registerBlock(blockPetrifiedSlab, "blockPetrifiedSlab");
blockRedwoodDoubleSlab = new BlockCustomDoubleSlab("blockRedwoodPlanks", blockRedwoodPlanks, Material.wood, blockRedwoodSlab)
.setBlockName("blockRedwoodDoubleSlab");
blockRedwoodDoubleSlab = new BlockCustomDoubleSlab("blockRedwoodPlanks", blockRedwoodPlanks, Material.wood, blockRedwoodSlab,
Steamcraft.instance).setBlockName("blockRedwoodDoubleSlab");
// registerBlock(blockRedwoodDoubleSlab, "BlockRedwoodDoubleSlab");
blockMangroveDoubleSlab = new BlockCustomDoubleSlab("blockMangrovePlanks", blockMangrovePlanks, Material.wood, blockMangroveSlab)
.setBlockName("blockMangroveDoubleSlab");
blockMangroveDoubleSlab = new BlockCustomDoubleSlab("blockMangrovePlanks", blockMangrovePlanks, Material.wood, blockMangroveSlab,
Steamcraft.instance).setBlockName("blockMangroveDoubleSlab");
// registerBlock(blockMangroveDoubleSlab, "blockMangroveDoubleSlab");
blockWillowDoubleSlab = new BlockCustomDoubleSlab("blockWillowPlanks", blockWillowPlanks, Material.wood, blockWillowSlab)
blockWillowDoubleSlab = new BlockCustomDoubleSlab("blockWillowPlanks", blockWillowPlanks, Material.wood, blockWillowSlab, Steamcraft.instance)
.setBlockName("blockWillowDoubleSlab");
// registerBlock(blockWillowDoubleSlab, "blockWillowDoubleSlab");
blockPetrifiedDoubleSlab = new BlockCustomDoubleSlab("blockPetrifiedPlanks", blockPetrifiedPlanks, Material.wood, blockPetrifiedSlab)
.setBlockName("blockPetrifiedDoubleSlab");
blockPetrifiedDoubleSlab = new BlockCustomDoubleSlab("blockPetrifiedPlanks", blockPetrifiedPlanks, Material.wood, blockPetrifiedSlab,
Steamcraft.instance).setBlockName("blockPetrifiedDoubleSlab");
// registerBlock(blockPetrifiedDoubleSlab, "blockPetrifiedDoubleSlab");
blockMud = new BlockMud(Material.ground).setBlockName("blockMud");

View File

@ -1,13 +1,9 @@
package steamcraft.common.lib;
/**
* A neat, tidy class for holding various bits of mod information.
*
* @author Surseance
*
*/
public class ModInfo
import boilerplate.common.IModInfo;
public class ModInfo implements IModInfo
{
public static final String ID = "steamcraft2";
public static final String NAME = "Steamcraft 2";
@ -18,4 +14,40 @@ public class ModInfo
public static final String CONFIG_GUI = "steamcraft.client.gui.GuiFactorySteamcraft";
public static final String PREFIX = "steamcraft:";
@Override
public String getID()
{
return ID;
}
@Override
public String getName()
{
return NAME;
}
@Override
public String getVersion()
{
return VERSION;
}
@Override
public String getPrefix()
{
return PREFIX;
}
@Override
public String getClientProxyPath()
{
return CLIENT_PROXY;
}
@Override
public String getCommonProxyPath()
{
return COMMON_PROXY;
}
}