From 8be5ecf140d60d18f7912f8ef137453f4206b6f2 Mon Sep 17 00:00:00 2001 From: "Aidan C. Brady" Date: Fri, 30 May 2014 23:49:24 +0200 Subject: [PATCH] Down to 215 errors, pretty much everything is packets now --- .../mekanism/client/gui/GuiDigitalMiner.java | 2 +- .../client/gui/GuiLogisticalSorter.java | 2 +- .../mekanism/client/gui/GuiRobitRepair.java | 2 +- .../client/render/RenderPartTransmitter.java | 5 +++-- .../mekanism/common/CommonPlayerTracker.java | 9 +++++++-- .../common/item/ItemBlockEnergyCube.java | 2 +- .../common/item/ItemBlockGasTank.java | 6 ++++-- .../common/item/ItemBlockMachine.java | 19 +++++++++++++------ .../mekanism/common/item/ItemScubaTank.java | 3 ++- .../multipart/PartDiversionTransporter.java | 2 +- .../multipart/PartLogisticalTransporter.java | 3 ++- .../common/tile/TileEntityContainerBlock.java | 3 ++- .../common/tile/TileEntityDigitalMiner.java | 4 ++-- .../common/tile/TileEntityElectricPump.java | 5 +++-- .../tile/TileEntityLogisticalSorter.java | 7 ++++--- .../mekanism/common/util/MekanismUtils.java | 16 ---------------- .../java/mekanism/common/util/MinerUtils.java | 4 ++-- 17 files changed, 49 insertions(+), 45 deletions(-) diff --git a/src/main/java/mekanism/client/gui/GuiDigitalMiner.java b/src/main/java/mekanism/client/gui/GuiDigitalMiner.java index c00bf1adb..ece04204f 100644 --- a/src/main/java/mekanism/client/gui/GuiDigitalMiner.java +++ b/src/main/java/mekanism/client/gui/GuiDigitalMiner.java @@ -361,7 +361,7 @@ public class GuiDigitalMiner extends GuiMekanism if(stack != null) { data.add(false); - data.add(toUse.itemID); + data.add(MekanismUtils.getID(toUse)); data.add(toUse.getItemDamage()); } else { diff --git a/src/main/java/mekanism/client/gui/GuiLogisticalSorter.java b/src/main/java/mekanism/client/gui/GuiLogisticalSorter.java index 11af9ba4a..bcfb5ccc2 100644 --- a/src/main/java/mekanism/client/gui/GuiLogisticalSorter.java +++ b/src/main/java/mekanism/client/gui/GuiLogisticalSorter.java @@ -9,7 +9,7 @@ import java.util.Set; import mekanism.api.Coord4D; import mekanism.client.render.MekanismRenderer; -import mekanism.common.PacketHandler; +import mekanism.common.Mekanism; import mekanism.common.inventory.container.ContainerNull; import mekanism.common.network.PacketLogisticalSorterGui; import mekanism.common.network.PacketLogisticalSorterGui.SorterGuiPacket; diff --git a/src/main/java/mekanism/client/gui/GuiRobitRepair.java b/src/main/java/mekanism/client/gui/GuiRobitRepair.java index 1a73cadb6..e7b563905 100644 --- a/src/main/java/mekanism/client/gui/GuiRobitRepair.java +++ b/src/main/java/mekanism/client/gui/GuiRobitRepair.java @@ -126,7 +126,7 @@ public class GuiRobitRepair extends GuiMekanism implements ICrafting if(itemNameField.textboxKeyTyped(c, i)) { repairContainer.updateItemName(itemNameField.getText()); - mc.thePlayer.sendQueue.addToSendQueue(new Packet250CustomPayload("MC|ItemName", itemNameField.getText().getBytes())); + mc.thePlayer.sendQueue.addToSendQueue(new C17PacketCustomPayload("MC|ItemName", itemNameField.getText().getBytes())); } else { super.keyTyped(c, i); diff --git a/src/main/java/mekanism/client/render/RenderPartTransmitter.java b/src/main/java/mekanism/client/render/RenderPartTransmitter.java index faceaaa49..e460ad24f 100644 --- a/src/main/java/mekanism/client/render/RenderPartTransmitter.java +++ b/src/main/java/mekanism/client/render/RenderPartTransmitter.java @@ -53,6 +53,7 @@ import codechicken.lib.render.CCRenderState.IVertexOperation; import codechicken.lib.render.ColourMultiplier; import codechicken.lib.render.TextureUtils; import codechicken.lib.render.TextureUtils.IIconSelfRegister; +import codechicken.lib.render.uv.IconTransformation; import codechicken.lib.render.uv.UV; import codechicken.lib.vec.Translation; import codechicken.lib.vec.Vector3; @@ -550,12 +551,12 @@ public class RenderPartTransmitter implements IIconSelfRegister public void renderPart(IIcon icon, CCModel cc, double x, double y, double z, Colour color, LazyLightMatrix olm) { - cc.render(0, cc.verts.length, new Translation(x, y, z), new IIconTransformation(icon), new TransmitterTransformation(color, null)); + cc.render(0, cc.verts.length, new Translation(x, y, z), new IconTransformation(icon), new TransmitterTransformation(color, null)); } public void renderTransparency(IIcon icon, CCModel cc, Colour colour) { - cc.render(0, cc.verts.length, new Translation(0, 0, 0), new IIconTransformation(icon), new ColourMultiplier(colour)); + cc.render(0, cc.verts.length, new Translation(0, 0, 0), new IconTransformation(icon), new ColourMultiplier(colour)); } public CCModel getItemModel(ForgeDirection side, TransmitterType type) diff --git a/src/main/java/mekanism/common/CommonPlayerTracker.java b/src/main/java/mekanism/common/CommonPlayerTracker.java index 9d94a8b71..9d73ad956 100644 --- a/src/main/java/mekanism/common/CommonPlayerTracker.java +++ b/src/main/java/mekanism/common/CommonPlayerTracker.java @@ -47,10 +47,15 @@ public class CommonPlayerTracker @SubscribeEvent public void onPlayerDimChangedEvent(PlayerChangedDimensionEvent event) { - onPlayerChangedDimension(event.player); + Mekanism.jetpackOn.remove(event.player); + + if(!event.player.worldObj.isRemote) + { + Mekanism.packetPipeline.sendTo(new PacketJetpackData(JetpackPacket.FULL), event.player); + Mekanism.packetPipeline.sendTo(new PacketScubaTankData(ScubaTankPacket.FULL), event.player); + } } - @Override public void onPlayerChangedDimension(EntityPlayer player) { Mekanism.jetpackOn.remove(player); diff --git a/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java b/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java index 2f46c7615..72dd1a233 100644 --- a/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java +++ b/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java @@ -176,7 +176,7 @@ public class ItemBlockEnergyCube extends ItemBlock implements IEnergizedItem, IE return null; } - return itemStack.stackTagCompound.getTagList("Items", NBT.TAG_ANY_NUMERIC); + return itemStack.stackTagCompound.getTagList("Items", NBT.TAG_COMPOUND); } return null; diff --git a/src/main/java/mekanism/common/item/ItemBlockGasTank.java b/src/main/java/mekanism/common/item/ItemBlockGasTank.java index a3fdd928f..6fc319d0a 100644 --- a/src/main/java/mekanism/common/item/ItemBlockGasTank.java +++ b/src/main/java/mekanism/common/item/ItemBlockGasTank.java @@ -13,12 +13,14 @@ import mekanism.common.tile.TileEntityGasTank; import net.minecraft.block.Block; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.util.IIcon; import net.minecraft.world.World; +import net.minecraftforge.common.util.Constants.NBT; import org.lwjgl.input.Keyboard; @@ -157,7 +159,7 @@ public class ItemBlockGasTank extends ItemBlock implements IGasItem, ISustainedI } @Override - public void getSubItems(int i, CreativeTabs tabs, List list) + public void getSubItems(Item item, CreativeTabs tabs, List list) { ItemStack empty = new ItemStack(this); setGas(empty, null); @@ -262,7 +264,7 @@ public class ItemBlockGasTank extends ItemBlock implements IGasItem, ISustainedI return null; } - return itemStack.stackTagCompound.getTagList("Items"); + return itemStack.stackTagCompound.getTagList("Items", NBT.TAG_COMPOUND); } return null; diff --git a/src/main/java/mekanism/common/item/ItemBlockMachine.java b/src/main/java/mekanism/common/item/ItemBlockMachine.java index 091dd3bac..52e19b911 100644 --- a/src/main/java/mekanism/common/item/ItemBlockMachine.java +++ b/src/main/java/mekanism/common/item/ItemBlockMachine.java @@ -20,14 +20,20 @@ import mekanism.common.ISustainedInventory; import mekanism.common.ISustainedTank; import mekanism.common.IUpgradeManagement; import mekanism.common.Mekanism; -import mekanism.common.PacketHandler; import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.integration.IC2ItemManager; import mekanism.common.inventory.InventoryElectricChest; import mekanism.common.miner.MinerFilter; import mekanism.common.network.PacketElectricChest; import mekanism.common.network.PacketElectricChest.ElectricChestPacketType; -import mekanism.common.tile.*; +import mekanism.common.tile.TileEntityChemicalInfuser; +import mekanism.common.tile.TileEntityChemicalOxidizer; +import mekanism.common.tile.TileEntityDigitalMiner; +import mekanism.common.tile.TileEntityElectricBlock; +import mekanism.common.tile.TileEntityElectricChest; +import mekanism.common.tile.TileEntityFactory; +import mekanism.common.tile.TileEntityLogisticalSorter; +import mekanism.common.tile.TileEntityRotaryCondensentrator; import mekanism.common.transporter.TransporterFilter; import mekanism.common.util.MekanismUtils; import mekanism.common.util.TransporterUtils; @@ -43,6 +49,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.world.World; +import net.minecraftforge.common.util.Constants.NBT; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; @@ -236,7 +243,7 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec if(stack.stackTagCompound.hasKey("filters")) { - NBTTagList tagList = stack.stackTagCompound.getTagList("filters"); + NBTTagList tagList = stack.stackTagCompound.getTagList("filters", NBT.TAG_COMPOUND); for(int i = 0; i < tagList.tagCount(); i++) { @@ -262,7 +269,7 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec if(stack.stackTagCompound.hasKey("filters")) { - NBTTagList tagList = stack.stackTagCompound.getTagList("filters"); + NBTTagList tagList = stack.stackTagCompound.getTagList("filters", NBT.TAG_COMPOUND); for(int i = 0; i < tagList.tagCount(); i++) { @@ -577,8 +584,8 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec { return null; } - - return itemStack.stackTagCompound.getTagList("Items"); + + return itemStack.stackTagCompound.getTagList("Items", NBT.TAG_ANY_NUMERIC); } return null; diff --git a/src/main/java/mekanism/common/item/ItemScubaTank.java b/src/main/java/mekanism/common/item/ItemScubaTank.java index 3aa827c05..9ace195b6 100644 --- a/src/main/java/mekanism/common/item/ItemScubaTank.java +++ b/src/main/java/mekanism/common/item/ItemScubaTank.java @@ -16,6 +16,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; import net.minecraft.item.ItemArmor; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -219,7 +220,7 @@ public class ItemScubaTank extends ItemArmor implements IGasItem } @Override - public void getSubItems(int i, CreativeTabs tabs, List list) + public void getSubItems(Item item, CreativeTabs tabs, List list) { ItemStack empty = new ItemStack(this); setGas(empty, null); diff --git a/src/main/java/mekanism/common/multipart/PartDiversionTransporter.java b/src/main/java/mekanism/common/multipart/PartDiversionTransporter.java index ff3204ffd..f2fd35ba7 100644 --- a/src/main/java/mekanism/common/multipart/PartDiversionTransporter.java +++ b/src/main/java/mekanism/common/multipart/PartDiversionTransporter.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import mekanism.api.Coord4D; import mekanism.api.EnumColor; -import mekanism.common.PacketHandler; +import mekanism.common.Mekanism; import mekanism.common.network.PacketTileEntity; import mekanism.common.transporter.TransporterStack; import mekanism.common.util.MekanismUtils; diff --git a/src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java b/src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java index 878af2f12..f3648a38f 100644 --- a/src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java +++ b/src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java @@ -30,6 +30,7 @@ import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ChatComponentText; import net.minecraft.util.IIcon; +import net.minecraftforge.common.util.Constants.NBT; import net.minecraftforge.common.util.ForgeDirection; import buildcraft.api.transport.IPipeTile; import codechicken.lib.vec.Vector3; @@ -609,7 +610,7 @@ public class PartLogisticalTransporter extends PartSidedPipe implements ILogisti if(nbtTags.hasKey("stacks")) { - NBTTagList tagList = nbtTags.getTagList("stacks"); + NBTTagList tagList = nbtTags.getTagList("stacks", NBT.TAG_COMPOUND); for(int i = 0; i < tagList.tagCount(); i++) { diff --git a/src/main/java/mekanism/common/tile/TileEntityContainerBlock.java b/src/main/java/mekanism/common/tile/TileEntityContainerBlock.java index 4abdecead..3b023e88f 100644 --- a/src/main/java/mekanism/common/tile/TileEntityContainerBlock.java +++ b/src/main/java/mekanism/common/tile/TileEntityContainerBlock.java @@ -8,6 +8,7 @@ import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; +import net.minecraftforge.common.util.Constants.NBT; public abstract class TileEntityContainerBlock extends TileEntityBasicBlock implements ISidedInventory, ISustainedInventory { @@ -33,7 +34,7 @@ public abstract class TileEntityContainerBlock extends TileEntityBasicBlock impl if(handleInventory()) { - NBTTagList tagList = nbtTags.getTagList("Items"); + NBTTagList tagList = nbtTags.getTagList("Items", NBT.TAG_COMPOUND); inventory = new ItemStack[getSizeInventory()]; for(int tagCount = 0; tagCount < tagList.tagCount(); tagCount++) diff --git a/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java b/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java index 8c0c1f261..600b26e44 100644 --- a/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java +++ b/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java @@ -542,7 +542,7 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I if(nbtTags.hasKey("filters")) { - NBTTagList tagList = nbtTags.getTagList("filters", NBT.TAG_ANY_NUMERIC); + NBTTagList tagList = nbtTags.getTagList("filters", NBT.TAG_COMPOUND); for(int i = 0; i < tagList.tagCount(); i++) { @@ -1346,7 +1346,7 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I if(nbtTags.hasKey("filters")) { - NBTTagList tagList = nbtTags.getTagList("filters", NBT.TAG_ANY_NUMERIC); + NBTTagList tagList = nbtTags.getTagList("filters", NBT.TAG_COMPOUND); for(int i = 0; i < tagList.tagCount(); i++) { diff --git a/src/main/java/mekanism/common/tile/TileEntityElectricPump.java b/src/main/java/mekanism/common/tile/TileEntityElectricPump.java index 41df62e0b..edd3f6e60 100644 --- a/src/main/java/mekanism/common/tile/TileEntityElectricPump.java +++ b/src/main/java/mekanism/common/tile/TileEntityElectricPump.java @@ -24,6 +24,7 @@ import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ChatComponentText; import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.common.util.Constants.NBT; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; @@ -374,7 +375,7 @@ public class TileEntityElectricPump extends TileEntityElectricBlock implements I if(nbtTags.hasKey("recurringNodes")) { - NBTTagList tagList = nbtTags.getTagList("recurringNodes"); + NBTTagList tagList = nbtTags.getTagList("recurringNodes", NBT.TAG_COMPOUND); for(int i = 0; i < tagList.tagCount(); i++) { @@ -384,7 +385,7 @@ public class TileEntityElectricPump extends TileEntityElectricBlock implements I if(nbtTags.hasKey("cleaningNodes")) { - NBTTagList tagList = nbtTags.getTagList("cleaningNodes"); + NBTTagList tagList = nbtTags.getTagList("cleaningNodes", NBT.TAG_COMPOUND); for(int i = 0; i < tagList.tagCount(); i++) { diff --git a/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java b/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java index d1f7eca4d..2fe0e2fb5 100644 --- a/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java +++ b/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java @@ -10,7 +10,7 @@ import mekanism.common.HashList; import mekanism.common.IActiveState; import mekanism.common.ILogisticalTransporter; import mekanism.common.IRedstoneControl; -import mekanism.common.PacketHandler; +import mekanism.common.Mekanism; import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.network.PacketTileEntity; import mekanism.common.transporter.Finder.FirstFinder; @@ -27,6 +27,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.common.util.Constants.NBT; import net.minecraftforge.common.util.ForgeDirection; import com.google.common.io.ByteArrayDataInput; @@ -245,7 +246,7 @@ public class TileEntityLogisticalSorter extends TileEntityElectricBlock implemen if(nbtTags.hasKey("filters")) { - NBTTagList tagList = nbtTags.getTagList("filters"); + NBTTagList tagList = nbtTags.getTagList("filters", NBT.TAG_COMPOUND); for(int i = 0; i < tagList.tagCount(); i++) { @@ -604,7 +605,7 @@ public class TileEntityLogisticalSorter extends TileEntityElectricBlock implemen if(nbtTags.hasKey("filters")) { - NBTTagList tagList = nbtTags.getTagList("filters"); + NBTTagList tagList = nbtTags.getTagList("filters", NBT.TAG_COMPOUND); for(int i = 0; i < tagList.tagCount(); i++) { diff --git a/src/main/java/mekanism/common/util/MekanismUtils.java b/src/main/java/mekanism/common/util/MekanismUtils.java index 68b7f6211..85db4086f 100644 --- a/src/main/java/mekanism/common/util/MekanismUtils.java +++ b/src/main/java/mekanism/common/util/MekanismUtils.java @@ -216,22 +216,6 @@ public final class MekanismUtils return builder.toString(); } - /** - * Sends a Packet3Chat packet to the defined player, with the defined message. - * @param playerUsername - Player to send packet to. - * @param msg - message sent to player. - */ - public static void sendChatMessageToPlayer(String playerUsername, String msg) - { - EntityPlayer player = FMLServerHandler.instance().getServer().getConfigurationManager().getPlayerForUsername(playerUsername); - Packet3Chat chatPacket = new Packet3Chat(msg); - - if(player != null) - { - ((EntityPlayerMP)player).playerNetServerHandler.sendPacketToPlayer(chatPacket); - } - } - /** * Returns the closest teleporter between a selection of one or two. */ diff --git a/src/main/java/mekanism/common/util/MinerUtils.java b/src/main/java/mekanism/common/util/MinerUtils.java index c290200f5..c51edadb6 100644 --- a/src/main/java/mekanism/common/util/MinerUtils.java +++ b/src/main/java/mekanism/common/util/MinerUtils.java @@ -32,13 +32,13 @@ public final class MinerUtils if(!silk) { - return block.getBlockDropped(world, obj.xCoord, obj.yCoord, obj.zCoord, meta, 0); + return block.getDrops(world, obj.xCoord, obj.yCoord, obj.zCoord, meta, 0); } else { List ret = new ArrayList(); ret.add(new ItemStack(block, 1, meta)); - if(specialSilkIDs.contains(block) || (block.getBlockDropped(world, obj.xCoord, obj.yCoord, obj.zCoord, meta, 0) != null && block.getBlockDropped(world, obj.xCoord, obj.yCoord, obj.zCoord, meta, 0).size() > 0)) + if(specialSilkIDs.contains(block) || (block.getDrops(world, obj.xCoord, obj.yCoord, obj.zCoord, meta, 0) != null && block.getDrops(world, obj.xCoord, obj.yCoord, obj.zCoord, meta, 0).size() > 0)) { return ret; }