From 7c7b644b3f666276f53a75207a727774df84c2c9 Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Sat, 28 Jun 2014 23:53:49 -0400 Subject: [PATCH] Revert "Merge remote-tracking branch 'origin/master' into 1.7.10" Yeah that didn't work... This reverts commit 714542e2c278e967feac1b9a2514aaa8693505a2, reversing changes made to b579bcdcd8a8e4cd00b7a5ccdd04e7b3d097badd. --- .gitignore | 2 +- Merge.bat | 5 +- README.md | 2 +- ReleaseNotes.txt | 2 - resources/assets/enderio/lang/en_US.lang | 21 +- .../textures/blocks/blockVacuumChest.png | Bin 938 -> 0 bytes .../enderio/textures/gui/vacumChest.png | Bin 2077 -> 0 bytes .../enderio/textures/items/itemGliderWing.png | Bin 262 -> 0 bytes .../textures/items/itemGliderWings.png | Bin 280 -> 0 bytes .../java/crazypants/enderio/ClientProxy.java | 10 - src/main/java/crazypants/enderio/EnderIO.java | 8 - .../java/crazypants/enderio/GuiHandler.java | 1 - .../java/crazypants/enderio/ModObject.java | 4 +- .../crazypants/enderio/config/Config.java | 26 +- .../enderio/enderface/GuiEnderface.java | 4 +- .../enderio/gui/IoConfigRenderer.java | 2 +- .../crazypants/enderio/item/ItemRecipes.java | 4 - .../item/darksteel/DarkSteelController.java | 142 ++--------- .../darksteel/DarkSteelRecipeManager.java | 1 - .../enderio/item/darksteel/GliderUpgrade.java | 54 ----- .../item/darksteel/ItemDarkSteelArmor.java | 6 - .../item/darksteel/ItemGliderWing.java | 89 ------- .../enderio/item/darksteel/KeyTracker.java | 56 ----- .../item/darksteel/PacketGlideState.java | 38 --- .../enderio/machine/GuiOverlayIoConfig.java | 2 +- .../enderio/machine/MachineRecipes.java | 4 - .../enderio/machine/farm/FakeFarmPlayer.java | 8 +- .../machine/hypercube/BlockHyperCube.java | 7 +- .../enderio/machine/hypercube/Channel.java | 8 +- .../machine/hypercube/HyperCubeConfig.java | 30 +-- .../machine/hypercube/HyperCubeRegister.java | 5 +- .../hypercube/PacketAddRemoveChannel.java | 6 +- .../machine/hypercube/PacketChannelList.java | 16 +- .../machine/hypercube/PacketClientState.java | 5 +- .../machine/hypercube/TileHyperCube.java | 16 +- .../machine/power/BlockCapacitorBank.java | 2 +- .../recipe/OreDictionaryRecipeInput.java | 2 +- .../machine/reservoir/BlockReservoir.java | 2 +- .../machine/spawner/ItemBrokenSpawner.java | 9 +- .../machine/spawner/TilePoweredSpawner.java | 64 ++--- .../machine/vacuum/BlockVacuumChest.java | 98 -------- .../machine/vacuum/ContainerVacuumChest.java | 66 ----- .../machine/vacuum/GuiVacuumChest.java | 25 -- .../machine/vacuum/TileVacuumChest.java | 227 ------------------ .../machine/vacuum/VacuumChestRenderer.java | 89 ------- .../enderio/network/NetworkUtil.java | 4 +- .../enderio/teleport/GuiTravelAuth.java | 3 +- .../enderio/teleport/ITravelAccessable.java | 4 +- .../enderio/teleport/TileTravelAnchor.java | 23 +- .../crazypants/gui/GuiScrollableList.java | 2 +- .../java/crazypants/gui/IconToggleButton.java | 3 +- .../crazypants/util/IBlockAccessWrapper.java | 6 - src/main/java/crazypants/util/Util.java | 15 +- 53 files changed, 150 insertions(+), 1078 deletions(-) delete mode 100644 resources/assets/enderio/textures/blocks/blockVacuumChest.png delete mode 100644 resources/assets/enderio/textures/gui/vacumChest.png delete mode 100644 resources/assets/enderio/textures/items/itemGliderWing.png delete mode 100644 resources/assets/enderio/textures/items/itemGliderWings.png delete mode 100644 src/main/java/crazypants/enderio/item/darksteel/GliderUpgrade.java delete mode 100644 src/main/java/crazypants/enderio/item/darksteel/ItemGliderWing.java delete mode 100644 src/main/java/crazypants/enderio/item/darksteel/KeyTracker.java delete mode 100644 src/main/java/crazypants/enderio/item/darksteel/PacketGlideState.java delete mode 100644 src/main/java/crazypants/enderio/machine/vacuum/BlockVacuumChest.java delete mode 100644 src/main/java/crazypants/enderio/machine/vacuum/ContainerVacuumChest.java delete mode 100644 src/main/java/crazypants/enderio/machine/vacuum/GuiVacuumChest.java delete mode 100644 src/main/java/crazypants/enderio/machine/vacuum/TileVacuumChest.java delete mode 100644 src/main/java/crazypants/enderio/machine/vacuum/VacuumChestRenderer.java diff --git a/.gitignore b/.gitignore index 3c1420e4e4..e26361df73 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,7 @@ /bin /build /download -/.settings/org.eclipse.jdt.core.prefs +/.settings /.gradle /eclipse /eclipseBin diff --git a/Merge.bat b/Merge.bat index ec82fee32c..d313d28672 100644 --- a/Merge.bat +++ b/Merge.bat @@ -1,6 +1,5 @@ -git checkout 1.7.10 -git pull git checkout master git pull -git merge 1.7.10 --no-ff --no-commit +git checkout 1.7 +git merge master --no-ff --no-commit pause \ No newline at end of file diff --git a/README.md b/README.md index 60e8554e80..2a862c428d 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ EnderIO ======= -All code (excluding the BuildCraft and other mod APIs, which is covered by their respective licenses) is released into the public domain. +All code (excluding the BuildCraft API, which is covered by the BuildCraft license) is licensed under the WTFPL (Do What the Fuck You Want to Public License http://www.wtfpl.net/). Do what you want with it, as long as you smile while doing so. While it is not a requirement, it would be nice to know if it is being used and how, so send me hello to **crazypants.mc at gmail.com**. diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index 986d58b753..51e491c956 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -21,8 +21,6 @@ New - Enlighted Glass and Fused Quartz - Blast resistent Dark Steel Bars - Powered Magnet -- Powered Spawner -- Vacuum Chest Changes - Removed advanced item conduits and added upgrades to the basic conduits diff --git a/resources/assets/enderio/lang/en_US.lang b/resources/assets/enderio/lang/en_US.lang index 117ef12c1b..4c2b3079f2 100644 --- a/resources/assets/enderio/lang/en_US.lang +++ b/resources/assets/enderio/lang/en_US.lang @@ -21,8 +21,7 @@ enderio.blockConduitFacade=Conduit Facade item.enderio.itemConduitFacade.name=Conduit Facade item.enderio.itemConduitFacade.tooltip.detailed.line1=Painted in the Painting Machine item.enderio.itemConduitFacade.tooltip.detailed.line2=Right click on a conduit to place -item.enderio.itemConduitFacade.tooltip.detailed.line3=Hidden when a wrench or conduit -item.enderio.itemConduitFacade.tooltip.detailed.line4=is equipped +item.enderio.itemConduitFacade.tooltip.detailed.line3=Hidden when a wrench is equipped enderio.itemPowerConduit.name=Energy Conduit enderio.itemPowerConduitEnhanced.name=Enhanced Energy Conduit @@ -232,18 +231,13 @@ enderio.tank.tank=Tank tile.blockCrafter.name=Crafter -tile.blockVacuumChest.name=Vacuum Chest - tile.blockPoweredSpawner.name=Powered Spawner tile.blockPoweredSpawner.tooltip.empty=Empty tile.blockPoweredSpawner.empty.tooltip.detailed.line1=Combine with a broken tile.blockPoweredSpawner.empty.tooltip.detailed.line2=spawner in an anvil tile.blockPoweredSpawner.tooltip.detailed.line1=Supply with power to tile.blockPoweredSpawner.tooltip.detailed.line2=activate - item.itemBrokenSpawner.name=Broken Spawner -item.itemBrokenSpawner.tooltip.detailed.line1=Combine with a Powered Spawner -item.itemBrokenSpawner.tooltip.detailed.line2=in an Anvil to set spawn type enderio.machine.tooltip.configured=(Configured) @@ -331,9 +325,6 @@ enderio.item.darkSteel_sword.tooltip.line3=+1 Damage when Powered enderio.item.darkSteel_armor.tooltip.line1=Diamond level protection enderio.item.darkSteel_armor.tooltip.line2=when powered -enderio.item.darkSteel_boots.tooltip.line1=Fall damage negated -enderio.item.darkSteel_boots.tooltip.line2=when powered - enderio.darksteel.upgrade.empowered_one.name=Empowered enderio.darksteel.upgrade.empowered_one.tooltip.detailed.line1=Power: $P enderio.darksteel.upgrade.empowered_one.tooltip.detailed.line2=Half durability damage absorbed @@ -357,14 +348,6 @@ enderio.darksteel.upgrade.empowered_four.tooltip.detailed.line3=by power enderio.darksteel.upgrade.jump_one.name=Jump enderio.darksteel.upgrade.jump_one.tooltip.detailed.line1=Increases step and jump height -enderio.darksteel.upgrade.glider.name=Glider -enderio.darksteel.upgrade.glider.tooltip.detailed.line1=Enables gliding -enderio.darksteel.upgrade.glider.enabled=Glider Active -enderio.darksteel.upgrade.glider.disabled=Glider Disabled - -item.itemGliderWing.name=Glider Wing -item.itemGliderWings.name=Glider Wings - enderio.darksteel.upgrade.jump_two.name=Jump II enderio.darksteel.upgrade.jump_two.tooltip.detailed.line1=Increases step and jump height enderio.darksteel.upgrade.jump_two.tooltip.detailed.line2=Allows double jumps @@ -563,4 +546,4 @@ enderio.config.magnet=Magnet Settings enderio.config.magnet.tooltip=How do they work? enderio.config.spawner=PoweredSpawner Settings -enderio.config.spawner.tooltip=I ran out of witty tooltips. +enderio.config.spawner.tooltip=I ran out of witty tooltips. \ No newline at end of file diff --git a/resources/assets/enderio/textures/blocks/blockVacuumChest.png b/resources/assets/enderio/textures/blocks/blockVacuumChest.png deleted file mode 100644 index c84b2568f799287c628e0e10f09eeda00d01ed04..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 938 zcmV;b16BNqP)N2bPDNB8 zb~7$DE-^4L^m3s900SmTL_t(oN6nX8Z`wc*h4Z`m(pIWyt_I(4U<@{wB#{39r|CIM z#yH+pP^DNj(ota9^?W-!GdsTd<#}>V{XYQlvXX4QmZEKCzTL=TxBVcF6>Wn#D@p2F z9^zPTgFt@!zT8Kl`13+$WlzOfepyN|pG#ORB&sU&*#gL6oQA6Bz0@zyvU+{##P3Ut zFZMerH?8CVxeLSYAp}Y48bwhj8q=Nk zrQ;6~=b!YLBu3LbH#&K8YhWyZ`DTM%o_0PK05?dLIA#lgKdcY0vOXRD!N=pQ=As*DDB*k>X}80Pemy9;JOdjs~!LK}Y#!pn0^o%H=P>~E`TcvO z1DMQa-QZOKbW&gXfEf8bG;m4ja%lmuxbdiY3>ExTJiw>eg#;(>TZdys!ao1OEiz@W59AaEzXr;;R1?U|5Rjm7#%4 z3Q@dJ{mv@_s7V9Cl|nD9O2R_Bu48zHh}X8yfiTl1r-Fvtj`-{mhk&zQDXhplI-2 zfh{z6g?@)a${LVBZ1HNM#p z49ZwcFvhex?>aK&H7L+0Vk17%RmIFQJt9+_-|?AiEr4t3$^f4H1!b~Q+Cdv%#{d8T M07*qoM6N<$f*ZV=kBO_y;s`N57=^ff~$MqGj87bfJas9uI;s1a6?(Xhm$BzB~{~xG$ z6pV(za0&r_3GG9mj8YQh7Yt0{BN;FRe`i+(#w}-oM`SSr1K)NKW|ZlV1{N9&QYEet zCBgY=CFO}lsSE*$nRz98ey$-3WyX4@dWHrDUy2q2iF4dmk`9$y?W!szmz|!mEK_H>Lv4mQ`znU2uY9W*u5$(W zH*U1q(#`yp-QXEh!216&DnL#tdx7NXd#88LKee);kY&d+?^$|Z@2(fQb+mC8bHuua zPtT^WcXixt5m3%xIemWZ^*N_hA8>A%^Y?V7!L)9Oc(C4V`OhGwESwBzL;&ldpGl+-*K1jSXC~Sd+N{d^P9`>n|HYa z^j5Tg%8y>@{!{sYuLDpdo*`o2(!X!s`7>O3pJ~7QHUEQcPxEgwr<6B@D>qzkfA{%24P*P^Qh^4BsxdiP{Y6ersYWmMUQV+_C4zl4E2?8;#EE^RHtug%rEAM}4e z4}&X|E#C}hGd%jY_HLG{gv0mPZIhl|JE?t3Ff$#F-_?P!85(w2TdoBL!Y>Y>(1k+t*L(}A*GGF6zkV_`gQ51;8rHf6 zw%eIt%3ti5jR+foa`WxL0CA9KWN0uy;LUQt=F0WA%NQCeFJylY`207#p-8gi^4kT` sVjm{evNkNsWyrY2Hu$JCK7;fB8BOJMV*gy0vjln6)78&qol`;+0A7TysQ>@~ diff --git a/resources/assets/enderio/textures/items/itemGliderWing.png b/resources/assets/enderio/textures/items/itemGliderWing.png deleted file mode 100644 index 0e4ffa9cdb0ad43ec920b5ca3d206a96f4c1535e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 262 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucL8%hgh?3y^w370~qEv=}#LT=BJwMkFg)(D3 zQ$0figD*u3fvQS9T^vI!{FnA^I%jUD}^c z&JCLJQ@r4dg3`JZH*G!$RBBu}{oBU&^6uH~9dY~mOvNu0X)SnK94)o5VVbJIuf}Pv zB6k=j9cI+cR$*g~FY1?GF$)eKMLPi$b9{HAdD{gDEuk}nSr U)s*eO0(26Cr>mdKI;Vst03s`6?EnA( diff --git a/src/main/java/crazypants/enderio/ClientProxy.java b/src/main/java/crazypants/enderio/ClientProxy.java index 97818a0163..16132ac3fb 100644 --- a/src/main/java/crazypants/enderio/ClientProxy.java +++ b/src/main/java/crazypants/enderio/ClientProxy.java @@ -42,7 +42,6 @@ import crazypants.enderio.gui.TooltipAddera; import crazypants.enderio.item.YetaWrenchOverlayRenderer; import crazypants.enderio.item.YetaWrenchTickHandler; -import crazypants.enderio.item.darksteel.KeyTracker; import crazypants.enderio.item.darksteel.PoweredItemRenderer; import crazypants.enderio.machine.AbstractMachineBlock; import crazypants.enderio.machine.AbstractMachineRenderer; @@ -72,8 +71,6 @@ import crazypants.enderio.machine.tank.TankFluidRenderer; import crazypants.enderio.machine.tank.TankItemRenderer; import crazypants.enderio.machine.tank.TileTank; -import crazypants.enderio.machine.vacuum.BlockVacuumChest; -import crazypants.enderio.machine.vacuum.VacuumChestRenderer; import crazypants.enderio.material.BlockFusedQuartz; import crazypants.enderio.material.FusedQuartzFrameRenderer; import crazypants.enderio.material.FusedQuartzRenderer; @@ -192,11 +189,6 @@ public void load() { BlockCapacitorBank.renderId = RenderingRegistry.getNextAvailableRenderId(); CapBankRenderer2 cbr2 = new CapBankRenderer2(); RenderingRegistry.registerBlockHandler(cbr2); - - BlockVacuumChest.renderId = RenderingRegistry.getNextAvailableRenderId(); - VacuumChestRenderer vcr = new VacuumChestRenderer(); - RenderingRegistry.registerBlockHandler(vcr); - MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockVacuumChest), vcr); ItemConduitRenderer itemConRenderer = new ItemConduitRenderer(); MinecraftForgeClient.registerItemRenderer(EnderIO.itemLiquidConduit, itemConRenderer); @@ -264,8 +256,6 @@ public void load() { MinecraftForgeClient.registerItemRenderer(EnderIO.itemDarkSteelSword, dsr); MinecraftForgeClient.registerItemRenderer(EnderIO.itemDarkSteelPickaxe, dsr); MinecraftForgeClient.registerItemRenderer(EnderIO.itemDarkSteelAxe, dsr); - //Ensure it is loaded and registered - KeyTracker.instance.isGlideActive(); } diff --git a/src/main/java/crazypants/enderio/EnderIO.java b/src/main/java/crazypants/enderio/EnderIO.java index 8f2f5220a3..1f057ebb52 100644 --- a/src/main/java/crazypants/enderio/EnderIO.java +++ b/src/main/java/crazypants/enderio/EnderIO.java @@ -51,7 +51,6 @@ import crazypants.enderio.item.darksteel.ItemDarkSteelAxe; import crazypants.enderio.item.darksteel.ItemDarkSteelPickaxe; import crazypants.enderio.item.darksteel.ItemDarkSteelSword; -import crazypants.enderio.item.darksteel.ItemGliderWing; import crazypants.enderio.machine.MachineRecipes; import crazypants.enderio.machine.PacketRedstoneMode; import crazypants.enderio.machine.alloy.AlloyRecipeManager; @@ -86,7 +85,6 @@ import crazypants.enderio.machine.still.BlockVat; import crazypants.enderio.machine.still.VatRecipeManager; import crazypants.enderio.machine.tank.BlockTank; -import crazypants.enderio.machine.vacuum.BlockVacuumChest; import crazypants.enderio.material.Alloy; import crazypants.enderio.material.BlockDarkIronBars; import crazypants.enderio.material.BlockFusedQuartz; @@ -178,7 +176,6 @@ public class EnderIO { public static BlockCrafter blockCrafter; public static BlockPoweredSpawner blockPoweredSpawner; public static ItemBrokenSpawner itemBrokenSpawner; - public static BlockVacuumChest blockVacuumChest; public static BlockElectricLight blockElectricLight; public static BlockLightNode blockLightNode; @@ -215,7 +212,6 @@ public class EnderIO { public static ItemDarkSteelSword itemDarkSteelSword; public static ItemDarkSteelPickaxe itemDarkSteelPickaxe; public static ItemDarkSteelAxe itemDarkSteelAxe; - public static ItemGliderWing itemGliderWing; // public static ITrigger triggerNoEnergy; // public static ITrigger triggerHasEnergy; @@ -265,8 +261,6 @@ public void preInit(FMLPreInitializationEvent event) { blockTank = BlockTank.create(); blockReservoir = BlockReservoir.create(); - blockVacuumChest = BlockVacuumChest.create(); - blockDarkSteelPressurePlate = BlockDarkSteelPressurePlate.create(); blockFusedQuartz = BlockFusedQuartz.create(); @@ -340,8 +334,6 @@ public void preInit(FMLPreInitializationEvent event) { blockDarkIronBars = BlockDarkIronBars.create(); - itemGliderWing = ItemGliderWing.create(); - itemDarkSteelHelmet = ItemDarkSteelArmor.create(0); itemDarkSteelChestplate = ItemDarkSteelArmor.create(1); itemDarkSteelLeggings = ItemDarkSteelArmor.create(2); diff --git a/src/main/java/crazypants/enderio/GuiHandler.java b/src/main/java/crazypants/enderio/GuiHandler.java index 35683dea92..a92bb18672 100644 --- a/src/main/java/crazypants/enderio/GuiHandler.java +++ b/src/main/java/crazypants/enderio/GuiHandler.java @@ -39,7 +39,6 @@ public class GuiHandler implements IGuiHandler { public static final int GUI_ID_CRAFTER = 87; public static final int GUI_ID_ZOMBIE_GEN = 71; public static final int GUI_ID_POWERED_SPAWNER = 88; - public static final int GUI_ID_VACUUM_CHEST = 89; protected final Map guiHandlers = new HashMap(); diff --git a/src/main/java/crazypants/enderio/ModObject.java b/src/main/java/crazypants/enderio/ModObject.java index fa237d530e..f972058410 100644 --- a/src/main/java/crazypants/enderio/ModObject.java +++ b/src/main/java/crazypants/enderio/ModObject.java @@ -47,7 +47,6 @@ public enum ModObject { blockFarmStation, blockTank, blockCrafter, - blockVacuumChest, blockPoweredSpawner, itemBrokenSpawner, @@ -75,8 +74,7 @@ public enum ModObject { blockTravelAnchor, itemTravelStaff, - itemMagnet, - itemGliderWing; + itemMagnet; public final String unlocalisedName; diff --git a/src/main/java/crazypants/enderio/config/Config.java b/src/main/java/crazypants/enderio/config/Config.java index 963c69bf9e..3235945d37 100644 --- a/src/main/java/crazypants/enderio/config/Config.java +++ b/src/main/java/crazypants/enderio/config/Config.java @@ -140,7 +140,6 @@ public String lc() { public static int darkSteelSprintPowerCost = darkSteelWalkPowerCost * 4; public static boolean darkSteelDrainPowerFromInventory = false; public static int darkSteelBootsJumpPowerCost = 250; - public static int darkSteelFallDistanceCost = 100; public static float darkSteelSwordWitherSkullChance = 0.05f; public static float darkSteelSwordWitherSkullLootingModifier = 0.167f / 3f; //at looting 3, have a 1 in 6 chance of getting a skull @@ -186,11 +185,6 @@ public String lc() { public static int darkSteelUpgradePowerTwoCost = 20; public static int darkSteelUpgradePowerThreeCost = 30; - public static int darkSteelGliderCost = 15; - public static double darkSteelGliderHorizontalSpeed = 0.03; - public static double darkSteelGliderVerticalSpeed = -0.05; - public static double darkSteelGliderVerticalSpeedSprinting = -0.15; - public static float farmContinuousEnergyUse = 4; public static float farmActionEnergyUse = 50; public static int farmDefaultSize = 3; @@ -218,8 +212,6 @@ public String lc() { public static double brokenSpawnerDropChance = 1; public static int powerSpawnerAddSpawnerCost = 30; - public static double vacuumChestRange = 6; - public static void load(FMLPreInitializationEvent event) { FMLCommonHandler.instance().bus().register(new Config()); @@ -342,8 +334,6 @@ public static void processConfig(Configuration config) { "'line of sight' distance rather than conduit path distance is used to calculate priorities.") .getBoolean(itemConduitUsePhyscialDistance); - vacuumChestRange = config.get("Efficiency Settings", "vacumChestRange", vacuumChestRange, "The range of the vacuum chest").getDouble(vacuumChestRange); - if(!useSneakMouseWheelYetaWrench && !useSneakRightClickYetaWrench) { Log.warn("Both useSneakMouseWheelYetaWrench and useSneakRightClickYetaWrench are set to false. Enabling mouse wheel."); useSneakMouseWheelYetaWrench = true; @@ -439,19 +429,7 @@ public static void processConfig(Configuration config) { darkSteelBootsJumpPowerCost = config.get(sectionDarkSteel.name, "darkSteelBootsJumpPowerCost", darkSteelBootsJumpPowerCost, "Base amount of power used per jump (RF) dark steel boots. The second jump in a 'double jump' uses 2x this etc").getInt(darkSteelBootsJumpPowerCost); - darkSteelFallDistanceCost = config.get("Dark Steel", "darkSteelFallDistanceCost", darkSteelFallDistanceCost, - "Amount of power used (RF) per block height of fall distance damage negated.").getInt(darkSteelFallDistanceCost); - - darkSteelGliderCost = config.get("Dark Steel", "darkSteelGliderCost", darkSteelGliderCost, - "Number of levels required for the 'Glider' upgrade.").getInt(darkSteelGliderCost); - darkSteelGliderHorizontalSpeed = config.get("Dark Steel", "darkSteelGliderHorizontalSpeed", darkSteelGliderHorizontalSpeed, - "Horizontal movement speed modifier when gliding.").getDouble(darkSteelGliderHorizontalSpeed); - darkSteelGliderVerticalSpeed = config.get("Dark Steel", "darkSteelGliderVerticalSpeed", darkSteelGliderVerticalSpeed, - "Rate of altitude loss when gliding.").getDouble(darkSteelGliderVerticalSpeed); - darkSteelGliderVerticalSpeedSprinting = config.get("Dark Steel", "darkSteelGliderVerticalSpeedSprinting", darkSteelGliderVerticalSpeedSprinting, - "Rate of altitude loss when sprinting and gliding.").getDouble(darkSteelGliderVerticalSpeedSprinting); - - darkSteelSwordSkullChance = (float) config.get("Dark Steel", "darkSteelSwordSkullChance", darkSteelSwordSkullChance, + darkSteelSwordSkullChance = (float) config.get(sectionDarkSteel.name, "darkSteelSwordSkullChance", darkSteelSwordSkullChance, "The base chance that a skull will be dropped when using a powered dark steel sword (0 = no chance, 1 = 100% chance)").getDouble( darkSteelSwordSkullChance); darkSteelSwordSkullLootingModifier = (float) config.get(sectionDarkSteel.name, "darkSteelSwordSkullLootingModifier", darkSteelSwordSkullLootingModifier, @@ -571,7 +549,7 @@ public static void processConfig(Configuration config) { "The chance a brokne spawner will be dropped when a spawner is broken. 1 = 100% chance, 0 = 0% chance").getDouble(brokenSpawnerDropChance); powerSpawnerAddSpawnerCost = config.get(sectionSpawner.name, "powerSpawnerAddSpawnerCost", powerSpawnerAddSpawnerCost, "The number of levels it costs to add a broken spawner").getInt(powerSpawnerAddSpawnerCost); - + } private Config() { diff --git a/src/main/java/crazypants/enderio/enderface/GuiEnderface.java b/src/main/java/crazypants/enderio/enderface/GuiEnderface.java index adc1869b79..cbe16cc144 100644 --- a/src/main/java/crazypants/enderio/enderface/GuiEnderface.java +++ b/src/main/java/crazypants/enderio/enderface/GuiEnderface.java @@ -346,7 +346,7 @@ private void setGlStateForPass(int pass) { } private boolean updateCamera(float partialTick) { - ScaledResolution scaledresolution = new ScaledResolution(mc.gameSettings, mc.displayWidth, mc.displayHeight); + ScaledResolution scaledresolution = new ScaledResolution(mc, mc.displayWidth, mc.displayHeight); int vpx = guiLeft * scaledresolution.getScaleFactor(); int vpy = guiTop * scaledresolution.getScaleFactor(); int vpw = (int) ((float) gw / width * mc.displayWidth); @@ -389,7 +389,7 @@ private void applyCamera(float partialTick) { private float portalFade = 1; private void drawEffectOverlay(float partialTick) { - ScaledResolution scaledresolution = new ScaledResolution(this.mc.gameSettings, this.mc.displayWidth, this.mc.displayHeight); + ScaledResolution scaledresolution = new ScaledResolution(this.mc, this.mc.displayWidth, this.mc.displayHeight); GL11.glMatrixMode(GL11.GL_PROJECTION); GL11.glLoadIdentity(); GL11.glOrtho(0.0D, scaledresolution.getScaledWidth_double(), scaledresolution.getScaledHeight_double(), 0.0D, 1000.0D, 3000.0D); diff --git a/src/main/java/crazypants/enderio/gui/IoConfigRenderer.java b/src/main/java/crazypants/enderio/gui/IoConfigRenderer.java index abeac22f58..ab537391b8 100644 --- a/src/main/java/crazypants/enderio/gui/IoConfigRenderer.java +++ b/src/main/java/crazypants/enderio/gui/IoConfigRenderer.java @@ -264,7 +264,7 @@ private void renderSelection() { private void renderOverlay(int mx, int my) { Rectangle vp = camera.getViewport(); - ScaledResolution scaledresolution = new ScaledResolution(mc.gameSettings, mc.displayWidth, mc.displayHeight); + ScaledResolution scaledresolution = new ScaledResolution(mc, mc.displayWidth, mc.displayHeight); int vpx = vp.x / scaledresolution.getScaleFactor(); int vph = vp.height / scaledresolution.getScaleFactor(); diff --git a/src/main/java/crazypants/enderio/item/ItemRecipes.java b/src/main/java/crazypants/enderio/item/ItemRecipes.java index 0192098c5a..05ee0e117d 100644 --- a/src/main/java/crazypants/enderio/item/ItemRecipes.java +++ b/src/main/java/crazypants/enderio/item/ItemRecipes.java @@ -1,6 +1,5 @@ package crazypants.enderio.item; -import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.ShapedOreRecipe; import cpw.mods.fml.common.registry.GameRegistry; @@ -32,9 +31,6 @@ public static void addRecipes() { GameRegistry.addShapedRecipe(EnderIO.itemDarkSteelLeggings.createItemStack(), "sss", "s s", "s s", 's', darkSteel); GameRegistry.addShapedRecipe(EnderIO.itemDarkSteelBoots.createItemStack(), "s s", "s s", " ", 's', darkSteel); GameRegistry.addShapedRecipe(EnderIO.itemDarkSteelBoots.createItemStack(), " ", "s s", "s s", 's', darkSteel); - ItemStack wing = new ItemStack(EnderIO.itemGliderWing,1,0); - GameRegistry.addShapedRecipe(wing, " s", " sl", "sll", 's', darkSteel, 'l', Items.leather); - GameRegistry.addShapedRecipe(new ItemStack(EnderIO.itemGliderWing,1,1), " s ", "wsw", " ", 's', darkSteel, 'w', wing); ItemStack dspp = new ItemStack(EnderIO.blockDarkSteelPressurePlate); GameRegistry.addShapedRecipe(dspp, "ss ", " ", " ", 's', darkSteel); diff --git a/src/main/java/crazypants/enderio/item/darksteel/DarkSteelController.java b/src/main/java/crazypants/enderio/item/darksteel/DarkSteelController.java index 1d7b900ca4..0acfd1dab4 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/DarkSteelController.java +++ b/src/main/java/crazypants/enderio/item/darksteel/DarkSteelController.java @@ -1,7 +1,5 @@ package crazypants.enderio.item.darksteel; -import java.util.HashMap; -import java.util.Map; import java.util.UUID; import net.minecraft.client.Minecraft; @@ -15,16 +13,11 @@ import cofh.api.energy.IEnergyContainerItem; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.TickEvent; -import cpw.mods.fml.common.gameevent.TickEvent.Phase; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.EnderIO; import crazypants.enderio.config.Config; import crazypants.enderio.network.PacketHandler; -import crazypants.util.Util; -import crazypants.vecmath.VecmathUtil; -import crazypants.vecmath.Vector3d; -import crazypants.vecmath.Vector4d; public class DarkSteelController { @@ -48,116 +41,25 @@ public class DarkSteelController { private boolean wasJumping; private int jumpCount; private int ticksSinceLastJump; - //private boolean isGlideActive = false; - private Map glideActiveMap = new HashMap(); private DarkSteelController() { PacketHandler.INSTANCE.registerMessage(PacketDarkSteelPowerPacket.class, PacketDarkSteelPowerPacket.class, PacketHandler.nextID(), Side.SERVER); - PacketHandler.INSTANCE.registerMessage(PacketGlideState.class, PacketGlideState.class, PacketHandler.nextID(), Side.SERVER); - } - - public void setGlideActive(EntityPlayer player, boolean isGlideActive) { - if(player.getGameProfile().getName() != null) { - glideActiveMap.put(player.getGameProfile().getName(), isGlideActive); - } - } - - public boolean isGlideActive(EntityPlayer player) { - Boolean isActive = glideActiveMap.get(player.getGameProfile().getName()); - if(isActive == null) { - return false; - } - return isActive.booleanValue(); } @SubscribeEvent public void onPlayerTick(TickEvent.PlayerTickEvent event) { EntityPlayer player = event.player; - //TODO: I am doing this at Phase.START and Phase.END //boots step height - updateStepHeightAndFallDistance(player); - - //leggings - updateSpeed(player); - - //sword - updateSword(player); - - if(event.phase == Phase.END) { - updateGlide(player); - } - - } - - private void updateGlide(EntityPlayer player) { - if(!isGlideActive(player) || !isGliderUpgradeEquipped(player)) { - return; - } - - if(!player.onGround && player.motionY < 0 && !player.isSneaking()) { - - double horizontalSpeed = Config.darkSteelGliderHorizontalSpeed; - double verticalSpeed = Config.darkSteelGliderVerticalSpeed; - if(player.isSprinting()) { - verticalSpeed = Config.darkSteelGliderVerticalSpeedSprinting; - } - - Vector3d look = Util.getLookVecEio(player); - Vector3d side = new Vector3d(); - side.cross(new Vector3d(0, 1, 0), look); - Vector3d playerPos = new Vector3d(player.prevPosX, player.prevPosY, player.prevPosZ); - Vector3d b = new Vector3d(playerPos); - b.y += 1; - Vector3d c = new Vector3d(playerPos); - c.add(side); - Vector4d plane = new Vector4d(); - VecmathUtil.computePlaneEquation(playerPos, b, c, plane); - double dist = Math.abs(VecmathUtil.distanceFromPointToPlane(plane, new Vector3d(player.posX, player.posY, player.posZ))); - double minDist = 0.15; - if(dist < minDist) { - double dropRate = (minDist * 10) - (dist * 10); - verticalSpeed = verticalSpeed + (verticalSpeed * dropRate * 8); - horizontalSpeed -= (0.02 * dropRate); - } - - double x = Math.cos(Math.toRadians(player.rotationYawHead + 90)) - * horizontalSpeed; - double z = Math.sin(Math.toRadians(player.rotationYawHead + 90)) - * horizontalSpeed; - - player.motionX += x; - player.motionZ += z; - - player.motionY = verticalSpeed; - player.fallDistance = 0f; - - } - - } - - public boolean isGliderUpgradeEquipped(EntityPlayer player) { - ItemStack chestPlate = player.getEquipmentInSlot(3); - GliderUpgrade glideUpgrade = GliderUpgrade.loadFromItem(chestPlate); - if(glideUpgrade == null) { - return false; - } - return true; - } - - private void updateSword(EntityPlayer player) { - if(ItemDarkSteelSword.isEquipped(player)) { - IAttributeInstance attackInst = player.getAttributeMap().getAttributeInstance(SharedMonsterAttributes.attackDamage); - attackInst.removeModifier(swordDamageModifierPowered); - - ItemStack sword = player.getCurrentEquippedItem(); - if(Config.darkSteelSwordPowerUsePerHit <= 0 || EnderIO.itemDarkSteelSword.getEnergyStored(sword) >= Config.darkSteelSwordPowerUsePerHit) { - attackInst.applyModifier(swordDamageModifierPowered); - } + ItemStack boots = player.getEquipmentInSlot(1); + JumpUpgrade jumpUpgrade = JumpUpgrade.loadFromItem(boots); + if(jumpUpgrade != null && boots != null && boots.getItem() == EnderIO.itemDarkSteelBoots) { + player.stepHeight = 1.0023F; + } else if(player.stepHeight == 1.0023F) { + player.stepHeight = 0.5001F; } - } - private void updateSpeed(EntityPlayer player) { + //leggings IAttributeInstance moveInst = player.getAttributeMap().getAttributeInstance(SharedMonsterAttributes.movementSpeed); moveInst.removeModifier(walkModifiers[0]); //any will so as they all have the same UID moveInst.removeModifier(sprintModifiers[0]); @@ -167,7 +69,7 @@ private void updateSpeed(EntityPlayer player) { if(leggings != null && leggings.getItem() == EnderIO.itemDarkSteelLeggings && speedUpgrade != null) { double horzMovement = Math.sqrt(player.motionX * player.motionX + player.motionZ * player.motionZ); - double costModifier = player.isSprinting() ? Config.darkSteelSprintPowerCost : Config.darkSteelWalkPowerCost; + double costModifier = player.isSprinting() ? Config.darkSteelSprintPowerCost : Config.darkSteelWalkPowerCost; costModifier = costModifier + (costModifier * speedUpgrade.walkMultiplier); int cost = (int) (horzMovement * costModifier); @@ -181,29 +83,18 @@ private void updateSpeed(EntityPlayer player) { } } } - } - private void updateStepHeightAndFallDistance(EntityPlayer player) { - ItemStack boots = player.getEquipmentInSlot(1); - - if(boots != null && boots.getItem() == EnderIO.itemDarkSteelBoots) { - int costedDistance = (int) player.fallDistance; - if(costedDistance > 0) { - int energyCost = costedDistance * Config.darkSteelFallDistanceCost; - int totalEnergy = getPlayerEnergy(player, EnderIO.itemDarkSteelBoots); - if(totalEnergy > 0 && totalEnergy >= energyCost) { - usePlayerEnergy(player, EnderIO.itemDarkSteelBoots, energyCost); - player.fallDistance -= costedDistance; - } + //sword + if(ItemDarkSteelSword.isEquipped(player)) { + IAttributeInstance attackInst = player.getAttributeMap().getAttributeInstance(SharedMonsterAttributes.attackDamage); + attackInst.removeModifier(swordDamageModifierPowered); + + ItemStack sword = player.getCurrentEquippedItem(); + if(Config.darkSteelSwordPowerUsePerHit <= 0 || EnderIO.itemDarkSteelSword.getEnergyStored(sword) >= Config.darkSteelSwordPowerUsePerHit) { + attackInst.applyModifier(swordDamageModifierPowered); } } - JumpUpgrade jumpUpgrade = JumpUpgrade.loadFromItem(boots); - if(jumpUpgrade != null && boots != null && boots.getItem() == EnderIO.itemDarkSteelBoots) { - player.stepHeight = 1.0023F; - } else if(player.stepHeight == 1.0023F) { - player.stepHeight = 0.5001F; - } } void usePlayerEnergy(EntityPlayer player, ItemDarkSteelArmor armor, int cost) { @@ -227,7 +118,6 @@ void usePlayerEnergy(EntityPlayer player, ItemDarkSteelArmor armor, int cost) { ItemStack stack = player.inventory.armorInventory[3 - armor.armorType]; if(stack != null) { armor.extractEnergy(stack, remaining, false); - player.inventory.markDirty(); } } } diff --git a/src/main/java/crazypants/enderio/item/darksteel/DarkSteelRecipeManager.java b/src/main/java/crazypants/enderio/item/darksteel/DarkSteelRecipeManager.java index 205330b75a..bdbff6a1b5 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/DarkSteelRecipeManager.java +++ b/src/main/java/crazypants/enderio/item/darksteel/DarkSteelRecipeManager.java @@ -34,7 +34,6 @@ public DarkSteelRecipeManager() { upgrades.add(SpeedUpgrade.SPEED_ONE); upgrades.add(SpeedUpgrade.SPEED_TWO); upgrades.add(SpeedUpgrade.SPEED_THREE); - upgrades.add(GliderUpgrade.INSTANCE); } @SubscribeEvent diff --git a/src/main/java/crazypants/enderio/item/darksteel/GliderUpgrade.java b/src/main/java/crazypants/enderio/item/darksteel/GliderUpgrade.java deleted file mode 100644 index c81ce94a41..0000000000 --- a/src/main/java/crazypants/enderio/item/darksteel/GliderUpgrade.java +++ /dev/null @@ -1,54 +0,0 @@ -package crazypants.enderio.item.darksteel; - -import crazypants.enderio.Config; -import crazypants.enderio.EnderIO; -import crazypants.enderio.material.Material; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; - -public class GliderUpgrade extends AbstractUpgrade { - - private static String UPGRADE_NAME = "glide"; - - public static final GliderUpgrade INSTANCE = new GliderUpgrade(); - - public static GliderUpgrade loadFromItem(ItemStack stack) { - if(stack == null) { - return null; - } - if(stack.stackTagCompound == null) { - return null; - } - if(!stack.stackTagCompound.hasKey(KEY_UPGRADE_PREFIX + UPGRADE_NAME)) { - return null; - } - return new GliderUpgrade((NBTTagCompound) stack.stackTagCompound.getTag(KEY_UPGRADE_PREFIX + UPGRADE_NAME)); - } - - - public GliderUpgrade(NBTTagCompound tag) { - super(UPGRADE_NAME, tag); - } - - public GliderUpgrade() { - super(UPGRADE_NAME, "enderio.darksteel.upgrade.glider", new ItemStack(EnderIO.itemGliderWing,1,1), Config.darkSteelGliderCost); - } - - @Override - public boolean canAddToItem(ItemStack stack) { - if(stack == null || stack.getItem() != EnderIO.itemDarkSteelChestplate) { - return false; - } - GliderUpgrade up = loadFromItem(stack); - if(up == null) { - return true; - } - return false; - } - - @Override - public void writeUpgradeToNBT(NBTTagCompound upgradeRoot) { - } - -} diff --git a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelArmor.java b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelArmor.java index 29cdbf109b..8defec2263 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelArmor.java +++ b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelArmor.java @@ -107,8 +107,6 @@ public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List par3List) SpeedUpgrade.SPEED_THREE.writeToItem(is); } else if(armorType == 3) { JumpUpgrade.JUMP_THREE.writeToItem(is); - } else if(armorType == 1) { - GliderUpgrade.INSTANCE.writeToItem(is); } par3List.add(is); @@ -149,10 +147,6 @@ public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, L if(EnergyUpgrade.itemHasAnyPowerUpgrade(itemstack)) { list.add(EnumChatFormatting.WHITE + Lang.localize("item.darkSteel_armor.tooltip.line1")); list.add(EnumChatFormatting.WHITE + Lang.localize("item.darkSteel_armor.tooltip.line2")); - if(itemstack.getItem() == EnderIO.itemDarkSteelBoots) { - list.add(EnumChatFormatting.WHITE + Lang.localize("item.darkSteel_boots.tooltip.line1")); - list.add(EnumChatFormatting.WHITE + Lang.localize("item.darkSteel_boots.tooltip.line2")); - } } DarkSteelRecipeManager.instance.addAdvancedTooltipEntries(itemstack, entityplayer, list, flag); } diff --git a/src/main/java/crazypants/enderio/item/darksteel/ItemGliderWing.java b/src/main/java/crazypants/enderio/item/darksteel/ItemGliderWing.java deleted file mode 100644 index 635f1aa590..0000000000 --- a/src/main/java/crazypants/enderio/item/darksteel/ItemGliderWing.java +++ /dev/null @@ -1,89 +0,0 @@ -package crazypants.enderio.item.darksteel; - -import java.util.List; - -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import crazypants.enderio.EnderIOTab; -import crazypants.enderio.ModObject; -import crazypants.enderio.material.ItemCapacitor; -import crazypants.enderio.power.BasicCapacitor; -import crazypants.enderio.power.Capacitors; -import crazypants.enderio.power.ICapacitor; -import crazypants.util.Lang; -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.util.IIcon; -import net.minecraft.util.MathHelper; - -public class ItemGliderWing extends Item { - - private static final BasicCapacitor CAP = new BasicCapacitor(); - - public static ItemGliderWing create() { - ItemGliderWing result = new ItemGliderWing(); - result.init(); - return result; - } - - private IIcon wingsIcon; - - protected ItemGliderWing() { - setCreativeTab(EnderIOTab.tabEnderIO); - setUnlocalizedName(ModObject.itemGliderWing.unlocalisedName); - setHasSubtypes(true); - setMaxDamage(0); - setMaxStackSize(64); - } - - protected void init() { - GameRegistry.registerItem(this, ModObject.itemGliderWing.unlocalisedName); - } - - @Override - public IIcon getIconFromDamage(int damage) { - damage = MathHelper.clamp_int(damage, 0, 1); - if(damage == 0) { - return itemIcon; - } - return wingsIcon; - } - - @Override - public void registerIcons(IIconRegister register) { - itemIcon = register.registerIcon("enderio:itemGliderWing"); - wingsIcon = register.registerIcon("enderio:itemGliderWings"); - } - - @Override - public String getUnlocalizedName(ItemStack par1ItemStack) { - int i = MathHelper.clamp_int(par1ItemStack.getItemDamage(), 0, Capacitors.values().length - 1); - if(i == 0) { - return super.getUnlocalizedName(); - } - return super.getUnlocalizedName() + "s"; - } - - @Override - @SuppressWarnings({ "rawtypes", "unchecked" }) - public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { - for (int j = 0; j < 2; ++j) { - par3List.add(new ItemStack(par1, 1, j)); - } - } - - -// @Override -// @SideOnly(Side.CLIENT) -// public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { -// if(par1ItemStack != null && par1ItemStack.getItemDamage() > 0) { -// par3List.add(Lang.localize("machine.tooltip.upgrade")); -// } -// -// } - -} diff --git a/src/main/java/crazypants/enderio/item/darksteel/KeyTracker.java b/src/main/java/crazypants/enderio/item/darksteel/KeyTracker.java deleted file mode 100644 index 51e4ff025f..0000000000 --- a/src/main/java/crazypants/enderio/item/darksteel/KeyTracker.java +++ /dev/null @@ -1,56 +0,0 @@ -package crazypants.enderio.item.darksteel; - -import org.lwjgl.input.Keyboard; - -import cpw.mods.fml.client.registry.ClientRegistry; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.gameevent.InputEvent.KeyInputEvent; -import crazypants.enderio.network.PacketHandler; -import crazypants.util.Lang; -import net.minecraft.client.Minecraft; -import net.minecraft.client.settings.KeyBinding; -import net.minecraft.util.ChatComponentTranslation; - -public class KeyTracker { - - public static KeyTracker instance = new KeyTracker(); - - static { - FMLCommonHandler.instance().bus().register(instance); - } - - private KeyBinding glideKey; - private boolean wasGlideKeyPressed = false; - - private boolean isGlideActive = false; - - public KeyTracker() { - glideKey = new KeyBinding("Glider Toggle", Keyboard.KEY_G, "Dark Steel Armor"); - ClientRegistry.registerKeyBinding(glideKey); - } - - @SubscribeEvent - public void onKeyInput(KeyInputEvent event) { - if(!DarkSteelController.instance.isGliderUpgradeEquipped(Minecraft.getMinecraft().thePlayer)) { - return; - } - if(glideKey.getIsKeyPressed()) { - isGlideActive = !isGlideActive; - String message; - if(isGlideActive) { - message = Lang.localize("darksteel.upgrade.glider.enabled"); - } else { - message = Lang.localize("darksteel.upgrade.glider.disabled"); - } - Minecraft.getMinecraft().thePlayer.addChatComponentMessage(new ChatComponentTranslation(message)); - DarkSteelController.instance.setGlideActive(Minecraft.getMinecraft().thePlayer, isGlideActive); - PacketHandler.INSTANCE.sendToServer(new PacketGlideState(isGlideActive)); - } - } - - public boolean isGlideActive() { - return isGlideActive; - } - -} diff --git a/src/main/java/crazypants/enderio/item/darksteel/PacketGlideState.java b/src/main/java/crazypants/enderio/item/darksteel/PacketGlideState.java deleted file mode 100644 index b3e2f31fe4..0000000000 --- a/src/main/java/crazypants/enderio/item/darksteel/PacketGlideState.java +++ /dev/null @@ -1,38 +0,0 @@ -package crazypants.enderio.item.darksteel; - -import net.minecraft.entity.player.EntityPlayerMP; -import io.netty.buffer.ByteBuf; -import cpw.mods.fml.common.network.simpleimpl.IMessage; -import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; -import cpw.mods.fml.common.network.simpleimpl.MessageContext; - -public class PacketGlideState implements IMessage, IMessageHandler { - - public PacketGlideState() { - } - - private boolean glideActive; - - public PacketGlideState(boolean glideActive) { - this.glideActive = glideActive; - } - - @Override - public void toBytes(ByteBuf buf) { - buf.writeBoolean(glideActive); - - } - - @Override - public void fromBytes(ByteBuf buf) { - glideActive = buf.readBoolean(); - } - - @Override - public IMessage onMessage(PacketGlideState message, MessageContext ctx) { - EntityPlayerMP player = ctx.getServerHandler().playerEntity; - DarkSteelController.instance.setGlideActive(player, message.glideActive); - return null; - } - -} diff --git a/src/main/java/crazypants/enderio/machine/GuiOverlayIoConfig.java b/src/main/java/crazypants/enderio/machine/GuiOverlayIoConfig.java index a7ac90f8b0..2004b852d1 100644 --- a/src/main/java/crazypants/enderio/machine/GuiOverlayIoConfig.java +++ b/src/main/java/crazypants/enderio/machine/GuiOverlayIoConfig.java @@ -68,7 +68,7 @@ public void draw(int mouseX, int mouseY, float partialTick) { RenderUtil.renderQuad2D(bounds.x, bounds.y, 0, bounds.width, bounds.height, ColorUtil.getRGB(Color.black)); Minecraft mc = Minecraft.getMinecraft(); - ScaledResolution scaledresolution = new ScaledResolution(mc.gameSettings, mc.displayWidth, mc.displayHeight); + ScaledResolution scaledresolution = new ScaledResolution(mc, mc.displayWidth, mc.displayHeight); int vpx = ( (screen.getGuiLeft() + bounds.x)* scaledresolution.getScaleFactor()); int vpy = (screen.getGuiTop() + 4) * scaledresolution.getScaleFactor(); diff --git a/src/main/java/crazypants/enderio/machine/MachineRecipes.java b/src/main/java/crazypants/enderio/machine/MachineRecipes.java index bf74eab7af..3b335bafa9 100644 --- a/src/main/java/crazypants/enderio/machine/MachineRecipes.java +++ b/src/main/java/crazypants/enderio/machine/MachineRecipes.java @@ -130,10 +130,6 @@ public static void addRecipes() { .addShapedRecipe(mJMonitor, "bmb", "bMb", "bcb", 'b', Blocks.stonebrick, 'e', Items.ender_eye, 'M', machineChassi, 'm', mJReader, 'p', powerConduit, 'r', redstoneConduit, 'c', capacitor); - //Vacuum Chest - ItemStack vacuumChest = new ItemStack(EnderIO.blockVacuumChest); - GameRegistry.addShapedRecipe(vacuumChest, "iii", "ici","ipi", 'i', Items.iron_ingot, 'c', Blocks.chest, 'p', pulCry); - } public static void addOreDictionaryRecipes() { diff --git a/src/main/java/crazypants/enderio/machine/farm/FakeFarmPlayer.java b/src/main/java/crazypants/enderio/machine/farm/FakeFarmPlayer.java index 6aa6fd749e..fa201a6455 100644 --- a/src/main/java/crazypants/enderio/machine/farm/FakeFarmPlayer.java +++ b/src/main/java/crazypants/enderio/machine/farm/FakeFarmPlayer.java @@ -1,5 +1,7 @@ package crazypants.enderio.machine.farm; +import java.util.UUID; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; @@ -17,8 +19,10 @@ import cpw.mods.fml.common.FMLCommonHandler; public class FakeFarmPlayer extends EntityPlayerMP { - - private static GameProfile DUMMY_PROFILE = new GameProfile("EioFarmerID", "[EioFarmer]"); + + private static final UUID uuid = UUID.fromString("c1ddfd7f-120a-4437-8b64-38660d3ec62d"); + + private static GameProfile DUMMY_PROFILE = new GameProfile(uuid, "[EioFarmer]"); public FakeFarmPlayer(WorldServer world) { super(FMLCommonHandler.instance().getMinecraftServerInstance(), world, DUMMY_PROFILE, new ItemInWorldManager(world)); diff --git a/src/main/java/crazypants/enderio/machine/hypercube/BlockHyperCube.java b/src/main/java/crazypants/enderio/machine/hypercube/BlockHyperCube.java index 951faf5117..2ae1491484 100644 --- a/src/main/java/crazypants/enderio/machine/hypercube/BlockHyperCube.java +++ b/src/main/java/crazypants/enderio/machine/hypercube/BlockHyperCube.java @@ -3,6 +3,7 @@ import java.text.NumberFormat; import java.util.ArrayList; import java.util.Random; +import java.util.UUID; import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; @@ -158,7 +159,7 @@ private void setChannelOnItem(TileHyperCube hc, ItemStack itemStack) { tag.setString("channelName", chan.name); tag.setBoolean("channelIsPublic", chan.isPublic()); if(!chan.isPublic()) { - tag.setString("channelUser", chan.user); + tag.setString("channelUser", chan.user.toString()); } } } @@ -197,9 +198,9 @@ private Channel getChannelFromItem(ItemStack itemStack) { return null; } - String user = null; + UUID user = null; if(!tag.getBoolean("channelIsPublic")) { - user = tag.getString("channelUser"); + user = UUID.fromString(tag.getString("channelUser")); } return new Channel(channelName, user); diff --git a/src/main/java/crazypants/enderio/machine/hypercube/Channel.java b/src/main/java/crazypants/enderio/machine/hypercube/Channel.java index 1731a53efc..7905086637 100644 --- a/src/main/java/crazypants/enderio/machine/hypercube/Channel.java +++ b/src/main/java/crazypants/enderio/machine/hypercube/Channel.java @@ -1,13 +1,15 @@ package crazypants.enderio.machine.hypercube; +import java.util.UUID; + public class Channel { final String name; - final String user; + final UUID user; - Channel(String name, String user) { + Channel(String name, UUID uuid) { this.name = trim(name); - this.user = trim(user); + this.user = uuid; } public boolean isPublic() { diff --git a/src/main/java/crazypants/enderio/machine/hypercube/HyperCubeConfig.java b/src/main/java/crazypants/enderio/machine/hypercube/HyperCubeConfig.java index e7df85cdc4..20f22aa2fb 100644 --- a/src/main/java/crazypants/enderio/machine/hypercube/HyperCubeConfig.java +++ b/src/main/java/crazypants/enderio/machine/hypercube/HyperCubeConfig.java @@ -12,6 +12,7 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Properties; +import java.util.UUID; import org.apache.commons.io.IOUtils; @@ -32,7 +33,7 @@ public class HyperCubeConfig { private final List publicChannels = new ArrayList(); - private final Map> userChannels = new HashMap>(); + private final Map> userChannels = new HashMap>(); private final File file; @@ -52,11 +53,11 @@ public void setPublicChannels(Collection chans) { publicChannels.addAll(chans); } - public Map> getUserChannels() { + public Map> getUserChannels() { return userChannels; } - public void setUserChannels(Map> channels) { + public void setUserChannels(Map> channels) { userChannels.clear(); userChannels.putAll(channels); } @@ -67,16 +68,14 @@ public void save() { setChannelListProperty(KEY_PUBLIC_CHANNELS, publicChannels); StringBuilder userListStr = new StringBuilder(); - Iterator>> itr = userChannels.entrySet().iterator(); + Iterator>> itr = userChannels.entrySet().iterator(); while (itr.hasNext()) { - Entry> entry = itr.next(); - String user = entry.getKey(); - if(user != null) { - user = user.trim(); - } + Entry> entry = itr.next(); + UUID user = entry.getKey(); + List channels = entry.getValue(); if(user != null && channels != null && !channels.isEmpty()) { - userListStr.append(user); + userListStr.append(user.toString()); setChannelListProperty(user + KEY_USER_CHANNEL, channels); } if(itr.hasNext()) { @@ -135,18 +134,15 @@ private void load(File file) { loadChannelList(KEY_PUBLIC_CHANNELS, null, publicChannels); userChannels.clear(); - List users = new ArrayList(); + List users = new ArrayList(); String usersStr = props.getProperty(KEY_USERS, ""); String[] usersSplit = usersStr.split(DELIM); for (String user : usersSplit) { if(user != null) { - user = user.trim(); - if(!user.isEmpty()) { - users.add(user); - } + users.add(UUID.fromString(user)); } } - for (String user : users) { + for (UUID user : users) { List channels = new ArrayList(); loadChannelList(user + KEY_USER_CHANNEL, user, channels); if(!channels.isEmpty()) { @@ -156,7 +152,7 @@ private void load(File file) { } - private void loadChannelList(String key, String user, List channels) { + private void loadChannelList(String key, UUID user, List channels) { String chans = props.getProperty(key, ""); //chans = chans.replaceAll(DELIM_ESC, DELIM); String[] chanSplit = chans.split(DELIM); diff --git a/src/main/java/crazypants/enderio/machine/hypercube/HyperCubeRegister.java b/src/main/java/crazypants/enderio/machine/hypercube/HyperCubeRegister.java index cdb5454020..969c9fcaf2 100644 --- a/src/main/java/crazypants/enderio/machine/hypercube/HyperCubeRegister.java +++ b/src/main/java/crazypants/enderio/machine/hypercube/HyperCubeRegister.java @@ -6,6 +6,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.UUID; import net.minecraftforge.common.DimensionManager; import crazypants.enderio.Log; @@ -23,7 +24,7 @@ public class HyperCubeRegister { private final List publicChannels = new ArrayList(); private final List publicChannelsRO = Collections.unmodifiableList(publicChannels); - private final Map> userChannels = new HashMap>(); + private final Map> userChannels = new HashMap>(); //private Configuration config; private HyperCubeConfig conf; @@ -44,7 +45,7 @@ private void innerLoad() { userChannels.putAll(conf.getUserChannels()); } - public synchronized List getChannelsForUser(String user) { + public synchronized List getChannelsForUser(UUID user) { List result = userChannels.get(user); if(result == null) { result = new ArrayList(); diff --git a/src/main/java/crazypants/enderio/machine/hypercube/PacketAddRemoveChannel.java b/src/main/java/crazypants/enderio/machine/hypercube/PacketAddRemoveChannel.java index 9209a9a29e..54813290cb 100644 --- a/src/main/java/crazypants/enderio/machine/hypercube/PacketAddRemoveChannel.java +++ b/src/main/java/crazypants/enderio/machine/hypercube/PacketAddRemoveChannel.java @@ -1,5 +1,7 @@ package crazypants.enderio.machine.hypercube; +import java.util.UUID; + import io.netty.buffer.ByteBuf; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.network.ByteBufUtils; @@ -28,7 +30,7 @@ public void toBytes(ByteBuf buf) { buf.writeBoolean(channel.isPublic()); ByteBufUtils.writeUTF8String(buf, channel.name); if(!channel.isPublic()) { - ByteBufUtils.writeUTF8String(buf, channel.user); + ByteBufUtils.writeUTF8String(buf, channel.user.toString()); } } @@ -42,7 +44,7 @@ public void fromBytes(ByteBuf data) { if(!isPublic) { user = ByteBufUtils.readUTF8String(data); } - channel = new Channel(name, user); + channel = new Channel(name, user == null ? null : UUID.fromString(user)); } @Override diff --git a/src/main/java/crazypants/enderio/machine/hypercube/PacketChannelList.java b/src/main/java/crazypants/enderio/machine/hypercube/PacketChannelList.java index e0eeaaa5ba..d8b37d72e1 100644 --- a/src/main/java/crazypants/enderio/machine/hypercube/PacketChannelList.java +++ b/src/main/java/crazypants/enderio/machine/hypercube/PacketChannelList.java @@ -4,6 +4,7 @@ import java.util.ArrayList; import java.util.List; +import java.util.UUID; import net.minecraft.entity.player.EntityPlayer; import cpw.mods.fml.common.network.ByteBufUtils; @@ -15,7 +16,7 @@ public class PacketChannelList implements IMessage, IMessageHandler channels; - private String userId; + private UUID userId; public PacketChannelList() { } @@ -24,16 +25,16 @@ public PacketChannelList(EntityPlayer player, boolean isPrivate) { this(player.getGameProfile().getId(), isPrivate); } - public PacketChannelList(String userId, boolean isPrivate) { - this.userId = userId; + public PacketChannelList(UUID uuid, boolean isPrivate) { + this.userId = uuid; this.isPrivate = isPrivate; - if(isPrivate && userId == null || userId.trim().length() == 0) { + if(isPrivate && uuid == null) { throw new RuntimeException("Null user ID."); } List res; if(isPrivate) { - res = HyperCubeRegister.instance.getChannelsForUser(userId); + res = HyperCubeRegister.instance.getChannelsForUser(uuid); } else { res = HyperCubeRegister.instance.getPublicChannels(); } @@ -49,7 +50,7 @@ public PacketChannelList(String userId, boolean isPrivate) { public void toBytes(ByteBuf buffer) { buffer.writeBoolean(isPrivate); if(isPrivate) { - ByteBufUtils.writeUTF8String(buffer, userId); + ByteBufUtils.writeUTF8String(buffer, userId.toString()); } buffer.writeInt(channels.size()); for (Channel channel : channels) { @@ -62,7 +63,7 @@ public void toBytes(ByteBuf buffer) { public void fromBytes(ByteBuf buffer) { isPrivate = buffer.readBoolean(); if(isPrivate) { - userId = ByteBufUtils.readUTF8String(buffer); + userId = UUID.fromString(ByteBufUtils.readUTF8String(buffer)); } else { userId = null; } @@ -71,7 +72,6 @@ public void fromBytes(ByteBuf buffer) { for (int i = 0; i < numChannels; i++) { channels.add(new Channel(ByteBufUtils.readUTF8String(buffer), userId)); } - } @Override diff --git a/src/main/java/crazypants/enderio/machine/hypercube/PacketClientState.java b/src/main/java/crazypants/enderio/machine/hypercube/PacketClientState.java index ecf3565adb..f7e5495c4e 100644 --- a/src/main/java/crazypants/enderio/machine/hypercube/PacketClientState.java +++ b/src/main/java/crazypants/enderio/machine/hypercube/PacketClientState.java @@ -4,6 +4,7 @@ import java.util.ArrayList; import java.util.List; +import java.util.UUID; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; @@ -50,7 +51,7 @@ public void toBytes(ByteBuf buf) { if(selectedChannel.isPublic()) { ByteBufUtils.writeUTF8String(buf, ""); } else { - ByteBufUtils.writeUTF8String(buf, selectedChannel.user); + ByteBufUtils.writeUTF8String(buf, selectedChannel.user.toString()); } } @@ -70,7 +71,7 @@ public void fromBytes(ByteBuf buf) { selectedChannel = null; if(name != null && name.trim().length() > 0) { if(user != null && user.trim().length() > 0) { - selectedChannel = new Channel(name, user); + selectedChannel = new Channel(name, UUID.fromString(user)); } else { selectedChannel = new Channel(name, null); } diff --git a/src/main/java/crazypants/enderio/machine/hypercube/TileHyperCube.java b/src/main/java/crazypants/enderio/machine/hypercube/TileHyperCube.java index e221660564..d260387132 100644 --- a/src/main/java/crazypants/enderio/machine/hypercube/TileHyperCube.java +++ b/src/main/java/crazypants/enderio/machine/hypercube/TileHyperCube.java @@ -5,6 +5,7 @@ import java.util.EnumMap; import java.util.List; import java.util.ListIterator; +import java.util.UUID; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; @@ -34,6 +35,7 @@ import crazypants.util.BlockCoord; import crazypants.util.ItemUtil; import crazypants.util.Lang; +import crazypants.util.Util; import crazypants.vecmath.VecmathUtil; public class TileHyperCube extends TileEntityEio implements IInternalPowerReceptor, IFluidHandler, ISidedInventory, IRedstoneModeControlable { @@ -120,7 +122,7 @@ public static enum SubChannel { private Channel channel = null; private Channel registeredChannel = null; - private String owner; + private UUID owner; private boolean init = true; @@ -184,7 +186,7 @@ public void onBlockAdded() { HyperCubeRegister.instance.register(this); } - public void setOwner(String owner) { + public void setOwner(UUID owner) { this.owner = owner; } @@ -839,12 +841,12 @@ public void readCustomNBT(NBTTagCompound nbtRoot) { String channelName = nbtRoot.getString("channelName"); String channelUser = nbtRoot.getString("channelUser"); if(channelName != null && !channelName.isEmpty()) { - channel = new Channel(channelName, channelUser == null || channelUser.isEmpty() ? null : channelUser); + channel = new Channel(channelName, channelUser == null || channelUser.isEmpty() ? null : UUID.fromString(channelUser)); } else { channel = null; } - owner = nbtRoot.getString("owner"); + owner = UUID.fromString(nbtRoot.getString("owner")); for (SubChannel subChannel : SubChannel.values()) { String key = "subChannel" + subChannel.ordinal(); @@ -868,11 +870,11 @@ public void writeCustomNBT(NBTTagCompound nbtRoot) { if(channel != null) { nbtRoot.setString("channelName", channel.name); if(channel.user != null) { - nbtRoot.setString("channelUser", channel.user); + nbtRoot.setString("channelUser", channel.user.toString()); } } - if(owner != null && !(owner.isEmpty())) { - nbtRoot.setString("owner", owner); + if(owner != null) { + nbtRoot.setString("owner", owner.toString()); } for (SubChannel subChannel : SubChannel.values()) { diff --git a/src/main/java/crazypants/enderio/machine/power/BlockCapacitorBank.java b/src/main/java/crazypants/enderio/machine/power/BlockCapacitorBank.java index 093f76fa15..07c0c96581 100644 --- a/src/main/java/crazypants/enderio/machine/power/BlockCapacitorBank.java +++ b/src/main/java/crazypants/enderio/machine/power/BlockCapacitorBank.java @@ -355,7 +355,7 @@ public AxisAlignedBB getSelectedBoundingBoxFromPool(World world, int x, int y, i min.z = Math.min(min.z, bc.z); max.z = Math.max(max.z, bc.z + 1); } - return AxisAlignedBB.getAABBPool().getAABB(min.x, min.y, min.z, max.x, max.y, max.z); + return AxisAlignedBB.getBoundingBox(min.x, min.y, min.z, max.x, max.y, max.z); } } diff --git a/src/main/java/crazypants/enderio/machine/recipe/OreDictionaryRecipeInput.java b/src/main/java/crazypants/enderio/machine/recipe/OreDictionaryRecipeInput.java index 69ddea2c65..1845d45205 100644 --- a/src/main/java/crazypants/enderio/machine/recipe/OreDictionaryRecipeInput.java +++ b/src/main/java/crazypants/enderio/machine/recipe/OreDictionaryRecipeInput.java @@ -19,7 +19,7 @@ public OreDictionaryRecipeInput(ItemStack stack, int oreId, float multiplier, in } public OreDictionaryRecipeInput(OreDictionaryRecipeInput copy) { - super(copy); + super(copy.getInput(), true, copy.getMulitplier(), copy.getSlotNumber()); oreId = copy.oreId; } diff --git a/src/main/java/crazypants/enderio/machine/reservoir/BlockReservoir.java b/src/main/java/crazypants/enderio/machine/reservoir/BlockReservoir.java index df4f1990e2..b1f9a50433 100644 --- a/src/main/java/crazypants/enderio/machine/reservoir/BlockReservoir.java +++ b/src/main/java/crazypants/enderio/machine/reservoir/BlockReservoir.java @@ -162,7 +162,7 @@ public AxisAlignedBB getSelectedBoundingBoxFromPool(World world, int x, int y, i min.z = Math.min(min.z, bc.z); max.z = Math.max(max.z, bc.z + 1); } - return AxisAlignedBB.getAABBPool().getAABB(min.x, min.y, min.z, max.x, max.y, max.z); + return AxisAlignedBB.getBoundingBox(min.x, min.y, min.z, max.x, max.y, max.z); } diff --git a/src/main/java/crazypants/enderio/machine/spawner/ItemBrokenSpawner.java b/src/main/java/crazypants/enderio/machine/spawner/ItemBrokenSpawner.java index 3f74245714..4c0cf18cf1 100644 --- a/src/main/java/crazypants/enderio/machine/spawner/ItemBrokenSpawner.java +++ b/src/main/java/crazypants/enderio/machine/spawner/ItemBrokenSpawner.java @@ -14,7 +14,6 @@ import crazypants.enderio.EnderIO; import crazypants.enderio.EnderIOTab; import crazypants.enderio.ModObject; -import crazypants.enderio.gui.TooltipAddera; public class ItemBrokenSpawner extends Item { @@ -56,7 +55,7 @@ protected ItemBrokenSpawner() { setUnlocalizedName(ModObject.itemBrokenSpawner.unlocalisedName); setHasSubtypes(true); setMaxDamage(0); - setMaxStackSize(8); + setMaxStackSize(1); } @Override @@ -92,11 +91,7 @@ public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlaye par3List.add(mobName); } } - if(TooltipAddera.showAdvancedTooltips()) { - TooltipAddera.addDetailedTooltipFromResources(par3List, par1ItemStack); - } else { - TooltipAddera.addShowDetailsTooltip(par3List); - } + } } diff --git a/src/main/java/crazypants/enderio/machine/spawner/TilePoweredSpawner.java b/src/main/java/crazypants/enderio/machine/spawner/TilePoweredSpawner.java index 5996b3e74f..601be25213 100644 --- a/src/main/java/crazypants/enderio/machine/spawner/TilePoweredSpawner.java +++ b/src/main/java/crazypants/enderio/machine/spawner/TilePoweredSpawner.java @@ -1,6 +1,5 @@ package crazypants.enderio.machine.spawner; - import net.minecraft.entity.Entity; import net.minecraft.entity.EntityList; import net.minecraft.entity.EntityLiving; @@ -27,9 +26,9 @@ public class TilePoweredSpawner extends AbstractPoweredTaskEntity { public static final float POWER_PER_TICK_THREE = Config.poweredSpawnerLevelThreePowerPerTick; public static final int MIN_PLAYER_DISTANCE = Config.poweredSpawnerMaxPlayerDistance; public static final boolean USE_VANILLA_SPAWN_CHECKS = Config.poweredSpawnerUseVanillaSpawChecks; - + private final MobSpawnerBaseLogic logic = new SpawnerLogic(); - + private static final String NULL_ENTITY_NAME = "None"; public TilePoweredSpawner() { @@ -42,7 +41,7 @@ public TilePoweredSpawner() { @Override protected void taskComplete() { super.taskComplete(); - logic.spawnDelay = 0; + logic.spawnDelay = 0; } @Override @@ -74,8 +73,8 @@ public float getPowerUsePerTick() { return POWER_PER_TICK_ONE; } else if(capacitorType.ordinal() == 1) { return POWER_PER_TICK_TWO; - } - return POWER_PER_TICK_THREE; + } + return POWER_PER_TICK_THREE; } @Override @@ -84,19 +83,19 @@ protected boolean hasInputStacks() { } @Override - protected boolean canInsertResult(float chance, IMachineRecipe nextRecipe) { + protected boolean canInsertResult(float chance, IMachineRecipe nextRecipe) { return true; } public void readCustomNBT(NBTTagCompound nbtRoot) { - super.readCustomNBT(nbtRoot); - logic.readFromNBT(nbtRoot); + super.readCustomNBT(nbtRoot); + logic.readFromNBT(nbtRoot); } public void writeCustomNBT(NBTTagCompound nbtRoot) { super.writeCustomNBT(nbtRoot); logic.writeToNBT(nbtRoot); - + } @Override @@ -117,12 +116,12 @@ public void writeCommon(NBTTagCompound nbtRoot) { BlockPoweredSpawner.writeMobTypeToNBT(nbtRoot, null); } else { BlockPoweredSpawner.writeMobTypeToNBT(nbtRoot, mobType); - } + } } public void updateEntity() { logic.updateSpawner(); - super.updateEntity(); + super.updateEntity(); } /** @@ -132,23 +131,25 @@ public void updateEntity() { public boolean receiveClientEvent(int p_145842_1_, int p_145842_2_) { return logic.setDelayToMin(p_145842_1_) ? true : super.receiveClientEvent(p_145842_1_, p_145842_2_); } - + protected IPoweredTask createTask(IMachineRecipe nextRecipe, float chance) { PoweredTask res = new PoweredTask(nextRecipe, chance, getInputs()); - - int ticksDelay = TilePoweredSpawner.MIN_SPAWN_DELAY_BASE + (int)Math.round((TilePoweredSpawner.MAX_SPAWN_DELAY_BASE - TilePoweredSpawner.MIN_SPAWN_DELAY_BASE) * Math.random()); + + int ticksDelay = TilePoweredSpawner.MIN_SPAWN_DELAY_BASE + + (int) Math.round((TilePoweredSpawner.MAX_SPAWN_DELAY_BASE - TilePoweredSpawner.MIN_SPAWN_DELAY_BASE) * Math.random()); if(capacitorType.ordinal() == 1) { ticksDelay /= 2; } else if(capacitorType.ordinal() == 2) { ticksDelay /= 4; } - int powerPerTick = (int)getPowerUsePerTick(); - res.setRequiredEnergy(powerPerTick * ticksDelay); + int powerPerTick = (int) getPowerUsePerTick(); + res.setRequiredEnergy(powerPerTick * ticksDelay); return res; } - - protected boolean canSpawnEntity(EntityLiving entityliving) { - boolean spaceClear = worldObj.checkNoEntityCollision(entityliving.boundingBox) && worldObj.getCollidingBoundingBoxes(entityliving, entityliving.boundingBox).isEmpty() && !worldObj.isAnyLiquid(entityliving.boundingBox); + + protected boolean canSpawnEntity(EntityLiving entityliving) { + boolean spaceClear = worldObj.checkNoEntityCollision(entityliving.boundingBox) + && worldObj.getCollidingBoundingBoxes(entityliving, entityliving.boundingBox).isEmpty() && !worldObj.isAnyLiquid(entityliving.boundingBox); if(spaceClear && USE_VANILLA_SPAWN_CHECKS) { //Full checks for lighting, dimension etc spaceClear = entityliving.getCanSpawnHere(); @@ -158,10 +159,10 @@ protected boolean canSpawnEntity(EntityLiving entityliving) { class SpawnerLogic extends MobSpawnerBaseLogic { - private int spawnCount = 4; + private int spawnCount = 4; private int maxNearbyEntities = 6; private int spawnRange = 4; - + public void func_98267_a(int par1) { worldObj.addBlockEvent(xCoord, yCoord, zCoord, EnderIO.blockPoweredSpawner, par1, 0); } @@ -196,16 +197,17 @@ public void setRandomEntity(MobSpawnerBaseLogic.WeightedRandomMinecart par1Weigh public boolean isActivated() { if(MIN_PLAYER_DISTANCE > 0) { //TODO: Add this to main 'hasPower' like check so turn of the machine if the player is out of range? - boolean playerInRange = worldObj.getClosestPlayer((double)getSpawnerX() + 0.5D, (double)getSpawnerY() + 0.5D, (double)getSpawnerZ() + 0.5D, (double)MIN_PLAYER_DISTANCE) != null; + boolean playerInRange = worldObj.getClosestPlayer((double) getSpawnerX() + 0.5D, (double) getSpawnerY() + 0.5D, (double) getSpawnerZ() + 0.5D, + (double) MIN_PLAYER_DISTANCE) != null; if(!playerInRange) { return false; } } - return isActive(); + return isActive(); } public void updateSpawner() { - + if(isActivated()) { double d2; @@ -224,7 +226,7 @@ public void updateSpawner() { field_98284_d = field_98287_c; field_98287_c = (field_98287_c + (double) (1000.0F / ((float) spawnDelay + 200.0F))) % 360.0D; } else { - + if(spawnDelay == -1) { resetTimer(); } @@ -236,7 +238,7 @@ public void updateSpawner() { boolean doTimerReset = false; for (int i = 0; i < spawnCount; ++i) { - + Entity entity = EntityList.createEntityByName(getEntityNameToSpawn(), getSpawnerWorld()); if(entity == null) { @@ -245,10 +247,8 @@ public void updateSpawner() { int j = getSpawnerWorld().getEntitiesWithinAABB( entity.getClass(), - AxisAlignedBB - .getAABBPool() - .getAABB((double) getSpawnerX(), (double) getSpawnerY(), (double) getSpawnerZ(), (double) (getSpawnerX() + 1), - (double) (getSpawnerY() + 1), (double) (getSpawnerZ() + 1)).expand((double) (spawnRange * 2), 4.0D, (double) (spawnRange * 2))).size(); + AxisAlignedBB.getBoundingBox((double) getSpawnerX(), (double) getSpawnerY(), (double) getSpawnerZ(), (double) (getSpawnerX() + 1), + (double) (getSpawnerY() + 1), (double) (getSpawnerZ() + 1)).expand((double) (spawnRange * 2), 4.0D, (double) (spawnRange * 2))).size(); if(j >= maxNearbyEntities) { resetTimer(); @@ -282,7 +282,7 @@ public void updateSpawner() { } void resetTimer() { - spawnDelay = Integer.MAX_VALUE; + spawnDelay = Integer.MAX_VALUE; } } diff --git a/src/main/java/crazypants/enderio/machine/vacuum/BlockVacuumChest.java b/src/main/java/crazypants/enderio/machine/vacuum/BlockVacuumChest.java deleted file mode 100644 index f8125a6db6..0000000000 --- a/src/main/java/crazypants/enderio/machine/vacuum/BlockVacuumChest.java +++ /dev/null @@ -1,98 +0,0 @@ -package crazypants.enderio.machine.vacuum; - -import buildcraft.api.tools.IToolWrench; -import cpw.mods.fml.common.network.IGuiHandler; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; -import crazypants.enderio.BlockEio; -import crazypants.enderio.EnderIO; -import crazypants.enderio.GuiHandler; -import crazypants.enderio.ModObject; -import crazypants.enderio.conduit.ConduitUtil; -import crazypants.enderio.machine.AbstractMachineEntity; -import crazypants.enderio.machine.power.ContainerCapacitorBank; -import crazypants.enderio.machine.power.GuiCapacitorBank; -import crazypants.enderio.machine.power.TileCapacitorBank; - -public class BlockVacuumChest extends BlockEio implements IGuiHandler { - - public static BlockVacuumChest create() { - BlockVacuumChest res = new BlockVacuumChest(); - res.init(); - return res; - } - - public static int renderId; - - protected BlockVacuumChest() { - super(ModObject.blockVacuumChest.unlocalisedName, TileVacuumChest.class); - setBlockTextureName("enderio:blockVacuumChest"); - } - - @Override - protected void init() { - super.init(); - EnderIO.guiHandler.registerGuiHandler(GuiHandler.GUI_ID_VACUUM_CHEST, this); - } - - @Override - public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer entityPlayer, int side, float par7, float par8, float par9) { - - if(ConduitUtil.isToolEquipped(entityPlayer)) { - if(entityPlayer.isSneaking() && entityPlayer.getCurrentEquippedItem().getItem() instanceof IToolWrench) { - IToolWrench wrench = (IToolWrench) entityPlayer.getCurrentEquippedItem().getItem(); - if(wrench.canWrench(entityPlayer, x, y, z)) { - removedByPlayer(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; - } - entityPlayer.openGui(EnderIO.instance, GuiHandler.GUI_ID_VACUUM_CHEST, world, x, y, z); - return true; - } - - @Override - public int getRenderType() { - return renderId; - } - - @Override - public boolean isOpaqueCube() { - return false; - } - - @Override - public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof TileVacuumChest) { - return new ContainerVacuumChest(player, player.inventory, (TileVacuumChest) te); - } - return null; - } - - @Override - public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof TileVacuumChest) { - return new GuiVacuumChest(player, player.inventory, (TileVacuumChest) te); - } - return null; - } - - public void breakBlock(World world, int x, int y, int z, Block block, int p_149749_6_) { - super.breakBlock(world, x, y, z, block, p_149749_6_); - world.removeTileEntity(x, y, z); - } - -} diff --git a/src/main/java/crazypants/enderio/machine/vacuum/ContainerVacuumChest.java b/src/main/java/crazypants/enderio/machine/vacuum/ContainerVacuumChest.java deleted file mode 100644 index 303a979957..0000000000 --- a/src/main/java/crazypants/enderio/machine/vacuum/ContainerVacuumChest.java +++ /dev/null @@ -1,66 +0,0 @@ -package crazypants.enderio.machine.vacuum; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.Slot; -import net.minecraft.item.ItemStack; - -public class ContainerVacuumChest extends Container { - - private int numRows = 3; - - public ContainerVacuumChest(EntityPlayer player, InventoryPlayer inventory, TileVacuumChest te) { - - int x = 8; - int y = 17; - int index = -1; - for (int i = 0; i < 3; ++i) { - for (int j = 0; j < 9; ++j) { - addSlotToContainer(new Slot(te, ++index, x + j * 18, y + i * 18)); - } - } - - y = 84; - // add players inventory - for (int i = 0; i < 3; ++i) { - for (int j = 0; j < 9; ++j) { - addSlotToContainer(new Slot(inventory, j + i * 9 + 9, x + j * 18, y + i * 18)); - } - } - for (int i = 0; i < 9; ++i) { - addSlotToContainer(new Slot(inventory, i, x + i * 18, y + 58)); - } - } - - @Override - public boolean canInteractWith(EntityPlayer var1) { - return true; - } - - public ItemStack transferStackInSlot(EntityPlayer par1EntityPlayer, int par2) { - ItemStack itemstack = null; - Slot slot = (Slot) this.inventorySlots.get(par2); - - if(slot != null && slot.getHasStack()) { - ItemStack itemstack1 = slot.getStack(); - itemstack = itemstack1.copy(); - - if(par2 < this.numRows * 9) { - if(!this.mergeItemStack(itemstack1, this.numRows * 9, this.inventorySlots.size(), true)) { - return null; - } - } else if(!this.mergeItemStack(itemstack1, 0, this.numRows * 9, false)) { - return null; - } - - if(itemstack1.stackSize == 0) { - slot.putStack((ItemStack) null); - } else { - slot.onSlotChanged(); - } - } - return itemstack; - } - -} diff --git a/src/main/java/crazypants/enderio/machine/vacuum/GuiVacuumChest.java b/src/main/java/crazypants/enderio/machine/vacuum/GuiVacuumChest.java deleted file mode 100644 index 5273ca4f67..0000000000 --- a/src/main/java/crazypants/enderio/machine/vacuum/GuiVacuumChest.java +++ /dev/null @@ -1,25 +0,0 @@ -package crazypants.enderio.machine.vacuum; - -import org.lwjgl.opengl.GL11; - -import crazypants.render.RenderUtil; -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.InventoryPlayer; - -public class GuiVacuumChest extends GuiContainer { - - public GuiVacuumChest(EntityPlayer player, InventoryPlayer inventory, TileVacuumChest te) { - super(new ContainerVacuumChest(player, inventory, te)); - } - - @Override - protected void drawGuiContainerBackgroundLayer(float var1, int var2, int var3) { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - RenderUtil.bindTexture("enderio:textures/gui/vacumChest.png"); - int sx = (width - xSize) / 2; - int sy = (height - ySize) / 2; - drawTexturedModalRect(sx, sy, 0, 0, this.xSize, this.ySize); - } - -} diff --git a/src/main/java/crazypants/enderio/machine/vacuum/TileVacuumChest.java b/src/main/java/crazypants/enderio/machine/vacuum/TileVacuumChest.java deleted file mode 100644 index fdd22aaa73..0000000000 --- a/src/main/java/crazypants/enderio/machine/vacuum/TileVacuumChest.java +++ /dev/null @@ -1,227 +0,0 @@ -package crazypants.enderio.machine.vacuum; - -import java.util.List; - -import net.minecraft.command.IEntitySelector; -import net.minecraft.entity.Entity; -import net.minecraft.entity.IProjectile; -import net.minecraft.entity.item.EntityItem; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.AxisAlignedBB; -import crazypants.enderio.Config; -import crazypants.enderio.ModObject; -import crazypants.enderio.conduit.TileConduitBundle; -import crazypants.render.BoundingBox; -import crazypants.util.BlockCoord; -import crazypants.util.ItemUtil; - -public class TileVacuumChest extends TileEntity implements IEntitySelector, IInventory { - - - private static final double RANGE = Config.vacuumChestRange; - private ItemStack[] inv = new ItemStack[27]; - - @Override - public void updateEntity() { - if(!isFull()) { - doHoover(); - } - } - - @Override - public boolean isEntityApplicable(Entity entity) { - if(entity.isDead) { - return false; - } - if(entity instanceof IProjectile) { - return entity.motionY < 0.01; - } - if(entity instanceof EntityItem) { - ItemStack stack = ((EntityItem) entity).getEntityItem(); - return true; - } - return false; - } - - - private void doHoover() { - - BoundingBox bb = new BoundingBox(getLocation()); - AxisAlignedBB aabb = AxisAlignedBB.getBoundingBox(bb.minX, bb.minY, bb.minZ, bb.maxX, bb.maxY, bb.maxZ); - aabb = aabb.expand(RANGE, RANGE, RANGE); - List interestingItems = worldObj.selectEntitiesWithinAABB(EntityItem.class, aabb, this); - - for (EntityItem entity : interestingItems) { - double x = (xCoord + 0.5D - entity.posX); - double y = (yCoord + 0.5D - entity.posY); - double z = (zCoord + 0.5D - entity.posZ); - - double distance = Math.sqrt(x * x + y * y + z * z); - if(distance < 1.25) { - hooverEntity(entity); - } else { - double speed = 0.035; - entity.motionX += x / distance * speed; - entity.motionY += y * speed; - if(y > 0) { - entity.motionY = 0.12; - } - entity.motionZ += z / distance * speed; - } - - } - } - - private void hooverEntity(Entity entity) { - if(!worldObj.isRemote) { - if(entity instanceof EntityItem && !entity.isDead) { - EntityItem item = (EntityItem) entity; - ItemStack stack = item.getEntityItem().copy(); - - int numInserted = ItemUtil.doInsertItem(this, stack); - stack.stackSize -= numInserted; - item.setEntityItemStack(stack); - if(stack.stackSize == 0) { - item.setDead(); - } - } - } - } - - private boolean isFull() { - for(ItemStack stack : inv) { - if(stack == null || stack.stackSize < stack.getMaxStackSize()) { - return false; - } - } - return true; - } - - private BlockCoord getLocation() { - return new BlockCoord(this); - } - - @Override - public int getSizeInventory() { - return inv.length; - } - - @Override - public int getInventoryStackLimit() { - return 64; - } - - @Override - public ItemStack getStackInSlot(int slot) { - if(slot < 0 || slot >= inv.length) { - return null; - } - return inv[slot]; - } - - @Override - public ItemStack decrStackSize(int fromSlot, int amount) { - ItemStack fromStack = inv[fromSlot]; - if(fromStack == null) { - return null; - } - if(fromStack.stackSize <= amount) { - inv[fromSlot] = null; - return fromStack; - } - ItemStack result = new ItemStack(fromStack.getItem(), amount, fromStack.getItemDamage()); - if(fromStack.stackTagCompound != null) { - result.stackTagCompound = (NBTTagCompound) fromStack.stackTagCompound.copy(); - } - fromStack.stackSize -= amount; - return result; - } - - @Override - public void setInventorySlotContents(int slot, ItemStack contents) { - - if(slot < 0 || slot >= inv.length) { - System.out.println("TileVacumChest.setInventorySlotContents: " + slot); - return; - } - - if(contents == null) { - inv[slot] = contents; - } else { - inv[slot] = contents.copy(); - } - - if(contents != null && contents.stackSize > getInventoryStackLimit()) { - contents.stackSize = getInventoryStackLimit(); - } - } - - @Override - public ItemStack getStackInSlotOnClosing(int var1) { - return null; - } - - @Override - public String getInventoryName() { - return ModObject.blockVacuumChest.unlocalisedName; - } - - @Override - public boolean hasCustomInventoryName() { - return false; - } - - @Override - public boolean isUseableByPlayer(EntityPlayer var1) { - return true; - } - - @Override - public void openInventory() { - } - - @Override - public void closeInventory() { - } - - @Override - public boolean isItemValidForSlot(int var1, ItemStack var2) { - return true; - } - - @Override - public void readFromNBT(NBTTagCompound nbtRoot) { - super.readFromNBT(nbtRoot); - NBTTagList itemList = (NBTTagList) nbtRoot.getTag("Items"); - if(itemList != null) { - for (int i = 0; i < itemList.tagCount(); i++) { - NBTTagCompound itemStack = itemList.getCompoundTagAt(i); - byte slot = itemStack.getByte("Slot"); - if(slot >= 0 && slot < inv.length) { - inv[slot] = ItemStack.loadItemStackFromNBT(itemStack); - } - } - } - } - - @Override - public void writeToNBT(NBTTagCompound nbtRoot) { - super.writeToNBT(nbtRoot); - NBTTagList itemList = new NBTTagList(); - for (int i = 0; i < inv.length; i++) { - if(inv[i] != null) { - NBTTagCompound itemStackNBT = new NBTTagCompound(); - itemStackNBT.setByte("Slot", (byte) i); - inv[i].writeToNBT(itemStackNBT); - itemList.appendTag(itemStackNBT); - } - } - nbtRoot.setTag("Items", itemList); - } - -} diff --git a/src/main/java/crazypants/enderio/machine/vacuum/VacuumChestRenderer.java b/src/main/java/crazypants/enderio/machine/vacuum/VacuumChestRenderer.java deleted file mode 100644 index f3ac3fe1e8..0000000000 --- a/src/main/java/crazypants/enderio/machine/vacuum/VacuumChestRenderer.java +++ /dev/null @@ -1,89 +0,0 @@ -package crazypants.enderio.machine.vacuum; - -import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; - -import net.minecraft.block.Block; -import net.minecraft.client.renderer.OpenGlHelper; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; -import net.minecraft.world.IBlockAccess; -import net.minecraftforge.client.IItemRenderer; -import net.minecraftforge.client.IItemRenderer.ItemRenderType; -import net.minecraftforge.client.IItemRenderer.ItemRendererHelper; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; -import crazypants.enderio.EnderIO; -import crazypants.render.BoundingBox; -import crazypants.render.CubeRenderer; -import crazypants.render.RenderUtil; - -public class VacuumChestRenderer implements ISimpleBlockRenderingHandler, IItemRenderer { - - @Override - public void renderInventoryBlock(Block block, int metadata, int modelId, RenderBlocks renderer) { - Tessellator.instance.startDrawingQuads(); - CubeRenderer.render(BoundingBox.UNIT_CUBE.scale(0.6, 0.6, 0.6), EnderIO.blockHyperCube.getIcon(0, 0)); - CubeRenderer.render(BoundingBox.UNIT_CUBE.scale(0.90, 0.90,0.90), EnderIO.blockVacuumChest.getIcon(0, 0)); - Tessellator.instance.draw(); - } - - @Override - public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { - - double size = 0.4; - renderer.renderMinX = 0.5 - size; - renderer.renderMaxX = 0.5 + size; - renderer.renderMinY = 0.5 - size; - renderer.renderMaxY = 0.5 + size; - renderer.renderMinZ = 0.5 - size; - renderer.renderMaxZ = 0.5 + size; - renderer.lockBlockBounds = true; - - renderer.setOverrideBlockTexture(EnderIO.blockHyperCube.getIcon(0, 0)); - renderer.renderStandardBlock(Blocks.stone, x, y, z); - renderer.setOverrideBlockTexture(null); - - renderer.lockBlockBounds = false; - - renderer.renderMinX = 0; - renderer.renderMaxX = 1; - renderer.renderMinY = 0; - renderer.renderMaxY = 1; - renderer.renderMinZ = 0; - renderer.renderMaxZ = 1; - - renderer.setOverrideBlockTexture(EnderIO.blockVacuumChest.getIcon(0, 0)); - renderer.renderStandardBlock(Blocks.stone, x, y, z); - renderer.setOverrideBlockTexture(null); - - return true; - } - - @Override - public boolean shouldRender3DInInventory(int modelId) { - return true; - } - - @Override - public int getRenderId() { - return EnderIO.blockVacuumChest.renderId; - } - - @Override - public boolean handleRenderType(ItemStack item, ItemRenderType type) { - return true; - } - - @Override - public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { - return true; - } - - @Override - public void renderItem(ItemRenderType type, ItemStack item, Object... data) { - renderInventoryBlock(Block.getBlockFromItem(item.getItem()), item.getItemDamage(), 0, (RenderBlocks)data[0]); - } - -} diff --git a/src/main/java/crazypants/enderio/network/NetworkUtil.java b/src/main/java/crazypants/enderio/network/NetworkUtil.java index 53d4c92232..202b751260 100644 --- a/src/main/java/crazypants/enderio/network/NetworkUtil.java +++ b/src/main/java/crazypants/enderio/network/NetworkUtil.java @@ -5,6 +5,7 @@ import java.io.IOException; import net.minecraft.nbt.CompressedStreamTools; +import net.minecraft.nbt.NBTSizeTracker; import net.minecraft.nbt.NBTTagCompound; import cpw.mods.fml.common.FMLCommonHandler; @@ -21,7 +22,8 @@ public static NBTTagCompound readNBTTagCompound(ByteBuf dataIn) { } else { byte[] buffer = new byte[size]; dataIn.readBytes(buffer); - return CompressedStreamTools.decompress(buffer); + // TODO I have no idea what I'm doing (byte = 8 bits = buffer.length * 8 ???) + return CompressedStreamTools.func_152457_a(buffer, new NBTSizeTracker(buffer.length * 8)); } } catch (IOException e) { FMLCommonHandler.instance().raiseException(e, "Custom Packet", true); diff --git a/src/main/java/crazypants/enderio/teleport/GuiTravelAuth.java b/src/main/java/crazypants/enderio/teleport/GuiTravelAuth.java index b34193a7a3..26419689ae 100644 --- a/src/main/java/crazypants/enderio/teleport/GuiTravelAuth.java +++ b/src/main/java/crazypants/enderio/teleport/GuiTravelAuth.java @@ -1,6 +1,7 @@ package crazypants.enderio.teleport; import java.awt.Color; +import java.util.UUID; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; @@ -21,7 +22,7 @@ public class GuiTravelAuth extends GuiContainerBase { private final String title; private final ITravelAccessable ta; - private final String username; + private final UUID username; private boolean failed = false; private final EntityPlayer player; diff --git a/src/main/java/crazypants/enderio/teleport/ITravelAccessable.java b/src/main/java/crazypants/enderio/teleport/ITravelAccessable.java index 52272f06c6..fec0e44e92 100644 --- a/src/main/java/crazypants/enderio/teleport/ITravelAccessable.java +++ b/src/main/java/crazypants/enderio/teleport/ITravelAccessable.java @@ -1,5 +1,7 @@ package crazypants.enderio.teleport; +import java.util.UUID; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import crazypants.enderio.teleport.TileTravelAnchor.AccessMode; @@ -29,7 +31,7 @@ public interface ITravelAccessable { void setItemLabel(ItemStack lableIcon); - String getPlacedBy(); + UUID getPlacedBy(); // void setPlacedBy(String placedBy); diff --git a/src/main/java/crazypants/enderio/teleport/TileTravelAnchor.java b/src/main/java/crazypants/enderio/teleport/TileTravelAnchor.java index 0167579d71..df8c91c9a3 100644 --- a/src/main/java/crazypants/enderio/teleport/TileTravelAnchor.java +++ b/src/main/java/crazypants/enderio/teleport/TileTravelAnchor.java @@ -2,6 +2,7 @@ import java.util.ArrayList; import java.util.List; +import java.util.UUID; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -28,9 +29,9 @@ public enum AccessMode { private ItemStack itemLabel; - private String placedBy; + private UUID placedBy; - private List authorisedUsers = new ArrayList(); + private List authorisedUsers = new ArrayList(); @Override public boolean canBlockBeAccessed(EntityPlayer playerName) { @@ -131,7 +132,7 @@ public void setItemLabel(ItemStack lableIcon) { } @Override - public String getPlacedBy() { + public UUID getPlacedBy() { return placedBy; } @@ -165,10 +166,10 @@ protected void readCustomNBT(NBTTagCompound root) { if(root.hasKey("accessMode")) { accessMode = AccessMode.values()[root.getShort("accessMode")]; } else { - //keep behaviour the same for blocks placed prior to this update + //keep behavior the same for blocks placed prior to this update accessMode = AccessMode.PUBLIC; } - placedBy = root.getString("placedBy"); + placedBy = UUID.fromString(root.getString("placedBy")); for (int i = 0; i < password.length; i++) { if(root.hasKey("password" + i)) { NBTTagCompound stackRoot = (NBTTagCompound) root.getTag("password" + i); @@ -185,7 +186,7 @@ protected void readCustomNBT(NBTTagCompound root) { if(user != null) { user = user.trim(); if(user.length() > 0) { - authorisedUsers.add(user); + authorisedUsers.add(UUID.fromString(user)); } } } @@ -202,8 +203,8 @@ protected void readCustomNBT(NBTTagCompound root) { @Override protected void writeCustomNBT(NBTTagCompound root) { root.setShort("accessMode", (short) accessMode.ordinal()); - if(placedBy != null && placedBy.trim().length() > 0) { - root.setString("placedBy", placedBy); + if(placedBy != null) { + root.setString("placedBy", placedBy.toString()); } for (int i = 0; i < password.length; i++) { ItemStack stack = password[i]; @@ -214,9 +215,9 @@ protected void writeCustomNBT(NBTTagCompound root) { } } StringBuffer userStr = new StringBuffer(); - for (String user : authorisedUsers) { - if(user != null && user.trim().length() > 0) { - userStr.append(user); + for (UUID user : authorisedUsers) { + if(user != null) { + userStr.append(user.toString()); userStr.append(","); } } diff --git a/src/main/java/crazypants/gui/GuiScrollableList.java b/src/main/java/crazypants/gui/GuiScrollableList.java index 29ba83e0bf..0ad6fdaa72 100644 --- a/src/main/java/crazypants/gui/GuiScrollableList.java +++ b/src/main/java/crazypants/gui/GuiScrollableList.java @@ -177,7 +177,7 @@ public void drawScreen(int mX, int mY, float partialTick) { GL11.glDisable(GL11.GL_LIGHTING); GL11.glDisable(GL11.GL_FOG); - ScaledResolution sr = new ScaledResolution(mc.gameSettings, mc.displayWidth, mc.displayHeight); + ScaledResolution sr = new ScaledResolution(mc, mc.displayWidth, mc.displayHeight); int sx = minX * sr.getScaleFactor(); int sw = width * sr.getScaleFactor(); int sy = mc.displayHeight - (maxY * sr.getScaleFactor()); diff --git a/src/main/java/crazypants/gui/IconToggleButton.java b/src/main/java/crazypants/gui/IconToggleButton.java index c31eaacb3d..c2df61f024 100644 --- a/src/main/java/crazypants/gui/IconToggleButton.java +++ b/src/main/java/crazypants/gui/IconToggleButton.java @@ -21,7 +21,7 @@ public void setSelected(boolean selected) { } @Override - protected int getHoverState(boolean par1) { + public int getHoverState(boolean par1) { int result = 1; if(!enabled || selected) { result = 0; @@ -30,5 +30,4 @@ protected int getHoverState(boolean par1) { } return result; } - } diff --git a/src/main/java/crazypants/util/IBlockAccessWrapper.java b/src/main/java/crazypants/util/IBlockAccessWrapper.java index c2dbbeff4b..2aa028ea09 100644 --- a/src/main/java/crazypants/util/IBlockAccessWrapper.java +++ b/src/main/java/crazypants/util/IBlockAccessWrapper.java @@ -2,7 +2,6 @@ import net.minecraft.block.Block; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Vec3Pool; import net.minecraft.world.IBlockAccess; import net.minecraft.world.biome.BiomeGenBase; import net.minecraftforge.common.util.ForgeDirection; @@ -32,11 +31,6 @@ public boolean isAirBlock(int var1, int var2, int var3) { return wrapped.isAirBlock(var1, var2, var3); } - @Override - public Vec3Pool getWorldVec3Pool() { - return wrapped.getWorldVec3Pool(); - } - @Override public TileEntity getTileEntity(int var1, int var2, int var3) { diff --git a/src/main/java/crazypants/util/Util.java b/src/main/java/crazypants/util/Util.java index a1df75f73a..adf04c5457 100644 --- a/src/main/java/crazypants/util/Util.java +++ b/src/main/java/crazypants/util/Util.java @@ -2,6 +2,7 @@ import java.io.File; import java.io.IOException; +import java.util.UUID; import net.minecraft.block.Block; import net.minecraft.entity.item.EntityItem; @@ -15,6 +16,7 @@ import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemPotion; import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.MathHelper; import net.minecraft.util.Vec3; import net.minecraft.world.World; @@ -38,7 +40,7 @@ public static Block getBlockFromItemId(ItemStack itemId) { } public static ItemStack consumeItem(ItemStack stack) { - if (stack.getItem() instanceof ItemPotion) { + if(stack.getItem() instanceof ItemPotion) { if(stack.stackSize == 1) { return new ItemStack(Items.glass_bottle); } else { @@ -76,11 +78,11 @@ public static void giveExperience(EntityPlayer thePlayer, float experience) { // derived from ItemBlock.onItemUse public static BlockCoord canPlaceItem(ItemStack itemUsed, Block blockIdToBePlaced, EntityPlayer player, World world, int x, int y, int z, int side) { - + if(blockIdToBePlaced == null) { return null; } - + Block block = world.getBlock(x, y, z); if(block == Blocks.snow_layer && (world.getBlockMetadata(x, y, z) & 7) < 1) { @@ -163,7 +165,7 @@ public static void dropItems(World world, ItemStack stack, double x, double y, d } public static void dropItems(World world, ItemStack stack, int x, int y, int z, boolean doRandomSpread) { - if(stack == null || stack.stackSize <= 0) { + if(stack.stackSize <= 0) { return; } @@ -289,19 +291,16 @@ public static Vector3d getLookVecEio(EntityPlayer player) { public static boolean isEquipped(EntityPlayer player, Class class1) { if(player == null || player.inventory == null || player.inventory.getCurrentItem() == null) { - return false; + return false; } //player.inventory.getCurrentItem().getClass().getItem().isAssignableFrom(class1) return class1.isAssignableFrom(player.inventory.getCurrentItem().getItem().getClass()); } - public static boolean isType(ItemStack stack, Class class1) { if(stack == null || class1 == null) { return false; } return class1.isAssignableFrom(stack.getItem().getClass()); } - - }