From bd83138a7a3ee886e38877407217c94eee59d7c6 Mon Sep 17 00:00:00 2001 From: cp Date: Sat, 1 Mar 2014 22:29:38 +0800 Subject: [PATCH] Transceiver compiling. --- .../java/crazypants/enderio/ClientProxy.java | 10 +- src/main/java/crazypants/enderio/EnderIO.java | 61 ++++++------ .../machine/hypercube/BlockHyperCube.java | 92 +++++++------------ .../machine/hypercube/CompositeInventory.java | 22 ++--- .../machine/hypercube/GuiHyperCube.java | 86 ++++++++--------- .../machine/hypercube/HyperCubeModel.java | 7 +- .../machine/hypercube/HyperCubeRegister.java | 49 +--------- .../machine/hypercube/HyperCubeRenderer.java | 2 +- .../machine/hypercube/ItemRecieveBuffer.java | 2 +- .../machine/hypercube/TileHyperCube.java | 53 +++++------ 10 files changed, 158 insertions(+), 226 deletions(-) diff --git a/src/main/java/crazypants/enderio/ClientProxy.java b/src/main/java/crazypants/enderio/ClientProxy.java index bff6dfb2..e3e141d4 100644 --- a/src/main/java/crazypants/enderio/ClientProxy.java +++ b/src/main/java/crazypants/enderio/ClientProxy.java @@ -13,6 +13,8 @@ import cpw.mods.fml.client.registry.RenderingRegistry; import cpw.mods.fml.common.FMLCommonHandler; import crazypants.enderio.enderface.EnderIoRenderer; import crazypants.enderio.enderface.TileEnderIO; +import crazypants.enderio.machine.hypercube.HyperCubeRenderer; +import crazypants.enderio.machine.hypercube.TileHyperCube; import crazypants.enderio.machine.light.BlockElectricLight; import crazypants.enderio.machine.light.ElectricLightRenderer; import crazypants.enderio.machine.painter.BlockPaintedFenceGate; @@ -143,10 +145,10 @@ public class ClientProxy extends CommonProxy { MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockEnderIo), eior); ClientRegistry.bindTileEntitySpecialRenderer(TileReservoir.class, new ReservoirRenderer(EnderIO.blockReservoir)); - // - // HyperCubeRenderer hcr = new HyperCubeRenderer(); - // ClientRegistry.bindTileEntitySpecialRenderer(TileHyperCube.class, hcr); - // MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockHyperCube), hcr); + + HyperCubeRenderer hcr = new HyperCubeRenderer(); + ClientRegistry.bindTileEntitySpecialRenderer(TileHyperCube.class, hcr); + MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockHyperCube), hcr); // new YetaWrenchOverlayRenderer(EnderIO.itemYetaWench); // // Tick handler diff --git a/src/main/java/crazypants/enderio/EnderIO.java b/src/main/java/crazypants/enderio/EnderIO.java index b70b6a0d..3000aff3 100644 --- a/src/main/java/crazypants/enderio/EnderIO.java +++ b/src/main/java/crazypants/enderio/EnderIO.java @@ -17,11 +17,14 @@ import cpw.mods.fml.common.event.FMLServerStoppedEvent; import cpw.mods.fml.common.network.NetworkRegistry; import crazypants.enderio.enderface.BlockEnderIO; import crazypants.enderio.enderface.ItemEnderface; +import crazypants.enderio.machine.MachineRecipes; import crazypants.enderio.machine.alloy.AlloyRecipeManager; import crazypants.enderio.machine.alloy.BlockAlloySmelter; import crazypants.enderio.machine.crusher.BlockCrusher; import crazypants.enderio.machine.crusher.CrusherRecipeManager; import crazypants.enderio.machine.generator.BlockStirlingGenerator; +import crazypants.enderio.machine.hypercube.BlockHyperCube; +import crazypants.enderio.machine.hypercube.HyperCubeRegister; import crazypants.enderio.machine.light.BlockElectricLight; import crazypants.enderio.machine.light.BlockLightNode; import crazypants.enderio.machine.monitor.BlockPowerMonitor; @@ -106,7 +109,7 @@ public class EnderIO { public static BlockAlloySmelter blockAlloySmelter; public static BlockCapacitorBank blockCapacitorBank; public static BlockCrusher blockCrusher; - // public static BlockHyperCube blockHyperCube; + public static BlockHyperCube blockHyperCube; public static BlockPowerMonitor blockPowerMonitor; public static BlockElectricLight blockElectricLight; @@ -130,19 +133,17 @@ public class EnderIO { // ConduitGeometryUtil.setupBounds((float) Config.conduitScale); - itemBasicCapacitor = ItemCapacitor.create(); - itemAlloy = ItemAlloy.create(); - blockFusedQuartz = BlockFusedQuartz.create(); - itemFusedQuartzFrame = ItemFusedQuartzFrame.create(); - itemMachinePart = ItemMachinePart.create(); - itemPowderIngot = ItemPowderIngot.create(); - itemMaterial = ItemMaterial.create(); - blockEnderIo = BlockEnderIO.create(); - itemEnderface = ItemEnderface.create(); blockTravelPlatform = BlockTravelAnchor.create(); - itemTravelStaff = ItemTravelStaff.create(); + + blockSolarPanel = BlockSolarPanel.create(); + blockStirlingGenerator = BlockStirlingGenerator.create(); + + blockCrusher = BlockCrusher.create(); + blockAlloySmelter = BlockAlloySmelter.create(); + blockPowerMonitor = BlockPowerMonitor.create(); + blockCapacitorBank = BlockCapacitorBank.create(); blockPainter = BlockPainter.create(); blockPaintedFence = BlockPaintedFence.create(); @@ -154,16 +155,20 @@ public class EnderIO { blockPaintedSlab.init(); blockPaintedDoubleSlab.init(); - blockStirlingGenerator = BlockStirlingGenerator.create(); - blockSolarPanel = BlockSolarPanel.create(); + blockHyperCube = BlockHyperCube.create(); + blockElectricLight = BlockElectricLight.create(); + blockLightNode = BlockLightNode.create(); blockReservoir = BlockReservoir.create(); - blockAlloySmelter = BlockAlloySmelter.create(); - blockCapacitorBank = BlockCapacitorBank.create(); - blockCrusher = BlockCrusher.create(); - blockPowerMonitor = BlockPowerMonitor.create(); - // blockHyperCube = BlockHyperCube.create(); - // + blockFusedQuartz = BlockFusedQuartz.create(); + itemFusedQuartzFrame = ItemFusedQuartzFrame.create(); + + itemBasicCapacitor = ItemCapacitor.create(); + itemMachinePart = ItemMachinePart.create(); + itemMaterial = ItemMaterial.create(); + itemAlloy = ItemAlloy.create(); + itemPowderIngot = ItemPowderIngot.create(); + // blockConduitBundle = BlockConduitBundle.create(); // blockConduitFacade = BlockConduitFacade.create(); // itemConduitFacade = ItemConduitFacade.create(); @@ -174,10 +179,10 @@ public class EnderIO { // itemItemConduit = ItemItemConduit.create(); // itemMeConduit = ItemMeConduit.create(); // - blockElectricLight = BlockElectricLight.create(); - blockLightNode = BlockLightNode.create(); - // - // itemYetaWench = ItemYetaWrench.create(); + + // itemYetaWench = ItemYetaWrench.create(); + itemEnderface = ItemEnderface.create(); + itemTravelStaff = ItemTravelStaff.create(); itemMJReader = ItemMJReader.create(); MaterialRecipes.registerOresInDictionary(); @@ -223,7 +228,7 @@ public class EnderIO { // EnderfaceRecipes.addRecipes(); MaterialRecipes.addRecipes(); // ConduitRecipes.addRecipes(); - // MachineRecipes.addRecipes(); + MachineRecipes.addRecipes(); // ItemRecipes.addRecipes(); TeleportRecipes.addRecipes(); @@ -232,7 +237,6 @@ public class EnderIO { // triggerFullEnergy = new TriggerEnderIO("enderIO.trigger.fullEnergy", 2); // triggerIsCharging = new TriggerEnderIO("enderIO.trigger.isCharging", 3); // triggerFinishedCharging = new TriggerEnderIO("enderIO.trigger.finishedCharging", 4); - // ActionManager.registerTriggerProvider(new TriggerProviderEIO()); proxy.load(); @@ -245,7 +249,7 @@ public class EnderIO { packetPipeline.postInitialise(); MaterialRecipes.registerExternalOresInDictionary(); MaterialRecipes.addOreDictionaryRecipes(); - // MachineRecipes.addOreDictionaryRecipes(); + MachineRecipes.addOreDictionaryRecipes(); // ConduitRecipes.addOreDictionaryRecipes(); CrusherRecipeManager.getInstance().loadRecipesFromConfig(); @@ -254,12 +258,11 @@ public class EnderIO { @EventHandler public void serverStarted(FMLServerStartedEvent event) { - System.out.println("EnderIO.serverStarted: "); - // HyperCubeRegister.load(); + HyperCubeRegister.load(); } @EventHandler public void serverStopped(FMLServerStoppedEvent event) { - // HyperCubeRegister.unload(); + HyperCubeRegister.unload(); } } diff --git a/src/main/java/crazypants/enderio/machine/hypercube/BlockHyperCube.java b/src/main/java/crazypants/enderio/machine/hypercube/BlockHyperCube.java index 155fc2ef..e6f556ff 100644 --- a/src/main/java/crazypants/enderio/machine/hypercube/BlockHyperCube.java +++ b/src/main/java/crazypants/enderio/machine/hypercube/BlockHyperCube.java @@ -5,8 +5,6 @@ import java.util.ArrayList; import java.util.Random; import net.minecraft.block.Block; -import net.minecraft.block.ITileEntityProvider; -import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; @@ -19,29 +17,25 @@ import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import buildcraft.api.tools.IToolWrench; import cpw.mods.fml.common.network.IGuiHandler; -import cpw.mods.fml.common.network.NetworkRegistry; -import cpw.mods.fml.common.registry.GameRegistry; import crazypants.enderio.EnderIO; -import crazypants.enderio.EnderIOTab; import crazypants.enderio.GuiHandler; import crazypants.enderio.ModObject; -import crazypants.enderio.PacketHandler; -import crazypants.enderio.conduit.ConduitUtil; +import crazypants.enderio.enderface.BlockEio; import crazypants.enderio.machine.hypercube.TileHyperCube.IoMode; import crazypants.enderio.machine.hypercube.TileHyperCube.SubChannel; import crazypants.enderio.power.PowerHandlerUtil; import crazypants.util.Util; -public class BlockHyperCube extends Block implements ITileEntityProvider, IGuiHandler { +public class BlockHyperCube extends BlockEio implements IGuiHandler { static final NumberFormat NF = NumberFormat.getIntegerInstance(); public static BlockHyperCube create() { - HyperCubePacketHandler pp = new HyperCubePacketHandler(); - PacketHandler.instance.addPacketProcessor(pp); - NetworkRegistry.instance().registerConnectionHandler(pp); + //TODO:1.7 + // HyperCubePacketHandler pp = new HyperCubePacketHandler(); + // PacketHandler.instance.addPacketProcessor(pp); + // NetworkRegistry.instance().registerConnectionHandler(pp); BlockHyperCube result = new BlockHyperCube(); result.init(); @@ -49,17 +43,13 @@ public class BlockHyperCube extends Block implements ITileEntityProvider, IGuiHa } private BlockHyperCube() { - super(ModObject.blockHyperCube.id, Material.ground); - setHardness(0.5F); - setStepSound(Block.soundMetalFootstep); - setUnlocalizedName("enderio." + ModObject.blockHyperCube.name()); - setCreativeTab(EnderIOTab.tabEnderIO); - setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F); + super(ModObject.blockHyperCube.unlocalisedName, TileHyperCube.class); + } - private void init() { - GameRegistry.registerBlock(this, ModObject.blockHyperCube.unlocalisedName); - GameRegistry.registerTileEntity(TileHyperCube.class, ModObject.blockHyperCube.unlocalisedName + "TileEntity"); + @Override + protected void init() { + super.init(); EnderIO.guiHandler.registerGuiHandler(GuiHandler.GUI_ID_HYPER_CUBE, this); } @@ -68,12 +58,12 @@ public class BlockHyperCube extends Block implements ITileEntityProvider, IGuiHa } @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; } @Override - public void registerIcons(IIconRegister IIconRegister) { + public void registerBlockIcons(IIconRegister IIconRegister) { blockIcon = IIconRegister.registerIcon("enderio:tesseractPortal"); } @@ -92,16 +82,6 @@ public class BlockHyperCube extends Block implements ITileEntityProvider, IGuiHa return false; } - @Override - public TileEntity createNewTileEntity(World world) { - return null; - } - - @Override - public TileEntity createTileEntity(World world, int metadata) { - return new TileHyperCube(); - } - @Override public int getLightValue(IBlockAccess world, int x, int y, int z) { return 8; @@ -117,16 +97,17 @@ public class BlockHyperCube extends Block implements ITileEntityProvider, IGuiHa } @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 blockId) { if(world.isRemote) { return; } TileHyperCube te = (TileHyperCube) world.getTileEntity(x, y, z); te.onNeighborBlockChange(); + } @Override - public ArrayList getBlockDropped(World world, int x, int y, int z, int metadata, int fortune) { + public ArrayList getDrops(World world, int x, int y, int z, int metadata, int fortune) { ArrayList ret = new ArrayList(); if(!world.isRemote) { TileEntity te = world.getTileEntity(x, y, z); @@ -134,7 +115,7 @@ public class BlockHyperCube extends Block implements ITileEntityProvider, IGuiHa TileHyperCube hc = (TileHyperCube) te; hc.onBreakBlock(); ItemStack itemStack = new ItemStack(this); - PowerHandlerUtil.setStoredEnergyForItem(itemStack, hc.getInternalPowerHandler().getEnergyStored()); + PowerHandlerUtil.setStoredEnergyForItem(itemStack, (float) hc.getInternalPowerHandler().getEnergyStored()); setChannelOnItem(hc, itemStack); setIoOnItem(hc, itemStack); ret.add(itemStack); @@ -213,14 +194,14 @@ public class BlockHyperCube extends Block implements ITileEntityProvider, IGuiHa } @Override - public boolean removeBlockByPlayer(World world, EntityPlayer player, int x, int y, int z) { + public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z) { if(!world.isRemote) { TileEntity te = world.getTileEntity(x, y, z); if(te instanceof TileHyperCube) { TileHyperCube hc = (TileHyperCube) te; hc.onBreakBlock(); ItemStack itemStack = new ItemStack(this); - PowerHandlerUtil.setStoredEnergyForItem(itemStack, hc.getInternalPowerHandler().getEnergyStored()); + PowerHandlerUtil.setStoredEnergyForItem(itemStack, (float) hc.getInternalPowerHandler().getEnergyStored()); setChannelOnItem(hc, itemStack); setIoOnItem(hc, itemStack); float f = 0.7F; @@ -236,7 +217,7 @@ public class BlockHyperCube extends Block implements ITileEntityProvider, IGuiHa } } - return super.removeBlockByPlayer(world, player, x, y, z); + return super.removedByPlayer(world, player, x, y, z); } @Override @@ -249,7 +230,7 @@ public class BlockHyperCube extends Block implements ITileEntityProvider, IGuiHa TileHyperCube cb = (TileHyperCube) te; cb.getInternalPowerHandler().setEnergy(PowerHandlerUtil.getStoredEnergyForItem(stack)); if(player instanceof EntityPlayerMP) { - cb.setOwner(((EntityPlayerMP) player).username); + cb.setOwner(((EntityPlayerMP) player).getGameProfile().getId()); } cb.setChannel(getChannelFromItem(stack)); setIoOnTransciever(cb, stack); @@ -257,11 +238,6 @@ public class BlockHyperCube extends Block implements ITileEntityProvider, IGuiHa world.markBlockForUpdate(x, y, z); } - @Override - public int idDropped(int par1, Random par2Random, int par3) { - return 0; - } - @Override public int quantityDropped(Random r) { return 0; @@ -269,19 +245,19 @@ public class BlockHyperCube extends Block implements ITileEntityProvider, IGuiHa @Override public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer entityPlayer, int par6, float par7, float par8, float par9) { - - if(ConduitUtil.isToolEquipped(entityPlayer) && entityPlayer.isSneaking()) { - if(entityPlayer.getCurrentEquippedItem().getItem() instanceof IToolWrench) { - IToolWrench wrench = (IToolWrench) entityPlayer.getCurrentEquippedItem().getItem(); - if(wrench.canWrench(entityPlayer, x, y, z)) { - removeBlockByPlayer(world, entityPlayer, x, y, z); - if(entityPlayer.getCurrentEquippedItem().getItem() instanceof IToolWrench) { - ((IToolWrench) entityPlayer.getCurrentEquippedItem().getItem()).wrenchUsed(entityPlayer, x, y, z); - } - return true; - } - } - } + //TODO:1.7 + // if(ConduitUtil.isToolEquipped(entityPlayer) && entityPlayer.isSneaking()) { + // if(entityPlayer.getCurrentEquippedItem().getItem() instanceof IToolWrench) { + // IToolWrench wrench = (IToolWrench) entityPlayer.getCurrentEquippedItem().getItem(); + // if(wrench.canWrench(entityPlayer, x, y, z)) { + // removeBlockByPlayer(world, entityPlayer, x, y, z); + // if(entityPlayer.getCurrentEquippedItem().getItem() instanceof IToolWrench) { + // ((IToolWrench) entityPlayer.getCurrentEquippedItem().getItem()).wrenchUsed(entityPlayer, x, y, z); + // } + // return true; + // } + // } + // } if(entityPlayer.isSneaking()) { return false; } diff --git a/src/main/java/crazypants/enderio/machine/hypercube/CompositeInventory.java b/src/main/java/crazypants/enderio/machine/hypercube/CompositeInventory.java index ac218df9..3056f6c7 100644 --- a/src/main/java/crazypants/enderio/machine/hypercube/CompositeInventory.java +++ b/src/main/java/crazypants/enderio/machine/hypercube/CompositeInventory.java @@ -144,10 +144,10 @@ public class CompositeInventory implements ISidedInventory { } @Override - public void onInventoryChanged() { + public void markDirty() { for (InvEntry inv : inventories) { if(inv != null) { - inv.inv.onInventoryChanged(); + inv.inv.markDirty(); } } } @@ -155,13 +155,8 @@ public class CompositeInventory implements ISidedInventory { //---------------- Inventory @Override - public String getInvName() { - return ModObject.blockHyperCube.name; - } - - @Override - public boolean isInvNameLocalized() { - return false; + public String getInventoryName() { + return ModObject.blockHyperCube.unlocalisedName; } @Override @@ -175,11 +170,11 @@ public class CompositeInventory implements ISidedInventory { } @Override - public void openChest() { + public void openInventory() { } @Override - public void closeChest() { + public void closeInventory() { } @Override @@ -187,6 +182,11 @@ public class CompositeInventory implements ISidedInventory { return null; } + @Override + public boolean hasCustomInventoryName() { + return false; + } + private static class InvEntry { IInventory origInv; ISidedInventory inv; diff --git a/src/main/java/crazypants/enderio/machine/hypercube/GuiHyperCube.java b/src/main/java/crazypants/enderio/machine/hypercube/GuiHyperCube.java index 57561e41..64499c96 100644 --- a/src/main/java/crazypants/enderio/machine/hypercube/GuiHyperCube.java +++ b/src/main/java/crazypants/enderio/machine/hypercube/GuiHyperCube.java @@ -8,17 +8,13 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiTextField; -import net.minecraft.network.packet.Packet; import org.lwjgl.opengl.GL11; -import cpw.mods.fml.common.network.PacketDispatcher; import crazypants.enderio.gui.IconButtonEIO; import crazypants.enderio.gui.IconEIO; import crazypants.enderio.gui.RedstoneModeButton; import crazypants.enderio.gui.ToggleButtonEIO; -import crazypants.enderio.machine.IRedstoneModeControlable; -import crazypants.enderio.machine.RedstoneControlMode; import crazypants.enderio.machine.hypercube.TileHyperCube.IoMode; import crazypants.enderio.machine.hypercube.TileHyperCube.SubChannel; import crazypants.enderio.machine.power.PowerDisplayUtil; @@ -122,25 +118,27 @@ public class GuiHyperCube extends GuiScreenBase { fluidB = new IconButtonEIO(this, FLUID_MODE_BUTTON_ID, x, y, IconEIO.WRENCH_OVERLAY_FLUID); fluidB.setIconMargin(3, 3); + //TODO:1.7 x += 24; - rsB = new RedstoneModeButton(this, 99, x, y, new IRedstoneModeControlable() { - - @Override - public void setRedstoneControlMode(RedstoneControlMode mode) { - RedstoneControlMode curMode = getRedstoneControlMode(); - cube.setRedstoneControlMode(mode); - if(curMode != mode) { - Packet pkt = HyperCubePacketHandler.createRedstonePacket(cube); - PacketDispatcher.sendPacketToServer(pkt); - } - - } - - @Override - public RedstoneControlMode getRedstoneControlMode() { - return cube.getRedstoneControlMode(); - } - }); + // rsB = new RedstoneModeButton(this, 99, x, y, new IRedstoneModeControlable() { + // + // @Override + // public void setRedstoneControlMode(RedstoneControlMode mode) { + // RedstoneControlMode curMode = getRedstoneControlMode(); + // cube.setRedstoneControlMode(mode); + // if(curMode != mode) { + // Packet pkt = HyperCubePacketHandler.createRedstonePacket(cube); + // PacketDispatcher.sendPacketToServer(pkt); + // } + // + // } + // + // @Override + // public RedstoneControlMode getRedstoneControlMode() { + // return cube.getRedstoneControlMode(); + // } + // }); + rsB = new RedstoneModeButton(this, 99, x, y, IconEIO.REDSTONE_MODE_ALWAYS); updateIoButtons(); @@ -232,7 +230,7 @@ public class GuiHyperCube extends GuiScreenBase { y = guiTop + 12; x = guiLeft + 8; - newChannelTF = new GuiTextField(fontRenderer, x, y, 103, 16); + newChannelTF = new GuiTextField(getFontRenderer(), x, y, 103, 16); newChannelTF.setCanLoseFocus(false); newChannelTF.setMaxStringLength(32); newChannelTF.setFocused(true); @@ -265,9 +263,9 @@ public class GuiHyperCube extends GuiScreenBase { cube.setModeForChannel(SubChannel.FLUID, nextMode); updateIoButtons(); - - Packet pkt = HyperCubePacketHandler.createIoModePacket(cube); - PacketDispatcher.sendPacketToServer(pkt); + //TODO:1.7 + // Packet pkt = HyperCubePacketHandler.createIoModePacket(cube); + // PacketDispatcher.sendPacketToServer(pkt); } else if(par1GuiButton.id == POWER_MODE_BUTTON_ID) { @@ -276,9 +274,9 @@ public class GuiHyperCube extends GuiScreenBase { cube.setModeForChannel(SubChannel.POWER, nextMode); updateIoButtons(); - - Packet pkt = HyperCubePacketHandler.createIoModePacket(cube); - PacketDispatcher.sendPacketToServer(pkt); + //TODO:1.7 + // Packet pkt = HyperCubePacketHandler.createIoModePacket(cube); + // PacketDispatcher.sendPacketToServer(pkt); } else if(par1GuiButton.id == ITEM_MODE_BUTTON_ID) { @@ -287,21 +285,22 @@ public class GuiHyperCube extends GuiScreenBase { cube.setModeForChannel(SubChannel.ITEM, nextMode); updateIoButtons(); - - Packet pkt = HyperCubePacketHandler.createIoModePacket(cube); - PacketDispatcher.sendPacketToServer(pkt); + //TODO:1.7 + // Packet pkt = HyperCubePacketHandler.createIoModePacket(cube); + // PacketDispatcher.sendPacketToServer(pkt); } else if(par1GuiButton.id == ADD_BUTTON_ID) { Channel c; if(privateButton.isSelected()) { - c = new Channel(newChannelTF.getText(), Minecraft.getMinecraft().thePlayer.username); + c = new Channel(newChannelTF.getText(), Minecraft.getMinecraft().thePlayer.getGameProfile().getId()); } else { c = new Channel(newChannelTF.getText(), null); } ClientChannelRegister.instance.addChannel(c); - Packet pkt = HyperCubePacketHandler.createAddRemoveChannelPacket(c, true); - PacketDispatcher.sendPacketToServer(pkt); + //TODO:1.7 + // Packet pkt = HyperCubePacketHandler.createAddRemoveChannelPacket(c, true); + // PacketDispatcher.sendPacketToServer(pkt); setActiveChannel(c); @@ -323,8 +322,9 @@ public class GuiHyperCube extends GuiScreenBase { setActiveChannel(null); } ClientChannelRegister.instance.channelRemoved(c); - Packet pkt = HyperCubePacketHandler.createAddRemoveChannelPacket(c, false); - PacketDispatcher.sendPacketToServer(pkt); + //TODO:1.7 + // Packet pkt = HyperCubePacketHandler.createAddRemoveChannelPacket(c, false); + // PacketDispatcher.sendPacketToServer(pkt); } } @@ -334,8 +334,10 @@ public class GuiHyperCube extends GuiScreenBase { cube.setChannel(c); publicChannelList.setActiveChannel(isPublic(c) ? c : null); privateChannelList.setActiveChannel(isPrivate(c) ? c : null); - Packet pkt = HyperCubePacketHandler.createChannelSelectedPacket(cube, c); - PacketDispatcher.sendPacketToServer(pkt); + //TODO:1.7 + // Packet pkt = HyperCubePacketHandler.createChannelSelectedPacket(cube, c); + // PacketDispatcher.sendPacketToServer(pkt); + } @Override @@ -395,10 +397,10 @@ public class GuiHyperCube extends GuiScreenBase { int x = guiLeft + 12; int y = guiTop + 35; int rgb = ColorUtil.getRGB(Color.white); - drawString(fontRenderer, Lang.localize("gui.trans.publicHeading"), x, y, rgb); + drawString(getFontRenderer(), Lang.localize("gui.trans.publicHeading"), x, y, rgb); x += 109; - drawString(fontRenderer, Lang.localize("gui.trans.privateHeading"), x, y, rgb); + drawString(getFontRenderer(), Lang.localize("gui.trans.privateHeading"), x, y, rgb); IoMode fluidMode = cube.getModeForChannel(SubChannel.FLUID); IoMode powerMode = cube.getModeForChannel(SubChannel.POWER); @@ -458,7 +460,7 @@ public class GuiHyperCube extends GuiScreenBase { @Override public FontRenderer getFontRenderer() { - return fontRenderer; + return Minecraft.getMinecraft().fontRenderer; } } diff --git a/src/main/java/crazypants/enderio/machine/hypercube/HyperCubeModel.java b/src/main/java/crazypants/enderio/machine/hypercube/HyperCubeModel.java index fe6f10d5..bad7a020 100644 --- a/src/main/java/crazypants/enderio/machine/hypercube/HyperCubeModel.java +++ b/src/main/java/crazypants/enderio/machine/hypercube/HyperCubeModel.java @@ -1,6 +1,7 @@ package crazypants.enderio.machine.hypercube; import net.minecraft.client.model.ModelBase; +import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.AdvancedModelLoader; import net.minecraftforge.client.model.IModelCustom; @@ -13,13 +14,13 @@ public class HyperCubeModel extends ModelBase implements IModel { public static final float SCALE = 1 / 16f; private static final String TEXTURE = "enderio:models/hyperCube.png"; - //private static final String MODEL = "enderio:models/hyperCube.obj"; - private static final String MODEL = "/assets/enderio/models/hyperCube.obj"; + private static final String MODEL = "enderio:models/hyperCube.obj"; + //private static final String MODEL = "/assets/enderio/models/hyperCube.obj"; private IModelCustom model; public HyperCubeModel() { - model = AdvancedModelLoader.loadModel(MODEL); + model = AdvancedModelLoader.loadModel(new ResourceLocation(MODEL)); } @Override diff --git a/src/main/java/crazypants/enderio/machine/hypercube/HyperCubeRegister.java b/src/main/java/crazypants/enderio/machine/hypercube/HyperCubeRegister.java index 920dec85..8fc203f6 100644 --- a/src/main/java/crazypants/enderio/machine/hypercube/HyperCubeRegister.java +++ b/src/main/java/crazypants/enderio/machine/hypercube/HyperCubeRegister.java @@ -7,9 +7,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import net.minecraftforge.common.Configuration; import net.minecraftforge.common.DimensionManager; -import net.minecraftforge.common.Property; import crazypants.enderio.Log; public class HyperCubeRegister { @@ -42,51 +40,8 @@ public class HyperCubeRegister { private void innerLoad() { File f = DimensionManager.getCurrentSaveRootDirectory(); conf = new HyperCubeConfig(new File(DimensionManager.getCurrentSaveRootDirectory(), "enderio/dimensionalTransceiver.cfg")); - File oldFile = new File(DimensionManager.getCurrentSaveRootDirectory(), "enderio/hypercubes.cfg"); - if(oldFile.exists()) { - convertOldFile(); - } else { - publicChannels.addAll(conf.getPublicChannels()); - userChannels.putAll(conf.getUserChannels()); - } - - } - - private void convertOldFile() { - try { - File oldFile = new File(DimensionManager.getCurrentSaveRootDirectory(), "enderio/hypercubes.cfg"); - Configuration config = new Configuration(oldFile); - config.load(); - - Property pcNamesProp = config.get(CATEGORY_PUBLIC_CHANNELS, "names", new String[] {}); - String[] pcNames = pcNamesProp.getStringList(); - if(pcNames != null) { - for (String name : pcNames) { - publicChannels.add(new Channel(name, null)); - } - } - Property userNamesProp = config.get(CATEGORY_PRIVATE_CHANNELS, "users", new String[] {}); - String[] userNames = userNamesProp.getStringList(); - if(userNames != null) { - for (String user : userNames) { - Property userChannles = config.get(CATEGORY_PRIVATE_CHANNELS, user + ".channels", new String[] {}); - String[] channelNames = userChannles.getStringList(); - if(channelNames != null && channelNames.length > 0) { - List channels = getChannelsForUser(user); - for (String chanName : channelNames) { - channels.add(new Channel(chanName, user)); - } - } - } - } - - updateConfig(); - - oldFile.renameTo(new File(DimensionManager.getCurrentSaveRootDirectory(), "/enderio/hypercubes.cfg.old")); - } catch (Exception e) { - Log.warn("Could not convert old Dimensional Transciever (hypercube.cfg) to new format. Channles will be reset."); - } - + publicChannels.addAll(conf.getPublicChannels()); + userChannels.putAll(conf.getUserChannels()); } public synchronized List getChannelsForUser(String user) { diff --git a/src/main/java/crazypants/enderio/machine/hypercube/HyperCubeRenderer.java b/src/main/java/crazypants/enderio/machine/hypercube/HyperCubeRenderer.java index 6ac79b23..7925f304 100644 --- a/src/main/java/crazypants/enderio/machine/hypercube/HyperCubeRenderer.java +++ b/src/main/java/crazypants/enderio/machine/hypercube/HyperCubeRenderer.java @@ -48,7 +48,7 @@ public class HyperCubeRenderer extends TileEntitySpecialRenderer implements IIte model.render(cube, x, y, z); if(cube.getInternalPowerHandler().getEnergyStored() > 0) { - renderPower(te.worldObj, x, y, z, cube.getChannel() != null); + renderPower(te.getWorldObj(), x, y, z, cube.getChannel() != null); } GL11.glDisable(GL12.GL_RESCALE_NORMAL); diff --git a/src/main/java/crazypants/enderio/machine/hypercube/ItemRecieveBuffer.java b/src/main/java/crazypants/enderio/machine/hypercube/ItemRecieveBuffer.java index 471f44ba..f2be9f98 100644 --- a/src/main/java/crazypants/enderio/machine/hypercube/ItemRecieveBuffer.java +++ b/src/main/java/crazypants/enderio/machine/hypercube/ItemRecieveBuffer.java @@ -81,7 +81,7 @@ public class ItemRecieveBuffer extends ArrayInventory implements ISidedInventory if(stack != null) { NBTTagCompound stackRoot = new NBTTagCompound(); stack.writeToNBT(stackRoot); - nbtRoot.setCompoundTag("recieveBuffer" + i, stackRoot); + nbtRoot.setTag("recieveBuffer" + i, stackRoot); } } diff --git a/src/main/java/crazypants/enderio/machine/hypercube/TileHyperCube.java b/src/main/java/crazypants/enderio/machine/hypercube/TileHyperCube.java index 34909118..ce84a790 100644 --- a/src/main/java/crazypants/enderio/machine/hypercube/TileHyperCube.java +++ b/src/main/java/crazypants/enderio/machine/hypercube/TileHyperCube.java @@ -23,7 +23,7 @@ import buildcraft.api.power.PowerHandler.PowerReceiver; import buildcraft.api.power.PowerHandler.Type; import crazypants.enderio.Config; import crazypants.enderio.ModObject; -import crazypants.enderio.PacketHandler; +import crazypants.enderio.TileEntityEio; import crazypants.enderio.machine.RedstoneControlMode; import crazypants.enderio.power.BasicCapacitor; import crazypants.enderio.power.IInternalPowerReceptor; @@ -34,7 +34,7 @@ import crazypants.util.ItemUtil; import crazypants.util.Lang; import crazypants.vecmath.VecmathUtil; -public class TileHyperCube extends TileEntity implements IInternalPowerReceptor, IFluidHandler, ISidedInventory { +public class TileHyperCube extends TileEntityEio implements IInternalPowerReceptor, IFluidHandler, ISidedInventory { private static final float ENERGY_LOSS = (float) Config.transceiverEnergyLoss; @@ -168,7 +168,7 @@ public class TileHyperCube extends TileEntity implements IInternalPowerReceptor, } int getEnergyStoredScaled(int scale) { - return VecmathUtil.clamp(Math.round(scale * (powerHandler.getEnergyStored() / powerHandler.getMaxEnergyStored())), 0, scale); + return (int) VecmathUtil.clamp(Math.round(scale * (powerHandler.getEnergyStored() / powerHandler.getMaxEnergyStored())), 0, scale); } public void onBreakBlock() { @@ -203,13 +203,13 @@ public class TileHyperCube extends TileEntity implements IInternalPowerReceptor, boolean iWasConnected = isConnected(); for (TileHyperCube cube : cubes) { - float stored = powerHandler.getEnergyStored(); + double stored = powerHandler.getEnergyStored(); if(stored > 0 && cube != null && cube != this && cube.canRecievePower()) { boolean wasConnected = cube.isConnected(); - float curPower = cube.powerHandler.getEnergyStored(); - float requires = cube.powerHandler.getMaxEnergyStored() - curPower; - float transfer = Math.min(requires, stored); + double curPower = cube.powerHandler.getEnergyStored(); + double requires = cube.powerHandler.getMaxEnergyStored() - curPower; + double transfer = Math.min(requires, stored); transfer = Math.min(transfer, Config.transceiverMaxIO); cube.powerHandler.setEnergy(curPower + ((1 - ENERGY_LOSS) * transfer)); powerHandler.setEnergy(powerHandler.getEnergyStored() - transfer); @@ -254,7 +254,7 @@ public class TileHyperCube extends TileEntity implements IInternalPowerReceptor, } // else is server, do all logic only on the server // do the required tick to keep BC API happy - float stored = powerHandler.getEnergyStored(); + double stored = powerHandler.getEnergyStored(); powerHandler.update(); // do a dummy recieve of power to force the updating of what is an isn't a // power source as we rely on this @@ -313,7 +313,7 @@ public class TileHyperCube extends TileEntity implements IInternalPowerReceptor, boolean requiresClientSync = wasConnected != stillConnected; requiresClientSync |= prevRedCheck != redstoneCheckPassed; - float storedEnergy = powerHandler.getEnergyStored(); + float storedEnergy = (float) powerHandler.getEnergyStored(); // Update if our power has changed by more than 0.5% requiresClientSync |= lastSyncPowerStored != storedEnergy && worldObj.getTotalWorldTime() % 21 == 0; @@ -324,7 +324,7 @@ public class TileHyperCube extends TileEntity implements IInternalPowerReceptor, // client/server connection worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); // And this will make sure our current tile entity state is saved - onInventoryChanged(); + markDirty(); } } @@ -361,7 +361,7 @@ public class TileHyperCube extends TileEntity implements IInternalPowerReceptor, return false; } - float canTransmit = Math.min(powerHandler.getEnergyStored(), internalCapacitor.getMaxEnergyExtracted()); + float canTransmit = (float) Math.min(powerHandler.getEnergyStored(), internalCapacitor.getMaxEnergyExtracted()); float transmitted = 0; updatePowersReceptors(); @@ -750,6 +750,11 @@ public class TileHyperCube extends TileEntity implements IInternalPowerReceptor, return getRemoteInventory().getSizeInventory(); } + @Override + public boolean hasCustomInventoryName() { + return false; + } + @Override public ItemStack getStackInSlot(int i) { return getRemoteInventory().getStackInSlot(i); @@ -787,13 +792,8 @@ public class TileHyperCube extends TileEntity implements IInternalPowerReceptor, } @Override - public String getInvName() { - return ModObject.blockHyperCube.name; - } - - @Override - public boolean isInvNameLocalized() { - return false; + public String getInventoryName() { + return ModObject.blockHyperCube.unlocalisedName; } @Override @@ -807,11 +807,11 @@ public class TileHyperCube extends TileEntity implements IInternalPowerReceptor, } @Override - public void openChest() { + public void openInventory() { } @Override - public void closeChest() { + public void closeInventory() { } @Override @@ -822,8 +822,7 @@ public class TileHyperCube extends TileEntity implements IInternalPowerReceptor, //---- Serialisation --------------------------------------------------------- @Override - public void readFromNBT(NBTTagCompound nbtRoot) { - super.readFromNBT(nbtRoot); + public void readCustomNBT(NBTTagCompound nbtRoot) { powerHandler.setEnergy(nbtRoot.getFloat("storedEnergy")); String channelName = nbtRoot.getString("channelName"); String channelUser = nbtRoot.getString("channelUser"); @@ -852,9 +851,8 @@ public class TileHyperCube extends TileEntity implements IInternalPowerReceptor, } @Override - public void writeToNBT(NBTTagCompound nbtRoot) { - super.writeToNBT(nbtRoot); - nbtRoot.setFloat("storedEnergy", powerHandler.getEnergyStored()); + public void writeCustomNBT(NBTTagCompound nbtRoot) { + nbtRoot.setFloat("storedEnergy", (float) powerHandler.getEnergyStored()); if(channel != null) { nbtRoot.setString("channelName", channel.name); if(channel.user != null) { @@ -875,11 +873,6 @@ public class TileHyperCube extends TileEntity implements IInternalPowerReceptor, recieveBuffer.writeToNBT(nbtRoot); } - @Override - public Packet getDescriptionPacket() { - return PacketHandler.getPacket(this); - } - static class Receptor { IPowerInterface receptor; ForgeDirection fromDir;