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

Merge branch 'master' of https://github.com/aidancbrady/Mekanism

Browse source
This commit is contained in:
Aidan Brady 2013-11-10 19:35:52 -05:00
commit 5ad16564a3
6 changed files with 34 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/mekanism/client/ClientPlayerTickHandler.java
View file

@ -109,7 +109,7 @@ public class ClientPlayerTickHandler implements ITickHandler
int newChan = item.getChannel(stack) < 9 ? item.getChannel(stack)+1 : 1;
item.setChannel(stack, newChan);
PacketHandler.sendPacket(Transmission.SERVER, new PacketWalkieTalkieState().setParams(newChan));
Minecraft.getMinecraft().sndManager.playSoundFX("mekanism:etc.ChanSwitch", 1.0F, 1.0F);
Minecraft.getMinecraft().sndManager.playSoundFX("mekanism:etc.Ding", 1.0F, 1.0F);
lastTickUpdate = true;
}
}

12
common/mekanism/client/gui/GuiConfiguration.java
View file

@ -208,6 +208,16 @@ public class GuiConfiguration extends GuiMekanism
drawCreativeTabHoveringText("None", xAxis, yAxis);
}
}
if(xAxis >= 156 && xAxis <= 170 && yAxis >= 6 && yAxis <= 20)
{
drawCreativeTabHoveringText("Auto-eject", xAxis, yAxis);
}
if(xAxis >= 156 && xAxis <= 170 && yAxis >= 21 && yAxis <= 35)
{
drawCreativeTabHoveringText("Strict Input", xAxis, yAxis);
}
}
@Override
@ -255,7 +265,7 @@ public class GuiConfiguration extends GuiMekanism
if(xAxis >= 80 && xAxis <= 96 && yAxis >= 49 && yAxis <= 65)
{
mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F);
mc.sndManager.playSoundFX("mekanism:etc.Ding", 1.0F, 1.0F);
PacketHandler.sendPacket(Transmission.SERVER, new PacketConfigurationUpdate().setParams(ConfigurationPacket.EJECT_COLOR, Object3D.get(tile)));
}

9
common/mekanism/client/gui/GuiItemStackFilter.java
View file

@ -300,15 +300,22 @@ public class GuiItemStackFilter extends GuiMekanism
{
ItemStack stack = mc.thePlayer.inventory.getItemStack();
if(stack != null)
if(stack != null && !Keyboard.isKeyDown(Keyboard.KEY_LSHIFT))
{
filter.itemType = stack.copy();
filter.itemType.stackSize = 1;
}
else if(stack == null && Keyboard.isKeyDown(Keyboard.KEY_LSHIFT))
{
filter.itemType = null;
}
mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F);
}
if(xAxis >= 12 && xAxis <= 28 && yAxis >= 44 && yAxis <= 60)
{
mc.sndManager.playSoundFX("mekanism:etc.Ding", 1.0F, 1.0F);
filter.color = TransporterUtils.increment(filter.color);
}

13
common/mekanism/client/gui/GuiLogisticalSorter.java
View file

@ -178,6 +178,7 @@ public class GuiLogisticalSorter extends GuiMekanism
data.add(0);
PacketHandler.sendPacket(Transmission.SERVER, new PacketTileEntity().setParams(Object3D.get(tileEntity), data));
mc.sndManager.playSoundFX("mekanism:etc.Ding", 1.0F, 1.0F);
}
if(xAxis >= 12 && xAxis <= 26 && yAxis >= 110 && yAxis <= 124)
@ -186,6 +187,7 @@ public class GuiLogisticalSorter extends GuiMekanism
data.add(1);
PacketHandler.sendPacket(Transmission.SERVER, new PacketTileEntity().setParams(Object3D.get(tileEntity), data));
mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F);
}
if(xAxis >= 12 && xAxis <= 26 && yAxis >= 84 && yAxis <= 98)
@ -194,6 +196,7 @@ public class GuiLogisticalSorter extends GuiMekanism
data.add(2);
PacketHandler.sendPacket(Transmission.SERVER, new PacketTileEntity().setParams(Object3D.get(tileEntity), data));
mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F);
}
}
}
@ -345,6 +348,16 @@ public class GuiLogisticalSorter extends GuiMekanism
}
}
if(xAxis >= 12 && xAxis <= 26 && yAxis >= 110 && yAxis <= 124)
{
drawCreativeTabHoveringText("Auto-eject", xAxis, yAxis);
}
if(xAxis >= 12 && xAxis <= 26 && yAxis >= 84 && yAxis <= 98)
{
drawCreativeTabHoveringText("Round robin", xAxis, yAxis);
}
super.drawGuiContainerForegroundLayer(mouseX, mouseY);
}

1
common/mekanism/client/gui/GuiOreDictFilter.java
View file

@ -292,6 +292,7 @@ public class GuiOreDictFilter extends GuiMekanism
if(xAxis >= 12 && xAxis <= 28 && yAxis >= 44 && yAxis <= 60)
{
mc.sndManager.playSoundFX("mekanism:etc.Ding", 1.0F, 1.0F);
filter.color = TransporterUtils.increment(filter.color);
}

0
resources/assets/mekanism/sound/etc/ChanSwitch.ogg → resources/assets/mekanism/sound/etc/Ding.ogg
View file