1.3.1

BTW-Community · Dec 13, 2021 · 0b5b9ca · 0b5b9ca
1 parent 9bc8b9e
commit 0b5b9ca
Show file tree

Hide file tree

Showing 9 changed files with 143 additions and 56 deletions.
diff --git a/changelog.txt b/changelog.txt
@@ -1,3 +1,16 @@
+## Version 1.3.1 ##
+Thanks to the following people who contributed to this release!
+- Hiracho
+
+/--General--/
+- Fixed an issue where mod initialization in multiplayer would still cause crashes on launching the server.
+
+/--Gameplay--/
+- Added the ability to sprint by pressing alt use (defaulted to ctrl) while moving.
+- Added the ability to place several orientable blocks with the opposite rotation by holding alt use while placing.
+- Changed sprinting to not cancel when hitting blocks as long as movement input is still activated.
+- Fixed an issue where pressing alt use while moving in multiplayer would disconnect the client.
+
 ## Version 1.3.0 ##
 Thanks to the following people who contributed to this release!
 - Dawnraider

diff --git a/patches/minecraft/net/minecraft/src/EntityPlayerSP.java.patch b/patches/minecraft/net/minecraft/src/EntityPlayerSP.java.patch
@@ -11,7 +11,16 @@
          }
 
          this.username = par3Session.username;
-@@ -180,7 +183,12 @@
+@@ -162,6 +165,8 @@
+             boolean var1 = this.movementInput.jump;
+             float var2 = 0.8F;
+             boolean var3 = this.movementInput.moveForward >= var2;
++            boolean wasHoldingSpecial = isUsingSpecialKey();
++            
+             this.movementInput.updatePlayerMoveState();
+
+             if (this.isUsingItem())
+@@ -180,8 +185,15 @@
              this.pushOutOfBlocks(this.posX - (double)this.width * 0.35D, this.boundingBox.minY + 0.5D, this.posZ - (double)this.width * 0.35D);
              this.pushOutOfBlocks(this.posX + (double)this.width * 0.35D, this.boundingBox.minY + 0.5D, this.posZ - (double)this.width * 0.35D);
              this.pushOutOfBlocks(this.posX + (double)this.width * 0.35D, this.boundingBox.minY + 0.5D, this.posZ + (double)this.width * 0.35D);
@@ -21,10 +30,41 @@
 +            */
 +            boolean var4 = !HasStatusPenalty() || this.capabilities.allowFlying;
 +            // END FCMOD
++            boolean activatedSprint=false;
 
++
              if (this.onGround && !var3 && this.movementInput.moveForward >= var2 && !this.isSprinting() && var4 && !this.isUsingItem() && !this.isPotionActive(Potion.blindness))
              {
-@@ -254,9 +262,22 @@
+                 if (this.sprintToggleTimer == 0)
+@@ -191,16 +203,26 @@
+                 else
+                 {
+                     this.setSprinting(true);
++                    activatedSprint=true;
+                     this.sprintToggleTimer = 0;
+                 }
+             }
+
++            if ( isUsingSpecialKey() && !wasHoldingSpecial && this.movementInput.moveForward >= var2 && !this.isSprinting() &&
++            		var4 && !this.isUsingItem() && !this.isPotionActive(Potion.blindness))
++            {
++                this.setSprinting(true);
++                activatedSprint=true;
++                this.sprintToggleTimer = 0;
++            }
++            
+             if (this.isSneaking())
+             {
+                 this.sprintToggleTimer = 0;
+             }
+
+-            if (this.isSprinting() && (this.movementInput.moveForward < var2 || this.isCollidedHorizontally || !var4))
++            if (this.isSprinting() && (this.movementInput.moveForward < var2 || !var4 ||
++            		( isUsingSpecialKey() && !wasHoldingSpecial && !activatedSprint )))
+             {
+                 this.setSprinting(false);
+             }
+@@ -254,9 +276,22 @@
              var1 *= 1.1F;
          }
 
