Kotori0629/Arclight1.18
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Provide more helpful error message iterating recipe

Browse Source
This commit is contained in:
IzzelAliz 2021-10-27 18:12:44 +08:00
parent 9c46952a18
commit f16728bb5f
No known key found for this signature in database
GPG Key ID: EE50E123A11D8338
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
arclight-common/src/main/java/io/izzel/arclight/common/mixin/bukkit/RecipeIteratorMixin.java
View File

@ -1,6 +1,8 @@
package io.izzel.arclight.common.mixin.bukkit; package io.izzel.arclight.common.mixin.bukkit;
import io.izzel.arclight.common.bridge.core.item.crafting.IRecipeBridge; import io.izzel.arclight.common.bridge.core.item.crafting.IRecipeBridge;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.item.crafting.RecipeType;
import org.bukkit.craftbukkit.v.inventory.RecipeIterator; import org.bukkit.craftbukkit.v.inventory.RecipeIterator;
import org.bukkit.inventory.Recipe; import org.bukkit.inventory.Recipe;
import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Final;
@ -10,8 +12,6 @@ import org.spongepowered.asm.mixin.Shadow;
import java.util.Iterator; import java.util.Iterator;
import java.util.Map; import java.util.Map;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.item.crafting.RecipeType;
@Mixin(value = RecipeIterator.class, remap = false) @Mixin(value = RecipeIterator.class, remap = false)
public class RecipeIteratorMixin { public class RecipeIteratorMixin {
@ -45,7 +45,13 @@ public class RecipeIteratorMixin {
public Recipe next() { public Recipe next() {
if (current == null || !current.hasNext()) { if (current == null || !current.hasNext()) {
current = recipes.next().getValue().values().iterator(); current = recipes.next().getValue().values().iterator();
return next();
}
net.minecraft.world.item.crafting.Recipe<?> recipe = current.next();
try {
return ((IRecipeBridge) recipe).bridge$toBukkitRecipe();
} catch (Throwable e) {
throw new RuntimeException("Error converting recipe " + recipe.getId(), e);
} }
return ((IRecipeBridge) current.next()).bridge$toBukkitRecipe();
} }
} }