Remove forge versions pre 1.16.5 since they dont work with Java 11. Fixes: #379
This commit is contained in:
parent
1fa8bb5e4c
commit
4cc3774590
|
@ -1,3 +0,0 @@
|
||||||
rootProject.name = "forge-1.14.4"
|
|
||||||
|
|
||||||
includeBuild("../../BlueMapCommon")
|
|
|
@ -1,84 +0,0 @@
|
||||||
/*
|
|
||||||
* This file is part of BlueMap, licensed under the MIT License (MIT).
|
|
||||||
*
|
|
||||||
* Copyright (c) Blue (Lukas Rieger) <https://bluecolored.de>
|
|
||||||
* Copyright (c) contributors
|
|
||||||
*
|
|
||||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
* of this software and associated documentation files (the "Software"), to deal
|
|
||||||
* in the Software without restriction, including without limitation the rights
|
|
||||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
* copies of the Software, and to permit persons to whom the Software is
|
|
||||||
* furnished to do so, subject to the following conditions:
|
|
||||||
*
|
|
||||||
* The above copyright notice and this permission notice shall be included in
|
|
||||||
* all copies or substantial portions of the Software.
|
|
||||||
*
|
|
||||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
||||||
* THE SOFTWARE.
|
|
||||||
*/
|
|
||||||
package de.bluecolored.bluemap.forge;
|
|
||||||
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.util.Optional;
|
|
||||||
|
|
||||||
import com.flowpowered.math.vector.Vector3d;
|
|
||||||
|
|
||||||
import de.bluecolored.bluemap.common.plugin.Plugin;
|
|
||||||
import de.bluecolored.bluemap.common.serverinterface.CommandSource;
|
|
||||||
import de.bluecolored.bluemap.common.plugin.text.Text;
|
|
||||||
import de.bluecolored.bluemap.core.world.World;
|
|
||||||
import net.minecraft.util.math.Vec3d;
|
|
||||||
import net.minecraft.util.text.ITextComponent;
|
|
||||||
|
|
||||||
public class ForgeCommandSource implements CommandSource {
|
|
||||||
|
|
||||||
private final ForgeMod mod;
|
|
||||||
private final Plugin plugin;
|
|
||||||
private final net.minecraft.command.CommandSource delegate;
|
|
||||||
|
|
||||||
public ForgeCommandSource(ForgeMod mod, Plugin plugin, net.minecraft.command.CommandSource delegate) {
|
|
||||||
this.mod = mod;
|
|
||||||
this.plugin = plugin;
|
|
||||||
this.delegate = delegate;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void sendMessage(Text text) {
|
|
||||||
var component = ITextComponent.Serializer.fromJson(text.toJSONString());
|
|
||||||
if (component != null)
|
|
||||||
delegate.sendFeedback(component, false);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean hasPermission(String permission) {
|
|
||||||
return delegate.hasPermissionLevel(1);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Optional<Vector3d> getPosition() {
|
|
||||||
Vec3d pos = delegate.getPos();
|
|
||||||
if (pos != null) {
|
|
||||||
return Optional.of(new Vector3d(pos.x, pos.y, pos.z));
|
|
||||||
}
|
|
||||||
|
|
||||||
return Optional.empty();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Optional<World> getWorld() {
|
|
||||||
try {
|
|
||||||
var serverWorld = mod.getWorld(delegate.getWorld());
|
|
||||||
String worldId = plugin.getBlueMap().getWorldId(serverWorld.getSaveFolder());
|
|
||||||
return Optional.ofNullable(plugin.getWorlds().get(worldId));
|
|
||||||
} catch (IOException ignore) {}
|
|
||||||
|
|
||||||
return Optional.empty();
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
|
@ -1,264 +0,0 @@
|
||||||
/*
|
|
||||||
* This file is part of BlueMap, licensed under the MIT License (MIT).
|
|
||||||
*
|
|
||||||
* Copyright (c) Blue (Lukas Rieger) <https://bluecolored.de>
|
|
||||||
* Copyright (c) contributors
|
|
||||||
*
|
|
||||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
* of this software and associated documentation files (the "Software"), to deal
|
|
||||||
* in the Software without restriction, including without limitation the rights
|
|
||||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
* copies of the Software, and to permit persons to whom the Software is
|
|
||||||
* furnished to do so, subject to the following conditions:
|
|
||||||
*
|
|
||||||
* The above copyright notice and this permission notice shall be included in
|
|
||||||
* all copies or substantial portions of the Software.
|
|
||||||
*
|
|
||||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
||||||
* THE SOFTWARE.
|
|
||||||
*/
|
|
||||||
package de.bluecolored.bluemap.forge;
|
|
||||||
|
|
||||||
import com.github.benmanes.caffeine.cache.Caffeine;
|
|
||||||
import com.github.benmanes.caffeine.cache.LoadingCache;
|
|
||||||
import de.bluecolored.bluemap.common.plugin.Plugin;
|
|
||||||
import de.bluecolored.bluemap.common.plugin.commands.Commands;
|
|
||||||
import de.bluecolored.bluemap.common.serverinterface.Player;
|
|
||||||
import de.bluecolored.bluemap.common.serverinterface.ServerEventListener;
|
|
||||||
import de.bluecolored.bluemap.common.serverinterface.ServerInterface;
|
|
||||||
import de.bluecolored.bluemap.common.serverinterface.ServerWorld;
|
|
||||||
import de.bluecolored.bluemap.core.BlueMap;
|
|
||||||
import de.bluecolored.bluemap.core.MinecraftVersion;
|
|
||||||
import de.bluecolored.bluemap.core.logger.Logger;
|
|
||||||
import net.minecraft.entity.player.PlayerEntity;
|
|
||||||
import net.minecraft.entity.player.ServerPlayerEntity;
|
|
||||||
import net.minecraft.server.MinecraftServer;
|
|
||||||
import net.minecraft.util.ResourceLocation;
|
|
||||||
import net.minecraft.world.dimension.DimensionType;
|
|
||||||
import net.minecraftforge.common.MinecraftForge;
|
|
||||||
import net.minecraftforge.event.TickEvent.ServerTickEvent;
|
|
||||||
import net.minecraftforge.event.entity.player.PlayerEvent.PlayerLoggedInEvent;
|
|
||||||
import net.minecraftforge.event.entity.player.PlayerEvent.PlayerLoggedOutEvent;
|
|
||||||
import net.minecraftforge.eventbus.api.SubscribeEvent;
|
|
||||||
import net.minecraftforge.fml.ExtensionPoint;
|
|
||||||
import net.minecraftforge.fml.ModLoadingContext;
|
|
||||||
import net.minecraftforge.fml.common.Mod;
|
|
||||||
import net.minecraftforge.fml.event.server.FMLServerStartedEvent;
|
|
||||||
import net.minecraftforge.fml.event.server.FMLServerStartingEvent;
|
|
||||||
import net.minecraftforge.fml.event.server.FMLServerStoppingEvent;
|
|
||||||
import net.minecraftforge.fml.network.FMLNetworkConstants;
|
|
||||||
import org.apache.commons.lang3.tuple.Pair;
|
|
||||||
import org.apache.logging.log4j.LogManager;
|
|
||||||
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.nio.file.Path;
|
|
||||||
import java.util.*;
|
|
||||||
import java.util.concurrent.ConcurrentHashMap;
|
|
||||||
|
|
||||||
@Mod(Plugin.PLUGIN_ID)
|
|
||||||
public class ForgeMod implements ServerInterface {
|
|
||||||
|
|
||||||
private final Plugin pluginInstance;
|
|
||||||
private MinecraftServer serverInstance = null;
|
|
||||||
|
|
||||||
private final ForgeEventForwarder eventForwarder;
|
|
||||||
private final LoadingCache<net.minecraft.world.server.ServerWorld, ServerWorld> worlds;
|
|
||||||
|
|
||||||
private int playerUpdateIndex = 0;
|
|
||||||
private final Map<UUID, Player> onlinePlayerMap;
|
|
||||||
private final List<ForgePlayer> onlinePlayerList;
|
|
||||||
|
|
||||||
public ForgeMod() {
|
|
||||||
Logger.global = new Log4jLogger(LogManager.getLogger(Plugin.PLUGIN_NAME));
|
|
||||||
|
|
||||||
this.onlinePlayerMap = new ConcurrentHashMap<>();
|
|
||||||
this.onlinePlayerList = Collections.synchronizedList(new ArrayList<>());
|
|
||||||
|
|
||||||
this.pluginInstance = new Plugin("forge-1.14.4", this);
|
|
||||||
|
|
||||||
this.eventForwarder = new ForgeEventForwarder();
|
|
||||||
this.worlds = Caffeine.newBuilder()
|
|
||||||
.executor(BlueMap.THREAD_POOL)
|
|
||||||
.weakKeys()
|
|
||||||
.maximumSize(1000)
|
|
||||||
.build(ForgeWorld::new);
|
|
||||||
|
|
||||||
MinecraftForge.EVENT_BUS.register(this);
|
|
||||||
|
|
||||||
//Make sure the mod being absent on the other network side does not cause the client to display the server as incompatible
|
|
||||||
ModLoadingContext.get().registerExtensionPoint(ExtensionPoint.DISPLAYTEST, () -> Pair.of(() -> FMLNetworkConstants.IGNORESERVERONLY, (a, b) -> true));
|
|
||||||
}
|
|
||||||
|
|
||||||
@SubscribeEvent
|
|
||||||
public void onServerStarting(FMLServerStartingEvent event) {
|
|
||||||
this.serverInstance = event.getServer();
|
|
||||||
|
|
||||||
//register commands
|
|
||||||
new Commands<>(pluginInstance, event.getServer().getCommandManager().getDispatcher(), forgeSource ->
|
|
||||||
new ForgeCommandSource(this, pluginInstance, forgeSource)
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
@SubscribeEvent
|
|
||||||
public void onServerStarted(FMLServerStartedEvent event) {
|
|
||||||
//save worlds to generate level.dat files
|
|
||||||
serverInstance.save(false, true, true);
|
|
||||||
|
|
||||||
new Thread(() -> {
|
|
||||||
Logger.global.logInfo("Loading...");
|
|
||||||
|
|
||||||
try {
|
|
||||||
pluginInstance.load();
|
|
||||||
if (pluginInstance.isLoaded()) Logger.global.logInfo("Loaded!");
|
|
||||||
} catch (IOException e) {
|
|
||||||
Logger.global.logError("Failed to load bluemap!", e);
|
|
||||||
pluginInstance.unload();
|
|
||||||
}
|
|
||||||
}, "BlueMap-Plugin-Loading").start();
|
|
||||||
}
|
|
||||||
|
|
||||||
@SubscribeEvent
|
|
||||||
public void onServerStopping(FMLServerStoppingEvent event) {
|
|
||||||
pluginInstance.unload();
|
|
||||||
Logger.global.logInfo("BlueMap unloaded!");
|
|
||||||
}
|
|
||||||
|
|
||||||
@SubscribeEvent
|
|
||||||
public void onTick(ServerTickEvent evt) {
|
|
||||||
updateSomePlayers();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public MinecraftVersion getMinecraftVersion() {
|
|
||||||
return new MinecraftVersion(1, 14, 4);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void registerListener(ServerEventListener listener) {
|
|
||||||
eventForwarder.addEventListener(listener);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void unregisterAllListeners() {
|
|
||||||
eventForwarder.removeAllListeners();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Collection<ServerWorld> getLoadedWorlds() {
|
|
||||||
Collection<ServerWorld> loadedWorlds = new ArrayList<>(3);
|
|
||||||
for (net.minecraft.world.server.ServerWorld serverWorld : serverInstance.getWorlds()) {
|
|
||||||
loadedWorlds.add(worlds.get(serverWorld));
|
|
||||||
}
|
|
||||||
return loadedWorlds;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Optional<ServerWorld> getWorld(Object world) {
|
|
||||||
if (world instanceof Path)
|
|
||||||
return getWorld((Path) world);
|
|
||||||
|
|
||||||
if (world instanceof String) {
|
|
||||||
ResourceLocation resourceLocation = ResourceLocation.tryCreate((String) world);
|
|
||||||
DimensionType dimensionType = null;
|
|
||||||
if (resourceLocation != null) dimensionType = DimensionType.byName(resourceLocation);
|
|
||||||
if (dimensionType != null) world = serverInstance.getWorld(dimensionType);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (world instanceof ResourceLocation) {
|
|
||||||
DimensionType dimensionType = DimensionType.byName((ResourceLocation) world);
|
|
||||||
if (dimensionType != null) world = dimensionType;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (world instanceof DimensionType) {
|
|
||||||
var serverWorld = serverInstance.getWorld((DimensionType) world);
|
|
||||||
//noinspection ConstantConditions
|
|
||||||
if (serverWorld != null) world = serverWorld;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (world instanceof net.minecraft.world.server.ServerWorld)
|
|
||||||
return Optional.of(getWorld((net.minecraft.world.server.ServerWorld) world));
|
|
||||||
|
|
||||||
return Optional.empty();
|
|
||||||
}
|
|
||||||
|
|
||||||
public ServerWorld getWorld(net.minecraft.world.server.ServerWorld world) {
|
|
||||||
return worlds.get(world);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Path getConfigFolder() {
|
|
||||||
return Path.of("config", "bluemap");
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Optional<Path> getModsFolder() {
|
|
||||||
return Optional.of(Path.of("mods"));
|
|
||||||
}
|
|
||||||
|
|
||||||
@SubscribeEvent
|
|
||||||
public void onPlayerJoin(PlayerLoggedInEvent evt) {
|
|
||||||
PlayerEntity playerInstance = evt.getPlayer();
|
|
||||||
if (!(playerInstance instanceof ServerPlayerEntity)) return;
|
|
||||||
|
|
||||||
ForgePlayer player = new ForgePlayer(playerInstance.getUniqueID(), this);
|
|
||||||
onlinePlayerMap.put(player.getUuid(), player);
|
|
||||||
onlinePlayerList.add(player);
|
|
||||||
}
|
|
||||||
|
|
||||||
@SubscribeEvent
|
|
||||||
public void onPlayerLeave(PlayerLoggedOutEvent evt) {
|
|
||||||
PlayerEntity player = evt.getPlayer();
|
|
||||||
if (!(player instanceof ServerPlayerEntity)) return;
|
|
||||||
|
|
||||||
UUID playerUUID = player.getUniqueID();
|
|
||||||
onlinePlayerMap.remove(playerUUID);
|
|
||||||
synchronized (onlinePlayerList) {
|
|
||||||
onlinePlayerList.removeIf(p -> p.getUuid().equals(playerUUID));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public MinecraftServer getServer() {
|
|
||||||
return this.serverInstance;
|
|
||||||
}
|
|
||||||
|
|
||||||
public Plugin getPlugin() {
|
|
||||||
return this.pluginInstance;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Collection<Player> getOnlinePlayers() {
|
|
||||||
return onlinePlayerMap.values();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Optional<Player> getPlayer(UUID uuid) {
|
|
||||||
return Optional.ofNullable(onlinePlayerMap.get(uuid));
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Only update some of the online players each tick to minimize performance impact on the server-thread.
|
|
||||||
* Only call this method on the server-thread.
|
|
||||||
*/
|
|
||||||
private void updateSomePlayers() {
|
|
||||||
int onlinePlayerCount = onlinePlayerList.size();
|
|
||||||
if (onlinePlayerCount == 0) return;
|
|
||||||
|
|
||||||
int playersToBeUpdated = onlinePlayerCount / 20; //with 20 tps, each player is updated once a second
|
|
||||||
if (playersToBeUpdated == 0) playersToBeUpdated = 1;
|
|
||||||
|
|
||||||
for (int i = 0; i < playersToBeUpdated; i++) {
|
|
||||||
playerUpdateIndex++;
|
|
||||||
if (playerUpdateIndex >= 20 && playerUpdateIndex >= onlinePlayerCount) playerUpdateIndex = 0;
|
|
||||||
|
|
||||||
if (playerUpdateIndex < onlinePlayerCount) {
|
|
||||||
onlinePlayerList.get(playerUpdateIndex).update();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
|
@ -1,172 +0,0 @@
|
||||||
/*
|
|
||||||
* This file is part of BlueMap, licensed under the MIT License (MIT).
|
|
||||||
*
|
|
||||||
* Copyright (c) Blue (Lukas Rieger) <https://bluecolored.de>
|
|
||||||
* Copyright (c) contributors
|
|
||||||
*
|
|
||||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
* of this software and associated documentation files (the "Software"), to deal
|
|
||||||
* in the Software without restriction, including without limitation the rights
|
|
||||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
* copies of the Software, and to permit persons to whom the Software is
|
|
||||||
* furnished to do so, subject to the following conditions:
|
|
||||||
*
|
|
||||||
* The above copyright notice and this permission notice shall be included in
|
|
||||||
* all copies or substantial portions of the Software.
|
|
||||||
*
|
|
||||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
||||||
* THE SOFTWARE.
|
|
||||||
*/
|
|
||||||
package de.bluecolored.bluemap.forge;
|
|
||||||
|
|
||||||
import com.flowpowered.math.vector.Vector3d;
|
|
||||||
import de.bluecolored.bluemap.common.plugin.text.Text;
|
|
||||||
import de.bluecolored.bluemap.common.serverinterface.Gamemode;
|
|
||||||
import de.bluecolored.bluemap.common.serverinterface.Player;
|
|
||||||
import net.minecraft.entity.player.ServerPlayerEntity;
|
|
||||||
import net.minecraft.potion.EffectInstance;
|
|
||||||
import net.minecraft.potion.Effects;
|
|
||||||
import net.minecraft.server.MinecraftServer;
|
|
||||||
import net.minecraft.util.math.Vec3d;
|
|
||||||
import net.minecraft.world.GameType;
|
|
||||||
import net.minecraft.world.LightType;
|
|
||||||
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.util.EnumMap;
|
|
||||||
import java.util.Map;
|
|
||||||
import java.util.UUID;
|
|
||||||
|
|
||||||
public class ForgePlayer implements Player {
|
|
||||||
|
|
||||||
private static final Map<GameType, Gamemode> GAMEMODE_MAP = new EnumMap<>(GameType.class);
|
|
||||||
static {
|
|
||||||
GAMEMODE_MAP.put(GameType.ADVENTURE, Gamemode.ADVENTURE);
|
|
||||||
GAMEMODE_MAP.put(GameType.SURVIVAL, Gamemode.SURVIVAL);
|
|
||||||
GAMEMODE_MAP.put(GameType.CREATIVE, Gamemode.CREATIVE);
|
|
||||||
GAMEMODE_MAP.put(GameType.SPECTATOR, Gamemode.SPECTATOR);
|
|
||||||
GAMEMODE_MAP.put(GameType.NOT_SET, Gamemode.SURVIVAL);
|
|
||||||
}
|
|
||||||
|
|
||||||
private final UUID uuid;
|
|
||||||
private Text name;
|
|
||||||
private String world;
|
|
||||||
private Vector3d position;
|
|
||||||
private Vector3d rotation;
|
|
||||||
private int skyLight;
|
|
||||||
private int blockLight;
|
|
||||||
private boolean online;
|
|
||||||
private boolean sneaking;
|
|
||||||
private boolean invisible;
|
|
||||||
private Gamemode gamemode;
|
|
||||||
|
|
||||||
private final ForgeMod mod;
|
|
||||||
|
|
||||||
public ForgePlayer(UUID playerUuid, ForgeMod mod) {
|
|
||||||
this.uuid = playerUuid;
|
|
||||||
this.mod = mod;
|
|
||||||
|
|
||||||
update();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public UUID getUuid() {
|
|
||||||
return this.uuid;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Text getName() {
|
|
||||||
return this.name;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getWorld() {
|
|
||||||
return this.world;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Vector3d getPosition() {
|
|
||||||
return this.position;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Vector3d getRotation() {
|
|
||||||
return rotation;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public int getSkyLight() {
|
|
||||||
return skyLight;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public int getBlockLight() {
|
|
||||||
return blockLight;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isOnline() {
|
|
||||||
return this.online;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isSneaking() {
|
|
||||||
return this.sneaking;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isInvisible() {
|
|
||||||
return this.invisible;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Gamemode getGamemode() {
|
|
||||||
return this.gamemode;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Only call on server thread!
|
|
||||||
*/
|
|
||||||
public void update() {
|
|
||||||
MinecraftServer server = mod.getServer();
|
|
||||||
if (server == null) {
|
|
||||||
this.online = false;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
ServerPlayerEntity player = server.getPlayerList().getPlayerByUUID(uuid);
|
|
||||||
if (player == null) {
|
|
||||||
this.online = false;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
this.gamemode = GAMEMODE_MAP.get(player.interactionManager.getGameType());
|
|
||||||
if (this.gamemode == null) this.gamemode = Gamemode.SURVIVAL;
|
|
||||||
|
|
||||||
EffectInstance invis = player.getActivePotionEffect(Effects.INVISIBILITY);
|
|
||||||
this.invisible = invis != null && invis.getDuration() > 0;
|
|
||||||
|
|
||||||
this.name = Text.of(player.getName().getString());
|
|
||||||
this.online = true;
|
|
||||||
|
|
||||||
Vec3d pos = player.getPositionVec();
|
|
||||||
this.position = new Vector3d(pos.getX(), pos.getY(), pos.getZ());
|
|
||||||
this.rotation = new Vector3d(player.rotationPitch, player.rotationYawHead, 0);
|
|
||||||
this.sneaking = player.isSneaking();
|
|
||||||
|
|
||||||
this.skyLight = player.getServerWorld().getChunkProvider().getLightManager().getLightEngine(LightType.SKY).getLightFor(player.getPosition());
|
|
||||||
this.blockLight = player.getServerWorld().getChunkProvider().getLightManager().getLightEngine(LightType.BLOCK).getLightFor(player.getPosition());
|
|
||||||
|
|
||||||
try {
|
|
||||||
var world = mod.getWorld(player.getServerWorld());
|
|
||||||
this.world = mod.getPlugin().getBlueMap().getWorldId(world.getSaveFolder());
|
|
||||||
} catch (IOException | NullPointerException e) { // NullPointerException -> the plugin isn't fully loaded
|
|
||||||
this.world = "unknown";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
|
@ -1,99 +0,0 @@
|
||||||
/*
|
|
||||||
* This file is part of BlueMap, licensed under the MIT License (MIT).
|
|
||||||
*
|
|
||||||
* Copyright (c) Blue (Lukas Rieger) <https://bluecolored.de>
|
|
||||||
* Copyright (c) contributors
|
|
||||||
*
|
|
||||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
* of this software and associated documentation files (the "Software"), to deal
|
|
||||||
* in the Software without restriction, including without limitation the rights
|
|
||||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
* copies of the Software, and to permit persons to whom the Software is
|
|
||||||
* furnished to do so, subject to the following conditions:
|
|
||||||
*
|
|
||||||
* The above copyright notice and this permission notice shall be included in
|
|
||||||
* all copies or substantial portions of the Software.
|
|
||||||
*
|
|
||||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
||||||
* THE SOFTWARE.
|
|
||||||
*/
|
|
||||||
package de.bluecolored.bluemap.forge;
|
|
||||||
|
|
||||||
import de.bluecolored.bluemap.common.serverinterface.Dimension;
|
|
||||||
import de.bluecolored.bluemap.common.serverinterface.ServerWorld;
|
|
||||||
import net.minecraft.world.dimension.DimensionType;
|
|
||||||
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.lang.ref.WeakReference;
|
|
||||||
import java.nio.file.Path;
|
|
||||||
import java.util.concurrent.CompletableFuture;
|
|
||||||
import java.util.concurrent.CompletionException;
|
|
||||||
import java.util.concurrent.ExecutionException;
|
|
||||||
|
|
||||||
public class ForgeWorld implements ServerWorld {
|
|
||||||
|
|
||||||
private final WeakReference<net.minecraft.world.server.ServerWorld> delegate;
|
|
||||||
private final Path saveFolder;
|
|
||||||
|
|
||||||
public ForgeWorld(net.minecraft.world.server.ServerWorld delegate) {
|
|
||||||
this.delegate = new WeakReference<>(delegate);
|
|
||||||
|
|
||||||
Path saveFolder = delegate.getSaveHandler().getWorldDirectory().toPath();
|
|
||||||
int dimensionId = delegate.getDimension().getType().getId();
|
|
||||||
if (dimensionId != 0) {
|
|
||||||
saveFolder = saveFolder.resolve("DIM" + dimensionId);
|
|
||||||
}
|
|
||||||
|
|
||||||
this.saveFolder = saveFolder;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Dimension getDimension() {
|
|
||||||
net.minecraft.world.server.ServerWorld world = delegate.get();
|
|
||||||
if (world != null) {
|
|
||||||
if (world.getDimension().getType().equals(DimensionType.THE_NETHER)) return Dimension.NETHER;
|
|
||||||
if (world.getDimension().getType().equals(DimensionType.THE_END)) return Dimension.END;
|
|
||||||
if (world.getDimension().getType().equals(DimensionType.OVERWORLD)) return Dimension.OVERWORLD;
|
|
||||||
}
|
|
||||||
|
|
||||||
return ServerWorld.super.getDimension();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean persistWorldChanges() throws IOException {
|
|
||||||
net.minecraft.world.server.ServerWorld world = delegate.get();
|
|
||||||
if (world == null) return false;
|
|
||||||
|
|
||||||
var taskResult = CompletableFuture.supplyAsync(() -> {
|
|
||||||
try {
|
|
||||||
world.save(null, true, false);
|
|
||||||
return true;
|
|
||||||
} catch (Exception e) {
|
|
||||||
throw new CompletionException(e);
|
|
||||||
}
|
|
||||||
}, world.getServer());
|
|
||||||
|
|
||||||
try {
|
|
||||||
return taskResult.get();
|
|
||||||
} catch (InterruptedException e) {
|
|
||||||
Thread.currentThread().interrupt();
|
|
||||||
throw new IOException(e);
|
|
||||||
} catch (ExecutionException e) {
|
|
||||||
Throwable t = e.getCause();
|
|
||||||
if (t instanceof IOException) throw (IOException) t;
|
|
||||||
if (t instanceof IllegalArgumentException) throw (IllegalArgumentException) t;
|
|
||||||
throw new IOException(t);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Path getSaveFolder() {
|
|
||||||
return this.saveFolder;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
|
@ -1,26 +0,0 @@
|
||||||
modLoader="javafml"
|
|
||||||
loaderVersion="[28,)"
|
|
||||||
license="MIT"
|
|
||||||
issueTrackerURL="https://github.com/BlueMap-Minecraft/BlueMap/issues"
|
|
||||||
[[mods]]
|
|
||||||
modId="bluemap"
|
|
||||||
version="${version}"
|
|
||||||
displayName="BlueMap"
|
|
||||||
displayURL="https://github.com/BlueMap-Minecraft/BlueMap"
|
|
||||||
authors="Blue (TBlueF, Lukas Rieger)"
|
|
||||||
description='''
|
|
||||||
A 3d-map of your Minecraft worlds view-able in your browser using three.js (WebGL)
|
|
||||||
'''
|
|
||||||
|
|
||||||
[[dependencies.bluemap]]
|
|
||||||
modId="forge"
|
|
||||||
mandatory=true
|
|
||||||
versionRange="[28,)"
|
|
||||||
ordering="NONE"
|
|
||||||
side="SERVER"
|
|
||||||
[[dependencies.bluemap]]
|
|
||||||
modId="minecraft"
|
|
||||||
mandatory=true
|
|
||||||
versionRange="[1.14.4]"
|
|
||||||
ordering="NONE"
|
|
||||||
side="SERVER"
|
|
|
@ -1,213 +0,0 @@
|
||||||
buildscript {
|
|
||||||
repositories {
|
|
||||||
// These repositories are only for Gradle plugins, put any other repositories in the repository block further below
|
|
||||||
maven { url = 'https://maven.minecraftforge.net' }
|
|
||||||
mavenCentral()
|
|
||||||
}
|
|
||||||
dependencies {
|
|
||||||
classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.0.9', changing: true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
plugins {
|
|
||||||
id "java"
|
|
||||||
id "java-library"
|
|
||||||
id "com.diffplug.spotless" version "6.1.2"
|
|
||||||
id "com.github.node-gradle.node" version "3.0.1"
|
|
||||||
id "com.github.johnrengelman.shadow" version "7.1.2"
|
|
||||||
id "com.modrinth.minotaur" version "2.+"
|
|
||||||
id "com.matthewprenger.cursegradle" version "1.4.0"
|
|
||||||
}
|
|
||||||
|
|
||||||
apply plugin: "net.minecraftforge.gradle"
|
|
||||||
|
|
||||||
group = "de.bluecolored.bluemap.forge"
|
|
||||||
version = System.getProperty("bluemap.version") ?: "?" // set by BlueMapCore
|
|
||||||
archivesBaseName = 'bluemap'
|
|
||||||
|
|
||||||
def javaTarget = 11
|
|
||||||
java {
|
|
||||||
sourceCompatibility = JavaVersion.toVersion(javaTarget)
|
|
||||||
targetCompatibility = JavaVersion.toVersion(javaTarget)
|
|
||||||
}
|
|
||||||
|
|
||||||
minecraft {
|
|
||||||
mappings channel: 'snapshot', version: '20190719-1.14.3'
|
|
||||||
|
|
||||||
runs {
|
|
||||||
server {
|
|
||||||
workingDirectory project.file('run')
|
|
||||||
property 'forge.logging.markers', 'REGISTRIES'
|
|
||||||
property 'forge.logging.console.level', 'debug'
|
|
||||||
|
|
||||||
mods {
|
|
||||||
bluemap {
|
|
||||||
source sourceSets.main
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
sourceSets.main.resources { srcDir 'src/generated/resources' }
|
|
||||||
|
|
||||||
repositories {
|
|
||||||
mavenCentral()
|
|
||||||
maven {
|
|
||||||
setUrl("https://libraries.minecraft.net")
|
|
||||||
}
|
|
||||||
maven {
|
|
||||||
setUrl("https://jitpack.io")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
configurations {
|
|
||||||
implementation.extendsFrom(shadowInclude)
|
|
||||||
}
|
|
||||||
|
|
||||||
dependencies {
|
|
||||||
minecraft 'net.minecraftforge:forge:1.15.2-31.2.0'
|
|
||||||
|
|
||||||
shadowInclude ("de.bluecolored.bluemap.common:BlueMapCommon") {
|
|
||||||
//exclude dependencies provided by forge
|
|
||||||
exclude (group: "com.google.guava", module: "guava")
|
|
||||||
exclude (group: "com.google.code.gson", module: "gson")
|
|
||||||
exclude (group: "org.apache.commons", module: "commons-lang3")
|
|
||||||
exclude (group: "commons-io", module: "commons-io")
|
|
||||||
exclude (group: "com.mojang", module: "brigadier")
|
|
||||||
}
|
|
||||||
|
|
||||||
testImplementation ("org.junit.jupiter:junit-jupiter:5.8.2")
|
|
||||||
testRuntimeOnly ("org.junit.jupiter:junit-jupiter-engine:5.8.2")
|
|
||||||
}
|
|
||||||
|
|
||||||
spotless {
|
|
||||||
java {
|
|
||||||
target ("src/*/java/**/*.java")
|
|
||||||
|
|
||||||
licenseHeaderFile("../../HEADER")
|
|
||||||
indentWithSpaces()
|
|
||||||
trimTrailingWhitespace()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
jar {
|
|
||||||
manifest {
|
|
||||||
attributes([
|
|
||||||
"Specification-Title" : "bluemap",
|
|
||||||
"Specification-Vendor" : "bluemap",
|
|
||||||
"Specification-Version" : "1", // We are version 1 of ourselves
|
|
||||||
"Implementation-Title" : project.name,
|
|
||||||
"Implementation-Version" : project.jar.archiveVersion,
|
|
||||||
"Implementation-Vendor" : "bluemap",
|
|
||||||
"Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")
|
|
||||||
])
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
jar.finalizedBy('reobfJar')
|
|
||||||
|
|
||||||
tasks.withType(JavaCompile).configureEach {
|
|
||||||
options.encoding = "utf-8"
|
|
||||||
}
|
|
||||||
|
|
||||||
tasks.withType(AbstractArchiveTask).configureEach {
|
|
||||||
setReproducibleFileOrder(true)
|
|
||||||
setPreserveFileTimestamps(false)
|
|
||||||
}
|
|
||||||
|
|
||||||
test {
|
|
||||||
useJUnitPlatform()
|
|
||||||
}
|
|
||||||
|
|
||||||
shadowJar {
|
|
||||||
destinationDirectory.set(file("../../build/release"))
|
|
||||||
archiveFileName.set("BlueMap-${project.version}-${project.name}.jar")
|
|
||||||
|
|
||||||
configurations = [project.configurations.shadowInclude]
|
|
||||||
|
|
||||||
//relocate ("com.flowpowered.math", "de.bluecolored.shadow.flowpowered.math") //DON"T relocate this, because the API depends on it
|
|
||||||
relocate ("com.typesafe.config", "de.bluecolored.shadow.typesafe.config")
|
|
||||||
relocate ("net.querz.nbt", "de.bluecolored.shadow.querz.nbt")
|
|
||||||
relocate ("org.spongepowered.configurate", "de.bluecolored.shadow.configurate")
|
|
||||||
relocate ("com.github.benmanes.caffeine", "de.bluecolored.shadow.benmanes.caffeine")
|
|
||||||
relocate ("org.aopalliance", "de.bluecolored.shadow.aopalliance")
|
|
||||||
relocate ("javax.inject", "de.bluecolored.shadow.javax.inject")
|
|
||||||
relocate ("org.checkerframework", "de.bluecolored.shadow.checkerframework")
|
|
||||||
relocate ("org.codehaus", "de.bluecolored.shadow.codehaus")
|
|
||||||
relocate ("io.leangen.geantyref", "de.bluecolored.shadow.geantyref")
|
|
||||||
|
|
||||||
relocate ("com.google.errorprone", "de.bluecolored.shadow.google.errorprone")
|
|
||||||
relocate ("com.google.inject", "de.bluecolored.shadow.google.inject")
|
|
||||||
|
|
||||||
relocate ("org.apache.commons.dbcp2", "de.bluecolored.shadow.apache.commons.dbcp2")
|
|
||||||
relocate ("org.apache.commons.logging", "de.bluecolored.shadow.apache.commons.logging")
|
|
||||||
relocate ("org.apache.commons.pool2", "de.bluecolored.shadow.apache.commons.pool2")
|
|
||||||
}
|
|
||||||
|
|
||||||
processResources {
|
|
||||||
from(sourceSets.main.resources.srcDirs) {
|
|
||||||
include 'mcmod.info','META-INF/mods.toml'
|
|
||||||
duplicatesStrategy = DuplicatesStrategy.WARN
|
|
||||||
|
|
||||||
expand (
|
|
||||||
version: project.version
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
afterEvaluate {
|
|
||||||
reobf {
|
|
||||||
shadowJar {
|
|
||||||
mappings = createMcpToSrg.output
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
task release {
|
|
||||||
dependsOn(build)
|
|
||||||
}
|
|
||||||
|
|
||||||
modrinth {
|
|
||||||
token = System.getenv("MODRINTH_TOKEN")
|
|
||||||
projectId = "swbUV1cr"
|
|
||||||
versionNumber = "${project.version}-${project.name}"
|
|
||||||
changelog = "Releasenotes and Changelog:\nhttps://github.com/BlueMap-Minecraft/BlueMap/releases/tag/v${project.version}"
|
|
||||||
uploadFile = shadowJar
|
|
||||||
gameVersions = ["1.15.2"]
|
|
||||||
}
|
|
||||||
|
|
||||||
curseforge {
|
|
||||||
apiKey = System.getenv("CURSEFORGE_TOKEN") ?: ""
|
|
||||||
project {
|
|
||||||
id = "406463"
|
|
||||||
changelogType = "markdown"
|
|
||||||
changelog = "**Releasenotes and Changelog:**\n\nhttps://github.com/BlueMap-Minecraft/BlueMap/releases/tag/v${project.version}"
|
|
||||||
releaseType = "release"
|
|
||||||
|
|
||||||
addGameVersion "Forge"
|
|
||||||
|
|
||||||
addGameVersion "Java 18"
|
|
||||||
addGameVersion "Java 17"
|
|
||||||
addGameVersion "Java 16"
|
|
||||||
addGameVersion "Java 15"
|
|
||||||
addGameVersion "Java 14"
|
|
||||||
addGameVersion "Java 13"
|
|
||||||
addGameVersion "Java 12"
|
|
||||||
addGameVersion "Java 11"
|
|
||||||
|
|
||||||
addGameVersion "1.15.2"
|
|
||||||
|
|
||||||
mainArtifact shadowJar
|
|
||||||
}
|
|
||||||
options {
|
|
||||||
javaVersionAutoDetect = false
|
|
||||||
javaIntegration = false
|
|
||||||
forgeGradleIntegration = false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
task publish {
|
|
||||||
dependsOn(tasks.findByName("modrinth"))
|
|
||||||
dependsOn(tasks.findByName("curseforge"))
|
|
||||||
}
|
|
Binary file not shown.
|
@ -1,5 +0,0 @@
|
||||||
distributionBase=GRADLE_USER_HOME
|
|
||||||
distributionPath=wrapper/dists
|
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
|
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
|
||||||
zipStorePath=wrapper/dists
|
|
|
@ -1,234 +0,0 @@
|
||||||
#!/bin/sh
|
|
||||||
|
|
||||||
#
|
|
||||||
# Copyright © 2015-2021 the original authors.
|
|
||||||
#
|
|
||||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
# you may not use this file except in compliance with the License.
|
|
||||||
# You may obtain a copy of the License at
|
|
||||||
#
|
|
||||||
# https://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
#
|
|
||||||
# Unless required by applicable law or agreed to in writing, software
|
|
||||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
# See the License for the specific language governing permissions and
|
|
||||||
# limitations under the License.
|
|
||||||
#
|
|
||||||
|
|
||||||
##############################################################################
|
|
||||||
#
|
|
||||||
# Gradle start up script for POSIX generated by Gradle.
|
|
||||||
#
|
|
||||||
# Important for running:
|
|
||||||
#
|
|
||||||
# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
|
|
||||||
# noncompliant, but you have some other compliant shell such as ksh or
|
|
||||||
# bash, then to run this script, type that shell name before the whole
|
|
||||||
# command line, like:
|
|
||||||
#
|
|
||||||
# ksh Gradle
|
|
||||||
#
|
|
||||||
# Busybox and similar reduced shells will NOT work, because this script
|
|
||||||
# requires all of these POSIX shell features:
|
|
||||||
# * functions;
|
|
||||||
# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
|
|
||||||
# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
|
|
||||||
# * compound commands having a testable exit status, especially «case»;
|
|
||||||
# * various built-in commands including «command», «set», and «ulimit».
|
|
||||||
#
|
|
||||||
# Important for patching:
|
|
||||||
#
|
|
||||||
# (2) This script targets any POSIX shell, so it avoids extensions provided
|
|
||||||
# by Bash, Ksh, etc; in particular arrays are avoided.
|
|
||||||
#
|
|
||||||
# The "traditional" practice of packing multiple parameters into a
|
|
||||||
# space-separated string is a well documented source of bugs and security
|
|
||||||
# problems, so this is (mostly) avoided, by progressively accumulating
|
|
||||||
# options in "$@", and eventually passing that to Java.
|
|
||||||
#
|
|
||||||
# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
|
|
||||||
# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
|
|
||||||
# see the in-line comments for details.
|
|
||||||
#
|
|
||||||
# There are tweaks for specific operating systems such as AIX, CygWin,
|
|
||||||
# Darwin, MinGW, and NonStop.
|
|
||||||
#
|
|
||||||
# (3) This script is generated from the Groovy template
|
|
||||||
# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
|
|
||||||
# within the Gradle project.
|
|
||||||
#
|
|
||||||
# You can find Gradle at https://github.com/gradle/gradle/.
|
|
||||||
#
|
|
||||||
##############################################################################
|
|
||||||
|
|
||||||
# Attempt to set APP_HOME
|
|
||||||
|
|
||||||
# Resolve links: $0 may be a link
|
|
||||||
app_path=$0
|
|
||||||
|
|
||||||
# Need this for daisy-chained symlinks.
|
|
||||||
while
|
|
||||||
APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path
|
|
||||||
[ -h "$app_path" ]
|
|
||||||
do
|
|
||||||
ls=$( ls -ld "$app_path" )
|
|
||||||
link=${ls#*' -> '}
|
|
||||||
case $link in #(
|
|
||||||
/*) app_path=$link ;; #(
|
|
||||||
*) app_path=$APP_HOME$link ;;
|
|
||||||
esac
|
|
||||||
done
|
|
||||||
|
|
||||||
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
|
|
||||||
|
|
||||||
APP_NAME="Gradle"
|
|
||||||
APP_BASE_NAME=${0##*/}
|
|
||||||
|
|
||||||
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
|
||||||
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
|
||||||
|
|
||||||
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
|
||||||
MAX_FD=maximum
|
|
||||||
|
|
||||||
warn () {
|
|
||||||
echo "$*"
|
|
||||||
} >&2
|
|
||||||
|
|
||||||
die () {
|
|
||||||
echo
|
|
||||||
echo "$*"
|
|
||||||
echo
|
|
||||||
exit 1
|
|
||||||
} >&2
|
|
||||||
|
|
||||||
# OS specific support (must be 'true' or 'false').
|
|
||||||
cygwin=false
|
|
||||||
msys=false
|
|
||||||
darwin=false
|
|
||||||
nonstop=false
|
|
||||||
case "$( uname )" in #(
|
|
||||||
CYGWIN* ) cygwin=true ;; #(
|
|
||||||
Darwin* ) darwin=true ;; #(
|
|
||||||
MSYS* | MINGW* ) msys=true ;; #(
|
|
||||||
NONSTOP* ) nonstop=true ;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
|
|
||||||
|
|
||||||
|
|
||||||
# Determine the Java command to use to start the JVM.
|
|
||||||
if [ -n "$JAVA_HOME" ] ; then
|
|
||||||
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
|
|
||||||
# IBM's JDK on AIX uses strange locations for the executables
|
|
||||||
JAVACMD=$JAVA_HOME/jre/sh/java
|
|
||||||
else
|
|
||||||
JAVACMD=$JAVA_HOME/bin/java
|
|
||||||
fi
|
|
||||||
if [ ! -x "$JAVACMD" ] ; then
|
|
||||||
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
|
|
||||||
|
|
||||||
Please set the JAVA_HOME variable in your environment to match the
|
|
||||||
location of your Java installation."
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
JAVACMD=java
|
|
||||||
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
|
||||||
|
|
||||||
Please set the JAVA_HOME variable in your environment to match the
|
|
||||||
location of your Java installation."
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Increase the maximum file descriptors if we can.
|
|
||||||
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
|
|
||||||
case $MAX_FD in #(
|
|
||||||
max*)
|
|
||||||
MAX_FD=$( ulimit -H -n ) ||
|
|
||||||
warn "Could not query maximum file descriptor limit"
|
|
||||||
esac
|
|
||||||
case $MAX_FD in #(
|
|
||||||
'' | soft) :;; #(
|
|
||||||
*)
|
|
||||||
ulimit -n "$MAX_FD" ||
|
|
||||||
warn "Could not set maximum file descriptor limit to $MAX_FD"
|
|
||||||
esac
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Collect all arguments for the java command, stacking in reverse order:
|
|
||||||
# * args from the command line
|
|
||||||
# * the main class name
|
|
||||||
# * -classpath
|
|
||||||
# * -D...appname settings
|
|
||||||
# * --module-path (only if needed)
|
|
||||||
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
|
|
||||||
|
|
||||||
# For Cygwin or MSYS, switch paths to Windows format before running java
|
|
||||||
if "$cygwin" || "$msys" ; then
|
|
||||||
APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
|
|
||||||
CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
|
|
||||||
|
|
||||||
JAVACMD=$( cygpath --unix "$JAVACMD" )
|
|
||||||
|
|
||||||
# Now convert the arguments - kludge to limit ourselves to /bin/sh
|
|
||||||
for arg do
|
|
||||||
if
|
|
||||||
case $arg in #(
|
|
||||||
-*) false ;; # don't mess with options #(
|
|
||||||
/?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath
|
|
||||||
[ -e "$t" ] ;; #(
|
|
||||||
*) false ;;
|
|
||||||
esac
|
|
||||||
then
|
|
||||||
arg=$( cygpath --path --ignore --mixed "$arg" )
|
|
||||||
fi
|
|
||||||
# Roll the args list around exactly as many times as the number of
|
|
||||||
# args, so each arg winds up back in the position where it started, but
|
|
||||||
# possibly modified.
|
|
||||||
#
|
|
||||||
# NB: a `for` loop captures its iteration list before it begins, so
|
|
||||||
# changing the positional parameters here affects neither the number of
|
|
||||||
# iterations, nor the values presented in `arg`.
|
|
||||||
shift # remove old arg
|
|
||||||
set -- "$@" "$arg" # push replacement arg
|
|
||||||
done
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Collect all arguments for the java command;
|
|
||||||
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
|
|
||||||
# shell script including quotes and variable substitutions, so put them in
|
|
||||||
# double quotes to make sure that they get re-expanded; and
|
|
||||||
# * put everything else in single quotes, so that it's not re-expanded.
|
|
||||||
|
|
||||||
set -- \
|
|
||||||
"-Dorg.gradle.appname=$APP_BASE_NAME" \
|
|
||||||
-classpath "$CLASSPATH" \
|
|
||||||
org.gradle.wrapper.GradleWrapperMain \
|
|
||||||
"$@"
|
|
||||||
|
|
||||||
# Use "xargs" to parse quoted args.
|
|
||||||
#
|
|
||||||
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
|
|
||||||
#
|
|
||||||
# In Bash we could simply go:
|
|
||||||
#
|
|
||||||
# readarray ARGS < <( xargs -n1 <<<"$var" ) &&
|
|
||||||
# set -- "${ARGS[@]}" "$@"
|
|
||||||
#
|
|
||||||
# but POSIX shell has neither arrays nor command substitution, so instead we
|
|
||||||
# post-process each arg (as a line of input to sed) to backslash-escape any
|
|
||||||
# character that might be a shell metacharacter, then use eval to reverse
|
|
||||||
# that process (while maintaining the separation between arguments), and wrap
|
|
||||||
# the whole thing up as a single "set" statement.
|
|
||||||
#
|
|
||||||
# This will of course break if any of these variables contains a newline or
|
|
||||||
# an unmatched quote.
|
|
||||||
#
|
|
||||||
|
|
||||||
eval "set -- $(
|
|
||||||
printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
|
|
||||||
xargs -n1 |
|
|
||||||
sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
|
|
||||||
tr '\n' ' '
|
|
||||||
)" '"$@"'
|
|
||||||
|
|
||||||
exec "$JAVACMD" "$@"
|
|
|
@ -1,89 +0,0 @@
|
||||||
@rem
|
|
||||||
@rem Copyright 2015 the original author or authors.
|
|
||||||
@rem
|
|
||||||
@rem Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
@rem you may not use this file except in compliance with the License.
|
|
||||||
@rem You may obtain a copy of the License at
|
|
||||||
@rem
|
|
||||||
@rem https://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
@rem
|
|
||||||
@rem Unless required by applicable law or agreed to in writing, software
|
|
||||||
@rem distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
@rem See the License for the specific language governing permissions and
|
|
||||||
@rem limitations under the License.
|
|
||||||
@rem
|
|
||||||
|
|
||||||
@if "%DEBUG%" == "" @echo off
|
|
||||||
@rem ##########################################################################
|
|
||||||
@rem
|
|
||||||
@rem Gradle startup script for Windows
|
|
||||||
@rem
|
|
||||||
@rem ##########################################################################
|
|
||||||
|
|
||||||
@rem Set local scope for the variables with windows NT shell
|
|
||||||
if "%OS%"=="Windows_NT" setlocal
|
|
||||||
|
|
||||||
set DIRNAME=%~dp0
|
|
||||||
if "%DIRNAME%" == "" set DIRNAME=.
|
|
||||||
set APP_BASE_NAME=%~n0
|
|
||||||
set APP_HOME=%DIRNAME%
|
|
||||||
|
|
||||||
@rem Resolve any "." and ".." in APP_HOME to make it shorter.
|
|
||||||
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
|
|
||||||
|
|
||||||
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
|
||||||
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
|
|
||||||
|
|
||||||
@rem Find java.exe
|
|
||||||
if defined JAVA_HOME goto findJavaFromJavaHome
|
|
||||||
|
|
||||||
set JAVA_EXE=java.exe
|
|
||||||
%JAVA_EXE% -version >NUL 2>&1
|
|
||||||
if "%ERRORLEVEL%" == "0" goto execute
|
|
||||||
|
|
||||||
echo.
|
|
||||||
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
|
||||||
echo.
|
|
||||||
echo Please set the JAVA_HOME variable in your environment to match the
|
|
||||||
echo location of your Java installation.
|
|
||||||
|
|
||||||
goto fail
|
|
||||||
|
|
||||||
:findJavaFromJavaHome
|
|
||||||
set JAVA_HOME=%JAVA_HOME:"=%
|
|
||||||
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
|
|
||||||
|
|
||||||
if exist "%JAVA_EXE%" goto execute
|
|
||||||
|
|
||||||
echo.
|
|
||||||
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
|
|
||||||
echo.
|
|
||||||
echo Please set the JAVA_HOME variable in your environment to match the
|
|
||||||
echo location of your Java installation.
|
|
||||||
|
|
||||||
goto fail
|
|
||||||
|
|
||||||
:execute
|
|
||||||
@rem Setup the command line
|
|
||||||
|
|
||||||
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
|
|
||||||
|
|
||||||
|
|
||||||
@rem Execute Gradle
|
|
||||||
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
|
|
||||||
|
|
||||||
:end
|
|
||||||
@rem End local scope for the variables with windows NT shell
|
|
||||||
if "%ERRORLEVEL%"=="0" goto mainEnd
|
|
||||||
|
|
||||||
:fail
|
|
||||||
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
|
|
||||||
rem the _cmd.exe /c_ return code!
|
|
||||||
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
|
|
||||||
exit /b 1
|
|
||||||
|
|
||||||
:mainEnd
|
|
||||||
if "%OS%"=="Windows_NT" endlocal
|
|
||||||
|
|
||||||
:omega
|
|
|
@ -1,3 +0,0 @@
|
||||||
rootProject.name = "forge-1.15.2"
|
|
||||||
|
|
||||||
includeBuild("../../BlueMapCommon")
|
|
|
@ -1,83 +0,0 @@
|
||||||
/*
|
|
||||||
* This file is part of BlueMap, licensed under the MIT License (MIT).
|
|
||||||
*
|
|
||||||
* Copyright (c) Blue (Lukas Rieger) <https://bluecolored.de>
|
|
||||||
* Copyright (c) contributors
|
|
||||||
*
|
|
||||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
* of this software and associated documentation files (the "Software"), to deal
|
|
||||||
* in the Software without restriction, including without limitation the rights
|
|
||||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
* copies of the Software, and to permit persons to whom the Software is
|
|
||||||
* furnished to do so, subject to the following conditions:
|
|
||||||
*
|
|
||||||
* The above copyright notice and this permission notice shall be included in
|
|
||||||
* all copies or substantial portions of the Software.
|
|
||||||
*
|
|
||||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
||||||
* THE SOFTWARE.
|
|
||||||
*/
|
|
||||||
package de.bluecolored.bluemap.forge;
|
|
||||||
|
|
||||||
import com.flowpowered.math.vector.Vector3d;
|
|
||||||
import de.bluecolored.bluemap.common.plugin.Plugin;
|
|
||||||
import de.bluecolored.bluemap.common.serverinterface.CommandSource;
|
|
||||||
import de.bluecolored.bluemap.common.plugin.text.Text;
|
|
||||||
import de.bluecolored.bluemap.core.world.World;
|
|
||||||
import net.minecraft.util.math.Vec3d;
|
|
||||||
import net.minecraft.util.text.ITextComponent;
|
|
||||||
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.util.Optional;
|
|
||||||
|
|
||||||
public class ForgeCommandSource implements CommandSource {
|
|
||||||
|
|
||||||
private final ForgeMod mod;
|
|
||||||
private final Plugin plugin;
|
|
||||||
private final net.minecraft.command.CommandSource delegate;
|
|
||||||
|
|
||||||
public ForgeCommandSource(ForgeMod mod, Plugin plugin, net.minecraft.command.CommandSource delegate) {
|
|
||||||
this.mod = mod;
|
|
||||||
this.plugin = plugin;
|
|
||||||
this.delegate = delegate;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void sendMessage(Text text) {
|
|
||||||
var component = ITextComponent.Serializer.fromJson(text.toJSONString());
|
|
||||||
if (component != null)
|
|
||||||
delegate.sendFeedback(component, false);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean hasPermission(String permission) {
|
|
||||||
return delegate.hasPermissionLevel(1);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Optional<Vector3d> getPosition() {
|
|
||||||
Vec3d pos = delegate.getPos();
|
|
||||||
if (pos != null) {
|
|
||||||
return Optional.of(new Vector3d(pos.x, pos.y, pos.z));
|
|
||||||
}
|
|
||||||
|
|
||||||
return Optional.empty();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Optional<World> getWorld() {
|
|
||||||
try {
|
|
||||||
var serverWorld = mod.getWorld(delegate.getWorld());
|
|
||||||
String worldId = plugin.getBlueMap().getWorldId(serverWorld.getSaveFolder());
|
|
||||||
return Optional.ofNullable(plugin.getWorlds().get(worldId));
|
|
||||||
} catch (IOException ignore) {}
|
|
||||||
|
|
||||||
return Optional.empty();
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
|
@ -1,67 +0,0 @@
|
||||||
/*
|
|
||||||
* This file is part of BlueMap, licensed under the MIT License (MIT).
|
|
||||||
*
|
|
||||||
* Copyright (c) Blue (Lukas Rieger) <https://bluecolored.de>
|
|
||||||
* Copyright (c) contributors
|
|
||||||
*
|
|
||||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
* of this software and associated documentation files (the "Software"), to deal
|
|
||||||
* in the Software without restriction, including without limitation the rights
|
|
||||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
* copies of the Software, and to permit persons to whom the Software is
|
|
||||||
* furnished to do so, subject to the following conditions:
|
|
||||||
*
|
|
||||||
* The above copyright notice and this permission notice shall be included in
|
|
||||||
* all copies or substantial portions of the Software.
|
|
||||||
*
|
|
||||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
||||||
* THE SOFTWARE.
|
|
||||||
*/
|
|
||||||
package de.bluecolored.bluemap.forge;
|
|
||||||
|
|
||||||
import de.bluecolored.bluemap.common.serverinterface.ServerEventListener;
|
|
||||||
import net.minecraftforge.common.MinecraftForge;
|
|
||||||
import net.minecraftforge.event.entity.player.PlayerEvent.PlayerLoggedInEvent;
|
|
||||||
import net.minecraftforge.event.entity.player.PlayerEvent.PlayerLoggedOutEvent;
|
|
||||||
import net.minecraftforge.eventbus.api.SubscribeEvent;
|
|
||||||
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.Collection;
|
|
||||||
import java.util.UUID;
|
|
||||||
|
|
||||||
public class ForgeEventForwarder {
|
|
||||||
|
|
||||||
private final Collection<ServerEventListener> eventListeners;
|
|
||||||
|
|
||||||
public ForgeEventForwarder() {
|
|
||||||
this.eventListeners = new ArrayList<>(1);
|
|
||||||
|
|
||||||
MinecraftForge.EVENT_BUS.register(this);
|
|
||||||
}
|
|
||||||
|
|
||||||
public synchronized void addEventListener(ServerEventListener listener) {
|
|
||||||
this.eventListeners.add(listener);
|
|
||||||
}
|
|
||||||
|
|
||||||
public synchronized void removeAllListeners() {
|
|
||||||
this.eventListeners.clear();
|
|
||||||
}
|
|
||||||
|
|
||||||
@SubscribeEvent
|
|
||||||
public synchronized void onPlayerJoin(PlayerLoggedInEvent evt) {
|
|
||||||
UUID uuid = evt.getPlayer().getUniqueID();
|
|
||||||
for (ServerEventListener listener : eventListeners) listener.onPlayerJoin(uuid);
|
|
||||||
}
|
|
||||||
|
|
||||||
@SubscribeEvent
|
|
||||||
public synchronized void onPlayerLeave(PlayerLoggedOutEvent evt) {
|
|
||||||
UUID uuid = evt.getPlayer().getUniqueID();
|
|
||||||
for (ServerEventListener listener : eventListeners) listener.onPlayerLeave(uuid);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
|
@ -1,264 +0,0 @@
|
||||||
/*
|
|
||||||
* This file is part of BlueMap, licensed under the MIT License (MIT).
|
|
||||||
*
|
|
||||||
* Copyright (c) Blue (Lukas Rieger) <https://bluecolored.de>
|
|
||||||
* Copyright (c) contributors
|
|
||||||
*
|
|
||||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
* of this software and associated documentation files (the "Software"), to deal
|
|
||||||
* in the Software without restriction, including without limitation the rights
|
|
||||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
* copies of the Software, and to permit persons to whom the Software is
|
|
||||||
* furnished to do so, subject to the following conditions:
|
|
||||||
*
|
|
||||||
* The above copyright notice and this permission notice shall be included in
|
|
||||||
* all copies or substantial portions of the Software.
|
|
||||||
*
|
|
||||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
||||||
* THE SOFTWARE.
|
|
||||||
*/
|
|
||||||
package de.bluecolored.bluemap.forge;
|
|
||||||
|
|
||||||
import com.github.benmanes.caffeine.cache.Caffeine;
|
|
||||||
import com.github.benmanes.caffeine.cache.LoadingCache;
|
|
||||||
import de.bluecolored.bluemap.common.plugin.Plugin;
|
|
||||||
import de.bluecolored.bluemap.common.plugin.commands.Commands;
|
|
||||||
import de.bluecolored.bluemap.common.serverinterface.Player;
|
|
||||||
import de.bluecolored.bluemap.common.serverinterface.ServerEventListener;
|
|
||||||
import de.bluecolored.bluemap.common.serverinterface.ServerInterface;
|
|
||||||
import de.bluecolored.bluemap.common.serverinterface.ServerWorld;
|
|
||||||
import de.bluecolored.bluemap.core.BlueMap;
|
|
||||||
import de.bluecolored.bluemap.core.MinecraftVersion;
|
|
||||||
import de.bluecolored.bluemap.core.logger.Logger;
|
|
||||||
import net.minecraft.entity.player.PlayerEntity;
|
|
||||||
import net.minecraft.entity.player.ServerPlayerEntity;
|
|
||||||
import net.minecraft.server.MinecraftServer;
|
|
||||||
import net.minecraft.util.ResourceLocation;
|
|
||||||
import net.minecraft.world.dimension.DimensionType;
|
|
||||||
import net.minecraftforge.common.MinecraftForge;
|
|
||||||
import net.minecraftforge.event.TickEvent.ServerTickEvent;
|
|
||||||
import net.minecraftforge.event.entity.player.PlayerEvent.PlayerLoggedInEvent;
|
|
||||||
import net.minecraftforge.event.entity.player.PlayerEvent.PlayerLoggedOutEvent;
|
|
||||||
import net.minecraftforge.eventbus.api.SubscribeEvent;
|
|
||||||
import net.minecraftforge.fml.ExtensionPoint;
|
|
||||||
import net.minecraftforge.fml.ModLoadingContext;
|
|
||||||
import net.minecraftforge.fml.common.Mod;
|
|
||||||
import net.minecraftforge.fml.event.server.FMLServerStartedEvent;
|
|
||||||
import net.minecraftforge.fml.event.server.FMLServerStartingEvent;
|
|
||||||
import net.minecraftforge.fml.event.server.FMLServerStoppingEvent;
|
|
||||||
import net.minecraftforge.fml.network.FMLNetworkConstants;
|
|
||||||
import org.apache.commons.lang3.tuple.Pair;
|
|
||||||
import org.apache.logging.log4j.LogManager;
|
|
||||||
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.nio.file.Path;
|
|
||||||
import java.util.*;
|
|
||||||
import java.util.concurrent.ConcurrentHashMap;
|
|
||||||
|
|
||||||
@Mod(Plugin.PLUGIN_ID)
|
|
||||||
public class ForgeMod implements ServerInterface {
|
|
||||||
|
|
||||||
private final Plugin pluginInstance;
|
|
||||||
private MinecraftServer serverInstance = null;
|
|
||||||
|
|
||||||
private final ForgeEventForwarder eventForwarder;
|
|
||||||
private final LoadingCache<net.minecraft.world.server.ServerWorld, ServerWorld> worlds;
|
|
||||||
|
|
||||||
private int playerUpdateIndex = 0;
|
|
||||||
private final Map<UUID, Player> onlinePlayerMap;
|
|
||||||
private final List<ForgePlayer> onlinePlayerList;
|
|
||||||
|
|
||||||
public ForgeMod() {
|
|
||||||
Logger.global = new Log4jLogger(LogManager.getLogger(Plugin.PLUGIN_NAME));
|
|
||||||
|
|
||||||
this.onlinePlayerMap = new ConcurrentHashMap<>();
|
|
||||||
this.onlinePlayerList = Collections.synchronizedList(new ArrayList<>());
|
|
||||||
|
|
||||||
this.pluginInstance = new Plugin("forge-1.15.2", this);
|
|
||||||
|
|
||||||
this.eventForwarder = new ForgeEventForwarder();
|
|
||||||
this.worlds = Caffeine.newBuilder()
|
|
||||||
.executor(BlueMap.THREAD_POOL)
|
|
||||||
.weakKeys()
|
|
||||||
.maximumSize(1000)
|
|
||||||
.build(ForgeWorld::new);
|
|
||||||
|
|
||||||
MinecraftForge.EVENT_BUS.register(this);
|
|
||||||
|
|
||||||
//Make sure the mod being absent on the other network side does not cause the client to display the server as incompatible
|
|
||||||
ModLoadingContext.get().registerExtensionPoint(ExtensionPoint.DISPLAYTEST, () -> Pair.of(() -> FMLNetworkConstants.IGNORESERVERONLY, (a, b) -> true));
|
|
||||||
}
|
|
||||||
|
|
||||||
@SubscribeEvent
|
|
||||||
public void onServerStarting(FMLServerStartingEvent event) {
|
|
||||||
this.serverInstance = event.getServer();
|
|
||||||
|
|
||||||
//register commands
|
|
||||||
new Commands<>(pluginInstance, event.getServer().getCommandManager().getDispatcher(), forgeSource ->
|
|
||||||
new ForgeCommandSource(this, pluginInstance, forgeSource)
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
@SubscribeEvent
|
|
||||||
public void onServerStarted(FMLServerStartedEvent event) {
|
|
||||||
//save worlds to generate level.dat files
|
|
||||||
serverInstance.save(false, true, true);
|
|
||||||
|
|
||||||
new Thread(() -> {
|
|
||||||
Logger.global.logInfo("Loading...");
|
|
||||||
|
|
||||||
try {
|
|
||||||
pluginInstance.load();
|
|
||||||
if (pluginInstance.isLoaded()) Logger.global.logInfo("Loaded!");
|
|
||||||
} catch (IOException e) {
|
|
||||||
Logger.global.logError("Failed to load bluemap!", e);
|
|
||||||
pluginInstance.unload();
|
|
||||||
}
|
|
||||||
}, "BlueMap-Plugin-Loading").start();
|
|
||||||
}
|
|
||||||
|
|
||||||
@SubscribeEvent
|
|
||||||
public void onServerStopping(FMLServerStoppingEvent event) {
|
|
||||||
pluginInstance.unload();
|
|
||||||
Logger.global.logInfo("BlueMap unloaded!");
|
|
||||||
}
|
|
||||||
|
|
||||||
@SubscribeEvent
|
|
||||||
public void onTick(ServerTickEvent evt) {
|
|
||||||
updateSomePlayers();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public MinecraftVersion getMinecraftVersion() {
|
|
||||||
return new MinecraftVersion(1, 15, 2);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void registerListener(ServerEventListener listener) {
|
|
||||||
eventForwarder.addEventListener(listener);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void unregisterAllListeners() {
|
|
||||||
eventForwarder.removeAllListeners();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Collection<ServerWorld> getLoadedWorlds() {
|
|
||||||
Collection<ServerWorld> loadedWorlds = new ArrayList<>(3);
|
|
||||||
for (net.minecraft.world.server.ServerWorld serverWorld : serverInstance.getWorlds()) {
|
|
||||||
loadedWorlds.add(worlds.get(serverWorld));
|
|
||||||
}
|
|
||||||
return loadedWorlds;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Optional<ServerWorld> getWorld(Object world) {
|
|
||||||
if (world instanceof Path)
|
|
||||||
return getWorld((Path) world);
|
|
||||||
|
|
||||||
if (world instanceof String) {
|
|
||||||
ResourceLocation resourceLocation = ResourceLocation.tryCreate((String) world);
|
|
||||||
DimensionType dimensionType = null;
|
|
||||||
if (resourceLocation != null) dimensionType = DimensionType.byName(resourceLocation);
|
|
||||||
if (dimensionType != null) world = serverInstance.getWorld(dimensionType);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (world instanceof ResourceLocation) {
|
|
||||||
DimensionType dimensionType = DimensionType.byName((ResourceLocation) world);
|
|
||||||
if (dimensionType != null) world = dimensionType;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (world instanceof DimensionType) {
|
|
||||||
var serverWorld = serverInstance.getWorld((DimensionType) world);
|
|
||||||
//noinspection ConstantConditions
|
|
||||||
if (serverWorld != null) world = serverWorld;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (world instanceof net.minecraft.world.server.ServerWorld)
|
|
||||||
return Optional.of(getWorld((net.minecraft.world.server.ServerWorld) world));
|
|
||||||
|
|
||||||
return Optional.empty();
|
|
||||||
}
|
|
||||||
|
|
||||||
public ServerWorld getWorld(net.minecraft.world.server.ServerWorld world) {
|
|
||||||
return worlds.get(world);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Path getConfigFolder() {
|
|
||||||
return Path.of("config", "bluemap");
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Optional<Path> getModsFolder() {
|
|
||||||
return Optional.of(Path.of("mods"));
|
|
||||||
}
|
|
||||||
|
|
||||||
@SubscribeEvent
|
|
||||||
public void onPlayerJoin(PlayerLoggedInEvent evt) {
|
|
||||||
PlayerEntity playerInstance = evt.getPlayer();
|
|
||||||
if (!(playerInstance instanceof ServerPlayerEntity)) return;
|
|
||||||
|
|
||||||
ForgePlayer player = new ForgePlayer(playerInstance.getUniqueID(), this);
|
|
||||||
onlinePlayerMap.put(player.getUuid(), player);
|
|
||||||
onlinePlayerList.add(player);
|
|
||||||
}
|
|
||||||
|
|
||||||
@SubscribeEvent
|
|
||||||
public void onPlayerLeave(PlayerLoggedOutEvent evt) {
|
|
||||||
PlayerEntity player = evt.getPlayer();
|
|
||||||
if (!(player instanceof ServerPlayerEntity)) return;
|
|
||||||
|
|
||||||
UUID playerUUID = player.getUniqueID();
|
|
||||||
onlinePlayerMap.remove(playerUUID);
|
|
||||||
synchronized (onlinePlayerList) {
|
|
||||||
onlinePlayerList.removeIf(p -> p.getUuid().equals(playerUUID));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public MinecraftServer getServer() {
|
|
||||||
return this.serverInstance;
|
|
||||||
}
|
|
||||||
|
|
||||||
public Plugin getPlugin() {
|
|
||||||
return this.pluginInstance;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Collection<Player> getOnlinePlayers() {
|
|
||||||
return onlinePlayerMap.values();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Optional<Player> getPlayer(UUID uuid) {
|
|
||||||
return Optional.ofNullable(onlinePlayerMap.get(uuid));
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Only update some of the online players each tick to minimize performance impact on the server-thread.
|
|
||||||
* Only call this method on the server-thread.
|
|
||||||
*/
|
|
||||||
private void updateSomePlayers() {
|
|
||||||
int onlinePlayerCount = onlinePlayerList.size();
|
|
||||||
if (onlinePlayerCount == 0) return;
|
|
||||||
|
|
||||||
int playersToBeUpdated = onlinePlayerCount / 20; //with 20 tps, each player is updated once a second
|
|
||||||
if (playersToBeUpdated == 0) playersToBeUpdated = 1;
|
|
||||||
|
|
||||||
for (int i = 0; i < playersToBeUpdated; i++) {
|
|
||||||
playerUpdateIndex++;
|
|
||||||
if (playerUpdateIndex >= 20 && playerUpdateIndex >= onlinePlayerCount) playerUpdateIndex = 0;
|
|
||||||
|
|
||||||
if (playerUpdateIndex < onlinePlayerCount) {
|
|
||||||
onlinePlayerList.get(playerUpdateIndex).update();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
|
@ -1,172 +0,0 @@
|
||||||
/*
|
|
||||||
* This file is part of BlueMap, licensed under the MIT License (MIT).
|
|
||||||
*
|
|
||||||
* Copyright (c) Blue (Lukas Rieger) <https://bluecolored.de>
|
|
||||||
* Copyright (c) contributors
|
|
||||||
*
|
|
||||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
* of this software and associated documentation files (the "Software"), to deal
|
|
||||||
* in the Software without restriction, including without limitation the rights
|
|
||||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
* copies of the Software, and to permit persons to whom the Software is
|
|
||||||
* furnished to do so, subject to the following conditions:
|
|
||||||
*
|
|
||||||
* The above copyright notice and this permission notice shall be included in
|
|
||||||
* all copies or substantial portions of the Software.
|
|
||||||
*
|
|
||||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
||||||
* THE SOFTWARE.
|
|
||||||
*/
|
|
||||||
package de.bluecolored.bluemap.forge;
|
|
||||||
|
|
||||||
import com.flowpowered.math.vector.Vector3d;
|
|
||||||
import de.bluecolored.bluemap.common.plugin.text.Text;
|
|
||||||
import de.bluecolored.bluemap.common.serverinterface.Gamemode;
|
|
||||||
import de.bluecolored.bluemap.common.serverinterface.Player;
|
|
||||||
import net.minecraft.entity.player.ServerPlayerEntity;
|
|
||||||
import net.minecraft.potion.EffectInstance;
|
|
||||||
import net.minecraft.potion.Effects;
|
|
||||||
import net.minecraft.server.MinecraftServer;
|
|
||||||
import net.minecraft.util.math.Vec3d;
|
|
||||||
import net.minecraft.world.GameType;
|
|
||||||
import net.minecraft.world.LightType;
|
|
||||||
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.util.EnumMap;
|
|
||||||
import java.util.Map;
|
|
||||||
import java.util.UUID;
|
|
||||||
|
|
||||||
public class ForgePlayer implements Player {
|
|
||||||
|
|
||||||
private static final Map<GameType, Gamemode> GAMEMODE_MAP = new EnumMap<>(GameType.class);
|
|
||||||
static {
|
|
||||||
GAMEMODE_MAP.put(GameType.ADVENTURE, Gamemode.ADVENTURE);
|
|
||||||
GAMEMODE_MAP.put(GameType.SURVIVAL, Gamemode.SURVIVAL);
|
|
||||||
GAMEMODE_MAP.put(GameType.CREATIVE, Gamemode.CREATIVE);
|
|
||||||
GAMEMODE_MAP.put(GameType.SPECTATOR, Gamemode.SPECTATOR);
|
|
||||||
GAMEMODE_MAP.put(GameType.NOT_SET, Gamemode.SURVIVAL);
|
|
||||||
}
|
|
||||||
|
|
||||||
private final UUID uuid;
|
|
||||||
private Text name;
|
|
||||||
private String world;
|
|
||||||
private Vector3d position;
|
|
||||||
private Vector3d rotation;
|
|
||||||
private int skyLight;
|
|
||||||
private int blockLight;
|
|
||||||
private boolean online;
|
|
||||||
private boolean sneaking;
|
|
||||||
private boolean invisible;
|
|
||||||
private Gamemode gamemode;
|
|
||||||
|
|
||||||
private final ForgeMod mod;
|
|
||||||
|
|
||||||
public ForgePlayer(UUID playerUuid, ForgeMod mod) {
|
|
||||||
this.uuid = playerUuid;
|
|
||||||
this.mod = mod;
|
|
||||||
|
|
||||||
update();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public UUID getUuid() {
|
|
||||||
return this.uuid;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Text getName() {
|
|
||||||
return this.name;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getWorld() {
|
|
||||||
return this.world;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Vector3d getPosition() {
|
|
||||||
return this.position;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Vector3d getRotation() {
|
|
||||||
return rotation;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public int getSkyLight() {
|
|
||||||
return skyLight;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public int getBlockLight() {
|
|
||||||
return blockLight;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isOnline() {
|
|
||||||
return this.online;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isSneaking() {
|
|
||||||
return this.sneaking;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isInvisible() {
|
|
||||||
return this.invisible;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Gamemode getGamemode() {
|
|
||||||
return this.gamemode;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Only call on server thread!
|
|
||||||
*/
|
|
||||||
public void update() {
|
|
||||||
MinecraftServer server = mod.getServer();
|
|
||||||
if (server == null) {
|
|
||||||
this.online = false;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
ServerPlayerEntity player = server.getPlayerList().getPlayerByUUID(uuid);
|
|
||||||
if (player == null) {
|
|
||||||
this.online = false;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
this.gamemode = GAMEMODE_MAP.get(player.interactionManager.getGameType());
|
|
||||||
if (this.gamemode == null) this.gamemode = Gamemode.SURVIVAL;
|
|
||||||
|
|
||||||
EffectInstance invis = player.getActivePotionEffect(Effects.INVISIBILITY);
|
|
||||||
this.invisible = invis != null && invis.getDuration() > 0;
|
|
||||||
|
|
||||||
this.name = Text.of(player.getName().getString());
|
|
||||||
this.online = true;
|
|
||||||
|
|
||||||
Vec3d pos = player.getPositionVec();
|
|
||||||
this.position = new Vector3d(pos.getX(), pos.getY(), pos.getZ());
|
|
||||||
this.rotation = new Vector3d(player.rotationPitch, player.rotationYawHead, 0);
|
|
||||||
this.sneaking = player.isCrouching();
|
|
||||||
|
|
||||||
this.skyLight = player.getServerWorld().getChunkProvider().getLightManager().getLightEngine(LightType.SKY).getLightFor(player.getPosition());
|
|
||||||
this.blockLight = player.getServerWorld().getChunkProvider().getLightManager().getLightEngine(LightType.BLOCK).getLightFor(player.getPosition());
|
|
||||||
|
|
||||||
try {
|
|
||||||
var world = mod.getWorld(player.getServerWorld());
|
|
||||||
this.world = mod.getPlugin().getBlueMap().getWorldId(world.getSaveFolder());
|
|
||||||
} catch (IOException e) {
|
|
||||||
this.world = "unknown";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
|
@ -1,99 +0,0 @@
|
||||||
/*
|
|
||||||
* This file is part of BlueMap, licensed under the MIT License (MIT).
|
|
||||||
*
|
|
||||||
* Copyright (c) Blue (Lukas Rieger) <https://bluecolored.de>
|
|
||||||
* Copyright (c) contributors
|
|
||||||
*
|
|
||||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
* of this software and associated documentation files (the "Software"), to deal
|
|
||||||
* in the Software without restriction, including without limitation the rights
|
|
||||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
* copies of the Software, and to permit persons to whom the Software is
|
|
||||||
* furnished to do so, subject to the following conditions:
|
|
||||||
*
|
|
||||||
* The above copyright notice and this permission notice shall be included in
|
|
||||||
* all copies or substantial portions of the Software.
|
|
||||||
*
|
|
||||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
||||||
* THE SOFTWARE.
|
|
||||||
*/
|
|
||||||
package de.bluecolored.bluemap.forge;
|
|
||||||
|
|
||||||
import de.bluecolored.bluemap.common.serverinterface.Dimension;
|
|
||||||
import de.bluecolored.bluemap.common.serverinterface.ServerWorld;
|
|
||||||
import net.minecraft.world.dimension.DimensionType;
|
|
||||||
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.lang.ref.WeakReference;
|
|
||||||
import java.nio.file.Path;
|
|
||||||
import java.util.concurrent.CompletableFuture;
|
|
||||||
import java.util.concurrent.CompletionException;
|
|
||||||
import java.util.concurrent.ExecutionException;
|
|
||||||
|
|
||||||
public class ForgeWorld implements ServerWorld {
|
|
||||||
|
|
||||||
private final WeakReference<net.minecraft.world.server.ServerWorld> delegate;
|
|
||||||
private final Path saveFolder;
|
|
||||||
|
|
||||||
public ForgeWorld(net.minecraft.world.server.ServerWorld delegate) {
|
|
||||||
this.delegate = new WeakReference<>(delegate);
|
|
||||||
|
|
||||||
Path saveFolder = delegate.getSaveHandler().getWorldDirectory().toPath();
|
|
||||||
int dimensionId = delegate.getDimension().getType().getId();
|
|
||||||
if (dimensionId != 0) {
|
|
||||||
saveFolder = saveFolder.resolve("DIM" + dimensionId);
|
|
||||||
}
|
|
||||||
|
|
||||||
this.saveFolder = saveFolder;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Dimension getDimension() {
|
|
||||||
net.minecraft.world.server.ServerWorld world = delegate.get();
|
|
||||||
if (world != null) {
|
|
||||||
if (world.getDimension().getType().equals(DimensionType.THE_NETHER)) return Dimension.NETHER;
|
|
||||||
if (world.getDimension().getType().equals(DimensionType.THE_END)) return Dimension.END;
|
|
||||||
if (world.getDimension().getType().equals(DimensionType.OVERWORLD)) return Dimension.OVERWORLD;
|
|
||||||
}
|
|
||||||
|
|
||||||
return ServerWorld.super.getDimension();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean persistWorldChanges() throws IOException {
|
|
||||||
net.minecraft.world.server.ServerWorld world = delegate.get();
|
|
||||||
if (world == null) return false;
|
|
||||||
|
|
||||||
var taskResult = CompletableFuture.supplyAsync(() -> {
|
|
||||||
try {
|
|
||||||
world.save(null, true, false);
|
|
||||||
return true;
|
|
||||||
} catch (Exception e) {
|
|
||||||
throw new CompletionException(e);
|
|
||||||
}
|
|
||||||
}, world.getServer());
|
|
||||||
|
|
||||||
try {
|
|
||||||
return taskResult.get();
|
|
||||||
} catch (InterruptedException e) {
|
|
||||||
Thread.currentThread().interrupt();
|
|
||||||
throw new IOException(e);
|
|
||||||
} catch (ExecutionException e) {
|
|
||||||
Throwable t = e.getCause();
|
|
||||||
if (t instanceof IOException) throw (IOException) t;
|
|
||||||
if (t instanceof IllegalArgumentException) throw (IllegalArgumentException) t;
|
|
||||||
throw new IOException(t);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Path getSaveFolder() {
|
|
||||||
return this.saveFolder;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
|
@ -1,69 +0,0 @@
|
||||||
/*
|
|
||||||
* This file is part of BlueMap, licensed under the MIT License (MIT).
|
|
||||||
*
|
|
||||||
* Copyright (c) Blue (Lukas Rieger) <https://bluecolored.de>
|
|
||||||
* Copyright (c) contributors
|
|
||||||
*
|
|
||||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
* of this software and associated documentation files (the "Software"), to deal
|
|
||||||
* in the Software without restriction, including without limitation the rights
|
|
||||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
* copies of the Software, and to permit persons to whom the Software is
|
|
||||||
* furnished to do so, subject to the following conditions:
|
|
||||||
*
|
|
||||||
* The above copyright notice and this permission notice shall be included in
|
|
||||||
* all copies or substantial portions of the Software.
|
|
||||||
*
|
|
||||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
||||||
* THE SOFTWARE.
|
|
||||||
*/
|
|
||||||
package de.bluecolored.bluemap.forge;
|
|
||||||
|
|
||||||
import org.apache.logging.log4j.Logger;
|
|
||||||
|
|
||||||
import de.bluecolored.bluemap.core.logger.AbstractLogger;
|
|
||||||
|
|
||||||
public class Log4jLogger extends AbstractLogger {
|
|
||||||
|
|
||||||
private Logger out;
|
|
||||||
|
|
||||||
public Log4jLogger(Logger out) {
|
|
||||||
this.out = out;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void logError(String message, Throwable throwable) {
|
|
||||||
out.error(message, throwable);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void logWarning(String message) {
|
|
||||||
out.warn(message);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void logInfo(String message) {
|
|
||||||
out.info(message);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void logDebug(String message) {
|
|
||||||
if (out.isDebugEnabled()) out.debug(message);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void noFloodDebug(String message) {
|
|
||||||
if (out.isDebugEnabled()) super.noFloodDebug(message);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void noFloodDebug(String key, String message) {
|
|
||||||
if (out.isDebugEnabled()) super.noFloodDebug(key, message);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
|
@ -1,26 +0,0 @@
|
||||||
modLoader="javafml"
|
|
||||||
loaderVersion="[28,)"
|
|
||||||
license="MIT"
|
|
||||||
issueTrackerURL="https://github.com/BlueMap-Minecraft/BlueMap/issues"
|
|
||||||
[[mods]]
|
|
||||||
modId="bluemap"
|
|
||||||
version="${version}"
|
|
||||||
displayName="BlueMap"
|
|
||||||
displayURL="https://github.com/BlueMap-Minecraft/BlueMap"
|
|
||||||
authors="Blue (TBlueF, Lukas Rieger)"
|
|
||||||
description='''
|
|
||||||
A 3d-map of your Minecraft worlds view-able in your browser using three.js (WebGL)
|
|
||||||
'''
|
|
||||||
|
|
||||||
[[dependencies.bluemap]]
|
|
||||||
modId="forge"
|
|
||||||
mandatory=true
|
|
||||||
versionRange="[29,)"
|
|
||||||
ordering="NONE"
|
|
||||||
side="SERVER"
|
|
||||||
[[dependencies.bluemap]]
|
|
||||||
modId="minecraft"
|
|
||||||
mandatory=true
|
|
||||||
versionRange="[1.15,1.15.2]"
|
|
||||||
ordering="NONE"
|
|
||||||
side="SERVER"
|
|
|
@ -1,6 +0,0 @@
|
||||||
{
|
|
||||||
"pack": {
|
|
||||||
"description": "BlueMap - A 3d-map of your Minecraft worlds view-able in your browser using three.js (WebGL)",
|
|
||||||
"pack_format": 5
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,216 +0,0 @@
|
||||||
buildscript {
|
|
||||||
repositories {
|
|
||||||
// These repositories are only for Gradle plugins, put any other repositories in the repository block further below
|
|
||||||
maven { url = 'https://maven.minecraftforge.net' }
|
|
||||||
mavenCentral()
|
|
||||||
}
|
|
||||||
dependencies {
|
|
||||||
classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.0.9', changing: true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
plugins {
|
|
||||||
id "java"
|
|
||||||
id "java-library"
|
|
||||||
id "com.diffplug.spotless" version "6.1.2"
|
|
||||||
id "com.github.node-gradle.node" version "3.0.1"
|
|
||||||
id "com.github.johnrengelman.shadow" version "7.1.2"
|
|
||||||
id "com.modrinth.minotaur" version "2.+"
|
|
||||||
id "com.matthewprenger.cursegradle" version "1.4.0"
|
|
||||||
}
|
|
||||||
|
|
||||||
apply plugin: "net.minecraftforge.gradle"
|
|
||||||
|
|
||||||
group = "de.bluecolored.bluemap.forge"
|
|
||||||
version = System.getProperty("bluemap.version") ?: "?" // set by BlueMapCore
|
|
||||||
archivesBaseName = 'bluemap'
|
|
||||||
|
|
||||||
def javaTarget = 11
|
|
||||||
java {
|
|
||||||
sourceCompatibility = JavaVersion.toVersion(javaTarget)
|
|
||||||
targetCompatibility = JavaVersion.toVersion(javaTarget)
|
|
||||||
}
|
|
||||||
|
|
||||||
minecraft {
|
|
||||||
mappings channel: 'snapshot', version: '20200514-1.16'
|
|
||||||
|
|
||||||
runs {
|
|
||||||
server {
|
|
||||||
workingDirectory project.file('run')
|
|
||||||
property 'forge.logging.markers', 'REGISTRIES'
|
|
||||||
property 'forge.logging.console.level', 'debug'
|
|
||||||
|
|
||||||
mods {
|
|
||||||
bluemap {
|
|
||||||
source sourceSets.main
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
sourceSets.main.resources { srcDir 'src/generated/resources' }
|
|
||||||
|
|
||||||
repositories {
|
|
||||||
mavenCentral()
|
|
||||||
maven {
|
|
||||||
setUrl("https://libraries.minecraft.net")
|
|
||||||
}
|
|
||||||
maven {
|
|
||||||
setUrl("https://jitpack.io")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
configurations {
|
|
||||||
implementation.extendsFrom(shadowInclude)
|
|
||||||
}
|
|
||||||
|
|
||||||
dependencies {
|
|
||||||
minecraft 'net.minecraftforge:forge:1.16.3-34.0.0'
|
|
||||||
|
|
||||||
shadowInclude ("de.bluecolored.bluemap.common:BlueMapCommon") {
|
|
||||||
//exclude dependencies provided by forge
|
|
||||||
exclude (group: "com.google.guava", module: "guava")
|
|
||||||
exclude (group: "com.google.code.gson", module: "gson")
|
|
||||||
exclude (group: "org.apache.commons", module: "commons-lang3")
|
|
||||||
exclude (group: "commons-io", module: "commons-io")
|
|
||||||
exclude (group: "com.mojang", module: "brigadier")
|
|
||||||
}
|
|
||||||
|
|
||||||
testImplementation ("org.junit.jupiter:junit-jupiter:5.8.2")
|
|
||||||
testRuntimeOnly ("org.junit.jupiter:junit-jupiter-engine:5.8.2")
|
|
||||||
}
|
|
||||||
|
|
||||||
spotless {
|
|
||||||
java {
|
|
||||||
target ("src/*/java/**/*.java")
|
|
||||||
|
|
||||||
licenseHeaderFile("../../HEADER")
|
|
||||||
indentWithSpaces()
|
|
||||||
trimTrailingWhitespace()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
jar {
|
|
||||||
manifest {
|
|
||||||
attributes([
|
|
||||||
"Specification-Title" : "bluemap",
|
|
||||||
"Specification-Vendor" : "bluemap",
|
|
||||||
"Specification-Version" : "1", // We are version 1 of ourselves
|
|
||||||
"Implementation-Title" : project.name,
|
|
||||||
"Implementation-Version" : project.jar.archiveVersion,
|
|
||||||
"Implementation-Vendor" : "bluemap",
|
|
||||||
"Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")
|
|
||||||
])
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
jar.finalizedBy('reobfJar')
|
|
||||||
|
|
||||||
tasks.withType(JavaCompile).configureEach {
|
|
||||||
options.encoding = "utf-8"
|
|
||||||
}
|
|
||||||
|
|
||||||
tasks.withType(AbstractArchiveTask).configureEach {
|
|
||||||
setReproducibleFileOrder(true)
|
|
||||||
setPreserveFileTimestamps(false)
|
|
||||||
}
|
|
||||||
|
|
||||||
test {
|
|
||||||
useJUnitPlatform()
|
|
||||||
}
|
|
||||||
|
|
||||||
shadowJar {
|
|
||||||
destinationDirectory.set(file("../../build/release"))
|
|
||||||
archiveFileName.set("BlueMap-${project.version}-${project.name}.jar")
|
|
||||||
|
|
||||||
configurations = [project.configurations.shadowInclude]
|
|
||||||
|
|
||||||
//relocate ("com.flowpowered.math", "de.bluecolored.shadow.flowpowered.math") //DON"T relocate this, because the API depends on it
|
|
||||||
relocate ("com.typesafe.config", "de.bluecolored.shadow.typesafe.config")
|
|
||||||
relocate ("net.querz.nbt", "de.bluecolored.shadow.querz.nbt")
|
|
||||||
relocate ("org.spongepowered.configurate", "de.bluecolored.shadow.configurate")
|
|
||||||
relocate ("com.github.benmanes.caffeine", "de.bluecolored.shadow.benmanes.caffeine")
|
|
||||||
relocate ("org.aopalliance", "de.bluecolored.shadow.aopalliance")
|
|
||||||
relocate ("javax.inject", "de.bluecolored.shadow.javax.inject")
|
|
||||||
relocate ("org.checkerframework", "de.bluecolored.shadow.checkerframework")
|
|
||||||
relocate ("org.codehaus", "de.bluecolored.shadow.codehaus")
|
|
||||||
relocate ("io.leangen.geantyref", "de.bluecolored.shadow.geantyref")
|
|
||||||
|
|
||||||
relocate ("com.google.errorprone", "de.bluecolored.shadow.google.errorprone")
|
|
||||||
relocate ("com.google.inject", "de.bluecolored.shadow.google.inject")
|
|
||||||
|
|
||||||
relocate ("org.apache.commons.dbcp2", "de.bluecolored.shadow.apache.commons.dbcp2")
|
|
||||||
relocate ("org.apache.commons.logging", "de.bluecolored.shadow.apache.commons.logging")
|
|
||||||
relocate ("org.apache.commons.pool2", "de.bluecolored.shadow.apache.commons.pool2")
|
|
||||||
}
|
|
||||||
|
|
||||||
processResources {
|
|
||||||
from(sourceSets.main.resources.srcDirs) {
|
|
||||||
include 'mcmod.info','META-INF/mods.toml'
|
|
||||||
duplicatesStrategy = DuplicatesStrategy.WARN
|
|
||||||
|
|
||||||
expand (
|
|
||||||
version: project.version
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
afterEvaluate {
|
|
||||||
reobf {
|
|
||||||
shadowJar {
|
|
||||||
mappings = createMcpToSrg.output
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
task release {
|
|
||||||
dependsOn(build)
|
|
||||||
}
|
|
||||||
|
|
||||||
modrinth {
|
|
||||||
token = System.getenv("MODRINTH_TOKEN")
|
|
||||||
projectId = "swbUV1cr"
|
|
||||||
versionNumber = "${project.version}-${project.name}"
|
|
||||||
changelog = "Releasenotes and Changelog:\nhttps://github.com/BlueMap-Minecraft/BlueMap/releases/tag/v${project.version}"
|
|
||||||
uploadFile = shadowJar
|
|
||||||
gameVersions = ["1.16.2", "1.16.3", "1.16.4", "1.16.5"]
|
|
||||||
}
|
|
||||||
|
|
||||||
curseforge {
|
|
||||||
apiKey = System.getenv("CURSEFORGE_TOKEN") ?: ""
|
|
||||||
project {
|
|
||||||
id = "406463"
|
|
||||||
changelogType = "markdown"
|
|
||||||
changelog = "**Releasenotes and Changelog:**\n\nhttps://github.com/BlueMap-Minecraft/BlueMap/releases/tag/v${project.version}"
|
|
||||||
releaseType = "release"
|
|
||||||
|
|
||||||
addGameVersion "Forge"
|
|
||||||
|
|
||||||
addGameVersion "Java 18"
|
|
||||||
addGameVersion "Java 17"
|
|
||||||
addGameVersion "Java 16"
|
|
||||||
addGameVersion "Java 15"
|
|
||||||
addGameVersion "Java 14"
|
|
||||||
addGameVersion "Java 13"
|
|
||||||
addGameVersion "Java 12"
|
|
||||||
addGameVersion "Java 11"
|
|
||||||
|
|
||||||
addGameVersion "1.16.2"
|
|
||||||
addGameVersion "1.16.3"
|
|
||||||
addGameVersion "1.16.4"
|
|
||||||
addGameVersion "1.16.5"
|
|
||||||
|
|
||||||
mainArtifact shadowJar
|
|
||||||
}
|
|
||||||
options {
|
|
||||||
javaVersionAutoDetect = false
|
|
||||||
javaIntegration = false
|
|
||||||
forgeGradleIntegration = false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
task publish {
|
|
||||||
dependsOn(tasks.findByName("modrinth"))
|
|
||||||
dependsOn(tasks.findByName("curseforge"))
|
|
||||||
}
|
|
Binary file not shown.
|
@ -1,5 +0,0 @@
|
||||||
distributionBase=GRADLE_USER_HOME
|
|
||||||
distributionPath=wrapper/dists
|
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
|
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
|
||||||
zipStorePath=wrapper/dists
|
|
|
@ -1,234 +0,0 @@
|
||||||
#!/bin/sh
|
|
||||||
|
|
||||||
#
|
|
||||||
# Copyright © 2015-2021 the original authors.
|
|
||||||
#
|
|
||||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
# you may not use this file except in compliance with the License.
|
|
||||||
# You may obtain a copy of the License at
|
|
||||||
#
|
|
||||||
# https://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
#
|
|
||||||
# Unless required by applicable law or agreed to in writing, software
|
|
||||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
# See the License for the specific language governing permissions and
|
|
||||||
# limitations under the License.
|
|
||||||
#
|
|
||||||
|
|
||||||
##############################################################################
|
|
||||||
#
|
|
||||||
# Gradle start up script for POSIX generated by Gradle.
|
|
||||||
#
|
|
||||||
# Important for running:
|
|
||||||
#
|
|
||||||
# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
|
|
||||||
# noncompliant, but you have some other compliant shell such as ksh or
|
|
||||||
# bash, then to run this script, type that shell name before the whole
|
|
||||||
# command line, like:
|
|
||||||
#
|
|
||||||
# ksh Gradle
|
|
||||||
#
|
|
||||||
# Busybox and similar reduced shells will NOT work, because this script
|
|
||||||
# requires all of these POSIX shell features:
|
|
||||||
# * functions;
|
|
||||||
# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
|
|
||||||
# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
|
|
||||||
# * compound commands having a testable exit status, especially «case»;
|
|
||||||
# * various built-in commands including «command», «set», and «ulimit».
|
|
||||||
#
|
|
||||||
# Important for patching:
|
|
||||||
#
|
|
||||||
# (2) This script targets any POSIX shell, so it avoids extensions provided
|
|
||||||
# by Bash, Ksh, etc; in particular arrays are avoided.
|
|
||||||
#
|
|
||||||
# The "traditional" practice of packing multiple parameters into a
|
|
||||||
# space-separated string is a well documented source of bugs and security
|
|
||||||
# problems, so this is (mostly) avoided, by progressively accumulating
|
|
||||||
# options in "$@", and eventually passing that to Java.
|
|
||||||
#
|
|
||||||
# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
|
|
||||||
# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
|
|
||||||
# see the in-line comments for details.
|
|
||||||
#
|
|
||||||
# There are tweaks for specific operating systems such as AIX, CygWin,
|
|
||||||
# Darwin, MinGW, and NonStop.
|
|
||||||
#
|
|
||||||
# (3) This script is generated from the Groovy template
|
|
||||||
# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
|
|
||||||
# within the Gradle project.
|
|
||||||
#
|
|
||||||
# You can find Gradle at https://github.com/gradle/gradle/.
|
|
||||||
#
|
|
||||||
##############################################################################
|
|
||||||
|
|
||||||
# Attempt to set APP_HOME
|
|
||||||
|
|
||||||
# Resolve links: $0 may be a link
|
|
||||||
app_path=$0
|
|
||||||
|
|
||||||
# Need this for daisy-chained symlinks.
|
|
||||||
while
|
|
||||||
APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path
|
|
||||||
[ -h "$app_path" ]
|
|
||||||
do
|
|
||||||
ls=$( ls -ld "$app_path" )
|
|
||||||
link=${ls#*' -> '}
|
|
||||||
case $link in #(
|
|
||||||
/*) app_path=$link ;; #(
|
|
||||||
*) app_path=$APP_HOME$link ;;
|
|
||||||
esac
|
|
||||||
done
|
|
||||||
|
|
||||||
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
|
|
||||||
|
|
||||||
APP_NAME="Gradle"
|
|
||||||
APP_BASE_NAME=${0##*/}
|
|
||||||
|
|
||||||
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
|
||||||
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
|
||||||
|
|
||||||
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
|
||||||
MAX_FD=maximum
|
|
||||||
|
|
||||||
warn () {
|
|
||||||
echo "$*"
|
|
||||||
} >&2
|
|
||||||
|
|
||||||
die () {
|
|
||||||
echo
|
|
||||||
echo "$*"
|
|
||||||
echo
|
|
||||||
exit 1
|
|
||||||
} >&2
|
|
||||||
|
|
||||||
# OS specific support (must be 'true' or 'false').
|
|
||||||
cygwin=false
|
|
||||||
msys=false
|
|
||||||
darwin=false
|
|
||||||
nonstop=false
|
|
||||||
case "$( uname )" in #(
|
|
||||||
CYGWIN* ) cygwin=true ;; #(
|
|
||||||
Darwin* ) darwin=true ;; #(
|
|
||||||
MSYS* | MINGW* ) msys=true ;; #(
|
|
||||||
NONSTOP* ) nonstop=true ;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
|
|
||||||
|
|
||||||
|
|
||||||
# Determine the Java command to use to start the JVM.
|
|
||||||
if [ -n "$JAVA_HOME" ] ; then
|
|
||||||
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
|
|
||||||
# IBM's JDK on AIX uses strange locations for the executables
|
|
||||||
JAVACMD=$JAVA_HOME/jre/sh/java
|
|
||||||
else
|
|
||||||
JAVACMD=$JAVA_HOME/bin/java
|
|
||||||
fi
|
|
||||||
if [ ! -x "$JAVACMD" ] ; then
|
|
||||||
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
|
|
||||||
|
|
||||||
Please set the JAVA_HOME variable in your environment to match the
|
|
||||||
location of your Java installation."
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
JAVACMD=java
|
|
||||||
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
|
||||||
|
|
||||||
Please set the JAVA_HOME variable in your environment to match the
|
|
||||||
location of your Java installation."
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Increase the maximum file descriptors if we can.
|
|
||||||
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
|
|
||||||
case $MAX_FD in #(
|
|
||||||
max*)
|
|
||||||
MAX_FD=$( ulimit -H -n ) ||
|
|
||||||
warn "Could not query maximum file descriptor limit"
|
|
||||||
esac
|
|
||||||
case $MAX_FD in #(
|
|
||||||
'' | soft) :;; #(
|
|
||||||
*)
|
|
||||||
ulimit -n "$MAX_FD" ||
|
|
||||||
warn "Could not set maximum file descriptor limit to $MAX_FD"
|
|
||||||
esac
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Collect all arguments for the java command, stacking in reverse order:
|
|
||||||
# * args from the command line
|
|
||||||
# * the main class name
|
|
||||||
# * -classpath
|
|
||||||
# * -D...appname settings
|
|
||||||
# * --module-path (only if needed)
|
|
||||||
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
|
|
||||||
|
|
||||||
# For Cygwin or MSYS, switch paths to Windows format before running java
|
|
||||||
if "$cygwin" || "$msys" ; then
|
|
||||||
APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
|
|
||||||
CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
|
|
||||||
|
|
||||||
JAVACMD=$( cygpath --unix "$JAVACMD" )
|
|
||||||
|
|
||||||
# Now convert the arguments - kludge to limit ourselves to /bin/sh
|
|
||||||
for arg do
|
|
||||||
if
|
|
||||||
case $arg in #(
|
|
||||||
-*) false ;; # don't mess with options #(
|
|
||||||
/?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath
|
|
||||||
[ -e "$t" ] ;; #(
|
|
||||||
*) false ;;
|
|
||||||
esac
|
|
||||||
then
|
|
||||||
arg=$( cygpath --path --ignore --mixed "$arg" )
|
|
||||||
fi
|
|
||||||
# Roll the args list around exactly as many times as the number of
|
|
||||||
# args, so each arg winds up back in the position where it started, but
|
|
||||||
# possibly modified.
|
|
||||||
#
|
|
||||||
# NB: a `for` loop captures its iteration list before it begins, so
|
|
||||||
# changing the positional parameters here affects neither the number of
|
|
||||||
# iterations, nor the values presented in `arg`.
|
|
||||||
shift # remove old arg
|
|
||||||
set -- "$@" "$arg" # push replacement arg
|
|
||||||
done
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Collect all arguments for the java command;
|
|
||||||
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
|
|
||||||
# shell script including quotes and variable substitutions, so put them in
|
|
||||||
# double quotes to make sure that they get re-expanded; and
|
|
||||||
# * put everything else in single quotes, so that it's not re-expanded.
|
|
||||||
|
|
||||||
set -- \
|
|
||||||
"-Dorg.gradle.appname=$APP_BASE_NAME" \
|
|
||||||
-classpath "$CLASSPATH" \
|
|
||||||
org.gradle.wrapper.GradleWrapperMain \
|
|
||||||
"$@"
|
|
||||||
|
|
||||||
# Use "xargs" to parse quoted args.
|
|
||||||
#
|
|
||||||
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
|
|
||||||
#
|
|
||||||
# In Bash we could simply go:
|
|
||||||
#
|
|
||||||
# readarray ARGS < <( xargs -n1 <<<"$var" ) &&
|
|
||||||
# set -- "${ARGS[@]}" "$@"
|
|
||||||
#
|
|
||||||
# but POSIX shell has neither arrays nor command substitution, so instead we
|
|
||||||
# post-process each arg (as a line of input to sed) to backslash-escape any
|
|
||||||
# character that might be a shell metacharacter, then use eval to reverse
|
|
||||||
# that process (while maintaining the separation between arguments), and wrap
|
|
||||||
# the whole thing up as a single "set" statement.
|
|
||||||
#
|
|
||||||
# This will of course break if any of these variables contains a newline or
|
|
||||||
# an unmatched quote.
|
|
||||||
#
|
|
||||||
|
|
||||||
eval "set -- $(
|
|
||||||
printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
|
|
||||||
xargs -n1 |
|
|
||||||
sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
|
|
||||||
tr '\n' ' '
|
|
||||||
)" '"$@"'
|
|
||||||
|
|
||||||
exec "$JAVACMD" "$@"
|
|
|
@ -1,89 +0,0 @@
|
||||||
@rem
|
|
||||||
@rem Copyright 2015 the original author or authors.
|
|
||||||
@rem
|
|
||||||
@rem Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
@rem you may not use this file except in compliance with the License.
|
|
||||||
@rem You may obtain a copy of the License at
|
|
||||||
@rem
|
|
||||||
@rem https://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
@rem
|
|
||||||
@rem Unless required by applicable law or agreed to in writing, software
|
|
||||||
@rem distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
@rem See the License for the specific language governing permissions and
|
|
||||||
@rem limitations under the License.
|
|
||||||
@rem
|
|
||||||
|
|
||||||
@if "%DEBUG%" == "" @echo off
|
|
||||||
@rem ##########################################################################
|
|
||||||
@rem
|
|
||||||
@rem Gradle startup script for Windows
|
|
||||||
@rem
|
|
||||||
@rem ##########################################################################
|
|
||||||
|
|
||||||
@rem Set local scope for the variables with windows NT shell
|
|
||||||
if "%OS%"=="Windows_NT" setlocal
|
|
||||||
|
|
||||||
set DIRNAME=%~dp0
|
|
||||||
if "%DIRNAME%" == "" set DIRNAME=.
|
|
||||||
set APP_BASE_NAME=%~n0
|
|
||||||
set APP_HOME=%DIRNAME%
|
|
||||||
|
|
||||||
@rem Resolve any "." and ".." in APP_HOME to make it shorter.
|
|
||||||
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
|
|
||||||
|
|
||||||
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
|
||||||
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
|
|
||||||
|
|
||||||
@rem Find java.exe
|
|
||||||
if defined JAVA_HOME goto findJavaFromJavaHome
|
|
||||||
|
|
||||||
set JAVA_EXE=java.exe
|
|
||||||
%JAVA_EXE% -version >NUL 2>&1
|
|
||||||
if "%ERRORLEVEL%" == "0" goto execute
|
|
||||||
|
|
||||||
echo.
|
|
||||||
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
|
||||||
echo.
|
|
||||||
echo Please set the JAVA_HOME variable in your environment to match the
|
|
||||||
echo location of your Java installation.
|
|
||||||
|
|
||||||
goto fail
|
|
||||||
|
|
||||||
:findJavaFromJavaHome
|
|
||||||
set JAVA_HOME=%JAVA_HOME:"=%
|
|
||||||
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
|
|
||||||
|
|
||||||
if exist "%JAVA_EXE%" goto execute
|
|
||||||
|
|
||||||
echo.
|
|
||||||
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
|
|
||||||
echo.
|
|
||||||
echo Please set the JAVA_HOME variable in your environment to match the
|
|
||||||
echo location of your Java installation.
|
|
||||||
|
|
||||||
goto fail
|
|
||||||
|
|
||||||
:execute
|
|
||||||
@rem Setup the command line
|
|
||||||
|
|
||||||
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
|
|
||||||
|
|
||||||
|
|
||||||
@rem Execute Gradle
|
|
||||||
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
|
|
||||||
|
|
||||||
:end
|
|
||||||
@rem End local scope for the variables with windows NT shell
|
|
||||||
if "%ERRORLEVEL%"=="0" goto mainEnd
|
|
||||||
|
|
||||||
:fail
|
|
||||||
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
|
|
||||||
rem the _cmd.exe /c_ return code!
|
|
||||||
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
|
|
||||||
exit /b 1
|
|
||||||
|
|
||||||
:mainEnd
|
|
||||||
if "%OS%"=="Windows_NT" endlocal
|
|
||||||
|
|
||||||
:omega
|
|
|
@ -1,3 +0,0 @@
|
||||||
rootProject.name = "forge-1.16.2"
|
|
||||||
|
|
||||||
includeBuild("../../BlueMapCommon")
|
|
|
@ -1,67 +0,0 @@
|
||||||
/*
|
|
||||||
* This file is part of BlueMap, licensed under the MIT License (MIT).
|
|
||||||
*
|
|
||||||
* Copyright (c) Blue (Lukas Rieger) <https://bluecolored.de>
|
|
||||||
* Copyright (c) contributors
|
|
||||||
*
|
|
||||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
* of this software and associated documentation files (the "Software"), to deal
|
|
||||||
* in the Software without restriction, including without limitation the rights
|
|
||||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
* copies of the Software, and to permit persons to whom the Software is
|
|
||||||
* furnished to do so, subject to the following conditions:
|
|
||||||
*
|
|
||||||
* The above copyright notice and this permission notice shall be included in
|
|
||||||
* all copies or substantial portions of the Software.
|
|
||||||
*
|
|
||||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
||||||
* THE SOFTWARE.
|
|
||||||
*/
|
|
||||||
package de.bluecolored.bluemap.forge;
|
|
||||||
|
|
||||||
import de.bluecolored.bluemap.common.serverinterface.ServerEventListener;
|
|
||||||
import net.minecraftforge.common.MinecraftForge;
|
|
||||||
import net.minecraftforge.event.entity.player.PlayerEvent.PlayerLoggedInEvent;
|
|
||||||
import net.minecraftforge.event.entity.player.PlayerEvent.PlayerLoggedOutEvent;
|
|
||||||
import net.minecraftforge.eventbus.api.SubscribeEvent;
|
|
||||||
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.Collection;
|
|
||||||
import java.util.UUID;
|
|
||||||
|
|
||||||
public class ForgeEventForwarder {
|
|
||||||
|
|
||||||
private final Collection<ServerEventListener> eventListeners;
|
|
||||||
|
|
||||||
public ForgeEventForwarder() {
|
|
||||||
this.eventListeners = new ArrayList<>(1);
|
|
||||||
|
|
||||||
MinecraftForge.EVENT_BUS.register(this);
|
|
||||||
}
|
|
||||||
|
|
||||||
public synchronized void addEventListener(ServerEventListener listener) {
|
|
||||||
this.eventListeners.add(listener);
|
|
||||||
}
|
|
||||||
|
|
||||||
public synchronized void removeAllListeners() {
|
|
||||||
this.eventListeners.clear();
|
|
||||||
}
|
|
||||||
|
|
||||||
@SubscribeEvent
|
|
||||||
public synchronized void onPlayerJoin(PlayerLoggedInEvent evt) {
|
|
||||||
UUID uuid = evt.getPlayer().getUniqueID();
|
|
||||||
for (ServerEventListener listener : eventListeners) listener.onPlayerJoin(uuid);
|
|
||||||
}
|
|
||||||
|
|
||||||
@SubscribeEvent
|
|
||||||
public synchronized void onPlayerLeave(PlayerLoggedOutEvent evt) {
|
|
||||||
UUID uuid = evt.getPlayer().getUniqueID();
|
|
||||||
for (ServerEventListener listener : eventListeners) listener.onPlayerLeave(uuid);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
|
@ -1,69 +0,0 @@
|
||||||
/*
|
|
||||||
* This file is part of BlueMap, licensed under the MIT License (MIT).
|
|
||||||
*
|
|
||||||
* Copyright (c) Blue (Lukas Rieger) <https://bluecolored.de>
|
|
||||||
* Copyright (c) contributors
|
|
||||||
*
|
|
||||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
* of this software and associated documentation files (the "Software"), to deal
|
|
||||||
* in the Software without restriction, including without limitation the rights
|
|
||||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
* copies of the Software, and to permit persons to whom the Software is
|
|
||||||
* furnished to do so, subject to the following conditions:
|
|
||||||
*
|
|
||||||
* The above copyright notice and this permission notice shall be included in
|
|
||||||
* all copies or substantial portions of the Software.
|
|
||||||
*
|
|
||||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
||||||
* THE SOFTWARE.
|
|
||||||
*/
|
|
||||||
package de.bluecolored.bluemap.forge;
|
|
||||||
|
|
||||||
import org.apache.logging.log4j.Logger;
|
|
||||||
|
|
||||||
import de.bluecolored.bluemap.core.logger.AbstractLogger;
|
|
||||||
|
|
||||||
public class Log4jLogger extends AbstractLogger {
|
|
||||||
|
|
||||||
private Logger out;
|
|
||||||
|
|
||||||
public Log4jLogger(Logger out) {
|
|
||||||
this.out = out;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void logError(String message, Throwable throwable) {
|
|
||||||
out.error(message, throwable);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void logWarning(String message) {
|
|
||||||
out.warn(message);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void logInfo(String message) {
|
|
||||||
out.info(message);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void logDebug(String message) {
|
|
||||||
if (out.isDebugEnabled()) out.debug(message);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void noFloodDebug(String message) {
|
|
||||||
if (out.isDebugEnabled()) super.noFloodDebug(message);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void noFloodDebug(String key, String message) {
|
|
||||||
if (out.isDebugEnabled()) super.noFloodDebug(key, message);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
|
@ -1,6 +0,0 @@
|
||||||
{
|
|
||||||
"pack": {
|
|
||||||
"description": "BlueMap - A 3d-map of your Minecraft worlds view-able in your browser using three.js (WebGL)",
|
|
||||||
"pack_format": 5
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -32,7 +32,7 @@ java {
|
||||||
}
|
}
|
||||||
|
|
||||||
minecraft {
|
minecraft {
|
||||||
mappings channel: 'snapshot', version: '20190719-1.14.3'
|
mappings channel: 'snapshot', version: '20200514-1.16'
|
||||||
|
|
||||||
runs {
|
runs {
|
||||||
server {
|
server {
|
||||||
|
@ -66,7 +66,7 @@ configurations {
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
minecraft 'net.minecraftforge:forge:1.14.4-28.2.0'
|
minecraft 'net.minecraftforge:forge:1.16.5-36.2.34'
|
||||||
|
|
||||||
shadowInclude ("de.bluecolored.bluemap.common:BlueMapCommon") {
|
shadowInclude ("de.bluecolored.bluemap.common:BlueMapCommon") {
|
||||||
//exclude dependencies provided by forge
|
//exclude dependencies provided by forge
|
||||||
|
@ -174,7 +174,7 @@ modrinth {
|
||||||
versionNumber = "${project.version}-${project.name}"
|
versionNumber = "${project.version}-${project.name}"
|
||||||
changelog = "Releasenotes and Changelog:\nhttps://github.com/BlueMap-Minecraft/BlueMap/releases/tag/v${project.version}"
|
changelog = "Releasenotes and Changelog:\nhttps://github.com/BlueMap-Minecraft/BlueMap/releases/tag/v${project.version}"
|
||||||
uploadFile = shadowJar
|
uploadFile = shadowJar
|
||||||
gameVersions = ["1.14.4"]
|
gameVersions = ["1.16.5"]
|
||||||
}
|
}
|
||||||
|
|
||||||
curseforge {
|
curseforge {
|
||||||
|
@ -196,7 +196,7 @@ curseforge {
|
||||||
addGameVersion "Java 12"
|
addGameVersion "Java 12"
|
||||||
addGameVersion "Java 11"
|
addGameVersion "Java 11"
|
||||||
|
|
||||||
addGameVersion "1.14.4"
|
addGameVersion "1.16.5"
|
||||||
|
|
||||||
mainArtifact shadowJar
|
mainArtifact shadowJar
|
||||||
}
|
}
|
|
@ -0,0 +1,3 @@
|
||||||
|
rootProject.name = "forge-1.16.5"
|
||||||
|
|
||||||
|
includeBuild("../../BlueMapCommon")
|
|
@ -82,7 +82,7 @@ public class ForgeMod implements ServerInterface {
|
||||||
this.onlinePlayerMap = new ConcurrentHashMap<>();
|
this.onlinePlayerMap = new ConcurrentHashMap<>();
|
||||||
this.onlinePlayerList = Collections.synchronizedList(new ArrayList<>());
|
this.onlinePlayerList = Collections.synchronizedList(new ArrayList<>());
|
||||||
|
|
||||||
this.pluginInstance = new Plugin("forge-1.16.2", this);
|
this.pluginInstance = new Plugin("forge-1.16.5", this);
|
||||||
|
|
||||||
this.eventForwarder = new ForgeEventForwarder();
|
this.eventForwarder = new ForgeEventForwarder();
|
||||||
this.worlds = Caffeine.newBuilder()
|
this.worlds = Caffeine.newBuilder()
|
||||||
|
@ -141,7 +141,7 @@ public class ForgeMod implements ServerInterface {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public MinecraftVersion getMinecraftVersion() {
|
public MinecraftVersion getMinecraftVersion() {
|
||||||
return new MinecraftVersion(1, 16, 2);
|
return new MinecraftVersion(1, 16, 5);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
|
@ -9,9 +9,7 @@ includeBuild("implementations/fabric-1.18")
|
||||||
includeBuild("implementations/fabric-1.19")
|
includeBuild("implementations/fabric-1.19")
|
||||||
includeBuild("implementations/fabric-1.19.3")
|
includeBuild("implementations/fabric-1.19.3")
|
||||||
|
|
||||||
includeBuild("implementations/forge-1.14.4")
|
includeBuild("implementations/forge-1.16.5")
|
||||||
includeBuild("implementations/forge-1.15.2")
|
|
||||||
includeBuild("implementations/forge-1.16.2")
|
|
||||||
includeBuild("implementations/forge-1.17.1")
|
includeBuild("implementations/forge-1.17.1")
|
||||||
includeBuild("implementations/forge-1.18.1")
|
includeBuild("implementations/forge-1.18.1")
|
||||||
includeBuild("implementations/forge-1.19.1")
|
includeBuild("implementations/forge-1.19.1")
|
||||||
|
|
Loading…
Reference in New Issue