@@ -47,7 +87,7 @@
          {
              int var2 = this.getItemInUseDuration();
              float var3 = (float)var2 / 20.0F;
-@@ -278,7 +299,10 @@
+@@ -278,7 +313,10 @@
 
      public void updateCloak()
      {
@@ -59,7 +99,7 @@
      }
 
      /**
-@@ -320,7 +344,13 @@
+@@ -320,7 +358,13 @@
          {
              this.mc.displayGuiScreen(new GuiScreenBook(this, par1ItemStack, true));
          }
@@ -73,7 +113,7 @@
 
      /**
       * Displays the GUI for interacting with a chest inventory. Args: chestInventory
-@@ -345,7 +375,10 @@
+@@ -345,7 +389,10 @@
       */
      public void displayGUIWorkbench(int par1, int par2, int par3)
      {
@@ -85,7 +125,7 @@
      }
 
      public void displayGUIEnchantment(int par1, int par2, int par3, String par4Str)
-@@ -403,12 +436,12 @@
+@@ -403,12 +450,12 @@
       */
      public void onCriticalHit(Entity par1Entity)
      {
@@ -100,7 +140,7 @@
          this.mc.effectRenderer.addEffect(var2);
      }
 
-@@ -417,7 +450,7 @@
+@@ -417,7 +464,7 @@
       */
      public void onItemPickup(Entity par1Entity, int par2)
      {
@@ -109,7 +149,7 @@
      }
 
      /**
-@@ -428,6 +461,11 @@
+@@ -428,6 +475,11 @@
          return this.movementInput.sneak && !this.sleeping;
      }
 
@@ -121,7 +161,7 @@
      /**
       * Updates health locally.
       */
-@@ -617,4 +655,183 @@
+@@ -617,4 +669,183 @@
      {
          this.worldObj.playSound(this.posX, this.posY - (double)this.yOffset, this.posZ, par1Str, par2, par3, false);
      }

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

diff --git a/patches/minecraft/net/minecraft/src/FCBlockPistonBase.java.patch b/patches/minecraft/net/minecraft/src/FCBlockPistonBase.java.patch
@@ -1,6 +1,6 @@
 --- /dev/null
 +++ b/minecraft/net/minecraft/src/FCBlockPistonBase.java
-@@ -0,0 +1,531 @@
+@@ -0,0 +1,532 @@
 +// FCMOD
 +
 +package net.minecraft.src;
@@ -369,16 +369,17 @@
 +    }
 +	
 +	@Override
-+    public int PreBlockPlacedBy( World world, int i, int j, int k, int iMetadata, 
-+    	EntityLiving entityBy ) 
-+    {
++	public int PreBlockPlacedBy( World world, int i, int j, int k, int iMetadata, 
++			EntityLiving entityBy ) 
++	{
 +		int facing = determineOrientation( world, i, j, k, entityBy );
-+		if(entityBy.isUsingSpecialKey())
-+		{
-+			//facing = Facing.oppositeSide[facing];
++    
++		if(entityBy.isUsingSpecialKey()) {
++			facing = Facing.oppositeSide[facing];
 +		}
-+    	return facing;    	
-+    }
++
++		return facing;    	
++	}
 +
 +	@Override
 +	public void onBlockPlacedBy( World world, int i, int j, int k, 

diff --git a/patches/minecraft/net/minecraft/src/FCUtilsMisc.java.patch b/patches/minecraft/net/minecraft/src/FCUtilsMisc.java.patch
@@ -1,6 +1,6 @@
 --- /dev/null
 +++ b/minecraft/net/minecraft/src/FCUtilsMisc.java
-@@ -0,0 +1,922 @@
+@@ -0,0 +1,931 @@
 +// FCMOD
 +
 +package net.minecraft.src;
@@ -21,22 +21,22 @@
 +		if ( pitch > 60.0F )
 +		{
 +			// looking down
-+			//if(GuiScreen.isSpecialKeyDown())
-+			//{
-+			//	return 0;
-+			//}
-+			//else
-+			return 1;			
++			if(entityLiving.isUsingSpecialKey()) {
++				return 0;
++			}
++			else {
++				return 1;	
++			}
 +		}
 +		else if ( pitch < -60.0F )
 +		{
 +			// looking up
-+			//if(GuiScreen.isSpecialKeyDown())
-+			//{
-+			//	return 1;
-+			//}
-+			//else
-+			return 0;
++			if(entityLiving.isUsingSpecialKey()) {
++				return 1;
++			}
++			else {
++				return 0;
++			}
 +		}
 +		else
 +		{
@@ -66,7 +66,11 @@
 +	    {
 +			iFacing = 4;			
 +	    }
-+	    
++
++		if(entityLiving.isUsingSpecialKey()) {
++			iFacing = Facing.oppositeSide[iFacing];
++		}
++      
 +		return iFacing;
 +    }
 +    
@@ -92,6 +96,11 @@
 +	    {
 +			iFacing = 5;			
 +	    }
++	    
++		if(entityLiving.isUsingSpecialKey()) {
++			iFacing = Facing.oppositeSide[iFacing];
++		}
++		
 +		return iFacing;
 +    }
 +    

diff --git a/patches/minecraft_server/net/minecraft/src/DedicatedServer.java.patch b/patches/minecraft_server/net/minecraft/src/DedicatedServer.java.patch
@@ -0,0 +1,11 @@
+--- a/minecraft_server/net/minecraft/src/DedicatedServer.java
++++ b/minecraft_server/net/minecraft/src/DedicatedServer.java
+@@ -38,6 +38,8 @@
+         var1.start();
+         this.getLogAgent().func_98233_a("Starting minecraft server version 1.5.2");
+
++        FCAddOnHandler.InitializeMods(); 
++        
+         if (Runtime.getRuntime().maxMemory() / 1024L / 1024L < 512L)
+         {
+             this.getLogAgent().func_98236_b("To start the server with more ram, launch it as \"java -Xmx1024M -Xms1024M -jar minecraft_server.jar\"");
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.0";
++	public static final String fcVersionString = "1.3.1";
 +
 +	public static FCBetterThanWolves m_instance = new FCBetterThanWolves();
 +

diff --git a/patches/minecraft_server/net/minecraft/src/FCBlockPistonBase.java.patch b/patches/minecraft_server/net/minecraft/src/FCBlockPistonBase.java.patch
@@ -1,6 +1,6 @@
 --- /dev/null
 +++ b/minecraft_server/net/minecraft/src/FCBlockPistonBase.java
-@@ -0,0 +1,479 @@
+@@ -0,0 +1,483 @@
 +// FCMOD
 +
 +package net.minecraft.src;
@@ -369,11 +369,17 @@
 +    }
 +	
 +	@Override
-+    public int PreBlockPlacedBy( World world, int i, int j, int k, int iMetadata, 
-+    	EntityLiving entityBy ) 
-+    {
-+    	return determineOrientation( world, i, j, k, entityBy );    	
-+    }
++	public int PreBlockPlacedBy( World world, int i, int j, int k, int iMetadata, 
++			EntityLiving entityBy ) 
++	{
++		int facing = determineOrientation( world, i, j, k, entityBy );
++    
++		if(entityBy.isUsingSpecialKey()) {
++			facing = Facing.oppositeSide[facing];
++		}
++
++		return facing;    	
++	}
 +
 +	@Override
 +	public void onBlockPlacedBy( World world, int i, int j, int k, 
@@ -477,6 +483,4 @@
 +            world.setBlockToAir( i, j, k );    	                    
 +    	}
 +	}
