1.3.7

BTW-Community · Feb 9, 2022 · 7328754 · 7328754
1 parent 1d08238
commit 7328754
Show file tree

Hide file tree

Showing 21 changed files with 902 additions and 47 deletions.
diff --git a/changelog.txt b/changelog.txt
@@ -1,3 +1,16 @@
+## Version 1.3.7 ##
+/--General--/
+- Added a Simplified Chinese translation. Thanks to Peakstep for providing the translation!
+
+/--Gameplay--/
+- Changed the recipe for the screw. The recipe remains the same shape, using a column of three iron ingots in the center, while the outer ingots have been changed to nuggets. This should help make screw pump towers a little more accessible in the mid game, without completely devaluing their cost.
+- Changed vanilla armor types to have equal durability across armor slots to match mod armors.
+
+/--Addon API--/
+- Changed the type passed in to the world decorator hook from last release from BiomeDecorator to a new interface FCIBiomeDecorator, which BiomeDecorator implements.
+- Changed the hook for checking for valid snow placement to pass the current world as an argument.
+- Fixed an issue where some instances of the game checking for snow did not use the new hook.
+
 ## Version 1.3.6 ##
 /--Gameplay--/
 - Fixed an issue where sawing corners of wood types with metadata would create gears with metadata which wouldn't stack together or work in recipes. Additionally, recipes involving gears have been changed to ignore metadata so that existing bugged gears can be used.

diff --git a/patches/minecraft/net/minecraft/src/BiomeDecorator.java.patch b/patches/minecraft/net/minecraft/src/BiomeDecorator.java.patch
@@ -1,6 +1,23 @@
 --- a/minecraft/net/minecraft/src/BiomeDecorator.java
 +++ b/minecraft/net/minecraft/src/BiomeDecorator.java
-@@ -376,6 +376,8 @@
+@@ -2,7 +2,7 @@
+
+ import java.util.Random;
+
+-public class BiomeDecorator
++public class BiomeDecorator implements FCIBiomeDecorator
+ {
+     /** The world the BiomeDecorator is currently decorating */
+     protected World currentWorld;
+@@ -169,6 +169,7 @@
+     /**
+      * Decorates the world. Calls code that was formerly (pre-1.8) in ChunkProviderGenerate.populate
+      */
++    @Override
+     public void decorate(World par1World, Random par2Random, int par3, int par4)
+     {
+         if (this.currentWorld != null)
+@@ -376,6 +377,8 @@
                  (new WorldGenLiquids(Block.lavaMoving.blockID)).generate(this.currentWorld, this.randomGenerator, var3, var4, var7);
              }
          }

diff --git a/patches/minecraft/net/minecraft/src/BiomeGenBase.java.patch b/patches/minecraft/net/minecraft/src/BiomeGenBase.java.patch
@@ -189,8 +189,8 @@
 +    	return false;
 +    }
 +    
-+    public boolean canSnowAt(int x, int y, int z) {
-+    	return this.temperature <= 0.15F;
++    public boolean canSnowAt(World world, int x, int y, int z) {
++    	return this.getEnableSnow();
 +    }
 +    // END FCMOD
 +}
diff --git a/patches/minecraft/net/minecraft/src/EntityRenderer.java.patch b/patches/minecraft/net/minecraft/src/EntityRenderer.java.patch
diff --git a/patches/minecraft/net/minecraft/src/FCAddOn.java.patch b/patches/minecraft/net/minecraft/src/FCAddOn.java.patch
@@ -131,7 +131,7 @@
 +	 * @param y
 +	 * @param biome The biome being decorated. Biomes during decoration are lower resolution, only being caluclated per chunk not per block
 +	 */
