more ettempted cauldron fixes

AbrarSyed · AbrarSyed · commit d6d0a68f2467 · 2014-06-12T13:55:48.000-05:00
diff --git a/src/main/java/net/minecraftforge/gradle/dev/CauldronDevPlugin.java b/src/main/java/net/minecraftforge/gradle/dev/CauldronDevPlugin.java
@@ -400,7 +400,6 @@ public Object call()
                 {
                     Manifest mani = (Manifest) getDelegate();
                     mani.getAttributes().put("Main-Class", delayedString("{MAIN_CLASS}").call());
-                    mani.getAttributes().put("TweakClass", delayedString("{FML_TWEAK_CLASS}").call());
                     mani.getAttributes().put("Class-Path", getServerClassPath(delayedFile(CDN_JSON_REL).call()));
                     return null;
                 }
@@ -435,7 +434,7 @@ public Object call()
             task.addReplacement("@minecraft_version@", delayedString("{MC_VERSION}"));
             task.addReplacement("@version@", delayedString("{VERSION}"));
             task.addReplacement("@project@", delayedString("cauldron"));
-            task.addReplacement("@artifact@", delayedString("net.minecraftforge:forge:{MC_VERSION}-{VERSION}"));
+            task.addReplacement("@artifact@", delayedString("net.minecraftforge:cauldron:{MC_VERSION}-{VERSION}"));
             task.addReplacement("@universal_jar@", new Closure<String>(project)
             {
                 public String call()

Original file line number	Diff line number	Diff line change
`@@ -400,7 +400,6 @@ public Object call()`
`400`	`400`	`{`
`401`	`401`	`Manifest mani = (Manifest) getDelegate();`
`402`	`402`	`mani.getAttributes().put("Main-Class", delayedString("{MAIN_CLASS}").call());`
`403`		`- mani.getAttributes().put("TweakClass", delayedString("{FML_TWEAK_CLASS}").call());`
`404`	`403`	`mani.getAttributes().put("Class-Path", getServerClassPath(delayedFile(CDN_JSON_REL).call()));`
`405`	`404`	`return null;`
`406`	`405`	`}`
`@@ -435,7 +434,7 @@ public Object call()`
`435`	`434`	`task.addReplacement("@minecraft_version@", delayedString("{MC_VERSION}"));`
`436`	`435`	`task.addReplacement("@version@", delayedString("{VERSION}"));`
`437`	`436`	`task.addReplacement("@project@", delayedString("cauldron"));`
`438`		`- task.addReplacement("@artifact@", delayedString("net.minecraftforge:forge:{MC_VERSION}-{VERSION}"));`
	`437`	`+ task.addReplacement("@artifact@", delayedString("net.minecraftforge:cauldron:{MC_VERSION}-{VERSION}"));`
`439`	`438`	`task.addReplacement("@universal_jar@", new Closure<String>(project)`
`440`	`439`	`{`
`441`	`440`	`public String call()`