Skip to content

Commit

Permalink
Spotless apply
Browse files Browse the repository at this point in the history
  • Loading branch information
mak8427 committed Jan 28, 2025
1 parent 8b07aec commit c40941f
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 23 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,13 @@
import net.minecraft.entity.player.EntityPlayer;

public interface IKeyHandlerTile {

/**
* Called when a key interaction occurs
*
* @param aKey The key identifier (e.g. KEY_CTRL = 1)
* @param aKey The key identifier (e.g. KEY_CTRL = 1)
* @param aPressed True if key was pressed, false if released
* @param aPlayer The player who triggered the key event
* @param aPlayer The player who triggered the key event
* @return True if the key event was handled
*/
boolean onKeyInteraction(byte aKey, boolean aPressed, EntityPlayer aPlayer);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@
import java.util.List;
import java.util.Map;

import gregtech.api.enums.*;
import gregtech.api.net.GTPacketKeyEvent;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
Expand All @@ -44,6 +42,7 @@

import cpw.mods.fml.common.Optional;
import gregtech.GTMod;
import gregtech.api.enums.*;
import gregtech.api.interfaces.IIconContainer;
import gregtech.api.interfaces.ITexture;
import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
Expand All @@ -53,6 +52,7 @@
import gregtech.api.items.MetaGeneratedTool;
import gregtech.api.metatileentity.BaseMetaPipeEntity;
import gregtech.api.metatileentity.MetaPipeEntity;
import gregtech.api.net.GTPacketKeyEvent;
import gregtech.api.render.TextureFactory;
import gregtech.api.util.CoverBehavior;
import gregtech.api.util.CoverBehaviorBase;
Expand Down Expand Up @@ -472,30 +472,28 @@ public void blockPipeOnSide(ForgeDirection side, EntityPlayer entityPlayer, byte
}
}



@Override
public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer, ForgeDirection side,
float aX, float aY, float aZ) {
float aX, float aY, float aZ) {
if (aBaseMetaTileEntity.isClientSide()) {
if (KeyboardUtil.isCtrlKeyDown()) {
GTUtility.sendChatToPlayer(aPlayer, "Ctrl+Rightclick");
// Send key event packet with player name
GTValues.NW.sendToServer(new GTPacketKeyEvent(
aBaseMetaTileEntity.getXCoord(),
(short) aBaseMetaTileEntity.getYCoord(),
aBaseMetaTileEntity.getZCoord(),
KEY_CTRL,
(byte) 1,
aPlayer.getCommandSenderName()));
GTValues.NW.sendToServer(
new GTPacketKeyEvent(
aBaseMetaTileEntity.getXCoord(),
(short) aBaseMetaTileEntity.getYCoord(),
aBaseMetaTileEntity.getZCoord(),
KEY_CTRL,
(byte) 1,
aPlayer.getCommandSenderName()));
return true;
}
return false;
}
return super.onRightclick(aBaseMetaTileEntity, aPlayer, side, aX, aY, aZ);
}


// Implement the IKeyHandlerTile interface
@Override
public boolean onKeyInteraction(byte aKey, boolean aPressed, EntityPlayer aPlayer) {
Expand All @@ -510,7 +508,6 @@ public boolean onKeyInteraction(byte aKey, boolean aPressed, EntityPlayer aPlaye

if (aPlayer == null) return false;


// Store old state before any changes
byte oldConnections = this.mConnections;
short oldMetaID = (short) te.getMetaTileID();
Expand Down Expand Up @@ -632,7 +629,7 @@ public boolean onKeyInteraction(byte aKey, boolean aPressed, EntityPlayer aPlaye
return false;
}

@Override
@Override
public boolean onWrenchRightClick(ForgeDirection side, ForgeDirection wrenchingSide, EntityPlayer entityPlayer,
float aX, float aY, float aZ, ItemStack aTool) {

Expand Down
15 changes: 9 additions & 6 deletions src/main/java/gregtech/api/net/GTPacketKeyEvent.java
Original file line number Diff line number Diff line change
@@ -1,18 +1,20 @@
package gregtech.api.net;

import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;

import com.google.common.io.ByteArrayDataInput;
import gregtech.GTMod;

import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import gregtech.api.interfaces.tileentity.IKeyHandlerTile;
import gregtech.api.util.GTUtility;
import io.netty.buffer.ByteBuf;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;

public class GTPacketKeyEvent extends GTPacket {

private int mX, mZ;
private short mY;
private byte mKey;
Expand Down Expand Up @@ -82,7 +84,8 @@ public void process(IBlockAccess aWorld) {
// Find the player
EntityPlayer player = null;
for (Object obj : world.playerEntities) {
if (obj instanceof EntityPlayer && ((EntityPlayer) obj).getCommandSenderName().equals(mPlayerName)) {
if (obj instanceof EntityPlayer && ((EntityPlayer) obj).getCommandSenderName()
.equals(mPlayerName)) {
player = (EntityPlayer) obj;
break;
}
Expand Down

0 comments on commit c40941f

Please sign in to comment.