diff --git a/build.gradle b/build.gradle index df5042d98..c26afbcb1 100644 --- a/build.gradle +++ b/build.gradle @@ -98,8 +98,8 @@ dependencies { 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") - compileOnly fg.deobf("top.theillusivec4.curios:curios:FORGE-1.14.4-0.25:api") - runtimeOnly fg.deobf("top.theillusivec4.curios:curios:FORGE-1.14.4-0.25") + compileOnly fg.deobf("top.theillusivec4.curios:curios:FORGE-1.14.4-1.0.2:api") + runtimeOnly fg.deobf("top.theillusivec4.curios:curios:FORGE-1.14.4-1.0.2") //deobfCompile "thaumcraft:Thaumcraft:1.12.2:6.1.BETA26" //and a bit more for SCP diff --git a/src/main/java/vazkii/botania/common/integration/curios/CurioIntegration.java b/src/main/java/vazkii/botania/common/integration/curios/CurioIntegration.java index eec2ac1ec..8c5676212 100644 --- a/src/main/java/vazkii/botania/common/integration/curios/CurioIntegration.java +++ b/src/main/java/vazkii/botania/common/integration/curios/CurioIntegration.java @@ -53,7 +53,7 @@ public class CurioIntegration extends EquipmentHandler { InterModComms.sendTo("curios", CuriosAPI.IMC.REGISTER_TYPE, () -> new CurioIMCMessage("belt")); InterModComms.sendTo("curios", CuriosAPI.IMC.REGISTER_TYPE, () -> new CurioIMCMessage("body")); InterModComms.sendTo("curios", CuriosAPI.IMC.REGISTER_TYPE, () -> new CurioIMCMessage("head")); - InterModComms.sendTo("curios", CuriosAPI.IMC.REGISTER_TYPE, () -> new CurioIMCMessage("trinket")); + InterModComms.sendTo("curios", CuriosAPI.IMC.REGISTER_TYPE, () -> new CurioIMCMessage("necklace")); } @Override diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index 99c139e2c..9d52028a6 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -30,6 +30,6 @@ Botania is a mod that adds nature magic to Minecraft [[dependencies.botania]] modId="curios" mandatory=true - versionRange="[FORGE-1.14.4-0.25,)" + versionRange="[FORGE-1.14.4-1.0.2,)" ordering="AFTER" side="BOTH" \ No newline at end of file diff --git a/src/main/resources/data/curios/tags/items/charm.json b/src/main/resources/data/curios/tags/items/charm.json index 816c7c5e2..ef3c3701f 100644 --- a/src/main/resources/data/curios/tags/items/charm.json +++ b/src/main/resources/data/curios/tags/items/charm.json @@ -1,15 +1,9 @@ { "replace": false, "values": [ - "botania:blood_pendant", - "botania:cloud_pendant", "botania:diva_charm", "botania:goddess_charm", - "botania:ice_pendant", - "botania:lava_pendant", "botania:monocle", - "botania:super_cloud_pendant", - "botania:super_lava_pendant", "botania:tiny_planet" ] } \ No newline at end of file diff --git a/src/main/resources/data/curios/tags/items/trinket.json b/src/main/resources/data/curios/tags/items/curio.json similarity index 97% rename from src/main/resources/data/curios/tags/items/trinket.json rename to src/main/resources/data/curios/tags/items/curio.json index 39ee3b541..65d113ec1 100644 --- a/src/main/resources/data/curios/tags/items/trinket.json +++ b/src/main/resources/data/curios/tags/items/curio.json @@ -1,38 +1,38 @@ -{ - "replace": false, - "values": [ - "botania:cosmetic_black_bowtie", - "botania:cosmetic_black_tie", - "botania:cosmetic_red_glasses", - "botania:cosmetic_puffy_scarf", - "botania:cosmetic_engineer_goggles", - "botania:cosmetic_eyepatch", - "botania:cosmetic_wicked_eyepatch", - "botania:cosmetic_red_ribbons", - "botania:cosmetic_pink_flower_bud", - "botania:cosmetic_polka_dotted_bows", - "botania:cosmetic_blue_butterfly", - "botania:cosmetic_cat_ears", - "botania:cosmetic_witch_pin", - "botania:cosmetic_devil_tail", - "botania:cosmetic_kamui_eye", - "botania:cosmetic_googly_eyes", - "botania:cosmetic_four_leaf_clover", - "botania:cosmetic_clock_eye", - "botania:cosmetic_unicorn_horn", - "botania:cosmetic_devil_horns", - "botania:cosmetic_hyper_plus", - "botania:cosmetic_botanist_emblem", - "botania:cosmetic_ancient_mask", - "botania:cosmetic_eerie_mask", - "botania:cosmetic_alien_antenna", - "botania:cosmetic_anaglyph_glasses", - "botania:cosmetic_orange_shades", - "botania:cosmetic_groucho_glasses", - "botania:cosmetic_thick_eyebrows", - "botania:cosmetic_lusitanic_shield", - "botania:cosmetic_tiny_potato_mask", - "botania:cosmetic_questgiver_mark", - "botania:cosmetic_thinking_hand" - ] +{ + "replace": false, + "values": [ + "botania:cosmetic_black_bowtie", + "botania:cosmetic_black_tie", + "botania:cosmetic_red_glasses", + "botania:cosmetic_puffy_scarf", + "botania:cosmetic_engineer_goggles", + "botania:cosmetic_eyepatch", + "botania:cosmetic_wicked_eyepatch", + "botania:cosmetic_red_ribbons", + "botania:cosmetic_pink_flower_bud", + "botania:cosmetic_polka_dotted_bows", + "botania:cosmetic_blue_butterfly", + "botania:cosmetic_cat_ears", + "botania:cosmetic_witch_pin", + "botania:cosmetic_devil_tail", + "botania:cosmetic_kamui_eye", + "botania:cosmetic_googly_eyes", + "botania:cosmetic_four_leaf_clover", + "botania:cosmetic_clock_eye", + "botania:cosmetic_unicorn_horn", + "botania:cosmetic_devil_horns", + "botania:cosmetic_hyper_plus", + "botania:cosmetic_botanist_emblem", + "botania:cosmetic_ancient_mask", + "botania:cosmetic_eerie_mask", + "botania:cosmetic_alien_antenna", + "botania:cosmetic_anaglyph_glasses", + "botania:cosmetic_orange_shades", + "botania:cosmetic_groucho_glasses", + "botania:cosmetic_thick_eyebrows", + "botania:cosmetic_lusitanic_shield", + "botania:cosmetic_tiny_potato_mask", + "botania:cosmetic_questgiver_mark", + "botania:cosmetic_thinking_hand" + ] } \ No newline at end of file diff --git a/src/main/resources/data/curios/tags/items/necklace.json b/src/main/resources/data/curios/tags/items/necklace.json new file mode 100644 index 000000000..be3c43046 --- /dev/null +++ b/src/main/resources/data/curios/tags/items/necklace.json @@ -0,0 +1,11 @@ +{ + "replace": false, + "values": [ + "botania:blood_pendant", + "botania:cloud_pendant", + "botania:ice_pendant", + "botania:lava_pendant", + "botania:super_cloud_pendant", + "botania:super_lava_pendant" + ] +} \ No newline at end of file