1
This commit is contained in:
parent
1c7291b865
commit
7359d49dec
|
|
@ -5,8 +5,8 @@ import com.extendedae_plus.ae.wireless.LabelNetworkRegistry;
|
|||
import com.extendedae_plus.menu.LabeledWirelessTransceiverMenu;
|
||||
import com.extendedae_plus.network.LabelNetworkActionC2SPacket;
|
||||
import com.extendedae_plus.network.LabelNetworkListC2SPacket;
|
||||
import com.extendedae_plus.init.ModNetwork;
|
||||
import com.mojang.blaze3d.systems.RenderSystem;
|
||||
import net.neoforged.neoforge.network.PacketDistributor;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.gui.GuiGraphics;
|
||||
import net.minecraft.client.gui.components.EditBox;
|
||||
|
|
@ -109,7 +109,6 @@ public class LabeledWirelessTransceiverScreen extends AbstractContainerScreen<La
|
|||
|
||||
@Override
|
||||
public void render(GuiGraphics gfx, int mouseX, int mouseY, float partialTicks) {
|
||||
this.renderBackground(gfx);
|
||||
super.render(gfx, mouseX, mouseY, partialTicks);
|
||||
drawAllButtonText(gfx);
|
||||
this.renderTooltip(gfx, mouseX, mouseY);
|
||||
|
|
@ -184,13 +183,13 @@ public class LabeledWirelessTransceiverScreen extends AbstractContainerScreen<La
|
|||
}
|
||||
|
||||
@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)) {
|
||||
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 super.mouseScrolled(mouseX, mouseY, delta);
|
||||
return super.mouseScrolled(mouseX, mouseY, scrollDeltaX, scrollDeltaY);
|
||||
}
|
||||
|
||||
private void renderList(GuiGraphics gfx) {
|
||||
|
|
|
|||
|
|
@ -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.properties.BooleanProperty;
|
||||
import net.minecraft.world.phys.BlockHitResult;
|
||||
import net.neoforged.neoforge.network.MenuHooks;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
import com.extendedae_plus.init.ModBlockEntities;
|
||||
|
|
@ -68,7 +67,7 @@ public class LabeledWirelessTransceiverBlock extends Block implements EntityBloc
|
|||
if (!(be instanceof LabeledWirelessTransceiverBlockEntity te)) {
|
||||
return InteractionResult.PASS;
|
||||
}
|
||||
MenuHooks.openMenu((net.minecraft.server.level.ServerPlayer) player, te, pos);
|
||||
player.openMenu(te, pos);
|
||||
return InteractionResult.CONSUME;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -250,7 +250,7 @@ public class LabeledWirelessTransceiverBlockEntity extends AEBaseBlockEntity imp
|
|||
}
|
||||
|
||||
@Override
|
||||
protected void saveAdditional(CompoundTag tag, HolderLookup.Provider registries) {
|
||||
public void saveAdditional(CompoundTag tag, HolderLookup.Provider registries) {
|
||||
super.saveAdditional(tag, registries);
|
||||
tag.putLong("frequency", frequency);
|
||||
if (labelForDisplay != null) {
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ import snownee.jade.api.IServerDataProvider;
|
|||
public enum LabeledWirelessTransceiverProvider implements IServerDataProvider<BlockAccessor> {
|
||||
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
|
||||
public ResourceLocation getUid() {
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ public record LabelNetworkActionC2SPacket(BlockPos pos, String label, Action act
|
|||
ctx.enqueueWork(() -> {
|
||||
var player = ctx.player();
|
||||
if (player == null) return;
|
||||
var level = player.serverLevel();
|
||||
var level = (net.minecraft.server.level.ServerLevel) player.level();
|
||||
if (!level.hasChunkAt(packet.pos)) return;
|
||||
var be = level.getBlockEntity(packet.pos);
|
||||
if (!(be instanceof LabeledWirelessTransceiverBlockEntity te)) return;
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ public record LabelNetworkListC2SPacket(BlockPos pos) implements CustomPacketPay
|
|||
ctx.enqueueWork(() -> {
|
||||
var player = ctx.player();
|
||||
if (player == null) return;
|
||||
var level = player.serverLevel();
|
||||
var level = (net.minecraft.server.level.ServerLevel) player.level();
|
||||
if (!level.hasChunkAt(pkt.pos)) return;
|
||||
var be = level.getBlockEntity(pkt.pos);
|
||||
if (!(be instanceof LabeledWirelessTransceiverBlockEntity te)) return;
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user