From ed520167f6dab8cea184f1f80efd2c2bb877bac5 Mon Sep 17 00:00:00 2001 From: fayer3 Date: Thu, 20 Jun 2024 13:57:40 +0200 Subject: [PATCH] fix item tags and recipes add tag translations as requested by fabric --- .../assets/vivecraft/lang/de_de.json | 20 ++++++++++++++++- .../assets/vivecraft/lang/en_us.json | 22 ++++++++++++++++++- .../{recipes => recipe}/climbclaws.json | 0 .../{recipes => recipe}/jumpboots.json | 0 .../tags/{blocks => block}/climbable.json | 0 .../tags/{blocks => block}/crops.json | 0 .../tags/{blocks => block}/music_blocks.json | 0 .../tags/{items => item}/arrows.json | 0 .../tags/{items => item}/bow_exclusion.json | 0 .../tags/{items => item}/brushes.json | 0 .../tags/{items => item}/compasses.json | 0 .../tags/{items => item}/crossbows.json | 0 .../tags/{items => item}/fishing_rods.json | 0 .../tags/{items => item}/food_sticks.json | 0 .../vivecraft/tags/{items => item}/hoes.json | 0 .../vivecraft/tags/{items => item}/maces.json | 0 .../vivecraft/tags/{items => item}/maps.json | 0 .../moditems/irons_spellbooks.json | 0 .../{items => item}/moditems/mvw_weapons.json | 0 .../tags/{items => item}/scythes.json | 0 .../tags/{items => item}/shields.json | 0 .../tags/{items => item}/spears.json | 0 .../tags/{items => item}/swords.json | 0 .../tags/{items => item}/telescope.json | 0 .../tags/{items => item}/throw_items.json | 0 .../vivecraft/tags/{items => item}/tools.json | 0 forge/src/main/resources/pack.mcmeta | 2 +- gradle.properties | 2 +- 28 files changed, 42 insertions(+), 4 deletions(-) rename common/src/main/resources/data/vivecraft/{recipes => recipe}/climbclaws.json (100%) rename common/src/main/resources/data/vivecraft/{recipes => recipe}/jumpboots.json (100%) rename common/src/main/resources/data/vivecraft/tags/{blocks => block}/climbable.json (100%) rename common/src/main/resources/data/vivecraft/tags/{blocks => block}/crops.json (100%) rename common/src/main/resources/data/vivecraft/tags/{blocks => block}/music_blocks.json (100%) rename common/src/main/resources/data/vivecraft/tags/{items => item}/arrows.json (100%) rename common/src/main/resources/data/vivecraft/tags/{items => item}/bow_exclusion.json (100%) rename common/src/main/resources/data/vivecraft/tags/{items => item}/brushes.json (100%) rename common/src/main/resources/data/vivecraft/tags/{items => item}/compasses.json (100%) rename common/src/main/resources/data/vivecraft/tags/{items => item}/crossbows.json (100%) rename common/src/main/resources/data/vivecraft/tags/{items => item}/fishing_rods.json (100%) rename common/src/main/resources/data/vivecraft/tags/{items => item}/food_sticks.json (100%) rename common/src/main/resources/data/vivecraft/tags/{items => item}/hoes.json (100%) rename common/src/main/resources/data/vivecraft/tags/{items => item}/maces.json (100%) rename common/src/main/resources/data/vivecraft/tags/{items => item}/maps.json (100%) rename common/src/main/resources/data/vivecraft/tags/{items => item}/moditems/irons_spellbooks.json (100%) rename common/src/main/resources/data/vivecraft/tags/{items => item}/moditems/mvw_weapons.json (100%) rename common/src/main/resources/data/vivecraft/tags/{items => item}/scythes.json (100%) rename common/src/main/resources/data/vivecraft/tags/{items => item}/shields.json (100%) rename common/src/main/resources/data/vivecraft/tags/{items => item}/spears.json (100%) rename common/src/main/resources/data/vivecraft/tags/{items => item}/swords.json (100%) rename common/src/main/resources/data/vivecraft/tags/{items => item}/telescope.json (100%) rename common/src/main/resources/data/vivecraft/tags/{items => item}/throw_items.json (100%) rename common/src/main/resources/data/vivecraft/tags/{items => item}/tools.json (100%) diff --git a/common/src/main/resources/assets/vivecraft/lang/de_de.json b/common/src/main/resources/assets/vivecraft/lang/de_de.json index 84d30f280..4a2c93e8e 100644 --- a/common/src/main/resources/assets/vivecraft/lang/de_de.json +++ b/common/src/main/resources/assets/vivecraft/lang/de_de.json @@ -504,5 +504,23 @@ "vivecraft.toasts.point_controller": "Zeige mit deinem %s", "vivecraft.toasts.point_controller.left": "linken Controller", "vivecraft.toasts.point_controller.right": "rechten Controller", - "vivecraft.toasts.teleport": "Teleportiere mit %s" + "vivecraft.toasts.teleport": "Teleportiere mit %s", + + "tag.item.vivecraft.arrows": "Vivecraft Pfeil", + "tag.item.vivecraft.bow_exclusion": "Vivecraft nicht Raumskala Bogen", + "tag.item.vivecraft.brushes": "Vivecraft Pinsel", + "tag.item.vivecraft.compasses": "Vivecraft Kompass", + "tag.item.vivecraft.crossbows": "Vivecraft Armbrust", + "tag.item.vivecraft.fishing_rods": "Vivecraft Angel", + "tag.item.vivecraft.food_sticks": "Vivecraft Essen am Stiel", + "tag.item.vivecraft.hoes": "Vivecraft Hacke", + "tag.item.vivecraft.maces": "Vivecraft Streitkolben", + "tag.item.vivecraft.maps": "Vivecraft Karte", + "tag.item.vivecraft.scythes": "Vivecraft Sichel", + "tag.item.vivecraft.spears": "Vivecraft Speer", + "tag.item.vivecraft.shields": "Vivecraft Schild", + "tag.item.vivecraft.swords": "Vivecraft Schwert", + "tag.item.vivecraft.telescope": "Vivecraft Fernrohr", + "tag.item.vivecraft.throw_items": "Vivecraft werfbarer Gegenstand", + "tag.item.vivecraft.tools": "Vivecraft Werkzeug" } diff --git a/common/src/main/resources/assets/vivecraft/lang/en_us.json b/common/src/main/resources/assets/vivecraft/lang/en_us.json index 6a7c63b13..cd9d4f889 100644 --- a/common/src/main/resources/assets/vivecraft/lang/en_us.json +++ b/common/src/main/resources/assets/vivecraft/lang/en_us.json @@ -506,5 +506,25 @@ "vivecraft.toasts.point_controller": "Point with your %s", "vivecraft.toasts.point_controller.left": "left Controller", "vivecraft.toasts.point_controller.right": "right Controller", - "vivecraft.toasts.teleport": "Teleport with %s" + "vivecraft.toasts.teleport": "Teleport with %s", + + "tag.item.vivecraft.arrows": "Vivecraft Arrow", + "tag.item.vivecraft.bow_exclusion": "Vivecraft non Roomscale Bow", + "tag.item.vivecraft.brushes": "Vivecraft Brush", + "tag.item.vivecraft.compasses": "Vivecraft Compass", + "tag.item.vivecraft.crossbows": "Vivecraft Crossbow", + "tag.item.vivecraft.fishing_rods": "Vivecraft Fishing Rod", + "tag.item.vivecraft.food_sticks": "Vivecraft Food Stick", + "tag.item.vivecraft.hoes": "Vivecraft Hoe", + "tag.item.vivecraft.maces": "Vivecraft Mace", + "tag.item.vivecraft.maps": "Vivecraft Map", + "tag.item.vivecraft.scythes": "Vivecraft Scythe", + "tag.item.vivecraft.spears": "Vivecraft Spear", + "tag.item.vivecraft.shields": "Vivecraft Shield", + "tag.item.vivecraft.swords": "Vivecraft Sword", + "tag.item.vivecraft.telescope": "Vivecraft Telescope", + "tag.item.vivecraft.throw_items": "Vivecraft Throwable Item", + "tag.item.vivecraft.tools": "Vivecraft Tool", + "tag.item.vivecraft.moditems.irons_spellbooks": "Vivecraft Iron Spellbook", + "tag.item.vivecraft.moditems.mvw_weapons": "Vivecraft More Vanilla Weapon" } diff --git a/common/src/main/resources/data/vivecraft/recipes/climbclaws.json b/common/src/main/resources/data/vivecraft/recipe/climbclaws.json similarity index 100% rename from common/src/main/resources/data/vivecraft/recipes/climbclaws.json rename to common/src/main/resources/data/vivecraft/recipe/climbclaws.json diff --git a/common/src/main/resources/data/vivecraft/recipes/jumpboots.json b/common/src/main/resources/data/vivecraft/recipe/jumpboots.json similarity index 100% rename from common/src/main/resources/data/vivecraft/recipes/jumpboots.json rename to common/src/main/resources/data/vivecraft/recipe/jumpboots.json diff --git a/common/src/main/resources/data/vivecraft/tags/blocks/climbable.json b/common/src/main/resources/data/vivecraft/tags/block/climbable.json similarity index 100% rename from common/src/main/resources/data/vivecraft/tags/blocks/climbable.json rename to common/src/main/resources/data/vivecraft/tags/block/climbable.json diff --git a/common/src/main/resources/data/vivecraft/tags/blocks/crops.json b/common/src/main/resources/data/vivecraft/tags/block/crops.json similarity index 100% rename from common/src/main/resources/data/vivecraft/tags/blocks/crops.json rename to common/src/main/resources/data/vivecraft/tags/block/crops.json diff --git a/common/src/main/resources/data/vivecraft/tags/blocks/music_blocks.json b/common/src/main/resources/data/vivecraft/tags/block/music_blocks.json similarity index 100% rename from common/src/main/resources/data/vivecraft/tags/blocks/music_blocks.json rename to common/src/main/resources/data/vivecraft/tags/block/music_blocks.json diff --git a/common/src/main/resources/data/vivecraft/tags/items/arrows.json b/common/src/main/resources/data/vivecraft/tags/item/arrows.json similarity index 100% rename from common/src/main/resources/data/vivecraft/tags/items/arrows.json rename to common/src/main/resources/data/vivecraft/tags/item/arrows.json diff --git a/common/src/main/resources/data/vivecraft/tags/items/bow_exclusion.json b/common/src/main/resources/data/vivecraft/tags/item/bow_exclusion.json similarity index 100% rename from common/src/main/resources/data/vivecraft/tags/items/bow_exclusion.json rename to common/src/main/resources/data/vivecraft/tags/item/bow_exclusion.json diff --git a/common/src/main/resources/data/vivecraft/tags/items/brushes.json b/common/src/main/resources/data/vivecraft/tags/item/brushes.json similarity index 100% rename from common/src/main/resources/data/vivecraft/tags/items/brushes.json rename to common/src/main/resources/data/vivecraft/tags/item/brushes.json diff --git a/common/src/main/resources/data/vivecraft/tags/items/compasses.json b/common/src/main/resources/data/vivecraft/tags/item/compasses.json similarity index 100% rename from common/src/main/resources/data/vivecraft/tags/items/compasses.json rename to common/src/main/resources/data/vivecraft/tags/item/compasses.json diff --git a/common/src/main/resources/data/vivecraft/tags/items/crossbows.json b/common/src/main/resources/data/vivecraft/tags/item/crossbows.json similarity index 100% rename from common/src/main/resources/data/vivecraft/tags/items/crossbows.json rename to common/src/main/resources/data/vivecraft/tags/item/crossbows.json diff --git a/common/src/main/resources/data/vivecraft/tags/items/fishing_rods.json b/common/src/main/resources/data/vivecraft/tags/item/fishing_rods.json similarity index 100% rename from common/src/main/resources/data/vivecraft/tags/items/fishing_rods.json rename to common/src/main/resources/data/vivecraft/tags/item/fishing_rods.json diff --git a/common/src/main/resources/data/vivecraft/tags/items/food_sticks.json b/common/src/main/resources/data/vivecraft/tags/item/food_sticks.json similarity index 100% rename from common/src/main/resources/data/vivecraft/tags/items/food_sticks.json rename to common/src/main/resources/data/vivecraft/tags/item/food_sticks.json diff --git a/common/src/main/resources/data/vivecraft/tags/items/hoes.json b/common/src/main/resources/data/vivecraft/tags/item/hoes.json similarity index 100% rename from common/src/main/resources/data/vivecraft/tags/items/hoes.json rename to common/src/main/resources/data/vivecraft/tags/item/hoes.json diff --git a/common/src/main/resources/data/vivecraft/tags/items/maces.json b/common/src/main/resources/data/vivecraft/tags/item/maces.json similarity index 100% rename from common/src/main/resources/data/vivecraft/tags/items/maces.json rename to common/src/main/resources/data/vivecraft/tags/item/maces.json diff --git a/common/src/main/resources/data/vivecraft/tags/items/maps.json b/common/src/main/resources/data/vivecraft/tags/item/maps.json similarity index 100% rename from common/src/main/resources/data/vivecraft/tags/items/maps.json rename to common/src/main/resources/data/vivecraft/tags/item/maps.json diff --git a/common/src/main/resources/data/vivecraft/tags/items/moditems/irons_spellbooks.json b/common/src/main/resources/data/vivecraft/tags/item/moditems/irons_spellbooks.json similarity index 100% rename from common/src/main/resources/data/vivecraft/tags/items/moditems/irons_spellbooks.json rename to common/src/main/resources/data/vivecraft/tags/item/moditems/irons_spellbooks.json diff --git a/common/src/main/resources/data/vivecraft/tags/items/moditems/mvw_weapons.json b/common/src/main/resources/data/vivecraft/tags/item/moditems/mvw_weapons.json similarity index 100% rename from common/src/main/resources/data/vivecraft/tags/items/moditems/mvw_weapons.json rename to common/src/main/resources/data/vivecraft/tags/item/moditems/mvw_weapons.json diff --git a/common/src/main/resources/data/vivecraft/tags/items/scythes.json b/common/src/main/resources/data/vivecraft/tags/item/scythes.json similarity index 100% rename from common/src/main/resources/data/vivecraft/tags/items/scythes.json rename to common/src/main/resources/data/vivecraft/tags/item/scythes.json diff --git a/common/src/main/resources/data/vivecraft/tags/items/shields.json b/common/src/main/resources/data/vivecraft/tags/item/shields.json similarity index 100% rename from common/src/main/resources/data/vivecraft/tags/items/shields.json rename to common/src/main/resources/data/vivecraft/tags/item/shields.json diff --git a/common/src/main/resources/data/vivecraft/tags/items/spears.json b/common/src/main/resources/data/vivecraft/tags/item/spears.json similarity index 100% rename from common/src/main/resources/data/vivecraft/tags/items/spears.json rename to common/src/main/resources/data/vivecraft/tags/item/spears.json diff --git a/common/src/main/resources/data/vivecraft/tags/items/swords.json b/common/src/main/resources/data/vivecraft/tags/item/swords.json similarity index 100% rename from common/src/main/resources/data/vivecraft/tags/items/swords.json rename to common/src/main/resources/data/vivecraft/tags/item/swords.json diff --git a/common/src/main/resources/data/vivecraft/tags/items/telescope.json b/common/src/main/resources/data/vivecraft/tags/item/telescope.json similarity index 100% rename from common/src/main/resources/data/vivecraft/tags/items/telescope.json rename to common/src/main/resources/data/vivecraft/tags/item/telescope.json diff --git a/common/src/main/resources/data/vivecraft/tags/items/throw_items.json b/common/src/main/resources/data/vivecraft/tags/item/throw_items.json similarity index 100% rename from common/src/main/resources/data/vivecraft/tags/items/throw_items.json rename to common/src/main/resources/data/vivecraft/tags/item/throw_items.json diff --git a/common/src/main/resources/data/vivecraft/tags/items/tools.json b/common/src/main/resources/data/vivecraft/tags/item/tools.json similarity index 100% rename from common/src/main/resources/data/vivecraft/tags/items/tools.json rename to common/src/main/resources/data/vivecraft/tags/item/tools.json diff --git a/forge/src/main/resources/pack.mcmeta b/forge/src/main/resources/pack.mcmeta index a4f28e125..40cda8810 100644 --- a/forge/src/main/resources/pack.mcmeta +++ b/forge/src/main/resources/pack.mcmeta @@ -1,6 +1,6 @@ { "pack": { "description": "The VR mod for any loader!", - "pack_format": 18 + "pack_format": 34 } } diff --git a/gradle.properties b/gradle.properties index 8df467c30..d96494e19 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ minecraft_version=1.21 enabled_platforms=fabric,forge,neoforge archives_base_name=vivecraft -mod_version=1.1.9-a1 +mod_version=1.1.9-a2 maven_group=org.vivecraft architectury_version=12.0.26