fix
This commit is contained in:
1 parent
fb3afa3b59
commit
fd3bcab522
5 files changed
+56
-17
No files matched your search
@@ -0,0 +1,6 @@
|
|||||||
|
package carpet.fakes;
|
||||||
|
|
||||||
|
public interface MinecraftClientInferface
|
||||||
|
{
|
||||||
|
public float getPausedTickDelta();
|
||||||
|
}
|
||||||
@@ -34,9 +34,9 @@ public class LoggerRegistry
|
|||||||
registerLogger("tnt", new Logger("tnt", "brief", new String[]{"brief", "full"}));
|
registerLogger("tnt", new Logger("tnt", "brief", new String[]{"brief", "full"}));
|
||||||
registerLogger("projectiles", new Logger("projectiles", "brief", new String[]{"brief", "full"}));
|
registerLogger("projectiles", new Logger("projectiles", "brief", new String[]{"brief", "full"}));
|
||||||
registerLogger("fallingBlocks",new Logger("fallingBlocks", "brief", new String[]{"brief", "full"}));
|
registerLogger("fallingBlocks",new Logger("fallingBlocks", "brief", new String[]{"brief", "full"}));
|
||||||
registerLogger("kills", new Logger("kills", null, null));
|
//registerLogger("kills", new Logger("kills", null, null));
|
||||||
registerLogger("damage", new Logger("damage", "all", new String[]{"all","players","me"}));
|
//registerLogger("damage", new Logger("damage", "all", new String[]{"all","players","me"}));
|
||||||
registerLogger("weather", new Logger("weather", null, null));
|
//registerLogger("weather", new Logger("weather", null, null));
|
||||||
registerLogger( "pathfinding", new Logger("pathfinding", "20", new String[]{"2", "5", "10"}));
|
registerLogger( "pathfinding", new Logger("pathfinding", "20", new String[]{"2", "5", "10"}));
|
||||||
|
|
||||||
registerLogger("tps", new HUDLogger("tps", null, null));
|
registerLogger("tps", new HUDLogger("tps", null, null));
|
||||||
|
|||||||
@@ -0,0 +1,36 @@
|
|||||||
|
package carpet.mixins;
|
||||||
|
|
||||||
|
import carpet.fakes.MinecraftClientInferface;
|
||||||
|
import carpet.helpers.TickSpeed;
|
||||||
|
import net.minecraft.client.MinecraftClient;
|
||||||
|
import net.minecraft.client.render.Camera;
|
||||||
|
import net.minecraft.client.render.GameRenderer;
|
||||||
|
import net.minecraft.client.render.VisibleRegion;
|
||||||
|
import net.minecraft.client.render.WorldRenderer;
|
||||||
|
import org.spongepowered.asm.mixin.Final;
|
||||||
|
import org.spongepowered.asm.mixin.Mixin;
|
||||||
|
import org.spongepowered.asm.mixin.Shadow;
|
||||||
|
import org.spongepowered.asm.mixin.injection.At;
|
||||||
|
import org.spongepowered.asm.mixin.injection.Redirect;
|
||||||
|
|
||||||
|
@Mixin(GameRenderer.class)
|
||||||
|
public class GameRenderer_pausedShakeMixin
|
||||||
|
{
|
||||||
|
@Shadow @Final private MinecraftClient client;
|
||||||
|
|
||||||
|
@Redirect(method = "renderCenter", at = @At(
|
||||||
|
value = "INVOKE",
|
||||||
|
target = "Lnet/minecraft/client/render/WorldRenderer;renderEntities(Lnet/minecraft/client/render/Camera;Lnet/minecraft/client/render/VisibleRegion;F)V"
|
||||||
|
))
|
||||||
|
private void renderEntitiesNoShake(WorldRenderer worldRenderer, Camera camera_1, VisibleRegion visibleRegion_1, float float_1)
|
||||||
|
{
|
||||||
|
if (!TickSpeed.process_entities)
|
||||||
|
{
|
||||||
|
worldRenderer.renderEntities(camera_1, visibleRegion_1, ((MinecraftClientInferface)client).getPausedTickDelta());
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
worldRenderer.renderEntities(camera_1, visibleRegion_1, float_1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,24 +1,18 @@
|
|||||||
package carpet.mixins;
|
package carpet.mixins;
|
||||||
|
|
||||||
import carpet.helpers.TickSpeed;
|
import carpet.fakes.MinecraftClientInferface;
|
||||||
import net.minecraft.client.MinecraftClient;
|
import net.minecraft.client.MinecraftClient;
|
||||||
import org.spongepowered.asm.mixin.Mixin;
|
import org.spongepowered.asm.mixin.Mixin;
|
||||||
import org.spongepowered.asm.mixin.Shadow;
|
import org.spongepowered.asm.mixin.Shadow;
|
||||||
import org.spongepowered.asm.mixin.injection.At;
|
|
||||||
import org.spongepowered.asm.mixin.injection.Redirect;
|
|
||||||
|
|
||||||
@Mixin(MinecraftClient.class)
|
@Mixin(MinecraftClient.class)
|
||||||
public class MinecraftClient_pausedShakeMixin
|
public class MinecraftClient_pausedShakeMixin implements MinecraftClientInferface
|
||||||
{
|
{
|
||||||
@Shadow private boolean paused;
|
@Shadow private float pausedTickDelta;
|
||||||
|
|
||||||
@Redirect(method = "render", at = @At(
|
@Override
|
||||||
value = "FIELD",
|
public float getPausedTickDelta()
|
||||||
target = "Lnet/minecraft/client/MinecraftClient;paused:Z",
|
|
||||||
ordinal = 0
|
|
||||||
))
|
|
||||||
private boolean isPausedForRendering(MinecraftClient client)
|
|
||||||
{
|
{
|
||||||
return paused || !TickSpeed.process_entities;
|
return pausedTickDelta;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -133,6 +133,10 @@
|
|||||||
"client": [
|
"client": [
|
||||||
"RenderTickCounter_tickSpeedMixin",
|
"RenderTickCounter_tickSpeedMixin",
|
||||||
"MinecraftClientMixin",
|
"MinecraftClientMixin",
|
||||||
|
|
||||||
|
"MinecraftClient_pausedShakeMixin",
|
||||||
|
"GameRenderer_pausedShakeMixin",
|
||||||
|
|
||||||
"IntegratedServerMixin",
|
"IntegratedServerMixin",
|
||||||
"InGameHudMixin",
|
"InGameHudMixin",
|
||||||
"PlayerListHudMixin",
|
"PlayerListHudMixin",
|
||||||
@@ -140,8 +144,7 @@
|
|||||||
"ClientPlayerInteractionManager_ghostBlocksMixin",
|
"ClientPlayerInteractionManager_ghostBlocksMixin",
|
||||||
|
|
||||||
"BlockEntityRenderDispatcher_movableTEMixin",
|
"BlockEntityRenderDispatcher_movableTEMixin",
|
||||||
"PistonBlockEntityRenderer_movableTEMixin",
|
"PistonBlockEntityRenderer_movableTEMixin"
|
||||||
"MinecraftClient_pausedShakeMixin"
|
|
||||||
],
|
],
|
||||||
"server": [
|
"server": [
|
||||||
"MinecraftDedicatedServerMixin"
|
"MinecraftDedicatedServerMixin"
|
||||||
|
|||||||
Reference in new issue
Block a user