1.3.3

BTW-Community · Dec 15, 2021 · 6640cba · 6640cba
1 parent 4b0f7cf
commit 6640cba
Show file tree

Hide file tree

Showing 10 changed files with 38 additions and 22 deletions.
diff --git a/changelog.txt b/changelog.txt
@@ -1,3 +1,14 @@
+## Version 1.3.3 ##
+/--Gameplay--/
+- Fixed an issue where chopping logs with an axe produced 4 planks instead of 2.
+- Fixed an issue where several BTW materials would erroneously break the saw. I made sure all vanilla materials were updated to the new system but missed the BTW materials.
+
+/--Creative Mode--/
+- Fixed an issue where wet bricks returned the wrong result when using pick block.
+
+/--Addon API--/
+- Fixed an issue where saw and kiln recipes weren't properly checking for if they should ignore metadata.
+
 ## Version 1.3.2 ##
 Thanks to the following people who contributed to this release!
 - Dawnraider

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.2";
++	public static final String fcVersionString = "1.3.3";
 +
 +	public static FCBetterThanWolves m_instance = new FCBetterThanWolves();
 +
@@ -36,14 +36,14 @@
 +	public static final Material fcMaterialCement = (new FCMaterialCement(MapColor.stoneColor));
 +	public static final Material fcMaterialSoulforgedSteel = (new FCMaterialSoulforgedSteel(MapColor.ironColor));
 +	public static final Material fcMaterialNetherGrowth = (new FCMaterialNetherGrowth(MapColor.foliageColor)).SetMobsCantSpawnOn();    
-+	public static final Material fcMaterialCandle = (new MaterialLogic(MapColor.airColor)).setNoPushMobility();
++	public static final Material fcMaterialCandle = (new MaterialLogic(MapColor.airColor)).setNoPushMobility().setDoesNotBreakSaw();
 +	public static final Material fcMaterialMiscellaneous = new Material(MapColor.dirtColor); // used for aesthetic blocks to avoid tool dependancies
-+	public static final Material fcMaterialLog = (new Material(MapColor.woodColor)).setBurning().setRequiresTool().SetMobsCantSpawnOn();
-+	public static final Material fcMaterialPlanks = (new Material(MapColor.woodColor)).setBurning().setRequiresTool().SetMobsCantSpawnOn();
-+	public static final Material fcMaterialAsh = (new MaterialLogic(MapColor.stoneColor)).setReplaceable().setTranslucent().setRequiresTool().setNoPushMobility();
++	public static final Material fcMaterialLog = (new Material(MapColor.woodColor)).setBurning().setRequiresTool().SetMobsCantSpawnOn().setDoesNotBreakSaw();
++	public static final Material fcMaterialPlanks = (new Material(MapColor.woodColor)).setBurning().setRequiresTool().SetMobsCantSpawnOn().setDoesNotBreakSaw();
++	public static final Material fcMaterialAsh = (new MaterialLogic(MapColor.stoneColor)).setReplaceable().setTranslucent().setRequiresTool().setNoPushMobility().setDoesNotBreakSaw();
 +	public static final Material fcMaterialNaturalClay = (new Material(MapColor.clayColor)).setRequiresTool();
-+	public static final Material fcMaterialWicker = (new Material(MapColor.woodColor)).setBurning().setRequiresTool().SetAxesEfficientOn();
-+	public static final Material fcMaterialBasket = (new Material(MapColor.woodColor)).setNoPushMobility();
++	public static final Material fcMaterialWicker = (new Material(MapColor.woodColor)).setBurning().setRequiresTool().SetAxesEfficientOn().setDoesNotBreakSaw();
++	public static final Material fcMaterialBasket = (new Material(MapColor.woodColor)).setNoPushMobility().setDoesNotBreakSaw();
 +	public static final Material fcMaterialMilk = (new MaterialLogic(MapColor.snowColor)).setReplaceable().setTranslucent().setRequiresTool().setNoPushMobility();
 +	public static final Material fcMaterialNetherRock = (new Material(MapColor.stoneColor)).setRequiresTool().SetNetherMobsCanSpawnOn();
 +

diff --git a/patches/minecraft/net/minecraft/src/FCBlockUnfiredBrick.java.patch b/patches/minecraft/net/minecraft/src/FCBlockUnfiredBrick.java.patch
@@ -1,6 +1,6 @@
 --- /dev/null
 +++ b/minecraft/net/minecraft/src/FCBlockUnfiredBrick.java
