Updated to 1.9.4

Signed-off-by: Anthony Anderson <[email protected]>
derimagia · Jun 16, 2016 · 7e0ddd3 · 7e0ddd3
1 parent 93ee190
commit 7e0ddd3
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 26 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,27 +1,23 @@
 buildscript {
     repositories {
-        mavenCentral()
+        jcenter()
         maven {
             name = "forge"
             url = "http://files.minecraftforge.net/maven"
         }
-        maven {
-            name = "sonatype"
-            url = "https://oss.sonatype.org/content/repositories/snapshots/"
-        }
     }
     dependencies {
-        classpath "net.minecraftforge.gradle:ForgeGradle:2.1-SNAPSHOT"
+        classpath "net.minecraftforge.gradle:ForgeGradle:2.2-SNAPSHOT"
     }
 }
 
 plugins {
-    id "com.github.johnrengelman.shadow" version "1.2.2" // shading
+    id "com.github.johnrengelman.shadow" version "1.2.3" // shading
 }
 apply plugin: "net.minecraftforge.gradle.forge"  // adds the forge dependency
 
 
-version = "1.8.9-0.1"
+version = "1.9.4-0.1.1"
 group= "com.derimagia.forgeslack" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = "forgeslack"
 
@@ -34,9 +30,9 @@ dependencies {
 }
 
 minecraft {
-    mappings = "snapshot_20160121"
+    mappings = "snapshot_20160522"
 
-    version = "1.8.9-11.15.1.1747"
+    version = "1.9.4-12.17.0.1940"
     runDir = "run"
 }
 
@@ -47,4 +43,4 @@ shadowJar {
 }
 
 reobf { shadowJar { mappingType = "SEARGE" } }
-tasks.reobfShadowJar.mustRunAfter shadowJar
+tasks.reobfShadowJar.mustRunAfter shadowJar
diff --git a/src/main/java/com/derimagia/forgeslack/ForgeSlack.java b/src/main/java/com/derimagia/forgeslack/ForgeSlack.java
@@ -20,7 +20,7 @@
 public class ForgeSlack {
 
     public static final String modId = "ForgeSlack";
-    public static final String version = "0.1.0";
+    public static final String version = "0.1.1";
 
     public static Logger log = LogManager.getLogger(modId);
 

diff --git a/src/main/java/com/derimagia/forgeslack/handler/FMLEventHandler.java b/src/main/java/com/derimagia/forgeslack/handler/FMLEventHandler.java
@@ -4,8 +4,9 @@
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.scoreboard.ScorePlayerTeam;
-import net.minecraft.util.ChatComponentText;
-import net.minecraft.util.IChatComponent;
+import net.minecraft.util.text.ITextComponent;
+import net.minecraft.util.text.TextComponentString;
+
 import net.minecraftforge.event.entity.living.LivingDeathEvent;
 import net.minecraftforge.event.entity.player.AchievementEvent;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
@@ -29,25 +30,25 @@ public void onLeave(PlayerEvent.PlayerLoggedOutEvent event) {
 
     @SubscribeEvent
     public void onPlayerDeath(LivingDeathEvent event) {
-        if (event.entityLiving instanceof EntityPlayer) {
-            SlackSender.getInstance().send("_" + event.entityLiving.getCombatTracker().getDeathMessage().getUnformattedText() + "_", getName((EntityPlayer) event.entityLiving));
+        if (event.getEntity() instanceof EntityPlayer) {
+            SlackSender.getInstance().send("_" + ((EntityPlayer) event.getEntity()).getCombatTracker().getDeathMessage().getUnformattedText() + "_", getName((EntityPlayer) event.getEntity()));
         }
     }
 
     @SubscribeEvent
     public void onPlayerRecieveAchievement(AchievementEvent event) {
-        if (event.entityPlayer instanceof EntityPlayerMP) {
-            if (((EntityPlayerMP) event.entityPlayer).getStatFile().hasAchievementUnlocked(event.achievement)) {
+        if (event.getEntity() instanceof EntityPlayerMP) {
+            if (((EntityPlayerMP) event.getEntity()).getStatFile().hasAchievementUnlocked(event.getAchievement())) {
                 return;
             }
-            if (!((EntityPlayerMP) event.entityPlayer).getStatFile().canUnlockAchievement(event.achievement)) {
+            if (!((EntityPlayerMP) event.getEntity()).getStatFile().canUnlockAchievement(event.getAchievement())) {
                 return;
             }
 
-            IChatComponent achievementComponent = event.achievement.getStatName();
-            IChatComponent achievementText = new ChatComponentText("[").appendSibling(achievementComponent).appendText("]");
+            ITextComponent achievementComponent = event.getAchievement().getStatName();
+            ITextComponent achievementText      = new TextComponentString("[").appendSibling(achievementComponent).appendText("]");
 
-            String playerName = getName(event.entityPlayer);
+            String playerName = getName(event.getEntityPlayer());
             SlackSender.getInstance().send("_" + playerName + " has earned the achievement: " + achievementText.getUnformattedText() + "_", playerName);
         }
     }

diff --git a/src/main/java/com/derimagia/forgeslack/handler/ForgeEventHandler.java b/src/main/java/com/derimagia/forgeslack/handler/ForgeEventHandler.java
@@ -12,7 +12,7 @@ public class ForgeEventHandler {
 
     @SubscribeEvent
     public void serverChat(ServerChatEvent event) {
-        SlackSender.getInstance().send(event.message, event.username);
+        SlackSender.getInstance().send(event.getMessage(), event.getUsername());
     }
 
 }
diff --git a/src/main/java/com/derimagia/forgeslack/slack/SlackReceiveHandler.java b/src/main/java/com/derimagia/forgeslack/slack/SlackReceiveHandler.java
@@ -2,8 +2,8 @@
 
 import com.derimagia.forgeslack.ForgeSlack;
 import com.derimagia.forgeslack.handler.ConfigurationHandler;
-import net.minecraft.server.MinecraftServer;
-import net.minecraft.util.ChatComponentText;
+import net.minecraft.util.text.TextComponentString;
+
 import org.eclipse.jetty.server.Request;
 import org.eclipse.jetty.server.handler.AbstractHandler;
 
@@ -12,6 +12,9 @@
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 
+
+import net.minecraftforge.fml.server.FMLServerHandler;
+
 /**
  * @author derimagia
  */
@@ -27,7 +30,7 @@ public void handle(String target, Request baseRequest, HttpServletRequest reques
 
             if (!token.isEmpty() && token.equals(ConfigurationHandler.slackToken)) {
                 if (!username.isEmpty() && !(username.trim().equals("slackbot"))) {
-                    MinecraftServer.getServer().getConfigurationManager().sendChatMsg(new ChatComponentText(message));
+                    FMLServerHandler.instance().getServer().addChatMessage(new TextComponentString(message));
                 }
             } else {
                 ForgeSlack.log.error("Token on Slack Outgoing WebHook is invalid! Ignoring Request.");