Add OreDictionary entries to Warp Core blocks to allow for CT to chan…

…ge them (#1884) - Titanium Block is "blockWarpCoreRim" - Gold Block is "blockWarpCoreCore"
Advanced-Rocketry · Jul 25, 2020 · 9e9dd80 · 9e9dd80
1 parent d53abb3
commit 9e9dd80
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/src/main/java/zmaster587/advancedRocketry/AdvancedRocketry.java b/src/main/java/zmaster587/advancedRocketry/AdvancedRocketry.java
@@ -613,6 +613,8 @@ public void registerItems(RegistryEvent.Register<Item> evt)
         OreDictionary.registerOre("itemSilicon", MaterialRegistry.getItemStackFromMaterialAndType("Silicon", AllowedProducts.getProductByName("INGOT")));
         OreDictionary.registerOre("dustThermite", new ItemStack(AdvancedRocketryItems.itemThermite));
         OreDictionary.registerOre("slab", new ItemStack(Blocks.STONE_SLAB));
+		OreDictionary.registerOre("blockWarpCoreCore", new ItemStack(Blocks.GOLD_BLOCK));
+		OreDictionary.registerOre("blockWarpCoreRim", MaterialRegistry.getMaterialFromName("Titanium").getProduct(AllowedProducts.getProductByName("BLOCK")));
 	}
 
 	@SubscribeEvent(priority=EventPriority.HIGH)

diff --git a/src/main/java/zmaster587/advancedRocketry/tile/multiblock/TileWarpCore.java b/src/main/java/zmaster587/advancedRocketry/tile/multiblock/TileWarpCore.java
@@ -22,17 +22,17 @@ public class TileWarpCore extends TileMultiBlock {
 	private SpaceStationObject station;
 
 	public static final Object[][][] structure = { 
-		{{"blockTitanium", "blockTitanium", "blockTitanium"},
-			{"blockTitanium", 'I', "blockTitanium"},
-			{"blockTitanium", "blockTitanium", "blockTitanium"}},
+		{{"blockWarpCoreRim", "blockWarpCoreRim", "blockWarpCoreRim"},
+			{"blockWarpCoreRim", 'I', "blockWarpCoreRim"},
+			{"blockWarpCoreRim", "blockWarpCoreRim", "blockWarpCoreRim"}},
 
 			{{null, new BlockMeta(LibVulpesBlocks.blockStructureBlock), null},
-				{new BlockMeta(LibVulpesBlocks.blockStructureBlock), new BlockMeta(Blocks.GOLD_BLOCK), new BlockMeta(LibVulpesBlocks.blockStructureBlock)},
+				{new BlockMeta(LibVulpesBlocks.blockStructureBlock), "blockWarpCoreCore", new BlockMeta(LibVulpesBlocks.blockStructureBlock)},
 				{null, new BlockMeta(LibVulpesBlocks.blockStructureBlock), null}},
 
-				{{"blockTitanium", 'c', "blockTitanium"}, 
-					{"blockTitanium", new BlockMeta(Blocks.GOLD_BLOCK), "blockTitanium"},
-					{"blockTitanium", "blockTitanium", "blockTitanium"}},
+				{{"blockWarpCoreRim", 'c', "blockWarpCoreRim"},
+					{"blockWarpCoreRim", "blockWarpCoreCore", "blockWarpCoreRim"},
+					{"blockWarpCoreRim", "blockWarpCoreRim", "blockWarpCoreRim"}},
 
 	};