From b4e0d53509151d40a6a4e4a680314e5ae4390e47 Mon Sep 17 00:00:00 2001 From: StevenRS11 Date: Wed, 6 Nov 2013 16:53:14 -0500 Subject: [PATCH] Not quite --- .../mod_pocketDim/items/ItemBlockDimWall.java | 2 +- StevenDimDoors/mod_pocketDim/items/ItemRiftBlade.java | 5 +++-- .../mod_pocketDim/items/ItemRiftSignature.java | 4 ++-- .../items/ItemStabilizedRiftSignature.java | 6 +++--- StevenDimDoors/mod_pocketDim/mod_pocketDim.java | 10 ++++++++++ 5 files changed, 19 insertions(+), 8 deletions(-) diff --git a/StevenDimDoors/mod_pocketDim/items/ItemBlockDimWall.java b/StevenDimDoors/mod_pocketDim/items/ItemBlockDimWall.java index 572f506..a53e55a 100644 --- a/StevenDimDoors/mod_pocketDim/items/ItemBlockDimWall.java +++ b/StevenDimDoors/mod_pocketDim/items/ItemBlockDimWall.java @@ -28,6 +28,6 @@ public class ItemBlockDimWall extends ItemBlock public String getUnlocalizedName(ItemStack par1ItemStack) { - return subNames[getItemDamageFromStack(par1ItemStack)]; + return subNames[(par1ItemStack.getItemDamage())]; } } \ No newline at end of file diff --git a/StevenDimDoors/mod_pocketDim/items/ItemRiftBlade.java b/StevenDimDoors/mod_pocketDim/items/ItemRiftBlade.java index b51950c..1e70456 100644 --- a/StevenDimDoors/mod_pocketDim/items/ItemRiftBlade.java +++ b/StevenDimDoors/mod_pocketDim/items/ItemRiftBlade.java @@ -59,7 +59,7 @@ public class ItemRiftBlade extends ItemSword } } - @Override + //@Override public int getDamageVsEntity(Entity par1Entity) { return 7; @@ -72,7 +72,8 @@ public class ItemRiftBlade extends ItemSword return true; } - @Override + //TODO fix damage + //@Override public boolean hitEntity(ItemStack par1ItemStack, EntityLiving par2EntityLiving, EntityLiving par3EntityLiving) { par1ItemStack.damageItem(1, par3EntityLiving); diff --git a/StevenDimDoors/mod_pocketDim/items/ItemRiftSignature.java b/StevenDimDoors/mod_pocketDim/items/ItemRiftSignature.java index 578a71f..d42d625 100644 --- a/StevenDimDoors/mod_pocketDim/items/ItemRiftSignature.java +++ b/StevenDimDoors/mod_pocketDim/items/ItemRiftSignature.java @@ -98,14 +98,14 @@ public class ItemRiftSignature extends Item stack.stackSize--; } clearSource(stack); - player.sendChatToPlayer("Rift Created"); + mod_pocketDim.sendChat(player,("Rift Created")); world.playSoundAtEntity(player,"mods.DimDoors.sfx.riftEnd", 0.6f, 1); } else { //The link signature has not been used. Store its current target as the first location. setSource(stack, x, adjustedY, z,orientation, PocketManager.getDimensionData(world)); - player.sendChatToPlayer("Location Stored in Rift Signature"); + mod_pocketDim.sendChat(player,("Location Stored in Rift Signature")); world.playSoundAtEntity(player,"mods.DimDoors.sfx.riftStart", 0.6f, 1); } return true; diff --git a/StevenDimDoors/mod_pocketDim/items/ItemStabilizedRiftSignature.java b/StevenDimDoors/mod_pocketDim/items/ItemStabilizedRiftSignature.java index fca2c24..fa0efc0 100644 --- a/StevenDimDoors/mod_pocketDim/items/ItemStabilizedRiftSignature.java +++ b/StevenDimDoors/mod_pocketDim/items/ItemStabilizedRiftSignature.java @@ -56,7 +56,7 @@ public class ItemStabilizedRiftSignature extends ItemRiftSignature // or if the player can pay an Ender Pearl to create a rift. if (!player.capabilities.isCreativeMode && !player.inventory.hasItem(Item.enderPearl.itemID)) { - player.sendChatToPlayer("You don't have any Ender Pearls!"); + mod_pocketDim.sendChat(player,"You don't have any Ender Pearls!"); return true; } @@ -86,14 +86,14 @@ public class ItemStabilizedRiftSignature extends ItemRiftSignature { player.inventory.consumeInventoryItem(Item.enderPearl.itemID); } - player.sendChatToPlayer("Rift Created"); + mod_pocketDim.sendChat(player,"Rift Created"); world.playSoundAtEntity(player,"mods.DimDoors.sfx.riftEnd", 0.6f, 1); } else { //The link signature has not been used. Store its current target as the first location. setSource(stack, x, adjustedY, z, orientation, PocketManager.getDimensionData(world)); - player.sendChatToPlayer("Location Stored in Rift Signature"); + mod_pocketDim.sendChat(player,"Location Stored in Rift Signature"); world.playSoundAtEntity(player,"mods.DimDoors.sfx.riftStart", 0.6f, 1); } return true; diff --git a/StevenDimDoors/mod_pocketDim/mod_pocketDim.java b/StevenDimDoors/mod_pocketDim/mod_pocketDim.java index 4c19fd7..19f90e1 100644 --- a/StevenDimDoors/mod_pocketDim/mod_pocketDim.java +++ b/StevenDimDoors/mod_pocketDim/mod_pocketDim.java @@ -8,9 +8,11 @@ import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityEggInfo; import net.minecraft.entity.EntityList; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumToolMaterial; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.ChatMessageComponent; import net.minecraft.world.biome.BiomeGenBase; import net.minecraftforge.common.DimensionManager; import net.minecraftforge.common.ForgeChunkManager; @@ -326,4 +328,12 @@ public class mod_pocketDim ChunkLoaderHelper.loadChunkForcedWorlds(event); } + + public static void sendChat(EntityPlayer player, String message) + { + ChatMessageComponent cmp = new ChatMessageComponent(); + cmp.addText(message); + player.sendChatToPlayer(cmp); + + } }