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

Removed old rendering system

Browse Source 
Removed old rendering system. Some parts may be left over, but they
won't affect testing.
1.10-R todo tag marks things to do with rendering.
This commit is contained in:
elix-x
2016-06-29 12:22:18 +02:00
parent 92753a432a
commit 03aa59521c
146 changed files with 15 additions and 13767 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/parts/reporting/AbstractPartDisplay.java
-101
View File
@@ -20,15 +20,6 @@ package appeng.parts.reporting;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import appeng.api.parts.IPartRenderHelper;
import appeng.api.util.IAESprite;
import appeng.api.util.ModelGenerator;
import appeng.client.texture.CableBusTextures;
/**
@@ -50,98 +41,6 @@ public abstract class AbstractPartDisplay extends AbstractPartReporting
super( is, true );
}
@Override
@SideOnly( Side.CLIENT )
public void renderInventory( final IPartRenderHelper rh, final ModelGenerator renderer )
{
rh.setBounds( 2, 2, 14, 14, 14, 16 );
final IAESprite sideTexture = CableBusTextures.PartMonitorSides.getIcon();
final IAESprite backTexture = CableBusTextures.PartMonitorBack.getIcon();
rh.setTexture( sideTexture, sideTexture, backTexture, renderer.getIcon( this.getItemStack() ), sideTexture, sideTexture );
rh.renderInventoryBox( renderer );
rh.setInvColor( this.getColor().whiteVariant );
rh.renderInventoryFace( this.getFrontBright().getIcon(), EnumFacing.SOUTH, renderer );
rh.setInvColor( this.getColor().mediumVariant );
rh.renderInventoryFace( this.getFrontDark().getIcon(), EnumFacing.SOUTH, renderer );
rh.setInvColor( this.getColor().blackVariant );
rh.renderInventoryFace( this.getFrontColored().getIcon(), EnumFacing.SOUTH, renderer );
rh.setBounds( 4, 4, 13, 12, 12, 14 );
rh.renderInventoryBox( renderer );
}
@Override
@SideOnly( Side.CLIENT )
public void renderStatic( final BlockPos pos, final IPartRenderHelper rh, final ModelGenerator renderer )
{
final IAESprite sideTexture = CableBusTextures.PartMonitorSides.getIcon();
final IAESprite backTexture = CableBusTextures.PartMonitorBack.getIcon();
rh.setTexture( sideTexture, sideTexture, backTexture, renderer.getIcon( this.getItemStack() ), sideTexture, sideTexture );
rh.setBounds( 2, 2, 14, 14, 14, 16 );
rh.renderBlock( pos, renderer );
if( this.getLightLevel() > 0 )
{
final int l = 13;
renderer.setBrightness( l << 20 | l << 4 );
}
renderer.setUvRotateBottom( renderer.setUvRotateEast( renderer.setUvRotateNorth( renderer.setUvRotateSouth( renderer.setUvRotateTop( renderer.setUvRotateWest( this.getSpin() ) ) ) ) ) );
renderer.setColorOpaque_I( this.getColor().whiteVariant );
rh.renderFace( pos, this.getFrontBright().getIcon(), EnumFacing.SOUTH, renderer );
renderer.setColorOpaque_I( this.getColor().mediumVariant );
rh.renderFace( pos, this.getFrontDark().getIcon(), EnumFacing.SOUTH, renderer );
renderer.setColorOpaque_I( this.getColor().blackVariant );
rh.renderFace( pos, this.getFrontColored().getIcon(), EnumFacing.SOUTH, renderer );
renderer.setUvRotateBottom( renderer.setUvRotateEast( renderer.setUvRotateNorth( renderer.setUvRotateSouth( renderer.setUvRotateTop( renderer.setUvRotateWest( 0 ) ) ) ) ) );
final IAESprite sideStatusTexture = CableBusTextures.PartMonitorSidesStatus.getIcon();
rh.setTexture( sideStatusTexture, sideStatusTexture, backTexture, renderer.getIcon( this.getItemStack() ), sideStatusTexture, sideStatusTexture );
rh.setBounds( 4, 4, 13, 12, 12, 14 );
rh.renderBlock( pos, renderer );
final boolean hasChan = ( this.getClientFlags() & ( PartPanel.POWERED_FLAG | PartPanel.CHANNEL_FLAG ) ) == ( PartPanel.POWERED_FLAG | PartPanel.CHANNEL_FLAG );
final boolean hasPower = ( this.getClientFlags() & PartPanel.POWERED_FLAG ) == PartPanel.POWERED_FLAG;
if( hasChan )
{
final int l = 14;
renderer.setBrightness( l << 20 | l << 4 );
renderer.setColorOpaque_I( this.getColor().blackVariant );
}
else if( hasPower )
{
final int l = 9;
renderer.setBrightness( l << 20 | l << 4 );
renderer.setColorOpaque_I( this.getColor().whiteVariant );
}
else
{
renderer.setBrightness( 0 );
renderer.setColorOpaque_I( 0x000000 );
}
final IAESprite sideStatusLightTexture = CableBusTextures.PartMonitorSidesStatusLights.getIcon();
rh.renderFace( pos, sideStatusLightTexture, EnumFacing.EAST, renderer );
rh.renderFace( pos, sideStatusLightTexture, EnumFacing.WEST, renderer );
rh.renderFace( pos, sideStatusLightTexture, EnumFacing.UP, renderer );
rh.renderFace( pos, sideStatusLightTexture, EnumFacing.DOWN, renderer );
}
@Override
public boolean isLightSource()
{
src/main/java/appeng/parts/reporting/AbstractPartMonitor.java
-43
View File
@@ -30,7 +30,6 @@ import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.FontRenderer;
import net.minecraft.client.renderer.GLAllocation;
import net.minecraft.client.renderer.OpenGlHelper;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.client.renderer.VertexBuffer;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
@@ -46,14 +45,12 @@ import appeng.api.implementations.parts.IPartStorageMonitor;
import appeng.api.networking.security.BaseActionSource;
import appeng.api.networking.storage.IStackWatcher;
import appeng.api.networking.storage.IStackWatcherHost;
import appeng.api.parts.IPartRenderHelper;
import appeng.api.storage.IMEMonitor;
import appeng.api.storage.StorageChannel;
import appeng.api.storage.data.IAEItemStack;
import appeng.api.storage.data.IAEStack;
import appeng.api.storage.data.IItemList;
import appeng.api.util.AEPartLocation;
import appeng.api.util.ModelGenerator;
import appeng.client.ClientHelper;
import appeng.core.AELog;
import appeng.core.localization.PlayerMessages;
@@ -259,46 +256,6 @@ public abstract class AbstractPartMonitor extends AbstractPartDisplay implements
}
}
@Override
@SideOnly( Side.CLIENT )
public void renderDynamic( final double x, final double y, final double z, final IPartRenderHelper rh, final ModelGenerator renderer )
{
if( this.dspList == null )
{
this.dspList = GLAllocation.generateDisplayLists( 1 );
}
final Tessellator tess = Tessellator.getInstance();
final VertexBuffer wr = tess.getBuffer();
if( ( this.getClientFlags() & ( PartPanel.POWERED_FLAG | PartPanel.CHANNEL_FLAG ) ) != ( PartPanel.POWERED_FLAG | PartPanel.CHANNEL_FLAG ) )
{
return;
}
final IAEItemStack ais = (IAEItemStack) this.getDisplayed();
if( ais != null )
{
GL11.glPushMatrix();
GL11.glTranslated( x + 0.5, y + 0.5, z + 0.5 );
if( this.updateList )
{
this.updateList = false;
GL11.glNewList( this.dspList, GL11.GL_COMPILE_AND_EXECUTE );
this.tesrRenderScreen( wr, ais );
GL11.glEndList();
}
else
{
GL11.glCallList( this.dspList );
}
GL11.glPopMatrix();
}
}
@Override
public boolean requireDynamicRender()
{
src/main/java/appeng/parts/reporting/AbstractPartPanel.java
-74
View File
@@ -20,16 +20,8 @@ package appeng.parts.reporting;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import appeng.api.parts.IPartRenderHelper;
import appeng.api.util.AEColor;
import appeng.api.util.IAESprite;
import appeng.api.util.ModelGenerator;
import appeng.client.texture.CableBusTextures;
/**
@@ -44,83 +36,17 @@ import appeng.client.texture.CableBusTextures;
*/
public abstract class AbstractPartPanel extends AbstractPartReporting
{
private static final CableBusTextures FRONT_BRIGHT_ICON = CableBusTextures.PartMonitor_Bright;
private static final CableBusTextures FRONT_DARK_ICON = CableBusTextures.PartMonitor_Colored;
private static final CableBusTextures FRONT_COLORED_ICON = CableBusTextures.PartMonitor_Colored;
public AbstractPartPanel( final ItemStack is )
{
super( is, false );
}
@Override
public CableBusTextures getFrontBright()
{
return FRONT_BRIGHT_ICON;
}
@Override
public CableBusTextures getFrontColored()
{
return FRONT_COLORED_ICON;
}
@Override
public CableBusTextures getFrontDark()
{
return FRONT_DARK_ICON;
}
@Override
public boolean isLightSource()
{
return true;
}
@Override
@SideOnly( Side.CLIENT )
public void renderInventory( final IPartRenderHelper rh, final ModelGenerator renderer )
{
rh.setBounds( 2, 2, 14, 14, 14, 16 );
final IAESprite sideTexture = CableBusTextures.PartMonitorSides.getIcon();
final IAESprite backTexture = CableBusTextures.PartMonitorBack.getIcon();
rh.setTexture( sideTexture, sideTexture, backTexture, renderer.getIcon( this.getItemStack() ), sideTexture, sideTexture );
rh.renderInventoryBox( renderer );
rh.setInvColor( this.getBrightnessColor() );
rh.renderInventoryFace( this.getFrontBright().getIcon(), EnumFacing.SOUTH, renderer );
rh.setBounds( 4, 4, 13, 12, 12, 14 );
rh.renderInventoryBox( renderer );
}
@Override
@SideOnly( Side.CLIENT )
public void renderStatic( final BlockPos pos, final IPartRenderHelper rh, final ModelGenerator renderer )
{
final IAESprite sideTexture = CableBusTextures.PartMonitorSides.getIcon();
final IAESprite backTexture = CableBusTextures.PartMonitorBack.getIcon();
rh.setTexture( sideTexture, sideTexture, backTexture, renderer.getIcon( this.getItemStack() ), sideTexture, sideTexture );
rh.setBounds( 2, 2, 14, 14, 14, 16 );
rh.renderBlock( pos, renderer );
if( this.getLightLevel() > 0 )
{
final int l = 13;
renderer.setBrightness( l << 20 | l << 4 );
}
renderer.setColorOpaque_I( this.getBrightnessColor() );
rh.renderFace( pos, this.getFrontBright().getIcon(), EnumFacing.SOUTH, renderer );
rh.setBounds( 4, 4, 13, 12, 12, 14 );
rh.renderBlock( pos, renderer );
}
/**
* How bright the color the panel should appear. Usually it depends on a {@link AEColor} variant.
* This does not affect the actual light level of the part.
src/main/java/appeng/parts/reporting/AbstractPartReporting.java
-22
View File
@@ -39,7 +39,6 @@ import appeng.api.networking.events.MENetworkEventSubscribe;
import appeng.api.networking.events.MENetworkPowerStatusChange;
import appeng.api.parts.IPartCollisionHelper;
import appeng.api.util.AEPartLocation;
import appeng.client.texture.CableBusTextures;
import appeng.me.GridAccessException;
import appeng.parts.AEBasePart;
import appeng.util.Platform;
@@ -300,27 +299,6 @@ public abstract class AbstractPartReporting extends AEBasePart implements IPartM
return this.spin;
}
/**
* The texture used for the bright front layer.
*
* The final texture can overlap any of the the texture in no particular order.
*/
public abstract CableBusTextures getFrontBright();
/**
* The texture used for the colored (medium) front layer.
*
* The final texture can overlap any of the the texture in no particular order.
*/
public abstract CableBusTextures getFrontColored();
/**
* The texture used for the dark front layer.
*
* The final texture can overlap any of the the texture in no particular order.
*/
public abstract CableBusTextures getFrontDark();
/**
* Should the part emit light. This actually only affects the light level, light source use a level of 15 and non
* light source 9.
src/main/java/appeng/parts/reporting/PartConversionMonitor.java
-24
View File
@@ -33,7 +33,6 @@ import appeng.api.networking.energy.IEnergySource;
import appeng.api.networking.security.PlayerSource;
import appeng.api.storage.IMEMonitor;
import appeng.api.storage.data.IAEItemStack;
import appeng.client.texture.CableBusTextures;
import appeng.helpers.Reflected;
import appeng.me.GridAccessException;
import appeng.util.InventoryAdaptor;
@@ -43,11 +42,6 @@ import appeng.util.item.AEItemStack;
public class PartConversionMonitor extends AbstractPartMonitor
{
private static final CableBusTextures FRONT_BRIGHT_ICON = CableBusTextures.PartConversionMonitor_Bright;
private static final CableBusTextures FRONT_DARK_ICON = CableBusTextures.PartConversionMonitor_Dark;
private static final CableBusTextures FRONT_DARK_ICON_LOCKED = CableBusTextures.PartConversionMonitor_Dark_Locked;
private static final CableBusTextures FRONT_COLORED_ICON = CableBusTextures.PartConversionMonitor_Colored;
@Reflected
public PartConversionMonitor( final ItemStack is )
{
@@ -166,22 +160,4 @@ public class PartConversionMonitor extends AbstractPartMonitor
}
}
}
@Override
public CableBusTextures getFrontBright()
{
return FRONT_BRIGHT_ICON;
}
@Override
public CableBusTextures getFrontColored()
{
return FRONT_COLORED_ICON;
}
@Override
public CableBusTextures getFrontDark()
{
return this.isLocked() ? FRONT_DARK_ICON_LOCKED : FRONT_DARK_ICON;
}
}
src/main/java/appeng/parts/reporting/PartCraftingTerminal.java
-23
View File
@@ -26,7 +26,6 @@ import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import appeng.client.texture.CableBusTextures;
import appeng.core.sync.GuiBridge;
import appeng.helpers.Reflected;
import appeng.tile.inventory.AppEngInternalInventory;
@@ -34,10 +33,6 @@ import appeng.tile.inventory.AppEngInternalInventory;
public class PartCraftingTerminal extends AbstractPartTerminal
{
private static final CableBusTextures FRONT_BRIGHT_ICON = CableBusTextures.PartCraftingTerm_Bright;
private static final CableBusTextures FRONT_DARK_ICON = CableBusTextures.PartCraftingTerm_Dark;
private static final CableBusTextures FRONT_COLORED_ICON = CableBusTextures.PartCraftingTerm_Colored;
private final AppEngInternalInventory craftingGrid = new AppEngInternalInventory( this, 9 );
@Reflected
@@ -103,22 +98,4 @@ public class PartCraftingTerminal extends AbstractPartTerminal
}
return super.getInventoryByName( name );
}
@Override
public CableBusTextures getFrontBright()
{
return FRONT_BRIGHT_ICON;
}
@Override
public CableBusTextures getFrontColored()
{
return FRONT_COLORED_ICON;
}
@Override
public CableBusTextures getFrontDark()
{
return FRONT_DARK_ICON;
}
}
src/main/java/appeng/parts/reporting/PartInterfaceTerminal.java
-23
View File
@@ -24,17 +24,12 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumHand;
import net.minecraft.util.math.Vec3d;
import appeng.client.texture.CableBusTextures;
import appeng.core.sync.GuiBridge;
import appeng.util.Platform;
public class PartInterfaceTerminal extends AbstractPartDisplay
{
private static final CableBusTextures FRONT_BRIGHT_ICON = CableBusTextures.PartInterfaceTerm_Bright;
private static final CableBusTextures FRONT_DARK_ICON = CableBusTextures.PartInterfaceTerm_Dark;
private static final CableBusTextures FRONT_COLORED_ICON = CableBusTextures.PartInterfaceTerm_Colored;
public PartInterfaceTerminal( final ItemStack is )
{
super( is );
@@ -60,22 +55,4 @@ public class PartInterfaceTerminal extends AbstractPartDisplay
return false;
}
@Override
public CableBusTextures getFrontBright()
{
return FRONT_BRIGHT_ICON;
}
@Override
public CableBusTextures getFrontColored()
{
return FRONT_COLORED_ICON;
}
@Override
public CableBusTextures getFrontDark()
{
return FRONT_DARK_ICON;
}
}
src/main/java/appeng/parts/reporting/PartPatternTerminal.java
-23
View File
@@ -29,7 +29,6 @@ import net.minecraft.nbt.NBTTagCompound;
import appeng.api.implementations.ICraftingPatternItem;
import appeng.api.networking.crafting.ICraftingPatternDetails;
import appeng.api.storage.data.IAEItemStack;
import appeng.client.texture.CableBusTextures;
import appeng.core.sync.GuiBridge;
import appeng.helpers.Reflected;
import appeng.tile.inventory.AppEngInternalInventory;
@@ -38,10 +37,6 @@ import appeng.tile.inventory.InvOperation;
public class PartPatternTerminal extends AbstractPartTerminal
{
private static final CableBusTextures FRONT_BRIGHT_ICON = CableBusTextures.PartPatternTerm_Bright;
private static final CableBusTextures FRONT_DARK_ICON = CableBusTextures.PartPatternTerm_Dark;
private static final CableBusTextures FRONT_COLORED_ICON = CableBusTextures.PartPatternTerm_Colored;
private final AppEngInternalInventory crafting = new AppEngInternalInventory( this, 9 );
private final AppEngInternalInventory output = new AppEngInternalInventory( this, 3 );
private final AppEngInternalInventory pattern = new AppEngInternalInventory( this, 2 );
@@ -202,22 +197,4 @@ public class PartPatternTerminal extends AbstractPartTerminal
return super.getInventoryByName( name );
}
@Override
public CableBusTextures getFrontBright()
{
return FRONT_BRIGHT_ICON;
}
@Override
public CableBusTextures getFrontColored()
{
return FRONT_COLORED_ICON;
}
@Override
public CableBusTextures getFrontDark()
{
return FRONT_DARK_ICON;
}
}
src/main/java/appeng/parts/reporting/PartStorageMonitor.java
-23
View File
@@ -21,7 +21,6 @@ package appeng.parts.reporting;
import net.minecraft.item.ItemStack;
import appeng.client.texture.CableBusTextures;
import appeng.helpers.Reflected;
@@ -33,32 +32,10 @@ import appeng.helpers.Reflected;
*/
public class PartStorageMonitor extends AbstractPartMonitor
{
private static final CableBusTextures FRONT_BRIGHT_ICON = CableBusTextures.PartStorageMonitor_Bright;
private static final CableBusTextures FRONT_DARK_ICON = CableBusTextures.PartStorageMonitor_Dark;
private static final CableBusTextures FRONT_COLORED_ICON = CableBusTextures.PartStorageMonitor_Colored;
private static final CableBusTextures FRONT_COLORED_ICON_LOCKED = CableBusTextures.PartStorageMonitor_Colored_Locked;
@Reflected
public PartStorageMonitor( final ItemStack is )
{
super( is );
}
@Override
public CableBusTextures getFrontBright()
{
return FRONT_BRIGHT_ICON;
}
@Override
public CableBusTextures getFrontColored()
{
return this.isLocked() ? FRONT_COLORED_ICON_LOCKED : FRONT_COLORED_ICON;
}
@Override
public CableBusTextures getFrontDark()
{
return FRONT_DARK_ICON;
}
}
src/main/java/appeng/parts/reporting/PartTerminal.java
-24
View File
@@ -21,8 +21,6 @@ package appeng.parts.reporting;
import net.minecraft.item.ItemStack;
import appeng.client.texture.CableBusTextures;
public class PartTerminal extends AbstractPartTerminal
{
@@ -31,26 +29,4 @@ public class PartTerminal extends AbstractPartTerminal
{
super( is );
}
private static final CableBusTextures FRONT_BRIGHT_ICON = CableBusTextures.PartTerminal_Bright;
private static final CableBusTextures FRONT_DARK_ICON = CableBusTextures.PartTerminal_Dark;
private static final CableBusTextures FRONT_COLORED_ICON = CableBusTextures.PartTerminal_Colored;
@Override
public CableBusTextures getFrontBright()
{
return FRONT_BRIGHT_ICON;
}
@Override
public CableBusTextures getFrontColored()
{
return FRONT_COLORED_ICON;
}
@Override
public CableBusTextures getFrontDark()
{
return FRONT_DARK_ICON;
}
}