Removed galacticraft dependency for laser render (#2868)

* Removed cursed galacticraft dependency. Sorry mitch :(

* spotless

* Spotless

* Update GT_Loader_MetaTileEntities.java

---------

Co-authored-by: ah-OOG-ah <75745146+ah-OOG-ah@users.noreply.github.com>

5 files changed, 33 insertions, 53 deletions

diff --git a/src/main/java/gregtech/common/GT_Client.java b/src/main/java/gregtech/common/GT_Client.java
index 0ad831b2e1..0bf578e303 100644
--- a/src/main/java/gregtech/common/GT_Client.java
+++ b/src/main/java/gregtech/common/GT_Client.java
@@ -62,7 +62,6 @@ import gregtech.api.GregTech_API;
 import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Materials;
-import gregtech.api.enums.Mods;
 import gregtech.api.enums.SoundResource;
 import gregtech.api.gui.GT_GUIColorOverride;
 import gregtech.api.gui.modularui.FallbackableSteamTexture;
@@ -625,10 +624,9 @@ public class GT_Client extends GT_Proxy implements Runnable {
         GT_Renderer_Block.register();
         new GT_MultiTile_Renderer();
         new GT_RenderDrone();
+        new GT_LaserRenderer();
         new GT_WormholeRenderer();
-        if (Mods.GalacticraftCore.isModLoaded()) {
-            new GT_LaserRenderer();
-        }
+
         metaGeneratedItemRenderer = new GT_MetaGenerated_Item_Renderer();
         for (GT_MetaGenerated_Item item : GT_MetaGenerated_Item.sInstances.values()) {
             metaGeneratedItemRenderer.registerItem(item);
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_IndustrialLaserEngraver.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_IndustrialLaserEngraver.java
index 2390d690aa..816a35f557 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_IndustrialLaserEngraver.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_IndustrialLaserEngraver.java
@@ -254,10 +254,10 @@ public class GT_MetaTileEntity_IndustrialLaserEngraver
     protected GT_Multiblock_Tooltip_Builder createTooltip() {
         GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
         tt.addMachineType("Laser Engraver")
-            .addInfo("Controller Block for the High Energy Laser Emitter")
+            .addInfo("Controller Block for the Hyper-Intensity Laser Engraver")
             .addInfo("200% faster than single block machines of the same voltage")
             .addInfo("Uses 80% of the EU normally required")
-            .addInfo("Laser source hatch determines maximum power tier and parallels")
+            .addInfo("Laser source hatch determines maximum recipe tier and parallels")
             .addInfo("Parallels equal to the cube root of laser source amperage input")
             .addInfo("Glass tier determines maximum laser source tier")
             .addInfo("Only accepts borosilicate glass (no, really)")
diff --git a/src/main/java/gregtech/common/tileentities/render/TileLaser.java b/src/main/java/gregtech/common/tileentities/render/TileLaser.java
index b7457353f4..848eecdcf2 100644
--- a/src/main/java/gregtech/common/tileentities/render/TileLaser.java
+++ b/src/main/java/gregtech/common/tileentities/render/TileLaser.java
@@ -1,28 +1,21 @@
 package gregtech.common.tileentities.render;
 
 import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.network.NetworkManager;
+import net.minecraft.network.Packet;
+import net.minecraft.network.play.server.S35PacketUpdateTileEntity;
+import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.common.util.ForgeDirection;
 
 import com.gtnewhorizon.structurelib.alignment.enumerable.Flip;
 import com.gtnewhorizon.structurelib.alignment.enumerable.Rotation;
 
-import cpw.mods.fml.relauncher.Side;
-import micdoodle8.mods.galacticraft.core.tile.TileEntityAdvanced;
-import micdoodle8.mods.galacticraft.core.util.Annotations;
+public class TileLaser extends TileEntity {
 
-// This should either move to gt5u tiles, or get moved to GTNH-Intergalactic
-public class TileLaser extends TileEntityAdvanced {
-
-    @Annotations.NetworkedField(targetSide = Side.CLIENT)
     public boolean shouldRender = false;
-    @Annotations.NetworkedField(targetSide = Side.CLIENT)
     public float red = 0, green = 0, blue = 0;
-    @Annotations.NetworkedField(targetSide = Side.CLIENT)
     public float counter = 0F;
-    @Annotations.NetworkedField(targetSide = Side.CLIENT)
     public boolean realism = false;
-    @Annotations.NetworkedField(targetSide = Side.CLIENT)
     public double rotAxisX = 0, rotAxisY = 0, rotAxisZ = 0, rotationAngle = 0;
 
     @Override
@@ -55,11 +48,13 @@ public class TileLaser extends TileEntityAdvanced {
         this.red = red;
         this.green = green;
         this.blue = blue;
+        worldObj.markBlockForUpdate(xCoord, yCoord, zCoord);
     }
 
     public void setRotationFields(ForgeDirection direction, Rotation rotation, Flip flip) {
         setRotationAngle(rotation, flip);
         setRotationAxis(direction);
+        worldObj.markBlockForUpdate(xCoord, yCoord, zCoord);
     }
 
     private void setRotationAngle(Rotation rotation, Flip flip) {
@@ -70,16 +65,19 @@ public class TileLaser extends TileEntityAdvanced {
             case COUNTER_CLOCKWISE -> rotationAngle = -90 * invert;
             case UPSIDE_DOWN -> rotationAngle = 180;
         }
+        worldObj.markBlockForUpdate(xCoord, yCoord, zCoord);
     }
 
     public void setRotationAxis(ForgeDirection direction) {
         rotAxisX = direction.offsetX;
         rotAxisY = direction.offsetY;
         rotAxisZ = direction.offsetZ;
+        worldObj.markBlockForUpdate(xCoord, yCoord, zCoord);
     }
 
     public void setShouldRender(boolean shouldRender) {
         this.shouldRender = shouldRender;
+        worldObj.markBlockForUpdate(xCoord, yCoord, zCoord);
     }
 
     public Boolean getShouldRender() {
@@ -99,27 +97,20 @@ public class TileLaser extends TileEntityAdvanced {
     }
 
     @Override
-    public AxisAlignedBB getRenderBoundingBox() {
-        return INFINITE_EXTENT_AABB;
-    }
-
-    @Override
-    public double getMaxRenderDistanceSquared() {
-        return 65536;
+    public Packet getDescriptionPacket() {
+        NBTTagCompound nbttagcompound = new NBTTagCompound();
+        writeToNBT(nbttagcompound);
+        return new S35PacketUpdateTileEntity(xCoord, yCoord, zCoord, 1, nbttagcompound);
     }
 
     @Override
-    public double getPacketRange() {
-        return 128;
+    public void onDataPacket(NetworkManager net, S35PacketUpdateTileEntity pkt) {
+        readFromNBT(pkt.func_148857_g());
+        worldObj.markBlockRangeForRenderUpdate(xCoord, yCoord, zCoord, xCoord, yCoord, zCoord);
     }
 
     @Override
-    public int getPacketCooldown() {
-        return 20;
-    }
-
-    @Override
-    public boolean isNetworkedTile() {
-        return true;
+    public double getMaxRenderDistanceSquared() {
+        return 4096;
     }
 }
diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java b/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java
index f22633ecd0..4b412e2796 100644
--- a/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java
+++ b/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java
@@ -38,7 +38,6 @@ import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.MaterialsKevlar;
 import gregtech.api.enums.MaterialsUEVplus;
-import gregtech.api.enums.Mods;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.enums.SubTag;
 import gregtech.api.fluid.GT_FluidFactory;
@@ -555,12 +554,9 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable {
         GregTech_API.sDroneRender = new GT_Block_Drone();
         GregTech_API.sBlockGlass1 = new GT_Block_Glass1();
         GregTech_API.sBlockTintedGlass = new GT_Block_TintedIndustrialGlass();
+        GregTech_API.sLaserRender = new GT_Block_Laser();
         GregTech_API.sWormholeRender = new GT_WormholeRenderBlock();
-        if (Mods.GalacticraftCore.isModLoaded()) {
-            GregTech_API.sLaserRender = new GT_Block_Laser();
-        } else {
-            GregTech_API.sLaserRender = null;
-        }
+
         // meta ID order, DO NOT CHANGE ORDER
 
         GregTech_API.sBlockMetal1 = new GT_Block_Metal(
@@ -687,14 +683,12 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable {
         GT_Log.out.println("GT_Mod: Registering the DroneRender.");
         GameRegistry.registerTileEntity(TileDrone.class, "DroneRender");
 
+        GT_Log.out.println("GT_Mod: Registering the LaserRender.");
+        GameRegistry.registerTileEntity(TileLaser.class, "LaserRenderer");
+
         GT_Log.out.println("GT_Mod: Registering the WormholeRender.");
         GameRegistry.registerTileEntity(TileWormhole.class, "WormholeRender");
 
-        if (Mods.GalacticraftCore.isModLoaded()) {
-            GT_Log.out.println("GT_Mod: Registering the LaserRender.");
-            GameRegistry.registerTileEntity(TileLaser.class, "LaserRenderer");
-        }
-
         GT_Log.out.println("GT_Mod: Registering the BaseMetaPipeEntity.");
         GameRegistry.registerTileEntity(BaseMetaPipeEntity.class, "BaseMetaPipeEntity");
         FMLInterModComms.sendMessage(AppliedEnergistics2.ID, "whitelist-spatial", BaseMetaPipeEntity.class.getName());
diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java b/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
index 35cc7af6ad..d3644c5efe 100644
--- a/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
+++ b/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
@@ -483,7 +483,6 @@ import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.MaterialsUEVplus;
-import gregtech.api.enums.Mods;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Cable;
 import gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Fluid;
@@ -1139,13 +1138,11 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 "multimachine.wormhole",
                 "Miniature Wormhole Generator").getStackForm(1));
 
-        if (Mods.GalacticraftCore.isModLoaded()) {
-            ItemList.Machine_Multi_IndustrialLaserEngraver.set(
-                new GT_MetaTileEntity_IndustrialLaserEngraver(
-                    INDUSTRIAL_LASER_ENGRAVER_CONTROLLER.ID,
-                    "multimachine.engraver",
-                    "High Energy Laser Emitter").getStackForm(1));
-        }
+        ItemList.Machine_Multi_IndustrialLaserEngraver.set(
+            new GT_MetaTileEntity_IndustrialLaserEngraver(
+                INDUSTRIAL_LASER_ENGRAVER_CONTROLLER.ID,
+                "multimachine.engraver",
+                "Hyper-Intensity Laser Emitter").getStackForm(1));
 
         ItemList.Machine_Multi_Lathe.set(
             new GT_MetaTileEntity_MultiLathe(