Skip to content

Commit

Permalink
feat: project page added to the book
Browse files Browse the repository at this point in the history
feat: update to 1.20.2
  • Loading branch information
edayot committed Oct 29, 2023
1 parent f2168a7 commit 322e550
Show file tree
Hide file tree
Showing 11 changed files with 41 additions and 11 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@



MINECRAFT_FOLDER = /mnt/c/Users/erwan/AppData/Roaming/PrismLauncher/instances/1.20.2/.minecraft/
MINECRAFT_FOLDER = /home/erwan/.var/app/org.prismlauncher.PrismLauncher/data/PrismLauncher/instances/1.20.2/.minecraft/
SAVE_FOLDER = $(MINECRAFT_FOLDER)saves/Datapack\ island/
DATAPACKS_FOLDER = $(SAVE_FOLDER)datapacks/
RESOURCES_PACK_FOLDER = $(MINECRAFT_FOLDER)resourcepacks/
Expand Down
4 changes: 4 additions & 0 deletions assets/simpledrawer/font/font.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@
"id": "minecraft:include/space"
},
{ "type": "bitmap", "file": "simpledrawer:item/font/drawer.png", "ascent": 7, "height": 64, "chars": ["\uee00"] },
{ "type": "bitmap", "file": "simpledrawer:item/logo/github.png", "ascent": 7, "height": 25, "chars": ["\uee01"] },
{ "type": "bitmap", "file": "simpledrawer:item/logo/pmc.png", "ascent": 7, "height": 25, "chars": ["\uee02"] },
{ "type": "bitmap", "file": "simpledrawer:item/logo/smithed.png", "ascent": 7, "height": 25, "chars": ["\uee03"] },
{ "type": "bitmap", "file": "simpledrawer:item/logo/modrinth.png", "ascent": 7, "height": 25, "chars": ["\uee04"] },



Expand Down
7 changes: 6 additions & 1 deletion assets/simpledrawer/lang/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,12 @@

"simpledrawer.guide.update_button": "Click here to update the guide\nCurrent guide version : %s",
"simpledrawer.update_guide": "The guide has been updated",
"simpledrawer.update_guide_fail": "There is no guide to update"
"simpledrawer.update_guide_fail": "There is no guide to update",


"simpledrawer.project":"The project",
"simpledrawer.guide.project_pages":"Check all official pages of the project"



}
7 changes: 6 additions & 1 deletion assets/simpledrawer/lang/fr_fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,11 @@

"simpledrawer.guide.update_button": "Cliquez ici pour mettre à jour le guide\nVersion actuelle : %s",
"simpledrawer.update_guide": "Le guide a été mis à jour",
"simpledrawer.update_guide_fail": "Il n'y a pas de guide à mettre à jour"
"simpledrawer.update_guide_fail": "Il n'y a pas de guide à mettre à jour",


"simpledrawer.project": "Le projet",
"simpledrawer.guide.project_pages": "Regarde toutes les pages officielles du projet"


}
Binary file added assets/simpledrawer/textures/item/logo/github.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/simpledrawer/textures/item/logo/pmc.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions beet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ extend: "common.yaml"

meta:
modrinth_id: "JmCxCKiW"
mc_supports: ["1.20","1.20.1"]
mc_supports_dataversion: [3463,3465]
mc_supports: ["1.20.2"]
mc_supports_dataversion: [3578]
smithed_dependencies:
- id: "smithed:crafter"
version_: "0.2.0"
Expand Down
1 change: 1 addition & 0 deletions data/simpledrawer/functions/impl/guide/generate.mcfunction

Large diffs are not rendered by default.