-+	public void decorateWorld(BiomeDecorator decorator, World world, Random rand, int x, int y, BiomeGenBase biome) {}
++	public void decorateWorld(FCIBiomeDecorator decorator, World world, Random rand, int x, int y, BiomeGenBase biome) {}
 +	
 +	//------ API Methods ------//
 +	/*

diff --git a/patches/minecraft/net/minecraft/src/FCAddOnHandler.java.patch b/patches/minecraft/net/minecraft/src/FCAddOnHandler.java.patch
@@ -324,7 +324,7 @@
 +		FCAddOnHandler.addonWorldDataMap.put(mod, data);
 +	}
 +	
-+	public static void decorateWorld(BiomeDecorator decorator, World world, Random rand, int x, int y, BiomeGenBase biome) {
++	public static void decorateWorld(FCIBiomeDecorator decorator, World world, Random rand, int x, int y, BiomeGenBase biome) {
 +		for (Object mod : FCAddOnHandler.m_ModList) {
 +			FCAddOn addon = (FCAddOn) mod;
 +			

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.6";
++	public static final String fcVersionString = "1.3.7";
 +
 +	public static FCBetterThanWolves m_instance = new FCBetterThanWolves();
 +

diff --git a/patches/minecraft/net/minecraft/src/FCIBiomeDecorator.java.patch b/patches/minecraft/net/minecraft/src/FCIBiomeDecorator.java.patch
@@ -0,0 +1,10 @@
+--- /dev/null
++++ b/minecraft/net/minecraft/src/FCIBiomeDecorator.java
+@@ -0,0 +1,7 @@
++package net.minecraft.src;
++
++import java.util.Random;
++
++public interface FCIBiomeDecorator {
++	public void decorate(World world, Random rand, int x, int z);
++}
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,7179 @@
+@@ -0,0 +1,7180 @@
 +// FCMOD
 +
 +package net.minecraft.src;
@@ -2356,10 +2356,11 @@
 +		} );
 +		
 +		AddRecipe( new ItemStack( FCBetterThanWolves.fcItemScrew ), new Object[] {
-+    		"## ", 
-+    		" ##", 
-+    		"## ", 
-+    		'#', new ItemStack( Item.ingotIron )
++    		"n# ", 
++    		" #n", 
++    		"n# ", 
++    		'#', new ItemStack(Item.ingotIron),
++    		'n', new ItemStack(FCBetterThanWolves.fcItemNuggetIron)
 +		} );
 +		
 +		AddRecipe( new ItemStack( FCBetterThanWolves.fcItemOcularOfEnder, 1, 0 ), new Object[] {

diff --git a/patches/minecraft/net/minecraft/src/ItemArmor.java.patch b/patches/minecraft/net/minecraft/src/ItemArmor.java.patch
@@ -1,13 +1,18 @@
 --- a/minecraft/net/minecraft/src/ItemArmor.java
 +++ b/minecraft/net/minecraft/src/ItemArmor.java
-@@ -1,5 +1,7 @@
+@@ -1,9 +1,11 @@
  package net.minecraft.src;
 
 +import com.prupe.mcpatcher.cc.ColorizeEntity;
 +
  public class ItemArmor extends Item
  {
      /** Holds the 'base' maxDamage that each armorType have. */
+-    private static final int[] maxDamageArray = new int[] {11, 16, 15, 13};
++    private static final int[] maxDamageArray = new int[] {16, 16, 16, 16};
+     private static final String[] field_94606_cu = new String[] {"helmetCloth_overlay", "chestplateCloth_overlay", "leggingsCloth_overlay", "bootsCloth_overlay"};
+     public static final String[] field_94603_a = new String[] {"slot_empty_helmet", "slot_empty_chestplate", "slot_empty_leggings", "slot_empty_boots"};
+     private static final IBehaviorDispenseItem field_96605_cw = new BehaviorDispenseArmor();
 @@ -14,7 +16,12 @@
      public final int armorType;
 

