1.9.4

Furgl · Sep 2, 2016 · 06891f2 · 06891f2
1 parent 578b11b
commit 06891f2
Show file tree

Hide file tree

Showing 100 changed files with 29,538 additions and 11,133 deletions.
diff --git a/.classpath b/.classpath
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="output" path="bin"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="src" path="src/main/java"/>
 	<classpathentry kind="src" path="src/main/resources"/>
-	<classpathentry sourcepath="C:/Users/Jake/.gradle/caches/minecraft/net/minecraftforge/forge/1.9-12.16.1.1887/snapshot/20160312/forgeSrc-1.9-12.16.1.1887-sources.jar" kind="lib" path="C:/Users/Jake/.gradle/caches/minecraft/net/minecraftforge/forge/1.9-12.16.1.1887/snapshot/20160312/forgeSrc-1.9-12.16.1.1887.jar"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="lib" path="C:/Users/Jake/.gradle/caches/minecraft/net/minecraftforge/forge/1.9.4-12.17.0.1976/snapshot/20160518/forgeBin-1.9.4-12.17.0.1976.jar"/>
+	<classpathentry sourcepath="C:/Users/Jake/.gradle/caches/modules-2/files-2.1/com.google.code.findbugs/jsr305/3.0.1/a2926c057ca3b662b9db194c869bdbe7d3bb8aef/jsr305-3.0.1-sources.jar" kind="lib" path="C:/Users/Jake/.gradle/caches/modules-2/files-2.1/com.google.code.findbugs/jsr305/3.0.1/f7be08ec23c21485b9b5a1cf1654c2ec8c58168d/jsr305-3.0.1.jar"/>
 	<classpathentry sourcepath="C:/Users/Jake/.gradle/caches/modules-2/files-2.1/com.mojang/netty/1.6/cd01cc3788bac1b1eb9cf2cda02fc7698a5ca1cc/netty-1.6-sources.jar" kind="lib" path="C:/Users/Jake/.gradle/caches/modules-2/files-2.1/com.mojang/netty/1.6/4b75825a06139752bd800d9e29c5fd55b8b1b1e4/netty-1.6.jar"/>
 	<classpathentry sourcepath="C:/Users/Jake/.gradle/caches/modules-2/files-2.1/oshi-project/oshi-core/1.1/1ec1ab1e6ac5a1572edfd0dd9ac95e83684b8a65/oshi-core-1.1-sources.jar" kind="lib" path="C:/Users/Jake/.gradle/caches/modules-2/files-2.1/oshi-project/oshi-core/1.1/9ddf7b048a8d701be231c0f4f95fd986198fd2d8/oshi-core-1.1.jar"/>
 	<classpathentry sourcepath="C:/Users/Jake/.gradle/caches/modules-2/files-2.1/net.java.dev.jna/jna/3.4.0/2f42653596d0044f0ab456620cba54c9cf53c5ca/jna-3.4.0-sources.jar" kind="lib" path="C:/Users/Jake/.gradle/caches/modules-2/files-2.1/net.java.dev.jna/jna/3.4.0/803ff252fedbd395baffd43b37341dc4a150a554/jna-3.4.0.jar"/>
@@ -19,11 +20,12 @@
 	<classpathentry sourcepath="C:/Users/Jake/.gradle/caches/modules-2/files-2.1/net.java.jutils/jutils/1.0.0/d18678a00b216863206a1bb6190507e02a32971b/jutils-1.0.0-sources.jar" kind="lib" path="C:/Users/Jake/.gradle/caches/modules-2/files-2.1/net.java.jutils/jutils/1.0.0/e12fe1fda814bd348c1579329c86943d2cd3c6a6/jutils-1.0.0.jar"/>
 	<classpathentry sourcepath="C:/Users/Jake/.gradle/caches/modules-2/files-2.1/com.google.code.gson/gson/2.2.4/a6dc5db8a12928e583bd3f23e72d3ab611ecd58f/gson-2.2.4-sources.jar" kind="lib" path="C:/Users/Jake/.gradle/caches/modules-2/files-2.1/com.google.code.gson/gson/2.2.4/a60a5e993c98c864010053cb901b7eab25306568/gson-2.2.4.jar"/>
 	<classpathentry sourcepath="C:/Users/Jake/.gradle/caches/modules-2/files-2.1/com.mojang/authlib/1.5.22/c5eb40c6aaa812cc015fea27cf4db7efea24b898/authlib-1.5.22-sources.jar" kind="lib" path="C:/Users/Jake/.gradle/caches/modules-2/files-2.1/com.mojang/authlib/1.5.22/afaa8f6df976fcb5520e76ef1d5798c9e6b5c0b2/authlib-1.5.22.jar"/>
