Updated rhino, added ServerEvents.modifyRecipeResult replacing callba…

…ck function in recipe with ID
KubeJS-Mods · Jun 12, 2024 · 37dcf00 · 37dcf00
1 parent 8367c89
commit 37dcf00
Show file tree

Hide file tree

Showing 63 changed files with 371 additions and 256 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -15,7 +15,7 @@ mod_version=2006.7.0
 
 neoforge_version=20.6.115
 parchment_version=2024.05.01
-rhino_version=2006.2.5-build.23
+rhino_version=2006.2.5-build.25
 architectury_version=12.1.3
 
 rei_version=15.0.728

diff --git a/src/main/java/dev/latvian/mods/kubejs/BuiltinKubeJSPlugin.java b/src/main/java/dev/latvian/mods/kubejs/BuiltinKubeJSPlugin.java
@@ -59,6 +59,7 @@
 import dev.latvian.mods.kubejs.item.ChancedIngredient;
 import dev.latvian.mods.kubejs.item.ChancedItem;
 import dev.latvian.mods.kubejs.item.ItemBuilder;
+import dev.latvian.mods.kubejs.item.ItemEnchantmentsWrapper;
 import dev.latvian.mods.kubejs.item.ItemStackJS;
 import dev.latvian.mods.kubejs.item.ItemTintFunction;
 import dev.latvian.mods.kubejs.item.creativetab.CreativeTabBuilder;
@@ -118,7 +119,8 @@
 import dev.latvian.mods.kubejs.script.BindingRegistry;
 import dev.latvian.mods.kubejs.script.PlatformWrapper;
 import dev.latvian.mods.kubejs.script.ScriptType;
-import dev.latvian.mods.kubejs.script.WrapperRegistry;
+import dev.latvian.mods.kubejs.script.TypeDescriptionRegistry;
+import dev.latvian.mods.kubejs.script.TypeWrapperRegistry;
 import dev.latvian.mods.kubejs.server.ScheduledServerEvent;
 import dev.latvian.mods.kubejs.server.ServerScriptManager;
 import dev.latvian.mods.kubejs.util.ClassFilter;
@@ -139,6 +141,8 @@
 import dev.latvian.mods.kubejs.util.TimeJS;
 import dev.latvian.mods.kubejs.util.UtilsJS;
 import dev.latvian.mods.kubejs.util.registrypredicate.RegistryPredicate;
+import dev.latvian.mods.rhino.type.RecordTypeInfo;
+import dev.latvian.mods.rhino.type.TypeInfo;
 import dev.latvian.mods.unit.Unit;
 import net.minecraft.commands.arguments.selector.EntitySelector;
 import net.minecraft.core.BlockPos;
@@ -169,6 +173,7 @@
 import net.minecraft.world.item.component.Fireworks;
 import net.minecraft.world.item.crafting.Ingredient;
 import net.minecraft.world.item.enchantment.Enchantment;
+import net.minecraft.world.item.enchantment.ItemEnchantments;
 import net.minecraft.world.level.ItemLike;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.SoundType;
@@ -448,7 +453,7 @@ public void registerBindings(BindingRegistry bindings) {
 	}
 
 	@Override
