Hopefully fixed custom KubeJS methods not existing

Author: VeljkoBogdan

gradle.properties

@@ -10,7 +10,7 @@ org.gradle.jvmargs=-Xmx1G
     mapping_version=2023.09.03-1.20.1
 
 # Mod Properties
-    mod_version=2.2.0
+    mod_version=2.2.1
     maven_group=com.illuminatijoe.refactorycore
     archives_base_name=refactorycore
     mod_id=refactorycore

src/main/java/com/illuminatijoe/refactorycore/ReFactoryCore.java

@@ -1,6 +1,7 @@
 package com.illuminatijoe.refactorycore;
 
 import com.illuminatijoe.refactorycore.api.ReFactoryRegistries;
+import com.illuminatijoe.refactorycore.api.capabilities.ILPContainer;
 import com.illuminatijoe.refactorycore.api.capabilities.recipe.lookup.MapLPIngredient;
 import com.illuminatijoe.refactorycore.client.ReFactoryCoreClient;
 import com.illuminatijoe.refactorycore.data.ReFactorySounds;
@@ -22,7 +23,9 @@
 
 import net.minecraft.resources.ResourceLocation;
 import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.common.capabilities.RegisterCapabilitiesEvent;
 import net.minecraftforge.eventbus.api.IEventBus;
+import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
 import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
@@ -99,4 +102,9 @@ private void registerMachines(GTCEuAPI.RegisterEvent<ResourceLocation, MachineDe
     public void registerSounds(GTCEuAPI.RegisterEvent<ResourceLocation, SoundEntry> event) {
         ReFactorySounds.init();
     }
+
+    @SubscribeEvent
+    public void registerCapabilities(RegisterCapabilitiesEvent event) {
+        event.register(ILPContainer.class);
+    }
 }

src/main/java/com/illuminatijoe/refactorycore/ReFactoryCoreGTAddon.java

@@ -1,23 +1,24 @@
 package com.illuminatijoe.refactorycore;
 
 import com.illuminatijoe.refactorycore.api.ReFactoryRegistries;
-import com.illuminatijoe.refactorycore.api.capabilities.recipe.LPRecipeCapability;
+import com.illuminatijoe.refactorycore.api.capabilities.recipe.ReFactoryRecipeCapabilities;
 import com.illuminatijoe.refactorycore.data.recipes.ReFactoryCoreRecipeTypes;
 import com.illuminatijoe.refactorycore.data.recipes.ReFactoryCoreRecipes;
 
 import com.gregtechceu.gtceu.api.addon.GTAddon;
 import com.gregtechceu.gtceu.api.addon.IGTAddon;
 import com.gregtechceu.gtceu.api.addon.events.KJSRecipeKeyEvent;
 import com.gregtechceu.gtceu.api.registry.registrate.GTRegistrate;
-import com.gregtechceu.gtceu.integration.kjs.recipe.components.ContentJS;
 
 import net.minecraft.data.recipes.FinishedRecipe;
 
 import com.mojang.datafixers.util.Pair;
-import dev.latvian.mods.kubejs.recipe.component.NumberComponent;
 
 import java.util.function.Consumer;
 
+import static com.illuminatijoe.refactorycore.integration.kubejs.ReFactoryRecipeComponent.LP_IN;
+import static com.illuminatijoe.refactorycore.integration.kubejs.ReFactoryRecipeComponent.LP_OUT;
+
 @SuppressWarnings("unused")
 @GTAddon
 public class ReFactoryCoreGTAddon implements IGTAddon {
@@ -46,16 +47,16 @@ public void addRecipes(Consumer<FinishedRecipe> provider) {
         ReFactoryCoreRecipes.init(provider);
     }
 
+    @Override
+    public void registerRecipeCapabilities() {
+        ReFactoryRecipeCapabilities.init();
+    }
+
     // If you have custom ingredient types, uncomment this & change to match your capability.
     // KubeJS WILL REMOVE YOUR RECIPES IF THESE ARE NOT REGISTERED.
 
-    public static final ContentJS<Integer> LP_IN = new ContentJS<>(NumberComponent.ANY_INT,
-            LPRecipeCapability.CAP, false);
-    public static final ContentJS<Integer> LP_OUT = new ContentJS<>(NumberComponent.ANY_INT,
-            LPRecipeCapability.CAP, true);
-
     @Override
     public void registerRecipeKeys(KJSRecipeKeyEvent event) {
-        event.registerKey(LPRecipeCapability.CAP, Pair.of(LP_IN, LP_OUT));
+        event.registerKey(ReFactoryRecipeCapabilities.LP, Pair.of(LP_IN, LP_OUT));
     }
 }

