删除调试信息
This commit is contained in:
parent
846cc7d02d
commit
b2b6b24231
|
|
@ -270,24 +270,16 @@ public abstract class GuiExPatternTerminalMixin extends AEBaseScreen<AEBaseMenu>
|
||||||
|
|
||||||
// 发送我们自己的 C2S 包:OpenProviderUiC2SPacket
|
// 发送我们自己的 C2S 包:OpenProviderUiC2SPacket
|
||||||
try {
|
try {
|
||||||
if (this.minecraft != null && this.minecraft.player != null) {
|
|
||||||
this.minecraft.player.displayClientMessage(Component.literal("↗ 正在请求打开供应器界面..."), true);
|
|
||||||
}
|
|
||||||
ModNetwork.CHANNEL.sendToServer(new OpenProviderUiC2SPacket(
|
ModNetwork.CHANNEL.sendToServer(new OpenProviderUiC2SPacket(
|
||||||
posLong,
|
posLong,
|
||||||
new ResourceLocation(dimStr),
|
new ResourceLocation(dimStr),
|
||||||
faceOrd
|
faceOrd
|
||||||
));
|
));
|
||||||
if (this.minecraft != null && this.minecraft.player != null) {
|
|
||||||
EAP_LOGGER.info("[EPlus] Sent OpenProviderUiC2SPacket: pos={}, dim={}, face={}", posLong, dimStr, faceOrd);
|
|
||||||
}
|
|
||||||
} catch (Throwable t) {
|
} catch (Throwable t) {
|
||||||
if (this.minecraft != null && this.minecraft.player != null) {
|
// 静默失败:不提示玩家
|
||||||
this.minecraft.player.displayClientMessage(Component.literal("❌ ExtendedAE Plus: 发送打开UI请求失败"), true);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
} catch (Throwable t) {
|
} catch (Throwable t) {
|
||||||
EAP_LOGGER.warn("[EPlus] eap$tryOpenProviderUI failed: {}", t.toString());
|
// 静默失败:不输出日志
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -537,11 +529,7 @@ public abstract class GuiExPatternTerminalMixin extends AEBaseScreen<AEBaseMenu>
|
||||||
|
|
||||||
int visibleRows = acc.getVisibleRows();
|
int visibleRows = acc.getVisibleRows();
|
||||||
|
|
||||||
if (!eap$debugLoggedOnce) {
|
// 生产环境移除调试日志
|
||||||
EAP_LOGGER.info("[EPlus] GuiExPatternTerminalMixin.afterDrawFG fired: rows={}, currentScroll={}, visibleRows={}",
|
|
||||||
rows.size(), currentScroll, visibleRows);
|
|
||||||
eap$debugLoggedOnce = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
// 先隐藏旧按钮,避免残留
|
// 先隐藏旧按钮,避免残留
|
||||||
for (Button b : this.eap$openUIButtons.values()) {
|
for (Button b : this.eap$openUIButtons.values()) {
|
||||||
|
|
@ -576,11 +564,7 @@ public abstract class GuiExPatternTerminalMixin extends AEBaseScreen<AEBaseMenu>
|
||||||
btn.visible = true;
|
btn.visible = true;
|
||||||
shownCount++;
|
shownCount++;
|
||||||
}
|
}
|
||||||
if (shownCount == 0) {
|
// 生产环境移除调试日志
|
||||||
EAP_LOGGER.debug("[EPlus] No GroupHeaderRow visible in current page (scroll={}, rows={})", currentScroll, rows.size());
|
|
||||||
} else {
|
|
||||||
EAP_LOGGER.debug("[EPlus] GroupHeaderRow buttons shown count: {}", shownCount);
|
|
||||||
}
|
|
||||||
} catch (Throwable ignored) {
|
} catch (Throwable ignored) {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -19,8 +19,6 @@ import net.minecraftforge.network.NetworkEvent;
|
||||||
import net.minecraftforge.network.NetworkHooks;
|
import net.minecraftforge.network.NetworkHooks;
|
||||||
|
|
||||||
import java.util.function.Supplier;
|
import java.util.function.Supplier;
|
||||||
import org.apache.logging.log4j.LogManager;
|
|
||||||
import org.apache.logging.log4j.Logger;
|
|
||||||
|
|
||||||
public class OpenProviderUiC2SPacket {
|
public class OpenProviderUiC2SPacket {
|
||||||
private final long posLong;
|
private final long posLong;
|
||||||
|
|
@ -52,21 +50,17 @@ public class OpenProviderUiC2SPacket {
|
||||||
context.enqueueWork(() -> {
|
context.enqueueWork(() -> {
|
||||||
ServerPlayer player = context.getSender();
|
ServerPlayer player = context.getSender();
|
||||||
if (player == null) return;
|
if (player == null) return;
|
||||||
Logger logger = LogManager.getLogger("ExtendedAE_Plus");
|
|
||||||
|
|
||||||
// 校验维度与方块
|
// 校验维度与方块
|
||||||
ResourceKey<Level> levelKey = ResourceKey.create(Registries.DIMENSION, msg.dimId);
|
ResourceKey<Level> levelKey = ResourceKey.create(Registries.DIMENSION, msg.dimId);
|
||||||
ServerLevel level = player.server.getLevel(levelKey);
|
ServerLevel level = player.server.getLevel(levelKey);
|
||||||
if (level == null) {
|
if (level == null) {
|
||||||
logger.warn("[EPlus] OpenProviderUiC2SPacket: invalid dimension {}", msg.dimId);
|
|
||||||
player.displayClientMessage(net.minecraft.network.chat.Component.literal("❌ 维度无效:" + msg.dimId), true);
|
|
||||||
return; // 无效维度
|
return; // 无效维度
|
||||||
}
|
}
|
||||||
|
|
||||||
BlockPos pos = BlockPos.of(msg.posLong);
|
BlockPos pos = BlockPos.of(msg.posLong);
|
||||||
if (!level.isLoaded(pos)) {
|
if (!level.isLoaded(pos)) {
|
||||||
logger.warn("[EPlus] OpenProviderUiC2SPacket: chunk not loaded at {} in {}", pos, msg.dimId);
|
|
||||||
player.displayClientMessage(net.minecraft.network.chat.Component.literal("❌ 区块未加载:" + pos.toShortString()), true);
|
|
||||||
return; // 区块未加载
|
return; // 区块未加载
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -83,14 +77,12 @@ public class OpenProviderUiC2SPacket {
|
||||||
BlockEntity tbe = level.getBlockEntity(targetPos);
|
BlockEntity tbe = level.getBlockEntity(targetPos);
|
||||||
if (tbe instanceof MenuProvider provider) {
|
if (tbe instanceof MenuProvider provider) {
|
||||||
NetworkHooks.openScreen(player, provider, targetPos);
|
NetworkHooks.openScreen(player, provider, targetPos);
|
||||||
logger.debug("[EPlus] OpenProviderUiC2SPacket: opened BE MenuProvider at {} (neighbor via {})", targetPos, dir);
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
var tstate = level.getBlockState(targetPos);
|
var tstate = level.getBlockState(targetPos);
|
||||||
MenuProvider provider2 = tstate.getMenuProvider(level, targetPos);
|
MenuProvider provider2 = tstate.getMenuProvider(level, targetPos);
|
||||||
if (provider2 != null) {
|
if (provider2 != null) {
|
||||||
NetworkHooks.openScreen(player, provider2, targetPos);
|
NetworkHooks.openScreen(player, provider2, targetPos);
|
||||||
logger.debug("[EPlus] OpenProviderUiC2SPacket: opened State MenuProvider at {} (neighbor via {})", targetPos, dir);
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -105,9 +97,7 @@ public class OpenProviderUiC2SPacket {
|
||||||
var state2 = level.getBlockState(targetPos);
|
var state2 = level.getBlockState(targetPos);
|
||||||
var hit = new BlockHitResult(Vec3.atCenterOf(targetPos), dir.getOpposite(), targetPos, false);
|
var hit = new BlockHitResult(Vec3.atCenterOf(targetPos), dir.getOpposite(), targetPos, false);
|
||||||
InteractionResult r = state2.use(level, player, hand, hit);
|
InteractionResult r = state2.use(level, player, hand, hit);
|
||||||
logger.debug("[EPlus] OpenProviderUiC2SPacket: fallback(use) at {} hit {} (via {}), result={}", targetPos, dir.getOpposite(), dir, r);
|
|
||||||
if (r.consumesAction()) {
|
if (r.consumesAction()) {
|
||||||
player.displayClientMessage(net.minecraft.network.chat.Component.literal("✅ 已尝试模拟右键交互: " + r), true);
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
|
@ -126,24 +116,18 @@ public class OpenProviderUiC2SPacket {
|
||||||
var state2 = level.getBlockState(targetPos);
|
var state2 = level.getBlockState(targetPos);
|
||||||
var hit = new BlockHitResult(Vec3.atCenterOf(targetPos), chosen.getOpposite(), targetPos, false);
|
var hit = new BlockHitResult(Vec3.atCenterOf(targetPos), chosen.getOpposite(), targetPos, false);
|
||||||
InteractionResult r = state2.use(level, player, hand, hit);
|
InteractionResult r = state2.use(level, player, hand, hit);
|
||||||
logger.debug("[EPlus] OpenProviderUiC2SPacket: fallback(use) at {} hit {} (auto via {}), result={}", targetPos, chosen.getOpposite(), chosen, r);
|
|
||||||
if (r.consumesAction()) {
|
if (r.consumesAction()) {
|
||||||
player.displayClientMessage(net.minecraft.network.chat.Component.literal("✅ 已尝试模拟右键交互: " + r), true);
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
logger.debug("[EPlus] OpenProviderUiC2SPacket: no neighbor candidate for fallback (faceOrd<0)");
|
// 无可选邻居
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
logger.debug("[EPlus] OpenProviderUiC2SPacket: skip fallback(use) because both hands occupied");
|
// 双手占用则跳过兜底交互
|
||||||
}
|
}
|
||||||
|
|
||||||
// 若走到这里,说明未能打开界面
|
context.setPacketHandled(true);
|
||||||
logger.warn("[EPlus] OpenProviderUiC2SPacket: No MenuProvider around {} (BE={}, Block={})", pos,
|
|
||||||
be == null ? "null" : be.getClass().getName(), stateAtPos.getBlock().getClass().getName());
|
|
||||||
player.displayClientMessage(net.minecraft.network.chat.Component.literal("❌ 未找到可打开的相邻界面"), true);
|
|
||||||
});
|
});
|
||||||
context.setPacketHandled(true);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user