Fix many server crashes from client-side code

This commit is contained in:
mezz committed 2017-02-09 02:27:31 -08:00
1 parent f660f213f6
commit b8acba968e
49 files changed
+232 -147

No files matched your search

@@ -4,7 +4,6 @@ import binnie.core.machines.IMachineType;
import binnie.core.machines.Machine;
import binnie.core.machines.MachinePackage;
import binnie.core.machines.TileEntityMachine;
import binnie.core.resource.BinnieResource;
import binnie.core.resource.IBinnieTexture;
import binnie.genetics.Genetics;
import binnie.genetics.machine.inoculator.PackageInoculator;
@@ -13,6 +12,8 @@ import binnie.genetics.machine.polymeriser.PackagePolymeriser;
import binnie.genetics.machine.sequencer.PackageSequencer;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
public enum GeneticMachine implements IMachineType {
Isolator(PackageIsolator.class),
@@ -41,12 +42,12 @@ public enum GeneticMachine implements IMachineType {
}
public abstract static class PackageGeneticBase extends MachinePackage {
BinnieResource renderTexture;
int colour;
private final IBinnieTexture renderTexture;
private final int colour;
protected PackageGeneticBase(final String uid, final IBinnieTexture renderTexture, final int flashColour, final boolean powered) {
super(uid, powered);
this.renderTexture = renderTexture.getTexture();
this.renderTexture = renderTexture;
this.colour = flashColour;
}
@@ -60,6 +61,7 @@ public enum GeneticMachine implements IMachineType {
}
@Override
@SideOnly(Side.CLIENT)
public void renderMachine(Machine machine, double x, double y, double z, float partialTicks, int destroyStage) {
MachineRendererGenetics.instance.renderMachine(machine, x, y, z, partialTicks, destroyStage);
}