Skip to content

Freecam Schematica Compatibility #481

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 1, 2023
Merged

Freecam Schematica Compatibility #481

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 16 additions & 0 deletions src/main/java/com/lambda/mixin/render/MixinRenderGlobal.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,10 @@
import com.lambda.client.event.events.RenderEntityEvent;
import com.lambda.client.module.modules.player.Freecam;
import com.lambda.client.module.modules.render.SelectionHighlight;
import com.lambda.client.util.Wrapper;
import net.minecraft.client.entity.EntityPlayerSP;
import net.minecraft.client.renderer.RenderGlobal;
import net.minecraft.client.renderer.ViewFrustum;
import net.minecraft.client.renderer.culling.ICamera;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
Expand All @@ -15,6 +18,7 @@
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.ModifyVariable;
import org.spongepowered.asm.mixin.injection.Redirect;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;

@Mixin(RenderGlobal.class)
Expand Down Expand Up @@ -50,4 +54,16 @@ public BlockPos setupTerrainStoreFlooredChunkPosition(BlockPos playerPos) {

return playerPos;
}

@Redirect(method = "setupTerrain", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/ViewFrustum;updateChunkPositions(DD)V"))
public void updateSetupTerrain(ViewFrustum viewFrustum, double viewEntityX, double viewEntityZ) {
if (Freecam.INSTANCE.isEnabled()) {
EntityPlayerSP player = Wrapper.getPlayer();
if (player != null) {
viewEntityX = player.posX;
viewEntityZ = player.posZ;
}
}
viewFrustum.updateChunkPositions(viewEntityX, viewEntityZ);
}
}
53 changes: 0 additions & 53 deletions src/main/java/com/lambda/mixin/render/MixinViewFrustum.java
View file
Open in desktop

This file was deleted.

12 changes: 10 additions & 2 deletions src/main/kotlin/com/lambda/client/module/modules/player/Freecam.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,13 @@ import com.lambda.client.util.threads.onMainThreadSafe
import com.lambda.client.util.threads.runSafeR
import com.lambda.client.util.threads.safeListener
import kotlinx.coroutines.runBlocking
import net.minecraft.client.entity.EntityOtherPlayerMP
import net.minecraft.client.entity.EntityPlayerSP
import net.minecraft.client.multiplayer.WorldClient
import net.minecraft.client.network.NetHandlerPlayClient
import net.minecraft.entity.Entity
import net.minecraft.entity.MoverType
import net.minecraft.entity.player.EntityPlayer
import net.minecraft.network.Packet
import net.minecraft.network.play.client.CPacketUseEntity
import net.minecraft.network.play.server.SPacketEntityHeadLook
import net.minecraft.util.MovementInput
Expand Down Expand Up @@ -265,7 +266,7 @@ object Freecam : Module(
}
}

private class FakeCamera(world: WorldClient, val player: EntityPlayerSP) : EntityOtherPlayerMP(world, mc.session.profile) {
private class FakeCamera(world: WorldClient, val player: EntityPlayerSP) : EntityPlayerSP(mc, world, NoOpNetHandlerPlayerClient(player.connection), player.statFileWriter, player.recipeBook) {
init {
copyLocationAndAnglesFrom(player)
capabilities.allowFlying = true
Expand All @@ -276,6 +277,7 @@ object Freecam : Module(
// Update inventory
inventory.copyInventory(player.inventory)

this.movementInput = MovementInput()
// Update yaw head
updateEntityActionState()

Expand Down Expand Up @@ -331,6 +333,12 @@ object Freecam : Module(
override fun isInvisibleToPlayer(player: EntityPlayer) = true
}

private class NoOpNetHandlerPlayerClient(realNetHandler: NetHandlerPlayClient) : NetHandlerPlayClient(mc, null, realNetHandler.networkManager, realNetHandler.gameProfile) {
override fun sendPacket(packetIn: Packet<*>) {
// no packets from freecam player, thanks
}
}

/**
* @param forward <Forward, Backward>
* @param strafe <Left, Right>
Expand Down
5 changes: 2 additions & 3 deletions src/main/resources/mixins.lambda.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@
"accessor.network.AccessorCPacketPlayer",
"accessor.network.AccessorCPacketUseEntity",
"accessor.network.AccessorSPacketChat",
"accessor.network.AccessorSPacketEntity",
"accessor.network.AccessorSPacketEntityHeadLook",
"accessor.network.AccessorSPacketEntityVelocity",
"accessor.network.AccessorSPacketExplosion",
"accessor.network.AccessorSPacketPosLook",
"accessor.network.AccessorSPacketEntity",
"accessor.network.AccessorSPacketEntityHeadLook",
"accessor.player.AccessorEntityPlayerSP",
"accessor.player.AccessorPlayerControllerMP",
"accessor.render.AccessorRenderGlobal",
Expand Down Expand Up @@ -75,7 +75,6 @@
"render.MixinTileEntityRendererDispatcher",
"render.MixinTileEntitySignRenderer",
"render.MixinTileRendererDispatcher",
"render.MixinViewFrustum",
"render.MixinVisGraph",
"world.MixinBlock",
"world.MixinBlockDragonEgg",
Expand Down