fix bugs

Author: iczero

src/main/java/net/hellomouse/ae2dn/AE2DistributedNetworks.java

@@ -1,8 +1,12 @@
 package net.hellomouse.ae2dn;
 
+import appeng.api.AECapabilities;
+import appeng.api.networking.IInWorldGridNodeHost;
 import net.hellomouse.ae2dn.definitions.DNBlockEntities;
 import net.hellomouse.ae2dn.definitions.DNBlocks;
 import net.hellomouse.ae2dn.definitions.DNItems;
+import net.neoforged.bus.api.SubscribeEvent;
+import net.neoforged.neoforge.capabilities.RegisterCapabilitiesEvent;
 import org.slf4j.Logger;
 
 import com.mojang.logging.LogUtils;
@@ -19,6 +23,7 @@ public class AE2DistributedNetworks {
 
     public AE2DistributedNetworks(IEventBus modEventBus, ModContainer modContainer) {
         modEventBus.addListener(this::commonSetup);
+        modEventBus.addListener(this::initCapabilities);
 
         // Register our mod's ModConfigSpec so that FML can create and load the config file for us
         modContainer.registerConfig(ModConfig.Type.SERVER, Config.SPEC);
@@ -31,4 +36,12 @@ public AE2DistributedNetworks(IEventBus modEventBus, ModContainer modContainer)
     private void commonSetup(final FMLCommonSetupEvent event) {
         LOGGER.info("Hello, world!");
     }
+
+    private void initCapabilities(RegisterCapabilitiesEvent event) {
+        event.registerBlockEntity(
+            AECapabilities.IN_WORLD_GRID_NODE_HOST,
+            DNBlockEntities.ROUTE_DISTRIBUTOR.get(),
+            (object, context) -> (IInWorldGridNodeHost) object
+        );
+    }
 }

src/main/java/net/hellomouse/ae2dn/Config.java

@@ -13,18 +13,18 @@ public class Config {
             .comment("Whether to enable mod functionality")
             .define("enable", true);
 
-    private static final ModConfigSpec.BooleanValue REQUIRE_SUBNET_MANAGER = BUILDER
+    private static final ModConfigSpec.BooleanValue REQUIRE_ROUTE_DISTRIBUTOR = BUILDER
         .comment("Whether the Subnet Manager is required to allow multiple controllers on a network")
         .define("enable", true);
 
     static final ModConfigSpec SPEC = BUILDER.build();
 
     public static boolean globalEnable;
-    public static boolean requireSubnetManager;
+    public static boolean requireRouteDistributor;
 
     @SubscribeEvent
     static void onLoad(final ModConfigEvent event) {
         globalEnable = GLOBAL_ENABLE.get();
-        requireSubnetManager = REQUIRE_SUBNET_MANAGER.get();
+        requireRouteDistributor = REQUIRE_ROUTE_DISTRIBUTOR.get();
     }
 }

src/main/java/net/hellomouse/ae2dn/RouteDistributorBlock.java

@@ -0,0 +1,9 @@
+package net.hellomouse.ae2dn;
+
+import appeng.block.AEBaseEntityBlock;
+
+public class RouteDistributorBlock extends AEBaseEntityBlock<RouteDistributorBlockEntity> {
+    public RouteDistributorBlock() {
+        super(metalProps());
+    }
+}

src/main/java/net/hellomouse/ae2dn/RouteDistributorBlockEntity.java

@@ -0,0 +1,16 @@
+package net.hellomouse.ae2dn;
+
+import appeng.api.inventories.InternalInventory;
+import appeng.api.networking.GridFlags;
+import appeng.blockentity.grid.AENetworkedBlockEntity;
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.level.block.entity.BlockEntityType;
+import net.minecraft.world.level.block.state.BlockState;
+
+public class RouteDistributorBlockEntity extends AENetworkedBlockEntity {
+    public RouteDistributorBlockEntity(BlockEntityType<?> blockEntityType, BlockPos pos, BlockState blockState) {
+        super(blockEntityType, pos, blockState);
+        this.getMainNode().setIdlePowerUsage(100);
+        this.getMainNode().setFlags(GridFlags.REQUIRE_CHANNEL);
+    }
+}

src/main/java/net/hellomouse/ae2dn/SubnetManagerBlock.java

@@ -5,7 +5,7 @@
 import appeng.core.definitions.BlockDefinition;
 import appeng.core.definitions.DeferredBlockEntityType;
 import net.hellomouse.ae2dn.AE2DistributedNetworks;
-import net.hellomouse.ae2dn.SubnetManagerBlockEntity;
+import net.hellomouse.ae2dn.RouteDistributorBlockEntity;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.registries.Registries;
 import net.minecraft.world.level.block.entity.BlockEntityType;
@@ -27,11 +27,11 @@ public static List<DeferredBlockEntityType<?>> getBlockEntityTypes() {
         return Collections.unmodifiableList(BLOCK_ENTITY_TYPES);
     }
 
-    public static final Supplier<BlockEntityType<SubnetManagerBlockEntity>> SUBNET_MANAGER = create(
-        "subnet_manager",
-        SubnetManagerBlockEntity.class,
-        SubnetManagerBlockEntity::new,
-        DNBlocks.SUBNET_MANAGER_BLOCK
+    public static final Supplier<BlockEntityType<RouteDistributorBlockEntity>> ROUTE_DISTRIBUTOR = create(
+        "route_distributor",
+        RouteDistributorBlockEntity.class,
+        RouteDistributorBlockEntity::new,
+        DNBlocks.ROUTE_DISTRIBUTOR_BLOCK
     );
 
     private static <T extends AEBaseBlockEntity> Supplier<BlockEntityType<T>> create(

src/main/java/net/hellomouse/ae2dn/SubnetManagerBlockEntity.java

@@ -5,7 +5,7 @@
 import appeng.core.definitions.BlockDefinition;
 import appeng.core.definitions.ItemDefinition;
 import net.hellomouse.ae2dn.AE2DistributedNetworks;
-import net.hellomouse.ae2dn.SubnetManagerBlock;
+import net.hellomouse.ae2dn.RouteDistributorBlock;
 import net.minecraft.world.item.BlockItem;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.level.block.Block;
@@ -25,10 +25,10 @@ public static List<BlockDefinition<?>> getBlocks() {
         return Collections.unmodifiableList(BLOCKS);
     }
 
-    public static final BlockDefinition<SubnetManagerBlock> SUBNET_MANAGER_BLOCK = block(
-        "Subnet Manager",
-        "subnet_manager",
-        SubnetManagerBlock::new,
+    public static final BlockDefinition<RouteDistributorBlock> ROUTE_DISTRIBUTOR_BLOCK = block(
+        "Route Distributor",
+        "route_distributor",
+        RouteDistributorBlock::new,
         AEBaseBlockItem::new
     );
 

src/main/java/net/hellomouse/ae2dn/definitions/DNBlockEntities.java

@@ -39,9 +39,9 @@ private void handleTrunkError(IUsedChannelProvider object, TooltipContext contex
                     .withStyle(ChatFormatting.RED)
             );
             ci.cancel();
-        } else if (error.equals(TrunkIssue.MISSING_SUBNET_MANAGER.name())) {
+        } else if (error.equals(TrunkIssue.MISSING_ROUTE_DISTRIBUTOR.name())) {
             tooltip.addLine(
-                Component.translatable("waila.ae2dn.ErrorMissingSubnetManager")
+                Component.translatable("waila.ae2dn.ErrorMissingRouteDistributor")
                     .withStyle(ChatFormatting.RED)
             );
             ci.cancel();

src/main/java/net/hellomouse/ae2dn/definitions/DNBlocks.java

@@ -15,7 +15,7 @@
 import net.hellomouse.ae2dn.pathfinding.ControllerInfo;
 import net.hellomouse.ae2dn.pathfinding.ControllerInfo.SubtreeInfo;
 import net.hellomouse.ae2dn.pathfinding.ControllerInfo.TrunkSearchState;
-import net.hellomouse.ae2dn.SubnetManagerBlockEntity;
+import net.hellomouse.ae2dn.RouteDistributorBlockEntity;
 import net.hellomouse.ae2dn.pathfinding.TrunkIssue;
 import net.hellomouse.ae2dn.extension.HasSubtreeInfo;
 import net.hellomouse.ae2dn.extension.PathingCalculationExt;
@@ -337,16 +337,15 @@ private void postCompute(CallbackInfo ci) {
                 return;
             }
 
-            smCheck: if (Config.requireSubnetManager) {
-                // TODO: SubnetManagerBlockEntity.class
-                for (var node : grid.getMachineNodes(SubnetManagerBlockEntity.class)) {
+            smCheck: if (Config.requireRouteDistributor) {
+                for (var node : grid.getMachineNodes(RouteDistributorBlockEntity.class)) {
                     // require at least one subnet manager to have a channel
                     if (channelNodes.contains((GridNode) node)) {
                         break smCheck;
                     }
                 }
 
-                ae2dn$trunkIssue = TrunkIssue.MISSING_SUBNET_MANAGER;
+                ae2dn$trunkIssue = TrunkIssue.MISSING_ROUTE_DISTRIBUTOR;
                 ci.cancel();
             }
         }