Move BW packets to GT & remove CircuitProgrammerPacket

GTNewHorizons · Sep 28, 2024 · a3b3e1b · a3b3e1b
1 parent 968811b
commit a3b3e1b
Show file tree

Hide file tree

Showing 13 changed files with 27 additions and 281 deletions.
diff --git a/src/main/java/bartworks/MainMod.java b/src/main/java/bartworks/MainMod.java
@@ -45,7 +45,6 @@
 import bartworks.common.loaders.RegisterGlassTiers;
 import bartworks.common.loaders.RegisterServerCommands;
 import bartworks.common.loaders.StaticRecipeChangeLoaders;
-import bartworks.common.net.BWNetwork;
 import bartworks.server.EventHandler.ServerEventHandler;
 import bartworks.system.material.CircuitGeneration.CircuitImprintLoader;
 import bartworks.system.material.CircuitGeneration.CircuitPartLoader;
@@ -106,8 +105,6 @@ public final class MainMod {
  @Mod.Instance(MainMod.MOD_ID)
  public static MainMod instance;
 
- public static BWNetwork BW_Network_instance = new BWNetwork();
-
  public MainMod() {
 
  }

diff --git a/src/main/java/bartworks/common/net/BWNetwork.java b/src/main/java/bartworks/common/net/BWNetwork.java
diff --git a/src/main/java/bartworks/common/net/CircuitProgrammerPacket.java b/src/main/java/bartworks/common/net/CircuitProgrammerPacket.java
diff --git a/src/main/java/bartworks/common/net/EICPacket.java b/src/main/java/bartworks/common/net/EICPacket.java
@@ -30,7 +30,7 @@ public EICPacket(Coords coords, boolean bool) {
 
  @Override
  public byte getPacketID() {
- return 5;
+ return 27;
  }
 
  @Override

diff --git a/src/main/java/bartworks/common/net/MetaBlockPacket.java b/src/main/java/bartworks/common/net/MetaBlockPacket.java
@@ -48,7 +48,7 @@ public MetaBlockPacket() {
 
  @Override
  public byte getPacketID() {
- return 2;
+ return 24;
  }
 
  @Override

diff --git a/src/main/java/bartworks/common/net/OreDictCachePacket.java b/src/main/java/bartworks/common/net/OreDictCachePacket.java
@@ -39,7 +39,7 @@ public OreDictCachePacket(HashSet<Pair<Integer, Short>> set) {
 
  @Override
  public byte getPacketID() {
- return 3;
+ return 25;
  }
 
  @Override

diff --git a/src/main/java/bartworks/common/net/RendererPacket.java b/src/main/java/bartworks/common/net/RendererPacket.java
@@ -44,7 +44,7 @@ public RendererPacket(Coords coords, int integer, boolean removal) {
 
  @Override
  public byte getPacketID() {
- return 0;
+ return 23;
  }
 
  @Override

diff --git a/src/main/java/bartworks/common/net/ServerJoinedPacket.java b/src/main/java/bartworks/common/net/ServerJoinedPacket.java
@@ -25,7 +25,7 @@ public class ServerJoinedPacket extends GTPacket {
 
  private byte config;
 
- ServerJoinedPacket() {
+ public ServerJoinedPacket() {
  super();
  }
 
@@ -36,7 +36,7 @@ public ServerJoinedPacket(Object obj) {
 
  @Override
  public byte getPacketID() {
- return 4;
+ return 26;
  }
 
  @Override

diff --git a/src/main/java/bartworks/common/tileentities/multis/MTEBioVat.java b/src/main/java/bartworks/common/tileentities/multis/MTEBioVat.java
@@ -57,7 +57,6 @@
 
 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;
@@ -69,6 +68,7 @@
 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,7 +390,7 @@ private void sendPackagesOrRenewRenderer(int x, int y, int z, BioCulture lCultur
  lCulture == null ? BioCulture.NULLCULTURE.getColorRGB() : lCulture.getColorRGB());
 
  if (SideReference.Side.Server) {
- MainMod.BW_Network_instance.sendPacketToAllPlayersInRange(
+ GTValues.NW.sendPacketToAllPlayersInRange(
  this.getBaseMetaTileEntity()
  .getWorld(),
  new RendererPacket(
@@ -411,7 +411,7 @@ private void sendPackagesOrRenewRenderer(int x, int y, int z, BioCulture lCultur
  .getXCoord(),
  this.getBaseMetaTileEntity()
  .getZCoord());
- MainMod.BW_Network_instance.sendPacketToAllPlayersInRange(
+ GTValues.NW.sendPacketToAllPlayersInRange(
  this.getBaseMetaTileEntity()
  .getWorld(),
  new RendererPacket(
@@ -703,7 +703,7 @@ private void sendRenderPackets(int xDir, int zDir) {
  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(