Skip to content
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

1.20/1.21 moving block ticks #694

Merged
merged 3 commits into from
Aug 19, 2024
Merged

1.20/1.21 moving block ticks #694

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
65dec54
1.20 Moving Block Ticks
drfiveminusmint Aug 18, 2024
d300504
Merge branch 'main' into 1.20-moving-tile-ticks
drfiveminusmint Aug 18, 2024
15c2837
1.21 implementation
drfiveminusmint Aug 18, 2024
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
1 change: 1 addition & 0 deletions v1_18/src/main/java/net/countercraft/movecraft/compat/v1_18/IWorldHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ public void rotateCraft(@NotNull Craft craft, @NotNull MovecraftLocation originP
ServerLevel nativeWorld = ((CraftWorld) craft.getWorld()).getHandle();
List<TileHolder> tiles = new ArrayList<>();
List<TickHolder> ticks = new ArrayList<>();

//get the tiles
for (BlockPos position : rotatedPositions.keySet()) {

Expand Down
95 changes: 64 additions & 31 deletions v1_20/src/main/java/net/countercraft/movecraft/compat/v1_20/IWorldHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,11 @@
import net.minecraft.world.level.block.Blocks;
import net.minecraft.world.level.block.Rotation;
import net.minecraft.world.level.block.entity.BlockEntity;
import net.minecraft.world.level.block.entity.BlockEntityTicker;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.chunk.LevelChunk;
import net.minecraft.world.level.chunk.LevelChunkSection;
import net.minecraft.world.ticks.LevelChunkTicks;
import net.minecraft.world.ticks.ScheduledTick;
import org.bukkit.Bukkit;
import org.bukkit.Location;
Expand All @@ -31,7 +33,12 @@
import org.jetbrains.annotations.Nullable;

import java.lang.reflect.Field;
import java.util.*;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.function.Predicate;

@SuppressWarnings("unused")
public class IWorldHandler extends WorldHandler {
Expand Down Expand Up @@ -67,15 +74,20 @@ public void rotateCraft(@NotNull Craft craft, @NotNull MovecraftLocation originP
//*******************************************
ServerLevel nativeWorld = ((CraftWorld) craft.getWorld()).getHandle();
List<TileHolder> tiles = new ArrayList<>();
List<TickHolder> ticks = new ArrayList<>();
//get the tiles
for (BlockPos position : rotatedPositions.keySet()) {
//BlockEntity tile = nativeWorld.removeBlockEntity(position);
BlockEntity tile = removeBlockEntity(nativeWorld, position);
if (tile == null)
continue;
// tile.a(ROTATION[rotation.ordinal()]);
if (tile != null)
tiles.add(new TileHolder(tile, position));

//get the nextTick to move with the tile
tiles.add(new TileHolder(tile, tickProvider.getNextTick(nativeWorld, position), position));
ScheduledTick tickHere = tickProvider.getNextTick(nativeWorld, position);
if (tickHere != null) {
((LevelChunkTicks) nativeWorld.getChunkAt(position).getBlockTicks()).removeIf(
(Predicate<ScheduledTick>) scheduledTick -> scheduledTick.equals(tickHere));
ticks.add(new TickHolder(tickHere, position));
}
}

//*******************************************
Expand All @@ -100,12 +112,16 @@ public void rotateCraft(@NotNull Craft craft, @NotNull MovecraftLocation originP
//* Step four: replace all the tiles *
//*******************************************
//TODO: go by chunks
for (TileHolder tileHolder : tiles) {
for (TileHolder tileHolder : tiles)
moveBlockEntity(nativeWorld, rotatedPositions.get(tileHolder.getTilePosition()), tileHolder.getTile());
if (tileHolder.getNextTick() == null)
continue;
for (TickHolder tickHolder : ticks) {
final long currentTime = nativeWorld.serverLevelData.getGameTime();
nativeWorld.getBlockTicks().schedule(new ScheduledTick<>((Block) tileHolder.getNextTick().type(), rotatedPositions.get(tileHolder.getNextTick().pos()), tileHolder.getNextTick().triggerTick() - currentTime, tileHolder.getNextTick().priority(), tileHolder.getNextTick().subTickOrder()));
nativeWorld.getBlockTicks().schedule(new ScheduledTick<>(
(Block) tickHolder.getTick().type(),
rotatedPositions.get(tickHolder.getTick().pos()),
tickHolder.getTick().triggerTick() - currentTime,
tickHolder.getTick().priority(),
tickHolder.getTick().subTickOrder()));
}

//*******************************************
Expand Down Expand Up @@ -134,20 +150,24 @@ public void translateCraft(@NotNull Craft craft, @NotNull MovecraftLocation disp
//* Step two: Get the tiles *
//*******************************************
List<TileHolder> tiles = new ArrayList<>();
List<TickHolder> ticks = new ArrayList<>();
//get the tiles
for (int i = 0, positionsSize = positions.size(); i < positionsSize; i++) {
BlockPos position = positions.get(i);
if (oldNativeWorld.getBlockState(position) == Blocks.AIR.defaultBlockState())
continue;
//BlockEntity tile = nativeWorld.removeBlockEntity(position);

BlockEntity tile = removeBlockEntity(oldNativeWorld, position);
if (tile == null)
continue;
//get the nextTick to move with the tile
if (tile != null)
tiles.add(new TileHolder(tile,position));

//nativeWorld.capturedTileEntities.remove(position);
//nativeWorld.getChunkAtWorldCoords(position).getTileEntities().remove(position);
tiles.add(new TileHolder(tile, tickProvider.getNextTick(oldNativeWorld, position), position));
//get the nextTick to move with the tile
ScheduledTick tickHere = tickProvider.getNextTick(nativeWorld, position);
if (tickHere != null) {
((LevelChunkTicks) nativeWorld.getChunkAt(position).getBlockTicks()).removeIf(
(Predicate<ScheduledTick>) scheduledTick -> scheduledTick.equals(tickHere));
ticks.add(new TickHolder(tickHere, position));
}

}
//*******************************************
Expand All @@ -173,13 +193,11 @@ public void translateCraft(@NotNull Craft craft, @NotNull MovecraftLocation disp
//* Step four: replace all the tiles *
//*******************************************
//TODO: go by chunks
for (int i = 0, tilesSize = tiles.size(); i < tilesSize; i++) {
TileHolder tileHolder = tiles.get(i);
for (TileHolder tileHolder : tiles)
moveBlockEntity(nativeWorld, tileHolder.getTilePosition().offset(translateVector), tileHolder.getTile());
if (tileHolder.getNextTick() == null)
continue;
for (TickHolder tickHolder : ticks) {
final long currentTime = nativeWorld.getGameTime();
nativeWorld.getBlockTicks().schedule(new ScheduledTick<>((Block) tileHolder.getNextTick().type(), tileHolder.getTilePosition().offset(translateVector), tileHolder.getNextTick().triggerTick() - currentTime, tileHolder.getNextTick().priority(), tileHolder.getNextTick().subTickOrder()));
nativeWorld.getBlockTicks().schedule(new ScheduledTick<>((Block) tickHolder.getTick().type(), tickHolder.getTickPosition().offset(translateVector), tickHolder.getTick().triggerTick() - currentTime, tickHolder.getTick().priority(), tickHolder.getTick().subTickOrder()));
}
//*******************************************
//* Step five: Destroy the leftovers *
Expand Down Expand Up @@ -291,14 +309,11 @@ private void moveBlockEntity(@NotNull Level nativeWorld, @NotNull BlockPos newPo
private static class TileHolder {
@NotNull
private final BlockEntity tile;
@Nullable
private final ScheduledTick<?> nextTick;
@NotNull
private final BlockPos tilePosition;

public TileHolder(@NotNull BlockEntity tile, @Nullable ScheduledTick<?> nextTick, @NotNull BlockPos tilePosition) {
public TileHolder(@NotNull BlockEntity tile, @NotNull BlockPos tilePosition) {
this.tile = tile;
this.nextTick = nextTick;
this.tilePosition = tilePosition;
}

Expand All @@ -308,14 +323,32 @@ public BlockEntity getTile() {
return tile;
}

@Nullable
public ScheduledTick<?> getNextTick() {
return nextTick;
}

@NotNull
public BlockPos getTilePosition() {
return tilePosition;
}
}

private static class TickHolder {
@NotNull
private final ScheduledTick tick;
@NotNull
private final BlockPos tickPosition;

public TickHolder(@NotNull ScheduledTick tick, @NotNull BlockPos tilePosition) {
this.tick = tick;
this.tickPosition = tilePosition;
}


@NotNull
public ScheduledTick getTick() {
return tick;
}

@NotNull
public BlockPos getTickPosition() {
return tickPosition;
}
}
}
22 changes: 10 additions & 12 deletions v1_20/src/main/java/net/countercraft/movecraft/compat/v1_20/NextTickProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import net.minecraft.server.level.ServerLevel;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.levelgen.structure.BoundingBox;
import net.minecraft.world.ticks.LevelChunkTicks;
import net.minecraft.world.ticks.LevelTicks;
import net.minecraft.world.ticks.ScheduledTick;
import org.jetbrains.annotations.NotNull;
Expand All @@ -12,31 +13,28 @@
import java.lang.reflect.Field;
import java.util.List;
import java.util.Queue;
import java.util.stream.Stream;

public class NextTickProvider {

@Nullable
public ScheduledTick<?> getNextTick(@NotNull ServerLevel world, @NotNull BlockPos position){
LevelTicks<Block> tickList = world.getBlockTicks();
LevelChunkTicks<Block> tickList = (LevelChunkTicks<Block>) world
.getChunk(position)
.getBlockTicks();

var box = BoundingBox.encapsulatingPositions(List.of(position));
if(box.isEmpty()){
return null;
}
Queue<ScheduledTick<?>> toRunThisTick;
try {
Field toRunThisTickField = LevelTicks.class.getDeclaredField("g"); // g is obfuscated toRunThisTick
toRunThisTickField.setAccessible(true);
toRunThisTick = (Queue<ScheduledTick<?>>) toRunThisTickField.get(tickList);
} catch (NoSuchFieldException | IllegalAccessException e) {
e.printStackTrace();
return null;
}
for (var iter = toRunThisTick.iterator(); iter.hasNext(); ) {

Stream<ScheduledTick<Block>> ticks = tickList.getAll();

for (var iter = ticks.iterator(); iter.hasNext(); ) {
var next = iter.next();
if (!next.pos().equals(position)) {
continue;
}
iter.remove();
return next;
}
return null;
Expand Down
Loading