Anvilcraft/HexCasting
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix FD on fabric being behind and making pan uncraftable

Browse source
This commit is contained in:
yrsegal@gmail.com 2022-08-07 20:01:50 -04:00
parent 24e98169e6
commit 1978cf9c93
2 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Fabric/src/main/java/at/petrak/hexcasting/fabric/recipe/FabricModConditionalIngredient.java
View file

@ -73,10 +73,14 @@ public class FabricModConditionalIngredient extends BaseCustomIngredient {
JsonObject object = element.getAsJsonObject();
if (object.has("type") && object.getAsJsonPrimitive("type").getAsString().equals(ID.toString())) {
if (object.has("modid") && IXplatAbstractions.INSTANCE.isModPresent(object.getAsJsonPrimitive("modid").getAsString()))
return Ingredient.fromJson(object.get("if_loaded"));
else
return Ingredient.fromJson(object.get("default"));
if (object.has("modid") && IXplatAbstractions.INSTANCE.isModPresent(object.getAsJsonPrimitive("modid").getAsString())) {
Ingredient ingredient = Ingredient.fromJson(object.get("if_loaded"));
if (!ingredient.isEmpty()) {
return ingredient;
}
}
return Ingredient.fromJson(object.get("default"));
}
return null;

12
Forge/src/main/java/at/petrak/hexcasting/forge/recipe/ForgeModConditionalIngredient.java
View file

@ -73,10 +73,14 @@ public class ForgeModConditionalIngredient extends AbstractIngredient {
public static Ingredient fromJson(JsonObject object) {
if (object.has("type") && object.getAsJsonPrimitive("type").getAsString().equals(ID.toString())) {
if (object.has("modid") && IXplatAbstractions.INSTANCE.isModPresent(object.getAsJsonPrimitive("modid").getAsString()))
return Ingredient.fromJson(object.get("if_loaded"));
else
return Ingredient.fromJson(object.get("default"));
if (object.has("modid") && IXplatAbstractions.INSTANCE.isModPresent(object.getAsJsonPrimitive("modid").getAsString())) {
Ingredient ingredient = Ingredient.fromJson(object.get("if_loaded"));
if (!ingredient.isEmpty()) {
return ingredient;
}
}
return Ingredient.fromJson(object.get("default"));
}
return Ingredient.of();