Updated to 1.6.2

README.md

@@ -36,16 +36,18 @@ Installing the code
 
 ####Automatic####
 
+Run Minecraft Launcher - and login to the appropriate version of Minecraft (REQUIRED)
+
 Run setup.cmd *(Requires powershell at the moment, someone is more than welcome to create a linux version of this in a pull request)*
 
 
 
 ####Manual####
 
  - 1. Create Directory (/mcp/)
- - 2. Download Forge (minecraftforge-src-1.5.2-7.8.1.737)
+ - 2. Download Forge
  - 3. Extract zip into /mcp/
- - 4. Download MCP (mcp751)
+ - 4. Download MCP
  - 5. Extract zip into /mcp/
  - 6. Run /mcp/forge/install.cmd
  - 7. Wait for days

build.xml

@@ -5,9 +5,9 @@
 	<property file="build.properties" prefix="build"/>
 
 	<target name="clean">
-		<delete file="mcp\src\minecraft\mcmod.info" />
-		<delete dir="mcp\src\minecraft\burptech" />
-		<delete dir="mcp\reobf\minecraft" />
+		<delete file="mcp\forge\mcp\src\minecraft\mcmod.info" />
+		<delete dir="mcp\forge\mcp\src\minecraft\burptech" />
+		<delete dir="mcp\forge\mcp\reobf\minecraft" />
 	</target>
 
 	<target name="increment_build_number">
@@ -17,30 +17,30 @@
 	</target>
 
 	<target name="prep">
-		<copy todir="mcp\src\minecraft">
+		<copy todir="mcp\forge\mcp\src\minecraft">
 			<fileset dir="src\common\" />
 			<fileset dir="src\resources" includes="mcmod.info" />
 		</copy>
 	</target>
 
 	<target name="replace_tokens">
-		<replace dir="mcp\src\minecraft" token="@VERSION@" value="${build.release.minecraft.version}.${build.release.number}" />
+		<replace dir="mcp\forge\mcp\src\minecraft" token="@VERSION@" value="${build.release.minecraft.version}.${build.release.number}" />
 	</target>
 
 	<target name="recompile">
-		<exec dir="mcp" executable="cmd" osfamily="windows">
+		<exec dir="mcp\forge\mcp" executable="cmd" osfamily="windows">
 			<arg line="/c recompile.bat" />
 		</exec>
-		<exec dir="mcp" executable="bash" osfamily="unix">
+		<exec dir="mcp\forge\mcp" executable="bash" osfamily="unix">
 			<arg line="recompile.sh" />
 		</exec>
 	</target>
 
 	<target name="reobfuscate">
-		<exec dir="mcp" executable="cmd" osfamily="windows">
+		<exec dir="mcp\forge\mcp" executable="cmd" osfamily="windows">
 			<arg line="/c reobfuscate_srg.bat" />
 		</exec>
-		<exec dir="mcp" executable="bash" osfamily="unix">
+		<exec dir="mcp\forge\mcp" executable="bash" osfamily="unix">
 			<arg line="reobfuscate_srg.sh" />
 		</exec>
 	</target>
@@ -58,8 +58,8 @@
 		<mkdir dir="bin\${build.release.minecraft.version}\" />
 		<jar destfile="bin\${build.release.minecraft.version}\burptech-${build.release.minecraft.version}.${build.release.number}.jar">
 			<fileset dir="src\resources" excludes="**/xcf/**,mcmod.info" />
-			<fileset dir="mcp\src\minecraft\" includes="mcmod.info" />
-			<fileset dir="mcp\reobf\minecraft" />
+			<fileset dir="mcp\forge\mcp\src\minecraft\" includes="mcmod.info" />
+			<fileset dir="mcp\forge\mcp\reobf\minecraft" />
 		</jar>
 
 		<!-- Clean up the MCP source now that we are done -->

setup.ps1

@@ -1,7 +1,7 @@
 ## Environmental Setup Script ##