27 changes: 21 additions & 6 deletions data/simpledrawer/functions/impl/guide/generate.py
Original file line number Diff line number Diff line change
Expand Up @@ -370,16 +370,31 @@ def generate_page(craft,craft_result,craft_char="uff01",craft_result_char="uff02

project_pages='["",'
project_pages=project_pages+'{"translate":"simpledrawer.project","font":"simpledrawer:big","color":"black","bold":true},'
project_pages=project_pages+'{"text":"\\\\uef01\\\\uef01\\\\uef00\\\\uef00\\\\uef00","font":"simpledrawer:font","color":"white"},'
project_pages=project_pages+'{"text":"\\\\uef03","font":"simpledrawer:font","color":"white","hoverEvent":{"action":"show_text","value":{"translate":"simpledrawer.guide.update_button","with":[{"text":"__version__"}]}},"clickEvent":{"action":"run_command","value":"/trigger simpledrawer.update_guide"}},'


project_pages=project_pages+'{"text":"\\\\n\\\\uef01\\\\uef01\\\\uef01\\\\uef01\\\\uef00\\\\uef00\\\\uef00\\\\uef00\\\\uef00","font":"simpledrawer:font","color":"white"},'

project_pages=project_pages+'{"text":"\\\\uef01","font":"simpledrawer:font","color":"white","hoverEvent":{"action":"show_text","value":{"translate":"simpledrawer.guide.update_button","with":[{"text":"__version__"}]}},"clickEvent":{"action":"run_command","value":"/trigger simpledrawer.update_guide"}},'
project_pages=project_pages+'{"text":"\\\\n\\\\n","font":"simpledrawer:font","color":"white"},'
project_pages=project_pages+'{"translate":"simpledrawer.guide.project_pages","color":"black"},'

project_pages=project_pages+'{"text":" \\\\uee00\\\\n\\\\n\\\\n\\\\n\\\\n\\\\n\\\\n","font":"simpledrawer:font","color":"white"},'
project_pages=project_pages+'{"translate":"simpledrawer.guide.project_pages","color":"black"}]'
project_pages=project_pages+'{"text":"\\\\n\\\\n\\\\uee01","font":"simpledrawer:font","color":"white","hoverEvent":{"action":"show_text","value":{"text":"GitHub"}},"clickEvent":{"action":"open_url","value":"https://github.com/edayot/ItemIO"}},'
project_pages=project_pages+'{"text":"\\\\uee02","font":"simpledrawer:font","color":"white","hoverEvent":{"action":"show_text","value":{"text":"Planet Minecraft"}},"clickEvent":{"action":"open_url","value":"https://www.planetminecraft.com/data-pack/simple-drawer/"}},'
project_pages=project_pages+'{"text":"\\\\uee03","font":"simpledrawer:font","color":"white","hoverEvent":{"action":"show_text","value":{"text":"Smithed"}},"clickEvent":{"action":"open_url","value":"https://smithed.net/packs/simpledrawer"}},'
project_pages=project_pages+'{"text":"\\\\uee04","font":"simpledrawer:font","color":"white","hoverEvent":{"action":"show_text","value":{"text":"Modrinth"}},"clickEvent":{"action":"open_url","value":"https://modrinth.com/datapack/simpledrawer"}},'

project_pages=project_pages+'{"text":"\\\\n\\\\uef02\\\\uef00\\\\uef00\\\\uef00","font":"simpledrawer:font","color":"white","hoverEvent":{"action":"show_text","value":{"text":"GitHub"}},"clickEvent":{"action":"open_url","value":"https://github.com/edayot/ItemIO"}},'
project_pages=project_pages+'{"text":"\\\\uef02\\\\uef00\\\\uef00\\\\uef00","font":"simpledrawer:font","color":"white","hoverEvent":{"action":"show_text","value":{"text":"Planet Minecraft"}},"clickEvent":{"action":"open_url","value":"https://www.planetminecraft.com/data-pack/simple-drawer/"}},'
project_pages=project_pages+'{"text":"\\\\uef02\\\\uef00\\\\uef00\\\\uef00","font":"simpledrawer:font","color":"white","hoverEvent":{"action":"show_text","value":{"text":"Smithed"}},"clickEvent":{"action":"open_url","value":"https://smithed.net/packs/simpledrawer"}},'
project_pages=project_pages+'{"text":"\\\\uef02\\\\uef00\\\\uef00\\\\uef00","font":"simpledrawer:font","color":"white","hoverEvent":{"action":"show_text","value":{"text":"Modrinth"}},"clickEvent":{"action":"open_url","value":"https://modrinth.com/datapack/simpledrawer"}},'

project_pages=project_pages+'{"text":"\\\\n\\\\uef02\\\\uef00\\\\uef00\\\\uef00","font":"simpledrawer:font","color":"white","hoverEvent":{"action":"show_text","value":{"text":"GitHub"}},"clickEvent":{"action":"open_url","value":"https://github.com/edayot/ItemIO"}},'
project_pages=project_pages+'{"text":"\\\\uef02\\\\uef00\\\\uef00\\\\uef00","font":"simpledrawer:font","color":"white","hoverEvent":{"action":"show_text","value":{"text":"Planet Minecraft"}},"clickEvent":{"action":"open_url","value":"https://www.planetminecraft.com/data-pack/simple-drawer/"}},'
project_pages=project_pages+'{"text":"\\\\uef02\\\\uef00\\\\uef00\\\\uef00","font":"simpledrawer:font","color":"white","hoverEvent":{"action":"show_text","value":{"text":"Smithed"}},"clickEvent":{"action":"open_url","value":"https://smithed.net/packs/simpledrawer"}},'
project_pages=project_pages+'{"text":"\\\\uef02\\\\uef00\\\\uef00\\\\uef00","font":"simpledrawer:font","color":"white","hoverEvent":{"action":"show_text","value":{"text":"Modrinth"}},"clickEvent":{"action":"open_url","value":"https://modrinth.com/datapack/simpledrawer"}},'




project_pages=project_pages[:-1]+"]"

commands.append(f"data modify storage simpledrawer:main ItemsNBT.guide.tag.pages append value '{project_pages}'")

Expand Down

0 comments on commit 322e550

Please sign in to comment.