-+    
-+	//----------- Client Side Functionality -----------//
 +}
diff --git a/patches/minecraft_server/net/minecraft/src/FCUtilsMisc.java.patch b/patches/minecraft_server/net/minecraft/src/FCUtilsMisc.java.patch
@@ -1,6 +1,6 @@
 --- /dev/null
 +++ b/minecraft_server/net/minecraft/src/FCUtilsMisc.java
-@@ -0,0 +1,922 @@
+@@ -0,0 +1,931 @@
 +// FCMOD
 +
 +package net.minecraft.src;
@@ -21,22 +21,22 @@
 +		if ( pitch > 60.0F )
 +		{
 +			// looking down
-+			//if(GuiScreen.isSpecialKeyDown())
-+			//{
-+			//	return 0;
-+			//}
-+			//else
-+			return 1;			
++			if(entityLiving.isUsingSpecialKey()) {
++				return 0;
++			}
++			else {
++				return 1;	
++			}
 +		}
 +		else if ( pitch < -60.0F )
 +		{
 +			// looking up
-+			//if(GuiScreen.isSpecialKeyDown())
-+			//{
-+			//	return 1;
-+			//}
-+			//else
-+			return 0;
++			if(entityLiving.isUsingSpecialKey()) {
++				return 1;
++			}
++			else {
++				return 0;
++			}
 +		}
 +		else
 +		{
@@ -66,7 +66,11 @@
 +	    {
 +			iFacing = 4;			
 +	    }
-+	    
++
++		if(entityLiving.isUsingSpecialKey()) {
++			iFacing = Facing.oppositeSide[iFacing];
++		}
++      
 +		return iFacing;
 +    }
 +    
@@ -92,6 +96,11 @@
 +	    {
 +			iFacing = 5;			
 +	    }
++	    
++		if(entityLiving.isUsingSpecialKey()) {
++			iFacing = Facing.oppositeSide[iFacing];
++		}
++		
 +		return iFacing;
 +    }
 +