-$forgeVersion = "7.8.1.737"
-$mcVersion = "1.5.2"
-$mcpVersion = "751"
+$forgeVersion = "9.10.0.804"
+$mcVersion = "1.6.2"
+$mcpVersion = "804"
 
 $rootLocation = get-location
 $rootPath = $rootLocation.path
@@ -70,7 +70,7 @@ foreach ($ZipFile in $ZipFiles)
 ## INSTALL FORGE ##
 write-host "Installing Forge"
 
-start-process -NoNewWindow -Wait -FilePath:"$rootPath\mcp\forge\fml\python\python_fml.exe" -WorkingDirectory:"$rootPath\mcp\forge\" -RedirectStandardOutput:"$rootPath\forgeinstall.log" -RedirectStandardError:"$rootPath\forgeinstall-errors.log" -ArgumentList "install.py"
+start-process -Wait -FilePath:"$rootPath\mcp\forge\fml\python\python_fml.exe" -WorkingDirectory:"$rootPath\mcp\forge\" -ArgumentList "install.py"
 
 ## DONE ##
 write-host "Work Complete"

src/common/burptech/BurpTechCore.java

@@ -34,7 +34,7 @@ public class BurpTechCore
     public static CommonProxy proxy;
 
 
-    @PreInit
+    @EventHandler
     public void preInitialization(FMLPreInitializationEvent e)
     {
         // setup logger
@@ -50,7 +50,7 @@ public void preInitialization(FMLPreInitializationEvent e)
         // register keyboard bindings
     }
 
-    @Init
+    @EventHandler
     public void initialization(FMLInitializationEvent e)
     {
         // gui handlers
@@ -76,7 +76,7 @@ public void initialization(FMLInitializationEvent e)
     	(new RecipeManager()).addRecipes();
     }
 
