Initial stab at 1.11

About halfway.
This commit is contained in:
Nicholas Ignoffo 2016-12-12 19:56:36 -08:00
parent ce52aea512
commit 00d6f8eb46
157 changed files with 1036 additions and 1554 deletions

View file

@ -7,9 +7,11 @@ import lombok.Getter;
import lombok.Setter;
import net.minecraft.block.Block;
import net.minecraft.block.state.IBlockState;
import net.minecraft.init.Blocks;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fml.common.registry.ForgeRegistries;
import net.minecraftforge.oredict.OreDictionary;
import WayofTime.bloodmagic.util.Utils;
@ -34,8 +36,8 @@ public class MeteorComponent
meta = Integer.parseInt(stringList[2]);
}
Block ore = Block.REGISTRY.getObject(new ResourceLocation(domain, block));
if (ore != null)
Block ore = ForgeRegistries.BLOCKS.getValue(new ResourceLocation(domain, block));
if (ore != Blocks.AIR)
{
return ore.getStateFromMeta(meta);
}