diff options
| author | miozune <miozune@gmail.com> | 2022-07-15 14:34:19 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-15 06:34:19 +0100 |
| commit | c0eb617fa5c146b7a222c5461faf14394508cf4b (patch) | |
| tree | e25d23490122b5c663fd4e2791a81704c0183b00 /src/main/java/goodgenerator/network | |
| parent | 36301feacf5a33ded24d338ae39985da6080d2bb (diff) | |
| download | GT5-Unofficial-c0eb617fa5c146b7a222c5461faf14394508cf4b.tar.gz GT5-Unofficial-c0eb617fa5c146b7a222c5461faf14394508cf4b.tar.bz2 GT5-Unofficial-c0eb617fa5c146b7a222c5461faf14394508cf4b.zip | |
Expand item limit for Neutron Activator & Add back Low Quality Naquadria Sulphate to the outputs from Concentrated Enriched-Naquadah Sludge (#53)
* Expand item limit for Neutron Activator & Add back Low Quality Naquadria Sulphate to the outputs from Concentrated Enriched-Naquadah Sludge
* updateBuildScript & spotlessApply
Diffstat (limited to 'src/main/java/goodgenerator/network')
4 files changed, 12 insertions, 20 deletions
diff --git a/src/main/java/goodgenerator/network/MessageMTEBase.java b/src/main/java/goodgenerator/network/MessageMTEBase.java index 65a86573d6..aad0128742 100644 --- a/src/main/java/goodgenerator/network/MessageMTEBase.java +++ b/src/main/java/goodgenerator/network/MessageMTEBase.java @@ -41,8 +41,7 @@ public abstract class MessageMTEBase implements IMessage { protected short y; protected int z; - public MessageMTEBase() { - } + public MessageMTEBase() {} public MessageMTEBase(IGregTechTileEntity tile) { this.w = tile.getWorld().provider.dimensionId; @@ -67,7 +66,8 @@ public abstract class MessageMTEBase implements IMessage { buf.writeInt(w); } - public static abstract class Handler<REQ extends MessageMTEBase, REPLY extends IMessage> implements IMessageHandler<REQ, REPLY> { + public abstract static class Handler<REQ extends MessageMTEBase, REPLY extends IMessage> + implements IMessageHandler<REQ, REPLY> { protected abstract REPLY onError(REQ message, MessageContext ctx); protected abstract REPLY onSuccess(REQ message, MessageContext ctx, IMetaTileEntity mte); @@ -79,17 +79,14 @@ public abstract class MessageMTEBase implements IMessage { world = DimensionManager.getWorld(message.w); } else { world = TecTech.proxy.getClientWorld(); - if (world.provider.dimensionId != message.w) - return onError(message, ctx); + if (world.provider.dimensionId != message.w) return onError(message, ctx); } - if (world == null) - return onError(message, ctx); + if (world == null) return onError(message, ctx); if (world.blockExists(message.x, message.y, message.z)) { TileEntity te = world.getTileEntity(message.x, message.y, message.z); if (te instanceof IGregTechTileEntity && !((IGregTechTileEntity) te).isInvalidTileEntity()) { IMetaTileEntity mte = ((IGregTechTileEntity) te).getMetaTileEntity(); - if (mte != null) - return onSuccess(message, ctx, mte); + if (mte != null) return onSuccess(message, ctx, mte); } } return onError(message, ctx); diff --git a/src/main/java/goodgenerator/network/MessageOpenNeutronSensorGUI.java b/src/main/java/goodgenerator/network/MessageOpenNeutronSensorGUI.java index ec0c40d4e1..634864564d 100644 --- a/src/main/java/goodgenerator/network/MessageOpenNeutronSensorGUI.java +++ b/src/main/java/goodgenerator/network/MessageOpenNeutronSensorGUI.java @@ -1,10 +1,10 @@ package goodgenerator.network; -import goodgenerator.blocks.tileEntity.GTMetaTileEntity.NeutronSensor; import com.github.technus.tectech.TecTech; import cpw.mods.fml.common.network.ByteBufUtils; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import goodgenerator.blocks.tileEntity.GTMetaTileEntity.NeutronSensor; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import io.netty.buffer.ByteBuf; @@ -12,8 +12,7 @@ import io.netty.buffer.ByteBuf; public class MessageOpenNeutronSensorGUI extends MessageMTEBase { protected String data; - public MessageOpenNeutronSensorGUI() { - } + public MessageOpenNeutronSensorGUI() {} public MessageOpenNeutronSensorGUI(IGregTechTileEntity tile, String data) { super(tile); diff --git a/src/main/java/goodgenerator/network/MessageResetTileTexture.java b/src/main/java/goodgenerator/network/MessageResetTileTexture.java index dd729af662..e078891c40 100644 --- a/src/main/java/goodgenerator/network/MessageResetTileTexture.java +++ b/src/main/java/goodgenerator/network/MessageResetTileTexture.java @@ -11,8 +11,7 @@ public class MessageResetTileTexture extends MessageMTEBase { protected int index; - public MessageResetTileTexture(){ - } + public MessageResetTileTexture() {} public MessageResetTileTexture(IGregTechTileEntity tile, int index) { super(tile); @@ -47,5 +46,4 @@ public class MessageResetTileTexture extends MessageMTEBase { return null; } } - } diff --git a/src/main/java/goodgenerator/network/MessageSetNeutronSensorData.java b/src/main/java/goodgenerator/network/MessageSetNeutronSensorData.java index e802e9477e..a3e2d30d60 100644 --- a/src/main/java/goodgenerator/network/MessageSetNeutronSensorData.java +++ b/src/main/java/goodgenerator/network/MessageSetNeutronSensorData.java @@ -1,11 +1,11 @@ package goodgenerator.network; -import goodgenerator.blocks.tileEntity.GTMetaTileEntity.NeutronSensor; import com.github.technus.tectech.TecTech; import cpw.mods.fml.common.network.ByteBufUtils; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import cpw.mods.fml.relauncher.Side; +import goodgenerator.blocks.tileEntity.GTMetaTileEntity.NeutronSensor; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import io.netty.buffer.ByteBuf; @@ -13,8 +13,7 @@ import io.netty.buffer.ByteBuf; public class MessageSetNeutronSensorData extends MessageMTEBase { protected String data; - public MessageSetNeutronSensorData() { - } + public MessageSetNeutronSensorData() {} public MessageSetNeutronSensorData(IGregTechTileEntity tile, String data) { super(tile); @@ -43,8 +42,7 @@ public class MessageSetNeutronSensorData extends MessageMTEBase { protected IMessage onSuccess(MessageSetNeutronSensorData message, MessageContext ctx, IMetaTileEntity mte) { if (mte instanceof NeutronSensor) { ((NeutronSensor) mte).setText(message.data); - if (ctx.side == Side.CLIENT) - mte.getBaseMetaTileEntity().openGUI(TecTech.proxy.getPlayer()); + if (ctx.side == Side.CLIENT) mte.getBaseMetaTileEntity().openGUI(TecTech.proxy.getPlayer()); } return null; } |
