More Runelang

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**

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

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Ɐ",

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",

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"
+  }
+}

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"
+  }
+}

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"
+  }
+}

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"
+  }
+}

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"
+  }
+}

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<ComponentItem> 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<ComponentItem> 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<ComponentItem> 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<ComponentItem> 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<ComponentItem> 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
 
 

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();
+    }
+
+
+
+}

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.");

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);
+            }
+        }
+    }
 
 }

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"