From b4638aac73508b3ae01993321705342a30eafe7d Mon Sep 17 00:00:00 2001 From: Jeralan Date: Thu, 22 May 2025 00:15:48 -0400 Subject: [PATCH] use static lazy init pattern for plugs registering --- common/buildcraft/robotics/BCRobotics.java | 1 - common/buildcraft/robotics/BCRoboticsPlugs.java | 2 +- common/buildcraft/silicon/BCSilicon.java | 1 - common/buildcraft/silicon/BCSiliconPlugs.java | 2 +- common/buildcraft/transport/BCTransport.java | 1 - common/buildcraft/transport/BCTransportPlugs.java | 2 +- 6 files changed, 3 insertions(+), 6 deletions(-) diff --git a/common/buildcraft/robotics/BCRobotics.java b/common/buildcraft/robotics/BCRobotics.java index f987835019..a4c9416b4f 100644 --- a/common/buildcraft/robotics/BCRobotics.java +++ b/common/buildcraft/robotics/BCRobotics.java @@ -99,7 +99,6 @@ public static void preInit(FMLConstructModEvent evt) { } BCRoboticsBlocks.preInit(); - BCRoboticsPlugs.preInit(); BCRoboticsItems.preInit(); BCRoboticsStatements.preInit(); BCRoboticsEntities.preInit(); diff --git a/common/buildcraft/robotics/BCRoboticsPlugs.java b/common/buildcraft/robotics/BCRoboticsPlugs.java index 312b3e8cb4..1cf0bd1b56 100644 --- a/common/buildcraft/robotics/BCRoboticsPlugs.java +++ b/common/buildcraft/robotics/BCRoboticsPlugs.java @@ -8,7 +8,7 @@ public class BCRoboticsPlugs { public static PluggableDefinition robotStation; - public static void preInit() { + static { robotStation = register("robot_station", PluggableRobotStation::new, PluggableRobotStation::new); } diff --git a/common/buildcraft/silicon/BCSilicon.java b/common/buildcraft/silicon/BCSilicon.java index 4d0f4c5024..ea25c56401 100644 --- a/common/buildcraft/silicon/BCSilicon.java +++ b/common/buildcraft/silicon/BCSilicon.java @@ -79,7 +79,6 @@ public static void preInit(FMLConstructModEvent evt) { BCSiliconConfig.preInit(); BCSiliconBlocks.preInit(); - BCSiliconPlugs.preInit(); BCSiliconItems.preInit(); BCSiliconStatements.preInit(); diff --git a/common/buildcraft/silicon/BCSiliconPlugs.java b/common/buildcraft/silicon/BCSiliconPlugs.java index 39ee7d453a..30c2867223 100644 --- a/common/buildcraft/silicon/BCSiliconPlugs.java +++ b/common/buildcraft/silicon/BCSiliconPlugs.java @@ -18,7 +18,7 @@ public class BCSiliconPlugs { public static PluggableDefinition timer; public static PluggableDefinition facade; - public static void preInit() { + static { gate = register("gate", PluggableGate::new, PluggableGate::new); lens = register("lens", PluggableLens::new, PluggableLens::new); pulsar = register("pulsar", PluggablePulsar::new, PluggablePulsar::new); diff --git a/common/buildcraft/transport/BCTransport.java b/common/buildcraft/transport/BCTransport.java index b045afc265..d00ea9eeee 100644 --- a/common/buildcraft/transport/BCTransport.java +++ b/common/buildcraft/transport/BCTransport.java @@ -72,7 +72,6 @@ public static void preInit(FMLConstructModEvent evt) { BCTransportConfig.preInit(); BCTransportBlocks.preInit(); BCTransportPipes.preInit(); - BCTransportPlugs.preInit(); BCTransportItems.preInit(); BCTransportStatements.preInit(); diff --git a/common/buildcraft/transport/BCTransportPlugs.java b/common/buildcraft/transport/BCTransportPlugs.java index 9d65ec8825..296106edc5 100644 --- a/common/buildcraft/transport/BCTransportPlugs.java +++ b/common/buildcraft/transport/BCTransportPlugs.java @@ -20,7 +20,7 @@ public class BCTransportPlugs { public static PluggableDefinition blocker; public static PluggableDefinition powerAdaptor; - public static void preInit() { + static { blocker = register("blocker", PluggableBlocker::new); powerAdaptor = register("power_adaptor", PluggablePowerAdaptor::new); }