tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

A few fixes

Browse source
This commit is contained in:
Aidan Brady 2013-12-22 01:07:47 -05:00
parent 87ce53f3fe
commit 0f7e8eec31
4 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/mekanism/common/Mekanism.java
View file

@ -668,7 +668,7 @@ public class Mekanism
Jetpack = (ItemJetpack)new ItemJetpack(configuration.getItem("Jetpack", 11223).getInt()).setUnlocalizedName("Jetpack"); Jetpack = (ItemJetpack)new ItemJetpack(configuration.getItem("Jetpack", 11223).getInt()).setUnlocalizedName("Jetpack");
WalkieTalkie = new ItemWalkieTalkie(configuration.getItem("WalkieTalkie", 11224).getInt()).setUnlocalizedName("WalkieTalkie"); WalkieTalkie = new ItemWalkieTalkie(configuration.getItem("WalkieTalkie", 11224).getInt()).setUnlocalizedName("WalkieTalkie");
PartTransmitter = new ItemPartTransmitter(configuration.getItem("MultipartTransmitter", 11225).getInt()).setUnlocalizedName("MultipartTransmitter"); 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(); configuration.save();
//TODO 1.7, fix item shifts //TODO 1.7, fix item shifts

3
common/mekanism/common/multipart/ItemPartTransmitter.java
View file

@ -115,6 +115,7 @@ public class ItemPartTransmitter extends JItemMultiPart
list.add(EnumColor.DARK_GREY + "Capable of transferring:"); list.add(EnumColor.DARK_GREY + "Capable of transferring:");
list.add("- " + EnumColor.PURPLE + "Items (universal)"); list.add("- " + EnumColor.PURPLE + "Items (universal)");
list.add("- " + EnumColor.PURPLE + "Blocks (universal)"); list.add("- " + EnumColor.PURPLE + "Blocks (universal)");
break;
} }
case 4: case 4:
{ {
@ -122,6 +123,7 @@ public class ItemPartTransmitter extends JItemMultiPart
list.add("- " + EnumColor.PURPLE + "Items (universal)"); list.add("- " + EnumColor.PURPLE + "Items (universal)");
list.add("- " + EnumColor.PURPLE + "Blocks (universal)"); list.add("- " + EnumColor.PURPLE + "Blocks (universal)");
list.add("- " + EnumColor.DARK_RED + "Only used if no other paths available"); list.add("- " + EnumColor.DARK_RED + "Only used if no other paths available");
break;
} }
case 5: case 5:
{ {
@ -129,6 +131,7 @@ public class ItemPartTransmitter extends JItemMultiPart
list.add("- " + EnumColor.PURPLE + "Items (universal)"); list.add("- " + EnumColor.PURPLE + "Items (universal)");
list.add("- " + EnumColor.PURPLE + "Blocks (universal)"); list.add("- " + EnumColor.PURPLE + "Blocks (universal)");
list.add("- " + EnumColor.DARK_RED + "Controllable by redstone"); list.add("- " + EnumColor.DARK_RED + "Controllable by redstone");
break;
} }
} }
} }

4
common/mekanism/common/multipart/PartSidedPipe.java
View file

@ -278,13 +278,13 @@ public abstract class PartSidedPipe extends TMultiPart implements TSlottedPart,
@Override @Override
public Cuboid6 getBounds() public Cuboid6 getBounds()
{ {
return smallSides[6]; return getTransmitter().getSize() == Size.SMALL ? smallSides[6] : largeSides[6];
} }
@Override @Override
public int getHollowSize() public int getHollowSize()
{ {
return getTransmitter().getSize() == Size.SMALL ? 7 : 9; return getTransmitter().getSize().centerSize+1;
} }
@Override @Override

4
common/mekanism/common/multipart/TransmitterType.java
View file

@ -45,11 +45,11 @@ public enum TransmitterType
SMALL(6), SMALL(6),
LARGE(8); LARGE(8);
public int centreSize; public int centerSize;
private Size(int size) private Size(int size)
{ {
centreSize = size; centerSize = size;
} }
} }