fix keyboard item & module

and also reordered override with nullcheck

Author: zyxkad

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

@@ -10,11 +10,10 @@
 import de.srendi.advancedperipherals.common.addons.refinedstorage.RSApi;
 import de.srendi.advancedperipherals.common.blocks.base.ICapabilityProvider;
 import de.srendi.advancedperipherals.common.configuration.APConfig;
-import de.srendi.advancedperipherals.common.items.SmartGlassesItem;
+// import de.srendi.advancedperipherals.common.items.SmartGlassesItem;
 import de.srendi.advancedperipherals.common.setup.APItems;
 import de.srendi.advancedperipherals.common.setup.APRegistration;
 import de.srendi.advancedperipherals.common.util.ChunkManager;
-import net.minecraft.core.Direction;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.level.ItemLike;
 import net.neoforged.bus.api.IEventBus;

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

@@ -15,27 +15,27 @@
 
 public class MetaTurtleUpgradeModeller<T extends ClockwiseAnimatedTurtleUpgrade<?>> implements TurtleUpgradeModeller<T> {
 
-    @NotNull
     @Override
-    public TransformedModel getModel(T upgrade, @Nullable ITurtleAccess turtle, TurtleSide side, DataComponentPatch dataComponentPatch) {
-        if (upgrade.getLeftModel() == null) {
-            PoseStack stack = new PoseStack();
-            stack.pushPose();
-            stack.translate(0.0f, 0.5f, 0.5f);
-            if (turtle != null) {
-                int rotationStep = DataStorageUtil.RotationCharge.get(turtle, side);
-                stack.mulPose(Axis.XN.rotationDegrees(-10f * rotationStep));
-            }
-            stack.translate(0.0f, -0.5f, -0.5f);
-            stack.mulPose(Axis.YN.rotationDegrees(90));
-            if (side == TurtleSide.LEFT) {
-                stack.translate(0, 0, -0.6);
-            } else {
-                stack.translate(0, 0, -1.4);
-            }
-            return TransformedModel.of(upgrade.getCraftingItem(), new Transformation(stack.last().pose()));
+    @NotNull
+    public TransformedModel getModel(@NotNull T upgrade, @Nullable ITurtleAccess turtle, TurtleSide side, DataComponentPatch dataComponentPatch) {
+        if (upgrade.getLeftModel() != null) {
+            return TransformedModel.of(side == TurtleSide.LEFT ? upgrade.getLeftModel() : upgrade.getRightModel());
+        }
+        PoseStack stack = new PoseStack();
+        stack.pushPose();
+        stack.translate(0.0f, 0.5f, 0.5f);
+        if (turtle != null) {
+            int rotationStep = DataStorageUtil.RotationCharge.get(turtle, side);
+            stack.mulPose(Axis.XN.rotationDegrees(-10f * rotationStep));
+        }
+        stack.translate(0.0f, -0.5f, -0.5f);
+        stack.mulPose(Axis.YN.rotationDegrees(90));
+        if (side == TurtleSide.LEFT) {
+            stack.translate(0, 0, -0.6);
+        } else {
+            stack.translate(0, 0, -1.4);
         }
-        return TransformedModel.of(side == TurtleSide.LEFT ? upgrade.getLeftModel() : upgrade.getRightModel());
+        return TransformedModel.of(upgrade.getCraftingItem(), new Transformation(stack.last().pose()));
     }
 
 }

src/main/java/de/srendi/advancedperipherals/common/addons/ae2/WiredCableP2PTunnelPart.java

@@ -142,26 +142,26 @@ public void onNeighborChanged(BlockGetter level, BlockPos pos, BlockPos neighbor
     private class P2PWiredElement implements WiredElement {
         private final WiredNode node = ComputerCraftAPI.createWiredNodeForElement(this);
 
-        @NotNull
         @Override
+        @NotNull
         public WiredNode getNode() {
             return node;
         }
 
-        @NotNull
         @Override
+        @NotNull
         public String getSenderID() {
             return "p2p";
         }
 
-        @NotNull
         @Override
+        @NotNull
         public Level getLevel() {
             return WiredCableP2PTunnelPart.this.getLevel();
         }
 
-        @NotNull
         @Override
+        @NotNull
         public Vec3 getPosition() {
             return Vec3.atCenterOf(WiredCableP2PTunnelPart.this.getBlockEntity().getBlockPos());
         }

src/main/java/de/srendi/advancedperipherals/common/addons/appliedenergistics/MEChemicalHandler.java

@@ -32,8 +32,8 @@ public MEChemicalHandler(@NotNull MEStorage storageMonitor, @NotNull IActionSour
         this.actionSource = actionSource;
     }
 
-    @NotNull
     @Override
+    @NotNull
     public ChemicalStack insertChemical(ChemicalStack resource, @NotNull Action action) {
         if (resource.isEmpty()) {
             return resource;

src/main/java/de/srendi/advancedperipherals/common/addons/appliedenergistics/MEItemHandler.java

@@ -31,8 +31,8 @@ public MEItemHandler(@NotNull MEStorage storageMonitor, @NotNull IActionSource a
         this.actionSource = actionSource;
     }
 
-    @NotNull
     @Override
+    @NotNull
     public ItemStack insertItem(@NotNull ItemStack stack, boolean simulate) {
         AEItemKey itemKey = AEItemKey.of(stack);
         long inserted = storageMonitor.insert(itemKey, stack.getCount(), simulate ? Actionable.SIMULATE : Actionable.MODULATE, actionSource);

src/main/java/de/srendi/advancedperipherals/common/addons/computercraft/integrations/NoteBlockIntegration.java

@@ -19,10 +19,10 @@ public NoteBlockIntegration(Level world, BlockPos pos) {
         super(world, pos);
     }
 
-    @NotNull
     @Override
+    @NotNull
     public String getType() {
-        return "noteBlock";
+        return "note_block";
     }
 
     @LuaFunction(mainThread = true)

…ercraft/owner/TileEntityFuelAbility.java …rcraft/owner/BlockEntityFuelAbility.javasrc/main/java/de/srendi/advancedperipherals/common/addons/computercraft/owner/TileEntityFuelAbility.java renamed to src/main/java/de/srendi/advancedperipherals/common/addons/computercraft/owner/BlockEntityFuelAbility.java src/main/java/de/srendi/advancedperipherals/common/addons/computercraft/owner/TileEntityFuelAbility.java renamed to src/main/java/de/srendi/advancedperipherals/common/addons/computercraft/owner/BlockEntityFuelAbility.java

@@ -7,9 +7,9 @@
 import net.neoforged.neoforge.energy.IEnergyStorage;
 import org.jetbrains.annotations.NotNull;
 
-public class TileEntityFuelAbility<T extends BlockEntity & IPeripheralBlockEntity> extends FuelAbility<BlockEntityPeripheralOwner<T>> {
+public class BlockEntityFuelAbility<T extends BlockEntity & IPeripheralBlockEntity> extends FuelAbility<BlockEntityPeripheralOwner<T>> {
 
-    public TileEntityFuelAbility(@NotNull BlockEntityPeripheralOwner<T> owner) {
+    public BlockEntityFuelAbility(@NotNull BlockEntityPeripheralOwner<T> owner) {
         super(owner);
     }
 

src/main/java/de/srendi/advancedperipherals/common/addons/computercraft/owner/BlockEntityPeripheralOwner.java

@@ -23,21 +23,24 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.Objects;
-
 public class BlockEntityPeripheralOwner<T extends BlockEntity & IPeripheralBlockEntity> extends BasePeripheralOwner {
+    @NotNull
+    private final T blockEntity;
 
-    public final T tileEntity;
-
-    public BlockEntityPeripheralOwner(T tileEntity) {
+    public BlockEntityPeripheralOwner(@NotNull T blockEntity) {
         super();
-        this.tileEntity = tileEntity;
+        this.blockEntity = blockEntity;
+    }
+
+    @NotNull
+    public final T getBlockEntity() {
+        return blockEntity;
     }
 
-    @Nullable
     @Override
+    @Nullable
     public String getCustomName() {
-        if (!(tileEntity instanceof Nameable nameableEntity)) {
+        if (!(blockEntity instanceof Nameable nameableEntity)) {
             return null;
         }
         Component name = nameableEntity.getCustomName();
@@ -49,61 +52,61 @@ public String getCustomName() {
 
     @Override
     public void setCustomName(String name) {
-        if (!(tileEntity instanceof VarNameable nameableEntity)) {
+        if (!(blockEntity instanceof VarNameable nameableEntity)) {
             return;
         }
         name = StringUtil.validateName(name);
         nameableEntity.setName(name == null ? null : Component.literal(name));
     }
 
-    @NotNull
     @Override
+    @NotNull
     public Level getLevel() {
-        return Objects.requireNonNull(tileEntity.getLevel());
+        return blockEntity.getLevel();
     }
 
-    @NotNull
     @Override
+    @NotNull
     public BlockPos getPos() {
-        return tileEntity.getBlockPos();
+        return blockEntity.getBlockPos();
     }
 
-    @NotNull
     @Override
+    @NotNull
     public Direction getFacing() {
         return getFrontAndTop().front();
     }
 
-    @NotNull
     @Override
+    @NotNull
     public FrontAndTop getFrontAndTop() {
-        return tileEntity.getBlockState().getValue(BaseBlock.ORIENTATION);
+        return blockEntity.getBlockState().getValue(BaseBlock.ORIENTATION);
     }
 
-    @Nullable
     @Override
+    @Nullable
     public Entity getHoldingEntity() {
         return null;
     }
 
-    @Nullable
     @Override
+    @Nullable
     public Player getOwner() {
         return null;
     }
 
     @Override
     public DataComponentPatch getDataStorage() {
-        return DataStorageUtil.getDataStorage(tileEntity);
+        return DataStorageUtil.getDataStorage(blockEntity);
     }
 
     @Override
     public void putDataStorage(DataComponentPatch dataStorage) {
-        DataStorageUtil.putDataStorage(tileEntity, dataStorage);
+        DataStorageUtil.putDataStorage(blockEntity, dataStorage);
     }
 
     @Override
-    public <T1> T1 withPlayer(APFakePlayer.Action<T1> function) throws LuaException {
+    public <U> U withPlayer(APFakePlayer.Action<U> function) throws LuaException {
         throw new NotImplementedException();
     }
 
@@ -120,25 +123,16 @@ public ItemStack storeItem(ItemStack stored) {
 
     @Override
     public void destroyUpgrade() {
-        getLevel().removeBlock(tileEntity.getBlockPos(), false);
-    }
-
-    @Override
-    public boolean isMovementPossible(@NotNull Level level, @NotNull BlockPos pos) {
-        return false;
-    }
-
-    @Override
-    public boolean move(@NotNull Level level, @NotNull BlockPos pos) {
-        return false;
+        getLevel().removeBlock(blockEntity.getBlockPos(), false);
     }
 
     public BlockEntityPeripheralOwner<T> attachFuel() {
-        attachAbility(PeripheralOwnerAbility.FUEL, new TileEntityFuelAbility<>(this));
+        attachAbility(PeripheralOwnerAbility.FUEL, new BlockEntityFuelAbility<>(this));
         return this;
     }
 
     @Override
+    @Nullable
     public <U extends IPeripheral> U getConnectedPeripheral(Class<U> type) {
         throw new NotImplementedException();
     }

src/main/java/de/srendi/advancedperipherals/common/addons/computercraft/owner/IPeripheralOwner.java

@@ -35,7 +35,7 @@ public interface IPeripheralOwner {
     @Nullable
     default String getCustomName() {
         Optional<? extends Component> component = this.getDataStorage().get(DataComponents.CUSTOM_NAME);
-        if (component == null || component.isPresent()) {
+        if (component == null || !component.isPresent()) {
             return null;
         }
         return component.get().getString();
@@ -138,9 +138,13 @@ default PatchedDataComponentMap getPatchedDataStorage(DataComponentMap defaults)
 
     void destroyUpgrade();
 
-    boolean isMovementPossible(@NotNull Level level, @NotNull BlockPos pos);
+    default boolean isMovementPossible(@NotNull Level level, @NotNull BlockPos pos) {
+        return false;
+    }
 
-    boolean move(@NotNull Level level, @NotNull BlockPos pos);
+    default boolean move(@NotNull Level level, @NotNull BlockPos pos) {
+        return false;
+    }
 
     <T extends IOwnerAbility> void attachAbility(PeripheralOwnerAbility<T> ability, T abilityImplementation);
 
@@ -162,6 +166,7 @@ default void attachOperation(Collection<IPeripheralOperation<?>> operations) {
             operationAbility.registerOperation(operation);
     }
 
+    @Nullable
     <T extends IPeripheral> T getConnectedPeripheral(Class<T> type);
 
     default boolean hasConnectedPeripheral(Class<? extends IPeripheral> type) {

src/main/java/de/srendi/advancedperipherals/common/addons/computercraft/owner/InventoryManagerOwner.java

@@ -9,9 +9,9 @@ public InventoryManagerOwner(InventoryManagerEntity tile) {
         super(tile);
     }
 
-    @Nullable
     @Override
+    @Nullable
     public Player getOwner() {
-        return tileEntity.getOwnerPlayer();
+        return getBlockEntity().getOwnerPlayer();
     }
 }