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/AEBasePart.java
-35
View File
@@ -58,14 +58,12 @@ import appeng.api.parts.BusSupport;
import appeng.api.parts.IPart;
import appeng.api.parts.IPartCollisionHelper;
import appeng.api.parts.IPartHost;
import appeng.api.parts.IPartRenderHelper;
import appeng.api.parts.PartItemStack;
import appeng.api.util.AECableType;
import appeng.api.util.AEColor;
import appeng.api.util.AEPartLocation;
import appeng.api.util.DimensionalCoord;
import appeng.api.util.IConfigManager;
import appeng.api.util.ModelGenerator;
import appeng.helpers.ICustomNameObject;
import appeng.helpers.IPriorityHost;
import appeng.me.helpers.AENetworkProxy;
@@ -145,17 +143,6 @@ public abstract class AEBasePart implements IPart, IGridProxyable, IActionHost,
return 0;
}
@Override
@SideOnly( Side.CLIENT )
public void renderInventory( final IPartRenderHelper rh, final ModelGenerator renderer )
{
rh.setBounds( 1, 1, 1, 15, 15, 15 );
rh.renderInventoryBox( renderer );
rh.setBounds( 1, 1, 1, 15, 15, 15 );
rh.renderInventoryBox( renderer );
}
@Override
public TileEntity getTile()
{
@@ -197,14 +184,6 @@ public abstract class AEBasePart implements IPart, IGridProxyable, IActionHost,
return this.getItemStack().getDisplayName();
}
@Override
@SideOnly( Side.CLIENT )
public void renderStatic( final BlockPos pos, final IPartRenderHelper rh, final ModelGenerator renderer )
{
rh.setBounds( 1, 1, 1, 15, 15, 15 );
rh.renderBlock( pos, renderer );
}
@Override
public boolean hasCustomName()
{
@@ -216,13 +195,6 @@ public abstract class AEBasePart implements IPart, IGridProxyable, IActionHost,
crashreportcategory.addCrashSection( "Part Side", this.getSide() );
}
@Override
@SideOnly( Side.CLIENT )
public void renderDynamic( final double x, final double y, final double z, final IPartRenderHelper rh, final ModelGenerator renderer )
{
}
@Override
public ItemStack getItemStack( final PartItemStack type )
{
@@ -543,13 +515,6 @@ public abstract class AEBasePart implements IPart, IGridProxyable, IActionHost,
return false;
}
@Override
@SideOnly( Side.CLIENT )
public TextureAtlasSprite getBreakingTexture( final ModelGenerator renderer )
{
return null;
}
public AEPartLocation getSide()
{
return this.side;
src/main/java/appeng/parts/CableBusContainer.java
-15
View File
@@ -43,8 +43,6 @@ import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Vec3d;
import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import appeng.api.AEApi;
import appeng.api.config.YesNo;
@@ -65,7 +63,6 @@ import appeng.api.util.AECableType;
import appeng.api.util.AEColor;
import appeng.api.util.AEPartLocation;
import appeng.api.util.DimensionalCoord;
import appeng.client.render.CableRenderHelper;
import appeng.core.AELog;
import appeng.facade.FacadeContainer;
import appeng.helpers.AEMultiTile;
@@ -903,18 +900,6 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I
return light;
}
@SideOnly( Side.CLIENT )
public void renderStatic()
{
CableRenderHelper.getInstance().renderStatic( this, this.getFacadeContainer() );
}
@SideOnly( Side.CLIENT )
public void renderDynamic( final double x, final double y, final double z )
{
CableRenderHelper.getInstance().renderDynamic( this, x, y, z );
}
public void writeToStream( final ByteBuf data ) throws IOException
{
int sides = 0;
src/main/java/appeng/parts/PartBasicState.java
-46
View File
@@ -23,21 +23,13 @@ import java.io.IOException;
import io.netty.buffer.ByteBuf;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
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.implementations.IPowerChannelState;
import appeng.api.networking.GridFlags;
import appeng.api.networking.events.MENetworkChannelsChanged;
import appeng.api.networking.events.MENetworkEventSubscribe;
import appeng.api.networking.events.MENetworkPowerStatusChange;
import appeng.api.parts.IPartRenderHelper;
import appeng.api.util.ModelGenerator;
import appeng.client.texture.CableBusTextures;
import appeng.me.GridAccessException;
@@ -67,37 +59,6 @@ public abstract class PartBasicState extends AEBasePart implements IPowerChannel
this.getHost().markForUpdate();
}
@SideOnly( Side.CLIENT )
public void renderLights( final BlockPos pos, final IPartRenderHelper rh, final ModelGenerator renderer )
{
this.setColors( renderer, ( this.clientFlags & ( POWERED_FLAG | CHANNEL_FLAG ) ) == ( POWERED_FLAG | CHANNEL_FLAG ), ( this.clientFlags & POWERED_FLAG ) == POWERED_FLAG );
rh.renderFace( pos, CableBusTextures.PartMonitorSidesStatusLights.getIcon(), EnumFacing.EAST, renderer );
rh.renderFace( pos, CableBusTextures.PartMonitorSidesStatusLights.getIcon(), EnumFacing.WEST, renderer );
rh.renderFace( pos, CableBusTextures.PartMonitorSidesStatusLights.getIcon(), EnumFacing.UP, renderer );
rh.renderFace( pos, CableBusTextures.PartMonitorSidesStatusLights.getIcon(), EnumFacing.DOWN, renderer );
}
public void setColors( final ModelGenerator renderer, final boolean hasChan, final boolean hasPower )
{
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 );
}
}
@Override
public void writeToStream( final ByteBuf data ) throws IOException
{
@@ -143,13 +104,6 @@ public abstract class PartBasicState extends AEBasePart implements IPowerChannel
return eh || old != this.getClientFlags();
}
@Override
@SideOnly( Side.CLIENT )
public TextureAtlasSprite getBreakingTexture( final ModelGenerator renderer )
{
return CableBusTextures.PartTransitionPlaneBack.getIcon().getAtlas();
}
@Override
public boolean isPowered()
{
src/main/java/appeng/parts/automation/PartAnnihilationPlane.java
-76
View File
@@ -35,8 +35,6 @@ import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraft.world.WorldServer;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import appeng.api.config.Actionable;
import appeng.api.config.PowerMultiplier;
@@ -54,12 +52,8 @@ import appeng.api.networking.ticking.TickingRequest;
import appeng.api.parts.IPart;
import appeng.api.parts.IPartCollisionHelper;
import appeng.api.parts.IPartHost;
import appeng.api.parts.IPartRenderHelper;
import appeng.api.storage.data.IAEItemStack;
import appeng.api.util.AEPartLocation;
import appeng.api.util.IAESprite;
import appeng.api.util.ModelGenerator;
import appeng.client.texture.CableBusTextures;
import appeng.core.settings.TickRates;
import appeng.core.sync.packets.PacketTransitionEffect;
import appeng.hooks.TickHandler;
@@ -73,10 +67,6 @@ import appeng.util.item.AEItemStack;
public class PartAnnihilationPlane extends PartBasicState implements IGridTickable, IWorldCallable<TickRateModulation>
{
private static final IAESprite SIDE_ICON = CableBusTextures.PartPlaneSides.getIcon();
private static final IAESprite BACK_ICON = CableBusTextures.PartTransitionPlaneBack.getIcon();
private static final IAESprite STATUS_ICON = CableBusTextures.PartMonitorSidesStatus.getIcon();
private static final IAESprite ACTIVE_ICON = CableBusTextures.BlockAnnihilationPlaneOn.getIcon();
private final BaseActionSource mySrc = new MachineSource( this );
private boolean isAccepting = true;
@@ -137,72 +127,6 @@ public class PartAnnihilationPlane extends PartBasicState implements IGridTickab
bch.addBox( minX, minY, 15, maxX, maxY, bch.isBBCollision() ? 15 : 16 );
}
@Override
@SideOnly( Side.CLIENT )
public void renderInventory( final IPartRenderHelper rh, final ModelGenerator renderer )
{
rh.setTexture( SIDE_ICON, SIDE_ICON, BACK_ICON, renderer.getIcon( this.getItemStack() ), SIDE_ICON, SIDE_ICON );
rh.setBounds( 1, 1, 15, 15, 15, 16 );
rh.renderInventoryBox( renderer );
rh.setBounds( 5, 5, 14, 11, 11, 15 );
rh.renderInventoryBox( renderer );
}
@Override
@SideOnly( Side.CLIENT )
public void renderStatic( final BlockPos pos, final IPartRenderHelper rh, final ModelGenerator renderer )
{
this.renderStaticWithIcon( pos, rh, renderer, ACTIVE_ICON );
}
protected void renderStaticWithIcon( final BlockPos opos, final IPartRenderHelper rh, final ModelGenerator renderer, final IAESprite activeIcon )
{
int minX = 1;
final EnumFacing e = rh.getWorldX();
final EnumFacing u = rh.getWorldY();
final TileEntity te = this.getHost().getTile();
final BlockPos pos = te.getPos();
if( this.isAnnihilationPlane( te.getWorld().getTileEntity( pos.offset( e.getOpposite() ) ), this.getSide() ) )
{
minX = 0;
}
int maxX = 15;
if( this.isAnnihilationPlane( te.getWorld().getTileEntity( pos.offset( e ) ), this.getSide() ) )
{
maxX = 16;
}
int minY = 1;
if( this.isAnnihilationPlane( te.getWorld().getTileEntity( pos.offset( u.getOpposite() ) ), this.getSide() ) )
{
minY = 0;
}
int maxY = 15;
if( this.isAnnihilationPlane( te.getWorld().getTileEntity( pos.offset( e ) ), this.getSide() ) )
{
maxY = 16;
}
final boolean isActive = ( this.getClientFlags() & ( PartBasicState.POWERED_FLAG | PartBasicState.CHANNEL_FLAG ) ) == ( PartBasicState.POWERED_FLAG | PartBasicState.CHANNEL_FLAG );
rh.setTexture( SIDE_ICON, SIDE_ICON, BACK_ICON, isActive ? activeIcon : renderer.getIcon( this.getItemStack() ), SIDE_ICON, SIDE_ICON );
rh.setBounds( minX, minY, 15, maxX, maxY, 16 );
rh.renderBlock( opos, renderer );
rh.setTexture( STATUS_ICON, STATUS_ICON, BACK_ICON, isActive ? activeIcon : renderer.getIcon( this.getItemStack() ), STATUS_ICON, STATUS_ICON );
rh.setBounds( 5, 5, 14, 11, 11, 15 );
rh.renderBlock( opos, renderer );
this.renderLights( opos, rh, renderer );
}
@Override
public void onNeighborChanged()
{
src/main/java/appeng/parts/automation/PartExportBus.java
-45
View File
@@ -26,10 +26,7 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.EnumHand;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Vec3d;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import appeng.api.config.Actionable;
import appeng.api.config.FuzzyMode;
@@ -49,12 +46,9 @@ import appeng.api.networking.security.MachineSource;
import appeng.api.networking.ticking.TickRateModulation;
import appeng.api.networking.ticking.TickingRequest;
import appeng.api.parts.IPartCollisionHelper;
import appeng.api.parts.IPartRenderHelper;
import appeng.api.storage.IMEInventory;
import appeng.api.storage.IMEMonitor;
import appeng.api.storage.data.IAEItemStack;
import appeng.api.util.ModelGenerator;
import appeng.client.texture.CableBusTextures;
import appeng.core.AELog;
import appeng.core.settings.TickRates;
import appeng.core.sync.GuiBridge;
@@ -189,45 +183,6 @@ public class PartExportBus extends PartSharedItemBus implements ICraftingRequest
bch.addBox( 6, 6, 11, 10, 10, 12 );
}
@Override
@SideOnly( Side.CLIENT )
public void renderInventory( final IPartRenderHelper rh, final ModelGenerator renderer )
{
rh.setTexture( CableBusTextures.PartExportSides.getIcon(), CableBusTextures.PartExportSides.getIcon(), CableBusTextures.PartMonitorBack.getIcon(), renderer.getIcon( this.getItemStack() ), CableBusTextures.PartExportSides.getIcon(), CableBusTextures.PartExportSides.getIcon() );
rh.setBounds( 4, 4, 12, 12, 12, 14 );
rh.renderInventoryBox( renderer );
rh.setBounds( 5, 5, 14, 11, 11, 15 );
rh.renderInventoryBox( renderer );
rh.setBounds( 6, 6, 15, 10, 10, 16 );
rh.renderInventoryBox( renderer );
}
@Override
@SideOnly( Side.CLIENT )
public void renderStatic( final BlockPos pos, final IPartRenderHelper rh, final ModelGenerator renderer )
{
rh.setTexture( CableBusTextures.PartExportSides.getIcon(), CableBusTextures.PartExportSides.getIcon(), CableBusTextures.PartMonitorBack.getIcon(), renderer.getIcon( this.getItemStack() ), CableBusTextures.PartExportSides.getIcon(), CableBusTextures.PartExportSides.getIcon() );
rh.setBounds( 4, 4, 12, 12, 12, 14 );
rh.renderBlock( pos, renderer );
rh.setBounds( 5, 5, 14, 11, 11, 15 );
rh.renderBlock( pos, renderer );
rh.setBounds( 6, 6, 15, 10, 10, 16 );
rh.renderBlock( pos, renderer );
rh.setTexture( CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartMonitorBack.getIcon(), renderer.getIcon( this.getItemStack() ), CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartMonitorSidesStatus.getIcon() );
rh.setBounds( 6, 6, 11, 10, 10, 12 );
rh.renderBlock( pos, renderer );
this.renderLights( pos, rh, renderer );
}
@Override
public int cableConnectionRenderTo()
{
src/main/java/appeng/parts/automation/PartFormationPlane.java
-69
View File
@@ -43,8 +43,6 @@ import net.minecraft.world.World;
import net.minecraft.world.WorldServer;
import net.minecraft.world.chunk.Chunk;
import net.minecraftforge.common.IPlantable;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import appeng.api.AEApi;
import appeng.api.config.AccessRestriction;
@@ -63,7 +61,6 @@ import appeng.api.parts.IPart;
import appeng.api.parts.IPartCollisionHelper;
import appeng.api.parts.IPartHost;
import appeng.api.parts.IPartItem;
import appeng.api.parts.IPartRenderHelper;
import appeng.api.storage.ICellContainer;
import appeng.api.storage.IMEInventory;
import appeng.api.storage.IMEInventoryHandler;
@@ -72,14 +69,11 @@ import appeng.api.storage.data.IAEItemStack;
import appeng.api.storage.data.IItemList;
import appeng.api.util.AEPartLocation;
import appeng.api.util.IConfigManager;
import appeng.api.util.ModelGenerator;
import appeng.client.texture.CableBusTextures;
import appeng.core.AEConfig;
import appeng.core.sync.GuiBridge;
import appeng.helpers.IPriorityHost;
import appeng.me.GridAccessException;
import appeng.me.storage.MEInventoryHandler;
import appeng.parts.PartBasicState;
import appeng.tile.inventory.AppEngInternalAEInventory;
import appeng.tile.inventory.InvOperation;
import appeng.util.Platform;
@@ -267,69 +261,6 @@ public class PartFormationPlane extends PartUpgradeable implements ICellContaine
bch.addBox( minX, minY, 15, maxX, maxY, 16 );
}
@Override
@SideOnly( Side.CLIENT )
public void renderInventory( final IPartRenderHelper rh, final ModelGenerator renderer )
{
rh.setTexture( CableBusTextures.PartPlaneSides.getIcon(), CableBusTextures.PartPlaneSides.getIcon(), CableBusTextures.PartTransitionPlaneBack.getIcon(), renderer.getIcon( this.getItemStack() ), CableBusTextures.PartPlaneSides.getIcon(), CableBusTextures.PartPlaneSides.getIcon() );
rh.setBounds( 1, 1, 15, 15, 15, 16 );
rh.renderInventoryBox( renderer );
rh.setBounds( 5, 5, 14, 11, 11, 15 );
rh.renderInventoryBox( renderer );
}
@Override
@SideOnly( Side.CLIENT )
public void renderStatic( final BlockPos opos, final IPartRenderHelper rh, final ModelGenerator renderer )
{
int minX = 1;
final EnumFacing e = rh.getWorldX();
final EnumFacing u = rh.getWorldY();
final TileEntity te = this.getHost().getTile();
final BlockPos pos = te.getPos();
if( this.isTransitionPlane( te.getWorld().getTileEntity( pos.offset( e.getOpposite() ) ), this.getSide() ) )
{
minX = 0;
}
int maxX = 15;
if( this.isTransitionPlane( te.getWorld().getTileEntity( pos.offset( e ) ), this.getSide() ) )
{
maxX = 16;
}
int minY = 1;
if( this.isTransitionPlane( te.getWorld().getTileEntity( pos.offset( u.getOpposite() ) ), this.getSide() ) )
{
minY = 0;
}
int maxY = 15;
if( this.isTransitionPlane( te.getWorld().getTileEntity( pos.offset( u ) ), this.getSide() ) )
{
maxY = 16;
}
final boolean isActive = ( this.getClientFlags() & ( PartBasicState.POWERED_FLAG | PartBasicState.CHANNEL_FLAG ) ) == ( PartBasicState.POWERED_FLAG | PartBasicState.CHANNEL_FLAG );
rh.setTexture( CableBusTextures.PartPlaneSides.getIcon(), CableBusTextures.PartPlaneSides.getIcon(), CableBusTextures.PartTransitionPlaneBack.getIcon(), isActive ? CableBusTextures.BlockFormPlaneOn.getIcon() : renderer.getIcon( this.getItemStack() ), CableBusTextures.PartPlaneSides.getIcon(), CableBusTextures.PartPlaneSides.getIcon() );
rh.setBounds( minX, minY, 15, maxX, maxY, 16 );
rh.renderBlock( opos, renderer );
rh.setTexture( CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartTransitionPlaneBack.getIcon(), isActive ? CableBusTextures.BlockFormPlaneOn.getIcon() : renderer.getIcon( this.getItemStack() ), CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartMonitorSidesStatus.getIcon() );
rh.setBounds( 5, 5, 14, 11, 11, 15 );
rh.renderBlock( opos, renderer );
this.renderLights( opos, rh, renderer );
}
@Override
public void onNeighborChanged()
{
src/main/java/appeng/parts/automation/PartIdentityAnnihilationPlane.java
-14
View File
@@ -30,21 +30,14 @@ import net.minecraft.util.math.BlockPos;
import net.minecraft.world.WorldServer;
import net.minecraftforge.common.util.FakePlayer;
import net.minecraftforge.common.util.FakePlayerFactory;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import appeng.api.parts.IPart;
import appeng.api.parts.IPartHost;
import appeng.api.parts.IPartRenderHelper;
import appeng.api.util.AEPartLocation;
import appeng.api.util.IAESprite;
import appeng.api.util.ModelGenerator;
import appeng.client.texture.CableBusTextures;
public class PartIdentityAnnihilationPlane extends PartAnnihilationPlane
{
private static final IAESprite ACTIVE_ICON = CableBusTextures.BlockIdentityAnnihilationPlaneOn.getIcon();
private static final float SILK_TOUCH_FACTOR = 16;
@@ -53,13 +46,6 @@ public class PartIdentityAnnihilationPlane extends PartAnnihilationPlane
super( is );
}
@Override
@SideOnly( Side.CLIENT )
public void renderStatic( final BlockPos pos, final IPartRenderHelper rh, final ModelGenerator renderer )
{
this.renderStaticWithIcon( pos, rh, renderer, ACTIVE_ICON );
}
@Override
protected boolean isAnnihilationPlane( final TileEntity blockTileEntity, final AEPartLocation side )
{
src/main/java/appeng/parts/automation/PartImportBus.java
-44
View File
@@ -22,10 +22,7 @@ package appeng.parts.automation;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumHand;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Vec3d;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import appeng.api.AEApi;
import appeng.api.config.Actionable;
@@ -42,12 +39,9 @@ import appeng.api.networking.security.MachineSource;
import appeng.api.networking.ticking.TickRateModulation;
import appeng.api.networking.ticking.TickingRequest;
import appeng.api.parts.IPartCollisionHelper;
import appeng.api.parts.IPartRenderHelper;
import appeng.api.storage.IMEInventory;
import appeng.api.storage.IMEMonitor;
import appeng.api.storage.data.IAEItemStack;
import appeng.api.util.ModelGenerator;
import appeng.client.texture.CableBusTextures;
import appeng.core.settings.TickRates;
import appeng.core.sync.GuiBridge;
import appeng.helpers.Reflected;
@@ -100,44 +94,6 @@ public class PartImportBus extends PartSharedItemBus implements IInventoryDestin
bch.addBox( 4, 4, 14, 12, 12, 16 );
}
@Override
@SideOnly( Side.CLIENT )
public void renderInventory( final IPartRenderHelper rh, final ModelGenerator renderer )
{
rh.setTexture( CableBusTextures.PartImportSides.getIcon(), CableBusTextures.PartImportSides.getIcon(), CableBusTextures.PartMonitorBack.getIcon(), renderer.getIcon( this.getItemStack() ), CableBusTextures.PartImportSides.getIcon(), CableBusTextures.PartImportSides.getIcon() );
rh.setBounds( 3, 3, 15, 13, 13, 16 );
rh.renderInventoryBox( renderer );
rh.setBounds( 4, 4, 14, 12, 12, 15 );
rh.renderInventoryBox( renderer );
rh.setBounds( 5, 5, 13, 11, 11, 14 );
rh.renderInventoryBox( renderer );
}
@Override
@SideOnly( Side.CLIENT )
public void renderStatic( final BlockPos pos, final IPartRenderHelper rh, final ModelGenerator renderer )
{
rh.setTexture( CableBusTextures.PartImportSides.getIcon(), CableBusTextures.PartImportSides.getIcon(), CableBusTextures.PartMonitorBack.getIcon(), renderer.getIcon( this.getItemStack() ), CableBusTextures.PartImportSides.getIcon(), CableBusTextures.PartImportSides.getIcon() );
rh.setBounds( 4, 4, 14, 12, 12, 16 );
rh.renderBlock( pos, renderer );
rh.setBounds( 5, 5, 13, 11, 11, 14 );
rh.renderBlock( pos, renderer );
rh.setBounds( 6, 6, 12, 10, 10, 13 );
rh.renderBlock( pos, renderer );
rh.setTexture( CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartMonitorBack.getIcon(), renderer.getIcon( this.getItemStack() ), CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartMonitorSidesStatus.getIcon() );
rh.setBounds( 6, 6, 11, 10, 10, 12 );
rh.renderBlock( pos, renderer );
this.renderLights( pos, rh, renderer );
}
@Override
public int cableConnectionRenderTo()
{
src/main/java/appeng/parts/automation/PartLevelEmitter.java
-213
View File
@@ -22,22 +22,17 @@ package appeng.parts.automation;
import java.util.Collection;
import java.util.Random;
import net.minecraft.client.renderer.BlockModelRenderer;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory;
import net.minecraft.inventory.InventoryCrafting;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.EnumHand;
import net.minecraft.util.EnumParticleTypes;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Vec3d;
import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import appeng.api.config.FuzzyMode;
import appeng.api.config.LevelType;
@@ -63,7 +58,6 @@ import appeng.api.networking.storage.IBaseMonitor;
import appeng.api.networking.storage.IStackWatcher;
import appeng.api.networking.storage.IStackWatcherHost;
import appeng.api.parts.IPartCollisionHelper;
import appeng.api.parts.IPartRenderHelper;
import appeng.api.storage.IMEMonitor;
import appeng.api.storage.IMEMonitorHandlerReceiver;
import appeng.api.storage.StorageChannel;
@@ -72,10 +66,7 @@ import appeng.api.storage.data.IAEStack;
import appeng.api.storage.data.IItemList;
import appeng.api.util.AECableType;
import appeng.api.util.AEPartLocation;
import appeng.api.util.IAESprite;
import appeng.api.util.IConfigManager;
import appeng.api.util.ModelGenerator;
import appeng.client.texture.CableBusTextures;
import appeng.core.sync.GuiBridge;
import appeng.helpers.Reflected;
import appeng.me.GridAccessException;
@@ -193,12 +184,6 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH
return cf | ( this.prevState ? FLAG_ON : 0 );
}
@Override
public TextureAtlasSprite getBreakingTexture( final ModelGenerator renderer )
{
return renderer.getIcon( this.getItemStack() ).getAtlas();
}
@Override
public void updateWatcher( final ICraftingWatcher newWatcher )
{
@@ -412,204 +397,6 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH
bch.addBox( 7, 7, 11, 9, 9, 16 );
}
@Override
@SideOnly( Side.CLIENT )
public void renderInventory( final IPartRenderHelper rh, final ModelGenerator renderer )
{
rh.setTexture( renderer.getIcon( this.getItemStack() ) );
this.renderTorchAtAngle( 0, -0.5, 0, renderer );
}
public void renderTorchAtAngle( double baseX, double baseY, double baseZ, final ModelGenerator renderer )
{
final boolean isOn = this.isLevelEmitterOn();
final IAESprite offTexture = renderer.getIcon( this.getItemStack() );
final IAESprite IIcon = ( isOn ? CableBusTextures.LevelEmitterTorchOn.getIcon() : offTexture );
//
this.centerX = baseX + 0.5;
this.centerY = baseY + 0.5;
this.centerZ = baseZ + 0.5;
baseY += 7.0 / 16.0;
// double par11 = 0;
/*
* double d5 = (double)TextureAtlasSprite.func_94209_e(); double d6 = (double)TextureAtlasSprite.func_94206_g();
* double d7 =
* (double)TextureAtlasSprite.func_94212_f(); double d8 = (double)TextureAtlasSprite.func_94210_h(); double d9 =
* (double)TextureAtlasSprite.func_94214_a(7.0D); double d10 = (double)TextureAtlasSprite.func_94207_b(6.0D);
* double d11 =
* (double)TextureAtlasSprite.func_94214_a(9.0D); double d12 = (double)TextureAtlasSprite.func_94207_b(8.0D);
* double d13 =
* (double)TextureAtlasSprite.func_94214_a(7.0D); double d14 = (double)TextureAtlasSprite.func_94207_b(13.0D);
* double d15 =
* (double)TextureAtlasSprite.func_94214_a(9.0D); double d16 = (double)TextureAtlasSprite.func_94207_b(15.0D);
*/
final float var16 = IIcon.getMinU();
final float var17 = IIcon.getMaxU();
final float var18 = IIcon.getMinV();
final float var19 = IIcon.getMaxV();
/*
* float var16 = (float)var14 / 256.0F; float var17 = ((float)var14 + 15.99F) / 256.0F; float var18 =
* (float)var15 / 256.0F; float var19 = ((float)var15 + 15.99F) / 256.0F;
*/
final double var20b = offTexture.getInterpolatedU( 7.0D );
final double var24b = offTexture.getInterpolatedU( 9.0D );
final double var20 = IIcon.getInterpolatedU( 7.0D );
final double var24 = IIcon.getInterpolatedU( 9.0D );
final double var22 = IIcon.getInterpolatedV( 6.0D + ( isOn ? 0 : 1.0D ) );
final double var26 = IIcon.getInterpolatedV( 8.0D + ( isOn ? 0 : 1.0D ) );
final double var28 = IIcon.getInterpolatedU( 7.0D );
final double var30 = IIcon.getInterpolatedV( 13.0D );
final double var32 = IIcon.getInterpolatedU( 9.0D );
final double var34 = IIcon.getInterpolatedV( 15.0D );
final double var22b = IIcon.getInterpolatedV( 9.0D );
final double var26b = IIcon.getInterpolatedV( 11.0D );
baseX += 0.5D;
baseZ += 0.5D;
final double var36 = baseX - 0.5D;
final double var38 = baseX + 0.5D;
final double var40 = baseZ - 0.5D;
final double var42 = baseZ + 0.5D;
double toff = 0.0d;
if( !isOn )
{
toff = 1.0d / 16.0d;
}
if( isOn )
{
renderer.setColorOpaque_F( 1.0F, 1.0F, 1.0F );
renderer.setBrightness( 11 << 20 | 11 << 4 );
}
final EnumFacing t = EnumFacing.UP;
final double TorchLen = 0.625D;
final double var44 = 0.0625D;
final double Zero = 0;
final double par10 = 0;
this.addVertexWithUV( t, renderer, baseX + Zero * ( 1.0D - TorchLen ) - var44, baseY + TorchLen - toff, baseZ + par10 * ( 1.0D - TorchLen ) - var44, var20, var22 );
this.addVertexWithUV( t, renderer, baseX + Zero * ( 1.0D - TorchLen ) - var44, baseY + TorchLen - toff, baseZ + par10 * ( 1.0D - TorchLen ) + var44, var20, var26 );
this.addVertexWithUV( t, renderer, baseX + Zero * ( 1.0D - TorchLen ) + var44, baseY + TorchLen - toff, baseZ + par10 * ( 1.0D - TorchLen ) + var44, var24, var26 );
this.addVertexWithUV( t, renderer, baseX + Zero * ( 1.0D - TorchLen ) + var44, baseY + TorchLen - toff, baseZ + par10 * ( 1.0D - TorchLen ) - var44, var24, var22 );
final double var422 = 0.1915D + 1.0 / 16.0;
this.addVertexWithUV( t, renderer, baseX + Zero * ( 1.0D - TorchLen ) + var44, baseY + var422, baseZ + par10 * ( 1.0D - TorchLen ) - var44, var24b, var22b );
this.addVertexWithUV( t, renderer, baseX + Zero * ( 1.0D - TorchLen ) + var44, baseY + var422, baseZ + par10 * ( 1.0D - TorchLen ) + var44, var24b, var26b );
this.addVertexWithUV( t, renderer, baseX + Zero * ( 1.0D - TorchLen ) - var44, baseY + var422, baseZ + par10 * ( 1.0D - TorchLen ) + var44, var20b, var26b );
this.addVertexWithUV( t, renderer, baseX + Zero * ( 1.0D - TorchLen ) - var44, baseY + var422, baseZ + par10 * ( 1.0D - TorchLen ) - var44, var20b, var22b );
this.addVertexWithUV( t, renderer, baseX + var44 + Zero, baseY, baseZ - var44 + par10, var32, var30 );
this.addVertexWithUV( t, renderer, baseX + var44 + Zero, baseY, baseZ + var44 + par10, var32, var34 );
this.addVertexWithUV( t, renderer, baseX - var44 + Zero, baseY, baseZ + var44 + par10, var28, var34 );
this.addVertexWithUV( t, renderer, baseX - var44 + Zero, baseY, baseZ - var44 + par10, var28, var30 );
this.addVertexWithUV( t, renderer, baseX - var44, baseY + 1.0D, var40, var16, var18 );
this.addVertexWithUV( t, renderer, baseX - var44 + Zero, baseY + 0.0D, var40 + par10, var16, var19 );
this.addVertexWithUV( t, renderer, baseX - var44 + Zero, baseY + 0.0D, var42 + par10, var17, var19 );
this.addVertexWithUV( t, renderer, baseX - var44, baseY + 1.0D, var42, var17, var18 );
this.addVertexWithUV( t, renderer, baseX + var44, baseY + 1.0D, var42, var16, var18 );
this.addVertexWithUV( t, renderer, baseX + Zero + var44, baseY + 0.0D, var42 + par10, var16, var19 );
this.addVertexWithUV( t, renderer, baseX + Zero + var44, baseY + 0.0D, var40 + par10, var17, var19 );
this.addVertexWithUV( t, renderer, baseX + var44, baseY + 1.0D, var40, var17, var18 );
this.addVertexWithUV( t, renderer, var36, baseY + 1.0D, baseZ + var44, var16, var18 );
this.addVertexWithUV( t, renderer, var36 + Zero, baseY + 0.0D, baseZ + var44 + par10, var16, var19 );
this.addVertexWithUV( t, renderer, var38 + Zero, baseY + 0.0D, baseZ + var44 + par10, var17, var19 );
this.addVertexWithUV( t, renderer, var38, baseY + 1.0D, baseZ + var44, var17, var18 );
this.addVertexWithUV( t, renderer, var38, baseY + 1.0D, baseZ - var44, var16, var18 );
this.addVertexWithUV( t, renderer, var38 + Zero, baseY + 0.0D, baseZ - var44 + par10, var16, var19 );
this.addVertexWithUV( t, renderer, var36 + Zero, baseY + 0.0D, baseZ - var44 + par10, var17, var19 );
this.addVertexWithUV( t, renderer, var36, baseY + 1.0D, baseZ - var44, var17, var18 );
}
private void addVertexWithUV( final EnumFacing face, final ModelGenerator renderer, double x, double y, double z, final double u, final double v )
{
x -= this.centerX;
y -= this.centerY;
z -= this.centerZ;
if( this.getSide() == AEPartLocation.DOWN )
{
y = -y;
z = -z;
}
if( this.getSide() == AEPartLocation.EAST )
{
final double m = x;
x = y;
y = m;
y = -y;
}
if( this.getSide() == AEPartLocation.WEST )
{
final double m = x;
x = -y;
y = m;
}
if( this.getSide() == AEPartLocation.SOUTH )
{
final double m = z;
z = y;
y = m;
y = -y;
}
if( this.getSide() == AEPartLocation.NORTH )
{
final double m = z;
z = -y;
y = m;
}
x += this.centerX;// + orientation.offsetX * 0.4;
y += this.centerY;// + orientation.offsetY * 0.4;
z += this.centerZ;// + orientation.offsetZ * 0.4;
renderer.addVertexWithUV( face, x, y, z, u, v );
}
@Override
@SideOnly( Side.CLIENT )
public void renderStatic( final BlockPos pos, final IPartRenderHelper rh, final ModelGenerator renderer )
{
rh.setTexture( renderer.getIcon( this.getItemStack() ) );
// rh.setTexture( CableBusTextures.ItemPartLevelEmitterOn.getIcon() );
// rh.setBounds( 2, 2, 14, 14, 14, 16 );
// rh.renderBlock( x, y, z, renderer );
// rh.setBounds( 7, 7, 10, 9, 9, 15 );
// rh.renderBlock( x, y, z, renderer );
renderer.setRenderAllFaces( true );
renderer.setBrightness( rh.getBlock().getPackedLightmapCoords( this.getHost().getTile().getWorld().getBlockState( pos ), this.getHost().getTile().getWorld(), pos ) );
renderer.setColorOpaque_F( 1.0F, 1.0F, 1.0F );
this.renderTorchAtAngle( pos.getX(), pos.getY(), pos.getZ(), renderer );
renderer.setRenderAllFaces( false );
rh.setBounds( 7, 7, 11, 9, 9, 12 );
this.renderLights( pos, rh, renderer );
// super.renderWorldBlock( world, x, y, z, block, modelId, renderer );
}
@Override
public int isProvidingStrongPower()
{
src/main/java/appeng/parts/misc/PartCableAnchor.java
-47
View File
@@ -25,7 +25,6 @@ import java.util.Random;
import io.netty.buffer.ByteBuf;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
@@ -36,19 +35,14 @@ import net.minecraft.util.EnumHand;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Vec3d;
import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import appeng.api.networking.IGridNode;
import appeng.api.parts.BusSupport;
import appeng.api.parts.IPart;
import appeng.api.parts.IPartCollisionHelper;
import appeng.api.parts.IPartHost;
import appeng.api.parts.IPartRenderHelper;
import appeng.api.parts.PartItemStack;
import appeng.api.util.AEPartLocation;
import appeng.api.util.IAESprite;
import appeng.api.util.ModelGenerator;
public class PartCableAnchor implements IPart
@@ -82,47 +76,6 @@ public class PartCableAnchor implements IPart
return this.is;
}
@Override
@SideOnly( Side.CLIENT )
public void renderInventory( final IPartRenderHelper instance, final ModelGenerator renderer )
{
instance.setTexture( renderer.getIcon( this.is ) );
instance.setBounds( 7, 7, 4, 9, 9, 14 );
instance.renderInventoryBox( renderer );
instance.setTexture( null );
}
@Override
@SideOnly( Side.CLIENT )
public void renderStatic( final BlockPos pos, final IPartRenderHelper rh, final ModelGenerator renderer )
{
final IAESprite myIcon = renderer.getIcon( this.is );
rh.setTexture( myIcon );
if( this.host != null && this.host.getFacadeContainer().getFacade( this.mySide ) != null )
{
rh.setBounds( 7, 7, 10, 9, 9, 14 );
}
else
{
rh.setBounds( 7, 7, 10, 9, 9, 16 );
}
rh.renderBlock( pos, renderer );
rh.setTexture( null );
}
@Override
@SideOnly( Side.CLIENT )
public void renderDynamic( final double x, final double y, final double z, final IPartRenderHelper rh, final ModelGenerator renderer )
{
}
@Override
public TextureAtlasSprite getBreakingTexture( final ModelGenerator renderer )
{
return null;
}
@Override
public boolean requireDynamicRender()
{
src/main/java/appeng/parts/misc/PartInterface.java
-51
View File
@@ -24,7 +24,6 @@ import java.util.List;
import com.google.common.collect.ImmutableSet;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory;
import net.minecraft.inventory.ISidedInventory;
@@ -34,11 +33,8 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.EnumHand;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Vec3d;
import net.minecraft.util.text.ITextComponent;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import appeng.api.config.Actionable;
import appeng.api.config.Upgrades;
@@ -55,14 +51,11 @@ import appeng.api.networking.ticking.IGridTickable;
import appeng.api.networking.ticking.TickRateModulation;
import appeng.api.networking.ticking.TickingRequest;
import appeng.api.parts.IPartCollisionHelper;
import appeng.api.parts.IPartRenderHelper;
import appeng.api.storage.IMEMonitor;
import appeng.api.storage.IStorageMonitorable;
import appeng.api.storage.data.IAEFluidStack;
import appeng.api.storage.data.IAEItemStack;
import appeng.api.util.IConfigManager;
import appeng.api.util.ModelGenerator;
import appeng.client.texture.CableBusTextures;
import appeng.core.sync.GuiBridge;
import appeng.helpers.DualityInterface;
import appeng.helpers.IInterfaceHost;
@@ -111,50 +104,12 @@ public class PartInterface extends PartBasicState implements IGridTickable, ISto
return this.duality.getInstalledUpgrades( u );
}
@Override
@SideOnly( Side.CLIENT )
public void renderInventory( final IPartRenderHelper rh, final ModelGenerator renderer )
{
rh.setTexture( CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.PartMonitorBack.getIcon(), renderer.getIcon( this.getItemStack() ), CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.PartMonitorSides.getIcon() );
rh.setBounds( 2, 2, 14, 14, 14, 16 );
rh.renderInventoryBox( renderer );
rh.setBounds( 5, 5, 12, 11, 11, 13 );
rh.renderInventoryBox( renderer );
rh.setBounds( 5, 5, 13, 11, 11, 14 );
rh.renderInventoryBox( renderer );
}
@Override
public void gridChanged()
{
this.duality.gridChanged();
}
@Override
@SideOnly( Side.CLIENT )
public void renderStatic( final BlockPos pos, final IPartRenderHelper rh, final ModelGenerator renderer )
{
rh.setTexture( CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.PartMonitorBack.getIcon(), renderer.getIcon( this.getItemStack() ), CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.PartMonitorSides.getIcon() );
rh.setBounds( 2, 2, 14, 14, 14, 16 );
rh.renderBlock( pos, renderer );
rh.setTexture( CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.PartMonitorBack.getIcon(), renderer.getIcon( this.getItemStack() ), CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.PartMonitorSides.getIcon() );
rh.setBounds( 5, 5, 12, 11, 11, 13 );
rh.renderBlock( pos, renderer );
rh.setTexture( CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartMonitorBack.getIcon(), renderer.getIcon( this.getItemStack() ), CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartMonitorSidesStatus.getIcon() );
rh.setBounds( 5, 5, 13, 11, 11, 14 );
rh.renderBlock( pos, renderer );
this.renderLights( pos, rh, renderer );
}
@Override
public void readFromNBT( final NBTTagCompound data )
{
@@ -216,12 +171,6 @@ public class PartInterface extends PartBasicState implements IGridTickable, ISto
return true;
}
@Override
public TextureAtlasSprite getBreakingTexture( final ModelGenerator renderer )
{
return renderer.getIcon( this.getItemStack() ).getAtlas();
}
@Override
public boolean canInsert( final ItemStack stack )
{
src/main/java/appeng/parts/misc/PartStorageBus.java
-47
View File
@@ -29,10 +29,7 @@ import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumHand;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Vec3d;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import appeng.api.AEApi;
import appeng.api.config.AccessRestriction;
@@ -55,7 +52,6 @@ import appeng.api.networking.ticking.TickRateModulation;
import appeng.api.networking.ticking.TickingRequest;
import appeng.api.parts.IPartCollisionHelper;
import appeng.api.parts.IPartHost;
import appeng.api.parts.IPartRenderHelper;
import appeng.api.storage.ICellContainer;
import appeng.api.storage.IExternalStorageHandler;
import appeng.api.storage.IMEInventory;
@@ -67,8 +63,6 @@ import appeng.api.storage.data.IAEItemStack;
import appeng.api.storage.data.IItemList;
import appeng.api.util.AEPartLocation;
import appeng.api.util.IConfigManager;
import appeng.api.util.ModelGenerator;
import appeng.client.texture.CableBusTextures;
import appeng.core.settings.TickRates;
import appeng.core.stats.Achievements;
import appeng.core.sync.GuiBridge;
@@ -264,47 +258,6 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC
bch.addBox( 5, 5, 12, 11, 11, 14 );
}
@Override
@SideOnly( Side.CLIENT )
public void renderInventory( final IPartRenderHelper rh, final ModelGenerator renderer )
{
rh.setTexture( CableBusTextures.PartStorageSides.getIcon(), CableBusTextures.PartStorageSides.getIcon(), CableBusTextures.PartStorageBack.getIcon(), renderer.getIcon( this.getItemStack() ), CableBusTextures.PartStorageSides.getIcon(), CableBusTextures.PartStorageSides.getIcon() );
rh.setBounds( 3, 3, 15, 13, 13, 16 );
rh.renderInventoryBox( renderer );
rh.setBounds( 2, 2, 14, 14, 14, 15 );
rh.renderInventoryBox( renderer );
rh.setBounds( 5, 5, 12, 11, 11, 14 );
rh.renderInventoryBox( renderer );
}
@Override
@SideOnly( Side.CLIENT )
public void renderStatic( final BlockPos pos, final IPartRenderHelper rh, final ModelGenerator renderer )
{
rh.setTexture( CableBusTextures.PartStorageSides.getIcon(), CableBusTextures.PartStorageSides.getIcon(), CableBusTextures.PartStorageBack.getIcon(), renderer.getIcon( this.getItemStack() ), CableBusTextures.PartStorageSides.getIcon(), CableBusTextures.PartStorageSides.getIcon() );
rh.setBounds( 3, 3, 15, 13, 13, 16 );
rh.renderBlock( pos, renderer );
rh.setBounds( 2, 2, 14, 14, 14, 15 );
rh.renderBlock( pos, renderer );
rh.setTexture( CableBusTextures.PartStorageSides.getIcon(), CableBusTextures.PartStorageSides.getIcon(), CableBusTextures.PartStorageBack.getIcon(), renderer.getIcon( this.getItemStack() ), CableBusTextures.PartStorageSides.getIcon(), CableBusTextures.PartStorageSides.getIcon() );
rh.setBounds( 5, 5, 12, 11, 11, 13 );
rh.renderBlock( pos, renderer );
rh.setTexture( CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartMonitorBack.getIcon(), renderer.getIcon( this.getItemStack() ), CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartMonitorSidesStatus.getIcon() );
rh.setBounds( 5, 5, 13, 11, 11, 14 );
rh.renderBlock( pos, renderer );
this.renderLights( pos, rh, renderer );
}
@Override
public void onNeighborChanged()
{
src/main/java/appeng/parts/misc/PartToggleBus.java
-62
View File
@@ -25,7 +25,6 @@ import java.util.List;
import org.lwjgl.opengl.GL11;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
@@ -41,11 +40,8 @@ import appeng.api.networking.IGridConnection;
import appeng.api.networking.IGridNode;
import appeng.api.parts.IPartCollisionHelper;
import appeng.api.parts.IPartHost;
import appeng.api.parts.IPartRenderHelper;
import appeng.api.util.AECableType;
import appeng.api.util.AEPartLocation;
import appeng.api.util.ModelGenerator;
import appeng.client.texture.CableBusTextures;
import appeng.helpers.Reflected;
import appeng.me.helpers.AENetworkProxy;
import appeng.parts.PartBasicState;
@@ -70,13 +66,6 @@ public class PartToggleBus extends PartBasicState
this.getOuterProxy().setFlags();
}
@Override
public void setColors( final ModelGenerator renderer, final boolean hasChan, final boolean hasPower )
{
this.hasRedstone = ( this.getClientFlags() & REDSTONE_FLAG ) == REDSTONE_FLAG;
super.setColors( renderer, hasChan && this.hasRedstone, hasPower && this.hasRedstone );
}
@Override
protected int populateFlags( final int cf )
{
@@ -88,12 +77,6 @@ public class PartToggleBus extends PartBasicState
return this.getHost().hasRedstone( this.getSide() );
}
@Override
public TextureAtlasSprite getBreakingTexture( final ModelGenerator renderer )
{
return renderer.getIcon( this.getItemStack() ).getAtlas();
}
@Override
public AECableType getCableConnectionType( final AEPartLocation dir )
{
@@ -119,51 +102,6 @@ public class PartToggleBus extends PartBasicState
bch.addBox( 6, 6, 11, 10, 10, 16 );
}
@Override
@SideOnly( Side.CLIENT )
public void renderInventory( final IPartRenderHelper rh, final ModelGenerator renderer )
{
GL11.glTranslated( -0.2, -0.3, 0.0 );
rh.setTexture( renderer.getIcon( this.getItemStack() ) );
rh.setBounds( 6, 6, 14 - 4, 10, 10, 16 - 4 );
rh.renderInventoryBox( renderer );
rh.setBounds( 6, 6, 11 - 4, 10, 10, 13 - 4 );
rh.renderInventoryBox( renderer );
rh.setBounds( 6, 6, 13 - 4, 10, 10, 14 - 4 );
rh.setTexture( CableBusTextures.PartMonitorSidesStatus.getIcon() );
rh.renderInventoryBox( renderer );
rh.setTexture( CableBusTextures.PartMonitorSidesStatusLights.getIcon() );
rh.setInvColor( 0x000000 );
rh.renderInventoryBox( renderer );
rh.setInvColor( 0xffffff );
rh.setTexture( null );
}
@Override
@SideOnly( Side.CLIENT )
public void renderStatic( final BlockPos pos, final IPartRenderHelper rh, final ModelGenerator renderer )
{
rh.setTexture( renderer.getIcon( this.getItemStack() ) );
rh.setBounds( 6, 6, 14, 10, 10, 16 );
rh.renderBlock( pos, renderer );
rh.setBounds( 6, 6, 11, 10, 10, 13 );
rh.renderBlock( pos, renderer );
rh.setTexture( CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartMonitorBack.getIcon(), renderer.getIcon( this.getItemStack() ), CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartMonitorSidesStatus.getIcon() );
rh.setBounds( 6, 6, 13, 10, 10, 14 );
rh.renderBlock( pos, renderer );
this.renderLights( pos, rh, renderer );
}
@Override
public void onNeighborChanged()
{
src/main/java/appeng/parts/networking/PartCable.java
-675
View File
@@ -22,19 +22,12 @@ package appeng.parts.networking;
import java.io.IOException;
import java.util.EnumSet;
import org.lwjgl.opengl.GL11;
import io.netty.buffer.ByteBuf;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
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.AEApi;
import appeng.api.config.SecurityPermissions;
@@ -48,18 +41,10 @@ import appeng.api.parts.BusSupport;
import appeng.api.parts.IPart;
import appeng.api.parts.IPartCollisionHelper;
import appeng.api.parts.IPartHost;
import appeng.api.parts.IPartRenderHelper;
import appeng.api.util.AECableType;
import appeng.api.util.AEColor;
import appeng.api.util.AEColoredItemDefinition;
import appeng.api.util.AEPartLocation;
import appeng.api.util.IAESprite;
import appeng.api.util.IReadOnlyCollection;
import appeng.api.util.ModelGenerator;
import appeng.block.AEBaseBlock;
import appeng.client.texture.CableBusTextures;
import appeng.client.texture.FlippableIcon;
import appeng.client.texture.TaughtIcon;
import appeng.items.parts.ItemMultiPart;
import appeng.me.GridAccessException;
import appeng.parts.AEBasePart;
@@ -255,200 +240,6 @@ public class PartCable extends AEBasePart implements IPartCable
}
}
@Override
@SideOnly( Side.CLIENT )
public void renderInventory( final IPartRenderHelper rh, final ModelGenerator renderer )
{
GL11.glTranslated( -0.0, -0.0, 0.3 );
rh.setTexture( this.getTexture( this.getCableColor(), renderer ) );
rh.setBounds( 6.0f, 6.0f, 2.0f, 10.0f, 10.0f, 14.0f );
rh.renderInventoryBox( renderer );
rh.setTexture( null );
}
public IAESprite getTexture( final AEColor c, final ModelGenerator renderer )
{
return this.getGlassTexture( c, renderer );
}
public IAESprite getGlassTexture( final AEColor c, final ModelGenerator renderer )
{
switch( c )
{
case Black:
return CableBusTextures.MECable_Black.getIcon();
case Blue:
return CableBusTextures.MECable_Blue.getIcon();
case Brown:
return CableBusTextures.MECable_Brown.getIcon();
case Cyan:
return CableBusTextures.MECable_Cyan.getIcon();
case Gray:
return CableBusTextures.MECable_Grey.getIcon();
case Green:
return CableBusTextures.MECable_Green.getIcon();
case LightBlue:
return CableBusTextures.MECable_LightBlue.getIcon();
case LightGray:
return CableBusTextures.MECable_LightGrey.getIcon();
case Lime:
return CableBusTextures.MECable_Lime.getIcon();
case Magenta:
return CableBusTextures.MECable_Magenta.getIcon();
case Orange:
return CableBusTextures.MECable_Orange.getIcon();
case Pink:
return CableBusTextures.MECable_Pink.getIcon();
case Purple:
return CableBusTextures.MECable_Purple.getIcon();
case Red:
return CableBusTextures.MECable_Red.getIcon();
case White:
return CableBusTextures.MECable_White.getIcon();
case Yellow:
return CableBusTextures.MECable_Yellow.getIcon();
default:
}
final AEColoredItemDefinition glassCable = AEApi.instance().definitions().parts().cableGlass();
final ItemStack glassCableStack = glassCable.stack( AEColor.Transparent, 1 );
return renderer.getIcon( glassCableStack );
}
@Override
@SideOnly( Side.CLIENT )
public void renderStatic( final BlockPos pos, final IPartRenderHelper rh, final ModelGenerator renderer )
{
boolean useCovered = false;
boolean requireDetailed = false;
for( final AEPartLocation dir : AEPartLocation.SIDE_LOCATIONS )
{
final IPart p = this.getHost().getPart( dir );
if( p instanceof IGridHost )
{
final IGridHost igh = (IGridHost) p;
final AECableType type = igh.getCableConnectionType( dir.getOpposite() );
if( type == AECableType.COVERED || type == AECableType.SMART )
{
useCovered = true;
break;
}
}
else if( this.getConnections().contains( dir ) )
{
final TileEntity te = this.getTile().getWorld().getTileEntity( pos.offset( dir.getFacing() ) );
final IPartHost partHost = te instanceof IPartHost ? (IPartHost) te : null;
final IGridHost gh = te instanceof IGridHost ? (IGridHost) te : null;
if( partHost == null && gh != null && gh.getCableConnectionType( dir ) != AECableType.GLASS )
{
requireDetailed = true;
}
}
}
if( useCovered )
{
rh.setTexture( this.getCoveredTexture( this.getCableColor(), renderer ) );
}
else
{
rh.setTexture( this.getTexture( this.getCableColor(), renderer ) );
}
final IPartHost ph = this.getHost();
for( final AEPartLocation of : EnumSet.complementOf( this.getConnections() ) )
{
final IPart bp = ph.getPart( of );
if( bp instanceof IGridHost )
{
final int len = bp.cableConnectionRenderTo();
if( len < 8 )
{
switch( of )
{
case DOWN:
rh.setBounds( 6, len, 6, 10, 6, 10 );
break;
case EAST:
rh.setBounds( 10, 6, 6, 16 - len, 10, 10 );
break;
case NORTH:
rh.setBounds( 6, 6, len, 10, 10, 6 );
break;
case SOUTH:
rh.setBounds( 6, 6, 10, 10, 10, 16 - len );
break;
case UP:
rh.setBounds( 6, 10, 6, 10, 16 - len, 10 );
break;
case WEST:
rh.setBounds( len, 6, 6, 6, 10, 10 );
break;
default:
continue;
}
rh.renderBlock( pos, renderer );
}
}
}
if( this.getConnections().size() != 2 || !this.nonLinear( this.getConnections() ) || useCovered || requireDetailed )
{
if( useCovered )
{
rh.setBounds( 5, 5, 5, 11, 11, 11 );
rh.renderBlock( pos, renderer );
}
else
{
rh.setBounds( 6, 6, 6, 10, 10, 10 );
rh.renderBlock( pos, renderer );
}
for( final AEPartLocation of : this.getConnections() )
{
this.renderGlassConnection( pos, rh, renderer, of );
}
}
else
{
final IAESprite def = this.getTexture( this.getCableColor(), renderer );
rh.setTexture( def );
for( final AEPartLocation of : this.getConnections() )
{
rh.setFacesToRender( EnumSet.complementOf( EnumSet.of( of.getFacing(), of.getFacing().getOpposite() ) ) );
switch( of )
{
case DOWN:
case UP:
renderer.setRenderBounds( 6 / 16.0, 0, 6 / 16.0, 10 / 16.0, 16 / 16.0, 10 / 16.0 );
break;
case EAST:
case WEST:
renderer.setUvRotateEast( renderer.setUvRotateWest( 1 ) );
renderer.setUvRotateBottom( renderer.setUvRotateTop( 1 ) );
renderer.setRenderBounds( 0, 6 / 16.0, 6 / 16.0, 16 / 16.0, 10 / 16.0, 10 / 16.0 );
break;
case NORTH:
case SOUTH:
renderer.setUvRotateNorth( renderer.setUvRotateSouth( 1 ) );
renderer.setRenderBounds( 6 / 16.0, 6 / 16.0, 0, 10 / 16.0, 10 / 16.0, 16 / 16.0 );
break;
default:
}
}
rh.renderBlockCurrentBounds( pos, renderer );
}
rh.setFacesToRender( EnumSet.allOf( EnumFacing.class ) );
rh.setTexture( null );
}
@Override
public void writeToNBT( final NBTTagCompound data )
{
@@ -588,477 +379,11 @@ public class PartCable extends AEBasePart implements IPartCable
return !myC.equals( this.getConnections() ) || wasPowered != this.powered || channelsChanged;
}
@Override
@SideOnly( Side.CLIENT )
public TextureAtlasSprite getBreakingTexture( final ModelGenerator renderer )
{
return this.getTexture( this.getCableColor(), renderer ).getAtlas();
}
public IAESprite getCoveredTexture( final AEColor c, final ModelGenerator renderer )
{
switch( c )
{
case Black:
return CableBusTextures.MECovered_Black.getIcon();
case Blue:
return CableBusTextures.MECovered_Blue.getIcon();
case Brown:
return CableBusTextures.MECovered_Brown.getIcon();
case Cyan:
return CableBusTextures.MECovered_Cyan.getIcon();
case Gray:
return CableBusTextures.MECovered_Gray.getIcon();
case Green:
return CableBusTextures.MECovered_Green.getIcon();
case LightBlue:
return CableBusTextures.MECovered_LightBlue.getIcon();
case LightGray:
return CableBusTextures.MECovered_LightGrey.getIcon();
case Lime:
return CableBusTextures.MECovered_Lime.getIcon();
case Magenta:
return CableBusTextures.MECovered_Magenta.getIcon();
case Orange:
return CableBusTextures.MECovered_Orange.getIcon();
case Pink:
return CableBusTextures.MECovered_Pink.getIcon();
case Purple:
return CableBusTextures.MECovered_Purple.getIcon();
case Red:
return CableBusTextures.MECovered_Red.getIcon();
case White:
return CableBusTextures.MECovered_White.getIcon();
case Yellow:
return CableBusTextures.MECovered_Yellow.getIcon();
default:
}
final AEColoredItemDefinition coveredCable = AEApi.instance().definitions().parts().cableCovered();
final ItemStack coveredCableStack = coveredCable.stack( AEColor.Transparent, 1 );
return renderer.getIcon( coveredCableStack );
}
protected boolean nonLinear( final EnumSet<AEPartLocation> sides )
{
return ( sides.contains( AEPartLocation.EAST ) && sides.contains( AEPartLocation.WEST ) ) || ( sides.contains( AEPartLocation.NORTH ) && sides.contains( AEPartLocation.SOUTH ) ) || ( sides.contains( AEPartLocation.UP ) && sides.contains( AEPartLocation.DOWN ) );
}
@SideOnly( Side.CLIENT )
private void renderGlassConnection( final BlockPos pos, final IPartRenderHelper rh, final ModelGenerator renderer, final AEPartLocation of )
{
final TileEntity te = this.getTile().getWorld().getTileEntity( pos.offset( of.getFacing() ) );
final IPartHost partHost = te instanceof IPartHost ? (IPartHost) te : null;
final IGridHost gh = te instanceof IGridHost ? (IGridHost) te : null;
rh.setFacesToRender( EnumSet.complementOf( EnumSet.of( of.getFacing() ) ) );
if( gh != null && partHost != null && gh.getCableConnectionType( of.getOpposite() ) == AECableType.GLASS && partHost.getColor() != AEColor.Transparent && partHost.getPart( of.getOpposite() ) == null )
{
rh.setTexture( this.getTexture( partHost.getColor(), renderer ) );
}
else if( partHost == null && gh != null && gh.getCableConnectionType( of.getOpposite() ) != AECableType.GLASS )
{
rh.setTexture( this.getCoveredTexture( this.getCableColor(), renderer ) );
switch( of )
{
case DOWN:
rh.setBounds( 5, 0, 5, 11, 4, 11 );
break;
case EAST:
rh.setBounds( 12, 5, 5, 16, 11, 11 );
break;
case NORTH:
rh.setBounds( 5, 5, 0, 11, 11, 4 );
break;
case SOUTH:
rh.setBounds( 5, 5, 12, 11, 11, 16 );
break;
case UP:
rh.setBounds( 5, 12, 5, 11, 16, 11 );
break;
case WEST:
rh.setBounds( 0, 5, 5, 4, 11, 11 );
break;
default:
return;
}
rh.renderBlock( pos, renderer );
rh.setTexture( this.getTexture( this.getCableColor(), renderer ) );
}
else
{
rh.setTexture( this.getTexture( this.getCableColor(), renderer ) );
}
switch( of )
{
case DOWN:
rh.setBounds( 6, 0, 6, 10, 6, 10 );
break;
case EAST:
rh.setBounds( 10, 6, 6, 16, 10, 10 );
break;
case NORTH:
rh.setBounds( 6, 6, 0, 10, 10, 6 );
break;
case SOUTH:
rh.setBounds( 6, 6, 10, 10, 10, 16 );
break;
case UP:
rh.setBounds( 6, 10, 6, 10, 16, 10 );
break;
case WEST:
rh.setBounds( 0, 6, 6, 6, 10, 10 );
break;
default:
return;
}
rh.renderBlock( pos, renderer );
rh.setFacesToRender( EnumSet.allOf( EnumFacing.class ) );
}
@SideOnly( Side.CLIENT )
protected void renderCoveredConnection( final BlockPos pos, final IPartRenderHelper rh, final ModelGenerator renderer, final int channels, final AEPartLocation of )
{
final TileEntity te = this.getTile().getWorld().getTileEntity( pos.offset( of.getFacing() ) );
final IPartHost partHost = te instanceof IPartHost ? (IPartHost) te : null;
final IGridHost ghh = te instanceof IGridHost ? (IGridHost) te : null;
rh.setFacesToRender( EnumSet.complementOf( EnumSet.of( of.getFacing() ) ) );
if( ghh != null && partHost != null && ghh.getCableConnectionType( of.getOpposite() ) == AECableType.GLASS && partHost.getPart( of.getOpposite() ) == null && partHost.getColor() != AEColor.Transparent )
{
rh.setTexture( this.getGlassTexture( partHost.getColor(), renderer ) );
}
else if( partHost == null && ghh != null && ghh.getCableConnectionType( of.getOpposite() ) != AECableType.GLASS )
{
rh.setTexture( this.getCoveredTexture( this.getCableColor(), renderer ) );
switch( of )
{
case DOWN:
rh.setBounds( 5, 0, 5, 11, 4, 11 );
break;
case EAST:
rh.setBounds( 12, 5, 5, 16, 11, 11 );
break;
case NORTH:
rh.setBounds( 5, 5, 0, 11, 11, 4 );
break;
case SOUTH:
rh.setBounds( 5, 5, 12, 11, 11, 16 );
break;
case UP:
rh.setBounds( 5, 12, 5, 11, 16, 11 );
break;
case WEST:
rh.setBounds( 0, 5, 5, 4, 11, 11 );
break;
default:
return;
}
rh.renderBlock( pos, renderer );
rh.setTexture( this.getTexture( this.getCableColor(), renderer ) );
}
else if( ghh != null && partHost != null && ghh.getCableConnectionType( of.getOpposite() ) == AECableType.COVERED && partHost.getColor() != AEColor.Transparent && partHost.getPart( of.getOpposite() ) == null )
{
rh.setTexture( this.getCoveredTexture( partHost.getColor(), renderer ) );
}
else
{
rh.setTexture( this.getCoveredTexture( this.getCableColor(), renderer ) );
}
switch( of )
{
case DOWN:
rh.setBounds( 6, 0, 6, 10, 5, 10 );
break;
case EAST:
rh.setBounds( 11, 6, 6, 16, 10, 10 );
break;
case NORTH:
rh.setBounds( 6, 6, 0, 10, 10, 5 );
break;
case SOUTH:
rh.setBounds( 6, 6, 11, 10, 10, 16 );
break;
case UP:
rh.setBounds( 6, 11, 6, 10, 16, 10 );
break;
case WEST:
rh.setBounds( 0, 6, 6, 5, 10, 10 );
break;
default:
return;
}
rh.renderBlock( pos, renderer );
rh.setFacesToRender( EnumSet.allOf( EnumFacing.class ) );
rh.setFacesToRender( EnumSet.allOf( EnumFacing.class ) );
}
@SideOnly( Side.CLIENT )
protected void renderSmartConnection( final BlockPos pos, final IPartRenderHelper rh, final ModelGenerator renderer, final int channels, final AEPartLocation of )
{
final TileEntity te = this.getTile().getWorld().getTileEntity( pos.offset( of.getFacing() ) );
final IPartHost partHost = te instanceof IPartHost ? (IPartHost) te : null;
final IGridHost ghh = te instanceof IGridHost ? (IGridHost) te : null;
AEColor myColor = this.getCableColor();
rh.setFacesToRender( EnumSet.complementOf( EnumSet.of( of.getFacing() ) ) );
boolean isGlass = false;
if( ghh != null && partHost != null && ghh.getCableConnectionType( of.getOpposite() ) == AECableType.GLASS && partHost.getPart( of.getOpposite() ) == null && partHost.getColor() != AEColor.Transparent )
{
isGlass = true;
rh.setTexture( this.getGlassTexture( myColor = partHost.getColor(), renderer ) );
}
else if( partHost == null && ghh != null && ghh.getCableConnectionType( of.getOpposite() ) != AECableType.GLASS )
{
rh.setTexture( this.getSmartTexture( myColor, renderer ) );
switch( of )
{
case DOWN:
rh.setBounds( 5, 0, 5, 11, 4, 11 );
break;
case EAST:
rh.setBounds( 12, 5, 5, 16, 11, 11 );
break;
case NORTH:
rh.setBounds( 5, 5, 0, 11, 11, 4 );
break;
case SOUTH:
rh.setBounds( 5, 5, 12, 11, 11, 16 );
break;
case UP:
rh.setBounds( 5, 12, 5, 11, 16, 11 );
break;
case WEST:
rh.setBounds( 0, 5, 5, 4, 11, 11 );
break;
default:
return;
}
rh.renderBlock( pos, renderer );
this.setSmartConnectionRotations( of, renderer );
final IAESprite firstIcon = new TaughtIcon( this.getChannelTex( channels, false ).getIcon(), -0.2f );
final IAESprite secondIcon = new TaughtIcon( this.getChannelTex( channels, true ).getIcon(), -0.2f );
if( of == AEPartLocation.EAST || of == AEPartLocation.WEST )
{
final AEBaseBlock blk = (AEBaseBlock) rh.getBlock();
final FlippableIcon ico = blk.getRendererInstance().getTexture( AEPartLocation.EAST );
ico.setFlip( false, true );
}
renderer.setBrightness( 15 << 20 | 15 << 4 );
renderer.setColorOpaque_I( myColor.blackVariant );
rh.setTexture( firstIcon, firstIcon, firstIcon, firstIcon, firstIcon, firstIcon );
this.renderAllFaces( (AEBaseBlock) rh.getBlock(), pos, rh, renderer );
renderer.setColorOpaque_I( myColor.whiteVariant );
rh.setTexture( secondIcon, secondIcon, secondIcon, secondIcon, secondIcon, secondIcon );
this.renderAllFaces( (AEBaseBlock) rh.getBlock(), pos, rh, renderer );
renderer.setUvRotateBottom( renderer.setUvRotateEast( renderer.setUvRotateNorth( renderer.setUvRotateSouth( renderer.setUvRotateTop( renderer.setUvRotateWest( 0 ) ) ) ) ) );
rh.setTexture( this.getTexture( this.getCableColor(), renderer ) );
}
else if( ghh != null && partHost != null && ghh.getCableConnectionType( of.getOpposite() ) != AECableType.GLASS && partHost.getColor() != AEColor.Transparent && partHost.getPart( of.getOpposite() ) == null )
{
rh.setTexture( this.getSmartTexture( myColor = partHost.getColor(), renderer ) );
}
else
{
rh.setTexture( this.getSmartTexture( this.getCableColor(), renderer ) );
}
switch( of )
{
case DOWN:
rh.setBounds( 6, 0, 6, 10, 5, 10 );
break;
case EAST:
rh.setBounds( 11, 6, 6, 16, 10, 10 );
break;
case NORTH:
rh.setBounds( 6, 6, 0, 10, 10, 5 );
break;
case SOUTH:
rh.setBounds( 6, 6, 11, 10, 10, 16 );
break;
case UP:
rh.setBounds( 6, 11, 6, 10, 16, 10 );
break;
case WEST:
rh.setBounds( 0, 6, 6, 5, 10, 10 );
break;
default:
return;
}
rh.renderBlock( pos, renderer );
rh.setFacesToRender( EnumSet.allOf( EnumFacing.class ) );
if( !isGlass )
{
this.setSmartConnectionRotations( of, renderer );
final IAESprite firstIcon = new TaughtIcon( this.getChannelTex( channels, false ).getIcon(), -0.2f );
final IAESprite secondIcon = new TaughtIcon( this.getChannelTex( channels, true ).getIcon(), -0.2f );
renderer.setBrightness( 15 << 20 | 15 << 4 );
renderer.setColorOpaque_I( myColor.blackVariant );
rh.setTexture( firstIcon, firstIcon, firstIcon, firstIcon, firstIcon, firstIcon );
this.renderAllFaces( (AEBaseBlock) rh.getBlock(), pos, rh, renderer );
renderer.setColorOpaque_I( myColor.whiteVariant );
rh.setTexture( secondIcon, secondIcon, secondIcon, secondIcon, secondIcon, secondIcon );
this.renderAllFaces( (AEBaseBlock) rh.getBlock(), pos, rh, renderer );
renderer.setUvRotateBottom( renderer.setUvRotateEast( renderer.setUvRotateNorth( renderer.setUvRotateSouth( renderer.setUvRotateTop( renderer.setUvRotateWest( 0 ) ) ) ) ) );
}
}
public IAESprite getSmartTexture( final AEColor c, final ModelGenerator renderer )
{
switch( c )
{
case Black:
return CableBusTextures.MESmart_Black.getIcon();
case Blue:
return CableBusTextures.MESmart_Blue.getIcon();
case Brown:
return CableBusTextures.MESmart_Brown.getIcon();
case Cyan:
return CableBusTextures.MESmart_Cyan.getIcon();
case Gray:
return CableBusTextures.MESmart_Gray.getIcon();
case Green:
return CableBusTextures.MESmart_Green.getIcon();
case LightBlue:
return CableBusTextures.MESmart_LightBlue.getIcon();
case LightGray:
return CableBusTextures.MESmart_LightGrey.getIcon();
case Lime:
return CableBusTextures.MESmart_Lime.getIcon();
case Magenta:
return CableBusTextures.MESmart_Magenta.getIcon();
case Orange:
return CableBusTextures.MESmart_Orange.getIcon();
case Pink:
return CableBusTextures.MESmart_Pink.getIcon();
case Purple:
return CableBusTextures.MESmart_Purple.getIcon();
case Red:
return CableBusTextures.MESmart_Red.getIcon();
case White:
return CableBusTextures.MESmart_White.getIcon();
case Yellow:
return CableBusTextures.MESmart_Yellow.getIcon();
default:
}
final IParts parts = AEApi.instance().definitions().parts();
final ItemStack smartCableStack = parts.cableSmart().stack( AEColor.Transparent, 1 );
return renderer.getIcon( smartCableStack );
}
@SideOnly( Side.CLIENT )
protected void setSmartConnectionRotations( final AEPartLocation of, final ModelGenerator renderer )
{
switch( of )
{
case UP:
case DOWN:
renderer.setUvRotateTop( 0 );
renderer.setUvRotateBottom( 0 );
renderer.setUvRotateSouth( 3 );
renderer.setUvRotateEast( 3 );
break;
case NORTH:
case SOUTH:
renderer.setUvRotateTop( 3 );
renderer.setUvRotateBottom( 3 );
renderer.setUvRotateNorth( 1 );
renderer.setUvRotateSouth( 2 );
renderer.setUvRotateWest( 1 );
break;
case EAST:
case WEST:
renderer.setUvRotateEast( 2 );
renderer.setUvRotateWest( 1 );
renderer.setUvRotateBottom( 2 );
renderer.setUvRotateTop( 1 );
renderer.setUvRotateSouth( 3 );
renderer.setUvRotateNorth( 0 );
break;
default:
break;
}
}
protected CableBusTextures getChannelTex( int i, final boolean b )
{
if( !this.powered )
{
i = 0;
}
if( b )
{
switch( i )
{
default:
return CableBusTextures.Channels10;
case 5:
return CableBusTextures.Channels11;
case 6:
return CableBusTextures.Channels12;
case 7:
return CableBusTextures.Channels13;
case 8:
return CableBusTextures.Channels14;
}
}
else
{
switch( i )
{
case 0:
return CableBusTextures.Channels00;
case 1:
return CableBusTextures.Channels01;
case 2:
return CableBusTextures.Channels02;
case 3:
return CableBusTextures.Channels03;
default:
return CableBusTextures.Channels04;
}
}
}
@SideOnly( Side.CLIENT )
protected void renderAllFaces( final AEBaseBlock blk, final BlockPos pos, final IPartRenderHelper rh, final ModelGenerator renderer )
{
rh.setBounds( (float) renderer.getRenderMinX() * 16.0f, (float) renderer.getRenderMinY() * 16.0f, (float) renderer.getRenderMinZ() * 16.0f, (float) renderer.getRenderMaxX() * 16.0f, (float) renderer.getRenderMaxY() * 16.0f, (float) renderer.getRenderMaxZ() * 16.0f );
rh.renderFace( pos, blk.getRendererInstance().getTexture( AEPartLocation.WEST ), EnumFacing.WEST, renderer );
rh.renderFace( pos, blk.getRendererInstance().getTexture( AEPartLocation.EAST ), EnumFacing.EAST, renderer );
rh.renderFace( pos, blk.getRendererInstance().getTexture( AEPartLocation.NORTH ), EnumFacing.NORTH, renderer );
rh.renderFace( pos, blk.getRendererInstance().getTexture( AEPartLocation.SOUTH ), EnumFacing.SOUTH, renderer );
rh.renderFace( pos, blk.getRendererInstance().getTexture( AEPartLocation.DOWN ), EnumFacing.DOWN, renderer );
rh.renderFace( pos, blk.getRendererInstance().getTexture( AEPartLocation.UP ), EnumFacing.UP, renderer );
}
int getChannelsOnSide( final int i )
{
return this.channelsOnSide[i];
src/main/java/appeng/parts/networking/PartCableCovered.java
-158
View File
@@ -19,31 +19,15 @@
package appeng.parts.networking;
import java.util.EnumSet;
import org.lwjgl.opengl.GL11;
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.networking.IGridHost;
import appeng.api.networking.IGridNode;
import appeng.api.networking.events.MENetworkChannelsChanged;
import appeng.api.networking.events.MENetworkEventSubscribe;
import appeng.api.networking.events.MENetworkPowerStatusChange;
import appeng.api.parts.IPart;
import appeng.api.parts.IPartCollisionHelper;
import appeng.api.parts.IPartHost;
import appeng.api.parts.IPartRenderHelper;
import appeng.api.util.AECableType;
import appeng.api.util.AEColor;
import appeng.api.util.AEPartLocation;
import appeng.api.util.IAESprite;
import appeng.api.util.ModelGenerator;
import appeng.client.texture.OffsetIcon;
import appeng.helpers.Reflected;
import appeng.util.Platform;
@@ -118,146 +102,4 @@ public class PartCableCovered extends PartCable
}
}
}
@Override
@SideOnly( Side.CLIENT )
public void renderInventory( final IPartRenderHelper rh, final ModelGenerator renderer )
{
GL11.glTranslated( -0.0, -0.0, 0.3 );
rh.setBounds( 5.0f, 5.0f, 2.0f, 11.0f, 11.0f, 14.0f );
float offU = 0;
float offV = 9;
OffsetIcon main = new OffsetIcon( this.getTexture( this.getCableColor(), renderer ), offU, offV );
for( final EnumFacing side : EnumSet.of( EnumFacing.UP, EnumFacing.DOWN ) )
{
rh.renderInventoryFace( main, side, renderer );
}
offU = 9;
offV = 0;
main = new OffsetIcon( this.getTexture( this.getCableColor(), renderer ), offU, offV );
for( final EnumFacing side : EnumSet.of( EnumFacing.EAST, EnumFacing.WEST ) )
{
rh.renderInventoryFace( main, side, renderer );
}
main = new OffsetIcon( this.getTexture( this.getCableColor(), renderer ), 0, 0 );
for( final EnumFacing side : EnumSet.of( EnumFacing.SOUTH, EnumFacing.NORTH ) )
{
rh.renderInventoryFace( main, side, renderer );
}
rh.setTexture( null );
}
@Override
public IAESprite getTexture( final AEColor c, final ModelGenerator renderer )
{
return this.getCoveredTexture( c, renderer );
}
@Override
@SideOnly( Side.CLIENT )
public void renderStatic( final BlockPos pos, final IPartRenderHelper rh, final ModelGenerator renderer )
{
rh.setTexture( this.getTexture( this.getCableColor(), renderer ) );
final EnumSet<AEPartLocation> sides = this.getConnections().clone();
boolean hasBuses = false;
final IPartHost ph = this.getHost();
for( final AEPartLocation of : EnumSet.complementOf( this.getConnections() ) )
{
final IPart bp = ph.getPart( of );
if( bp instanceof IGridHost )
{
if( of != AEPartLocation.INTERNAL )
{
sides.add( of );
hasBuses = true;
}
final int len = bp.cableConnectionRenderTo();
if( len < 8 )
{
switch( of )
{
case DOWN:
rh.setBounds( 6, len, 6, 10, 5, 10 );
break;
case EAST:
rh.setBounds( 11, 6, 6, 16 - len, 10, 10 );
break;
case NORTH:
rh.setBounds( 6, 6, len, 10, 10, 5 );
break;
case SOUTH:
rh.setBounds( 6, 6, 11, 10, 10, 16 - len );
break;
case UP:
rh.setBounds( 6, 11, 6, 10, 16 - len, 10 );
break;
case WEST:
rh.setBounds( len, 6, 6, 5, 10, 10 );
break;
default:
continue;
}
rh.renderBlock( pos, renderer );
}
}
}
if( sides.size() != 2 || !this.nonLinear( sides ) || hasBuses )
{
for( final AEPartLocation of : this.getConnections() )
{
this.renderCoveredConnection( pos, rh, renderer, this.getChannelsOnSide( of.ordinal() ), of );
}
rh.setTexture( this.getTexture( this.getCableColor(), renderer ) );
rh.setBounds( 5, 5, 5, 11, 11, 11 );
rh.renderBlock( pos, renderer );
}
else
{
final IAESprite def = this.getTexture( this.getCableColor(), renderer );
final IAESprite off = new OffsetIcon( def, 0, -12 );
for( final AEPartLocation of : this.getConnections() )
{
switch( of )
{
case DOWN:
case UP:
rh.setTexture( def, def, off, off, off, off );
renderer.setRenderBounds( 5 / 16.0, 0, 5 / 16.0, 11 / 16.0, 16 / 16.0, 11 / 16.0 );
break;
case EAST:
case WEST:
rh.setTexture( off, off, off, off, def, def );
renderer.setUvRotateEast( renderer.setUvRotateWest( 1 ) );
renderer.setUvRotateBottom( renderer.setUvRotateTop( 1 ) );
renderer.setRenderBounds( 0, 5 / 16.0, 5 / 16.0, 16 / 16.0, 11 / 16.0, 11 / 16.0 );
break;
case NORTH:
case SOUTH:
rh.setTexture( off, off, def, def, off, off );
renderer.setUvRotateNorth( renderer.setUvRotateSouth( 1 ) );
renderer.setRenderBounds( 5 / 16.0, 5 / 16.0, 0, 11 / 16.0, 11 / 16.0, 16 / 16.0 );
break;
default:
}
}
rh.renderBlockCurrentBounds( pos, renderer );
}
renderer.setUvRotateBottom( renderer.setUvRotateEast( renderer.setUvRotateNorth( renderer.setUvRotateSouth( renderer.setUvRotateTop( renderer.setUvRotateWest( 0 ) ) ) ) ) );
rh.setTexture( null );
}
}
src/main/java/appeng/parts/networking/PartCableSmart.java
-271
View File
@@ -19,34 +19,15 @@
package appeng.parts.networking;
import java.util.EnumSet;
import org.lwjgl.opengl.GL11;
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.networking.IGridHost;
import appeng.api.networking.IGridNode;
import appeng.api.networking.events.MENetworkChannelsChanged;
import appeng.api.networking.events.MENetworkEventSubscribe;
import appeng.api.networking.events.MENetworkPowerStatusChange;
import appeng.api.parts.IPart;
import appeng.api.parts.IPartCollisionHelper;
import appeng.api.parts.IPartHost;
import appeng.api.parts.IPartRenderHelper;
import appeng.api.util.AECableType;
import appeng.api.util.AEColor;
import appeng.api.util.AEPartLocation;
import appeng.api.util.IAESprite;
import appeng.api.util.ModelGenerator;
import appeng.block.AEBaseBlock;
import appeng.client.texture.FlippableIcon;
import appeng.client.texture.OffsetIcon;
import appeng.client.texture.TaughtIcon;
import appeng.helpers.Reflected;
import appeng.util.Platform;
@@ -121,256 +102,4 @@ public class PartCableSmart extends PartCable
}
}
}
@Override
@SideOnly( Side.CLIENT )
public void renderInventory( final IPartRenderHelper rh, final ModelGenerator renderer )
{
GL11.glTranslated( -0.0, -0.0, 0.3 );
float offU = 0;
float offV = 9;
OffsetIcon main = new OffsetIcon( this.getTexture( this.getCableColor(), renderer ), offU, offV );
OffsetIcon ch1 = new OffsetIcon( this.getChannelTex( 4, false ).getIcon(), offU, offV );
OffsetIcon ch2 = new OffsetIcon( this.getChannelTex( 4, true ).getIcon(), offU, offV );
for( final EnumFacing side : EnumSet.of( EnumFacing.UP, EnumFacing.DOWN ) )
{
rh.setBounds( 5.0f, 5.0f, 2.0f, 11.0f, 11.0f, 14.0f );
rh.renderInventoryFace( main, side, renderer );
rh.renderInventoryFace( ch1, side, renderer );
rh.renderInventoryFace( ch2, side, renderer );
}
offU = 9;
offV = 0;
main = new OffsetIcon( this.getTexture( this.getCableColor(), renderer ), offU, offV );
ch1 = new OffsetIcon( this.getChannelTex( 4, false ).getIcon(), offU, offV );
ch2 = new OffsetIcon( this.getChannelTex( 4, true ).getIcon(), offU, offV );
for( final EnumFacing side : EnumSet.of( EnumFacing.EAST, EnumFacing.WEST ) )
{
rh.setBounds( 5.0f, 5.0f, 2.0f, 11.0f, 11.0f, 14.0f );
rh.renderInventoryFace( main, side, renderer );
rh.renderInventoryFace( ch1, side, renderer );
rh.renderInventoryFace( ch2, side, renderer );
}
main = new OffsetIcon( this.getTexture( this.getCableColor(), renderer ), 0, 0 );
ch1 = new OffsetIcon( this.getChannelTex( 4, false ).getIcon(), 0, 0 );
ch2 = new OffsetIcon( this.getChannelTex( 4, true ).getIcon(), 0, 0 );
for( final EnumFacing side : EnumSet.of( EnumFacing.SOUTH, EnumFacing.NORTH ) )
{
rh.setBounds( 5.0f, 5.0f, 2.0f, 11.0f, 11.0f, 14.0f );
rh.renderInventoryFace( main, side, renderer );
rh.renderInventoryFace( ch1, side, renderer );
rh.renderInventoryFace( ch2, side, renderer );
}
rh.setTexture( null );
}
@Override
public IAESprite getTexture( final AEColor c, final ModelGenerator renderer )
{
return this.getSmartTexture( c, renderer );
}
@Override
@SideOnly( Side.CLIENT )
public void renderStatic( final BlockPos pos, final IPartRenderHelper rh, final ModelGenerator renderer )
{
rh.setTexture( this.getTexture( this.getCableColor(), renderer ) );
final EnumSet<AEPartLocation> sides = this.getConnections().clone();
boolean hasBuses = false;
final IPartHost ph = this.getHost();
for( final AEPartLocation of : EnumSet.complementOf( this.getConnections() ) )
{
final IPart bp = ph.getPart( of );
if( bp instanceof IGridHost )
{
if( of != AEPartLocation.INTERNAL )
{
sides.add( of );
hasBuses = true;
}
final int len = bp.cableConnectionRenderTo();
if( len < 8 )
{
switch( of )
{
case DOWN:
rh.setBounds( 6, len, 6, 10, 5, 10 );
break;
case EAST:
rh.setBounds( 11, 6, 6, 16 - len, 10, 10 );
break;
case NORTH:
rh.setBounds( 6, 6, len, 10, 10, 5 );
break;
case SOUTH:
rh.setBounds( 6, 6, 11, 10, 10, 16 - len );
break;
case UP:
rh.setBounds( 6, 11, 6, 10, 16 - len, 10 );
break;
case WEST:
rh.setBounds( len, 6, 6, 5, 10, 10 );
break;
default:
continue;
}
rh.renderBlock( pos, renderer );
this.setSmartConnectionRotations( of, renderer );
final IAESprite firstIcon = new TaughtIcon( this.getChannelTex( this.getChannelsOnSide( of.ordinal() ), false ).getIcon(), -0.2f );
final IAESprite secondIcon = new TaughtIcon( this.getChannelTex( this.getChannelsOnSide( of.ordinal() ), true ).getIcon(), -0.2f );
if( of == AEPartLocation.EAST || of == AEPartLocation.WEST )
{
final AEBaseBlock blk = (AEBaseBlock) rh.getBlock();
final FlippableIcon ico = blk.getRendererInstance().getTexture( AEPartLocation.EAST );
ico.setFlip( false, true );
}
renderer.setBrightness( 15 << 20 | 15 << 4 );
renderer.setColorOpaque_I( this.getCableColor().blackVariant );
rh.setTexture( firstIcon, firstIcon, firstIcon, firstIcon, firstIcon, firstIcon );
this.renderAllFaces( (AEBaseBlock) rh.getBlock(), pos, rh, renderer );
renderer.setColorOpaque_I( this.getCableColor().whiteVariant );
rh.setTexture( secondIcon, secondIcon, secondIcon, secondIcon, secondIcon, secondIcon );
this.renderAllFaces( (AEBaseBlock) rh.getBlock(), pos, rh, renderer );
renderer.setUvRotateBottom( renderer.setUvRotateEast( renderer.setUvRotateNorth( renderer.setUvRotateSouth( renderer.setUvRotateTop( renderer.setUvRotateWest( 0 ) ) ) ) ) );
rh.setTexture( this.getTexture( this.getCableColor(), renderer ) );
}
}
}
if( sides.size() != 2 || !this.nonLinear( sides ) || hasBuses )
{
for( final AEPartLocation of : this.getConnections() )
{
this.renderSmartConnection( pos, rh, renderer, this.getChannelsOnSide( of.ordinal() ), of );
}
rh.setTexture( this.getCoveredTexture( this.getCableColor(), renderer ) );
rh.setBounds( 5, 5, 5, 11, 11, 11 );
rh.renderBlock( pos, renderer );
}
else
{
AEPartLocation selectedSide = AEPartLocation.INTERNAL;
for( final AEPartLocation of : this.getConnections() )
{
selectedSide = of;
break;
}
final int channels = this.getChannelsOnSide( selectedSide.ordinal() );
final IAESprite def = this.getTexture( this.getCableColor(), renderer );
final IAESprite off = new OffsetIcon( def, 0, -12 );
final IAESprite firstTaughtIcon = new TaughtIcon( this.getChannelTex( channels, false ).getIcon(), -0.2f );
final IAESprite firstOffsetIcon = new OffsetIcon( firstTaughtIcon, 0, -12 );
final IAESprite secondTaughtIcon = new TaughtIcon( this.getChannelTex( channels, true ).getIcon(), -0.2f );
final IAESprite secondOffsetIcon = new OffsetIcon( secondTaughtIcon, 0, -12 );
switch( selectedSide )
{
case DOWN:
case UP:
renderer.setRenderBounds( 5 / 16.0, 0, 5 / 16.0, 11 / 16.0, 16 / 16.0, 11 / 16.0 );
rh.setTexture( def, def, off, off, off, off );
rh.renderBlockCurrentBounds( pos, renderer );
renderer.setUvRotateTop( 0 );
renderer.setUvRotateBottom( 0 );
renderer.setUvRotateSouth( 3 );
renderer.setUvRotateEast( 3 );
renderer.setBrightness( 15 << 20 | 15 << 4 );
renderer.setColorOpaque_I( this.getCableColor().blackVariant );
rh.setTexture( firstTaughtIcon, firstTaughtIcon, firstOffsetIcon, firstOffsetIcon, firstOffsetIcon, firstOffsetIcon );
this.renderAllFaces( (AEBaseBlock) rh.getBlock(), pos, rh, renderer );
renderer.setColorOpaque_I( this.getCableColor().whiteVariant );
rh.setTexture( secondTaughtIcon, secondTaughtIcon, secondOffsetIcon, secondOffsetIcon, secondOffsetIcon, secondOffsetIcon );
this.renderAllFaces( (AEBaseBlock) rh.getBlock(), pos, rh, renderer );
break;
case EAST:
case WEST:
rh.setTexture( off, off, off, off, def, def );
renderer.setUvRotateEast( 2 );
renderer.setUvRotateWest( 1 );
renderer.setUvRotateBottom( 2 );
renderer.setUvRotateTop( 1 );
renderer.setUvRotateSouth( 0 );
renderer.setUvRotateNorth( 0 );
final AEBaseBlock blk = (AEBaseBlock) rh.getBlock();
final FlippableIcon ico = blk.getRendererInstance().getTexture( AEPartLocation.EAST );
ico.setFlip( false, true );
renderer.setRenderBounds( 0, 5 / 16.0, 5 / 16.0, 16 / 16.0, 11 / 16.0, 11 / 16.0 );
rh.renderBlockCurrentBounds( pos, renderer );
renderer.setBrightness( 15 << 20 | 15 << 4 );
FlippableIcon fpA = new FlippableIcon( firstTaughtIcon );
FlippableIcon fpB = new FlippableIcon( secondTaughtIcon );
fpA = new FlippableIcon( firstTaughtIcon );
fpB = new FlippableIcon( secondTaughtIcon );
fpA.setFlip( true, false );
fpB.setFlip( true, false );
renderer.setColorOpaque_I( this.getCableColor().blackVariant );
rh.setTexture( firstOffsetIcon, firstOffsetIcon, firstOffsetIcon, firstOffsetIcon, firstTaughtIcon, fpA );
this.renderAllFaces( (AEBaseBlock) rh.getBlock(), pos, rh, renderer );
renderer.setColorOpaque_I( this.getCableColor().whiteVariant );
rh.setTexture( secondOffsetIcon, secondOffsetIcon, secondOffsetIcon, secondOffsetIcon, secondTaughtIcon, fpB );
this.renderAllFaces( (AEBaseBlock) rh.getBlock(), pos, rh, renderer );
break;
case NORTH:
case SOUTH:
rh.setTexture( off, off, def, def, off, off );
renderer.setUvRotateTop( 3 );
renderer.setUvRotateBottom( 3 );
renderer.setUvRotateNorth( 1 );
renderer.setUvRotateSouth( 2 );
renderer.setUvRotateWest( 1 );
renderer.setRenderBounds( 5 / 16.0, 5 / 16.0, 0, 11 / 16.0, 11 / 16.0, 16 / 16.0 );
rh.renderBlockCurrentBounds( pos, renderer );
renderer.setBrightness( 15 << 20 | 15 << 4 );
renderer.setColorOpaque_I( this.getCableColor().blackVariant );
rh.setTexture( firstOffsetIcon, firstOffsetIcon, firstTaughtIcon, firstTaughtIcon, firstOffsetIcon, firstOffsetIcon );
this.renderAllFaces( (AEBaseBlock) rh.getBlock(), pos, rh, renderer );
renderer.setColorOpaque_I( this.getCableColor().whiteVariant );
rh.setTexture( secondOffsetIcon, secondOffsetIcon, secondTaughtIcon, secondTaughtIcon, secondOffsetIcon, secondOffsetIcon );
this.renderAllFaces( (AEBaseBlock) rh.getBlock(), pos, rh, renderer );
break;
default:
break;
}
}
renderer.setUvRotateBottom( renderer.setUvRotateEast( renderer.setUvRotateNorth( renderer.setUvRotateSouth( renderer.setUvRotateTop( renderer.setUvRotateWest( 0 ) ) ) ) ) );
rh.setTexture( null );
}
}
src/main/java/appeng/parts/networking/PartDenseCable.java
-361
View File
@@ -19,18 +19,9 @@
package appeng.parts.networking;
import java.util.EnumSet;
import org.lwjgl.opengl.GL11;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
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.AEApi;
import appeng.api.networking.GridFlags;
import appeng.api.networking.IGridHost;
import appeng.api.networking.IGridNode;
@@ -39,18 +30,8 @@ import appeng.api.networking.events.MENetworkEventSubscribe;
import appeng.api.networking.events.MENetworkPowerStatusChange;
import appeng.api.parts.BusSupport;
import appeng.api.parts.IPartCollisionHelper;
import appeng.api.parts.IPartHost;
import appeng.api.parts.IPartRenderHelper;
import appeng.api.util.AECableType;
import appeng.api.util.AEColor;
import appeng.api.util.AEPartLocation;
import appeng.api.util.IAESprite;
import appeng.api.util.ModelGenerator;
import appeng.block.AEBaseBlock;
import appeng.client.texture.CableBusTextures;
import appeng.client.texture.FlippableIcon;
import appeng.client.texture.OffsetIcon;
import appeng.client.texture.TaughtIcon;
import appeng.helpers.Reflected;
import appeng.util.Platform;
@@ -154,306 +135,6 @@ public class PartDenseCable extends PartCable
}
}
@Override
@SideOnly( Side.CLIENT )
public void renderInventory( final IPartRenderHelper rh, final ModelGenerator renderer )
{
GL11.glTranslated( -0.0, -0.0, 0.3 );
rh.setBounds( 4.0f, 4.0f, 2.0f, 12.0f, 12.0f, 14.0f );
float offU = 0;
float offV = 9;
OffsetIcon main = new OffsetIcon( this.getTexture( this.getCableColor(), renderer ), offU, offV );
OffsetIcon ch1 = new OffsetIcon( this.getChannelTex( 4, false ).getIcon(), offU, offV );
OffsetIcon ch2 = new OffsetIcon( this.getChannelTex( 4, true ).getIcon(), offU, offV );
for( final EnumFacing side : EnumSet.of( EnumFacing.UP, EnumFacing.DOWN ) )
{
rh.renderInventoryFace( main, side, renderer );
rh.renderInventoryFace( ch1, side, renderer );
rh.renderInventoryFace( ch2, side, renderer );
}
offU = 9;
offV = 0;
main = new OffsetIcon( this.getTexture( this.getCableColor(), renderer ), offU, offV );
ch1 = new OffsetIcon( this.getChannelTex( 4, false ).getIcon(), offU, offV );
ch2 = new OffsetIcon( this.getChannelTex( 4, true ).getIcon(), offU, offV );
for( final EnumFacing side : EnumSet.of( EnumFacing.EAST, EnumFacing.WEST ) )
{
rh.renderInventoryFace( main, side, renderer );
rh.renderInventoryFace( ch1, side, renderer );
rh.renderInventoryFace( ch2, side, renderer );
}
main = new OffsetIcon( this.getTexture( this.getCableColor(), renderer ), 0, 0 );
ch1 = new OffsetIcon( this.getChannelTex( 4, false ).getIcon(), 0, 0 );
ch2 = new OffsetIcon( this.getChannelTex( 4, true ).getIcon(), 0, 0 );
for( final EnumFacing side : EnumSet.of( EnumFacing.SOUTH, EnumFacing.NORTH ) )
{
rh.renderInventoryFace( main, side, renderer );
rh.renderInventoryFace( ch1, side, renderer );
rh.renderInventoryFace( ch2, side, renderer );
}
rh.setTexture( null );
}
@Override
public IAESprite getTexture( final AEColor c, final ModelGenerator renderer )
{
if( c == AEColor.Transparent )
{
return renderer.getIcon( AEApi.instance().definitions().parts().cableSmart().stack( AEColor.Transparent, 1 ) );
}
return this.getSmartTexture( c, renderer );
}
@Override
@SideOnly( Side.CLIENT )
public void renderStatic( final BlockPos pos, final IPartRenderHelper rh, final ModelGenerator renderer )
{
rh.setTexture( this.getTexture( this.getCableColor(), renderer ) );
final EnumSet<AEPartLocation> sides = this.getConnections().clone();
boolean hasBuses = false;
for( final AEPartLocation of : this.getConnections() )
{
if( !this.isDense( of ) )
{
hasBuses = true;
}
}
if( sides.size() != 2 || !this.nonLinear( sides ) || hasBuses )
{
for( final AEPartLocation of : this.getConnections() )
{
if( this.isDense( of ) )
{
this.renderDenseConnection( pos, rh, renderer, this.getChannelsOnSide( of.ordinal() ), of );
}
else if( this.isSmart( of ) )
{
this.renderSmartConnection( pos, rh, renderer, this.getChannelsOnSide( of.ordinal() ), of );
}
else
{
this.renderCoveredConnection( pos, rh, renderer, this.getChannelsOnSide( of.ordinal() ), of );
}
}
rh.setTexture( this.getDenseTexture( this.getCableColor(), renderer ) );
rh.setBounds( 3, 3, 3, 13, 13, 13 );
rh.renderBlock( pos, renderer );
}
else
{
AEPartLocation selectedSide = AEPartLocation.INTERNAL;
for( final AEPartLocation of : this.getConnections() )
{
selectedSide = of;
break;
}
final int channels = this.getChannelsOnSide( selectedSide.ordinal() );
final IAESprite def = this.getTexture( this.getCableColor(), renderer );
final IAESprite off = new OffsetIcon( def, 0, -12 );
final IAESprite firstIcon = new TaughtIcon( this.getChannelTex( channels, false ).getIcon(), -0.2f );
final IAESprite firstOffset = new OffsetIcon( firstIcon, 0, -12 );
final IAESprite secondIcon = new TaughtIcon( this.getChannelTex( channels, true ).getIcon(), -0.2f );
final IAESprite secondOffset = new OffsetIcon( secondIcon, 0, -12 );
switch( selectedSide )
{
case DOWN:
case UP:
renderer.setRenderBounds( 3 / 16.0, 0, 3 / 16.0, 13 / 16.0, 16 / 16.0, 13 / 16.0 );
rh.setTexture( def, def, off, off, off, off );
rh.renderBlockCurrentBounds( pos, renderer );
renderer.setUvRotateTop( 0 );
renderer.setUvRotateBottom( 0 );
renderer.setUvRotateSouth( 3 );
renderer.setUvRotateEast( 3 );
renderer.setBrightness( 15 << 20 | 15 << 4 );
renderer.setColorOpaque_I( this.getCableColor().blackVariant );
rh.setTexture( firstIcon, firstIcon, firstOffset, firstOffset, firstOffset, firstOffset );
this.renderAllFaces( (AEBaseBlock) rh.getBlock(), pos, rh, renderer );
renderer.setColorOpaque_I( this.getCableColor().whiteVariant );
rh.setTexture( secondIcon, secondIcon, secondOffset, secondOffset, secondOffset, secondOffset );
this.renderAllFaces( (AEBaseBlock) rh.getBlock(), pos, rh, renderer );
break;
case EAST:
case WEST:
rh.setTexture( off, off, off, off, def, def );
renderer.setUvRotateEast( 2 );
renderer.setUvRotateWest( 1 );
renderer.setUvRotateBottom( 2 );
renderer.setUvRotateTop( 1 );
renderer.setUvRotateSouth( 0 );
renderer.setUvRotateNorth( 0 );
final AEBaseBlock blk = (AEBaseBlock) rh.getBlock();
final FlippableIcon ico = blk.getRendererInstance().getTexture( AEPartLocation.EAST );
ico.setFlip( false, true );
renderer.setRenderBounds( 0, 3 / 16.0, 3 / 16.0, 16 / 16.0, 13 / 16.0, 13 / 16.0 );
rh.renderBlockCurrentBounds( pos, renderer );
renderer.setBrightness( 15 << 20 | 15 << 4 );
final FlippableIcon fpA = new FlippableIcon( firstIcon );
final FlippableIcon fpB = new FlippableIcon( secondIcon );
fpA.setFlip( true, false );
fpB.setFlip( true, false );
renderer.setColorOpaque_I( this.getCableColor().blackVariant );
rh.setTexture( firstOffset, firstOffset, firstOffset, firstOffset, firstIcon, fpA );
this.renderAllFaces( (AEBaseBlock) rh.getBlock(), pos, rh, renderer );
renderer.setColorOpaque_I( this.getCableColor().whiteVariant );
rh.setTexture( secondOffset, secondOffset, secondOffset, secondOffset, secondIcon, fpB );
this.renderAllFaces( (AEBaseBlock) rh.getBlock(), pos, rh, renderer );
break;
case NORTH:
case SOUTH:
rh.setTexture( off, off, def, def, off, off );
renderer.setUvRotateTop( 3 );
renderer.setUvRotateBottom( 3 );
renderer.setUvRotateNorth( 1 );
renderer.setUvRotateSouth( 2 );
renderer.setUvRotateWest( 1 );
renderer.setRenderBounds( 3 / 16.0, 3 / 16.0, 0, 13 / 16.0, 13 / 16.0, 16 / 16.0 );
rh.renderBlockCurrentBounds( pos, renderer );
renderer.setBrightness( 15 << 20 | 15 << 4 );
renderer.setColorOpaque_I( this.getCableColor().blackVariant );
rh.setTexture( firstOffset, firstOffset, firstIcon, firstIcon, firstOffset, firstOffset );
this.renderAllFaces( (AEBaseBlock) rh.getBlock(), pos, rh, renderer );
renderer.setColorOpaque_I( this.getCableColor().whiteVariant );
rh.setTexture( secondOffset, secondOffset, secondIcon, secondIcon, secondOffset, secondOffset );
this.renderAllFaces( (AEBaseBlock) rh.getBlock(), pos, rh, renderer );
break;
default:
break;
}
}
renderer.setUvRotateBottom( renderer.setUvRotateEast( renderer.setUvRotateNorth( renderer.setUvRotateSouth( renderer.setUvRotateTop( renderer.setUvRotateWest( 0 ) ) ) ) ) );
rh.setTexture( null );
}
@SideOnly( Side.CLIENT )
public void renderDenseConnection( final BlockPos pos, final IPartRenderHelper rh, final ModelGenerator renderer, final int channels, final AEPartLocation of )
{
final TileEntity te = this.getTile().getWorld().getTileEntity( pos.offset( of.getFacing() ) );
final IPartHost partHost = te instanceof IPartHost ? (IPartHost) te : null;
final IGridHost ghh = te instanceof IGridHost ? (IGridHost) te : null;
AEColor myColor = this.getCableColor();
/*
* ( ghh != null && partHost != null && ghh.getCableConnectionType( of ) == AECableType.GLASS &&
* partHost.getPart(
* of.getOpposite() ) == null ) { isGlass = true; rh.setTexture( getGlassTexture( myColor = partHost.getColor()
* ) );
* } else if ( partHost == null && ghh != null && ghh.getCableConnectionType( of ) != AECableType.GLASS ) {
* rh.setTexture( getSmartTexture( myColor ) ); switch (of) { case DOWN: rh.setBounds( 3, 0, 3, 13, 4, 13 );
* break; case EAST: rh.setBounds( 12, 3, 3, 16, 13, 13 ); break; case NORTH: rh.setBounds( 3, 3, 0, 13, 13, 4
* ); break; case SOUTH: rh.setBounds( 3, 3, 12, 13, 13, 16 ); break; case UP: rh.setBounds( 3, 12, 3, 13, 16,
* 13 ); break; case WEST: rh.setBounds( 0, 3, 3, 4, 13, 13 ); break; default: return; } rh.renderBlock( x, y,
* z, renderer );
* if ( true ) { setSmartConnectionRotations( of, renderer ); TextureAtlasSprite firstIcon = new TaughtIcon(
* getChannelTex(
* channels, false ).getIcon(), -0.2f ); TextureAtlasSprite secondIcon = new TaughtIcon( getChannelTex(
* channels, true ).getIcon(),
* -0.2f );
* if ( of == AEPartLocation.EAST || of == AEPartLocation.WEST ) { AEBaseBlock blk = (AEBaseBlock)
* rh.getBlock(); FlippableIcon ico = blk.getRendererInstance().getTexture( AEPartLocation.EAST ); ico.setFlip(
* false, true ); }
* Tessellator.INSTANCE.setBrightness( 15 << 20 | 15 << 5 ); Tessellator.INSTANCE.setColorOpaque_I(
* myColor.mediumVariant ); rh.setTexture( firstIcon, firstIcon, firstIcon, firstIcon, firstIcon, firstIcon );
* renderAllFaces( (AEBaseBlock)
* rh.getBlock(), x, y, z, renderer );
* Tessellator.INSTANCE.setColorOpaque_I( myColor.whiteVariant ); rh.setTexture( secondIcon, secondIcon,
* secondIcon, secondIcon, secondIcon,
* secondIcon ); renderAllFaces( (AEBaseBlock) rh.getBlock(), x, y, z, renderer );
* renderer.uvRotateBottom = renderer.uvRotateEast = renderer.uvRotateNorth = renderer.uvRotateSouth =
* renderer.uvRotateTop = renderer.uvRotateWest = 0; }
* rh.setTexture( getTexture( getCableColor() ) ); }
*/
rh.setFacesToRender( EnumSet.complementOf( EnumSet.of( of.getFacing(), of.getFacing().getOpposite() ) ) );
if( ghh != null && partHost != null && ghh.getCableConnectionType( of ) != AECableType.GLASS && partHost.getColor() != AEColor.Transparent && partHost.getPart( of.getOpposite() ) == null )
{
rh.setTexture( this.getTexture( myColor = partHost.getColor(), renderer ) );
}
else
{
rh.setTexture( this.getTexture( this.getCableColor(), renderer ) );
}
switch( of )
{
case DOWN:
rh.setBounds( 4, 0, 4, 12, 5, 12 );
break;
case EAST:
rh.setBounds( 11, 4, 4, 16, 12, 12 );
break;
case NORTH:
rh.setBounds( 4, 4, 0, 12, 12, 5 );
break;
case SOUTH:
rh.setBounds( 4, 4, 11, 12, 12, 16 );
break;
case UP:
rh.setBounds( 4, 11, 4, 12, 16, 12 );
break;
case WEST:
rh.setBounds( 0, 4, 4, 5, 12, 12 );
break;
default:
return;
}
rh.renderBlock( pos, renderer );
rh.setFacesToRender( EnumSet.allOf( EnumFacing.class ) );
final boolean isGlass = false;
if( !isGlass )
{
this.setSmartConnectionRotations( of, renderer );
final IAESprite firstIcon = new TaughtIcon( this.getChannelTex( channels, false ).getIcon(), -0.2f );
final IAESprite secondIcon = new TaughtIcon( this.getChannelTex( channels, true ).getIcon(), -0.2f );
renderer.setBrightness( 15 << 20 | 15 << 4 );
renderer.setColorOpaque_I( myColor.blackVariant );
rh.setTexture( firstIcon, firstIcon, firstIcon, firstIcon, firstIcon, firstIcon );
this.renderAllFaces( (AEBaseBlock) rh.getBlock(), pos, rh, renderer );
renderer.setColorOpaque_I( myColor.whiteVariant );
rh.setTexture( secondIcon, secondIcon, secondIcon, secondIcon, secondIcon, secondIcon );
this.renderAllFaces( (AEBaseBlock) rh.getBlock(), pos, rh, renderer );
renderer.setUvRotateBottom( renderer.setUvRotateEast( renderer.setUvRotateNorth( renderer.setUvRotateSouth( renderer.setUvRotateTop( renderer.setUvRotateWest( 0 ) ) ) ) ) );
}
}
private boolean isSmart( final AEPartLocation of )
{
final TileEntity te = this.getTile().getWorld().getTileEntity( this.getTile().getPos().offset( of.getFacing() ) );
@@ -465,48 +146,6 @@ public class PartDenseCable extends PartCable
return false;
}
private IAESprite getDenseTexture( final AEColor c, final ModelGenerator renderer )
{
switch( c )
{
case Black:
return CableBusTextures.MEDense_Black.getIcon();
case Blue:
return CableBusTextures.MEDense_Blue.getIcon();
case Brown:
return CableBusTextures.MEDense_Brown.getIcon();
case Cyan:
return CableBusTextures.MEDense_Cyan.getIcon();
case Gray:
return CableBusTextures.MEDense_Gray.getIcon();
case Green:
return CableBusTextures.MEDense_Green.getIcon();
case LightBlue:
return CableBusTextures.MEDense_LightBlue.getIcon();
case LightGray:
return CableBusTextures.MEDense_LightGrey.getIcon();
case Lime:
return CableBusTextures.MEDense_Lime.getIcon();
case Magenta:
return CableBusTextures.MEDense_Magenta.getIcon();
case Orange:
return CableBusTextures.MEDense_Orange.getIcon();
case Pink:
return CableBusTextures.MEDense_Pink.getIcon();
case Purple:
return CableBusTextures.MEDense_Purple.getIcon();
case Red:
return CableBusTextures.MEDense_Red.getIcon();
case White:
return CableBusTextures.MEDense_White.getIcon();
case Yellow:
return CableBusTextures.MEDense_Yellow.getIcon();
default:
}
return renderer.getIcon( this.getItemStack() );
}
private boolean isDense( final AEPartLocation of )
{
final TileEntity te = this.getTile().getWorld().getTileEntity( this.getTile().getPos().offset( of.getFacing() ) );
src/main/java/appeng/parts/networking/PartQuartzFiber.java
-31
View File
@@ -22,16 +22,11 @@ package appeng.parts.networking;
import java.util.EnumSet;
import java.util.Set;
import org.lwjgl.opengl.GL11;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumHand;
import net.minecraft.util.math.BlockPos;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import appeng.api.config.Actionable;
import appeng.api.networking.GridFlags;
@@ -40,11 +35,8 @@ import appeng.api.networking.energy.IEnergyGrid;
import appeng.api.networking.energy.IEnergyGridProvider;
import appeng.api.parts.IPartCollisionHelper;
import appeng.api.parts.IPartHost;
import appeng.api.parts.IPartRenderHelper;
import appeng.api.util.AECableType;
import appeng.api.util.AEPartLocation;
import appeng.api.util.IAESprite;
import appeng.api.util.ModelGenerator;
import appeng.me.GridAccessException;
import appeng.me.helpers.AENetworkProxy;
import appeng.parts.AEBasePart;
@@ -76,29 +68,6 @@ public class PartQuartzFiber extends AEBasePart implements IEnergyGridProvider
bch.addBox( 6, 6, 10, 10, 10, 16 );
}
@Override
@SideOnly( Side.CLIENT )
public void renderInventory( final IPartRenderHelper rh, final ModelGenerator renderer )
{
GL11.glTranslated( -0.2, -0.3, 0.0 );
rh.setTexture( renderer.getIcon( this.getItemStack() ) );
rh.setBounds( 6.0f, 6.0f, 5.0f, 10.0f, 10.0f, 11.0f );
rh.renderInventoryBox( renderer );
rh.setTexture( null );
}
@Override
@SideOnly( Side.CLIENT )
public void renderStatic( final BlockPos pos, final IPartRenderHelper rh, final ModelGenerator renderer )
{
final IAESprite myIcon = renderer.getIcon( this.getItemStack() );
rh.setTexture( myIcon );
rh.setBounds( 6, 6, 10, 10, 10, 16 );
rh.renderBlock( pos, renderer );
rh.setTexture( null );
}
@Override
public void readFromNBT( final NBTTagCompound extra )
{
src/main/java/appeng/parts/p2p/PartP2PTunnel.java
-74
View File
@@ -24,14 +24,11 @@ import java.util.Collection;
import com.google.common.base.Optional;
import net.minecraft.block.Block;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Blocks;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.EnumHand;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Vec3d;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
@@ -47,12 +44,8 @@ import appeng.api.implementations.items.MemoryCardMessages;
import appeng.api.parts.IPart;
import appeng.api.parts.IPartCollisionHelper;
import appeng.api.parts.IPartItem;
import appeng.api.parts.IPartRenderHelper;
import appeng.api.parts.PartItemStack;
import appeng.api.util.AEPartLocation;
import appeng.api.util.IAESprite;
import appeng.api.util.ModelGenerator;
import appeng.client.texture.CableBusTextures;
import appeng.core.AEConfig;
import appeng.me.GridAccessException;
import appeng.me.cache.P2PCache;
@@ -122,66 +115,6 @@ public abstract class PartP2PTunnel<T extends PartP2PTunnel> extends PartBasicSt
bch.addBox( 2, 2, 14, 14, 14, 16 );
}
@Override
@SideOnly( Side.CLIENT )
public void renderInventory( final IPartRenderHelper rh, final ModelGenerator renderer )
{
rh.setTexture( this.getTypeTexture( renderer ) );
rh.setBounds( 2, 2, 14, 14, 14, 16 );
rh.renderInventoryBox( renderer );
rh.setTexture( CableBusTextures.PartTunnelSides.getIcon(), CableBusTextures.PartTunnelSides.getIcon(), CableBusTextures.BlockP2PTunnel2.getIcon(), renderer.getIcon( this.getItemStack() ), CableBusTextures.PartTunnelSides.getIcon(), CableBusTextures.PartTunnelSides.getIcon() );
rh.setBounds( 2, 2, 14, 14, 14, 16 );
rh.renderInventoryBox( renderer );
}
/**
* @param renderer
* @return If enabled it returns the icon of an AE quartz block, else vanilla quartz block icon
*/
protected IAESprite getTypeTexture( final ModelGenerator renderer )
{
final Optional<Block> maybeBlock = AEApi.instance().definitions().blocks().quartz().maybeBlock();
if( maybeBlock.isPresent() )
{
return renderer.getIcon( new ItemStack( maybeBlock.get() ) );
}
else
{
return renderer.getIcon( new ItemStack( Blocks.QUARTZ_BLOCK ) );
}
}
@Override
@SideOnly( Side.CLIENT )
public void renderStatic( final BlockPos pos, final IPartRenderHelper rh, final ModelGenerator renderer )
{
rh.setTexture( this.getTypeTexture( renderer ) );
rh.setBounds( 2, 2, 14, 14, 14, 16 );
rh.renderBlock( pos, renderer );
rh.setTexture( CableBusTextures.PartTunnelSides.getIcon(), CableBusTextures.PartTunnelSides.getIcon(), CableBusTextures.BlockP2PTunnel2.getIcon(), renderer.getIcon( this.getItemStack() ), CableBusTextures.PartTunnelSides.getIcon(), CableBusTextures.PartTunnelSides.getIcon() );
rh.setBounds( 2, 2, 14, 14, 14, 16 );
rh.renderBlock( pos, renderer );
rh.setBounds( 3, 3, 13, 13, 13, 14 );
rh.renderBlock( pos, renderer );
rh.setTexture( CableBusTextures.BlockP2PTunnel3.getIcon() );
rh.setBounds( 6, 5, 12, 10, 11, 13 );
rh.renderBlock( pos, renderer );
rh.setBounds( 5, 6, 12, 11, 10, 13 );
rh.renderBlock( pos, renderer );
this.renderLights( pos, rh, renderer );
}
@Override
public ItemStack getItemStack( final PartItemStack type )
{
@@ -445,13 +378,6 @@ public abstract class PartP2PTunnel<T extends PartP2PTunnel> extends PartBasicSt
}
@Override
@SideOnly( Side.CLIENT )
public TextureAtlasSprite getBreakingTexture( final ModelGenerator renderer )
{
return CableBusTextures.BlockP2PTunnel2.getIcon().getAtlas();
}
protected void queueTunnelDrain( final PowerUnits unit, final double f )
{
final double ae_to_tax = unit.convertTo( PowerUnits.AE, f * AEConfig.TUNNEL_POWER_LOSS );
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;
}
}