From c2448cd0f64e4c6ea1102b13d786b75958fc3ab2 Mon Sep 17 00:00:00 2001
From: kross <135918757+krossgg@users.noreply.github.com>
Date: Sun, 29 Dec 2024 10:39:13 -0500
Subject: [PATCH] Add multiblock constructors to KJS + lang (#2667)

---
 .../registrate/MultiblockMachineBuilder.java  | 12 ++++++-
 .../integration/kjs/GregTechKubeJSPlugin.java |  2 ++
 .../machine/KJSSteamMachineBuilder.java       |  2 +-
 .../machine/KJSTieredMultiblockBuilder.java   |  4 ++-
 .../kjs/helpers/MachineConstructors.java      | 34 +++++++++++++++++++
 5 files changed, 51 insertions(+), 3 deletions(-)
 create mode 100644 src/main/java/com/gregtechceu/gtceu/integration/kjs/helpers/MachineConstructors.java

diff --git a/src/main/java/com/gregtechceu/gtceu/api/registry/registrate/MultiblockMachineBuilder.java b/src/main/java/com/gregtechceu/gtceu/api/registry/registrate/MultiblockMachineBuilder.java
index 1b7871508a..2da6530b57 100644
--- a/src/main/java/com/gregtechceu/gtceu/api/registry/registrate/MultiblockMachineBuilder.java
+++ b/src/main/java/com/gregtechceu/gtceu/api/registry/registrate/MultiblockMachineBuilder.java
@@ -1,5 +1,6 @@
 package com.gregtechceu.gtceu.api.registry.registrate;
 
+import com.gregtechceu.gtceu.GTCEu;
 import com.gregtechceu.gtceu.api.block.IMachineBlock;
 import com.gregtechceu.gtceu.api.capability.recipe.RecipeCapability;
 import com.gregtechceu.gtceu.api.data.RotationState;
@@ -42,6 +43,7 @@
 import com.tterrag.registrate.builders.ItemBuilder;
 import com.tterrag.registrate.util.nullness.NonNullConsumer;
 import com.tterrag.registrate.util.nullness.NonNullUnaryOperator;
+import dev.latvian.mods.kubejs.client.LangEventJS;
 import dev.latvian.mods.rhino.util.HideFromJS;
 import it.unimi.dsi.fastutil.objects.Object2IntMap;
 import lombok.Getter;
@@ -376,6 +378,14 @@ public MultiblockMachineBuilder onBlockEntityRegister(NonNullConsumer<BlockEntit
         return (MultiblockMachineBuilder) super.onBlockEntityRegister(onBlockEntityRegister);
     }
 
+    @Override
+    public void generateLang(LangEventJS lang) {
+        super.generateLang(lang);
+        if (langValue() != null) {
+            lang.add(GTCEu.MOD_ID, value.getDescriptionId(), value.getLangValue());
+        }
+    }
+
     @Override
     @HideFromJS
     public MultiblockMachineDefinition register() {
@@ -399,6 +409,6 @@ public MultiblockMachineDefinition register() {
         }
         definition.setPartAppearance(partAppearance);
         definition.setAdditionalDisplay(additionalDisplay);
-        return definition;
+        return value = definition;
     }
 }
diff --git a/src/main/java/com/gregtechceu/gtceu/integration/kjs/GregTechKubeJSPlugin.java b/src/main/java/com/gregtechceu/gtceu/integration/kjs/GregTechKubeJSPlugin.java
index b3ddb3c532..5dd0615793 100644
--- a/src/main/java/com/gregtechceu/gtceu/integration/kjs/GregTechKubeJSPlugin.java
+++ b/src/main/java/com/gregtechceu/gtceu/integration/kjs/GregTechKubeJSPlugin.java
@@ -62,6 +62,7 @@
 import com.gregtechceu.gtceu.integration.kjs.builders.machine.*;
 import com.gregtechceu.gtceu.integration.kjs.builders.prefix.BasicTagPrefixBuilder;
 import com.gregtechceu.gtceu.integration.kjs.builders.prefix.OreTagPrefixBuilder;
+import com.gregtechceu.gtceu.integration.kjs.helpers.MachineConstructors;
 import com.gregtechceu.gtceu.integration.kjs.helpers.MachineModifiers;
 import com.gregtechceu.gtceu.integration.kjs.helpers.MaterialStackWrapper;
 import com.gregtechceu.gtceu.integration.kjs.recipe.GTRecipeSchema;
