Make KubeJS use GTCEu namespaces by default

Reabstraction · Reabstraction · commit 4f7643a856e7 · 2026-01-06T14:18:23.000+01:00
diff --git a/src/main/java/com/gregtechceu/gtceu/common/item/modules/TextModuleBehaviour.java b/src/main/java/com/gregtechceu/gtceu/common/item/modules/TextModuleBehaviour.java
@@ -139,7 +139,7 @@ public void setPlaceholderText(ItemStack stack, String text) {
 
     public String getPlaceholderText(ItemStack stack) {
         StringBuilder formatStringLines = new StringBuilder();
-        List<String> tag = stack.get(GTDataComponents.TEXT_MODULE_STRING_LINES);
+        List<String> tag = stack.getOrDefault(GTDataComponents.TEXT_MODULE_STRING_LINES, List.of());
         for (String value : tag) {
             formatStringLines.append(value).append('\n');
         }
diff --git a/src/main/java/com/gregtechceu/gtceu/core/mixins/kubejs/KubeResourceLocationMixin.java b/src/main/java/com/gregtechceu/gtceu/core/mixins/kubejs/KubeResourceLocationMixin.java
@@ -0,0 +1,22 @@
+package com.gregtechceu.gtceu.core.mixins.kubejs;
+
+import com.gregtechceu.gtceu.integration.kjs.ImplicitKubeResourceLocation;
+
+import dev.latvian.mods.kubejs.util.KubeResourceLocation;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+@Mixin(value = KubeResourceLocation.class)
+public class KubeResourceLocationMixin {
+
+    @Inject(at = @At("HEAD"), method = "wrap", cancellable = true)
+    private static void wrap(Object args, CallbackInfoReturnable<KubeResourceLocation> cir) {
+        if (args instanceof String stringArg) {
+            if (!stringArg.contains(":")) {
+                cir.setReturnValue(new KubeResourceLocation(ImplicitKubeResourceLocation.of(stringArg)));
+            }
+        }
+    }
+}
diff --git a/src/main/java/com/gregtechceu/gtceu/integration/kjs/ImplicitKubeResourceLocation.java b/src/main/java/com/gregtechceu/gtceu/integration/kjs/ImplicitKubeResourceLocation.java
@@ -0,0 +1,23 @@
+package com.gregtechceu.gtceu.integration.kjs;
+
+import com.gregtechceu.gtceu.GTCEu;
+
+import net.minecraft.resources.ResourceLocation;
+
+public class ImplicitKubeResourceLocation extends ResourceLocation {
+
+    protected ImplicitKubeResourceLocation(String namespace, String path) {
+        super(namespace, path);
+    }
+
+    public static ImplicitKubeResourceLocation of(String path) {
+        return new ImplicitKubeResourceLocation("kubejs", path);
+    }
+
+    public static ResourceLocation toGtceu(ResourceLocation loc) {
+        if (loc instanceof ImplicitKubeResourceLocation kube) {
+            return GTCEu.id(loc.getPath());
+        }
+        return loc;
+    }
+}
diff --git a/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/block/ActiveBlockBuilder.java b/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/block/ActiveBlockBuilder.java
@@ -3,6 +3,7 @@
 import com.gregtechceu.gtceu.GTCEu;
 import com.gregtechceu.gtceu.api.block.ActiveBlock;
 import com.gregtechceu.gtceu.api.block.property.GTBlockStateProperties;
+import com.gregtechceu.gtceu.integration.kjs.ImplicitKubeResourceLocation;
 
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.level.block.Block;
@@ -39,7 +40,7 @@ public enum Type {
     public transient String activeTexture;
 
     public ActiveBlockBuilder(ResourceLocation id) {
-        super(id);
+        super(ImplicitKubeResourceLocation.toGtceu(id));
         property(GTBlockStateProperties.ACTIVE);
         renderType(BlockRenderType.CUTOUT_MIPPED);
         activeTexture = ACTIVE.apply(baseTexture);
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
@@ -9,6 +9,7 @@
 import com.gregtechceu.gtceu.api.multiblock.util.RelativeDirection;
 import com.gregtechceu.gtceu.api.registry.registrate.MachineBuilder;
 import com.gregtechceu.gtceu.common.registry.GTRegistration;
+import com.gregtechceu.gtceu.integration.kjs.ImplicitKubeResourceLocation;
 import com.gregtechceu.gtceu.utils.FormattingUtil;
 
 import net.minecraft.resources.ResourceLocation;
@@ -39,7 +40,7 @@ public class KJSSteamMachineBuilder extends BuilderBase<MachineDefinition> imple
     private MachineDefinition lpObject = null, hpObject = null;
 
     public KJSSteamMachineBuilder(ResourceLocation id) {
-        super(id);
+        super(ImplicitKubeResourceLocation.toGtceu(id));
         this.dummyBuilder = true;
     }
 
diff --git a/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/machine/KJSTieredMachineBuilder.java b/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/machine/KJSTieredMachineBuilder.java
@@ -10,6 +10,7 @@
 import com.gregtechceu.gtceu.api.registry.registrate.MachineBuilder;
 import com.gregtechceu.gtceu.common.registry.GTRegistration;
 import com.gregtechceu.gtceu.data.machine.GTMachineUtils;
+import com.gregtechceu.gtceu.integration.kjs.ImplicitKubeResourceLocation;
 
 import net.minecraft.resources.ResourceLocation;
 
@@ -55,7 +56,7 @@ public class KJSTieredMachineBuilder extends BuilderBase<@Nullable MachineDefini
     public transient BiFunction<ResourceLocation, GTRecipeType, EditableMachineUI> editableUI;
 
     public KJSTieredMachineBuilder(ResourceLocation id) {
-        super(id);
+        super(ImplicitKubeResourceLocation.toGtceu(id));
         this.addDefaultTooltips = false;
         this.addDefaultModel = false;
         this.dummyBuilder = true;
@@ -64,7 +65,7 @@ public KJSTieredMachineBuilder(ResourceLocation id) {
     public KJSTieredMachineBuilder(ResourceLocation id, TieredCreationFunction machine,
                                    BiFunction<ResourceLocation, GTRecipeType, EditableMachineUI> editableUI,
                                    boolean isGenerator) {
-        super(id);
+        super(ImplicitKubeResourceLocation.toGtceu(id));
         this.machine = machine;
         this.editableUI = editableUI;
         this.isGenerator = isGenerator;
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
@@ -8,6 +8,7 @@
 import com.gregtechceu.gtceu.api.registry.registrate.MultiblockMachineBuilder;
 import com.gregtechceu.gtceu.common.registry.GTRegistration;
 import com.gregtechceu.gtceu.data.machine.GTMachineUtils;
+import com.gregtechceu.gtceu.integration.kjs.ImplicitKubeResourceLocation;
 
 import net.minecraft.resources.ResourceLocation;
 
@@ -38,12 +39,12 @@ public class KJSTieredMultiblockBuilder extends BuilderBase<@Nullable Multiblock
     public transient DefinitionFunction definition = (tier, def) -> def.tier(tier);
 
     public KJSTieredMultiblockBuilder(ResourceLocation id) {
-        super(id);
+        super(ImplicitKubeResourceLocation.toGtceu(id));
         this.dummyBuilder = true;
     }
 
     public KJSTieredMultiblockBuilder(ResourceLocation id, TieredCreationFunction machine) {
-        super(id);
+        super(ImplicitKubeResourceLocation.toGtceu(id));
         this.machine = machine;
         this.dummyBuilder = true;
     }
diff --git a/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/machine/KJSWrappingMachineBuilder.java b/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/machine/KJSWrappingMachineBuilder.java
@@ -1,6 +1,7 @@
 package com.gregtechceu.gtceu.integration.kjs.builders.machine;
 
 import com.gregtechceu.gtceu.api.machine.MachineDefinition;
+import com.gregtechceu.gtceu.integration.kjs.ImplicitKubeResourceLocation;
 
 import net.minecraft.resources.ResourceLocation;
 
@@ -22,7 +23,7 @@ public class KJSWrappingMachineBuilder extends BuilderBase<MachineDefinition> im
     private final KJSTieredMachineBuilder tieredBuilder;
 
     public KJSWrappingMachineBuilder(ResourceLocation id, KJSTieredMachineBuilder tieredBuilder) {
-        super(id);
+        super(ImplicitKubeResourceLocation.toGtceu(id));
         this.tieredBuilder = tieredBuilder;
         this.dummyBuilder = true;
     }
diff --git a/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/machine/KJSWrappingMultiblockBuilder.java b/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/machine/KJSWrappingMultiblockBuilder.java
@@ -1,6 +1,7 @@
 package com.gregtechceu.gtceu.integration.kjs.builders.machine;
 
 import com.gregtechceu.gtceu.api.machine.MultiblockMachineDefinition;
+import com.gregtechceu.gtceu.integration.kjs.ImplicitKubeResourceLocation;
 
 import net.minecraft.resources.ResourceLocation;
 
@@ -21,8 +22,8 @@ public class KJSWrappingMultiblockBuilder extends BuilderBase<MultiblockMachineD
     private final KJSTieredMultiblockBuilder tieredBuilder;
 
     public KJSWrappingMultiblockBuilder(ResourceLocation id) {
-        super(id);
-        this.tieredBuilder = new KJSTieredMultiblockBuilder(id);
+        super(ImplicitKubeResourceLocation.toGtceu(id));
+        this.tieredBuilder = new KJSTieredMultiblockBuilder(this.id);
         this.dummyBuilder = true;
     }
 
diff --git a/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/machine/MultiblockMachineBuilderWrapper.java b/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/machine/MultiblockMachineBuilderWrapper.java
@@ -21,6 +21,7 @@
 import com.gregtechceu.gtceu.api.registry.registrate.MachineBuilder;
 import com.gregtechceu.gtceu.api.registry.registrate.MultiblockMachineBuilder;
 import com.gregtechceu.gtceu.api.registry.registrate.provider.GTBlockstateProvider;
+import com.gregtechceu.gtceu.integration.kjs.ImplicitKubeResourceLocation;
 
 import net.minecraft.core.Direction;
 import net.minecraft.network.chat.Component;
@@ -59,7 +60,7 @@ public class MultiblockMachineBuilderWrapper extends BuilderBase<MultiblockMachi
     private final MultiblockMachineBuilder internal;
 
     public MultiblockMachineBuilderWrapper(ResourceLocation id, MultiblockMachineBuilder internal) {
-        super(id);
+        super(ImplicitKubeResourceLocation.toGtceu(id));
         this.internal = internal;
         this.dummyBuilder = true;
     }
diff --git a/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/material/ElementBuilder.java b/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/material/ElementBuilder.java
@@ -2,6 +2,7 @@
 
 import com.gregtechceu.gtceu.api.material.Element;
 import com.gregtechceu.gtceu.data.material.GTElements;
+import com.gregtechceu.gtceu.integration.kjs.ImplicitKubeResourceLocation;
 
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
@@ -25,7 +26,7 @@ public class ElementBuilder extends BuilderBase<Element> {
     public transient boolean isIsotope;
 
     public ElementBuilder(ResourceLocation id) {
-        super(id);
+        super(ImplicitKubeResourceLocation.toGtceu(id));
         name = id.getPath();
         translatableName = Component.translatable(id.toLanguageKey("element"));
     }
diff --git a/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/material/MaterialBuilderWrapper.java b/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/material/MaterialBuilderWrapper.java
@@ -10,6 +10,7 @@
 import com.gregtechceu.gtceu.api.material.material.properties.*;
 import com.gregtechceu.gtceu.api.medicalcondition.MedicalCondition;
 import com.gregtechceu.gtceu.api.tag.TagPrefix;
+import com.gregtechceu.gtceu.integration.kjs.ImplicitKubeResourceLocation;
 import com.gregtechceu.gtceu.integration.kjs.helpers.MaterialStackWrapper;
 
 import net.minecraft.resources.ResourceLocation;
@@ -28,8 +29,8 @@ public class MaterialBuilderWrapper extends BuilderBase<Material> {
     private final Material.Builder internal;
 
     public MaterialBuilderWrapper(ResourceLocation id) {
-        super(id);
-        this.internal = new Material.Builder(id);
+        super(ImplicitKubeResourceLocation.toGtceu(id));
+        this.internal = new Material.Builder(this.id);
         this.dummyBuilder = true;
     }
 
diff --git a/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/prefix/OreTagPrefixBuilder.java b/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/prefix/OreTagPrefixBuilder.java
@@ -5,6 +5,7 @@
 import com.gregtechceu.gtceu.api.material.material.info.MaterialIconType;
 import com.gregtechceu.gtceu.api.tag.TagPrefix;
 import com.gregtechceu.gtceu.data.block.GTBlocks;
+import com.gregtechceu.gtceu.integration.kjs.ImplicitKubeResourceLocation;
 
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.level.block.state.BlockBehaviour;
@@ -37,7 +38,7 @@ public class OreTagPrefixBuilder extends TagPrefixBuilder {
     public transient boolean shouldDropAsItem = false;
 
     public OreTagPrefixBuilder(ResourceLocation id) {
-        super(id);
+        super(ImplicitKubeResourceLocation.toGtceu(id));
     }
 
     @Override
diff --git a/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/prefix/TagPrefixBuilder.java b/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/prefix/TagPrefixBuilder.java
@@ -4,6 +4,7 @@
 import com.gregtechceu.gtceu.api.material.material.info.MaterialIconType;
 import com.gregtechceu.gtceu.api.material.material.stack.MaterialStack;
 import com.gregtechceu.gtceu.api.tag.TagPrefix;
+import com.gregtechceu.gtceu.integration.kjs.ImplicitKubeResourceLocation;
 
 import net.minecraft.client.renderer.RenderType;
 import net.minecraft.network.chat.Component;
@@ -32,7 +33,7 @@ public class TagPrefixBuilder extends BuilderBase<TagPrefix> {
     private final List<MaterialStack> secondaryMaterials = new ArrayList<>();
 
     public TagPrefixBuilder(ResourceLocation id) {
-        super(id);
+        super(ImplicitKubeResourceLocation.toGtceu(id));
         this.base = create(id.getPath());
     }
 
diff --git a/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/recipetype/GTRecipeCategoryBuilder.java b/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/recipetype/GTRecipeCategoryBuilder.java
@@ -5,6 +5,7 @@
 import com.gregtechceu.gtceu.api.recipe.category.GTRecipeCategory;
 import com.gregtechceu.gtceu.data.recipe.GTRecipeCategories;
 import com.gregtechceu.gtceu.data.recipe.GTRecipeTypes;
+import com.gregtechceu.gtceu.integration.kjs.ImplicitKubeResourceLocation;
 import com.gregtechceu.gtceu.utils.FormattingUtil;
 
 import com.lowdragmc.lowdraglib.gui.texture.IGuiTexture;
@@ -38,7 +39,7 @@ public class GTRecipeCategoryBuilder extends BuilderBase<GTRecipeCategory> {
     private transient String langValue;
 
     public GTRecipeCategoryBuilder(ResourceLocation id) {
-        super(id);
+        super(ImplicitKubeResourceLocation.toGtceu(id));
         name = id.getPath();
         recipeType = GTRecipeTypes.DUMMY_RECIPES;
         icon = null;
diff --git a/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/worldgen/BedrockFluidBuilder.java b/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/worldgen/BedrockFluidBuilder.java
@@ -2,6 +2,7 @@
 
 import com.gregtechceu.gtceu.api.worldgen.BiomeWeightModifier;
 import com.gregtechceu.gtceu.api.worldgen.bedrockfluid.BedrockFluidDefinition;
+import com.gregtechceu.gtceu.integration.kjs.ImplicitKubeResourceLocation;
 
 import net.minecraft.core.*;
 import net.minecraft.resources.ResourceKey;
@@ -36,7 +37,7 @@ public class BedrockFluidBuilder extends BuilderBase<BedrockFluidDefinition> {
     private final transient Set<ResourceKey<Level>> dimensions = new HashSet<>();
 
     public BedrockFluidBuilder(ResourceLocation id) {
-        super(id);
+        super(ImplicitKubeResourceLocation.toGtceu(id));
     }
 
     public static BedrockFluidBuilder from(BedrockFluidDefinition definition, ResourceLocation id) {
diff --git a/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/worldgen/BedrockOreBuilder.java b/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/worldgen/BedrockOreBuilder.java
@@ -4,6 +4,7 @@
 import com.gregtechceu.gtceu.api.worldgen.BiomeWeightModifier;
 import com.gregtechceu.gtceu.api.worldgen.bedrockore.BedrockOreDefinition;
 import com.gregtechceu.gtceu.api.worldgen.bedrockore.WeightedMaterial;
+import com.gregtechceu.gtceu.integration.kjs.ImplicitKubeResourceLocation;
 
 import net.minecraft.core.HolderSet;
 import net.minecraft.resources.ResourceKey;
@@ -40,7 +41,7 @@ public class BedrockOreBuilder extends BuilderBase<BedrockOreDefinition> {
     private final List<BiomeWeightModifier> biomes = new LinkedList<>();
 
     public BedrockOreBuilder(ResourceLocation id) {
-        super(id);
+        super(ImplicitKubeResourceLocation.toGtceu(id));
     }
 
     public static BedrockOreBuilder from(BedrockOreDefinition definition, ResourceLocation id) {
diff --git a/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/worldgen/OreVeinDefinitionBuilder.java b/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/worldgen/OreVeinDefinitionBuilder.java
@@ -5,6 +5,7 @@
 import com.gregtechceu.gtceu.api.worldgen.generator.VeinGenerator;
 import com.gregtechceu.gtceu.api.worldgen.generator.indicators.SurfaceIndicatorGenerator;
 import com.gregtechceu.gtceu.api.worldgen.generator.veins.*;
+import com.gregtechceu.gtceu.integration.kjs.ImplicitKubeResourceLocation;
 
 import net.minecraft.core.HolderSet;
 import net.minecraft.core.registries.Registries;
@@ -60,7 +61,7 @@ public class OreVeinDefinitionBuilder extends BuilderBase<OreVeinDefinition> {
     private List<IndicatorGenerator> indicatorGenerators;
 
     public OreVeinDefinitionBuilder(ResourceLocation id) {
-        super(id);
+        super(ImplicitKubeResourceLocation.toGtceu(id));
     }
 
     @Tolerate
diff --git a/src/main/resources/META-INF/accesstransformer.cfg b/src/main/resources/META-INF/accesstransformer.cfg
@@ -35,3 +35,7 @@ public net.minecraft.world.entity.vehicle.Boat DATA_ID_TYPE
 # for AE2 to be able to load (idk why but it needs these?)
 public net.minecraft.world.level.block.Blocks always(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)Z # always
 public net.minecraft.world.level.block.Blocks never(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)Z # never
+
+# This permits us to subclass ResourceLocation; for KubeJS reasons
+public-f net.minecraft.resources.ResourceLocation
+protected net.minecraft.resources.ResourceLocation <init>(Ljava/lang/String;Ljava/lang/String;)V
diff --git a/src/main/resources/gtceu.mixins.json b/src/main/resources/gtceu.mixins.json
@@ -70,6 +70,7 @@
         "emi.FillRecipePacketMixin",
         "emi.FluidEmiStackMixin",
         "jei.FluidHelperMixin",
+        "kubejs.KubeResourceLocationMixin",
         "ldlib.ButtonWidgetMixin",
         "ldlib.DummyWorldMixin",
         "ldlib.ItemStackPayloadMixin",

Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,7 @@ public void setPlaceholderText(ItemStack stack, String text) {`
`139`	`139`
`140`	`140`	`public String getPlaceholderText(ItemStack stack) {`
`141`	`141`	`StringBuilder formatStringLines = new StringBuilder();`
`142`		`- List<String> tag = stack.get(GTDataComponents.TEXT_MODULE_STRING_LINES);`
	`142`	`+ List<String> tag = stack.getOrDefault(GTDataComponents.TEXT_MODULE_STRING_LINES, List.of());`
`143`	`143`	`for (String value : tag) {`
`144`	`144`	`formatStringLines.append(value).append('\n');`
`145`	`145`	`}`