fix: block registry shouldnt use aether id

bconlon1 · bconlon1 · commit 50d98dcf38b2 · 2024-09-26T12:46:46.000-07:00
diff --git 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
@@ -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
@@ -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
@@ -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_treasure_reforging/blockstates/pyral_block.json b/src/generated/resources/assets/aether_treasure_reforging/blockstates/pyral_block.json
diff --git a/src/generated/resources/assets/aether_treasure_reforging/blockstates/valkyrum_block.json b/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
@@ -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_treasure_reforging/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"
 }
diff --git a/src/generated/resources/data/aether_treasure_reforging/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"
 }
diff --git 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"
   ]
 }
diff --git 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"
   ]
 }
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
@@ -1,6 +1,6 @@
 {
   "values": [
-    "aether:valkyrum_block",
-    "aether:pyral_block"
+    "aether_treasure_reforging:valkyrum_block",
+    "aether_treasure_reforging:pyral_block"
   ]
 }
diff --git 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<FacingPillarBlock> 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<Block> 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)));

Original file line number	Diff line number	Diff line change
`@@ -17,5 +17,5 @@`
`17`	`17`	`"rolls": 1.0`
`18`	`18`	`}`
`19`	`19`	`],`
`20`		`- "random_sequence": "aether:blocks/pyral_block"`
	`20`	`+ "random_sequence": "aether_treasure_reforging:blocks/pyral_block"`
`21`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"values": [`
`3`		`- "aether:valkyrum_block",`
`4`		`- "aether:pyral_block"`
	`3`	`+ "aether_treasure_reforging:valkyrum_block",`
	`4`	`+ "aether_treasure_reforging:pyral_block"`
`5`	`5`	`]`
`6`	`6`	`}`