Merge PR #7 from MoreThanHidden/1.10-rv3-rendering - Particle Texture Atlas Added
Merge PR #7 from MoreThanHidden/1.10-rv3-rendering - Particle Texture Atlas Added. Closes #6.
This commit is contained in:
parent
03aa59521c
commit
4c4bdff55c
|
@ -48,12 +48,14 @@ import net.minecraft.world.World;
|
|||
import net.minecraftforge.client.event.ModelBakeEvent;
|
||||
import net.minecraftforge.client.event.MouseEvent;
|
||||
import net.minecraftforge.client.event.RenderLivingEvent;
|
||||
import net.minecraftforge.client.event.TextureStitchEvent;
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
|
||||
|
||||
import appeng.api.parts.CableRenderMode;
|
||||
import appeng.api.util.AEColor;
|
||||
import appeng.block.AEBaseBlock;
|
||||
import appeng.client.render.textures.ParticleTextures;
|
||||
import appeng.client.render.effects.AssemblerFX;
|
||||
import appeng.client.render.effects.CraftingFx;
|
||||
import appeng.client.render.effects.EnergyFx;
|
||||
|
@ -404,6 +406,12 @@ public class ClientHelper extends ServerHelper
|
|||
}
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
public void onTextureStitch( final TextureStitchEvent.Pre event )
|
||||
{
|
||||
ParticleTextures.registerSprite( event );
|
||||
}
|
||||
|
||||
private static class IconReg
|
||||
{
|
||||
public final String name;
|
||||
|
@ -428,6 +436,7 @@ public class ClientHelper extends ServerHelper
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
public static class AEBaseBlockColor implements IBlockColor
|
||||
{
|
||||
|
||||
|
@ -436,9 +445,9 @@ public class ClientHelper extends ServerHelper
|
|||
{
|
||||
return tintIndex;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
public class ItemPaintBallColor implements IItemColor
|
||||
{
|
||||
|
||||
|
@ -463,6 +472,5 @@ public class ClientHelper extends ServerHelper
|
|||
return r << 16 | g << 8 | b | 0xff << 24;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
|
@ -30,6 +30,7 @@ import net.minecraftforge.fml.relauncher.Side;
|
|||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
|
||||
import appeng.api.util.AEPartLocation;
|
||||
import appeng.client.render.textures.ParticleTextures;
|
||||
|
||||
|
||||
@SideOnly( Side.CLIENT )
|
||||
|
@ -51,8 +52,7 @@ public class CraftingFx extends ParticleBreaking
|
|||
this.particleRed = 1;
|
||||
this.particleAlpha = 1.3f;
|
||||
this.particleScale = 1.5f;
|
||||
//TODO 1.10-R - Find exact atlas it was holding and replace this broken code with the atlas.
|
||||
this.particleTextureIndex = ExtraBlockTextures.BlockEnergyParticle.getIcon().getAtlas();
|
||||
this.particleTextureIndex = ParticleTextures.BlockEnergyParticle;
|
||||
this.particleMaxAge /= 1.2;
|
||||
|
||||
this.startBlkX = MathHelper.floor_double( this.posX );
|
||||
|
|
|
@ -30,6 +30,7 @@ import net.minecraftforge.fml.relauncher.Side;
|
|||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
|
||||
import appeng.api.util.AEPartLocation;
|
||||
import appeng.client.render.textures.ParticleTextures;
|
||||
|
||||
|
||||
@SideOnly( Side.CLIENT )
|
||||
|
@ -51,8 +52,7 @@ public class EnergyFx extends ParticleBreaking
|
|||
this.particleRed = 255;
|
||||
this.particleAlpha = 1.4f;
|
||||
this.particleScale = 3.5f;
|
||||
//TODO 1.10-R - Find exact atlas it was holding and replace this broken code with the atlas.
|
||||
this.particleTextureIndex = ExtraBlockTextures.BlockEnergyParticle.getIcon().getAtlas();
|
||||
this.particleTextureIndex = ParticleTextures.BlockEnergyParticle;
|
||||
|
||||
this.startBlkX = MathHelper.floor_double( this.posX );
|
||||
this.startBlkY = MathHelper.floor_double( this.posY );
|
||||
|
|
|
@ -27,6 +27,7 @@ import net.minecraft.item.Item;
|
|||
import net.minecraft.world.World;
|
||||
|
||||
import appeng.api.util.AEPartLocation;
|
||||
import appeng.client.render.textures.ParticleTextures;
|
||||
|
||||
|
||||
public class MatterCannonFX extends ParticleBreaking
|
||||
|
@ -46,8 +47,7 @@ public class MatterCannonFX extends ParticleBreaking
|
|||
this.motionX = 0.0f;
|
||||
this.motionY = 0.0f;
|
||||
this.motionZ = 0.0f;
|
||||
//TODO 1.10-R - Find exact atlas it was holding and replace this broken code with the atlas.
|
||||
this.particleTextureIndex = ExtraBlockTextures.BlockMatterCannonParticle.getIcon().getAtlas();
|
||||
this.particleTextureIndex = ParticleTextures.BlockMatterCannonParticle;
|
||||
}
|
||||
|
||||
public void fromItem( final AEPartLocation d )
|
||||
|
|
|
@ -0,0 +1,19 @@
|
|||
package appeng.client.render.textures;
|
||||
|
||||
|
||||
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraftforge.client.event.TextureStitchEvent;
|
||||
|
||||
|
||||
public class ParticleTextures
|
||||
{
|
||||
public static TextureAtlasSprite BlockEnergyParticle;
|
||||
public static TextureAtlasSprite BlockMatterCannonParticle;
|
||||
|
||||
public static void registerSprite( TextureStitchEvent.Pre event )
|
||||
{
|
||||
BlockEnergyParticle = event.getMap().registerSprite( new ResourceLocation( "appliedenergistics2:blocks/BlockEnergyParticle" ) );
|
||||
BlockMatterCannonParticle = event.getMap().registerSprite( new ResourceLocation( "appliedenergistics2:blocks/BlockMatterCannonParticle" ) );
|
||||
}
|
||||
}
|
Loading…
Reference in a new issue