Fix compilation

This commit is contained in:
s809
2024-04-01 21:52:25 +05:00
parent 5c13ff8960
commit 696f84a064
6 changed files with 31 additions and 11 deletions
@@ -7,6 +7,7 @@ import net.minecraft.server.dedicated.DedicatedServer;
import java.io.File;
import java.util.List;
import java.util.stream.Collectors;
//@Environment(EnvType.SERVER)
public class MinecraftDedicatedServerWrapper implements IMinecraftSharedWrapper
@@ -34,7 +35,7 @@ public class MinecraftDedicatedServerWrapper implements IMinecraftSharedWrapper
{
return this.dedicatedServer.getPlayerList().getPlayers().stream()
.map(serverPlayer -> (IServerPlayerWrapper) ServerPlayerWrapper.getWrapper(serverPlayer))
.toList();
.collect(Collectors.toList());
}
}
@@ -29,12 +29,14 @@ public class ServerPlayerWrapper implements IServerPlayerWrapper
this.serverPlayer = serverPlayer;
}
@Override public UUID getUUID()
@Override
public UUID getUUID()
{
return this.serverPlayer.getUUID();
}
@Override public IServerLevelWrapper getLevel()
@Override
public IServerLevelWrapper getLevel()
{
#if MC_VER < MC_1_20_1
return ServerLevelWrapper.getWrapper(this.serverPlayer.getLevel());
@@ -43,23 +45,31 @@ public class ServerPlayerWrapper implements IServerPlayerWrapper
#endif
}
@Override public Vec3d getPosition()
@Override
public Vec3d getPosition()
{
Vec3 position = this.serverPlayer.position();
return new Vec3d(position.x, position.y, position.z);
}
@Override public int getViewDistance()
@Override
public int getViewDistance()
{
return this.serverPlayer.server.getPlayerList().getViewDistance();
}
@Override public SocketAddress getRemoteAddress()
@Override
public SocketAddress getRemoteAddress()
{
#if MC_VER >= MC_1_19_4
return this.serverPlayer.connection.getRemoteAddress();
#else // < 1.19.4
return this.serverPlayer.connection.connection.getRemoteAddress();
#endif
}
@Override public Object getWrappedMcObject()
@Override
public Object getWrappedMcObject()
{
return this.serverPlayer;
}
@@ -6,25 +6,27 @@ import com.seibel.distanthorizons.core.wrapperInterfaces.misc.IServerPlayerWrapp
import io.netty.buffer.ByteBuf;
import net.minecraft.network.FriendlyByteBuf;
import net.minecraft.server.level.ServerPlayer;
import net.minecraftforge.network.PacketDistributor;
#if MC_VER >= MC_1_20_2
import net.minecraftforge.network.PacketDistributor;
import net.minecraftforge.network.ChannelBuilder;
import net.minecraftforge.network.SimpleChannel;
import org.apache.commons.lang3.ObjectUtils;
import org.checkerframework.checker.nullness.qual.Nullable;
#elif MC_VER >= MC_1_18_2
import net.minecraftforge.network.PacketDistributor;
import net.minecraftforge.network.NetworkRegistry;
import net.minecraftforge.network.simple.SimpleChannel;
#elif MC_VER >= MC_1_17_1
import net.minecraftforge.fmllegacy.network.NetworkRegistry;
import net.minecraftforge.fmllegacy.network.PacketDistributor;
import net.minecraftforge.fmllegacy.network.simple.SimpleChannel;
#else // < 1.17.1
import net.minecraftforge.fml.network.NetworkRegistry;
import net.minecraftforge.fml.network.simple.SimpleChannel;
import net.minecraftforge.fml.network.PacketDistributor;
#endif
import java.util.Optional;
import java.util.function.BiConsumer;
import java.util.function.Consumer;
+1 -1
View File
@@ -43,7 +43,7 @@ versionStr=
# This defines what MC version Intellij will use for the preprocessor
# and what version is used automatically by build and run commands
mcVer=1.20.4
mcVer=1.17.1
# Defines the maximum amount of memory Minecraft is allowed when run in a developement environment
#minecraftMemoryJavaArg="-Xmx4G"
+7
View File
@@ -16,12 +16,19 @@ for version in $(ls ./versionProperties/); do
result=""
if ./gradlew "$prefix"classes -PmcVer=$version; then
result+="\e[1;32m"
echo -ne "\e[1;32m"
else
result+="\e[1;31m"
echo -ne "\e[1;31m"
fi
result+=$version
result+="\e[0m"
echo "#"
echo "# $version"
echo "#"
echo -e "\e[0m"
completed_builds+=($result)
done