almost builds

Author: zyxkad

src/main/java/de/srendi/advancedperipherals/AdvancedPeripherals.java

@@ -1,6 +1,8 @@
 package de.srendi.advancedperipherals;
 
+import dan200.computercraft.api.media.MediaCapability;
 import dan200.computercraft.api.peripheral.PeripheralCapability;
+import dan200.computercraft.shared.media.MountMedia;
 import de.srendi.advancedperipherals.common.addons.APAddon;
 import de.srendi.advancedperipherals.common.addons.ae2.AE2Registries;
 import de.srendi.advancedperipherals.common.addons.appliedenergistics.AEApi;
@@ -16,6 +18,7 @@
 import de.srendi.advancedperipherals.common.util.ChunkManager;
 import de.srendi.advancedperipherals.common.village.VillageStructures;
 import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.level.ItemLike;
 import net.neoforged.bus.api.IEventBus;
 import net.neoforged.fml.ModLoadingContext;
 import net.neoforged.fml.common.Mod;

src/main/java/de/srendi/advancedperipherals/client/ClientEventSubscriber.java

@@ -18,7 +18,7 @@
 import net.neoforged.neoforge.event.entity.EntityMountEvent;
 import net.neoforged.neoforge.network.PacketDistributor;
 
-@EventBusSubscriber(modid = AdvancedPeripherals.MOD_ID, value = Dist.CLIENT)
+@EventBusSubscriber(Dist.CLIENT)
 public class ClientEventSubscriber {
     @SubscribeEvent
     public static void renderingHuds(RenderGuiLayerEvent.Pre event) {

src/main/java/de/srendi/advancedperipherals/client/ClientRegistry.java

@@ -14,6 +14,7 @@
 import de.srendi.advancedperipherals.common.setup.APContainerTypes;
 import de.srendi.advancedperipherals.common.setup.CCRegistration;
 import net.neoforged.api.distmarker.Dist;
+import net.neoforged.bus.api.EventPriority;
 import net.neoforged.bus.api.SubscribeEvent;
 import net.neoforged.fml.common.EventBusSubscriber;
 import net.neoforged.fml.event.lifecycle.FMLClientSetupEvent;
@@ -22,7 +23,7 @@
 import net.neoforged.neoforge.client.event.RegisterKeyMappingsEvent;
 import net.neoforged.neoforge.client.event.RegisterMenuScreensEvent;
 
-@EventBusSubscriber(modid = AdvancedPeripherals.MOD_ID, value = Dist.CLIENT)
+@EventBusSubscriber(Dist.CLIENT)
 public class ClientRegistry {
 
     public static final SaddleTurtleOverlay SADDLE_TURTLE_OVERLAY = new SaddleTurtleOverlay();

src/main/java/de/srendi/advancedperipherals/client/ClientWorker.java

@@ -9,7 +9,7 @@
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-@EventBusSubscriber(value = Dist.CLIENT, modid = AdvancedPeripherals.MOD_ID)
+@EventBusSubscriber(Dist.CLIENT)
 public class ClientWorker {
 
     private static final Map<String, Runnable> tasks = new ConcurrentHashMap<>();

src/main/java/de/srendi/advancedperipherals/client/screens/KeyboardScreen.java

@@ -8,17 +8,19 @@
 import com.mojang.blaze3d.platform.InputConstants;
 import com.mojang.blaze3d.platform.Window;
 import com.mojang.blaze3d.vertex.PoseStack;
-import dan200.computercraft.client.gui.ClientInputHandler;
+import dan200.computercraft.client.gui.ClientComputerActions;
+import dan200.computercraft.client.gui.ClientComputerInput;
 import dan200.computercraft.client.gui.widgets.TerminalWidget;
+import dan200.computercraft.core.input.UserComputerInput;
 import dan200.computercraft.core.terminal.Terminal;
-import dan200.computercraft.shared.computer.core.InputHandler;
 import de.srendi.advancedperipherals.client.ClientWorker;
 import de.srendi.advancedperipherals.common.container.KeyboardContainer;
 import de.srendi.advancedperipherals.common.network.toserver.KeyboardMouseClickPacket;
 import de.srendi.advancedperipherals.common.network.toserver.KeyboardMouseMovePacket;
 import de.srendi.advancedperipherals.common.network.toserver.KeyboardMouseScrollPacket;
 import net.minecraft.client.KeyMapping;
 import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.client.gui.screens.inventory.MenuAccess;
 import net.minecraft.network.chat.Component;
@@ -35,7 +37,8 @@
 public class KeyboardScreen extends Screen implements MenuAccess<KeyboardContainer> {
 
     protected final KeyboardContainer keyboardContainer;
-    protected final InputHandler input;
+    protected final UserComputerInput input;
+    protected final ClientComputerActions actions;
     private final Terminal terminalData;
     private TerminalWidget terminal;
     private MouseState mouseState = MouseState.RELEASED;
@@ -50,7 +53,8 @@ public class KeyboardScreen extends Screen implements MenuAccess<KeyboardContain
     public KeyboardScreen(KeyboardContainer keyboardContainer, Inventory inv, Component titleIn) {
         super(titleIn);
         this.keyboardContainer = keyboardContainer;
-        this.input = new ClientInputHandler(keyboardContainer);
+        this.input = new UserComputerInput(new ClientComputerInput(keyboardContainer), false, 0, 0);
+        this.actions = new ClientComputerActions(keyboardContainer);
         this.terminalData = new Terminal(0, 0, false);
     }
 
@@ -74,7 +78,7 @@ public void render(@NotNull GuiGraphics graphics, int x, int y, float partialTic
         // poseStack.scale(scale, scale, 1);
 
         Component text = Component.translatable("text.advancedperipherals.keyboard.close");
-        graphics.drawCenteredString(minecraft.font, text, screenWidth / 2f, 1, 0xFFFFFF);
+        graphics.drawCenteredString(minecraft.font, text, screenWidth / 2, 1, 0xFFFFFF);
     }
 
     @Override
@@ -89,7 +93,7 @@ protected void init() {
         super.init();
         // this.minecraft.keyboardHandler.setSendRepeatsToGui(true);
 
-        this.terminal = addWidget(new TerminalWidget(terminalData, new ClientInputHandler(this.keyboardContainer), 0, 0));
+        this.terminal = addWidget(new TerminalWidget(terminalData, this.input, this.actions, 0, 0));
         this.terminal.visible = false;
         this.terminal.active = false;
         setFocused(this.terminal);

src/main/java/de/srendi/advancedperipherals/client/screens/SaddleTurtleOverlay.java

@@ -142,7 +142,7 @@ private void renderDismountHint(PoseStack stack) {
     }
 
     @Override
-    public void render(@NonNull GuiGraphics guiGraphics, @NonNull DeltaTracker deltaTracker) {
+    public void render(@NotNull GuiGraphics guiGraphics, @NotNull DeltaTracker deltaTracker) {
         if (!this.isPlayerMountedOnTurtle()) {
             return;
         }

src/main/java/de/srendi/advancedperipherals/client/screens/SmartGlassesScreen.java

@@ -13,6 +13,7 @@
 import de.srendi.advancedperipherals.client.widgets.SmartGlassesSettingsSwitch;
 import de.srendi.advancedperipherals.common.container.SmartGlassesContainer;
 import de.srendi.advancedperipherals.common.smartglasses.SlotType;
+import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.util.FormattedCharSequence;
@@ -44,7 +45,13 @@ protected void init() {
 
     @Override
     protected TerminalWidget createTerminal() {
-        return new TerminalWidget(terminalData, input, leftPos + TurtleMenu.BORDER + AbstractComputerMenu.SIDEBAR_WIDTH, topPos + TurtleMenu.BORDER);
+        return new TerminalWidget(
+            terminalData,
+            computerInput,
+            computerActions,
+            leftPos + TurtleMenu.BORDER + AbstractComputerMenu.SIDEBAR_WIDTH,
+            topPos + TurtleMenu.BORDER
+        );
     }
 
     @Override

src/main/java/de/srendi/advancedperipherals/client/screens/base/BaseScreen.java

@@ -1,5 +1,6 @@
 package de.srendi.advancedperipherals.client.screens.base;
 
+import de.srendi.advancedperipherals.common.container.base.BaseContainer;
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
 import net.minecraft.network.chat.Component;

src/main/java/de/srendi/advancedperipherals/client/smartglasses/OverlayModuleLevelRenderer.java

@@ -21,16 +21,16 @@
 import net.minecraft.world.inventory.InventoryMenu;
 import net.minecraft.world.phys.Vec3;
 import net.neoforged.api.distmarker.Dist;
-import net.neoforged.eventbus.api.SubscribeEvent;
-import net.neoforged.fml.common.Mod;
+import net.neoforged.bus.api.SubscribeEvent;
+import net.neoforged.fml.common.EventBusSubscriber;
 import net.neoforged.neoforge.client.event.RenderLevelStageEvent;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-@Mod.EventBusSubscriber(value = Dist.CLIENT, bus = Mod.EventBusSubscriber.Bus.FORGE, modid = AdvancedPeripherals.MOD_ID)
+@EventBusSubscriber(Dist.CLIENT)
 public class OverlayModuleLevelRenderer {
 
     @SubscribeEvent

src/main/java/de/srendi/advancedperipherals/client/smartglasses/objects/threedim/BlockRenderer.java

@@ -16,7 +16,7 @@
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.phys.Vec3;
-import net.neoforged.client.event.RenderLevelStageEvent;
+import net.neoforged.neoforge.client.event.RenderLevelStageEvent;
 import org.joml.Quaternionf;
 
 import java.util.List;