Breaking change: Remove ultra dense cables (#638)

Co-authored-by: Martin Robertz <[email protected]> Co-authored-by: Maya <[email protected]>
GTNewHorizons · Dec 29, 2024 · 0c221eb · 0c221eb
1 parent 649fdc7
commit 0c221eb
Show file tree

Hide file tree

Showing 12 changed files with 5 additions and 196 deletions.
diff --git a/src/main/java/appeng/api/definitions/IParts.java b/src/main/java/appeng/api/definitions/IParts.java
@@ -30,10 +30,6 @@ public interface IParts {
 
     AEColoredItemDefinition cableDenseCovered();
 
-    AEColoredItemDefinition cableUltraDenseCovered();
-
-    AEColoredItemDefinition cableUltraDenseSmart();
-
     AEColoredItemDefinition lumenCableSmart();
 
     AEColoredItemDefinition lumenCableCovered();

diff --git a/src/main/java/appeng/core/Registration.java b/src/main/java/appeng/core/Registration.java
@@ -329,8 +329,6 @@ private void assignParts(final Parts target, final IParts source) {
         target.partCableGlass = source.cableGlass();
         target.partCableDense = source.cableDense();
         target.partCableDenseCovered = source.cableDenseCovered();
-        target.partCableUltraDenseSmart = source.cableUltraDenseSmart();
-        target.partCableUltraDenseCovered = source.cableUltraDenseCovered();
         // target.partLumenCableSmart = source.lumenCableSmart();
         // target.partLumenCableCovered = source.lumenCableCovered();
         // target.partLumenCableGlass = source.lumenCableGlass();

diff --git a/src/main/java/appeng/core/api/definitions/ApiParts.java b/src/main/java/appeng/core/api/definitions/ApiParts.java
@@ -29,8 +29,6 @@ public final class ApiParts implements IParts {
     private final AEColoredItemDefinition cableGlass;
     private final AEColoredItemDefinition cableDense;
     private final AEColoredItemDefinition cableDenseCovered;
-    private final AEColoredItemDefinition cableUltraDenseSmart;
-    private final AEColoredItemDefinition cableUltraDenseCovered;
     // private final AEColoredItemDefinition lumenCableSmart;
     // private final AEColoredItemDefinition lumenCableCovered;
     // private final AEColoredItemDefinition lumenCableGlass;
@@ -80,10 +78,6 @@ public ApiParts(final DefinitionConstructor constructor, final IPartHelper partH
         this.cableGlass = constructor.constructColoredDefinition(itemMultiPart, PartType.CableGlass);
         this.cableDense = constructor.constructColoredDefinition(itemMultiPart, PartType.CableDense);
         this.cableDenseCovered = constructor.constructColoredDefinition(itemMultiPart, PartType.CableDenseCovered);
-        this.cableUltraDenseSmart = constructor
-                .constructColoredDefinition(itemMultiPart, PartType.CableUltraDenseSmart, true);
-        this.cableUltraDenseCovered = constructor
-                .constructColoredDefinition(itemMultiPart, PartType.CableUltraDenseCovered, true);
         // this.lumenCableSmart = Optional.absent(); // has yet to be implemented, no PartType defined for it yet
         // this.lumenCableCovered = Optional.absent(); // has yet to be implemented, no PartType defined for it yet
         // this.lumenCableGlass = Optional.absent(); // has yet to be implemented, no PartType defined for it yet
@@ -152,16 +146,6 @@ public AEColoredItemDefinition cableDenseCovered() {
         return this.cableDenseCovered;
     }
 
-    @Override
-    public AEColoredItemDefinition cableUltraDenseSmart() {
-        return this.cableUltraDenseSmart;
-    }
-
-    @Override
-    public AEColoredItemDefinition cableUltraDenseCovered() {
-        return this.cableUltraDenseCovered;
-    }
-
     @Override
     public AEColoredItemDefinition lumenCableSmart() {
         throw new MissingDefinition("Lumen Smart Cable has yet to be implemented.");

diff --git a/src/main/java/appeng/core/features/registries/P2PTunnelRegistry.java b/src/main/java/appeng/core/features/registries/P2PTunnelRegistry.java
@@ -125,8 +125,6 @@ public void configure() {
             this.addNewAttunement(parts.cableSmart().stack(c, 1), TunnelType.ME);
             this.addNewAttunement(parts.cableDense().stack(c, 1), TunnelType.ME);
             this.addNewAttunement(parts.cableDenseCovered().stack(c, 1), TunnelType.ME);
-            this.addNewAttunement(parts.cableUltraDenseCovered().stack(c, 1), TunnelType.ME);
-            this.addNewAttunement(parts.cableUltraDenseSmart().stack(c, 1), TunnelType.ME);
         }
     }
 

diff --git a/src/main/java/appeng/integration/modules/waila/part/ChannelWailaDataProvider.java b/src/main/java/appeng/integration/modules/waila/part/ChannelWailaDataProvider.java
@@ -21,7 +21,6 @@
 import appeng.core.localization.WailaText;
 import appeng.parts.networking.PartCableSmart;
 import appeng.parts.networking.PartDenseCable;
-import appeng.parts.networking.PartUltraDenseCableSmart;
 import gnu.trove.map.TObjectShortMap;
 import gnu.trove.map.hash.TObjectShortHashMap;
 import mcp.mobius.waila.api.IWailaConfigHandler;
@@ -65,8 +64,7 @@ public List<String> getWailaBody(final IPart part, final List<String> currentToo
             final IWailaDataAccessor accessor, final IWailaConfigHandler config) {
         if (part instanceof PartCableSmart || part instanceof PartDenseCable) {
             final short usedChannels = this.getUsedChannels(part, accessor.getNBTData());
-            final int maxChannels = ((part instanceof PartUltraDenseCableSmart) ? 128
-                    : ((part instanceof PartDenseCable) ? 32 : 8));
+            final int maxChannels = (part instanceof PartDenseCable) ? 32 : 8;
 
             final String formattedToolTip = String.format(WailaText.Channels.getLocal(), usedChannels, maxChannels);
             currentToolTip.add(formattedToolTip);

diff --git a/src/main/java/appeng/items/parts/ItemMultiPart.java b/src/main/java/appeng/items/parts/ItemMultiPart.java
@@ -35,13 +35,14 @@
 import com.mojang.realmsclient.gui.ChatFormatting;
 
 import appeng.api.AEApi;
-import appeng.api.exceptions.MissingDefinition;
 import appeng.api.implementations.items.IItemGroup;
 import appeng.api.parts.IPart;
 import appeng.api.parts.IPartHelper;
 import appeng.api.parts.IPartItem;
 import appeng.api.util.AEColor;
+import appeng.client.texture.TextureUtils;
 import appeng.core.AEConfig;
+import appeng.core.AELog;
 import appeng.core.features.AEFeature;
 import appeng.core.features.ActivityState;
 import appeng.core.features.ItemStackSrc;
@@ -171,11 +172,12 @@ public IIcon getIconFromDamage(final int dmg) {
         }
 
         final String formattedRegistered = Arrays.toString(this.registered.keySet().toArray());
-        throw new MissingDefinition(
+        AELog.error(
                 "Tried to get the icon from a non-existent part with damage value " + dmg
                         + ". There were registered: "
                         + formattedRegistered
                         + '.');
+        return TextureUtils.getMissingItem();
     }
 
     @Override

diff --git a/src/main/java/appeng/items/parts/PartType.java b/src/main/java/appeng/items/parts/PartType.java
@@ -37,8 +37,6 @@
 import appeng.parts.networking.PartDenseCable;
 import appeng.parts.networking.PartDenseCableCovered;
 import appeng.parts.networking.PartQuartzFiber;
-import appeng.parts.networking.PartUltraDenseCableCovered;
-import appeng.parts.networking.PartUltraDenseCableSmart;
 import appeng.parts.p2p.PartP2PGT5Power;
 import appeng.parts.p2p.PartP2PIC2Power;
 import appeng.parts.p2p.PartP2PInterface;
@@ -107,23 +105,6 @@ public boolean isCable() {
         }
     },
 
-    CableUltraDenseCovered(540, EnumSet.of(AEFeature.UltraDenseCables), EnumSet.noneOf(IntegrationType.class),
-            PartUltraDenseCableCovered.class) {
-
-        @Override
-        public boolean isCable() {
-            return true;
-        }
-    },
-    CableUltraDenseSmart(560, EnumSet.of(AEFeature.UltraDenseCables), EnumSet.noneOf(IntegrationType.class),
-            PartUltraDenseCableSmart.class) {
-
-        @Override
-        public boolean isCable() {
-            return true;
-        }
-    },
-
     ToggleBus(80, EnumSet.of(AEFeature.Core), EnumSet.noneOf(IntegrationType.class), PartToggleBus.class),
 
     InvertedToggleBus(100, EnumSet.of(AEFeature.Core), EnumSet.noneOf(IntegrationType.class),

diff --git a/src/main/java/appeng/parts/networking/PartCable.java b/src/main/java/appeng/parts/networking/PartCable.java
@@ -100,10 +100,6 @@ public boolean changeColor(final AEColor newColor, final EntityPlayer who) {
                 newPart = parts.cableDense().stack(newColor, 1);
             } else if (this.getCableConnectionType() == AECableType.DENSE_COVERED) {
                 newPart = parts.cableDenseCovered().stack(newColor, 1);
-            } else if (this.getCableConnectionType() == AECableType.ULTRA_DENSE) {
-                newPart = parts.cableUltraDenseSmart().stack(newColor, 1);
-            } else if (this.getCableConnectionType() == AECableType.ULTRA_DENSE_SMART) {
-                newPart = parts.cableUltraDenseCovered().stack(newColor, 1);
             }
 
             boolean hasPermission = true;

diff --git a/src/main/java/appeng/parts/networking/PartUltraDenseCableCovered.java b/src/main/java/appeng/parts/networking/PartUltraDenseCableCovered.java
diff --git a/src/main/java/appeng/parts/networking/PartUltraDenseCableSmart.java b/src/main/java/appeng/parts/networking/PartUltraDenseCableSmart.java
diff --git a/src/main/java/appeng/recipes/AEItemResolver.java b/src/main/java/appeng/recipes/AEItemResolver.java
@@ -87,22 +87,6 @@ public Object resolveItemByName(final String nameSpace, final String itemName) {
                 return this.cableItem(parts.cableDenseCovered(), itemName.substring(itemName.indexOf('.') + 1));
             }
 
-            if (itemName.equals("CableUltraDenseSmart")) {
-                return new ResolverResultSet("CableUltraDenseSmart", parts.cableUltraDenseSmart().allStacks(1));
-            }
-
-            if (itemName.startsWith("CableUltraDenseSmart.")) {
-                return this.cableItem(parts.cableUltraDenseSmart(), itemName.substring(itemName.indexOf('.') + 1));
-            }
-
-            if (itemName.equals("CableUltraDenseCovered")) {
-                return new ResolverResultSet("CableUltraDenseCovered", parts.cableUltraDenseCovered().allStacks(1));
-            }
-
-            if (itemName.startsWith("CableUltraDenseCovered.")) {
-                return this.cableItem(parts.cableUltraDenseCovered(), itemName.substring(itemName.indexOf('.') + 1));
-            }
-
             if (itemName.startsWith("ItemCrystalSeed.")) {
                 if (itemName.equalsIgnoreCase("ItemCrystalSeed.Certus")) {
                     return ItemCrystalSeed.getResolver(ItemCrystalSeed.CERTUS);

diff --git a/src/main/java/appeng/util/Platform.java b/src/main/java/appeng/util/Platform.java
@@ -1744,14 +1744,6 @@ public static Object findPreferred(final ItemStack[] is) {
             if (parts.cableDenseCovered().sameAs(AEColor.Transparent, stack)) {
                 return stack;
             }
-
-            if (parts.cableUltraDenseCovered().sameAs(AEColor.Transparent, stack)) {
-                return stack;
-            }
-
-            if (parts.cableUltraDenseSmart().sameAs(AEColor.Transparent, stack)) {
-                return stack;
-            }
         }
 
         return is;