diff --git a/patches/minecraft/net/minecraft/src/World.java.patch b/patches/minecraft/net/minecraft/src/World.java.patch
@@ -474,7 +474,7 @@
 -
 -                if (var7 == 0 && Block.snow.canPlaceBlockAt(this, par1, par2, par3) && var6 != 0 && var6 != Block.ice.blockID && Block.blocksList[var6].blockMaterial.blocksMovement())
 -                {
-+        if (biome.canSnowAt(x, y, z)) {
++        if (biome.canSnowAt(this, x, y, z)) {
 +            if (y >= 0 && y < 256 && this.getSavedLightValue(EnumSkyBlock.Block, x, y, z) < 10) {
 +                if (FCBlockSnowCover.CanSnowCoverReplaceBlock(this, x, y, z) && Block.snow.canPlaceBlockAt(this, x, y, z)) {
                      return true;
@@ -1815,7 +1815,7 @@
 +        {
 +            BiomeGenBase biome = getBiomeGenForCoords( i, k );
 +            
-+            return biome.getEnableSnow();
++            return biome.canSnowAt(this, i, j, k);
 +        }
 +        
 +        return false;

diff --git a/patches/minecraft_server/net/minecraft/src/BiomeDecorator.java.patch b/patches/minecraft_server/net/minecraft/src/BiomeDecorator.java.patch
@@ -1,5 +1,14 @@
 --- a/minecraft_server/net/minecraft/src/BiomeDecorator.java
 +++ b/minecraft_server/net/minecraft/src/BiomeDecorator.java
+@@ -2,7 +2,7 @@
+
+ import java.util.Random;
+
+-public class BiomeDecorator
++public class BiomeDecorator implements FCIBiomeDecorator
+ {
+     /** The world the BiomeDecorator is currently decorating */
+     protected World currentWorld;
 @@ -376,6 +376,8 @@
                  (new WorldGenLiquids(Block.lavaMoving.blockID)).generate(this.currentWorld, this.randomGenerator, var3, var4, var7);
              }

diff --git a/patches/minecraft_server/net/minecraft/src/BiomeGenBase.java.patch b/patches/minecraft_server/net/minecraft/src/BiomeGenBase.java.patch
@@ -189,8 +189,8 @@
 +    	return false;
 +    }
 +
-+    public boolean canSnowAt(int x, int y, int z) {
-+    	return this.temperature <= 0.15F;
++    public boolean canSnowAt(World world, int x, int y, int z) {
++    	return this.getEnableSnow();
 +    }
 +    // END FCMOD
 +}
diff --git a/patches/minecraft_server/net/minecraft/src/FCAddOn.java.patch b/patches/minecraft_server/net/minecraft/src/FCAddOn.java.patch
@@ -130,7 +130,7 @@
 +	 * @param y
 +	 * @param biome The biome being decorated. Biomes during decoration are lower resolution, only being caluclated per chunk not per block
 +	 */
-+	public void decorateWorld(BiomeDecorator decorator, World world, Random rand, int x, int y, BiomeGenBase biome) {}
++	public void decorateWorld(FCIBiomeDecorator decorator, World world, Random rand, int x, int y, BiomeGenBase biome) {}
 +	
 +	//------ API Methods ------//
 +	/*

diff --git a/patches/minecraft_server/net/minecraft/src/FCAddOnHandler.java.patch b/patches/minecraft_server/net/minecraft/src/FCAddOnHandler.java.patch
@@ -322,7 +322,7 @@
 +		FCAddOnHandler.addonWorldDataMap.put(mod, data);
 +	}
 +	
-+	public static void decorateWorld(BiomeDecorator decorator, World world, Random rand, int x, int y, BiomeGenBase biome) {
++	public static void decorateWorld(FCIBiomeDecorator decorator, World world, Random rand, int x, int y, BiomeGenBase biome) {
 +		for (Object mod : FCAddOnHandler.m_ModList) {
 +			FCAddOn addon = (FCAddOn) mod;
 +

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.6";
++	public static final String fcVersionString = "1.3.7";
 +
 +	public static FCBetterThanWolves m_instance = new FCBetterThanWolves();
 +

diff --git a/patches/minecraft_server/net/minecraft/src/FCIBiomeDecorator.java.patch b/patches/minecraft_server/net/minecraft/src/FCIBiomeDecorator.java.patch
@@ -0,0 +1,11 @@
+--- /dev/null
++++ b/minecraft_server/net/minecraft/src/FCIBiomeDecorator.java
+@@ -0,0 +1,7 @@
++package net.minecraft.src;
++
++import java.util.Random;
++
++public interface FCIBiomeDecorator {
++	public void decorate(World world, Random rand, int x, int z);
++}
+\ No newline at end of file
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,7179 @@
+@@ -0,0 +1,7180 @@
 +// FCMOD
 +
 +package net.minecraft.src;
@@ -2356,10 +2356,11 @@
 +		} );
 +		
 +		AddRecipe( new ItemStack( FCBetterThanWolves.fcItemScrew ), new Object[] {
-+    		"## ", 
-+    		" ##", 
-+    		"## ", 
-+    		'#', new ItemStack( Item.ingotIron )
++    		"n# ", 
++    		" #n", 
++    		"n# ", 
++    		'#', new ItemStack(Item.ingotIron),
++    		'n', new ItemStack(FCBetterThanWolves.fcItemNuggetIron)
 +		} );
 +		
 +		AddRecipe( new ItemStack( FCBetterThanWolves.fcItemOcularOfEnder, 1, 0 ), new Object[] {

diff --git a/patches/minecraft_server/net/minecraft/src/ItemArmor.java.patch b/patches/minecraft_server/net/minecraft/src/ItemArmor.java.patch
@@ -1,5 +1,14 @@
 --- a/minecraft_server/net/minecraft/src/ItemArmor.java
 +++ b/minecraft_server/net/minecraft/src/ItemArmor.java
+@@ -3,7 +3,7 @@
+ public class ItemArmor extends Item
+ {
+     /** Holds the 'base' maxDamage that each armorType have. */
+-    private static final int[] maxDamageArray = new int[] {11, 16, 15, 13};
++    private static final int[] maxDamageArray = new int[] {16, 16, 16, 16};
+     private static final String[] field_94606_cu = new String[] {"helmetCloth_overlay", "chestplateCloth_overlay", "leggingsCloth_overlay", "bootsCloth_overlay"};
+     public static final String[] field_94603_a = new String[] {"slot_empty_helmet", "slot_empty_chestplate", "slot_empty_leggings", "slot_empty_boots"};
+     private static final IBehaviorDispenseItem field_96605_cw = new BehaviorDispenseArmor();
 @@ -14,7 +14,12 @@
      public final int armorType;
 

diff --git a/patches/minecraft_server/net/minecraft/src/World.java.patch b/patches/minecraft_server/net/minecraft/src/World.java.patch
@@ -472,7 +472,7 @@
 -
 -                if (var7 == 0 && Block.snow.canPlaceBlockAt(this, par1, par2, par3) && var6 != 0 && var6 != Block.ice.blockID && Block.blocksList[var6].blockMaterial.blocksMovement())
 -                {
-+        if (biome.canSnowAt(x, y, z)) {
++        if (biome.canSnowAt(this, x, y, z)) {
 +            if (y >= 0 && y < 256 && this.getSavedLightValue(EnumSkyBlock.Block, x, y, z) < 10) {
 +                if (FCBlockSnowCover.CanSnowCoverReplaceBlock(this, x, y, z) && Block.snow.canPlaceBlockAt(this, x, y, z)) {
                      return true;
@@ -1809,7 +1809,7 @@
 +        {
 +            BiomeGenBase biome = getBiomeGenForCoords( i, k );
 +            
-+            return biome.getEnableSnow();
++            return biome.canSnowAt(this, i, j, k);
 +        }
 +        
 +        return false;