diff --git a/README.md b/README.md index 3a53e91b..76d6d786 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,5 @@ -# Metallics Arts 1.19.2-1.4.0 +# Metallics Arts 1.19.2-1.4.1 + ## Index 📋 diff --git a/build.gradle b/build.gradle index ac20c092..c27d79a2 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ plugins { } -version = '1.19.2-1.4.0' +version = '1.19.2-1.4.1' 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/MetallicsArts.java b/src/main/java/net/rudahee/metallics_arts/MetallicsArts.java index 8297d803..341da6ef 100644 --- a/src/main/java/net/rudahee/metallics_arts/MetallicsArts.java +++ b/src/main/java/net/rudahee/metallics_arts/MetallicsArts.java @@ -127,8 +127,9 @@ private void setup(final FMLCommonSetupEvent event) // some preinit code LOGGER.info("Starting Metallics Arts Setup."); - MetallicsPowersSetup.register(event); ModNetwork.registerPackets(); + MetallicsPowersSetup.register(event); + } private void doClientStuff(final FMLClientSetupEvent event) { diff --git a/src/main/java/net/rudahee/metallics_arts/data/network/BannerPacket.java b/src/main/java/net/rudahee/metallics_arts/data/network/BannerPacket.java new file mode 100644 index 00000000..17110fc9 --- /dev/null +++ b/src/main/java/net/rudahee/metallics_arts/data/network/BannerPacket.java @@ -0,0 +1,52 @@ +package net.rudahee.metallics_arts.data.network; + +import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.world.entity.player.Player; +import net.minecraftforge.network.NetworkEvent; +import net.rudahee.metallics_arts.modules.powers.helpers.IronAndSteelHelpers; + +import java.util.UUID; +import java.util.function.Supplier; + +public class BannerPacket { + + private final UUID uuid; + private final int slot; + + /** + * + * @param slot slot for remove + * @param player the player + */ + public BannerPacket(int slot, Player player) { + this.uuid = player.getUUID(); + this.slot = slot; + } + + private BannerPacket(UUID uuid, int slot) { + this.slot = slot; + this.uuid = uuid; + } + + public static BannerPacket decode(FriendlyByteBuf buf) { + return new BannerPacket(buf.readUUID(), buf.readInt()); + } + + public void encode(FriendlyByteBuf buf) { + buf.writeInt(this.slot); + buf.writeUUID(this.uuid); + } + + public void handle(Supplier ctx) { + ctx.get().enqueueWork(() -> { + ServerPlayer player = ctx.get().getSender(); + + if (player != null) { + player.getInventory().removeItem(IronAndSteelHelpers.haveNuggets(player), 1); + } + }); + + ctx.get().setPacketHandled(true); + } +} diff --git a/src/main/java/net/rudahee/metallics_arts/data/providers/ModLanguageProviderES.java b/src/main/java/net/rudahee/metallics_arts/data/providers/ModLanguageProviderES.java index e8a6f589..839ae035 100644 --- a/src/main/java/net/rudahee/metallics_arts/data/providers/ModLanguageProviderES.java +++ b/src/main/java/net/rudahee/metallics_arts/data/providers/ModLanguageProviderES.java @@ -2,6 +2,7 @@ import net.minecraft.data.DataGenerator; import net.minecraftforge.common.data.LanguageProvider; +import net.rudahee.metallics_arts.modules.powers.client.MetalBlockHelpers; import net.rudahee.metallics_arts.setup.enums.extras.MetalsNBTData; import net.rudahee.metallics_arts.setup.enums.langs.MetalSpanish; @@ -11,300 +12,213 @@ public class ModLanguageProviderES extends LanguageProvider { - private Map base = new HashMap<>() { - { - - put("item.metallics_arts.steel_ingot", "Lingote de acero"); - put("item.metallics_arts.tin_ingot", "Lingote de estaño"); - put("item.metallics_arts.pewter_ingot", "Lingote de peltre"); - put("item.metallics_arts.bronze_ingot", "Lingote de bronce"); - put("item.metallics_arts.zinc_ingot", "Lingote de zinc"); - put("item.metallics_arts.brass_ingot", "Lingote de latón"); - put("item.metallics_arts.electrum_ingot", "Lingote de electrum"); - put("item.metallics_arts.cadmium_ingot", "Lingote de cadmio"); - put("item.metallics_arts.bendalloy_ingot", "Lingote de bendaleo"); - put("item.metallics_arts.aluminum_ingot", "Lingote de aluminio"); - put("item.metallics_arts.duralumin_ingot", "Lingote de duralumín"); - put("item.metallics_arts.chromium_ingot", "Lingote de cromo"); - put("item.metallics_arts.nicrosil_ingot", "Lingote de nicrosil"); - - put("item.metallics_arts.silver_ingot", "Lingote de plata"); - put("item.metallics_arts.lead_ingot", "Lingote de plomo"); - put("item.metallics_arts.nickel_ingot", "Lingote de níquel"); - - put("item.metallics_arts.atium", "Atium"); - put("item.metallics_arts.malatium", "Malatium"); - put("item.metallics_arts.lerasium", "Lerasium"); - put("item.metallics_arts.ettmetal", "Ettmetal"); - - - put("item.metallics_arts.steel_nugget", "Pepita de acero"); - put("item.metallics_arts.tin_nugget", "Pepita de estaño"); - put("item.metallics_arts.pewter_nugget", "Pepita de peltre"); - put("item.metallics_arts.bronze_nugget", "Pepita de bronce"); - put("item.metallics_arts.copper_nugget", "Pepita de cobre"); - put("item.metallics_arts.zinc_nugget", "Pepita de zinc"); - put("item.metallics_arts.brass_nugget", "Pepita de latón"); - put("item.metallics_arts.electrum_nugget", "Pepita de electrum"); - put("item.metallics_arts.cadmium_nugget", "Pepita de cadmio"); - put("item.metallics_arts.bendalloy_nugget", "Pepita de bendaleo"); - put("item.metallics_arts.aluminum_nugget", "Pepita de aluminio"); - put("item.metallics_arts.duralumin_nugget", "Pepita de duralumín"); - put("item.metallics_arts.chromium_nugget", "Pepita de cromo"); - put("item.metallics_arts.nicrosil_nugget", "Pepita de nicrosil"); - - put("item.metallics_arts.silver_nugget", "Pepita de plata"); - put("item.metallics_arts.lead_nugget", "Pepita de plomo"); - put("item.metallics_arts.nickel_nugget", "Pepita de níquel"); - - put("item.metallics_arts.atium_nugget", "Pepita de atium"); - put("item.metallics_arts.malatium_nugget", "Pepita de malatium"); - put("item.metallics_arts.lerasium_nugget", "Pepita de lerasium"); - put("item.metallics_arts.ettmetal_nugget", "Pepita de ettmetal"); - - - put("item.metallics_arts.raw_tin", "Estaño en bruto"); - put("item.metallics_arts.raw_zinc", "Zinc en bruto"); - put("item.metallics_arts.raw_cadmium", "Cadmio en bruto"); - put("item.metallics_arts.raw_aluminum", "Aluminio en bruto"); - - put("item.metallics_arts.raw_chromium", "Cromo en bruto"); - put("item.metallics_arts.raw_silver", "Plata en bruto"); - put("item.metallics_arts.raw_lead", "Plomo en bruto"); - put("item.metallics_arts.raw_nickel", "Níquel en bruto"); - - - put("block.metallics_arts.tin_ore", "Mena de estaño"); - put("block.metallics_arts.bronze_ore", "Mena de bronce"); - put("block.metallics_arts.zinc_ore", "Mena de zinc"); - put("block.metallics_arts.brass_ore", "Mena de latón"); - put("block.metallics_arts.cadmium_ore", "Mena de cadmio"); - put("block.metallics_arts.aluminum_ore", "Mena de aluminio"); - put("block.metallics_arts.chromium_ore", "Mena de cromo"); - put("block.metallics_arts.lead_ore", "Mena de plomo"); - - put("block.metallics_arts.deepslate_chromium_ore", "Mena de cromo de pizarra profunda"); - put("block.metallics_arts.deepslate_aluminum_ore", "Mena de aluminio de pizarra profunda"); - put("block.metallics_arts.deepslate_silver_ore", "Mena de plata de pizarra profunda"); - put("block.metallics_arts.deepslate_lead_ore", "Mena de plomo de pizarra profunda"); - put("block.metallics_arts.deepslate_nickel_ore", "Mena de níquel de pizarra profunda"); - - put("block.metallics_arts.raw_tin_block", "Bloque de estaño en bruto"); - put("block.metallics_arts.raw_zinc_block", "Bloque de zinc en bruto"); - put("block.metallics_arts.raw_cadmium_block", "Bloque de cadmio en bruto"); - put("block.metallics_arts.raw_aluminum_block", "Bloque de aluminio en bruto"); - - put("block.metallics_arts.raw_chromium_block", "Bloque de cromo en bruto"); - put("block.metallics_arts.raw_silver_block", "Bloque de plata en bruto"); - put("block.metallics_arts.raw_lead_block", "Bloque de plomo en bruto"); - put("block.metallics_arts.raw_nickel_block", "Bloque de níquel en bruto"); - - - put("block.metallics_arts.steel_block", "Bloque de acero"); - put("block.metallics_arts.tin_block", "Bloque de estaño"); - put("block.metallics_arts.pewter_block", "Bloque de peltre"); - put("block.metallics_arts.bronze_block", "Bloque de bronce"); - put("block.metallics_arts.zinc_block", "Bloque de zinc"); - put("block.metallics_arts.brass_block", "Bloque de latón"); - put("block.metallics_arts.electrum_block", "Bloque de electrum"); - put("block.metallics_arts.cadmium_block", "Bloque de cadmio"); - put("block.metallics_arts.bendalloy_block", "Bloque de bendaleo"); - put("block.metallics_arts.aluminum_block", "Bloque de aluminio"); - put("block.metallics_arts.duralumin_block", "Bloque de duralumín"); - put("block.metallics_arts.chromium_block", "Bloque de cromo"); - put("block.metallics_arts.nicrosil_block", "Bloque de nicrosil"); - - put("block.metallics_arts.silver_block", "Bloque de plata"); - put("block.metallics_arts.lead_block", "Bloque de plomo"); - put("block.metallics_arts.nickel_block", "Bloque de níquel"); - - put("block.metallics_arts.atium_block", "Bloque de atium"); - put("block.metallics_arts.malatium_block", "Bloque de malatium"); - put("block.metallics_arts.lerasium_block", "Bloque de lerasium"); - put("block.metallics_arts.ettmetal_block", "Bloque de ettmetal"); - - put("item.metallics_arts.band_aluminum_duralumin", "Brazal de aluminio-duralumín"); - put("item.metallics_arts.band_atium_malatium", "Brazal de atium-malatium"); - put("item.metallics_arts.band_cadmium_bendalloy", "Brazal de cadmio-bendaleo"); - put("item.metallics_arts.band_chromium_nicrosil", "Brazal de cromo-nicrosil"); - put("item.metallics_arts.band_copper_bronze", "Brazal de cobre-bronce"); - put("item.metallics_arts.band_electrum_gold", "Brazal de oro-electrum"); - put("item.metallics_arts.band_lerasium_ettmetal", "Brazal de lerasium-ettmetal"); - put("item.metallics_arts.band_pewter_tin", "Brazal de estaño-peltre"); - put("item.metallics_arts.band_zinc_brass", "Brazal de zinc-latón"); - put("item.metallics_arts.band_steel_iron", "Brazal de hierro-acero"); - - put("item.metallics_arts.ring_aluminum_duralumin", "Anillo de aluminio-duralumín"); - put("item.metallics_arts.ring_atium_malatium", "Anillo de atium-malatium"); - put("item.metallics_arts.ring_cadmium_bendalloy", "Anillo de cadmio-bendaleo"); - put("item.metallics_arts.ring_chromium_nicrosil", "Anillo de cromo-nicrosil"); - put("item.metallics_arts.ring_copper_bronze", "Anillo de cobre-bronce"); - put("item.metallics_arts.ring_electrum_gold", "Anillo de oro-electrum"); - put("item.metallics_arts.ring_lerasium_ettmetal", "Anillo de lerasium-ettmetal"); - put("item.metallics_arts.ring_pewter_tin", "Anillo de estaño-peltre"); - put("item.metallics_arts.ring_zinc_brass", "Anillo de zinc-latón"); - put("item.metallics_arts.ring_steel_iron", "Anillo de hierro-acero"); - - put("item.metallics_arts.iron_spike", "Clavo de hierro"); - put("item.metallics_arts.steel_spike", "Clavo de acero"); - put("item.metallics_arts.tin_spike", "Clavo de estaño"); - put("item.metallics_arts.pewter_spike", "Clavo de peltre"); - put("item.metallics_arts.copper_spike", "Clavo de cobre"); - put("item.metallics_arts.bronze_spike", "Clavo de bronce"); - put("item.metallics_arts.zinc_spike", "Clavo de zinc"); - put("item.metallics_arts.brass_spike", "Clavo de latón"); - put("item.metallics_arts.chromium_spike", "Clavo de cromo"); - put("item.metallics_arts.nicrosil_spike", "Clavo de nicrosil"); - put("item.metallics_arts.aluminum_spike", "Clavo de aluminio"); - put("item.metallics_arts.duralumin_spike", "Clavo de duralumín"); - put("item.metallics_arts.cadmium_spike", "Clavo de cadmio"); - put("item.metallics_arts.bendalloy_spike", "Clavo de bendaleo"); - put("item.metallics_arts.electrum_spike", "Clavo de electrum"); - put("item.metallics_arts.gold_spike", "Clavo de oro"); - put("item.metallics_arts.atium_spike", "Clavo de atium"); - put("item.metallics_arts.malatium_spike", "Clavo de malatium"); - put("item.metallics_arts.lerasium_spike", "Clavo de lerasium"); - put("item.metallics_arts.ettmetal_spike", "Clavo de ettmetal"); - - put("item.metallics_arts.obsidian_dagger", "Daga de obsidiana"); - put("item.metallics_arts.cristal_dagger", "Daga de cristal"); - put("item.metallics_arts.koloss_blade", "Espada de koloss"); - put("item.metallics_arts.dueling_staff", "Bastón de duelo"); - put("item.metallics_arts.obsidian_axe", "Hacha de obsidiana"); - - put("item.metallics_arts.large_vial", "Vial grande"); - put("item.metallics_arts.small_vial", "Vial pequeño"); - - - put("curios.identifier.metalmind_slot", "Ranura de mente de metal"); - - put("block.metallics_arts.atium_cristal_block", "Atium cristalizado"); - put("block.metallics_arts.budding_atium", "Brotador de atium"); - put("block.metallics_arts.atium_cluster", "Cúmulo de atium"); - put("block.metallics_arts.small_atium_bud", "Brote de atium pequeño"); - put("block.metallics_arts.medium_atium_bud", "Brote de atium mediano"); - put("block.metallics_arts.large_atium_bud", "Brote de atium grande"); - - put("block.metallics_arts.lerasium_cristal_block", "Lerasium cristalizado"); - put("block.metallics_arts.budding_lerasium", "Brotador de lerasium"); - put("block.metallics_arts.lerasium_cluster", "Cúmulo de lerasium"); - put("block.metallics_arts.small_lerasium_bud", "Brote de lerasium pequeño"); - put("block.metallics_arts.medium_lerasium_bud", "Brote de lerasium mediano"); - put("block.metallics_arts.large_lerasium_bud", "Brote de lerasium grande"); - - put("block.metallics_arts.ettmetal_cristal_block", "Ettmetal cristalizado"); - put("block.metallics_arts.budding_ettmetal", "Brotador de ettmetal"); - put("block.metallics_arts.ettmetal_cluster", "Cúmulo de ettmetal"); - put("block.metallics_arts.small_ettmetal_bud", "Brote de ettmetal pequeño"); - put("block.metallics_arts.medium_ettmetal_bud", "Brote de ettmetal mediano"); - put("block.metallics_arts.large_ettmetal_bud", "Brote de ettmetal grande"); - - - put("itemGroup.metallics_arts", "Artes Metálicas"); - put("itemGroup.metallics_arts.decorations", "Artes Metálicas, Decoración"); - - put("block.metallics_arts.alloy_furnace", "Horno de fusión"); - - put("screen.metallics_arts.alloy_furnace", "Horno de fusión"); - put("curios.identifier.ma_metalmind_slot", "Ranura de mente de metal"); - - put("key.categorymetallics_arts", "Artes Metálicas"); - put("key.metallics_arts.allomantic", "Selector de metal alomántico"); - put("key.metallics_arts.feruchemic", "Selector de metal feruquímico"); - put("key.metallics_arts.vertical_jump", "Empuje vertical"); - - put("item.metallics_arts.aluminum_allomantic_icon", "Aluminio alomántico"); - put("item.metallics_arts.duralumin_allomantic_icon", "Duralumín alomántico"); - put("item.metallics_arts.steel_allomantic_icon", "Acero alomántico"); - put("item.metallics_arts.iron_allomantic_icon", "Hierro alomántico"); - put("item.metallics_arts.tin_allomantic_icon", "Estaño alomántico"); - - put("item.metallics_arts.pewter_allomantic_icon", "Peltre alomántico"); - put("item.metallics_arts.bronze_allomantic_icon", "Bronce alomántico"); - put("item.metallics_arts.copper_allomantic_icon", "Cobre alomántico"); - put("item.metallics_arts.zinc_allomantic_icon", "Zinc alomántico"); - put("item.metallics_arts.brass_allomantic_icon", "Latón alomántico"); - - put("item.metallics_arts.gold_allomantic_icon", "Oro alomántico"); - put("item.metallics_arts.electrum_allomantic_icon", "Electrum alomántico"); - put("item.metallics_arts.cadmium_allomantic_icon", "Cadmio alomántico"); - put("item.metallics_arts.bendalloy_allomantic_icon", "Bendaleo alomántico"); - put("item.metallics_arts.chromium_allomantic_icon", "Cromo alomántico"); - - put("item.metallics_arts.nicrosil_allomantic_icon", "Nicrosil alomántico"); - put("item.metallics_arts.atium_allomantic_icon", "Atium alomántico"); - put("item.metallics_arts.malatium_allomantic_icon", "Malatium alomántico"); - put("item.metallics_arts.lerasium_allomantic_icon", "Lerasium alomántico"); - put("item.metallics_arts.ettmetal_allomantic_icon", "Ettmetal alomántico"); - - put("item.metallics_arts.aluminum_feruchemic_icon", "Aluminio feruquímico"); - put("item.metallics_arts.duralumin_feruchemic_icon", "Duralumín feruquímico"); - put("item.metallics_arts.steel_feruchemic_icon", "Acero feruquímico"); - put("item.metallics_arts.iron_feruchemic_icon", "Hierro feruquímico"); - put("item.metallics_arts.tin_feruchemic_icon", "Estaño feruquímico"); - - put("item.metallics_arts.pewter_feruchemic_icon", "Peltre feruquímico"); - put("item.metallics_arts.bronze_feruchemic_icon", "Bronce feruquímico"); - put("item.metallics_arts.copper_feruchemic_icon", "Cobre feruquímico"); - put("item.metallics_arts.zinc_feruchemic_icon", "Zinc feruquímico"); - put("item.metallics_arts.brass_feruchemic_icon", "Latón feruquímico"); - - put("item.metallics_arts.gold_feruchemic_icon", "Oro feruquímico"); - put("item.metallics_arts.electrum_feruchemic_icon", "Electrum feruquímico"); - put("item.metallics_arts.cadmium_feruchemic_icon", "Cadmio feruquímico"); - put("item.metallics_arts.bendalloy_feruchemic_icon", "Bendaleo feruquímico"); - put("item.metallics_arts.chromium_feruchemic_icon", "Cromo feruquímico"); - - put("item.metallics_arts.nicrosil_feruchemic_icon", "Nicrosil feruquímico"); - put("item.metallics_arts.atium_feruchemic_icon", "Atium feruquímico"); - put("item.metallics_arts.malatium_feruchemic_icon", "Malatium feruquímico"); - put("item.metallics_arts.lerasium_feruchemic_icon", "Lerasium feruquímico"); - put("item.metallics_arts.ettmetal_feruchemic_icon", "Ettmetal feruquímico"); - - put("metallics_arts.patchouli.name_book", "Artes Metalicas, Guía"); - - put("metallics_arts.patchouli.landing_text", "Soy, por desgracia, el Héroe de las Eras, y tengo una pregunta que hacerte, ¿acaso un hombre no tiene derecho a poseer sus propios metales? No, dice el hombre del Imperio, pertenece al \"dios\". No, dice el superviviente, pertenece a todos. No, dice el hombre de Elendel, pertenece a los pobres. Yo rechacé esas propuestas. En vez de eso elegí algo distinto. Elegi mi propio camino, elegí... el mod de las Artes Metálicas."); - - put("metallics_arts.mental_mind.owner", "Propietario"); - - put("metallics_arts.mental_mind.nobody", "Sin propietario"); - - put("metallics_arts.metal_translate.iron", "Hierro"); - put("metallics_arts.metal_translate.steel", "Acero"); - put("metallics_arts.metal_translate.tin", "Estaño"); - put("metallics_arts.metal_translate.pewter", "Peltre"); - put("metallics_arts.metal_translate.zinc", "Zinc"); - put("metallics_arts.metal_translate.brass", "Latón"); - put("metallics_arts.metal_translate.copper", "Cobre"); - put("metallics_arts.metal_translate.bronze", "Bronce"); - put("metallics_arts.metal_translate.aluminum", "Aluminio"); - put("metallics_arts.metal_translate.duralumin", "Duralumín"); - put("metallics_arts.metal_translate.chromium", "Cromo"); - put("metallics_arts.metal_translate.nicrosil", "Nicrosil"); - put("metallics_arts.metal_translate.gold", "Oro"); - put("metallics_arts.metal_translate.electrum", "Electrum"); - put("metallics_arts.metal_translate.bendalloy", "Bendaleo"); - put("metallics_arts.metal_translate.cadmium", "Cadmio"); - put("metallics_arts.metal_translate.atium", "Atium"); - put("metallics_arts.metal_translate.malatium", "Malatium"); - put("metallics_arts.metal_translate.lerasium", "Lerasium"); - put("metallics_arts.metal_translate.ettmetal", "Ettmetal"); - - put("metallics_arts.mental_mind_translate.has_reserve", "Contiene reservas alománticas"); - put("metallics_arts.mental_mind_translate.not_has_reserve", "No contiene reservas alománticas"); - - put("metallics_arts.mental_mind_translate.uses", "Usos"); - - put("metallics_arts.spike_feruchemic_power", "Poder almacenado, feruquímico"); - put("metallics_arts.spike_allomantic_power", "Poder almacenado, alomántico"); - - put("metallics_arts.mental_mind_translate.store_identity", "Almacenando Identidad"); - put("metallics_arts.mental_mind_translate.off_power", "Poder apagado"); - put("metallics_arts.spike_allomantic_power.tapping_identity", "Decantando Identidad"); - - put("metallics_arts.mental_mind.owner_someone", "Alguien"); - }}; + private Map base = new HashMap<>() {{ + + put("item.metallics_arts.atium", "Atium"); + put("item.metallics_arts.malatium", "Malatium"); + put("item.metallics_arts.lerasium", "Lerasium"); + put("item.metallics_arts.ettmetal", "Ettmetal"); + + + put("item.metallics_arts.raw_tin", "Estaño en bruto"); + put("item.metallics_arts.raw_zinc", "Zinc en bruto"); + put("item.metallics_arts.raw_cadmium", "Cadmio en bruto"); + put("item.metallics_arts.raw_aluminum", "Aluminio en bruto"); + + put("item.metallics_arts.raw_chromium", "Cromo en bruto"); + put("item.metallics_arts.raw_silver", "Plata en bruto"); + put("item.metallics_arts.raw_lead", "Plomo en bruto"); + put("item.metallics_arts.raw_nickel", "Níquel en bruto"); + + put("block.metallics_arts.tin_ore", "Mena de estaño"); + put("block.metallics_arts.bronze_ore", "Mena de bronce"); + put("block.metallics_arts.zinc_ore", "Mena de zinc"); + put("block.metallics_arts.brass_ore", "Mena de latón"); + put("block.metallics_arts.cadmium_ore", "Mena de cadmio"); + put("block.metallics_arts.aluminum_ore", "Mena de aluminio"); + put("block.metallics_arts.chromium_ore", "Mena de cromo"); + put("block.metallics_arts.lead_ore", "Mena de plomo"); + + put("block.metallics_arts.deepslate_chromium_ore", "Mena de cromo de pizarra profunda"); + put("block.metallics_arts.deepslate_aluminum_ore", "Mena de aluminio de pizarra profunda"); + put("block.metallics_arts.deepslate_silver_ore", "Mena de plata de pizarra profunda"); + put("block.metallics_arts.deepslate_lead_ore", "Mena de plomo de pizarra profunda"); + put("block.metallics_arts.deepslate_nickel_ore", "Mena de níquel de pizarra profunda"); + put("block.metallics_arts.deepslate_cadmium_ore", "Mena de cadmio de pizarra profunda"); + + put("block.metallics_arts.raw_tin_block", "Bloque de estaño en bruto"); + put("block.metallics_arts.raw_zinc_block", "Bloque de zinc en bruto"); + put("block.metallics_arts.raw_cadmium_block", "Bloque de cadmio en bruto"); + put("block.metallics_arts.raw_aluminum_block", "Bloque de aluminio en bruto"); + + put("block.metallics_arts.raw_chromium_block", "Bloque de cromo en bruto"); + put("block.metallics_arts.raw_silver_block", "Bloque de plata en bruto"); + put("block.metallics_arts.raw_lead_block", "Bloque de plomo en bruto"); + put("block.metallics_arts.raw_nickel_block", "Bloque de níquel en bruto"); + + + put("item.metallics_arts.band_aluminum_duralumin", "Brazal de aluminio-duralumín"); + put("item.metallics_arts.band_atium_malatium", "Brazal de atium-malatium"); + put("item.metallics_arts.band_cadmium_bendalloy", "Brazal de cadmio-bendaleo"); + put("item.metallics_arts.band_chromium_nicrosil", "Brazal de cromo-nicrosil"); + put("item.metallics_arts.band_copper_bronze", "Brazal de cobre-bronce"); + put("item.metallics_arts.band_electrum_gold", "Brazal de oro-electrum"); + put("item.metallics_arts.band_lerasium_ettmetal", "Brazal de lerasium-ettmetal"); + put("item.metallics_arts.band_pewter_tin", "Brazal de estaño-peltre"); + put("item.metallics_arts.band_zinc_brass", "Brazal de zinc-latón"); + put("item.metallics_arts.band_steel_iron", "Brazal de hierro-acero"); + + put("item.metallics_arts.ring_aluminum_duralumin", "Anillo de aluminio-duralumín"); + put("item.metallics_arts.ring_atium_malatium", "Anillo de atium-malatium"); + put("item.metallics_arts.ring_cadmium_bendalloy", "Anillo de cadmio-bendaleo"); + put("item.metallics_arts.ring_chromium_nicrosil", "Anillo de cromo-nicrosil"); + put("item.metallics_arts.ring_copper_bronze", "Anillo de cobre-bronce"); + put("item.metallics_arts.ring_electrum_gold", "Anillo de oro-electrum"); + put("item.metallics_arts.ring_lerasium_ettmetal", "Anillo de lerasium-ettmetal"); + put("item.metallics_arts.ring_pewter_tin", "Anillo de estaño-peltre"); + put("item.metallics_arts.ring_zinc_brass", "Anillo de zinc-latón"); + put("item.metallics_arts.ring_steel_iron", "Anillo de hierro-acero"); + + + put("item.metallics_arts.obsidian_dagger", "Daga de obsidiana"); + put("item.metallics_arts.cristal_dagger", "Daga de cristal"); + put("item.metallics_arts.koloss_blade", "Espada de koloss"); + put("item.metallics_arts.dueling_staff", "Bastón de duelo"); + put("item.metallics_arts.obsidian_axe", "Hacha de obsidiana"); + + put("item.metallics_arts.large_vial", "Vial grande"); + put("item.metallics_arts.small_vial", "Vial pequeño"); + + + put("curios.identifier.metalmind_slot", "Ranura de mente de metal"); + + put("block.metallics_arts.atium_cristal_block", "Atium Cristalizado"); + put("block.metallics_arts.budding_atium", "Brotador de atium"); + put("block.metallics_arts.atium_cluster", "Cúmulo de atium"); + put("block.metallics_arts.small_atium_bud", "Brote de atium pequeño"); + put("block.metallics_arts.medium_atium_bud", "Brote de atium mediano"); + put("block.metallics_arts.large_atium_bud", "Brote de atium grande"); + + put("block.metallics_arts.lerasium_cristal_block", "Lerasium Cristalizado"); + put("block.metallics_arts.budding_lerasium", "Brotador de lerasium"); + put("block.metallics_arts.lerasium_cluster", "Cúmulo de lerasium"); + put("block.metallics_arts.small_lerasium_bud", "Brote de lerasium pequeño"); + put("block.metallics_arts.medium_lerasium_bud", "Brote de lerasium mediano"); + put("block.metallics_arts.large_lerasium_bud", "Brote de lerasium grande"); + + put("block.metallics_arts.ettmetal_cristal_block", "Ettmetal Cristalizado"); + put("block.metallics_arts.budding_ettmetal", "Brotador de ettmetal"); + put("block.metallics_arts.ettmetal_cluster", "Cúmulo de ettmetal"); + put("block.metallics_arts.small_ettmetal_bud", "Brote de ettmetal pequeño"); + put("block.metallics_arts.medium_ettmetal_bud", "Brote de ettmetal mediano"); + put("block.metallics_arts.large_ettmetal_bud", "Brote de ettmetal grande"); + + + put("itemGroup.metallics_arts", "Artes Metálicas"); + put("itemGroup.metallics_arts.decorations", "Artes Metálicas: Decoración"); + + put("block.metallics_arts.alloy_furnace", "Horno de fusión"); + + put("screen.metallics_arts.alloy_furnace", "Horno de fusión"); + put("curios.identifier.ma_metalmind_slot", "Ranura de mente de metal"); + + put("key.categorymetallics_arts", "Artes Metálicas"); + put("key.metallics_arts.allomantic", "Selector de metal alomántico"); + put("key.metallics_arts.feruchemic", "Selector de metal feruquímico"); + put("key.metallics_arts.vertical_jump", "Empuje vertical"); + + + put("metallics_arts.patchouli.name_book", "Artes Metalicas, Guia"); + + put("metallics_arts.patchouli.landing_text", "Soy, por desgracia, el Héroe de las Eras, y tengo una pregunta que hacerte, ¿acaso un hombre no tiene derecho a poseer sus propios metales? No, dice el hombre del Imperio. Pertenece al \"dios\". No, dice el superviviente. Pertenece a todos. No, dice el hombre de Elendel. Pertenece a los pobres. Yo rechacé esas propuestas. En vez de eso elegí algo distinto. Elegi mi propio camino, elegí... Artes Metalicas Mod."); + + put("metallics_arts.mental_mind.owner", "Propietario"); + + put("metallics_arts.mental_mind.nobody", "Sin Propietario"); + + + put("metallics_arts.mental_mind_translate.has_reserve", "Tiene Reservas Alomanticas"); + put("metallics_arts.mental_mind_translate.not_has_reserve", "No Tiene Reservas Alomanticas"); + + put("metallics_arts.mental_mind_translate.uses", "Usos"); + + put("metallics_arts.spike_feruchemic_power", "Poder Almacenado, Feruqumico"); + put("metallics_arts.spike_allomantic_power", "Poder Almacenado, Alomantico"); + + put("metallics_arts.mental_mind_translate.store_identity", "Almacenando Identidad"); + put("metallics_arts.mental_mind_translate.off_power", "Poder Apagado"); + put("metallics_arts.spike_allomantic_power.tapping_identity", "Decantado Identidad"); + + put("metallics_arts.mental_mind.owner_someone", "Alguien"); + + + put("key.category_powers_metallics_arts", "Artes Metalicas, Poderes"); + put("key.metallics_arts.feruchemic_decant", "Decante Feruquimico"); + put("key.metallics_arts.feruchemic_store", "Almacenaje Feruqimico"); + put("key.metallics_arts.switch_overlay", "Alternar interfaz"); + + }}; + + + private Map ingots = new HashMap<>() {{ + + int cont = 0; + for (MetalsNBTData metal: MetalsNBTData.values()) { + if(cont <=16){ + put("item.metallics_arts."+ metal.getNameLower() +"_ingot","Lingote de "+ MetalSpanish.valueOf(metal.name()).getMetalNameLower()); + cont++; + } + } + + }}; + + private Map nuggets = new HashMap<>() {{ + + for (MetalsNBTData metal: MetalsNBTData.values()) { + put("item.metallics_arts."+ metal.getNameLower() +"_nugget","Pepita de "+ MetalSpanish.valueOf(metal.name()).getMetalNameLower()); + } + + }}; + private Map blocks = new HashMap<>() {{ + + for (MetalsNBTData metal: MetalsNBTData.values()) { + put("block.metallics_arts."+ metal.getNameLower() +"_block","Bloque de "+ MetalSpanish.valueOf(metal.name()).getMetalNameLower()); + } + + }}; + + private Map spikes = new HashMap<>() {{ + + for (MetalsNBTData metal: MetalsNBTData.values()) { + put("item.metallics_arts."+ metal.getNameLower() +"_spìke","Clavo de "+ MetalSpanish.valueOf(metal.name()).getMetalNameLower()); + } + + }}; + private Map icons = new HashMap<>() {{ + + for (MetalsNBTData metal: MetalsNBTData.values()) { + put("item.metallics_arts."+ metal.getNameLower()+"_allomantic_icon" , MetalSpanish.valueOf(metal.name()).getMetalName()+" Alomantico"); + put("item.metallics_arts."+ metal.getNameLower()+"_feruchemic_icon" , MetalSpanish.valueOf(metal.name()).getMetalName()+" Feruquimico"); + } + + }}; + + private Map metalls = new HashMap<>() {{ + + for (MetalsNBTData metal: MetalsNBTData.values()) { + put("metallics_arts.metal_translate."+ metal.getNameLower() , MetalSpanish.valueOf(metal.name()).getMetalName()); + } + + }}; + + private Map powers = new HashMap<>() {{ + + for (MetalsNBTData metal: MetalsNBTData.values()) { + put("key.metallics_arts."+ metal.getNameLower() +"_power", MetalSpanish.valueOf(metal.name()).getMetalName()); + } + + }}; private Map symbols = new HashMap<>() {{ for (MetalsNBTData metal: MetalsNBTData.values()) { put("f_"+metal.getNameLower()+"_1", MetalSpanish.valueOf(metal.name()).getMetalName() + " feruquimico sombreado"); @@ -350,6 +264,34 @@ public ModLanguageProviderES(DataGenerator gen, String modid, String locale) { @Override protected void addTranslations() { + for (String key: ingots.keySet()){ + add(key, ingots.get(key)); + } + + for (String key: nuggets.keySet()){ + add(key, nuggets.get(key)); + } + + for (String key: blocks.keySet()){ + add(key, blocks.get(key)); + } + + for (String key: spikes.keySet()){ + add(key, spikes.get(key)); + } + + for (String key: icons.keySet()){ + add(key, icons.get(key)); + } + + for (String key: metalls.keySet()){ + add(key, metalls.get(key)); + } + + for (String key: powers.keySet()){ + add(key, powers.get(key)); + } + for(String key: base.keySet()) { add(key, base.get(key)); } diff --git a/src/main/java/net/rudahee/metallics_arts/data/providers/ModRecipeProvider.java b/src/main/java/net/rudahee/metallics_arts/data/providers/ModRecipeProvider.java index b93f1557..5d49e363 100644 --- a/src/main/java/net/rudahee/metallics_arts/data/providers/ModRecipeProvider.java +++ b/src/main/java/net/rudahee/metallics_arts/data/providers/ModRecipeProvider.java @@ -56,6 +56,14 @@ protected void buildCraftingRecipes(Consumer recipesConsumer) { .save(recipesConsumer, new ResourceLocation(block.getDescriptionId() + "_to_" + ModItems.ITEM_RAW_METAL.get(name).getDescriptionId())); }); + ModItems.ITEM_RAW_METAL.forEach((name, item) -> { + ShapelessRecipeBuilder.shapeless(item.asItem(), 9) + .requires(ModBlock.RAW_METAL_BLOCKS.get(name)) + .unlockedBy("has_item", has(item)) + .save(recipesConsumer, new ResourceLocation(item.getDescriptionId() + "_to_" + ModBlock.RAW_METAL_BLOCKS.get(name).getDescriptionId())); + }); + + ModItems.ITEM_GEMS_BASE.forEach((name, item) -> { ShapelessRecipeBuilder.shapeless(item.asItem(), 9) diff --git a/src/main/java/net/rudahee/metallics_arts/modules/data_player/DefaultInvestedPlayerData.java b/src/main/java/net/rudahee/metallics_arts/modules/data_player/DefaultInvestedPlayerData.java index f2937ef7..eb536d41 100644 --- a/src/main/java/net/rudahee/metallics_arts/modules/data_player/DefaultInvestedPlayerData.java +++ b/src/main/java/net/rudahee/metallics_arts/modules/data_player/DefaultInvestedPlayerData.java @@ -8,6 +8,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; +import java.util.List; public class DefaultInvestedPlayerData implements IDefaultInvestedPlayerData { private final boolean[] allomantic_powers; @@ -591,6 +592,11 @@ public void load(CompoundTag nbt) { } } + this.setInvested(invested_data.getBoolean("invested")); + this.setMistborn(invested_data.getBoolean("mistborn")); + this.setFullFeruchemic(invested_data.getBoolean("fullFeruchemic")); + this.setFullInvested(invested_data.getBoolean("fullInvested")); + for (int i=0;i<10;i++){ this.setMetalMindEquiped(i,metal_mind_equiped.getBoolean("group"+i)); } @@ -607,7 +613,6 @@ public void load(CompoundTag nbt) { } catch(Exception ex) { System.out.println("SIGUE SIENDO UNA COSTRA DE NULL EL DEATH O SPAWN POS :D"); } - } - + } } diff --git a/src/main/java/net/rudahee/metallics_arts/modules/items/banners/Banners.java b/src/main/java/net/rudahee/metallics_arts/modules/items/banners/Banners.java index 0f106528..4545e3f7 100644 --- a/src/main/java/net/rudahee/metallics_arts/modules/items/banners/Banners.java +++ b/src/main/java/net/rudahee/metallics_arts/modules/items/banners/Banners.java @@ -29,10 +29,6 @@ public class Banners { RegistryObject pattern; TagKey bannerPatternTagKey; RegistryObject bannerPatternItem; - - if(metal.getNameLower().contains("a_alum")) { - System.out.println("az"); - } //Drawing patterns pattern = BANNER_PATTERN.register("a_"+metal.getNameLower()+"_1", () -> new BannerPattern(MetallicsArts.MOD_ID + "_a_" + metal.getNameLower()+"_1")); PATTERNS.put("a_"+metal.getNameLower(),pattern); diff --git a/src/main/java/net/rudahee/metallics_arts/modules/items/metal_spike/MetalSpikeAbstract.java b/src/main/java/net/rudahee/metallics_arts/modules/items/metal_spike/MetalSpikeAbstract.java index d755f884..fdc0f7ec 100644 --- a/src/main/java/net/rudahee/metallics_arts/modules/items/metal_spike/MetalSpikeAbstract.java +++ b/src/main/java/net/rudahee/metallics_arts/modules/items/metal_spike/MetalSpikeAbstract.java @@ -120,8 +120,8 @@ public boolean hurtEnemy(ItemStack stack, LivingEntity target, LivingEntity atta boolean hasAllomanticPower = targetData.hasAllomanticPower(MetalsNBTData.getMetal(stack.getTag().getInt("metal_spike"))); boolean hasFeruchemicPower = targetData.hasFeruchemicPower(MetalsNBTData.getMetal(stack.getTag().getInt("metal_spike"))); - boolean couldStealPower = Math.random()>0.90; - boolean couldRemovePower = Math.random()>0.50; + boolean couldStealPower = Math.random()>0.50; + boolean couldRemovePower = Math.random()<0.75; boolean isAllomantic = Math.random()>0.50; MetalsNBTData localMetal = MetalsNBTData.getMetal(stack.getTag().getInt("metal_spike")); @@ -135,19 +135,11 @@ public boolean hurtEnemy(ItemStack stack, LivingEntity target, LivingEntity atta if (!targetData.hasAllomanticPower(localMetal)){ targetData.addAllomanticPower(localMetal); doEffects(rng, world, pos); - - - } - - } else if (stack.getTag().getBoolean("feruchemic_power")){ if (!targetData.hasFeruchemicPower(localMetal)){ targetData.addFeruchemicPower(localMetal); - doEffects(rng, world, pos); - - } //SI EL CLAVO NO TIENE PODERES -> intenta robar @@ -196,6 +188,8 @@ public boolean hurtEnemy(ItemStack stack, LivingEntity target, LivingEntity atta } else if (hasFeruchemicPower){ if (Math.random()>0.50){ if (Math.random()<0.75) { + + targetData.removeFeruchemicPower(localMetal); target.addEffect(new MobEffectInstance(MobEffects.GLOWING, 40, 1, true, true, false)); diff --git a/src/main/java/net/rudahee/metallics_arts/modules/powers/PowersEventHandler.java b/src/main/java/net/rudahee/metallics_arts/modules/powers/PowersEventHandler.java index 0199dbb2..af0438e4 100644 --- a/src/main/java/net/rudahee/metallics_arts/modules/powers/PowersEventHandler.java +++ b/src/main/java/net/rudahee/metallics_arts/modules/powers/PowersEventHandler.java @@ -26,6 +26,7 @@ import net.minecraftforge.event.entity.player.PlayerSetSpawnEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; +import net.rudahee.metallics_arts.modules.data_player.DefaultInvestedPlayerData; import net.rudahee.metallics_arts.modules.data_player.InvestedCapability; import net.rudahee.metallics_arts.modules.powers.helpers.*; import net.rudahee.metallics_arts.setup.enums.extras.MetalsNBTData; @@ -79,12 +80,14 @@ public static void onJoinWorld(final PlayerEvent.PlayerLoggedInEvent event) { data.setSpawnDimension(dim); } if (data.getDeathDimension() == null) { - int[] pos = {player.level.getLevelData().getXSpawn(),player.level.getLevelData().getYSpawn(),player.level.getLevelData().getZSpawn()}; + int[] pos = {player.level.getLevelData().getXSpawn(), player.level.getLevelData().getYSpawn(),player.level.getLevelData().getZSpawn()}; String dim = player.level.dimension().location().toString(); data.setDeathPos(pos); data.setDeathDimension(dim); } - if (data.getAllomanticPowerCount() + data.getFeruchemicPowerCount() == 0) { + + //Se necesita hacer que cargue la date del player antes de ejecutar el onjoin world, o no funciona bien + if ((data.getAllomanticPowerCount() + data.getFeruchemicPowerCount() == 0) && !data.isInvested()) { List metals = Arrays.asList(MetalsNBTData.values()); Collections.shuffle(metals); List typeOfPower = Arrays.asList(0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 2, 2); // Leras footjob @@ -103,11 +106,12 @@ public static void onJoinWorld(final PlayerEvent.PlayerLoggedInEvent event) { Collections.shuffle(metals); data.addFeruchemicPower(metals.get(0)); } - } data.setInvested(true); + } + }); //Sync cap to client - ModNetwork.sync(event.getEntity()); + ModNetwork.sync(player); } } } @@ -153,7 +157,6 @@ public static void onLivingDeath(final LivingDeathEvent event) { @SubscribeEvent public static void onRespawn(final PlayerEvent.PlayerRespawnEvent event) { if (!event.getEntity().getCommandSenderWorld().isClientSide()) { - ModNetwork.sync(event.getEntity()); } } diff --git a/src/main/java/net/rudahee/metallics_arts/modules/powers/client/PowersClientEventHandler.java b/src/main/java/net/rudahee/metallics_arts/modules/powers/client/PowersClientEventHandler.java index 886fd8aa..eadd1540 100644 --- a/src/main/java/net/rudahee/metallics_arts/modules/powers/client/PowersClientEventHandler.java +++ b/src/main/java/net/rudahee/metallics_arts/modules/powers/client/PowersClientEventHandler.java @@ -15,6 +15,7 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Blocks; import net.minecraft.world.phys.*; import net.minecraftforge.api.distmarker.Dist; @@ -629,10 +630,11 @@ public void onRenderLevelStage(final RenderLevelStageEvent event) { for (Player otherPlayer: players) { IDefaultInvestedPlayerData cap = otherPlayer.getCapability(InvestedCapability.PLAYER_CAP).orElse(null); - - if (cap != null && (cap.isBurningSomething() && !cap.isBurning(MetalsNBTData.COPPER))) { - ClientUtils.drawMetalLine(stack, playervec, otherPlayer.position(), 5.0F, 1F, 0.6F, 0.6F); - } + if (cap!= null) { + if ((cap.isBurningSomething() && !cap.isBurning(MetalsNBTData.COPPER))) { + ClientUtils.drawMetalLine(stack, playervec, otherPlayer.position(), 5.0F, 1F, 0.6F, 0.6F); + } + } } } @@ -640,7 +642,7 @@ public void onRenderLevelStage(final RenderLevelStageEvent event) { * GOLD AND ELECTRUM AND MALATIUM LINES * *********************************************/ if (data.isBurning(MetalsNBTData.GOLD)) { - if(player.level.dimension().toString().equals(data.getDeathDimension())) { + if(player.level.dimension().location().toString().equals(data.getDeathDimension())) { Vec3 vector = new Vec3(data.getDeathPos()[0], data.getDeathPos()[1], data.getDeathPos()[2]); ClientUtils.drawMetalLine(stack,playervec,vector, 2.5f, 0.6f, 0.6f, 0.1f); } else { @@ -649,9 +651,8 @@ public void onRenderLevelStage(final RenderLevelStageEvent event) { } if (data.isBurning(MetalsNBTData.ELECTRUM)) { - Vec3 vector = new Vec3(data.getSpawnPos()[0], data.getSpawnPos()[1], data.getSpawnPos()[2]); - - if(player.level.dimension().toString().equals(data.getSpawnDimension())) { + if(player.level.dimension().location().toString().equals(data.getSpawnDimension())) { + Vec3 vector = new Vec3(data.getSpawnPos()[0], data.getSpawnPos()[1], data.getSpawnPos()[2]); ClientUtils.drawMetalLine(stack,playervec,vector, 2.5f, 0.6f, 0.6f, 0.1f); } else { ClientUtils.drawMetalLine(stack,playervec, playervec, 0,0,0,0); 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 37e83735..2fc7433f 100644 --- a/src/main/java/net/rudahee/metallics_arts/painting/ModPaintings.java +++ b/src/main/java/net/rudahee/metallics_arts/painting/ModPaintings.java @@ -10,7 +10,7 @@ public class ModPaintings { public static final DeferredRegisterPAINTING_VARIANTS = DeferredRegister.create(ForgeRegistries.PAINTING_VARIANTS, MetallicsArts.MOD_ID); - +/** //ALOMANTIC METALLS public static final RegistryObject ALUMINIUM_ALOMANTIC_PAINTING = PAINTING_VARIANTS.register("aluminium_alomantic_painting", () -> new PaintingVariant(32,32)); @@ -95,10 +95,39 @@ public class ModPaintings { public static final RegistryObject ZINC_FERUCHEMIC_PAINTING = PAINTING_VARIANTS.register("zinc_feruchemic_painting", () -> new PaintingVariant(32,32)); + JSON textr + "metallics_arts:aluminium_alomantic_painting","metallics_arts:atium_alomantic_painting","metallics_arts:bendalloy_alomantic_painting", + "metallics_arts:brass_alomantic_painting","metallics_arts:bronze_alomantic_painting","metallics_arts:cadmium_alomantic_painting", + "metallics_arts:chromium_alomantic_painting","metallics_arts:copper_alomantic_painting","metallics_arts:duralumin_alomantic_painting", + "metallics_arts:electrum_alomantic_painting","metallics_arts:ettmetal_alomantic_painting","metallics_arts:gold_alomantic_painting", + "metallics_arts:iron_alomantic_painting","metallics_arts:lerasium_alomantic_painting","metallics_arts:malatium_alomantic_painting", + "metallics_arts:nicrosil_alomantic_painting","metallics_arts:pewter_alomantic_painting","metallics_arts:steel_alomantic_painting", + "metallics_arts:tin_alomantic_painting","metallics_arts:zinc_alomantic_painting", + + "metallics_arts:aluminium_feruchemic_painting","metallics_arts:atium_feruchemic_painting","metallics_arts:bendalloy_feruchemic_painting", + "metallics_arts:brass_feruchemic_painting","metallics_arts:bronze_feruchemic_painting","metallics_arts:cadmium_feruchemic_painting", + "metallics_arts:chromium_feruchemic_painting","metallics_arts:copper_feruchemic_painting","metallics_arts:duralumin_feruchemic_painting", + "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", + */ + //Other paintingd + + public static final RegistryObject INQUISITOR_PAINTING = PAINTING_VARIANTS.register("inquisitor_painting", + () -> new PaintingVariant(16,16)); + public static final RegistryObject FUN_COBBER_PAINTING = PAINTING_VARIANTS.register("fun_cobber_painting", () -> new PaintingVariant(16,32)); + public static final RegistryObject SANFRE_PAINTING = PAINTING_VARIANTS.register("sanfre_painting", + () -> new PaintingVariant(64,64)); + + + + + //TO MAKE THE PAINTINGS WORK WE HAVE TO ADD THIS LINES TO DE placeable.json : , "metallics_arts:fun_cobber_painting","metallics_arts:inquisitor_painting" public static void register(IEventBus eventBus){ diff --git a/src/main/resources/assets/metallics_arts/textures/painting/inquisitor_painting.png b/src/main/resources/assets/metallics_arts/textures/painting/inquisitor_painting.png new file mode 100644 index 00000000..46f5bf56 Binary files /dev/null and b/src/main/resources/assets/metallics_arts/textures/painting/inquisitor_painting.png differ diff --git a/src/main/resources/assets/metallics_arts/textures/painting/sanfre_painting.png b/src/main/resources/assets/metallics_arts/textures/painting/sanfre_painting.png new file mode 100644 index 00000000..a13bd7dc Binary files /dev/null and b/src/main/resources/assets/metallics_arts/textures/painting/sanfre_painting.png differ 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 8328fb44..9c533ea0 100644 --- a/src/main/resources/data/minecraft/tags/painting_variant/placeable.json +++ b/src/main/resources/data/minecraft/tags/painting_variant/placeable.json @@ -1,21 +1,8 @@ { "values" : [ - "metallics_arts:aluminium_alomantic_painting","metallics_arts:atium_alomantic_painting","metallics_arts:bendalloy_alomantic_painting", - "metallics_arts:brass_alomantic_painting","metallics_arts:bronze_alomantic_painting","metallics_arts:cadmium_alomantic_painting", - "metallics_arts:chromium_alomantic_painting","metallics_arts:copper_alomantic_painting","metallics_arts:duralumin_alomantic_painting", - "metallics_arts:electrum_alomantic_painting","metallics_arts:ettmetal_alomantic_painting","metallics_arts:gold_alomantic_painting", - "metallics_arts:iron_alomantic_painting","metallics_arts:lerasium_alomantic_painting","metallics_arts:malatium_alomantic_painting", - "metallics_arts:nicrosil_alomantic_painting","metallics_arts:pewter_alomantic_painting","metallics_arts:steel_alomantic_painting", - "metallics_arts:tin_alomantic_painting","metallics_arts:zinc_alomantic_painting", + "metallics_arts:sanfre_painting", "metallics_arts:fun_cobber_painting", "metallics_arts:inquisitor_painting" - "metallics_arts:aluminium_feruchemic_painting","metallics_arts:atium_feruchemic_painting","metallics_arts:bendalloy_feruchemic_painting", - "metallics_arts:brass_feruchemic_painting","metallics_arts:bronze_feruchemic_painting","metallics_arts:cadmium_feruchemic_painting", - "metallics_arts:chromium_feruchemic_painting","metallics_arts:copper_feruchemic_painting","metallics_arts:duralumin_feruchemic_painting", - "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:fun_cobber_painting" ] }