R3944Realms/ExtendedAE_Plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
GaLi 2025-12-12 14:02:37 +08:00
parent 1c7291b865
commit 7359d49dec
6 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/extendedae_plus/client/screen/LabeledWirelessTransceiverScreen.java
View File

@ -5,8 +5,8 @@ import com.extendedae_plus.ae.wireless.LabelNetworkRegistry;
import com.extendedae_plus.menu.LabeledWirelessTransceiverMenu; import com.extendedae_plus.menu.LabeledWirelessTransceiverMenu;
import com.extendedae_plus.network.LabelNetworkActionC2SPacket; import com.extendedae_plus.network.LabelNetworkActionC2SPacket;
import com.extendedae_plus.network.LabelNetworkListC2SPacket; import com.extendedae_plus.network.LabelNetworkListC2SPacket;
import com.extendedae_plus.init.ModNetwork;
import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.systems.RenderSystem;
import net.neoforged.neoforge.network.PacketDistributor;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.GuiGraphics;
import net.minecraft.client.gui.components.EditBox; import net.minecraft.client.gui.components.EditBox;
@ -109,7 +109,6 @@ public class LabeledWirelessTransceiverScreen extends AbstractContainerScreen<La
@Override @Override
public void render(GuiGraphics gfx, int mouseX, int mouseY, float partialTicks) { public void render(GuiGraphics gfx, int mouseX, int mouseY, float partialTicks) {
this.renderBackground(gfx);
super.render(gfx, mouseX, mouseY, partialTicks); super.render(gfx, mouseX, mouseY, partialTicks);
drawAllButtonText(gfx); drawAllButtonText(gfx);
this.renderTooltip(gfx, mouseX, mouseY); this.renderTooltip(gfx, mouseX, mouseY);
@ -184,13 +183,13 @@ public class LabeledWirelessTransceiverScreen extends AbstractContainerScreen<La
} }
@Override @Override
public boolean mouseScrolled(double mouseX, double mouseY, double delta) { public boolean mouseScrolled(double mouseX, double mouseY, double scrollDeltaX, double scrollDeltaY) {
if (isMouseInList(mouseX, mouseY) || isMouseInScrollbar(mouseX, mouseY)) { if (isMouseInList(mouseX, mouseY) || isMouseInScrollbar(mouseX, mouseY)) {
int maxOffset = Math.max(0, filtered.size() - VISIBLE_ROWS); int maxOffset = Math.max(0, filtered.size() - VISIBLE_ROWS);
scrollOffset = Math.max(0, Math.min(maxOffset, scrollOffset - (int) Math.signum(delta))); scrollOffset = Math.max(0, Math.min(maxOffset, scrollOffset - (int) Math.signum(scrollDeltaY)));
return true; return true;
} }
return super.mouseScrolled(mouseX, mouseY, delta); return super.mouseScrolled(mouseX, mouseY, scrollDeltaX, scrollDeltaY);
} }
private void renderList(GuiGraphics gfx) { private void renderList(GuiGraphics gfx) {

3
src/main/java/com/extendedae_plus/content/wireless/LabeledWirelessTransceiverBlock.java
View File

@ -16,7 +16,6 @@ import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.block.state.StateDefinition; import net.minecraft.world.level.block.state.StateDefinition;
import net.minecraft.world.level.block.state.properties.BooleanProperty; import net.minecraft.world.level.block.state.properties.BooleanProperty;
import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.BlockHitResult;
import net.neoforged.neoforge.network.MenuHooks;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import com.extendedae_plus.init.ModBlockEntities; import com.extendedae_plus.init.ModBlockEntities;
@ -68,7 +67,7 @@ public class LabeledWirelessTransceiverBlock extends Block implements EntityBloc
if (!(be instanceof LabeledWirelessTransceiverBlockEntity te)) { if (!(be instanceof LabeledWirelessTransceiverBlockEntity te)) {
return InteractionResult.PASS; return InteractionResult.PASS;
} }
MenuHooks.openMenu((net.minecraft.server.level.ServerPlayer) player, te, pos); player.openMenu(te, pos);
return InteractionResult.CONSUME; return InteractionResult.CONSUME;
} }

2
src/main/java/com/extendedae_plus/content/wireless/LabeledWirelessTransceiverBlockEntity.java
View File

@ -250,7 +250,7 @@ public class LabeledWirelessTransceiverBlockEntity extends AEBaseBlockEntity imp
} }
@Override @Override
protected void saveAdditional(CompoundTag tag, HolderLookup.Provider registries) { public void saveAdditional(CompoundTag tag, HolderLookup.Provider registries) {
super.saveAdditional(tag, registries); super.saveAdditional(tag, registries);
tag.putLong("frequency", frequency); tag.putLong("frequency", frequency);
if (labelForDisplay != null) { if (labelForDisplay != null) {

2
src/main/java/com/extendedae_plus/integration/jade/LabeledWirelessTransceiverProvider.java
View File

@ -15,7 +15,7 @@ import snownee.jade.api.IServerDataProvider;
public enum LabeledWirelessTransceiverProvider implements IServerDataProvider<BlockAccessor> { public enum LabeledWirelessTransceiverProvider implements IServerDataProvider<BlockAccessor> {
INSTANCE; INSTANCE;
private static final ResourceLocation UID = new ResourceLocation("extendedae_plus", "labeled_wireless_info"); private static final ResourceLocation UID = ResourceLocation.fromNamespaceAndPath("extendedae_plus", "labeled_wireless_info");
@Override @Override
public ResourceLocation getUid() { public ResourceLocation getUid() {

2
src/main/java/com/extendedae_plus/network/LabelNetworkActionC2SPacket.java
View File

@ -36,7 +36,7 @@ public record LabelNetworkActionC2SPacket(BlockPos pos, String label, Action act
ctx.enqueueWork(() -> { ctx.enqueueWork(() -> {
var player = ctx.player(); var player = ctx.player();
if (player == null) return; if (player == null) return;
var level = player.serverLevel(); var level = (net.minecraft.server.level.ServerLevel) player.level();
if (!level.hasChunkAt(packet.pos)) return; if (!level.hasChunkAt(packet.pos)) return;
var be = level.getBlockEntity(packet.pos); var be = level.getBlockEntity(packet.pos);
if (!(be instanceof LabeledWirelessTransceiverBlockEntity te)) return; if (!(be instanceof LabeledWirelessTransceiverBlockEntity te)) return;

2
src/main/java/com/extendedae_plus/network/LabelNetworkListC2SPacket.java
View File

@ -33,7 +33,7 @@ public record LabelNetworkListC2SPacket(BlockPos pos) implements CustomPacketPay
ctx.enqueueWork(() -> { ctx.enqueueWork(() -> {
var player = ctx.player(); var player = ctx.player();
if (player == null) return; if (player == null) return;
var level = player.serverLevel(); var level = (net.minecraft.server.level.ServerLevel) player.level();
if (!level.hasChunkAt(pkt.pos)) return; if (!level.hasChunkAt(pkt.pos)) return;
var be = level.getBlockEntity(pkt.pos); var be = level.getBlockEntity(pkt.pos);
if (!(be instanceof LabeledWirelessTransceiverBlockEntity te)) return; if (!(be instanceof LabeledWirelessTransceiverBlockEntity te)) return;