Merge pull request #276 from FTBTeam/dev

Dev

Author: desht

.gitignore

@@ -24,4 +24,6 @@ run
 run2
 .vscode/
 .architectury-transformer/
-**/extra-mods-*/
+**/extra-mods-*/
+
+.DS_Store

CHANGELOG.md

@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2004.1.2]
+
+### Changed
+* Ported to Minecraft 1.20.4.  Support for Forge, NeoForge and Fabric.
+* A few minor GUI improvements.
+
 ## [2001.2.3]
 
 ### Added

build.gradle

@@ -1,6 +1,6 @@
 plugins {
 	id "architectury-plugin" version "3.4-SNAPSHOT"
-	id "dev.architectury.loom" version "1.2-SNAPSHOT" apply false
+	id "dev.architectury.loom" version "1.5-SNAPSHOT" apply false
 }
 
 architectury {

common/build.gradle

@@ -9,7 +9,7 @@ dependencies {
 def ENV = System.getenv()
 
 architectury {
-	common("forge", "fabric")
+	common("forge", "fabric", "neoforge")
 }
 
 configurations {

common/src/main/java/dev/ftb/mods/ftbchunks/FTBChunks.java

@@ -390,7 +390,7 @@ private boolean ignoreExplosion(Level level, Explosion explosion) {
 	}
 
 	public void explosionDetonate(Level level, Explosion explosion, List<Entity> affectedEntities) {
-		if (ignoreExplosion(level, explosion)) {
+		if (FTBChunksWorldConfig.DISABLE_PROTECTION.get() || ignoreExplosion(level, explosion)) {
 			return;
 		}
 
@@ -475,40 +475,49 @@ private void playerLeftParty(PlayerLeftPartyTeamEvent event) {
 				// return the departing player's original claims to them, if possible
 				transferClaims(partyData, playerData, partyData.getOriginalClaims(event.getPlayerId()));
 			}
-		});
-
-		partyData.deleteMemberData(event.getPlayerId());
 
-		partyData.updateLimits();
+			partyData.deleteMemberData(event.getPlayerId());
 
-		if (event.getPlayer() != null) {
-			PlayerVisibilityPacket.syncToLevel(event.getPlayer().level());
-			partyData.syncChunksToPlayer(event.getPlayer());
-		}
+			if (event.getPlayer() != null) {
+				PlayerVisibilityPacket.syncToLevel(event.getPlayer().level());
+			}
+		});
 	}
 
 	private void transferClaims(ChunkTeamDataImpl transferFrom, ChunkTeamDataImpl transferTo, Collection<ClaimedChunkImpl> chunksToTransfer) {
 		CommandSourceStack sourceStack = ClaimedChunkManagerImpl.getInstance().getMinecraftServer().createCommandSourceStack();
 
+		String fromName = transferFrom.getTeam().getShortName();
+		String toName = transferTo.getTeam().getShortName();
+
+		transferFrom.clearClaimCaches();
+		transferTo.clearClaimCaches();
+
+		int nChunks = transferTo.getClaimedChunks().size();
+
 		Map<ResourceKey<Level>, List<SendChunkPacket.SingleChunk>> chunksToSend = new HashMap<>();
 		Map<ResourceKey<Level>, List<SendChunkPacket.SingleChunk>> chunksToUnclaim = new HashMap<>();
-		int chunks = 0;
+		int transferred = 0;
+		int unclaimed = 0;
 		long now = System.currentTimeMillis();
 		int total = transferTo.getClaimedChunks().size();
 
+		FTBChunks.LOGGER.info("attempting to transfer {} chunks from {} to {}", chunksToTransfer.size(), fromName, toName);
+
 		for (ClaimedChunkImpl chunk : chunksToTransfer) {
 			ChunkDimPos cdp = chunk.getPos();
 			if (total >= transferTo.getMaxClaimChunks()) {
 				chunk.unclaim(sourceStack, false);
 				chunksToUnclaim.computeIfAbsent(cdp.dimension(), s -> new ArrayList<>()).add(new SendChunkPacket.SingleChunk(now, cdp.x(), cdp.z(), null));
+				unclaimed++;
 			} else {
 				chunk.setTeamData(transferTo);
 				chunksToSend.computeIfAbsent(cdp.dimension(), s -> new ArrayList<>()).add(new SendChunkPacket.SingleChunk(now, cdp.x(), cdp.z(), chunk));
-				chunks++;
+				transferred++;
 			}
 
 			if (chunk.isForceLoaded()) {
-				// also transfer any claim tickets for the old team's ID, since it's no longer valid
+				// also transfer any force-load tickets for the old team's ID, since it's no longer valid
 				ServerLevel level = ClaimedChunkManagerImpl.getInstance().getMinecraftServer().getLevel(cdp.dimension());
 				if (level != null) {
 					FTBChunksExpected.addChunkToForceLoaded(level, FTBChunks.MOD_ID, transferFrom.getTeamId(), cdp.x(), cdp.z(), false);
@@ -521,10 +530,10 @@ private void transferClaims(ChunkTeamDataImpl transferFrom, ChunkTeamDataImpl tr
 			total++;
 		}
 
-		transferFrom.markDirty();
-		transferTo.markDirty();
+		transferFrom.updateLimits();
+		transferTo.updateLimits();
 
-		if (chunks > 0) {
+		if (transferred > 0 || unclaimed > 0) {
 			chunksToSend.forEach((dimension, chunkPackets) -> {
 				if (!chunkPackets.isEmpty()) {
 					ChunkSendingUtils.sendManyChunksToAll(sourceStack.getServer(), transferTo, new SendManyChunksPacket(dimension, transferTo.getTeamId(), chunkPackets));
@@ -536,9 +545,11 @@ private void transferClaims(ChunkTeamDataImpl transferFrom, ChunkTeamDataImpl tr
 					new SendManyChunksPacket(dimension, Util.NIL_UUID, chunkPackets).sendToAll(sourceStack.getServer());
 				}
 			});
-
-			FTBChunks.LOGGER.info("Transferred " + chunks + "/" + total + " chunks from " + transferFrom + " to " + transferTo);
 		}
+
+		FTBChunks.LOGGER.info("Transferred {} chunks from {} ({}) to {} ({})", transferred, transferFrom, fromName, transferTo, toName);
+		FTBChunks.LOGGER.info("Unclaimed {} chunks for {} ({}) due to claim limits", unclaimed, transferFrom, fromName);
+		FTBChunks.LOGGER.info("Team {} had {} claimed chunks, now has {}", toName, nChunks, nChunks + transferred);
 	}
 
 	private void teamOwnershipTransferred(PlayerTransferredTeamOwnershipEvent event) {

common/src/main/java/dev/ftb/mods/ftbchunks/FTBChunksCommands.java

@@ -2,17 +2,19 @@
 
 import com.mojang.brigadier.CommandDispatcher;
 import com.mojang.brigadier.arguments.IntegerArgumentType;
+import com.mojang.brigadier.arguments.StringArgumentType;
 import com.mojang.brigadier.builder.RequiredArgumentBuilder;
 import com.mojang.brigadier.context.CommandContext;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import com.mojang.brigadier.tree.LiteralCommandNode;
-import com.mojang.util.UUIDTypeAdapter;
+import com.mojang.util.UndashedUuid;
 import dev.ftb.mods.ftbchunks.api.ChunkTeamData;
 import dev.ftb.mods.ftbchunks.api.ClaimResult;
 import dev.ftb.mods.ftbchunks.api.ClaimedChunk;
 import dev.ftb.mods.ftbchunks.data.ChunkTeamDataImpl;
 import dev.ftb.mods.ftbchunks.data.ClaimedChunkImpl;
 import dev.ftb.mods.ftbchunks.data.ClaimedChunkManagerImpl;
+import dev.ftb.mods.ftbchunks.net.AddWaypointPacket;
 import dev.ftb.mods.ftbchunks.net.LoadedChunkViewPacket;
 import dev.ftb.mods.ftbchunks.net.RequestBlockColorPacket;
 import dev.ftb.mods.ftbchunks.net.SendGeneralDataPacket;
@@ -24,11 +26,14 @@
 import dev.ftb.mods.ftbteams.data.TeamArgumentProvider;
 import it.unimi.dsi.fastutil.longs.Long2IntMaps;
 import it.unimi.dsi.fastutil.longs.Long2IntOpenHashMap;
+import net.minecraft.ChatFormatting;
 import net.minecraft.commands.CommandBuildContext;
 import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.commands.Commands;
+import net.minecraft.commands.arguments.ColorArgument;
 import net.minecraft.commands.arguments.DimensionArgument;
 import net.minecraft.commands.arguments.EntityArgument;
+import net.minecraft.commands.arguments.coordinates.BlockPosArgument;
 import net.minecraft.commands.arguments.coordinates.ColumnPosArgument;
 import net.minecraft.commands.arguments.coordinates.Coordinates;
 import net.minecraft.core.BlockPos;
@@ -179,11 +184,36 @@ public static void registerCommands(CommandDispatcher<CommandSourceStack> dispat
 							return 1;
 						})
 				)
+				.then(Commands.literal("waypoint")
+						.then(Commands.literal("add")
+								.then(Commands.argument("name", StringArgumentType.string())
+										.then(Commands.argument("position", BlockPosArgument.blockPos())
+												.executes(context -> addWaypoint(context.getSource(), StringArgumentType.getString(context, "name"), BlockPosArgument.getLoadedBlockPos(context, "position")))
+												.then(Commands.argument("color", ColorArgument.color())
+														.executes(context -> addWaypoint(context.getSource(), StringArgumentType.getString(context, "name"), BlockPosArgument.getLoadedBlockPos(context, "position"), ColorArgument.getColor(context, "color")))
+												)
+										)
+								)
+						)
+				)
 		);
 
 		dispatcher.register(Commands.literal("chunks").redirect(command));
 	}
 
+	private static int addWaypoint(CommandSourceStack source, String name, BlockPos position, ChatFormatting color) throws CommandSyntaxException {
+		if (color.getColor() != null) {
+			ServerPlayer player = source.getPlayerOrException();
+			new AddWaypointPacket(name, position, color.getColor()).sendTo(player);
+		}
+		return 1;
+	}
+
+	private static int addWaypoint(CommandSourceStack source, String name, BlockPos position) throws CommandSyntaxException {
+		int idx = source.getPlayerOrException().getRandom().nextInt(ChatFormatting.values().length);
+		return addWaypoint(source, name, position, ChatFormatting.values()[idx]);
+	}
+
 	private static int bypassProtection(CommandSourceStack source) throws CommandSyntaxException {
 		ServerPlayer player = source.getPlayerOrException();
 		ClaimedChunkManagerImpl manager = claimManager();
@@ -327,7 +357,7 @@ private static int info(CommandSourceStack source, ChunkDimPos pos) {
 			return 0;
 		}
 
-		source.sendSuccess(() -> Component.literal("Owner: ").append(chunk.getTeamData().getTeam().getColoredName()).append(" / " + UUIDTypeAdapter.fromUUID(chunk.getTeamData().getTeam().getId())), true);
+		source.sendSuccess(() -> Component.literal("Owner: ").append(chunk.getTeamData().getTeam().getColoredName()).append(" / " + UndashedUuid.toString(chunk.getTeamData().getTeam().getId())), true);
 
 		if (source.hasPermission(2)) {
 			source.sendSuccess(() -> Component.literal("Force Loaded: " + chunk.isForceLoaded()), true);

common/src/main/java/dev/ftb/mods/ftbchunks/client/FTBChunksClient.java

@@ -23,6 +23,7 @@
 import dev.ftb.mods.ftbchunks.api.client.icon.MapType;
 import dev.ftb.mods.ftbchunks.api.client.icon.WaypointIcon;
 import dev.ftb.mods.ftbchunks.api.client.waypoint.Waypoint;
+import dev.ftb.mods.ftbchunks.client.gui.AddWaypointOverlay;
 import dev.ftb.mods.ftbchunks.client.gui.ChunkScreen;
 import dev.ftb.mods.ftbchunks.client.gui.LargeMapScreen;
 import dev.ftb.mods.ftbchunks.client.gui.WaypointEditorScreen;
@@ -31,16 +32,18 @@
 import dev.ftb.mods.ftbchunks.client.mapicon.*;
 import dev.ftb.mods.ftbchunks.net.PartialPackets;
 import dev.ftb.mods.ftbchunks.net.SendGeneralDataPacket.GeneralChunkData;
+import dev.ftb.mods.ftblibrary.config.ColorConfig;
 import dev.ftb.mods.ftblibrary.config.StringConfig;
-import dev.ftb.mods.ftblibrary.config.ui.EditConfigFromStringScreen;
 import dev.ftb.mods.ftblibrary.icon.Color4I;
 import dev.ftb.mods.ftblibrary.icon.FaceIcon;
 import dev.ftb.mods.ftblibrary.icon.Icon;
 import dev.ftb.mods.ftblibrary.math.MathUtils;
 import dev.ftb.mods.ftblibrary.math.XZ;
 import dev.ftb.mods.ftblibrary.snbt.SNBTCompoundTag;
+import dev.ftb.mods.ftblibrary.ui.BaseScreen;
 import dev.ftb.mods.ftblibrary.ui.CustomClickEvent;
 import dev.ftb.mods.ftblibrary.ui.GuiHelper;
+import dev.ftb.mods.ftblibrary.ui.Theme;
 import dev.ftb.mods.ftblibrary.ui.input.Key;
 import dev.ftb.mods.ftblibrary.util.StringUtils;
 import dev.ftb.mods.ftblibrary.util.client.ClientUtils;
@@ -145,7 +148,7 @@ public enum FTBChunksClient {
 	private Matrix4f worldMatrix;
 	private Vec3 cameraPos;
 
-	public void init() {
+    public void init() {
 		if (Minecraft.getInstance() == null) {
 			return;
 		}
@@ -362,7 +365,7 @@ public EventResult keyPressed(Minecraft client, int keyCode, int scanCode, int a
 	public EventResult keyPressed(Minecraft client, Screen screen, int keyCode, int scanCode, int modifiers) {
 		if (doesKeybindMatch(openMapKey, keyCode, scanCode, modifiers)) {
 			LargeMapScreen gui = ClientUtils.getCurrentGuiAs(LargeMapScreen.class);
-			if (gui != null) {
+			if (gui != null && !gui.anyModalPanelOpen()) {
 				gui.closeGui(false);
 				return EventResult.interruptTrue();
 			}
@@ -377,16 +380,9 @@ private EventResult addQuickWaypoint() {
 		if (player == null) return EventResult.pass();
 
 		return MapManager.getInstance().map(manager -> {
-			new EditConfigFromStringScreen<>(name, set -> {
-				if (set && !name.getValue().isEmpty()) {
-					MapDimension mapDimension = manager.getDimension(player.level().dimension());
-					WaypointImpl waypoint = new WaypointImpl(WaypointType.DEFAULT, mapDimension, player.blockPosition())
-							.setName(name.getValue())
-							.setColor(Color4I.hsb(MathUtils.RAND.nextFloat(), 1F, 1F).rgba());
-					mapDimension.getWaypointManager().add(waypoint);
-				}
-				openGui();
-			}).openGuiLater();  // later needed to prevent keypress being passed into gui
+			BaseScreen screen = new WaypointAddScreen(name, player);
+			screen.openGuiLater();
+			// later needed to prevent keypress being passed into gui
 			return EventResult.interruptTrue();
 		}).orElse(EventResult.pass());
 	}
@@ -506,14 +502,14 @@ public void renderHud(GuiGraphics graphics, float tickDelta) {
 			currentPlayerChunkZ = cz;
 		}
 
-		if (mc.options.renderDebug || !FTBChunksClientConfig.MINIMAP_ENABLED.get() || FTBChunksClientConfig.MINIMAP_VISIBILITY.get() == 0 || !FTBChunksWorldConfig.shouldShowMinimap(mc.player)) {
+		if (mc.getDebugOverlay().showDebugScreen() || !FTBChunksClientConfig.MINIMAP_ENABLED.get() || FTBChunksClientConfig.MINIMAP_VISIBILITY.get() == 0 || !FTBChunksWorldConfig.shouldShowMinimap(mc.player)) {
 			return;
 		}
 
 		float scale;
 		if (FTBChunksClientConfig.MINIMAP_PROPORTIONAL.get()) {
 			scale = (float) (4D / guiScale);
-			scale *= (scaledWidth / 10f) / (scale * 64D) * FTBChunksClientConfig.MINIMAP_SCALE.get();
+			scale *= (scaledWidth / 10f) / (scale * 64f) * FTBChunksClientConfig.MINIMAP_SCALE.get().floatValue();
 		} else {
 			scale = (float) (FTBChunksClientConfig.MINIMAP_SCALE.get() * 4D / guiScale);
 		}
@@ -1161,4 +1157,50 @@ public List<Component> getChunkSummary() {
 	public int getMinimapTextureId() {
 		return minimapTextureId;
 	}
+
+	public static Waypoint addWaypoint(Player player, String name, BlockPos position, int color) {
+		return FTBChunksAPI.clientApi().getWaypointManager(player.level().dimension()).map(mgr -> {
+			Waypoint wp = mgr.addWaypointAt(position, name);
+			wp.setColor(color);
+			return wp;
+		}).orElse(null);
+	}
+
+	private static class WaypointAddScreen extends BaseScreen {
+		private final StringConfig name;
+		private final Player player;
+
+		public WaypointAddScreen(StringConfig name, Player player) {
+			super();
+			this.name = name;
+			this.player = player;
+			this.setHeight(35);
+		}
+
+		@Override
+		public void drawBackground(GuiGraphics graphics, Theme theme, int x, int y, int w, int h) {
+		}
+
+		@Override
+		public void addWidgets() {
+			ColorConfig col = new ColorConfig();
+			col.setValue(Color4I.hsb(MathUtils.RAND.nextFloat(), 1F, 1F));
+			AddWaypointOverlay overlay = new AddWaypointOverlay(this, name, col, set -> {
+				if (set && !name.getValue().isEmpty()) {
+					Waypoint wp = addWaypoint(player, name.getValue(), player.blockPosition(), col.getValue().rgba());
+					Minecraft.getInstance().player.displayClientMessage(
+							Component.translatable("ftbchunks.waypoint_added",
+									Component.literal(wp.getName()).withStyle(ChatFormatting.YELLOW)
+							), true);
+				}
+			}) {
+				@Override
+				public void onClosed() {
+					closeGui();
+				}
+			};
+			overlay.setWidth(this.width);
+			pushModalPanel(overlay);
+		}
+	}
 }