diff --git a/README.md b/README.md index bc469a4b..dba27fff 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Metallics Arts 1.19.2-1.3.4 +# Metallics Arts 1.19.2-1.3.5 ## Index 📋 diff --git a/build.gradle b/build.gradle index dd6e67c5..58626b72 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ plugins { } -version = '1.19.2-1.3.3' +version = '1.19.2-1.3.5' group = 'net.rudahee.metallics_arts' // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = 'metallics_arts' diff --git a/src/main/java/net/rudahee/metallics_arts/painting/ModPaintings.java b/src/main/java/net/rudahee/metallics_arts/painting/ModPaintings.java index 97d65b0a..37e83735 100644 --- a/src/main/java/net/rudahee/metallics_arts/painting/ModPaintings.java +++ b/src/main/java/net/rudahee/metallics_arts/painting/ModPaintings.java @@ -95,6 +95,10 @@ public class ModPaintings { public static final RegistryObject ZINC_FERUCHEMIC_PAINTING = PAINTING_VARIANTS.register("zinc_feruchemic_painting", () -> new PaintingVariant(32,32)); + //Other paintingd + public static final RegistryObject FUN_COBBER_PAINTING = PAINTING_VARIANTS.register("fun_cobber_painting", + () -> new PaintingVariant(16,32)); + public static void register(IEventBus eventBus){ diff --git a/src/main/resources/assets/metallics_arts/textures/painting/fun_cobber_painting.png b/src/main/resources/assets/metallics_arts/textures/painting/fun_cobber_painting.png new file mode 100644 index 00000000..0cd3f3a3 Binary files /dev/null and b/src/main/resources/assets/metallics_arts/textures/painting/fun_cobber_painting.png differ diff --git a/src/main/resources/data/metallics_arts/patchouli_books/metallics_arts_book/en_us/entries/feruchemic_powers_entry/atium_feruchemic_power.json b/src/main/resources/data/metallics_arts/patchouli_books/metallics_arts_book/en_us/entries/feruchemic_powers_entry/atium_feruchemic_power.json index a9cde19d..7640b435 100644 --- a/src/main/resources/data/metallics_arts/patchouli_books/metallics_arts_book/en_us/entries/feruchemic_powers_entry/atium_feruchemic_power.json +++ b/src/main/resources/data/metallics_arts/patchouli_books/metallics_arts_book/en_us/entries/feruchemic_powers_entry/atium_feruchemic_power.json @@ -6,11 +6,11 @@ { "type": "patchouli:spotlight", "item": "metallics_arts:atium_feruchemic_icon", - "text": "$(br)Storing:$(br2) - As you decant, it allows you to shine for other players." + "text": "$(br)Storing:$(br2) - While you store, it allows you to become invisible." }, { "type": "patchouli:text", - "text": "$(br2)$(br2)$(br2)Tapping:$(br2) - While you store, it allows you to become invisible." + "text": "$(br2)$(br2)$(br2)Tapping:$(br2) - As you decant, it allows you to shine for other players." } ] } \ No newline at end of file diff --git a/src/main/resources/data/metallics_arts/patchouli_books/metallics_arts_book/es_es/entries/feruchemic_powers_entry/atium_feruchemic_power.json b/src/main/resources/data/metallics_arts/patchouli_books/metallics_arts_book/es_es/entries/feruchemic_powers_entry/atium_feruchemic_power.json index b6d83a2b..ea01be56 100644 --- a/src/main/resources/data/metallics_arts/patchouli_books/metallics_arts_book/es_es/entries/feruchemic_powers_entry/atium_feruchemic_power.json +++ b/src/main/resources/data/metallics_arts/patchouli_books/metallics_arts_book/es_es/entries/feruchemic_powers_entry/atium_feruchemic_power.json @@ -6,11 +6,11 @@ { "type": "patchouli:spotlight", "item": "metallics_arts:atium_feruchemic_icon", - "text": "$(br)Almacenar:$(br2) - Mientras decantas, te permite brillar para el resto de jugadores." + "text": "$(br)Almacenar:$(br2) - Mientras almacenas, te permite volverte invisible." }, { "type": "patchouli:text", - "text": "$(br2)$(br2)$(br2)Decantar:$(br2) - Mientras almacenas, te permite volverte invisible." + "text": "$(br2)$(br2)$(br2)Decantar:$(br2) - Mientras decantas, te permite brillar para el resto de jugadores." } ] } \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/painting_variant/placeable.json b/src/main/resources/data/minecraft/tags/painting_variant/placeable.json index b59388f5..8328fb44 100644 --- a/src/main/resources/data/minecraft/tags/painting_variant/placeable.json +++ b/src/main/resources/data/minecraft/tags/painting_variant/placeable.json @@ -15,7 +15,7 @@ "metallics_arts:electrum_feruchemic_painting","metallics_arts:ettmetal_feruchemic_painting","metallics_arts:gold_feruchemic_painting", "metallics_arts:iron_feruchemic_painting","metallics_arts:lerasium_feruchemic_painting","metallics_arts:malatium_feruchemic_painting", "metallics_arts:nicrosil_feruchemic_painting","metallics_arts:pewter_feruchemic_painting","metallics_arts:steel_feruchemic_painting", - "metallics_arts:tin_feruchemic_painting","metallics_arts:zinc_feruchemic_painting" + "metallics_arts:tin_feruchemic_painting","metallics_arts:zinc_feruchemic_painting","metallics_arts:fun_cobber_painting" ] } diff --git a/src/main/resources/data/other_advancements/advancements/metallics_arts.json b/src/main/resources/data/other_advancements/advancements/metallics_arts.json new file mode 100644 index 00000000..1d8701fb --- /dev/null +++ b/src/main/resources/data/other_advancements/advancements/metallics_arts.json @@ -0,0 +1,27 @@ +{ + "display": { + "icon": { + "item": "metallics_arts:steel_ingot" + }, + "title": "Prueba de segunda pestaña!", + "description": "uwu", + "frame": "goal", + "show_toast": true, + "announce_to_chat": true, + "background": "metallics_arts:textures/advancements/mist_block.png" + }, + "criteria": { + "requirement": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "metallics_arts:steel_nugget" + ] + } + ] + } + } + } +}