ChomeNS/SongPlayer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Added block break movements and restore slot when using $stop

Browse source
This commit is contained in:
hhhzzzsss 2023-06-19 20:47:12 -05:00
parent cf5c63c7ed
commit fa76bb4d96
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/main/java/com/github/hhhzzzsss/songplayer/mixin/ClientPlayNetworkHandlerMixin.java
View file

@ -9,6 +9,7 @@ import net.minecraft.client.network.ClientPlayNetworkHandler;
import net.minecraft.entity.EntityPose; import net.minecraft.entity.EntityPose;
import net.minecraft.network.ClientConnection; import net.minecraft.network.ClientConnection;
import net.minecraft.network.packet.Packet; import net.minecraft.network.packet.Packet;
import net.minecraft.network.packet.c2s.play.ClickSlotC2SPacket;
import net.minecraft.network.packet.c2s.play.ClientCommandC2SPacket; import net.minecraft.network.packet.c2s.play.ClientCommandC2SPacket;
import net.minecraft.network.packet.c2s.play.PlayerMoveC2SPacket; import net.minecraft.network.packet.c2s.play.PlayerMoveC2SPacket;
import net.minecraft.network.packet.s2c.play.GameJoinS2CPacket; import net.minecraft.network.packet.s2c.play.GameJoinS2CPacket;

13
src/main/java/com/github/hhhzzzsss/songplayer/playing/SongHandler.java
View file

@ -206,7 +206,7 @@ public class SongHandler {
private int buildStartDelay = 0; private int buildStartDelay = 0;
private int buildEndDelay = 0; private int buildEndDelay = 0;
private int buildCooldown = 0; private int buildCooldown = 0;
private int buildSlot = 0; private int buildSlot = -1;
private ItemStack prevHeldItem = null; private ItemStack prevHeldItem = null;
private void handleBuilding() { private void handleBuilding() {
setBuildProgressDisplay(); setBuildProgressDisplay();
@ -237,7 +237,7 @@ public class SongHandler {
for (int i=0; i<5; i++) { for (int i=0; i<5; i++) {
if (stage.requiredBreaks.isEmpty()) break; if (stage.requiredBreaks.isEmpty()) break;
BlockPos bp = stage.requiredBreaks.poll(); BlockPos bp = stage.requiredBreaks.poll();
SongPlayer.MC.interactionManager.attackBlock(bp, Direction.UP); attackBlock(bp);
} }
buildEndDelay = 20; buildEndDelay = 20;
} else if (!stage.missingNotes.isEmpty()) { } else if (!stage.missingNotes.isEmpty()) {
@ -376,6 +376,7 @@ public class SongHandler {
currentPlaylist = null; currentPlaylist = null;
songQueue.clear(); songQueue.clear();
stage = null; stage = null;
buildSlot = -1;
SongPlayer.removeFakePlayer(); SongPlayer.removeFakePlayer();
} }
@ -391,6 +392,7 @@ public class SongHandler {
sendGamemodeCommand(Config.getConfig().survivalCommand); sendGamemodeCommand(Config.getConfig().survivalCommand);
} }
} }
restoreBuildSlot();
cleanup(); cleanup();
} }
@ -494,7 +496,10 @@ public class SongHandler {
prevHeldItem = SongPlayer.MC.player.getInventory().getStack(buildSlot); prevHeldItem = SongPlayer.MC.player.getInventory().getStack(buildSlot);
} }
private void restoreBuildSlot() { private void restoreBuildSlot() {
SongPlayer.MC.player.getInventory().setStack(buildSlot, prevHeldItem); if (buildSlot != -1) {
SongPlayer.MC.interactionManager.clickCreativeStack(prevHeldItem, 36 + buildSlot); SongPlayer.MC.player.getInventory().setStack(buildSlot, prevHeldItem);
SongPlayer.MC.interactionManager.clickCreativeStack(prevHeldItem, 36 + buildSlot);
buildSlot = -1;
}
} }
} }