-	<classpathentry kind="lib" path="C:/Users/Jake/.gradle/caches/modules-2/files-2.1/com.mojang/realms/1.8.7/b624280016616bb56cc6c30282684322edc7e7eb/realms-1.8.7.jar"/>
+	<classpathentry kind="lib" path="C:/Users/Jake/.gradle/caches/modules-2/files-2.1/com.mojang/realms/1.8.19/f7469a9307b962d1097e44713eb1baa087c06e43/realms-1.8.19.jar"/>
 	<classpathentry sourcepath="C:/Users/Jake/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-compress/1.8.1/3caea4421428752206c7a94c3e3097f0c47f1bb8/commons-compress-1.8.1-sources.jar" kind="lib" path="C:/Users/Jake/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-compress/1.8.1/a698750c16740fd5b3871425f4cb3bbaa87f529d/commons-compress-1.8.1.jar"/>
 	<classpathentry sourcepath="C:/Users/Jake/.gradle/caches/modules-2/files-2.1/org.apache.httpcomponents/httpclient/4.3.3/65cba03c4f6207f2885f88206fcf52c53f8d111b/httpclient-4.3.3-sources.jar" kind="lib" path="C:/Users/Jake/.gradle/caches/modules-2/files-2.1/org.apache.httpcomponents/httpclient/4.3.3/18f4247ff4572a074444572cee34647c43e7c9c7/httpclient-4.3.3.jar"/>
 	<classpathentry sourcepath="C:/Users/Jake/.gradle/caches/modules-2/files-2.1/commons-logging/commons-logging/1.1.3/28bb0405fddaf04f15058fbfbe01fe2780d7d3b6/commons-logging-1.1.3-sources.jar" kind="lib" path="C:/Users/Jake/.gradle/caches/modules-2/files-2.1/commons-logging/commons-logging/1.1.3/f6f66e966c70a83ffbdb6f17a0919eaf7c8aca7f/commons-logging-1.1.3.jar"/>
 	<classpathentry sourcepath="C:/Users/Jake/.gradle/caches/modules-2/files-2.1/org.apache.httpcomponents/httpcore/4.3.2/4809f38359edeea9487f747e09aa58ec8d3a54c5/httpcore-4.3.2-sources.jar" kind="lib" path="C:/Users/Jake/.gradle/caches/modules-2/files-2.1/org.apache.httpcomponents/httpcore/4.3.2/31fbbff1ddbf98f3aa7377c94d33b0447c646b6e/httpcore-4.3.2.jar"/>