-	public void registerTypeWrappers(WrapperRegistry registry) {
+	public void registerTypeWrappers(TypeWrapperRegistry registry) {
 		registry.register(RegistryPredicate.class, RegistryPredicate::of);
 
 		// Java / Minecraft //
@@ -480,6 +485,7 @@ public void registerTypeWrappers(WrapperRegistry registry) {
 		registry.register(Item.class, ItemStackJS::getRawItem);
 		registry.register(ItemLike.class, ItemStackJS::getRawItem);
 		registry.registerEnumFromStringCodec(MobCategory.class, MobCategory.CODEC);
+		registry.register(ItemEnchantments.class, ItemEnchantmentsWrapper::from);
 
 		registry.register(AABB.class, AABBWrapper::wrap);
 		registry.register(IntProvider.class, KubeJSTypeWrappers::intProviderOf);
@@ -531,6 +537,11 @@ public void registerTypeWrappers(WrapperRegistry registry) {
 		registry.registerMapCodec(ChancedIngredient.class, ChancedIngredient.CODEC);
 	}
 
+	@Override
+	public void registerTypeDescriptions(TypeDescriptionRegistry registry) {
+		registry.register(SlotFilter.class, ((RecordTypeInfo) TypeInfo.of(SlotFilter.class)).createCombinedType(TypeInfo.INT, IngredientJS.TYPE_INFO));
+	}
+
 	@Override
 	public void registerRecipeFactories(RecipeFactoryRegistry registry) {
 		registry.register(UnknownKubeRecipe.RECIPE_FACTORY);

diff --git a/src/main/java/dev/latvian/mods/kubejs/KubeJSPlugin.java b/src/main/java/dev/latvian/mods/kubejs/KubeJSPlugin.java
@@ -17,7 +17,8 @@
 import dev.latvian.mods.kubejs.registry.BuilderTypeRegistry;
 import dev.latvian.mods.kubejs.script.BindingRegistry;
 import dev.latvian.mods.kubejs.script.ScriptType;
-import dev.latvian.mods.kubejs.script.WrapperRegistry;
+import dev.latvian.mods.kubejs.script.TypeDescriptionRegistry;
+import dev.latvian.mods.kubejs.script.TypeWrapperRegistry;
 import dev.latvian.mods.kubejs.server.DataExport;
 import dev.latvian.mods.kubejs.util.AttachedData;
 import dev.latvian.mods.kubejs.util.ClassFilter;
@@ -58,7 +59,10 @@ default void registerClasses(ScriptType type, ClassFilter filter) {
 	default void registerBindings(BindingRegistry bindings) {
 	}
 
-	default void registerTypeWrappers(WrapperRegistry registry) {
+	default void registerTypeWrappers(TypeWrapperRegistry registry) {
+	}
+
+	default void registerTypeDescriptions(TypeDescriptionRegistry registry) {
 	}
 
 	default void registerRecipeFactories(RecipeFactoryRegistry registry) {

diff --git a/src/main/java/dev/latvian/mods/kubejs/bindings/SizedIngredientWrapper.java b/src/main/java/dev/latvian/mods/kubejs/bindings/SizedIngredientWrapper.java
@@ -57,6 +57,7 @@ static SizedIngredient read(DynamicOps<Tag> registryOps, StringReader reader) th
 
 		if (StringReader.isAllowedNumber(reader.peek())) {
 			count = Mth.ceil(reader.readDouble());
+			reader.skipWhitespace();
 			reader.expect('x');
 			reader.skipWhitespace();
 

diff --git a/src/main/java/dev/latvian/mods/kubejs/bindings/event/ItemEvents.java b/src/main/java/dev/latvian/mods/kubejs/bindings/event/ItemEvents.java
@@ -14,6 +14,7 @@
 import dev.latvian.mods.kubejs.item.ItemModificationKubeEvent;
 import dev.latvian.mods.kubejs.item.ItemPickedUpKubeEvent;
 import dev.latvian.mods.kubejs.item.ItemSmeltedKubeEvent;
+import dev.latvian.mods.kubejs.item.ItemStackJS;
 import dev.latvian.mods.kubejs.item.ItemTooltipKubeEvent;
 import dev.latvian.mods.kubejs.item.custom.ItemToolTierRegistryKubeEvent;
 import net.minecraft.core.registries.Registries;
@@ -26,7 +27,7 @@ public interface ItemEvents {
 
 	EventHandler MODIFICATION = GROUP.startup("modification", () -> ItemModificationKubeEvent.class);
 	EventHandler TOOL_TIER_REGISTRY = GROUP.startup("toolTierRegistry", () -> ItemToolTierRegistryKubeEvent.class);
-	SpecializedEventHandler<ResourceKey<Item>> RIGHT_CLICKED = GROUP.common("rightClicked", SUPPORTS_ITEM, () -> ItemClickedKubeEvent.class).hasResult();
+	SpecializedEventHandler<ResourceKey<Item>> RIGHT_CLICKED = GROUP.common("rightClicked", SUPPORTS_ITEM, () -> ItemClickedKubeEvent.class).hasResult(ItemStackJS.TYPE_INFO);
 	SpecializedEventHandler<ResourceKey<Item>> CAN_PICK_UP = GROUP.common("canPickUp", SUPPORTS_ITEM, () -> ItemPickedUpKubeEvent.class).hasResult();
 	SpecializedEventHandler<ResourceKey<Item>> PICKED_UP = GROUP.common("pickedUp", SUPPORTS_ITEM, () -> ItemPickedUpKubeEvent.class);
 	SpecializedEventHandler<ResourceKey<Item>> DROPPED = GROUP.common("dropped", SUPPORTS_ITEM, () -> ItemDroppedKubeEvent.class).hasResult();

diff --git a/src/main/java/dev/latvian/mods/kubejs/bindings/event/ServerEvents.java b/src/main/java/dev/latvian/mods/kubejs/bindings/event/ServerEvents.java
@@ -5,8 +5,10 @@
 import dev.latvian.mods.kubejs.event.EventHandler;
 import dev.latvian.mods.kubejs.event.Extra;
 import dev.latvian.mods.kubejs.event.SpecializedEventHandler;
+import dev.latvian.mods.kubejs.item.ItemStackJS;
 import dev.latvian.mods.kubejs.recipe.AfterRecipesLoadedKubeEvent;
 import dev.latvian.mods.kubejs.recipe.CompostableRecipesKubeEvent;
+import dev.latvian.mods.kubejs.recipe.ModifyRecipeResultKubeEvent;
 import dev.latvian.mods.kubejs.recipe.RecipesKubeEvent;
 import dev.latvian.mods.kubejs.recipe.schema.RecipeMappingRegistry;
 import dev.latvian.mods.kubejs.recipe.schema.RecipeSchemaRegistry;
@@ -37,4 +39,5 @@ public interface ServerEvents {
 	EventHandler RECIPES_AFTER_LOADED = GROUP.server("afterRecipes", () -> AfterRecipesLoadedKubeEvent.class);
 	EventHandler SPECIAL_RECIPES = GROUP.server("specialRecipeSerializers", () -> SpecialRecipeSerializerManager.class);
 	EventHandler COMPOSTABLE_RECIPES = GROUP.server("compostableRecipes", () -> CompostableRecipesKubeEvent.class);
+	SpecializedEventHandler<String> MODIFY_RECIPE_RESULT = GROUP.server("modifyRecipeResult", Extra.STRING, () -> ModifyRecipeResultKubeEvent.class).required().hasResult(ItemStackJS.TYPE_INFO);
 }
diff --git a/src/main/java/dev/latvian/mods/kubejs/block/BlockBuilder.java b/src/main/java/dev/latvian/mods/kubejs/block/BlockBuilder.java
@@ -24,10 +24,10 @@
 import dev.latvian.mods.kubejs.registry.RegistryInfo;
 import dev.latvian.mods.kubejs.script.ScriptType;
 import dev.latvian.mods.kubejs.typings.Info;
-import dev.latvian.mods.kubejs.typings.ReturnsSelf;
 import dev.latvian.mods.kubejs.util.Cast;
 import dev.latvian.mods.kubejs.util.ConsoleJS;
 import dev.latvian.mods.rhino.util.HideFromJS;
+import dev.latvian.mods.rhino.util.ReturnsSelf;
 import net.minecraft.core.Direction;
 import net.minecraft.core.Holder;
 import net.minecraft.network.chat.Component;

diff --git a/src/main/java/dev/latvian/mods/kubejs/block/DetectorBlock.java b/src/main/java/dev/latvian/mods/kubejs/block/DetectorBlock.java
@@ -3,7 +3,7 @@
 import dev.latvian.mods.kubejs.KubeJS;
 import dev.latvian.mods.kubejs.bindings.event.BlockEvents;
 import dev.latvian.mods.kubejs.generator.AssetJsonGenerator;
-import dev.latvian.mods.kubejs.typings.ReturnsSelf;
+import dev.latvian.mods.rhino.util.ReturnsSelf;
 import net.minecraft.core.BlockPos;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;

diff --git a/src/main/java/dev/latvian/mods/kubejs/block/custom/ButtonBlockBuilder.java b/src/main/java/dev/latvian/mods/kubejs/block/custom/ButtonBlockBuilder.java
@@ -3,7 +3,7 @@
 import dev.latvian.mods.kubejs.client.ModelGenerator;
 import dev.latvian.mods.kubejs.client.VariantBlockStateGenerator;
 import dev.latvian.mods.kubejs.generator.AssetJsonGenerator;
-import dev.latvian.mods.kubejs.typings.ReturnsSelf;
+import dev.latvian.mods.rhino.util.ReturnsSelf;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.tags.BlockTags;
 import net.minecraft.world.level.block.Block;

diff --git a/src/main/java/dev/latvian/mods/kubejs/block/custom/CarpetBlockBuilder.java b/src/main/java/dev/latvian/mods/kubejs/block/custom/CarpetBlockBuilder.java
@@ -2,7 +2,7 @@
 
 import dev.latvian.mods.kubejs.client.VariantBlockStateGenerator;
 import dev.latvian.mods.kubejs.generator.AssetJsonGenerator;
-import dev.latvian.mods.kubejs.typings.ReturnsSelf;
+import dev.latvian.mods.rhino.util.ReturnsSelf;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.tags.BlockTags;
 import net.minecraft.world.level.block.Block;

diff --git a/src/main/java/dev/latvian/mods/kubejs/block/custom/CropBlockBuilder.java b/src/main/java/dev/latvian/mods/kubejs/block/custom/CropBlockBuilder.java
@@ -9,7 +9,7 @@
 import dev.latvian.mods.kubejs.generator.AssetJsonGenerator;
 import dev.latvian.mods.kubejs.level.BlockContainerJS;
 import dev.latvian.mods.kubejs.typings.Info;
-import dev.latvian.mods.kubejs.typings.ReturnsSelf;
+import dev.latvian.mods.rhino.util.ReturnsSelf;
 import net.minecraft.core.BlockPos;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.level.ServerLevel;

diff --git a/src/main/java/dev/latvian/mods/kubejs/block/custom/FallingBlockBuilder.java b/src/main/java/dev/latvian/mods/kubejs/block/custom/FallingBlockBuilder.java
@@ -4,7 +4,7 @@
 import com.mojang.serialization.codecs.RecordCodecBuilder;
 import dev.latvian.mods.kubejs.block.BlockBuilder;
 import dev.latvian.mods.kubejs.color.Color;
-import dev.latvian.mods.kubejs.typings.ReturnsSelf;
+import dev.latvian.mods.rhino.util.ReturnsSelf;
 import net.minecraft.core.BlockPos;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.util.ColorRGBA;

diff --git a/src/main/java/dev/latvian/mods/kubejs/block/custom/FenceGateBlockBuilder.java b/src/main/java/dev/latvian/mods/kubejs/block/custom/FenceGateBlockBuilder.java
@@ -3,7 +3,7 @@
 import dev.latvian.mods.kubejs.client.ModelGenerator;
 import dev.latvian.mods.kubejs.client.VariantBlockStateGenerator;
 import dev.latvian.mods.kubejs.generator.AssetJsonGenerator;
-import dev.latvian.mods.kubejs.typings.ReturnsSelf;
+import dev.latvian.mods.rhino.util.ReturnsSelf;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.tags.BlockTags;
 import net.minecraft.world.level.block.Block;

diff --git a/src/main/java/dev/latvian/mods/kubejs/block/custom/HorizontalDirectionalBlockBuilder.java b/src/main/java/dev/latvian/mods/kubejs/block/custom/HorizontalDirectionalBlockBuilder.java
@@ -4,7 +4,7 @@
 import dev.latvian.mods.kubejs.client.ModelGenerator;
 import dev.latvian.mods.kubejs.client.VariantBlockStateGenerator;
 import dev.latvian.mods.kubejs.generator.AssetJsonGenerator;
-import dev.latvian.mods.kubejs.typings.ReturnsSelf;
+import dev.latvian.mods.rhino.util.ReturnsSelf;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.resources.ResourceLocation;

diff --git a/src/main/java/dev/latvian/mods/kubejs/block/custom/PressurePlateBlockBuilder.java b/src/main/java/dev/latvian/mods/kubejs/block/custom/PressurePlateBlockBuilder.java
@@ -3,7 +3,7 @@
 import dev.latvian.mods.kubejs.client.ModelGenerator;
 import dev.latvian.mods.kubejs.client.VariantBlockStateGenerator;
 import dev.latvian.mods.kubejs.generator.AssetJsonGenerator;
-import dev.latvian.mods.kubejs.typings.ReturnsSelf;
+import dev.latvian.mods.rhino.util.ReturnsSelf;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.tags.BlockTags;
 import net.minecraft.world.level.block.Block;

diff --git a/src/main/java/dev/latvian/mods/kubejs/command/KubeJSCommands.java b/src/main/java/dev/latvian/mods/kubejs/command/KubeJSCommands.java
@@ -327,7 +327,7 @@ private static int dumpEvents(CommandSourceStack source) {
 
 				builder.append("- Valid script types: ").append(handler.scriptTypePredicate.getValidTypes()).append("\n\n");
 
-				builder.append("- Has result? ").append(handler.getHasResult() ? UNICODE_TICK : UNICODE_CROSS).append("\n\n");
+				builder.append("- Has result? ").append(handler.getResult() != null ? UNICODE_TICK : UNICODE_CROSS).append("\n\n");
 
 				builder.append("- Event class: ");
 

diff --git a/src/main/java/dev/latvian/mods/kubejs/core/EnchantmentKJS.java b/src/main/java/dev/latvian/mods/kubejs/core/EnchantmentKJS.java
@@ -0,0 +1,13 @@
+package dev.latvian.mods.kubejs.core;
+
+import dev.latvian.mods.kubejs.registry.RegistryInfo;
+import dev.latvian.mods.rhino.util.RemapPrefixForJS;
+import net.minecraft.world.item.enchantment.Enchantment;
+
+@RemapPrefixForJS("kjs$")
+public interface EnchantmentKJS extends RegistryObjectKJS<Enchantment> {
+	@Override
+	default RegistryInfo<Enchantment> kjs$getKubeRegistry() {
+		return RegistryInfo.ENCHANTMENT;
+	}
+}
diff --git a/src/main/java/dev/latvian/mods/kubejs/core/ItemStackKJS.java b/src/main/java/dev/latvian/mods/kubejs/core/ItemStackKJS.java
@@ -12,12 +12,12 @@
 import dev.latvian.mods.kubejs.recipe.ReplacementMatch;
 import dev.latvian.mods.kubejs.registry.RegistryInfo;
 import dev.latvian.mods.kubejs.script.KubeJSContext;
-import dev.latvian.mods.kubejs.typings.ReturnsSelf;
 import dev.latvian.mods.kubejs.util.ID;
 import dev.latvian.mods.kubejs.util.WithCodec;
 import dev.latvian.mods.rhino.Context;
 import dev.latvian.mods.rhino.Undefined;
 import dev.latvian.mods.rhino.util.RemapPrefixForJS;
+import dev.latvian.mods.rhino.util.ReturnsSelf;
 import dev.latvian.mods.rhino.util.SpecialEquality;
 import dev.latvian.mods.rhino.util.ToStringJS;
 import net.minecraft.core.Holder;
@@ -36,6 +36,7 @@
 import net.minecraft.world.item.component.ItemLore;
 import net.minecraft.world.item.crafting.Ingredient;
 import net.minecraft.world.item.enchantment.Enchantment;
+import net.minecraft.world.item.enchantment.EnchantmentHelper;
 import net.minecraft.world.item.enchantment.ItemEnchantments;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.Blocks;
@@ -203,7 +204,7 @@ default boolean specialEquals(Context cx, Object o, boolean shallow) {
 	}
 
 	default ItemEnchantments kjs$getEnchantments() {
-		return kjs$self().get(DataComponents.ENCHANTMENTS);
+		return EnchantmentHelper.getEnchantmentsForCrafting(kjs$self());
 	}
 
 	default boolean kjs$hasEnchantment(Enchantment enchantment, int level) {
@@ -219,12 +220,14 @@ default boolean specialEquals(Context cx, Object o, boolean shallow) {
 	}
 
 	@ReturnsSelf(copy = true)
-	default ItemStack kjs$enchant(Map<Enchantment, Integer> enchantments) {
+	default ItemStack kjs$enchant(ItemEnchantments enchantments) {
 		var is = kjs$self().copy();
 
-		for (var entry : enchantments.entrySet()) {
-			is.enchant(entry.getKey(), entry.getValue());
-		}
+		EnchantmentHelper.updateEnchantments(is, mutable -> {
+			for (var entry : enchantments.entrySet()) {
+				mutable.upgrade(entry.getKey().value(), entry.getValue());
+			}
+		});
 
 		return is;
 	}

diff --git a/src/main/java/dev/latvian/mods/kubejs/core/mixin/EnchantmentMixin.java b/src/main/java/dev/latvian/mods/kubejs/core/mixin/EnchantmentMixin.java
@@ -0,0 +1,46 @@
+package dev.latvian.mods.kubejs.core.mixin;
+
+import dev.latvian.mods.kubejs.core.EnchantmentKJS;
+import net.minecraft.core.Holder;
+import net.minecraft.resources.ResourceKey;
+import net.minecraft.world.item.enchantment.Enchantment;
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.Unique;
+
+@Mixin(Enchantment.class)
+public abstract class EnchantmentMixin implements EnchantmentKJS {
+	@Shadow
+	@Final
+	private Holder.Reference<Enchantment> builtInRegistryHolder;
+
+	@Unique
+	private ResourceKey<Enchantment> kjs$registryKey;
+
+	@Unique
+	private String kjs$id;
+
+	@Override
+	public Holder<Enchantment> kjs$asHolder() {
+		return builtInRegistryHolder;
+	}
+
+	@Override
+	public ResourceKey<Enchantment> kjs$getRegistryKey() {
+		if (kjs$registryKey == null) {
+			kjs$registryKey = EnchantmentKJS.super.kjs$getRegistryKey();
+		}
+
+		return kjs$registryKey;
+	}
+
+	@Override
+	public String kjs$getId() {
+		if (kjs$id == null) {
+			kjs$id = EnchantmentKJS.super.kjs$getId();
+		}
+
+		return kjs$id;
+	}
+}
diff --git a/src/main/java/dev/latvian/mods/kubejs/core/mixin/ItemStackMixin.java b/src/main/java/dev/latvian/mods/kubejs/core/mixin/ItemStackMixin.java
@@ -5,6 +5,7 @@
 import dev.latvian.mods.rhino.util.RemapPrefixForJS;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.enchantment.Enchantment;
+import net.minecraft.world.item.enchantment.ItemEnchantments;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 
@@ -14,4 +15,8 @@ public abstract class ItemStackMixin implements ItemStackKJS {
 	@Shadow
 	@HideFromJS
 	public abstract void enchant(Enchantment enchantment, int level);
+
+	@Shadow
+	@HideFromJS
+	public abstract ItemEnchantments getEnchantments();
 }