diff --git a/.classpath b/.classpath
deleted file mode 100644
index 6634fe9..0000000
--- a/.classpath
+++ /dev/null
@@ -1,66 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/.gitignore b/.gitignore
index c3f98e3..ecafe1d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,8 @@
+.classpath
+LICENSE*.txt
+Paulscode*.txt
+run/
+
eclipse/
.gradel/
CREDITS-fml.txt
@@ -7,6 +12,6 @@ MinecraftForge*.txt
bin/
build/
.gradle/
-README.txt # forge's readme
+README.txt
.DS_Store
diff --git a/.project b/.project
index 414067c..809a5c1 100644
--- a/.project
+++ b/.project
@@ -1,7 +1,7 @@
safechat
-
+
org.eclipse.jdt.core.javanature
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
index a3bf05c..de68b74 100644
--- a/.settings/org.eclipse.jdt.core.prefs
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -1,5 +1,5 @@
#
-#Mon Feb 09 13:56:49 PST 2015
+#Tue Aug 23 16:58:22 PDT 2016
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.compliance=1.6
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
diff --git a/build.gradle b/build.gradle
index cb444cb..6f979f9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,70 +1,87 @@
-buildscript {
- repositories {
- mavenCentral()
- 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:1.2-SNAPSHOT'
- }
-}
-
-apply plugin: 'forge'
-
-version = "1.8"
-group= "colecf.safechat" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
-archivesBaseName = "Safechat"
-
-minecraft {
- version = "1.8-11.14.1.1308"
- runDir = "eclipse"
-
- // the mappings can be changed at any time, and must be in the following format.
- // snapshot_YYYYMMDD snapshot are built nightly.
- // stable_# stables are built at the discretion of the MCP team.
- // Use non-default mappings at your own risk. they may not allways work.
- // simply re-run your setup task after changing the mappings to update your workspace.
- mappings = "snapshot_nodoc_20141130"
-}
-
-dependencies {
- // you may put jars on which you depend on in ./libs
- // or you may define them like so..
- //compile "some.group:artifact:version:classifier"
- //compile "some.group:artifact:version"
-
- // real examples
- //compile 'com.mod-buildcraft:buildcraft:6.0.8:dev' // adds buildcraft to the dev env
- //compile 'com.googlecode.efficient-java-matrix-library:ejml:0.24' // adds ejml to the dev env
-
- // for more info...
- // http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html
- // http://www.gradle.org/docs/current/userguide/dependency_management.html
-
-}
-
-processResources
-{
- // this will ensure that this task is redone when the versions change.
- inputs.property "version", project.version
- inputs.property "mcversion", project.minecraft.version
-
- // replace stuff in mcmod.info, nothing else
- from(sourceSets.main.resources.srcDirs) {
- include 'mcmod.info'
-
- // replace version and mcversion
- expand 'version':project.version, 'mcversion':project.minecraft.version
- }
-
- // copy everything else, thats not the mcmod.info
- from(sourceSets.main.resources.srcDirs) {
- exclude 'mcmod.info'
- }
-}
+
+// For those who want the bleeding edge
+buildscript {
+ repositories {
+ jcenter()
+ maven {
+ name = "forge"
+ url = "http://files.minecraftforge.net/maven"
+ }
+ }
+ dependencies {
+ classpath 'net.minecraftforge.gradle:ForgeGradle:2.2-SNAPSHOT'
+ }
+}
+apply plugin: 'net.minecraftforge.gradle.forge'
+
+/*
+// for people who want stable - not yet functional for MC 1.8.8 - we require the forgegradle 2.1 snapshot
+plugins {
+ id "net.minecraftforge.gradle.forge" version "2.0.2"
+}
+*/
+version = "1.10"
+group= "colecf.safechat" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
+archivesBaseName = "Safechat"
+
+sourceCompatibility = targetCompatibility = "1.6" // Need this here so eclipse task generates correctly.
+compileJava {
+ sourceCompatibility = targetCompatibility = "1.6"
+}
+
+minecraft {
+ version = "1.10.2-12.18.1.2073"
+ runDir = "run"
+
+ // the mappings can be changed at any time, and must be in the following format.
+ // snapshot_YYYYMMDD snapshot are built nightly.
+ // stable_# stables are built at the discretion of the MCP team.
+ // Use non-default mappings at your own risk. they may not allways work.
+ // simply re-run your setup task after changing the mappings to update your workspace.
+ mappings = "snapshot_20160518"
+ // makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable.
+}
+
+dependencies {
+ // you may put jars on which you depend on in ./libs
+ // or you may define them like so..
+ //compile "some.group:artifact:version:classifier"
+ //compile "some.group:artifact:version"
+
+ // real examples
+ //compile 'com.mod-buildcraft:buildcraft:6.0.8:dev' // adds buildcraft to the dev env
+ //compile 'com.googlecode.efficient-java-matrix-library:ejml:0.24' // adds ejml to the dev env
+
+ // the 'provided' configuration is for optional dependencies that exist at compile-time but might not at runtime.
+ //provided 'com.mod-buildcraft:buildcraft:6.0.8:dev'
+
+ // the deobf configurations: 'deobfCompile' and 'deobfProvided' are the same as the normal compile and provided,
+ // except that these dependencies get remapped to your current MCP mappings
+ //deobfCompile 'com.mod-buildcraft:buildcraft:6.0.8:dev'
+ //deobfProvided 'com.mod-buildcraft:buildcraft:6.0.8:dev'
+
+ // for more info...
+ // http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html
+ // http://www.gradle.org/docs/current/userguide/dependency_management.html
+
+}
+
+processResources
+{
+ // this will ensure that this task is redone when the versions change.
+ inputs.property "version", project.version
+ inputs.property "mcversion", project.minecraft.version
+
+ // replace stuff in mcmod.info, nothing else
+ from(sourceSets.main.resources.srcDirs) {
+ include 'mcmod.info'
+
+ // replace version and mcversion
+ expand 'version':project.version, 'mcversion':project.minecraft.version
+ }
+
+ // copy everything else, thats not the mcmod.info
+ from(sourceSets.main.resources.srcDirs) {
+ exclude 'mcmod.info'
+ }
+}
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index b761216..30d399d 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 678d9d8..e18cba7 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Jul 02 15:54:47 CDT 2014
+#Mon Sep 14 12:28:28 PDT 2015
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14-bin.zip
diff --git a/safechat_Client.launch b/safechat_Client.launch
new file mode 100644
index 0000000..f2ab4a0
--- /dev/null
+++ b/safechat_Client.launch
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/safechat_Server.launch b/safechat_Server.launch
new file mode 100644
index 0000000..51befb9
--- /dev/null
+++ b/safechat_Server.launch
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/main/java/colecf/safechat/ChatEvents.java b/src/main/java/colecf/safechat/ChatEvents.java
index bc5d100..6b3cd47 100644
--- a/src/main/java/colecf/safechat/ChatEvents.java
+++ b/src/main/java/colecf/safechat/ChatEvents.java
@@ -10,7 +10,8 @@
import java.util.regex.Pattern;
import net.minecraft.client.Minecraft;
-import net.minecraft.util.ChatComponentText;
+import net.minecraft.util.text.ITextComponent;
+import net.minecraft.util.text.TextComponentString;
import net.minecraftforge.client.event.ClientChatReceivedEvent;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
@@ -51,7 +52,7 @@ public static void init()
@SubscribeEvent
public void chatReceived(ClientChatReceivedEvent event)
{
- String s = event.message.getFormattedText()+" ";
+ String s = event.getMessage().getFormattedText()+" ";
boolean deleteWholeWord = false;
if(deleteWholeWordString.equals("true"))
@@ -136,7 +137,7 @@ else if (deleteMessage.toLowerCase().equals("nochat"))
event.setCanceled(true);
if (!abort)
{
- ChatComponentText text = new ChatComponentText(s);
+ TextComponentString text = new TextComponentString(s);
Minecraft.getMinecraft().ingameGUI.getChatGUI().printChatMessage(text);
}
}
diff --git a/src/main/java/colecf/safechat/Safechat.java b/src/main/java/colecf/safechat/Safechat.java
index 9b254a4..2882d7d 100644
--- a/src/main/java/colecf/safechat/Safechat.java
+++ b/src/main/java/colecf/safechat/Safechat.java
@@ -13,7 +13,7 @@
import net.minecraftforge.fml.common.Mod.EventHandler;
import net.minecraftforge.fml.common.event.FMLInitializationEvent;
-@Mod(modid="colecf.Safechat", name="Safechat", version="1.3.2")
+@Mod(modid="colecf.Safechat", name="Safechat", version="1.10.2")
public class Safechat
{
diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info
index b51ced7..21ac68b 100644
--- a/src/main/resources/mcmod.info
+++ b/src/main/resources/mcmod.info
@@ -3,10 +3,10 @@
"modid": "colecf.Safechat",
"name": "Safechat",
"description": "Blocks swear words from multiplayer chat.",
-"version": "1.6.4",
+"version": "1.10.2",
"credits": "",
"logoFile": "safechat_logo.png",
-"mcversion": "1.6.4",
+"mcversion": "1.10.2",
"url": "http://www.minecraftforum.net/topic/1314911-132-safechat/",
"updateUrl": "",
"authors": [ "Colecf" ],