Update to 1.7.10

Gradleize the project. Changes to CompressedStreamTools.

.gitignore

@@ -34,3 +34,9 @@ Icon
 # Files that might appear on external disk
 .Spotlight-V100
 .Trashes
+/build
+/bin
+.gradle
+.project
+.settings
+.classpath

build.gradle

@@ -0,0 +1,74 @@
+buildscript {
+    repositories {
+        mavenCentral()
+        maven {
+            name = "forge"
+            url = "http://files.minecraftforge.net/maven"
+        }
+        maven {
+            name = "sonatype"
+            url = "https://oss.sonatype.org/content/repositories/snapshots/"
+        }
+    }
+    dependencies {
+        classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT'
+    }
+}
+
+apply plugin: 'forge'
+
+ext.configFile = file "build.properties"
+
+configFile.withReader {
+    def prop = new Properties()
+    prop.load(it)
+    project.ext.config = new ConfigSlurper().parse prop
+}
+
+version = config.mod_version
+group = config.mod_id
+archivesBaseName = "ForgeNBTEdit"
+
+minecraft {
+    version = config.minecraft_version + "-" + config.forge_version
+    assetDir = "eclipse/assets"
+}
+
+processResources
+{
+    from(sourceSets.main.resources.srcDirs) {
+        include '**/*.info'
+        include '**/*.properties'
+
+        expand ([
+            'mod_version': version,
+            'mc_version': project.config.minecraft_version,
+            'mod_id': project.config.mod_id
+        ])
+    }
+
+    from(sourceSets.main.resources.srcDirs) {
+        exclude '**/*.info'
+        exclude '**/*.properties'
+    }
+}
+
+
+jar {
+    appendix = 'universal'
+}
+
+task sourceJar(type: Jar) {
+    from sourceSets.main.allSource
+    appendix = 'src'
+}
+
+task deobfJar(type: Jar) {
+    from sourceSets.main.output
+    appendix = 'deobf'
+}
+
+artifacts {
+    archives sourceJar
+    archives deobfJar
+}

build.properties

@@ -0,0 +1,4 @@
+minecraft_version=1.7.10
+forge_version=10.13.0.1180
+mod_version=1.0.0.test
+mod_id=forgenbtedit

src/main/java/com/mcf/davidee/nbtedit/NBTEdit.java

@@ -35,7 +35,7 @@
  * 
  * TODO: Beg for the old clientSideRequired and serverSideRequired flags. Accepting all remote versions is stupid.
  */
-@Mod(modid="NBTEdit", name = "In-game NBTEdit",  version = "1.7.2.2", acceptableRemoteVersions="*")
+@Mod(modid="NBTEdit", name = "In-game NBTEdit",  version = "1.7.10", acceptableRemoteVersions="*")
 public class NBTEdit {
 
 	private static final String SEP = System.getProperty("line.separator");

src/main/java/com/mcf/davidee/nbtedit/NBTHelper.java

@@ -1,6 +1,8 @@
 package com.mcf.davidee.nbtedit;
 
 import java.io.DataInput;
+import java.io.DataInputStream;
+import java.io.InputStream;
 import java.io.DataOutput;
 import java.io.IOException;
 import java.util.List;
@@ -14,7 +16,7 @@
 
 public class NBTHelper {
 
-	public static NBTTagCompound nbtRead(DataInput in) throws IOException {
+	public static NBTTagCompound nbtRead(DataInputStream in) throws IOException {
 		return CompressedStreamTools.read(in);
 	}
 

src/main/java/com/mcf/davidee/nbtedit/packets/EntityNBTPacket.java

@@ -6,6 +6,7 @@
 import io.netty.buffer.ByteBufOutputStream;
 import io.netty.channel.ChannelHandlerContext;
 
+import java.io.DataInputStream;
 import java.io.IOException;
 import java.util.logging.Level;
 
@@ -44,8 +45,9 @@ public void encodeInto(ChannelHandlerContext ctx, ByteBuf buffer) throws IOExcep
 	@Override
 	public void decodeInto(ChannelHandlerContext ctx, ByteBuf buffer) throws IOException {
 		ByteBufInputStream bis = new ByteBufInputStream(buffer);
+		DataInputStream nbt = new DataInputStream(bis);
 		entityID = bis.readInt();
-		tag = NBTHelper.nbtRead(bis);
+		tag = NBTHelper.nbtRead(nbt);
 	}
 
 	@Override

src/main/java/com/mcf/davidee/nbtedit/packets/TileNBTPacket.java

@@ -6,6 +6,7 @@
 import io.netty.buffer.ByteBufOutputStream;
 import io.netty.channel.ChannelHandlerContext;
 
+import java.io.DataInputStream;
 import java.io.IOException;
 import java.util.logging.Level;
 
@@ -45,10 +46,11 @@ public void encodeInto(ChannelHandlerContext ctx, ByteBuf buffer) throws IOExcep
 	@Override
 	public void decodeInto(ChannelHandlerContext ctx, ByteBuf buffer) throws IOException {
 		ByteBufInputStream bis = new ByteBufInputStream(buffer);
+		DataInputStream nbt = new DataInputStream(bis);
 		x = bis.readInt();
 		y = bis.readInt();
 		z = bis.readInt();
-		tag = NBTHelper.nbtRead(bis);
+		tag = NBTHelper.nbtRead(nbt);
 	}
 
 	@Override

src/main/resources/mcmod.info

@@ -0,0 +1,14 @@
+[{
+  "modid": "${mod_id}",
+  "name": "ForgeNBTEdit",
+  "version": "${mod_version}",
+  "mcversion": "${mc_version}",
+
+  "credits": "",
+  "authorList": [ "DavidG" ],
+  "description": "Ingame NBT Editing",
+  "logoFile": "",
+
+  "parent": "",
+  "screenshots": [ ]
+}]