From b5d0db493bf0ceee20fb16e05783f5c6dfc8ed35 Mon Sep 17 00:00:00 2001 From: thatsIch Date: Sat, 13 Jun 2015 17:06:24 +0200 Subject: [PATCH] Fixes #1588: Charged Certus Quartz Ore has its own oredictionary entry --- src/main/java/appeng/block/solids/OreQuartz.java | 10 +--------- .../assets/appliedenergistics2/recipes/index.recipe | 2 ++ 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/src/main/java/appeng/block/solids/OreQuartz.java b/src/main/java/appeng/block/solids/OreQuartz.java index 861ddc481..cc03e34d5 100644 --- a/src/main/java/appeng/block/solids/OreQuartz.java +++ b/src/main/java/appeng/block/solids/OreQuartz.java @@ -1,6 +1,6 @@ /* * This file is part of Applied Energistics 2. - * Copyright (c) 2013 - 2014, AlgorithmX2, All rights reserved. + * Copyright (c) 2013 - 2015, AlgorithmX2, All rights reserved. * * Applied Energistics 2 is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by @@ -21,7 +21,6 @@ package appeng.block.solids; import java.util.EnumSet; import java.util.Random; - import javax.annotation.Nullable; import net.minecraft.block.material.Material; @@ -30,7 +29,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.MathHelper; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import net.minecraftforge.oredict.OreDictionary; import appeng.api.AEApi; import appeng.api.exceptions.MissingDefinition; @@ -63,12 +61,6 @@ public class OreQuartz extends AEBaseBlock return RenderQuartzOre.class; } - @Override - public void postInit() - { - OreDictionary.registerOre( "oreCertusQuartz", new ItemStack( this ) ); - } - @Override public int getMixedBrightnessForBlock( IBlockAccess par1iBlockAccess, int par2, int par3, int par4 ) { diff --git a/src/main/resources/assets/appliedenergistics2/recipes/index.recipe b/src/main/resources/assets/appliedenergistics2/recipes/index.recipe index 6a04bd643..facef180d 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/index.recipe +++ b/src/main/resources/assets/appliedenergistics2/recipes/index.recipe @@ -18,6 +18,8 @@ ore=mc:stained_hardened_clay:* -> blockStainedHardenedClay ore=ae2:ItemMaterial.NetherQuartzDust -> dustNetherQuartz ore=ae2:ItemMaterial.CertusQuartzDust -> dustCertusQuartz ore=ae2:ItemMaterial.FluixDust -> dustFluix +ore=ae2:tile.OreQuartz -> oreCertusQuartz +ore=ae2:tile.OreQuartzCharged -> oreCertusQuartz group= mc:iron_ingot oredictionary:ingotCopper oredictionary:ingotTin oredictionary:ingotSilver oredictionary:ingotLead oredictionary:ingotBronze oredictionary:ingotBrass oredictionary:ingotNickel oredictionary:ingotInvar oredictionary:ingotAluminium -> metalIngots group= oredictionary:dustEnder oredictionary:dustEnderPearl -> dustEnder