From 3e82144961f615b650fae80e6dd62d93dab02610 Mon Sep 17 00:00:00 2001 From: thevortex Date: Wed, 22 Nov 2023 18:05:06 -0700 Subject: [PATCH] update book, tooltips patchouli compat update, resolves https://github.com/AllTheMods/ATM-9/issues/851 --- gradle.properties | 2 +- .../assets/allthemodium/lang/en_us.json | 4 +-- .../en_us/categories/armour.json | 0 .../en_us/categories/dimensions.json | 0 .../en_us/categories/food.json | 0 .../en_us/categories/links.json | 0 .../en_us/categories/misc.json | 0 .../en_us/categories/ore.json | 0 .../en_us/entries/armour/allthemodium.json | 28 ++++++++++++++++ .../en_us/entries/dimensions/miningdim.json | 0 .../en_us/entries/dimensions/otherdim.json | 0 .../entries/dimensions/teleport_pad.json | 0 .../en_us/entries/food/atmapple.json | 0 .../en_us/entries/food/atmcarrot.json | 0 .../en_us/entries/links/discord.json | 0 .../en_us/entries/links/github.json | 0 .../en_us/entries/links/reddit.json | 0 .../en_us/entries/misc/tools.json | 0 .../en_us/entries/ore/allthemodium.json | 2 +- .../en_us/entries/ore/unobtainium.json | 0 .../en_us/entries/ore/vibranium.json | 2 +- .../patchouli_books/allthemodium/book.json | 6 ---- .../en_us/entries/armour/allthemodium.json | 32 ------------------- .../allthemodium_book/book.json | 9 ++++++ .../allthemodium/recipes/main/atm_book.json | 2 +- 25 files changed, 43 insertions(+), 44 deletions(-) rename src/main/resources/{data/allthemodium/patchouli_books/allthemodium => assets/allthemodium/patchouli_books/allthemodium_book}/en_us/categories/armour.json (100%) rename src/main/resources/{data/allthemodium/patchouli_books/allthemodium => assets/allthemodium/patchouli_books/allthemodium_book}/en_us/categories/dimensions.json (100%) rename src/main/resources/{data/allthemodium/patchouli_books/allthemodium => assets/allthemodium/patchouli_books/allthemodium_book}/en_us/categories/food.json (100%) rename src/main/resources/{data/allthemodium/patchouli_books/allthemodium => assets/allthemodium/patchouli_books/allthemodium_book}/en_us/categories/links.json (100%) rename src/main/resources/{data/allthemodium/patchouli_books/allthemodium => assets/allthemodium/patchouli_books/allthemodium_book}/en_us/categories/misc.json (100%) rename src/main/resources/{data/allthemodium/patchouli_books/allthemodium => assets/allthemodium/patchouli_books/allthemodium_book}/en_us/categories/ore.json (100%) create mode 100644 src/main/resources/assets/allthemodium/patchouli_books/allthemodium_book/en_us/entries/armour/allthemodium.json rename src/main/resources/{data/allthemodium/patchouli_books/allthemodium => assets/allthemodium/patchouli_books/allthemodium_book}/en_us/entries/dimensions/miningdim.json (100%) rename src/main/resources/{data/allthemodium/patchouli_books/allthemodium => assets/allthemodium/patchouli_books/allthemodium_book}/en_us/entries/dimensions/otherdim.json (100%) rename src/main/resources/{data/allthemodium/patchouli_books/allthemodium => assets/allthemodium/patchouli_books/allthemodium_book}/en_us/entries/dimensions/teleport_pad.json (100%) rename src/main/resources/{data/allthemodium/patchouli_books/allthemodium => assets/allthemodium/patchouli_books/allthemodium_book}/en_us/entries/food/atmapple.json (100%) rename src/main/resources/{data/allthemodium/patchouli_books/allthemodium => assets/allthemodium/patchouli_books/allthemodium_book}/en_us/entries/food/atmcarrot.json (100%) rename src/main/resources/{data/allthemodium/patchouli_books/allthemodium => assets/allthemodium/patchouli_books/allthemodium_book}/en_us/entries/links/discord.json (100%) rename src/main/resources/{data/allthemodium/patchouli_books/allthemodium => assets/allthemodium/patchouli_books/allthemodium_book}/en_us/entries/links/github.json (100%) rename src/main/resources/{data/allthemodium/patchouli_books/allthemodium => assets/allthemodium/patchouli_books/allthemodium_book}/en_us/entries/links/reddit.json (100%) rename src/main/resources/{data/allthemodium/patchouli_books/allthemodium => assets/allthemodium/patchouli_books/allthemodium_book}/en_us/entries/misc/tools.json (100%) rename src/main/resources/{data/allthemodium/patchouli_books/allthemodium => assets/allthemodium/patchouli_books/allthemodium_book}/en_us/entries/ore/allthemodium.json (92%) rename src/main/resources/{data/allthemodium/patchouli_books/allthemodium => assets/allthemodium/patchouli_books/allthemodium_book}/en_us/entries/ore/unobtainium.json (100%) rename src/main/resources/{data/allthemodium/patchouli_books/allthemodium => assets/allthemodium/patchouli_books/allthemodium_book}/en_us/entries/ore/vibranium.json (57%) delete mode 100644 src/main/resources/data/allthemodium/patchouli_books/allthemodium/book.json delete mode 100644 src/main/resources/data/allthemodium/patchouli_books/allthemodium/en_us/entries/armour/allthemodium.json create mode 100644 src/main/resources/data/allthemodium/patchouli_books/allthemodium_book/book.json diff --git a/gradle.properties b/gradle.properties index 8953a641..f1e05558 100644 --- a/gradle.properties +++ b/gradle.properties @@ -50,7 +50,7 @@ mod_name=Allthemodium # The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default. mod_license=All Rights Reserved # The mod version. See https://semver.org/ -mod_version=2.4.3 +mod_version=2.4.4 # The group ID for the mod. It is only important when publishing as an artifact to a Maven repository. # This should match the base package used for the mod sources. # See https://maven.apache.org/guides/mini/guide-naming-conventions.html diff --git a/src/main/resources/assets/allthemodium/lang/en_us.json b/src/main/resources/assets/allthemodium/lang/en_us.json index 7cfa25a9..6378a7e0 100644 --- a/src/main/resources/assets/allthemodium/lang/en_us.json +++ b/src/main/resources/assets/allthemodium/lang/en_us.json @@ -29,8 +29,8 @@ "teleport.pad": "Mining Dimension, and Other places", "how.to.teleport": "Place in the overworld, sneak right click, empty HANDS", "allthemodium.loc": "Found in Deep Dark biomes in cave walls and ceilings(uniformly)", - "vibranium.loc": "Nether: Warped Forests and Crimson Forests, Y 100 to 123.", - "vibranium.other.loc": "Other: All Biomes Y 0 to 20.", + "vibranium.loc": "Nether: Y 64+, cave walls.", + "vibranium.other.loc": "Other: All Biomes Y 0 to 40.", "unobtainium.loc": "End Highlands Biomes Only", "allthemodium.mine": "PLAYER MINEABLE ONLY. NOT QUARRYABLE", "entity.allthemodium.piglich": "Piglich", diff --git a/src/main/resources/data/allthemodium/patchouli_books/allthemodium/en_us/categories/armour.json b/src/main/resources/assets/allthemodium/patchouli_books/allthemodium_book/en_us/categories/armour.json similarity index 100% rename from src/main/resources/data/allthemodium/patchouli_books/allthemodium/en_us/categories/armour.json rename to src/main/resources/assets/allthemodium/patchouli_books/allthemodium_book/en_us/categories/armour.json diff --git a/src/main/resources/data/allthemodium/patchouli_books/allthemodium/en_us/categories/dimensions.json b/src/main/resources/assets/allthemodium/patchouli_books/allthemodium_book/en_us/categories/dimensions.json similarity index 100% rename from src/main/resources/data/allthemodium/patchouli_books/allthemodium/en_us/categories/dimensions.json rename to src/main/resources/assets/allthemodium/patchouli_books/allthemodium_book/en_us/categories/dimensions.json diff --git a/src/main/resources/data/allthemodium/patchouli_books/allthemodium/en_us/categories/food.json b/src/main/resources/assets/allthemodium/patchouli_books/allthemodium_book/en_us/categories/food.json similarity index 100% rename from src/main/resources/data/allthemodium/patchouli_books/allthemodium/en_us/categories/food.json rename to src/main/resources/assets/allthemodium/patchouli_books/allthemodium_book/en_us/categories/food.json diff --git a/src/main/resources/data/allthemodium/patchouli_books/allthemodium/en_us/categories/links.json b/src/main/resources/assets/allthemodium/patchouli_books/allthemodium_book/en_us/categories/links.json similarity index 100% rename from src/main/resources/data/allthemodium/patchouli_books/allthemodium/en_us/categories/links.json rename to src/main/resources/assets/allthemodium/patchouli_books/allthemodium_book/en_us/categories/links.json diff --git a/src/main/resources/data/allthemodium/patchouli_books/allthemodium/en_us/categories/misc.json b/src/main/resources/assets/allthemodium/patchouli_books/allthemodium_book/en_us/categories/misc.json similarity index 100% rename from src/main/resources/data/allthemodium/patchouli_books/allthemodium/en_us/categories/misc.json rename to src/main/resources/assets/allthemodium/patchouli_books/allthemodium_book/en_us/categories/misc.json diff --git a/src/main/resources/data/allthemodium/patchouli_books/allthemodium/en_us/categories/ore.json b/src/main/resources/assets/allthemodium/patchouli_books/allthemodium_book/en_us/categories/ore.json similarity index 100% rename from src/main/resources/data/allthemodium/patchouli_books/allthemodium/en_us/categories/ore.json rename to src/main/resources/assets/allthemodium/patchouli_books/allthemodium_book/en_us/categories/ore.json diff --git a/src/main/resources/assets/allthemodium/patchouli_books/allthemodium_book/en_us/entries/armour/allthemodium.json b/src/main/resources/assets/allthemodium/patchouli_books/allthemodium_book/en_us/entries/armour/allthemodium.json new file mode 100644 index 00000000..8a0e5284 --- /dev/null +++ b/src/main/resources/assets/allthemodium/patchouli_books/allthemodium_book/en_us/entries/armour/allthemodium.json @@ -0,0 +1,28 @@ +{ + "name": "Allthemodium Armour", + "icon": "allthemodium:allthemodium_chestplate", + "category": "allthemodium:armour", + "sortnum": 1, + "pages": [{ + "type": "text", + "text": "Allthemodium armour has several benefits other than just the armour, toughness and knockback resistance:$(li)Water Breathing$(li)No Crash Damage when Flying with Elytra$(li)Immune to Fire Damage$(li)No Fall Damage$(li)When you upgrade the armour from Netherite, it keeps the enchants" + }, + { + "type": "smithing", + "recipe": "allthemodium:smithing/allthemodium_helmet_smithing" + }, + + { + "type": "smithing", + "recipe": "allthemodium:smithing/allthemodium_chestplate_smithing" + }, + { + "type": "smithing", + "recipe": "allthemodium:smithing/allthemodium_leggings_smithing" + }, + { + "type": "smithing", + "recipe": "allthemodium:smithing/allthemodium_boots_smithing" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/allthemodium/patchouli_books/allthemodium/en_us/entries/dimensions/miningdim.json b/src/main/resources/assets/allthemodium/patchouli_books/allthemodium_book/en_us/entries/dimensions/miningdim.json similarity index 100% rename from src/main/resources/data/allthemodium/patchouli_books/allthemodium/en_us/entries/dimensions/miningdim.json rename to src/main/resources/assets/allthemodium/patchouli_books/allthemodium_book/en_us/entries/dimensions/miningdim.json diff --git a/src/main/resources/data/allthemodium/patchouli_books/allthemodium/en_us/entries/dimensions/otherdim.json b/src/main/resources/assets/allthemodium/patchouli_books/allthemodium_book/en_us/entries/dimensions/otherdim.json similarity index 100% rename from src/main/resources/data/allthemodium/patchouli_books/allthemodium/en_us/entries/dimensions/otherdim.json rename to src/main/resources/assets/allthemodium/patchouli_books/allthemodium_book/en_us/entries/dimensions/otherdim.json diff --git a/src/main/resources/data/allthemodium/patchouli_books/allthemodium/en_us/entries/dimensions/teleport_pad.json b/src/main/resources/assets/allthemodium/patchouli_books/allthemodium_book/en_us/entries/dimensions/teleport_pad.json similarity index 100% rename from src/main/resources/data/allthemodium/patchouli_books/allthemodium/en_us/entries/dimensions/teleport_pad.json rename to src/main/resources/assets/allthemodium/patchouli_books/allthemodium_book/en_us/entries/dimensions/teleport_pad.json diff --git a/src/main/resources/data/allthemodium/patchouli_books/allthemodium/en_us/entries/food/atmapple.json b/src/main/resources/assets/allthemodium/patchouli_books/allthemodium_book/en_us/entries/food/atmapple.json similarity index 100% rename from src/main/resources/data/allthemodium/patchouli_books/allthemodium/en_us/entries/food/atmapple.json rename to src/main/resources/assets/allthemodium/patchouli_books/allthemodium_book/en_us/entries/food/atmapple.json diff --git a/src/main/resources/data/allthemodium/patchouli_books/allthemodium/en_us/entries/food/atmcarrot.json b/src/main/resources/assets/allthemodium/patchouli_books/allthemodium_book/en_us/entries/food/atmcarrot.json similarity index 100% rename from src/main/resources/data/allthemodium/patchouli_books/allthemodium/en_us/entries/food/atmcarrot.json rename to src/main/resources/assets/allthemodium/patchouli_books/allthemodium_book/en_us/entries/food/atmcarrot.json diff --git a/src/main/resources/data/allthemodium/patchouli_books/allthemodium/en_us/entries/links/discord.json b/src/main/resources/assets/allthemodium/patchouli_books/allthemodium_book/en_us/entries/links/discord.json similarity index 100% rename from src/main/resources/data/allthemodium/patchouli_books/allthemodium/en_us/entries/links/discord.json rename to src/main/resources/assets/allthemodium/patchouli_books/allthemodium_book/en_us/entries/links/discord.json diff --git a/src/main/resources/data/allthemodium/patchouli_books/allthemodium/en_us/entries/links/github.json b/src/main/resources/assets/allthemodium/patchouli_books/allthemodium_book/en_us/entries/links/github.json similarity index 100% rename from src/main/resources/data/allthemodium/patchouli_books/allthemodium/en_us/entries/links/github.json rename to src/main/resources/assets/allthemodium/patchouli_books/allthemodium_book/en_us/entries/links/github.json diff --git a/src/main/resources/data/allthemodium/patchouli_books/allthemodium/en_us/entries/links/reddit.json b/src/main/resources/assets/allthemodium/patchouli_books/allthemodium_book/en_us/entries/links/reddit.json similarity index 100% rename from src/main/resources/data/allthemodium/patchouli_books/allthemodium/en_us/entries/links/reddit.json rename to src/main/resources/assets/allthemodium/patchouli_books/allthemodium_book/en_us/entries/links/reddit.json diff --git a/src/main/resources/data/allthemodium/patchouli_books/allthemodium/en_us/entries/misc/tools.json b/src/main/resources/assets/allthemodium/patchouli_books/allthemodium_book/en_us/entries/misc/tools.json similarity index 100% rename from src/main/resources/data/allthemodium/patchouli_books/allthemodium/en_us/entries/misc/tools.json rename to src/main/resources/assets/allthemodium/patchouli_books/allthemodium_book/en_us/entries/misc/tools.json diff --git a/src/main/resources/data/allthemodium/patchouli_books/allthemodium/en_us/entries/ore/allthemodium.json b/src/main/resources/assets/allthemodium/patchouli_books/allthemodium_book/en_us/entries/ore/allthemodium.json similarity index 92% rename from src/main/resources/data/allthemodium/patchouli_books/allthemodium/en_us/entries/ore/allthemodium.json rename to src/main/resources/assets/allthemodium/patchouli_books/allthemodium_book/en_us/entries/ore/allthemodium.json index d2fddd49..b8470c74 100644 --- a/src/main/resources/data/allthemodium/patchouli_books/allthemodium/en_us/entries/ore/allthemodium.json +++ b/src/main/resources/assets/allthemodium/patchouli_books/allthemodium_book/en_us/entries/ore/allthemodium.json @@ -8,6 +8,6 @@ "item": "allthemodium:allthemodium_ore", "title": "Allthemodium Ore", "link_recipe": false, - "text": "Allthemodium Ore spawns in the Deep Dark biome in cave walls and ceilings, you can also find it as a common spawn very high in the Mountains above 170Y, It can also be found everywhere in the mining dimension between Y -59 and Y 20. also Deepslate layer of the Other Dimension" + "text": "Allthemodium Ore spawns in the Deep Dark biome in cave walls and ceilings, you can also find it as a common spawn very high in the Mountains above 170Y, It can also be found everywhere in the mining dimension between Y -59 and Y 20. also Deepslate layer caves of the Other Dimension" }] } \ No newline at end of file diff --git a/src/main/resources/data/allthemodium/patchouli_books/allthemodium/en_us/entries/ore/unobtainium.json b/src/main/resources/assets/allthemodium/patchouli_books/allthemodium_book/en_us/entries/ore/unobtainium.json similarity index 100% rename from src/main/resources/data/allthemodium/patchouli_books/allthemodium/en_us/entries/ore/unobtainium.json rename to src/main/resources/assets/allthemodium/patchouli_books/allthemodium_book/en_us/entries/ore/unobtainium.json diff --git a/src/main/resources/data/allthemodium/patchouli_books/allthemodium/en_us/entries/ore/vibranium.json b/src/main/resources/assets/allthemodium/patchouli_books/allthemodium_book/en_us/entries/ore/vibranium.json similarity index 57% rename from src/main/resources/data/allthemodium/patchouli_books/allthemodium/en_us/entries/ore/vibranium.json rename to src/main/resources/assets/allthemodium/patchouli_books/allthemodium_book/en_us/entries/ore/vibranium.json index b4ae9aa2..7f94cd25 100644 --- a/src/main/resources/data/allthemodium/patchouli_books/allthemodium/en_us/entries/ore/vibranium.json +++ b/src/main/resources/assets/allthemodium/patchouli_books/allthemodium_book/en_us/entries/ore/vibranium.json @@ -8,6 +8,6 @@ "item": "allthemodium:vibranium_ore", "title": "Vibranium Ore", "link_recipe": false, - "text": "Vibranium ore can be found in the Crimson and Warped Forest biomes in the Nether, around Y 107-113. It is also found in The Other dimension, deep underground, usually very close to Piglin villages" + "text": "Vibranium ore can be found in the Nether, above Y 64. It is also found in The Other dimension, deep underground in caves" }] } \ No newline at end of file diff --git a/src/main/resources/data/allthemodium/patchouli_books/allthemodium/book.json b/src/main/resources/data/allthemodium/patchouli_books/allthemodium/book.json deleted file mode 100644 index f9bd18a3..00000000 --- a/src/main/resources/data/allthemodium/patchouli_books/allthemodium/book.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "name": "Allthemodium", - "landing_text": "This Book wil give you information about the Allthemodium Mod, and the ATM Mod Packs", - "version": 1, - "show_progress": false -} \ No newline at end of file diff --git a/src/main/resources/data/allthemodium/patchouli_books/allthemodium/en_us/entries/armour/allthemodium.json b/src/main/resources/data/allthemodium/patchouli_books/allthemodium/en_us/entries/armour/allthemodium.json deleted file mode 100644 index faa04ace..00000000 --- a/src/main/resources/data/allthemodium/patchouli_books/allthemodium/en_us/entries/armour/allthemodium.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "name": "Allthemodium Armour", - "icon": "allthemodium:allthemodium_chestplate", - "category": "allthemodium:armour", - "sortnum": 1, - "pages": [{ - "type": "text", - "text": "Allthemodium armour has several benefits other than just the armour, toughness and knockback resistance:$(li)Water Breathing$(li)No Crash Damage when Flying with Elytra$(li)Immune to Fire Damage$(li)No Fall Damage$(li)When you upgrade the armour from Netherite, it keeps the enchants" - }, - { - "type": "crafting", - "recipe": "allthemodium:main/allthemodium_helmet", - "recipe2": "kubejs:minecraft_netherite_helmet_upgrade" - }, - - { - "type": "crafting", - "recipe": "allthemodium:main/allthemodium_chestplate", - "recipe2": "kubejs:minecraft_netherite_chestplate_upgrade" - }, - { - "type": "crafting", - "recipe": "allthemodium:main/allthemodium_leggings", - "recipe2": "kubejs:minecraft_netherite_leggings_upgrade" - }, - { - "type": "crafting", - "recipe": "allthemodium:main/allthemodium_boots", - "recipe2": "kubejs:minecraft_netherite_boots_upgrade" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/allthemodium/patchouli_books/allthemodium_book/book.json b/src/main/resources/data/allthemodium/patchouli_books/allthemodium_book/book.json new file mode 100644 index 00000000..c4775ceb --- /dev/null +++ b/src/main/resources/data/allthemodium/patchouli_books/allthemodium_book/book.json @@ -0,0 +1,9 @@ +{ + "name": "allthemodium_book", + "landing_text": "This Book wil give you information about the Allthemodium Mod, and the ATM Mod Packs", + "subtitle": 1, + "show_progress": false, + "dont_generate_book": false, + "macros": {}, + "use_resource_pack": true +} \ No newline at end of file diff --git a/src/main/resources/data/allthemodium/recipes/main/atm_book.json b/src/main/resources/data/allthemodium/recipes/main/atm_book.json index d5bb8788..e0cdd0cb 100644 --- a/src/main/resources/data/allthemodium/recipes/main/atm_book.json +++ b/src/main/resources/data/allthemodium/recipes/main/atm_book.json @@ -10,6 +10,6 @@ ], "result": { "item": "patchouli:guide_book", - "nbt": { "patchouli:book": "allthemodium:allthemodium" } + "nbt": { "patchouli:book": "allthemodium:allthemodium_book" } } } \ No newline at end of file