Refactor packets (#3295)

Co-authored-by: boubou19 <miisterunknown@gmail.com>

2 files changed, 12 insertions, 12 deletions

diff --git a/src/main/java/bartworks/common/tileentities/multis/MTEBioVat.java b/src/main/java/bartworks/common/tileentities/multis/MTEBioVat.java
index b3d4347616..88c5888878 100644
--- a/src/main/java/bartworks/common/tileentities/multis/MTEBioVat.java
+++ b/src/main/java/bartworks/common/tileentities/multis/MTEBioVat.java
@@ -57,11 +57,10 @@ import com.gtnewhorizon.structurelib.structure.StructureDefinition;
 
 import bartworks.API.SideReference;
 import bartworks.API.recipe.BartWorksRecipeMaps;
-import bartworks.MainMod;
 import bartworks.common.configs.Configuration;
 import bartworks.common.items.ItemLabParts;
 import bartworks.common.loaders.FluidLoader;
-import bartworks.common.net.RendererPacket;
+import bartworks.common.net.PacketBioVatRenderer;
 import bartworks.common.tileentities.tiered.GT_MetaTileEntity_RadioHatch;
 import bartworks.util.BWUtil;
 import bartworks.util.BioCulture;
@@ -69,6 +68,7 @@ import bartworks.util.Coords;
 import bartworks.util.MathUtils;
 import bartworks.util.ResultWrongSievert;
 import gregtech.api.GregTechAPI;
+import gregtech.api.enums.GTValues;
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
@@ -390,10 +390,10 @@ public class MTEBioVat extends MTEEnhancedMultiBlockBase<MTEBioVat> implements I
             lCulture == null ? BioCulture.NULLCULTURE.getColorRGB() : lCulture.getColorRGB());
 
         if (SideReference.Side.Server) {
-            MainMod.BW_Network_instance.sendPacketToAllPlayersInRange(
+            GTValues.NW.sendPacketToAllPlayersInRange(
                 this.getBaseMetaTileEntity()
                     .getWorld(),
-                new RendererPacket(
+                new PacketBioVatRenderer(
                     new Coords(
                         xDir + x
                             + this.getBaseMetaTileEntity()
@@ -411,10 +411,10 @@ public class MTEBioVat extends MTEEnhancedMultiBlockBase<MTEBioVat> implements I
                     .getXCoord(),
                 this.getBaseMetaTileEntity()
                     .getZCoord());
-            MainMod.BW_Network_instance.sendPacketToAllPlayersInRange(
+            GTValues.NW.sendPacketToAllPlayersInRange(
                 this.getBaseMetaTileEntity()
                     .getWorld(),
-                new RendererPacket(
+                new PacketBioVatRenderer(
                     new Coords(
                         xDir + x
                             + this.getBaseMetaTileEntity()
@@ -703,10 +703,10 @@ public class MTEBioVat extends MTEEnhancedMultiBlockBase<MTEBioVat> implements I
             for (int x = -1; x < 2; x++) {
                 for (int y = 1; y < 3; y++) {
                     for (int z = -1; z < 2; z++) {
-                        MainMod.BW_Network_instance.sendPacketToAllPlayersInRange(
+                        GTValues.NW.sendPacketToAllPlayersInRange(
                             this.getBaseMetaTileEntity()
                                 .getWorld(),
-                            new RendererPacket(
+                            new PacketBioVatRenderer(
                                 new Coords(
                                     xDir + x
                                         + this.getBaseMetaTileEntity()
diff --git a/src/main/java/bartworks/common/tileentities/multis/MTEElectricImplosionCompressor.java b/src/main/java/bartworks/common/tileentities/multis/MTEElectricImplosionCompressor.java
index 1339c11095..76cf946f85 100644
--- a/src/main/java/bartworks/common/tileentities/multis/MTEElectricImplosionCompressor.java
+++ b/src/main/java/bartworks/common/tileentities/multis/MTEElectricImplosionCompressor.java
@@ -65,15 +65,15 @@ import com.gtnewhorizon.structurelib.structure.StructureDefinition;
 import com.gtnewhorizon.structurelib.structure.StructureUtility;
 
 import bartworks.API.recipe.BartWorksRecipeMaps;
-import bartworks.MainMod;
 import bartworks.client.renderer.EICPistonVisualizer;
 import bartworks.common.configs.Configuration;
-import bartworks.common.net.EICPacket;
+import bartworks.common.net.PacketEIC;
 import bartworks.util.Coords;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import fox.spiteful.avaritia.blocks.LudicrousBlocks;
 import gregtech.api.GregTechAPI;
+import gregtech.api.enums.GTValues;
 import gregtech.api.enums.Mods;
 import gregtech.api.enums.SoundResource;
 import gregtech.api.enums.Textures;
@@ -352,9 +352,9 @@ public class MTEElectricImplosionCompressor extends MTEExtendedPowerMultiBlockBa
 
         if (pistonEnabled && aBaseMetaTileEntity.isActive() && aTick % 20 == 0) {
             if (aBaseMetaTileEntity.isClientSide()) this.animatePiston(aBaseMetaTileEntity);
-            else if (aBaseMetaTileEntity.hasMufflerUpgrade()) MainMod.BW_Network_instance.sendPacketToAllPlayersInRange(
+            else if (aBaseMetaTileEntity.hasMufflerUpgrade()) GTValues.NW.sendPacketToAllPlayersInRange(
                 aBaseMetaTileEntity.getWorld(),
-                new EICPacket(
+                new PacketEIC(
                     new Coords(
                         aBaseMetaTileEntity.getXCoord(),
                         aBaseMetaTileEntity.getYCoord(),