From 61735a27aabd55b8ea1e5ece2794b7806e9dfd23 Mon Sep 17 00:00:00 2001 From: "Aidan C. Brady" Date: Sun, 29 Mar 2015 10:49:28 -0400 Subject: [PATCH] Fixed Solar Neutron Activator not rendering in inventory, fixed Solar Neutron Activator replacing blocks --- src/main/java/mekanism/client/ClientProxy.java | 1 + src/main/java/mekanism/common/ItemAttacher.java | 3 --- .../mekanism/common/item/ItemBlockMachine.java | 14 ++++++++------ 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/main/java/mekanism/client/ClientProxy.java b/src/main/java/mekanism/client/ClientProxy.java index 9b73a8aa3..d43f7240d 100644 --- a/src/main/java/mekanism/client/ClientProxy.java +++ b/src/main/java/mekanism/client/ClientProxy.java @@ -349,6 +349,7 @@ public class ClientProxy extends CommonProxy MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(MekanismBlocks.EnergyCube), handler); MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(MekanismBlocks.MachineBlock), handler); MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(MekanismBlocks.MachineBlock2), handler); + MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(MekanismBlocks.MachineBlock3), handler); MinecraftForgeClient.registerItemRenderer(MekanismItems.Robit, handler); MinecraftForgeClient.registerItemRenderer(MekanismItems.WalkieTalkie, handler); MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(MekanismBlocks.GasTank), handler); diff --git a/src/main/java/mekanism/common/ItemAttacher.java b/src/main/java/mekanism/common/ItemAttacher.java index 58e135f2e..651348d0f 100644 --- a/src/main/java/mekanism/common/ItemAttacher.java +++ b/src/main/java/mekanism/common/ItemAttacher.java @@ -4,7 +4,6 @@ import java.util.ArrayList; import java.util.List; import mekanism.common.multipart.TransmitterType; - import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; @@ -15,8 +14,6 @@ public final class ItemAttacher static { attachable.add(new ItemStack(Blocks.lever)); - attachable.add(new ItemStack(Blocks.redstone_torch)); - attachable.add(new ItemStack(Blocks.torch)); for(TransmitterType type : TransmitterType.values()) { diff --git a/src/main/java/mekanism/common/item/ItemBlockMachine.java b/src/main/java/mekanism/common/item/ItemBlockMachine.java index 95e40fb65..f4e074597 100644 --- a/src/main/java/mekanism/common/item/ItemBlockMachine.java +++ b/src/main/java/mekanism/common/item/ItemBlockMachine.java @@ -262,19 +262,21 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec { Block b = world.getBlock(xPos, yPos, zPos); - if(yPos > 255) + if(yPos > 255 || !b.isReplaceable(world, xPos, yPos, zPos)) { place = false; } - - if(!b.isAir(world, xPos, yPos, zPos) && !b.isReplaceable(world, xPos, yPos, zPos)) - { - return false; - } } } } } + else if(type == MachineType.SOLAR_NEUTRON_ACTIVATOR) + { + if(y+1 > 255 || !world.getBlock(x, y+1, z).isReplaceable(world, x, y+1, z)) + { + place = false; + } + } if(place && super.placeBlockAt(stack, player, world, x, y, z, side, hitX, hitY, hitZ, metadata)) {