+	<classpathentry sourcepath="C:/Users/Jake/.gradle/caches/modules-2/files-2.1/it.unimi.dsi/fastutil/7.0.12_mojang/b7e3b6acfcd16e9f63d38f493bed4ef6cb3ca502/fastutil-7.0.12_mojang-sources.jar" kind="lib" path="C:/Users/Jake/.gradle/caches/modules-2/files-2.1/it.unimi.dsi/fastutil/7.0.12_mojang/ba787e741efdc425fc5d2ea654b57c15fba27efa/fastutil-7.0.12_mojang.jar"/>
 	<classpathentry sourcepath="C:/Users/Jake/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-api/2.0-beta9/c6682b8a47ddd9f29108838aed0dc8e0ffdedf68/log4j-api-2.0-beta9-sources.jar" kind="lib" path="C:/Users/Jake/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-api/2.0-beta9/1dd66e68cccd907880229f9e2de1314bd13ff785/log4j-api-2.0-beta9.jar"/>
 	<classpathentry sourcepath="C:/Users/Jake/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-core/2.0-beta9/c7da50fd52d6ee6991a0e16e2df1431f7656a7f4/log4j-core-2.0-beta9-sources.jar" kind="lib" path="C:/Users/Jake/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-core/2.0-beta9/678861ba1b2e1fccb594bb0ca03114bb05da9695/log4j-core-2.0-beta9.jar"/>
 	<classpathentry sourcepath="C:/Users/Jake/.gradle/caches/modules-2/files-2.1/net.minecraft/launchwrapper/1.12/fd80cad9a1b967ce2ff20529dc54e520d5338d7/launchwrapper-1.12-sources.jar" kind="lib" path="C:/Users/Jake/.gradle/caches/modules-2/files-2.1/net.minecraft/launchwrapper/1.12/111e7bea9c968cdb3d06ef4632bf7ff0824d0f36/launchwrapper-1.12.jar"/>
@@ -56,11 +58,10 @@
 	<classpathentry kind="lib" path="C:/Users/Jake/.gradle/caches/modules-2/files-2.1/net.java.jinput/jinput-platform/2.0.5/7ff832a6eb9ab6a767f1ade2b548092d0fa64795/jinput-platform-2.0.5-natives-linux.jar"/>
 	<classpathentry kind="lib" path="C:/Users/Jake/.gradle/caches/modules-2/files-2.1/net.java.jinput/jinput-platform/2.0.5/385ee093e01f587f30ee1c8a2ee7d408fd732e16/jinput-platform-2.0.5-natives-windows.jar"/>
 	<classpathentry kind="lib" path="C:/Users/Jake/.gradle/caches/modules-2/files-2.1/net.java.jinput/jinput-platform/2.0.5/53f9c919f34d2ca9de8c51fc4e1e8282029a9232/jinput-platform-2.0.5-natives-osx.jar"/>
-	<classpathentry kind="lib" path="C:/Users/Jake/.gradle/caches/modules-2/files-2.1/com.google.code.findbugs/jsr305/2.0.1/516c03b21d50a644d538de0f0369c620989cd8f0/jsr305-2.0.1.jar"/>
 	<classpathentry kind="lib" path="C:/Users/Jake/.gradle/caches/modules-2/files-2.1/org.lwjgl.lwjgl/lwjgl-platform/2.9.4-nightly-20150209/b84d5102b9dbfabfeb5e43c7e2828d98a7fc80e0/lwjgl-platform-2.9.4-nightly-20150209-natives-windows.jar"/>
 	<classpathentry kind="lib" path="C:/Users/Jake/.gradle/caches/modules-2/files-2.1/org.lwjgl.lwjgl/lwjgl-platform/2.9.4-nightly-20150209/931074f46c795d2f7b30ed6395df5715cfd7675b/lwjgl-platform-2.9.4-nightly-20150209-natives-linux.jar"/>
 	<classpathentry kind="lib" path="C:/Users/Jake/.gradle/caches/modules-2/files-2.1/org.lwjgl.lwjgl/lwjgl-platform/2.9.4-nightly-20150209/bcab850f8f487c3f4c4dbabde778bb82bd1a40ed/lwjgl-platform-2.9.4-nightly-20150209-natives-osx.jar"/>
 	<classpathentry kind="lib" path="C:/Users/Jake/.gradle/caches/minecraft/deobfedDeps/compileDummy.jar"/>
 	<classpathentry kind="lib" path="C:/Users/Jake/.gradle/caches/minecraft/deobfedDeps/providedDummy.jar"/>
-	<classpathentry kind="lib" path="C:/Users/Jake/.gradle/caches/minecraft/net/minecraftforge/forge/1.9-12.16.1.1887/start"/>
+	<classpathentry kind="lib" path="C:/Users/Jake/.gradle/caches/minecraft/net/minecraftforge/forge/1.9.4-12.17.0.1976/start"/>
 </classpath>
