diff --git a/.gitignore b/.gitignore
index 122323c..221d0c1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,8 +6,11 @@
 # Package Files #
 *.war
 *.ear
+build/
+classes/
+out/
 
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
 
-.idea/
\ No newline at end of file
+.idea/
diff --git a/build.gradle b/build.gradle
index ee85187..ca59d2b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -15,7 +15,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'net.minecraftforge.gradle:ForgeGradle:2.1-SNAPSHOT'
+        classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT'
         classpath 'org.spongepowered:mixingradle:0.4-SNAPSHOT'
         classpath 'gradle.plugin.mnm.mods.kappa:ap-ide:1.0.5'
     }
@@ -27,14 +27,14 @@ apply plugin: 'mnm.gradle.ap-ide'
 sourceCompatibility = targetCompatibility = "1.8"
 
 minecraft {
-    version = "1.10.2"
+    version = "1.12.2"
     runDir = "run"
-    mappings = "snapshot_20160630"
+    mappings = "snapshot_20170919"
     tweakClass = 'me.dags.noclip.launch.NoClipTweaker'
 }
 
 group = 'me.dags'
-version = "1.1.1-mc$minecraft.version"
+version = "1.2-mc$minecraft.version"
 
 repositories {
     maven {
@@ -44,10 +44,10 @@ repositories {
 }
 
 dependencies {
-    compile('org.spongepowered:mixin:0.5.11-SNAPSHOT') {
+    compile('org.spongepowered:mixin:0.7.11-SNAPSHOT') {
         transitive = false
     }
-    factory 'org.spongepowered:mixin:0.5.11-SNAPSHOT'
+    factory 'org.spongepowered:mixin:0.7.11-SNAPSHOT'
 }
 
 processor {
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 53629fc..efddbf8 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,4 +1,4 @@
-#Sun Jul 09 21:50:30 BST 2017
+#Wed Sep 05 21:01:46 MDT 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/src/main/java/me/dags/noclip/client/NoClipClient.java b/src/main/java/me/dags/noclip/client/NoClipClient.java
index 37321bc..9113b10 100644
--- a/src/main/java/me/dags/noclip/client/NoClipClient.java
+++ b/src/main/java/me/dags/noclip/client/NoClipClient.java
@@ -31,7 +31,7 @@ public static void onTick(boolean inGame) {
     public static void sendNoClipData() {
         ByteBuf buf = Unpooled.buffer().writeBoolean(NoClipClient.getNoClipData().noClip());
         CPacketCustomPayload payload = new CPacketCustomPayload(EntityNoClipper.NOCLIP_CHANNEL, new PacketBuffer(buf));
-        Minecraft.getMinecraft().thePlayer.connection.sendPacket(payload);
+        Minecraft.getMinecraft().player.connection.sendPacket(payload);
     }
 
     public static NoClipData getNoClipData() {
diff --git a/src/main/java/me/dags/noclip/common/mixin/MixinEntityPlayer.java b/src/main/java/me/dags/noclip/common/mixin/MixinEntityPlayer.java
index 0ee726a..cea6c0d 100644
--- a/src/main/java/me/dags/noclip/common/mixin/MixinEntityPlayer.java
+++ b/src/main/java/me/dags/noclip/common/mixin/MixinEntityPlayer.java
@@ -3,6 +3,7 @@
 import me.dags.noclip.common.EntityNoClipper;
 import me.dags.noclip.common.NoClipData;
 import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.MoverType;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.PlayerCapabilities;
 import net.minecraft.world.World;
@@ -48,11 +49,12 @@ public void onUpdate(CallbackInfo callbackInfo) {
     }
 
     @Override
-    public void moveEntity(double x, double y, double z) {
+    public void move(MoverType type, double x, double y, double z) {
         if (getNoClipData().noClip() && getCapabilities().isFlying) {
             this.noClip = true;
+
         }
-        super.moveEntity(x, y, z);
+        super.move(type, x, y, z);
     }
 
     private PlayerCapabilities getCapabilities() {
diff --git a/src/main/java/me/dags/noclip/common/mixin/MixinNetHandlerServer.java b/src/main/java/me/dags/noclip/common/mixin/MixinNetHandlerServer.java
index 1196c53..4e902af 100644
--- a/src/main/java/me/dags/noclip/common/mixin/MixinNetHandlerServer.java
+++ b/src/main/java/me/dags/noclip/common/mixin/MixinNetHandlerServer.java
@@ -27,6 +27,6 @@ private NetHandlerPlayServer getNetHandler() {
     }
 
     private EntityNoClipper getNoClipPlayer() {
-        return EntityNoClipper.class.cast(getNetHandler().playerEntity);
+        return EntityNoClipper.class.cast(getNetHandler().player);
     }
 }
diff --git a/src/main/resources/mixin.noclip.client.json b/src/main/resources/mixin.noclip.client.json
index afaa02b..94c526f 100644
--- a/src/main/resources/mixin.noclip.client.json
+++ b/src/main/resources/mixin.noclip.client.json
@@ -1,6 +1,6 @@
 {
   "required": false,
-  "minVersion": "0.5.11",
+  "minVersion": "0.7.5",
   "compatibilityLevel": "JAVA_8",
   "package": "me.dags.noclip.client.mixin",
   "refmap": "mixin.noclip.refmap.json",
diff --git a/src/main/resources/mixin.noclip.common.json b/src/main/resources/mixin.noclip.common.json
index 740c8f1..3c09d6a 100644
--- a/src/main/resources/mixin.noclip.common.json
+++ b/src/main/resources/mixin.noclip.common.json
@@ -1,6 +1,6 @@
 {
   "required": false,
-  "minVersion": "0.5.11",
+  "minVersion": "0.7.5",
   "compatibilityLevel": "JAVA_8",
   "package": "me.dags.noclip.common.mixin",
   "refmap": "mixin.noclip.refmap.json",