Forgot build.gradle from last commit; clean up packet code; add config options

Author: impiaaa

build.gradle

@@ -13,15 +13,6 @@ buildscript {
 
 apply plugin: 'forge'
 
-ext.configFile = file "build.properties"
-
-configFile.withReader {
-    // Load config.  It shall from now be referenced as simply config or project.config
-    def prop = new Properties()
-    prop.load(it)
-    project.ext.config = new ConfigSlurper().parse prop
-}
-
 // Finds and sets version data
 task buildInfo {
     def cmd = "git rev-parse --short HEAD"
@@ -40,13 +31,13 @@ task buildInfo {
 }
 ext.artifact_version = 'NFG'
 if (System.getenv().ARTIFACT_VERSION == null) {
-    artifact_version = "${config.mod_version}"
+    artifact_version = "${mod_version}"
 }
 if (System.getenv().ARTIFACT_VERSION != null) {
     artifact_version = "${system.getenv().ARTIFACT_VERSION}"
 }
 
-version = "MC${config.minecraft_version}-${artifact_version}-${buildInfo.buildNum}"
+version = "MC${minecraft_version}-${artifact_version}-${buildInfo.buildNum}"
 def actualVersion = "${artifact_version}-${buildInfo.buildNum}"
 
 minecraft {

src/main/java/tterrag/treesimulator/PacketHandlerTGS.java

@@ -1,5 +1,9 @@
 package tterrag.treesimulator;
 
+import java.io.ByteArrayInputStream;
+import java.io.DataInputStream;
+import java.io.IOException;
+
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockSapling;
 import net.minecraft.entity.player.EntityPlayer;
@@ -9,25 +13,25 @@
 import cpw.mods.fml.common.network.Player;
 
 public class PacketHandlerTGS implements IPacketHandler{
-
 	@Override
 	public void onPacketData(INetworkManager manager, Packet250CustomPayload packet, Player player) {
-		
-		if (packet.data.length == 12)
-		{
-			byte[] bytes = packet.data;
-			
-			int x = ((bytes[0] & 255) | ((bytes[1] & 255) << 8) | ((bytes[2] & 255) << 16) | (bytes[3] & 255) << 24);
-			int y = ((bytes[4] & 255) | ((bytes[5] & 255) << 8) | ((bytes[6] & 255) << 16) | (bytes[7] & 255) << 24);
-			int z = ((bytes[8] & 255) | ((bytes[9] & 255) << 8) | ((bytes[10] & 255) << 16) | (bytes[11] & 255) << 24);
+		ByteArrayInputStream byteStream = new ByteArrayInputStream(packet.data);
+		DataInputStream stream = new DataInputStream(byteStream);
+		int x, y, z;
+		try {
+			x = stream.readInt();
+			y = stream.readInt();
+			z = stream.readInt();
+		} catch (IOException e) {
+			e.printStackTrace();
+			return;
+		}
 
-			EntityPlayer entity = (EntityPlayer) player;
-			Block block = Block.blocksList[entity.worldObj.getBlockId(x, y, z)];
-			if (block instanceof BlockSapling)
-			{
-				entity.worldObj.playAuxSFX(2005, x, y, z, 0);				
-			}
-			System.out.println(String.format("Packet Recieved! block:%s x:%d y:%d z:%d", block == null ? "null" : block.toString(), x, y, z));
+		EntityPlayer entity = (EntityPlayer) player;
+		Block block = Block.blocksList[entity.worldObj.getBlockId(x, y, z)];
+		if (block instanceof BlockSapling)
+		{
+			entity.worldObj.playAuxSFX(2005, x, y, z, 0);				
 		}
 	}
 }

src/main/java/tterrag/treesimulator/TickHandlerTGS.java

@@ -1,5 +1,8 @@
 package tterrag.treesimulator;
 
+import java.io.ByteArrayOutputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
 import java.util.Arrays;
 import java.util.EnumSet;
 
@@ -44,11 +47,11 @@ public void tickStart(EnumSet<TickType> type, Object... tickData)
 				if (pos.length == 0)
 					return;
 
-				if (Math.abs(player.posX - posX) > 0.25 || Math.abs(player.posZ - posZ) > 0.25)
+				if ((Math.abs(player.posX - posX) > 0.25 || Math.abs(player.posZ - posZ) > 0.25) && TreeSimulator.sprintingWorks)
 				{
 					movementCounter++;
 				}
-				if (PlayerState.getState(player.isSneaking()) != state)
+				if ((PlayerState.getState(player.isSneaking()) != state) && TreeSimulator.crouchingWorks)
 				{					
 					movementCounter++;
 				}
@@ -88,29 +91,21 @@ private void sendPacket(int x, int y, int z, World worldObj, Player player) {
 		Packet250CustomPayload packet = new Packet250CustomPayload();
 
 		packet.channel = TreeSimulator.CHANNEL;
-		packet.length = 12;
 
-		byte[] bytes = new byte[12];
-
-		bytes[0] = (byte) (x & 255);
-		bytes[1] = (byte) ((x >> 8) & 255);
-		bytes[2] = (byte) ((x >> 16) & 255);
-		bytes[3] = (byte) ((x >> 24) & 255);
-
-		bytes[4] = (byte) (y & 255);
-		bytes[5] = (byte) ((y >> 8) & 255);
-		bytes[6] = (byte) ((y >> 16) & 255);
-		bytes[7] = (byte) ((y >> 24) & 255);
-
-		bytes[8] = (byte) (z & 255);
-		bytes[9] = (byte) ((z >> 8) & 255);
-		bytes[10] = (byte) ((z >> 16) & 255);
-		bytes[11] = (byte) ((z >> 24) & 255);
-
-		System.out
-				.println(x + " " + y + " " + z + " " + Arrays.toString(bytes));
+		ByteArrayOutputStream byteStream = new ByteArrayOutputStream(12);
+		DataOutputStream stream = new DataOutputStream(byteStream);
+		try {
+			stream.writeInt(x);
+			stream.writeInt(y);
+			stream.writeInt(z);
+			stream.close();
+		} catch (IOException e) {
+			e.printStackTrace();
+			return;
+		}
 
-		packet.data = bytes;
+		packet.data = byteStream.toByteArray();
+		packet.length = byteStream.size();
 		PacketDispatcher.sendPacketToPlayer(packet, player);
 	}
 

src/main/java/tterrag/treesimulator/TreeSimulator.java

@@ -18,6 +18,8 @@ public class TreeSimulator {
 
 	public static int waitTime;
 	public static boolean showParticles;
+	public static boolean crouchingWorks;
+	public static boolean sprintingWorks;
 	public static final String CHANNEL = "TGS2014";
 
 	@Instance
@@ -43,6 +45,8 @@ private void initConfig(File file)
 
 		waitTime = config.get("Tweaks", "waitTime", 100, "The amount of ticks (times 5) you must be sprinting before bonemeal is applied").getInt();
 		showParticles = config.get("Tweaks", "showParticles", true, "Show bonemeal particles when appropriate. Not sure why you would turn this off, but eh").getBoolean(true);
+		crouchingWorks = config.get("Tweaks", "crouchingWorks", true, "Enable crouching to speed growth").getBoolean(true);
+		sprintingWorks = config.get("Tweaks", "sprintingWorks", true, "Enable sprinting to speed growth").getBoolean(true);
 
 		config.save();
 	}