diff --git a/.gitignore b/.gitignore
@@ -1 +1,42 @@
-/bin/
+# eclipse
+bin
+*.launch
+.settings
+.metadata
+.classpath
+.project
+
+# idea
+out
+*.ipr
+*.iws
+*.iml
+.idea
+
+# gradle
+build
+.gradle
+
+# other
+eclipse
+run
+saves
+screenshots
+logs
+config
+crash-reports
+world
+whitelist.json
+usercache.json
+usernamecache.json
+servers.dat
+server.properties
+options.txt
+ops.json
+Paulscode*
+banned-*
+CREDITS-fml.txt
+forge-*changelog.txt
+LICENSE-fml.txt
+MinecraftForge-*.txt
+README.txt
diff --git a/.gradle/2.7/taskArtifacts/cache.properties b/.gradle/2.7/taskArtifacts/cache.properties
@@ -1 +1 @@
-#Sun Jun 26 18:37:28 CDT 2016
+#Thu Sep 01 12:08:12 CDT 2016
diff --git a/.gradle/2.7/taskArtifacts/cache.properties.lock b/.gradle/2.7/taskArtifacts/cache.properties.lock
diff --git a/.gradle/2.7/taskArtifacts/fileHashes.bin b/.gradle/2.7/taskArtifacts/fileHashes.bin
diff --git a/.gradle/2.7/taskArtifacts/fileSnapshots.bin b/.gradle/2.7/taskArtifacts/fileSnapshots.bin
diff --git a/.gradle/2.7/taskArtifacts/outputFileStates.bin b/.gradle/2.7/taskArtifacts/outputFileStates.bin
diff --git a/.gradle/2.7/taskArtifacts/taskArtifacts.bin b/.gradle/2.7/taskArtifacts/taskArtifacts.bin
diff --git a/.gradle/gradle.log b/.gradle/gradle.log
@@ -1,5 +1,5 @@
 #################################################
-         ForgeGradle 2.1-SNAPSHOT-da90449        
+         ForgeGradle 2.2-SNAPSHOT-c438b06        
   https://github.com/MinecraftForge/ForgeGradle  
 #################################################
                Powered by MCP unknown               
@@ -9,20 +9,20 @@
 #################################################
 :deobfCompileDummyTask
 :deobfProvidedDummyTask
-:sourceApiJava
+:sourceApiJava UP-TO-DATE
 :compileApiJava UP-TO-DATE
 :processApiResources UP-TO-DATE
 :apiClasses UP-TO-DATE
 :sourceMainJava
 :compileJavawarning: [options] bootstrap class path not set in conjunction with -source 1.7
-Note: C:\Users\Jake\Desktop\Modding\Jake's Modding\Auto Pickup 1.9\build\sources\main\java\furgl\autoPickup\CommandBlacklist.java uses unchecked or unsafe operations.
+Note: C:\Users\Jake\Desktop\Modding\Jake's Modding\Auto Pickup 1.9.4\build\sources\main\java\furgl\autoPickup\CommandBlacklist.java uses unchecked or unsafe operations.
 Note: Recompile with -Xlint:unchecked for details.
 1 warning
 
 :processResources
 :classes
 :jar
-:sourceTestJava
+:sourceTestJava UP-TO-DATE
 :compileTestJava UP-TO-DATE
 :processTestResources UP-TO-DATE
 :testClasses UP-TO-DATE
@@ -34,7 +34,7 @@ Note: Recompile with -Xlint:unchecked for details.
 :genSrgs SKIPPED
 :reobfJar
 :extractRangemapReplacedMain
-C:\Users\Jake\Desktop\Modding\Jake's Modding\Auto Pickup 1.9\build\sources\main\java
+C:\Users\Jake\Desktop\Modding\Jake's Modding\Auto Pickup 1.9.4\build\sources\main\java
 :retromapReplacedMain
 remapping source...
 :sourceJar
