Adapt the "onAlloyIteraction" and "canUpgrade" methods to ITier

mekanism · Nov 9, 2024 · c5b894d · c5b894d
1 parent 3fea841
commit c5b894d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/src/api/java/mekanism/api/IAlloyInteraction.java b/src/api/java/mekanism/api/IAlloyInteraction.java
@@ -1,6 +1,6 @@
 package mekanism.api;
 
-import mekanism.api.tier.AlloyTier;
+import mekanism.api.tier.ITier;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.ItemStack;
 import org.jetbrains.annotations.NotNull;
@@ -19,5 +19,5 @@ public interface IAlloyInteraction {
      * @param stack  - the stack of alloy being right-clicked
      * @param tier   - the tier of the alloy
      */
-    void onAlloyInteraction(Player player, ItemStack stack, @NotNull AlloyTier tier);
+    <TIER extends ITier> void onAlloyInteraction(Player player, ItemStack stack, @NotNull TIER tier);
 }
diff --git a/src/main/java/mekanism/common/content/network/transmitter/IUpgradeableTransmitter.java b/src/main/java/mekanism/common/content/network/transmitter/IUpgradeableTransmitter.java
@@ -1,6 +1,5 @@
 package mekanism.common.content.network.transmitter;
 
-import mekanism.api.tier.AlloyTier;
 import mekanism.api.tier.ITier;
 import mekanism.common.upgrade.transmitter.TransmitterUpgradeData;
 import org.jetbrains.annotations.NotNull;
@@ -15,7 +14,7 @@ public interface IUpgradeableTransmitter<DATA extends TransmitterUpgradeData> {
 
     ITier getTier();
 
-    default boolean canUpgrade(AlloyTier alloyTier) {
+    default <TIER extends ITier> boolean canUpgrade(TIER alloyTier) {
         return alloyTier.getBaseTier().ordinal() == getTier().getBaseTier().ordinal() + 1;
     }
 }
diff --git a/src/main/java/mekanism/common/tile/transmitter/TileEntityTransmitter.java b/src/main/java/mekanism/common/tile/transmitter/TileEntityTransmitter.java
@@ -7,8 +7,8 @@
 import mekanism.api.IConfigurable;
 import mekanism.api.providers.IBlockProvider;
 import mekanism.api.text.EnumColor;
-import mekanism.api.tier.AlloyTier;
 import mekanism.api.tier.BaseTier;
+import mekanism.api.tier.ITier;
 import mekanism.client.model.data.TransmitterModelData;
 import mekanism.common.Mekanism;
 import mekanism.common.MekanismLang;
@@ -322,7 +322,7 @@ protected TransmitterModelData initModelData() {
     }
 
     @Override
-    public void onAlloyInteraction(Player player, ItemStack stack, @NotNull AlloyTier tier) {
+    public <TIER extends ITier> void onAlloyInteraction(Player player, ItemStack stack, @NotNull TIER tier) {
         if (getLevel() != null && getTransmitter().hasTransmitterNetwork()) {
             DynamicNetwork<?, ?, ?> transmitterNetwork = getTransmitter().getTransmitterNetwork();
             List<Transmitter<?, ?, ?>> list = new ArrayList<>(transmitterNetwork.getTransmitters());