Revert "Merge remote-tracking branch 'origin/master' into 1.7.10"

Yeah that didn't work...

This reverts commit 714542e, reversing
changes made to b579bcd.

.gitignore

@@ -1,7 +1,7 @@
 /bin
 /build
 /download
-/.settings/org.eclipse.jdt.core.prefs
+/.settings
 /.gradle
 /eclipse
 /eclipseBin

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

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**.

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

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.

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();
 
   }
 

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);

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<Integer, IGuiHandler> guiHandlers = new HashMap<Integer, IGuiHandler>();
 

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;
 

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() {

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);

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();

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);