diff options
9 files changed, 108 insertions, 16 deletions
diff --git a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockBasicTooltip.java b/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockBasicTooltip.java new file mode 100644 index 0000000000..d94bb218ea --- /dev/null +++ b/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockBasicTooltip.java @@ -0,0 +1,32 @@ +package gtPlusPlus.core.item.base.itemblock; + +import java.util.List; + +import gtPlusPlus.api.interfaces.ITileTooltip; +import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemStack; + +public class ItemBlockBasicTooltip extends ItemBlock{ + + protected final int mID; + + public ItemBlockBasicTooltip(final Block block) { + super(block); + this.mID = ((ITileTooltip) block).getTooltipID(); + } + + + @Override + public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) { + if (this.mID == 0){ //blockDarkWorldPortalFrame + list.add("Assembled in the same shape as the Nether Portal."); + } + else if (this.mID == 1){ //Modularity + list.add("Used to construct modular armour & bauble upgrades.."); + } + } + + +} diff --git a/src/Java/gtPlusPlus/core/world/darkworld/Dimension_DarkWorld.java b/src/Java/gtPlusPlus/core/world/darkworld/Dimension_DarkWorld.java index 2c8bf88b68..6ad9a60a5a 100644 --- a/src/Java/gtPlusPlus/core/world/darkworld/Dimension_DarkWorld.java +++ b/src/Java/gtPlusPlus/core/world/darkworld/Dimension_DarkWorld.java @@ -1,6 +1,5 @@ package gtPlusPlus.core.world.darkworld; -import cpw.mods.fml.common.registry.GameRegistry; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.world.darkworld.block.blockDarkWorldPortal; import gtPlusPlus.core.world.darkworld.item.itemDarkWorldPortalTrigger; @@ -13,7 +12,6 @@ public class Dimension_DarkWorld { public Object instance; public static int DIMID = CORE.DARKWORLD_ID; - public static blockDarkWorldPortal portalBlock; public static itemDarkWorldPortalTrigger portalItem; public static Block blockTopLayer; @@ -21,15 +19,11 @@ public class Dimension_DarkWorld { public static Block blockMainFiller = Blocks.stone; public static Block blockSecondaryFiller; public static Block blockFluidLakes; - public static Block blockPortalFrame; public void load() { - GameRegistry.registerBlock(portalBlock, "dimensionDarkWorld_portal"); DimensionManager.registerProviderType(DIMID, WorldProviderMod.class, false); DimensionManager.registerDimension(DIMID, DIMID); - // GameRegistry.addSmelting(Items.record_11, new ItemStack(block), - // 1.0f); } } diff --git a/src/Java/gtPlusPlus/core/world/darkworld/block/DarkWorldContentLoader.java b/src/Java/gtPlusPlus/core/world/darkworld/block/DarkWorldContentLoader.java index e74fe1e1a5..1908eeb11e 100644 --- a/src/Java/gtPlusPlus/core/world/darkworld/block/DarkWorldContentLoader.java +++ b/src/Java/gtPlusPlus/core/world/darkworld/block/DarkWorldContentLoader.java @@ -4,7 +4,9 @@ import static gtPlusPlus.core.world.darkworld.Dimension_DarkWorld.*; import cpw.mods.fml.common.registry.GameRegistry; import gtPlusPlus.core.block.base.BlockBaseFluid; +import gtPlusPlus.core.item.base.itemblock.ItemBlockBasicTooltip; import gtPlusPlus.core.util.Utils; +import gtPlusPlus.core.world.darkworld.item.ItemBlockToxicEverglades; import gtPlusPlus.core.world.darkworld.item.itemDarkWorldPortalTrigger; import net.minecraft.init.Blocks; import net.minecraftforge.fluids.FluidRegistry; @@ -53,9 +55,10 @@ public class DarkWorldContentLoader { blockPortalFrame = new blockDarkWorldPortalFrame(); //Registry - GameRegistry.registerBlock(blockTopLayer, "blockDarkWorldGround"); - GameRegistry.registerBlock(blockSecondLayer, "blockDarkWorldGround2"); - GameRegistry.registerBlock(blockPortalFrame, "blockDarkWorldPortalFrame"); + GameRegistry.registerBlock(portalBlock, ItemBlockToxicEverglades.class, "dimensionDarkWorld_portal"); + GameRegistry.registerBlock(blockTopLayer, ItemBlockToxicEverglades.class, "blockDarkWorldGround"); + GameRegistry.registerBlock(blockSecondLayer, ItemBlockToxicEverglades.class, "blockDarkWorldGround2"); + GameRegistry.registerBlock(blockPortalFrame, ItemBlockToxicEverglades.class, "blockDarkWorldPortalFrame"); //Make Flammable Blocks.fire.setFireInfo(blockTopLayer, 30, 20); diff --git a/src/Java/gtPlusPlus/core/world/darkworld/block/blockDarkWorldGround.java b/src/Java/gtPlusPlus/core/world/darkworld/block/blockDarkWorldGround.java index fc7e89c968..ccfb1b0595 100644 --- a/src/Java/gtPlusPlus/core/world/darkworld/block/blockDarkWorldGround.java +++ b/src/Java/gtPlusPlus/core/world/darkworld/block/blockDarkWorldGround.java @@ -1,10 +1,11 @@ package gtPlusPlus.core.world.darkworld.block; import cpw.mods.fml.common.registry.LanguageRegistry; +import gtPlusPlus.api.interfaces.ITileTooltip; import gtPlusPlus.core.creative.AddToCreativeTab; import net.minecraft.block.BlockGrass; -public class blockDarkWorldGround extends BlockGrass { +public class blockDarkWorldGround extends BlockGrass implements ITileTooltip{ public blockDarkWorldGround() { this.setCreativeTab(AddToCreativeTab.tabBOP); @@ -14,4 +15,9 @@ public class blockDarkWorldGround extends BlockGrass { LanguageRegistry.addName(this, "Unstable Earth"); } + @Override + public int getTooltipID() { + return 2; + } + } diff --git a/src/Java/gtPlusPlus/core/world/darkworld/block/blockDarkWorldPollutedDirt.java b/src/Java/gtPlusPlus/core/world/darkworld/block/blockDarkWorldPollutedDirt.java index 5f3f7e0bfd..0404e6f083 100644 --- a/src/Java/gtPlusPlus/core/world/darkworld/block/blockDarkWorldPollutedDirt.java +++ b/src/Java/gtPlusPlus/core/world/darkworld/block/blockDarkWorldPollutedDirt.java @@ -3,12 +3,13 @@ package gtPlusPlus.core.world.darkworld.block; import cpw.mods.fml.common.registry.LanguageRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import gtPlusPlus.api.interfaces.ITileTooltip; import gtPlusPlus.core.creative.AddToCreativeTab; import net.minecraft.block.BlockDirt; import net.minecraft.world.ColorizerGrass; import net.minecraft.world.IBlockAccess; -public class blockDarkWorldPollutedDirt extends BlockDirt { +public class blockDarkWorldPollutedDirt extends BlockDirt implements ITileTooltip{ public blockDarkWorldPollutedDirt() { this.setCreativeTab(AddToCreativeTab.tabBOP); @@ -63,4 +64,9 @@ public class blockDarkWorldPollutedDirt extends BlockDirt { return (l / 9 & 255) << 16 | (i1 / 9 & 255) << 8 | j1 / 9 & 255; } + @Override + public int getTooltipID() { + return 3; + } + } diff --git a/src/Java/gtPlusPlus/core/world/darkworld/block/blockDarkWorldPortal.java b/src/Java/gtPlusPlus/core/world/darkworld/block/blockDarkWorldPortal.java index ec5e0482fa..eab52a4183 100644 --- a/src/Java/gtPlusPlus/core/world/darkworld/block/blockDarkWorldPortal.java +++ b/src/Java/gtPlusPlus/core/world/darkworld/block/blockDarkWorldPortal.java @@ -5,6 +5,7 @@ import java.util.Random; import cpw.mods.fml.common.registry.LanguageRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import gtPlusPlus.api.interfaces.ITileTooltip; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.world.darkworld.Dimension_DarkWorld; @@ -23,7 +24,7 @@ import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -public class blockDarkWorldPortal extends BlockBreakable { +public class blockDarkWorldPortal extends BlockBreakable implements ITileTooltip{ IIcon gor = null, dol = null, st1 = null, st2 = null, st3 = null, st4 = null; public blockDarkWorldPortal() { @@ -362,6 +363,11 @@ public class blockDarkWorldPortal extends BlockBreakable { public String getLocalizedName() { return EnumChatFormatting.OBFUSCATED+super.getLocalizedName(); } + + @Override + public int getTooltipID() { + return 1; + } } diff --git a/src/Java/gtPlusPlus/core/world/darkworld/block/blockDarkWorldPortalFrame.java b/src/Java/gtPlusPlus/core/world/darkworld/block/blockDarkWorldPortalFrame.java index 209c8309e6..1ab4a95b2f 100644 --- a/src/Java/gtPlusPlus/core/world/darkworld/block/blockDarkWorldPortalFrame.java +++ b/src/Java/gtPlusPlus/core/world/darkworld/block/blockDarkWorldPortalFrame.java @@ -1,12 +1,13 @@ package gtPlusPlus.core.world.darkworld.block; import cpw.mods.fml.common.registry.LanguageRegistry; +import gtPlusPlus.api.interfaces.ITileTooltip; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.lib.CORE; import net.minecraft.block.Block; import net.minecraft.block.material.Material; -public class blockDarkWorldPortalFrame extends Block{ +public class blockDarkWorldPortalFrame extends Block implements ITileTooltip{ public blockDarkWorldPortalFrame() { super(Material.iron); @@ -14,9 +15,14 @@ public class blockDarkWorldPortalFrame extends Block{ this.setBlockName("blockDarkWorldPortalFrame"); this.setHardness(3.0F); this.setLightLevel(0.5F); - this.setBlockTextureName(CORE.MODID + ":" + "SwirlRed"); - LanguageRegistry.addName(this, "Mystical Frame"); + this.setBlockTextureName(CORE.MODID + ":" + "SwirlYellow"); + LanguageRegistry.addName(this, "Containment Frame"); } + @Override + public int getTooltipID() { + return 0; + } + } diff --git a/src/Java/gtPlusPlus/core/world/darkworld/item/ItemBlockToxicEverglades.java b/src/Java/gtPlusPlus/core/world/darkworld/item/ItemBlockToxicEverglades.java new file mode 100644 index 0000000000..6f3a713058 --- /dev/null +++ b/src/Java/gtPlusPlus/core/world/darkworld/item/ItemBlockToxicEverglades.java @@ -0,0 +1,38 @@ +package gtPlusPlus.core.world.darkworld.item; + +import java.util.List; + +import gtPlusPlus.api.interfaces.ITileTooltip; +import gtPlusPlus.core.item.base.itemblock.ItemBlockBasicTooltip; +import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemStack; + +public class ItemBlockToxicEverglades extends ItemBlock { + + protected final int mID; + + public ItemBlockToxicEverglades(final Block block) { + super(block); + this.mID = ((ITileTooltip) block).getTooltipID(); + } + + @Override + public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) { + if (this.mID == 0){ //blockDarkWorldPortalFrame + list.add("Assembled in the same shape as the Nether Portal."); + } + else if (this.mID == 1){ //blockDarkWorldPortal + list.add("Place this if you are lazy to create the portal structure, slacker."); + } + else if (this.mID == 2){ //blockDarkWorldGround + list.add("Will burn very quickly if it happens to catch fire."); + } + else if (this.mID == 3){ //blockDarkWorldPollutedDirt + list.add("Maybe you can do something with this?."); + } + } + + +} diff --git a/src/Java/gtPlusPlus/core/world/darkworld/item/itemDarkWorldPortalTrigger.java b/src/Java/gtPlusPlus/core/world/darkworld/item/itemDarkWorldPortalTrigger.java index 133bbb7663..fa85cbe4a3 100644 --- a/src/Java/gtPlusPlus/core/world/darkworld/item/itemDarkWorldPortalTrigger.java +++ b/src/Java/gtPlusPlus/core/world/darkworld/item/itemDarkWorldPortalTrigger.java @@ -46,7 +46,8 @@ public class itemDarkWorldPortalTrigger extends Item { @SuppressWarnings({ "unchecked", "rawtypes" }) @Override public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) { - list.add(EnumChatFormatting.GREEN+"A key for entering the Dark World."); + list.add(EnumChatFormatting.GREEN+"Shines the way, towards the far away Everglades."); + list.add(EnumChatFormatting.GREEN+"This item produces such a temperature, that you'd hate to use it incorrectly."); super.addInformation(stack, aPlayer, list, bool); } |