diff --git a/src/main/java/mekanism/api/ItemInfo.java b/src/main/java/mekanism/api/ItemInfo.java index b81f493d2..4fee46e69 100644 --- a/src/main/java/mekanism/api/ItemInfo.java +++ b/src/main/java/mekanism/api/ItemInfo.java @@ -1,29 +1,29 @@ package mekanism.api; -import net.minecraft.item.Item; +import net.minecraft.block.Block; import net.minecraft.item.ItemStack; public class ItemInfo { - public Item item; + public Block block; public int meta; - public ItemInfo(Item i, int j) + public ItemInfo(Block b, int j) { - item = i; + block = b; meta = j; } public static ItemInfo get(ItemStack stack) { - return new ItemInfo(stack.getItem(), stack.getItemDamage()); + return new ItemInfo(Block.getBlockFromItem(stack.getItem()), stack.getItemDamage()); } @Override public boolean equals(Object obj) { return obj instanceof ItemInfo && - ((ItemInfo)obj).item == item && + ((ItemInfo)obj).block == block && ((ItemInfo)obj).meta == meta; } @@ -31,7 +31,7 @@ public class ItemInfo public int hashCode() { int code = 1; - code = 31 * code + item.getUnlocalizedName().hashCode(); + code = 31 * code + block.getUnlocalizedName().hashCode(); code = 31 * code + meta; return code; } diff --git a/src/main/java/mekanism/api/MekanismAPI.java b/src/main/java/mekanism/api/MekanismAPI.java index 98a2ccc20..128b2c79b 100644 --- a/src/main/java/mekanism/api/MekanismAPI.java +++ b/src/main/java/mekanism/api/MekanismAPI.java @@ -3,6 +3,8 @@ package mekanism.api; import java.util.HashSet; import java.util.Set; +import net.minecraft.block.Block; +import net.minecraft.item.Item; import cpw.mods.fml.common.eventhandler.Event; import net.minecraftforge.oredict.OreDictionary; @@ -11,11 +13,11 @@ public class MekanismAPI //Add a BlockInfo value here if you don't want a certain block to be picked up by cardboard boxes private static Set cardboardBoxIgnore = new HashSet(); - public static boolean isBlockCompatible(int id, int meta) + public static boolean isBlockCompatible(Item item, int meta) { for(ItemInfo i : cardboardBoxIgnore) { - if(i.id == id && (i.meta == OreDictionary.WILDCARD_VALUE || i.meta == meta)) + if(i.block == item && (i.meta == OreDictionary.WILDCARD_VALUE || i.meta == meta)) { return false; } @@ -24,14 +26,14 @@ public class MekanismAPI return true; } - public static void addBoxBlacklist(int id, int meta) + public static void addBoxBlacklist(Block block, int meta) { - cardboardBoxIgnore.add(new ItemInfo(id, meta)); + cardboardBoxIgnore.add(new ItemInfo(block, meta)); } - public static void removeBoxBlacklist(int id, int meta) + public static void removeBoxBlacklist(Block block, int meta) { - cardboardBoxIgnore.remove(new ItemInfo(id, meta)); + cardboardBoxIgnore.remove(new ItemInfo(block, meta)); } public static Set getBoxIgnore() diff --git a/src/main/java/mekanism/api/transmitters/TransmitterNetworkRegistry.java b/src/main/java/mekanism/api/transmitters/TransmitterNetworkRegistry.java index 9b061c827..2d8dbfa5e 100644 --- a/src/main/java/mekanism/api/transmitters/TransmitterNetworkRegistry.java +++ b/src/main/java/mekanism/api/transmitters/TransmitterNetworkRegistry.java @@ -1,37 +1,25 @@ package mekanism.api.transmitters; -import java.util.EnumSet; import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; import java.util.Map; import java.util.Set; -import net.minecraft.tileentity.TileEntity; import net.minecraft.world.chunk.Chunk; import net.minecraft.world.chunk.IChunkProvider; import net.minecraftforge.common.MinecraftForge; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.event.world.ChunkEvent; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.ITickHandler; -import cpw.mods.fml.common.TickType; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.registry.TickRegistry; -import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.common.gameevent.TickEvent.ServerTickEvent; -public class TransmitterNetworkRegistry implements ITickHandler +public class TransmitterNetworkRegistry { private static TransmitterNetworkRegistry INSTANCE = new TransmitterNetworkRegistry(); private static boolean loaderRegistered = false; private HashSet networks = new HashSet(); - public TransmitterNetworkRegistry() - { - TickRegistry.registerTickHandler(this, Side.SERVER); - } - public static void initiate() { if(!loaderRegistered) @@ -73,11 +61,13 @@ public class TransmitterNetworkRegistry implements ITickHandler } } - @Override - public void tickStart(EnumSet type, Object... tickData) {} + @SubscribeEvent + public void onTick(ServerTickEvent event) + { + tickEnd(); + } - @Override - public void tickEnd(EnumSet type, Object... tickData) + public void tickEnd() { Set iterNetworks = (Set)networks.clone(); @@ -90,18 +80,6 @@ public class TransmitterNetworkRegistry implements ITickHandler } } - @Override - public EnumSet ticks() - { - return EnumSet.of(TickType.SERVER); - } - - @Override - public String getLabel() - { - return "MekanismNetworks"; - } - @Override public String toString() { diff --git a/src/main/java/mekanism/client/ClientTickHandler.java b/src/main/java/mekanism/client/ClientTickHandler.java index 8431a6e18..ea400ef38 100644 --- a/src/main/java/mekanism/client/ClientTickHandler.java +++ b/src/main/java/mekanism/client/ClientTickHandler.java @@ -16,7 +16,6 @@ import mekanism.common.KeySync; import mekanism.common.Mekanism; import mekanism.common.ObfuscatedNames; import mekanism.common.PacketHandler; -import mekanism.common.PacketHandler.Transmission; import mekanism.common.item.ItemConfigurator; import mekanism.common.item.ItemElectricBow; import mekanism.common.item.ItemFreeRunners; @@ -38,7 +37,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.entity.AbstractClientPlayer; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.ChatMessageComponent; +import net.minecraft.util.ChatComponentText; import net.minecraft.util.StringUtils; import org.lwjgl.input.Keyboard; @@ -218,13 +217,13 @@ public class ClientTickHandler implements ITickHandler { ItemConfigurator item = (ItemConfigurator)mc.thePlayer.getCurrentEquippedItem().getItem(); - if(MekanismKeyHandler.modeSwitchKey.pressed) + if(MekanismKeyHandler.modeSwitchKey.getIsKeyPressed()) { if(!lastTickUpdate) { item.setState(stack, (byte)(item.getState(stack) < 3 ? item.getState(stack)+1 : 0)); - PacketHandler.sendPacket(Transmission.SERVER, new PacketConfiguratorState().setParams(item.getState(stack))); - mc.thePlayer.sendChatToPlayer(ChatMessageComponent.createFromText(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.GREY + "Configure State: " + item.getColor(item.getState(stack)) + item.getStateDisplay(item.getState(stack)))); + Mekanism.packetPipeline.sendToServer(new PacketConfiguratorState(item.getState(stack))); + mc.thePlayer.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.GREY + "Configure State: " + item.getColor(item.getState(stack)) + item.getStateDisplay(item.getState(stack)))); lastTickUpdate = true; } } @@ -236,13 +235,13 @@ public class ClientTickHandler implements ITickHandler { ItemElectricBow item = (ItemElectricBow)mc.thePlayer.getCurrentEquippedItem().getItem(); - if(MekanismKeyHandler.modeSwitchKey.pressed) + if(MekanismKeyHandler.modeSwitchKey.getIsKeyPressed()) { if(!lastTickUpdate) { item.setFireState(stack, !item.getFireState(stack)); - PacketHandler.sendPacket(Transmission.SERVER, new PacketElectricBowState().setParams(item.getFireState(stack))); - mc.thePlayer.sendChatToPlayer(ChatMessageComponent.createFromText(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.GREY + "Fire Mode: " + (item.getFireState(stack) ? (EnumColor.DARK_GREEN + "ON") : (EnumColor.DARK_RED + "OFF")))); + Mekanism.packetPipeline.sendToServer(new PacketElectricBowState(item.getFireState(stack))); + mc.thePlayer.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.GREY + "Fire Mode: " + (item.getFireState(stack) ? (EnumColor.DARK_GREEN + "ON") : (EnumColor.DARK_RED + "OFF")))); lastTickUpdate = true; } } @@ -254,13 +253,13 @@ public class ClientTickHandler implements ITickHandler { ItemWalkieTalkie item = (ItemWalkieTalkie)mc.thePlayer.getCurrentEquippedItem().getItem(); - if(MekanismKeyHandler.modeSwitchKey.pressed && item.getOn(stack)) + if(MekanismKeyHandler.modeSwitchKey.getIsKeyPressed() && item.getOn(stack)) { if(!lastTickUpdate) { int newChan = item.getChannel(stack) < 9 ? item.getChannel(stack)+1 : 1; item.setChannel(stack, newChan); - PacketHandler.sendPacket(Transmission.SERVER, new PacketWalkieTalkieState().setParams(newChan)); + Mekanism.packetPipeline.sendToServer(new PacketWalkieTalkieState(newChan)); Minecraft.getMinecraft().sndManager.playSoundFX("mekanism:etc.Ding", 1.0F, 1.0F); lastTickUpdate = true; } @@ -273,12 +272,12 @@ public class ClientTickHandler implements ITickHandler { ItemStack jetpack = mc.thePlayer.getCurrentItemOrArmor(3); - if(MekanismKeyHandler.modeSwitchKey.pressed) + if(MekanismKeyHandler.modeSwitchKey.getIsKeyPressed()) { if(!lastTickUpdate) { ((ItemJetpack)jetpack.getItem()).incrementMode(jetpack); - PacketHandler.sendPacket(Transmission.SERVER, new PacketJetpackData().setParams(JetpackPacket.MODE)); + Mekanism.packetPipeline.sendToServer(new PacketJetpackData(JetpackPacket.MODE)); Minecraft.getMinecraft().sndManager.playSoundFX("mekanism:etc.Hydraulic", 1.0F, 1.0F); lastTickUpdate = true; } @@ -291,12 +290,12 @@ public class ClientTickHandler implements ITickHandler { ItemStack scubaTank = mc.thePlayer.getCurrentItemOrArmor(3); - if(MekanismKeyHandler.modeSwitchKey.pressed) + if(MekanismKeyHandler.modeSwitchKey.getIsKeyPressed()) { if(!lastTickUpdate) { ((ItemScubaTank)scubaTank.getItem()).toggleFlowing(scubaTank); - PacketHandler.sendPacket(Transmission.SERVER, new PacketScubaTankData().setParams(ScubaTankPacket.MODE)); + Mekanism.packetPipeline.sendToServer(new PacketScubaTankData(ScubaTankPacket.MODE)); Minecraft.getMinecraft().sndManager.playSoundFX("mekanism:etc.Hydraulic", 1.0F, 1.0F); lastTickUpdate = true; } @@ -331,7 +330,7 @@ public class ClientTickHandler implements ITickHandler Mekanism.jetpackOn.remove(mc.thePlayer.username); } - PacketHandler.sendPacket(Transmission.SERVER, new PacketJetpackData().setParams(JetpackPacket.UPDATE, mc.thePlayer.username, isJetpackOn(mc.thePlayer))); + Mekanism.packetPipeline.sendToServer(new PacketJetpackData(JetpackPacket.UPDATE, mc.thePlayer.username, isJetpackOn(mc.thePlayer))); } if(Mekanism.gasmaskOn.contains(mc.thePlayer.username) != isGasMaskOn(mc.thePlayer)) @@ -344,7 +343,7 @@ public class ClientTickHandler implements ITickHandler Mekanism.gasmaskOn.remove(mc.thePlayer.username); } - PacketHandler.sendPacket(Transmission.SERVER, new PacketScubaTankData().setParams(ScubaTankPacket.UPDATE, mc.thePlayer.username, isGasMaskOn(mc.thePlayer))); + Mekanism.packetPipeline.sendToServer(new PacketScubaTankData(ScubaTankPacket.UPDATE, mc.thePlayer.username, isGasMaskOn(mc.thePlayer))); } if(MekanismClient.audioHandler != null) @@ -374,8 +373,8 @@ public class ClientTickHandler implements ITickHandler if(mc.thePlayer.getCurrentItemOrArmor(3) != null && mc.thePlayer.getCurrentItemOrArmor(3).getItem() instanceof ItemJetpack) { - MekanismClient.updateKey(mc.gameSettings.keyBindJump.keyCode, KeySync.ASCEND); - MekanismClient.updateKey(mc.gameSettings.keyBindSneak.keyCode, KeySync.DESCEND); + MekanismClient.updateKey(mc.gameSettings.keyBindJump.getKeyCode(), KeySync.ASCEND); + MekanismClient.updateKey(mc.gameSettings.keyBindSneak.getKeyCode(), KeySync.DESCEND); } if(isJetpackOn(mc.thePlayer)) @@ -389,7 +388,7 @@ public class ClientTickHandler implements ITickHandler } else if(jetpack.getMode(mc.thePlayer.getCurrentItemOrArmor(3)) == JetpackMode.HOVER) { - if((!Keyboard.isKeyDown(mc.gameSettings.keyBindJump.keyCode) && !Keyboard.isKeyDown(mc.gameSettings.keyBindSneak.keyCode)) || (Keyboard.isKeyDown(mc.gameSettings.keyBindJump.keyCode) && Keyboard.isKeyDown(mc.gameSettings.keyBindSneak.keyCode)) || mc.currentScreen != null) + if((!Keyboard.isKeyDown(mc.gameSettings.keyBindJump.getKeyCode()) && !Keyboard.isKeyDown(mc.gameSettings.keyBindSneak.keyCode)) || (Keyboard.isKeyDown(mc.gameSettings.keyBindJump.keyCode) && Keyboard.isKeyDown(mc.gameSettings.keyBindSneak.keyCode)) || mc.currentScreen != null) { if(mc.thePlayer.motionY > 0) { @@ -401,11 +400,11 @@ public class ClientTickHandler implements ITickHandler } } else { - if(Keyboard.isKeyDown(mc.gameSettings.keyBindJump.keyCode) && mc.currentScreen == null) + if(Keyboard.isKeyDown(mc.gameSettings.keyBindJump.getKeyCode()) && mc.currentScreen == null) { mc.thePlayer.motionY = Math.min(mc.thePlayer.motionY + 0.15D, 0.2D); } - else if(Keyboard.isKeyDown(mc.gameSettings.keyBindSneak.keyCode) && mc.currentScreen == null) + else if(Keyboard.isKeyDown(mc.gameSettings.keyBindSneak.getKeyCode()) && mc.currentScreen == null) { mc.thePlayer.motionY = Math.max(mc.thePlayer.motionY - 0.15D, -0.2D); } diff --git a/src/main/java/mekanism/client/HolidayManager.java b/src/main/java/mekanism/client/HolidayManager.java index 990530f9a..96492cf6f 100644 --- a/src/main/java/mekanism/client/HolidayManager.java +++ b/src/main/java/mekanism/client/HolidayManager.java @@ -7,7 +7,7 @@ import java.util.List; import mekanism.api.EnumColor; import net.minecraft.client.Minecraft; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.ChatMessageComponent; +import net.minecraft.util.ChatComponentText; public final class HolidayManager { @@ -100,13 +100,13 @@ public final class HolidayManager public void onEvent(EntityPlayer player) { String themedLines = getThemedLines(new EnumColor[] {EnumColor.DARK_GREEN, EnumColor.DARK_RED}, 13); - player.sendChatToPlayer(ChatMessageComponent.createFromText(themedLines + EnumColor.DARK_BLUE + "[Mekanism]" + themedLines)); - player.sendChatToPlayer(ChatMessageComponent.createFromText(EnumColor.RED + "Merry Christmas, " + EnumColor.DARK_BLUE + player.username + EnumColor.RED + "!")); - player.sendChatToPlayer(ChatMessageComponent.createFromText(EnumColor.RED + "May you have plenty of Christmas cheer")); - player.sendChatToPlayer(ChatMessageComponent.createFromText(EnumColor.RED + "and have a relaxing holiday with your")); - player.sendChatToPlayer(ChatMessageComponent.createFromText(EnumColor.RED + "family :)")); - player.sendChatToPlayer(ChatMessageComponent.createFromText(EnumColor.DARK_GREY + "-aidancbrady")); - player.sendChatToPlayer(ChatMessageComponent.createFromText(themedLines + EnumColor.DARK_BLUE + "[=======]" + themedLines)); + player.addChatMessage(new ChatComponentText(themedLines + EnumColor.DARK_BLUE + "[Mekanism]" + themedLines)); + player.addChatMessage(new ChatComponentText(EnumColor.RED + "Merry Christmas, " + EnumColor.DARK_BLUE + player.getCommandSenderName() + EnumColor.RED + "!")); + player.addChatMessage(new ChatComponentText(EnumColor.RED + "May you have plenty of Christmas cheer")); + player.addChatMessage(new ChatComponentText(EnumColor.RED + "and have a relaxing holiday with your")); + player.addChatMessage(new ChatComponentText(EnumColor.RED + "family :)")); + player.addChatMessage(new ChatComponentText(EnumColor.DARK_GREY + "-aidancbrady")); + player.addChatMessage(new ChatComponentText(themedLines + EnumColor.DARK_BLUE + "[=======]" + themedLines)); } @Override @@ -149,12 +149,12 @@ public final class HolidayManager public void onEvent(EntityPlayer player) { String themedLines = getThemedLines(new EnumColor[] {EnumColor.WHITE, EnumColor.YELLOW}, 13); - player.sendChatToPlayer(ChatMessageComponent.createFromText(themedLines + EnumColor.DARK_BLUE + "[Mekanism]" + themedLines)); - player.sendChatToPlayer(ChatMessageComponent.createFromText(EnumColor.AQUA + "Happy New Year, " + EnumColor.DARK_BLUE + player.username + EnumColor.RED + "!")); - player.sendChatToPlayer(ChatMessageComponent.createFromText(EnumColor.AQUA + "Best wishes to you as we enter this")); - player.sendChatToPlayer(ChatMessageComponent.createFromText(EnumColor.AQUA + "new and exciting year of " + calendar.get(Calendar.YEAR) + "! :)")); - player.sendChatToPlayer(ChatMessageComponent.createFromText(EnumColor.DARK_GREY + "-aidancbrady")); - player.sendChatToPlayer(ChatMessageComponent.createFromText(themedLines + EnumColor.DARK_BLUE + "[=======]" + themedLines)); + player.addChatMessage(new ChatComponentText(themedLines + EnumColor.DARK_BLUE + "[Mekanism]" + themedLines)); + player.addChatMessage(new ChatComponentText(EnumColor.AQUA + "Happy New Year, " + EnumColor.DARK_BLUE + player.getCommandSenderName() + EnumColor.RED + "!")); + player.addChatMessage(new ChatComponentText(EnumColor.AQUA + "Best wishes to you as we enter this")); + player.addChatMessage(new ChatComponentText(EnumColor.AQUA + "new and exciting year of " + calendar.get(Calendar.YEAR) + "! :)")); + player.addChatMessage(new ChatComponentText(EnumColor.DARK_GREY + "-aidancbrady")); + player.addChatMessage(new ChatComponentText(themedLines + EnumColor.DARK_BLUE + "[=======]" + themedLines)); } } diff --git a/src/main/java/mekanism/client/MekanismClient.java b/src/main/java/mekanism/client/MekanismClient.java index c7c207638..aff7e8419 100644 --- a/src/main/java/mekanism/client/MekanismClient.java +++ b/src/main/java/mekanism/client/MekanismClient.java @@ -6,7 +6,6 @@ import mekanism.client.sound.SoundHandler; import mekanism.client.voice.VoiceClient; import mekanism.common.Mekanism; import mekanism.common.PacketHandler; -import mekanism.common.PacketHandler.Transmission; import mekanism.common.network.PacketKey; import net.minecraft.client.Minecraft; import net.minecraftforge.common.MinecraftForge; @@ -38,7 +37,7 @@ public class MekanismClient extends Mekanism if(down != keyMap.has(Minecraft.getMinecraft().thePlayer, type)) { - PacketHandler.sendPacket(Transmission.SERVER, new PacketKey().setParams(type, down)); + Mekanism.packetPipeline.sendToServer(new PacketKey(type, down)); keyMap.update(Minecraft.getMinecraft().thePlayer, type, down); } } diff --git a/src/main/java/mekanism/client/gui/GuiChemicalCrystallizer.java b/src/main/java/mekanism/client/gui/GuiChemicalCrystallizer.java index 75ed544ca..70b260991 100644 --- a/src/main/java/mekanism/client/gui/GuiChemicalCrystallizer.java +++ b/src/main/java/mekanism/client/gui/GuiChemicalCrystallizer.java @@ -17,7 +17,6 @@ import mekanism.client.gui.GuiSlot.SlotOverlay; import mekanism.client.gui.GuiSlot.SlotType; import mekanism.client.render.MekanismRenderer; import mekanism.common.PacketHandler; -import mekanism.common.PacketHandler.Transmission; import mekanism.common.inventory.container.ContainerChemicalCrystallizer; import mekanism.common.network.PacketTileEntity; import mekanism.common.tile.TileEntityChemicalCrystallizer; @@ -158,7 +157,7 @@ public class GuiChemicalCrystallizer extends GuiMekanism ArrayList data = new ArrayList(); data.add(0); - PacketHandler.sendPacket(Transmission.SERVER, new PacketTileEntity().setParams(Coord4D.get(tileEntity), data)); + Mekanism.packetPipeline.sendToServer(new PacketTileEntity(Coord4D.get(tileEntity), data)); mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); } } diff --git a/src/main/java/mekanism/client/gui/GuiChemicalInfuser.java b/src/main/java/mekanism/client/gui/GuiChemicalInfuser.java index c8f9a5ba0..1fe9af3db 100644 --- a/src/main/java/mekanism/client/gui/GuiChemicalInfuser.java +++ b/src/main/java/mekanism/client/gui/GuiChemicalInfuser.java @@ -15,7 +15,6 @@ import mekanism.client.gui.GuiSlot.SlotOverlay; import mekanism.client.gui.GuiSlot.SlotType; import mekanism.client.render.MekanismRenderer; import mekanism.common.PacketHandler; -import mekanism.common.PacketHandler.Transmission; import mekanism.common.inventory.container.ContainerChemicalInfuser; import mekanism.common.network.PacketTileEntity; import mekanism.common.tile.TileEntityChemicalInfuser; @@ -132,7 +131,7 @@ public class GuiChemicalInfuser extends GuiMekanism ArrayList data = new ArrayList(); data.add(0); - PacketHandler.sendPacket(Transmission.SERVER, new PacketTileEntity().setParams(Coord4D.get(tileEntity), data)); + Mekanism.packetPipeline.sendToServer(new PacketTileEntity(Coord4D.get(tileEntity), data)); mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); } else if(xAxis > 114 && xAxis < 132 && yAxis > 13 && yAxis < 21) @@ -140,7 +139,7 @@ public class GuiChemicalInfuser extends GuiMekanism ArrayList data = new ArrayList(); data.add(1); - PacketHandler.sendPacket(Transmission.SERVER, new PacketTileEntity().setParams(Coord4D.get(tileEntity), data)); + Mekanism.packetPipeline.sendToServer(new PacketTileEntity(Coord4D.get(tileEntity), data)); mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); } } diff --git a/src/main/java/mekanism/client/gui/GuiChemicalWasher.java b/src/main/java/mekanism/client/gui/GuiChemicalWasher.java index affcbfc34..38a29bcc5 100644 --- a/src/main/java/mekanism/client/gui/GuiChemicalWasher.java +++ b/src/main/java/mekanism/client/gui/GuiChemicalWasher.java @@ -17,7 +17,6 @@ import mekanism.client.gui.GuiSlot.SlotOverlay; import mekanism.client.gui.GuiSlot.SlotType; import mekanism.client.render.MekanismRenderer; import mekanism.common.PacketHandler; -import mekanism.common.PacketHandler.Transmission; import mekanism.common.inventory.container.ContainerChemicalWasher; import mekanism.common.network.PacketTileEntity; import mekanism.common.tile.TileEntityChemicalWasher; @@ -123,7 +122,7 @@ public class GuiChemicalWasher extends GuiMekanism ArrayList data = new ArrayList(); data.add(0); - PacketHandler.sendPacket(Transmission.SERVER, new PacketTileEntity().setParams(Coord4D.get(tileEntity), data)); + Mekanism.packetPipeline.sendToServer(new PacketTileEntity(Coord4D.get(tileEntity), data)); mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); } } diff --git a/src/main/java/mekanism/client/gui/GuiConfiguration.java b/src/main/java/mekanism/client/gui/GuiConfiguration.java index 1ba5e99be..e7a561256 100644 --- a/src/main/java/mekanism/client/gui/GuiConfiguration.java +++ b/src/main/java/mekanism/client/gui/GuiConfiguration.java @@ -8,7 +8,6 @@ import mekanism.api.EnumColor; import mekanism.client.render.MekanismRenderer; import mekanism.common.IInvConfiguration; import mekanism.common.PacketHandler; -import mekanism.common.PacketHandler.Transmission; import mekanism.common.SideData; import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.inventory.container.ContainerNull; @@ -256,19 +255,19 @@ public class GuiConfiguration extends GuiMekanism { int guiId = MachineType.get(tile.getBlockType(), tile.getBlockMetadata()).guiId; mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); - PacketHandler.sendPacket(Transmission.SERVER, new PacketSimpleGui().setParams(Coord4D.get(tile), guiId)); + Mekanism.packetPipeline.sendToServer(new PacketSimpleGui(Coord4D.get(tile), guiId)); } if(xAxis >= 156 && xAxis <= 170 && yAxis >= 6 && yAxis <= 20) { mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); - PacketHandler.sendPacket(Transmission.SERVER, new PacketConfigurationUpdate().setParams(ConfigurationPacket.EJECT, Coord4D.get(tile))); + Mekanism.packetPipeline.sendToServer(new PacketConfigurationUpdate(ConfigurationPacket.EJECT, Coord4D.get(tile))); } if(xAxis >= 156 && xAxis <= 170 && yAxis >= 21 && yAxis <= 35) { mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); - PacketHandler.sendPacket(Transmission.SERVER, new PacketConfigurationUpdate().setParams(ConfigurationPacket.STRICT_INPUT, Coord4D.get(tile))); + Mekanism.packetPipeline.sendToServer(new PacketConfigurationUpdate(ConfigurationPacket.STRICT_INPUT, Coord4D.get(tile))); } } @@ -280,7 +279,7 @@ public class GuiConfiguration extends GuiMekanism if(xAxis >= 80 && xAxis <= 96 && yAxis >= 49 && yAxis <= 65) { mc.sndManager.playSoundFX("mekanism:etc.Ding", 1.0F, 1.0F); - PacketHandler.sendPacket(Transmission.SERVER, new PacketConfigurationUpdate().setParams(ConfigurationPacket.EJECT_COLOR, Coord4D.get(tile), button)); + Mekanism.packetPipeline.sendToServer(new PacketConfigurationUpdate(ConfigurationPacket.EJECT_COLOR, Coord4D.get(tile), button)); } for(int i = 0; i < slotPosMap.size(); i++) @@ -291,7 +290,7 @@ public class GuiConfiguration extends GuiMekanism if(xAxis >= x && xAxis <= x+14 && yAxis >= y && yAxis <= y+14) { mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); - PacketHandler.sendPacket(Transmission.SERVER, new PacketConfigurationUpdate().setParams(ConfigurationPacket.SIDE_DATA, Coord4D.get(tile), button, i)); + Mekanism.packetPipeline.sendToServer(new PacketConfigurationUpdate(ConfigurationPacket.SIDE_DATA, Coord4D.get(tile), button, i)); } } @@ -303,7 +302,7 @@ public class GuiConfiguration extends GuiMekanism if(xAxis >= x && xAxis <= x+14 && yAxis >= y && yAxis <= y+14) { mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); - PacketHandler.sendPacket(Transmission.SERVER, new PacketConfigurationUpdate().setParams(ConfigurationPacket.INPUT_COLOR, Coord4D.get(tile), button, i)); + Mekanism.packetPipeline.sendToServer(new PacketConfigurationUpdate(ConfigurationPacket.INPUT_COLOR, Coord4D.get(tile), button, i)); } } } diff --git a/src/main/java/mekanism/client/gui/GuiConfigurationTab.java b/src/main/java/mekanism/client/gui/GuiConfigurationTab.java index 143556320..317cf046f 100644 --- a/src/main/java/mekanism/client/gui/GuiConfigurationTab.java +++ b/src/main/java/mekanism/client/gui/GuiConfigurationTab.java @@ -3,7 +3,6 @@ package mekanism.client.gui; import mekanism.api.Coord4D; import mekanism.common.IRedstoneControl; import mekanism.common.PacketHandler; -import mekanism.common.PacketHandler.Transmission; import mekanism.common.network.PacketSimpleGui; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; @@ -67,7 +66,7 @@ public class GuiConfigurationTab extends GuiElement { if(xAxis >= -21 && xAxis <= -3 && yAxis >= 10 && yAxis <= 28) { - PacketHandler.sendPacket(Transmission.SERVER, new PacketSimpleGui().setParams(Coord4D.get(tileEntity), 9)); + Mekanism.packetPipeline.sendToServer(new PacketSimpleGui(Coord4D.get(tileEntity), 9)); mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); } } diff --git a/src/main/java/mekanism/client/gui/GuiDigitalMiner.java b/src/main/java/mekanism/client/gui/GuiDigitalMiner.java index 89814270f..bc7fca51e 100644 --- a/src/main/java/mekanism/client/gui/GuiDigitalMiner.java +++ b/src/main/java/mekanism/client/gui/GuiDigitalMiner.java @@ -9,7 +9,6 @@ import mekanism.client.gui.GuiEnergyInfo.IInfoHandler; import mekanism.client.gui.GuiSlot.SlotOverlay; import mekanism.client.gui.GuiSlot.SlotType; import mekanism.common.PacketHandler; -import mekanism.common.PacketHandler.Transmission; import mekanism.common.inventory.container.ContainerDigitalMiner; import mekanism.common.miner.ThreadMinerSearch.State; import mekanism.common.network.PacketDigitalMinerGui; @@ -109,18 +108,18 @@ public class GuiDigitalMiner extends GuiMekanism ArrayList data = new ArrayList(); data.add(3); - PacketHandler.sendPacket(Transmission.SERVER, new PacketTileEntity().setParams(Coord4D.get(tileEntity), data)); + Mekanism.packetPipeline.sendToServer(new PacketTileEntity(Coord4D.get(tileEntity), data)); } else if(guibutton.id == 1) { ArrayList data = new ArrayList(); data.add(4); - PacketHandler.sendPacket(Transmission.SERVER, new PacketTileEntity().setParams(Coord4D.get(tileEntity), data)); + Mekanism.packetPipeline.sendToServer(new PacketTileEntity(Coord4D.get(tileEntity), data)); } else if(guibutton.id == 2) { - PacketHandler.sendPacket(Transmission.SERVER, new PacketDigitalMinerGui().setParams(MinerGuiPacket.SERVER, Coord4D.get(tileEntity), 0)); + Mekanism.packetPipeline.sendToServer(new PacketDigitalMinerGui(MinerGuiPacket.SERVER, Coord4D.get(tileEntity), 0)); } } @@ -299,7 +298,7 @@ public class GuiDigitalMiner extends GuiMekanism ArrayList data = new ArrayList(); data.add(0); - PacketHandler.sendPacket(Transmission.SERVER, new PacketTileEntity().setParams(Coord4D.get(tileEntity), data)); + Mekanism.packetPipeline.sendToServer(new PacketTileEntity(Coord4D.get(tileEntity), data)); } if(xAxis >= 147 && xAxis <= 161 && yAxis >= 63 && yAxis <= 77) @@ -309,7 +308,7 @@ public class GuiDigitalMiner extends GuiMekanism ArrayList data = new ArrayList(); data.add(1); - PacketHandler.sendPacket(Transmission.SERVER, new PacketTileEntity().setParams(Coord4D.get(tileEntity), data)); + Mekanism.packetPipeline.sendToServer(new PacketTileEntity(Coord4D.get(tileEntity), data)); } if(xAxis >= 131 && xAxis <= 145 && yAxis >= 47 && yAxis <= 61) @@ -319,7 +318,7 @@ public class GuiDigitalMiner extends GuiMekanism ArrayList data = new ArrayList(); data.add(5); - PacketHandler.sendPacket(Transmission.SERVER, new PacketTileEntity().setParams(Coord4D.get(tileEntity), data)); + Mekanism.packetPipeline.sendToServer(new PacketTileEntity(Coord4D.get(tileEntity), data)); } if(xAxis >= 131 && xAxis <= 145 && yAxis >= 63 && yAxis <= 77) @@ -329,7 +328,7 @@ public class GuiDigitalMiner extends GuiMekanism ArrayList data = new ArrayList(); data.add(9); - PacketHandler.sendPacket(Transmission.SERVER, new PacketTileEntity().setParams(Coord4D.get(tileEntity), data)); + Mekanism.packetPipeline.sendToServer(new PacketTileEntity(Coord4D.get(tileEntity), data)); } if(xAxis >= 144 && xAxis <= 160 && yAxis >= 27 && yAxis <= 43) @@ -369,7 +368,7 @@ public class GuiDigitalMiner extends GuiMekanism data.add(true); } - PacketHandler.sendPacket(Transmission.SERVER, new PacketTileEntity().setParams(Coord4D.get(tileEntity), data)); + Mekanism.packetPipeline.sendToServer(new PacketTileEntity(Coord4D.get(tileEntity), data)); } mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); diff --git a/src/main/java/mekanism/client/gui/GuiDigitalMinerConfig.java b/src/main/java/mekanism/client/gui/GuiDigitalMinerConfig.java index 4341bc611..c65190902 100644 --- a/src/main/java/mekanism/client/gui/GuiDigitalMinerConfig.java +++ b/src/main/java/mekanism/client/gui/GuiDigitalMinerConfig.java @@ -9,7 +9,6 @@ import java.util.Set; import mekanism.api.Coord4D; import mekanism.common.PacketHandler; -import mekanism.common.PacketHandler.Transmission; import mekanism.common.inventory.container.ContainerNull; import mekanism.common.miner.MItemStackFilter; import mekanism.common.miner.MMaterialFilter; @@ -174,17 +173,17 @@ public class GuiDigitalMinerConfig extends GuiMekanism if(filter instanceof MItemStackFilter) { mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); - PacketHandler.sendPacket(Transmission.SERVER, new PacketDigitalMinerGui().setParams(MinerGuiPacket.SERVER_INDEX, Coord4D.get(tileEntity), 1, getFilterIndex()+i)); + Mekanism.packetPipeline.sendToServer(new PacketDigitalMinerGui(MinerGuiPacket.SERVER_INDEX, Coord4D.get(tileEntity), 1, getFilterIndex()+i)); } else if(filter instanceof MOreDictFilter) { mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); - PacketHandler.sendPacket(Transmission.SERVER, new PacketDigitalMinerGui().setParams(MinerGuiPacket.SERVER_INDEX, Coord4D.get(tileEntity), 2, getFilterIndex()+i)); + Mekanism.packetPipeline.sendToServer(new PacketDigitalMinerGui(MinerGuiPacket.SERVER_INDEX, Coord4D.get(tileEntity), 2, getFilterIndex()+i)); } else if(filter instanceof MMaterialFilter) { mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); - PacketHandler.sendPacket(Transmission.SERVER, new PacketDigitalMinerGui().setParams(MinerGuiPacket.SERVER_INDEX, Coord4D.get(tileEntity), 3, getFilterIndex()+i)); + Mekanism.packetPipeline.sendToServer(new PacketDigitalMinerGui(MinerGuiPacket.SERVER_INDEX, Coord4D.get(tileEntity), 3, getFilterIndex()+i)); } } } @@ -193,7 +192,7 @@ public class GuiDigitalMinerConfig extends GuiMekanism if(xAxis >= 5 && xAxis <= 16 && yAxis >= 5 && yAxis <= 16) { mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); - PacketHandler.sendPacket(Transmission.SERVER, new PacketDigitalMinerGui().setParams(MinerGuiPacket.SERVER, Coord4D.get(tileEntity), 4)); + Mekanism.packetPipeline.sendToServer(new PacketDigitalMinerGui(MinerGuiPacket.SERVER, Coord4D.get(tileEntity), 4)); } if(xAxis >= 39 && xAxis <= 50 && yAxis >= 67 && yAxis <= 78) @@ -219,7 +218,7 @@ public class GuiDigitalMinerConfig extends GuiMekanism ArrayList data = new ArrayList(); data.add(10); - PacketHandler.sendPacket(Transmission.SERVER, new PacketTileEntity().setParams(Coord4D.get(tileEntity), data)); + Mekanism.packetPipeline.sendToServer(new PacketTileEntity(Coord4D.get(tileEntity), data)); mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); } } @@ -286,7 +285,7 @@ public class GuiDigitalMinerConfig extends GuiMekanism if(guibutton.id == 0) { - PacketHandler.sendPacket(Transmission.SERVER, new PacketDigitalMinerGui().setParams(MinerGuiPacket.SERVER, Coord4D.get(tileEntity), 5)); + Mekanism.packetPipeline.sendToServer(new PacketDigitalMinerGui(MinerGuiPacket.SERVER, Coord4D.get(tileEntity), 5)); } } @@ -507,7 +506,7 @@ public class GuiDigitalMinerConfig extends GuiMekanism data.add(6); data.add(toUse); - PacketHandler.sendPacket(Transmission.SERVER, new PacketTileEntity().setParams(Coord4D.get(tileEntity), data)); + Mekanism.packetPipeline.sendToServer(new PacketTileEntity(Coord4D.get(tileEntity), data)); radiusField.setText(""); } @@ -523,7 +522,7 @@ public class GuiDigitalMinerConfig extends GuiMekanism data.add(7); data.add(toUse); - PacketHandler.sendPacket(Transmission.SERVER, new PacketTileEntity().setParams(Coord4D.get(tileEntity), data)); + Mekanism.packetPipeline.sendToServer(new PacketTileEntity(Coord4D.get(tileEntity), data)); minField.setText(""); } @@ -539,7 +538,7 @@ public class GuiDigitalMinerConfig extends GuiMekanism data.add(8); data.add(toUse); - PacketHandler.sendPacket(Transmission.SERVER, new PacketTileEntity().setParams(Coord4D.get(tileEntity), data)); + Mekanism.packetPipeline.sendToServer(new PacketTileEntity(Coord4D.get(tileEntity), data)); maxField.setText(""); } diff --git a/src/main/java/mekanism/client/gui/GuiElectricChest.java b/src/main/java/mekanism/client/gui/GuiElectricChest.java index a9a7c88f3..f49e15423 100644 --- a/src/main/java/mekanism/client/gui/GuiElectricChest.java +++ b/src/main/java/mekanism/client/gui/GuiElectricChest.java @@ -6,7 +6,6 @@ import mekanism.api.energy.IEnergizedItem; import mekanism.common.IElectricChest; import mekanism.common.Mekanism; import mekanism.common.PacketHandler; -import mekanism.common.PacketHandler.Transmission; import mekanism.common.inventory.container.ContainerElectricChest; import mekanism.common.network.PacketElectricChest; import mekanism.common.network.PacketElectricChest.ElectricChestPacketType; @@ -124,10 +123,10 @@ public class GuiElectricChest extends GuiMekanism if(isBlock) { - PacketHandler.sendPacket(Transmission.SERVER, new PacketElectricChest().setParams(ElectricChestPacketType.LOCK, !getLocked(), true, Coord4D.get(tileEntity))); + Mekanism.packetPipeline.sendToServer(new PacketElectricChest(ElectricChestPacketType.LOCK, !getLocked(), true, Coord4D.get(tileEntity))); } else { - PacketHandler.sendPacket(Transmission.SERVER, new PacketElectricChest().setParams(ElectricChestPacketType.LOCK, !getLocked(), false)); + Mekanism.packetPipeline.sendToServer(new PacketElectricChest(ElectricChestPacketType.LOCK, !getLocked(), false)); ItemStack stack = mc.thePlayer.getCurrentEquippedItem(); ((IElectricChest)stack.getItem()).setLocked(stack, !getLocked()); diff --git a/src/main/java/mekanism/client/gui/GuiElectrolyticSeparator.java b/src/main/java/mekanism/client/gui/GuiElectrolyticSeparator.java index ec5439f6d..073bfdc06 100755 --- a/src/main/java/mekanism/client/gui/GuiElectrolyticSeparator.java +++ b/src/main/java/mekanism/client/gui/GuiElectrolyticSeparator.java @@ -15,7 +15,6 @@ import mekanism.client.gui.GuiSlot.SlotOverlay; import mekanism.client.gui.GuiSlot.SlotType; import mekanism.common.Mekanism; import mekanism.common.PacketHandler; -import mekanism.common.PacketHandler.Transmission; import mekanism.common.inventory.container.ContainerElectrolyticSeparator; import mekanism.common.network.PacketTileEntity; import mekanism.common.tile.TileEntityElectrolyticSeparator; @@ -99,7 +98,7 @@ public class GuiElectrolyticSeparator extends GuiMekanism ArrayList data = new ArrayList(); data.add((byte)0); - PacketHandler.sendPacket(Transmission.SERVER, new PacketTileEntity().setParams(Coord4D.get(tileEntity), data)); + Mekanism.packetPipeline.sendToServer(new PacketTileEntity(Coord4D.get(tileEntity), data)); mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); } @@ -108,7 +107,7 @@ public class GuiElectrolyticSeparator extends GuiMekanism ArrayList data = new ArrayList(); data.add((byte)1); - PacketHandler.sendPacket(Transmission.SERVER, new PacketTileEntity().setParams(Coord4D.get(tileEntity), data)); + Mekanism.packetPipeline.sendToServer(new PacketTileEntity(Coord4D.get(tileEntity), data)); mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); } diff --git a/src/main/java/mekanism/client/gui/GuiGasTank.java b/src/main/java/mekanism/client/gui/GuiGasTank.java index afe1c8227..ed19844a1 100644 --- a/src/main/java/mekanism/client/gui/GuiGasTank.java +++ b/src/main/java/mekanism/client/gui/GuiGasTank.java @@ -4,7 +4,6 @@ import java.util.ArrayList; import mekanism.api.Coord4D; import mekanism.common.PacketHandler; -import mekanism.common.PacketHandler.Transmission; import mekanism.common.inventory.container.ContainerGasTank; import mekanism.common.network.PacketTileEntity; import mekanism.common.tile.TileEntityGasTank; @@ -82,7 +81,7 @@ public class GuiGasTank extends GuiMekanism ArrayList data = new ArrayList(); data.add(0); - PacketHandler.sendPacket(Transmission.SERVER, new PacketTileEntity().setParams(Coord4D.get(tileEntity), data)); + Mekanism.packetPipeline.sendToServer(new PacketTileEntity(Coord4D.get(tileEntity), data)); mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); } diff --git a/src/main/java/mekanism/client/gui/GuiLogisticalSorter.java b/src/main/java/mekanism/client/gui/GuiLogisticalSorter.java index 76be5d44c..0cae2d81d 100644 --- a/src/main/java/mekanism/client/gui/GuiLogisticalSorter.java +++ b/src/main/java/mekanism/client/gui/GuiLogisticalSorter.java @@ -10,7 +10,6 @@ import java.util.Set; import mekanism.api.Coord4D; import mekanism.client.render.MekanismRenderer; import mekanism.common.PacketHandler; -import mekanism.common.PacketHandler.Transmission; import mekanism.common.inventory.container.ContainerNull; import mekanism.common.network.PacketLogisticalSorterGui; import mekanism.common.network.PacketLogisticalSorterGui.SorterGuiPacket; @@ -163,17 +162,17 @@ public class GuiLogisticalSorter extends GuiMekanism if(filter instanceof TItemStackFilter) { mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); - PacketHandler.sendPacket(Transmission.SERVER, new PacketLogisticalSorterGui().setParams(SorterGuiPacket.SERVER_INDEX, Coord4D.get(tileEntity), 1, getFilterIndex()+i)); + Mekanism.packetPipeline.sendToServer(new PacketLogisticalSorterGui(SorterGuiPacket.SERVER_INDEX, Coord4D.get(tileEntity), 1, getFilterIndex()+i)); } else if(filter instanceof TOreDictFilter) { mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); - PacketHandler.sendPacket(Transmission.SERVER, new PacketLogisticalSorterGui().setParams(SorterGuiPacket.SERVER_INDEX, Coord4D.get(tileEntity), 2, getFilterIndex()+i)); + Mekanism.packetPipeline.sendToServer(new PacketLogisticalSorterGui(SorterGuiPacket.SERVER_INDEX, Coord4D.get(tileEntity), 2, getFilterIndex()+i)); } else if(filter instanceof TMaterialFilter) { mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); - PacketHandler.sendPacket(Transmission.SERVER, new PacketLogisticalSorterGui().setParams(SorterGuiPacket.SERVER_INDEX, Coord4D.get(tileEntity), 3, getFilterIndex()+i)); + Mekanism.packetPipeline.sendToServer(new PacketLogisticalSorterGui(SorterGuiPacket.SERVER_INDEX, Coord4D.get(tileEntity), 3, getFilterIndex()+i)); } } } @@ -184,7 +183,7 @@ public class GuiLogisticalSorter extends GuiMekanism ArrayList data = new ArrayList(); data.add(1); - PacketHandler.sendPacket(Transmission.SERVER, new PacketTileEntity().setParams(Coord4D.get(tileEntity), data)); + Mekanism.packetPipeline.sendToServer(new PacketTileEntity(Coord4D.get(tileEntity), data)); mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); } @@ -193,7 +192,7 @@ public class GuiLogisticalSorter extends GuiMekanism ArrayList data = new ArrayList(); data.add(2); - PacketHandler.sendPacket(Transmission.SERVER, new PacketTileEntity().setParams(Coord4D.get(tileEntity), data)); + Mekanism.packetPipeline.sendToServer(new PacketTileEntity(Coord4D.get(tileEntity), data)); mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); } } @@ -209,7 +208,7 @@ public class GuiLogisticalSorter extends GuiMekanism data.add(0); data.add(button); - PacketHandler.sendPacket(Transmission.SERVER, new PacketTileEntity().setParams(Coord4D.get(tileEntity), data)); + Mekanism.packetPipeline.sendToServer(new PacketTileEntity(Coord4D.get(tileEntity), data)); mc.sndManager.playSoundFX("mekanism:etc.Ding", 1.0F, 1.0F); } } @@ -259,7 +258,7 @@ public class GuiLogisticalSorter extends GuiMekanism if(guibutton.id == 0) { - PacketHandler.sendPacket(Transmission.SERVER, new PacketLogisticalSorterGui().setParams(SorterGuiPacket.SERVER, Coord4D.get(tileEntity), 4)); + Mekanism.packetPipeline.sendToServer(new PacketLogisticalSorterGui(SorterGuiPacket.SERVER, Coord4D.get(tileEntity), 4)); } } diff --git a/src/main/java/mekanism/client/gui/GuiMFilterSelect.java b/src/main/java/mekanism/client/gui/GuiMFilterSelect.java index 647054200..0f2bc5159 100644 --- a/src/main/java/mekanism/client/gui/GuiMFilterSelect.java +++ b/src/main/java/mekanism/client/gui/GuiMFilterSelect.java @@ -2,7 +2,6 @@ package mekanism.client.gui; import mekanism.api.Coord4D; import mekanism.common.PacketHandler; -import mekanism.common.PacketHandler.Transmission; import mekanism.common.inventory.container.ContainerNull; import mekanism.common.network.PacketDigitalMinerGui; import mekanism.common.network.PacketDigitalMinerGui.MinerGuiPacket; @@ -50,15 +49,15 @@ public class GuiMFilterSelect extends GuiMekanism if(guibutton.id == 0) { - PacketHandler.sendPacket(Transmission.SERVER, new PacketDigitalMinerGui().setParams(MinerGuiPacket.SERVER, Coord4D.get(tileEntity), 1)); + Mekanism.packetPipeline.sendToServer(new PacketDigitalMinerGui(MinerGuiPacket.SERVER, Coord4D.get(tileEntity), 1)); } else if(guibutton.id == 1) { - PacketHandler.sendPacket(Transmission.SERVER, new PacketDigitalMinerGui().setParams(MinerGuiPacket.SERVER, Coord4D.get(tileEntity), 2)); + Mekanism.packetPipeline.sendToServer(new PacketDigitalMinerGui(MinerGuiPacket.SERVER, Coord4D.get(tileEntity), 2)); } else if(guibutton.id == 2) { - PacketHandler.sendPacket(Transmission.SERVER, new PacketDigitalMinerGui().setParams(MinerGuiPacket.SERVER, Coord4D.get(tileEntity), 3)); + Mekanism.packetPipeline.sendToServer(new PacketDigitalMinerGui(MinerGuiPacket.SERVER, Coord4D.get(tileEntity), 3)); } } @@ -109,7 +108,7 @@ public class GuiMFilterSelect extends GuiMekanism if(xAxis >= 5 && xAxis <= 16 && yAxis >= 5 && yAxis <= 16) { mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); - PacketHandler.sendPacket(Transmission.SERVER, new PacketDigitalMinerGui().setParams(MinerGuiPacket.SERVER, Coord4D.get(tileEntity), 0)); + Mekanism.packetPipeline.sendToServer(new PacketDigitalMinerGui(MinerGuiPacket.SERVER, Coord4D.get(tileEntity), 0)); } } } diff --git a/src/main/java/mekanism/client/gui/GuiMItemStackFilter.java b/src/main/java/mekanism/client/gui/GuiMItemStackFilter.java index 8cf688b6b..b8689fe7d 100644 --- a/src/main/java/mekanism/client/gui/GuiMItemStackFilter.java +++ b/src/main/java/mekanism/client/gui/GuiMItemStackFilter.java @@ -3,7 +3,6 @@ package mekanism.client.gui; import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.common.PacketHandler; -import mekanism.common.PacketHandler.Transmission; import mekanism.common.inventory.container.ContainerFilter; import mekanism.common.miner.MItemStackFilter; import mekanism.common.network.PacketDigitalMinerGui; @@ -87,13 +86,13 @@ public class GuiMItemStackFilter extends GuiMekanism { if(isNew) { - PacketHandler.sendPacket(Transmission.SERVER, new PacketNewFilter().setParams(Coord4D.get(tileEntity), filter)); + Mekanism.packetPipeline.sendToServer(new PacketNewFilter(Coord4D.get(tileEntity), filter)); } else { - PacketHandler.sendPacket(Transmission.SERVER, new PacketEditFilter().setParams(Coord4D.get(tileEntity), false, origFilter, filter)); + Mekanism.packetPipeline.sendToServer(new PacketEditFilter(Coord4D.get(tileEntity), false, origFilter, filter)); } - PacketHandler.sendPacket(Transmission.SERVER, new PacketDigitalMinerGui().setParams(MinerGuiPacket.SERVER, Coord4D.get(tileEntity), 0)); + Mekanism.packetPipeline.sendToServer(new PacketDigitalMinerGui(MinerGuiPacket.SERVER, Coord4D.get(tileEntity), 0)); } else if(filter.itemType == null) { @@ -103,8 +102,8 @@ public class GuiMItemStackFilter extends GuiMekanism } else if(guibutton.id == 1) { - PacketHandler.sendPacket(Transmission.SERVER, new PacketEditFilter().setParams(Coord4D.get(tileEntity), true, origFilter)); - PacketHandler.sendPacket(Transmission.SERVER, new PacketDigitalMinerGui().setParams(MinerGuiPacket.SERVER, Coord4D.get(tileEntity), 0)); + Mekanism.packetPipeline.sendToServer(new PacketEditFilter(Coord4D.get(tileEntity), true, origFilter)); + Mekanism.packetPipeline.sendToServer(new PacketDigitalMinerGui(MinerGuiPacket.SERVER, Coord4D.get(tileEntity), 0)); } } @@ -200,7 +199,7 @@ public class GuiMItemStackFilter extends GuiMekanism if(xAxis >= 5 && xAxis <= 16 && yAxis >= 5 && yAxis <= 16) { mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); - PacketHandler.sendPacket(Transmission.SERVER, new PacketDigitalMinerGui().setParams(MinerGuiPacket.SERVER, Coord4D.get(tileEntity), isNew ? 5 : 0)); + Mekanism.packetPipeline.sendToServer(new PacketDigitalMinerGui(MinerGuiPacket.SERVER, Coord4D.get(tileEntity), isNew ? 5 : 0)); } if(xAxis >= 12 && xAxis <= 28 && yAxis >= 19 && yAxis <= 35) diff --git a/src/main/java/mekanism/client/gui/GuiMMaterialFilter.java b/src/main/java/mekanism/client/gui/GuiMMaterialFilter.java index 88c49cea7..b7b0bf500 100644 --- a/src/main/java/mekanism/client/gui/GuiMMaterialFilter.java +++ b/src/main/java/mekanism/client/gui/GuiMMaterialFilter.java @@ -3,7 +3,6 @@ package mekanism.client.gui; import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.common.PacketHandler; -import mekanism.common.PacketHandler.Transmission; import mekanism.common.inventory.container.ContainerFilter; import mekanism.common.miner.MMaterialFilter; import mekanism.common.network.PacketDigitalMinerGui; @@ -87,13 +86,13 @@ public class GuiMMaterialFilter extends GuiMekanism { if(isNew) { - PacketHandler.sendPacket(Transmission.SERVER, new PacketNewFilter().setParams(Coord4D.get(tileEntity), filter)); + Mekanism.packetPipeline.sendToServer(new PacketNewFilter(Coord4D.get(tileEntity), filter)); } else { - PacketHandler.sendPacket(Transmission.SERVER, new PacketEditFilter().setParams(Coord4D.get(tileEntity), false, origFilter, filter)); + Mekanism.packetPipeline.sendToServer(new PacketEditFilter(Coord4D.get(tileEntity), false, origFilter, filter)); } - PacketHandler.sendPacket(Transmission.SERVER, new PacketDigitalMinerGui().setParams(MinerGuiPacket.SERVER, Coord4D.get(tileEntity), 0)); + Mekanism.packetPipeline.sendToServer(new PacketDigitalMinerGui(MinerGuiPacket.SERVER, Coord4D.get(tileEntity), 0)); } else if(filter.materialItem == null) { @@ -103,8 +102,8 @@ public class GuiMMaterialFilter extends GuiMekanism } else if(guibutton.id == 1) { - PacketHandler.sendPacket(Transmission.SERVER, new PacketEditFilter().setParams(Coord4D.get(tileEntity), true, origFilter)); - PacketHandler.sendPacket(Transmission.SERVER, new PacketDigitalMinerGui().setParams(MinerGuiPacket.SERVER, Coord4D.get(tileEntity), 0)); + Mekanism.packetPipeline.sendToServer(new PacketEditFilter(Coord4D.get(tileEntity), true, origFilter)); + Mekanism.packetPipeline.sendToServer(new PacketDigitalMinerGui(MinerGuiPacket.SERVER, Coord4D.get(tileEntity), 0)); } } @@ -200,7 +199,7 @@ public class GuiMMaterialFilter extends GuiMekanism if(xAxis >= 5 && xAxis <= 16 && yAxis >= 5 && yAxis <= 16) { mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); - PacketHandler.sendPacket(Transmission.SERVER, new PacketDigitalMinerGui().setParams(MinerGuiPacket.SERVER, Coord4D.get(tileEntity), isNew ? 5 : 0)); + Mekanism.packetPipeline.sendToServer(new PacketDigitalMinerGui(MinerGuiPacket.SERVER, Coord4D.get(tileEntity), isNew ? 5 : 0)); } if(xAxis >= 12 && xAxis <= 28 && yAxis >= 19 && yAxis <= 35) diff --git a/src/main/java/mekanism/client/gui/GuiMOreDictFilter.java b/src/main/java/mekanism/client/gui/GuiMOreDictFilter.java index e8bdedb2b..150105e2c 100644 --- a/src/main/java/mekanism/client/gui/GuiMOreDictFilter.java +++ b/src/main/java/mekanism/client/gui/GuiMOreDictFilter.java @@ -6,7 +6,6 @@ import java.util.List; import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.common.PacketHandler; -import mekanism.common.PacketHandler.Transmission; import mekanism.common.inventory.container.ContainerFilter; import mekanism.common.miner.MOreDictFilter; import mekanism.common.network.PacketDigitalMinerGui; @@ -131,13 +130,13 @@ public class GuiMOreDictFilter extends GuiMekanism { if(isNew) { - PacketHandler.sendPacket(Transmission.SERVER, new PacketNewFilter().setParams(Coord4D.get(tileEntity), filter)); + Mekanism.packetPipeline.sendToServer(new PacketNewFilter(Coord4D.get(tileEntity), filter)); } else { - PacketHandler.sendPacket(Transmission.SERVER, new PacketEditFilter().setParams(Coord4D.get(tileEntity), false, origFilter, filter)); + Mekanism.packetPipeline.sendToServer(new PacketEditFilter(Coord4D.get(tileEntity), false, origFilter, filter)); } - PacketHandler.sendPacket(Transmission.SERVER, new PacketDigitalMinerGui().setParams(MinerGuiPacket.SERVER, Coord4D.get(tileEntity), 0)); + Mekanism.packetPipeline.sendToServer(new PacketDigitalMinerGui(MinerGuiPacket.SERVER, Coord4D.get(tileEntity), 0)); } else { status = EnumColor.DARK_RED + "No key"; @@ -146,8 +145,8 @@ public class GuiMOreDictFilter extends GuiMekanism } else if(guibutton.id == 1) { - PacketHandler.sendPacket(Transmission.SERVER, new PacketEditFilter().setParams(Coord4D.get(tileEntity), true, origFilter)); - PacketHandler.sendPacket(Transmission.SERVER, new PacketDigitalMinerGui().setParams(MinerGuiPacket.SERVER, Coord4D.get(tileEntity), 0)); + Mekanism.packetPipeline.sendToServer(new PacketEditFilter(Coord4D.get(tileEntity), true, origFilter)); + Mekanism.packetPipeline.sendToServer(new PacketDigitalMinerGui(MinerGuiPacket.SERVER, Coord4D.get(tileEntity), 0)); } } @@ -264,7 +263,7 @@ public class GuiMOreDictFilter extends GuiMekanism if(xAxis >= 5 && xAxis <= 16 && yAxis >= 5 && yAxis <= 16) { mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); - PacketHandler.sendPacket(Transmission.SERVER, new PacketDigitalMinerGui().setParams(MinerGuiPacket.SERVER, Coord4D.get(tileEntity), isNew ? 5 : 0)); + Mekanism.packetPipeline.sendToServer(new PacketDigitalMinerGui(MinerGuiPacket.SERVER, Coord4D.get(tileEntity), isNew ? 5 : 0)); } if(xAxis >= 131 && xAxis <= 143 && yAxis >= 47 && yAxis <= 59) diff --git a/src/main/java/mekanism/client/gui/GuiMetallurgicInfuser.java b/src/main/java/mekanism/client/gui/GuiMetallurgicInfuser.java index f89e38679..5aefa543f 100644 --- a/src/main/java/mekanism/client/gui/GuiMetallurgicInfuser.java +++ b/src/main/java/mekanism/client/gui/GuiMetallurgicInfuser.java @@ -11,7 +11,6 @@ import mekanism.client.gui.GuiProgress.ProgressBar; import mekanism.client.gui.GuiSlot.SlotOverlay; import mekanism.client.gui.GuiSlot.SlotType; import mekanism.common.PacketHandler; -import mekanism.common.PacketHandler.Transmission; import mekanism.common.inventory.container.ContainerMetallurgicInfuser; import mekanism.common.network.PacketTileEntity; import mekanism.common.tile.TileEntityMetallurgicInfuser; @@ -121,7 +120,7 @@ public class GuiMetallurgicInfuser extends GuiMekanism ArrayList data = new ArrayList(); data.add(0); - PacketHandler.sendPacket(Transmission.SERVER, new PacketTileEntity().setParams(Coord4D.get(tileEntity), data)); + Mekanism.packetPipeline.sendToServer(new PacketTileEntity(Coord4D.get(tileEntity), data)); mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); } } diff --git a/src/main/java/mekanism/client/gui/GuiPasswordEnter.java b/src/main/java/mekanism/client/gui/GuiPasswordEnter.java index e5bfcc61e..2e6e96c7d 100644 --- a/src/main/java/mekanism/client/gui/GuiPasswordEnter.java +++ b/src/main/java/mekanism/client/gui/GuiPasswordEnter.java @@ -5,7 +5,6 @@ import mekanism.api.Coord4D; import mekanism.api.energy.IEnergizedItem; import mekanism.common.IElectricChest; import mekanism.common.PacketHandler; -import mekanism.common.PacketHandler.Transmission; import mekanism.common.network.PacketElectricChest; import mekanism.common.network.PacketElectricChest.ElectricChestPacketType; import mekanism.common.tile.TileEntityElectricChest; @@ -136,11 +135,11 @@ public class GuiPasswordEnter extends GuiScreen if(isBlock) { tileEntity.setEnergy(tileEntity.getEnergy() - 100); - PacketHandler.sendPacket(Transmission.SERVER, new PacketElectricChest().setParams(ElectricChestPacketType.SERVER_OPEN, true, true, Coord4D.get(tileEntity))); + Mekanism.packetPipeline.sendToServer(new PacketElectricChest(ElectricChestPacketType.SERVER_OPEN, true, true, Coord4D.get(tileEntity))); } else { ((IEnergizedItem)itemStack.getItem()).setEnergy(itemStack, ((IEnergizedItem)itemStack.getItem()).getEnergy(itemStack) - 100); - PacketHandler.sendPacket(Transmission.SERVER, new PacketElectricChest().setParams(ElectricChestPacketType.SERVER_OPEN, true, false)); + Mekanism.packetPipeline.sendToServer(new PacketElectricChest(ElectricChestPacketType.SERVER_OPEN, true, false)); } mc.sndManager.playSoundFX("mekanism:etc.Success", 1.0F, 1.0F); diff --git a/src/main/java/mekanism/client/gui/GuiPasswordModify.java b/src/main/java/mekanism/client/gui/GuiPasswordModify.java index 74ee1d51d..3881d8bf4 100644 --- a/src/main/java/mekanism/client/gui/GuiPasswordModify.java +++ b/src/main/java/mekanism/client/gui/GuiPasswordModify.java @@ -4,7 +4,6 @@ import mekanism.api.EnumColor; import mekanism.api.Coord4D; import mekanism.common.IElectricChest; import mekanism.common.PacketHandler; -import mekanism.common.PacketHandler.Transmission; import mekanism.common.network.PacketElectricChest; import mekanism.common.network.PacketElectricChest.ElectricChestPacketType; import mekanism.common.tile.TileEntityElectricChest; @@ -163,13 +162,13 @@ public class GuiPasswordModify extends GuiScreen else { if(isBlock) { - PacketHandler.sendPacket(Transmission.SERVER, new PacketElectricChest().setParams(ElectricChestPacketType.PASSWORD, confirmPasswordField.getText(), true, Coord4D.get(tileEntity))); - PacketHandler.sendPacket(Transmission.SERVER, new PacketElectricChest().setParams(ElectricChestPacketType.SERVER_OPEN, false, true, Coord4D.get(tileEntity))); + Mekanism.packetPipeline.sendToServer(new PacketElectricChest(ElectricChestPacketType.PASSWORD, confirmPasswordField.getText(), true, Coord4D.get(tileEntity))); + Mekanism.packetPipeline.sendToServer(new PacketElectricChest(ElectricChestPacketType.SERVER_OPEN, false, true, Coord4D.get(tileEntity))); } else { ((IElectricChest)itemStack.getItem()).setPassword(itemStack, confirmPasswordField.getText()); - PacketHandler.sendPacket(Transmission.SERVER, new PacketElectricChest().setParams(ElectricChestPacketType.PASSWORD, confirmPasswordField.getText(), false)); - PacketHandler.sendPacket(Transmission.SERVER, new PacketElectricChest().setParams(ElectricChestPacketType.SERVER_OPEN, false, false)); + Mekanism.packetPipeline.sendToServer(new PacketElectricChest(ElectricChestPacketType.PASSWORD, confirmPasswordField.getText(), false)); + Mekanism.packetPipeline.sendToServer(new PacketElectricChest(ElectricChestPacketType.SERVER_OPEN, false, false)); } } } diff --git a/src/main/java/mekanism/client/gui/GuiPortableTeleporter.java b/src/main/java/mekanism/client/gui/GuiPortableTeleporter.java index deaf1b1c0..ee875260b 100644 --- a/src/main/java/mekanism/client/gui/GuiPortableTeleporter.java +++ b/src/main/java/mekanism/client/gui/GuiPortableTeleporter.java @@ -1,7 +1,6 @@ package mekanism.client.gui; import mekanism.common.PacketHandler; -import mekanism.common.PacketHandler.Transmission; import mekanism.common.item.ItemPortableTeleporter; import mekanism.common.network.PacketDigitUpdate; import mekanism.common.network.PacketPortableTeleport; @@ -83,7 +82,7 @@ public class GuiPortableTeleporter extends GuiScreen { if(guibutton.id == 0) { - PacketHandler.sendPacket(Transmission.SERVER, new PacketPortableTeleport()); + Mekanism.packetPipeline.sendToServer(new PacketPortableTeleport()); mc.setIngameFocus(); } } @@ -98,25 +97,25 @@ public class GuiPortableTeleporter extends GuiScreen if(xAxis > 23 && xAxis < 37 && yAxis > 44 && yAxis < 58) { - PacketHandler.sendPacket(Transmission.SERVER, new PacketDigitUpdate().setParams(0, getIncrementedNumber(((ItemPortableTeleporter)itemStack.getItem()).getDigit(itemStack, 0)))); + Mekanism.packetPipeline.sendToServer(new PacketDigitUpdate(0, getIncrementedNumber(((ItemPortableTeleporter)itemStack.getItem()).getDigit(itemStack, 0)))); ((ItemPortableTeleporter)itemStack.getItem()).setDigit(itemStack, 0, getIncrementedNumber(((ItemPortableTeleporter)itemStack.getItem()).getDigit(itemStack, 0))); mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); } else if(xAxis > 62 && xAxis < 76 && yAxis > 44 && yAxis < 58) { - PacketHandler.sendPacket(Transmission.SERVER, new PacketDigitUpdate().setParams(1, getIncrementedNumber(((ItemPortableTeleporter)itemStack.getItem()).getDigit(itemStack, 1)))); + Mekanism.packetPipeline.sendToServer(new PacketDigitUpdate(1, getIncrementedNumber(((ItemPortableTeleporter)itemStack.getItem()).getDigit(itemStack, 1)))); ((ItemPortableTeleporter)itemStack.getItem()).setDigit(itemStack, 1, getIncrementedNumber(((ItemPortableTeleporter)itemStack.getItem()).getDigit(itemStack, 1))); mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); } else if(xAxis > 101 && xAxis < 115 && yAxis > 44 && yAxis < 58) { - PacketHandler.sendPacket(Transmission.SERVER, new PacketDigitUpdate().setParams(2, getIncrementedNumber(((ItemPortableTeleporter)itemStack.getItem()).getDigit(itemStack, 2)))); + Mekanism.packetPipeline.sendToServer(new PacketDigitUpdate(2, getIncrementedNumber(((ItemPortableTeleporter)itemStack.getItem()).getDigit(itemStack, 2)))); ((ItemPortableTeleporter)itemStack.getItem()).setDigit(itemStack, 2, getIncrementedNumber(((ItemPortableTeleporter)itemStack.getItem()).getDigit(itemStack, 2))); mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); } else if(xAxis > 140 && xAxis < 154 && yAxis > 44 && yAxis < 58) { - PacketHandler.sendPacket(Transmission.SERVER, new PacketDigitUpdate().setParams(3, getIncrementedNumber(((ItemPortableTeleporter)itemStack.getItem()).getDigit(itemStack, 3)))); + Mekanism.packetPipeline.sendToServer(new PacketDigitUpdate(3, getIncrementedNumber(((ItemPortableTeleporter)itemStack.getItem()).getDigit(itemStack, 3)))); ((ItemPortableTeleporter)itemStack.getItem()).setDigit(itemStack, 3, getIncrementedNumber(((ItemPortableTeleporter)itemStack.getItem()).getDigit(itemStack, 3))); mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); } diff --git a/src/main/java/mekanism/client/gui/GuiRedstoneControl.java b/src/main/java/mekanism/client/gui/GuiRedstoneControl.java index a84438fc0..e20691130 100644 --- a/src/main/java/mekanism/client/gui/GuiRedstoneControl.java +++ b/src/main/java/mekanism/client/gui/GuiRedstoneControl.java @@ -4,7 +4,6 @@ import mekanism.api.Coord4D; import mekanism.common.IRedstoneControl; import mekanism.common.IRedstoneControl.RedstoneControl; import mekanism.common.PacketHandler; -import mekanism.common.PacketHandler.Transmission; import mekanism.common.network.PacketRedstoneControl; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; @@ -75,7 +74,7 @@ public class GuiRedstoneControl extends GuiElement int ordinalToSet = current.ordinal() < (RedstoneControl.values().length-1) ? current.ordinal()+1 : 0; mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); - PacketHandler.sendPacket(Transmission.SERVER, new PacketRedstoneControl().setParams(Coord4D.get(tileEntity), RedstoneControl.values()[ordinalToSet])); + Mekanism.packetPipeline.sendToServer(new PacketRedstoneControl(Coord4D.get(tileEntity), RedstoneControl.values()[ordinalToSet])); } } } diff --git a/src/main/java/mekanism/client/gui/GuiRobitCrafting.java b/src/main/java/mekanism/client/gui/GuiRobitCrafting.java index 5c950a904..e5847f554 100644 --- a/src/main/java/mekanism/client/gui/GuiRobitCrafting.java +++ b/src/main/java/mekanism/client/gui/GuiRobitCrafting.java @@ -2,7 +2,6 @@ package mekanism.client.gui; import mekanism.common.Mekanism; import mekanism.common.PacketHandler; -import mekanism.common.PacketHandler.Transmission; import mekanism.common.inventory.container.ContainerRobitCrafting; import mekanism.common.network.PacketRobit; import mekanism.common.network.PacketRobit.RobitPacketType; @@ -105,7 +104,7 @@ public class GuiRobitCrafting extends GuiMekanism if(xAxis >= 179 && xAxis <= 197 && yAxis >= 10 && yAxis <= 28) { mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); - PacketHandler.sendPacket(Transmission.SERVER, new PacketRobit().setParams(RobitPacketType.GUI, 0, entityId)); + Mekanism.packetPipeline.sendToServer(new PacketRobit(RobitPacketType.GUI, 0, entityId)); mc.thePlayer.openGui(Mekanism.instance, 21, mc.theWorld, entityId, 0, 0); } else if(xAxis >= 179 && xAxis <= 197 && yAxis >= 30 && yAxis <= 48) @@ -115,19 +114,19 @@ public class GuiRobitCrafting extends GuiMekanism else if(xAxis >= 179 && xAxis <= 197 && yAxis >= 50 && yAxis <= 68) { mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); - PacketHandler.sendPacket(Transmission.SERVER, new PacketRobit().setParams(RobitPacketType.GUI, 2, entityId)); + Mekanism.packetPipeline.sendToServer(new PacketRobit(RobitPacketType.GUI, 2, entityId)); mc.thePlayer.openGui(Mekanism.instance, 23, mc.theWorld, entityId, 0, 0); } else if(xAxis >= 179 && xAxis <= 197 && yAxis >= 70 && yAxis <= 88) { mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); - PacketHandler.sendPacket(Transmission.SERVER, new PacketRobit().setParams(RobitPacketType.GUI, 3, entityId)); + Mekanism.packetPipeline.sendToServer(new PacketRobit(RobitPacketType.GUI, 3, entityId)); mc.thePlayer.openGui(Mekanism.instance, 24, mc.theWorld, entityId, 0, 0); } else if(xAxis >= 179 && xAxis <= 197 && yAxis >= 90 && yAxis <= 108) { mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); - PacketHandler.sendPacket(Transmission.SERVER, new PacketRobit().setParams(RobitPacketType.GUI, 4, entityId)); + Mekanism.packetPipeline.sendToServer(new PacketRobit(RobitPacketType.GUI, 4, entityId)); mc.thePlayer.openGui(Mekanism.instance, 25, mc.theWorld, entityId, 0, 0); } } diff --git a/src/main/java/mekanism/client/gui/GuiRobitInventory.java b/src/main/java/mekanism/client/gui/GuiRobitInventory.java index 94506381d..50450782d 100644 --- a/src/main/java/mekanism/client/gui/GuiRobitInventory.java +++ b/src/main/java/mekanism/client/gui/GuiRobitInventory.java @@ -2,7 +2,6 @@ package mekanism.client.gui; import mekanism.common.Mekanism; import mekanism.common.PacketHandler; -import mekanism.common.PacketHandler.Transmission; import mekanism.common.entity.EntityRobit; import mekanism.common.inventory.container.ContainerRobitInventory; import mekanism.common.network.PacketRobit; @@ -105,13 +104,13 @@ public class GuiRobitInventory extends GuiMekanism if(xAxis >= 179 && xAxis <= 197 && yAxis >= 10 && yAxis <= 28) { mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); - PacketHandler.sendPacket(Transmission.SERVER, new PacketRobit().setParams(RobitPacketType.GUI, 0, robit.getEntityId())); + Mekanism.packetPipeline.sendToServer(new PacketRobit(RobitPacketType.GUI, 0, robit.getEntityId())); mc.thePlayer.openGui(Mekanism.instance, 21, mc.theWorld, robit.getEntityId(), 0, 0); } else if(xAxis >= 179 && xAxis <= 197 && yAxis >= 30 && yAxis <= 48) { mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); - PacketHandler.sendPacket(Transmission.SERVER, new PacketRobit().setParams(RobitPacketType.GUI, 1, robit.getEntityId())); + Mekanism.packetPipeline.sendToServer(new PacketRobit(RobitPacketType.GUI, 1, robit.getEntityId())); mc.thePlayer.openGui(Mekanism.instance, 22, mc.theWorld, robit.getEntityId(), 0, 0); } else if(xAxis >= 179 && xAxis <= 197 && yAxis >= 50 && yAxis <= 68) @@ -121,13 +120,13 @@ public class GuiRobitInventory extends GuiMekanism else if(xAxis >= 179 && xAxis <= 197 && yAxis >= 70 && yAxis <= 88) { mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); - PacketHandler.sendPacket(Transmission.SERVER, new PacketRobit().setParams(RobitPacketType.GUI, 3, robit.getEntityId())); + Mekanism.packetPipeline.sendToServer(new PacketRobit(RobitPacketType.GUI, 3, robit.getEntityId())); mc.thePlayer.openGui(Mekanism.instance, 24, mc.theWorld, robit.getEntityId(), 0, 0); } else if(xAxis >= 179 && xAxis <= 197 && yAxis >= 90 && yAxis <= 108) { mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); - PacketHandler.sendPacket(Transmission.SERVER, new PacketRobit().setParams(RobitPacketType.GUI, 4, robit.getEntityId())); + Mekanism.packetPipeline.sendToServer(new PacketRobit(RobitPacketType.GUI, 4, robit.getEntityId())); mc.thePlayer.openGui(Mekanism.instance, 25, mc.theWorld, robit.getEntityId(), 0, 0); } } diff --git a/src/main/java/mekanism/client/gui/GuiRobitMain.java b/src/main/java/mekanism/client/gui/GuiRobitMain.java index 94ba7f874..6ea31b541 100644 --- a/src/main/java/mekanism/client/gui/GuiRobitMain.java +++ b/src/main/java/mekanism/client/gui/GuiRobitMain.java @@ -2,7 +2,6 @@ package mekanism.client.gui; import mekanism.common.Mekanism; import mekanism.common.PacketHandler; -import mekanism.common.PacketHandler.Transmission; import mekanism.common.entity.EntityRobit; import mekanism.common.inventory.container.ContainerRobitMain; import mekanism.common.network.PacketRobit; @@ -47,7 +46,7 @@ public class GuiRobitMain extends GuiMekanism { if(nameChangeField.getText() != null && !nameChangeField.getText().isEmpty()) { - PacketHandler.sendPacket(Transmission.SERVER, new PacketRobit().setParams(RobitPacketType.NAME, nameChangeField.getText(), robit.getEntityId())); + Mekanism.packetPipeline.sendToServer(new PacketRobit(RobitPacketType.NAME, nameChangeField.getText(), robit.getEntityId())); toggleNameChange(); nameChangeField.setText(""); } @@ -272,31 +271,31 @@ public class GuiRobitMain extends GuiMekanism else if(xAxis >= 179 && xAxis <= 197 && yAxis >= 30 && yAxis <= 48) { mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); - PacketHandler.sendPacket(Transmission.SERVER, new PacketRobit().setParams(RobitPacketType.GUI, 1, robit.getEntityId())); + Mekanism.packetPipeline.sendToServer(new PacketRobit(RobitPacketType.GUI, 1, robit.getEntityId())); mc.thePlayer.openGui(Mekanism.instance, 22, mc.theWorld, robit.getEntityId(), 0, 0); } else if(xAxis >= 179 && xAxis <= 197 && yAxis >= 50 && yAxis <= 68) { mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); - PacketHandler.sendPacket(Transmission.SERVER, new PacketRobit().setParams(RobitPacketType.GUI, 2, robit.getEntityId())); + Mekanism.packetPipeline.sendToServer(new PacketRobit(RobitPacketType.GUI, 2, robit.getEntityId())); mc.thePlayer.openGui(Mekanism.instance, 23, mc.theWorld, robit.getEntityId(), 0, 0); } else if(xAxis >= 179 && xAxis <= 197 && yAxis >= 70 && yAxis <= 88) { mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); - PacketHandler.sendPacket(Transmission.SERVER, new PacketRobit().setParams(RobitPacketType.GUI, 3, robit.getEntityId())); + Mekanism.packetPipeline.sendToServer(new PacketRobit(RobitPacketType.GUI, 3, robit.getEntityId())); mc.thePlayer.openGui(Mekanism.instance, 24, mc.theWorld, robit.getEntityId(), 0, 0); } else if(xAxis >= 179 && xAxis <= 197 && yAxis >= 90 && yAxis <= 108) { mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); - PacketHandler.sendPacket(Transmission.SERVER, new PacketRobit().setParams(RobitPacketType.GUI, 4, robit.getEntityId())); + Mekanism.packetPipeline.sendToServer(new PacketRobit(RobitPacketType.GUI, 4, robit.getEntityId())); mc.thePlayer.openGui(Mekanism.instance, 25, mc.theWorld, robit.getEntityId(), 0, 0); } else if(xAxis >= 152 && xAxis <= 170 && yAxis >= 54 && yAxis <= 72) { mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); - PacketHandler.sendPacket(Transmission.SERVER, new PacketRobit().setParams(RobitPacketType.FOLLOW, robit.getEntityId())); + Mekanism.packetPipeline.sendToServer(new PacketRobit(RobitPacketType.FOLLOW, robit.getEntityId())); } else if(xAxis >= 6 && xAxis <= 24 && yAxis >= 54 && yAxis <= 72) { @@ -306,13 +305,13 @@ public class GuiRobitMain extends GuiMekanism else if(xAxis >= 6 && xAxis <= 24 && yAxis >= 16 && yAxis <= 34) { mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); - PacketHandler.sendPacket(Transmission.SERVER, new PacketRobit().setParams(RobitPacketType.GO_HOME, robit.getEntityId())); + Mekanism.packetPipeline.sendToServer(new PacketRobit(RobitPacketType.GO_HOME, robit.getEntityId())); mc.displayGuiScreen(null); } else if(xAxis >= 6 && xAxis <= 24 && yAxis >= 35 && yAxis <= 53) { mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); - PacketHandler.sendPacket(Transmission.SERVER, new PacketRobit().setParams(RobitPacketType.DROP_PICKUP, robit.getEntityId())); + Mekanism.packetPipeline.sendToServer(new PacketRobit(RobitPacketType.DROP_PICKUP, robit.getEntityId())); } } } diff --git a/src/main/java/mekanism/client/gui/GuiRobitRepair.java b/src/main/java/mekanism/client/gui/GuiRobitRepair.java index 5818be332..b17fed838 100644 --- a/src/main/java/mekanism/client/gui/GuiRobitRepair.java +++ b/src/main/java/mekanism/client/gui/GuiRobitRepair.java @@ -4,7 +4,6 @@ import java.util.List; import mekanism.common.Mekanism; import mekanism.common.PacketHandler; -import mekanism.common.PacketHandler.Transmission; import mekanism.common.inventory.container.ContainerRobitRepair; import mekanism.common.network.PacketRobit; import mekanism.common.network.PacketRobit.RobitPacketType; @@ -149,25 +148,25 @@ public class GuiRobitRepair extends GuiMekanism implements ICrafting if(xAxis >= 179 && xAxis <= 197 && yAxis >= 10 && yAxis <= 28) { mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); - PacketHandler.sendPacket(Transmission.SERVER, new PacketRobit().setParams(RobitPacketType.GUI, 0, entityId)); + Mekanism.packetPipeline.sendToServer(new PacketRobit(RobitPacketType.GUI, 0, entityId)); mc.thePlayer.openGui(Mekanism.instance, 21, mc.theWorld, entityId, 0, 0); } else if(xAxis >= 179 && xAxis <= 197 && yAxis >= 30 && yAxis <= 48) { mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); - PacketHandler.sendPacket(Transmission.SERVER, new PacketRobit().setParams(RobitPacketType.GUI, 1, entityId)); + Mekanism.packetPipeline.sendToServer(new PacketRobit(RobitPacketType.GUI, 1, entityId)); mc.thePlayer.openGui(Mekanism.instance, 22, mc.theWorld, entityId, 0, 0); } else if(xAxis >= 179 && xAxis <= 197 && yAxis >= 50 && yAxis <= 68) { mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); - PacketHandler.sendPacket(Transmission.SERVER, new PacketRobit().setParams(RobitPacketType.GUI, 2, entityId)); + Mekanism.packetPipeline.sendToServer(new PacketRobit(RobitPacketType.GUI, 2, entityId)); mc.thePlayer.openGui(Mekanism.instance, 23, mc.theWorld, entityId, 0, 0); } else if(xAxis >= 179 && xAxis <= 197 && yAxis >= 70 && yAxis <= 88) { mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); - PacketHandler.sendPacket(Transmission.SERVER, new PacketRobit().setParams(RobitPacketType.GUI, 3, entityId)); + Mekanism.packetPipeline.sendToServer(new PacketRobit(RobitPacketType.GUI, 3, entityId)); mc.thePlayer.openGui(Mekanism.instance, 24, mc.theWorld, entityId, 0, 0); } else if(xAxis >= 179 && xAxis <= 197 && yAxis >= 90 && yAxis <= 108) diff --git a/src/main/java/mekanism/client/gui/GuiRobitSmelting.java b/src/main/java/mekanism/client/gui/GuiRobitSmelting.java index 74938a8d9..70f61ab6e 100644 --- a/src/main/java/mekanism/client/gui/GuiRobitSmelting.java +++ b/src/main/java/mekanism/client/gui/GuiRobitSmelting.java @@ -2,7 +2,6 @@ package mekanism.client.gui; import mekanism.common.Mekanism; import mekanism.common.PacketHandler; -import mekanism.common.PacketHandler.Transmission; import mekanism.common.entity.EntityRobit; import mekanism.common.inventory.container.ContainerRobitSmelting; import mekanism.common.network.PacketRobit; @@ -112,19 +111,19 @@ public class GuiRobitSmelting extends GuiMekanism if(xAxis >= 179 && xAxis <= 197 && yAxis >= 10 && yAxis <= 28) { mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); - PacketHandler.sendPacket(Transmission.SERVER, new PacketRobit().setParams(RobitPacketType.GUI, 0, robit.getEntityId())); + Mekanism.packetPipeline.sendToServer(new PacketRobit(RobitPacketType.GUI, 0, robit.getEntityId())); mc.thePlayer.openGui(Mekanism.instance, 21, mc.theWorld, robit.getEntityId(), 0, 0); } else if(xAxis >= 179 && xAxis <= 197 && yAxis >= 30 && yAxis <= 48) { mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); - PacketHandler.sendPacket(Transmission.SERVER, new PacketRobit().setParams(RobitPacketType.GUI, 1, robit.getEntityId())); + Mekanism.packetPipeline.sendToServer(new PacketRobit(RobitPacketType.GUI, 1, robit.getEntityId())); mc.thePlayer.openGui(Mekanism.instance, 22, mc.theWorld, robit.getEntityId(), 0, 0); } else if(xAxis >= 179 && xAxis <= 197 && yAxis >= 50 && yAxis <= 68) { mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); - PacketHandler.sendPacket(Transmission.SERVER, new PacketRobit().setParams(RobitPacketType.GUI, 2, robit.getEntityId())); + Mekanism.packetPipeline.sendToServer(new PacketRobit(RobitPacketType.GUI, 2, robit.getEntityId())); mc.thePlayer.openGui(Mekanism.instance, 23, mc.theWorld, robit.getEntityId(), 0, 0); } else if(xAxis >= 179 && xAxis <= 197 && yAxis >= 70 && yAxis <= 88) @@ -134,7 +133,7 @@ public class GuiRobitSmelting extends GuiMekanism else if(xAxis >= 179 && xAxis <= 197 && yAxis >= 90 && yAxis <= 108) { mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); - PacketHandler.sendPacket(Transmission.SERVER, new PacketRobit().setParams(RobitPacketType.GUI, 4, robit.getEntityId())); + Mekanism.packetPipeline.sendToServer(new PacketRobit(RobitPacketType.GUI, 4, robit.getEntityId())); mc.thePlayer.openGui(Mekanism.instance, 25, mc.theWorld, robit.getEntityId(), 0, 0); } } diff --git a/src/main/java/mekanism/client/gui/GuiRotaryCondensentrator.java b/src/main/java/mekanism/client/gui/GuiRotaryCondensentrator.java index 14d3bbce7..494106d8a 100644 --- a/src/main/java/mekanism/client/gui/GuiRotaryCondensentrator.java +++ b/src/main/java/mekanism/client/gui/GuiRotaryCondensentrator.java @@ -13,7 +13,6 @@ import mekanism.client.gui.GuiSlot.SlotOverlay; import mekanism.client.gui.GuiSlot.SlotType; import mekanism.client.render.MekanismRenderer; import mekanism.common.PacketHandler; -import mekanism.common.PacketHandler.Transmission; import mekanism.common.inventory.container.ContainerRotaryCondensentrator; import mekanism.common.network.PacketTileEntity; import mekanism.common.tile.TileEntityRotaryCondensentrator; @@ -157,7 +156,7 @@ public class GuiRotaryCondensentrator extends GuiMekanism ArrayList data = new ArrayList(); data.add(0); - PacketHandler.sendPacket(Transmission.SERVER, new PacketTileEntity().setParams(Coord4D.get(tileEntity), data)); + Mekanism.packetPipeline.sendToServer(new PacketTileEntity(Coord4D.get(tileEntity), data)); mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); } } diff --git a/src/main/java/mekanism/client/gui/GuiSalinationController.java b/src/main/java/mekanism/client/gui/GuiSalinationController.java index 52f969b53..d1985941e 100644 --- a/src/main/java/mekanism/client/gui/GuiSalinationController.java +++ b/src/main/java/mekanism/client/gui/GuiSalinationController.java @@ -6,7 +6,6 @@ import mekanism.api.Coord4D; import mekanism.api.gas.GasStack; import mekanism.client.render.MekanismRenderer; import mekanism.common.PacketHandler; -import mekanism.common.PacketHandler.Transmission; import mekanism.common.inventory.container.ContainerSalinationController; import mekanism.common.network.PacketTileEntity; import mekanism.common.tile.TileEntitySalinationController; @@ -156,7 +155,7 @@ public class GuiSalinationController extends GuiMekanism ArrayList data = new ArrayList(); data.add(0); - PacketHandler.sendPacket(Transmission.SERVER, new PacketTileEntity().setParams(Coord4D.get(tileEntity), data)); + Mekanism.packetPipeline.sendToServer(new PacketTileEntity(Coord4D.get(tileEntity), data)); mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); } } diff --git a/src/main/java/mekanism/client/gui/GuiSortingTab.java b/src/main/java/mekanism/client/gui/GuiSortingTab.java index 8b0010fe6..f00c4b6f3 100644 --- a/src/main/java/mekanism/client/gui/GuiSortingTab.java +++ b/src/main/java/mekanism/client/gui/GuiSortingTab.java @@ -4,7 +4,6 @@ import java.util.ArrayList; import mekanism.api.Coord4D; import mekanism.common.PacketHandler; -import mekanism.common.PacketHandler.Transmission; import mekanism.common.network.PacketTileEntity; import mekanism.common.tile.TileEntityFactory; import mekanism.common.util.MekanismUtils; @@ -71,7 +70,7 @@ public class GuiSortingTab extends GuiElement { ArrayList data = new ArrayList(); data.add(0); - PacketHandler.sendPacket(Transmission.SERVER, new PacketTileEntity().setParams(Coord4D.get(tileEntity), data)); + Mekanism.packetPipeline.sendToServer(new PacketTileEntity(Coord4D.get(tileEntity), data)); mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); } } diff --git a/src/main/java/mekanism/client/gui/GuiTFilterSelect.java b/src/main/java/mekanism/client/gui/GuiTFilterSelect.java index de9f6ab2a..d0f5dfa93 100644 --- a/src/main/java/mekanism/client/gui/GuiTFilterSelect.java +++ b/src/main/java/mekanism/client/gui/GuiTFilterSelect.java @@ -2,7 +2,6 @@ package mekanism.client.gui; import mekanism.api.Coord4D; import mekanism.common.PacketHandler; -import mekanism.common.PacketHandler.Transmission; import mekanism.common.inventory.container.ContainerNull; import mekanism.common.network.PacketLogisticalSorterGui; import mekanism.common.network.PacketLogisticalSorterGui.SorterGuiPacket; @@ -50,15 +49,15 @@ public class GuiTFilterSelect extends GuiMekanism if(guibutton.id == 0) { - PacketHandler.sendPacket(Transmission.SERVER, new PacketLogisticalSorterGui().setParams(SorterGuiPacket.SERVER, Coord4D.get(tileEntity), 1)); + Mekanism.packetPipeline.sendToServer(new PacketLogisticalSorterGui(SorterGuiPacket.SERVER, Coord4D.get(tileEntity), 1)); } else if(guibutton.id == 1) { - PacketHandler.sendPacket(Transmission.SERVER, new PacketLogisticalSorterGui().setParams(SorterGuiPacket.SERVER, Coord4D.get(tileEntity), 2)); + Mekanism.packetPipeline.sendToServer(new PacketLogisticalSorterGui(SorterGuiPacket.SERVER, Coord4D.get(tileEntity), 2)); } else if(guibutton.id == 2) { - PacketHandler.sendPacket(Transmission.SERVER, new PacketLogisticalSorterGui().setParams(SorterGuiPacket.SERVER, Coord4D.get(tileEntity), 3)); + Mekanism.packetPipeline.sendToServer(new PacketLogisticalSorterGui(SorterGuiPacket.SERVER, Coord4D.get(tileEntity), 3)); } } @@ -109,7 +108,7 @@ public class GuiTFilterSelect extends GuiMekanism if(xAxis >= 5 && xAxis <= 16 && yAxis >= 5 && yAxis <= 16) { mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); - PacketHandler.sendPacket(Transmission.SERVER, new PacketLogisticalSorterGui().setParams(SorterGuiPacket.SERVER, Coord4D.get(tileEntity), 0)); + Mekanism.packetPipeline.sendToServer(new PacketLogisticalSorterGui(SorterGuiPacket.SERVER, Coord4D.get(tileEntity), 0)); } } } diff --git a/src/main/java/mekanism/client/gui/GuiTItemStackFilter.java b/src/main/java/mekanism/client/gui/GuiTItemStackFilter.java index 56aa31a24..9c97c3708 100644 --- a/src/main/java/mekanism/client/gui/GuiTItemStackFilter.java +++ b/src/main/java/mekanism/client/gui/GuiTItemStackFilter.java @@ -4,7 +4,6 @@ import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.client.render.MekanismRenderer; import mekanism.common.PacketHandler; -import mekanism.common.PacketHandler.Transmission; import mekanism.common.inventory.container.ContainerFilter; import mekanism.common.network.PacketEditFilter; import mekanism.common.network.PacketLogisticalSorterGui; @@ -107,13 +106,13 @@ public class GuiTItemStackFilter extends GuiMekanism if(isNew) { - PacketHandler.sendPacket(Transmission.SERVER, new PacketNewFilter().setParams(Coord4D.get(tileEntity), filter)); + Mekanism.packetPipeline.sendToServer(new PacketNewFilter(Coord4D.get(tileEntity), filter)); } else { - PacketHandler.sendPacket(Transmission.SERVER, new PacketEditFilter().setParams(Coord4D.get(tileEntity), false, origFilter, filter)); + Mekanism.packetPipeline.sendToServer(new PacketEditFilter(Coord4D.get(tileEntity), false, origFilter, filter)); } - PacketHandler.sendPacket(Transmission.SERVER, new PacketLogisticalSorterGui().setParams(SorterGuiPacket.SERVER, Coord4D.get(tileEntity), 0)); + Mekanism.packetPipeline.sendToServer(new PacketLogisticalSorterGui(SorterGuiPacket.SERVER, Coord4D.get(tileEntity), 0)); } else if(min > max) { @@ -139,8 +138,8 @@ public class GuiTItemStackFilter extends GuiMekanism } else if(guibutton.id == 1) { - PacketHandler.sendPacket(Transmission.SERVER, new PacketEditFilter().setParams(Coord4D.get(tileEntity), true, origFilter)); - PacketHandler.sendPacket(Transmission.SERVER, new PacketLogisticalSorterGui().setParams(SorterGuiPacket.SERVER, Coord4D.get(tileEntity), 0)); + Mekanism.packetPipeline.sendToServer(new PacketEditFilter(Coord4D.get(tileEntity), true, origFilter)); + Mekanism.packetPipeline.sendToServer(new PacketLogisticalSorterGui(SorterGuiPacket.SERVER, Coord4D.get(tileEntity), 0)); } } @@ -297,7 +296,7 @@ public class GuiTItemStackFilter extends GuiMekanism if(xAxis >= 5 && xAxis <= 16 && yAxis >= 5 && yAxis <= 16) { mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); - PacketHandler.sendPacket(Transmission.SERVER, new PacketLogisticalSorterGui().setParams(SorterGuiPacket.SERVER, Coord4D.get(tileEntity), isNew ? 4 : 0)); + Mekanism.packetPipeline.sendToServer(new PacketLogisticalSorterGui(SorterGuiPacket.SERVER, Coord4D.get(tileEntity), isNew ? 4 : 0)); } if(xAxis >= 12 && xAxis <= 28 && yAxis >= 19 && yAxis <= 35) diff --git a/src/main/java/mekanism/client/gui/GuiTMaterialFilter.java b/src/main/java/mekanism/client/gui/GuiTMaterialFilter.java index 6b2111f9e..9b0c43aec 100644 --- a/src/main/java/mekanism/client/gui/GuiTMaterialFilter.java +++ b/src/main/java/mekanism/client/gui/GuiTMaterialFilter.java @@ -4,7 +4,6 @@ import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.client.render.MekanismRenderer; import mekanism.common.PacketHandler; -import mekanism.common.PacketHandler.Transmission; import mekanism.common.inventory.container.ContainerFilter; import mekanism.common.network.PacketEditFilter; import mekanism.common.network.PacketLogisticalSorterGui; @@ -90,13 +89,13 @@ public class GuiTMaterialFilter extends GuiMekanism { if(isNew) { - PacketHandler.sendPacket(Transmission.SERVER, new PacketNewFilter().setParams(Coord4D.get(tileEntity), filter)); + Mekanism.packetPipeline.sendToServer(new PacketNewFilter(Coord4D.get(tileEntity), filter)); } else { - PacketHandler.sendPacket(Transmission.SERVER, new PacketEditFilter().setParams(Coord4D.get(tileEntity), false, origFilter, filter)); + Mekanism.packetPipeline.sendToServer(new PacketEditFilter(Coord4D.get(tileEntity), false, origFilter, filter)); } - PacketHandler.sendPacket(Transmission.SERVER, new PacketLogisticalSorterGui().setParams(SorterGuiPacket.SERVER, Coord4D.get(tileEntity), 0)); + Mekanism.packetPipeline.sendToServer(new PacketLogisticalSorterGui(SorterGuiPacket.SERVER, Coord4D.get(tileEntity), 0)); } else if(filter.materialItem == null) { @@ -106,8 +105,8 @@ public class GuiTMaterialFilter extends GuiMekanism } else if(guibutton.id == 1) { - PacketHandler.sendPacket(Transmission.SERVER, new PacketEditFilter().setParams(Coord4D.get(tileEntity), true, origFilter)); - PacketHandler.sendPacket(Transmission.SERVER, new PacketLogisticalSorterGui().setParams(SorterGuiPacket.SERVER, Coord4D.get(tileEntity), 0)); + Mekanism.packetPipeline.sendToServer(new PacketEditFilter(Coord4D.get(tileEntity), true, origFilter)); + Mekanism.packetPipeline.sendToServer(new PacketLogisticalSorterGui(SorterGuiPacket.SERVER, Coord4D.get(tileEntity), 0)); } } @@ -228,7 +227,7 @@ public class GuiTMaterialFilter extends GuiMekanism if(xAxis >= 5 && xAxis <= 16 && yAxis >= 5 && yAxis <= 16) { mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); - PacketHandler.sendPacket(Transmission.SERVER, new PacketLogisticalSorterGui().setParams(SorterGuiPacket.SERVER, Coord4D.get(tileEntity), isNew ? 4 : 0)); + Mekanism.packetPipeline.sendToServer(new PacketLogisticalSorterGui(SorterGuiPacket.SERVER, Coord4D.get(tileEntity), isNew ? 4 : 0)); } if(xAxis >= 12 && xAxis <= 28 && yAxis >= 19 && yAxis <= 35) diff --git a/src/main/java/mekanism/client/gui/GuiTOreDictFilter.java b/src/main/java/mekanism/client/gui/GuiTOreDictFilter.java index b7e62c2c6..8a0c80f77 100644 --- a/src/main/java/mekanism/client/gui/GuiTOreDictFilter.java +++ b/src/main/java/mekanism/client/gui/GuiTOreDictFilter.java @@ -7,7 +7,6 @@ import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.client.render.MekanismRenderer; import mekanism.common.PacketHandler; -import mekanism.common.PacketHandler.Transmission; import mekanism.common.inventory.container.ContainerFilter; import mekanism.common.network.PacketEditFilter; import mekanism.common.network.PacketLogisticalSorterGui; @@ -133,13 +132,13 @@ public class GuiTOreDictFilter extends GuiMekanism { if(isNew) { - PacketHandler.sendPacket(Transmission.SERVER, new PacketNewFilter().setParams(Coord4D.get(tileEntity), filter)); + Mekanism.packetPipeline.sendToServer(new PacketNewFilter(Coord4D.get(tileEntity), filter)); } else { - PacketHandler.sendPacket(Transmission.SERVER, new PacketEditFilter().setParams(Coord4D.get(tileEntity), false, origFilter, filter)); + Mekanism.packetPipeline.sendToServer(new PacketEditFilter(Coord4D.get(tileEntity), false, origFilter, filter)); } - PacketHandler.sendPacket(Transmission.SERVER, new PacketLogisticalSorterGui().setParams(SorterGuiPacket.SERVER, Coord4D.get(tileEntity), 0)); + Mekanism.packetPipeline.sendToServer(new PacketLogisticalSorterGui(SorterGuiPacket.SERVER, Coord4D.get(tileEntity), 0)); } else { status = EnumColor.DARK_RED + MekanismUtils.localize("gui.oredictFilter.noKey"); @@ -148,8 +147,8 @@ public class GuiTOreDictFilter extends GuiMekanism } else if(guibutton.id == 1) { - PacketHandler.sendPacket(Transmission.SERVER, new PacketEditFilter().setParams(Coord4D.get(tileEntity), true, origFilter)); - PacketHandler.sendPacket(Transmission.SERVER, new PacketLogisticalSorterGui().setParams(SorterGuiPacket.SERVER, Coord4D.get(tileEntity), 0)); + Mekanism.packetPipeline.sendToServer(new PacketEditFilter(Coord4D.get(tileEntity), true, origFilter)); + Mekanism.packetPipeline.sendToServer(new PacketLogisticalSorterGui(SorterGuiPacket.SERVER, Coord4D.get(tileEntity), 0)); } } @@ -291,7 +290,7 @@ public class GuiTOreDictFilter extends GuiMekanism if(xAxis >= 5 && xAxis <= 16 && yAxis >= 5 && yAxis <= 16) { mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); - PacketHandler.sendPacket(Transmission.SERVER, new PacketLogisticalSorterGui().setParams(SorterGuiPacket.SERVER, Coord4D.get(tileEntity), isNew ? 4 : 0)); + Mekanism.packetPipeline.sendToServer(new PacketLogisticalSorterGui(SorterGuiPacket.SERVER, Coord4D.get(tileEntity), isNew ? 4 : 0)); } if(xAxis >= 131 && xAxis <= 143 && yAxis >= 47 && yAxis <= 59) diff --git a/src/main/java/mekanism/client/gui/GuiTeleporter.java b/src/main/java/mekanism/client/gui/GuiTeleporter.java index eb4a7ee7d..82b7dd279 100644 --- a/src/main/java/mekanism/client/gui/GuiTeleporter.java +++ b/src/main/java/mekanism/client/gui/GuiTeleporter.java @@ -6,7 +6,6 @@ import mekanism.api.Coord4D; import mekanism.client.gui.GuiSlot.SlotOverlay; import mekanism.client.gui.GuiSlot.SlotType; import mekanism.common.PacketHandler; -import mekanism.common.PacketHandler.Transmission; import mekanism.common.inventory.container.ContainerTeleporter; import mekanism.common.network.PacketTileEntity; import mekanism.common.tile.TileEntityTeleporter; @@ -66,7 +65,7 @@ public class GuiTeleporter extends GuiMekanism data.add(0); data.add(getIncrementedNumber(tileEntity.code.digitOne)); - PacketHandler.sendPacket(Transmission.SERVER, new PacketTileEntity().setParams(Coord4D.get(tileEntity), data)); + Mekanism.packetPipeline.sendToServer(new PacketTileEntity(Coord4D.get(tileEntity), data)); tileEntity.code.digitOne = getIncrementedNumber(tileEntity.code.digitOne); mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); } @@ -75,7 +74,7 @@ public class GuiTeleporter extends GuiMekanism data.add(1); data.add(getIncrementedNumber(tileEntity.code.digitTwo)); - PacketHandler.sendPacket(Transmission.SERVER, new PacketTileEntity().setParams(Coord4D.get(tileEntity), data)); + Mekanism.packetPipeline.sendToServer(new PacketTileEntity(Coord4D.get(tileEntity), data)); tileEntity.code.digitTwo = getIncrementedNumber(tileEntity.code.digitTwo); mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); } @@ -84,7 +83,7 @@ public class GuiTeleporter extends GuiMekanism data.add(2); data.add(getIncrementedNumber(tileEntity.code.digitThree)); - PacketHandler.sendPacket(Transmission.SERVER, new PacketTileEntity().setParams(Coord4D.get(tileEntity), data)); + Mekanism.packetPipeline.sendToServer(new PacketTileEntity(Coord4D.get(tileEntity), data)); tileEntity.code.digitThree = getIncrementedNumber(tileEntity.code.digitThree); mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); } @@ -93,7 +92,7 @@ public class GuiTeleporter extends GuiMekanism data.add(3); data.add(getIncrementedNumber(tileEntity.code.digitFour)); - PacketHandler.sendPacket(Transmission.SERVER, new PacketTileEntity().setParams(Coord4D.get(tileEntity), data)); + Mekanism.packetPipeline.sendToServer(new PacketTileEntity(Coord4D.get(tileEntity), data)); tileEntity.code.digitFour = getIncrementedNumber(tileEntity.code.digitFour); mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); } diff --git a/src/main/java/mekanism/client/gui/GuiUpgradeManagement.java b/src/main/java/mekanism/client/gui/GuiUpgradeManagement.java index ea882b54c..eefa6b1bb 100644 --- a/src/main/java/mekanism/client/gui/GuiUpgradeManagement.java +++ b/src/main/java/mekanism/client/gui/GuiUpgradeManagement.java @@ -3,7 +3,6 @@ package mekanism.client.gui; import mekanism.api.Coord4D; import mekanism.common.IUpgradeTile; import mekanism.common.PacketHandler; -import mekanism.common.PacketHandler.Transmission; import mekanism.common.network.PacketRemoveUpgrade; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; @@ -83,13 +82,13 @@ public class GuiUpgradeManagement extends GuiElement if(xAxis >= 179 && xAxis <= 198 && yAxis >= 47 && yAxis <= 54) { mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); - PacketHandler.sendPacket(Transmission.SERVER, new PacketRemoveUpgrade().setParams(Coord4D.get(tileEntity), (byte)0)); + Mekanism.packetPipeline.sendToServer(new PacketRemoveUpgrade(Coord4D.get(tileEntity), (byte)0)); } if(xAxis >= 179 && xAxis <= 198 && yAxis >= 57 && yAxis <= 64) { mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); - PacketHandler.sendPacket(Transmission.SERVER, new PacketRemoveUpgrade().setParams(Coord4D.get(tileEntity), (byte)1)); + Mekanism.packetPipeline.sendToServer(new PacketRemoveUpgrade(Coord4D.get(tileEntity), (byte)1)); } if(xAxis >= 180 && xAxis <= 196 && yAxis >= 11 && yAxis <= 27) diff --git a/src/main/java/mekanism/client/render/RenderPartTransmitter.java b/src/main/java/mekanism/client/render/RenderPartTransmitter.java index 1f3e39ea4..90aa169f0 100644 --- a/src/main/java/mekanism/client/render/RenderPartTransmitter.java +++ b/src/main/java/mekanism/client/render/RenderPartTransmitter.java @@ -51,12 +51,13 @@ import codechicken.lib.lighting.LightModel; import codechicken.lib.lighting.LightModel.Light; import codechicken.lib.render.CCModel; import codechicken.lib.render.CCRenderState; +import codechicken.lib.render.CCRenderState.IVertexOperation; import codechicken.lib.render.ColourMultiplier; -import codechicken.lib.render.IVertexModifier; -import codechicken.lib.render.IIconTransformation; +import codechicken.lib.render.uv.IVertexModifier; +import codechicken.lib.render.uv.UVTransformation; import codechicken.lib.render.TextureUtils; import codechicken.lib.render.TextureUtils.IIconRegister; -import codechicken.lib.render.UV; +import codechicken.lib.render.uv.UV; import codechicken.lib.vec.Translation; import codechicken.lib.vec.Vector3; import cpw.mods.fml.relauncher.Side; @@ -727,12 +728,12 @@ public class RenderPartTransmitter implements IIconRegister return display; } - public static class TransmitterTransformation implements IVertexModifier + public static class TransmitterTransformation implements IVertexOperation { public ColourMultiplier colour; public LightMatrix lightMatrix; - public TransmitterTransformation(Colour color, LazyLightMatrix olm) + public TransmitterTransformation(Colour color, LightMatrix olm) { if(color != null) { diff --git a/src/main/java/mekanism/common/CommandMekanism.java b/src/main/java/mekanism/common/CommandMekanism.java index 82022bfb8..f755c131d 100644 --- a/src/main/java/mekanism/common/CommandMekanism.java +++ b/src/main/java/mekanism/common/CommandMekanism.java @@ -8,7 +8,7 @@ import mekanism.common.util.MekanismUtils; import net.minecraft.command.CommandBase; import net.minecraft.command.ICommandSender; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.ChatMessageComponent; +import net.minecraft.util.ChatComponentText; import net.minecraft.server.MinecraftServer; public class CommandMekanism extends CommandBase @@ -42,26 +42,26 @@ public class CommandMekanism extends CommandBase { if(params.length < 1) { - sender.sendChatToPlayer(ChatMessageComponent.createFromText(EnumColor.GREY + "------------- " + EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " -------------")); - sender.sendChatToPlayer(ChatMessageComponent.createFromText(EnumColor.GREY + " *Version: " + EnumColor.DARK_GREY + Mekanism.versionNumber)); - sender.sendChatToPlayer(ChatMessageComponent.createFromText(EnumColor.GREY + " *Latest Version: " + EnumColor.DARK_GREY + Mekanism.latestVersionNumber)); - sender.sendChatToPlayer(ChatMessageComponent.createFromText(EnumColor.GREY + " *Developed on Mac OS X 10.8 Mountain Lion")); - sender.sendChatToPlayer(ChatMessageComponent.createFromText(EnumColor.GREY + " *Code, textures, and ideas by aidancbrady")); - sender.sendChatToPlayer(ChatMessageComponent.createFromText(EnumColor.GREY + " *Recent News: " + EnumColor.INDIGO + Mekanism.recentNews)); - sender.sendChatToPlayer(ChatMessageComponent.createFromText(EnumColor.GREY + "------------- " + EnumColor.DARK_BLUE + "[=======]" + EnumColor.GREY + " -------------")); + sender.addChatMessage(new ChatComponentText(EnumColor.GREY + "------------- " + EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " -------------")); + sender.addChatMessage(new ChatComponentText(EnumColor.GREY + " *Version: " + EnumColor.DARK_GREY + Mekanism.versionNumber)); + sender.addChatMessage(new ChatComponentText(EnumColor.GREY + " *Latest Version: " + EnumColor.DARK_GREY + Mekanism.latestVersionNumber)); + sender.addChatMessage(new ChatComponentText(EnumColor.GREY + " *Developed on Mac OS X 10.8 Mountain Lion")); + sender.addChatMessage(new ChatComponentText(EnumColor.GREY + " *Code, textures, and ideas by aidancbrady")); + sender.addChatMessage(new ChatComponentText(EnumColor.GREY + " *Recent News: " + EnumColor.INDIGO + Mekanism.recentNews)); + sender.addChatMessage(new ChatComponentText(EnumColor.GREY + "------------- " + EnumColor.DARK_BLUE + "[=======]" + EnumColor.GREY + " -------------")); } else if(params.length == 1) { if(params[0].equalsIgnoreCase("help")) { - sender.sendChatToPlayer(ChatMessageComponent.createFromText(EnumColor.GREY + "------------- " + EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " -------------")); - sender.sendChatToPlayer(ChatMessageComponent.createFromText(EnumColor.INDIGO + " /mk" + EnumColor.GREY + " -- displays the main page.")); - sender.sendChatToPlayer(ChatMessageComponent.createFromText(EnumColor.INDIGO + " /mk help" + EnumColor.GREY + " -- displays this guide.")); - sender.sendChatToPlayer(ChatMessageComponent.createFromText(EnumColor.INDIGO + " /mk version" + EnumColor.GREY + " -- displays the version number.")); - sender.sendChatToPlayer(ChatMessageComponent.createFromText(EnumColor.INDIGO + " /mk latest" + EnumColor.GREY + " -- displays the latest version number.")); - sender.sendChatToPlayer(ChatMessageComponent.createFromText(EnumColor.INDIGO + " /mk news" + EnumColor.GREY + " -- displays most recent recent news.")); - sender.sendChatToPlayer(ChatMessageComponent.createFromText(EnumColor.INDIGO + " /mk debug" + EnumColor.GREY + " -- toggles Mekanism's debug mode.")); - sender.sendChatToPlayer(ChatMessageComponent.createFromText(EnumColor.GREY + "------------- " + EnumColor.DARK_BLUE + "[=======]" + EnumColor.GREY + " -------------")); + sender.addChatMessage(new ChatComponentText(EnumColor.GREY + "------------- " + EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " -------------")); + sender.addChatMessage(new ChatComponentText(EnumColor.INDIGO + " /mk" + EnumColor.GREY + " -- displays the main page.")); + sender.addChatMessage(new ChatComponentText(EnumColor.INDIGO + " /mk help" + EnumColor.GREY + " -- displays this guide.")); + sender.addChatMessage(new ChatComponentText(EnumColor.INDIGO + " /mk version" + EnumColor.GREY + " -- displays the version number.")); + sender.addChatMessage(new ChatComponentText(EnumColor.INDIGO + " /mk latest" + EnumColor.GREY + " -- displays the latest version number.")); + sender.addChatMessage(new ChatComponentText(EnumColor.INDIGO + " /mk news" + EnumColor.GREY + " -- displays most recent recent news.")); + sender.addChatMessage(new ChatComponentText(EnumColor.INDIGO + " /mk debug" + EnumColor.GREY + " -- toggles Mekanism's debug mode.")); + sender.addChatMessage(new ChatComponentText(EnumColor.GREY + "------------- " + EnumColor.DARK_BLUE + "[=======]" + EnumColor.GREY + " -------------")); } else if(params[0].equalsIgnoreCase("version")) { @@ -69,28 +69,28 @@ public class CommandMekanism extends CommandBase { if(Mekanism.updateNotifications || Mekanism.latestVersionNumber == null || Mekanism.recentNews == null || Mekanism.latestVersionNumber.equals("null")) { - sender.sendChatToPlayer(ChatMessageComponent.createFromText(EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " Minecraft is in offline mode, could not check for updates.")); + sender.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " Minecraft is in offline mode, could not check for updates.")); } else { - sender.sendChatToPlayer(ChatMessageComponent.createFromText(EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " Your client is up to date.")); + sender.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " Your client is up to date.")); } } } else if(params[0].equalsIgnoreCase("news")) { - sender.sendChatToPlayer(ChatMessageComponent.createFromText(EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " Most recent news: " + EnumColor.INDIGO + Mekanism.recentNews)); + sender.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " Most recent news: " + EnumColor.INDIGO + Mekanism.recentNews)); } else if(params[0].equalsIgnoreCase("latest")) { - sender.sendChatToPlayer(ChatMessageComponent.createFromText(EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " The latest version for this mod is " + EnumColor.DARK_GREY + Mekanism.latestVersionNumber + EnumColor.GREY + ".")); + sender.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " The latest version for this mod is " + EnumColor.DARK_GREY + Mekanism.latestVersionNumber + EnumColor.GREY + ".")); } else if(params[0].equalsIgnoreCase("debug")) { Mekanism.debug = !Mekanism.debug; - sender.sendChatToPlayer(ChatMessageComponent.createFromText(EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " Debug mode set to " + EnumColor.DARK_GREY + Mekanism.debug)); + sender.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " Debug mode set to " + EnumColor.DARK_GREY + Mekanism.debug)); } else { - sender.sendChatToPlayer(ChatMessageComponent.createFromText(EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " Unknown command. Type '" + EnumColor.INDIGO + "/mk help" + EnumColor.GREY + "' for help.")); + sender.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " Unknown command. Type '" + EnumColor.INDIGO + "/mk help" + EnumColor.GREY + "' for help.")); } } } diff --git a/src/main/java/mekanism/common/CommonPlayerTickHandler.java b/src/main/java/mekanism/common/CommonPlayerTickHandler.java index 210a9dc3a..4875ed1df 100644 --- a/src/main/java/mekanism/common/CommonPlayerTickHandler.java +++ b/src/main/java/mekanism/common/CommonPlayerTickHandler.java @@ -2,7 +2,6 @@ package mekanism.common; import java.util.EnumSet; -import mekanism.common.PacketHandler.Transmission; import mekanism.common.item.ItemFreeRunners; import mekanism.common.item.ItemGasMask; import mekanism.common.item.ItemJetpack; @@ -47,14 +46,14 @@ public class CommonPlayerTickHandler implements ITickHandler if(item.getStatus(itemstack) != 2) { item.setStatus(itemstack, 2); - PacketHandler.sendPacket(Transmission.SINGLE_CLIENT, new PacketStatusUpdate().setParams(2), player); + Mekanism.packetPipeline.sendTo(new PacketStatusUpdate(2), player); } } else { if(item.getStatus(itemstack) != 1) { item.setStatus(itemstack, 1); - PacketHandler.sendPacket(Transmission.SINGLE_CLIENT, new PacketStatusUpdate().setParams(1), player); + Mekanism.packetPipeline.sendTo(new PacketStatusUpdate(1), player); } } return; @@ -64,7 +63,7 @@ public class CommonPlayerTickHandler implements ITickHandler if(item.getStatus(itemstack) != 3) { item.setStatus(itemstack, 3); - PacketHandler.sendPacket(Transmission.SINGLE_CLIENT, new PacketStatusUpdate().setParams(3), player); + Mekanism.packetPipeline.sendTo(new PacketStatusUpdate(3), player); } return; } @@ -72,7 +71,7 @@ public class CommonPlayerTickHandler implements ITickHandler if(item.getStatus(itemstack) != 4) { item.setStatus(itemstack, 4); - PacketHandler.sendPacket(Transmission.SINGLE_CLIENT, new PacketStatusUpdate().setParams(4), player); + Mekanism.packetPipeline.sendTo(new PacketStatusUpdate(4), player); } return; } @@ -81,7 +80,7 @@ public class CommonPlayerTickHandler implements ITickHandler if(item.getStatus(itemstack) != 4) { item.setStatus(itemstack, 4); - PacketHandler.sendPacket(Transmission.SINGLE_CLIENT, new PacketStatusUpdate().setParams(4), player); + Mekanism.packetPipeline.sendTo(new PacketStatusUpdate(4), player); } return; } diff --git a/src/main/java/mekanism/common/CommonPlayerTracker.java b/src/main/java/mekanism/common/CommonPlayerTracker.java index 1dd000ede..9d94a8b71 100644 --- a/src/main/java/mekanism/common/CommonPlayerTracker.java +++ b/src/main/java/mekanism/common/CommonPlayerTracker.java @@ -1,5 +1,4 @@ package mekanism.common; -import mekanism.common.PacketHandler.Transmission; import mekanism.common.network.PacketBoxBlacklist; import mekanism.common.network.PacketConfigSync; import mekanism.common.network.PacketJetpackData; @@ -8,7 +7,9 @@ import mekanism.common.network.PacketScubaTankData; import mekanism.common.network.PacketScubaTankData.ScubaTankPacket; import net.minecraft.entity.player.EntityPlayer; import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.common.gameevent.PlayerEvent.PlayerChangedDimensionEvent; import cpw.mods.fml.common.gameevent.PlayerEvent.PlayerLoggedInEvent; +import cpw.mods.fml.common.gameevent.PlayerEvent.PlayerLoggedOutEvent; public class CommonPlayerTracker { @@ -18,39 +19,46 @@ public class CommonPlayerTracker onPlayerLogin(event.player); } - @Override public void onPlayerLogin(EntityPlayer player) { - if(!player.getWorldObj().isRemote) + if(!player.worldObj.isRemote) { - PacketHandler.sendPacket(Transmission.SINGLE_CLIENT, new PacketConfigSync().setParams(), player); - PacketHandler.sendPacket(Transmission.SINGLE_CLIENT, new PacketBoxBlacklist().setParams(), player); - PacketHandler.sendPacket(Transmission.SINGLE_CLIENT, new PacketJetpackData().setParams(JetpackPacket.FULL), player); - PacketHandler.sendPacket(Transmission.SINGLE_CLIENT, new PacketScubaTankData().setParams(ScubaTankPacket.FULL), player); + Mekanism.packetPipeline.sendTo(new PacketConfigSync(), player); + Mekanism.packetPipeline.sendTo(new PacketBoxBlacklist(), player); + Mekanism.packetPipeline.sendTo(new PacketJetpackData(JetpackPacket.FULL), player); + Mekanism.packetPipeline.sendTo(new PacketScubaTankData(ScubaTankPacket.FULL), player); - System.out.println("[Mekanism] Sent config to '" + player.username + ".'"); + Mekanism.logger.info((String) "Sent config to '" + player.getDisplayName() + ".'"); } } - @Override + @SubscribeEvent + public void onPlayerLogoutEvent(PlayerLoggedOutEvent event) + { + onPlayerLogout(event.player); + } + public void onPlayerLogout(EntityPlayer player) { Mekanism.jetpackOn.remove(player); Mekanism.gasmaskOn.remove(player); } + @SubscribeEvent + public void onPlayerDimChangedEvent(PlayerChangedDimensionEvent event) + { + onPlayerChangedDimension(event.player); + } + @Override public void onPlayerChangedDimension(EntityPlayer player) { Mekanism.jetpackOn.remove(player); - if(!player.getWorldObj().isRemote) + if(!player.worldObj.isRemote) { - PacketHandler.sendPacket(Transmission.SINGLE_CLIENT, new PacketJetpackData().setParams(JetpackPacket.FULL), player); - PacketHandler.sendPacket(Transmission.SINGLE_CLIENT, new PacketScubaTankData().setParams(ScubaTankPacket.FULL), player); + Mekanism.packetPipeline.sendTo(new PacketJetpackData(JetpackPacket.FULL), player); + Mekanism.packetPipeline.sendTo(new PacketScubaTankData(ScubaTankPacket.FULL), player); } } - - @Override - public void onPlayerRespawn(EntityPlayer player) {} } diff --git a/src/main/java/mekanism/common/CommonWorldTickHandler.java b/src/main/java/mekanism/common/CommonWorldTickHandler.java index 88cc8e3e3..0707151ab 100644 --- a/src/main/java/mekanism/common/CommonWorldTickHandler.java +++ b/src/main/java/mekanism/common/CommonWorldTickHandler.java @@ -1,7 +1,6 @@ package mekanism.common; import java.util.ArrayList; -import java.util.EnumSet; import java.util.HashMap; import java.util.HashSet; import java.util.Map; @@ -12,91 +11,81 @@ import mekanism.common.tile.TileEntityDynamicTank; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import cpw.mods.fml.common.ITickHandler; -import cpw.mods.fml.common.TickType; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.common.gameevent.TickEvent.Phase; +import cpw.mods.fml.common.gameevent.TickEvent.WorldTickEvent; +import cpw.mods.fml.relauncher.Side; -public class CommonWorldTickHandler implements ITickHandler +public class CommonWorldTickHandler { - @Override - public void tickStart(EnumSet type, Object... tickData) {} - - @Override - public void tickEnd(EnumSet type, Object... tickData) + @SubscribeEvent + public void onTick(WorldTickEvent event) { - if(tickData[0] instanceof World) + if(event.side == Side.SERVER && event.phase == Phase.END) { - ArrayList idsToKill = new ArrayList(); - HashMap> tilesToKill = new HashMap>(); - - World world = (World)tickData[0]; - - if(!world.isRemote) - { - for(Map.Entry entry : Mekanism.dynamicInventories.entrySet()) - { - int inventoryID = entry.getKey(); - - for(Coord4D obj : entry.getValue().locations) - { - if(obj.dimensionId == world.provider.dimensionId) - { - TileEntity tileEntity = obj.getTileEntity(world); - - if(!(tileEntity instanceof TileEntityDynamicTank) || ((TileEntityDynamicTank)tileEntity).inventoryID != inventoryID) - { - if(!tilesToKill.containsKey(inventoryID)) - { - tilesToKill.put(inventoryID, new HashSet()); - } - - tilesToKill.get(inventoryID).add(obj); - } - } - } - - if(entry.getValue().locations.isEmpty()) - { - idsToKill.add(inventoryID); - } - } - - for(Map.Entry> entry : tilesToKill.entrySet()) - { - for(Coord4D obj : entry.getValue()) - { - Mekanism.dynamicInventories.get(entry.getKey()).locations.remove(obj); - } - } - - for(int inventoryID : idsToKill) - { - for(Coord4D obj : Mekanism.dynamicInventories.get(inventoryID).locations) - { - TileEntityDynamicTank dynamicTank = (TileEntityDynamicTank)obj.getTileEntity(world); - - if(dynamicTank != null) - { - dynamicTank.cachedFluid = null; - dynamicTank.inventory = new ItemStack[2]; - dynamicTank.inventoryID = -1; - } - } - - Mekanism.dynamicInventories.remove(inventoryID); - } - } + tickEnd(event.world); } } - @Override - public EnumSet ticks() + public void tickEnd(World world) { - return EnumSet.of(TickType.WORLD); - } + ArrayList idsToKill = new ArrayList(); + HashMap> tilesToKill = new HashMap>(); - @Override - public String getLabel() - { - return "MekanismCommonWorld"; + if(!world.isRemote) + { + for(Map.Entry entry : Mekanism.dynamicInventories.entrySet()) + { + int inventoryID = entry.getKey(); + + for(Coord4D obj : entry.getValue().locations) + { + if(obj.dimensionId == world.provider.dimensionId) + { + TileEntity tileEntity = obj.getTileEntity(world); + + if(!(tileEntity instanceof TileEntityDynamicTank) || ((TileEntityDynamicTank)tileEntity).inventoryID != inventoryID) + { + if(!tilesToKill.containsKey(inventoryID)) + { + tilesToKill.put(inventoryID, new HashSet()); + } + + tilesToKill.get(inventoryID).add(obj); + } + } + } + + if(entry.getValue().locations.isEmpty()) + { + idsToKill.add(inventoryID); + } + } + + for(Map.Entry> entry : tilesToKill.entrySet()) + { + for(Coord4D obj : entry.getValue()) + { + Mekanism.dynamicInventories.get(entry.getKey()).locations.remove(obj); + } + } + + for(int inventoryID : idsToKill) + { + for(Coord4D obj : Mekanism.dynamicInventories.get(inventoryID).locations) + { + TileEntityDynamicTank dynamicTank = (TileEntityDynamicTank)obj.getTileEntity(world); + + if(dynamicTank != null) + { + dynamicTank.cachedFluid = null; + dynamicTank.inventory = new ItemStack[2]; + dynamicTank.inventoryID = -1; + } + } + + Mekanism.dynamicInventories.remove(inventoryID); + } + } } } diff --git a/src/main/java/mekanism/common/ConnectedTextureRenderer.java b/src/main/java/mekanism/common/ConnectedTextureRenderer.java index 5a041fbda..19c56e3c8 100644 --- a/src/main/java/mekanism/common/ConnectedTextureRenderer.java +++ b/src/main/java/mekanism/common/ConnectedTextureRenderer.java @@ -4,6 +4,8 @@ import java.util.HashMap; import java.util.Map; import mekanism.api.Coord4D; + +import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; @@ -15,17 +17,17 @@ public class ConnectedTextureRenderer { public static final byte[][] sideEdges = {{2, 5, 3, 4}, {2, 5, 3, 4}, {1, 4, 0, 5}, {1, 5, 0, 4}, {1, 3, 0, 2}, {1, 2, 0, 3}}; - public int blockID; + public Block block; public int metadata; public String iconTitle; public Map glassMap = new HashMap(); - public ConnectedTextureRenderer(String title, int id, int meta) + public ConnectedTextureRenderer(String title, Block block, int meta) { iconTitle = title; - blockID = id; + this.block = block; metadata = meta; } @@ -113,13 +115,13 @@ public class ConnectedTextureRenderer Coord4D block = obj.getFromSide(ForgeDirection.getOrientation(side)); Coord4D blockabove = obj.getFromSide(ForgeDirection.getOrientation(face)); - return (block.getBlockId(access) == blockID && block.getMetadata(access) == metadata) && (blockabove.getBlockId(access) != blockID || blockabove.getMetadata(access) != metadata); + return (block.getBlock(access) == this.block && block.getMetadata(access) == metadata) && (blockabove.getBlock(access) != this.block || blockabove.getMetadata(access) != metadata); } @SideOnly(Side.CLIENT) public boolean shouldRenderSide(IBlockAccess world, int x, int y, int z, int side) { Coord4D obj = new Coord4D(x, y, z).getFromSide(ForgeDirection.getOrientation(side).getOpposite()); - return obj.getBlockId(world) != blockID || obj.getMetadata(world) != metadata; + return obj.getBlock(world) != block || obj.getMetadata(world) != metadata; } } diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index 1c77f6683..ee507b56f 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -8,7 +8,6 @@ import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Set; -import java.util.logging.Logger; import mekanism.api.AdvancedInput; import mekanism.api.ChanceOutput; @@ -37,7 +36,6 @@ import mekanism.common.EnergyDisplay.EnergyType; import mekanism.common.EnergyNetwork.EnergyTransferEvent; import mekanism.common.FluidNetwork.FluidTransferEvent; import mekanism.common.IFactory.RecipeType; -import mekanism.common.PacketHandler.Transmission; import mekanism.common.Tier.EnergyCubeTier; import mekanism.common.Tier.FactoryTier; import mekanism.common.block.BlockBasic; @@ -154,6 +152,9 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.ShapedOreRecipe; import net.minecraftforge.oredict.ShapelessOreRecipe; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import rebelkeithy.mods.metallurgy.api.IOreInfo; import rebelkeithy.mods.metallurgy.api.MetallurgyAPI; import codechicken.multipart.handler.MultipartProxy; @@ -169,7 +170,6 @@ import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.event.FMLServerStartingEvent; import cpw.mods.fml.common.event.FMLServerStoppingEvent; -import cpw.mods.fml.common.network.NetworkMod; import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.registry.EntityRegistry; import cpw.mods.fml.common.registry.GameRegistry; @@ -186,7 +186,7 @@ public class Mekanism public static final PacketPipeline packetPipeline = new PacketPipeline(); /** Mekanism logger instance */ - public static Logger logger = Logger.getLogger("Minecraft"); + public static Logger logger = LogManager.getLogger(""); /** Mekanism proxy instance */ @SidedProxy(clientSide = "mekanism.client.ClientProxy", serverSide = "mekanism.common.CommonProxy") @@ -240,24 +240,6 @@ public class Mekanism public static Set ic2Registered = new HashSet(); public static Set activeVibrators = new HashSet(); - - //Block IDs - public static int basicBlockID; - public static int basicBlock2ID; - public static int machineBlockID; - public static int machineBlock2ID; - public static int oreBlockID; - public static int obsidianTNTID; - public static int energyCubeID; - public static int boundingBlockID; - public static int gasTankID; - public static int cardboardBoxID; - public static int plasticID; - public static int slickPlasticID; - public static int glowPlasticID; - public static int reinforcedPlasticID; - public static int roadPlasticID; - public static int plasticFenceID; //Items public static ItemElectricBow ElectricBow; @@ -322,9 +304,6 @@ public class Mekanism public static Item DirtyDust; public static Item Shard; public static Item Crystal; - - public static int ITEM_ID = 11200; - public static int BLOCK_ID = 3000; //General Configuration public static boolean osmiumGenerationEnabled = true; @@ -442,10 +421,10 @@ public class Mekanism "***", "XXX", "***", Character.valueOf('*'), Blocks.obsidian, Character.valueOf('X'), Blocks.tnt })); CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(ElectricBow.getUnchargedItem(), new Object[] { - " AB", "E B", " AB", Character.valueOf('A'), EnrichedAlloy, Character.valueOf('B'), Items.silk, Character.valueOf('E'), EnergyTablet.getUnchargedItem() + " AB", "E B", " AB", Character.valueOf('A'), EnrichedAlloy, Character.valueOf('B'), Items.string, Character.valueOf('E'), EnergyTablet.getUnchargedItem() })); CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(EnergyTablet.getUnchargedItem(), new Object[] { - "RCR", "ECE", "RCR", Character.valueOf('C'), Items.ingotGold, Character.valueOf('R'), Items.redstone, Character.valueOf('E'), EnrichedAlloy + "RCR", "ECE", "RCR", Character.valueOf('C'), Items.gold_ingot, Character.valueOf('R'), Items.redstone, Character.valueOf('E'), EnrichedAlloy })); CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MachineBlock, 1, 0), new Object[] { "ARA", "CIC", "ARA", Character.valueOf('A'), EnrichedAlloy, Character.valueOf('R'), Items.redstone, Character.valueOf('I'), new ItemStack(BasicBlock, 1, 8), Character.valueOf('C'), "circuitBasic" @@ -457,7 +436,7 @@ public class Mekanism "SCS", "RIR", "SCS", Character.valueOf('S'), Blocks.cobblestone, Character.valueOf('C'), "circuitBasic", Character.valueOf('R'), Items.redstone, Character.valueOf('I'), new ItemStack(BasicBlock, 1, 8) })); CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MachineBlock, 1, 3), new Object[] { - "RLR", "CIC", "RLR", Character.valueOf('R'), Items.redstone, Character.valueOf('L'), Items.bucketLava, Character.valueOf('C'), "circuitBasic", Character.valueOf('I'), new ItemStack(BasicBlock, 1, 8) + "RLR", "CIC", "RLR", Character.valueOf('R'), Items.redstone, Character.valueOf('L'), Items.lava_bucket, Character.valueOf('C'), "circuitBasic", Character.valueOf('I'), new ItemStack(BasicBlock, 1, 8) })); CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(SpeedUpgrade), new Object[] { " G ", "APA", " G ", Character.valueOf('P'), "dustOsmium", Character.valueOf('A'), EnrichedAlloy, Character.valueOf('G'), Blocks.glass @@ -478,7 +457,7 @@ public class Mekanism "RLR", "TIT", "RLR", Character.valueOf('R'), Items.redstone, Character.valueOf('L'), new ItemStack(Items.dye, 1, 4), Character.valueOf('T'), EnergyTablet.getUnchargedItem(), Character.valueOf('I'), new ItemStack(BasicBlock, 1, 8) })); CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(MekanismUtils.getEnergyCube(EnergyCubeTier.ADVANCED), new Object[] { - "EGE", "TBT", "EGE", Character.valueOf('E'), EnrichedAlloy, Character.valueOf('G'), Items.ingotGold, Character.valueOf('T'), EnergyTablet.getUnchargedItem(), Character.valueOf('B'), MekanismUtils.getEnergyCube(EnergyCubeTier.BASIC) + "EGE", "TBT", "EGE", Character.valueOf('E'), EnrichedAlloy, Character.valueOf('G'), Items.gold_ingot, Character.valueOf('T'), EnergyTablet.getUnchargedItem(), Character.valueOf('B'), MekanismUtils.getEnergyCube(EnergyCubeTier.BASIC) })); CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(MekanismUtils.getEnergyCube(EnergyCubeTier.ELITE), new Object[] { "CDC", "TAT", "CDC", Character.valueOf('C'), "circuitBasic", Character.valueOf('D'), Items.diamond, Character.valueOf('T'), EnergyTablet.getUnchargedItem(), Character.valueOf('A'), MekanismUtils.getEnergyCube(EnergyCubeTier.ADVANCED) @@ -490,10 +469,10 @@ public class Mekanism "RER", Character.valueOf('R'), Items.redstone, Character.valueOf('E'), EnrichedAlloy })); CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MachineBlock, 1, 8), new Object[] { - "IFI", "ROR", "IFI", Character.valueOf('I'), Items.ingotIron, Character.valueOf('F'), Blocks.furnaceIdle, Character.valueOf('R'), Items.redstone, Character.valueOf('O'), "ingotOsmium" + "IFI", "ROR", "IFI", Character.valueOf('I'), Items.iron_ingot, Character.valueOf('F'), Blocks.furnace, Character.valueOf('R'), Items.redstone, Character.valueOf('O'), "ingotOsmium" })); CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(TeleportationCore), new Object[] { - "LAL", "GDG", "LAL", Character.valueOf('L'), new ItemStack(Items.dye, 1, 4), Character.valueOf('A'), AtomicCore, Character.valueOf('G'), Items.ingotGold, Character.valueOf('D'), Items.diamond + "LAL", "GDG", "LAL", Character.valueOf('L'), new ItemStack(Items.dye, 1, 4), Character.valueOf('A'), AtomicCore, Character.valueOf('G'), Items.gold_ingot, Character.valueOf('D'), Items.diamond })); CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(PortableTeleporter), new Object[] { " E ", "CTC", " E ", Character.valueOf('E'), EnergyTablet.getUnchargedItem(), Character.valueOf('C'), "circuitBasic", Character.valueOf('T'), TeleportationCore @@ -517,7 +496,7 @@ public class Mekanism "SCS", "GIG", "SCS", Character.valueOf('S'), Blocks.cobblestone, Character.valueOf('C'), "circuitBasic", Character.valueOf('G'), Blocks.glass, Character.valueOf('I'), new ItemStack(BasicBlock, 1, 8) })); CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MachineBlock, 1, 12), new Object[] { - " B ", "ECE", "OOO", Character.valueOf('B'), Items.bucketEmpty, Character.valueOf('E'), EnrichedAlloy, Character.valueOf('C'), new ItemStack(BasicBlock, 1, 8), Character.valueOf('O'), "ingotOsmium" + " B ", "ECE", "OOO", Character.valueOf('B'), Items.bucket, Character.valueOf('E'), EnrichedAlloy, Character.valueOf('C'), new ItemStack(BasicBlock, 1, 8), Character.valueOf('O'), "ingotOsmium" })); CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MachineBlock, 1, 13), new Object[] { "SGS", "CcC", "SSS", Character.valueOf('S'), "ingotSteel", Character.valueOf('G'), Blocks.glass, Character.valueOf('C'), Blocks.chest, Character.valueOf('c'), "circuitBasic" @@ -532,7 +511,7 @@ public class Mekanism " I ", "ICI", " I ", Character.valueOf('I'), "ingotSteel", Character.valueOf('C'), "circuitBasic" })); CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MachineBlock, 1, 14), new Object[] { - "PPP", "SES", Character.valueOf('P'), Blocks.pressurePlateStone, Character.valueOf('S'), "ingotSteel", Character.valueOf('E'), EnergyTablet.getUnchargedItem() + "PPP", "SES", Character.valueOf('P'), Blocks.stone_pressure_plate, Character.valueOf('S'), "ingotSteel", Character.valueOf('E'), EnergyTablet.getUnchargedItem() })); CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(Robit.getUnchargedItem(), new Object[] { " S ", "ECE", "OIO", Character.valueOf('S'), "ingotSteel", Character.valueOf('E'), EnergyTablet.getUnchargedItem(), Character.valueOf('C'), AtomicCore, Character.valueOf('O'), "ingotRefinedObsidian", Character.valueOf('I'), new ItemStack(MachineBlock, 1, 13) @@ -544,7 +523,7 @@ public class Mekanism " O", "SCS", " S ", Character.valueOf('O'), "ingotOsmium", Character.valueOf('S'), "ingotSteel", Character.valueOf('C'), "circuitBasic" })); CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MachineBlock, 1, 15), new Object[] { - "IPI", "ICI", "III", Character.valueOf('I'), Items.ingotIron, Character.valueOf('P'), Blocks.pistonBase, Character.valueOf('C'), "circuitBasic" + "IPI", "ICI", "III", Character.valueOf('I'), Items.iron_ingot, Character.valueOf('P'), Blocks.piston, Character.valueOf('C'), "circuitBasic" })); CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(BasicBlock, 1, 6), new Object[] { "SSS", "SCS", "SSS", Character.valueOf('S'), Blocks.cobblestone, Character.valueOf('C'), "circuitBasic" @@ -579,7 +558,7 @@ public class Mekanism "ACA", "ERE", "ACA", Character.valueOf('C'), "circuitBasic", Character.valueOf('A'), AtomicCore, Character.valueOf('E'), new ItemStack(BasicBlock, 1, 8), Character.valueOf('R'), new ItemStack(MachineBlock, 1, 9) })); CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MachineBlock2, 1, 4), new Object[] { - "IRI", "ECE", "IRI", Character.valueOf('I'), Items.ingotIron, Character.valueOf('R'), Items.redstone, Character.valueOf('E'), Mekanism.EnrichedAlloy, Character.valueOf('C'), ElectrolyticCore + "IRI", "ECE", "IRI", Character.valueOf('I'), Items.iron_ingot, Character.valueOf('R'), Items.redstone, Character.valueOf('E'), Mekanism.EnrichedAlloy, Character.valueOf('C'), ElectrolyticCore })); CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(ElectrolyticCore), new Object[] { "EPE", "IEG", "EPE", Character.valueOf('E'), Mekanism.EnrichedAlloy, Character.valueOf('P'), "dustOsmium", Character.valueOf('I'), "dustIron", Character.valueOf('G'), "dustGold" @@ -594,7 +573,7 @@ public class Mekanism "ICI", "ASA", "ICI", Character.valueOf('I'), "ingotIron", Character.valueOf('C'), "circuitBasic", Character.valueOf('A'), EnrichedAlloy, Character.valueOf('S'), new ItemStack(BasicBlock, 1, 8) })); CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(BasicBlock, 1, 14), new Object[] { - "CGC", "IBI", "CGC", Character.valueOf('C'), "circuitBasic", Character.valueOf('G'), Blocks.thinGlass, Character.valueOf('I'), new ItemStack(BasicBlock, 1, 8), Character.valueOf('B'), "blockCopper" + "CGC", "IBI", "CGC", Character.valueOf('C'), "circuitBasic", Character.valueOf('G'), Blocks.glass_pane, Character.valueOf('I'), new ItemStack(BasicBlock, 1, 8), Character.valueOf('B'), "blockCopper" })); CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(BasicBlock, 1, 15), new Object[] { "ITI", "CBC", "ITI", Character.valueOf('I'), "ingotCopper", Character.valueOf('T'), new ItemStack(BasicBlock, 1, 11), Character.valueOf('C'), "circuitBasic", Character.valueOf('B'), new ItemStack(BasicBlock, 1, 8) @@ -606,7 +585,7 @@ public class Mekanism "CGC", "EAE", "CGC", Character.valueOf('G'), MekanismUtils.getEmptyGasTank(), Character.valueOf('C'), "circuitBasic", Character.valueOf('A'), AtomicCore, Character.valueOf('E'), EnrichedAlloy })); CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MachineBlock2, 1, 7), new Object[] { - "CWC", "EIE", "CGC", Character.valueOf('W'), Items.bucketWater, Character.valueOf('C'), "circuitBasic", Character.valueOf('E'), EnrichedAlloy, Character.valueOf('G'), MekanismUtils.getEmptyGasTank(), Character.valueOf('I'), new ItemStack(BasicBlock, 1, 8) + "CWC", "EIE", "CGC", Character.valueOf('W'), Items.bucket, Character.valueOf('C'), "circuitBasic", Character.valueOf('E'), EnrichedAlloy, Character.valueOf('G'), MekanismUtils.getEmptyGasTank(), Character.valueOf('I'), new ItemStack(BasicBlock, 1, 8) })); CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MachineBlock2, 1, 8), new Object[] { "CGC", "ASA", "CGC", Character.valueOf('G'), MekanismUtils.getEmptyGasTank(), Character.valueOf('C'), "circuitBasic", Character.valueOf('A'), AtomicCore, Character.valueOf('S'), new ItemStack(BasicBlock, 1, 8) @@ -650,7 +629,7 @@ public class Mekanism "CTC", Character.valueOf('C'), AtomicCore, Character.valueOf('T'), new ItemStack(PartTransmitter, 1, 0) })); CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(PartTransmitter, 8, 4), new Object[] { - "SBS", Character.valueOf('S'), "ingotSteel", Character.valueOf('B'), Items.bucketEmpty + "SBS", Character.valueOf('S'), "ingotSteel", Character.valueOf('B'), Items.bucket })); CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(PartTransmitter, 1, 9), new Object[] { "ETE", Character.valueOf('E'), EnrichedAlloy, Character.valueOf('T'), new ItemStack(PartTransmitter, 1, 4) @@ -668,10 +647,10 @@ public class Mekanism "SCS", Character.valueOf('S'), "ingotSteel", Character.valueOf('C'), "circuitBasic" })); CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(PartTransmitter, 2, 7), new Object[] { - "SBS", Character.valueOf('S'), "ingotSteel", Character.valueOf('B'), Blocks.fenceIron + "SBS", Character.valueOf('S'), "ingotSteel", Character.valueOf('B'), Blocks.iron_bars })); CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(PartTransmitter, 2, 8), new Object[] { - "RRR", "SBS", "RRR", Character.valueOf('R'), Items.redstone, Character.valueOf('S'), "ingotSteel", Character.valueOf('B'), Blocks.fenceIron + "RRR", "SBS", "RRR", Character.valueOf('R'), Items.redstone, Character.valueOf('S'), "ingotSteel", Character.valueOf('B'), Blocks.iron_bars })); CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(Polyethene, 1, 1), new Object[] { "PP", "PP", "PP", Character.valueOf('P'), new ItemStack(Polyethene, 1, 0) @@ -686,7 +665,7 @@ public class Mekanism "SSS", "S S", "SSS", Character.valueOf('S'), new ItemStack(Polyethene, 1, 2) })); CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(GlowPanel, 2, 15), new Object[] { - "PSP", "S S", "GSG", Character.valueOf('P'), Blocks.thinGlass, Character.valueOf('S'), new ItemStack(Polyethene, 1, 2), Character.valueOf('G'), Items.glowstone + "PSP", "S S", "GSG", Character.valueOf('P'), Blocks.glass_pane, Character.valueOf('S'), new ItemStack(Polyethene, 1, 2), Character.valueOf('G'), Items.glowstone_dust })); for(int i = 0; i < EnumColor.DYES.length-1; i++) @@ -695,14 +674,14 @@ public class Mekanism "SSS", "SDS", "SSS", Character.valueOf('S'), new ItemStack(Polyethene, 1, 2), Character.valueOf('D'), new ItemStack(Items.dye, 1, i) })); CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(GlowPanel, 2, i), new Object[] { - "PSP", "SDS", "GSG", Character.valueOf('P'), Blocks.thinGlass, Character.valueOf('S'), new ItemStack(Polyethene, 1, 2), Character.valueOf('D'), new ItemStack(Items.dye, 1, i), Character.valueOf('G'), Items.glowstone + "PSP", "SDS", "GSG", Character.valueOf('P'), Blocks.glass_pane, Character.valueOf('S'), new ItemStack(Polyethene, 1, 2), Character.valueOf('D'), new ItemStack(Items.dye, 1, i), Character.valueOf('G'), Items.glowstone_dust })); } for(int i = 0; i < EnumColor.DYES.length; i++) { CraftingManager.getInstance().getRecipeList().add(new ShapelessOreRecipe(new ItemStack(Balloon, 2, i), new Object[] { - Items.leather, Items.silk, new ItemStack(Items.dye, 1, i) + Items.leather, Items.string, new ItemStack(Items.dye, 1, i) })); for(int j = 0; j < EnumColor.DYES.length; j++) @@ -733,7 +712,7 @@ public class Mekanism } CraftingManager.getInstance().getRecipeList().add(new ShapelessOreRecipe(new ItemStack(BlockGlowHDPE, 3, i), new Object[] { - new ItemStack(BlockHDPE, 1, i), new ItemStack(BlockHDPE, 1, i), new ItemStack(BlockHDPE, 1, i), new ItemStack(Items.glowstone) + new ItemStack(BlockHDPE, 1, i), new ItemStack(BlockHDPE, 1, i), new ItemStack(BlockHDPE, 1, i), new ItemStack(Items.glowstone_dust) })); CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(BlockReinforcedHDPE, 4, i), new Object[] { @@ -746,67 +725,67 @@ public class Mekanism } //Furnace Recipes - FurnaceRecipes.smelting().addSmelting(oreBlockID, 0, new ItemStack(Ingot, 1, 1), 1.0F); - FurnaceRecipes.smelting().addSmelting(oreBlockID, 1, new ItemStack(Ingot, 1, 5), 1.0F); - FurnaceRecipes.smelting().addSmelting(oreBlockID, 2, new ItemStack(Ingot, 1, 6), 1.0F); - FurnaceRecipes.smelting().addSmelting(Dust.itemID, 2, new ItemStack(Ingot, 1, 1), 0.0F); - FurnaceRecipes.smelting().addSmelting(Dust.itemID, 0, new ItemStack(Items.ingotIron), 0.0F); - FurnaceRecipes.smelting().addSmelting(Dust.itemID, 1, new ItemStack(Items.ingotGold), 0.0F); - FurnaceRecipes.smelting().addSmelting(Dust.itemID, 5, new ItemStack(Ingot, 1, 4), 0.0F); - FurnaceRecipes.smelting().addSmelting(Dust.itemID, 6, new ItemStack(Ingot, 1, 5), 0.0F); - FurnaceRecipes.smelting().addSmelting(Dust.itemID, 7, new ItemStack(Ingot, 1, 6), 0.0F); + FurnaceRecipes.smelting().func_151394_a(new ItemStack(OreBlock, 1, 0), new ItemStack(Ingot, 1, 1), 1.0F); + FurnaceRecipes.smelting().func_151394_a(new ItemStack(OreBlock, 1, 1), new ItemStack(Ingot, 1, 5), 1.0F); + FurnaceRecipes.smelting().func_151394_a(new ItemStack(OreBlock, 1, 2), new ItemStack(Ingot, 1, 6), 1.0F); + FurnaceRecipes.smelting().func_151394_a(new ItemStack(Dust, 1, 2), new ItemStack(Ingot, 1, 1), 0.0F); + FurnaceRecipes.smelting().func_151394_a(new ItemStack(Dust, 1, 0), new ItemStack(Items.iron_ingot), 0.0F); + FurnaceRecipes.smelting().func_151394_a(new ItemStack(Dust, 1, 1), new ItemStack(Items.gold_ingot), 0.0F); + FurnaceRecipes.smelting().func_151394_a(new ItemStack(Dust, 1, 5), new ItemStack(Ingot, 1, 4), 0.0F); + FurnaceRecipes.smelting().func_151394_a(new ItemStack(Dust, 1, 6), new ItemStack(Ingot, 1, 5), 0.0F); + FurnaceRecipes.smelting().func_151394_a(new ItemStack(Dust, 1, 7), new ItemStack(Ingot, 1, 6), 0.0F); //Enrichment Chamber Recipes - RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Blocks.oreRedstone), new ItemStack(Items.redstone, 12)); + RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Blocks.redstone_ore), new ItemStack(Items.redstone, 12)); RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Blocks.obsidian), new ItemStack(DirtyDust, 2, 6)); RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Items.coal, 1, 0), new ItemStack(CompressedCarbon)); RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Items.coal, 1, 1), new ItemStack(CompressedCarbon)); RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Items.redstone), new ItemStack(CompressedRedstone)); - RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Blocks.oreLapis), new ItemStack(Items.dye, 12, 4)); - RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Blocks.oreCoal), new ItemStack(Items.coal, 2)); - RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Blocks.oreDiamond), new ItemStack(Items.diamond, 2)); - RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Blocks.cobblestoneMossy), new ItemStack(Blocks.cobblestone)); - RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Blocks.stone), new ItemStack(Blocks.stoneBrick, 1, 2)); + RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Blocks.lapis_ore), new ItemStack(Items.dye, 12, 4)); + RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Blocks.coal_ore), new ItemStack(Items.coal, 2)); + RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Blocks.diamond_ore), new ItemStack(Items.diamond, 2)); + RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Blocks.mossy_cobblestone), new ItemStack(Blocks.cobblestone)); + RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Blocks.stone), new ItemStack(Blocks.stonebrick, 1, 2)); RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Blocks.sand), new ItemStack(Blocks.gravel)); RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Blocks.gravel), new ItemStack(Blocks.cobblestone)); RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Items.gunpowder), new ItemStack(Items.flint)); - RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Blocks.stoneBrick, 1, 2), new ItemStack(Blocks.stoneBrick, 1, 0)); - RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Blocks.stoneBrick, 1, 0), new ItemStack(Blocks.stoneBrick, 1, 3)); - RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Blocks.stoneBrick, 1, 1), new ItemStack(Blocks.stoneBrick, 1, 0)); - RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Blocks.oreNetherQuartz), new ItemStack(Items.netherQuartz, 2)); + RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Blocks.stonebrick, 1, 2), new ItemStack(Blocks.stonebrick, 1, 0)); + RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Blocks.stonebrick, 1, 0), new ItemStack(Blocks.stonebrick, 1, 3)); + RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Blocks.stonebrick, 1, 1), new ItemStack(Blocks.stonebrick, 1, 0)); + RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Blocks.quartz_ore), new ItemStack(Items.quartz, 2)); for(int i = 0; i < EnumColor.DYES.length; i++) { RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(BlockHDPE, 1, i), new ItemStack(BlockSlickHDPE, 1, i)); } //Combiner recipes - RecipeHandler.addCombinerRecipe(new ItemStack(Items.redstone, 16), new ItemStack(Blocks.oreRedstone)); + RecipeHandler.addCombinerRecipe(new ItemStack(Items.redstone, 16), new ItemStack(Blocks.redstone_ore)); RecipeHandler.addCombinerRecipe(new ItemStack(Items.dye, 16, 4), new ItemStack(Blocks.lapis_ore)); RecipeHandler.addCombinerRecipe(new ItemStack(Items.flint), new ItemStack(Blocks.gravel)); //Osmium Compressor Recipes - RecipeHandler.addOsmiumCompressorRecipe(new ItemStack(Items.glowstone), new ItemStack(Ingot, 1, 3)); + RecipeHandler.addOsmiumCompressorRecipe(new ItemStack(Items.glowstone_dust), new ItemStack(Ingot, 1, 3)); //Crusher Recipes RecipeHandler.addCrusherRecipe(new ItemStack(Items.diamond), new ItemStack(Dust, 1, 4)); - RecipeHandler.addCrusherRecipe(new ItemStack(Items.ingotIron), new ItemStack(Dust, 1, 0)); - RecipeHandler.addCrusherRecipe(new ItemStack(Items.ingotGold), new ItemStack(Dust, 1, 1)); + RecipeHandler.addCrusherRecipe(new ItemStack(Items.iron_ingot), new ItemStack(Dust, 1, 0)); + RecipeHandler.addCrusherRecipe(new ItemStack(Items.gold_ingot), new ItemStack(Dust, 1, 1)); RecipeHandler.addCrusherRecipe(new ItemStack(Blocks.gravel), new ItemStack(Blocks.sand)); RecipeHandler.addCrusherRecipe(new ItemStack(Blocks.stone), new ItemStack(Blocks.cobblestone)); RecipeHandler.addCrusherRecipe(new ItemStack(Blocks.cobblestone), new ItemStack(Blocks.gravel)); - RecipeHandler.addCrusherRecipe(new ItemStack(Blocks.stoneBrick, 1, 2), new ItemStack(Blocks.stone)); - RecipeHandler.addCrusherRecipe(new ItemStack(Blocks.stoneBrick, 1, 0), new ItemStack(Blocks.stoneBrick, 1, 2)); - RecipeHandler.addCrusherRecipe(new ItemStack(Blocks.stoneBrick, 1, 3), new ItemStack(Blocks.stoneBrick, 1, 0)); + RecipeHandler.addCrusherRecipe(new ItemStack(Blocks.stonebrick, 1, 2), new ItemStack(Blocks.stone)); + RecipeHandler.addCrusherRecipe(new ItemStack(Blocks.stonebrick, 1, 0), new ItemStack(Blocks.stonebrick, 1, 2)); + RecipeHandler.addCrusherRecipe(new ItemStack(Blocks.stonebrick, 1, 3), new ItemStack(Blocks.stonebrick, 1, 0)); RecipeHandler.addCrusherRecipe(new ItemStack(Items.flint, 4), new ItemStack(Items.gunpowder)); - RecipeHandler.addCrusherRecipe(new ItemStack(Blocks.sandStone), new ItemStack(Blocks.sand, 2)); + RecipeHandler.addCrusherRecipe(new ItemStack(Blocks.sandstone), new ItemStack(Blocks.sand, 2)); //BioFuel Crusher Recipes - RecipeHandler.addCrusherRecipe(new ItemStack(Blocks.tallGrass), new ItemStack(BioFuel, 4)); - RecipeHandler.addCrusherRecipe(new ItemStack(Items.reed), new ItemStack(BioFuel, 2)); - RecipeHandler.addCrusherRecipe(new ItemStack(Items.seeds), new ItemStack(BioFuel, 2)); + RecipeHandler.addCrusherRecipe(new ItemStack(Blocks.tallgrass), new ItemStack(BioFuel, 4)); + RecipeHandler.addCrusherRecipe(new ItemStack(Items.reeds), new ItemStack(BioFuel, 2)); + RecipeHandler.addCrusherRecipe(new ItemStack(Items.wheat_seeds), new ItemStack(BioFuel, 2)); RecipeHandler.addCrusherRecipe(new ItemStack(Items.wheat), new ItemStack(BioFuel, 4)); - RecipeHandler.addCrusherRecipe(new ItemStack(Items.pumpkinSeeds), new ItemStack(BioFuel, 2)); - RecipeHandler.addCrusherRecipe(new ItemStack(Items.melonSeeds), new ItemStack(BioFuel, 2)); - RecipeHandler.addCrusherRecipe(new ItemStack(Items.appleRed), new ItemStack(BioFuel, 4)); + RecipeHandler.addCrusherRecipe(new ItemStack(Items.pumpkin_seeds), new ItemStack(BioFuel, 2)); + RecipeHandler.addCrusherRecipe(new ItemStack(Items.melon_seeds), new ItemStack(BioFuel, 2)); + RecipeHandler.addCrusherRecipe(new ItemStack(Items.apple), new ItemStack(BioFuel, 4)); RecipeHandler.addCrusherRecipe(new ItemStack(Items.bread), new ItemStack(BioFuel, 4)); RecipeHandler.addCrusherRecipe(new ItemStack(Items.potato), new ItemStack(BioFuel, 4)); RecipeHandler.addCrusherRecipe(new ItemStack(Items.carrot), new ItemStack(BioFuel, 4)); @@ -817,7 +796,7 @@ public class Mekanism //Chemical Injection Chamber Recipes RecipeHandler.addChemicalInjectionChamberRecipe(new AdvancedInput(new ItemStack(Blocks.obsidian), GasRegistry.getGas("hydrogenChloride")), new ItemStack(Shard, 4, 6)); - RecipeHandler.addChemicalInjectionChamberRecipe(new AdvancedInput(new ItemStack(Blocks.dirt), GasRegistry.getGas("water")), new ItemStack(Blocks.blockClay)); + RecipeHandler.addChemicalInjectionChamberRecipe(new AdvancedInput(new ItemStack(Blocks.dirt), GasRegistry.getGas("water")), new ItemStack(Blocks.clay)); RecipeHandler.addChemicalInjectionChamberRecipe(new AdvancedInput(new ItemStack(Items.gunpowder), GasRegistry.getGas("hydrogenChloride")), new ItemStack(Mekanism.Dust, 1, 10)); //Precision Sawmill Recipes @@ -825,26 +804,26 @@ public class Mekanism RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Blocks.chest), new ChanceOutput(new ItemStack(Blocks.planks, 8))); RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Blocks.trapdoor), new ChanceOutput(new ItemStack(Blocks.planks, 3))); RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Items.boat), new ChanceOutput(new ItemStack(Blocks.planks, 5))); - RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Items.bed), new ChanceOutput(new ItemStack(Blocks.planks, 3), new ItemStack(Blocks.cloth, 3), 1)); + RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Items.bed), new ChanceOutput(new ItemStack(Blocks.planks, 3), new ItemStack(Blocks.wool, 3), 1)); RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Blocks.jukebox), new ChanceOutput(new ItemStack(Blocks.planks, 8), new ItemStack(Items.diamond), 1)); - RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Blocks.bookShelf), new ChanceOutput(new ItemStack(Blocks.planks, 6), new ItemStack(Items.book, 3), 1)); - RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Blocks.pressurePlatePlanks), new ChanceOutput(new ItemStack(Blocks.planks, 2))); + RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Blocks.bookshelf), new ChanceOutput(new ItemStack(Blocks.planks, 6), new ItemStack(Items.book, 3), 1)); + RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Blocks.wooden_pressure_plate), new ChanceOutput(new ItemStack(Blocks.planks, 2))); RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Blocks.fence), new ChanceOutput(new ItemStack(Items.stick, 3))); - RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Blocks.fenceGate), new ChanceOutput(new ItemStack(Blocks.planks, 2), new ItemStack(Items.stick, 4), 1)); - RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Blocks.music), new ChanceOutput(new ItemStack(Blocks.planks, 8), new ItemStack(Items.redstone, 1), 1)); - RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Blocks.torchRedstoneIdle), new ChanceOutput(new ItemStack(Items.stick, 1), new ItemStack(Items.redstone), 1)); - RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Blocks.workbench), new ChanceOutput(new ItemStack(Blocks.planks, 4))); + RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Blocks.fence_gate), new ChanceOutput(new ItemStack(Blocks.planks, 2), new ItemStack(Items.stick, 4), 1)); + RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Blocks.noteblock), new ChanceOutput(new ItemStack(Blocks.planks, 8), new ItemStack(Items.redstone, 1), 1)); + RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Blocks.unlit_redstone_torch), new ChanceOutput(new ItemStack(Items.stick, 1), new ItemStack(Items.redstone), 1)); + RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Blocks.crafting_table), new ChanceOutput(new ItemStack(Blocks.planks, 4))); //Metallurgic Infuser Recipes - RecipeHandler.addMetallurgicInfuserRecipe(InfusionInput.getInfusion(InfuseRegistry.get("CARBON"), 10, new ItemStack(Items.ingotIron)), new ItemStack(EnrichedIron)); + RecipeHandler.addMetallurgicInfuserRecipe(InfusionInput.getInfusion(InfuseRegistry.get("CARBON"), 10, new ItemStack(Items.iron_ingot)), new ItemStack(EnrichedIron)); RecipeHandler.addMetallurgicInfuserRecipe(InfusionInput.getInfusion(InfuseRegistry.get("CARBON"), 10, new ItemStack(EnrichedIron)), new ItemStack(Dust, 1, 5)); - RecipeHandler.addMetallurgicInfuserRecipe(InfusionInput.getInfusion(InfuseRegistry.get("REDSTONE"), 10, new ItemStack(Items.ingotIron)), new ItemStack(EnrichedAlloy)); + RecipeHandler.addMetallurgicInfuserRecipe(InfusionInput.getInfusion(InfuseRegistry.get("REDSTONE"), 10, new ItemStack(Items.iron_ingot)), new ItemStack(EnrichedAlloy)); RecipeHandler.addMetallurgicInfuserRecipe(InfusionInput.getInfusion(InfuseRegistry.get("FUNGI"), 10, new ItemStack(Blocks.dirt)), new ItemStack(Blocks.mycelium)); if(InfuseRegistry.contains("BIO")) { - RecipeHandler.addMetallurgicInfuserRecipe(InfusionInput.getInfusion(InfuseRegistry.get("BIO"), 10, new ItemStack(Blocks.cobblestone)), new ItemStack(Blocks.cobblestoneMossy)); - RecipeHandler.addMetallurgicInfuserRecipe(InfusionInput.getInfusion(InfuseRegistry.get("BIO"), 10, new ItemStack(Blocks.stoneBrick, 1, 0)), new ItemStack(Blocks.stoneBrick, 1, 1)); + RecipeHandler.addMetallurgicInfuserRecipe(InfusionInput.getInfusion(InfuseRegistry.get("BIO"), 10, new ItemStack(Blocks.cobblestone)), new ItemStack(Blocks.mossy_cobblestone)); + RecipeHandler.addMetallurgicInfuserRecipe(InfusionInput.getInfusion(InfuseRegistry.get("BIO"), 10, new ItemStack(Blocks.stonebrick, 1, 0)), new ItemStack(Blocks.stonebrick, 1, 1)); } //Chemical Infuser Recipes @@ -892,10 +871,10 @@ public class Mekanism InfuseRegistry.registerInfuseObject(new ItemStack(Items.coal, 1, 1), new InfuseObject(InfuseRegistry.get("CARBON"), 20)); InfuseRegistry.registerInfuseObject(new ItemStack(CompressedCarbon), new InfuseObject(InfuseRegistry.get("CARBON"), 100)); InfuseRegistry.registerInfuseObject(new ItemStack(Items.redstone), new InfuseObject(InfuseRegistry.get("REDSTONE"), 10)); - InfuseRegistry.registerInfuseObject(new ItemStack(Blocks.blockRedstone), new InfuseObject(InfuseRegistry.get("REDSTONE"), 90)); + InfuseRegistry.registerInfuseObject(new ItemStack(Blocks.redstone_block), new InfuseObject(InfuseRegistry.get("REDSTONE"), 90)); InfuseRegistry.registerInfuseObject(new ItemStack(CompressedRedstone), new InfuseObject(InfuseRegistry.get("REDSTONE"), 100)); - InfuseRegistry.registerInfuseObject(new ItemStack(Blocks.mushroomRed), new InfuseObject(InfuseRegistry.get("FUNGI"), 10)); - InfuseRegistry.registerInfuseObject(new ItemStack(Blocks.mushroomBrown), new InfuseObject(InfuseRegistry.get("FUNGI"), 10)); + InfuseRegistry.registerInfuseObject(new ItemStack(Blocks.red_mushroom), new InfuseObject(InfuseRegistry.get("FUNGI"), 10)); + InfuseRegistry.registerInfuseObject(new ItemStack(Blocks.brown_mushroom), new InfuseObject(InfuseRegistry.get("FUNGI"), 10)); //Fuels GameRegistry.registerFuelHandler(new IFuelHandler() { @@ -922,48 +901,48 @@ public class Mekanism { //Declarations configuration.load(); - PartTransmitter = new ItemPartTransmitter(configuration.getItem("MultipartTransmitter", ITEM_ID++).getInt()).setUnlocalizedName("MultipartTransmitter"); - EnrichedAlloy = new ItemMekanism(configuration.getItem("EnrichedAlloy", ITEM_ID++).getInt()).setUnlocalizedName("EnrichedAlloy"); - EnrichedIron = new ItemMekanism(configuration.getItem("EnrichedIron", ITEM_ID++).getInt()).setUnlocalizedName("EnrichedIron"); - ControlCircuit = new ItemMekanism(configuration.getItem("ControlCircuit", ITEM_ID++).getInt()).setUnlocalizedName("ControlCircuit"); - AtomicCore = new ItemMekanism(configuration.getItem("AtomicCore", ITEM_ID++).getInt()).setUnlocalizedName("AtomicCore"); - TeleportationCore = new ItemMekanism(configuration.getItem("TeleportationCore", ITEM_ID++).getInt()).setUnlocalizedName("TeleportationCore"); - ElectrolyticCore = new ItemMekanism(configuration.getItem("ElectrolyticCore", ITEM_ID++).getInt()).setUnlocalizedName("ElectrolyticCore"); - CompressedCarbon = new ItemMekanism(configuration.getItem("CompressedCarbon", ITEM_ID++).getInt()).setUnlocalizedName("CompressedCarbon"); - CompressedRedstone = new ItemMekanism(configuration.getItem("CompressedRedstone", ITEM_ID++).getInt()).setUnlocalizedName("CompressedRedstone"); - SpeedUpgrade = new ItemMachineUpgrade(configuration.getItem("SpeedUpgrade", ITEM_ID++).getInt()).setUnlocalizedName("SpeedUpgrade"); - EnergyUpgrade = new ItemMachineUpgrade(configuration.getItem("EnergyUpgrade", ITEM_ID++).getInt()).setUnlocalizedName("EnergyUpgrade"); - EnergyTablet = (ItemEnergized)new ItemEnergized(configuration.getItem("EnergyTablet", ITEM_ID++).getInt(), 1000000).setUnlocalizedName("EnergyTablet"); - Dictionary = new ItemDictionary(configuration.getItem("Dictionary", ITEM_ID++).getInt()).setUnlocalizedName("Dictionary"); - FilterCard = new ItemFilterCard(configuration.getItem("FilterCard", ITEM_ID++).getInt()).setUnlocalizedName("FilterCard"); - ElectricBow = (ItemElectricBow)new ItemElectricBow(configuration.getItem("ElectricBow", ITEM_ID++).getInt()).setUnlocalizedName("ElectricBow"); - PortableTeleporter = new ItemPortableTeleporter(configuration.getItem("PortableTeleporter", ITEM_ID++).getInt()).setUnlocalizedName("PortableTeleporter"); - Configurator = new ItemConfigurator(configuration.getItem("Configurator", ITEM_ID++).getInt()).setUnlocalizedName("Configurator"); - NetworkReader = new ItemNetworkReader(configuration.getItem("NetworkReader", ITEM_ID++).getInt()).setUnlocalizedName("NetworkReader"); - WalkieTalkie = new ItemWalkieTalkie(configuration.getItem("WalkieTalkie", ITEM_ID++).getInt()).setUnlocalizedName("WalkieTalkie"); - SeismicReader = (ItemSeismicReader)new ItemSeismicReader(configuration.getItem("SeismicReader", ITEM_ID++).getInt()).setUnlocalizedName("SeismicReader"); - AtomicDisassembler = (ItemAtomicDisassembler)new ItemAtomicDisassembler(configuration.getItem("AtomicDisassembler", ITEM_ID++).getInt()).setUnlocalizedName("AtomicDisassembler"); - GasMask = (ItemGasMask)new ItemGasMask(configuration.getItem("GasMask", ITEM_ID++).getInt()).setUnlocalizedName("GasMask"); - ScubaTank = (ItemScubaTank)new ItemScubaTank(configuration.getItem("ScubaTank", ITEM_ID++).getInt()).setUnlocalizedName("ScubaTank"); - Jetpack = (ItemJetpack)new ItemJetpack(configuration.getItem("Jetpack", ITEM_ID++).getInt()).setUnlocalizedName("Jetpack"); - ArmoredJetpack = (ItemJetpack)new ItemJetpack(configuration.getItem("ArmoredJetpack", ITEM_ID++).getInt()).setUnlocalizedName("ArmoredJetpack"); - FreeRunners = new ItemFreeRunners(configuration.getItem("FreeRunners", ITEM_ID++).getInt()).setUnlocalizedName("FreeRunners"); - BrineBucket = new ItemMekanism(configuration.getItem("BrineBucket", ITEM_ID++).getInt()).setMaxStackSize(1).setContainerItem(Items.bucketEmpty).setUnlocalizedName("BrineBucket"); - Sawdust = new ItemMekanism(configuration.getItem("Sawdust", ITEM_ID++).getInt()).setUnlocalizedName("Sawdust"); - Salt = new ItemMekanism(configuration.getItem("Salt", ITEM_ID++).getInt()).setUnlocalizedName("Salt"); - Ingot = new ItemIngot(configuration.getItem("Ingot", ITEM_ID++).getInt()); - DirtyDust = new ItemDirtyDust(configuration.getItem("DirtyDust", ITEM_ID++).getInt()); - Clump = new ItemClump(configuration.getItem("Clump", ITEM_ID++).getInt()); - Shard = new ItemShard(configuration.getItem("Shard", ITEM_ID++).getInt()); - Crystal = new ItemCrystal(configuration.getItem("Crystal", ITEM_ID++).getInt()); - Dust = new ItemDust(configuration.getItem("Dust", ITEM_ID++).getInt()); - Robit = (ItemRobit)new ItemRobit(configuration.getItem("Robit", ITEM_ID++).getInt()).setUnlocalizedName("Robit"); - Balloon = new ItemBalloon(configuration.getItem("Balloon", ITEM_ID++).getInt()).setUnlocalizedName("Balloon"); - ItemProxy = new ItemProxy(configuration.getItem("ItemProxy", ITEM_ID++).getInt()).setUnlocalizedName("ItemProxy"); - Substrate = new ItemMekanism(configuration.getItem("Substrate", ITEM_ID++).getInt()).setUnlocalizedName("Substrate"); - Polyethene = new ItemHDPE(configuration.getItem("HDPE", ITEM_ID++).getInt()).setUnlocalizedName("HDPE"); - BioFuel = new ItemMekanism(Mekanism.configuration.getItem("BioFuel", ITEM_ID++).getInt()).setUnlocalizedName("BioFuel"); - GlowPanel = new ItemGlowPanel(configuration.getItem("GlowPanel", ITEM_ID++).getInt()).setUnlocalizedName("GlowPanel"); + PartTransmitter = new ItemPartTransmitter().setUnlocalizedName("MultipartTransmitter"); + EnrichedAlloy = new ItemMekanism().setUnlocalizedName("EnrichedAlloy"); + EnrichedIron = new ItemMekanism().setUnlocalizedName("EnrichedIron"); + ControlCircuit = new ItemMekanism().setUnlocalizedName("ControlCircuit"); + AtomicCore = new ItemMekanism().setUnlocalizedName("AtomicCore"); + TeleportationCore = new ItemMekanism().setUnlocalizedName("TeleportationCore"); + ElectrolyticCore = new ItemMekanism().setUnlocalizedName("ElectrolyticCore"); + CompressedCarbon = new ItemMekanism().setUnlocalizedName("CompressedCarbon"); + CompressedRedstone = new ItemMekanism().setUnlocalizedName("CompressedRedstone"); + SpeedUpgrade = new ItemMachineUpgrade().setUnlocalizedName("SpeedUpgrade"); + EnergyUpgrade = new ItemMachineUpgrade().setUnlocalizedName("EnergyUpgrade"); + EnergyTablet = (ItemEnergized)new ItemEnergized(1000000).setUnlocalizedName("EnergyTablet"); + Dictionary = new ItemDictionary().setUnlocalizedName("Dictionary"); + FilterCard = new ItemFilterCard().setUnlocalizedName("FilterCard"); + ElectricBow = (ItemElectricBow)new ItemElectricBow().setUnlocalizedName("ElectricBow"); + PortableTeleporter = new ItemPortableTeleporter().setUnlocalizedName("PortableTeleporter"); + Configurator = new ItemConfigurator().setUnlocalizedName("Configurator"); + NetworkReader = new ItemNetworkReader().setUnlocalizedName("NetworkReader"); + WalkieTalkie = new ItemWalkieTalkie().setUnlocalizedName("WalkieTalkie"); + SeismicReader = (ItemSeismicReader)new ItemSeismicReader().setUnlocalizedName("SeismicReader"); + AtomicDisassembler = (ItemAtomicDisassembler)new ItemAtomicDisassembler().setUnlocalizedName("AtomicDisassembler"); + GasMask = (ItemGasMask)new ItemGasMask().setUnlocalizedName("GasMask"); + ScubaTank = (ItemScubaTank)new ItemScubaTank().setUnlocalizedName("ScubaTank"); + Jetpack = (ItemJetpack)new ItemJetpack().setUnlocalizedName("Jetpack"); + ArmoredJetpack = (ItemJetpack)new ItemJetpack().setUnlocalizedName("ArmoredJetpack"); + FreeRunners = new ItemFreeRunners().setUnlocalizedName("FreeRunners"); + BrineBucket = new ItemMekanism().setMaxStackSize(1).setContainerItem(Items.bucket).setUnlocalizedName("BrineBucket"); + Sawdust = new ItemMekanism().setUnlocalizedName("Sawdust"); + Salt = new ItemMekanism().setUnlocalizedName("Salt"); + Ingot = new ItemIngot(); + DirtyDust = new ItemDirtyDust(); + Clump = new ItemClump(); + Shard = new ItemShard(); + Crystal = new ItemCrystal(); + Dust = new ItemDust(); + Robit = (ItemRobit)new ItemRobit().setUnlocalizedName("Robit"); + Balloon = new ItemBalloon().setUnlocalizedName("Balloon"); + ItemProxy = new ItemProxy().setUnlocalizedName("ItemProxy"); + Substrate = new ItemMekanism().setUnlocalizedName("Substrate"); + Polyethene = new ItemHDPE().setUnlocalizedName("HDPE"); + BioFuel = new ItemMekanism().setUnlocalizedName("BioFuel"); + GlowPanel = new ItemGlowPanel().setUnlocalizedName("GlowPanel"); configuration.save(); @@ -1019,22 +998,22 @@ public class Mekanism public void addBlocks() { //Declarations - BasicBlock = new BlockBasic(basicBlockID).setUnlocalizedName("BasicBlock"); - BasicBlock2 = new BlockBasic(basicBlock2ID).setUnlocalizedName("BasicBlock2"); - MachineBlock = new BlockMachine(machineBlockID).setUnlocalizedName("MachineBlock"); - MachineBlock2 = new BlockMachine(machineBlock2ID).setUnlocalizedName("MachineBlock2"); - OreBlock = new BlockOre(oreBlockID).setUnlocalizedName("OreBlock"); - EnergyCube = new BlockEnergyCube(energyCubeID).setUnlocalizedName("EnergyCube"); - ObsidianTNT = new BlockObsidianTNT(obsidianTNTID).setUnlocalizedName("ObsidianTNT").setCreativeTab(tabMekanism); - BoundingBlock = (BlockBounding) new BlockBounding(boundingBlockID).setUnlocalizedName("BoundingBlock"); - GasTank = new BlockGasTank(gasTankID).setUnlocalizedName("GasTank"); - CardboardBox = new BlockCardboardBox(cardboardBoxID).setUnlocalizedName("CardboardBox"); - BlockHDPE = new BlockPlastic(plasticID).setUnlocalizedName("PlasticBlock"); - BlockSlickHDPE = new BlockPlastic(slickPlasticID).setUnlocalizedName("SlickPlasticBlock"); - BlockGlowHDPE = new BlockPlastic(glowPlasticID).setUnlocalizedName("GlowPlasticBlock"); - BlockReinforcedHDPE = new BlockPlastic(reinforcedPlasticID).setUnlocalizedName("ReinforcedPlasticBlock"); - BlockRoadHDPE = new BlockPlastic(roadPlasticID).setUnlocalizedName("RoadPlasticBlock"); - BlockHDPEFence = new BlockPlasticFence(plasticFenceID).setUnlocalizedName("PlasticFence"); + BasicBlock = new BlockBasic(); + BasicBlock2 = new BlockBasic(); + MachineBlock = new BlockMachine(); + MachineBlock2 = new BlockMachine(); + OreBlock = new BlockOre(); + EnergyCube = new BlockEnergyCube(); + ObsidianTNT = new BlockObsidianTNT().setCreativeTab(tabMekanism); + BoundingBlock = (BlockBounding) new BlockBounding(); + GasTank = new BlockGasTank(); + CardboardBox = new BlockCardboardBox(); + BlockHDPE = new BlockPlastic(); + BlockSlickHDPE = new BlockPlastic(); + BlockGlowHDPE = new BlockPlastic(); + BlockReinforcedHDPE = new BlockPlastic(); + BlockRoadHDPE = new BlockPlastic(); + BlockHDPEFence = new BlockPlasticFence(); //Registrations GameRegistry.registerBlock(BasicBlock, ItemBlockBasic.class, "BasicBlock"); @@ -1114,11 +1093,11 @@ public class Mekanism OreDictionary.registerOre("oreTin", new ItemStack(OreBlock, 1, 2)); //MC stuff - OreDictionary.registerOre("oreCoal", new ItemStack(Blocks.oreCoal)); - OreDictionary.registerOre("ingotIron", new ItemStack(Items.ingotIron)); - OreDictionary.registerOre("ingotGold", new ItemStack(Items.ingotGold)); - OreDictionary.registerOre("oreRedstone", new ItemStack(Blocks.oreRedstone)); - OreDictionary.registerOre("oreRedstone", new ItemStack(Blocks.oreRedstoneGlowing)); + OreDictionary.registerOre("oreCoal", new ItemStack(Blocks.coal_ore)); + OreDictionary.registerOre("ingotIron", new ItemStack(Items.iron_ingot)); + OreDictionary.registerOre("ingotGold", new ItemStack(Items.iron_ingot)); + OreDictionary.registerOre("oreRedstone", new ItemStack(Blocks.redstone_ore)); + OreDictionary.registerOre("oreRedstone", new ItemStack(Blocks.lit_redstone_ore)); if(controlCircuitOreDict || !hooks.BasicComponentsLoaded) { @@ -1268,7 +1247,7 @@ public class Mekanism @EventHandler public void preInit(FMLPreInitializationEvent event) { - logger.setParent(FMLLog.getLogger()); + //logger.setParent(FMLLog.getLogger()); File config = event.getSuggestedConfigurationFile(); //Set the mod's configuration @@ -1276,11 +1255,11 @@ public class Mekanism if(config.getAbsolutePath().contains("voltz")) { - System.out.println("[Mekanism] Detected Voltz in root directory - hello, fellow user!"); + logger.info("Detected Voltz in root directory - hello, fellow user!"); } else if(config.getAbsolutePath().contains("tekkit")) { - System.out.println("[Mekanism] Detected Tekkit in root directory - hello, fellow user!"); + logger.info("Detected Tekkit in root directory - hello, fellow user!"); } GasRegistry.register(new Gas("hydrogen")).registerFluid(); @@ -1320,16 +1299,16 @@ public class Mekanism public void init(FMLInitializationEvent event) { //Register the mod's ore handler - GameRegistry.registerWorldGenerator(new OreHandler()); + GameRegistry.registerWorldGenerator(new OreHandler(), 1); //Register player tracker - GameRegistry.registerPlayerTracker(new CommonPlayerTracker()); + MinecraftForge.EVENT_BUS.register(new CommonPlayerTracker()); //Register the mod's GUI handler - NetworkRegistry.instance().registerGuiHandler(this, new CoreGuiHandler()); + NetworkRegistry.INSTANCE.registerGuiHandler(this, new CoreGuiHandler()); //Initialization notification - System.out.println("[Mekanism] Version " + versionNumber + " initializing..."); + logger.info("[Mekanism] Version " + versionNumber + " initializing..."); //Get data from server. new ThreadGetData(); @@ -1360,41 +1339,17 @@ public class Mekanism new MultipartMekanism(); //Packet registrations - PacketHandler.registerPacket(PacketRobit.class); - PacketHandler.registerPacket(PacketTransmitterUpdate.class); - PacketHandler.registerPacket(PacketElectricChest.class); - PacketHandler.registerPacket(PacketElectricBowState.class); - PacketHandler.registerPacket(PacketConfiguratorState.class); - PacketHandler.registerPacket(PacketTileEntity.class); - PacketHandler.registerPacket(PacketPortalFX.class); - PacketHandler.registerPacket(PacketDataRequest.class); - PacketHandler.registerPacket(PacketStatusUpdate.class); - PacketHandler.registerPacket(PacketDigitUpdate.class); - PacketHandler.registerPacket(PacketPortableTeleport.class); - PacketHandler.registerPacket(PacketRemoveUpgrade.class); - PacketHandler.registerPacket(PacketRedstoneControl.class); - PacketHandler.registerPacket(PacketWalkieTalkieState.class); - PacketHandler.registerPacket(PacketLogisticalSorterGui.class); - PacketHandler.registerPacket(PacketNewFilter.class); - PacketHandler.registerPacket(PacketEditFilter.class); - PacketHandler.registerPacket(PacketConfigurationUpdate.class); - PacketHandler.registerPacket(PacketSimpleGui.class); - PacketHandler.registerPacket(PacketDigitalMinerGui.class); - PacketHandler.registerPacket(PacketJetpackData.class); - PacketHandler.registerPacket(PacketKey.class); - PacketHandler.registerPacket(PacketScubaTankData.class); - PacketHandler.registerPacket(PacketConfigSync.class); - PacketHandler.registerPacket(PacketBoxBlacklist.class); - + packetPipeline.initalise(); + //Load proxy proxy.registerRenderInformation(); proxy.loadUtilities(); //Completion notification - System.out.println("[Mekanism] Loading complete."); + logger.info("Loading complete."); //Success message - logger.info("[Mekanism] Mod loaded."); + logger.info("Mod loaded."); } @EventHandler @@ -1408,15 +1363,17 @@ public class Mekanism addIntegratedItems(); OreDictManager.init(); + + packetPipeline.postInitialise(); - System.out.println("[Mekanism] Hooking complete."); + logger.info("Hooking complete."); } @SubscribeEvent public void onEnergyTransferred(EnergyTransferEvent event) { try { - PacketHandler.sendPacket(Transmission.ALL_CLIENTS, new PacketTransmitterUpdate().setParams(PacketType.ENERGY, event.energyNetwork.transmitters.iterator().next(), event.power)); + packetPipeline.sendToAll(new PacketTransmitterUpdate(PacketType.ENERGY, (TileEntity)event.energyNetwork.transmitters.iterator().next(), event.power)); } catch(Exception e) {} } @@ -1424,7 +1381,7 @@ public class Mekanism public void onGasTransferred(GasTransferEvent event) { try { - PacketHandler.sendPacket(Transmission.ALL_CLIENTS, new PacketTransmitterUpdate().setParams(PacketType.GAS, event.gasNetwork.transmitters.iterator().next(), event.transferType, event.didTransfer)); + packetPipeline.sendToAll(new PacketTransmitterUpdate(PacketType.GAS, (TileEntity)event.gasNetwork.transmitters.iterator().next(), event.transferType, event.didTransfer)); } catch(Exception e) {} } @@ -1432,7 +1389,7 @@ public class Mekanism public void onLiquidTransferred(FluidTransferEvent event) { try { - PacketHandler.sendPacket(Transmission.ALL_CLIENTS, new PacketTransmitterUpdate().setParams(PacketType.FLUID, event.fluidNetwork.transmitters.iterator().next(), event.fluidType, event.didTransfer)); + packetPipeline.sendToAll(new PacketTransmitterUpdate(PacketType.FLUID, (TileEntity)event.fluidNetwork.transmitters.iterator().next(), event.fluidType, event.didTransfer)); } catch(Exception e) {} } @@ -1440,7 +1397,7 @@ public class Mekanism public void onNetworkClientRequest(NetworkClientRequest event) { try { - PacketHandler.sendPacket(Transmission.SERVER, new PacketDataRequest().setParams(Coord4D.get(event.tileEntity))); + packetPipeline.sendToServer(new PacketDataRequest(Coord4D.get(event.tileEntity))); } catch(Exception e) {} } @@ -1461,16 +1418,16 @@ public class Mekanism @SubscribeEvent public void onBlacklistUpdate(BoxBlacklistEvent event) { - MekanismAPI.addBoxBlacklist(CardboardBox.blockID, OreDictionary.WILDCARD_VALUE); - MekanismAPI.addBoxBlacklist(BoundingBlock.blockID, OreDictionary.WILDCARD_VALUE); - MekanismAPI.addBoxBlacklist(Blocks.bedrock.blockID, 0); - MekanismAPI.addBoxBlacklist(Blocks.portal.blockID, OreDictionary.WILDCARD_VALUE); - MekanismAPI.addBoxBlacklist(Blocks.endPortal.blockID, OreDictionary.WILDCARD_VALUE); - MekanismAPI.addBoxBlacklist(Blocks.endPortalFrame.blockID, OreDictionary.WILDCARD_VALUE); - MekanismAPI.addBoxBlacklist(Blocks.bed.blockID, OreDictionary.WILDCARD_VALUE); - MekanismAPI.addBoxBlacklist(Blocks.doorWood.blockID, OreDictionary.WILDCARD_VALUE); - MekanismAPI.addBoxBlacklist(Blocks.doorIron.blockID, OreDictionary.WILDCARD_VALUE); - MekanismAPI.addBoxBlacklist(MultipartProxy.block().blockID, OreDictionary.WILDCARD_VALUE); + MekanismAPI.addBoxBlacklist(CardboardBox, OreDictionary.WILDCARD_VALUE); + MekanismAPI.addBoxBlacklist(BoundingBlock, OreDictionary.WILDCARD_VALUE); + MekanismAPI.addBoxBlacklist(Blocks.bedrock, 0); + MekanismAPI.addBoxBlacklist(Blocks.portal, OreDictionary.WILDCARD_VALUE); + MekanismAPI.addBoxBlacklist(Blocks.end_portal, OreDictionary.WILDCARD_VALUE); + MekanismAPI.addBoxBlacklist(Blocks.end_portal_frame, OreDictionary.WILDCARD_VALUE); + MekanismAPI.addBoxBlacklist(Blocks.bed, OreDictionary.WILDCARD_VALUE); + MekanismAPI.addBoxBlacklist(Blocks.wooden_door, OreDictionary.WILDCARD_VALUE); + MekanismAPI.addBoxBlacklist(Blocks.iron_door, OreDictionary.WILDCARD_VALUE); + MekanismAPI.addBoxBlacklist(MultipartProxy.block(), OreDictionary.WILDCARD_VALUE); BoxBlacklistParser.load(); } diff --git a/src/main/java/mekanism/common/asm/LoadingHook.java b/src/main/java/mekanism/common/asm/LoadingHook.java index f3ea22d15..f2807c9cf 100644 --- a/src/main/java/mekanism/common/asm/LoadingHook.java +++ b/src/main/java/mekanism/common/asm/LoadingHook.java @@ -36,4 +36,10 @@ public class LoadingHook implements IFMLLoadingPlugin { } + + @Override + public String getAccessTransformerClass() + { + return null; + } } diff --git a/src/main/java/mekanism/common/block/BlockBasic.java b/src/main/java/mekanism/common/block/BlockBasic.java index 1da3fd358..6572490e6 100644 --- a/src/main/java/mekanism/common/block/BlockBasic.java +++ b/src/main/java/mekanism/common/block/BlockBasic.java @@ -12,7 +12,6 @@ import mekanism.common.IBoundingBlock; import mekanism.common.ItemAttacher; import mekanism.common.Mekanism; import mekanism.common.PacketHandler; -import mekanism.common.PacketHandler.Transmission; import mekanism.common.inventory.InventoryBin; import mekanism.common.network.PacketTileEntity; import mekanism.common.tank.TankUpdateProtocol; @@ -33,6 +32,7 @@ import net.minecraft.entity.EnumCreatureType; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -44,6 +44,7 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; +import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -73,40 +74,40 @@ public class BlockBasic extends Block { public IIcon[][] icons = new IIcon[256][6]; - public ConnectedTextureRenderer glassRenderer = new ConnectedTextureRenderer("glass/DynamicGlass", blockID, 10); + public ConnectedTextureRenderer glassRenderer = new ConnectedTextureRenderer("glass/DynamicGlass", this, 10); - public BlockBasic(int id) + public BlockBasic() { - super(id, Material.iron); + super(Material.iron); setHardness(5F); setResistance(10F); setCreativeTab(Mekanism.tabMekanism); } @Override - public void onNeighborBlockChange(World world, int x, int y, int z, int id) + public void onNeighborBlockChange(World world, int x, int y, int z, Block block) { if(!world.isRemote) { TileEntity tileEntity = world.getTileEntity(x, y, z); - if(id == blockID && tileEntity instanceof TileEntityDynamicTank) + if(block == this && tileEntity instanceof TileEntityDynamicTank) { ((TileEntityDynamicTank)tileEntity).update(); } if(tileEntity instanceof TileEntityBasicBlock) { - ((TileEntityBasicBlock)tileEntity).onNeighborChange(id); + ((TileEntityBasicBlock)tileEntity).onNeighborChange(block); } } } @Override @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister register) + public void registerBlockIcons(IIconRegister register) { - if(blockID == Mekanism.basicBlockID) + if(this == Mekanism.BasicBlock) { icons[0][0] = register.registerIcon("mekanism:OsmiumBlock"); icons[1][0] = register.registerIcon("mekanism:BronzeBlock"); @@ -133,7 +134,7 @@ public class BlockBasic extends Block glassRenderer.registerIcons(register); } - else if(blockID == Mekanism.basicBlock2ID) + else if(this == Mekanism.BasicBlock2) { icons[0][0] = register.registerIcon("mekanism:SalinationBlock"); } @@ -141,11 +142,11 @@ public class BlockBasic extends Block @Override @SideOnly(Side.CLIENT) - public IIcon getBlockTexture(IBlockAccess world, int x, int y, int z, int side) + public IIcon getIcon(IBlockAccess world, int x, int y, int z, int side) { int metadata = world.getBlockMetadata(x, y, z); - if(blockID == Mekanism.basicBlockID) + if(this == Mekanism.BasicBlock) { if(metadata == 6) { @@ -183,7 +184,7 @@ public class BlockBasic extends Block return getIcon(side, metadata); } } - else if(blockID == Mekanism.basicBlock2ID) + else if(this == Mekanism.BasicBlock2) { return getIcon(side, metadata); } @@ -195,7 +196,7 @@ public class BlockBasic extends Block @SideOnly(Side.CLIENT) public IIcon getIcon(int side, int meta) { - if(blockID == Mekanism.basicBlockID) + if(this == Mekanism.BasicBlock) { if(meta != 6 && meta != 14) { @@ -226,7 +227,7 @@ public class BlockBasic extends Block } } } - else if(blockID == Mekanism.basicBlock2ID) + else if(this == Mekanism.BasicBlock2) { return icons[meta][0]; } @@ -242,39 +243,39 @@ public class BlockBasic extends Block @Override @SideOnly(Side.CLIENT) - public void getSubBlocks(int i, CreativeTabs creativetabs, List list) + public void getSubBlocks(Item item, CreativeTabs creativetabs, List list) { - if(blockID == Mekanism.basicBlockID) + if(this == Mekanism.BasicBlock) { - list.add(new ItemStack(i, 1, 0)); - list.add(new ItemStack(i, 1, 1)); - list.add(new ItemStack(i, 1, 2)); - list.add(new ItemStack(i, 1, 3)); - list.add(new ItemStack(i, 1, 4)); - list.add(new ItemStack(i, 1, 5)); - list.add(new ItemStack(i, 1, 6)); - list.add(new ItemStack(i, 1, 7)); - list.add(new ItemStack(i, 1, 8)); - list.add(new ItemStack(i, 1, 9)); - list.add(new ItemStack(i, 1, 10)); - list.add(new ItemStack(i, 1, 11)); - list.add(new ItemStack(i, 1, 12)); - list.add(new ItemStack(i, 1, 13)); - list.add(new ItemStack(i, 1, 14)); - list.add(new ItemStack(i, 1, 15)); + list.add(new ItemStack(item, 1, 0)); + list.add(new ItemStack(item, 1, 1)); + list.add(new ItemStack(item, 1, 2)); + list.add(new ItemStack(item, 1, 3)); + list.add(new ItemStack(item, 1, 4)); + list.add(new ItemStack(item, 1, 5)); + list.add(new ItemStack(item, 1, 6)); + list.add(new ItemStack(item, 1, 7)); + list.add(new ItemStack(item, 1, 8)); + list.add(new ItemStack(item, 1, 9)); + list.add(new ItemStack(item, 1, 10)); + list.add(new ItemStack(item, 1, 11)); + list.add(new ItemStack(item, 1, 12)); + list.add(new ItemStack(item, 1, 13)); + list.add(new ItemStack(item, 1, 14)); + list.add(new ItemStack(item, 1, 15)); } - else if(blockID == Mekanism.basicBlock2ID) + else if(this == Mekanism.BasicBlock2) { - list.add(new ItemStack(i, 1, 0)); + list.add(new ItemStack(item, 1, 0)); } } @Override - public boolean canCreatureSpawn(EnumCreatureType type, World world, int x, int y, int z) + public boolean canCreatureSpawn(EnumCreatureType type, IBlockAccess world, int x, int y, int z) { int meta = world.getBlockMetadata(x, y, z); - if(blockID == Mekanism.basicBlockID) + if(this == Mekanism.BasicBlock) { if(meta == 9 || meta == 10 || meta == 11) { @@ -282,7 +283,7 @@ public class BlockBasic extends Block if(tileEntity != null) { - if(!world.isRemote) + if(FMLCommonHandler.instance().getEffectiveSide() == Side.SERVER) { if(tileEntity.structure != null) { @@ -298,7 +299,7 @@ public class BlockBasic extends Block } } } - else if(blockID == Mekanism.basicBlock2ID) + else if(this == Mekanism.BasicBlock2) { } @@ -311,7 +312,7 @@ public class BlockBasic extends Block { int meta = world.getBlockMetadata(x, y, z); - if(blockID == Mekanism.basicBlockID) + if(this == Mekanism.BasicBlock) { if(!world.isRemote && meta == 6) { @@ -340,7 +341,7 @@ public class BlockBasic extends Block { int metadata = world.getBlockMetadata(x, y, z); - if(blockID == Mekanism.basicBlockID) + if(this == Mekanism.BasicBlock) { if(metadata != 6) { @@ -419,11 +420,11 @@ public class BlockBasic extends Block if(!manageInventory(entityplayer, tileEntity)) { - PacketHandler.sendPacket(Transmission.ALL_CLIENTS, new PacketTileEntity().setParams(Coord4D.get(tileEntity), tileEntity.getNetworkedData(new ArrayList()))); + Mekanism.packetPipeline.sendToAll(new PacketTileEntity(Coord4D.get(tileEntity), tileEntity.getNetworkedData(new ArrayList()))); entityplayer.openGui(Mekanism.instance, 18, world, x, y, z); } else { - entityplayer.inventory.onInventoryChanged(); + entityplayer.inventory.markDirty(); tileEntity.sendPacketToRenderer(); } @@ -436,9 +437,9 @@ public class BlockBasic extends Block } @Override - public boolean isBlockSolidOnSide(World world, int x, int y, int z, ForgeDirection side) + public boolean isSideSolid(IBlockAccess world, int x, int y, int z, ForgeDirection side) { - return !(blockID == Mekanism.basicBlockID && world.getBlockMetadata(x, y, z) == 10); + return !(this == Mekanism.BasicBlock && world.getBlockMetadata(x, y, z) == 10); } private boolean manageInventory(EntityPlayer player, TileEntityDynamicTank tileEntity) @@ -539,7 +540,7 @@ public class BlockBasic extends Block if(!player.capabilities.isCreativeMode) { - player.setCurrentItemOrArmor(0, new ItemStack(Items.bucketEmpty)); + player.setCurrentItemOrArmor(0, new ItemStack(Items.bucket)); } return true; @@ -605,7 +606,7 @@ public class BlockBasic extends Block } } - if(blockID == Mekanism.basicBlockID) + if(this == Mekanism.BasicBlock) { switch(metadata) { @@ -624,11 +625,11 @@ public class BlockBasic extends Block @Override public boolean hasTileEntity(int metadata) { - if(blockID == Mekanism.basicBlockID) + if(this == Mekanism.BasicBlock) { return metadata == 6 || metadata == 9 || metadata == 10 || metadata == 11 || metadata == 12 || metadata == 14 || metadata == 15; } - else if(blockID == Mekanism.basicBlock2ID) + else if(this == Mekanism.BasicBlock2) { return metadata == 0; } @@ -639,7 +640,7 @@ public class BlockBasic extends Block @Override public TileEntity createTileEntity(World world, int metadata) { - if(blockID == Mekanism.basicBlockID) + if(this == Mekanism.BasicBlock) { switch(metadata) { @@ -657,7 +658,7 @@ public class BlockBasic extends Block return new TileEntitySalinationValve(); } } - else if(blockID == Mekanism.basicBlock2ID) + else if(this == Mekanism.BasicBlock2) { switch(metadata) { @@ -728,9 +729,9 @@ public class BlockBasic extends Block @Override public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z) { - ItemStack ret = new ItemStack(blockID, 1, world.getBlockMetadata(x, y, z)); + ItemStack ret = new ItemStack(this, 1, world.getBlockMetadata(x, y, z)); - if(blockID == Mekanism.basicBlockID) + if(this == Mekanism.BasicBlock) { if(ret.getItemDamage() == 6) { @@ -750,9 +751,9 @@ public class BlockBasic extends Block } @Override - public int idDropped(int i, Random random, int j) + public Item getItemDropped(int i, Random random, int j) { - return 0; + return null; } @Override @@ -800,7 +801,7 @@ public class BlockBasic extends Block @SideOnly(Side.CLIENT) public boolean shouldSideBeRendered(IBlockAccess world, int x, int y, int z, int side) { - if(blockID == Mekanism.basicBlockID && world.getBlockMetadata(x, y, z) == 10) + if(this == Mekanism.BasicBlock && world.getBlockMetadata(x, y, z) == 10) { return glassRenderer.shouldRenderSide(world, x, y, z, side); } diff --git a/src/main/java/mekanism/common/block/BlockBounding.java b/src/main/java/mekanism/common/block/BlockBounding.java index 0c6f49ceb..94f7f6a84 100644 --- a/src/main/java/mekanism/common/block/BlockBounding.java +++ b/src/main/java/mekanism/common/block/BlockBounding.java @@ -8,6 +8,7 @@ import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.MovingObjectPosition; @@ -17,16 +18,16 @@ import cpw.mods.fml.relauncher.SideOnly; public class BlockBounding extends Block { - public BlockBounding(int id) + public BlockBounding() { - super(id, Material.iron); + super(Material.iron); setHardness(3.5F); setResistance(8F); } @Override @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister register) {} + public void registerBlockIcons(IIconRegister register) {} @Override public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer entityplayer, int facing, float playerX, float playerY, float playerZ) @@ -62,12 +63,12 @@ public class BlockBounding extends Block } @Override - public void onNeighborBlockChange(World world, int x, int y, int z, int id) + public void onNeighborBlockChange(World world, int x, int y, int z, Block block) { try { TileEntityBoundingBlock tileEntity = (TileEntityBoundingBlock)world.getTileEntity(x, y, z); - tileEntity.onNeighborChange(id); - Block.blocksList[world.getBlockId(tileEntity.mainX, tileEntity.mainY, tileEntity.mainZ)].onNeighborBlockChange(world, tileEntity.mainX, tileEntity.mainY, tileEntity.mainZ, id); + tileEntity.onNeighborChange(block); + world.getBlock(tileEntity.mainX, tileEntity.mainY, tileEntity.mainZ).onNeighborBlockChange(world, tileEntity.mainX, tileEntity.mainY, tileEntity.mainZ, this); } catch(Exception e) {} } @@ -78,9 +79,9 @@ public class BlockBounding extends Block } @Override - public int idDropped(int i, Random random, int j) + public Item getItemDropped(int i, Random random, int j) { - return 0; + return null; } @Override diff --git a/src/main/java/mekanism/common/block/BlockCardboardBox.java b/src/main/java/mekanism/common/block/BlockCardboardBox.java index 166ae0698..25609a139 100644 --- a/src/main/java/mekanism/common/block/BlockCardboardBox.java +++ b/src/main/java/mekanism/common/block/BlockCardboardBox.java @@ -12,6 +12,7 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; @@ -25,9 +26,9 @@ public class BlockCardboardBox extends BlockContainer { public IIcon[] icons = new IIcon[6]; - public BlockCardboardBox(int id) + public BlockCardboardBox() { - super(id, Material.cloth); + super(Material.cloth); setCreativeTab(Mekanism.tabMekanism); setHardness(0.5F); setResistance(1F); @@ -35,7 +36,7 @@ public class BlockCardboardBox extends BlockContainer @Override @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister register) + public void registerBlockIcons(IIconRegister register) { icons[0] = register.registerIcon("mekanism:CardboardBoxTop"); icons[1] = register.registerIcon("mekanism:CardboardBoxSide"); @@ -67,12 +68,12 @@ public class BlockCardboardBox extends BlockContainer { BlockData data = tileEntity.storedData; - if(Blocks.blocksList[data.id] != null) + if(data.block != null) { - data.meta = Blocks.blocksList[data.id].onBlockPlaced(world, x, y, z, facing, hitX, hitY, hitZ, data.meta); + data.meta =data.block.onBlockPlaced(world, x, y, z, facing, hitX, hitY, hitZ, data.meta); } - world.setBlock(x, y, z, data.id, data.meta, 3); + world.setBlock(x, y, z, data.block, data.meta, 3); if(data.tileTag != null && world.getTileEntity(x, y, z) != null) { @@ -80,10 +81,10 @@ public class BlockCardboardBox extends BlockContainer world.getTileEntity(x, y, z).readFromNBT(data.tileTag); } - if(Blocks.blocksList[data.id] != null) + if(data.block != null) { - Blocks.blocksList[data.id].onBlockPlacedBy(world, x, y, z, entityplayer, new ItemStack(data.id, 1, data.meta)); - Blocks.blocksList[data.id].onPostBlockPlaced(world, x, y, z, data.meta); + data.block.onBlockPlacedBy(world, x, y, z, entityplayer, new ItemStack(data.block, 1, data.meta)); + data.block.onPostBlockPlaced(world, x, y, z, data.meta); } float motion = 0.7F; @@ -101,7 +102,7 @@ public class BlockCardboardBox extends BlockContainer } @Override - public TileEntity createNewTileEntity(World world) + public TileEntity createNewTileEntity(World world, int meta) { return new TileEntityCardboardBox(); } @@ -170,20 +171,20 @@ public class BlockCardboardBox extends BlockContainer } @Override - public int idDropped(int i, Random random, int j) + public Item getItemDropped(int i, Random random, int j) { - return 0; + return null; } public static class BlockData { - public int id; + public Block block; public int meta; public NBTTagCompound tileTag; - public BlockData(int i, int j, NBTTagCompound nbtTags) + public BlockData(Block b, int j, NBTTagCompound nbtTags) { - id = i; + block = b; meta = j; tileTag = nbtTags; } diff --git a/src/main/java/mekanism/common/block/BlockEnergyCube.java b/src/main/java/mekanism/common/block/BlockEnergyCube.java index 353fe7fed..f3bfcdc30 100644 --- a/src/main/java/mekanism/common/block/BlockEnergyCube.java +++ b/src/main/java/mekanism/common/block/BlockEnergyCube.java @@ -19,6 +19,8 @@ import mekanism.common.tile.TileEntityBasicBlock; import mekanism.common.tile.TileEntityDynamicTank; import mekanism.common.tile.TileEntityElectricBlock; import mekanism.common.tile.TileEntityEnergyCube; + +import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -52,9 +54,9 @@ public class BlockEnergyCube extends BlockContainer { public IIcon[][] icons = new IIcon[256][256]; - public BlockEnergyCube(int id) + public BlockEnergyCube() { - super(id, Material.iron); + super(Material.iron); setHardness(2F); setResistance(4F); setCreativeTab(Mekanism.tabMekanism); @@ -62,10 +64,10 @@ public class BlockEnergyCube extends BlockContainer @Override @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister register) {} + public void registerBlockIcons(IIconRegister register) {} @Override - public void onNeighborBlockChange(World world, int x, int y, int z, int id) + public void onNeighborBlockChange(World world, int x, int y, int z, Block block) { if(!world.isRemote) { @@ -73,7 +75,7 @@ public class BlockEnergyCube extends BlockContainer if(tileEntity instanceof TileEntityBasicBlock) { - ((TileEntityBasicBlock)tileEntity).onNeighborChange(id); + ((TileEntityBasicBlock)tileEntity).onNeighborChange(block); } } } @@ -115,14 +117,14 @@ public class BlockEnergyCube extends BlockContainer } @Override - public int idDropped(int i, Random random, int j) + public Item getItemDropped(int i, Random random, int j) { - return 0; + return null; } @Override @SideOnly(Side.CLIENT) - public void getSubBlocks(int i, CreativeTabs creativetabs, List list) + public void getSubBlocks(Item item, CreativeTabs creativetabs, List list) { for(EnergyCubeTier tier : EnergyCubeTier.values()) { @@ -194,7 +196,7 @@ public class BlockEnergyCube extends BlockContainer } tileEntity.setFacing((short)change); - world.notifyBlocksOfNeighborChange(x, y, z, blockID); + world.notifyBlocksOfNeighborChange(x, y, z, this); return true; } } @@ -231,7 +233,7 @@ public class BlockEnergyCube extends BlockContainer } @Override - public TileEntity createNewTileEntity(World world) + public TileEntity createNewTileEntity(World world, int meta) { return new TileEntityEnergyCube(); } @@ -318,7 +320,7 @@ public class BlockEnergyCube extends BlockContainer } @Override - public boolean isBlockSolidOnSide(World world, int x, int y, int z, ForgeDirection side) + public boolean isSideSolid(IBlockAccess world, int x, int y, int z, ForgeDirection side) { return true; } diff --git a/src/main/java/mekanism/common/block/BlockGasTank.java b/src/main/java/mekanism/common/block/BlockGasTank.java index 6d60489b1..16d95649d 100644 --- a/src/main/java/mekanism/common/block/BlockGasTank.java +++ b/src/main/java/mekanism/common/block/BlockGasTank.java @@ -9,6 +9,8 @@ import mekanism.common.Mekanism; import mekanism.common.tile.TileEntityBasicBlock; import mekanism.common.tile.TileEntityElectricBlock; import mekanism.common.tile.TileEntityGasTank; + +import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -29,9 +31,9 @@ public class BlockGasTank extends BlockContainer { public Random machineRand = new Random(); - public BlockGasTank(int id) + public BlockGasTank() { - super(id, Material.iron); + super(Material.iron); setBlockBounds(0.2F, 0.0F, 0.2F, 0.8F, 1.0F, 0.8F); setHardness(3.5F); setResistance(8F); @@ -40,7 +42,7 @@ public class BlockGasTank extends BlockContainer @Override @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister register) {} + public void registerBlockIcons(IIconRegister register) {} @Override public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase entityliving, ItemStack itemstack) @@ -63,7 +65,7 @@ public class BlockGasTank extends BlockContainer } @Override - public void onNeighborBlockChange(World world, int x, int y, int z, int id) + public void onNeighborBlockChange(World world, int x, int y, int z, Block block) { if(!world.isRemote) { @@ -71,7 +73,7 @@ public class BlockGasTank extends BlockContainer if(tileEntity instanceof TileEntityBasicBlock) { - ((TileEntityBasicBlock)tileEntity).onNeighborChange(id); + ((TileEntityBasicBlock)tileEntity).onNeighborChange(block); } } } @@ -127,7 +129,7 @@ public class BlockGasTank extends BlockContainer } tileEntity.setFacing((short)change); - world.notifyBlocksOfNeighborChange(x, y, z, blockID); + world.notifyBlocksOfNeighborChange(x, y, z, this); return true; } } @@ -190,9 +192,9 @@ public class BlockGasTank extends BlockContainer } @Override - public int idDropped(int i, Random random, int j) + public Item getItemDropped(int i, Random random, int j) { - return 0; + return null; } @Override @@ -214,7 +216,7 @@ public class BlockGasTank extends BlockContainer } @Override - public TileEntity createNewTileEntity(World world) + public TileEntity createNewTileEntity(World world, int meta) { return new TileEntityGasTank(); } diff --git a/src/main/java/mekanism/common/block/BlockMachine.java b/src/main/java/mekanism/common/block/BlockMachine.java index cbb57d0de..7e1e544ee 100644 --- a/src/main/java/mekanism/common/block/BlockMachine.java +++ b/src/main/java/mekanism/common/block/BlockMachine.java @@ -20,7 +20,6 @@ import mekanism.common.IUpgradeManagement; import mekanism.common.ItemAttacher; import mekanism.common.Mekanism; import mekanism.common.PacketHandler; -import mekanism.common.PacketHandler.Transmission; import mekanism.common.miner.MinerFilter; import mekanism.common.network.PacketElectricChest; import mekanism.common.network.PacketElectricChest.ElectricChestPacketType; @@ -741,10 +740,10 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds } else if(!electricChest.authenticated) { - PacketHandler.sendPacket(Transmission.SINGLE_CLIENT, new PacketElectricChest().setParams(ElectricChestPacketType.CLIENT_OPEN, 2, 0, true, Coord4D.get(electricChest)), entityplayer); + Mekanism.packetPipeline.sendTo(new PacketElectricChest(ElectricChestPacketType.CLIENT_OPEN, 2, 0, true, Coord4D.get(electricChest)), entityplayer); } else { - PacketHandler.sendPacket(Transmission.SINGLE_CLIENT, new PacketElectricChest().setParams(ElectricChestPacketType.CLIENT_OPEN, 1, 0, true, Coord4D.get(electricChest)), entityplayer); + Mekanism.packetPipeline.sendTo(new PacketElectricChest(ElectricChestPacketType.CLIENT_OPEN, 1, 0, true, Coord4D.get(electricChest)), entityplayer); } return true; diff --git a/src/main/java/mekanism/common/block/BlockObsidianTNT.java b/src/main/java/mekanism/common/block/BlockObsidianTNT.java index 3111025e2..392863003 100644 --- a/src/main/java/mekanism/common/block/BlockObsidianTNT.java +++ b/src/main/java/mekanism/common/block/BlockObsidianTNT.java @@ -9,6 +9,7 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.projectile.EntityArrow; +import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; @@ -21,15 +22,15 @@ public class BlockObsidianTNT extends Block { public IIcon[] icons = new IIcon[256]; - public BlockObsidianTNT(int id) + public BlockObsidianTNT() { - super(id, Material.tnt); + super(Material.tnt); setCreativeTab(Mekanism.tabMekanism); } @Override @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister register) {} + public void registerBlockIcons(IIconRegister register) {} @Override public void onBlockAdded(World world, int x, int y, int z) @@ -44,7 +45,7 @@ public class BlockObsidianTNT extends Block } @Override - public void onNeighborBlockChange(World world, int x, int y, int z, int blockID) + public void onNeighborBlockChange(World world, int x, int y, int z, Block block) { if(world.isBlockIndirectlyGettingPowered(x, y, z)) { @@ -77,7 +78,7 @@ public class BlockObsidianTNT extends Block @Override public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer entityplayer, int i1, float f1, float f2, float f3) { - if(entityplayer.getCurrentEquippedItem() != null && entityplayer.getCurrentEquippedItem().itemID == Items.flintAndSteel.itemID) + if(entityplayer.getCurrentEquippedItem() != null && entityplayer.getCurrentEquippedItem().getItem() == Items.flint_and_steel) { explode(world, x, y, z); world.setBlockToAir(x, y, z); diff --git a/src/main/java/mekanism/common/block/BlockOre.java b/src/main/java/mekanism/common/block/BlockOre.java index 37332a219..d8679fa69 100644 --- a/src/main/java/mekanism/common/block/BlockOre.java +++ b/src/main/java/mekanism/common/block/BlockOre.java @@ -7,6 +7,7 @@ import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import cpw.mods.fml.relauncher.Side; @@ -24,9 +25,9 @@ public class BlockOre extends Block { public IIcon[] icons = new IIcon[256]; - public BlockOre(int id) + public BlockOre() { - super(id, Material.rock); + super(Material.rock); setHardness(3F); setResistance(5F); setCreativeTab(Mekanism.tabMekanism); @@ -34,7 +35,7 @@ public class BlockOre extends Block @Override @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister register) + public void registerBlockIcons(IIconRegister register) { icons[0] = register.registerIcon("mekanism:OsmiumOre"); icons[1] = register.registerIcon("mekanism:CopperOre"); @@ -56,10 +57,10 @@ public class BlockOre extends Block @Override @SideOnly(Side.CLIENT) - public void getSubBlocks(int i, CreativeTabs creativetabs, List list) + public void getSubBlocks(Item item, CreativeTabs creativetabs, List list) { - list.add(new ItemStack(i, 1, 0)); - list.add(new ItemStack(i, 1, 1)); - list.add(new ItemStack(i, 1, 2)); + list.add(new ItemStack(item, 1, 0)); + list.add(new ItemStack(item, 1, 1)); + list.add(new ItemStack(item, 1, 2)); } } diff --git a/src/main/java/mekanism/common/block/BlockPlastic.java b/src/main/java/mekanism/common/block/BlockPlastic.java index 9910dab86..208b0a6b4 100644 --- a/src/main/java/mekanism/common/block/BlockPlastic.java +++ b/src/main/java/mekanism/common/block/BlockPlastic.java @@ -11,6 +11,7 @@ import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; @@ -24,13 +25,13 @@ import cpw.mods.fml.relauncher.SideOnly; public class BlockPlastic extends Block { - public BlockPlastic(int id) + public BlockPlastic() { - super(id, Material.wood); + super(Material.wood); setHardness(5F); setResistance(10F); setCreativeTab(Mekanism.tabMekanism); - if(id == Mekanism.slickPlasticID) + if(this == Mekanism.BlockSlickHDPE) { slipperiness = 0.98F; } @@ -38,25 +39,25 @@ public class BlockPlastic extends Block @Override @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister register) + public void registerBlockIcons(IIconRegister register) { - if(blockID == Mekanism.plasticID) + if(this == Mekanism.BlockHDPE) { blockIcon = register.registerIcon("mekanism:PlasticBlock"); } - else if(blockID == Mekanism.slickPlasticID) + else if(this == Mekanism.BlockSlickHDPE) { blockIcon = register.registerIcon("mekanism:SlickPlasticBlock"); } - else if(blockID == Mekanism.glowPlasticID) + else if(this == Mekanism.BlockGlowHDPE) { blockIcon = register.registerIcon("mekanism:GlowPlasticBlock"); } - else if(blockID == Mekanism.reinforcedPlasticID) + else if(this == Mekanism.BlockReinforcedHDPE) { blockIcon = register.registerIcon("mekanism:ReinforcedPlasticBlock"); } - else if(blockID == Mekanism.roadPlasticID) + else if(this == Mekanism.BlockRoadHDPE) { blockIcon = register.registerIcon("mekanism:RoadPlasticBlock"); } @@ -65,7 +66,7 @@ public class BlockPlastic extends Block @Override public void onEntityWalking(World world, int x, int y, int z, Entity e) { - if(blockID == Mekanism.roadPlasticID) + if(this == Mekanism.BlockRoadHDPE) { double boost = 1.6; @@ -83,11 +84,11 @@ public class BlockPlastic extends Block @Override @SideOnly(Side.CLIENT) - public void getSubBlocks(int id, CreativeTabs creativetabs, List list) + public void getSubBlocks(Item item, CreativeTabs creativetabs, List list) { for(int i = 0; i < EnumColor.DYES.length; i++) { - list.add(new ItemStack(id, 1, i)); + list.add(new ItemStack(item, 1, i)); } } @@ -108,7 +109,7 @@ public class BlockPlastic extends Block @Override public int getLightValue(IBlockAccess world, int x, int y, int z) { - if(blockID == Mekanism.glowPlasticID) + if(this == Mekanism.BlockGlowHDPE) { return 10; } diff --git a/src/main/java/mekanism/common/block/BlockPlasticFence.java b/src/main/java/mekanism/common/block/BlockPlasticFence.java index db822ee7b..b0cdb565b 100644 --- a/src/main/java/mekanism/common/block/BlockPlasticFence.java +++ b/src/main/java/mekanism/common/block/BlockPlasticFence.java @@ -7,9 +7,9 @@ import net.minecraft.block.material.Material; public class BlockPlasticFence extends BlockFence { - public BlockPlasticFence(int id) + public BlockPlasticFence() { - super(id, "mekanism:PlasticFence", Material.clay); + super("mekanism:PlasticFence", Material.clay); setCreativeTab(Mekanism.tabMekanism); } } diff --git a/src/main/java/mekanism/common/entity/EntityRobit.java b/src/main/java/mekanism/common/entity/EntityRobit.java index a8d062957..65812aa72 100644 --- a/src/main/java/mekanism/common/entity/EntityRobit.java +++ b/src/main/java/mekanism/common/entity/EntityRobit.java @@ -650,7 +650,7 @@ public class EntityRobit extends EntityCreature implements IInventory, ISustaine } @Override - public void onInventoryChanged() {} + public void markDirty() {} @Override public boolean isUseableByPlayer(EntityPlayer entityplayer) diff --git a/src/main/java/mekanism/common/inventory/InventoryElectricChest.java b/src/main/java/mekanism/common/inventory/InventoryElectricChest.java index 790af82f2..5c2e94058 100644 --- a/src/main/java/mekanism/common/inventory/InventoryElectricChest.java +++ b/src/main/java/mekanism/common/inventory/InventoryElectricChest.java @@ -32,9 +32,9 @@ public class InventoryElectricChest extends InventoryBasic } @Override - public void onInventoryChanged() + public void markDirty() { - super.onInventoryChanged(); + super.markDirty(); if(!reading) { diff --git a/src/main/java/mekanism/common/item/ItemAtomicDisassembler.java b/src/main/java/mekanism/common/item/ItemAtomicDisassembler.java index d0d819051..8dee7af3b 100644 --- a/src/main/java/mekanism/common/item/ItemAtomicDisassembler.java +++ b/src/main/java/mekanism/common/item/ItemAtomicDisassembler.java @@ -17,6 +17,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.ChatComponentText; import net.minecraft.util.DamageSource; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; @@ -29,16 +30,16 @@ public class ItemAtomicDisassembler extends ItemEnergized public double ENERGY_USAGE = 10; public double HOE_USAGE = 100; - public ItemAtomicDisassembler(int id) + public ItemAtomicDisassembler() { - super(id, 1000000); + super(1000000); } @Override public void registerIcons(IIconRegister register) {} @Override - public boolean canHarvestBlock(Block block) + public boolean canHarvestBlock(Block block, ItemStack stack) { return block != Blocks.bedrock; } @@ -151,7 +152,7 @@ public class ItemAtomicDisassembler extends ItemEnergized if(!world.isRemote && entityplayer.isSneaking()) { toggleMode(itemstack); - entityplayer.addChatMessage(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.GREY + "Mode toggled to " + EnumColor.INDIGO + getModeName(itemstack) + EnumColor.AQUA + " (" + getEfficiency(itemstack) + ")"); + entityplayer.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.GREY + "Mode toggled to " + EnumColor.INDIGO + getModeName(itemstack) + EnumColor.AQUA + " (" + getEfficiency(itemstack) + ")")); } return itemstack; diff --git a/src/main/java/mekanism/common/item/ItemBalloon.java b/src/main/java/mekanism/common/item/ItemBalloon.java index 14b2bade4..da63c7195 100644 --- a/src/main/java/mekanism/common/item/ItemBalloon.java +++ b/src/main/java/mekanism/common/item/ItemBalloon.java @@ -22,9 +22,9 @@ import cpw.mods.fml.relauncher.SideOnly; public class ItemBalloon extends ItemMekanism { - public ItemBalloon(int id) + public ItemBalloon() { - super(id); + super(); setHasSubtypes(true); } @@ -88,7 +88,7 @@ public class ItemBalloon extends ItemMekanism { AxisAlignedBB bound = AxisAlignedBB.getBoundingBox(x, y, z, x+1, y+3, z+1); - List balloonsNear = player.getWorldObj().getEntitiesWithinAABB(EntityBalloon.class, bound); + List balloonsNear = player.worldObj.getEntitiesWithinAABB(EntityBalloon.class, bound); if(balloonsNear.size() > 0) { @@ -125,11 +125,11 @@ public class ItemBalloon extends ItemMekanism { if(player.isSneaking()) { - if(!player.getWorldObj().isRemote) + if(!player.worldObj.isRemote) { AxisAlignedBB bound = AxisAlignedBB.getBoundingBox(entity.posX - 0.2, entity.posY - 0.5, entity.posZ - 0.2, entity.posX + 0.2, entity.posY + entity.ySize + 4, entity.posZ + 0.2); - List balloonsNear = player.getWorldObj().getEntitiesWithinAABB(EntityBalloon.class, bound); + List balloonsNear = player.worldObj.getEntitiesWithinAABB(EntityBalloon.class, bound); for(EntityBalloon balloon : balloonsNear) { @@ -139,7 +139,7 @@ public class ItemBalloon extends ItemMekanism } } - player.getWorldObj().spawnEntityInWorld(new EntityBalloon(entity, getColor(stack))); + player.worldObj.spawnEntityInWorld(new EntityBalloon(entity, getColor(stack))); stack.stackSize--; } diff --git a/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java b/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java index 78f816298..874cd55ff 100644 --- a/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java +++ b/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java @@ -13,7 +13,6 @@ import mekanism.common.IEnergyCube; import mekanism.common.ISustainedInventory; import mekanism.common.Mekanism; import mekanism.common.PacketHandler; -import mekanism.common.PacketHandler.Transmission; import mekanism.common.Tier.EnergyCubeTier; import mekanism.common.integration.IC2ItemManager; import mekanism.common.network.PacketTileEntity; @@ -90,7 +89,7 @@ public class ItemBlockEnergyCube extends ItemBlock implements IEnergizedItem, IE if(!world.isRemote) { - PacketHandler.sendPacket(Transmission.ALL_CLIENTS, new PacketTileEntity().setParams(Coord4D.get(tileEntity), tileEntity.getNetworkedData(new ArrayList()))); + Mekanism.packetPipeline.sendToAll(new PacketTileEntity(Coord4D.get(tileEntity), tileEntity.getNetworkedData(new ArrayList()))); } } diff --git a/src/main/java/mekanism/common/item/ItemBlockMachine.java b/src/main/java/mekanism/common/item/ItemBlockMachine.java index c18257b8f..b4ab6471f 100644 --- a/src/main/java/mekanism/common/item/ItemBlockMachine.java +++ b/src/main/java/mekanism/common/item/ItemBlockMachine.java @@ -21,7 +21,6 @@ import mekanism.common.ISustainedTank; import mekanism.common.IUpgradeManagement; import mekanism.common.Mekanism; import mekanism.common.PacketHandler; -import mekanism.common.PacketHandler.Transmission; import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.integration.IC2ItemManager; import mekanism.common.inventory.InventoryElectricChest; @@ -524,11 +523,11 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec { if(!getAuthenticated(itemstack)) { - PacketHandler.sendPacket(Transmission.SINGLE_CLIENT, new PacketElectricChest().setParams(ElectricChestPacketType.CLIENT_OPEN, 2, 0, false), entityplayer); + Mekanism.packetPipeline.sendTo(new PacketElectricChest(ElectricChestPacketType.CLIENT_OPEN, 2, 0, false), entityplayer); } else if(getLocked(itemstack) && getEnergy(itemstack) > 0) { - PacketHandler.sendPacket(Transmission.SINGLE_CLIENT, new PacketElectricChest().setParams(ElectricChestPacketType.CLIENT_OPEN, 1, 0, false), entityplayer); + Mekanism.packetPipeline.sendTo(new PacketElectricChest(ElectricChestPacketType.CLIENT_OPEN, 1, 0, false), entityplayer); } else { InventoryElectricChest inventory = new InventoryElectricChest(entityplayer); diff --git a/src/main/java/mekanism/common/item/ItemClump.java b/src/main/java/mekanism/common/item/ItemClump.java index a361a8e0a..cf416027f 100644 --- a/src/main/java/mekanism/common/item/ItemClump.java +++ b/src/main/java/mekanism/common/item/ItemClump.java @@ -6,6 +6,7 @@ import mekanism.common.Mekanism; import mekanism.common.Resource; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; @@ -13,9 +14,9 @@ public class ItemClump extends ItemMekanism { public IIcon[] icons = new IIcon[256]; - public ItemClump(int id) + public ItemClump() { - super(id); + super(); setHasSubtypes(true); setCreativeTab(Mekanism.tabMekanism); } @@ -36,7 +37,7 @@ public class ItemClump extends ItemMekanism } @Override - public void getSubItems(int id, CreativeTabs tabs, List itemList) + public void getSubItems(Item item, CreativeTabs tabs, List itemList) { for(int counter = 0; counter < Resource.values().length; counter++) { diff --git a/src/main/java/mekanism/common/item/ItemConfigurator.java b/src/main/java/mekanism/common/item/ItemConfigurator.java index 2aec09ca3..1ac965972 100644 --- a/src/main/java/mekanism/common/item/ItemConfigurator.java +++ b/src/main/java/mekanism/common/item/ItemConfigurator.java @@ -9,7 +9,6 @@ import mekanism.api.EnumColor; import mekanism.common.IConfigurable; import mekanism.common.IInvConfiguration; import mekanism.common.PacketHandler; -import mekanism.common.PacketHandler.Transmission; import mekanism.common.network.PacketTileEntity; import mekanism.common.tile.TileEntityBasicBlock; import mekanism.common.tile.TileEntityElectricChest; @@ -20,7 +19,7 @@ import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ChatMessageComponent; +import net.minecraft.util.ChatComponentText; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import buildcraft.api.tools.IToolWrench; @@ -32,9 +31,9 @@ public class ItemConfigurator extends ItemEnergized implements IToolWrench private Random random = new Random(); - public ItemConfigurator(int id) + public ItemConfigurator() { - super(id, 60000); + super(60000); } @Override @@ -85,7 +84,7 @@ public class ItemConfigurator extends ItemEnergized implements IToolWrench if(!player.isSneaking()) { - player.sendChatToPlayer(ChatMessageComponent.createFromText(EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " " + MekanismUtils.localize("tooltip.configurator.viewColor") + ": " + config.getSideData().get(config.getConfiguration()[MekanismUtils.getBaseOrientation(side, config.getOrientation())]).color.getName())); + player.sendChatToPlayer(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " " + MekanismUtils.localize("tooltip.configurator.viewColor") + ": " + config.getSideData().get(config.getConfiguration()[MekanismUtils.getBaseOrientation(side, config.getOrientation())]).color.getName())); return true; } else { @@ -93,12 +92,12 @@ public class ItemConfigurator extends ItemEnergized implements IToolWrench { setEnergy(stack, getEnergy(stack) - ENERGY_PER_CONFIGURE); MekanismUtils.incrementOutput(config, MekanismUtils.getBaseOrientation(side, config.getOrientation())); - player.sendChatToPlayer(ChatMessageComponent.createFromText(EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " " + MekanismUtils.localize("tooltip.configurator.toggleColor") + ": " + config.getSideData().get(config.getConfiguration()[MekanismUtils.getBaseOrientation(side, config.getOrientation())]).color.getName())); + player.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " " + MekanismUtils.localize("tooltip.configurator.toggleColor") + ": " + config.getSideData().get(config.getConfiguration()[MekanismUtils.getBaseOrientation(side, config.getOrientation())]).color.getName())); if(config instanceof TileEntityBasicBlock) { TileEntityBasicBlock tileEntity = (TileEntityBasicBlock)config; - PacketHandler.sendPacket(Transmission.CLIENTS_RANGE, new PacketTileEntity().setParams(Coord4D.get(tileEntity), tileEntity.getNetworkedData(new ArrayList())), Coord4D.get(tileEntity), 50D); + Mekanism.packetPipeline.sendToAllAround(new PacketTileEntity(Coord4D.get(tileEntity), tileEntity.getNetworkedData(new ArrayList())), Coord4D.get(tileEntity), 50D); } return true; @@ -162,7 +161,7 @@ public class ItemConfigurator extends ItemEnergized implements IToolWrench return true; } else { - player.addChatMessage(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.GREY + MekanismUtils.localize("tooltip.configurator.unauth")); + player.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.GREY + MekanismUtils.localize("tooltip.configurator.unauth"))); return true; } } @@ -196,7 +195,7 @@ public class ItemConfigurator extends ItemEnergized implements IToolWrench if(!world.isRemote && player.isSneaking()) { Coord4D obj = new Coord4D(x, y, z, world.provider.dimensionId); - player.addChatMessage(EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " Set link to block " + EnumColor.INDIGO + MekanismUtils.getCoordDisplay(obj) + EnumColor.GREY + ", dimension " + EnumColor.INDIGO + obj.dimensionId); + player.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " Set link to block " + EnumColor.INDIGO + MekanismUtils.getCoordDisplay(obj) + EnumColor.GREY + ", dimension " + EnumColor.INDIGO + obj.dimensionId)); setLink(stack, obj); return true; @@ -307,7 +306,7 @@ public class ItemConfigurator extends ItemEnergized implements IToolWrench @Override public boolean canWrench(EntityPlayer player, int x, int y, int z) { - return !(player.getWorldObj().getTileEntity(x, y, z) instanceof TileEntityBasicBlock); + return !(player.worldObj.getTileEntity(x, y, z) instanceof TileEntityBasicBlock); } @Override diff --git a/src/main/java/mekanism/common/item/ItemCrystal.java b/src/main/java/mekanism/common/item/ItemCrystal.java index fa34ef6f1..7cce13099 100644 --- a/src/main/java/mekanism/common/item/ItemCrystal.java +++ b/src/main/java/mekanism/common/item/ItemCrystal.java @@ -6,6 +6,7 @@ import mekanism.common.Mekanism; import mekanism.common.Resource; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; @@ -13,9 +14,9 @@ public class ItemCrystal extends ItemMekanism { public IIcon[] icons = new IIcon[256]; - public ItemCrystal(int id) + public ItemCrystal() { - super(id); + super(); setHasSubtypes(true); setCreativeTab(Mekanism.tabMekanism); } @@ -36,11 +37,11 @@ public class ItemCrystal extends ItemMekanism } @Override - public void getSubItems(int id, CreativeTabs tabs, List itemList) + public void getSubItems(Item item, CreativeTabs tabs, List itemList) { for(int counter = 0; counter < Resource.values().length; counter++) { - itemList.add(new ItemStack(this, 1, counter)); + itemList.add(new ItemStack(item, 1, counter)); } } diff --git a/src/main/java/mekanism/common/item/ItemDictionary.java b/src/main/java/mekanism/common/item/ItemDictionary.java index 650de6e21..88d3a3ad8 100644 --- a/src/main/java/mekanism/common/item/ItemDictionary.java +++ b/src/main/java/mekanism/common/item/ItemDictionary.java @@ -8,13 +8,14 @@ import mekanism.common.util.MekanismUtils; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.ChatComponentText; import net.minecraft.world.World; public class ItemDictionary extends ItemMekanism { - public ItemDictionary(int id) + public ItemDictionary() { - super(id); + super(); setMaxStackSize(1); } @@ -34,15 +35,15 @@ public class ItemDictionary extends ItemMekanism if(!names.isEmpty()) { - player.addChatMessage(EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " Key(s) found:"); + player.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " Key(s) found:")); for(String name : names) { - player.addChatMessage(EnumColor.DARK_GREEN + " - " + name); + player.addChatMessage(new ChatComponentText(EnumColor.DARK_GREEN + " - " + name)); } } else { - player.addChatMessage(EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " No key."); + player.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " No key.")); } } diff --git a/src/main/java/mekanism/common/item/ItemDirtyDust.java b/src/main/java/mekanism/common/item/ItemDirtyDust.java index 06cd97179..31c2b284b 100644 --- a/src/main/java/mekanism/common/item/ItemDirtyDust.java +++ b/src/main/java/mekanism/common/item/ItemDirtyDust.java @@ -6,6 +6,7 @@ import mekanism.common.Mekanism; import mekanism.common.Resource; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; @@ -13,9 +14,9 @@ public class ItemDirtyDust extends ItemMekanism { public IIcon[] icons = new IIcon[256]; - public ItemDirtyDust(int id) + public ItemDirtyDust() { - super(id); + super(); setHasSubtypes(true); setCreativeTab(Mekanism.tabMekanism); } @@ -36,11 +37,11 @@ public class ItemDirtyDust extends ItemMekanism } @Override - public void getSubItems(int id, CreativeTabs tabs, List itemList) + public void getSubItems(Item item, CreativeTabs tabs, List itemList) { for(int counter = 0; counter < Resource.values().length; counter++) { - itemList.add(new ItemStack(this, 1, counter)); + itemList.add(new ItemStack(item, 1, counter)); } } diff --git a/src/main/java/mekanism/common/item/ItemDust.java b/src/main/java/mekanism/common/item/ItemDust.java index 81ec53386..c73d13e28 100644 --- a/src/main/java/mekanism/common/item/ItemDust.java +++ b/src/main/java/mekanism/common/item/ItemDust.java @@ -5,6 +5,7 @@ import java.util.List; import mekanism.common.Mekanism; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; @@ -17,9 +18,9 @@ public class ItemDust extends ItemMekanism "Copper", "Tin", "Silver", "Lead", "Sulfur"}; - public ItemDust(int id) + public ItemDust() { - super(id); + super(); setHasSubtypes(true); setCreativeTab(Mekanism.tabMekanism); } @@ -40,11 +41,11 @@ public class ItemDust extends ItemMekanism } @Override - public void getSubItems(int id, CreativeTabs tabs, List itemList) + public void getSubItems(Item item, CreativeTabs tabs, List itemList) { for(int counter = 0; counter <= 10; ++counter) { - itemList.add(new ItemStack(this, 1, counter)); + itemList.add(new ItemStack(item, 1, counter)); } } diff --git a/src/main/java/mekanism/common/item/ItemElectricBow.java b/src/main/java/mekanism/common/item/ItemElectricBow.java index ad8f0e26e..b3e2df897 100644 --- a/src/main/java/mekanism/common/item/ItemElectricBow.java +++ b/src/main/java/mekanism/common/item/ItemElectricBow.java @@ -7,6 +7,7 @@ import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.projectile.EntityArrow; +import net.minecraft.init.Items; import net.minecraft.item.EnumAction; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -15,9 +16,9 @@ import net.minecraft.world.World; public class ItemElectricBow extends ItemEnergized { - public ItemElectricBow(int id) + public ItemElectricBow() { - super(id, 120000); + super(120000); } @Override @@ -34,7 +35,7 @@ public class ItemElectricBow extends ItemEnergized { boolean flag = player.capabilities.isCreativeMode || EnchantmentHelper.getEnchantmentLevel(Enchantment.infinity.effectId, itemstack) > 0; - if(flag || player.inventory.hasItem(Items.arrow.itemID)) + if(flag || player.inventory.hasItem(Items.arrow)) { int maxItemUse = getMaxItemUseDuration(itemstack) - itemUseCount; float f = maxItemUse / 20F; @@ -69,7 +70,7 @@ public class ItemElectricBow extends ItemEnergized entityarrow.canBePickedUp = 2; } else { - player.inventory.consumeInventoryItem(Items.arrow.itemID); + player.inventory.consumeInventoryItem(Items.arrow); } if(!world.isRemote) @@ -96,7 +97,7 @@ public class ItemElectricBow extends ItemEnergized @Override public ItemStack onItemRightClick(ItemStack itemstack, World world, EntityPlayer entityplayer) { - if(entityplayer.capabilities.isCreativeMode || entityplayer.inventory.hasItem(Items.arrow.itemID)) + if(entityplayer.capabilities.isCreativeMode || entityplayer.inventory.hasItem(Items.arrow)) { entityplayer.setItemInUse(itemstack, getMaxItemUseDuration(itemstack)); } diff --git a/src/main/java/mekanism/common/item/ItemEnergized.java b/src/main/java/mekanism/common/item/ItemEnergized.java index a2fb4b6d7..a1db438d6 100644 --- a/src/main/java/mekanism/common/item/ItemEnergized.java +++ b/src/main/java/mekanism/common/item/ItemEnergized.java @@ -12,6 +12,7 @@ import mekanism.common.integration.IC2ItemManager; import mekanism.common.util.MekanismUtils; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; @@ -22,9 +23,9 @@ public class ItemEnergized extends ItemMekanism implements IEnergizedItem, ISpec /** The maximum amount of energy this item can hold. */ public double MAX_ELECTRICITY; - public ItemEnergized(int id, double maxElectricity) + public ItemEnergized(double maxElectricity) { - super(id); + super(); MAX_ELECTRICITY = maxElectricity; setMaxStackSize(1); setMaxDamage(100); @@ -46,7 +47,7 @@ public class ItemEnergized extends ItemMekanism implements IEnergizedItem, ISpec } @Override - public void getSubItems(int i, CreativeTabs tabs, List list) + public void getSubItems(Item item, CreativeTabs tabs, List list) { ItemStack discharged = new ItemStack(this); discharged.setItemDamage(100); @@ -63,15 +64,15 @@ public class ItemEnergized extends ItemMekanism implements IEnergizedItem, ISpec } @Override - public int getChargedItemId(ItemStack itemStack) + public Item getChargedItem(ItemStack itemStack) { - return itemID; + return this; } @Override - public int getEmptyItemId(ItemStack itemStack) + public Item getEmptyItem(ItemStack itemStack) { - return itemID; + return this; } @Override diff --git a/src/main/java/mekanism/common/item/ItemFilterCard.java b/src/main/java/mekanism/common/item/ItemFilterCard.java index c57c6f1ad..fb366245e 100644 --- a/src/main/java/mekanism/common/item/ItemFilterCard.java +++ b/src/main/java/mekanism/common/item/ItemFilterCard.java @@ -9,14 +9,14 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ChatMessageComponent; +import net.minecraft.util.ChatComponentText; import net.minecraft.world.World; public class ItemFilterCard extends ItemMekanism { - public ItemFilterCard(int id) + public ItemFilterCard() { - super(id); + super(); setMaxStackSize(1); } @@ -46,7 +46,7 @@ public class ItemFilterCard extends ItemMekanism { data.setString("dataType", ((IFilterAccess)tileEntity).getDataType()); setData(stack, data); - player.addChatMessage(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.GREY + MekanismUtils.localize("tooltip.filterCard.got").replaceAll("%s", EnumColor.INDIGO + MekanismUtils.localize(data.getString("dataType")) + EnumColor.GREY)); + player.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.GREY + MekanismUtils.localize("tooltip.filterCard.got").replaceAll("%s", EnumColor.INDIGO + MekanismUtils.localize(data.getString("dataType")) + EnumColor.GREY))); } return true; @@ -56,11 +56,11 @@ public class ItemFilterCard extends ItemMekanism if(((IFilterAccess)tileEntity).getDataType().equals(getDataType(stack))) { ((IFilterAccess)tileEntity).setFilterData(getData(stack)); - player.addChatMessage(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.DARK_GREEN + MekanismUtils.localize("tooltip.filterCard.set").replaceAll("%s", EnumColor.INDIGO + MekanismUtils.localize(getDataType(stack)) + EnumColor.DARK_GREEN)); + player.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.DARK_GREEN + MekanismUtils.localize("tooltip.filterCard.set").replaceAll("%s", EnumColor.INDIGO + MekanismUtils.localize(getDataType(stack)) + EnumColor.DARK_GREEN))); setData(stack, null); } else { - player.addChatMessage(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.RED + MekanismUtils.localize("tooltip.filterCard.unequal") + "."); + player.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.RED + MekanismUtils.localize("tooltip.filterCard.unequal") + ".")); } return true; diff --git a/src/main/java/mekanism/common/item/ItemFreeRunners.java b/src/main/java/mekanism/common/item/ItemFreeRunners.java index 4ccb6e56f..d4e802eaa 100644 --- a/src/main/java/mekanism/common/item/ItemFreeRunners.java +++ b/src/main/java/mekanism/common/item/ItemFreeRunners.java @@ -19,12 +19,13 @@ 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; import net.minecraft.util.DamageSource; import net.minecraft.world.World; -import net.minecraftforge.common.EnumHelper; +import net.minecraftforge.common.util.EnumHelper; import net.minecraftforge.common.MinecraftForge; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.event.entity.living.LivingAttackEvent; @@ -36,9 +37,9 @@ public class ItemFreeRunners extends ItemArmor implements IEnergizedItem, ISpeci /** The maximum amount of energy this item can hold. */ public double MAX_ELECTRICITY = 64000; - public ItemFreeRunners(int id) + public ItemFreeRunners() { - super(id, EnumHelper.addArmorMaterial("FRICTIONBOOTS", 0, new int[] {0, 0, 0, 0}, 0), 0, 3); + super(EnumHelper.addArmorMaterial("FRICTIONBOOTS", 0, new int[] {0, 0, 0, 0}, 0), 0, 3); setMaxStackSize(1); setMaxDamage(100); setNoRepair(); @@ -85,7 +86,7 @@ public class ItemFreeRunners extends ItemArmor implements IEnergizedItem, ISpeci } @Override - public void getSubItems(int i, CreativeTabs tabs, List list) + public void getSubItems(Item item, CreativeTabs tabs, List list) { ItemStack discharged = new ItemStack(this); discharged.setItemDamage(100); @@ -102,15 +103,15 @@ public class ItemFreeRunners extends ItemArmor implements IEnergizedItem, ISpeci } @Override - public int getChargedItemId(ItemStack itemStack) + public Item getChargedItem(ItemStack itemStack) { - return itemID; + return this; } @Override - public int getEmptyItemId(ItemStack itemStack) + public Item getEmptyItem(ItemStack itemStack) { - return itemID; + return this; } @Override diff --git a/src/main/java/mekanism/common/item/ItemGasMask.java b/src/main/java/mekanism/common/item/ItemGasMask.java index 86fea7a2f..fa4603865 100644 --- a/src/main/java/mekanism/common/item/ItemGasMask.java +++ b/src/main/java/mekanism/common/item/ItemGasMask.java @@ -10,7 +10,7 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemArmor; import net.minecraft.item.ItemStack; import net.minecraft.util.DamageSource; -import net.minecraftforge.common.EnumHelper; +import net.minecraftforge.common.util.EnumHelper; import net.minecraftforge.common.MinecraftForge; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.event.entity.living.LivingAttackEvent; @@ -19,9 +19,9 @@ import cpw.mods.fml.relauncher.SideOnly; public class ItemGasMask extends ItemArmor { - public ItemGasMask(int id) + public ItemGasMask() { - super(id, EnumHelper.addArmorMaterial("GASMASK", 0, new int[] {0, 0, 0, 0}, 0), 0, 0); + super(EnumHelper.addArmorMaterial("GASMASK", 0, new int[] {0, 0, 0, 0}, 0), 0, 0); setCreativeTab(Mekanism.tabMekanism); MinecraftForge.EVENT_BUS.register(this); } diff --git a/src/main/java/mekanism/common/item/ItemHDPE.java b/src/main/java/mekanism/common/item/ItemHDPE.java index 8c7d6b1a2..5badc57f0 100644 --- a/src/main/java/mekanism/common/item/ItemHDPE.java +++ b/src/main/java/mekanism/common/item/ItemHDPE.java @@ -6,6 +6,7 @@ import mekanism.common.Mekanism; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; @@ -13,9 +14,9 @@ public class ItemHDPE extends ItemMekanism { public IIcon[] icons = new IIcon[256]; - public ItemHDPE(int id) + public ItemHDPE() { - super(id); + super(); setHasSubtypes(true); setCreativeTab(Mekanism.tabMekanism); } @@ -36,11 +37,11 @@ public class ItemHDPE extends ItemMekanism } @Override - public void getSubItems(int id, CreativeTabs tabs, List itemList) + public void getSubItems(Item item, CreativeTabs tabs, List itemList) { for(int counter = 0; counter < PlasticItem.values().length; counter++) { - itemList.add(new ItemStack(this, 1, counter)); + itemList.add(new ItemStack(item, 1, counter)); } } diff --git a/src/main/java/mekanism/common/item/ItemIngot.java b/src/main/java/mekanism/common/item/ItemIngot.java index 42e88d2f2..1679b8ab1 100644 --- a/src/main/java/mekanism/common/item/ItemIngot.java +++ b/src/main/java/mekanism/common/item/ItemIngot.java @@ -5,6 +5,7 @@ import java.util.List; import mekanism.common.Mekanism; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; @@ -14,9 +15,9 @@ public class ItemIngot extends ItemMekanism public static String[] en_USNames = {"Obsidian", "Osmium", "Bronze", "Glowstone", "Steel", "Copper", "Tin"}; - public ItemIngot(int id) + public ItemIngot() { - super(id); + super(); setHasSubtypes(true); setCreativeTab(Mekanism.tabMekanism); } @@ -37,11 +38,11 @@ public class ItemIngot extends ItemMekanism } @Override - public void getSubItems(int id, CreativeTabs tabs, List itemList) + public void getSubItems(Item item, CreativeTabs tabs, List itemList) { for(int counter = 0; counter <= 6; ++counter) { - itemList.add(new ItemStack(this, 1, counter)); + itemList.add(new ItemStack(item, 1, counter)); } } diff --git a/src/main/java/mekanism/common/item/ItemJetpack.java b/src/main/java/mekanism/common/item/ItemJetpack.java index 52fb27a64..bd255f3d5 100644 --- a/src/main/java/mekanism/common/item/ItemJetpack.java +++ b/src/main/java/mekanism/common/item/ItemJetpack.java @@ -17,11 +17,12 @@ 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; import net.minecraft.util.DamageSource; -import net.minecraftforge.common.EnumHelper; +import net.minecraftforge.common.util.EnumHelper; import net.minecraftforge.common.ISpecialArmor; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -31,9 +32,9 @@ public class ItemJetpack extends ItemArmor implements IGasItem, ISpecialArmor public int MAX_GAS = 24000; public int TRANSFER_RATE = 16; - public ItemJetpack(int id) + public ItemJetpack() { - super(id, EnumHelper.addArmorMaterial("JETPACK", 0, new int[] {0, 0, 0, 0}, 0), 0, 1); + super(EnumHelper.addArmorMaterial("JETPACK", 0, new int[] {0, 0, 0, 0}, 0), 0, 1); setCreativeTab(Mekanism.tabMekanism); setMaxDamage(100); setNoRepair(); @@ -235,7 +236,7 @@ public class ItemJetpack extends ItemArmor implements IGasItem, ISpecialArmor } @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/item/ItemMachineUpgrade.java b/src/main/java/mekanism/common/item/ItemMachineUpgrade.java index 6718d628b..64335b793 100644 --- a/src/main/java/mekanism/common/item/ItemMachineUpgrade.java +++ b/src/main/java/mekanism/common/item/ItemMachineUpgrade.java @@ -4,9 +4,9 @@ import mekanism.common.Mekanism; public class ItemMachineUpgrade extends ItemMekanism { - public ItemMachineUpgrade(int id) + public ItemMachineUpgrade() { - super(id); + super(); setMaxStackSize(8); setCreativeTab(Mekanism.tabMekanism); } diff --git a/src/main/java/mekanism/common/item/ItemNetworkReader.java b/src/main/java/mekanism/common/item/ItemNetworkReader.java index ef4cd1d76..e843f04c7 100644 --- a/src/main/java/mekanism/common/item/ItemNetworkReader.java +++ b/src/main/java/mekanism/common/item/ItemNetworkReader.java @@ -7,16 +7,16 @@ import mekanism.common.Mekanism; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ChatMessageComponent; +import net.minecraft.util.ChatComponentText; import net.minecraft.world.World; public class ItemNetworkReader extends ItemEnergized { public static double ENERGY_PER_USE = 400; - public ItemNetworkReader(int id) + public ItemNetworkReader() { - super(id, 60000); + super(60000); } @Override @@ -34,28 +34,28 @@ public class ItemNetworkReader extends ItemEnergized IGridTransmitter transmitter = (IGridTransmitter)tileEntity; - player.sendChatToPlayer(ChatMessageComponent.createFromText(EnumColor.GREY + "------------- " + EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " -------------")); - player.sendChatToPlayer(ChatMessageComponent.createFromText(EnumColor.GREY + " *Transmitters: " + EnumColor.DARK_GREY + transmitter.getTransmitterNetwork().getSize())); - player.sendChatToPlayer(ChatMessageComponent.createFromText(EnumColor.GREY + " *Acceptors: " + EnumColor.DARK_GREY + transmitter.getTransmitterNetwork().getAcceptorSize())); - player.sendChatToPlayer(ChatMessageComponent.createFromText(EnumColor.GREY + " *Needed: " + EnumColor.DARK_GREY + transmitter.getTransmitterNetwork().getNeeded())); - player.sendChatToPlayer(ChatMessageComponent.createFromText(EnumColor.GREY + " *Buffer: " + EnumColor.DARK_GREY + transmitter.getTransmitterNetwork().getStored())); - player.sendChatToPlayer(ChatMessageComponent.createFromText(EnumColor.GREY + " *Throughput: " + EnumColor.DARK_GREY + transmitter.getTransmitterNetwork().getFlow())); - player.sendChatToPlayer(ChatMessageComponent.createFromText(EnumColor.GREY + " *Capacity: " + EnumColor.DARK_GREY + transmitter.getTransmitterNetwork().getCapacity() + "/tick")); - player.sendChatToPlayer(ChatMessageComponent.createFromText(EnumColor.GREY + "------------- " + EnumColor.DARK_BLUE + "[=======]" + EnumColor.GREY + " -------------")); + player.addChatMessage(new ChatComponentText(EnumColor.GREY + "------------- " + EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " -------------")); + player.addChatMessage(new ChatComponentText(EnumColor.GREY + " *Transmitters: " + EnumColor.DARK_GREY + transmitter.getTransmitterNetwork().getSize())); + player.addChatMessage(new ChatComponentText(EnumColor.GREY + " *Acceptors: " + EnumColor.DARK_GREY + transmitter.getTransmitterNetwork().getAcceptorSize())); + player.addChatMessage(new ChatComponentText(EnumColor.GREY + " *Needed: " + EnumColor.DARK_GREY + transmitter.getTransmitterNetwork().getNeeded())); + player.addChatMessage(new ChatComponentText(EnumColor.GREY + " *Buffer: " + EnumColor.DARK_GREY + transmitter.getTransmitterNetwork().getStored())); + player.addChatMessage(new ChatComponentText(EnumColor.GREY + " *Throughput: " + EnumColor.DARK_GREY + transmitter.getTransmitterNetwork().getFlow())); + player.addChatMessage(new ChatComponentText(EnumColor.GREY + " *Capacity: " + EnumColor.DARK_GREY + transmitter.getTransmitterNetwork().getCapacity() + "/tick")); + player.addChatMessage(new ChatComponentText(EnumColor.GREY + "------------- " + EnumColor.DARK_BLUE + "[=======]" + EnumColor.GREY + " -------------")); } } if(player.isSneaking() && Mekanism.debug) { String[] strings = TransmitterNetworkRegistry.getInstance().toStrings(); - player.sendChatToPlayer(ChatMessageComponent.createFromText(EnumColor.GREY + "---------- " + EnumColor.DARK_BLUE + "[Mekanism Debug]" + EnumColor.GREY + " ----------")); + player.addChatMessage(new ChatComponentText(EnumColor.GREY + "---------- " + EnumColor.DARK_BLUE + "[Mekanism Debug]" + EnumColor.GREY + " ----------")); for(String s : strings) { - player.sendChatToPlayer(ChatMessageComponent.createFromText(EnumColor.DARK_GREY + s)); + player.addChatMessage(new ChatComponentText(EnumColor.DARK_GREY + s)); } - player.sendChatToPlayer(ChatMessageComponent.createFromText(EnumColor.GREY + "------------- " + EnumColor.DARK_BLUE + "[=======]" + EnumColor.GREY + " -------------")); + player.addChatMessage(new ChatComponentText(EnumColor.GREY + "------------- " + EnumColor.DARK_BLUE + "[=======]" + EnumColor.GREY + " -------------")); } } diff --git a/src/main/java/mekanism/common/item/ItemPortableTeleporter.java b/src/main/java/mekanism/common/item/ItemPortableTeleporter.java index c27f73d3d..337d7b205 100644 --- a/src/main/java/mekanism/common/item/ItemPortableTeleporter.java +++ b/src/main/java/mekanism/common/item/ItemPortableTeleporter.java @@ -12,9 +12,9 @@ import net.minecraft.world.World; public class ItemPortableTeleporter extends ItemEnergized { - public ItemPortableTeleporter(int id) + public ItemPortableTeleporter() { - super(id, 1000000); + super(1000000); } @Override @@ -33,7 +33,7 @@ public class ItemPortableTeleporter extends ItemEnergized int neededEnergy = 1000; - if(entity.getWorldObj().provider.dimensionId != coords.dimensionId) + if(entity.worldObj.provider.dimensionId != coords.dimensionId) { neededEnergy+=10000; } diff --git a/src/main/java/mekanism/common/item/ItemProxy.java b/src/main/java/mekanism/common/item/ItemProxy.java index a540cfacd..bb23c83d8 100644 --- a/src/main/java/mekanism/common/item/ItemProxy.java +++ b/src/main/java/mekanism/common/item/ItemProxy.java @@ -12,14 +12,14 @@ import net.minecraft.world.World; public class ItemProxy extends Item { - public ItemProxy(int id) + public ItemProxy() { - super(id); + super(); setMaxDamage(1); } @Override - public ItemStack getContainerItemStack(ItemStack stack) + public ItemStack getContainerItem(ItemStack stack) { return getSavedItem(stack) != null ? getSavedItem(stack) : getDead(); } @@ -31,9 +31,9 @@ public class ItemProxy extends Item } @Override - public boolean hasContainerItem() + public boolean hasContainerItem(ItemStack itemStack) { - return true; //TODO forge PR + return true; //TODO forge PR -- Is this sorted now? -unpairedbracket } public void setSavedItem(ItemStack stack, ItemStack save) diff --git a/src/main/java/mekanism/common/item/ItemRobit.java b/src/main/java/mekanism/common/item/ItemRobit.java index 775caa6f7..5e502a5d6 100644 --- a/src/main/java/mekanism/common/item/ItemRobit.java +++ b/src/main/java/mekanism/common/item/ItemRobit.java @@ -19,9 +19,9 @@ import cpw.mods.fml.relauncher.SideOnly; public class ItemRobit extends ItemEnergized implements ISustainedInventory { - public ItemRobit(int id) + public ItemRobit() { - super(id, 100000); + super(100000); } @Override @@ -54,7 +54,7 @@ public class ItemRobit extends ItemEnergized implements ISustainedInventory robit.setHome(Coord4D.get(chargepad)); robit.setEnergy(getEnergy(itemstack)); - robit.setOwner(entityplayer.username); + robit.setOwner(entityplayer.getCommandSenderName()); robit.setInventory(getInventory(itemstack)); robit.setName(getName(itemstack)); @@ -126,7 +126,7 @@ public class ItemRobit extends ItemEnergized implements ISustainedInventory return null; } - return itemStack.stackTagCompound.getTagList("Items"); + return itemStack.stackTagCompound.getTagList("Items", 10); } return null; diff --git a/src/main/java/mekanism/common/item/ItemScubaTank.java b/src/main/java/mekanism/common/item/ItemScubaTank.java index 15774f159..3aa827c05 100644 --- a/src/main/java/mekanism/common/item/ItemScubaTank.java +++ b/src/main/java/mekanism/common/item/ItemScubaTank.java @@ -19,7 +19,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemArmor; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.common.EnumHelper; +import net.minecraftforge.common.util.EnumHelper; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -28,9 +28,9 @@ public class ItemScubaTank extends ItemArmor implements IGasItem public int MAX_GAS = 24000; public int TRANSFER_RATE = 16; - public ItemScubaTank(int id) + public ItemScubaTank() { - super(id, EnumHelper.addArmorMaterial("SCUBATANK", 0, new int[] {0, 0, 0, 0}, 0), 0, 1); + super(EnumHelper.addArmorMaterial("SCUBATANK", 0, new int[] {0, 0, 0, 0}, 0), 0, 1); setCreativeTab(Mekanism.tabMekanism); setMaxDamage(100); setNoRepair(); diff --git a/src/main/java/mekanism/common/item/ItemSeismicReader.java b/src/main/java/mekanism/common/item/ItemSeismicReader.java index d6582f321..09b53ee2c 100644 --- a/src/main/java/mekanism/common/item/ItemSeismicReader.java +++ b/src/main/java/mekanism/common/item/ItemSeismicReader.java @@ -6,15 +6,16 @@ import mekanism.common.Mekanism; import mekanism.common.util.MekanismUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.ChatComponentText; import net.minecraft.world.World; public class ItemSeismicReader extends ItemEnergized { public static final double ENERGY_USAGE = 250; - public ItemSeismicReader(int id) + public ItemSeismicReader() { - super(id, 12000); + super(12000); } @Override @@ -32,7 +33,7 @@ public class ItemSeismicReader extends ItemEnergized { if(!world.isRemote) { - entityplayer.addChatMessage(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.RED + MekanismUtils.localize("tooltip.seismicReader.needsEnergy")); + entityplayer.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.RED + MekanismUtils.localize("tooltip.seismicReader.needsEnergy"))); } return itemstack; @@ -41,7 +42,7 @@ public class ItemSeismicReader extends ItemEnergized { if(!world.isRemote) { - entityplayer.addChatMessage(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.RED + MekanismUtils.localize("tooltip.seismicReader.noVibrations")); + entityplayer.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.RED + MekanismUtils.localize("tooltip.seismicReader.noVibrations"))); } return itemstack; diff --git a/src/main/java/mekanism/common/item/ItemShard.java b/src/main/java/mekanism/common/item/ItemShard.java index ccdef108a..ca372a484 100644 --- a/src/main/java/mekanism/common/item/ItemShard.java +++ b/src/main/java/mekanism/common/item/ItemShard.java @@ -6,6 +6,7 @@ import mekanism.common.Mekanism; import mekanism.common.Resource; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; @@ -13,9 +14,9 @@ public class ItemShard extends ItemMekanism { public IIcon[] icons = new IIcon[256]; - public ItemShard(int id) + public ItemShard() { - super(id); + super(); setHasSubtypes(true); setCreativeTab(Mekanism.tabMekanism); } @@ -36,11 +37,11 @@ public class ItemShard extends ItemMekanism } @Override - public void getSubItems(int id, CreativeTabs tabs, List itemList) + public void getSubItems(Item item, CreativeTabs tabs, List itemList) { for(int counter = 0; counter < Resource.values().length; counter++) { - itemList.add(new ItemStack(this, 1, counter)); + itemList.add(new ItemStack(item, 1, counter)); } } diff --git a/src/main/java/mekanism/common/item/ItemWalkieTalkie.java b/src/main/java/mekanism/common/item/ItemWalkieTalkie.java index 7de290e14..ec0e0b04e 100644 --- a/src/main/java/mekanism/common/item/ItemWalkieTalkie.java +++ b/src/main/java/mekanism/common/item/ItemWalkieTalkie.java @@ -16,9 +16,9 @@ public class ItemWalkieTalkie extends ItemMekanism { public IIcon[] icons = new IIcon[256]; - public ItemWalkieTalkie(int id) + public ItemWalkieTalkie() { - super(id); + super(); setMaxStackSize(1); } diff --git a/src/main/java/mekanism/common/multipart/ItemGlowPanel.java b/src/main/java/mekanism/common/multipart/ItemGlowPanel.java index b50340176..182ea73d9 100644 --- a/src/main/java/mekanism/common/multipart/ItemGlowPanel.java +++ b/src/main/java/mekanism/common/multipart/ItemGlowPanel.java @@ -7,6 +7,7 @@ import mekanism.common.Mekanism; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.world.World; @@ -19,9 +20,9 @@ import codechicken.multipart.TMultiPart; public class ItemGlowPanel extends JItemMultiPart { - public ItemGlowPanel(int id) + public ItemGlowPanel() { - super(id); + super(); setHasSubtypes(true); setCreativeTab(Mekanism.tabMekanism); } @@ -64,16 +65,16 @@ public class ItemGlowPanel extends JItemMultiPart } @Override - public void getSubItems(int itemID, CreativeTabs tab, List listToAddTo) + public void getSubItems(Item item, CreativeTabs tab, List listToAddTo) { for(EnumColor color : EnumColor.DYES) { - listToAddTo.add(new ItemStack(itemID, 1, color.getMetaValue())); + listToAddTo.add(new ItemStack(item, 1, color.getMetaValue())); } } @Override - public String getItemDisplayName(ItemStack stack) + public String getItemStackDisplayName(ItemStack stack) { EnumColor colour = EnumColor.DYES[stack.getItemDamage()]; String colourName; @@ -85,7 +86,7 @@ public class ItemGlowPanel extends JItemMultiPart colourName = colour.getDyedName(); } - return colourName + " " + super.getItemDisplayName(stack); + return colourName + " " + super.getItemStackDisplayName(stack); } @Override diff --git a/src/main/java/mekanism/common/multipart/ItemPartTransmitter.java b/src/main/java/mekanism/common/multipart/ItemPartTransmitter.java index 4bf5590b5..efef9ab2c 100644 --- a/src/main/java/mekanism/common/multipart/ItemPartTransmitter.java +++ b/src/main/java/mekanism/common/multipart/ItemPartTransmitter.java @@ -14,6 +14,7 @@ import mekanism.common.util.MekanismUtils; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; @@ -30,9 +31,9 @@ import cpw.mods.fml.relauncher.SideOnly; public class ItemPartTransmitter extends JItemMultiPart { - public ItemPartTransmitter(int id) + public ItemPartTransmitter() { - super(id); + super(); setHasSubtypes(true); setCreativeTab(Mekanism.tabMekanism); } @@ -152,11 +153,11 @@ public class ItemPartTransmitter extends JItemMultiPart } @Override - public void getSubItems(int itemID, CreativeTabs tab, List listToAddTo) + public void getSubItems(Item item, CreativeTabs tab, List listToAddTo) { for(TransmitterType type : TransmitterType.values()) { - listToAddTo.add(new ItemStack(itemID, 1, type.ordinal())); + listToAddTo.add(new ItemStack(item, 1, type.ordinal())); } } diff --git a/src/main/java/mekanism/common/multipart/PartDiversionTransporter.java b/src/main/java/mekanism/common/multipart/PartDiversionTransporter.java index e6571ef76..ff3204ffd 100644 --- a/src/main/java/mekanism/common/multipart/PartDiversionTransporter.java +++ b/src/main/java/mekanism/common/multipart/PartDiversionTransporter.java @@ -5,13 +5,12 @@ import java.util.ArrayList; import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.common.PacketHandler; -import mekanism.common.PacketHandler.Transmission; import mekanism.common.network.PacketTileEntity; import mekanism.common.transporter.TransporterStack; import mekanism.common.util.MekanismUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.ChatMessageComponent; +import net.minecraft.util.ChatComponentText; import net.minecraft.util.IIcon; import net.minecraftforge.common.util.ForgeDirection; @@ -121,8 +120,8 @@ public class PartDiversionTransporter extends PartLogisticalTransporter refreshConnections(); tile().notifyPartChange(this); - player.sendChatToPlayer(ChatMessageComponent.createFromText(EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " " + MekanismUtils.localize("tooltip.configurator.toggleDiverter") + ": " + EnumColor.RED + description)); - PacketHandler.sendPacket(Transmission.CLIENTS_RANGE, new PacketTileEntity().setParams(Coord4D.get(tile()), getNetworkedData(new ArrayList())), Coord4D.get(tile()), 50D); + player.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " " + MekanismUtils.localize("tooltip.configurator.toggleDiverter") + ": " + EnumColor.RED + description)); + Mekanism.packetPipeline.sendToAllAround(new PacketTileEntity(Coord4D.get(tile()), getNetworkedData(new ArrayList())), Coord4D.get(tile()), 50D); return true; } diff --git a/src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java b/src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java index 4abd154b6..74bcb7f6b 100644 --- a/src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java +++ b/src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java @@ -11,7 +11,6 @@ import mekanism.client.render.RenderPartTransmitter; import mekanism.common.HashList; import mekanism.common.ILogisticalTransporter; import mekanism.common.PacketHandler; -import mekanism.common.PacketHandler.Transmission; import mekanism.common.network.PacketDataRequest; import mekanism.common.network.PacketTileEntity; import mekanism.common.tile.TileEntityLogisticalSorter; @@ -31,13 +30,12 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ChatMessageComponent; +import net.minecraft.util.ChatComponentText; import net.minecraft.util.IIcon; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; -import buildcraft.api.transport.IPipe; import buildcraft.api.transport.IPipeTile; import codechicken.lib.vec.Vector3; @@ -330,7 +328,7 @@ public class PartLogisticalTransporter extends PartSidedPipe implements ILogisti for(TransporterStack stack : remove) { - PacketHandler.sendPacket(Transmission.CLIENTS_RANGE, new PacketTileEntity().setParams(Coord4D.get(tile()), getSyncPacket(stack, true)), Coord4D.get(tile()), 50D); + Mekanism.packetPipeline.sendToAllAround(new PacketTileEntity(Coord4D.get(tile()), getSyncPacket(stack, true)), Coord4D.get(tile()), 50D); transit.remove(stack); MekanismUtils.saveChunk(tile()); } @@ -339,7 +337,7 @@ public class PartLogisticalTransporter extends PartSidedPipe implements ILogisti { if(transit.contains(stack)) { - PacketHandler.sendPacket(Transmission.CLIENTS_RANGE, new PacketTileEntity().setParams(Coord4D.get(tile()), getSyncPacket(stack, false)), Coord4D.get(tile()), 50D); + Mekanism.packetPipeline.sendToAllAround(new PacketTileEntity(Coord4D.get(tile()), getSyncPacket(stack, false)), Coord4D.get(tile()), 50D); } } @@ -444,7 +442,7 @@ public class PartLogisticalTransporter extends PartSidedPipe implements ILogisti { transit.add(stack); TransporterManager.add(stack); - PacketHandler.sendPacket(Transmission.CLIENTS_RANGE, new PacketTileEntity().setParams(Coord4D.get(tile()), getSyncPacket(stack, false)), Coord4D.get(tile()), 50D); + Mekanism.packetPipeline.sendToAllAround(new PacketTileEntity(Coord4D.get(tile()), getSyncPacket(stack, false)), Coord4D.get(tile()), 50D); MekanismUtils.saveChunk(tile()); } @@ -480,7 +478,7 @@ public class PartLogisticalTransporter extends PartSidedPipe implements ILogisti { transit.add(stack); TransporterManager.add(stack); - PacketHandler.sendPacket(Transmission.CLIENTS_RANGE, new PacketTileEntity().setParams(Coord4D.get(tile()), getSyncPacket(stack, false)), Coord4D.get(tile()), 50D); + Mekanism.packetPipeline.sendToAllAround(new PacketTileEntity(Coord4D.get(tile()), getSyncPacket(stack, false)), Coord4D.get(tile()), 50D); MekanismUtils.saveChunk(tile()); } @@ -495,7 +493,7 @@ public class PartLogisticalTransporter extends PartSidedPipe implements ILogisti { stack.progress = 0; transit.add(stack); - PacketHandler.sendPacket(Transmission.CLIENTS_RANGE, new PacketTileEntity().setParams(Coord4D.get(tile()), getSyncPacket(stack, false)), Coord4D.get(tile()), 50D); + Mekanism.packetPipeline.sendToAllAround(new PacketTileEntity(Coord4D.get(tile()), getSyncPacket(stack, false)), Coord4D.get(tile()), 50D); MekanismUtils.saveChunk(tile()); } @@ -506,7 +504,7 @@ public class PartLogisticalTransporter extends PartSidedPipe implements ILogisti if(world().isRemote) { - PacketHandler.sendPacket(Transmission.SERVER, new PacketDataRequest().setParams(Coord4D.get(tile()))); + Mekanism.packetPipeline.sendToServer(new PacketDataRequest(Coord4D.get(tile()))); } } @@ -733,8 +731,8 @@ public class PartLogisticalTransporter extends PartSidedPipe implements ILogisti TransporterUtils.incrementColor(this); refreshConnections(); tile().notifyPartChange(this); - PacketHandler.sendPacket(Transmission.CLIENTS_RANGE, new PacketTileEntity().setParams(Coord4D.get(tile()), getNetworkedData(new ArrayList())), Coord4D.get(tile()), 50D); - player.sendChatToPlayer(ChatMessageComponent.createFromText(EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " " + MekanismUtils.localize("tooltip.configurator.toggleColor") + ": " + (color != null ? color.getName() : EnumColor.BLACK + MekanismUtils.localize("gui.none")))); + Mekanism.packetPipeline.sendToAllAround(new PacketTileEntity(Coord4D.get(tile()), getNetworkedData(new ArrayList())), Coord4D.get(tile()), 50D); + player.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " " + MekanismUtils.localize("tooltip.configurator.toggleColor") + ": " + (color != null ? color.getName() : EnumColor.BLACK + MekanismUtils.localize("gui.none")))); return true; } @@ -743,7 +741,7 @@ public class PartLogisticalTransporter extends PartSidedPipe implements ILogisti public boolean onRightClick(EntityPlayer player, int side) { super.onRightClick(player, side); - player.sendChatToPlayer(ChatMessageComponent.createFromText(EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " " + MekanismUtils.localize("tooltip.configurator.viewColor") + ": " + (color != null ? color.getName() : "None"))); + player.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " " + MekanismUtils.localize("tooltip.configurator.viewColor") + ": " + (color != null ? color.getName() : "None"))); return true; } diff --git a/src/main/java/mekanism/common/multipart/PartSidedPipe.java b/src/main/java/mekanism/common/multipart/PartSidedPipe.java index 483723957..df45339cd 100644 --- a/src/main/java/mekanism/common/multipart/PartSidedPipe.java +++ b/src/main/java/mekanism/common/multipart/PartSidedPipe.java @@ -28,7 +28,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ChatMessageComponent; +import net.minecraft.util.ChatComponentText; import net.minecraft.util.IIcon; import net.minecraft.util.MovingObjectPosition; import net.minecraftforge.common.util.ForgeDirection; @@ -600,7 +600,7 @@ public abstract class PartSidedPipe extends TMultiPart implements TSlottedPart, sendDesc = true; onModeChange(ForgeDirection.getOrientation(side)); - player.sendChatToPlayer(ChatMessageComponent.createFromText("Connection type changed to " + connectionTypes[hit.subHit].toString())); + player.addChatMessage(new ChatComponentText("Connection type changed to " + connectionTypes[hit.subHit].toString())); return true; } @@ -626,7 +626,7 @@ public abstract class PartSidedPipe extends TMultiPart implements TSlottedPart, refreshConnections(); tile().notifyPartChange(this); - player.sendChatToPlayer(ChatMessageComponent.createFromText(EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " Redstone sensitivity turned " + EnumColor.INDIGO + (redstoneReactive ? "on." : "off."))); + player.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " Redstone sensitivity turned " + EnumColor.INDIGO + (redstoneReactive ? "on." : "off."))); return true; } diff --git a/src/main/java/mekanism/common/multipart/PartTransmitter.java b/src/main/java/mekanism/common/multipart/PartTransmitter.java index 0be03d76e..4e8263f35 100644 --- a/src/main/java/mekanism/common/multipart/PartTransmitter.java +++ b/src/main/java/mekanism/common/multipart/PartTransmitter.java @@ -12,7 +12,6 @@ import mekanism.api.transmitters.TransmitterNetworkRegistry; import mekanism.client.ClientTickHandler; import mekanism.common.IConfigurable; import mekanism.common.PacketHandler; -import mekanism.common.PacketHandler.Transmission; import mekanism.common.network.PacketTransmitterUpdate; import mekanism.common.network.PacketTransmitterUpdate.PacketType; import net.minecraft.entity.player.EntityPlayer; @@ -204,7 +203,7 @@ public abstract class PartTransmitter> extends Pa if(!world().isRemote) { - PacketHandler.sendPacket(Transmission.CLIENTS_DIM, new PacketTransmitterUpdate().setParams(PacketType.UPDATE, tile()), world().provider.dimensionId); + Mekanism.packetPipeline.sendToDimension(new PacketTransmitterUpdate(PacketType.UPDATE, tile()), world().provider.dimensionId); } } @@ -215,7 +214,7 @@ public abstract class PartTransmitter> extends Pa if(!world().isRemote) { - PacketHandler.sendPacket(Transmission.CLIENTS_DIM, new PacketTransmitterUpdate().setParams(PacketType.UPDATE, tile()), world().provider.dimensionId); + Mekanism.packetPipeline.sendToDimension(new PacketTransmitterUpdate(PacketType.UPDATE, tile()), world().provider.dimensionId); } } diff --git a/src/main/java/mekanism/common/network/MekanismPacket.java b/src/main/java/mekanism/common/network/MekanismPacket.java index 5e004a1c1..ab268ec12 100644 --- a/src/main/java/mekanism/common/network/MekanismPacket.java +++ b/src/main/java/mekanism/common/network/MekanismPacket.java @@ -1,14 +1,18 @@ package mekanism.common.network; +import java.io.DataOutputStream; + +import com.google.common.io.ByteArrayDataInput; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.world.World; /** * AbstractPacket class. Should be the parent of all packets wishing to use the * PacketPipeline. * - * @author unpairedbracket based on sirgingalot's work in TiCon + * @author unpairedbracket based on sirgingalot's tutorial */ public abstract class MekanismPacket { diff --git a/src/main/java/mekanism/common/network/PacketBoxBlacklist.java b/src/main/java/mekanism/common/network/PacketBoxBlacklist.java index 405d094c3..42a20aae3 100644 --- a/src/main/java/mekanism/common/network/PacketBoxBlacklist.java +++ b/src/main/java/mekanism/common/network/PacketBoxBlacklist.java @@ -8,22 +8,11 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; import com.google.common.io.ByteArrayDataInput; +import io.netty.buffer.ByteBuf; +import io.netty.channel.ChannelHandlerContext; -public class PacketBoxBlacklist implements IMekanismPacket +public class PacketBoxBlacklist extends MekanismPacket { - @Override - public String getName() - { - return "BoxBlacklist"; - } - - @Override - public IMekanismPacket setParams(Object... data) - { - return this; - } - - @Override public void read(ByteArrayDataInput dataStream, EntityPlayer player, World world) throws Exception { MekanismAPI.getBoxIgnore().clear(); @@ -38,7 +27,6 @@ public class PacketBoxBlacklist implements IMekanismPacket System.out.println("[Mekanism] Received Cardboard Box blacklist entries from server (" + amount + " total)"); } - @Override public void write(DataOutputStream dataStream) throws Exception { dataStream.writeInt(MekanismAPI.getBoxIgnore().size()); @@ -49,4 +37,28 @@ public class PacketBoxBlacklist implements IMekanismPacket dataStream.writeInt(info.meta); } } + + @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) + { + + } } diff --git a/src/main/java/mekanism/common/network/PacketConfigSync.java b/src/main/java/mekanism/common/network/PacketConfigSync.java index 15c4d6e77..0e9c82b5b 100644 --- a/src/main/java/mekanism/common/network/PacketConfigSync.java +++ b/src/main/java/mekanism/common/network/PacketConfigSync.java @@ -8,22 +8,11 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; import com.google.common.io.ByteArrayDataInput; +import io.netty.buffer.ByteBuf; +import io.netty.channel.ChannelHandlerContext; -public class PacketConfigSync implements IMekanismPacket +public class PacketConfigSync extends MekanismPacket { - @Override - public String getName() - { - return "ConfigSync"; - } - - @Override - public IMekanismPacket setParams(Object... data) - { - return this; - } - - @Override public void read(ByteArrayDataInput dataStream, EntityPlayer player, World world) throws Exception { Mekanism.osmiumGenerationEnabled = dataStream.readBoolean(); @@ -83,7 +72,6 @@ public class PacketConfigSync implements IMekanismPacket Mekanism.proxy.onConfigSync(); } - @Override public void write(DataOutputStream dataStream) throws Exception { dataStream.writeBoolean(Mekanism.osmiumGenerationEnabled); @@ -137,4 +125,28 @@ public class PacketConfigSync implements IMekanismPacket module.writeConfig(dataStream); } } + + @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) + { + + } } diff --git a/src/main/java/mekanism/common/network/PacketConfigurationUpdate.java b/src/main/java/mekanism/common/network/PacketConfigurationUpdate.java index 2d3c3189a..1846b22ea 100644 --- a/src/main/java/mekanism/common/network/PacketConfigurationUpdate.java +++ b/src/main/java/mekanism/common/network/PacketConfigurationUpdate.java @@ -6,8 +6,7 @@ import java.util.ArrayList; import mekanism.api.Coord4D; import mekanism.common.IInvConfiguration; import mekanism.common.ITileNetwork; -import mekanism.common.PacketHandler; -import mekanism.common.PacketHandler.Transmission; +import mekanism.common.Mekanism; import mekanism.common.tile.TileEntityBasicBlock; import mekanism.common.util.MekanismUtils; import mekanism.common.util.TransporterUtils; @@ -17,10 +16,12 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import com.google.common.io.ByteArrayDataInput; +import io.netty.buffer.ByteBuf; +import io.netty.channel.ChannelHandlerContext; -public class PacketConfigurationUpdate implements IMekanismPacket +public class PacketConfigurationUpdate extends MekanismPacket { - public Coord4D object3D; + public Coord4D coord4D; public int configIndex; @@ -30,47 +31,37 @@ public class PacketConfigurationUpdate implements IMekanismPacket public ConfigurationPacket packetType; - @Override - public String getName() + public PacketConfigurationUpdate(ConfigurationPacket type, Coord4D coord, int click, int extra) { - return "ConfigurationUpdate"; - } + packetType = type; - @Override - public IMekanismPacket setParams(Object... data) - { - packetType = (ConfigurationPacket)data[0]; - - object3D = (Coord4D)data[1]; + coord4D = coord; if(packetType == ConfigurationPacket.EJECT_COLOR) { - clickType = (Integer)data[2]; + clickType = click; } if(packetType == ConfigurationPacket.SIDE_DATA) { - clickType = (Integer)data[2]; - configIndex = (Integer)data[3]; + clickType = click; + configIndex = extra; } if(packetType == ConfigurationPacket.INPUT_COLOR) { - clickType = (Integer)data[2]; - inputSide = (Integer)data[3]; + clickType = click; + inputSide = extra; } - - return this; } - @Override public void read(ByteArrayDataInput dataStream, EntityPlayer player, World world) throws Exception { packetType = ConfigurationPacket.values()[dataStream.readInt()]; - object3D = new Coord4D(dataStream.readInt(), dataStream.readInt(), dataStream.readInt(), dataStream.readInt()); + coord4D = new Coord4D(dataStream.readInt(), dataStream.readInt(), dataStream.readInt(), dataStream.readInt()); - TileEntity tile = object3D.getTileEntity(world); + TileEntity tile = coord4D.getTileEntity(world); if(tile instanceof IInvConfiguration) { @@ -98,7 +89,7 @@ public class PacketConfigurationUpdate implements IMekanismPacket ((IInvConfiguration)tile).getConfiguration()[configIndex] = 0; } - PacketHandler.sendPacket(Transmission.CLIENTS_RANGE, new PacketTileEntity().setParams(object3D, ((ITileNetwork)tile).getNetworkedData(new ArrayList())), object3D, 50D); + Mekanism.packetPipeline.sendToAllAround(new PacketTileEntity(coord4D, ((ITileNetwork) tile).getNetworkedData(new ArrayList())), coord4D, 50D); } else if(packetType == ConfigurationPacket.EJECT_COLOR) { @@ -144,21 +135,20 @@ public class PacketConfigurationUpdate implements IMekanismPacket for(EntityPlayer p : ((TileEntityBasicBlock)config).playersUsing) { - PacketHandler.sendPacket(Transmission.SINGLE_CLIENT, new PacketTileEntity().setParams(object3D, ((ITileNetwork)tile).getNetworkedData(new ArrayList())), p); + Mekanism.packetPipeline.sendTo(new PacketTileEntity(coord4D, ((ITileNetwork) tile).getNetworkedData(new ArrayList())), p); } } } - @Override public void write(DataOutputStream dataStream) throws Exception { dataStream.writeInt(packetType.ordinal()); - dataStream.writeInt(object3D.xCoord); - dataStream.writeInt(object3D.yCoord); - dataStream.writeInt(object3D.zCoord); + dataStream.writeInt(coord4D.xCoord); + dataStream.writeInt(coord4D.yCoord); + dataStream.writeInt(coord4D.zCoord); - dataStream.writeInt(object3D.dimensionId); + dataStream.writeInt(coord4D.dimensionId); if(packetType != ConfigurationPacket.EJECT && packetType != ConfigurationPacket.STRICT_INPUT) { @@ -176,6 +166,29 @@ public class PacketConfigurationUpdate implements IMekanismPacket } } + @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) + { + + } + public static enum ConfigurationPacket { EJECT, SIDE_DATA, EJECT_COLOR, INPUT_COLOR, STRICT_INPUT diff --git a/src/main/java/mekanism/common/network/PacketConfiguratorState.java b/src/main/java/mekanism/common/network/PacketConfiguratorState.java index d8a710ada..2617d94ee 100644 --- a/src/main/java/mekanism/common/network/PacketConfiguratorState.java +++ b/src/main/java/mekanism/common/network/PacketConfiguratorState.java @@ -8,26 +8,18 @@ import net.minecraft.item.ItemStack; import net.minecraft.world.World; import com.google.common.io.ByteArrayDataInput; +import io.netty.buffer.ByteBuf; +import io.netty.channel.ChannelHandlerContext; -public class PacketConfiguratorState implements IMekanismPacket +public class PacketConfiguratorState extends MekanismPacket { public byte state; - @Override - public String getName() + public PacketConfiguratorState(byte s) { - return "ConfiguratorState"; + state = s; } - @Override - public IMekanismPacket setParams(Object... data) - { - state = (Byte)data[0]; - - return this; - } - - @Override public void read(ByteArrayDataInput dataStream, EntityPlayer player, World world) throws Exception { byte state = dataStream.readByte(); @@ -40,9 +32,32 @@ public class PacketConfiguratorState implements IMekanismPacket } } - @Override public void write(DataOutputStream dataStream) throws Exception { dataStream.writeByte(state); } + + @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) + { + + } } diff --git a/src/main/java/mekanism/common/network/PacketDataRequest.java b/src/main/java/mekanism/common/network/PacketDataRequest.java index 36603b025..b9868e18c 100644 --- a/src/main/java/mekanism/common/network/PacketDataRequest.java +++ b/src/main/java/mekanism/common/network/PacketDataRequest.java @@ -7,36 +7,27 @@ import mekanism.api.Coord4D; import mekanism.api.transmitters.DynamicNetwork; import mekanism.api.transmitters.IGridTransmitter; import mekanism.common.ITileNetwork; -import mekanism.common.PacketHandler; -import mekanism.common.PacketHandler.Transmission; +import mekanism.common.Mekanism; import mekanism.common.tile.TileEntityDynamicTank; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import com.google.common.io.ByteArrayDataInput; +import io.netty.buffer.ByteBuf; +import io.netty.channel.ChannelHandlerContext; import cpw.mods.fml.common.FMLCommonHandler; -public class PacketDataRequest implements IMekanismPacket +public class PacketDataRequest extends MekanismPacket { - public Coord4D object3D; + public Coord4D coord4D; - @Override - public String getName() + public PacketDataRequest(Coord4D coord) { - return "DataRequest"; + coord4D = coord; } - @Override - public IMekanismPacket setParams(Object... data) - { - object3D = (Coord4D)data[0]; - - return this; - } - - @Override public void read(ByteArrayDataInput dataStream, EntityPlayer player, World world) throws Exception { int x = dataStream.readInt(); @@ -66,17 +57,40 @@ public class PacketDataRequest implements IMekanismPacket } } - PacketHandler.sendPacket(Transmission.ALL_CLIENTS, new PacketTileEntity().setParams(Coord4D.get(worldServer.getTileEntity(x, y, z)), ((ITileNetwork)worldServer.getTileEntity(x, y, z)).getNetworkedData(new ArrayList()))); + Mekanism.packetPipeline.sendToAll(new PacketTileEntity(Coord4D.get(worldServer.getTileEntity(x, y, z)), ((ITileNetwork) worldServer.getTileEntity(x, y, z)).getNetworkedData(new ArrayList()))); } } - @Override public void write(DataOutputStream dataStream) throws Exception { - dataStream.writeInt(object3D.xCoord); - dataStream.writeInt(object3D.yCoord); - dataStream.writeInt(object3D.zCoord); + dataStream.writeInt(coord4D.xCoord); + dataStream.writeInt(coord4D.yCoord); + dataStream.writeInt(coord4D.zCoord); + + dataStream.writeInt(coord4D.dimensionId); + } + + @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) + { - dataStream.writeInt(object3D.dimensionId); } } diff --git a/src/main/java/mekanism/common/network/PacketDigitUpdate.java b/src/main/java/mekanism/common/network/PacketDigitUpdate.java index 6c9ee36a1..fb4b543b8 100644 --- a/src/main/java/mekanism/common/network/PacketDigitUpdate.java +++ b/src/main/java/mekanism/common/network/PacketDigitUpdate.java @@ -8,28 +8,20 @@ import net.minecraft.item.ItemStack; import net.minecraft.world.World; import com.google.common.io.ByteArrayDataInput; +import io.netty.buffer.ByteBuf; +import io.netty.channel.ChannelHandlerContext; -public class PacketDigitUpdate implements IMekanismPacket +public class PacketDigitUpdate extends MekanismPacket { public int index; public int digit; - @Override - public String getName() + public PacketDigitUpdate(int ind, int dig) { - return "DigitUpdate"; + index = ind; + digit = dig; } - @Override - public IMekanismPacket setParams(Object... data) - { - index = (Integer)data[0]; - digit = (Integer)data[1]; - - return this; - } - - @Override public void read(ByteArrayDataInput dataStream, EntityPlayer player, World world) throws Exception { int index = dataStream.readInt(); @@ -44,10 +36,33 @@ public class PacketDigitUpdate implements IMekanismPacket } } - @Override public void write(DataOutputStream dataStream) throws Exception { dataStream.writeInt(index); dataStream.writeInt(digit); } + + @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) + { + + } } diff --git a/src/main/java/mekanism/common/network/PacketDigitalMinerGui.java b/src/main/java/mekanism/common/network/PacketDigitalMinerGui.java index d440c85a4..8db1e1c19 100644 --- a/src/main/java/mekanism/common/network/PacketDigitalMinerGui.java +++ b/src/main/java/mekanism/common/network/PacketDigitalMinerGui.java @@ -10,8 +10,7 @@ import mekanism.client.gui.GuiMFilterSelect; import mekanism.client.gui.GuiMItemStackFilter; import mekanism.client.gui.GuiMMaterialFilter; import mekanism.client.gui.GuiMOreDictFilter; -import mekanism.common.PacketHandler; -import mekanism.common.PacketHandler.Transmission; +import mekanism.common.Mekanism; import mekanism.common.inventory.container.ContainerDigitalMiner; import mekanism.common.inventory.container.ContainerFilter; import mekanism.common.inventory.container.ContainerNull; @@ -24,62 +23,54 @@ import net.minecraft.inventory.Container; import net.minecraft.world.World; import com.google.common.io.ByteArrayDataInput; +import io.netty.buffer.ByteBuf; +import io.netty.channel.ChannelHandlerContext; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -public class PacketDigitalMinerGui implements IMekanismPacket +public class PacketDigitalMinerGui extends MekanismPacket { public Coord4D object3D; public MinerGuiPacket packetType; - public int type; + public int guiType; public int windowId = -1; public int index = -1; - @Override - public String getName() + public PacketDigitalMinerGui(MinerGuiPacket type, Coord4D coord, int guiID, int extra, int extra2) { - return "DigitalMinerGui"; - } + packetType = type; - @Override - public IMekanismPacket setParams(Object... data) - { - packetType = (MinerGuiPacket)data[0]; - - object3D = (Coord4D)data[1]; - type = (Integer)data[2]; + object3D = coord; + guiType = guiID; if(packetType == MinerGuiPacket.CLIENT) { - windowId = (Integer)data[3]; + windowId = extra; } else if(packetType == MinerGuiPacket.SERVER_INDEX) { - index = (Integer)data[3]; + index = extra; } else if(packetType == MinerGuiPacket.CLIENT_INDEX) { - windowId = (Integer)data[3]; - index = (Integer)data[4]; + windowId = extra; + index = extra2; } - - return this; } - @Override public void read(ByteArrayDataInput dataStream, EntityPlayer player, World world) throws Exception { packetType = MinerGuiPacket.values()[dataStream.readInt()]; object3D = new Coord4D(dataStream.readInt(), dataStream.readInt(), dataStream.readInt(), dataStream.readInt()); - type = dataStream.readInt(); + guiType = dataStream.readInt(); if(packetType == MinerGuiPacket.CLIENT || packetType == MinerGuiPacket.CLIENT_INDEX) { @@ -97,7 +88,7 @@ public class PacketDigitalMinerGui implements IMekanismPacket if(worldServer != null && object3D.getTileEntity(worldServer) instanceof TileEntityDigitalMiner) { - openServerGui(packetType, type, worldServer, (EntityPlayerMP)player, object3D, index); + openServerGui(packetType, guiType, worldServer, (EntityPlayerMP)player, object3D, index); } } else { @@ -106,11 +97,11 @@ public class PacketDigitalMinerGui implements IMekanismPacket try { if(packetType == MinerGuiPacket.CLIENT) { - FMLCommonHandler.instance().showGuiScreen(getGui(packetType, type, player, world, object3D.xCoord, object3D.yCoord, object3D.zCoord, -1)); + FMLCommonHandler.instance().showGuiScreen(getGui(packetType, guiType, player, world, object3D.xCoord, object3D.yCoord, object3D.zCoord, -1)); } else if(packetType == MinerGuiPacket.CLIENT_INDEX) { - FMLCommonHandler.instance().showGuiScreen(getGui(packetType, type, player, world, object3D.xCoord, object3D.yCoord, object3D.zCoord, index)); + FMLCommonHandler.instance().showGuiScreen(getGui(packetType, guiType, player, world, object3D.xCoord, object3D.yCoord, object3D.zCoord, index)); } player.openContainer.windowId = windowId; @@ -149,11 +140,11 @@ public class PacketDigitalMinerGui implements IMekanismPacket if(t == MinerGuiPacket.SERVER) { - PacketHandler.sendPacket(Transmission.SINGLE_CLIENT, new PacketDigitalMinerGui().setParams(MinerGuiPacket.CLIENT, obj, guiType, window), playerMP); + Mekanism.packetPipeline.sendTo(new PacketDigitalMinerGui(MinerGuiPacket.CLIENT, obj, guiType, window, 0), playerMP); } else if(t == MinerGuiPacket.SERVER_INDEX) { - PacketHandler.sendPacket(Transmission.SINGLE_CLIENT, new PacketDigitalMinerGui().setParams(MinerGuiPacket.CLIENT_INDEX, obj, guiType, window, i), playerMP); + Mekanism.packetPipeline.sendTo(new PacketDigitalMinerGui(MinerGuiPacket.CLIENT_INDEX, obj, guiType, window, i), playerMP); } playerMP.openContainer = container; @@ -166,7 +157,7 @@ public class PacketDigitalMinerGui implements IMekanismPacket for(EntityPlayer player : tile.playersUsing) { - PacketHandler.sendPacket(Transmission.SINGLE_CLIENT, new PacketTileEntity().setParams(obj, tile.getFilterPacket(new ArrayList())), player); + Mekanism.packetPipeline.sendTo(new PacketTileEntity(obj, tile.getFilterPacket(new ArrayList())), (EntityPlayerMP)player); } } } @@ -222,7 +213,6 @@ public class PacketDigitalMinerGui implements IMekanismPacket return null; } - @Override public void write(DataOutputStream dataStream) throws Exception { dataStream.writeInt(packetType.ordinal()); @@ -233,7 +223,7 @@ public class PacketDigitalMinerGui implements IMekanismPacket dataStream.writeInt(object3D.dimensionId); - dataStream.writeInt(type); + dataStream.writeInt(guiType); if(packetType == MinerGuiPacket.CLIENT || packetType == MinerGuiPacket.CLIENT_INDEX) { @@ -246,6 +236,30 @@ public class PacketDigitalMinerGui implements IMekanismPacket } } + @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) + { + + } + public static enum MinerGuiPacket { SERVER, CLIENT, SERVER_INDEX, CLIENT_INDEX diff --git a/src/main/java/mekanism/common/network/PacketEditFilter.java b/src/main/java/mekanism/common/network/PacketEditFilter.java index a1cb10c7c..4306412fc 100644 --- a/src/main/java/mekanism/common/network/PacketEditFilter.java +++ b/src/main/java/mekanism/common/network/PacketEditFilter.java @@ -4,22 +4,24 @@ import java.io.DataOutputStream; import java.util.ArrayList; import mekanism.api.Coord4D; -import mekanism.common.PacketHandler; -import mekanism.common.PacketHandler.Transmission; +import mekanism.common.Mekanism; import mekanism.common.miner.MinerFilter; import mekanism.common.tile.TileEntityDigitalMiner; import mekanism.common.tile.TileEntityLogisticalSorter; import mekanism.common.transporter.TransporterFilter; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.world.World; import com.google.common.io.ByteArrayDataInput; +import io.netty.buffer.ByteBuf; +import io.netty.channel.ChannelHandlerContext; import cpw.mods.fml.common.FMLCommonHandler; -public class PacketEditFilter implements IMekanismPacket +public class PacketEditFilter extends MekanismPacket { - public Coord4D object3D; + public Coord4D coord4D; public TransporterFilter tFilter; public TransporterFilter tEdited; @@ -31,48 +33,38 @@ public class PacketEditFilter implements IMekanismPacket public boolean delete; - @Override - public String getName() + public PacketEditFilter(Coord4D coord, boolean deletion, Object filter, Object edited) { - return "EditFilter"; - } + coord4D = coord; + delete = deletion; - @Override - public IMekanismPacket setParams(Object... data) - { - object3D = (Coord4D)data[0]; - delete = (Boolean)data[1]; - - if(data[2] instanceof TransporterFilter) + if(filter instanceof TransporterFilter) { - tFilter = (TransporterFilter)data[2]; + tFilter = (TransporterFilter)filter; if(!delete) { - tEdited = (TransporterFilter)data[3]; + tEdited = (TransporterFilter)edited; } type = 0; } - else if(data[2] instanceof MinerFilter) + else if(filter instanceof MinerFilter) { - mFilter = (MinerFilter)data[2]; + mFilter = (MinerFilter)filter; if(!delete) { - mEdited = (MinerFilter)data[3]; + mEdited = (MinerFilter)edited; } type = 1; } - - return this; } - @Override public void read(ByteArrayDataInput dataStream, EntityPlayer player, World world) throws Exception { - object3D = new Coord4D(dataStream.readInt(), dataStream.readInt(), dataStream.readInt(), dataStream.readInt()); + coord4D = new Coord4D(dataStream.readInt(), dataStream.readInt(), dataStream.readInt(), dataStream.readInt()); type = dataStream.readByte(); delete = dataStream.readBoolean(); @@ -96,13 +88,13 @@ public class PacketEditFilter implements IMekanismPacket } } - World worldServer = FMLCommonHandler.instance().getMinecraftServerInstance().worldServerForDimension(object3D.dimensionId); + World worldServer = FMLCommonHandler.instance().getMinecraftServerInstance().worldServerForDimension(coord4D.dimensionId); if(worldServer != null) { - if(type == 0 && object3D.getTileEntity(worldServer) instanceof TileEntityLogisticalSorter) + if(type == 0 && coord4D.getTileEntity(worldServer) instanceof TileEntityLogisticalSorter) { - TileEntityLogisticalSorter sorter = (TileEntityLogisticalSorter)object3D.getTileEntity(worldServer); + TileEntityLogisticalSorter sorter = (TileEntityLogisticalSorter) coord4D.getTileEntity(worldServer); if(!sorter.filters.contains(tFilter)) { @@ -120,12 +112,12 @@ public class PacketEditFilter implements IMekanismPacket for(EntityPlayer iterPlayer : sorter.playersUsing) { - PacketHandler.sendPacket(Transmission.SINGLE_CLIENT, new PacketTileEntity().setParams(Coord4D.get(sorter), sorter.getFilterPacket(new ArrayList())), iterPlayer); + Mekanism.packetPipeline.sendTo(new PacketTileEntity(Coord4D.get(sorter), sorter.getFilterPacket(new ArrayList())), (EntityPlayerMP)iterPlayer); } } - else if(type == 1 && object3D.getTileEntity(worldServer) instanceof TileEntityDigitalMiner) + else if(type == 1 && coord4D.getTileEntity(worldServer) instanceof TileEntityDigitalMiner) { - TileEntityDigitalMiner miner = (TileEntityDigitalMiner)object3D.getTileEntity(worldServer); + TileEntityDigitalMiner miner = (TileEntityDigitalMiner) coord4D.getTileEntity(worldServer); if(!miner.filters.contains(mFilter)) { @@ -143,7 +135,7 @@ public class PacketEditFilter implements IMekanismPacket for(EntityPlayer iterPlayer : miner.playersUsing) { - PacketHandler.sendPacket(Transmission.SINGLE_CLIENT, new PacketTileEntity().setParams(Coord4D.get(miner), miner.getFilterPacket(new ArrayList())), iterPlayer); + Mekanism.packetPipeline.sendTo(new PacketTileEntity(Coord4D.get(miner), miner.getFilterPacket(new ArrayList())), (EntityPlayerMP)iterPlayer); } } } @@ -152,11 +144,11 @@ public class PacketEditFilter implements IMekanismPacket @Override public void write(DataOutputStream dataStream) throws Exception { - dataStream.writeInt(object3D.xCoord); - dataStream.writeInt(object3D.yCoord); - dataStream.writeInt(object3D.zCoord); + dataStream.writeInt(coord4D.xCoord); + dataStream.writeInt(coord4D.yCoord); + dataStream.writeInt(coord4D.zCoord); - dataStream.writeInt(object3D.dimensionId); + dataStream.writeInt(coord4D.dimensionId); dataStream.writeByte(type); @@ -185,4 +177,28 @@ public class PacketEditFilter implements IMekanismPacket PacketHandler.encode(data.toArray(), dataStream); } + + @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) + { + + } } diff --git a/src/main/java/mekanism/common/network/PacketElectricBowState.java b/src/main/java/mekanism/common/network/PacketElectricBowState.java index 5de7471fa..5aac2ddd0 100644 --- a/src/main/java/mekanism/common/network/PacketElectricBowState.java +++ b/src/main/java/mekanism/common/network/PacketElectricBowState.java @@ -8,26 +8,18 @@ import net.minecraft.item.ItemStack; import net.minecraft.world.World; import com.google.common.io.ByteArrayDataInput; +import io.netty.buffer.ByteBuf; +import io.netty.channel.ChannelHandlerContext; -public class PacketElectricBowState implements IMekanismPacket +public class PacketElectricBowState extends MekanismPacket { public boolean fireMode; - @Override - public String getName() + public PacketElectricBowState(boolean state) { - return "ElectricBowState"; + fireMode = state; } - @Override - public IMekanismPacket setParams(Object... data) - { - fireMode = (Boolean)data[0]; - - return this; - } - - @Override public void read(ByteArrayDataInput dataStream, EntityPlayer player, World world) throws Exception { boolean state = dataStream.readBoolean(); @@ -40,9 +32,32 @@ public class PacketElectricBowState implements IMekanismPacket } } - @Override public void write(DataOutputStream dataStream) throws Exception { dataStream.writeBoolean(fireMode); } + + @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) + { + + } } diff --git a/src/main/java/mekanism/common/network/PacketElectricChest.java b/src/main/java/mekanism/common/network/PacketElectricChest.java index 430f651e3..34d58e374 100644 --- a/src/main/java/mekanism/common/network/PacketElectricChest.java +++ b/src/main/java/mekanism/common/network/PacketElectricChest.java @@ -16,8 +16,10 @@ import net.minecraft.item.ItemStack; import net.minecraft.world.World; import com.google.common.io.ByteArrayDataInput; +import io.netty.buffer.ByteBuf; +import io.netty.channel.ChannelHandlerContext; -public class PacketElectricChest implements IMekanismPacket +public class PacketElectricChest extends MekanismPacket { public ElectricChestPacketType activeType; @@ -34,16 +36,9 @@ public class PacketElectricChest implements IMekanismPacket public Coord4D obj; - @Override - public String getName() + public PacketElectricChest(ElectricChestPacketType type)//TODO I'm bored now.) { - return "ElectricChest"; - } - - @Override - public IMekanismPacket setParams(Object... data) - { - activeType = (ElectricChestPacketType)data[0]; + activeType = type; switch(activeType) { @@ -89,11 +84,8 @@ public class PacketElectricChest implements IMekanismPacket break; } - - return this; } - @Override public void read(ByteArrayDataInput dataStream, EntityPlayer player, World world) throws Exception { ElectricChestPacketType packetType = ElectricChestPacketType.values()[dataStream.readInt()]; @@ -222,7 +214,6 @@ public class PacketElectricChest implements IMekanismPacket } } - @Override public void write(DataOutputStream dataStream) throws Exception { dataStream.writeInt(activeType.ordinal()); @@ -281,6 +272,30 @@ public class PacketElectricChest implements IMekanismPacket } } + @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) + { + + } + public static enum ElectricChestPacketType { LOCK, diff --git a/src/main/java/mekanism/common/network/PacketJetpackData.java b/src/main/java/mekanism/common/network/PacketJetpackData.java index 1eb25aafc..bb052644f 100644 --- a/src/main/java/mekanism/common/network/PacketJetpackData.java +++ b/src/main/java/mekanism/common/network/PacketJetpackData.java @@ -3,43 +3,33 @@ package mekanism.common.network; import java.io.DataOutputStream; import mekanism.common.Mekanism; -import mekanism.common.PacketHandler; -import mekanism.common.PacketHandler.Transmission; import mekanism.common.item.ItemJetpack; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; import com.google.common.io.ByteArrayDataInput; +import io.netty.buffer.ByteBuf; +import io.netty.channel.ChannelHandlerContext; -public class PacketJetpackData implements IMekanismPacket +public class PacketJetpackData extends MekanismPacket { public JetpackPacket packetType; public String username; public boolean value; - @Override - public String getName() + public PacketJetpackData(JetpackPacket type, String name, boolean state) { - return "JetpackData"; - } - - @Override - public IMekanismPacket setParams(Object... data) - { - packetType = (JetpackPacket)data[0]; + packetType = type; if(packetType == JetpackPacket.UPDATE) { - username = (String)data[1]; - value = (Boolean)data[2]; + username = name; + value = state; } - - return this; } - @Override public void read(ByteArrayDataInput dataStream, EntityPlayer player, World world) throws Exception { packetType = JetpackPacket.values()[dataStream.readInt()]; @@ -70,7 +60,7 @@ public class PacketJetpackData implements IMekanismPacket if(!world.isRemote) { - PacketHandler.sendPacket(Transmission.CLIENTS_DIM, new PacketJetpackData().setParams(JetpackPacket.UPDATE, username, value), world.provider.dimensionId); + Mekanism.packetPipeline.sendToDimension(new PacketJetpackData(JetpackPacket.UPDATE, username, value), world.provider.dimensionId); } } else if(packetType == JetpackPacket.MODE) @@ -84,7 +74,6 @@ public class PacketJetpackData implements IMekanismPacket } } - @Override public void write(DataOutputStream dataStream) throws Exception { dataStream.writeInt(packetType.ordinal()); @@ -105,6 +94,30 @@ public class PacketJetpackData implements IMekanismPacket } } + @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) + { + + } + public static enum JetpackPacket { UPDATE, diff --git a/src/main/java/mekanism/common/network/PacketKey.java b/src/main/java/mekanism/common/network/PacketKey.java index 3d60c3ea0..9253fd516 100644 --- a/src/main/java/mekanism/common/network/PacketKey.java +++ b/src/main/java/mekanism/common/network/PacketKey.java @@ -7,28 +7,20 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; import com.google.common.io.ByteArrayDataInput; +import io.netty.buffer.ByteBuf; +import io.netty.channel.ChannelHandlerContext; -public class PacketKey implements IMekanismPacket +public class PacketKey extends MekanismPacket { public int key; public boolean add; - @Override - public String getName() + public PacketKey(int k, boolean a) { - return "Key"; + key = k; + add = a; } - @Override - public IMekanismPacket setParams(Object... data) - { - key = (Integer)data[0]; - add = (Boolean)data[1]; - - return this; - } - - @Override public void read(ByteArrayDataInput dataStream, EntityPlayer player, World world) throws Exception { key = dataStream.readInt(); @@ -43,10 +35,33 @@ public class PacketKey implements IMekanismPacket } } - @Override public void write(DataOutputStream dataStream) throws Exception { dataStream.writeInt(key); dataStream.writeBoolean(add); } + + @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) + { + + } } diff --git a/src/main/java/mekanism/common/network/PacketLogisticalSorterGui.java b/src/main/java/mekanism/common/network/PacketLogisticalSorterGui.java index c06fa0306..f20888ad3 100644 --- a/src/main/java/mekanism/common/network/PacketLogisticalSorterGui.java +++ b/src/main/java/mekanism/common/network/PacketLogisticalSorterGui.java @@ -8,8 +8,7 @@ import mekanism.client.gui.GuiTFilterSelect; import mekanism.client.gui.GuiTItemStackFilter; import mekanism.client.gui.GuiTMaterialFilter; import mekanism.client.gui.GuiTOreDictFilter; -import mekanism.common.PacketHandler; -import mekanism.common.PacketHandler.Transmission; +import mekanism.common.Mekanism; import mekanism.common.inventory.container.ContainerFilter; import mekanism.common.inventory.container.ContainerNull; import mekanism.common.tile.TileEntityContainerBlock; @@ -21,62 +20,54 @@ import net.minecraft.inventory.Container; import net.minecraft.world.World; import com.google.common.io.ByteArrayDataInput; +import io.netty.buffer.ByteBuf; +import io.netty.channel.ChannelHandlerContext; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -public class PacketLogisticalSorterGui implements IMekanismPacket +public class PacketLogisticalSorterGui extends MekanismPacket { public Coord4D object3D; public SorterGuiPacket packetType; - public int type; + public int guiType; public int windowId = -1; public int index = -1; - @Override - public String getName() + public PacketLogisticalSorterGui(SorterGuiPacket type, Coord4D coord, int guiId, int extra, int extra2) { - return "LogisticalSorterGui"; - } + packetType = type; - @Override - public IMekanismPacket setParams(Object... data) - { - packetType = (SorterGuiPacket)data[0]; - - object3D = (Coord4D)data[1]; - type = (Integer)data[2]; + object3D = coord; + guiType = guiId; if(packetType == SorterGuiPacket.CLIENT) { - windowId = (Integer)data[3]; + windowId = extra; } else if(packetType == SorterGuiPacket.SERVER_INDEX) { - index = (Integer)data[3]; + index = extra; } else if(packetType == SorterGuiPacket.CLIENT_INDEX) { - windowId = (Integer)data[3]; - index = (Integer)data[4]; + windowId = extra2; + index = extra2; } - - return this; } - @Override public void read(ByteArrayDataInput dataStream, EntityPlayer player, World world) throws Exception { packetType = SorterGuiPacket.values()[dataStream.readInt()]; object3D = new Coord4D(dataStream.readInt(), dataStream.readInt(), dataStream.readInt(), dataStream.readInt()); - type = dataStream.readInt(); + guiType = dataStream.readInt(); if(packetType == SorterGuiPacket.CLIENT || packetType == SorterGuiPacket.CLIENT_INDEX) { @@ -94,7 +85,7 @@ public class PacketLogisticalSorterGui implements IMekanismPacket if(worldServer != null && object3D.getTileEntity(worldServer) instanceof TileEntityLogisticalSorter) { - openServerGui(packetType, type, worldServer, (EntityPlayerMP)player, object3D, index); + openServerGui(packetType, guiType, worldServer, (EntityPlayerMP)player, object3D, index); } } else { @@ -103,11 +94,11 @@ public class PacketLogisticalSorterGui implements IMekanismPacket try { if(packetType == SorterGuiPacket.CLIENT) { - FMLCommonHandler.instance().showGuiScreen(getGui(packetType, type, player, world, object3D.xCoord, object3D.yCoord, object3D.zCoord, -1)); + FMLCommonHandler.instance().showGuiScreen(getGui(packetType, guiType, player, world, object3D.xCoord, object3D.yCoord, object3D.zCoord, -1)); } else if(packetType == SorterGuiPacket.CLIENT_INDEX) { - FMLCommonHandler.instance().showGuiScreen(getGui(packetType, type, player, world, object3D.xCoord, object3D.yCoord, object3D.zCoord, index)); + FMLCommonHandler.instance().showGuiScreen(getGui(packetType, guiType, player, world, object3D.xCoord, object3D.yCoord, object3D.zCoord, index)); } player.openContainer.windowId = windowId; @@ -142,11 +133,11 @@ public class PacketLogisticalSorterGui implements IMekanismPacket if(t == SorterGuiPacket.SERVER) { - PacketHandler.sendPacket(Transmission.SINGLE_CLIENT, new PacketLogisticalSorterGui().setParams(SorterGuiPacket.CLIENT, obj, guiType, window), playerMP); + Mekanism.packetPipeline.sendTo(new PacketLogisticalSorterGui(SorterGuiPacket.CLIENT, obj, guiType, window, 0), playerMP); } else if(t == SorterGuiPacket.SERVER_INDEX) { - PacketHandler.sendPacket(Transmission.SINGLE_CLIENT, new PacketLogisticalSorterGui().setParams(SorterGuiPacket.CLIENT_INDEX, obj, guiType, window, i), playerMP); + Mekanism.packetPipeline.sendTo(new PacketLogisticalSorterGui(SorterGuiPacket.CLIENT_INDEX, obj, guiType, window, i), playerMP); } playerMP.openContainer = container; @@ -201,7 +192,6 @@ public class PacketLogisticalSorterGui implements IMekanismPacket return null; } - @Override public void write(DataOutputStream dataStream) throws Exception { dataStream.writeInt(packetType.ordinal()); @@ -212,7 +202,7 @@ public class PacketLogisticalSorterGui implements IMekanismPacket dataStream.writeInt(object3D.dimensionId); - dataStream.writeInt(type); + dataStream.writeInt(guiType); if(packetType == SorterGuiPacket.CLIENT || packetType == SorterGuiPacket.CLIENT_INDEX) { @@ -225,6 +215,30 @@ public class PacketLogisticalSorterGui implements IMekanismPacket } } + @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) + { + + } + public static enum SorterGuiPacket { SERVER, CLIENT, SERVER_INDEX, CLIENT_INDEX diff --git a/src/main/java/mekanism/common/network/PacketNewFilter.java b/src/main/java/mekanism/common/network/PacketNewFilter.java index bb279afe6..2fdf153ed 100644 --- a/src/main/java/mekanism/common/network/PacketNewFilter.java +++ b/src/main/java/mekanism/common/network/PacketNewFilter.java @@ -4,22 +4,25 @@ import java.io.DataOutputStream; import java.util.ArrayList; import mekanism.api.Coord4D; +import mekanism.common.Mekanism; import mekanism.common.PacketHandler; -import mekanism.common.PacketHandler.Transmission; import mekanism.common.miner.MinerFilter; import mekanism.common.tile.TileEntityDigitalMiner; import mekanism.common.tile.TileEntityLogisticalSorter; import mekanism.common.transporter.TransporterFilter; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.world.World; import com.google.common.io.ByteArrayDataInput; +import io.netty.buffer.ByteBuf; +import io.netty.channel.ChannelHandlerContext; import cpw.mods.fml.common.FMLCommonHandler; -public class PacketNewFilter implements IMekanismPacket +public class PacketNewFilter extends MekanismPacket { - public Coord4D object3D; + public Coord4D coord4D; public TransporterFilter tFilter; @@ -27,63 +30,53 @@ public class PacketNewFilter implements IMekanismPacket public byte type = -1; - @Override - public String getName() + public PacketNewFilter(Coord4D coord, Object filter) { - return "NewFilter"; - } + coord4D = coord; - @Override - public IMekanismPacket setParams(Object... data) - { - object3D = (Coord4D)data[0]; - - if(data[1] instanceof TransporterFilter) + if(filter instanceof TransporterFilter) { - tFilter = (TransporterFilter)data[1]; + tFilter = (TransporterFilter)filter; type = 0; } - else if(data[1] instanceof MinerFilter) + else if(filter instanceof MinerFilter) { - mFilter = (MinerFilter)data[1]; + mFilter = (MinerFilter)filter; type = 1; } - - return this; } - @Override public void read(ByteArrayDataInput dataStream, EntityPlayer player, World world) throws Exception { - object3D = new Coord4D(dataStream.readInt(), dataStream.readInt(), dataStream.readInt(), dataStream.readInt()); + coord4D = new Coord4D(dataStream.readInt(), dataStream.readInt(), dataStream.readInt(), dataStream.readInt()); type = dataStream.readByte(); - World worldServer = FMLCommonHandler.instance().getMinecraftServerInstance().worldServerForDimension(object3D.dimensionId); + World worldServer = FMLCommonHandler.instance().getMinecraftServerInstance().worldServerForDimension(coord4D.dimensionId); if(worldServer != null) { - if(type == 0 && object3D.getTileEntity(worldServer) instanceof TileEntityLogisticalSorter) + if(type == 0 && coord4D.getTileEntity(worldServer) instanceof TileEntityLogisticalSorter) { - TileEntityLogisticalSorter sorter = (TileEntityLogisticalSorter)object3D.getTileEntity(worldServer); + TileEntityLogisticalSorter sorter = (TileEntityLogisticalSorter) coord4D.getTileEntity(worldServer); TransporterFilter filter = TransporterFilter.readFromPacket(dataStream); sorter.filters.add(filter); for(EntityPlayer iterPlayer : sorter.playersUsing) { - PacketHandler.sendPacket(Transmission.SINGLE_CLIENT, new PacketTileEntity().setParams(Coord4D.get(sorter), sorter.getFilterPacket(new ArrayList())), iterPlayer); + Mekanism.packetPipeline.sendTo(new PacketTileEntity(Coord4D.get(sorter), sorter.getFilterPacket(new ArrayList())), (EntityPlayerMP)iterPlayer); } } - else if(type == 1 && object3D.getTileEntity(worldServer) instanceof TileEntityDigitalMiner) + else if(type == 1 && coord4D.getTileEntity(worldServer) instanceof TileEntityDigitalMiner) { - TileEntityDigitalMiner miner = (TileEntityDigitalMiner)object3D.getTileEntity(worldServer); + TileEntityDigitalMiner miner = (TileEntityDigitalMiner) coord4D.getTileEntity(worldServer); MinerFilter filter = MinerFilter.readFromPacket(dataStream); miner.filters.add(filter); for(EntityPlayer iterPlayer : miner.playersUsing) { - PacketHandler.sendPacket(Transmission.SINGLE_CLIENT, new PacketTileEntity().setParams(Coord4D.get(miner), miner.getFilterPacket(new ArrayList())), iterPlayer); + Mekanism.packetPipeline.sendTo(new PacketTileEntity(Coord4D.get(miner), miner.getFilterPacket(new ArrayList())), (EntityPlayerMP)iterPlayer); } } } @@ -92,11 +85,11 @@ public class PacketNewFilter implements IMekanismPacket @Override public void write(DataOutputStream dataStream) throws Exception { - dataStream.writeInt(object3D.xCoord); - dataStream.writeInt(object3D.yCoord); - dataStream.writeInt(object3D.zCoord); + dataStream.writeInt(coord4D.xCoord); + dataStream.writeInt(coord4D.yCoord); + dataStream.writeInt(coord4D.zCoord); - dataStream.writeInt(object3D.dimensionId); + dataStream.writeInt(coord4D.dimensionId); dataStream.writeByte(type); @@ -113,4 +106,28 @@ public class PacketNewFilter implements IMekanismPacket PacketHandler.encode(data.toArray(), dataStream); } + + @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) + { + + } } diff --git a/src/main/java/mekanism/common/network/PacketPipeline.java b/src/main/java/mekanism/common/network/PacketPipeline.java index 851b6a1d9..b7f0f7358 100644 --- a/src/main/java/mekanism/common/network/PacketPipeline.java +++ b/src/main/java/mekanism/common/network/PacketPipeline.java @@ -29,7 +29,7 @@ import cpw.mods.fml.relauncher.SideOnly; * Packet pipeline class. Directs all registered packet data to be handled by * the packets themselves. * - * @author unpairedbracket based on sirgingalot's work in TiCon + * @author unpairedbracket based on sirgingalot's tutorial */ @ChannelHandler.Sharable public class PacketPipeline extends MessageToMessageCodec @@ -130,12 +130,38 @@ public class PacketPipeline extends MessageToMessageCodec inventory[1].stackSize) { @@ -93,7 +92,7 @@ public class TileEntityElectricPump extends TileEntityElectricBlock implements I inventory[0] = null; } - onInventoryChanged(); + markDirty(); } } } @@ -106,7 +105,7 @@ public class TileEntityElectricPump extends TileEntityElectricBlock implements I { if(suck(true)) { - PacketHandler.sendPacket(Transmission.CLIENTS_RANGE, new PacketTileEntity().setParams(Coord4D.get(this), getNetworkedData(new ArrayList())), Coord4D.get(this), 50D); + Mekanism.packetPipeline.sendToAllAround(new PacketTileEntity(Coord4D.get(this), getNetworkedData(new ArrayList())), Coord4D.get(this), 50D); } clean(true); @@ -531,7 +530,7 @@ public class TileEntityElectricPump extends TileEntityElectricBlock implements I recurringNodes.clear(); cleaningNodes.clear(); - player.sendChatToPlayer(ChatMessageComponent.createFromText(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.GREY + MekanismUtils.localize("tooltip.configurator.pumpReset"))); + player.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.GREY + MekanismUtils.localize("tooltip.configurator.pumpReset"))); return true; } diff --git a/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java b/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java index 42a71b6c0..a524c31aa 100644 --- a/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java +++ b/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java @@ -15,7 +15,6 @@ import mekanism.api.gas.ITubeConnection; import mekanism.common.ISustainedTank; import mekanism.common.Mekanism; import mekanism.common.PacketHandler; -import mekanism.common.PacketHandler.Transmission; import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.network.PacketTileEntity; import mekanism.common.recipe.RecipeHandler; @@ -154,7 +153,7 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp if(worldObj.rand.nextInt(3) == 2) { - PacketHandler.sendPacket(Transmission.CLIENTS_RANGE, new PacketTileEntity().setParams(Coord4D.get(this), getParticlePacket(0, new ArrayList())), Coord4D.get(this), 40D); + Mekanism.packetPipeline.sendToAllAround(new PacketTileEntity(Coord4D.get(this), getParticlePacket(0, new ArrayList())), Coord4D.get(this), 40D); } } } @@ -181,7 +180,7 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp if(worldObj.rand.nextInt(3) == 2) { - PacketHandler.sendPacket(Transmission.CLIENTS_RANGE, new PacketTileEntity().setParams(Coord4D.get(this), getParticlePacket(1, new ArrayList())), Coord4D.get(this), 40D); + Mekanism.packetPipeline.sendToAllAround(new PacketTileEntity(Coord4D.get(this), getParticlePacket(1, new ArrayList())), Coord4D.get(this), 40D); } } } diff --git a/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java b/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java index f7a8bb5ac..66e314625 100644 --- a/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java +++ b/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java @@ -6,7 +6,6 @@ import java.util.EnumSet; import mekanism.api.Coord4D; import mekanism.common.IRedstoneControl; import mekanism.common.PacketHandler; -import mekanism.common.PacketHandler.Transmission; import mekanism.common.Tier.EnergyCubeTier; import mekanism.common.network.PacketTileEntity; import mekanism.common.util.CableUtils; @@ -66,7 +65,7 @@ public class TileEntityEnergyCube extends TileEntityElectricBlock implements IPe if(newScale != prevScale) { - PacketHandler.sendPacket(Transmission.CLIENTS_RANGE, new PacketTileEntity().setParams(Coord4D.get(this), getNetworkedData(new ArrayList())), Coord4D.get(this), 50D); + Mekanism.packetPipeline.sendToAllAround(new PacketTileEntity(Coord4D.get(this), getNetworkedData(new ArrayList())), Coord4D.get(this), 50D); } prevScale = newScale; @@ -242,7 +241,7 @@ public class TileEntityEnergyCube extends TileEntityElectricBlock implements IPe if(newRedstoneLevel != currentRedstoneLevel) { - onInventoryChanged(); + markDirty(); currentRedstoneLevel = newRedstoneLevel; } } diff --git a/src/main/java/mekanism/common/tile/TileEntityFactory.java b/src/main/java/mekanism/common/tile/TileEntityFactory.java index 07f578d6f..15e415b0e 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFactory.java +++ b/src/main/java/mekanism/common/tile/TileEntityFactory.java @@ -22,7 +22,6 @@ import mekanism.common.IRedstoneControl; import mekanism.common.IUpgradeTile; import mekanism.common.Mekanism; import mekanism.common.PacketHandler; -import mekanism.common.PacketHandler.Transmission; import mekanism.common.SideData; import mekanism.common.Tier.FactoryTier; import mekanism.common.block.BlockMachine.MachineType; @@ -154,7 +153,7 @@ public class TileEntityFactory extends TileEntityElectricBlock implements IPerip if(updateDelay == 0 && clientActive != isActive) { - PacketHandler.sendPacket(Transmission.ALL_CLIENTS, new PacketTileEntity().setParams(Coord4D.get(this), getNetworkedData(new ArrayList()))); + Mekanism.packetPipeline.sendToAll(new PacketTileEntity(Coord4D.get(this), getNetworkedData(new ArrayList()))); } } @@ -304,7 +303,7 @@ public class TileEntityFactory extends TileEntityElectricBlock implements IPerip if(didOp) { - onInventoryChanged(); + markDirty(); break; } } @@ -534,7 +533,7 @@ public class TileEntityFactory extends TileEntityElectricBlock implements IPerip inventory[outputSlot].stackSize += itemstack.stackSize; } - onInventoryChanged(); + markDirty(); ejectorComponent.onOutput(); } @@ -766,7 +765,7 @@ public class TileEntityFactory extends TileEntityElectricBlock implements IPerip if(clientActive != active && updateDelay == 0) { - PacketHandler.sendPacket(Transmission.ALL_CLIENTS, new PacketTileEntity().setParams(Coord4D.get(this), getNetworkedData(new ArrayList()))); + Mekanism.packetPipeline.sendToAll(new PacketTileEntity(Coord4D.get(this), getNetworkedData(new ArrayList()))); updateDelay = 10; clientActive = active; diff --git a/src/main/java/mekanism/common/tile/TileEntityGasTank.java b/src/main/java/mekanism/common/tile/TileEntityGasTank.java index 1b272b757..f1ad4f1ec 100644 --- a/src/main/java/mekanism/common/tile/TileEntityGasTank.java +++ b/src/main/java/mekanism/common/tile/TileEntityGasTank.java @@ -13,7 +13,6 @@ import mekanism.api.gas.IGasItem; import mekanism.api.gas.ITubeConnection; import mekanism.common.IRedstoneControl; import mekanism.common.PacketHandler; -import mekanism.common.PacketHandler.Transmission; import mekanism.common.network.PacketTileEntity; import mekanism.common.util.MekanismUtils; import net.minecraft.entity.player.EntityPlayer; @@ -161,7 +160,7 @@ public class TileEntityGasTank extends TileEntityContainerBlock implements IGasH for(EntityPlayer player : playersUsing) { - PacketHandler.sendPacket(Transmission.SINGLE_CLIENT, new PacketTileEntity().setParams(Coord4D.get(this), getNetworkedData(new ArrayList())), player); + Mekanism.packetPipeline.sendTo(new PacketTileEntity(Coord4D.get(this), getNetworkedData(new ArrayList())), player); } return; diff --git a/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java b/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java index e5ef3d389..0dd0843e0 100644 --- a/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java +++ b/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java @@ -11,7 +11,6 @@ import mekanism.common.IActiveState; import mekanism.common.ILogisticalTransporter; import mekanism.common.IRedstoneControl; import mekanism.common.PacketHandler; -import mekanism.common.PacketHandler.Transmission; import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.network.PacketTileEntity; import mekanism.common.transporter.Finder.FirstFinder; @@ -112,7 +111,7 @@ public class TileEntityLogisticalSorter extends TileEntityElectricBlock implemen if(used != null) { invStack.use(used.stackSize); - inventory.onInventoryChanged(); + inventory.markDirty(); setActive(true); sentItems = true; } @@ -133,7 +132,7 @@ public class TileEntityLogisticalSorter extends TileEntityElectricBlock implemen if(used != null) { invStack.use(used.stackSize); - inventory.onInventoryChanged(); + inventory.markDirty(); setActive(true); } } @@ -147,7 +146,7 @@ public class TileEntityLogisticalSorter extends TileEntityElectricBlock implemen { for(EntityPlayer player : playersUsing) { - PacketHandler.sendPacket(Transmission.SINGLE_CLIENT, new PacketTileEntity().setParams(Coord4D.get(this), getGenericPacket(new ArrayList())), player); + Mekanism.packetPipeline.sendTo(new PacketTileEntity(Coord4D.get(this), getGenericPacket(new ArrayList())), player); } } } @@ -492,7 +491,7 @@ public class TileEntityLogisticalSorter extends TileEntityElectricBlock implemen { if(!worldObj.isRemote) { - PacketHandler.sendPacket(Transmission.CLIENTS_RANGE, new PacketTileEntity().setParams(Coord4D.get(this), getFilterPacket(new ArrayList())), Coord4D.get(this), 50D); + Mekanism.packetPipeline.sendToAllAround(new PacketTileEntity(Coord4D.get(this), getFilterPacket(new ArrayList())), Coord4D.get(this), 50D); } } @@ -515,7 +514,7 @@ public class TileEntityLogisticalSorter extends TileEntityElectricBlock implemen if(clientActive != active) { - PacketHandler.sendPacket(Transmission.ALL_CLIENTS, new PacketTileEntity().setParams(Coord4D.get(this), getNetworkedData(new ArrayList()))); + Mekanism.packetPipeline.sendToAll(new PacketTileEntity(Coord4D.get(this), getNetworkedData(new ArrayList()))); if(active) { diff --git a/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java b/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java index b46fefc74..dca1e69ed 100644 --- a/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java +++ b/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java @@ -17,7 +17,6 @@ import mekanism.common.IRedstoneControl; import mekanism.common.IUpgradeTile; import mekanism.common.Mekanism; import mekanism.common.PacketHandler; -import mekanism.common.PacketHandler.Transmission; import mekanism.common.SideData; import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.network.PacketTileEntity; @@ -125,7 +124,7 @@ public class TileEntityMetallurgicInfuser extends TileEntityElectricBlock implem if(updateDelay == 0 && clientActive != isActive) { - PacketHandler.sendPacket(Transmission.ALL_CLIENTS, new PacketTileEntity().setParams(Coord4D.get(this), getNetworkedData(new ArrayList()))); + Mekanism.packetPipeline.sendToAll(new PacketTileEntity(Coord4D.get(this), getNetworkedData(new ArrayList()))); } } @@ -511,7 +510,7 @@ public class TileEntityMetallurgicInfuser extends TileEntityElectricBlock implem if(clientActive != active && updateDelay == 0) { - PacketHandler.sendPacket(Transmission.ALL_CLIENTS, new PacketTileEntity().setParams(Coord4D.get(this), getNetworkedData(new ArrayList()))); + Mekanism.packetPipeline.sendToAll(new PacketTileEntity(Coord4D.get(this), getNetworkedData(new ArrayList()))); updateDelay = 10; clientActive = active; diff --git a/src/main/java/mekanism/common/tile/TileEntityPRC.java b/src/main/java/mekanism/common/tile/TileEntityPRC.java index 3b9c19faa..6b75ac1c6 100644 --- a/src/main/java/mekanism/common/tile/TileEntityPRC.java +++ b/src/main/java/mekanism/common/tile/TileEntityPRC.java @@ -169,7 +169,7 @@ public class TileEntityPRC extends TileEntityBasicMachine implements IFluidHandl recipe.products.addProducts(inventory, 2); - onInventoryChanged(); + markDirty(); ejectorComponent.onOutput(); } diff --git a/src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java b/src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java index 914e5c947..e30af3226 100644 --- a/src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java +++ b/src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java @@ -15,7 +15,6 @@ import mekanism.common.IRedstoneControl; import mekanism.common.ISustainedTank; import mekanism.common.Mekanism; import mekanism.common.PacketHandler; -import mekanism.common.PacketHandler.Transmission; import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.network.PacketTileEntity; import mekanism.common.util.ChargeUtils; @@ -93,7 +92,7 @@ public class TileEntityRotaryCondensentrator extends TileEntityElectricBlock imp if(updateDelay == 0 && clientActive != isActive) { - PacketHandler.sendPacket(Transmission.ALL_CLIENTS, new PacketTileEntity().setParams(Coord4D.get(this), getNetworkedData(new ArrayList()))); + Mekanism.packetPipeline.sendToAll(new PacketTileEntity(Coord4D.get(this), getNetworkedData(new ArrayList()))); } } @@ -290,7 +289,7 @@ public class TileEntityRotaryCondensentrator extends TileEntityElectricBlock imp for(EntityPlayer player : playersUsing) { - PacketHandler.sendPacket(Transmission.SINGLE_CLIENT, new PacketTileEntity().setParams(Coord4D.get(this), getNetworkedData(new ArrayList())), player); + Mekanism.packetPipeline.sendTo(new PacketTileEntity(Coord4D.get(this), getNetworkedData(new ArrayList())), player); } return; @@ -410,7 +409,7 @@ public class TileEntityRotaryCondensentrator extends TileEntityElectricBlock imp if(clientActive != active && updateDelay == 0) { - PacketHandler.sendPacket(Transmission.ALL_CLIENTS, new PacketTileEntity().setParams(Coord4D.get(this), getNetworkedData(new ArrayList()))); + Mekanism.packetPipeline.sendToAll(new PacketTileEntity(Coord4D.get(this), getNetworkedData(new ArrayList()))); updateDelay = 10; clientActive = active; diff --git a/src/main/java/mekanism/common/tile/TileEntitySalinationController.java b/src/main/java/mekanism/common/tile/TileEntitySalinationController.java index 8b1dd7c2a..c3e40caeb 100644 --- a/src/main/java/mekanism/common/tile/TileEntitySalinationController.java +++ b/src/main/java/mekanism/common/tile/TileEntitySalinationController.java @@ -8,7 +8,6 @@ import mekanism.api.Coord4D; import mekanism.api.ISalinationSolar; import mekanism.common.IConfigurable; import mekanism.common.PacketHandler; -import mekanism.common.PacketHandler.Transmission; import mekanism.common.network.PacketTileEntity; import mekanism.common.tank.TankUpdateProtocol; import mekanism.common.util.MekanismUtils; @@ -115,7 +114,7 @@ public class TileEntitySalinationController extends TileEntitySalinationTank imp { if(Math.abs((float)waterTank.getFluidAmount()/waterTank.getCapacity()-prevScale) > 0.01) { - PacketHandler.sendPacket(Transmission.CLIENTS_RANGE, new PacketTileEntity().setParams(Coord4D.get(this), getNetworkedData(new ArrayList())), Coord4D.get(this), 50D); + Mekanism.packetPipeline.sendToAllAround(new PacketTileEntity(Coord4D.get(this), getNetworkedData(new ArrayList())), Coord4D.get(this), 50D); prevScale = (float)waterTank.getFluidAmount()/waterTank.getCapacity(); } } @@ -151,7 +150,7 @@ public class TileEntitySalinationController extends TileEntitySalinationTank imp if(structured != prev) { - PacketHandler.sendPacket(Transmission.CLIENTS_RANGE, new PacketTileEntity().setParams(Coord4D.get(this), getNetworkedData(new ArrayList())), Coord4D.get(this), 50D); + Mekanism.packetPipeline.sendToAllAround(new PacketTileEntity(Coord4D.get(this), getNetworkedData(new ArrayList())), Coord4D.get(this), 50D); } if(structured) @@ -208,7 +207,7 @@ public class TileEntitySalinationController extends TileEntitySalinationTank imp inventory[2] = null; } - onInventoryChanged(); + markDirty(); } else if(tempStack.isItemEqual(inventory[3]) && tempStack.getMaxStackSize() > inventory[3].stackSize) { @@ -222,7 +221,7 @@ public class TileEntitySalinationController extends TileEntitySalinationTank imp inventory[2] = null; } - onInventoryChanged(); + markDirty(); } } } diff --git a/src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java b/src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java index 4ac65b0b0..31c43b811 100644 --- a/src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java +++ b/src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java @@ -8,7 +8,6 @@ import mekanism.common.IRedstoneControl; import mekanism.common.Mekanism; import mekanism.common.PacketHandler; import mekanism.common.IRedstoneControl.RedstoneControl; -import mekanism.common.PacketHandler.Transmission; import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.network.PacketTileEntity; import mekanism.common.util.ChargeUtils; @@ -60,7 +59,7 @@ public class TileEntitySeismicVibrator extends TileEntityElectricBlock implement if(updateDelay == 0 && clientActive != isActive) { - PacketHandler.sendPacket(Transmission.ALL_CLIENTS, new PacketTileEntity().setParams(Coord4D.get(this), getNetworkedData(new ArrayList()))); + Mekanism.packetPipeline.sendToAll(new PacketTileEntity(Coord4D.get(this), getNetworkedData(new ArrayList()))); } } @@ -145,7 +144,7 @@ public class TileEntitySeismicVibrator extends TileEntityElectricBlock implement if(clientActive != active && updateDelay == 0) { - PacketHandler.sendPacket(Transmission.ALL_CLIENTS, new PacketTileEntity().setParams(Coord4D.get(this), getNetworkedData(new ArrayList()))); + Mekanism.packetPipeline.sendToAll(new PacketTileEntity(Coord4D.get(this), getNetworkedData(new ArrayList()))); updateDelay = 10; clientActive = active; diff --git a/src/main/java/mekanism/common/tile/TileEntityTeleporter.java b/src/main/java/mekanism/common/tile/TileEntityTeleporter.java index 41cc5b5f8..844bf2fc7 100644 --- a/src/main/java/mekanism/common/tile/TileEntityTeleporter.java +++ b/src/main/java/mekanism/common/tile/TileEntityTeleporter.java @@ -10,7 +10,6 @@ import mekanism.api.EnumColor; import mekanism.api.Coord4D; import mekanism.common.Mekanism; import mekanism.common.PacketHandler; -import mekanism.common.PacketHandler.Transmission; import mekanism.common.Teleporter; import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.network.PacketPortalFX; @@ -133,7 +132,7 @@ public class TileEntityTeleporter extends TileEntityElectricBlock implements IPe if(shouldRender != prevShouldRender) { - PacketHandler.sendPacket(Transmission.CLIENTS_RANGE, new PacketTileEntity().setParams(Coord4D.get(this), getNetworkedData(new ArrayList())), Coord4D.get(this), 40D); + Mekanism.packetPipeline.sendToAllAround(new PacketTileEntity(Coord4D.get(this), getNetworkedData(new ArrayList())), Coord4D.get(this), 40D); } prevShouldRender = shouldRender; @@ -281,7 +280,7 @@ public class TileEntityTeleporter extends TileEntityElectricBlock implements IPe for(Coord4D coords : Mekanism.teleporters.get(code)) { - PacketHandler.sendPacket(Transmission.CLIENTS_RANGE, new PacketPortalFX().setParams(coords), coords, 40D); + Mekanism.packetPipeline.sendToAllAround(new PacketPortalFX(coords), coords, 40D); } setEnergy(getEnergy() - calculateEnergyCost(entity, closestCoords)); diff --git a/src/main/java/mekanism/common/tile/component/TileComponentEjector.java b/src/main/java/mekanism/common/tile/component/TileComponentEjector.java index eb16ad7c1..d1cd1fd55 100644 --- a/src/main/java/mekanism/common/tile/component/TileComponentEjector.java +++ b/src/main/java/mekanism/common/tile/component/TileComponentEjector.java @@ -143,7 +143,7 @@ public class TileComponentEjector implements ITileComponent, IEjector } tileEntity.inventory[slotID] = stack; - tileEntity.onInventoryChanged(); + tileEntity.markDirty(); } tickDelay = 20; diff --git a/src/main/java/mekanism/common/tile/component/TileComponentUpgrade.java b/src/main/java/mekanism/common/tile/component/TileComponentUpgrade.java index fa074921f..990454304 100644 --- a/src/main/java/mekanism/common/tile/component/TileComponentUpgrade.java +++ b/src/main/java/mekanism/common/tile/component/TileComponentUpgrade.java @@ -64,7 +64,7 @@ public class TileComponentUpgrade implements ITileComponent tileEntity.inventory[upgradeSlot] = null; } - tileEntity.onInventoryChanged(); + tileEntity.markDirty(); } } else if(tileEntity.inventory[upgradeSlot].isItemEqual(new ItemStack(Mekanism.SpeedUpgrade)) && speedMultiplier < 8) @@ -85,7 +85,7 @@ public class TileComponentUpgrade implements ITileComponent tileEntity.inventory[upgradeSlot] = null; } - tileEntity.onInventoryChanged(); + tileEntity.markDirty(); } } else { diff --git a/src/main/java/mekanism/common/util/MekanismUtils.java b/src/main/java/mekanism/common/util/MekanismUtils.java index 40b3088a9..afa9b8019 100644 --- a/src/main/java/mekanism/common/util/MekanismUtils.java +++ b/src/main/java/mekanism/common/util/MekanismUtils.java @@ -29,7 +29,6 @@ import mekanism.common.IRedstoneControl.RedstoneControl; import mekanism.common.Mekanism; import mekanism.common.OreDictCache; import mekanism.common.PacketHandler; -import mekanism.common.PacketHandler.Transmission; import mekanism.common.Teleporter; import mekanism.common.Tier.EnergyCubeTier; import mekanism.common.Tier.FactoryTier; @@ -56,6 +55,7 @@ import net.minecraft.item.crafting.CraftingManager; import net.minecraft.item.crafting.IRecipe; import net.minecraft.network.packet.Packet3Chat; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.ChatComponentText; import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; @@ -104,28 +104,28 @@ public final class MekanismUtils if(Version.get(Mekanism.latestVersionNumber).comparedState(Mekanism.versionNumber) == 1 || !list.isEmpty()) { - entityplayer.addChatMessage(EnumColor.GREY + "------------- " + EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " -------------"); - entityplayer.addChatMessage(EnumColor.GREY + " Using outdated version on one or more modules."); + entityplayer.addChatMessage(new ChatComponentText(EnumColor.GREY + "------------- " + EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " -------------")); + entityplayer.addChatMessage(new ChatComponentText(EnumColor.GREY + " Using outdated version on one or more modules.")); if(Version.get(Mekanism.latestVersionNumber).comparedState(Mekanism.versionNumber) == 1) { - entityplayer.addChatMessage(EnumColor.INDIGO + " Mekanism: " + EnumColor.DARK_RED + Mekanism.versionNumber); + entityplayer.addChatMessage(new ChatComponentText(EnumColor.INDIGO + " Mekanism: " + EnumColor.DARK_RED + Mekanism.versionNumber)); } for(IModule module : list) { - entityplayer.addChatMessage(EnumColor.INDIGO + " Mekanism" + module.getName() + ": " + EnumColor.DARK_RED + module.getVersion()); + entityplayer.addChatMessage(new ChatComponentText(EnumColor.INDIGO + " Mekanism" + module.getName() + ": " + EnumColor.DARK_RED + module.getVersion())); } - entityplayer.addChatMessage(EnumColor.GREY + " Consider updating to version " + EnumColor.DARK_GREY + Mekanism.latestVersionNumber); - entityplayer.addChatMessage(EnumColor.GREY + " New features: " + EnumColor.INDIGO + Mekanism.recentNews); - entityplayer.addChatMessage(EnumColor.GREY + " Visit " + EnumColor.DARK_GREY + "aidancbrady.com/mekanism" + EnumColor.GREY + " to download."); - entityplayer.addChatMessage(EnumColor.GREY + "------------- " + EnumColor.DARK_BLUE + "[=======]" + EnumColor.GREY + " -------------"); + entityplayer.addChatMessage(new ChatComponentText(EnumColor.GREY + " Consider updating to version " + EnumColor.DARK_GREY + Mekanism.latestVersionNumber)); + entityplayer.addChatMessage(new ChatComponentText(EnumColor.GREY + " New features: " + EnumColor.INDIGO + Mekanism.recentNews)); + entityplayer.addChatMessage(new ChatComponentText(EnumColor.GREY + " Visit " + EnumColor.DARK_GREY + "aidancbrady.com/mekanism" + EnumColor.GREY + " to download.")); + entityplayer.addChatMessage(new ChatComponentText(EnumColor.GREY + "------------- " + EnumColor.DARK_BLUE + "[=======]" + EnumColor.GREY + " -------------")); return true; } else if(Version.get(Mekanism.latestVersionNumber).comparedState(Mekanism.versionNumber) == -1) { - entityplayer.addChatMessage(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.GREY + "Using developer build " + EnumColor.DARK_GREY + Mekanism.versionNumber); + entityplayer.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.GREY + "Using developer build " + EnumColor.DARK_GREY + Mekanism.versionNumber)); return true; } } @@ -855,10 +855,10 @@ public final class MekanismUtils if(isBlock) { - PacketHandler.sendPacket(Transmission.SINGLE_CLIENT, new PacketElectricChest().setParams(ElectricChestPacketType.CLIENT_OPEN, 0, id, true, Coord4D.get(tileEntity)), player); + Mekanism.packetPipeline.sendTo(new PacketElectricChest(ElectricChestPacketType.CLIENT_OPEN, 0, id, true, Coord4D.get(tileEntity)), player); } else { - PacketHandler.sendPacket(Transmission.SINGLE_CLIENT, new PacketElectricChest().setParams(ElectricChestPacketType.CLIENT_OPEN, 0, id, false), player); + Mekanism.packetPipeline.sendTo(new PacketElectricChest(ElectricChestPacketType.CLIENT_OPEN, 0, id, false), player); } player.openContainer = new ContainerElectricChest(player.inventory, tileEntity, inventory, isBlock); diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java index a5ccfcbe5..5e887d6fa 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java @@ -9,7 +9,6 @@ import mekanism.common.IActiveState; import mekanism.common.IRedstoneControl; import mekanism.common.Mekanism; import mekanism.common.PacketHandler; -import mekanism.common.PacketHandler.Transmission; import mekanism.common.network.PacketTileEntity; import mekanism.common.tile.TileEntityElectricBlock; import mekanism.common.util.CableUtils; @@ -90,7 +89,7 @@ public abstract class TileEntityGenerator extends TileEntityElectricBlock implem if(updateDelay == 0 && clientActive != isActive) { clientActive = isActive; - PacketHandler.sendPacket(Transmission.ALL_CLIENTS, new PacketTileEntity().setParams(Coord4D.get(this), getNetworkedData(new ArrayList()))); + Mekanism.packetPipeline.sendToAll(new PacketTileEntity(Coord4D.get(this), getNetworkedData(new ArrayList()))); } } @@ -149,7 +148,7 @@ public abstract class TileEntityGenerator extends TileEntityElectricBlock implem if(clientActive != active && updateDelay == 0) { - PacketHandler.sendPacket(Transmission.ALL_CLIENTS, new PacketTileEntity().setParams(Coord4D.get(this), getNetworkedData(new ArrayList()))); + Mekanism.packetPipeline.sendToAll(new PacketTileEntity(Coord4D.get(this), getNetworkedData(new ArrayList()))); updateDelay = Mekanism.UPDATE_DELAY; clientActive = active;