diff --git a/build.gradle b/build.gradle index 3c062f03f..8ce9be5d0 100644 --- a/build.gradle +++ b/build.gradle @@ -82,31 +82,23 @@ sourceSets.main.resources { repositories { mavenCentral() maven { - name = "buildcraft" - url = "https://mod-buildcraft.com/maven" + url = "https://maven.blamejared.com" } maven { - name = "thiakil" - url = "http://maven.thiakil.com" + url = "https://dvs1.progwml6.com/files/maven" } maven { - url = "http://dvs1.progwml6.com/files/maven" - } - maven { - url = "http://minecraft.curseforge.com/api/maven/" + url = "https://minecraft.curseforge.com/api/maven/" } maven { name = "curios" url = "https://maven.theillusivec4.top/" } - flatDir { - dirs 'libs' - } } dependencies { minecraft "net.minecraftforge:forge:${config.mc_version}-${config.forge_version}" - compile fg.deobf("vazkii:patchouli:1.1-22") + compile fg.deobf("vazkii.patchouli:Patchouli:1.1-22.37") { transitive = false } compileOnly fg.deobf("mezz.jei:jei-1.14.4:6.0.0.11:api") runtimeOnly fg.deobf("mezz.jei:jei-1.14.4:6.0.0.11") @@ -193,8 +185,7 @@ task sortArtifacts(type: Copy) { //This matcher is used to get the classifier of the jar def matcher = Pattern.compile("$config.mod_name $version-(?\\w+).jar").matcher(it.name) //Only change the destination for full matches, i.e jars with classifiers - if (matcher.matches()) - { + if (matcher.matches()) { def classifier = matcher.group('classifier') /* Set the relative path to change the destination, since * Gradle doesn't seem to like the absolute path being set*/ @@ -205,12 +196,13 @@ task sortArtifacts(type: Copy) { // SCP servers remotes { - web { - host = 'botaniamod.net' - user = priv.scp_user - password = priv.scp_pass - knownHosts = allowAnyHosts - } + if (priv != null) + web { + host = 'botaniamod.net' + user = priv.scp_user + password = priv.scp_pass + knownHosts = allowAnyHosts + } } task upload { diff --git a/src/main/java/vazkii/botania/common/lib/ModTags.java b/src/main/java/vazkii/botania/common/lib/ModTags.java index 376c3901b..638b3f5fc 100644 --- a/src/main/java/vazkii/botania/common/lib/ModTags.java +++ b/src/main/java/vazkii/botania/common/lib/ModTags.java @@ -35,6 +35,7 @@ public class ModTags { public static final Tag NUGGETS_TERRASTEEL = forgeTag("nuggets/terrasteel"); public static final Tag MYSTICAL_FLOWERS = tag("mystical_flowers"); + public static final Tag DOUBLE_MYSTICAL_FLOWERS = tag("double_mystical_flowers"); public static final Tag SPECIAL_FLOWERS = tag("special_flowers"); public static final Tag MINI_FLOWERS = tag("mini_flowers"); @@ -141,6 +142,7 @@ public class ModTags { public static class Blocks { public static final Tag MYSTICAL_FLOWERS = tag("mystical_flowers"); + public static final Tag DOUBLE_MYSTICAL_FLOWERS = tag("double_mystical_flowers"); public static final Tag SPECIAL_FLOWERS = tag("special_flowers"); public static final Tag MINI_FLOWERS = tag("mini_flowers"); diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/basics/apothecary.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/basics/apothecary.json index e12dd71ec..d0c6e473e 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/basics/apothecary.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/basics/apothecary.json @@ -42,5 +42,8 @@ "text": "botania.page.apothecary5", "recipe": "botania:apothecary_default" } - ] + ], + "extra_recipe_mappings": { + "botania:apothecary_mossy": 1 + } } \ No newline at end of file diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/basics/flowers.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/basics/flowers.json index 69849fa0c..e9ccf3611 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/basics/flowers.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/basics/flowers.json @@ -72,5 +72,9 @@ "text": "botania.page.flowers13", "recipes": "botania:conversions/white_petal_block_deconstruct;botania:conversions/orange_petal_block_deconstruct;botania:conversions/magenta_petal_block_deconstruct;botania:conversions/light_blue_petal_block_deconstruct;botania:conversions/yellow_petal_block_deconstruct;botania:conversions/lime_petal_block_deconstruct;botania:conversions/pink_petal_block_deconstruct;botania:conversions/gray_petal_block_deconstruct;botania:conversions/silver_petal_block_deconstruct;botania:conversions/cyan_petal_block_deconstruct;botania:conversions/purple_petal_block_deconstruct;botania:conversions/blue_petal_block_deconstruct;botania:conversions/brown_petal_block_deconstruct;botania:conversions/green_petal_block_deconstruct;botania:conversions/red_petal_block_deconstruct;botania:conversions/black_petal_block_deconstruct" } - ] + ], + "extra_recipe_mappings": { + "tag:botania:mystical_flowers": 1, + "tag:botania:double_mystical_flowers": 10 + } } \ No newline at end of file diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/basics/garden_of_glass.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/basics/garden_of_glass.json new file mode 100644 index 000000000..81dc5e65f --- /dev/null +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/basics/garden_of_glass.json @@ -0,0 +1,71 @@ +{ + "name": "botania.entry.gardenOfGlass", + "category": "basics", + "icon": "botania:living_root", + "flag": "|debug,mod:gardenofglass", + "priority": true, + "pages": [ + { + "type": "text", + "text": "botania.page.gardenOfGlass0" + }, + { + "type": "text", + "text": "botania.page.gardenOfGlass1" + }, + { + "type": "text", + "text": "botania.page.gardenOfGlass2" + }, + { + "type": "crafting", + "text": "botania.page.gardenOfGlass3", + "recipe": "botania:garden_of_glass/root_to_sapling" + }, + { + "type": "crafting", + "text": "botania.page.gardenOfGlass4", + "recipe": "botania:garden_of_glass/root_to_fertilizer" + }, + { + "type": "crafting", + "text": "botania.page.gardenOfGlass5", + "recipe": "botania:garden_of_glass/pebble_to_cobblestone" + }, + { + "type": "text", + "text": "botania.page.gardenOfGlass6" + }, + { + "type": "mana_infusion", + "text": "botania.page.gardenOfGlass7", + "recipes": "botania:sugar_cane" + }, + { + "type": "crafting", + "text": "botania.page.gardenOfGlass8", + "recipe": "botania:garden_of_glass/magma_cream_to_slime_ball" + }, + { + "type": "mana_infusion", + "text": "botania.page.gardenOfGlass13", + "recipes": "botania:prismarine_shard_gog;prismarine_crystals_gog" + }, + { + "type": "text", + "text": "botania.page.gardenOfGlass9" + }, + { + "type": "text", + "text": "botania.page.gardenOfGlass11" + }, + { + "type": "crafting", + "text": "botania.page.gardenOfGlass12", + "recipe": "botania:garden_of_glass/end_portal_frame" + } + ], + "extra_recipe_mappings": { + "botania:root": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/basics/pure_daisy.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/basics/pure_daisy.json index f0dbc7d91..ca5e6ac8a 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/basics/pure_daisy.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/basics/pure_daisy.json @@ -31,5 +31,13 @@ "text": "botania.page.pureDaisy3", "recipe": "botania:pure_daisy" } - ] + ], + "extra_recipe_mappings": { + "botania:livingrock": 1, + "botania:livingwood": 1, + "minecraft:snow": 1, + "minecraft:packed_ice": 1, + "minecraft:blue_ice": 1, + "minecraft:obsidian": 1 + } } \ No newline at end of file diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/basics/terrasteel.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/basics/terrasteel.json index 0c46a00ff..89c988a54 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/basics/terrasteel.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/basics/terrasteel.json @@ -29,5 +29,8 @@ "type": "terrasteel", "text": "botania.page.terrasteel3" } - ] + ], + "extra_recipe_mappings": { + "botania:terrasteel_block": 1 + } } \ No newline at end of file diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/devices/mana_enchanting.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/devices/mana_enchanting.json index 0c5a2244f..fec1010f8 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/devices/mana_enchanting.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/devices/mana_enchanting.json @@ -37,5 +37,8 @@ "type": "text", "text": "botania.page.manaEnchanting9" } - ] + ], + "extra_recipe_mappings": { + "botania:enchanter": 1 + } } \ No newline at end of file diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/marimorphosis.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/marimorphosis.json index 8cd0db775..8e9aa57a6 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/marimorphosis.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/marimorphosis.json @@ -23,7 +23,7 @@ { "type": "crafting_multi", "text": "botania.page.marimorphosis3", - "recipes": "botania:apothecary_forest;botania:apothecary_plains;botania:apothecary_mountain;botania:apothecary_fungal;botania:apothecary_swamp;botania:apotehcary_desert;botania:apothecary_taiga;botania:apothecary_mesa" + "recipes": "botania:apothecary_forest;botania:apothecary_plains;botania:apothecary_mountain;botania:apothecary_fungal;botania:apothecary_swamp;botania:apothecary_desert;botania:apothecary_taiga;botania:apothecary_mesa" } ] } \ No newline at end of file diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/mana/pool.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/mana/pool.json index 19db19dea..d0dcaedfc 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/mana/pool.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/mana/pool.json @@ -39,7 +39,7 @@ { "type": "mana_infusion", "text": "botania.page.pool3", - "recipes": "botania:manasteel" + "recipes": "botania:manasteel;botania:manasteel_block" }, { "type": "mana_infusion", @@ -49,7 +49,7 @@ { "type": "mana_infusion", "text": "botania.page.pool5", - "recipes": "botania:mana_diamond" + "recipes": "botania:mana_diamond;botania:mana_diamond_block" }, { "type": "mana_infusion", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/misc/cacophonium.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/misc/cacophonium.json index caf90921c..17abb8484 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/misc/cacophonium.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/misc/cacophonium.json @@ -16,5 +16,8 @@ "type": "text", "text": "botania.page.cacophonium2" } - ] + ], + "extra_recipe_mappings": { + "botania:cacophonium_block": 1 + } } \ No newline at end of file diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/grass_seeds.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/grass_seeds.json index 25bca3560..8d42be709 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/grass_seeds.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/grass_seeds.json @@ -32,5 +32,16 @@ "text": "botania.page.grassSeeds5", "recipes": "botania:dry_seeds;botania:golden_seeds;botania:vivid_seeds;botania:scorched_seeds;botania:infused_seeds;botania:mutated_seeds" } - ] + ], + "extra_recipe_mappings": { + "minecraft:grass_block": 2, + "minecraft:podzol": 3, + "minecraft:mycelium": 4, + "botania:dry_grass": 5, + "botania:golden_grass": 5, + "botania:vivid_grass": 5, + "botania:scorched_grass": 5, + "botania:infused_grass": 5, + "botania:mutated_grass": 5 + } } \ No newline at end of file diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/overgrowth_seed.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/overgrowth_seed.json index 179389b7b..cea397cea 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/overgrowth_seed.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/overgrowth_seed.json @@ -12,5 +12,8 @@ "type": "text", "text": "botania.page.overgrowthSeed1" } - ] + ], + "extra_recipe_mappings": { + "botania:enchanted_soil": 1 + } } \ No newline at end of file diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/templates/terrasteel.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/templates/terrasteel.json index fcd1d1644..9f5e26e21 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/templates/terrasteel.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/templates/terrasteel.json @@ -31,6 +31,7 @@ { "type": "item", "item": "botania:terrasteel_ingot", + "link_recipe": true, "x": 50, "y": 10 }, diff --git a/src/main/resources/data/botania/recipes/apotehcary_desert.json b/src/main/resources/data/botania/recipes/apothecary_desert.json similarity index 100% rename from src/main/resources/data/botania/recipes/apotehcary_desert.json rename to src/main/resources/data/botania/recipes/apothecary_desert.json diff --git a/src/main/resources/data/botania/tags/blocks/double_mystical_flowers.json b/src/main/resources/data/botania/tags/blocks/double_mystical_flowers.json new file mode 100644 index 000000000..95a275a69 --- /dev/null +++ b/src/main/resources/data/botania/tags/blocks/double_mystical_flowers.json @@ -0,0 +1,21 @@ +{ + "replace": false, + "values": [ + "botania:white_double_flower", + "botania:orange_double_flower", + "botania:magenta_double_flower", + "botania:light_blue_double_flower", + "botania:yellow_double_flower", + "botania:lime_double_flower", + "botania:pink_double_flower", + "botania:gray_double_flower", + "botania:light_gray_double_flower", + "botania:cyan_double_flower", + "botania:purple_double_flower", + "botania:blue_double_flower", + "botania:brown_double_flower", + "botania:green_double_flower", + "botania:red_double_flower", + "botania:black_double_flower" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/tags/items/double_mystical_flowers.json b/src/main/resources/data/botania/tags/items/double_mystical_flowers.json new file mode 100644 index 000000000..95a275a69 --- /dev/null +++ b/src/main/resources/data/botania/tags/items/double_mystical_flowers.json @@ -0,0 +1,21 @@ +{ + "replace": false, + "values": [ + "botania:white_double_flower", + "botania:orange_double_flower", + "botania:magenta_double_flower", + "botania:light_blue_double_flower", + "botania:yellow_double_flower", + "botania:lime_double_flower", + "botania:pink_double_flower", + "botania:gray_double_flower", + "botania:light_gray_double_flower", + "botania:cyan_double_flower", + "botania:purple_double_flower", + "botania:blue_double_flower", + "botania:brown_double_flower", + "botania:green_double_flower", + "botania:red_double_flower", + "botania:black_double_flower" + ] +} \ No newline at end of file