diff --git a/.gitignore b/.gitignore index ae3c172..c149166 100644 --- 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 \ No newline at end of file diff --git a/Auto Pickup 1.9_Client.launch b/Auto Pickup 1.9_Client.launch deleted file mode 100644 index d7bf876..0000000 --- a/Auto Pickup 1.9_Client.launch +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - diff --git a/Auto Pickup 1.9_Server.launch b/Auto Pickup 1.9_Server.launch deleted file mode 100644 index 41cfc38..0000000 --- a/Auto Pickup 1.9_Server.launch +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - diff --git a/Tester 1.9_Client.launch b/Tester 1.9_Client.launch deleted file mode 100644 index 1f53916..0000000 --- a/Tester 1.9_Client.launch +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/Tester 1.9_Server.launch b/Tester 1.9_Server.launch deleted file mode 100644 index 39fa643..0000000 --- a/Tester 1.9_Server.launch +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/banned-ips.json b/banned-ips.json deleted file mode 100644 index 0637a08..0000000 --- a/banned-ips.json +++ /dev/null @@ -1 +0,0 @@ -[] \ No newline at end of file diff --git a/banned-players.json b/banned-players.json deleted file mode 100644 index 0637a08..0000000 --- a/banned-players.json +++ /dev/null @@ -1 +0,0 @@ -[] \ No newline at end of file diff --git a/build.gradle b/build.gradle index 72d3235..03eb17b 100644 --- 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,7 +20,7 @@ plugins { id "net.minecraftforge.gradle.forge" version "2.0.2" } */ -version = "1.9-2.0" +version = "1.10.2-2.1" group= "furgl.autoPickup" // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = "AutoPickup" @@ -28,7 +28,7 @@ sourceCompatibility = 1.7 targetCompatibility = 1.7 minecraft { - version = "1.9-12.16.1.1887" + version = "1.10.2-12.18.1.2011" runDir = "run" // the mappings can be changed at any time, and must be in the following format. @@ -36,7 +36,7 @@ minecraft { // 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/ops.json b/ops.json deleted file mode 100644 index 0637a08..0000000 --- a/ops.json +++ /dev/null @@ -1 +0,0 @@ -[] \ No newline at end of file diff --git a/options.txt b/options.txt deleted file mode 100644 index d19ea6f..0000000 --- a/options.txt +++ /dev/null @@ -1,101 +0,0 @@ -version:512 -invertYMouse:false -mouseSensitivity:0.5 -fov:0.0 -gamma:0.0 -saturation:0.0 -renderDistance:12 -guiScale:0 -particles:0 -bobView:true -anaglyph3d:false -maxFps:120 -fboEnable:true -difficulty:2 -fancyGraphics:true -ao:2 -renderClouds:true -resourcePacks:[] -incompatibleResourcePacks:[] -lastServer: -lang:en_US -chatVisibility:0 -chatColors:true -chatLinks:true -chatLinksPrompt:true -chatOpacity:1.0 -snooperEnabled:true -fullscreen:false -enableVsync:true -useVbo:true -hideServerAddress:false -advancedItemTooltips:false -pauseOnLostFocus:true -touchscreen:false -overrideWidth:0 -overrideHeight:0 -heldItemTooltips:true -chatHeightFocused:1.0 -chatHeightUnfocused:0.44366196 -chatScale:1.0 -chatWidth:1.0 -showInventoryAchievementHint:true -mipmapLevels:4 -forceUnicodeFont:false -reducedDebugInfo:false -useNativeTransport:true -entityShadows:true -mainHand:right -attackIndicator:1 -showSubtitles:false -realmsNotifications:true -enableWeakAttacks:false -autoJump:true -key_key.attack:-100 -key_key.use:-99 -key_key.forward:17 -key_key.left:30 -key_key.back:31 -key_key.right:32 -key_key.jump:57 -key_key.sneak:42 -key_key.sprint:29 -key_key.drop:16 -key_key.inventory:18 -key_key.chat:20 -key_key.playerlist:15 -key_key.pickItem:-98 -key_key.command:53 -key_key.screenshot:60 -key_key.togglePerspective:63 -key_key.smoothCamera:0 -key_key.fullscreen:87 -key_key.spectatorOutlines:0 -key_key.swapHands:33 -key_key.hotbar.1:2 -key_key.hotbar.2:3 -key_key.hotbar.3:4 -key_key.hotbar.4:5 -key_key.hotbar.5:6 -key_key.hotbar.6:7 -key_key.hotbar.7:8 -key_key.hotbar.8:9 -key_key.hotbar.9:10 -key_Ignore Blacklist:56 -soundCategory_master:1.0 -soundCategory_music:1.0 -soundCategory_record:1.0 -soundCategory_weather:1.0 -soundCategory_block:1.0 -soundCategory_hostile:1.0 -soundCategory_neutral:1.0 -soundCategory_player:1.0 -soundCategory_ambient:1.0 -soundCategory_voice:1.0 -modelPart_cape:true -modelPart_jacket:true -modelPart_left_sleeve:true -modelPart_right_sleeve:true -modelPart_left_pants_leg:true -modelPart_right_pants_leg:true -modelPart_hat:true diff --git a/server.properties b/server.properties deleted file mode 100644 index 60bfcfd..0000000 --- a/server.properties +++ /dev/null @@ -1,37 +0,0 @@ -#Minecraft server properties -#Thu Sep 01 16:57:38 CDT 2016 -generator-settings= -op-permission-level=4 -allow-nether=true -level-name=world -enable-query=false -allow-flight=false -announce-player-achievements=true -server-port=25565 -max-world-size=29999984 -level-type=DEFAULT -enable-rcon=false -level-seed= -force-gamemode=false -server-ip= -network-compression-threshold=256 -max-build-height=256 -spawn-npcs=true -white-list=false -spawn-animals=true -hardcore=false -snooper-enabled=true -resource-pack-sha1= -online-mode=true -resource-pack= -pvp=true -difficulty=1 -enable-command-block=false -gamemode=0 -player-idle-timeout=0 -max-players=20 -max-tick-time=60000 -spawn-monsters=true -generate-structures=true -view-distance=10 -motd=A Minecraft Server diff --git a/servers.dat b/servers.dat deleted file mode 100644 index f107d80..0000000 Binary files a/servers.dat and /dev/null differ diff --git a/usercache.json b/usercache.json deleted file mode 100644 index c3e185a..0000000 --- a/usercache.json +++ /dev/null @@ -1 +0,0 @@ -[{"name":"Furgl","uuid":"f08951bc-e379-4f19-a113-7728b0367647","expiresOn":"2016-10-01 16:57:46 -0500"}] \ No newline at end of file diff --git a/usernamecache.json b/usernamecache.json deleted file mode 100644 index 5e638f5..0000000 --- a/usernamecache.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "f08951bc-e379-4f19-a113-7728b0367647": "Furgl" -} \ No newline at end of file diff --git a/whitelist.json b/whitelist.json deleted file mode 100644 index 0637a08..0000000 --- a/whitelist.json +++ /dev/null @@ -1 +0,0 @@ -[] \ No newline at end of file