-    @PostInit
+    @EventHandler
     public void postInitialization(FMLPostInitializationEvent e)
     {
     	// tweaks

src/common/burptech/client/gui/GuiPortableWorkbech.java

@@ -7,9 +7,12 @@
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.util.StatCollector;
 import net.minecraft.world.World;
+import net.minecraft.util.ResourceLocation;
 
 public class GuiPortableWorkbech extends GuiContainer
 {
+	private static final ResourceLocation resourceLocation = new ResourceLocation("textures/gui/container/crafting_table.png");
+
 	public GuiPortableWorkbech(InventoryPlayer par1InventoryPlayer, World world)
     {
         super(new ContainerPortableWorkbench(par1InventoryPlayer, world));
@@ -33,7 +36,7 @@ protected void drawGuiContainerForegroundLayer(int par1, int par2)
     protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3)
     {
         GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
-        this.mc.renderEngine.bindTexture("/gui/crafting.png");
+        this.mc.func_110434_K().func_110577_a(resourceLocation);
 
         int j = (this.width - this.xSize) / 2;
         int k = (this.height - this.ySize) / 2;

src/common/burptech/client/gui/GuiRucksack.java

@@ -9,9 +9,12 @@
 import net.minecraft.inventory.IInventory;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.StatCollector;
+import net.minecraft.util.ResourceLocation;
 
 public class GuiRucksack extends GuiContainer
 {
+	protected static final ResourceLocation resourceLocation = new ResourceLocation("textures/gui/container/generic_54.png");
+
 	/**
      * window height is calculated with these values, the more rows, the higher
      */
@@ -61,7 +64,7 @@ protected void drawGuiContainerForegroundLayer(int par1, int par2)
     protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3)
     {
         GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
-        this.mc.renderEngine.bindTexture("/gui/container.png");
+        this.mc.func_110434_K().func_110577_a(resourceLocation);
         int var5 = (this.width - this.xSize) / 2;
         int var6 = (this.height - this.ySize) / 2;
         this.drawTexturedModalRect(var5, var6, 0, 0, this.xSize, this.inventoryRows * 18 + 17);

src/common/burptech/entity/ai/EntityAIGroundEater.java

@@ -25,7 +25,7 @@ public EntityAIGroundEater(EntityAnimal entity)
     @Override
     public boolean shouldExecute()
     {
-    	return entity.getHealth() > 0 && !entity.isInLove() && entity.getGrowingAge() == 0;
+    	return entity.isEntityAlive() && !entity.isInLove() && entity.getGrowingAge() == 0;
     }
 
     /**
@@ -34,7 +34,7 @@ public boolean shouldExecute()
     @Override
     public boolean continueExecuting()
     {
-    	if (entity.getHealth() > 0 && !entity.isInLove() && entity.getGrowingAge() == 0)
+    	if (entity.isEntityAlive()&& !entity.isInLove() && entity.getGrowingAge() == 0)
     	{
 	    	List nearbyItems = entity.worldObj.getEntitiesWithinAABBExcludingEntity(entity, entity.boundingBox.expand(1.0D, 0.0D, 1.0D));
 
@@ -60,7 +60,7 @@ public boolean continueExecuting()
     @Override
     public void startExecuting()
     {
-    	if (entity.getHealth() > 0 && !entity.isInLove() && entity.getGrowingAge() == 0)
+    	if (entity.isEntityAlive() && !entity.isInLove() && entity.getGrowingAge() == 0)
         {
         	List nearbyItems = entity.worldObj.getEntitiesWithinAABBExcludingEntity(entity, entity.boundingBox.expand(2.0D, 0.0D, 2.0D));
         	if (nearbyItems != null && nearbyItems.size() > 0)

src/common/burptech/gui/ContainerPortableWorkbench.java

@@ -65,9 +65,9 @@ public void onCraftMatrixChanged(IInventory par1IInventory)
      * Callback for when the crafting gui is closed.
      */
     @Override
-    public void onCraftGuiClosed(EntityPlayer par1EntityPlayer)
+    public void onContainerClosed(EntityPlayer par1EntityPlayer)
     {
-        super.onCraftGuiClosed(par1EntityPlayer);
+        super.onContainerClosed(par1EntityPlayer);
 
         if (!this.worldObj.isRemote)
         {

src/common/burptech/gui/ContainerRucksack.java

@@ -108,10 +108,10 @@ public ItemStack slotClick(int var1, int var2, int var3, EntityPlayer player)
      * Callback for when the crafting gui is closed.
      */
     @Override
-    public void onCraftGuiClosed(EntityPlayer par1EntityPlayer)
+    public void onContainerClosed(EntityPlayer par1EntityPlayer)
     {
     	if (!(container instanceof InventoryEnderChest))
     		((RucksackInventory) container).onGuiClose(par1EntityPlayer);
-        super.onCraftGuiClosed(par1EntityPlayer);
+        super.onContainerClosed(par1EntityPlayer);
     }
 }

src/common/burptech/item/RucksackInventory.java

@@ -245,7 +245,7 @@ public boolean isInvNameLocalized()
 	}
 
 	@Override
-	public boolean isStackValidForSlot(int i, ItemStack itemstack) 
+	public boolean isItemValidForSlot(int i, ItemStack itemstack) 
 	{
 		// TODO Auto-generated method stub
 		return false;

src/common/burptech/item/crafting/RecipesRucksackDyes.java

@@ -3,7 +3,7 @@
 import java.util.ArrayList;
 
 import burptech.item.ItemRucksack;
-import net.minecraft.block.BlockCloth;
+import net.minecraft.block.BlockColored;
 import net.minecraft.entity.passive.EntitySheep;
 import net.minecraft.inventory.InventoryCrafting;
 import net.minecraft.item.Item;
@@ -106,7 +106,7 @@ public ItemStack getCraftingResult(InventoryCrafting par1InventoryCrafting)
 						return null;
 					}
 
-					float[] var14 = EntitySheep.fleeceColorTable[BlockCloth.getBlockFromDye(var8.getItemDamage())];
+					float[] var14 = EntitySheep.fleeceColorTable[BlockColored.getBlockFromDye(var8.getItemDamage())];
 					int var16 = (int)(var14[0] * 255.0F);
 					int var15 = (int)(var14[1] * 255.0F);
 					var17 = (int)(var14[2] * 255.0F);