From 8092d0d35459958d4dc895a7ddff938373b9aba9 Mon Sep 17 00:00:00 2001 From: PrototypeTrousers Date: Tue, 28 Mar 2023 18:02:36 -0300 Subject: [PATCH] Allow the quantum linking card to be disabled by config Clean up some wrong tooltip --- src/main/java/appeng/core/Registration.java | 6 +----- src/main/java/appeng/core/features/AEFeature.java | 1 + src/main/java/appeng/items/materials/MaterialType.java | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/main/java/appeng/core/Registration.java b/src/main/java/appeng/core/Registration.java index 2297041d6..d34883465 100644 --- a/src/main/java/appeng/core/Registration.java +++ b/src/main/java/appeng/core/Registration.java @@ -418,14 +418,10 @@ final class Registration { for (IItemDefinition id : iids) { id.maybeItem().ifPresent(terminal -> { registries.wireless().registerWirelessHandler((IWirelessTermHandler) terminal); - Upgrades.QUANTUM_LINK.registerItem(id, 1); Upgrades.MAGNET.registerItem(id, 1); }); } - items.wirelessFluidTerminal().maybeItem().ifPresent(terminal -> { - registries.wireless().registerWirelessHandler((IWirelessTermHandler) terminal); - Upgrades.QUANTUM_LINK.registerItem(items.wirelessFluidTerminal(), 1); - }); + items.wirelessFluidTerminal().maybeItem().ifPresent(terminal -> registries.wireless().registerWirelessHandler((IWirelessTermHandler) terminal)); // Charge Rates items.chargedStaff().maybeItem().ifPresent(chargedStaff -> registries.charger().addChargeRate(chargedStaff, 320d)); diff --git a/src/main/java/appeng/core/features/AEFeature.java b/src/main/java/appeng/core/features/AEFeature.java index 067654301..ca23e7be9 100644 --- a/src/main/java/appeng/core/features/AEFeature.java +++ b/src/main/java/appeng/core/features/AEFeature.java @@ -74,6 +74,7 @@ public enum AEFeature { SECURITY("Security", Constants.CATEGORY_NETWORK_FEATURES), SPATIAL_IO("SpatialIO", Constants.CATEGORY_NETWORK_FEATURES), QUANTUM_NETWORK_BRIDGE("QuantumNetworkBridge", Constants.CATEGORY_NETWORK_FEATURES), + QUANTUM_LINKING_CARD("QuantumLinkingCard", Constants.CATEGORY_NETWORK_FEATURES), CHANNELS("Channels", Constants.CATEGORY_NETWORK_FEATURES), INTERFACE("Interface", Constants.CATEGORY_NETWORK_BUSES), diff --git a/src/main/java/appeng/items/materials/MaterialType.java b/src/main/java/appeng/items/materials/MaterialType.java index 848fc0cd8..67f7fc912 100644 --- a/src/main/java/appeng/items/materials/MaterialType.java +++ b/src/main/java/appeng/items/materials/MaterialType.java @@ -119,7 +119,7 @@ public enum MaterialType { FLUID_CELL64K_PART(57, "material_fluid_cell64k_part", EnumSet.of(AEFeature.STORAGE_CELLS)), CARD_PATTERN_EXPANSION(58, "material_card_pattern_expansion", EnumSet.of(AEFeature.ADVANCED_CARDS)), - CARD_QUANTUM_LINK(59, "material_card_quantum_link", EnumSet.of(AEFeature.ADVANCED_CARDS)), + CARD_QUANTUM_LINK(59, "material_card_quantum_link", EnumSet.of(AEFeature.ADVANCED_CARDS, AEFeature.QUANTUM_LINKING_CARD)), CARD_MAGNET(60, "material_card_magnet", EnumSet.of(AEFeature.BASIC_CARDS));