1.3.4

BTW-Community · Dec 18, 2021 · 2e15f0b · 2e15f0b
1 parent 6640cba
commit 2e15f0b
Show file tree

Hide file tree

Showing 15 changed files with 114 additions and 26 deletions.
diff --git a/changelog.txt b/changelog.txt
@@ -1,3 +1,15 @@
+## Version 1.3.4 ##
+/--Gameplay--/
+- Added the ability to block with the refined hoe since its right click functionality has been freed up.
+- Fixed an issue where smelting nether bricks in an oven still used nether sludge instead of unfired nether brick.
+- Fixed an issue where using fireworks would cause the game to crash.
+- Fixed an issue where saws in multiplayer were checking against material incorrectly.
+- Removed the recipe for the old unfired brick block in the kiln, since it is no longer obtainable, in order to help craftguide keep clutter down.
+
+/--Creative Mode--/
+- Fixed an issue where unfired nether bricks returned the wrong result when using pick block.
+- Fixed an issue where stone always returned its first strata variant when used with pick block.
+
 ## Version 1.3.3 ##
 /--Gameplay--/
 - Fixed an issue where chopping logs with an axe produced 4 planks instead of 2.

diff --git a/patches/minecraft/net/minecraft/src/EntityFireworkRocket.java.patch b/patches/minecraft/net/minecraft/src/EntityFireworkRocket.java.patch
@@ -0,0 +1,13 @@
+--- a/minecraft/net/minecraft/src/EntityFireworkRocket.java
++++ b/minecraft/net/minecraft/src/EntityFireworkRocket.java
+@@ -30,6 +30,10 @@
+         return par1 < 4096.0D;
+     }
+
++    public EntityFireworkRocket(World par1World, double par2, double par4, double par6) {
++    	this(par1World, par2, par4, par6, null);
++    }
++    
+     public EntityFireworkRocket(World par1World, double par2, double par4, double par6, ItemStack par8ItemStack)
+     {
+         super(par1World);
diff --git a/patches/minecraft/net/minecraft/src/EntityList.java.patch b/patches/minecraft/net/minecraft/src/EntityList.java.patch
@@ -136,7 +136,7 @@
 +		addMapping(EntityEgg.class, "Egg", id--);
 +		addMapping(EntitySnowball.class, "Snowball", id--);
 +		addMapping(EntityFishHook.class, "FishHook", id--);
-+		addMapping(EntityDragonPart.class, "DragonPart",id--);
++		addMapping(EntityDragonPart.class, "DragonPart", id--);
 +
 +		// Client only
 +		addMapping(EntityClientPlayerMP.class, "ClientPlayerMP", id--);

diff --git a/patches/minecraft/net/minecraft/src/FCBetterThanWolves.java.patch b/patches/minecraft/net/minecraft/src/FCBetterThanWolves.java.patch
@@ -25,7 +25,7 @@
 +
 +public class FCBetterThanWolves extends FCAddOn
 +{
-+	public static final String fcVersionString = "1.3.3";
++	public static final String fcVersionString = "1.3.4";
 +
 +	public static FCBetterThanWolves m_instance = new FCBetterThanWolves();
 +

diff --git a/patches/minecraft/net/minecraft/src/FCBlockStone.java.patch b/patches/minecraft/net/minecraft/src/FCBlockStone.java.patch
@@ -1,6 +1,6 @@
 --- /dev/null
 +++ b/minecraft/net/minecraft/src/FCBlockStone.java
-@@ -0,0 +1,367 @@
+@@ -0,0 +1,373 @@
 +// FCMOD
 +
 +package net.minecraft.src;
@@ -340,6 +340,12 @@
 +        //list.add( new ItemStack( iBlockID, 1, 5 ) );
 +        //list.add( new ItemStack( iBlockID, 1, 6 ) );
 +    }
++
++	@Override
++    public int getDamageValue(World world, int x, int y, int z) {
++		// used only by pick block
++		return world.getBlockMetadata(x, y, z);
++    }
 +    
 +	@Override
 +    public void registerIcons( IconRegister register )

diff --git a/patches/minecraft/net/minecraft/src/FCBlockUnfiredPottery.java.patch b/patches/minecraft/net/minecraft/src/FCBlockUnfiredPottery.java.patch
@@ -1,6 +1,6 @@
 --- /dev/null
 +++ b/minecraft/net/minecraft/src/FCBlockUnfiredPottery.java
-@@ -0,0 +1,888 @@
+@@ -0,0 +1,895 @@
 +// FCMOD
 +
 +package net.minecraft.src;
@@ -498,7 +498,14 @@
 +	
 +	@Override
 +	public int idPicked(World world, int x, int y, int z) {
-+		return this.idDropped(world.getBlockMetadata(x, y, z), world.rand, 0);
++		int metadata = world.getBlockMetadata(x, y, z);
++		
++		if (metadata == m_iSubtypeNetherBrick || metadata == m_iSubtypeNetherBrickIAligned) {
++			return FCBetterThanWolves.fcItemNetherBrickUnfired.itemID;
++		}
++		else {
++			return this.idDropped(metadata, world.rand, 0);
++		}
 +	}
 +	
 +    @Override

diff --git a/patches/minecraft/net/minecraft/src/FCItemRefinedHoe.java.patch b/patches/minecraft/net/minecraft/src/FCItemRefinedHoe.java.patch
@@ -1,6 +1,6 @@
 --- /dev/null
 +++ b/minecraft/net/minecraft/src/FCItemRefinedHoe.java
-@@ -0,0 +1,17 @@
+@@ -0,0 +1,40 @@
 +// FCMOD
 +
 +package net.minecraft.src;
@@ -14,6 +14,29 @@
 +        setUnlocalizedName( "fcItemHoeRefined" );        
 +    }
 +
