diff --git a/resources/assets/tinker/manuals/firstday.xml b/resources/assets/tinker/manuals/firstday.xml
index 0416607a735..7692d419659 100644
--- a/resources/assets/tinker/manuals/firstday.xml
+++ b/resources/assets/tinker/manuals/firstday.xml
@@ -234,7 +234,7 @@ Note: The Smeltery is required to process all metals, including iron.
-Vision
+Dodge
dodge
two
@@ -298,14 +298,6 @@ Note: The Smeltery is required to process all metals, including iron.
glovehaste
-
-Flesh
-
- gloveclimb
- two
-
-
-
travelgloves
gloveknuckles
diff --git a/src/main/java/tconstruct/TConstruct.java b/src/main/java/tconstruct/TConstruct.java
index 1aad1eae86d..7a7fad1c056 100644
--- a/src/main/java/tconstruct/TConstruct.java
+++ b/src/main/java/tconstruct/TConstruct.java
@@ -26,7 +26,7 @@
import tconstruct.util.EnvironmentChecks;
import tconstruct.util.config.DimensionBlacklist;
import tconstruct.util.config.PHConstruct;
-import tconstruct.util.network.packet.PacketPipeline;
+import tconstruct.util.network.PacketPipeline;
import tconstruct.world.TinkerWorld;
import tconstruct.world.gen.SlimeIslandGen;
import tconstruct.world.village.ComponentSmeltery;
diff --git a/src/main/java/tconstruct/armor/ArmorProxyClient.java b/src/main/java/tconstruct/armor/ArmorProxyClient.java
index 4be084790fa..b411c80019a 100644
--- a/src/main/java/tconstruct/armor/ArmorProxyClient.java
+++ b/src/main/java/tconstruct/armor/ArmorProxyClient.java
@@ -25,12 +25,14 @@
import net.minecraft.util.ResourceLocation;
import net.minecraft.world.World;
import net.minecraftforge.client.GuiIngameForge;
+import net.minecraftforge.client.event.FOVUpdateEvent;
import net.minecraftforge.client.event.RenderGameOverlayEvent;
import net.minecraftforge.client.event.RenderGameOverlayEvent.ElementType;
import net.minecraftforge.client.event.RenderPlayerEvent;
import net.minecraftforge.common.MinecraftForge;
import tconstruct.armor.gui.ArmorExtendedGui;
import tconstruct.armor.gui.KnapsackGui;
+import tconstruct.armor.items.TravelGear;
import tconstruct.armor.model.BeltModel;
import tconstruct.armor.model.BootBump;
import tconstruct.armor.model.HiddenPlayerModel;
@@ -75,40 +77,39 @@ public void initialize ()
MinecraftForge.EVENT_BUS.register(this);
FMLCommonHandler.instance().bus().register(new ArmorAbilitiesClient(mc, controlInstance));
}
-
+
private void registerManualRecipes ()
{
ItemStack feather = new ItemStack(Items.feather);
ItemStack redstone = new ItemStack(Items.redstone);
- ItemStack goggles = new ItemStack(TinkerArmor.travelGoggles);
- MantleClientRegistry.registerManualIcon("travelgoggles", goggles);
- TConstructClientRegistry.registerManualModifier("nightvision", goggles.copy(), new ItemStack(Items.flint_and_steel), new ItemStack(Items.potionitem, 1, 8198));
+ ItemStack goggles = TinkerArmor.travelGoggles.getDefaultItem();
+ MantleClientRegistry.registerManualSmallRecipe("nightvision", goggles.copy(), new ItemStack(Items.flint_and_steel), new ItemStack(Items.potionitem, 1, 0), new ItemStack(Items.golden_carrot), null);
- ItemStack vest = new ItemStack(TinkerArmor.travelVest);
+ ItemStack vest = TinkerArmor.travelVest.getDefaultItem();
+ System.out.println("Travel Vest Item: "+vest);
MantleClientRegistry.registerManualIcon("travelvest", vest);
MantleClientRegistry.registerManualSmallRecipe("dodge", vest.copy(), new ItemStack(Items.ender_eye), new ItemStack(Items.ender_pearl), new ItemStack(Items.sugar), null);
- MantleClientRegistry.registerManualSmallRecipe("stealth", vest.copy(), new ItemStack(Blocks.ice), new ItemStack(Items.ender_eye), new ItemStack(Items.potionitem, 1, 8206), null);
+ MantleClientRegistry.registerManualSmallRecipe("stealth", vest.copy(), new ItemStack(Items.fermented_spider_eye), new ItemStack(Items.ender_eye), new ItemStack(Items.potionitem, 1, 0),
+ new ItemStack(Items.golden_carrot));
ItemStack wings = new ItemStack(TinkerArmor.travelWings);
MantleClientRegistry.registerManualIcon("travelwings", wings);
MantleClientRegistry.registerManualSmallRecipe("doublejump", wings.copy(), new ItemStack(Items.ghast_tear), new ItemStack(TinkerWorld.slimeGel, 1, 0), new ItemStack(Blocks.piston), null);
- MantleClientRegistry.registerManualLargeRecipe("featherfall", wings.copy(), new ItemStack(TinkerWorld.slimeGel, 1, 0), feather, feather, feather, wings.copy(), feather, feather, new ItemStack(
- Items.ender_pearl), feather);
+ MantleClientRegistry.registerManualLargeRecipe("featherfall", wings.copy(), new ItemStack(TinkerWorld.slimeGel, 1, 0), feather, feather, feather, wings.copy(), feather, feather,
+ new ItemStack(Items.ender_pearl), feather);
- ItemStack boots = new ItemStack(TinkerArmor.travelBoots);
+ ItemStack boots = TinkerArmor.travelBoots.getDefaultItem();
MantleClientRegistry.registerManualIcon("travelboots", boots);
- MantleClientRegistry.registerManualSmallRecipe("doublejumpboots", boots.copy(), new ItemStack(Items.ghast_tear), new ItemStack(TinkerWorld.slimeGel, 1, 1), new ItemStack(Blocks.piston),
- null);
+ MantleClientRegistry.registerManualSmallRecipe("doublejumpboots", boots.copy(), new ItemStack(Items.ghast_tear), new ItemStack(TinkerWorld.slimeGel, 1, 1), new ItemStack(Blocks.piston), null);
TConstructClientRegistry.registerManualModifier("waterwalk", boots.copy(), new ItemStack(Blocks.waterlily), new ItemStack(Blocks.waterlily));
TConstructClientRegistry.registerManualModifier("leadboots", boots.copy(), new ItemStack(Blocks.iron_block));
TConstructClientRegistry.registerManualModifier("slimysoles", boots.copy(), new ItemStack(TinkerWorld.slimePad, 1, 0), new ItemStack(TinkerWorld.slimePad, 1, 0));
- ItemStack gloves = new ItemStack(TinkerArmor.travelGlove);
+ ItemStack gloves = TinkerArmor.travelGlove.getDefaultItem();
MantleClientRegistry.registerManualIcon("travelgloves", gloves);
TConstructClientRegistry.registerManualModifier("glovehaste", gloves.copy(), redstone, new ItemStack(Blocks.redstone_block));
- MantleClientRegistry.registerManualSmallRecipe("gloveclimb", gloves.copy(), new ItemStack(Items.slime_ball), new ItemStack(Blocks.web), new ItemStack(TinkerTools.materials, 1, 25), null);
+ //MantleClientRegistry.registerManualSmallRecipe("gloveclimb", gloves.copy(), new ItemStack(Items.slime_ball), new ItemStack(Blocks.web), new ItemStack(TinkerTools.materials, 1, 25), null);
TConstructClientRegistry.registerManualModifier("gloveknuckles", gloves.copy(), new ItemStack(Items.quartz), new ItemStack(Blocks.quartz_block, 1, Short.MAX_VALUE));
-
}
@Override
@@ -188,6 +189,21 @@ public void uploadKeyBindingsToGame (GameSettings settings, TKeyHandler keyhandl
int updateCounter = 0;
GameSettings gs = Minecraft.getMinecraft().gameSettings;
+
+ @SubscribeEvent
+ public void goggleZoom (FOVUpdateEvent event)
+ {
+ if (TControls.zoom)
+ {
+ ItemStack helmet = event.entity.getCurrentArmor(3);
+ if (helmet != null && helmet.getItem() instanceof TravelGear)
+ {
+ event.newfov = 0.3f;
+ }
+ }
+ //ItemStack feet = player.getCurrentArmor(0);
+ //event.newfov = 1.0f;
+ }
/* HUD */
@SubscribeEvent
diff --git a/src/main/java/tconstruct/armor/PlayerAbilityHelper.java b/src/main/java/tconstruct/armor/PlayerAbilityHelper.java
index 932489012e1..51808563303 100644
--- a/src/main/java/tconstruct/armor/PlayerAbilityHelper.java
+++ b/src/main/java/tconstruct/armor/PlayerAbilityHelper.java
@@ -1,20 +1,23 @@
package tconstruct.armor;
import net.minecraft.entity.Entity;
-import net.minecraft.entity.player.*;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.*;
-import net.minecraft.potion.*;
-import tconstruct.TConstruct;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
+import net.minecraft.potion.Potion;
+import net.minecraft.potion.PotionEffect;
+import tconstruct.armor.player.ArmorExtended;
import tconstruct.armor.player.TPlayerStats;
public class PlayerAbilityHelper
{
- public static void toggleGoggles (EntityPlayer player)
+ public static void toggleGoggles (EntityPlayer player, boolean active)
{
TPlayerStats stats = TPlayerStats.get(player);
- stats.activeGoggles = !stats.activeGoggles;
+ stats.activeGoggles = active;
if (!stats.activeGoggles)
{
player.removePotionEffect(Potion.nightVision.id);
@@ -25,7 +28,7 @@ public static void toggleGoggles (EntityPlayer player)
}
}
- public static void swapBelt (EntityPlayer player, TPlayerStats stats)
+ public static void swapBelt (EntityPlayer player, ArmorExtended armor)
{
NBTTagList slots = new NBTTagList();
InventoryPlayer hotbar = player.inventory;
@@ -44,7 +47,7 @@ public static void swapBelt (EntityPlayer player, TPlayerStats stats)
hotbar.mainInventory[i] = null;
}
- ItemStack belt = stats.armor.inventory[3];
+ ItemStack belt = armor.inventory[3];
NBTTagList replaceSlots = belt.getTagCompound().getTagList("Inventory", 10);
for (int i = 0; i < replaceSlots.tagCount(); ++i)
{
diff --git a/src/main/java/tconstruct/armor/TinkerArmor.java b/src/main/java/tconstruct/armor/TinkerArmor.java
index 6e392c8513f..24f38c319cf 100644
--- a/src/main/java/tconstruct/armor/TinkerArmor.java
+++ b/src/main/java/tconstruct/armor/TinkerArmor.java
@@ -206,8 +206,8 @@ private void craftingTableRecipes ()
GameRegistry.addRecipe(new ItemStack(TinkerArmor.knapsack, 1, 0), "###", "rmr", "###", '#', new ItemStack(Items.leather), 'r', new ItemStack(TinkerTools.toughRod, 1, 2), 'm', aluBrass);
// Drying Rack Recipes
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TinkerArmor.dryingRack, 1, 0), "bbb", 'b', "slabWood"));
-
- //Temporary recipes
+
+ //Temporary recipes
ItemStack leather = new ItemStack(Items.leather);
ItemStack glass = new ItemStack(Blocks.glass);
ItemStack string = new ItemStack(Items.string);
@@ -250,14 +250,14 @@ private void registerModifiers ()
TConstructRegistry.registerActiveArmorMod(new ActiveTinkerArmor());
//Head
- ModifyBuilder.registerModifier(new AModBoolean(0, "Night Vision", EnumSet.of(ArmorPart.Head),
- new ItemStack[] { new ItemStack(Items.flint_and_steel), new ItemStack(Items.potionitem, 1, 8198) }, "\u00a78", "Night Vision"));
+ ModifyBuilder.registerModifier(new AModBoolean(0, "Night Vision", EnumSet.of(ArmorPart.Head), new ItemStack[] { new ItemStack(Items.flint_and_steel), new ItemStack(Items.potionitem, 1, 0),
+ new ItemStack(Items.golden_carrot) }, "\u00a78", "Night Vision"));
//Chest
ModifyBuilder.registerModifier(new AModInteger(0, "Perfect Dodge", EnumSet.of(ArmorPart.Chest), new ItemStack[] { new ItemStack(Items.ender_eye), new ItemStack(Items.ender_pearl),
new ItemStack(Items.sugar) }, 1, "\u00a7d", "Perfect Dodge"));
- ModifyBuilder.registerModifier(new AModBoolean(1, "Stealth", EnumSet.of(ArmorPart.Chest), new ItemStack[] { new ItemStack(Blocks.ice), new ItemStack(Items.ender_eye),
- new ItemStack(Items.potionitem, 1, 8206) }, "\u00a78", "Stealth"));
+ ModifyBuilder.registerModifier(new AModBoolean(1, "Stealth", EnumSet.of(ArmorPart.Chest), new ItemStack[] { new ItemStack(Items.fermented_spider_eye), new ItemStack(Items.ender_eye),
+ new ItemStack(Items.potionitem, 1, 0), new ItemStack(Items.golden_carrot) }, "\u00a78", "Stealth"));
//Wings
ItemStack feather = new ItemStack(Items.feather);
@@ -275,7 +275,7 @@ private void registerModifiers ()
//Glove
ModifyBuilder.registerModifier(new GloveSpeed(1, new ItemStack[] { redstoneItem, redstoneBlock }, new int[] { 1, 9 }));
- ModifyBuilder.registerModifier(new GloveClimb(new ItemStack[] { new ItemStack(Items.slime_ball), new ItemStack(Blocks.web), new ItemStack(TinkerTools.materials, 1, 25) }));
+ //ModifyBuilder.registerModifier(new GloveClimb(new ItemStack[] { new ItemStack(Items.slime_ball), new ItemStack(Blocks.web), new ItemStack(TinkerTools.materials, 1, 25) }));
this.modAttackGlove = new ModAttack("Quartz", 2, new ItemStack[] { new ItemStack(Items.quartz), new ItemStack(Blocks.quartz_block, 1, Short.MAX_VALUE) }, new int[] { 1, 4 }, 50, 50,
"Accessory");
ModifyBuilder.registerModifier(this.modAttackGlove);
diff --git a/src/main/java/tconstruct/armor/items/Knapsack.java b/src/main/java/tconstruct/armor/items/Knapsack.java
index 03b810821c9..a7925d40777 100644
--- a/src/main/java/tconstruct/armor/items/Knapsack.java
+++ b/src/main/java/tconstruct/armor/items/Knapsack.java
@@ -7,10 +7,11 @@
import net.minecraft.item.ItemStack;
import net.minecraft.util.StatCollector;
import tconstruct.library.TConstructRegistry;
+import tconstruct.library.accessory.IAccessory;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
-public class Knapsack extends CraftingItem
+public class Knapsack extends CraftingItem implements IAccessory
{
public Knapsack()
@@ -31,6 +32,12 @@ public void addInformation (ItemStack stack, EntityPlayer player, List list, boo
}
}
+ @Override
+ public boolean canEquipAccessory (ItemStack item, int slot)
+ {
+ return slot == 2;
+ }
+
// TODO feel fix this so that stuff ticks in backpacks
/*
* @Override public void onArmorTickUpdate (World world, EntityPlayer
diff --git a/src/main/java/tconstruct/armor/items/TravelGear.java b/src/main/java/tconstruct/armor/items/TravelGear.java
index fcd4ef26717..23111421cf6 100644
--- a/src/main/java/tconstruct/armor/items/TravelGear.java
+++ b/src/main/java/tconstruct/armor/items/TravelGear.java
@@ -175,7 +175,7 @@ public void addInformation (ItemStack stack, EntityPlayer player, List list, boo
switch (armorPart)
{
case Head:
- list.add("\u00a76Ability: Zoom with");
+ list.add("\u00a76Ability: Zoom with " + GameSettings.getKeyDisplayString(tconstruct.client.TControls.zoomKey.getKeyCode()));
list.add("\u00a76Toggle Abilities: " + GameSettings.getKeyDisplayString(tconstruct.client.TControls.toggleGoggles.getKeyCode()));
break;
case Chest:
diff --git a/src/main/java/tconstruct/client/TControls.java b/src/main/java/tconstruct/client/TControls.java
index 431b4a13c10..8668ce91acc 100644
--- a/src/main/java/tconstruct/client/TControls.java
+++ b/src/main/java/tconstruct/client/TControls.java
@@ -9,12 +9,16 @@
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.potion.Potion;
import tconstruct.TConstruct;
+import tconstruct.armor.ArmorProxyClient;
import tconstruct.armor.ArmorProxyCommon;
+import tconstruct.armor.PlayerAbilityHelper;
+import tconstruct.armor.items.TravelGear;
import tconstruct.client.event.EventCloakRender;
import tconstruct.client.tabs.TabRegistry;
-import tconstruct.util.network.packet.PacketDoubleJump;
-import tconstruct.util.network.packet.PacketExtendedInventory;
-import cpw.mods.fml.client.registry.ClientRegistry;
+import tconstruct.util.network.AccessoryInventoryPacket;
+import tconstruct.util.network.BeltPacket;
+import tconstruct.util.network.DoubleJumpPacket;
+import tconstruct.util.network.GogglePacket;
import cpw.mods.fml.common.gameevent.TickEvent.Type;
public class TControls extends TKeyHandler
@@ -33,8 +37,8 @@ public class TControls extends TKeyHandler
int midairJumps = 0;
boolean climbing = false;
boolean onGround = false;
- boolean onStilts = false;
public static boolean zoom = false;
+ boolean activeGoggles = false; //TODO: Set this on server login
int currentTab = 1;
@@ -113,37 +117,29 @@ public void keyDown (Type types, KeyBinding kb, boolean tickEnd, boolean isRepea
}
}
- /*if (mc.currentScreen == null)
+ if (mc.currentScreen == null)
{
if (kb == toggleGoggles)
{
ItemStack goggles = mc.thePlayer.getCurrentArmor(3);
if (goggles != null && goggles.getItem() instanceof TravelGear) //TODO: Genericize this
{
- PlayerAbilityHelper.toggleGoggles(mc.thePlayer);
- updateServer((byte) 9);
+ activeGoggles = !activeGoggles;
+ toggleGoggles();
}
}
if (kb == beltSwap)
{
- TPlayerStats stats = TConstruct.playerTracker.getPlayerStats(mc.thePlayer.username);
- if (stats.armor.inventory[3] != null)
+ if (ArmorProxyClient.armorExtended.inventory[3] != null)
{
- //PlayerAbilityHelper.swapBelt(mc.thePlayer, stats);
- updateServer((byte) 8);
+ PlayerAbilityHelper.swapBelt(mc.thePlayer, ArmorProxyClient.armorExtended);
+ toggleBelt();
}
}
if (kb == zoomKey)
zoom = !zoom;
- }*/
+ }
}
- /*
- * else if (kb == stiltsKey) //Stilts { float size = 1.8F; if
- * (!onStilts) size = 0.8F;
- * TConstruct.playerTracker.updateSize(mc.thePlayer.username, size);
- * onStilts = !onStilts; //updateServer(mc.thePlayer.username, (byte)
- * 11); if (onStilts) { onStilts = false; } else { onStilts = true; } }
- */
}
@Override
@@ -164,46 +160,35 @@ public void resetControls ()
jumping = false;
climbing = false;
onGround = false;
- onStilts = false;
}
void resetFallDamage ()
{
- AbstractPacket packet = new PacketDoubleJump();
+ AbstractPacket packet = new DoubleJumpPacket();
updateServer(packet);
}
- void updateSize (String name, float size)
- {
- /*ByteArrayOutputStream bos = new ByteArrayOutputStream(8);
- DataOutputStream outputStream = new DataOutputStream(bos);
- try
- {
- outputStream.writeByte(11);
- outputStream.writeUTF(name);
- outputStream.writeFloat(size);
- }
- catch (Exception ex)
- {
- ex.printStackTrace();
- }
-
- updateServer(bos);*/
-
- //TODO: Enable code with right packet
- //AbstractPacket packet = new ();
- //updateServer(packet);
- }
-
public static void openArmorGui ()
{
- AbstractPacket packet = new PacketExtendedInventory(ArmorProxyCommon.armorGuiID);
+ AbstractPacket packet = new AccessoryInventoryPacket(ArmorProxyCommon.armorGuiID);
updateServer(packet);
}
public static void openKnapsackGui ()
{
- AbstractPacket packet = new PacketExtendedInventory(ArmorProxyCommon.knapsackGuiID);
+ AbstractPacket packet = new AccessoryInventoryPacket(ArmorProxyCommon.knapsackGuiID);
+ updateServer(packet);
+ }
+
+ private void toggleGoggles()
+ {
+ AbstractPacket packet = new GogglePacket(activeGoggles);
+ updateServer(packet);
+ }
+
+ private void toggleBelt()
+ {
+ AbstractPacket packet = new BeltPacket();
updateServer(packet);
}
diff --git a/src/main/java/tconstruct/library/client/TConstructClientRegistry.java b/src/main/java/tconstruct/library/client/TConstructClientRegistry.java
index eb3e4c15390..8c0ac96dea4 100644
--- a/src/main/java/tconstruct/library/client/TConstructClientRegistry.java
+++ b/src/main/java/tconstruct/library/client/TConstructClientRegistry.java
@@ -8,6 +8,7 @@
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
import tconstruct.library.TConstructRegistry;
+import tconstruct.library.crafting.ModifyBuilder;
import tconstruct.library.crafting.ToolBuilder;
import tconstruct.library.tools.ToolCore;
@@ -87,7 +88,7 @@ public static void registerManualModifier (String name, ItemStack output, ItemSt
public static void registerManualModifier (String name, ItemStack output, ItemStack topinput, ItemStack bottominput)
{
ItemStack[] recipe = new ItemStack[3];
- recipe[0] = ToolBuilder.instance.buildTool(output, topinput, bottominput, "");
+ recipe[0] = ModifyBuilder.instance.modifyItem(output, new ItemStack[] {topinput, bottominput});//ToolBuilder.instance.buildTool(output, topinput, bottominput, "");
recipe[1] = topinput;
recipe[2] = bottominput;
MantleClientRegistry.recipeIcons.put(name, recipe);
diff --git a/src/main/java/tconstruct/smeltery/gui/SmelteryGui.java b/src/main/java/tconstruct/smeltery/gui/SmelteryGui.java
index 2eade5aba41..f9065f6d58b 100644
--- a/src/main/java/tconstruct/smeltery/gui/SmelteryGui.java
+++ b/src/main/java/tconstruct/smeltery/gui/SmelteryGui.java
@@ -26,7 +26,7 @@
import tconstruct.smeltery.inventory.ActiveContainer;
import tconstruct.smeltery.inventory.SmelteryContainer;
import tconstruct.smeltery.logic.SmelteryLogic;
-import tconstruct.util.network.packet.PacketSmeltery;
+import tconstruct.util.network.SmelteryPacket;
public class SmelteryGui extends NewContainerGui
{
@@ -474,7 +474,7 @@ public void mouseClicked (int mouseX, int mouseY, int mouseButton)
fluidToBeBroughtUp = liquid.fluidID;
TConstruct.packetPipeline
- .sendToServer(new PacketSmeltery(logic.getWorldObj().provider.dimensionId, logic.xCoord, logic.yCoord, logic.zCoord, this.isShiftKeyDown(), fluidToBeBroughtUp));
+ .sendToServer(new SmelteryPacket(logic.getWorldObj().provider.dimensionId, logic.xCoord, logic.yCoord, logic.zCoord, this.isShiftKeyDown(), fluidToBeBroughtUp));
}
}
}
diff --git a/src/main/java/tconstruct/tools/gui/StencilTableGui.java b/src/main/java/tconstruct/tools/gui/StencilTableGui.java
index a59804c4b5e..4ef8b9f3438 100644
--- a/src/main/java/tconstruct/tools/gui/StencilTableGui.java
+++ b/src/main/java/tconstruct/tools/gui/StencilTableGui.java
@@ -14,7 +14,7 @@
import tconstruct.tools.TinkerTools;
import tconstruct.tools.inventory.PatternShaperContainer;
import tconstruct.tools.logic.StencilTableLogic;
-import tconstruct.util.network.packet.PacketStencilTable;
+import tconstruct.util.network.PatternTablePacket;
public class StencilTableGui extends GuiContainer
{
@@ -122,6 +122,6 @@ else if (button.id == 1)
void updateServer (ItemStack stack)
{
- TConstruct.packetPipeline.sendToServer(new PacketStencilTable(logic.xCoord, logic.yCoord, logic.zCoord, stack));
+ TConstruct.packetPipeline.sendToServer(new PatternTablePacket(logic.xCoord, logic.yCoord, logic.zCoord, stack));
}
}
\ No newline at end of file
diff --git a/src/main/java/tconstruct/tools/gui/ToolStationGui.java b/src/main/java/tconstruct/tools/gui/ToolStationGui.java
index cb5c97a1803..5ce1d25bec0 100644
--- a/src/main/java/tconstruct/tools/gui/ToolStationGui.java
+++ b/src/main/java/tconstruct/tools/gui/ToolStationGui.java
@@ -25,7 +25,7 @@
import tconstruct.smeltery.inventory.ActiveContainer;
import tconstruct.tools.inventory.ToolStationContainer;
import tconstruct.tools.logic.ToolStationLogic;
-import tconstruct.util.network.packet.PacketToolStation;
+import tconstruct.util.network.ToolStationPacket;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -506,7 +506,7 @@ void updateServer (String name)
* PacketDispatcher.sendPacketToServer(packet);
*/
- TConstruct.packetPipeline.sendToServer(new PacketToolStation(logic.xCoord, logic.yCoord, logic.zCoord, name));
+ TConstruct.packetPipeline.sendToServer(new ToolStationPacket(logic.xCoord, logic.yCoord, logic.zCoord, name));
}
/*
diff --git a/src/main/java/tconstruct/util/network/packet/PacketExtendedInventory.java b/src/main/java/tconstruct/util/network/AccessoryInventoryPacket.java
similarity index 88%
rename from src/main/java/tconstruct/util/network/packet/PacketExtendedInventory.java
rename to src/main/java/tconstruct/util/network/AccessoryInventoryPacket.java
index 19236ff6cf2..c9ebb549090 100644
--- a/src/main/java/tconstruct/util/network/packet/PacketExtendedInventory.java
+++ b/src/main/java/tconstruct/util/network/AccessoryInventoryPacket.java
@@ -1,4 +1,4 @@
-package tconstruct.util.network.packet;
+package tconstruct.util.network;
import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandlerContext;
@@ -7,17 +7,17 @@
import tconstruct.TConstruct;
import tconstruct.armor.ArmorProxyCommon;
-public class PacketExtendedInventory extends AbstractPacket
+public class AccessoryInventoryPacket extends AbstractPacket
{
int type;
- public PacketExtendedInventory()
+ public AccessoryInventoryPacket()
{
}
- public PacketExtendedInventory(int type)
+ public AccessoryInventoryPacket(int type)
{
this.type = type;
}
diff --git a/src/main/java/tconstruct/util/network/BeltPacket.java b/src/main/java/tconstruct/util/network/BeltPacket.java
new file mode 100644
index 00000000000..8e05f589e70
--- /dev/null
+++ b/src/main/java/tconstruct/util/network/BeltPacket.java
@@ -0,0 +1,36 @@
+package tconstruct.util.network;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandlerContext;
+import mantle.common.network.AbstractPacket;
+import net.minecraft.entity.player.EntityPlayer;
+import tconstruct.armor.PlayerAbilityHelper;
+import tconstruct.armor.player.TPlayerStats;
+
+public class BeltPacket extends AbstractPacket
+{
+ public BeltPacket() {}
+
+ @Override
+ public void encodeInto (ChannelHandlerContext ctx, ByteBuf buffer)
+ {
+ }
+
+ @Override
+ public void decodeInto (ChannelHandlerContext ctx, ByteBuf buffer)
+ {
+ }
+
+ @Override
+ public void handleClientSide (EntityPlayer player)
+ {
+
+ }
+
+ @Override
+ public void handleServerSide (EntityPlayer player)
+ {
+ PlayerAbilityHelper.swapBelt(player, TPlayerStats.get(player).armor);
+ }
+
+}
diff --git a/src/main/java/tconstruct/util/network/packet/PacketDoubleJump.java b/src/main/java/tconstruct/util/network/DoubleJumpPacket.java
similarity index 88%
rename from src/main/java/tconstruct/util/network/packet/PacketDoubleJump.java
rename to src/main/java/tconstruct/util/network/DoubleJumpPacket.java
index 560edec0927..c0dd277d368 100644
--- a/src/main/java/tconstruct/util/network/packet/PacketDoubleJump.java
+++ b/src/main/java/tconstruct/util/network/DoubleJumpPacket.java
@@ -1,11 +1,11 @@
-package tconstruct.util.network.packet;
+package tconstruct.util.network;
import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandlerContext;
import mantle.common.network.AbstractPacket;
import net.minecraft.entity.player.EntityPlayer;
-public class PacketDoubleJump extends AbstractPacket
+public class DoubleJumpPacket extends AbstractPacket
{
@Override
diff --git a/src/main/java/tconstruct/util/network/GogglePacket.java b/src/main/java/tconstruct/util/network/GogglePacket.java
new file mode 100644
index 00000000000..2d38a7425ee
--- /dev/null
+++ b/src/main/java/tconstruct/util/network/GogglePacket.java
@@ -0,0 +1,47 @@
+package tconstruct.util.network;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandlerContext;
+import mantle.common.network.AbstractPacket;
+import net.minecraft.entity.player.EntityPlayer;
+import tconstruct.armor.PlayerAbilityHelper;
+import tconstruct.armor.player.TPlayerStats;
+
+public class GogglePacket extends AbstractPacket
+{
+ boolean active;
+
+ public GogglePacket() {}
+
+ public GogglePacket(boolean active)
+ {
+ this.active = active;
+ }
+
+ @Override
+ public void encodeInto (ChannelHandlerContext ctx, ByteBuf buffer)
+ {
+ buffer.writeBoolean(active);
+ }
+
+ @Override
+ public void decodeInto (ChannelHandlerContext ctx, ByteBuf buffer)
+ {
+ active = buffer.readBoolean();
+ }
+
+ @Override
+ public void handleClientSide (EntityPlayer player)
+ {
+
+ }
+
+ @Override
+ public void handleServerSide (EntityPlayer player)
+ {
+ PlayerAbilityHelper.toggleGoggles(player, active);
+ /*TPlayerStats stats = TPlayerStats.get(player);
+ stats.activeGoggles = active;*/
+ }
+
+}
diff --git a/src/main/java/tconstruct/util/network/packet/PacketPipeline.java b/src/main/java/tconstruct/util/network/PacketPipeline.java
similarity index 96%
rename from src/main/java/tconstruct/util/network/packet/PacketPipeline.java
rename to src/main/java/tconstruct/util/network/PacketPipeline.java
index 17db0bd0db6..c11492db433 100644
--- a/src/main/java/tconstruct/util/network/packet/PacketPipeline.java
+++ b/src/main/java/tconstruct/util/network/PacketPipeline.java
@@ -1,4 +1,4 @@
-package tconstruct.util.network.packet;
+package tconstruct.util.network;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
@@ -136,11 +136,11 @@ public void initalise ()
public void registerPackets ()
{
- registerPacket(PacketDoubleJump.class);
- registerPacket(PacketExtendedInventory.class);
- registerPacket(PacketSmeltery.class);
- registerPacket(PacketStencilTable.class);
- registerPacket(PacketToolStation.class);
+ registerPacket(DoubleJumpPacket.class);
+ registerPacket(AccessoryInventoryPacket.class);
+ registerPacket(SmelteryPacket.class);
+ registerPacket(PatternTablePacket.class);
+ registerPacket(ToolStationPacket.class);
registerPacket(PacketUpdateTE.class);
}
diff --git a/src/main/java/tconstruct/util/network/packet/PacketStencilTable.java b/src/main/java/tconstruct/util/network/PatternTablePacket.java
similarity index 88%
rename from src/main/java/tconstruct/util/network/packet/PacketStencilTable.java
rename to src/main/java/tconstruct/util/network/PatternTablePacket.java
index 31335845b66..6cc2cf247d7 100644
--- a/src/main/java/tconstruct/util/network/packet/PacketStencilTable.java
+++ b/src/main/java/tconstruct/util/network/PatternTablePacket.java
@@ -1,4 +1,4 @@
-package tconstruct.util.network.packet;
+package tconstruct.util.network;
import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandlerContext;
@@ -10,18 +10,18 @@
import net.minecraft.world.World;
import cpw.mods.fml.common.network.ByteBufUtils;
-public class PacketStencilTable extends AbstractPacket
+public class PatternTablePacket extends AbstractPacket
{
int x, y, z;
ItemStack contents;
- public PacketStencilTable()
+ public PatternTablePacket()
{
}
- public PacketStencilTable(int x, int y, int z, ItemStack contents)
+ public PatternTablePacket(int x, int y, int z, ItemStack contents)
{
this.x = x;
this.y = y;
diff --git a/src/main/java/tconstruct/util/network/packet/PacketSmeltery.java b/src/main/java/tconstruct/util/network/SmelteryPacket.java
similarity index 93%
rename from src/main/java/tconstruct/util/network/packet/PacketSmeltery.java
rename to src/main/java/tconstruct/util/network/SmelteryPacket.java
index 48300d878c6..96157a2310d 100644
--- a/src/main/java/tconstruct/util/network/packet/PacketSmeltery.java
+++ b/src/main/java/tconstruct/util/network/SmelteryPacket.java
@@ -1,4 +1,4 @@
-package tconstruct.util.network.packet;
+package tconstruct.util.network;
import cpw.mods.fml.common.FMLCommonHandler;
import io.netty.buffer.ByteBuf;
@@ -13,18 +13,18 @@
import tconstruct.TConstruct;
import tconstruct.smeltery.logic.SmelteryLogic;
-public class PacketSmeltery extends AbstractPacket
+public class SmelteryPacket extends AbstractPacket
{
int dimension, x, y, z, fluidID;
boolean isShiftPressed;
- public PacketSmeltery()
+ public SmelteryPacket()
{
}
- public PacketSmeltery(int dimension, int x, int y, int z, boolean isShiftPressed, int fluidID)
+ public SmelteryPacket(int dimension, int x, int y, int z, boolean isShiftPressed, int fluidID)
{
this.dimension = dimension;
this.x = x;
diff --git a/src/main/java/tconstruct/util/network/packet/PacketToolStation.java b/src/main/java/tconstruct/util/network/ToolStationPacket.java
similarity index 89%
rename from src/main/java/tconstruct/util/network/packet/PacketToolStation.java
rename to src/main/java/tconstruct/util/network/ToolStationPacket.java
index e528f3109ca..e4ff96b1bc1 100644
--- a/src/main/java/tconstruct/util/network/packet/PacketToolStation.java
+++ b/src/main/java/tconstruct/util/network/ToolStationPacket.java
@@ -1,4 +1,4 @@
-package tconstruct.util.network.packet;
+package tconstruct.util.network;
import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandlerContext;
@@ -10,17 +10,17 @@
import tconstruct.tools.logic.ToolStationLogic;
import cpw.mods.fml.common.network.ByteBufUtils;
-public class PacketToolStation extends AbstractPacket
+public class ToolStationPacket extends AbstractPacket
{
private int x, y, z;
private String toolName;
- public PacketToolStation()
+ public ToolStationPacket()
{
}
- public PacketToolStation(int x, int y, int z, String toolName)
+ public ToolStationPacket(int x, int y, int z, String toolName)
{
this.x = x;
this.y = y;