Skip to content

Commit

Permalink
1.15.2 suppourt
Browse files Browse the repository at this point in the history
  • Loading branch information
@oh-noey
oh-noey committed May 31, 2021
1 parent 257b465 commit 9158f5a
Show file tree
Hide file tree
Showing 6 changed files with 468 additions and 0 deletions.
6 changes: 6 additions & 0 deletions modules/Movecraft/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,12 @@
<version>v1_14_R1</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>net.countercraft</groupId>
<artifactId>movecraft-v1_15_R1</artifactId>
<version>v1_15_R1</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>net.countercraft</groupId>
<artifactId>movecraft-v1_16_R1</artifactId>
Expand Down
61 changes: 61 additions & 0 deletions modules/v1_15_R1/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>movecraft-parent</artifactId>
<groupId>net.countercraft</groupId>
<version>parent</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>movecraft-v1_15_R1</artifactId>
<name>Movecraft-v1_15_R1</name>
<version>v1_15_R1</version>
<packaging>jar</packaging>
<dependencies>
<dependency>
<groupId>org.bukkit</groupId>
<artifactId>craftbukkit</artifactId>
<version>1.15.2-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.countercraft</groupId>
<artifactId>movecraft-api</artifactId>
<version>API</version>
<type>jar</type>
</dependency>
</dependencies>
<build>
<sourceDirectory>src/main/java</sourceDirectory>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
<includes>
<include>net/countercraft/movecraft/compat/v1_15_R1/**</include>
<include>net/countercraft/movecraft/support/v1_15_R1/**</include>
</includes>
<source>11</source>
<target>11</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.4</version>
<configuration>
<includes>
<include>net/countercraft/movecraft/compat/v1_15_R1/**</include>
<include>net/countercraft/movecraft/support/v1_15_R1/**</include>
</includes>
</configuration>
</plugin>
</plugins>
</build>

</project>
320 changes: 320 additions & 0 deletions modules/v1_15_R1/src/main/java/net/countercraft/movecraft/compat/v1_15_R1/IWorldHandler.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,320 @@
package net.countercraft.movecraft.compat.v1_15_R1;

import net.countercraft.movecraft.MovecraftLocation;
import net.countercraft.movecraft.Rotation;
import net.countercraft.movecraft.WorldHandler;
import net.countercraft.movecraft.craft.Craft;
import net.countercraft.movecraft.util.CollectionUtils;
import net.countercraft.movecraft.util.MathUtils;
import net.minecraft.server.v1_15_R1.Block;
import net.minecraft.server.v1_15_R1.BlockPosition;
import net.minecraft.server.v1_15_R1.Blocks;
import net.minecraft.server.v1_15_R1.Chunk;
import net.minecraft.server.v1_15_R1.ChunkSection;
import net.minecraft.server.v1_15_R1.EntityPlayer;
import net.minecraft.server.v1_15_R1.EnumBlockRotation;
import net.minecraft.server.v1_15_R1.IBlockData;
import net.minecraft.server.v1_15_R1.NextTickListEntry;
import net.minecraft.server.v1_15_R1.PacketPlayOutPosition;
import net.minecraft.server.v1_15_R1.PlayerConnection;
import net.minecraft.server.v1_15_R1.TileEntity;
import net.minecraft.server.v1_15_R1.World;
import net.minecraft.server.v1_15_R1.WorldServer;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.block.data.BlockData;
import org.bukkit.craftbukkit.v1_15_R1.CraftWorld;
import org.bukkit.craftbukkit.v1_15_R1.block.data.CraftBlockData;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftPlayer;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

import java.lang.invoke.MethodHandle;
import java.lang.invoke.MethodHandles;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.Collection;
import java.util.EnumSet;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;

@SuppressWarnings("unused")
public class IWorldHandler extends WorldHandler {
private static final EnumBlockRotation ROTATION[];
static {
ROTATION = new EnumBlockRotation[3];
ROTATION[Rotation.NONE.ordinal()] = EnumBlockRotation.NONE;
ROTATION[Rotation.CLOCKWISE.ordinal()] = EnumBlockRotation.CLOCKWISE_90;
ROTATION[Rotation.ANTICLOCKWISE.ordinal()] = EnumBlockRotation.COUNTERCLOCKWISE_90;
}
private final NextTickProvider tickProvider = new NextTickProvider();
private MethodHandle internalTeleportMH;

public IWorldHandler() {
MethodHandles.Lookup lookup = MethodHandles.lookup();
Method teleport = null;
try {
teleport = PlayerConnection.class.getDeclaredMethod("a", double.class, double.class, double.class, float.class, float.class, Set.class);
teleport.setAccessible(true);
internalTeleportMH = lookup.unreflect(teleport);

} catch (NoSuchMethodException | IllegalAccessException e) {
e.printStackTrace();
}
}

@Override
public void addPlayerLocation(Player player, double x, double y, double z, float yaw, float pitch){
EntityPlayer ePlayer = ((CraftPlayer) player).getHandle();
if(internalTeleportMH == null) {
//something went wrong
super.addPlayerLocation(player, x, y, z, yaw, pitch);
return;
}
try {
internalTeleportMH.invoke(ePlayer.playerConnection, x, y, z, yaw, pitch, EnumSet.allOf(PacketPlayOutPosition.EnumPlayerTeleportFlags.class));
} catch (Throwable throwable) {
throwable.printStackTrace();
}
}

@Override
public void rotateCraft(@NotNull Craft craft, @NotNull MovecraftLocation originPoint, @NotNull Rotation rotation) {
//*******************************************
//* Step one: Convert to Positions *
//*******************************************
HashMap<BlockPosition,BlockPosition> rotatedPositions = new HashMap<>();
Rotation counterRotation = rotation == Rotation.CLOCKWISE ? Rotation.ANTICLOCKWISE : Rotation.CLOCKWISE;
for(MovecraftLocation newLocation : craft.getHitBox()){
rotatedPositions.put(locationToPosition(MathUtils.rotateVec(counterRotation, newLocation.subtract(originPoint)).add(originPoint)),locationToPosition(newLocation));
}
//*******************************************
//* Step two: Get the tiles *
//*******************************************
WorldServer nativeWorld = ((CraftWorld) craft.getWorld()).getHandle();
List<TileHolder> tiles = new ArrayList<>();
//get the tiles
for(BlockPosition position : rotatedPositions.keySet()){
//TileEntity tile = nativeWorld.removeTileEntity(position);
TileEntity tile = removeTileEntity(nativeWorld,position);
if(tile == null)
continue;
tile.a(ROTATION[rotation.ordinal()]);
//get the nextTick to move with the tile
tiles.add(new TileHolder(tile, tickProvider.getNextTick(nativeWorld,position), position));
}

//*******************************************
//* Step three: Translate all the blocks *
//*******************************************
// blockedByWater=false means an ocean-going vessel
//TODO: Simplify
//TODO: go by chunks
//TODO: Don't move unnecessary blocks
//get the blocks and rotate them
HashMap<BlockPosition,IBlockData> blockData = new HashMap<>();
for(BlockPosition position : rotatedPositions.keySet()){
blockData.put(position,nativeWorld.getType(position).a(ROTATION[rotation.ordinal()]));
}
//create the new block
for(Map.Entry<BlockPosition,IBlockData> entry : blockData.entrySet()) {
setBlockFast(nativeWorld, rotatedPositions.get(entry.getKey()), entry.getValue());
}


//*******************************************
//* Step four: replace all the tiles *
//*******************************************
//TODO: go by chunks
for(TileHolder tileHolder : tiles){
moveTileEntity(nativeWorld, rotatedPositions.get(tileHolder.getTilePosition()),tileHolder.getTile());
if(tileHolder.getNextTick()==null)
continue;
final long currentTime = nativeWorld.worldData.getTime();
nativeWorld.getBlockTickList().a(rotatedPositions.get(tileHolder.getNextTick().a), (Block)tileHolder.getNextTick().b(), (int) (tileHolder.getNextTick().b - currentTime), tileHolder.getNextTick().c);
}

//*******************************************
//* Step five: Destroy the leftovers *
//*******************************************
//TODO: add support for pass-through
Collection<BlockPosition> deletePositions = CollectionUtils.filter(rotatedPositions.keySet(),rotatedPositions.values());
for(BlockPosition position : deletePositions){
setBlockFast(nativeWorld, position, Blocks.AIR.getBlockData());
}
}

@Override
public void translateCraft(@NotNull Craft craft, @NotNull MovecraftLocation displacement, @NotNull org.bukkit.World world) {
//TODO: Add support for rotations
//A craftTranslateCommand should only occur if the craft is moving to a valid position
//*******************************************
//* Step one: Convert to Positions *
//*******************************************
BlockPosition translateVector = locationToPosition(displacement);
List<BlockPosition> positions = new ArrayList<>(craft.getHitBox().size());
craft.getHitBox().forEach((movecraftLocation) -> positions.add(locationToPosition((movecraftLocation)).b(translateVector)));
WorldServer oldNativeWorld = ((CraftWorld) craft.getWorld()).getHandle();
World nativeWorld = ((CraftWorld) world).getHandle();
//*******************************************
//* Step two: Get the tiles *
//*******************************************
List<TileHolder> tiles = new ArrayList<>();
//get the tiles
for (int i = 0, positionsSize = positions.size(); i < positionsSize; i++) {
BlockPosition position = positions.get(i);
if (oldNativeWorld.getType(position) == Blocks.AIR.getBlockData())
continue;
//TileEntity tile = nativeWorld.removeTileEntity(position);
TileEntity tile = removeTileEntity(oldNativeWorld, position);
if (tile == null)
continue;
//get the nextTick to move with the tile

//nativeWorld.capturedTileEntities.remove(position);
//nativeWorld.getChunkAtWorldCoords(position).getTileEntities().remove(position);
tiles.add(new TileHolder(tile, tickProvider.getNextTick(oldNativeWorld, position), position));

}
//*******************************************
//* Step three: Translate all the blocks *
//*******************************************
// blockedByWater=false means an ocean-going vessel
//TODO: Simplify
//TODO: go by chunks
//TODO: Don't move unnecessary blocks
//get the blocks and translate the positions
List<IBlockData> blockData = new ArrayList<>();
List<BlockPosition> newPositions = new ArrayList<>();
for (int i = 0, positionsSize = positions.size(); i < positionsSize; i++) {
BlockPosition position = positions.get(i);
blockData.add(oldNativeWorld.getType(position));
newPositions.add(position.a(translateVector));
}
//create the new block
for(int i = 0, positionSize = newPositions.size(); i<positionSize; i++) {
setBlockFast(nativeWorld, newPositions.get(i), blockData.get(i));
}
//*******************************************
//* 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);
moveTileEntity(nativeWorld, tileHolder.getTilePosition().a(translateVector), tileHolder.getTile());
if (tileHolder.getNextTick() == null)
continue;
final long currentTime = nativeWorld.worldData.getTime();
nativeWorld.getBlockTickList().a(tileHolder.getNextTick().a.a(translateVector), (Block) tileHolder.getNextTick().b(), (int) (tileHolder.getNextTick().b - currentTime), tileHolder.getNextTick().c);
}
//*******************************************
//* Step five: Destroy the leftovers *
//*******************************************
List<BlockPosition> deletePositions = positions;
if (oldNativeWorld == nativeWorld) deletePositions = CollectionUtils.filter(positions,newPositions);
for (int i = 0, deletePositionsSize = deletePositions.size(); i < deletePositionsSize; i++) {
BlockPosition position = deletePositions.get(i);
setBlockFast(oldNativeWorld, position, Blocks.AIR.getBlockData());
}
}

@Nullable
private TileEntity removeTileEntity(@NotNull World world, @NotNull BlockPosition position){
return world.getChunkAtWorldCoords(position).tileEntities.remove(position);
}

@NotNull
private BlockPosition locationToPosition(@NotNull MovecraftLocation loc) {
return new BlockPosition(loc.getX(), loc.getY(), loc.getZ());
}

private void setBlockFast(@NotNull World world, @NotNull BlockPosition position,@NotNull IBlockData data) {
Chunk chunk = world.getChunkAtWorldCoords(position);
ChunkSection chunkSection = chunk.getSections()[position.getY()>>4];
if (chunkSection == null) {
// Put a GLASS block to initialize the section. It will be replaced next with the real block.
chunk.setType(position, Blocks.GLASS.getBlockData(), false);
chunkSection = chunk.getSections()[position.getY() >> 4];
}
if(chunkSection.getType(position.getX()&15, position.getY()&15, position.getZ()&15).equals(data)){
//Block is already of correct type and data, don't overwrite
return;
}

chunkSection.setType(position.getX()&15, position.getY()&15, position.getZ()&15, data);
world.notify(position, data, data, 3);
chunk.markDirty();
}

@Override
public void setBlockFast(@NotNull Location location, @NotNull BlockData data){
setBlockFast(location, Rotation.NONE, data);
}

@Override
public void setBlockFast(@NotNull Location location, @NotNull Rotation rotation, @NotNull BlockData data) {
IBlockData blockData;
if(data instanceof CraftBlockData){
blockData = ((CraftBlockData) data).getState();
} else {
blockData = (IBlockData) data;
}
blockData = blockData.a(ROTATION[rotation.ordinal()]);
World world = ((CraftWorld)(location.getWorld())).getHandle();
BlockPosition blockPosition = locationToPosition(bukkit2MovecraftLoc(location));
setBlockFast(world,blockPosition,blockData);
}

@Override
public void disableShadow(@NotNull Material type) {
// Disabled
}

private static MovecraftLocation bukkit2MovecraftLoc(Location l) {
return new MovecraftLocation(l.getBlockX(), l.getBlockY(), l.getBlockZ());
}

private void moveTileEntity(@NotNull World nativeWorld, @NotNull BlockPosition newPosition, @NotNull TileEntity tile){
Chunk chunk = nativeWorld.getChunkAtWorldCoords(newPosition);
tile.invalidateBlockCache();
tile.setLocation(nativeWorld, newPosition);
if(nativeWorld.captureBlockStates) {
tile.setLocation(nativeWorld, newPosition);
nativeWorld.capturedTileEntities.put(newPosition, tile);
return;
}
chunk.tileEntities.put(newPosition, tile);
}

private class TileHolder{
@NotNull private final TileEntity tile;
@Nullable
private final NextTickListEntry<?> nextTick;
@NotNull private final BlockPosition tilePosition;

public TileHolder(@NotNull TileEntity tile, @Nullable NextTickListEntry<?> nextTick, @NotNull BlockPosition tilePosition){
this.tile = tile;
this.nextTick = nextTick;
this.tilePosition = tilePosition;
}


@NotNull
public TileEntity getTile() {
return tile;
}

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

@NotNull
public BlockPosition getTilePosition() {
return tilePosition;
}
}
}
Loading

0 comments on commit 9158f5a

Please sign in to comment.