| 
									
										
										
										
											2016-03-30 20:50:23 -04:00
										 |  |  | #!/usr/bin/env bash
 | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2016-04-03 02:23:19 -05:00
										 |  |  | ( | 
					
						
							|  |  |  | set -e | 
					
						
							| 
									
										
										
										
											2016-03-30 20:50:23 -04:00
										 |  |  | nms="net/minecraft/server" | 
					
						
							|  |  |  | export MODLOG="" | 
					
						
							|  |  |  | PS1="$" | 
					
						
							| 
									
										
										
										
											2016-04-02 18:34:27 -05:00
										 |  |  | basedir=$(realpath "$1") | 
					
						
							| 
									
										
										
										
											2016-03-30 20:50:23 -04:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2016-04-01 22:55:54 -05:00
										 |  |  | workdir="$basedir/work" | 
					
						
							|  |  |  | minecraftversion=$(cat "$workdir/BuildData/info.json"  | grep minecraftVersion | cut -d '"' -f 4) | 
					
						
							|  |  |  | decompiledir="$workdir/$minecraftversion" | 
					
						
							| 
									
										
										
										
											2016-03-30 20:50:23 -04:00
										 |  |  | 
 | 
					
						
							|  |  |  | export importedmcdev="" | 
					
						
							|  |  |  | function import { | 
					
						
							|  |  |  | 	export importedmcdev="$importedmcdev $1" | 
					
						
							|  |  |  | 	file="${1}.java" | 
					
						
							| 
									
										
										
										
											2016-04-01 22:55:54 -05:00
										 |  |  | 	target="$workdir/Spigot/Spigot-Server/src/main/java/$nms/$file" | 
					
						
							| 
									
										
										
										
											2016-03-30 20:50:23 -04:00
										 |  |  | 	base="$decompiledir/$nms/$file" | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 	if [[ ! -f "$target" ]]; then | 
					
						
							|  |  |  | 		export MODLOG="$MODLOG  Imported $file from mc-dev\n"; | 
					
						
							|  |  |  | 		echo "Copying $base to $target" | 
					
						
							|  |  |  | 		cp "$base" "$target" | 
					
						
							|  |  |  | 	fi | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | ( | 
					
						
							| 
									
										
										
										
											2016-04-01 22:55:54 -05:00
										 |  |  | 	cd "$workdir/Spigot/Spigot-Server/" | 
					
						
							| 
									
										
										
										
											2016-03-30 20:50:23 -04:00
										 |  |  | 	lastlog=$(git log -1 --oneline) | 
					
						
							|  |  |  | 	if [[ "$lastlog" = *"mc-dev Imports"* ]]; then | 
					
						
							|  |  |  | 		git reset --hard HEAD^ | 
					
						
							|  |  |  | 	fi | 
					
						
							|  |  |  | ) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | import BaseBlockPosition | 
					
						
							|  |  |  | import BiomeBase | 
					
						
							|  |  |  | import BiomeMesa | 
					
						
							|  |  |  | import BlockChest | 
					
						
							|  |  |  | import BlockFalling | 
					
						
							|  |  |  | import BlockFluids | 
					
						
							|  |  |  | import BlockPosition | 
					
						
							|  |  |  | import BlockStateList | 
					
						
							|  |  |  | import ChunkProviderFlat | 
					
						
							|  |  |  | import ChunkProviderGenerate | 
					
						
							|  |  |  | import ChunkProviderHell | 
					
						
							|  |  |  | import CommandAbstract | 
					
						
							|  |  |  | import CommandScoreboard | 
					
						
							|  |  |  | import CommandWhitelist | 
					
						
							|  |  |  | import DataConverterMaterialId | 
					
						
							|  |  |  | import EULA | 
					
						
							|  |  |  | import EntitySquid | 
					
						
							|  |  |  | import FileIOThread | 
					
						
							|  |  |  | import ItemBlock | 
					
						
							|  |  |  | import PacketPlayInResourcePackStatus | 
					
						
							|  |  |  | import PacketPlayOutPlayerListHeaderFooter | 
					
						
							|  |  |  | import PacketPlayOutTitle | 
					
						
							|  |  |  | import PacketPlayOutUpdateTime | 
					
						
							| 
									
										
										
										
											2016-03-31 19:08:27 -04:00
										 |  |  | import PathfinderAbstract | 
					
						
							| 
									
										
										
										
											2016-03-30 20:50:23 -04:00
										 |  |  | import PathfinderGoalFloat | 
					
						
							|  |  |  | import PersistentVillage | 
					
						
							|  |  |  | import TileEntityEnderChest | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2016-04-03 02:23:19 -05:00
										 |  |  | cd "$workdir/Spigot/Spigot-Server/" | 
					
						
							|  |  |  | git add src -A | 
					
						
							|  |  |  | echo -e "mc-dev Imports\n\n$MODLOG" | git commit src -F - | 
					
						
							| 
									
										
										
										
											2016-03-30 20:50:23 -04:00
										 |  |  | ) |