mirror of
https://github.com/GTNewHorizons/EnderIO.git
synced 2026-11-20 12:19:55 +00:00
More bug fixes.
This commit is contained in:
1 parent
78d828aff8
commit
ffc97bf3ed
5 files changed
+42
-30
No files matched your search
@@ -425,7 +425,7 @@ public class BlockConduitBundle extends BlockEio implements IGuiHandler {
|
||||
return false;
|
||||
}
|
||||
|
||||
if(PainterUtil.getSourceBlock(player.getCurrentEquippedItem()) != null) {
|
||||
if(PainterUtil.getSourceBlock(player.getCurrentEquippedItem()) == null) {
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
@@ -8,8 +8,7 @@ public enum ConduitDisplayMode {
|
||||
POWER,
|
||||
REDSTONE,
|
||||
ITEM,
|
||||
FLUID,
|
||||
ME;
|
||||
FLUID;
|
||||
|
||||
public static ConduitDisplayMode next(ConduitDisplayMode mode) {
|
||||
int index = mode.ordinal() + 1;
|
||||
|
||||
@@ -63,8 +63,6 @@ public class YetaWrenchOverlayRenderer {
|
||||
IconEIO.WRENCH_OVERLAY_ITEM.renderIcon(offsetX + 32, offsetY - 32, 16, 16, 0, true);
|
||||
} else if(mode == ConduitDisplayMode.REDSTONE) {
|
||||
IconEIO.WRENCH_OVERLAY_REDSTONE.renderIcon(offsetX + 16, offsetY - 32, 16, 16, 0, true);
|
||||
} else if(mode == ConduitDisplayMode.ME) {
|
||||
IconEIO.WRENCH_OVERLAY_ME.renderIcon(offsetX + 24, offsetY - 16, 16, 16, 0, true);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -28,7 +28,7 @@ public class YetaWrenchPacketProcessor implements IPacketEio {
|
||||
|
||||
@Override
|
||||
public void decode(ChannelHandlerContext ctx, ByteBuf buffer) {
|
||||
slot = buffer.readShort();
|
||||
slot = buffer.readInt();
|
||||
mode = ConduitDisplayMode.values()[buffer.readShort()];
|
||||
}
|
||||
|
||||
|
||||
@@ -8,6 +8,7 @@ import org.lwjgl.input.Mouse;
|
||||
|
||||
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
|
||||
import cpw.mods.fml.common.gameevent.TickEvent;
|
||||
import cpw.mods.fml.common.gameevent.TickEvent.Phase;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import crazypants.enderio.EnderIO;
|
||||
@@ -20,33 +21,47 @@ public class YetaWrenchTickHandler {
|
||||
@SideOnly(Side.CLIENT)
|
||||
@SubscribeEvent
|
||||
public void onClientTick(TickEvent.ClientTickEvent event) {
|
||||
EntityClientPlayerMP player = Minecraft.getMinecraft().thePlayer;
|
||||
if(player != null) {
|
||||
if(slotSelected > -1 && dWheel != Mouse.getDWheel()) {
|
||||
player.inventory.currentItem = slotSelected;
|
||||
Minecraft.getMinecraft().playerController.updateController();
|
||||
|
||||
ItemStack stack = player.inventory.getStackInSlot(slotSelected);
|
||||
ConduitDisplayMode curMode = ConduitDisplayMode.getDisplayMode(stack);
|
||||
if(curMode == null) {
|
||||
curMode = ConduitDisplayMode.ALL;
|
||||
}
|
||||
|
||||
int dif = dWheel - Mouse.getDWheel();
|
||||
ConduitDisplayMode newMode = null;
|
||||
if(dif < 0) {
|
||||
newMode = curMode.next();
|
||||
ConduitDisplayMode.setDisplayMode(stack, newMode);
|
||||
} else if(dif > 0) {
|
||||
newMode = curMode.previous();
|
||||
ConduitDisplayMode.setDisplayMode(stack, newMode);
|
||||
}
|
||||
if(newMode != null) {
|
||||
EnderIO.packetPipeline.sendToServer(new YetaWrenchPacketProcessor(slotSelected, newMode));
|
||||
}
|
||||
if(event.phase == Phase.START) {
|
||||
dWheel = Mouse.getDWheel() / 120;
|
||||
EntityClientPlayerMP player = Minecraft.getMinecraft().thePlayer;
|
||||
if(player != null && player.getCurrentEquippedItem() != null && player.getCurrentEquippedItem().getItem() instanceof ItemYetaWrench
|
||||
&& player.isSneaking()) {
|
||||
slotSelected = player.inventory.currentItem;
|
||||
} else {
|
||||
slotSelected = -1;
|
||||
}
|
||||
slotSelected = -1;
|
||||
} else {
|
||||
|
||||
EntityClientPlayerMP player = Minecraft.getMinecraft().thePlayer;
|
||||
if(player != null) {
|
||||
if(slotSelected > -1 && dWheel != Mouse.getDWheel()) {
|
||||
|
||||
player.inventory.currentItem = slotSelected;
|
||||
Minecraft.getMinecraft().playerController.updateController();
|
||||
|
||||
ItemStack stack = player.inventory.getStackInSlot(slotSelected);
|
||||
ConduitDisplayMode curMode = ConduitDisplayMode.getDisplayMode(stack);
|
||||
if(curMode == null) {
|
||||
curMode = ConduitDisplayMode.ALL;
|
||||
}
|
||||
|
||||
int dif = dWheel - Mouse.getDWheel();
|
||||
ConduitDisplayMode newMode = null;
|
||||
if(dif < 0) {
|
||||
newMode = curMode.next();
|
||||
ConduitDisplayMode.setDisplayMode(stack, newMode);
|
||||
} else if(dif > 0) {
|
||||
newMode = curMode.previous();
|
||||
ConduitDisplayMode.setDisplayMode(stack, newMode);
|
||||
}
|
||||
if(newMode != null) {
|
||||
EnderIO.packetPipeline.sendToServer(new YetaWrenchPacketProcessor(slotSelected, newMode));
|
||||
}
|
||||
}
|
||||
slotSelected = -1;
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user