-@@ -0,0 +1,314 @@
+@@ -0,0 +1,319 @@
 +// FCMOD
 +
 +package net.minecraft.src;
@@ -256,8 +256,13 @@
 +        		i + ( 0.5F + m_fBrickHalfWidth ), j + m_fBrickHeight, k + ( 0.5F + m_fBrickHalfLength ) );	    	
 +        }    	
 +    }
-+    
-+	//----------- Client Side Functionality -----------//
++	
++	//------ Client Only Functionality ------//
++	
++	@Override
++	public int idPicked(World world, int x, int y, int z) {
++		return FCBetterThanWolves.fcItemBrickUnfired.itemID;
++	}
 +	
 +    private Icon[] m_cookIcons;
 +

diff --git a/patches/minecraft/net/minecraft/src/FCCraftingManagerKilnRecipe.java.patch b/patches/minecraft/net/minecraft/src/FCCraftingManagerKilnRecipe.java.patch
@@ -25,7 +25,7 @@
 +	public boolean matchesRecipe(FCCraftingManagerKilnRecipe recipe) {
 +		if (this.block == recipe.block && 
 +			(Arrays.equals(this.metadatas, recipe.metadatas) || 
-+				this.ignoreMetadata() && this.ignoreMetadata())) 
++				this.ignoreMetadata() && recipe.ignoreMetadata())) 
 +		{
 +			return output.equals(recipe.output);
 +		}

diff --git a/patches/minecraft/net/minecraft/src/FCCraftingManagerSawRecipe.java.patch b/patches/minecraft/net/minecraft/src/FCCraftingManagerSawRecipe.java.patch
@@ -23,7 +23,7 @@
 +	public boolean matchesRecipe(FCCraftingManagerSawRecipe recipe) {
 +		if (this.block == recipe.block && 
 +			(Arrays.equals(this.metadatas, recipe.metadatas) || 
-+				this.ignoreMetadata() && this.ignoreMetadata())) 
++				this.ignoreMetadata() && recipe.ignoreMetadata())) 
 +		{
 +			return output.equals(recipe.output);
 +		}

