aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/com/detrav/net
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2024-08-30 17:31:24 +0200
committerGitHub <noreply@github.com>2024-08-30 17:31:24 +0200
commit59fbe6b43fb455c546064c554da576f10e364bbe (patch)
treea8881bebec2a461f632af74920146e351fdc36e6 /src/main/java/com/detrav/net
parentf0129bff91127286a06d707056ec8ad4c02309ff (diff)
downloadGT5-Unofficial-59fbe6b43fb455c546064c554da576f10e364bbe.tar.gz
GT5-Unofficial-59fbe6b43fb455c546064c554da576f10e364bbe.tar.bz2
GT5-Unofficial-59fbe6b43fb455c546064c554da576f10e364bbe.zip
Spotless apply for branch mergeDetrav for #2998 (#2999)
spotlessApply Co-authored-by: GitHub GTNH Actions <>
Diffstat (limited to 'src/main/java/com/detrav/net')
-rw-r--r--src/main/java/com/detrav/net/DetravNetwork.java27
-rw-r--r--src/main/java/com/detrav/net/ProspectingPacket.java25
2 files changed, 33 insertions, 19 deletions
diff --git a/src/main/java/com/detrav/net/DetravNetwork.java b/src/main/java/com/detrav/net/DetravNetwork.java
index 75e0a267ab..0b4dbc1af4 100644
--- a/src/main/java/com/detrav/net/DetravNetwork.java
+++ b/src/main/java/com/detrav/net/DetravNetwork.java
@@ -38,7 +38,12 @@ public class DetravNetwork extends MessageToMessageCodec<FMLProxyPacket, DetravP
ByteBuf buf = Unpooled.buffer();
buf.writeByte(msg.getPacketID());
msg.encode(new ByteBufOutputStream(buf));
- out.add(new FMLProxyPacket(buf, ctx.channel().attr(NetworkRegistry.FML_CHANNEL).get()));
+ out.add(
+ new FMLProxyPacket(
+ buf,
+ ctx.channel()
+ .attr(NetworkRegistry.FML_CHANNEL)
+ .get()));
}
@Override
@@ -49,16 +54,22 @@ public class DetravNetwork extends MessageToMessageCodec<FMLProxyPacket, DetravP
}
public void sendToPlayer(DetravPacket aPacket, EntityPlayerMP aPlayer) {
- this.mChannel.get(Side.SERVER).attr(FMLOutboundHandler.FML_MESSAGETARGET)
- .set(FMLOutboundHandler.OutboundTarget.PLAYER);
- this.mChannel.get(Side.SERVER).attr(FMLOutboundHandler.FML_MESSAGETARGETARGS).set(aPlayer);
- this.mChannel.get(Side.SERVER).writeAndFlush(aPacket);
+ this.mChannel.get(Side.SERVER)
+ .attr(FMLOutboundHandler.FML_MESSAGETARGET)
+ .set(FMLOutboundHandler.OutboundTarget.PLAYER);
+ this.mChannel.get(Side.SERVER)
+ .attr(FMLOutboundHandler.FML_MESSAGETARGETARGS)
+ .set(aPlayer);
+ this.mChannel.get(Side.SERVER)
+ .writeAndFlush(aPacket);
}
public void sendToServer(DetravPacket aPacket) {
- this.mChannel.get(Side.CLIENT).attr(FMLOutboundHandler.FML_MESSAGETARGET)
- .set(FMLOutboundHandler.OutboundTarget.TOSERVER);
- this.mChannel.get(Side.CLIENT).writeAndFlush(aPacket);
+ this.mChannel.get(Side.CLIENT)
+ .attr(FMLOutboundHandler.FML_MESSAGETARGET)
+ .set(FMLOutboundHandler.OutboundTarget.TOSERVER);
+ this.mChannel.get(Side.CLIENT)
+ .writeAndFlush(aPacket);
}
@ChannelHandler.Sharable
diff --git a/src/main/java/com/detrav/net/ProspectingPacket.java b/src/main/java/com/detrav/net/ProspectingPacket.java
index bc2f1bc9f2..23e881f86a 100644
--- a/src/main/java/com/detrav/net/ProspectingPacket.java
+++ b/src/main/java/com/detrav/net/ProspectingPacket.java
@@ -67,7 +67,7 @@ public class ProspectingPacket extends DetravPacket {
Materials tMaterial = GregTech_API.sGeneratedMaterials[meta % 1000];
rgba = tMaterial.getRGBA();
name = tMaterial.getLocalizedNameForItem(
- GT_LanguageManager.getTranslation("gt.blockores." + meta + ".name"));
+ GT_LanguageManager.getTranslation("gt.blockores." + meta + ".name"));
} else {
final Werkstoff werkstoff = Werkstoff.werkstoffHashMap.getOrDefault((short) (meta * -1), null);
String translated = GT_LanguageManager.getTranslation("bw.blocktype.ore");
@@ -84,13 +84,14 @@ public class ProspectingPacket extends DetravPacket {
rgba = fluidColors.get((int) meta);
if (rgba == null) {
DetravScannerMod.proxy
- .sendPlayerExeption("Unknown fluid ID = " + meta + " Please add to FluidColors.java!");
+ .sendPlayerExeption("Unknown fluid ID = " + meta + " Please add to FluidColors.java!");
rgba = new short[] { 0, 0, 0, 0 };
}
name = Objects.firstNonNull(
- FluidRegistry.getFluid(meta).getLocalizedName(new FluidStack(FluidRegistry.getFluid(meta), 0)),
- StatCollector.translateToLocal("gui.detrav.scanner.unknown_fluid"));
+ FluidRegistry.getFluid(meta)
+ .getLocalizedName(new FluidStack(FluidRegistry.getFluid(meta), 0)),
+ StatCollector.translateToLocal("gui.detrav.scanner.unknown_fluid"));
} else if (packet.ptype == 3) {
// Pollution
name = StatCollector.translateToLocal("gui.detrav.scanner.pollution");
@@ -108,12 +109,12 @@ public class ProspectingPacket extends DetravPacket {
public static Object decode(InputStream in) throws IOException {
DataInput aData = new DataInputStream(new GZIPInputStream(in));
ProspectingPacket packet = new ProspectingPacket(
- aData.readInt(),
- aData.readInt(),
- aData.readInt(),
- aData.readInt(),
- aData.readInt(),
- aData.readInt());
+ aData.readInt(),
+ aData.readInt(),
+ aData.readInt(),
+ aData.readInt(),
+ aData.readInt(),
+ aData.readInt());
packet.level = aData.readInt();
int aSize = (packet.size * 2 + 1) * 16;
@@ -157,7 +158,9 @@ public class ProspectingPacket extends DetravPacket {
HashMap<Byte, Short> data = map[i][j];
if (data == null) tOut.writeByte(0);
else {
- tOut.writeByte(data.keySet().size());
+ tOut.writeByte(
+ data.keySet()
+ .size());
for (byte key : data.keySet()) {
tOut.writeByte(key);
tOut.writeShort(data.get(key));