Fix kubejs compat

Author: SammySemicolon

build.gradle.kts

@@ -98,65 +98,74 @@ repositories {
     }
     mavenLocal()
     mavenCentral()
-    maven {
+    maven { //Lodestone
+        name = "BlameJared maven"
+        url = uri("https://maven.blamejared.com/")
+    }
+    maven { //Curios
         name = "Curios maven"
         url = uri("https://maven.theillusivec4.top/")
     }
-    maven {
+    maven { //JEI
         name = "JEI maven"
         url = uri("https://dvs1.progwml6.com/files/maven")
     }
-    maven {
-        name = "BlameJared maven"
-        url = uri("https://maven.blamejared.com/")
-    }
-    maven {
-        name = "KosmX's maven"
-        url = uri("https://maven.kosmx.dev/")
-    }
-    maven {
+
+    maven { //Curse Maven, Generic
         name = "Curse Maven"
         url = uri("https://cursemaven.com")
         content {
             includeGroup("curse.maven")
         }
     }
-    maven {
-        url = uri("https://dl.cloudsmith.io/public/geckolib3/geckolib/maven/")
+    maven { //ParchmentMC Maven, Generic
+        name = "ParchmentMC"
+        url = uri("https://maven.parchmentmc.org")
         content {
-            includeGroup("software.bernie.geckolib")
+            includeGroup("org.parchmentmc.data")
         }
     }
-    maven {
+    maven { //Mod Maven, Generic
         name = "ModMaven"
         url = uri("https://modmaven.dev")
     }
-    maven {
+
+    maven { //KubeJS
+        url = uri("https://maven.latvian.dev/releases")
+        content {
+            includeGroup("dev.latvian.mods")
+            includeGroup("dev.latvian.apps")
+        }
+    }
+    maven { //KubeJS Dependencies
         name = "jitpack"
         url = uri("https://jitpack.io")
         content {
             includeGroup("io.github")
+            includeGroup("com.github.rtyley")
         }
     }
-    maven {
-        name = "OctoStudios"
-        url = uri("https://maven.octo-studios.com/releases")
-    }
-    maven {
-        url = uri("https://maven.latvian.dev/releases")
+
+    maven { //GeckoLib, Needed for Iron's Spellbooks
+        url = uri("https://dl.cloudsmith.io/public/geckolib3/geckolib/maven/")
         content {
-            includeGroup("dev.latvian.mods")
+            includeGroup("software.bernie.geckolib")
         }
     }
-    maven {
+    maven { //Player Animation Lib, Needed for Iron's Spellbooks
+        name = "KosmX's maven"
+        url = uri("https://maven.kosmx.dev/")
+    }
+
+    maven { //Create
         url = uri("https://maven.createmod.net")
-    } //Create
-    maven {
+    }
+    maven { //Registrate
         url = uri("https://mvn.devos.one/snapshots")
-    } //Registrate
-    maven {
+    }
+    maven { // NeoForge config api port, needed by ponder
         url = uri("https://raw.githubusercontent.com/Fuzss/modresources/main/maven")
-    } // NeoForge config api port, needed by ponder
+    }
 }
 
 dependencies {
@@ -178,8 +187,7 @@ dependencies {
     runtimeOnly(("team.lodestar.wayward_attributes:wayward_attributes:${property("minecraft_version")}-${property("wayward_attributes_version")}"))
 
     // KubeJS
-    implementation("curse.maven:rhino-416294:6184623")
-    implementation("curse.maven:kubejs-238086:5810100")
+    implementation("dev.latvian.mods:kubejs-neoforge:${property("kubejs_version")}")
 
     // Tetra, Optional
 //    compileOnly(("curse.maven:tetra-${property("tetra_version")}"))

changelogs/1.8.1.txt

@@ -0,0 +1,4 @@
+# Bugfixes
+- Fixed Rite of Hastening crashing the game in certain situations
+- Fixed Spirit Catalyzers not working properly when fed just one item at a time
+- Fixed Spirit Catalyzers not properly returning the crafting remainder items with, for example, Lava Buckets

gradle.properties

@@ -15,15 +15,15 @@ parchment_mappings_version=2024.11.17
 
 mod_name=Malum
 mod_id=malum
-mod_version=1.8
+mod_version=1.8.1
 mod_license=All Rights Reserved
 mod_group_id=com.sammy.malum
 mod_authors=Sammy Semicolon
 mod_description=A dark magic mod focused on soul and spirit magic.
 
 # Mandatory
 lodestone_version=1.8.0.510
-lodestone_version_range=[1.7.2,)
+lodestone_version_range=[1.8.0,)
 curios_version=9.3.1+1.21.1
 
 # Wayward Attributes
@@ -34,6 +34,10 @@ gecko_lib_version=4.7
 player_animator_version=2.0.0-alpha1+1.21
 irons_spells_version=1.21-3.8.5
 
+# KubeJS
+kubejs_version=2101.7.2-build.277
+rhino_version=2001.2.2-build.13
+
 # Create
 create_version = 6.0.7-117
 flywheel_version = 1.0.4
@@ -42,7 +46,7 @@ ponder_version = 1.0.56
 registrate_version = MC1.21-1.3.0+62
 
 # Misc
-jei_version=19.21.0.247
+jei_version=19.25.0.322
 fusion_version=1.1.1
 
 imgui_version=1.86.11

src/main/java/com/sammy/malum/common/block/curiosities/spirit_catalyzer/CatalyzerArtificeModifierSourceInstance.java

@@ -5,8 +5,10 @@
 import com.sammy.malum.core.systems.spirit.type.SpiritArcanaType;
 import com.sammy.malum.visual_effects.SpiritCrucibleParticleEffects;
 import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.entity.item.*;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.crafting.RecipeType;
+import net.minecraft.world.level.*;
 import team.lodestar.lodestone.helpers.block.BlockStateHelper;
 
 import java.util.function.Consumer;
@@ -52,10 +54,21 @@ public boolean canModifyFocusing(ArtificeAttributeData attributes) {
             return true;
         }
         ItemStack stack = catalyzer.inventory.getStackInSlot(0);
-        if (!stack.isEmpty() && stack.getBurnTime(RecipeType.SMELTING) > 0) {
-            stack.shrink(1);
-            catalyzer.burnTicks = stack.getBurnTime(RecipeType.SMELTING) / 2f;
-            BlockStateHelper.updateAndNotifyState(catalyzer.getLevel(), catalyzer.getBlockPos());
+        int burnTime = stack.getBurnTime(RecipeType.SMELTING);
+        if (!stack.isEmpty()) {
+            if (burnTime > 0) {
+                catalyzer.burnTicks = burnTime / 2f;
+                var level = catalyzer.getLevel();
+                if (stack.hasCraftingRemainingItem()) {
+                    var remainder = stack.getCraftingRemainingItem();
+                    var catalyzerPos = catalyzer.getBlockPos();
+                    var spawnPos = SpiritCatalyzerCoreBlockEntity.CATALYZER_ITEM_OFFSET.add(catalyzerPos.getX(), catalyzerPos.getY(), catalyzerPos.getZ());
+                    var entity = new ItemEntity(level, spawnPos.x, spawnPos.y, spawnPos.z, remainder);
+                    level.addFreshEntity(entity);
+                }
+                stack.shrink(1);
+                BlockStateHelper.updateAndNotifyState(level, catalyzer.getBlockPos());
+            }
         }
         return catalyzer.burnTicks > 0;
     }

src/main/java/com/sammy/malum/common/data/attachment/WindTunnelData.java

@@ -6,6 +6,8 @@
 import com.sammy.malum.common.block.curiosities.gust_igniter.wind_tunnel.*;
 import com.sammy.malum.core.handlers.*;
 import com.sammy.malum.registry.common.*;
+import com.sammy.malum.visual_effects.networked.*;
+import com.sammy.malum.visual_effects.networked.wind_gust.*;
 import io.netty.buffer.*;
 import net.minecraft.core.*;
 import net.minecraft.network.codec.*;
@@ -14,7 +16,9 @@
 import net.minecraft.world.entity.player.*;
 import net.minecraft.world.phys.*;
 
+import java.awt.*;
 import java.util.*;
+import java.util.List;
 
 public class WindTunnelData {
 
@@ -101,8 +105,17 @@ public void tickData(Entity entity) {
             return;
         }
         activeTime++;
-        if (entity instanceof ServerPlayer && activeTime % 4 == 0) {
-            entity.syncData(MalumAttachmentTypes.WIND_TUNNEL_INFO);
+        if (level instanceof ServerLevel serverLevel) {
+            boolean isPlayer = entity instanceof Player;
+            int interval = isPlayer ? 4 : 20;
+            if (activeTime % interval == 0) {
+                MalumParticleEffectTypes.WIND_TRAIL
+                        .createEffect(entity)
+                        .customData(new WindTrailParticleEffect.WindTrailParticleEffectData(entity.getId(), 2, interval*2))
+                        .color(new Color(224, 230, 255))
+                        .spawn(serverLevel);
+                entity.syncData(MalumAttachmentTypes.WIND_TUNNEL_INFO);
+            }
         }
         if (entity instanceof Player player) {
             player.resetFallDistance();

src/main/java/com/sammy/malum/common/geas/pact/aerial/CloudSkipperGeas.java

@@ -113,7 +113,6 @@ public void addTooltipComponents(LivingEntity entity, Consumer<Component> toolti
         tooltipAcceptor.accept(ComponentHelper.positiveGeasEffect("rocket_jumping"));
         tooltipAcceptor.accept(ComponentHelper.positiveGeasEffect("wind_gliding"));
         tooltipAcceptor.accept(ComponentHelper.negativeGeasEffect("weak_legs"));
-        super.addTooltipComponents(entity, tooltipAcceptor, tooltipFlag);
     }
 
     @Override

src/main/java/com/sammy/malum/common/spiritrite/effect/infernal/FurnaceAccelerationRiteEffect.java

@@ -4,6 +4,7 @@
 import com.sammy.malum.core.systems.rite.effect.*;
 import net.minecraft.core.BlockPos;
 import net.minecraft.server.level.ServerLevel;
+import net.minecraft.util.*;
 import net.minecraft.world.level.block.entity.AbstractFurnaceBlockEntity;
 import net.minecraft.world.level.block.state.BlockState;
 
@@ -20,33 +21,33 @@ public FurnaceAccelerationRiteEffect() {
     public void applyEffect(ServerLevel level, BlockRiteEffectActivatorEntity entity, BlockState state, BlockPos pos, float impact) {
         if (level.getBlockEntity(pos) instanceof AbstractFurnaceBlockEntity furnace) {
             createEffect(level, pos, INFERNAL_SPIRIT, ELDRITCH_SPIRIT);
-            quickenFurnace(level, furnace, 20, 20);
+            int progress = Mth.floor(20*impact);
+            quickenFurnace(level, furnace, progress, progress);
         }
     }
 
     public void quickenFurnace(ServerLevel level, AbstractFurnaceBlockEntity furnace, int removedLitTime, int addedCookingProgress) {
+        if (!furnace.isLit()) {
+            return;
+        }
         int maxCookingTime = furnace.cookingTotalTime - 1;
         int excessLitTime = 0;
         int excessCookingProgress = 0;
 
         furnace.litTime -= removedLitTime;
         furnace.cookingProgress += addedCookingProgress;
-        if (furnace.litTime < 0) {
+        if (furnace.litTime < 1) {
             int excess = Math.abs(furnace.litTime);
-            furnace.litTime = 0;
+            furnace.litTime = 1;
             excessLitTime = excess;
         }
         if (furnace.cookingProgress > maxCookingTime) {
             int excess = furnace.cookingProgress - maxCookingTime;
             furnace.cookingProgress = maxCookingTime;
             excessCookingProgress = excess;
         }
-        if (excessLitTime != 0 || excessCookingProgress != 0) {
-            int cachedLitTime = furnace.litTime;
-            int cachedCookingProgress = furnace.cookingProgress;
+        if (excessLitTime > 0 || excessCookingProgress > 0) {
             AbstractFurnaceBlockEntity.serverTick(level, furnace.getBlockPos(), furnace.getBlockState(), furnace);
-            furnace.litTime = cachedLitTime;
-            furnace.cookingProgress = cachedCookingProgress;
             quickenFurnace(level, furnace, excessLitTime, excessCookingProgress);
             //Recursion to update the furnace with the excess values after a successful smelt
         }

src/main/java/com/sammy/malum/compat/kubejs/MalumJSPlugin.java

@@ -2,28 +2,25 @@
 
 import com.sammy.malum.common.recipe.spirit_repair.*;
 import com.sammy.malum.compat.kubejs.component.*;
+import com.sammy.malum.compat.kubejs.wrapper.*;
 import com.sammy.malum.core.systems.recipe.*;
-import com.sammy.malum.registry.common.*;
 import dev.latvian.mods.kubejs.plugin.*;
-import dev.latvian.mods.kubejs.recipe.schema.*;
+import dev.latvian.mods.kubejs.recipe.component.*;
 import dev.latvian.mods.kubejs.script.*;
-import net.minecraft.core.*;
-import net.minecraft.sounds.*;
 
 public class MalumJSPlugin implements KubeJSPlugin {
 
     @Override
-    public void registerRecipeComponents(RecipeComponentFactoryRegistry registry) {
+    public void registerRecipeComponents(RecipeComponentTypeRegistry registry) {
         registry.register(SpiritJSComponent.SPIRIT_INGREDIENT);
-        registry.register(SpiritRepairRegexDataJSComponent.REGEX_DATA);
+        registry.register(SpiritRepairRegexDataJSComponent.REPAIR_REGEX);
         registry.register(SoundEventHolderJSComponent.SOUND_HOLDER);
     }
 
     @Override
     public void registerBindings(BindingRegistry bindings) {
         bindings.add("SpiritComponent", SpiritJSComponentWrapper.class);
         bindings.add("RepairRegex", SpiritRepairRegexDataJSComponentWrapper.class);
-        bindings.add("RunicWorkbenchSound", SpiritRepairRegexDataJSComponentWrapper.class);
     }
 
     @Override

src/main/java/com/sammy/malum/compat/kubejs/component/SoundEventHolderJSComponent.java

@@ -4,9 +4,12 @@
 import com.mojang.brigadier.*;
 import com.mojang.brigadier.exceptions.*;
 import com.mojang.serialization.*;
+import com.sammy.malum.*;
+import com.sammy.malum.core.systems.recipe.*;
 import com.sammy.malum.registry.common.*;
 import dev.latvian.mods.kubejs.recipe.*;
 import dev.latvian.mods.kubejs.recipe.component.*;
+import dev.latvian.mods.kubejs.recipe.filter.*;
 import dev.latvian.mods.kubejs.recipe.match.*;
 import dev.latvian.mods.kubejs.util.*;
 import dev.latvian.mods.rhino.*;
@@ -16,33 +19,40 @@
 import net.minecraft.resources.*;
 import net.minecraft.sounds.*;
 
-public record SoundEventHolderJSComponent(String name, Codec<Holder<SoundEvent>> codec) implements RecipeComponent<Holder<SoundEvent>> {
+public record SoundEventHolderJSComponent(RecipeComponentType<?> type) implements RecipeComponent<Holder<SoundEvent>> {
 
-    //TODO: This should just be a built-in component in KubeJS, but using the existing one just parses a SoundEvent instead
-    public static final RecipeComponent<Holder<SoundEvent>> SOUND_HOLDER = new SoundEventHolderJSComponent("malum:runic_workbench_sound", BuiltInRegistries.SOUND_EVENT.holderByNameCodec());
-    public static final TypeInfo TYPE_INFO = TypeInfo.of(Holder.class).withParams(TypeInfo.of(SoundEvent.class));
+    //TODO: This should just be a built-in component in KubeJS, but using the existing one just parses a SoundEvent instead not a Holder<SoundEvent>
+    public static final RecipeComponentType<Holder<SoundEvent>> SOUND_HOLDER = RecipeComponentType.unit(
+            MalumMod.malumPath("runic_workbench_sound"),
+            SoundEventHolderJSComponent::new
+    );
 
     @Override
-    public boolean matches(Context cx, KubeRecipe recipe, Holder<SoundEvent> value, ReplacementMatchInfo match) {
-        return false;
+    public RecipeComponentType<?> type() {
+        return SOUND_HOLDER;
+    }
+
+    @Override
+    public Codec<Holder<SoundEvent>> codec() {
+        return SoundEvent.CODEC;
     }
 
     @Override
     public TypeInfo typeInfo() {
-        return TYPE_INFO;
+        return TypeInfo.of(SoundEvents.NOTE_BLOCK_XYLOPHONE.getClass());
     }
 
     @Override
     public String toString() {
-        return this.name;
+        return type().id().getPath();
     }
 
     @Override
-    public Holder<SoundEvent> wrap(Context cx, KubeRecipe recipe, Object from) {
+    public Holder<SoundEvent> wrap(RecipeScriptContext cx, Object from) {
         if (from instanceof JsonObject json) {
-            return this.codec.decode(JsonOps.INSTANCE, json).result().orElseThrow().getFirst();
+            return codec().decode(JsonOps.INSTANCE, json).result().orElseThrow().getFirst();
         }
-        return fromObject(RegistryAccessContainer.of(cx), from);
+        return fromObject(RegistryAccessContainer.of(cx.cx()), from);
     }
 
     public static Holder<SoundEvent> fromObject(RegistryAccessContainer registries, Object from) {