Merge remote-tracking branch 'origin/Optimization' into Optimization

# Conflicts:
#	src/main/java/com/hbm/tileentity/TileEntityMachineBase.java
#	src/main/java/com/hbm/tileentity/TileEntityTickingBase.java
#	src/main/java/com/hbm/tileentity/machine/TileEntityMachineAutosaw.java
#	src/main/java/com/hbm/tileentity/machine/TileEntityMachineRadarScreen.java
#	src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKRod.java
#	src/main/java/com/hbm/tileentity/network/TileEntityRequestNetworkContainer.java
This commit is contained in:
BallOfEnergy 2024-09-06 22:26:53 -05:00
commit 11a4d5ccf7
2 changed files with 2 additions and 2 deletions

View File

@ -153,7 +153,7 @@ public abstract class TileEntityMachineBase extends TileEntityLoadedBase impleme
if(!worldObj.isRemote) PacketDispatcher.wrapper.sendToAllAround(new AuxGaugePacket(xCoord, yCoord, zCoord, val, id), new TargetPoint(this.worldObj.provider.dimensionId, xCoord, yCoord, zCoord, range));
}
@Deprecated public void processGauge(int val, int id) { }
/** Sends a sync packet that uses ByteBuf for efficient information-cramming */
public void networkPackNT(int range) {
if(!worldObj.isRemote) PacketDispatcher.wrapper.sendToAllAround(new BufPacket(xCoord, yCoord, zCoord, this), new TargetPoint(this.worldObj.provider.dimensionId, xCoord, yCoord, zCoord, range));

View File

@ -200,7 +200,7 @@ public class TileEntityRBMKRod extends TileEntityRBMKSlottedBase implements IRBM
Vec3 neutronVector = Vec3.createVectorHelper(dir.offsetX, dir.offsetY, dir.offsetZ);
// Create new neutron streams
new RBMKNeutronStream(node, neutronVector, flux, ratio);
new RBMKNeutronHandler.RBMKNeutronStream(node, neutronVector, flux, ratio);
}
}