From 7a40b45a825558a7e992ac377e48724ae6ad2acc Mon Sep 17 00:00:00 2001 From: jaredlll08 Date: Sat, 5 Sep 2015 20:03:15 +0200 Subject: [PATCH] Fix Blocks --- .../src/main/java/minetweaker/mc18/MineTweakerMod.java | 6 +++++- .../minetweaker/mc18/actions/SetBlockHardnessAction.java | 7 ++++--- .../src/main/java/minetweaker/mc18/item/MCItemStack.java | 5 +++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/MineTweakerMod.java b/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/MineTweakerMod.java index 2cbb73b..e796536 100644 --- a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/MineTweakerMod.java +++ b/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/MineTweakerMod.java @@ -12,6 +12,8 @@ import minetweaker.MineTweakerAPI; import minetweaker.MineTweakerImplementationAPI; import minetweaker.api.logger.FileLogger; import minetweaker.mc18.brackets.ItemBracketHandler; +import minetweaker.mc18.brackets.LiquidBracketHandler; +import minetweaker.mc18.brackets.OreBracketHandler; import minetweaker.mc18.client.MCClient; import minetweaker.mc18.formatting.MCFormatter; import minetweaker.mc18.furnace.FuelTweaker; @@ -34,7 +36,6 @@ import minetweaker.runtime.IScriptProvider; import minetweaker.runtime.providers.ScriptProviderCascade; import minetweaker.runtime.providers.ScriptProviderCustom; import minetweaker.runtime.providers.ScriptProviderDirectory; -import net.minecraft.block.Block; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.common.FMLCommonHandler; @@ -154,6 +155,9 @@ public class MineTweakerMod { // starts before loading worlds // perfect place to start MineTweaker! ItemBracketHandler.rebuildItemRegistry(); + MineTweakerAPI.registerBracketHandler(new ItemBracketHandler()); + MineTweakerAPI.registerBracketHandler(new LiquidBracketHandler()); + MineTweakerAPI.registerBracketHandler(new OreBracketHandler()); if (MineTweakerPlatformUtils.isClient()) { MineTweakerAPI.client = new MCClient(); diff --git a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/actions/SetBlockHardnessAction.java b/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/actions/SetBlockHardnessAction.java index d84f5ce..7c4fd88 100644 --- a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/actions/SetBlockHardnessAction.java +++ b/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/actions/SetBlockHardnessAction.java @@ -9,7 +9,9 @@ package minetweaker.mc18.actions; import minetweaker.IUndoableAction; import minetweaker.MineTweakerAPI; import net.minecraft.block.Block; +import net.minecraft.block.BlockRedFlower; import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.ReflectionHelper; /** @@ -72,9 +74,8 @@ public class SetBlockHardnessAction implements IUndoableAction { } public static boolean isBlock(ItemStack stack) { - String name = (String) Block.blockRegistry.getNameForObject(Block.getBlockFromItem(stack.getItem())); - return !name.equalsIgnoreCase("minecraft:air") && Block.blockRegistry.containsKey(name); - + ResourceLocation res = (ResourceLocation) Block.blockRegistry.getNameForObject(Block.getBlockFromItem(stack.getItem())); + return !res.getResourcePath().equalsIgnoreCase("minecraft:air") && Block.blockRegistry.containsKey(res); } @Override diff --git a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/item/MCItemStack.java b/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/item/MCItemStack.java index 7a9021a..86c6d84 100644 --- a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/item/MCItemStack.java +++ b/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/item/MCItemStack.java @@ -39,6 +39,7 @@ import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.ResourceLocation; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fml.relauncher.ReflectionHelper; @@ -306,8 +307,8 @@ public class MCItemStack implements IItemStack { @Override public IBlock asBlock() { - String name = (String) Block.blockRegistry.getNameForObject(Block.getBlockFromItem(stack.getItem())); - if (Block.blockRegistry.containsKey(name)) { + ResourceLocation res = (ResourceLocation) Block.blockRegistry.getNameForObject(Block.getBlockFromItem(stack.getItem())); + if (Block.blockRegistry.containsKey(res)) { return new MCItemBlock(stack); } else { throw new ClassCastException("This item is not a block");