tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

This should stop the servercrashing issue

Browse source
This commit is contained in:
Ben Spiers 2014-07-22 18:03:34 +01:00
parent a2bb224bf5
commit dd421f7308
3 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/main/java/mekanism/api/lasers/LaserManager.java
View file

@ -2,6 +2,7 @@ package mekanism.api.lasers;
import mekanism.api.Coord4D; import mekanism.api.Coord4D;
import mekanism.client.entity.EntityLaser; import mekanism.client.entity.EntityLaser;
import mekanism.common.Mekanism;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.particle.EntityNoteFX; import net.minecraft.client.particle.EntityNoteFX;
@ -39,11 +40,11 @@ public class LaserManager
} }
} }
renderLaser(world, from, new Coord4D(mop.blockX, mop.blockY, mop.blockZ), direction); Mekanism.proxy.renderLaser(world, from, new Coord4D(mop.blockX, mop.blockY, mop.blockZ), direction);
} }
else else
{ {
renderLaser(world, from, to, direction); Mekanism.proxy.renderLaser(world, from, to, direction);
} }
} }

8
src/main/java/mekanism/client/ClientProxy.java
View file

@ -4,6 +4,7 @@ import java.io.File;
import java.util.HashMap; import java.util.HashMap;
import mekanism.api.Coord4D; import mekanism.api.Coord4D;
import mekanism.client.entity.EntityLaser;
import mekanism.client.gui.GuiChemicalCrystallizer; import mekanism.client.gui.GuiChemicalCrystallizer;
import mekanism.client.gui.GuiChemicalDissolutionChamber; import mekanism.client.gui.GuiChemicalDissolutionChamber;
import mekanism.client.gui.GuiChemicalInfuser; import mekanism.client.gui.GuiChemicalInfuser;
@ -147,6 +148,7 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.client.MinecraftForgeClient; import net.minecraftforge.client.MinecraftForgeClient;
import net.minecraftforge.common.config.Configuration; import net.minecraftforge.common.config.Configuration;
import net.minecraftforge.common.util.ForgeDirection;
import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.client.FMLClientHandler;
import cpw.mods.fml.client.registry.ClientRegistry; import cpw.mods.fml.client.registry.ClientRegistry;
import cpw.mods.fml.client.registry.RenderingRegistry; import cpw.mods.fml.client.registry.RenderingRegistry;
@ -583,4 +585,10 @@ public class ClientProxy extends CommonProxy
return Minecraft.getMinecraft().thePlayer; return Minecraft.getMinecraft().thePlayer;
} }
} }
@Override
public void renderLaser(World world, Coord4D from, Coord4D to, ForgeDirection direction)
{
Minecraft.getMinecraft().effectRenderer.addEffect(new EntityLaser(world, from, to, direction));
}
} }

4
src/main/java/mekanism/common/CommonProxy.java
View file

@ -2,6 +2,7 @@ package mekanism.common;
import java.io.File; import java.io.File;
import mekanism.api.Coord4D;
import mekanism.api.MekanismAPI; import mekanism.api.MekanismAPI;
import mekanism.common.EnergyDisplay.EnergyType; import mekanism.common.EnergyDisplay.EnergyType;
import mekanism.common.entity.EntityRobit; import mekanism.common.entity.EntityRobit;
@ -85,6 +86,7 @@ import net.minecraft.inventory.Container;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.common.config.Configuration; import net.minecraftforge.common.config.Configuration;
import net.minecraftforge.common.util.ForgeDirection;
import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.network.simpleimpl.MessageContext; import cpw.mods.fml.common.network.simpleimpl.MessageContext;
import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.common.registry.GameRegistry;
@ -471,4 +473,6 @@ public class CommonProxy
{ {
return context.getServerHandler().playerEntity; return context.getServerHandler().playerEntity;
} }
public void renderLaser(World world, Coord4D from, Coord4D to, ForgeDirection direction) {}
} }