fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed old renamer

Browse Source
This commit is contained in:
thatsIch
2015-06-26 22:13:04 +02:00
parent 0e378d8ad4
commit 4e863e7d90
18 changed files with 432 additions and 530 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/client/ClientHelper.java
+300 -285
View File
@@ -27,6 +27,8 @@ import java.util.List;
import java.util.Map;
import java.util.Random;
import org.lwjgl.opengl.GL11;
import net.minecraft.block.Block;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.ItemMeshDefinition;
@@ -55,8 +57,6 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.fml.common.registry.GameRegistry;
import net.minecraftforge.fml.common.registry.GameRegistry.UniqueIdentifier;
import org.lwjgl.opengl.GL11;
import appeng.api.parts.CableRenderMode;
import appeng.api.parts.IPartItem;
import appeng.api.util.AEColor;
@@ -101,104 +101,34 @@ public class ClientHelper extends ServerHelper
private static final RenderItem ITEM_RENDERER = Minecraft.getMinecraft().getRenderItem();
private static final ModelGenerator BLOCK_RENDERER = new ModelGenerator();
final ModelResourceLocation partRenderer = new ModelResourceLocation( new ResourceLocation( AppEng.MOD_ID, "DynamicPartRenderer" ), "inventory" );
private static class IconReg
{
public IconReg(
Object item2,
int meta2,
String name2 )
{
meta = meta2;
name = name2;
item = item2;
loc = null;
}
public IconReg(
Item item2,
int meta2,
String name2,
ModelResourceLocation res )
{
meta = meta2;
name = name2;
item = item2;
loc = res;
}
public final String name;
public final Object item;
public final int meta;
public final ModelResourceLocation loc;
};
public Map<Object,List<IconReg>> iconRegistrations = new HashMap();
;
public Map<Object, List<IconReg>> iconRegistrations = new HashMap();
public List<IconReg> iconTmp = new ArrayList<>();
public List<ResourceLocation> extraIcons = new ArrayList<>();
@Override
public ResourceLocation addIcon( String string )
{
ModelResourceLocation n = new ModelResourceLocation( new ResourceLocation( AppEng.MOD_ID, string ), "inventory" );
extraIcons.add( n );
return n;
}
@Override
public void configureIcon(Object item, String name )
public void configureIcon( Object item, String name )
{
iconTmp.add( new IconReg( item, 0, name ) );
}
public ModelResourceLocation setIcon(
Item item,
String name )
{
List<IconReg> reg = iconRegistrations.get( item );
if ( reg == null)
iconRegistrations.put( item , reg = new LinkedList<IconReg>() );
ModelResourceLocation res = new ModelResourceLocation( new ResourceLocation( AppEng.MOD_ID, name ), "inventory" );
reg.add( new IconReg(item,-1,name,res) );
return res;
}
public ModelResourceLocation setIcon(
Item item,
int meta,
String name )
{
List<IconReg> reg = iconRegistrations.get( item );
if ( reg == null)
iconRegistrations.put( item , reg = new LinkedList<IconReg>() );
ModelResourceLocation res = new ModelResourceLocation( new ResourceLocation( AppEng.MOD_ID, name ), "inventory" );
reg.add( new IconReg(item,meta,name,res) );
return res;
}
@SubscribeEvent
public void postPlayerRender( RenderLivingEvent.Pre p )
{
PlayerColor player = TickHandler.INSTANCE.getPlayerColors().get( p.entity.getEntityId() );
if( player != null )
{
AEColor col = player.myColor;
float r = 0xff & ( col.mediumVariant >> 16 );
float g = 0xff & ( col.mediumVariant >> 8 );
float b = 0xff & ( col.mediumVariant );
GL11.glColor3f( r / 255.0f, g / 255.0f, b / 255.0f );
}
}
@Override
public void preinit()
{
MinecraftForge.EVENT_BUS.register( this );
}
@Override
public void init()
{
Item fluixItem = GameRegistry.findItem( "appliedenergistics2", "BlockFluix" );
ModelResourceLocation itemModelResourceLocation = new ModelResourceLocation( "appliedenergistics2:BlockFluix", "inventory" );
final int DEFAULT_ITEM_SUBTYPE = 0;
Minecraft.getMinecraft().getRenderItem().getItemModelMesher().register( fluixItem, DEFAULT_ITEM_SUBTYPE, itemModelResourceLocation );
}
@Override
public World getWorld()
{
@@ -267,6 +197,230 @@ public class ClientHelper extends ServerHelper
}
}
@Override
public boolean shouldAddParticles( Random r )
{
int setting = Minecraft.getMinecraft().gameSettings.particleSetting;
if( setting == 2 )
{
return false;
}
if( setting == 0 )
{
return true;
}
return r.nextInt( 2 * ( setting + 1 ) ) == 0;
}
@Override
public MovingObjectPosition getMOP()
{
return Minecraft.getMinecraft().objectMouseOver;
}
@Override
public void doRenderItem( ItemStack itemstack, World w )
{
if( itemstack != null )
{
EntityItem entityitem = new EntityItem( w, 0.0D, 0.0D, 0.0D, itemstack );
entityitem.getEntityItem().stackSize = 1;
// set all this stuff and then do shit? meh?
entityitem.hoverStart = 0;
entityitem.setNoDespawn();
entityitem.rotationYaw = 0;
GL11.glPushMatrix();
GL11.glTranslatef( 0, -0.04F, 0 );
GL11.glColor4f( 1.0F, 1.0F, 1.0F, 1.0F );
// GL11.glDisable( GL11.GL_CULL_FACE );
// TODO RENDER ITEM FOR STORAGE MONITOR!
GL11.glPopMatrix();
}
}
@Override
public void postInit()
{
//RenderingRegistry.registerBlockHandler( WorldRender.INSTANCE );
RenderManager inst = Minecraft.getMinecraft().getRenderManager();
inst.entityRenderMap.put( EntityTinyTNTPrimed.class, new RenderTinyTNTPrimed( inst ) );
inst.entityRenderMap.put( EntityFloatingItem.class, new RenderFloatingItem( inst ) );
String MODID = AppEng.MOD_ID + ":";
final ItemModelMesher mesher = Minecraft.getMinecraft().getRenderItem().getItemModelMesher();
ItemMeshDefinition imd = new ItemMeshDefinition()
{
@Override
public ModelResourceLocation getModelLocation( ItemStack stack )
{
return partRenderer;
}
};
for( IconReg reg : iconTmp )
{
if( reg.item instanceof IPartItem || reg.item instanceof IFacadeItem )
{
mesher.register( reg.item instanceof Item ? (Item) reg.item : Item.getItemFromBlock( (Block) reg.item ), imd );
continue;
}
if( reg.item instanceof AEBaseBlock )
{
final BlockRenderInfo renderer = ( (AEBaseBlock) reg.item ).getRendererInstance();
if( renderer == null )
{
continue;
}
addIcon( reg.name );
mesher.register( reg.item instanceof Item ? (Item) reg.item : Item.getItemFromBlock( (Block) reg.item ), new ItemMeshDefinition()
{
@Override
public ModelResourceLocation getModelLocation( ItemStack stack )
{
return renderer.rendererInstance.getResourcePath();
}
} );
continue;
}
if( reg.name == null )
{
continue;
}
if( reg.item instanceof AEBaseItem )
{
( (AEBaseItem) reg.item ).registerIcons( this, reg.name );
}
else if( reg.item instanceof Item )
{
this.setIcon( (Item) reg.item, 0, reg.name );
}
}
for( List<IconReg> reg : iconRegistrations.values() )
{
String[] names = new String[reg.size()];
Item it = null;
int offset = 0;
for( IconReg r : reg )
{
it = (Item) r.item;
if( r.meta >= 0 )
{
mesher.register( (Item) r.item, r.meta, r.loc );
}
names[offset++] = MODID + r.name;
}
ModelBakery.addVariantName( it, names );
}
}
@Override
public CableRenderMode getRenderMode()
{
if( Platform.isServer() )
{
return super.getRenderMode();
}
Minecraft mc = Minecraft.getMinecraft();
EntityPlayer player = mc.thePlayer;
return this.renderModeForPlayer( player );
}
@Override
public void triggerUpdates()
{
Minecraft mc = Minecraft.getMinecraft();
if( mc == null || mc.thePlayer == null || mc.theWorld == null )
{
return;
}
EntityPlayer player = mc.thePlayer;
int x = (int) player.posX;
int y = (int) player.posY;
int z = (int) player.posZ;
int range = 16 * 16;
mc.theWorld.markBlockRangeForRenderUpdate( x - range, y - range, z - range, x + range, y + range, z + range );
}
@Override
public void missingCoreMod()
{
throw new MissingCoreMod();
}
@Override
public ResourceLocation addIcon( String string )
{
ModelResourceLocation n = new ModelResourceLocation( new ResourceLocation( AppEng.MOD_ID, string ), "inventory" );
extraIcons.add( n );
return n;
}
public ModelResourceLocation setIcon( Item item, String name )
{
List<IconReg> reg = iconRegistrations.get( item );
if( reg == null )
{
iconRegistrations.put( item, reg = new LinkedList<IconReg>() );
}
ModelResourceLocation res = new ModelResourceLocation( new ResourceLocation( AppEng.MOD_ID, name ), "inventory" );
reg.add( new IconReg( item, -1, name, res ) );
return res;
}
public ModelResourceLocation setIcon( Item item, int meta, String name )
{
List<IconReg> reg = iconRegistrations.get( item );
if( reg == null )
{
iconRegistrations.put( item, reg = new LinkedList<IconReg>() );
}
ModelResourceLocation res = new ModelResourceLocation( new ResourceLocation( AppEng.MOD_ID, name ), "inventory" );
reg.add( new IconReg( item, meta, name, res ) );
return res;
}
@SubscribeEvent
public void postPlayerRender( RenderLivingEvent.Pre p )
{
PlayerColor player = TickHandler.INSTANCE.getPlayerColors().get( p.entity.getEntityId() );
if( player != null )
{
AEColor col = player.myColor;
float r = 0xff & ( col.mediumVariant >> 16 );
float g = 0xff & ( col.mediumVariant >> 8 );
float b = 0xff & ( col.mediumVariant );
GL11.glColor3f( r / 255.0f, g / 255.0f, b / 255.0f );
}
}
private void spawnAssembler( World worldObj, double posX, double posY, double posZ, Object o )
{
PacketAssemblerAnimation paa = (PacketAssemblerAnimation) o;
@@ -330,206 +484,41 @@ public class ClientHelper extends ServerHelper
Minecraft.getMinecraft().effectRenderer.addEffect( fx );
}
@Override
public boolean shouldAddParticles( Random r )
@SubscribeEvent
public void onModelBakeEvent( ModelBakeEvent event )
{
int setting = Minecraft.getMinecraft().gameSettings.particleSetting;
if( setting == 2 )
{
return false;
}
if( setting == 0 )
{
return true;
}
return r.nextInt( 2 * ( setting + 1 ) ) == 0;
}
@Override
public MovingObjectPosition getMOP()
{
return Minecraft.getMinecraft().objectMouseOver;
}
@Override
public void doRenderItem( ItemStack itemstack, World w )
{
if( itemstack != null )
{
EntityItem entityitem = new EntityItem( w, 0.0D, 0.0D, 0.0D, itemstack );
entityitem.getEntityItem().stackSize = 1;
// set all this stuff and then do shit? meh?
entityitem.hoverStart = 0;
entityitem.setNoDespawn();
entityitem.rotationYaw = 0;
GL11.glPushMatrix();
GL11.glTranslatef( 0, -0.04F, 0 );
GL11.glColor4f( 1.0F, 1.0F, 1.0F, 1.0F );
// GL11.glDisable( GL11.GL_CULL_FACE );
// TODO RENDER ITEM FOR STORAGE MONITOR!
GL11.glPopMatrix();
}
}
final ModelResourceLocation partRenderer = new ModelResourceLocation( new ResourceLocation( AppEng.MOD_ID, "DynamicPartRenderer" ), "inventory" );
@Override
public void postInit()
{
//RenderingRegistry.registerBlockHandler( WorldRender.INSTANCE );
RenderManager inst = Minecraft.getMinecraft().getRenderManager();
inst.entityRenderMap.put( EntityTinyTNTPrimed.class, new RenderTinyTNTPrimed(inst) );
inst.entityRenderMap.put( EntityFloatingItem.class, new RenderFloatingItem(inst) );
String MODID = AppEng.MOD_ID+":";
final ItemModelMesher mesher = Minecraft.getMinecraft().getRenderItem().getItemModelMesher();
ItemMeshDefinition imd = new ItemMeshDefinition(){
@Override
public ModelResourceLocation getModelLocation(
ItemStack stack )
{
return partRenderer;
}
};
for ( IconReg reg: iconTmp )
{
if ( reg.item instanceof IPartItem || reg.item instanceof IFacadeItem )
{
mesher.register( reg.item instanceof Item ? (Item)reg.item : Item.getItemFromBlock( (Block)reg.item ), imd );
continue;
}
if ( reg.item instanceof AEBaseBlock )
{
final BlockRenderInfo renderer = ((AEBaseBlock)reg.item).getRendererInstance();
if ( renderer == null )
continue;
addIcon( reg.name );
mesher.register( reg.item instanceof Item ? (Item)reg.item : Item.getItemFromBlock( (Block)reg.item ), new ItemMeshDefinition(){
@Override
public ModelResourceLocation getModelLocation(
ItemStack stack )
{
return renderer.rendererInstance.getResourcePath();
}
} );
continue;
}
if ( reg.name == null ) continue;
if ( reg.item instanceof AEBaseItem )
( (AEBaseItem) reg.item).registerIcons( this, reg.name );
else if ( reg.item instanceof Item )
this.setIcon( (Item)reg.item, 0, reg.name );
}
for ( List<IconReg> reg : iconRegistrations.values() )
{
String[] names = new String[reg.size()];
Item it = null;
int offset=0;
for ( IconReg r : reg )
{
it = ( Item ) r.item;
if ( r.meta >= 0 )
mesher.register( (Item)r.item, r.meta, r.loc );
names[offset++] = MODID + r.name;
}
ModelBakery.addVariantName( it, names );
}
}
@SubscribeEvent
public void onModelBakeEvent(
ModelBakeEvent event )
{
// inventory renderer
SmartModel buses = new SmartModel( new BlockRenderInfo( ( new RendererCableBus() ) ) );
event.modelRegistry.putObject( partRenderer, buses );
for ( IconReg reg: iconTmp )
SmartModel buses = new SmartModel( new BlockRenderInfo( ( new RendererCableBus() ) ) );
event.modelRegistry.putObject( partRenderer, buses );
for( IconReg reg : iconTmp )
{
if ( reg.item instanceof IPartItem || reg.item instanceof IFacadeItem)
if( reg.item instanceof IPartItem || reg.item instanceof IFacadeItem )
{
UniqueIdentifier i = GameRegistry.findUniqueIdentifierFor( (Item)reg.item );
event.modelRegistry.putObject( new ModelResourceLocation( new ResourceLocation(i.modId ,i.name),"inventory"), buses );
UniqueIdentifier i = GameRegistry.findUniqueIdentifierFor( (Item) reg.item );
event.modelRegistry.putObject( new ModelResourceLocation( new ResourceLocation( i.modId, i.name ), "inventory" ), buses );
}
if ( reg.item instanceof AEBaseBlock )
if( reg.item instanceof AEBaseBlock )
{
BlockRenderInfo renderer = ((AEBaseBlock)reg.item).getRendererInstance();
if ( renderer == null )
continue;
SmartModel sm = new SmartModel( renderer );
event.modelRegistry.putObject( renderer.rendererInstance.getResourcePath(), sm );
Map data = new DefaultStateMapper().putStateModelLocations( (Block)reg.item );
for ( Object Loc : data.values() )
BlockRenderInfo renderer = ( (AEBaseBlock) reg.item ).getRendererInstance();
if( renderer == null )
{
ModelResourceLocation res = (ModelResourceLocation)Loc;
event.modelRegistry.putObject( res, sm );
continue;
}
SmartModel sm = new SmartModel( renderer );
event.modelRegistry.putObject( renderer.rendererInstance.getResourcePath(), sm );
Map data = new DefaultStateMapper().putStateModelLocations( (Block) reg.item );
for( Object Loc : data.values() )
{
ModelResourceLocation res = (ModelResourceLocation) Loc;
event.modelRegistry.putObject( res, sm );
}
}
}
}
@Override
public CableRenderMode getRenderMode()
{
if( Platform.isServer() )
{
return super.getRenderMode();
}
Minecraft mc = Minecraft.getMinecraft();
EntityPlayer player = mc.thePlayer;
return this.renderModeForPlayer( player );
}
@Override
public void triggerUpdates()
{
Minecraft mc = Minecraft.getMinecraft();
if( mc == null || mc.thePlayer == null || mc.theWorld == null )
{
return;
}
EntityPlayer player = mc.thePlayer;
int x = (int) player.posX;
int y = (int) player.posY;
int z = (int) player.posZ;
int range = 16 * 16;
mc.theWorld.markBlockRangeForRenderUpdate( x - range, y - range, z - range, x + range, y + range, z + range );
}
@Override
public void missingCoreMod()
{
throw new MissingCoreMod();
}
@SubscribeEvent
public void wheelEvent( MouseEvent me )
@@ -560,25 +549,29 @@ public class ClientHelper extends ServerHelper
@SubscribeEvent
public void updateTextureSheet( TextureStitchEvent.Pre ev )
{
for ( IconReg reg: iconTmp )
for( IconReg reg : iconTmp )
{
if ( reg.item instanceof AEBaseItem )
if( reg.item instanceof AEBaseItem )
{
((AEBaseItem)reg.item).registerCustomIcon( ev.map );
( (AEBaseItem) reg.item ).registerCustomIcon( ev.map );
}
else if ( reg.item instanceof AEBaseBlock )
else if( reg.item instanceof AEBaseBlock )
{
BlockRenderInfo renderer = ((AEBaseBlock)reg.item).getRendererInstance();
if ( renderer == null )
BlockRenderInfo renderer = ( (AEBaseBlock) reg.item ).getRendererInstance();
if( renderer == null )
{
continue;
( (AEBaseBlock) reg.item).registerBlockIcons( ev.map, reg.name );
}
( (AEBaseBlock) reg.item ).registerBlockIcons( ev.map, reg.name );
}
}
for ( ResourceLocation res : extraIcons )
for( ResourceLocation res : extraIcons )
{
ev.map.registerSprite( res );
}
//if( ev.map.getTextureType() == ITEM_RENDERER )
{
for( ExtraItemTextures et : ExtraItemTextures.values() )
@@ -601,5 +594,27 @@ public class ClientHelper extends ServerHelper
}
}
private static class IconReg
{
public final String name;
public final Object item;
public final int meta;
public final ModelResourceLocation loc;
public IconReg( Object item2, int meta2, String name2 )
{
meta = meta2;
name = name2;
item = item2;
loc = null;
}
public IconReg( Item item2, int meta2, String name2, ModelResourceLocation res )
{
meta = meta2;
name = name2;
item = item2;
loc = res;
}
}
}