diff --git a/build.properties b/build.properties index ee58cd0f..ef163b1f 100644 --- a/build.properties +++ b/build.properties @@ -1,6 +1,6 @@ minecraft_version=1.7.2 -forge_version=10.12.1.1074 -mantle_version=143.727db8b +forge_version=10.12.1.1101 +mantle_version=145.3a637c2 FMP_version=1.1.0.268 CCLIB_version=1.1.0.77 NEI_version=1.0.1 diff --git a/src/main/java/tconstruct/client/TControls.java b/src/main/java/tconstruct/client/TControls.java index 69a54a43..4af39e54 100644 --- a/src/main/java/tconstruct/client/TControls.java +++ b/src/main/java/tconstruct/client/TControls.java @@ -1,6 +1,7 @@ package tconstruct.client; import cpw.mods.fml.common.gameevent.TickEvent.Type; +import mantle.common.network.AbstractPacket; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.gui.inventory.GuiInventory; @@ -10,7 +11,6 @@ import tconstruct.TConstruct; import tconstruct.client.event.EventCloakRender; import tconstruct.client.tabs.TabRegistry; import tconstruct.common.TProxyCommon; -import tconstruct.util.network.packet.AbstractPacket; import tconstruct.util.network.packet.PacketDoubleJump; import tconstruct.util.network.packet.PacketExtendedInventory; diff --git a/src/main/java/tconstruct/common/TRecipes.java b/src/main/java/tconstruct/common/TRecipes.java index 391bf79c..819517a6 100644 --- a/src/main/java/tconstruct/common/TRecipes.java +++ b/src/main/java/tconstruct/common/TRecipes.java @@ -8,6 +8,7 @@ import java.util.HashMap; import java.util.List; import mantle.blocks.abstracts.MultiServantLogic; +import mantle.utils.RecipeRemover; import net.minecraft.block.Block; import net.minecraft.block.BlockDispenser; import net.minecraft.init.Blocks; @@ -112,7 +113,6 @@ import tconstruct.modifiers.tools.ModReinforced; import tconstruct.modifiers.tools.ModRepair; import tconstruct.modifiers.tools.ModSmite; import tconstruct.modifiers.tools.TActiveOmniMod; -import tconstruct.util.RecipeRemover; import tconstruct.util.TDispenserBehaviorArrow; import tconstruct.util.TDispenserBehaviorSpawnEgg; import tconstruct.util.config.PHConstruct; diff --git a/src/main/java/tconstruct/util/network/packet/AbstractPacket.java b/src/main/java/tconstruct/util/network/packet/AbstractPacket.java deleted file mode 100644 index 6e8dfff2..00000000 --- a/src/main/java/tconstruct/util/network/packet/AbstractPacket.java +++ /dev/null @@ -1,57 +0,0 @@ -package tconstruct.util.network.packet; - -import io.netty.buffer.ByteBuf; -import io.netty.channel.ChannelHandlerContext; -import net.minecraft.entity.player.EntityPlayer; - -/** - * AbstractPacket class. Should be the parent of all packets wishing to use the - * PacketPipeline. - * - * @author sirgingalot - */ -public abstract class AbstractPacket -{ - - /** - * Encode the packet data into the ByteBuf stream. Complex data sets may - * need specific data handlers (See - * @link{cpw.mods.fml.common.network.ByteBuffUtils}) - * - * @param ctx - * channel context - * @param buffer - * the buffer to encode into - */ - public abstract void encodeInto (ChannelHandlerContext ctx, ByteBuf buffer); - - /** - * Decode the packet data from the ByteBuf stream. Complex data sets may - * need specific data handlers (See - * @link{cpw.mods.fml.common.network.ByteBuffUtils}) - * - * @param ctx - * channel context - * @param buffer - * the buffer to decode from - */ - public abstract void decodeInto (ChannelHandlerContext ctx, ByteBuf buffer); - - /** - * Handle a packet on the client side. Note this occurs after decoding has - * completed. - * - * @param player - * the player reference - */ - public abstract void handleClientSide (EntityPlayer player); - - /** - * Handle a packet on the server side. Note this occurs after decoding has - * completed. - * - * @param player - * the player reference - */ - public abstract void handleServerSide (EntityPlayer player); -} diff --git a/src/main/java/tconstruct/util/network/packet/PacketDoubleJump.java b/src/main/java/tconstruct/util/network/packet/PacketDoubleJump.java index 6d9635df..560edec0 100644 --- a/src/main/java/tconstruct/util/network/packet/PacketDoubleJump.java +++ b/src/main/java/tconstruct/util/network/packet/PacketDoubleJump.java @@ -2,6 +2,7 @@ package tconstruct.util.network.packet; 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 diff --git a/src/main/java/tconstruct/util/network/packet/PacketExtendedInventory.java b/src/main/java/tconstruct/util/network/packet/PacketExtendedInventory.java index b11007ee..a07d52b4 100644 --- a/src/main/java/tconstruct/util/network/packet/PacketExtendedInventory.java +++ b/src/main/java/tconstruct/util/network/packet/PacketExtendedInventory.java @@ -2,6 +2,7 @@ package tconstruct.util.network.packet; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; +import mantle.common.network.AbstractPacket; import net.minecraft.entity.player.EntityPlayer; import tconstruct.TConstruct; import tconstruct.common.TProxyCommon; diff --git a/src/main/java/tconstruct/util/network/packet/PacketPipeline.java b/src/main/java/tconstruct/util/network/packet/PacketPipeline.java index 6abf94ed..17db0bd0 100644 --- a/src/main/java/tconstruct/util/network/packet/PacketPipeline.java +++ b/src/main/java/tconstruct/util/network/packet/PacketPipeline.java @@ -12,6 +12,8 @@ import java.util.EnumMap; import java.util.LinkedList; import java.util.List; +import mantle.common.network.AbstractPacket; +import mantle.common.network.PacketUpdateTE; import net.minecraft.client.Minecraft; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; diff --git a/src/main/java/tconstruct/util/network/packet/PacketSmeltery.java b/src/main/java/tconstruct/util/network/packet/PacketSmeltery.java index 18ec91f4..b5753be5 100644 --- a/src/main/java/tconstruct/util/network/packet/PacketSmeltery.java +++ b/src/main/java/tconstruct/util/network/packet/PacketSmeltery.java @@ -1,9 +1,10 @@ package tconstruct.util.network.packet; import cpw.mods.fml.common.FMLCommonHandler; - import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; +import mantle.common.network.AbstractPacket; +import mantle.common.network.PacketUpdateTE; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/tconstruct/util/network/packet/PacketStencilTable.java b/src/main/java/tconstruct/util/network/packet/PacketStencilTable.java index 050aa214..31335845 100644 --- a/src/main/java/tconstruct/util/network/packet/PacketStencilTable.java +++ b/src/main/java/tconstruct/util/network/packet/PacketStencilTable.java @@ -3,6 +3,7 @@ package tconstruct.util.network.packet; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; import mantle.blocks.abstracts.InventoryLogic; +import mantle.common.network.AbstractPacket; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/tconstruct/util/network/packet/PacketToolStation.java b/src/main/java/tconstruct/util/network/packet/PacketToolStation.java index c6f5cce7..6960cb88 100644 --- a/src/main/java/tconstruct/util/network/packet/PacketToolStation.java +++ b/src/main/java/tconstruct/util/network/packet/PacketToolStation.java @@ -2,6 +2,7 @@ package tconstruct.util.network.packet; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; +import mantle.common.network.AbstractPacket; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; diff --git a/src/main/java/tconstruct/util/network/packet/PacketUpdateTE.java b/src/main/java/tconstruct/util/network/packet/PacketUpdateTE.java deleted file mode 100644 index 78de19ac..00000000 --- a/src/main/java/tconstruct/util/network/packet/PacketUpdateTE.java +++ /dev/null @@ -1,79 +0,0 @@ -package tconstruct.util.network.packet; - -import io.netty.buffer.ByteBuf; -import io.netty.channel.ChannelHandlerContext; -import java.io.IOException; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.network.PacketBuffer; -import net.minecraft.tileentity.TileEntity; - -public class PacketUpdateTE extends AbstractPacket -{ - private int x, y, z; - private NBTTagCompound data; - - public PacketUpdateTE() - { - - } - - public PacketUpdateTE(int x, int y, int z, NBTTagCompound data) - { - this.x = x; - this.y = y; - this.z = z; - this.data = data; - } - - @Override - public void encodeInto (ChannelHandlerContext ctx, ByteBuf buffer) - { - PacketBuffer pbuff = new PacketBuffer(buffer); - pbuff.writeInt(x); - pbuff.writeShort(y); - pbuff.writeInt(z); - try - { - pbuff.writeNBTTagCompoundToBuffer(data); - } - catch (Exception e) - { - e.printStackTrace(); - } - } - - @Override - public void decodeInto (ChannelHandlerContext ctx, ByteBuf buffer) - { - PacketBuffer pbuff = new PacketBuffer(buffer); - x = pbuff.readInt(); - y = pbuff.readShort(); - z = pbuff.readInt(); - try - { - data = pbuff.readNBTTagCompoundFromBuffer(); - } - catch (Exception e) - { - e.printStackTrace(); - } - } - - @Override - public void handleClientSide (EntityPlayer player) - { - TileEntity te = player.worldObj.getTileEntity(x, y, z); - - if (te != null) - { - te.readFromNBT(data); - } - } - - @Override - public void handleServerSide (EntityPlayer player) - { - } - -}