effect cleanup
This commit is contained in:
parent
319e27870f
commit
936154e5ce
35 changed files with 1182 additions and 1741 deletions
|
@ -59,6 +59,7 @@ import client.network.ClientPlayer;
|
|||
import client.network.DummyConnection;
|
||||
import client.renderer.BlockRenderer;
|
||||
import client.renderer.Drawing;
|
||||
import client.renderer.EffectRenderer;
|
||||
import client.renderer.EntityRenderer;
|
||||
import client.renderer.GlState;
|
||||
import client.renderer.ItemRenderer;
|
||||
|
@ -68,7 +69,6 @@ import client.renderer.blockmodel.ModelManager;
|
|||
import client.renderer.chunk.RenderChunk;
|
||||
import client.renderer.entity.RenderItem;
|
||||
import client.renderer.entity.RenderManager;
|
||||
import client.renderer.particle.EffectRenderer;
|
||||
import client.renderer.texture.ColormapLoader;
|
||||
import client.renderer.texture.EntityTexManager;
|
||||
import client.renderer.texture.TextureManager;
|
||||
|
@ -696,7 +696,7 @@ public class Client implements IThreadListener {
|
|||
this.renderGlobal = new RenderGlobal(this);
|
||||
this.renderGlobal.onReload();
|
||||
EntityTexManager.loadNpcTextures();
|
||||
this.effectRenderer = new EffectRenderer(this.world, this.textureManager);
|
||||
this.effectRenderer = new EffectRenderer(this.textureManager);
|
||||
}
|
||||
|
||||
public void start()
|
||||
|
@ -898,7 +898,7 @@ public class Client implements IThreadListener {
|
|||
{
|
||||
this.world.displayTick(ExtMath.floord(this.player.posX), ExtMath.floord(this.player.posY), ExtMath.floord(this.player.posZ));
|
||||
}
|
||||
this.effectRenderer.updateEffects();
|
||||
this.effectRenderer.update();
|
||||
}
|
||||
else if (this.connection != null)
|
||||
{
|
||||
|
@ -1378,7 +1378,7 @@ public class Client implements IThreadListener {
|
|||
|
||||
if (this.world.getState(blockpos).getBlock() != Blocks.air && this.controller.damageBlock(blockpos, this.pointed.side))
|
||||
{
|
||||
this.effectRenderer.addBlockHitEffects(blockpos, this.pointed.side);
|
||||
this.effectRenderer.damageBlock(blockpos, this.pointed.side);
|
||||
this.player.swingItem();
|
||||
}
|
||||
}
|
||||
|
@ -1604,7 +1604,7 @@ public class Client implements IThreadListener {
|
|||
|
||||
if (this.effectRenderer != null)
|
||||
{
|
||||
this.effectRenderer.clearEffects(world);
|
||||
this.effectRenderer.setWorld(world);
|
||||
}
|
||||
|
||||
if (this.player == null)
|
||||
|
@ -1898,7 +1898,7 @@ public class Client implements IThreadListener {
|
|||
// this.connected != null ? this.connected : "[???]"))),
|
||||
this.renderGlobal.getDebugInfoRenders() + "\n" +
|
||||
this.renderGlobal.getDebugInfoEntities() + "\n" +
|
||||
"Partikel: " + this.effectRenderer.getStatistics() + ". O: " + this.world.getDebugLoadedEntities() + "\n" +
|
||||
"Partikel: " + this.effectRenderer.getParticleCount() + ". O: " + this.world.getDebugLoadedEntities() + "\n" +
|
||||
this.world.getInfo() + "\n" +
|
||||
// "",
|
||||
String.format("XYZ: %.3f / %.3f / %.3f", this.viewEntity.posX,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue