From 0f7e8eec3186b38ef327777bf018d9ac1b6ffdb0 Mon Sep 17 00:00:00 2001 From: Aidan Brady Date: Sun, 22 Dec 2013 01:07:47 -0500 Subject: [PATCH] A few fixes --- common/mekanism/common/Mekanism.java | 2 +- common/mekanism/common/multipart/ItemPartTransmitter.java | 3 +++ common/mekanism/common/multipart/PartSidedPipe.java | 4 ++-- common/mekanism/common/multipart/TransmitterType.java | 4 ++-- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/common/mekanism/common/Mekanism.java b/common/mekanism/common/Mekanism.java index ec4309c76..aca8d1ab9 100644 --- a/common/mekanism/common/Mekanism.java +++ b/common/mekanism/common/Mekanism.java @@ -668,7 +668,7 @@ public class Mekanism Jetpack = (ItemJetpack)new ItemJetpack(configuration.getItem("Jetpack", 11223).getInt()).setUnlocalizedName("Jetpack"); WalkieTalkie = new ItemWalkieTalkie(configuration.getItem("WalkieTalkie", 11224).getInt()).setUnlocalizedName("WalkieTalkie"); PartTransmitter = new ItemPartTransmitter(configuration.getItem("MultipartTransmitter", 11225).getInt()).setUnlocalizedName("MultipartTransmitter"); - Balloon = new ItemBalloon(configuration.getItem("Balloon", 11226).getInt()).setUnlocalizedName("Balloon"); + Balloon = new ItemBalloon(configuration.getItem("Balloon", 11226).getInt()).setUnlocalizedName("Balloon"); configuration.save(); //TODO 1.7, fix item shifts diff --git a/common/mekanism/common/multipart/ItemPartTransmitter.java b/common/mekanism/common/multipart/ItemPartTransmitter.java index c2e162acb..4c0536c4c 100644 --- a/common/mekanism/common/multipart/ItemPartTransmitter.java +++ b/common/mekanism/common/multipart/ItemPartTransmitter.java @@ -115,6 +115,7 @@ public class ItemPartTransmitter extends JItemMultiPart list.add(EnumColor.DARK_GREY + "Capable of transferring:"); list.add("- " + EnumColor.PURPLE + "Items (universal)"); list.add("- " + EnumColor.PURPLE + "Blocks (universal)"); + break; } case 4: { @@ -122,6 +123,7 @@ public class ItemPartTransmitter extends JItemMultiPart list.add("- " + EnumColor.PURPLE + "Items (universal)"); list.add("- " + EnumColor.PURPLE + "Blocks (universal)"); list.add("- " + EnumColor.DARK_RED + "Only used if no other paths available"); + break; } case 5: { @@ -129,6 +131,7 @@ public class ItemPartTransmitter extends JItemMultiPart list.add("- " + EnumColor.PURPLE + "Items (universal)"); list.add("- " + EnumColor.PURPLE + "Blocks (universal)"); list.add("- " + EnumColor.DARK_RED + "Controllable by redstone"); + break; } } } diff --git a/common/mekanism/common/multipart/PartSidedPipe.java b/common/mekanism/common/multipart/PartSidedPipe.java index 07e72d4aa..b8855f45a 100644 --- a/common/mekanism/common/multipart/PartSidedPipe.java +++ b/common/mekanism/common/multipart/PartSidedPipe.java @@ -278,13 +278,13 @@ public abstract class PartSidedPipe extends TMultiPart implements TSlottedPart, @Override public Cuboid6 getBounds() { - return smallSides[6]; + return getTransmitter().getSize() == Size.SMALL ? smallSides[6] : largeSides[6]; } @Override public int getHollowSize() { - return getTransmitter().getSize() == Size.SMALL ? 7 : 9; + return getTransmitter().getSize().centerSize+1; } @Override diff --git a/common/mekanism/common/multipart/TransmitterType.java b/common/mekanism/common/multipart/TransmitterType.java index 14bcb3e5b..06d7831df 100644 --- a/common/mekanism/common/multipart/TransmitterType.java +++ b/common/mekanism/common/multipart/TransmitterType.java @@ -45,11 +45,11 @@ public enum TransmitterType SMALL(6), LARGE(8); - public int centreSize; + public int centerSize; private Size(int size) { - centreSize = size; + centerSize = size; } }