src/main/java/com/illuminatijoe/refactorycore/api/capabilities/recipe/LPRecipeCapability.java

@@ -15,9 +15,7 @@
 
 import it.unimi.dsi.fastutil.objects.ObjectArrayList;
 import org.apache.commons.lang3.mutable.MutableInt;
-import org.jetbrains.annotations.Nullable;
 
-import java.util.Collection;
 import java.util.List;
 
 public class LPRecipeCapability extends RecipeCapability<Integer> {
@@ -38,18 +36,12 @@ public Integer copyWithModifier(Integer content, ContentModifier modifier) {
         return modifier.apply(content);
     }
 
-    @Override
-    public @Nullable List<AbstractMapIngredient> getDefaultMapIngredient(Object object) {
+    public List<AbstractMapIngredient> convertToMapIngredient(Object ingredient) {
         List<AbstractMapIngredient> ingredients = new ObjectArrayList<>(1);
-        if (object instanceof Integer essence) ingredients.add(new MapLPIngredient(essence));
+        if (ingredient instanceof Integer essence) ingredients.add(new MapLPIngredient(essence));
         return ingredients;
     }
 
-    @Override
-    public List<Object> compressIngredients(Collection<Object> ingredients) {
-        return super.compressIngredients(ingredients);
-    }
-
     @Override
     public boolean isRecipeSearchFilter() {
         return true;

src/main/java/com/illuminatijoe/refactorycore/api/capabilities/recipe/ReFactoryRecipeCapabilities.java

@@ -0,0 +1,12 @@
+package com.illuminatijoe.refactorycore.api.capabilities.recipe;
+
+import com.gregtechceu.gtceu.api.registry.GTRegistries;
+
+public class ReFactoryRecipeCapabilities {
+
+    public static final LPRecipeCapability LP = LPRecipeCapability.CAP;
+
+    public static void init() {
+        GTRegistries.RECIPE_CAPABILITIES.register(LP.name, LP);
+    }
+}

src/main/java/com/illuminatijoe/refactorycore/data/recipes/ReFactoryCoreRecipes.java

@@ -1,12 +1,18 @@
 package com.illuminatijoe.refactorycore.data.recipes;
 
+import com.illuminatijoe.refactorycore.api.capabilities.recipe.LPRecipeCapability;
+
+import com.gregtechceu.gtceu.api.GTValues;
+
 import net.minecraft.data.recipes.FinishedRecipe;
+import net.minecraft.world.item.Items;
 
 import java.util.function.Consumer;
 
 import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.*;
 import static com.gregtechceu.gtceu.common.data.GTMaterials.*;
 import static com.illuminatijoe.refactorycore.data.recipes.ReFactoryCoreRecipeTypes.ADVANCED_PRIMITIVE_BLAST_FURNACE_RECIPES;
+import static com.illuminatijoe.refactorycore.data.recipes.ReFactoryCoreRecipeTypes.BLOODFORGE;
 
 public class ReFactoryCoreRecipes {
 
@@ -161,5 +167,13 @@ public static void init(Consumer<FinishedRecipe> provider) {
                 .outputItems(dust, Ash)
                 .duration(180 * REDUCED_DURATION)
                 .save(provider);
+
+//        BLOODFORGE.recipeBuilder("dirt_from_dirt")
+//                .inputItems(Items.DIRT)
+//                .input(LPRecipeCapability.CAP, 100)
+//                .outputItems(Items.DIRT)
+//                .duration(400)
+//                .EUt(GTValues.VA[GTValues.HV])
+//                .save(provider);
     }
 }

src/main/java/com/illuminatijoe/refactorycore/integration/kubejs/ReFactoryCoreKubeJSPlugin.java

@@ -1,7 +1,6 @@
 package com.illuminatijoe.refactorycore.integration.kubejs;
 
 import com.illuminatijoe.refactorycore.ReFactoryCore;
-import com.illuminatijoe.refactorycore.ReFactoryCoreGTAddon;
 import com.illuminatijoe.refactorycore.data.recipes.ReFactoryCoreRecipeTypes;
 import com.illuminatijoe.refactorycore.machines.ReFactoryMachines;
 
@@ -50,7 +49,7 @@ public void registerRecipeSchemas(RegisterRecipeSchemasEvent event) {
 
     @Override
     public void registerRecipeComponents(RecipeComponentFactoryRegistryEvent event) {
-        event.register("lpIn", ReFactoryCoreGTAddon.LP_IN);
-        event.register("lpOut", ReFactoryCoreGTAddon.LP_OUT);
+        event.register("lpInput", ReFactoryRecipeComponent.LP_IN);
+        event.register("lpOutput", ReFactoryRecipeComponent.LP_OUT);
     }
 }

src/main/java/com/illuminatijoe/refactorycore/integration/kubejs/ReFactoryRecipeComponent.java

@@ -0,0 +1,15 @@
+package com.illuminatijoe.refactorycore.integration.kubejs;
+
+import com.illuminatijoe.refactorycore.api.capabilities.recipe.LPRecipeCapability;
+
+import com.gregtechceu.gtceu.integration.kjs.recipe.components.ContentJS;
+
+import dev.latvian.mods.kubejs.recipe.component.NumberComponent;
+
+public class ReFactoryRecipeComponent {
+
+    public static final ContentJS<Integer> LP_IN = new ContentJS<>(NumberComponent.ANY_INT,
+            LPRecipeCapability.CAP, false);
+    public static final ContentJS<Integer> LP_OUT = new ContentJS<>(NumberComponent.ANY_INT,
+            LPRecipeCapability.CAP, true);
+}

src/main/java/com/illuminatijoe/refactorycore/integration/kubejs/ReFactoryRecipeSchema.java

@@ -11,20 +11,22 @@
 
 public interface ReFactoryRecipeSchema {
 
-    @SuppressWarnings("InnerClassMayBeStatic")
     @Accessors(chain = true, fluent = true)
     class ReFactoryRecipeJS extends GTRecipeSchema.GTRecipeJS {
 
         public GTRecipeSchema.GTRecipeJS lpInput(int essence) {
-            return this.input(LPRecipeCapability.CAP, essence);
+            this.input(LPRecipeCapability.CAP, essence);
+            return this;
         }
 
         public GTRecipeSchema.GTRecipeJS lpOutput(int essence) {
-            return this.output(LPRecipeCapability.CAP, essence);
+            this.output(LPRecipeCapability.CAP, essence);
+            return this;
         }
     }
 
-    RecipeSchema SCHEMA = new RecipeSchema(ReFactoryRecipeJS.class, ReFactoryRecipeJS::new, DURATION, DATA, CONDITIONS,
+    RecipeSchema SCHEMA = new RecipeSchema(ReFactoryRecipeJS.class, ReFactoryRecipeJS::new,
+            DURATION, DATA, CONDITIONS,
             ALL_INPUTS, ALL_TICK_INPUTS, ALL_OUTPUTS, ALL_TICK_OUTPUTS,
             INPUT_CHANCE_LOGICS, OUTPUT_CHANCE_LOGICS, TICK_INPUT_CHANCE_LOGICS, TICK_OUTPUT_CHANCE_LOGICS, CATEGORY)
             .constructor((recipe, schemaType, keys, from) -> recipe.id(from.getValue(recipe, ID)), ID)

src/main/java/com/illuminatijoe/refactorycore/machines/part/LPHatchPartMachine.java

@@ -90,6 +90,7 @@ public static int getMaxCapacity(int tier) {
 
     public static int getMaxConsumption(int tier) {
         return switch (tier) {
+            case GTValues.EV -> 5000;
             case GTValues.IV -> 10000;
             case GTValues.LuV -> 50000;
             case GTValues.ZPM -> 5000000;