Skip to content

Commit

Permalink
fix: block registry shouldnt use aether id
Browse files Browse the repository at this point in the history
  • Loading branch information
bconlon1 committed Sep 26, 2024
1 parent dad2b2d commit b16331f
Show file tree
Hide file tree
Showing 13 changed files with 24 additions and 24 deletions.
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
// 1.19.4 2024-09-26T12:14:01.5437642 Loot Tables
6ec8d4cf44fafe9a7498266804eccce403459e64 data/aether/loot_tables/blocks/pyral_block.json
73f0dcb1483cc00c50559edabae00c48d8d3c171 data/aether/loot_tables/blocks/valkyrum_block.json
// 1.19.4 2024-09-26T12:28:43.8544867 Loot Tables
6ec8d4cf44fafe9a7498266804eccce403459e64 data/aether_treasure_reforging/loot_tables/blocks/pyral_block.json
73f0dcb1483cc00c50559edabae00c48d8d3c171 data/aether_treasure_reforging/loot_tables/blocks/valkyrum_block.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// 1.19.4 2024-05-09T14:08:13.1915914 Block States: aether_treasure_reforging
f00bcb829a6af337a592d0442d02ca35be1c4830 assets/aether/blockstates/pyral_block.json
9b1438950be937e5c5aba53513dd71e1127b864b assets/aether/blockstates/valkyrum_block.json
// 1.19.4 2024-09-26T12:28:43.8514886 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
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
// 1.19.4 2024-05-09T17:23:56.1121312 Languages: en_us
d88055907653d30a24c10315ae1f9ae534e6eff6 assets/aether_treasure_reforging/lang/en_us.json
// 1.19.4 2024-09-26T12:28:43.855489 Languages: en_us
e743931a9fc14256f51e02279173dd3a5b677354 assets/aether_treasure_reforging/lang/en_us.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.19.4 2024-09-26T12:14:01.5957595 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.19.4 2024-09-26T12:28:43.8564868 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
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"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.pyral_ingot": "Pyral Ingot",
"item.aether_treasure_reforging.pyral_shard": "Pyral Shard",
"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.pyral_ingot": "A hardened and fire-resistant ingot. With the respective template, it can be used in a Smithing Table to forge Phoenix armor.",
"lore.item.aether_treasure_reforging.pyral_shard": "When combined with obsidian, fragments of Pyral material can be used to craft Pyral Ingots. The shard can also function as a long-lasting fuel.",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"values": [
"aether:valkyrum_block",
"aether:pyral_block"
"aether_treasure_reforging:valkyrum_block",
"aether_treasure_reforging:pyral_block"
]
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"values": [
"aether:valkyrum_block",
"aether:pyral_block"
"aether_treasure_reforging:valkyrum_block",
"aether_treasure_reforging:pyral_block"
]
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"values": [
"aether:valkyrum_block",
"aether:pyral_block"
"aether_treasure_reforging:valkyrum_block",
"aether_treasure_reforging:pyral_block"
]
}
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -18,7 +18,7 @@
import java.util.function.Supplier;

public class ReforgingBlocks {
public static final DeferredRegister<Block> BLOCKS = DeferredRegister.create(ForgeRegistries.BLOCKS, Aether.MODID);
public static final DeferredRegister<Block> BLOCKS = DeferredRegister.create(ForgeRegistries.BLOCKS, TreasureReforging.MODID);

public static final RegistryObject<FacingPillarBlock> VALKYRUM_BLOCK = register("valkyrum_block", () -> new FacingPillarBlock(Block.Properties.of(Material.METAL, MaterialColor.QUARTZ).strength(5.0F, 6.0F).requiresCorrectToolForDrops().sound(SoundType.METAL)));
public static final RegistryObject<Block> PYRAL_BLOCK = register("pyral_block", () -> new Block(Block.Properties.of(Material.METAL, MaterialColor.COLOR_ORANGE).strength(5.0F, 6.0F).requiresCorrectToolForDrops().sound(SoundType.METAL)));
Expand Down

0 comments on commit b16331f

Please sign in to comment.