@@ -267,6 +268,7 @@ public void registerBindings(BindingsEvent event) {
         event.add("GTMedicalConditions", GTMedicalConditions.class);
         event.add("GTRecipeModifiers", GTRecipeModifiers.class);
         event.add("OverclockingLogic", OverclockingLogic.class);
+        event.add("MachineConstructors", MachineConstructors.class);
         event.add("MachineModifiers", MachineModifiers.class);
         event.add("ModifierFunction", ModifierFunction.class);
         event.add("RecipeCapability", RecipeCapability.class);
diff --git a/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/machine/KJSSteamMachineBuilder.java b/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/machine/KJSSteamMachineBuilder.java
index 803d9afadc..0544b69039 100644
--- a/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/machine/KJSSteamMachineBuilder.java
+++ b/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/machine/KJSSteamMachineBuilder.java
@@ -62,7 +62,7 @@ public MachineDefinition register() {
     @Override
     public void generateLang(LangEventJS lang) {
         super.generateLang(lang);
-        lang.add(value.getDescriptionId(), value.getLangValue());
+        lang.add(GTCEu.MOD_ID, value.getDescriptionId(), value.getLangValue());
         if (hp != null) {
             lang.add(GTCEu.MOD_ID, hp.getDescriptionId(), hp.getLangValue());
         }
diff --git a/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/machine/KJSTieredMultiblockBuilder.java b/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/machine/KJSTieredMultiblockBuilder.java
index 186bd27f24..1cee26dcf3 100644
--- a/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/machine/KJSTieredMultiblockBuilder.java
+++ b/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/machine/KJSTieredMultiblockBuilder.java
@@ -45,7 +45,9 @@ public void generateLang(LangEventJS lang) {
         super.generateLang(lang);
         for (int tier : tiers) {
             MachineDefinition def = value[tier];
-            lang.add(GTCEu.MOD_ID, def.getDescriptionId(), def.getLangValue());
+            if (def.getLangValue() != null) {
+                lang.add(GTCEu.MOD_ID, def.getDescriptionId(), def.getLangValue());
+            }
         }
     }
 
diff --git a/src/main/java/com/gregtechceu/gtceu/integration/kjs/helpers/MachineConstructors.java b/src/main/java/com/gregtechceu/gtceu/integration/kjs/helpers/MachineConstructors.java
new file mode 100644
index 0000000000..3316944aa0
--- /dev/null
+++ b/src/main/java/com/gregtechceu/gtceu/integration/kjs/helpers/MachineConstructors.java
@@ -0,0 +1,34 @@
+package com.gregtechceu.gtceu.integration.kjs.helpers;
+
+import com.gregtechceu.gtceu.api.machine.IMachineBlockEntity;
+import com.gregtechceu.gtceu.api.machine.multiblock.MultiblockControllerMachine;
+import com.gregtechceu.gtceu.common.machine.multiblock.electric.FusionReactorMachine;
+import com.gregtechceu.gtceu.common.machine.multiblock.generator.LargeCombustionEngineMachine;
+import com.gregtechceu.gtceu.common.machine.multiblock.generator.LargeTurbineMachine;
+import com.gregtechceu.gtceu.common.machine.multiblock.steam.SteamParallelMultiblockMachine;
+
+/**
+ * Collection of functions that can be used in the Machine Creation Functions in KJS definitions
+ * Makes using them for KJS easier, as loading the relevant class won't be required.
+ */
+@SuppressWarnings("unused")
+public final class MachineConstructors {
+
+    // This one in particular stops a crash when trying to define a new LCE
+    // The crash is caused by the static FluidStack members in LargeCombustionEngine.class
+    public static MultiblockControllerMachine createLargeCombustionEngine(IMachineBlockEntity holder, int tier) {
+        return new LargeCombustionEngineMachine(holder, tier);
+    }
+
+    public static MultiblockControllerMachine createLargeTurbine(IMachineBlockEntity holder, int tier) {
+        return new LargeTurbineMachine(holder, tier);
+    }
+
+    public static MultiblockControllerMachine createFusionReactor(IMachineBlockEntity holder, int tier) {
+        return new FusionReactorMachine(holder, tier);
+    }
+
+    public static MultiblockControllerMachine createSteamMultiblock(IMachineBlockEntity holder, int parallels) {
+        return new SteamParallelMultiblockMachine(holder, parallels);
+    }
+}