diff --git a/patches/minecraft/net/minecraft/src/FCRecipes.java.patch b/patches/minecraft/net/minecraft/src/FCRecipes.java.patch
@@ -5600,7 +5600,7 @@
 +	
 +	private static void addLogChoppingRecipes() {
 +		for (int i = 0; i < 4; i++) {
-+			addLogChoppingRecipe(new ItemStack(Block.planks, 4, i), 
++			addLogChoppingRecipe(new ItemStack(Block.planks, 2, i), 
 +					new ItemStack[] {
 +							new ItemStack(FCBetterThanWolves.fcItemBark, 1, i),
 +							new ItemStack(FCBetterThanWolves.fcItemSawDust, 2, 0), 
@@ -5613,7 +5613,7 @@
 +					new ItemStack(Block.wood, 1, i));
 +		}
 +		
-+		addLogChoppingRecipe(new ItemStack(Block.planks, 4, 4), 
++		addLogChoppingRecipe(new ItemStack(Block.planks, 2, 4), 
 +				new ItemStack[] {
 +						new ItemStack(FCBetterThanWolves.fcItemBark, 1, 4),
 +						new ItemStack(FCBetterThanWolves.fcItemSawDust, 1, 0),

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.2";
++	public static final String fcVersionString = "1.3.3";
 +
 +	public static FCBetterThanWolves m_instance = new FCBetterThanWolves();
 +
@@ -33,14 +33,14 @@
 +	public static final Material fcMaterialCement = (new FCMaterialCement(MapColor.stoneColor));
 +	public static final Material fcMaterialSoulforgedSteel = (new FCMaterialSoulforgedSteel(MapColor.ironColor));
 +	public static final Material fcMaterialNetherGrowth = (new FCMaterialNetherGrowth(MapColor.foliageColor)).SetMobsCantSpawnOn();    
-+	public static final Material fcMaterialCandle = (new MaterialLogic(MapColor.airColor)).setNoPushMobility();
++	public static final Material fcMaterialCandle = (new MaterialLogic(MapColor.airColor)).setNoPushMobility().setDoesNotBreakSaw();
 +	public static final Material fcMaterialMiscellaneous = new Material(MapColor.dirtColor); // used for aesthetic blocks to avoid tool dependancies
 +	public static final Material fcMaterialLog = (new Material(MapColor.woodColor)).setBurning().setRequiresTool().SetMobsCantSpawnOn().setDoesNotBreakSaw();
 +	public static final Material fcMaterialPlanks = (new Material(MapColor.woodColor)).setBurning().setRequiresTool().SetMobsCantSpawnOn().setDoesNotBreakSaw();
 +	public static final Material fcMaterialAsh = (new MaterialLogic(MapColor.stoneColor)).setReplaceable().setTranslucent().setRequiresTool().setNoPushMobility().setDoesNotBreakSaw();
 +	public static final Material fcMaterialNaturalClay = (new Material(MapColor.clayColor)).setRequiresTool();
-+	public static final Material fcMaterialWicker = (new Material(MapColor.woodColor)).setBurning().setRequiresTool().SetAxesEfficientOn().SetMobsCantSpawnOn().setDoesNotBreakSaw();
-+	public static final Material fcMaterialBasket = (new Material(MapColor.woodColor)).setNoPushMobility().SetMobsCantSpawnOn().setDoesNotBreakSaw();
++	public static final Material fcMaterialWicker = (new Material(MapColor.woodColor)).setBurning().setRequiresTool().SetAxesEfficientOn().setDoesNotBreakSaw();
++	public static final Material fcMaterialBasket = (new Material(MapColor.woodColor)).setNoPushMobility().setDoesNotBreakSaw();
 +	public static final Material fcMaterialMilk = (new MaterialLogic(MapColor.snowColor)).setReplaceable().setTranslucent().setRequiresTool().setNoPushMobility();
 +	public static final Material fcMaterialNetherRock = (new Material(MapColor.stoneColor)).setRequiresTool().SetNetherMobsCanSpawnOn();
 +

diff --git a/patches/minecraft_server/net/minecraft/src/FCCraftingManagerKilnRecipe.java.patch b/patches/minecraft_server/net/minecraft/src/FCCraftingManagerKilnRecipe.java.patch
@@ -25,7 +25,7 @@
 +	public boolean matchesRecipe(FCCraftingManagerKilnRecipe recipe) {
 +		if (this.block == recipe.block && 
 +			(Arrays.equals(this.metadatas, recipe.metadatas) || 
-+				this.ignoreMetadata() && this.ignoreMetadata())) 
++				this.ignoreMetadata() && recipe.ignoreMetadata())) 
 +		{
 +			return output.equals(recipe.output);
 +		}

diff --git a/patches/minecraft_server/net/minecraft/src/FCCraftingManagerSawRecipe.java.patch b/patches/minecraft_server/net/minecraft/src/FCCraftingManagerSawRecipe.java.patch
@@ -23,7 +23,7 @@
 +	public boolean matchesRecipe(FCCraftingManagerSawRecipe recipe) {
 +		if (this.block == recipe.block && 
 +			(Arrays.equals(this.metadatas, recipe.metadatas) || 
-+				this.ignoreMetadata() && this.ignoreMetadata())) 
++				this.ignoreMetadata() && recipe.ignoreMetadata())) 
 +		{
 +			return output.equals(recipe.output);
 +		}

diff --git a/patches/minecraft_server/net/minecraft/src/FCRecipes.java.patch b/patches/minecraft_server/net/minecraft/src/FCRecipes.java.patch
@@ -5600,7 +5600,7 @@
 +	
 +	private static void addLogChoppingRecipes() {
 +		for (int i = 0; i < 4; i++) {
-+			addLogChoppingRecipe(new ItemStack(Block.planks, 4, i), 
++			addLogChoppingRecipe(new ItemStack(Block.planks, 2, i), 
 +					new ItemStack[] {
 +							new ItemStack(FCBetterThanWolves.fcItemBark, 1, i),
 +							new ItemStack(FCBetterThanWolves.fcItemSawDust, 2, 0), 
@@ -5613,7 +5613,7 @@
 +					new ItemStack(Block.wood, 1, i));
 +		}
 +		
-+		addLogChoppingRecipe(new ItemStack(Block.planks, 4, 4), 
++		addLogChoppingRecipe(new ItemStack(Block.planks, 2, 4), 
 +				new ItemStack[] {
 +						new ItemStack(FCBetterThanWolves.fcItemBark, 1, 4),
 +						new ItemStack(FCBetterThanWolves.fcItemSawDust, 1, 0),