diff options
Diffstat (limited to 'src/main/java')
6 files changed, 16 insertions, 13 deletions
diff --git a/src/main/java/gmail/Lance5057/com/RoundShield.java b/src/main/java/gmail/Lance5057/com/RoundShield.java index 9588542..ca176a3 100644 --- a/src/main/java/gmail/Lance5057/com/RoundShield.java +++ b/src/main/java/gmail/Lance5057/com/RoundShield.java @@ -27,7 +27,7 @@ import net.minecraft.world.World; import net.minecraftforge.event.entity.player.PlayerInteractEvent; import tconstruct.library.tools.*; import tconstruct.tools.TinkerTools; -public class RoundShield extends HarvestTool implements IShield, ISheathed, IArrowCatcher, IArrowDisplay +public class RoundShield extends Shield implements IShield, ISheathed, IArrowCatcher, IArrowDisplay { int induceDamage = 0; public RoundShield() diff --git a/src/main/java/gmail/Lance5057/com/mod_TinkersDefense.java b/src/main/java/gmail/Lance5057/com/mod_TinkersDefense.java index 3c3c1c6..da66949 100644 --- a/src/main/java/gmail/Lance5057/com/mod_TinkersDefense.java +++ b/src/main/java/gmail/Lance5057/com/mod_TinkersDefense.java @@ -19,6 +19,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.StatCollector; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; @@ -298,7 +299,7 @@ public void init(FMLInitializationEvent e) public void postInit(FMLPostInitializationEvent e) { TConstructClientRegistry.toolButtons.add(TConstructClientRegistry.toolButtons.size(), - new ToolGuiElement(1, 0, 0, new int[] { 9, 0, 4, 0 }, new int[] { 2, 3, 2, 0 }, "Round Shield", "A simple shield with average durability and average defense.", "tinkersdefense", "textures/gui/icons.png")); + new ToolGuiElement(1, 0, 0, new int[] { 9, 0, 4, 0 }, new int[] { 2, 3, 2, 0 }, StatCollector.translateToLocal("gui.toolstation.roundshield.name"), StatCollector.translateToLocal("gui.toolstation.roundshield.desc"), "tinkersdefense", "textures/gui/icons.png")); TConstructClientRegistry.tierTwoButtons.add(TConstructClientRegistry.tierTwoButtons.size(), new ToolGuiElement(5, 0, 0, new int[] { 9, 8, 9, 9 }, new int[] { 2, 3, 2, 3 }, "Heater Shield", "An advanced shield with high durability and high defense.", "tinkersdefense", "textures/gui/icons.png")); } diff --git a/src/main/java/gmail/Lance5057/containers/Container_CrestMount.java b/src/main/java/gmail/Lance5057/containers/Container_CrestMount.java index 283eb4e..2baa3e3 100644 --- a/src/main/java/gmail/Lance5057/containers/Container_CrestMount.java +++ b/src/main/java/gmail/Lance5057/containers/Container_CrestMount.java @@ -12,10 +12,10 @@ public class Container_CrestMount extends Container public Container_CrestMount(InventoryPlayer inventoryPlayer, TileEntity_CrestMount TileEntity_CrestMount) { - addSlotToContainer(new Slot(TileEntity_CrestMount, 0, 0, 0)); - addSlotToContainer(new Slot(TileEntity_CrestMount, 1, 0, 16)); - addSlotToContainer(new Slot(TileEntity_CrestMount, 2, 0, 32)); - addSlotToContainer(new Slot(TileEntity_CrestMount, 3, 0, 48)); + addSlotToContainer(new Slot(TileEntity_CrestMount, 0, 62, 28)); + addSlotToContainer(new Slot(TileEntity_CrestMount, 1, 98, 28)); + addSlotToContainer(new Slot(TileEntity_CrestMount, 2, 80, 28)); + addSlotToContainer(new Slot(TileEntity_CrestMount, 3, 80, 46)); for (int x = 0; x < 9; x++) { diff --git a/src/main/java/gmail/Lance5057/gui/Gui_CrestMount.java b/src/main/java/gmail/Lance5057/gui/Gui_CrestMount.java index 72b876b..ab8b498 100644 --- a/src/main/java/gmail/Lance5057/gui/Gui_CrestMount.java +++ b/src/main/java/gmail/Lance5057/gui/Gui_CrestMount.java @@ -42,10 +42,11 @@ this.inventory = te_crest; public void initGui() { super.initGui(); - this.buttonList.add(new GuiButton(1,this.guiLeft + 60, this.guiTop + 10, 18, 18,"Flip")); - this.buttonList.add(new GuiButton(2,this.guiLeft + 94, this.guiTop + 10, 18, 18,"Flip")); - this.buttonList.add(new GuiButton(3,this.guiLeft + 78, this.guiTop + 10, 18, 18,"Flip")); - this.buttonList.add(new GuiButton(4,this.guiLeft + 77, this.guiTop + 64, 18, 18,"Flip")); + this.buttonList.add(new GuiButton(1,this.guiLeft + 61, this.guiTop + 8, 18, 18,"Flip")); + this.buttonList.add(new GuiButton(3,this.guiLeft + 79, this.guiTop + 8, 18, 18,"Flip")); + this.buttonList.add(new GuiButton(2,this.guiLeft + 97, this.guiTop + 8, 18, 18,"Flip")); + + this.buttonList.add(new GuiButton(4,this.guiLeft + 79, this.guiTop + 63, 18, 18,"Flip")); } @Override diff --git a/src/main/java/gmail/Lance5057/network/Message_CrestMount.java b/src/main/java/gmail/Lance5057/network/Message_CrestMount.java index 6034726..66328aa 100644 --- a/src/main/java/gmail/Lance5057/network/Message_CrestMount.java +++ b/src/main/java/gmail/Lance5057/network/Message_CrestMount.java @@ -23,7 +23,8 @@ public class Message_CrestMount implements IMessage this.x = x; this.y = y; this.z = z; - System.arraycopy(flip, 0, this.flip, 0, flip.length); + this.flip = flip; + //System.arraycopy(flip, 0, this.flip, 0, flip.length); } diff --git a/src/main/java/gmail/Lance5057/tileentities/TileEntity_CrestMount.java b/src/main/java/gmail/Lance5057/tileentities/TileEntity_CrestMount.java index d8384ed..ad1ab70 100644 --- a/src/main/java/gmail/Lance5057/tileentities/TileEntity_CrestMount.java +++ b/src/main/java/gmail/Lance5057/tileentities/TileEntity_CrestMount.java @@ -33,8 +33,8 @@ public class TileEntity_CrestMount extends TileEntity implements IInventory // if (!worldObj.isRemote) // { - getWorldObj().markBlockForUpdate(xCoord, yCoord, zCoord); - markDirty(); +// getWorldObj().markBlockForUpdate(xCoord, yCoord, zCoord); +// markDirty(); // // } } |