@@ -44,4 +44,4 @@ remapping source...
 
 BUILD SUCCESSFUL
 
-Total time: 29.521 secs
+Total time: 15.562 secs
diff --git a/.project b/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>Auto Pickup 1.9</name>
+	<name>Auto Pickup 1.9.4</name>
 	<comment/>
 	<projects/>
 	<natures>

diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
@@ -1,5 +1,5 @@
 #
-#Wed Aug 31 20:25:06 CDT 2016
+#Thu Sep 01 12:22:38 CDT 2016
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve

diff --git a/Auto Pickup 1.9_Client.launch b/Auto Pickup 1.9_Client.launch
diff --git a/Auto Pickup 1.9_Server.launch b/Auto Pickup 1.9_Server.launch
diff --git a/Tester 1.9_Client.launch b/Tester 1.9_Client.launch
diff --git a/Tester 1.9_Server.launch b/Tester 1.9_Server.launch
diff --git a/build.gradle b/build.gradle
@@ -9,7 +9,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'net.minecraftforge.gradle:ForgeGradle:2.1-SNAPSHOT'
+        classpath 'net.minecraftforge.gradle:ForgeGradle:2.2-SNAPSHOT'
     }
 }
 apply plugin: 'net.minecraftforge.gradle.forge'
@@ -20,23 +20,23 @@ plugins {
     id "net.minecraftforge.gradle.forge" version "2.0.2"
 }
 */
-version = "1.9-2.0"
+version = "1.9.4-2.1"
 group= "furgl.autoPickup" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = "AutoPickup"
 
 sourceCompatibility = 1.7
 targetCompatibility = 1.7
 
 minecraft {
-    version = "1.9-12.16.1.1887"
+    version = "1.9.4-12.17.0.1976"
     runDir = "run"
 
     // the mappings can be changed at any time, and must be in the following format.
     // snapshot_YYYYMMDD   snapshot are built nightly.
     // stable_#            stables are built at the discretion of the MCP team.
     // Use non-default mappings at your own risk. they may not allways work.
     // simply re-run your setup task after changing the mappings to update your workspace.
-    mappings = "snapshot_20160312"
+    mappings = "snapshot_20160518"
     // makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable.
 }
 

diff --git a/build/classes/main/furgl/autoPickup/AutoPickup.class b/build/classes/main/furgl/autoPickup/AutoPickup.class
diff --git a/build/classes/main/furgl/autoPickup/CommandBlacklist.class b/build/classes/main/furgl/autoPickup/CommandBlacklist.class
diff --git a/build/classes/main/furgl/autoPickup/IgnoreKey.class b/build/classes/main/furgl/autoPickup/IgnoreKey.class
diff --git a/build/classes/main/furgl/autoPickup/event/DelayedPickupEvent.class b/build/classes/main/furgl/autoPickup/event/DelayedPickupEvent.class
diff --git a/build/classes/main/furgl/autoPickup/event/ItemTossEvents.class b/build/classes/main/furgl/autoPickup/event/ItemTossEvents.class
diff --git a/build/libs/AutoPickup-1.9-2.0-sources.jar b/build/libs/AutoPickup-1.9-2.0-sources.jar
diff --git a/build/libs/AutoPickup-1.9-2.0.jar b/build/libs/AutoPickup-1.9-2.0.jar
diff --git a/build/resources/main/mcmod.info b/build/resources/main/mcmod.info
@@ -3,8 +3,8 @@
   "modid": "autopickup",
   "name": "AutoPickup",
   "description": "Allows items to be picked up automatically or blacklisted and never picked up.",
-  "version": "2.0",
-  "mcversion": "1.9",
+  "version": "2.1",
+  "mcversion": "1.9.4",
   "url": "https://sites.google.com/site/furglsmods/auto-pickup",
   "updateUrl": "",
   "authorList": ["Furgl"],
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		#Sun Jun 26 18:37:28 CDT 2016
		#Thu Sep 01 12:08:12 CDT 2016