From b1b0a1cfdb74fdcd588c538a78381a5c6008f46d Mon Sep 17 00:00:00 2001 From: Ghostipedia Date: Thu, 2 Jan 2025 15:38:26 -0500 Subject: [PATCH] More Runelang --- changelog.md | 4 +- gradle.properties | 2 +- .../assets/cosmiccore/lang/en_ud.json | 22 ++++++- .../assets/cosmiccore/lang/en_us.json | 22 ++++++- .../item/rune_conjunction_arklythar.json | 6 ++ .../models/item/rune_conjunction_kholys.json | 6 ++ .../item/rune_conjunction_valkruth.json | 6 ++ .../models/item/rune_slate_tenura.json | 6 ++ .../models/item/rune_slate_valdris.json | 6 ++ .../cosmiccore/common/data/CosmicItems.java | 58 ++++++++++++++++++ .../events/EndPortalInteractionEvent.java | 24 ++++++++ .../common/data/lang/CosmicLangHandler.java | 20 ++++++ .../attribute/FireResApplicator.java | 8 +++ src/main/resources/META-INF/mods.toml | 10 ++- .../item/rune_conjunction_arklythar.png | Bin 0 -> 377 bytes .../textures/item/rune_conjunction_kholys.png | Bin 0 -> 367 bytes .../item/rune_conjunction_valkruth.png | Bin 0 -> 379 bytes .../textures/item/rune_slate_tenura.png | Bin 0 -> 289 bytes .../textures/item/rune_slate_valdris.png | Bin 0 -> 331 bytes 19 files changed, 194 insertions(+), 6 deletions(-) create mode 100644 src/generated/resources/assets/cosmiccore/models/item/rune_conjunction_arklythar.json create mode 100644 src/generated/resources/assets/cosmiccore/models/item/rune_conjunction_kholys.json create mode 100644 src/generated/resources/assets/cosmiccore/models/item/rune_conjunction_valkruth.json create mode 100644 src/generated/resources/assets/cosmiccore/models/item/rune_slate_tenura.json create mode 100644 src/generated/resources/assets/cosmiccore/models/item/rune_slate_valdris.json create mode 100644 src/main/java/com/ghostipedia/cosmiccore/common/data/events/EndPortalInteractionEvent.java create mode 100644 src/main/resources/assets/cosmiccore/textures/item/rune_conjunction_arklythar.png create mode 100644 src/main/resources/assets/cosmiccore/textures/item/rune_conjunction_kholys.png create mode 100644 src/main/resources/assets/cosmiccore/textures/item/rune_conjunction_valkruth.png create mode 100644 src/main/resources/assets/cosmiccore/textures/item/rune_slate_tenura.png create mode 100644 src/main/resources/assets/cosmiccore/textures/item/rune_slate_valdris.png diff --git a/changelog.md b/changelog.md index c241869..84f08ca 100644 --- a/changelog.md +++ b/changelog.md @@ -1,4 +1,4 @@ -# Cosmic Core 0.5.1 -* Fix Heat Res Attribute Not Setting back to 0 Properly for potions. +# Cosmic Core 0.5.3 +* Heat Resistance Modifier to Fire pots now properly removed upon clearing the effect with heal/milk/etc # DO NOT MANUALLY UPDATE COSMIC CORE FOR FRONTIERS **I WILL NOT WORK** \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 9706fde..213bf53 100644 --- a/gradle.properties +++ b/gradle.properties @@ -17,7 +17,7 @@ parchment_mappings=2023.09.03 quilt_mappings=23 # Mod Properties -mod_version=0.5.2 +mod_version=0.5.3 maven_group=com.ghostipedia.frontiers archives_base_name=cosmic-core mod_id=cosmiccore diff --git a/src/generated/resources/assets/cosmiccore/lang/en_ud.json b/src/generated/resources/assets/cosmiccore/lang/en_ud.json index ed8ce60..316c8d2 100644 --- a/src/generated/resources/assets/cosmiccore/lang/en_ud.json +++ b/src/generated/resources/assets/cosmiccore/lang/en_ud.json @@ -88,7 +88,7 @@ "block.gtceu.lp_steam_bender": "ʇsıxƎ ʎןןɐnʇɔⱯ ʇ,uoᗡ I", "block.gtceu.lp_steam_wiremill": "ʇsıxƎ ʎןןɐnʇɔⱯ ʇ,uoᗡ I", "block.gtceu.luv_naquahine_mini_reactor": "ɹ§ɹoʇɔɐǝᴚ ǝuıɥɐnbɐN oɹɔıW pǝɔuɐʌpⱯp§", - "block.gtceu.steam_caster": "ɹǝןqɯǝssⱯ ǝɹnssǝɹԀ ɥbıH", + "block.gtceu.steam_caster": "ɹǝıɟıpıןoS ɹǝʇsɐƆ ɯɐǝʇS", "block.gtceu.steam_fluid_input_hatch": ")ɯɐǝʇS( ɥɔʇɐH ʇnduI", "block.gtceu.steam_fluid_output_hatch": ")ɯɐǝʇS( ɥɔʇɐH ʇndʇnO", "block.gtceu.steam_mixing_vessel": "ןǝssǝΛ buıxıW ɯɐǝʇS ǝbɹɐꞀ9§", @@ -97,6 +97,15 @@ "block.gtceu.zpm_naquahine_mini_reactor": "ɹ§ɹoʇɔɐǝᴚ ǝuıɥɐnbɐN oɹɔıW ǝʇıןƎɔ§", "cosmiccore.arklys.1": "ǝɹnʇɔnɹʇS - ʞɹⱯ9§", "cosmiccore.arklys.2": "ǝsɐǝןǝᴚ - sʎꞀ9§", + "cosmiccore.conjuct_arklythar.1": "ǝɹnʇɔnɹʇS - ʞɹⱯ9§", + "cosmiccore.conjuct_arklythar.2": "ǝbɹoℲ - ɹɐɥ⟘9§", + "cosmiccore.conjuct_arklythar_emotion.1": "ǝʌןosǝᴚ - Ɐ˙ᴚ˙Ǝq§", + "cosmiccore.conjuct_kholys.1": "ǝɔɐdS - ɹoɥʞ9§", + "cosmiccore.conjuct_kholys.2": "ǝsɐǝןǝᴚ - sʎꞀ9§", + "cosmiccore.conjuct_kholys_emotion.1": "ǝɔuǝpıɟuoƆ - Ɐ˙ᴚ˙Ǝq§", + "cosmiccore.conjuct_valkruth.1": "buıɯןǝɥʍɹǝʌO - ןɐΛ9§", + "cosmiccore.conjuct_valkruth.2": "uoıʇɐpunoℲ - ɥʇnᴚ9§", + "cosmiccore.conjuct_valkruth_emotion.1": "ǝɔuǝbɹǝʌuoƆ - Ɐ˙ᴚ˙Ǝq§", "cosmiccore.khoruth.1": "ǝɔɐdS - ɹoɥʞ9§", "cosmiccore.khoruth.2": "uoıʇɐpunoℲ - ɥʇnᴚ9§", "cosmiccore.lore.shard_huge.0": "˙ʎʇıuɹǝʇǝ ʇsɐd ɯoɹɟ ɹǝʇsnןɔ ǝʌıssɐɯ ʎןןɐɯɹouqɐ uⱯƐ§", @@ -145,9 +154,15 @@ "cosmiccore.recipe.minField": "⟘%s :ɥʇbuǝɹʇS pןǝıℲ ˙uıWɟ§", "cosmiccore.recipe.soulIn": "%s :ʇnduI ןnoS", "cosmiccore.recipe.soulOut": "%s :ʇndʇnO ןnoS", + "cosmiccore.rune_emotion_weak.1": "˙pǝʌɹǝsqo sı uoıʇɔɐǝɹ ⱯᴚƎ ǝʇǝןdɯoɔuı uⱯo§ㄥ§", + "cosmiccore.rune_emotion_weak.2": "˙ǝʇɐɹqıʌ oʇ ǝʇɐןs ǝɥʇ ǝsnɐɔ suoıʇɔɐǝɹ ןɐɔıɯǝɥɔ puɐ ןɐuoıʇoɯǝ buoɹʇS§ㄥ§", "cosmiccore.rune_vague": "˙buıssıɯ ǝq oʇ ɯǝǝs suoıʇoɯǝ ʇuǝʇɐꞀo§ㄥ§", + "cosmiccore.tenura.1": "ןoɹʇuoƆ - uǝ⟘9§", + "cosmiccore.tenura.2": "ʍoןℲ - ɐɹ∩9§", "cosmiccore.tylomir.1": "uoıʇɐɯɹoℲ - oןʎ⟘9§", "cosmiccore.tylomir.2": "pןɹoM - ɹıW9§", + "cosmiccore.valdris.1": "ɯןǝɥʍɹǝʌO - ןɐΛ9§", + "cosmiccore.valdris.2": "ʇɔǝuuoƆ - sıɹᗡ9§", "cosmiccore.wire_coil.eu_multiplier": "ʇ/∩Ǝ %sɔ§ :ʇsoƆ ∩Ǝ ʇǝubɐWɐ§ ", "cosmiccore.wire_coil.magnet_capacity": "ɐןsǝ⟘ %sɟ§ :ɥʇbuǝɹʇS pןǝıℲ xɐWɟ§ ", "cosmiccore.wire_coil.magnet_regen": "ʇ/ɐןsǝ⟘ %s :ǝʇɐᴚ uǝbǝᴚ pןǝıℲϛ§ ", @@ -223,9 +238,14 @@ "item.cosmiccore.psionic_processor_assembly": "ʎןqɯǝssⱯ ɹossǝɔoɹԀ ɔıuoısԀ", "item.cosmiccore.psionic_processor_mainframe": "ǝɯɐɹɟuıɐW ɹossǝɔoɹԀ ɔıuoısԀ", "item.cosmiccore.psionic_processor_supercomputer": "ɹǝʇndɯoɔɹǝdnS ɹossǝɔoɹԀ ɔıuoısԀ", + "item.cosmiccore.rune_conjunction_arklythar": "]ɹɐɥʇʎןʞɹⱯ[ uoıʇɔunظuoƆ ǝunᴚ", + "item.cosmiccore.rune_conjunction_kholys": "]sʎןoɥʞ[ uoıʇɔunظuoƆ ǝunᴚ", + "item.cosmiccore.rune_conjunction_valkruth": "]ɥʇnɹʞןɐΛ[ uoıʇɔunظuoƆ ǝunᴚ", "item.cosmiccore.rune_slate_arklys": "]sʎןʞɹⱯ[ ǝʇɐןS ǝunᴚ", "item.cosmiccore.rune_slate_khoruth": "]ɥʇnɹoɥʞ[ ǝʇɐןS ǝunᴚ", + "item.cosmiccore.rune_slate_tenura": "]ɐɹnuǝ⟘[ ǝʇɐןS ǝunᴚ", "item.cosmiccore.rune_slate_tylomir": "]ɹıɯoןʎ⟘[ ǝʇɐןS ǝunᴚ", + "item.cosmiccore.rune_slate_valdris": "]ɐɹnuǝ⟘[ ǝʇɐןS ǝunᴚ", "item.cosmiccore.rune_slate_zelothar": "]ɹɐɥʇoןǝZ[ ǝʇɐןS ǝunᴚ", "item.cosmiccore.shard_of_perpetuity": "ʎʇınʇǝdɹǝԀ ɟo pɹɐɥS", "item.cosmiccore.sov_blood_orb": "qɹO pooןᗺ ʇuɐpuǝɔsⱯ", diff --git a/src/generated/resources/assets/cosmiccore/lang/en_us.json b/src/generated/resources/assets/cosmiccore/lang/en_us.json index 1989c6b..2033838 100644 --- a/src/generated/resources/assets/cosmiccore/lang/en_us.json +++ b/src/generated/resources/assets/cosmiccore/lang/en_us.json @@ -88,7 +88,7 @@ "block.gtceu.lp_steam_bender": "I Don't Actually Exist", "block.gtceu.lp_steam_wiremill": "I Don't Actually Exist", "block.gtceu.luv_naquahine_mini_reactor": "§dAdvanced Micro Naquahine Reactor§r", - "block.gtceu.steam_caster": "High Pressure Assembler", + "block.gtceu.steam_caster": "Steam Caster Solidifier", "block.gtceu.steam_fluid_input_hatch": "Input Hatch (Steam)", "block.gtceu.steam_fluid_output_hatch": "Output Hatch (Steam)", "block.gtceu.steam_mixing_vessel": "§6Large Steam Mixing Vessel", @@ -97,6 +97,15 @@ "block.gtceu.zpm_naquahine_mini_reactor": "§cElite Micro Naquahine Reactor§r", "cosmiccore.arklys.1": "§6Ark - Structure", "cosmiccore.arklys.2": "§6Lys - Release", + "cosmiccore.conjuct_arklythar.1": "§6Ark - Structure", + "cosmiccore.conjuct_arklythar.2": "§6Thar - Forge", + "cosmiccore.conjuct_arklythar_emotion.1": "§bE.R.A - Resolve", + "cosmiccore.conjuct_kholys.1": "§6Khor - Space", + "cosmiccore.conjuct_kholys.2": "§6Lys - Release", + "cosmiccore.conjuct_kholys_emotion.1": "§bE.R.A - Confidence", + "cosmiccore.conjuct_valkruth.1": "§6Val - Overwhelming", + "cosmiccore.conjuct_valkruth.2": "§6Ruth - Foundation", + "cosmiccore.conjuct_valkruth_emotion.1": "§bE.R.A - Convergence", "cosmiccore.khoruth.1": "§6Khor - Space", "cosmiccore.khoruth.2": "§6Ruth - Foundation", "cosmiccore.lore.shard_huge.0": "§3An abnormally massive cluster from past eternity.", @@ -145,9 +154,15 @@ "cosmiccore.recipe.minField": "§fMin. Field Strength: %sT", "cosmiccore.recipe.soulIn": "Soul Input: %s", "cosmiccore.recipe.soulOut": "Soul Output: %s", + "cosmiccore.rune_emotion_weak.1": "§7§oAn incomplete ERA reaction is observed.", + "cosmiccore.rune_emotion_weak.2": "§7§Strong emotional and chemical reactions cause the slate to vibrate.", "cosmiccore.rune_vague": "§7§oLatent emotions seem to be missing.", + "cosmiccore.tenura.1": "§6Ten - Control", + "cosmiccore.tenura.2": "§6Ura - Flow", "cosmiccore.tylomir.1": "§6Tylo - Formation", "cosmiccore.tylomir.2": "§6Mir - World", + "cosmiccore.valdris.1": "§6Val - Overwhelm", + "cosmiccore.valdris.2": "§6Dris - Connect", "cosmiccore.wire_coil.eu_multiplier": " §aMagnet EU Cost: §c%s EU/t", "cosmiccore.wire_coil.magnet_capacity": " §fMax Field Strength: §f%s Tesla", "cosmiccore.wire_coil.magnet_regen": " §5Field Regen Rate: %s Tesla/t", @@ -223,9 +238,14 @@ "item.cosmiccore.psionic_processor_assembly": "Psionic Processor Assembly", "item.cosmiccore.psionic_processor_mainframe": "Psionic Processor Mainframe", "item.cosmiccore.psionic_processor_supercomputer": "Psionic Processor Supercomputer", + "item.cosmiccore.rune_conjunction_arklythar": "Rune Conjunction [Arklythar]", + "item.cosmiccore.rune_conjunction_kholys": "Rune Conjunction [Kholys]", + "item.cosmiccore.rune_conjunction_valkruth": "Rune Conjunction [Valkruth]", "item.cosmiccore.rune_slate_arklys": "Rune Slate [Arklys]", "item.cosmiccore.rune_slate_khoruth": "Rune Slate [Khoruth]", + "item.cosmiccore.rune_slate_tenura": "Rune Slate [Tenura]", "item.cosmiccore.rune_slate_tylomir": "Rune Slate [Tylomir]", + "item.cosmiccore.rune_slate_valdris": "Rune Slate [Tenura]", "item.cosmiccore.rune_slate_zelothar": "Rune Slate [Zelothar]", "item.cosmiccore.shard_of_perpetuity": "Shard of Perpetuity", "item.cosmiccore.sov_blood_orb": "Ascendant Blood Orb", diff --git a/src/generated/resources/assets/cosmiccore/models/item/rune_conjunction_arklythar.json b/src/generated/resources/assets/cosmiccore/models/item/rune_conjunction_arklythar.json new file mode 100644 index 0000000..3a45be8 --- /dev/null +++ b/src/generated/resources/assets/cosmiccore/models/item/rune_conjunction_arklythar.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "cosmiccore:item/rune_conjunction_arklythar" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/cosmiccore/models/item/rune_conjunction_kholys.json b/src/generated/resources/assets/cosmiccore/models/item/rune_conjunction_kholys.json new file mode 100644 index 0000000..f046b37 --- /dev/null +++ b/src/generated/resources/assets/cosmiccore/models/item/rune_conjunction_kholys.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "cosmiccore:item/rune_conjunction_kholys" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/cosmiccore/models/item/rune_conjunction_valkruth.json b/src/generated/resources/assets/cosmiccore/models/item/rune_conjunction_valkruth.json new file mode 100644 index 0000000..0b9164a --- /dev/null +++ b/src/generated/resources/assets/cosmiccore/models/item/rune_conjunction_valkruth.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "cosmiccore:item/rune_conjunction_valkruth" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/cosmiccore/models/item/rune_slate_tenura.json b/src/generated/resources/assets/cosmiccore/models/item/rune_slate_tenura.json new file mode 100644 index 0000000..32b4ccb --- /dev/null +++ b/src/generated/resources/assets/cosmiccore/models/item/rune_slate_tenura.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "cosmiccore:item/rune_slate_tenura" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/cosmiccore/models/item/rune_slate_valdris.json b/src/generated/resources/assets/cosmiccore/models/item/rune_slate_valdris.json new file mode 100644 index 0000000..8f1c43d --- /dev/null +++ b/src/generated/resources/assets/cosmiccore/models/item/rune_slate_valdris.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "cosmiccore:item/rune_slate_valdris" + } +} \ No newline at end of file diff --git a/src/main/java/com/ghostipedia/cosmiccore/common/data/CosmicItems.java b/src/main/java/com/ghostipedia/cosmiccore/common/data/CosmicItems.java index 6687536..7d6f2f7 100644 --- a/src/main/java/com/ghostipedia/cosmiccore/common/data/CosmicItems.java +++ b/src/main/java/com/ghostipedia/cosmiccore/common/data/CosmicItems.java @@ -633,6 +633,64 @@ public boolean isFoil(ItemStack stack) { }))) .defaultModel() .register(); + public static final ItemEntry RUNE_SLATE_TENURA = REGISTRATE.item("rune_slate_tenura", ComponentItem::create) + .lang("Rune Slate [Tenura]") + .properties(p -> p.stacksTo(64)) + .onRegister(attach(new TooltipBehavior(tooltips -> { + tooltips.add(Component.translatable("cosmiccore.tenura.1")); + tooltips.add(Component.translatable("cosmiccore.tenura.2")); + tooltips.add(Component.translatable("cosmiccore.rune_vague")); + }))) + .defaultModel() + .register(); + + public static final ItemEntry RUNE_SLATE_VALDRIS = REGISTRATE.item("rune_slate_valdris", ComponentItem::create) + .lang("Rune Slate [Tenura]") + .properties(p -> p.stacksTo(64)) + .onRegister(attach(new TooltipBehavior(tooltips -> { + tooltips.add(Component.translatable("cosmiccore.valdris.1")); + tooltips.add(Component.translatable("cosmiccore.valdris.2")); + tooltips.add(Component.translatable("cosmiccore.rune_vague")); + }))) + .defaultModel() + .register(); + + public static final ItemEntry RUNE_CONJUNCTION_VALKRUTH = REGISTRATE.item("rune_conjunction_valkruth", ComponentItem::create) + .lang("Rune Conjunction [Valkruth]") + .properties(p -> p.stacksTo(64)) + .onRegister(attach(new TooltipBehavior(tooltips -> { + tooltips.add(Component.translatable("cosmiccore.conjuct_valkruth.1")); + tooltips.add(Component.translatable("cosmiccore.conjuct_valkruth.2")); + tooltips.add(Component.translatable("cosmiccore.conjuct_valkruth_emotion.1")); + tooltips.add(Component.translatable("cosmiccore.rune_emotion_weak.1")); + }))) + .defaultModel() + .register(); + + public static final ItemEntry RUNE_CONJUNCTION_KHOLYS = REGISTRATE.item("rune_conjunction_kholys", ComponentItem::create) + .lang("Rune Conjunction [Kholys]") + .properties(p -> p.stacksTo(64)) + .onRegister(attach(new TooltipBehavior(tooltips -> { + tooltips.add(Component.translatable("cosmiccore.conjuct_kholys.1")); + tooltips.add(Component.translatable("cosmiccore.conjuct_kholys.2")); + tooltips.add(Component.translatable("cosmiccore.conjuct_kholys_emotion.1")); + tooltips.add(Component.translatable("cosmiccore.rune_emotion_weak.1")); + }))) + .defaultModel() + .register(); + + public static final ItemEntry RUNE_CONJUNCTION_ARKLYTHAR = REGISTRATE.item("rune_conjunction_arklythar", ComponentItem::create) + .lang("Rune Conjunction [Arklythar]") + .properties(p -> p.stacksTo(64)) + .onRegister(attach(new TooltipBehavior(tooltips -> { + tooltips.add(Component.translatable("cosmiccore.conjuct_arklythar.1")); + tooltips.add(Component.translatable("cosmiccore.conjuct_arklythar.2")); + tooltips.add(Component.translatable("cosmiccore.conjuct_arklythar_emotion.1")); + tooltips.add(Component.translatable("cosmiccore.rune_emotion_weak.1")); + tooltips.add(Component.translatable("cosmiccore.rune_emotion_weak.2")); + }))) + .defaultModel() + .register(); //Thermal Related Things for LSO diff --git a/src/main/java/com/ghostipedia/cosmiccore/common/data/events/EndPortalInteractionEvent.java b/src/main/java/com/ghostipedia/cosmiccore/common/data/events/EndPortalInteractionEvent.java new file mode 100644 index 0000000..0e973fd --- /dev/null +++ b/src/main/java/com/ghostipedia/cosmiccore/common/data/events/EndPortalInteractionEvent.java @@ -0,0 +1,24 @@ +package com.ghostipedia.cosmiccore.common.data.events; + +import com.ghostipedia.cosmiccore.CosmicCore; +import dev.architectury.event.events.common.InteractionEvent; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.Items; +import net.minecraft.world.level.block.Blocks; +import net.minecraftforge.event.entity.player.PlayerInteractEvent; +import net.minecraftforge.eventbus.api.SubscribeEvent; +import net.minecraftforge.fml.common.Mod; + +@Mod.EventBusSubscriber(modid = CosmicCore.MOD_ID, bus = Mod.EventBusSubscriber.Bus.FORGE) +public class EndPortalInteractionEvent { + + @SubscribeEvent + public static void denyRightClick(PlayerInteractEvent event){ + var player = event.getEntity(); + var level = event.getLevel(); + var hand = event.getHand(); + } + + + +} diff --git a/src/main/java/com/ghostipedia/cosmiccore/common/data/lang/CosmicLangHandler.java b/src/main/java/com/ghostipedia/cosmiccore/common/data/lang/CosmicLangHandler.java index 205e65d..a0079ad 100644 --- a/src/main/java/com/ghostipedia/cosmiccore/common/data/lang/CosmicLangHandler.java +++ b/src/main/java/com/ghostipedia/cosmiccore/common/data/lang/CosmicLangHandler.java @@ -100,6 +100,8 @@ public static void init(RegistrateLangProvider provider) { replace(provider,"block.gtceu.lp_steam_wiremill", "I Don't Actually Exist"); //Rune Lang replace(provider,"cosmiccore.rune_vague", "§7§oLatent emotions seem to be missing."); + replace(provider,"cosmiccore.rune_emotion_weak.1", "§7§oAn incomplete ERA reaction is observed."); + replace(provider,"cosmiccore.rune_emotion_weak.2", "§7§Strong emotional and chemical reactions cause the slate to vibrate."); replace(provider,"cosmiccore.arklys.1", "§6Ark - Structure"); replace(provider,"cosmiccore.arklys.2", "§6Lys - Release"); @@ -112,6 +114,24 @@ public static void init(RegistrateLangProvider provider) { replace(provider,"cosmiccore.zelothar.1", "§6Zelos - Zeal"); replace(provider,"cosmiccore.zelothar.2", "§6Thar - Forge"); + replace(provider,"cosmiccore.tenura.1", "§6Ten - Control"); + replace(provider,"cosmiccore.tenura.2", "§6Ura - Flow"); + + replace(provider,"cosmiccore.valdris.1", "§6Val - Overwhelm"); + replace(provider,"cosmiccore.valdris.2", "§6Dris - Connect"); + + replace(provider,"cosmiccore.conjuct_kholys.1", "§6Khor - Space"); + replace(provider,"cosmiccore.conjuct_kholys.2", "§6Lys - Release"); + replace(provider,"cosmiccore.conjuct_kholys_emotion.1", "§bE.R.A - Confidence"); + + replace(provider,"cosmiccore.conjuct_arklythar.1", "§6Ark - Structure"); + replace(provider,"cosmiccore.conjuct_arklythar.2", "§6Thar - Forge"); + replace(provider,"cosmiccore.conjuct_arklythar_emotion.1", "§bE.R.A - Resolve"); + + replace(provider,"cosmiccore.conjuct_valkruth.1", "§6Val - Overwhelming"); + replace(provider,"cosmiccore.conjuct_valkruth.2", "§6Ruth - Foundation"); + replace(provider,"cosmiccore.conjuct_valkruth_emotion.1", "§bE.R.A - Convergence"); + replace(provider,"item.cosmiccore.the_one_ring.tooltip.0", "§6§oOne Ring to rule them all, One Ring to find them, One Ring to bring them all and in the darkness bind them.§r"); replace(provider,"item.cosmiccore.the_one_ring.tooltip.1", "You might find it hard to take off."); diff --git a/src/main/java/com/ghostipedia/cosmiccore/common/data/temperature/attribute/FireResApplicator.java b/src/main/java/com/ghostipedia/cosmiccore/common/data/temperature/attribute/FireResApplicator.java index b6721ca..77c42d3 100644 --- a/src/main/java/com/ghostipedia/cosmiccore/common/data/temperature/attribute/FireResApplicator.java +++ b/src/main/java/com/ghostipedia/cosmiccore/common/data/temperature/attribute/FireResApplicator.java @@ -32,5 +32,13 @@ public static void onPotionEffect(MobEffectEvent.Expired event) { } } + @SubscribeEvent + public static void onPotionEffect(MobEffectEvent.Remove event) { + if (event.getEntity() instanceof Player player) { + if (event.getEffectInstance() != null && event.getEffectInstance().getEffect() == MobEffects.FIRE_RESISTANCE) { + TemperatureUtil.internal.addHeatResistanceModifier(player, 0.0, heatResModifierID); + } + } + } } diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index bfdc09e..191e1d1 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -60,6 +60,14 @@ side = "BOTH" [[dependencies.cosmiccore]] modId="gtceu" mandatory=true -versionRange="[1.2.2,)" +versionRange="[1.5.0,)" ordering="AFTER" +side="BOTH" + + +[[dependencies.cosmiccore]] +modId="legendarysurvivaloverhaul" +mandatory=true +versionRange="[1.20.1-1.20.1-2.0.15,)" +ordering="BEFORE" side="BOTH" \ No newline at end of file diff --git a/src/main/resources/assets/cosmiccore/textures/item/rune_conjunction_arklythar.png b/src/main/resources/assets/cosmiccore/textures/item/rune_conjunction_arklythar.png new file mode 100644 index 0000000000000000000000000000000000000000..9c0e4e5117df4f91be879f7ae731310e750f7d76 GIT binary patch literal 377 zcmV-<0fzpGP)LQ$0_^Fc5u46%dCsY7;`N;19yGUQLB3x4tgd5uysES5 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/cosmiccore/textures/item/rune_conjunction_kholys.png b/src/main/resources/assets/cosmiccore/textures/item/rune_conjunction_kholys.png new file mode 100644 index 0000000000000000000000000000000000000000..93f89d4f5939c81d7d31368221c4dca674dbd030 GIT binary patch literal 367 zcmV-#0g(QQP)LQ_F6HFc2J95e5@L38|`bD^fY-tNH`n@)6wlwxX({ z61{Os4uRkR7xxg^F(I!ibMbmtGaj$KL0bDp37%R zad-{w#}gq0Ear*D^UKY*z9mFXqs6@cjwRXiEy$ze{0B-Lb&D3YZ*Kqq N002ovPDHLkV1i)~m!$vz literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/cosmiccore/textures/item/rune_conjunction_valkruth.png b/src/main/resources/assets/cosmiccore/textures/item/rune_conjunction_valkruth.png new file mode 100644 index 0000000000000000000000000000000000000000..7b887fa29dbac0ff34d462740b33e8dcc6629cd9 GIT binary patch literal 379 zcmV->0fhdEP)Llf6!aKoo_~m<>NOvSgPvCU%-w7z+z~YhTD0u(P7G z^QEHNR1n3!ls1;sAQEYOU_$}F%zNcL2d%)Q?|Id_H#A#jW))j_AGpp=bnOyY=0 zfKE+ud3BB1+!_tA78fFkBO)E7>3Xn1Q8jsHZ141>U1a+X!oURp*uDeXcK`rok>kaE zh4=o}023hubZUyl**OejDkqgi4gd%P7dN-}ji%Y$!q?{qk~ks<4%$%X$}pz*{rSe0uXX@n_a8@!0TM7|4sz#{SU zrQK(zJzPG2wl-zXiayN6;dIMfGC<(ceGwV|=bci~Jm)l)I)sW{lV^|SJ8(dvMc~5O jYuV>F&O8xhy`S;Sy0`=FMt15z?=g6~`njxgN@xNAgac|g literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/cosmiccore/textures/item/rune_slate_valdris.png b/src/main/resources/assets/cosmiccore/textures/item/rune_slate_valdris.png new file mode 100644 index 0000000000000000000000000000000000000000..3226906e324f473c76947422b4cdd784fa342a59 GIT binary patch literal 331 zcmV-R0kr;!P)LlTB;FKoEwXl%k1;3XPXaDYPKeN)hy?c=exqjNl>U zP^f2HKd6!zy^N;~Nt_j>FDxv>&NJ`s&Nw2%e{^3C_>HEOm?Saje(U6m765*uDeoVj z)@qyeiuw1K0FKoGKpe-}{&+|Ms8n5cyY1Q8I}I?KPB82tX7DL}36x zyVF+z>J>~ilN5!)Z2;S0RU(qDNB>C%qp<+e?(_vH?4Ms+;(8B~&#^kVWIHeQ5%Uo9 zh&HJXDpi-+bW(88?G0Hif3A0+eWj*CUwgH>yuP*6jx$>RF4!l3St~o`Y4mFKi{n`y drZd2;Isr{sf^wLP$U6W4002ovPDHLkV1lQuiKYMm literal 0 HcmV?d00001