From 99c60ac54be7619f8b42482fa8dd959036e087f7 Mon Sep 17 00:00:00 2001
From: Jonathan Coates <git@squiddev.cc>
Date: Thu, 25 Jul 2024 09:28:00 +0100
Subject: [PATCH] Remove IComputerBlockEntity

We only really made use of it in the has_computer_id loot condition, so
probably easier to remove it.
---
 .../blocks/AbstractComputerBlock.java         |  2 +-
 .../blocks/AbstractComputerBlockEntity.java   |  7 +-----
 .../computer/blocks/IComputerBlockEntity.java | 22 -------------------
 .../data/HasComputerIdLootCondition.java      |  4 ++--
 4 files changed, 4 insertions(+), 31 deletions(-)
 delete mode 100644 projects/common/src/main/java/dan200/computercraft/shared/computer/blocks/IComputerBlockEntity.java

diff --git a/projects/common/src/main/java/dan200/computercraft/shared/computer/blocks/AbstractComputerBlock.java b/projects/common/src/main/java/dan200/computercraft/shared/computer/blocks/AbstractComputerBlock.java
index 263456005..7647b36e6 100644
--- a/projects/common/src/main/java/dan200/computercraft/shared/computer/blocks/AbstractComputerBlock.java
+++ b/projects/common/src/main/java/dan200/computercraft/shared/computer/blocks/AbstractComputerBlock.java
@@ -146,7 +146,7 @@ public abstract class AbstractComputerBlock<T extends AbstractComputerBlockEntit
         super.setPlacedBy(world, pos, state, placer, stack);
 
         var tile = world.getBlockEntity(pos);
-        if (!world.isClientSide && tile instanceof IComputerBlockEntity computer && stack.getItem() instanceof IComputerItem item) {
+        if (!world.isClientSide && tile instanceof AbstractComputerBlockEntity computer && stack.getItem() instanceof IComputerItem item) {
 
             var id = item.getComputerID(stack);
             if (id != -1) computer.setComputerID(id);
diff --git a/projects/common/src/main/java/dan200/computercraft/shared/computer/blocks/AbstractComputerBlockEntity.java b/projects/common/src/main/java/dan200/computercraft/shared/computer/blocks/AbstractComputerBlockEntity.java
index 1dc74ba57..07db76314 100644
--- a/projects/common/src/main/java/dan200/computercraft/shared/computer/blocks/AbstractComputerBlockEntity.java
+++ b/projects/common/src/main/java/dan200/computercraft/shared/computer/blocks/AbstractComputerBlockEntity.java
@@ -38,7 +38,7 @@ import javax.annotation.Nullable;
 import java.util.Objects;
 import java.util.UUID;
 
-public abstract class AbstractComputerBlockEntity extends BlockEntity implements IComputerBlockEntity, Nameable, MenuProvider {
+public abstract class AbstractComputerBlockEntity extends BlockEntity implements Nameable, MenuProvider {
     private static final String NBT_ID = "ComputerId";
     private static final String NBT_LABEL = "Label";
     private static final String NBT_ON = "On";
@@ -300,17 +300,14 @@ public abstract class AbstractComputerBlockEntity extends BlockEntity implements
         for (var dir : DirectionUtil.FACINGS) updateRedstoneTo(dir);
     }
 
-    @Override
     public final int getComputerID() {
         return computerID;
     }
 
-    @Override
     public final @Nullable String getLabel() {
         return label;
     }
 
-    @Override
     public final void setComputerID(int id) {
         if (getLevel().isClientSide || computerID == id) return;
 
@@ -318,7 +315,6 @@ public abstract class AbstractComputerBlockEntity extends BlockEntity implements
         BlockEntityHelpers.updateBlock(this);
     }
 
-    @Override
     public final void setLabel(@Nullable String label) {
         if (getLevel().isClientSide || Objects.equals(this.label, label)) return;
 
@@ -328,7 +324,6 @@ public abstract class AbstractComputerBlockEntity extends BlockEntity implements
         BlockEntityHelpers.updateBlock(this);
     }
 
-    @Override
     public ComputerFamily getFamily() {
         return family;
     }
diff --git a/projects/common/src/main/java/dan200/computercraft/shared/computer/blocks/IComputerBlockEntity.java b/projects/common/src/main/java/dan200/computercraft/shared/computer/blocks/IComputerBlockEntity.java
deleted file mode 100644
index 226f179a6..000000000
--- a/projects/common/src/main/java/dan200/computercraft/shared/computer/blocks/IComputerBlockEntity.java
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright Daniel Ratcliffe, 2011-2022. Do not distribute without permission.
-//
-// SPDX-License-Identifier: LicenseRef-CCPL
-
-package dan200.computercraft.shared.computer.blocks;
-
-import dan200.computercraft.shared.computer.core.ComputerFamily;
-
-import javax.annotation.Nullable;
-
-public interface IComputerBlockEntity {
-    int getComputerID();
-
-    void setComputerID(int id);
-
-    @Nullable
-    String getLabel();
-
-    void setLabel(@Nullable String label);
-
-    ComputerFamily getFamily();
-}
diff --git a/projects/common/src/main/java/dan200/computercraft/shared/data/HasComputerIdLootCondition.java b/projects/common/src/main/java/dan200/computercraft/shared/data/HasComputerIdLootCondition.java
index d89f9783d..cb1f4f319 100644
--- a/projects/common/src/main/java/dan200/computercraft/shared/data/HasComputerIdLootCondition.java
+++ b/projects/common/src/main/java/dan200/computercraft/shared/data/HasComputerIdLootCondition.java
@@ -5,7 +5,7 @@
 package dan200.computercraft.shared.data;
 
 import dan200.computercraft.shared.ModRegistry;
-import dan200.computercraft.shared.computer.blocks.IComputerBlockEntity;
+import dan200.computercraft.shared.computer.blocks.AbstractComputerBlockEntity;
 import net.minecraft.world.level.storage.loot.LootContext;
 import net.minecraft.world.level.storage.loot.parameters.LootContextParam;
 import net.minecraft.world.level.storage.loot.parameters.LootContextParams;
@@ -27,7 +27,7 @@ public final class HasComputerIdLootCondition implements LootItemCondition {
     @Override
     public boolean test(LootContext lootContext) {
         var tile = lootContext.getParamOrNull(LootContextParams.BLOCK_ENTITY);
-        return tile instanceof IComputerBlockEntity computer && computer.getComputerID() >= 0;
+        return tile instanceof AbstractComputerBlockEntity computer && computer.getComputerID() >= 0;
     }
 
     @Override