player-use-pertick-interpolated

src/main/java/carpettisaddition/helpers/carpet/playerActionEnhanced/IEntityPlayerActionPackActionTypeUse.java

@@ -0,0 +1,26 @@
+/*
+ * This file is part of the Carpet TIS Addition project, licensed under the
+ * GNU Lesser General Public License v3.0
+ *
+ * Copyright (C) 2023  Fallen_Breath and contributors
+ *
+ * Carpet TIS Addition is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Carpet TIS Addition is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Carpet TIS Addition.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package carpettisaddition.helpers.carpet.playerActionEnhanced;
+
+public interface IEntityPlayerActionPackActionTypeUse
+{
+	void setTickPart(float f);
+}

src/main/java/carpettisaddition/helpers/carpet/playerActionEnhanced/IServerPlayerEntity.java

@@ -0,0 +1,29 @@
+/*
+ * This file is part of the Carpet TIS Addition project, licensed under the
+ * GNU Lesser General Public License v3.0
+ *
+ * Copyright (C) 2023  Fallen_Breath and contributors
+ *
+ * Carpet TIS Addition is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Carpet TIS Addition is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Carpet TIS Addition.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package carpettisaddition.helpers.carpet.playerActionEnhanced;
+
+public interface IServerPlayerEntity
+{
+	void pushOldPosRot();
+
+	void swapOldPosRot(boolean lastTickValues);
+
+}

src/main/java/carpettisaddition/mixins/carpet/tweaks/command/playerActionEnhanced/EntityPlayerActionPackActionMixin.java

@@ -22,6 +22,8 @@
 
 import carpet.helpers.EntityPlayerActionPack;
 import carpettisaddition.helpers.carpet.playerActionEnhanced.IEntityPlayerActionPackAction;
+import carpettisaddition.helpers.carpet.playerActionEnhanced.IEntityPlayerActionPackActionTypeUse;
+import carpettisaddition.helpers.carpet.playerActionEnhanced.IServerPlayerEntity;
 import carpettisaddition.helpers.carpet.playerActionEnhanced.randomly.gen.RandomGen;
 import net.minecraft.server.network.ServerPlayerEntity;
 import org.spongepowered.asm.mixin.Final;
@@ -90,15 +92,24 @@ private void perTickMultiplier(EntityPlayerActionPack actionPack, EntityPlayerAc
 	{
 		if (this.perTick != null)
 		{
+			ServerPlayerEntity player = ((EntityPlayerActionPackAccessor)actionPack).getPlayer();
+			IServerPlayerEntity iplayer = (IServerPlayerEntity)(Object)player;
+			EntityPlayerActionPackActionTypeAccessor typeAccessor = ((EntityPlayerActionPackActionTypeAccessor)(Object)type);
+			EntityPlayerActionPack.Action self = (EntityPlayerActionPack.Action)(Object)this;
+			IEntityPlayerActionPackActionTypeUse actionTypeUSE = (IEntityPlayerActionPackActionTypeUse)(Object)EntityPlayerActionPack.ActionType.USE;
+
+			iplayer.swapOldPosRot(true);
+
 			for (int i = 0; i < this.perTick - 1; i++)
 			{
-				EntityPlayerActionPackActionTypeAccessor typeAccessor = ((EntityPlayerActionPackActionTypeAccessor)(Object)type);
-				ServerPlayerEntity player = ((EntityPlayerActionPackAccessor)actionPack).getPlayer();
-				EntityPlayerActionPack.Action self = (EntityPlayerActionPack.Action)(Object)this;
-
+				actionTypeUSE.setTickPart((i + 1) / (float)perTick);
 				typeAccessor.invokeExecute(player, self);
 				typeAccessor.invokeInactiveTick(player, self);
 			}
+
+			actionTypeUSE.setTickPart(1.0f);
+			iplayer.swapOldPosRot(false);
+			iplayer.pushOldPosRot();
 		}
 	}
 }

src/main/java/carpettisaddition/mixins/carpet/tweaks/command/playerActionEnhanced/EntityPlayerActionPackActionTypeMixin.java

@@ -0,0 +1,39 @@
+/*
+ * This file is part of the Carpet TIS Addition project, licensed under the
+ * GNU Lesser General Public License v3.0
+ *
+ * Copyright (C) 2023  Fallen_Breath and contributors
+ *
+ * Carpet TIS Addition is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Carpet TIS Addition is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Carpet TIS Addition.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package carpettisaddition.mixins.carpet.tweaks.command.playerActionEnhanced;
+
+import carpet.helpers.EntityPlayerActionPack;
+import carpettisaddition.helpers.carpet.playerActionEnhanced.IServerPlayerEntity;
+import net.minecraft.server.network.ServerPlayerEntity;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(EntityPlayerActionPack.ActionType.class)
+public class EntityPlayerActionPackActionTypeMixin
+{
+	@Inject(method = "start", at = @At("HEAD"), remap = false)
+	private void onStart(ServerPlayerEntity player, EntityPlayerActionPack.Action action, CallbackInfo info)
+	{
+		((IServerPlayerEntity)(Object)player).pushOldPosRot();
+	}
+}

src/main/java/carpettisaddition/mixins/carpet/tweaks/command/playerActionEnhanced/EntityPlayerActionPackActionTypeUseMixin.java

@@ -0,0 +1,60 @@
+/*
+ * This file is part of the Carpet TIS Addition project, licensed under the
+ * GNU Lesser General Public License v3.0
+ *
+ * Copyright (C) 2023  Fallen_Breath and contributors
+ *
+ * Carpet TIS Addition is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Carpet TIS Addition is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Carpet TIS Addition.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package carpettisaddition.mixins.carpet.tweaks.command.playerActionEnhanced;
+
+//#if MC > 11903
+//$$ import carpet.script.utils.Tracer;
+//#else
+import carpet.helpers.Tracer;
+//#endif
+import carpettisaddition.helpers.carpet.playerActionEnhanced.IEntityPlayerActionPackActionTypeUse;
+import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.util.hit.HitResult;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Redirect;
+
+@Mixin(targets = "carpet.helpers.EntityPlayerActionPack$ActionType$1")
+public class EntityPlayerActionPackActionTypeUseMixin implements IEntityPlayerActionPackActionTypeUse
+{
+	private float tickPart = 1.0f;
+
+	@Redirect(
+		method = "execute",
+		at = @At(
+			value = "INVOKE",
+			target = "Lcarpet/helpers/EntityPlayerActionPack;getTarget(Lnet/minecraft/server/network/ServerPlayerEntity;)Lnet/minecraft/util/hit/HitResult;",
+			remap = false
+		),
+		remap = false
+	)
+	private HitResult doRayTrace(ServerPlayerEntity player)
+	{
+		double reach = player.interactionManager.isCreative() ? 5 : 4.5f;
+		return Tracer.rayTrace(player, tickPart, reach, false);
+	}
+
+	@Override
+	public void setTickPart(float f)
+	{
+		tickPart = f;
+	}
+}

src/main/java/carpettisaddition/mixins/command/player/pertick/ServerPlayerEntityMixin.java

@@ -0,0 +1,59 @@
+/*
+ * This file is part of the Carpet TIS Addition project, licensed under the
+ * GNU Lesser General Public License v3.0
+ *
+ * Copyright (C) 2023  Fallen_Breath and contributors
+ *
+ * Carpet TIS Addition is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Carpet TIS Addition is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Carpet TIS Addition.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package carpettisaddition.mixins.command.player.pertick;
+
+import carpettisaddition.helpers.carpet.playerActionEnhanced.IServerPlayerEntity;
+import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.util.math.Vec2f;
+import net.minecraft.util.math.Vec3d;
+import org.spongepowered.asm.mixin.Mixin;
+
+@Mixin(ServerPlayerEntity.class)
+public abstract class ServerPlayerEntityMixin implements IServerPlayerEntity
+{
+	private Vec3d posLastTick;
+	private Vec2f rotLastTick;
+
+	public void pushOldPosRot()
+	{
+		ServerPlayerEntity self = (ServerPlayerEntity)(Object)this;
+		posLastTick = self.getPos();
+		rotLastTick = self.getRotationClient();
+	}
+
+	public void swapOldPosRot(boolean lastTickValues)
+	{
+		ServerPlayerEntity self = (ServerPlayerEntity)(Object)this;
+		if (lastTickValues) {
+			self.prevX = posLastTick.x;
+			self.prevY = posLastTick.y;
+			self.prevZ = posLastTick.z;
+			self.prevPitch = rotLastTick.x;
+			self.prevYaw = rotLastTick.y;
+		} else {
+			self.prevX = self.getPos().x;
+			self.prevY = self.getPos().y;
+			self.prevZ = self.getPos().z;
+			self.prevPitch = self.getPitch(1.0f);
+			self.prevYaw = self.getYaw(1.0f);
+		}
+	}
+}

src/main/resources/carpet-tis-addition.mixins.json

@@ -24,6 +24,8 @@
     "carpet.tweaks.command.playerActionEnhanced.EntityPlayerActionPackActionAccessor",
     "carpet.tweaks.command.playerActionEnhanced.EntityPlayerActionPackActionMixin",
     "carpet.tweaks.command.playerActionEnhanced.EntityPlayerActionPackActionTypeAccessor",
+    "carpet.tweaks.command.playerActionEnhanced.EntityPlayerActionPackActionTypeMixin",
+    "carpet.tweaks.command.playerActionEnhanced.EntityPlayerActionPackActionTypeUseMixin",
     "carpet.tweaks.command.playerActionEnhanced.PlayerCommandMixin",
     "carpet.tweaks.command.spawnTrackingRestart.SpawnCommandMixin",
     "carpet.tweaks.command.tickWarpMaximumDuration.TickCommandMixin",
@@ -150,6 +152,7 @@
     "command.manipulate.entity.MobEntityAccessor",
     "command.mobcapsLocal.SpawnCommandAccessor",
     "command.mobcapsLocal.SpawnCommandMixin",
+    "command.player.pertick.ServerPlayerEntityMixin",
     "command.raid.RaidAccessor",
     "command.raid.RaidManagerAccessor",
     "command.raid.RaidMixin",