From e571fc49155d81c56105d4d0d36333cee205666e Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 29 Jun 2017 20:25:36 -0500 Subject: [PATCH] Don't reinvent the wheel, GardenOfGlass recipe condition is just forge:mod_loaded --- .../GardenOfGlassConditionFactory.java | 25 ------------------- .../assets/botania/recipes/_factories.json | 1 - .../assets/botania/recipes/blazeblock.json | 7 ++++-- .../assets/botania/recipes/cocoon.json | 7 ++++-- .../conversions/blazeblock_deconstruct.json | 7 ++++-- .../botania/recipes/fertilizer_powder.json | 7 ++++-- .../recipes/garden_of_glass/blazeblock.json | 4 +-- .../blazeblock_deconstruct.json | 4 +-- .../recipes/garden_of_glass/cocoon.json | 4 +-- .../garden_of_glass/end_portal_frame.json | 4 +-- .../garden_of_glass/fertilizer_powder.json | 4 +-- .../magma_cream_to_slime_ball.json | 4 +-- .../pebble_to_cobblestone.json | 4 +-- .../garden_of_glass/root_to_fertilizer.json | 4 +-- .../garden_of_glass/root_to_sapling.json | 4 +-- .../recipes/garden_of_glass/spreader_0.json | 4 +-- .../assets/botania/recipes/spreader_0.json | 7 ++++-- 17 files changed, 45 insertions(+), 56 deletions(-) delete mode 100644 src/main/java/vazkii/botania/common/crafting/GardenOfGlassConditionFactory.java diff --git a/src/main/java/vazkii/botania/common/crafting/GardenOfGlassConditionFactory.java b/src/main/java/vazkii/botania/common/crafting/GardenOfGlassConditionFactory.java deleted file mode 100644 index 28398a60a..000000000 --- a/src/main/java/vazkii/botania/common/crafting/GardenOfGlassConditionFactory.java +++ /dev/null @@ -1,25 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - */ -package vazkii.botania.common.crafting; - -import com.google.gson.JsonObject; -import net.minecraft.util.JsonUtils; -import net.minecraftforge.common.crafting.IConditionFactory; -import net.minecraftforge.common.crafting.JsonContext; -import vazkii.botania.common.Botania; - -import java.util.function.BooleanSupplier; - -public class GardenOfGlassConditionFactory implements IConditionFactory { - @Override - public BooleanSupplier parse(JsonContext context, JsonObject json) { - boolean value = JsonUtils.getBoolean(json , "value", true); - return () -> Botania.gardenOfGlassLoaded == value; - } -} diff --git a/src/main/resources/assets/botania/recipes/_factories.json b/src/main/resources/assets/botania/recipes/_factories.json index 12ea45195..1e09e0a3b 100644 --- a/src/main/resources/assets/botania/recipes/_factories.json +++ b/src/main/resources/assets/botania/recipes/_factories.json @@ -1,6 +1,5 @@ { "conditions": { - "garden_of_glass": "vazkii.botania.common.crafting.GardenOfGlassConditionFactory", "dark_quartz_enabled": "vazkii.botania.common.crafting.DarkQuartzConditionFactory", "fluxfield_enabled": "vazkii.botania.common.crafting.FluxfieldConditionFactory" } diff --git a/src/main/resources/assets/botania/recipes/blazeblock.json b/src/main/resources/assets/botania/recipes/blazeblock.json index 332348294..a4f006027 100644 --- a/src/main/resources/assets/botania/recipes/blazeblock.json +++ b/src/main/resources/assets/botania/recipes/blazeblock.json @@ -1,8 +1,11 @@ { "conditions": [ { - "type": "botania:garden_of_glass", - "value": false + "type": "forge:not", + "value": { + "type": "forge:mod_loaded", + "modid": "gardenofglass" + } } ], "result": { diff --git a/src/main/resources/assets/botania/recipes/cocoon.json b/src/main/resources/assets/botania/recipes/cocoon.json index 048bd13f0..c693b25ca 100644 --- a/src/main/resources/assets/botania/recipes/cocoon.json +++ b/src/main/resources/assets/botania/recipes/cocoon.json @@ -1,8 +1,11 @@ { "conditions": [ { - "type": "botania:garden_of_glass", - "value": false + "type": "forge:not", + "value": { + "type": "forge:mod_loaded", + "modid": "gardenofglass" + } } ], "result": { diff --git a/src/main/resources/assets/botania/recipes/conversions/blazeblock_deconstruct.json b/src/main/resources/assets/botania/recipes/conversions/blazeblock_deconstruct.json index 5101e3afc..9ea3f1ea8 100644 --- a/src/main/resources/assets/botania/recipes/conversions/blazeblock_deconstruct.json +++ b/src/main/resources/assets/botania/recipes/conversions/blazeblock_deconstruct.json @@ -1,8 +1,11 @@ { "conditions": [ { - "type": "botania:garden_of_glass", - "value": false + "type": "forge:not", + "value": { + "type": "forge:mod_loaded", + "modid": "gardenofglass" + } } ], "result": { diff --git a/src/main/resources/assets/botania/recipes/fertilizer_powder.json b/src/main/resources/assets/botania/recipes/fertilizer_powder.json index 8cca33265..b633a4a7d 100644 --- a/src/main/resources/assets/botania/recipes/fertilizer_powder.json +++ b/src/main/resources/assets/botania/recipes/fertilizer_powder.json @@ -1,8 +1,11 @@ { "conditions": [ { - "type": "botania:garden_of_glass", - "value": false + "type": "forge:not", + "value": { + "type": "forge:mod_loaded", + "modid": "gardenofglass" + } } ], "result": { diff --git a/src/main/resources/assets/botania/recipes/garden_of_glass/blazeblock.json b/src/main/resources/assets/botania/recipes/garden_of_glass/blazeblock.json index 9a26c0ef4..28a3eb911 100644 --- a/src/main/resources/assets/botania/recipes/garden_of_glass/blazeblock.json +++ b/src/main/resources/assets/botania/recipes/garden_of_glass/blazeblock.json @@ -1,8 +1,8 @@ { "conditions": [ { - "type": "botania:garden_of_glass", - "value": true + "type": "forge:mod_loaded", + "modid": "gardenofglass" } ], "result": { diff --git a/src/main/resources/assets/botania/recipes/garden_of_glass/blazeblock_deconstruct.json b/src/main/resources/assets/botania/recipes/garden_of_glass/blazeblock_deconstruct.json index 69061bb8b..46fe6dc4c 100644 --- a/src/main/resources/assets/botania/recipes/garden_of_glass/blazeblock_deconstruct.json +++ b/src/main/resources/assets/botania/recipes/garden_of_glass/blazeblock_deconstruct.json @@ -1,8 +1,8 @@ { "conditions": [ { - "type": "botania:garden_of_glass", - "value": true + "type": "forge:mod_loaded", + "modid": "gardenofglass" } ], "result": { diff --git a/src/main/resources/assets/botania/recipes/garden_of_glass/cocoon.json b/src/main/resources/assets/botania/recipes/garden_of_glass/cocoon.json index 52031baa6..8281dfe84 100644 --- a/src/main/resources/assets/botania/recipes/garden_of_glass/cocoon.json +++ b/src/main/resources/assets/botania/recipes/garden_of_glass/cocoon.json @@ -1,8 +1,8 @@ { "conditions": [ { - "type": "botania:garden_of_glass", - "value": true + "type": "forge:mod_loaded", + "modid": "gardenofglass" } ], "result": { diff --git a/src/main/resources/assets/botania/recipes/garden_of_glass/end_portal_frame.json b/src/main/resources/assets/botania/recipes/garden_of_glass/end_portal_frame.json index 27dbc6368..3cf3b6203 100644 --- a/src/main/resources/assets/botania/recipes/garden_of_glass/end_portal_frame.json +++ b/src/main/resources/assets/botania/recipes/garden_of_glass/end_portal_frame.json @@ -1,8 +1,8 @@ { "conditions": [ { - "type": "botania:garden_of_glass", - "value": true + "type": "forge:mod_loaded", + "modid": "gardenofglass" } ], "result": { diff --git a/src/main/resources/assets/botania/recipes/garden_of_glass/fertilizer_powder.json b/src/main/resources/assets/botania/recipes/garden_of_glass/fertilizer_powder.json index 84134c26a..cb0c6c09f 100644 --- a/src/main/resources/assets/botania/recipes/garden_of_glass/fertilizer_powder.json +++ b/src/main/resources/assets/botania/recipes/garden_of_glass/fertilizer_powder.json @@ -1,8 +1,8 @@ { "conditions": [ { - "type": "botania:garden_of_glass", - "value": true + "type": "forge:mod_loaded", + "modid": "gardenofglass" } ], "result": { diff --git a/src/main/resources/assets/botania/recipes/garden_of_glass/magma_cream_to_slime_ball.json b/src/main/resources/assets/botania/recipes/garden_of_glass/magma_cream_to_slime_ball.json index 502b41a69..617f8b114 100644 --- a/src/main/resources/assets/botania/recipes/garden_of_glass/magma_cream_to_slime_ball.json +++ b/src/main/resources/assets/botania/recipes/garden_of_glass/magma_cream_to_slime_ball.json @@ -1,8 +1,8 @@ { "conditions": [ { - "type": "botania:garden_of_glass", - "value": true + "type": "forge:mod_loaded", + "modid": "gardenofglass" } ], "result": { diff --git a/src/main/resources/assets/botania/recipes/garden_of_glass/pebble_to_cobblestone.json b/src/main/resources/assets/botania/recipes/garden_of_glass/pebble_to_cobblestone.json index 7ba051b81..2873ce83e 100644 --- a/src/main/resources/assets/botania/recipes/garden_of_glass/pebble_to_cobblestone.json +++ b/src/main/resources/assets/botania/recipes/garden_of_glass/pebble_to_cobblestone.json @@ -1,8 +1,8 @@ { "conditions": [ { - "type": "botania:garden_of_glass", - "value": true + "type": "forge:mod_loaded", + "modid": "gardenofglass" } ], "result": { diff --git a/src/main/resources/assets/botania/recipes/garden_of_glass/root_to_fertilizer.json b/src/main/resources/assets/botania/recipes/garden_of_glass/root_to_fertilizer.json index 46e53b3c2..e6ba2c1d3 100644 --- a/src/main/resources/assets/botania/recipes/garden_of_glass/root_to_fertilizer.json +++ b/src/main/resources/assets/botania/recipes/garden_of_glass/root_to_fertilizer.json @@ -1,8 +1,8 @@ { "conditions": [ { - "type": "botania:garden_of_glass", - "value": true + "type": "forge:mod_loaded", + "modid": "gardenofglass" } ], "result": { diff --git a/src/main/resources/assets/botania/recipes/garden_of_glass/root_to_sapling.json b/src/main/resources/assets/botania/recipes/garden_of_glass/root_to_sapling.json index 10b7b01ff..23acc430a 100644 --- a/src/main/resources/assets/botania/recipes/garden_of_glass/root_to_sapling.json +++ b/src/main/resources/assets/botania/recipes/garden_of_glass/root_to_sapling.json @@ -1,8 +1,8 @@ { "conditions": [ { - "type": "botania:garden_of_glass", - "value": true + "type": "forge:mod_loaded", + "modid": "gardenofglass" } ], "result": { diff --git a/src/main/resources/assets/botania/recipes/garden_of_glass/spreader_0.json b/src/main/resources/assets/botania/recipes/garden_of_glass/spreader_0.json index 08940642f..11cac9691 100644 --- a/src/main/resources/assets/botania/recipes/garden_of_glass/spreader_0.json +++ b/src/main/resources/assets/botania/recipes/garden_of_glass/spreader_0.json @@ -1,8 +1,8 @@ { "conditions": [ { - "type": "botania:garden_of_glass", - "value": true + "type": "forge:mod_loaded", + "modid": "gardenofglass" } ], "result": { diff --git a/src/main/resources/assets/botania/recipes/spreader_0.json b/src/main/resources/assets/botania/recipes/spreader_0.json index 7df50147a..cb1c182bf 100644 --- a/src/main/resources/assets/botania/recipes/spreader_0.json +++ b/src/main/resources/assets/botania/recipes/spreader_0.json @@ -1,8 +1,11 @@ { "conditions": [ { - "type": "botania:garden_of_glass", - "value": false + "type": "forge:not", + "value": { + "type": "forge:mod_loaded", + "modid": "gardenofglass" + } } ], "result": {