0.89; fix chat posts in read-only mode

arpruss · arpruss · commit 1cba221ba4e8 · 2017-05-07T20:39:52.000-05:00
diff --git a/110/build.gradle b/110/build.gradle
@@ -20,7 +20,7 @@ plugins {
     id "net.minecraftforge.gradle.forge" version "2.0.2"
 }
 */
-version = "0.88"
+version = "0.89"
 group= "mobi.omegacentauri.raspberryjammod" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = "RaspberryJamMod"
 
diff --git a/110/fix.sed b/110/fix.sed
@@ -4,4 +4,5 @@ s/MobEffects\.nightVision/MobEffects.NIGHT_VISION/g
 s/\.thePlayer/\.player/g
 s/\.theWorld/\.world/g
 s/\[1\.9,1\.9\.4)/[1.9.4,1.11)/
+s/getUnformattedTextForChat/getUnformattedComponentText/g
 s/NOMINAL_VERSION\s*=\s*1009000/NOMINAL_VERSION = 1010000/
diff --git a/111/build.gradle b/111/build.gradle
@@ -20,7 +20,7 @@ plugins {
     id "net.minecraftforge.gradle.forge" version "2.0.2"
 }
 */
-version = "0.88"
+version = "0.89"
 group= "mobi.omegacentauri.raspberryjammod" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = "RaspberryJamMod"
 
diff --git a/111/fix.sed b/111/fix.sed
@@ -15,4 +15,5 @@ s/spawnEntityInWorld/spawnEntity/g
 s/createEntityByName/createEntityByIDFromName/g
 s/worldServers/worlds/g
 s/DamageSource\.inWall/DamageSource.IN_WALL/g
-s/DamageSource\.fall/DamageSource.FALL/g
+s/DamageSource\.fall/DamageSource.FALL/g
+s/getUnformattedTextForChat/getUnformattedComponentText/g
diff --git a/19/build.gradle b/19/build.gradle
@@ -20,7 +20,7 @@ plugins {
     id "net.minecraftforge.gradle.forge" version "2.0.2"
 }
 */
-version = "0.88"
+version = "0.89"
 group= "mobi.omegacentauri.raspberryjammod" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = "RaspberryJamMod"
 
diff --git a/19/src/main/java/mobi/omegacentauri/raspberryjammod/MCEventHandlerClientOnly.java b/19/src/main/java/mobi/omegacentauri/raspberryjammod/MCEventHandlerClientOnly.java
@@ -21,12 +21,16 @@ public MCEventHandlerClientOnly() {
 		super();
 		doRemote = true;
 	}
+    
+    private static String fixMessage(String s) {
+        if (s.startsWith("<> ")) return s.substring(3); else return s;
+    }
 
 	@SubscribeEvent
 	@SideOnly(Side.CLIENT)
 	public void onChatEvent(ClientChatReceivedEvent event) {
 		APIHandler.ChatDescription cd = new APIHandler.ChatDescription(Minecraft.getMinecraft().thePlayer.getEntityId(), 
-				event.getMessage().toString());
+				fixMessage(event.getMessage().getUnformattedTextForChat()));
 		for (APIHandler apiHandler: apiHandlers)
 			apiHandler.addChatDescription(cd);
 	}
diff --git a/19/src/main/java/mobi/omegacentauri/raspberryjammod/RaspberryJamMod.java b/19/src/main/java/mobi/omegacentauri/raspberryjammod/RaspberryJamMod.java
@@ -55,7 +55,7 @@
 public class RaspberryJamMod
 {
 	public static final String MODID = "raspberryjammod";
-	public static final String VERSION = "0.88";
+	public static final String VERSION = "0.89";
 	public static final String NAME = "Raspberry Jam Mod";
 	private APIServer fullAPIServer = null;
 	private PythonExternalCommand pythonExternalCommand = null;
diff --git a/194/build.gradle b/194/build.gradle
@@ -20,7 +20,7 @@ plugins {
     id "net.minecraftforge.gradle.forge" version "2.0.2"
 }
 */
-version = "0.88"
+version = "0.89"
 group= "mobi.omegacentauri.raspberryjammod" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = "RaspberryJamMod"
 
diff --git a/194/fix.sed b/194/fix.sed
@@ -2,4 +2,5 @@ s/Blocks\.air/Blocks.AIR/g
 s/MobEffects\.levitation/MobEffects.LEVITATION/g
 s/MobEffects\.nightVision/MobEffects.NIGHT_VISION/g
 s/NOMINAL_VERSION\s*=\s*1009000/NOMINAL_VERSION = 1009004/
+s/getUnformattedTextForChat/getUnformattedComponentText/g
 s/\[1\.9,1\.9\.4)/[1.9.4,1.10)/
diff --git a/build.gradle b/build.gradle
@@ -17,7 +17,7 @@ buildscript {
 
 apply plugin: 'forge'
 
-version = "0.88"
+version = "0.89"
 group= "mobi.omegacentauri.raspberryjammod" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = "RaspberryJamMod"
 
diff --git a/src/main/java/mobi/omegacentauri/raspberryjammod/RaspberryJamMod.java b/src/main/java/mobi/omegacentauri/raspberryjammod/RaspberryJamMod.java
@@ -54,7 +54,7 @@
 public class RaspberryJamMod
 {
 	public static final String MODID = "raspberryjammod";
-	public static final String VERSION = "0.88";
+	public static final String VERSION = "0.89";
 	public static final String NAME = "Raspberry Jam Mod";
 	private APIServer fullAPIServer = null;
 	private PythonExternalCommand pythonExternalCommand = null;

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ plugins {`
`20`	`20`	`id "net.minecraftforge.gradle.forge" version "2.0.2"`
`21`	`21`	`}`
`22`	`22`	`*/`
`23`		`-version = "0.88"`
	`23`	`+version = "0.89"`
`24`	`24`	`group= "mobi.omegacentauri.raspberryjammod" // http://maven.apache.org/guides/mini/guide-naming-conventions.html`
`25`	`25`	`archivesBaseName = "RaspberryJamMod"`
`26`	`26`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@`
`55`	`55`	`public class RaspberryJamMod`
`56`	`56`	`{`
`57`	`57`	`public static final String MODID = "raspberryjammod";`
`58`		`- public static final String VERSION = "0.88";`
	`58`	`+ public static final String VERSION = "0.89";`
`59`	`59`	`public static final String NAME = "Raspberry Jam Mod";`
`60`	`60`	`private APIServer fullAPIServer = null;`
`61`	`61`	`private PythonExternalCommand pythonExternalCommand = null;`