From 9f3c83b780b73b479aed8f58079f0b4c04282957 Mon Sep 17 00:00:00 2001
From: Robotia <spuri4096@gmail.com>
Date: Tue, 19 Jan 2016 02:19:49 -0500
Subject: [PATCH] Makepatch fixes for issue #13

---
 makepatch.class | Bin 0 -> 1832 bytes
 makepatch.java  |  53 ++++++++++++++++++++++++++++++++++++++++++++++++
 makepatch.sh    |   8 +++++---
 3 files changed, 58 insertions(+), 3 deletions(-)
 create mode 100644 makepatch.class
 create mode 100644 makepatch.java

diff --git a/makepatch.class b/makepatch.class
new file mode 100644
index 0000000000000000000000000000000000000000..c8f2768d9846a17b9c384dc49ceeaafa8617b12f
GIT binary patch
literal 1832
zcmZ`(TUQ)K5dM01VTNHKFo7U}jf2<aGFgF`s2dSO0-~^>8$pQ1^v*UgFgvrEnN83)
zU;PJo^57ef9(`EOk#ll<_9yrQeDN1}jn%_-$+G8cO?TB-Rb5|I_pkr`{1m`7Jkszg
z##LNX@TP+68dA8SA&Ix7cw50c8dQu+kyCL~#k(3N@SciEsd`_<EfrG|dRxUEX_{6s
zBflR=F{|Q3`Ta<WIVt8PHm_hoLt5rYV^NBH3qHmtDhe9z;!_1n3YHm~Z#te6O)w-g
zgG&slDZeBbF3dTe$XCln5!~fPmo%v|cRYqmnR|1a{1MN(+*{8UqQLRibJDS`5OI5J
zo>yYLg3qW{2JOzaEh>@Yd!d3A+86w4V2f!-hHNkMEm7f-y>V5B)bSc#X8=QIoS_;y
zZnj`^&l3TI9_t)GD}5z&Rf>B$KF1dfJ!j8!tLnHV5$L#&FB$rT?K+iEWT#xgy=)lR
zSy@h2dNCNZw~Cz1Wvbc^_*z8g*YN;kWSWkmOmXEXhRv&PDexPIdF%&UCt-BhC^7Wr
zebW<<U5ak<$P`}5^w-R_xDbIghQ#Egj&*G4aIhh_rjAW)>2Oh&!qeePZY~~?ut>Z|
z%YhTg5-V6$@K8s9kV+jjV@l1)rwrRB57x~<Jgho_C@F|^RI$p?a!fr##|d`}#Z6&H
zb*h6FAEl1Fe%w=r?o8up=seUP_A8zc)f3y1oGXT|%;58WG>g1aA#xb3Mq!`xIP7tb
zK?y{~<u*mWecE$sg9inwU3j+0opP_!H#~_N`A3DfZtyUFd~&)aM4xK=UPJ>V`93$H
z1ZrW#gD6~fB5G?xvSc)>`4H0T@-Uk9N@9C~#-gFaEOjre7Q^`J$qP9<+pvW0Ok;hM
z?fM}x)l`u)RNw2b!bp_qDe$Xg=ssYKS{P3o@gaDb$gUs412wfE4(ECpz$^6H$zOu5
zGF@qs8QP`kOSc<MLwjI9(t=@-WOJ-cq6I@3CKrOT-$<LH@66EC)b}iBB<A*!T-irz
zWhgneho(I=&yUogEXQIW>dGEkhHKE|-e@)S8ro=Qw3DdOTXq)FVRW8BkfX7KAEbZY
zGA`E8wS(r}XMb2mcMX?z@O8ZC`3_5#@j?x>m_HTNO2+2irUx}#J}0qt0_i&q*~RtK
zk?Ku-=bD}^(pmfWk*=fVO5P$GUbJd3chUM228@?#cv+I2h{?W>9$L2$y*kM@^r4-4
zbpbQzpqHnUUXm_)AG+}k;l4#Lo)F>}^y7D!jC#p>G06Hc#7qpcF^sSquviXRHi1z#
tjd6@n^fc6e;V7^aT>S?<wD=pP%YUIK@h1ipWC@a@p1(o=QCcT3_CMGnz^niO

literal 0
HcmV?d00001

diff --git a/makepatch.java b/makepatch.java
new file mode 100644
index 0000000..5da6eff
--- /dev/null
+++ b/makepatch.java
@@ -0,0 +1,53 @@
+import java.util.*;
+import java.io.*;
+public class makepatch
+{
+
+public static void main(String[] args) throws Exception
+{
+
+if(args.length == 1)
+{
+
+String post = "";
+Scanner in = new Scanner(new File(args[0]));
+in.nextLine();in.nextLine();
+post += in.nextLine().replace("eclipse/Clean/src/main/java","../src-base/minecraft")+"\n";
+post += in.nextLine().replace("eclipse/cauldron/src/main/java","../src-work/minecraft")+"\n";
+while(in.hasNextLine())
+{
+
+	String current = in.nextLine();
+	if(current.contains("No newline at end of file")) continue;
+
+	if(current.startsWith("@@"))
+	{
+		if(!(current.endsWith("@@") || current.endsWith("@ ")))
+		{
+			post += current.substring(0,current.lastIndexOf("@@")+2)+"\n";
+			post += current.substring(current.lastIndexOf("@@")+2)+"\n";
+		}
+		else
+		{
+			post += current + "\n";
+		}
+
+	}
+	else
+	{
+		post += current + "\n";
+	}
+
+}
+in.close();
+PrintWriter out = new PrintWriter(new File(args[0]));
+out.print(post);
+out.close();
+
+}
+else
+System.out.println("1 patch to fix arg required");
+
+}
+
+}
diff --git a/makepatch.sh b/makepatch.sh
index 6630825..35779e5 100755
--- a/makepatch.sh
+++ b/makepatch.sh
@@ -14,7 +14,7 @@ then
 	CLEAN=`find eclipse/Clean/src/main/java | grep $FILE`
 	CAULD=`find eclipse/cauldron/src/main/java | grep $FILE`
 	PATCH=`find patches/ | grep -i $FILE`
-	git diff --no-index $CLEAN $CAULD
+	git diff --no-index --text -w $CLEAN $CAULD
 	echo "Diff patch of ${redf}$CLEAN${reset} and ${gref}$CAULD${reset} above."
 elif [ $1 == "make" ]
 then
@@ -23,7 +23,8 @@ then
 	CLEAN=`find eclipse/Clean/src/main/java | grep $FILE`
 	CAULD=`find eclipse/cauldron/src/main/java | grep $FILE`
 	PATCH=`find patches/ | grep -i $FILE`
-	git diff --no-index $CLEAN $CAULD > $PATCH
+	git diff --no-index --text -w $CLEAN $CAULD > $PATCH
+	java makepatch.class $PATCH
 	echo "Diff of ${redf}$CLEAN${reset} and ${gref}$CAULD${reset} written to ${yelf}$PATCH${reset}"
 else
 	echo "${bluf}CREATING PATCH${reset}"
@@ -31,6 +32,7 @@ else
 	CLEAN=`find eclipse/Clean/src/main/java | grep $FILE`
 	CAULD=`find eclipse/cauldron/src/main/java | grep $FILE`
 	PATCH=`find patches/ | grep -i $FILE`
-	git diff --no-index $CLEAN $CAULD > $PATCH
+	git diff --no-prefix --no-index --text -w $CLEAN $CAULD > $PATCH
+	java makepatch.class $PATCH
 	echo "Diff of ${redf}$CLEAN${reset} and ${gref}$CAULD${reset} written to ${yelf}$PATCH${reset}"
 fi