Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -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/
.idea/
12 changes: 6 additions & 6 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
Expand All @@ -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 {
Expand All @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/me/dags/noclip/client/NoClipClient.java
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,6 @@ private NetHandlerPlayServer getNetHandler() {
}

private EntityNoClipper getNoClipPlayer() {
return EntityNoClipper.class.cast(getNetHandler().playerEntity);
return EntityNoClipper.class.cast(getNetHandler().player);
}
}
2 changes: 1 addition & 1 deletion src/main/resources/mixin.noclip.client.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/mixin.noclip.common.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down