++    @Override
++    public EnumAction getItemUseAction(ItemStack itemstack)
++    {
++        return EnumAction.block;
++    }
++
++    @Override
++    public int getMaxItemUseDuration(ItemStack itemstack)
++    {
++        return 0x11940;
++    }
++
++    @Override
++    public ItemStack onItemRightClick(ItemStack itemstack, World world, EntityPlayer entityplayer)
++    {
++    	if (!entityplayer.isUsingSpecialKey())
++    	{
++    		entityplayer.setItemInUse(itemstack, getMaxItemUseDuration(itemstack));
++    	}
++    	
++        return itemstack;
++    }
++
 +    //------------- Class Specific Methods ------------//
 +    
 +	//------------ Client Side Functionality ----------//

diff --git a/patches/minecraft/net/minecraft/src/FCItemRefinedPickAxe.java.patch b/patches/minecraft/net/minecraft/src/FCItemRefinedPickAxe.java.patch
@@ -1,6 +1,6 @@
 --- /dev/null
 +++ b/minecraft/net/minecraft/src/FCItemRefinedPickAxe.java
-@@ -0,0 +1,62 @@
+@@ -0,0 +1,63 @@
 +// FCMOD
 +
 +package net.minecraft.src;
@@ -31,8 +31,9 @@
 +    {
 +    	if (!entityplayer.isUsingSpecialKey())
 +    	{
-+        entityplayer.setItemInUse(itemstack, getMaxItemUseDuration(itemstack));
++    		entityplayer.setItemInUse(itemstack, getMaxItemUseDuration(itemstack));
 +    	}
++    	
 +        return itemstack;
 +    }
 +

diff --git a/patches/minecraft/net/minecraft/src/FCRecipes.java.patch b/patches/minecraft/net/minecraft/src/FCRecipes.java.patch
@@ -1,6 +1,6 @@
 --- /dev/null
 +++ b/minecraft/net/minecraft/src/FCRecipes.java
-@@ -0,0 +1,7184 @@
+@@ -0,0 +1,7179 @@
 +// FCMOD
 +
 +package net.minecraft.src;
