From 7657479ccc2d74589447c6ea38272c0b1c1c42c1 Mon Sep 17 00:00:00 2001 From: SammySemicolon <69329424+SammySemicolon@users.noreply.github.com> Date: Fri, 22 Mar 2024 22:44:45 +0100 Subject: [PATCH] Waaaaaaa --- src/generated/resources/assets/malum/lang/en_us.json | 6 +++--- .../resources/data/minecraft/tags/blocks/planks.json | 4 ++++ .../resources/data/minecraft/tags/items/planks.json | 4 ++++ .../sammy/malum/registry/common/block/BlockRegistry.java | 8 ++++---- 4 files changed, 15 insertions(+), 7 deletions(-) diff --git a/src/generated/resources/assets/malum/lang/en_us.json b/src/generated/resources/assets/malum/lang/en_us.json index 2148c1f0e..c1b2b4f71 100644 --- a/src/generated/resources/assets/malum/lang/en_us.json +++ b/src/generated/resources/assets/malum/lang/en_us.json @@ -810,7 +810,7 @@ "malum.gui.book.entry.page.text.crucible_augmentation.1": "The Crucible is a machine of great potential, and through the system I dubbed augmentation, that potential can be brought to even greater heights. Augmentation revolves around augments, simple items made from alchemical calx.", "malum.gui.book.entry.page.text.crucible_augmentation.2": "Each augment provides a unique effect that can be activated by slotting it in either the spirit catalyzer, or up to four in the spirit crucible itself. Using more than one instance of the same augment type works just fine.", "malum.gui.book.entry.page.text.crucible_augmentation.3": "In order to help with augmentation, I have designed a tool known as the Tuning Fork. While held, I will be able to see all the unique attributes of the crucible and it's augments. On top of that, by using the Tuning Fork on the crucible I may choose an attribute to improve, at the cost of other attributes lessening in potency.", - "malum.gui.book.entry.page.text.cthonic_gold.1": "Cthonic Gold is a strange, yet very useful metal. The ore is found deep underground in the deepslate layer of the world, in a small nodule full of gold ore, as if forced together.", + "malum.gui.book.entry.page.text.cthonic_gold.1": "Cthonic Gold is a strange, yet very useful metal. The ore is found deep underground in the deepslate layer of the world, rooted deeply into existing veins of gold ore.", "malum.gui.book.entry.page.text.cthonic_gold.2": "Physically, Cthonic Gold could be described as resembling pyrite, however it is much more dense than one would expect. Furthermore, the metal is filled to the brim with a mix of earthen and infernal arcana, though it doesn't appear to release any of it, ever.", "malum.gui.book.entry.page.text.cthonic_gold.3": "This arcane link of sorts appears to be a deep rooted connection between what is physical, and what is not. The arcana found within the metal appears to have been forced to reside within it for so long that it became near inseparable.", "malum.gui.book.entry.page.text.cthonic_gold.4": "I'm not sure what use this metal bears quite yet, but what I am certain of is that it'll prove itself useful to me in the future.", @@ -961,7 +961,7 @@ "malum.gui.book.entry.page.text.void.belt_of_the_limitless.1": "powerful belt item thing. Doubles ur soulward and also makes it absorb physical damage as well as magical damage.", "malum.gui.book.entry.page.text.void.fused_consciousness.1": "Cool arguably expensive material obtained by throwing the complete design into the weeping well. ", "malum.gui.book.entry.page.text.void.introduction.1": "\"The soul's existence creates the body, as the body's existence then informs the soul. One cannot exist without the other, but could a soul be diminished? Expanded? Bound to a new vessel, leaving a husk in its wake?\"", - "malum.gui.book.entry.page.text.void.introduction.2": "I appear to have stumbled onto an inexplicable new branch of magic, one that is built on the operation of souls. I have seen similar concepts written of, but none fit the mechanics I have now seen at play. My soul itself seems to... stir at these acts of magecraft, shying away, yet eagerly seeking more. If it has not been discovered, I do not think I could consider myself a magus were I to forgo this opportunity.", + "malum.gui.book.entry.page.text.void.introduction.2": "I appear to have stumbled onto an inexplicable new branch of magic, one that is built on the operation of souls. I have seen similar concepts written of, but none fit the mechanics I have now seen at play. My soul itself seems to... $istir/$ at these acts of magecraft, shying away, yet eagerly seeking more. If it has not been discovered, I do not think I could consider myself a magus were I to forgo this opportunity.", "malum.gui.book.entry.page.text.void.mnemonic_fragment.1": "Brilliance Clusters or Chunks when thrown into the weeping well nets you Mnemonic Fragments, a material full of memories turned into matter. Pretend that this description is a lot more cryptic and imagine there being some cool page on the right.", "malum.gui.book.entry.page.text.void.null_slate.1": "Soulstone when thrown into the weeping well nets you null slate, a material suspected to be the true form of soulstone. Pretend that this description is a lot more cryptic and imagine there being some cool page on the right.", "malum.gui.book.entry.page.text.void.ring_of_growing_flesh.1": "The ring will give you a stacking max health buff every time you collect spirits, at full potency doubling your max health. The buff lasts quite a long time.", @@ -1149,7 +1149,7 @@ "malum.gui.ritual.hexing_transmission": "Hexing Transmission", "malum.gui.ritual.idle_mending": "Idle Mending", "malum.gui.ritual.manabound_enhancement": "Manabound Enhancement", - "malum.gui.ritual.marine_spoils": "Marine Spoils", + "malum.gui.ritual.marine_spoil": "Marine Spoil", "malum.gui.ritual.terran_unearthing": "Terran Unearthing", "malum.gui.ritual.tier": "Ritual Tier: ", "malum.gui.ritual.tier.bright": "Bright", diff --git a/src/generated/resources/data/minecraft/tags/blocks/planks.json b/src/generated/resources/data/minecraft/tags/blocks/planks.json index bead932e4..218edff9f 100644 --- a/src/generated/resources/data/minecraft/tags/blocks/planks.json +++ b/src/generated/resources/data/minecraft/tags/blocks/planks.json @@ -2,16 +2,20 @@ "values": [ "malum:rustic_runewood_planks", "malum:rustic_soulwood_planks", + "malum:rustic_runewood_tiles", "malum:vertical_soulwood_planks", "malum:vertical_soulwood_boards", "malum:vertical_runewood_boards", + "malum:rustic_soulwood_tiles", "malum:vertical_runewood_planks", "malum:runewood_boards", + "malum:soulwood_tiles", "malum:cut_soulwood_planks", "malum:soulwood_boards", "malum:cut_runewood_planks", "malum:vertical_rustic_runewood_planks", "malum:runewood_planks", + "malum:runewood_tiles", "malum:soulwood_planks", "malum:vertical_rustic_soulwood_planks" ] diff --git a/src/generated/resources/data/minecraft/tags/items/planks.json b/src/generated/resources/data/minecraft/tags/items/planks.json index bead932e4..218edff9f 100644 --- a/src/generated/resources/data/minecraft/tags/items/planks.json +++ b/src/generated/resources/data/minecraft/tags/items/planks.json @@ -2,16 +2,20 @@ "values": [ "malum:rustic_runewood_planks", "malum:rustic_soulwood_planks", + "malum:rustic_runewood_tiles", "malum:vertical_soulwood_planks", "malum:vertical_soulwood_boards", "malum:vertical_runewood_boards", + "malum:rustic_soulwood_tiles", "malum:vertical_runewood_planks", "malum:runewood_boards", + "malum:soulwood_tiles", "malum:cut_soulwood_planks", "malum:soulwood_boards", "malum:cut_runewood_planks", "malum:vertical_rustic_runewood_planks", "malum:runewood_planks", + "malum:runewood_tiles", "malum:soulwood_planks", "malum:vertical_rustic_soulwood_planks" ] diff --git a/src/main/java/com/sammy/malum/registry/common/block/BlockRegistry.java b/src/main/java/com/sammy/malum/registry/common/block/BlockRegistry.java index ff22bca49..967a8f619 100644 --- a/src/main/java/com/sammy/malum/registry/common/block/BlockRegistry.java +++ b/src/main/java/com/sammy/malum/registry/common/block/BlockRegistry.java @@ -232,11 +232,11 @@ public class BlockRegistry { public static final RegistryObject VERTICAL_RUSTIC_RUNEWOOD_PLANKS_SLAB = BLOCKS.register("vertical_rustic_runewood_planks_slab", () -> new SlabBlock(MalumBlockProperties.RUNEWOOD().addTags(SLABS, WOODEN_SLABS))); public static final RegistryObject VERTICAL_RUSTIC_RUNEWOOD_PLANKS_STAIRS = BLOCKS.register("vertical_rustic_runewood_planks_stairs", () -> new StairBlock(() -> VERTICAL_RUSTIC_RUNEWOOD_PLANKS.get().defaultBlockState(), MalumBlockProperties.RUNEWOOD().addTags(STAIRS, WOODEN_STAIRS))); - public static final RegistryObject RUNEWOOD_TILES = BLOCKS.register("runewood_tiles", () -> new Block(MalumBlockProperties.RUNEWOOD())); + public static final RegistryObject RUNEWOOD_TILES = BLOCKS.register("runewood_tiles", () -> new Block(MalumBlockProperties.RUNEWOOD().addTags(PLANKS))); public static final RegistryObject RUNEWOOD_TILES_SLAB = BLOCKS.register("runewood_tiles_slab", () -> new SlabBlock(MalumBlockProperties.RUNEWOOD().addTags(SLABS, WOODEN_SLABS))); public static final RegistryObject RUNEWOOD_TILES_STAIRS = BLOCKS.register("runewood_tiles_stairs", () -> new StairBlock(() -> RUNEWOOD_TILES.get().defaultBlockState(), MalumBlockProperties.RUNEWOOD().addTags(STAIRS, WOODEN_STAIRS))); - public static final RegistryObject RUSTIC_RUNEWOOD_TILES = BLOCKS.register("rustic_runewood_tiles", () -> new Block(MalumBlockProperties.RUNEWOOD())); + public static final RegistryObject RUSTIC_RUNEWOOD_TILES = BLOCKS.register("rustic_runewood_tiles", () -> new Block(MalumBlockProperties.RUNEWOOD().addTags(PLANKS))); public static final RegistryObject RUSTIC_RUNEWOOD_TILES_SLAB = BLOCKS.register("rustic_runewood_tiles_slab", () -> new SlabBlock(MalumBlockProperties.RUNEWOOD().addTags(SLABS, WOODEN_SLABS))); public static final RegistryObject RUSTIC_RUNEWOOD_TILES_STAIRS = BLOCKS.register("rustic_runewood_tiles_stairs", () -> new StairBlock(() -> RUSTIC_RUNEWOOD_TILES.get().defaultBlockState(), MalumBlockProperties.RUNEWOOD().addTags(STAIRS, WOODEN_STAIRS))); @@ -299,11 +299,11 @@ public class BlockRegistry { public static final RegistryObject VERTICAL_RUSTIC_SOULWOOD_PLANKS_SLAB = BLOCKS.register("vertical_rustic_soulwood_planks_slab", () -> new SlabBlock(MalumBlockProperties.SOULWOOD().addTags(SLABS, WOODEN_SLABS))); public static final RegistryObject VERTICAL_RUSTIC_SOULWOOD_PLANKS_STAIRS = BLOCKS.register("vertical_rustic_soulwood_planks_stairs", () -> new StairBlock(() -> VERTICAL_RUSTIC_SOULWOOD_PLANKS.get().defaultBlockState(), MalumBlockProperties.SOULWOOD().addTags(STAIRS, WOODEN_STAIRS))); - public static final RegistryObject SOULWOOD_TILES = BLOCKS.register("soulwood_tiles", () -> new Block(MalumBlockProperties.SOULWOOD())); + public static final RegistryObject SOULWOOD_TILES = BLOCKS.register("soulwood_tiles", () -> new Block(MalumBlockProperties.SOULWOOD().addTags(PLANKS))); public static final RegistryObject SOULWOOD_TILES_SLAB = BLOCKS.register("soulwood_tiles_slab", () -> new SlabBlock(MalumBlockProperties.SOULWOOD().addTags(SLABS, WOODEN_SLABS))); public static final RegistryObject SOULWOOD_TILES_STAIRS = BLOCKS.register("soulwood_tiles_stairs", () -> new StairBlock(() -> SOULWOOD_TILES.get().defaultBlockState(), MalumBlockProperties.SOULWOOD().addTags(STAIRS, WOODEN_STAIRS))); - public static final RegistryObject RUSTIC_SOULWOOD_TILES = BLOCKS.register("rustic_soulwood_tiles", () -> new Block(MalumBlockProperties.SOULWOOD())); + public static final RegistryObject RUSTIC_SOULWOOD_TILES = BLOCKS.register("rustic_soulwood_tiles", () -> new Block(MalumBlockProperties.SOULWOOD().addTags(PLANKS))); public static final RegistryObject RUSTIC_SOULWOOD_TILES_SLAB = BLOCKS.register("rustic_soulwood_tiles_slab", () -> new SlabBlock(MalumBlockProperties.SOULWOOD().addTags(SLABS, WOODEN_SLABS))); public static final RegistryObject RUSTIC_SOULWOOD_TILES_STAIRS = BLOCKS.register("rustic_soulwood_tiles_stairs", () -> new StairBlock(() -> RUSTIC_SOULWOOD_TILES.get().defaultBlockState(), MalumBlockProperties.SOULWOOD().addTags(STAIRS, WOODEN_STAIRS)));