Skip to content

Commit 935cc82

Browse files
authored
Fix event listeners loading KJS classes with no KJS (#3410)
1 parent d8b61ad commit 935cc82

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

src/main/java/com/gregtechceu/gtceu/common/CommonInit.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@
8888
import com.gregtechceu.gtceu.data.worldgen.GTFeatures;
8989
import com.gregtechceu.gtceu.integration.cctweaked.CCTweakedPlugin;
9090
import com.gregtechceu.gtceu.integration.kjs.GTCEuStartupEvents;
91+
import com.gregtechceu.gtceu.integration.kjs.GTKubeJSPlugin;
9192
import com.gregtechceu.gtceu.integration.kjs.events.MaterialModificationKubeEvent;
9293
import com.gregtechceu.gtceu.integration.map.WaypointManager;
9394
import com.gregtechceu.gtceu.integration.top.TheOneProbePlugin;
@@ -158,6 +159,9 @@ public class CommonInit {
158159
public static void init(final IEventBus modBus) {
159160
CommonInit.modBus = modBus;
160161
modBus.register(CommonInit.class);
162+
if (GTCEu.Mods.isKubeJSLoaded()) {
163+
modBus.addListener(EventPriority.LOWEST, GTKubeJSPlugin::registerKJSMachines);
164+
}
161165

162166
UIFactory.register(MachineUIFactory.INSTANCE);
163167
UIFactory.register(CoverUIFactory.INSTANCE);

src/main/java/com/gregtechceu/gtceu/integration/kjs/GTKubeJSPlugin.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -107,9 +107,6 @@
107107
import net.minecraft.world.item.crafting.RecipeType;
108108
import net.minecraft.world.level.block.SoundType;
109109
import net.minecraft.world.level.levelgen.placement.HeightRangePlacement;
110-
import net.neoforged.bus.api.EventPriority;
111-
import net.neoforged.bus.api.SubscribeEvent;
112-
import net.neoforged.fml.common.EventBusSubscriber;
113110
import net.neoforged.neoforge.registries.RegisterEvent;
114111

115112
import dev.latvian.mods.kubejs.DevProperties;
@@ -128,11 +125,9 @@
128125
import dev.latvian.mods.kubejs.script.TypeWrapperRegistry;
129126
import dev.latvian.mods.rhino.Wrapper;
130127

131-
@EventBusSubscriber(modid = GTCEu.MOD_ID, bus = EventBusSubscriber.Bus.MOD)
132128
public class GTKubeJSPlugin implements KubeJSPlugin {
133129

134-
@SubscribeEvent(priority = EventPriority.LOWEST)
135-
private static void registerKJSMachines(RegisterEvent event) {
130+
public static void registerKJSMachines(RegisterEvent event) {
136131
if (event.getRegistryKey() != GTRegistries.MACHINE_REGISTRY) {
137132
return;
138133
}

0 commit comments

Comments
 (0)