@@ -3441,7 +3441,7 @@
 +		
 +		// non-food (custom cook times)
 +		
-+		FurnaceRecipes.smelting().addSmelting( FCBetterThanWolves.fcItemNetherSludge.itemID, new ItemStack( FCBetterThanWolves.fcItemNetherBrick ), 0, 2 );
++		FurnaceRecipes.smelting().addSmelting( FCBetterThanWolves.fcItemNetherBrickUnfired.itemID, new ItemStack( FCBetterThanWolves.fcItemNetherBrick ), 0, 2 );
 +		
 +		FurnaceRecipes.smelting().addSmelting( FCBetterThanWolves.fcItemBrickUnfired.itemID, new ItemStack( Item.brick ), 0, 2 );
 +		
@@ -5297,11 +5297,6 @@
 +		//		FCBetterThanWolves.fcUnfiredPottery, FCBlockUnfiredPottery.m_iSubtypeMould,
 +		//		cookTimeMultiplierClay);
 +		
-+		addKilnRecipe(new ItemStack(Item.brick),
-+				FCBetterThanWolves.fcUnfiredPottery,
-+				new int[] {FCBlockUnfiredPottery.m_iSubtypeClayBrick, FCBlockUnfiredPottery.m_iSubtypeClayBrickIAligned},
-+				cookTimeMultiplierClay);
-+		
 +		addKilnRecipe(new ItemStack(FCBetterThanWolves.fcItemNetherBrick),
 +				FCBetterThanWolves.fcUnfiredPottery,
 +				new int[] {FCBlockUnfiredPottery.m_iSubtypeNetherBrick, FCBlockUnfiredPottery.m_iSubtypeNetherBrickIAligned},

diff --git a/patches/minecraft/net/minecraft/src/NetClientHandler.java.patch b/patches/minecraft/net/minecraft/src/NetClientHandler.java.patch
@@ -59,7 +59,7 @@
          else if (par1Packet23VehicleSpawn.type == 76)
          {
 -            var8 = new EntityFireworkRocket(this.worldClient, var2, var4, var6, (ItemStack)null);
-+            var8 = EntityList.createEntityOfType(EntityFireworkRocket.class, this.worldClient, var2, var4, var6, (ItemStack)null);
++            var8 = EntityList.createEntityOfType(EntityFireworkRocket.class, this.worldClient, var2, var4, var6);
          }
          else if (par1Packet23VehicleSpawn.type == 63)
          {

diff --git a/patches/minecraft_server/net/minecraft/src/Block.java.patch b/patches/minecraft_server/net/minecraft/src/Block.java.patch
@@ -1515,7 +1515,7 @@
 +	//------------- Saw related functionality ------------//
 +
 +	public boolean DoesBlockBreakSaw(World world, int x, int y, int z) {
-+		if (blockMaterial.isSolid() && !blockMaterial.breaksSaw()) {
++		if (blockMaterial.isSolid() && blockMaterial.breaksSaw()) {
 +			return true;
 +		}
 +

diff --git a/patches/minecraft_server/net/minecraft/src/EntityFireworkRocket.java.patch b/patches/minecraft_server/net/minecraft/src/EntityFireworkRocket.java.patch
@@ -0,0 +1,13 @@
+--- a/minecraft_server/net/minecraft/src/EntityFireworkRocket.java
++++ b/minecraft_server/net/minecraft/src/EntityFireworkRocket.java
+@@ -21,6 +21,10 @@
+         this.dataWatcher.addObjectByDataType(8, 5);
+     }
+
++    public EntityFireworkRocket(World par1World, double par2, double par4, double par6) {
++    	this(par1World, par2, par4, par6, null);
++    }
++
+     public EntityFireworkRocket(World par1World, double par2, double par4, double par6, ItemStack par8ItemStack)
+     {
+         super(par1World);
diff --git a/patches/minecraft_server/net/minecraft/src/FCBetterThanWolves.java.patch b/patches/minecraft_server/net/minecraft/src/FCBetterThanWolves.java.patch
@@ -22,7 +22,7 @@
 +
 +public class FCBetterThanWolves extends FCAddOn
 +{
-+	public static final String fcVersionString = "1.3.3";
++	public static final String fcVersionString = "1.3.4";
 +
 +	public static FCBetterThanWolves m_instance = new FCBetterThanWolves();
 +

diff --git a/patches/minecraft_server/net/minecraft/src/FCItemRefinedHoe.java.patch b/patches/minecraft_server/net/minecraft/src/FCItemRefinedHoe.java.patch
@@ -1,6 +1,6 @@
 --- /dev/null
 +++ b/minecraft_server/net/minecraft/src/FCItemRefinedHoe.java
-@@ -0,0 +1,17 @@
+@@ -0,0 +1,40 @@
 +// FCMOD
 +
 +package net.minecraft.src;
@@ -13,6 +13,29 @@
 +        
 +        setUnlocalizedName( "fcItemHoeRefined" );        
 +    }
++    
++    @Override
++    public EnumAction getItemUseAction(ItemStack itemstack)
++    {
++        return EnumAction.block;
++    }
++
++    @Override
++    public int getMaxItemUseDuration(ItemStack itemstack)
++    {
++        return 0x11940;
++    }
++
++    @Override
++    public ItemStack onItemRightClick(ItemStack itemstack, World world, EntityPlayer entityplayer)
++    {
++    	if (!entityplayer.isUsingSpecialKey())
++    	{
++    		entityplayer.setItemInUse(itemstack, getMaxItemUseDuration(itemstack));
++    	}
++
++        return itemstack;
++    }
 +
 +    //------------- Class Specific Methods ------------//
 +    

diff --git a/patches/minecraft_server/net/minecraft/src/FCRecipes.java.patch b/patches/minecraft_server/net/minecraft/src/FCRecipes.java.patch
@@ -1,6 +1,6 @@
 --- /dev/null
 +++ b/minecraft_server/net/minecraft/src/FCRecipes.java
-@@ -0,0 +1,7184 @@
+@@ -0,0 +1,7179 @@
 +// FCMOD
 +
 +package net.minecraft.src;
@@ -3441,7 +3441,7 @@
 +		
 +		// non-food (custom cook times)
 +		
-+		FurnaceRecipes.smelting().addSmelting( FCBetterThanWolves.fcItemNetherSludge.itemID, new ItemStack( FCBetterThanWolves.fcItemNetherBrick ), 0, 2 );
++		FurnaceRecipes.smelting().addSmelting( FCBetterThanWolves.fcItemNetherBrickUnfired.itemID, new ItemStack( FCBetterThanWolves.fcItemNetherBrick ), 0, 2 );
 +		
 +		FurnaceRecipes.smelting().addSmelting( FCBetterThanWolves.fcItemBrickUnfired.itemID, new ItemStack( Item.brick ), 0, 2 );
 +		
@@ -5297,11 +5297,6 @@
 +		//		FCBetterThanWolves.fcUnfiredPottery, FCBlockUnfiredPottery.m_iSubtypeMould,
 +		//		cookTimeMultiplierClay);
 +		
-+		addKilnRecipe(new ItemStack(Item.brick),
-+				FCBetterThanWolves.fcUnfiredPottery,
-+				new int[] {FCBlockUnfiredPottery.m_iSubtypeClayBrick, FCBlockUnfiredPottery.m_iSubtypeClayBrickIAligned},
-+				cookTimeMultiplierClay);
-+		
 +		addKilnRecipe(new ItemStack(FCBetterThanWolves.fcItemNetherBrick),
 +				FCBetterThanWolves.fcUnfiredPottery,
 +				new int[] {FCBlockUnfiredPottery.m_iSubtypeNetherBrick, FCBlockUnfiredPottery.m_iSubtypeNetherBrickIAligned},