Merge remote-tracking branch 'origin/2002' into 2004

# Conflicts:
#	src/main/java/dev/latvian/mods/kubejs/recipe/RecipesEventJS.java

src/main/java/dev/latvian/mods/kubejs/KubeJS.java

@@ -239,7 +239,7 @@ public void loadComplete() {
 					.followRedirects(HttpClient.Redirect.ALWAYS)
 					.connectTimeout(Duration.ofSeconds(5L))
 					.build()
-					.send(HttpRequest.newBuilder().uri(URI.create("https://kubejs.com/update-check?" + QUERY)).GET().build(), HttpResponse.BodyHandlers.ofString(StandardCharsets.UTF_8));
+					.send(HttpRequest.newBuilder().uri(URI.create("https://v.kubejs.com/update-check?" + QUERY)).GET().build(), HttpResponse.BodyHandlers.ofString(StandardCharsets.UTF_8));
 				if (response.statusCode() == 200) {
 					var body = response.body().trim();
 

src/main/java/dev/latvian/mods/kubejs/bindings/UtilsWrapper.java

@@ -20,6 +20,8 @@
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.item.CreativeModeTab;
 import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.level.block.Blocks;
+import net.minecraft.world.level.block.state.BlockState;
 import org.jetbrains.annotations.Nullable;
 import org.joml.Vector3f;
 
@@ -244,4 +246,12 @@ static ParticleOptions particleOptions(Object o) {
 
 		return ERROR_PARTICLE;
 	}
+
+	@Info("Parses a block state from the input string. May throw for invalid inputs!")
+	static BlockState parseBlockState(Object o) {
+		if (o instanceof BlockState bs) {
+			return bs;
+		}
+		return o == null ? Blocks.AIR.defaultBlockState() : UtilsJS.parseBlockState(o.toString());
+	}
 }

src/main/java/dev/latvian/mods/kubejs/core/mixin/common/EntityMixin.java

@@ -9,6 +9,7 @@
 import net.minecraft.world.damagesource.DamageSource;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.EntityType;
+import net.minecraft.world.level.Level;
 import org.jetbrains.annotations.Nullable;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -157,4 +158,8 @@ private void loadKJS(CompoundTag tag, CallbackInfo ci) {
 	@Shadow
 	@RemapForJS("distanceToEntity")
 	public abstract float distanceTo(Entity arg);
+
+	@Shadow
+	@HideFromJS
+	public abstract Level level();
 }

src/main/java/dev/latvian/mods/kubejs/entity/CheckLivingEntitySpawnEventJS.java

@@ -7,6 +7,7 @@
 import net.minecraft.world.entity.MobSpawnType;
 import net.minecraft.world.level.BaseSpawner;
 import net.minecraft.world.level.Level;
+import org.jetbrains.annotations.Nullable;
 
 @Info("""
 	Invoked before an entity is spawned into the world.
@@ -19,9 +20,11 @@ public class CheckLivingEntitySpawnEventJS extends LivingEntityEventJS {
 
 	public final double x, y, z;
 	public final MobSpawnType type;
+
+	@Nullable
 	public final BaseSpawner spawner;
 
-	public CheckLivingEntitySpawnEventJS(LivingEntity entity, Level level, double x, double y, double z, MobSpawnType type, BaseSpawner spawner) {
+	public CheckLivingEntitySpawnEventJS(LivingEntity entity, Level level, double x, double y, double z, MobSpawnType type, @Nullable BaseSpawner spawner) {
 		this.entity = entity;
 		this.level = level;
 		this.x = x;
@@ -53,7 +56,8 @@ public MobSpawnType getType() {
 		return type;
 	}
 
-	@Info("The spawner that spawned the entity.")
+	@Info("The spawner that spawned the entity. Can be null if the entity was spawned by worldgen.")
+	@Nullable
 	public BaseSpawner getSpawner() {
 		return spawner;
 	}

src/main/java/dev/latvian/mods/kubejs/entity/KubeJSEntityEventHandler.java

@@ -11,6 +11,7 @@
 import net.minecraft.world.level.BaseSpawner;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.LevelAccessor;
+import org.jetbrains.annotations.Nullable;
 
 public class KubeJSEntityEventHandler {
 	public static void init() {
@@ -20,7 +21,7 @@ public static void init() {
 		EntityEvent.ADD.register(KubeJSEntityEventHandler::entitySpawned);
 	}
 
-	private static EventResult checkSpawn(LivingEntity entity, LevelAccessor la, double x, double y, double z, MobSpawnType type, BaseSpawner spawner) {
+	private static EventResult checkSpawn(LivingEntity entity, LevelAccessor la, double x, double y, double z, MobSpawnType type, @Nullable BaseSpawner spawner) {
 		if (la instanceof Level level && (la.isClientSide() || UtilsJS.staticServer != null) && EntityEvents.CHECK_SPAWN.hasListeners()) {
 			return EntityEvents.CHECK_SPAWN.post(level, entity.getType(), new CheckLivingEntitySpawnEventJS(entity, level, x, y, z, type, spawner)).arch();
 		}

src/main/java/dev/latvian/mods/kubejs/recipe/RecipeExceptionJS.java

@@ -17,7 +17,19 @@ public RecipeExceptionJS(String m, Throwable cause) {
 
 	@Override
 	public String toString() {
-		return getLocalizedMessage();
+		var sb = new StringBuilder();
+		sb.append(getMessage());
+		if (error) {
+			sb.append(" [error]");
+		}
+
+		// append cause as well since RecipeExceptions can swallow underlying problems
+		if (getCause() != null) {
+			sb.append("\ncause: ");
+			sb.append(getCause());
+		}
+
+		return sb.toString();
 	}
 
 	public RecipeExceptionJS error() {

src/main/java/dev/latvian/mods/kubejs/recipe/RecipesEventJS.java

@@ -441,12 +441,13 @@ public void post(RecipeManager recipeManager, Map<ResourceLocation, JsonElement>
 	private RecipeHolder<?> createRecipe(RecipeJS r) {
 		try {
 			var rec = r.createRecipe();
+			var path = r.kjs$getMod() + "/" + r.getPath();
 
-			if (DataExport.export != null) {
-				DataExport.export.addJson("recipes/" + rec.id() + ".json", r.json);
+			if (!r.removed && DataExport.export != null) {
+				DataExport.export.addJson("recipes/%s.json".formatted(path), r.json);
 
 				if (r.newRecipe) {
-					DataExport.export.addJson("added_recipes/" + rec.id() + ".json", r.json);
+					DataExport.export.addJson("added_recipes/%s.json".formatted(path), r.json);
 				}
 			}