From 50d98dcf38b220c8d3c0044f303e960cead916aa Mon Sep 17 00:00:00 2001 From: bconlon Date: Thu, 26 Sep 2024 12:46:46 -0700 Subject: [PATCH] fix: block registry shouldnt use aether id --- .../.cache/4a70f41dffa39a8e1b615a62c7953f67790ad695 | 4 ++-- .../.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d | 6 +++--- .../.cache/6b5b4c408837c58a7ba25a66c36556a3bba26add | 6 +++--- .../.cache/f6a74cd8da2df68a12670b9fea0a3123992a1ca1 | 8 ++++---- .../blockstates/pyral_block.json | 0 .../blockstates/valkyrum_block.json | 0 .../assets/aether_treasure_reforging/lang/en_us.json | 8 ++++---- .../loot_tables/blocks/pyral_block.json | 2 +- .../loot_tables/blocks/valkyrum_block.json | 2 +- .../resources/data/forge/tags/blocks/storage_blocks.json | 4 ++-- .../data/minecraft/tags/blocks/mineable/pickaxe.json | 4 ++-- .../data/minecraft/tags/blocks/needs_iron_tool.json | 4 ++-- .../treasure_reforging/block/ReforgingBlocks.java | 4 ++-- 13 files changed, 26 insertions(+), 26 deletions(-) rename src/generated/resources/assets/{aether => aether_treasure_reforging}/blockstates/pyral_block.json (100%) rename src/generated/resources/assets/{aether => aether_treasure_reforging}/blockstates/valkyrum_block.json (100%) rename src/generated/resources/data/{aether => aether_treasure_reforging}/loot_tables/blocks/pyral_block.json (83%) rename src/generated/resources/data/{aether => aether_treasure_reforging}/loot_tables/blocks/valkyrum_block.json (83%) diff --git a/src/generated/resources/.cache/4a70f41dffa39a8e1b615a62c7953f67790ad695 b/src/generated/resources/.cache/4a70f41dffa39a8e1b615a62c7953f67790ad695 index 9765ae2..d8017bc 100644 --- a/src/generated/resources/.cache/4a70f41dffa39a8e1b615a62c7953f67790ad695 +++ b/src/generated/resources/.cache/4a70f41dffa39a8e1b615a62c7953f67790ad695 @@ -1,2 +1,2 @@ -// 1.20.4 2024-05-10T23:03:32.1607053 Languages: en_us for mod: aether_treasure_reforging -fd458833bae789cfaef625d7db38caea49d944b2 assets/aether_treasure_reforging/lang/en_us.json +// 1.20.4 2024-09-26T12:45:36.2385375 Languages: en_us for mod: aether_treasure_reforging +982310625dd007a4e207f86e5b06ae06a61cc8f7 assets/aether_treasure_reforging/lang/en_us.json diff --git a/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d b/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d index 33294e2..b5ac239 100644 --- a/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d +++ b/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d @@ -1,3 +1,3 @@ -// 1.20.4 2024-09-26T11:12:33.5755532 Loot Tables -dbf3240a71731dbbf8e009549358fe06b1606d8f data/aether/loot_tables/blocks/pyral_block.json -d324f3492facdf203fc3d8b1d86c5d86f01b5453 data/aether/loot_tables/blocks/valkyrum_block.json +// 1.20.4 2024-09-26T12:45:36.2405376 Loot Tables +e125b9ac88e9b5288c731d1d17d73d1f930eb359 data/aether_treasure_reforging/loot_tables/blocks/pyral_block.json +71569d5553777bab28f87b989e3de01b8491e116 data/aether_treasure_reforging/loot_tables/blocks/valkyrum_block.json diff --git a/src/generated/resources/.cache/6b5b4c408837c58a7ba25a66c36556a3bba26add b/src/generated/resources/.cache/6b5b4c408837c58a7ba25a66c36556a3bba26add index f05b6e3..1d4cc31 100644 --- a/src/generated/resources/.cache/6b5b4c408837c58a7ba25a66c36556a3bba26add +++ b/src/generated/resources/.cache/6b5b4c408837c58a7ba25a66c36556a3bba26add @@ -1,6 +1,6 @@ -// 1.20.4 2024-05-10T22:53:15.5291038 Block States: aether_treasure_reforging -f00bcb829a6af337a592d0442d02ca35be1c4830 assets/aether/blockstates/pyral_block.json -9b1438950be937e5c5aba53513dd71e1127b864b assets/aether/blockstates/valkyrum_block.json +// 1.20.4 2024-09-26T12:45:36.2355375 Block States: aether_treasure_reforging +f00bcb829a6af337a592d0442d02ca35be1c4830 assets/aether_treasure_reforging/blockstates/pyral_block.json +9b1438950be937e5c5aba53513dd71e1127b864b assets/aether_treasure_reforging/blockstates/valkyrum_block.json ea3b7ce93bad864feb437c32f80addb4122b4b84 assets/aether_treasure_reforging/models/block/pyral_block.json b126328ad7263cdc93459ae3e151b5426bb65159 assets/aether_treasure_reforging/models/block/valkyrum_block.json 01ccafc7c2658228a3325c21e068c151c6833a01 assets/aether_treasure_reforging/models/block/valkyrum_block_horizontal.json diff --git a/src/generated/resources/.cache/f6a74cd8da2df68a12670b9fea0a3123992a1ca1 b/src/generated/resources/.cache/f6a74cd8da2df68a12670b9fea0a3123992a1ca1 index 9aa68d8..114faee 100644 --- a/src/generated/resources/.cache/f6a74cd8da2df68a12670b9fea0a3123992a1ca1 +++ b/src/generated/resources/.cache/f6a74cd8da2df68a12670b9fea0a3123992a1ca1 @@ -1,4 +1,4 @@ -// 1.20.4 2024-09-26T10:52:05.454581 Tags for minecraft:block mod id aether_treasure_reforging -2ef60f386a62d5b7f99c520a1390f317b79e22aa data/forge/tags/blocks/storage_blocks.json -2ef60f386a62d5b7f99c520a1390f317b79e22aa data/minecraft/tags/blocks/mineable/pickaxe.json -2ef60f386a62d5b7f99c520a1390f317b79e22aa data/minecraft/tags/blocks/needs_iron_tool.json +// 1.20.4 2024-09-26T12:45:36.2425387 Tags for minecraft:block mod id aether_treasure_reforging +e34285046bb3b80e031a87af7087e15676e7b45c data/forge/tags/blocks/storage_blocks.json +e34285046bb3b80e031a87af7087e15676e7b45c data/minecraft/tags/blocks/mineable/pickaxe.json +e34285046bb3b80e031a87af7087e15676e7b45c data/minecraft/tags/blocks/needs_iron_tool.json diff --git a/src/generated/resources/assets/aether/blockstates/pyral_block.json b/src/generated/resources/assets/aether_treasure_reforging/blockstates/pyral_block.json similarity index 100% rename from src/generated/resources/assets/aether/blockstates/pyral_block.json rename to src/generated/resources/assets/aether_treasure_reforging/blockstates/pyral_block.json diff --git a/src/generated/resources/assets/aether/blockstates/valkyrum_block.json b/src/generated/resources/assets/aether_treasure_reforging/blockstates/valkyrum_block.json similarity index 100% rename from src/generated/resources/assets/aether/blockstates/valkyrum_block.json rename to src/generated/resources/assets/aether_treasure_reforging/blockstates/valkyrum_block.json diff --git a/src/generated/resources/assets/aether_treasure_reforging/lang/en_us.json b/src/generated/resources/assets/aether_treasure_reforging/lang/en_us.json index 3dffa32..b8a8be2 100644 --- a/src/generated/resources/assets/aether_treasure_reforging/lang/en_us.json +++ b/src/generated/resources/assets/aether_treasure_reforging/lang/en_us.json @@ -1,6 +1,6 @@ { - "block.aether.pyral_block": "Block of Pyral", - "block.aether.valkyrum_block": "Block of Valkyrum", + "block.aether_treasure_reforging.pyral_block": "Block of Pyral", + "block.aether_treasure_reforging.valkyrum_block": "Block of Valkyrum", "item.aether_treasure_reforging.neptune_mesh": "Neptune Mesh", "item.aether_treasure_reforging.neptune_upgrade_smithing_template": "Smithing Template", "item.aether_treasure_reforging.phoenix_upgrade_smithing_template": "Smithing Template", @@ -20,8 +20,8 @@ "item.aether_treasure_reforging.smithing_template.valkyrie_upgrade.ingredients": "Valkyrum Ingot", "item.aether_treasure_reforging.valkyrie_upgrade_smithing_template": "Smithing Template", "item.aether_treasure_reforging.valkyrum_ingot": "Valkyrum Ingot", - "lore.block.aether.pyral_block": "A solid block made from Pyral Ingots. They can power beacons and have a fiery look to them.", - "lore.block.aether.valkyrum_block": "A solid block made from Valkyrum Ingots. They can power beacons and be used as decorative accenting.", + "lore.block.aether_treasure_reforging.pyral_block": "A solid block made from Pyral Ingots. They can power beacons and have a fiery look to them.", + "lore.block.aether_treasure_reforging.valkyrum_block": "A solid block made from Valkyrum Ingots. They can power beacons and be used as decorative accenting.", "lore.item.aether_treasure_reforging.neptune_mesh": "A mesh of interwoven blue metallic links. With the respective template, it can be used in a Smithing Table to forge Neptune armor.", "lore.item.aether_treasure_reforging.neptune_upgrade_smithing_template": "A smithing template that can be used in the creation of Neptune Armor, using both Neptune Mesh and Zanite Armor.", "lore.item.aether_treasure_reforging.phoenix_upgrade_smithing_template": "A smithing template that can be used in the creation of Phoenix Armor, using both Pyral Ingots and Gravitite Armor.", diff --git a/src/generated/resources/data/aether/loot_tables/blocks/pyral_block.json b/src/generated/resources/data/aether_treasure_reforging/loot_tables/blocks/pyral_block.json similarity index 83% rename from src/generated/resources/data/aether/loot_tables/blocks/pyral_block.json rename to src/generated/resources/data/aether_treasure_reforging/loot_tables/blocks/pyral_block.json index bcf5242..6e82032 100644 --- a/src/generated/resources/data/aether/loot_tables/blocks/pyral_block.json +++ b/src/generated/resources/data/aether_treasure_reforging/loot_tables/blocks/pyral_block.json @@ -17,5 +17,5 @@ "rolls": 1.0 } ], - "random_sequence": "aether:blocks/pyral_block" + "random_sequence": "aether_treasure_reforging:blocks/pyral_block" } \ No newline at end of file diff --git a/src/generated/resources/data/aether/loot_tables/blocks/valkyrum_block.json b/src/generated/resources/data/aether_treasure_reforging/loot_tables/blocks/valkyrum_block.json similarity index 83% rename from src/generated/resources/data/aether/loot_tables/blocks/valkyrum_block.json rename to src/generated/resources/data/aether_treasure_reforging/loot_tables/blocks/valkyrum_block.json index f3bc419..398b3b9 100644 --- a/src/generated/resources/data/aether/loot_tables/blocks/valkyrum_block.json +++ b/src/generated/resources/data/aether_treasure_reforging/loot_tables/blocks/valkyrum_block.json @@ -17,5 +17,5 @@ "rolls": 1.0 } ], - "random_sequence": "aether:blocks/valkyrum_block" + "random_sequence": "aether_treasure_reforging:blocks/valkyrum_block" } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks.json b/src/generated/resources/data/forge/tags/blocks/storage_blocks.json index 77d9d46..fc8ed6d 100644 --- a/src/generated/resources/data/forge/tags/blocks/storage_blocks.json +++ b/src/generated/resources/data/forge/tags/blocks/storage_blocks.json @@ -1,6 +1,6 @@ { "values": [ - "aether:valkyrum_block", - "aether:pyral_block" + "aether_treasure_reforging:valkyrum_block", + "aether_treasure_reforging:pyral_block" ] } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json b/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json index 77d9d46..fc8ed6d 100644 --- a/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json +++ b/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json @@ -1,6 +1,6 @@ { "values": [ - "aether:valkyrum_block", - "aether:pyral_block" + "aether_treasure_reforging:valkyrum_block", + "aether_treasure_reforging:pyral_block" ] } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/needs_iron_tool.json b/src/generated/resources/data/minecraft/tags/blocks/needs_iron_tool.json index 77d9d46..fc8ed6d 100644 --- a/src/generated/resources/data/minecraft/tags/blocks/needs_iron_tool.json +++ b/src/generated/resources/data/minecraft/tags/blocks/needs_iron_tool.json @@ -1,6 +1,6 @@ { "values": [ - "aether:valkyrum_block", - "aether:pyral_block" + "aether_treasure_reforging:valkyrum_block", + "aether_treasure_reforging:pyral_block" ] } \ No newline at end of file diff --git a/src/main/java/com/aetherteam/treasure_reforging/block/ReforgingBlocks.java b/src/main/java/com/aetherteam/treasure_reforging/block/ReforgingBlocks.java index 267830d..9c69f52 100644 --- a/src/main/java/com/aetherteam/treasure_reforging/block/ReforgingBlocks.java +++ b/src/main/java/com/aetherteam/treasure_reforging/block/ReforgingBlocks.java @@ -1,7 +1,7 @@ package com.aetherteam.treasure_reforging.block; -import com.aetherteam.aether.Aether; import com.aetherteam.aether.block.miscellaneous.FacingPillarBlock; +import com.aetherteam.treasure_reforging.TreasureReforging; import com.aetherteam.treasure_reforging.item.ReforgingItems; import net.minecraft.world.item.BlockItem; import net.minecraft.world.item.Item; @@ -17,7 +17,7 @@ import java.util.function.Supplier; public class ReforgingBlocks { - public static final DeferredRegister.Blocks BLOCKS = DeferredRegister.createBlocks(Aether.MODID); + public static final DeferredRegister.Blocks BLOCKS = DeferredRegister.createBlocks(TreasureReforging.MODID); public static final DeferredBlock VALKYRUM_BLOCK = register("valkyrum_block", () -> new FacingPillarBlock(Block.Properties.of().mapColor(MapColor.QUARTZ).instrument(NoteBlockInstrument.CHIME).strength(5.0F, 6.0F).requiresCorrectToolForDrops().sound(SoundType.METAL))); public static final DeferredBlock PYRAL_BLOCK = register("pyral_block", () -> new Block(Block.Properties.of().mapColor(MapColor.COLOR_ORANGE).instrument(NoteBlockInstrument.DIDGERIDOO).strength(5.0F, 6.0F).requiresCorrectToolForDrops().sound(SoundType.METAL)));