tilera
/
Applied-Energistics-2-tilera-Edition
1
1
Fork 0
Code Issues 7 Pull Requests Releases 1 Wiki Activity

Make the project buildable with gradlew build by externalizing the model generator and expose it as an interface

This commit is contained in:
thatsIch 2016-02-16 21:06:59 +01:00
parent 8383715892
commit aff3941729
89 changed files with 307 additions and 143 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,6 +1,6 @@
#Tue Feb 16 19:55:25 CET 2016
#Tue Feb 16 20:36:24 CET 2016
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.11-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-2.11-all.zip

2
src/api/java/appeng/api/parts/IFacadePart.java
View File

@ -33,7 +33,7 @@ import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import appeng.api.util.AEPartLocation;
import appeng.client.render.ModelGenerator;
import appeng.api.util.ModelGenerator;
/**

6
src/api/java/appeng/api/parts/IPart.java
View File

@ -45,7 +45,7 @@ import net.minecraftforge.fml.relauncher.SideOnly;
import appeng.api.networking.IGridNode;
import appeng.api.util.AEPartLocation;
import appeng.client.render.ModelGenerator;
import appeng.api.util.ModelGenerator;
public interface IPart extends IBoxProvider
@ -81,9 +81,7 @@ public interface IPart extends IBoxProvider
*
* GL is NOT Available
*
* @param x x coord
* @param y y coord
* @param z z coord
* @param pos pos of block
* @param rh helper
* @param renderer renderer
*/

15
src/api/java/appeng/api/parts/IPartRenderHelper.java
View File

@ -32,13 +32,12 @@ import net.minecraft.util.EnumFacing;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import appeng.client.render.ModelGenerator;
import appeng.client.texture.IAESprite;
import appeng.api.util.IAESprite;
import appeng.api.util.ModelGenerator;
public interface IPartRenderHelper
{
/**
* sets the Render Helpers Block Bounds. 0.0 - 16.0 block coords.
*
@ -85,9 +84,7 @@ public interface IPartRenderHelper
*
* render a block of specified bounds.
*
* @param x x pos of block
* @param y y pos of block
* @param z z pos of block
* @param pos pos of block
* @param renderer renderer
*/
@SideOnly( Side.CLIENT )
@ -96,7 +93,7 @@ public interface IPartRenderHelper
/**
* render a single face in inventory renderer.
*
* @param TextureAtlasSprite icon of part
* @param IIcon icon of part
* @param direction face of part
* @param renderer renderer
*/
@ -164,9 +161,7 @@ public interface IPartRenderHelper
/**
* render a block using the current renderer state.
*
* @param x x pos of part
* @param y y pos of part
* @param z z pos of part
* @param pos pos of part
* @param renderer renderer of part
*/
void renderBlockCurrentBounds( BlockPos pos, ModelGenerator renderer );

2
src/api/java/appeng/api/storage/ICellHandler.java
View File

@ -30,7 +30,7 @@ import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import appeng.api.implementations.tiles.IChestOrDrive;
import appeng.client.texture.IAESprite;
import appeng.api.util.IAESprite;
/**

2
src/main/java/appeng/client/texture/IAESprite.java → src/api/java/appeng/api/util/IAESprite.java
View File

@ -1,5 +1,5 @@
package appeng.client.texture;
package appeng.api.util;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;

118
src/api/java/appeng/api/util/ModelGenerator.java Normal file
View File

@ -0,0 +1,118 @@
package appeng.api.util;
import java.util.EnumSet;
import net.minecraft.block.Block;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.resources.model.IBakedModel;
import net.minecraft.item.ItemStack;
import net.minecraft.util.BlockPos;
import net.minecraft.util.EnumFacing;
import net.minecraft.world.IBlockAccess;
/**
* TODO replace with description
*
* TODO replace with intention
*
* @author thatsIch
* @version rv3 - 16.02.2016
* @see //TODO anything to see?
* @since rv3 - 16.02.2016
*/
public interface ModelGenerator
{
int setUvRotateBottom( int i );
int setUvRotateTop( int i );
int setUvRotateEast( int i );
int setUvRotateWest( int i );
int setUvRotateNorth( int i );
int setUvRotateSouth( int i );
IAESprite[] getIcon( IBlockState iBlockState );
IAESprite getOverrideBlockTexture();
IBlockAccess getBlockAccess();
void setBlockAccess( IBlockAccess theWorld );
void setRenderAllFaces( boolean b );
void setOverrideBlockTexture( IAESprite o );
void setFlipTexture( boolean b );
void setRenderBoundsFromBlock( Block block );
void setRenderBounds( double v, double v1, double v2, double v3, double v4, double v5 );
boolean renderStandardBlock( Block block, BlockPos pos );
void setRenderFaces( EnumSet<EnumFacing> faces );
void setNormal( float v, float v1, float v2 );
void setColorOpaque_I( int color );
void setRenderMinX( double min );
void setRenderMinY( double min );
void setRenderMinZ( double min );
void setRenderMaxX( double max );
void setRenderMaxY( double max );
void setRenderMaxZ( double max );
void addVertexWithUV( EnumFacing face, double v, double v1, double v2, double interpolatedU, double interpolatedV );
void renderFaceZNeg( Block block, BlockPos pos, IAESprite ico );
void renderFaceZPos( Block block, BlockPos pos, IAESprite ico );
void renderFaceXPos( Block block, BlockPos pos, IAESprite ico );
void renderFaceXNeg( Block block, BlockPos pos, IAESprite ico );
void renderFaceYPos( Block block, BlockPos pos, IAESprite ico );
void renderFaceYNeg( Block block, BlockPos pos, IAESprite ico );
void setTranslation( int i, int i1, int i2 );
IAESprite getIcon( ItemStack itemStack );
void setBrightness( int i );
void setColorOpaque_F( float v, float v1, float v2 );
boolean isAlphaPass();
void setColorRGBA_F( int i, int i1, int i2, float v );
double getRenderMinX();
double getRenderMaxX();
double getRenderMinY();
double getRenderMaxY();
double getRenderMinZ();
double getRenderMaxZ();
void finalizeModel( boolean b );
IBakedModel getOutput();
}

2
src/main/java/appeng/block/AEBaseBlock.java
View File

@ -54,13 +54,13 @@ import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import appeng.api.util.AEPartLocation;
import appeng.api.util.IAESprite;
import appeng.api.util.IOrientable;
import appeng.api.util.IOrientableBlock;
import appeng.client.render.BaseBlockRender;
import appeng.client.render.BlockRenderInfo;
import appeng.client.texture.BaseIcon;
import appeng.client.texture.FlippableIcon;
import appeng.client.texture.IAESprite;
import appeng.core.AppEng;
import appeng.core.features.AEBlockFeatureHandler;
import appeng.core.features.AEFeature;

2
src/main/java/appeng/block/crafting/BlockCraftingMonitor.java
View File

@ -31,10 +31,10 @@ import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import appeng.api.AEApi;
import appeng.api.util.IAESprite;
import appeng.client.render.BaseBlockRender;
import appeng.client.render.blocks.RenderBlockCraftingCPUMonitor;
import appeng.client.texture.ExtraBlockTextures;
import appeng.client.texture.IAESprite;
import appeng.tile.crafting.TileCraftingMonitorTile;

3
src/main/java/appeng/block/crafting/BlockCraftingStorage.java
View File

@ -27,6 +27,7 @@ import net.minecraft.item.ItemStack;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import appeng.api.util.IAESprite;
import appeng.client.texture.ExtraBlockTextures;
import appeng.tile.crafting.TileCraftingStorageTile;
@ -47,7 +48,7 @@ public class BlockCraftingStorage extends BlockCraftingUnit
}
@Override
public appeng.client.texture.IAESprite getIcon( final net.minecraft.util.EnumFacing side, final net.minecraft.block.state.IBlockState state )
public IAESprite getIcon( final net.minecraft.util.EnumFacing side, final net.minecraft.block.state.IBlockState state )
{
final boolean formed = (boolean) state.getValue( FORMED );
switch( this.type )

3
src/main/java/appeng/block/crafting/BlockCraftingUnit.java
View File

@ -41,6 +41,7 @@ import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import appeng.api.util.AEPartLocation;
import appeng.api.util.IAESprite;
import appeng.block.AEBaseTileBlock;
import appeng.client.render.BaseBlockRender;
import appeng.client.render.blocks.RenderBlockCraftingCPU;
@ -148,7 +149,7 @@ public class BlockCraftingUnit extends AEBaseTileBlock
}
@Override
public appeng.client.texture.IAESprite getIcon( final EnumFacing side, final IBlockState state )
public IAESprite getIcon( final EnumFacing side, final IBlockState state )
{
if( this.type == CraftingUnitType.ACCELERATOR )
{

4
src/main/java/appeng/block/misc/BlockVibrationChamber.java
View File

@ -32,9 +32,9 @@ import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import appeng.api.util.AEPartLocation;
import appeng.api.util.IAESprite;
import appeng.block.AEBaseTileBlock;
import appeng.client.texture.ExtraBlockTextures;
import appeng.client.texture.IAESprite;
import appeng.core.AEConfig;
import appeng.core.features.AEFeature;
import appeng.core.sync.GuiBridge;
@ -55,7 +55,7 @@ public final class BlockVibrationChamber extends AEBaseTileBlock
}
@Override
public appeng.client.texture.IAESprite getIcon( final IBlockAccess w, final BlockPos pos, final EnumFacing side )
public IAESprite getIcon( final IBlockAccess w, final BlockPos pos, final EnumFacing side )
{
final IAESprite ico = super.getIcon( w, pos, side );
final TileVibrationChamber tvc = this.getTileEntity( w, pos );

3
src/main/java/appeng/block/networking/BlockDenseEnergyCell.java
View File

@ -21,6 +21,7 @@ package appeng.block.networking;
import java.util.EnumSet;
import appeng.api.util.IAESprite;
import appeng.client.texture.ExtraBlockTextures;
import appeng.core.features.AEFeature;
import appeng.tile.networking.TileDenseEnergyCell;
@ -36,7 +37,7 @@ public class BlockDenseEnergyCell extends BlockEnergyCell
}
@Override
public appeng.client.texture.IAESprite getIcon( final net.minecraft.util.EnumFacing side, final net.minecraft.block.state.IBlockState state )
public IAESprite getIcon( final net.minecraft.util.EnumFacing side, final net.minecraft.block.state.IBlockState state )
{
switch( (int) state.getValue( ENERGY_STORAGE ) )
{

3
src/main/java/appeng/block/networking/BlockEnergyCell.java
View File

@ -32,6 +32,7 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import appeng.api.util.IAESprite;
import appeng.block.AEBaseItemBlock;
import appeng.block.AEBaseItemBlockChargeable;
import appeng.block.AEBaseTileBlock;
@ -76,7 +77,7 @@ public class BlockEnergyCell extends AEBaseTileBlock
}
@Override
public appeng.client.texture.IAESprite getIcon( final net.minecraft.util.EnumFacing side, final IBlockState state )
public IAESprite getIcon( final net.minecraft.util.EnumFacing side, final IBlockState state )
{
switch( (int) state.getValue( ENERGY_STORAGE ) )
{

7
src/main/java/appeng/client/SmartModel.java
View File

@ -19,9 +19,10 @@ import net.minecraftforge.client.model.ISmartItemModel;
import net.minecraftforge.common.property.IExtendedBlockState;
import appeng.api.util.AEPartLocation;
import appeng.api.util.ModelGenerator;
import appeng.block.AEBaseBlock;
import appeng.client.render.BakingModelGenerator;
import appeng.client.render.BlockRenderInfo;
import appeng.client.render.ModelGenerator;
import appeng.client.texture.MissingIcon;
@ -81,7 +82,7 @@ public class SmartModel implements IBakedModel, ISmartBlockModel, ISmartItemMode
@Override
public IBakedModel handleItemState( final ItemStack stack )
{
final ModelGenerator helper = new ModelGenerator();
final ModelGenerator helper = new BakingModelGenerator();
final Block blk = Block.getBlockFromItem( stack.getItem() );
helper.setRenderBoundsFromBlock( blk );
this.aeRenderer.getRendererInstance().renderInventory( blk instanceof AEBaseBlock ? (AEBaseBlock) blk : null, stack, helper, ItemRenderType.INVENTORY, null );
@ -92,7 +93,7 @@ public class SmartModel implements IBakedModel, ISmartBlockModel, ISmartItemMode
@Override
public IBakedModel handleBlockState( final IBlockState state )
{
final ModelGenerator helper = new ModelGenerator();
final ModelGenerator helper = new BakingModelGenerator();
final Block blk = state.getBlock();
final BlockPos pos = ( (IExtendedBlockState) state ).getValue( AEBaseBlock.AE_BLOCK_POS );
final IBlockAccess world = ( (IExtendedBlockState) state ).getValue( AEBaseBlock.AE_BLOCK_ACCESS );

67
src/main/java/appeng/client/render/ModelGenerator.java → src/main/java/appeng/client/render/BakingModelGenerator.java
View File

@ -1,4 +1,3 @@
package appeng.client.render;
@ -28,17 +27,17 @@ import net.minecraft.world.IBlockAccess;
import net.minecraftforge.client.MinecraftForgeClient;
import net.minecraftforge.client.model.IColoredBakedQuad;
import appeng.api.util.IAESprite;
import appeng.api.util.ModelGenerator;
import appeng.block.AEBaseBlock;
import appeng.client.texture.BaseIcon;
import appeng.client.texture.IAESprite;
import appeng.client.texture.MissingIcon;
import appeng.items.AEBaseItem;
import appeng.items.parts.ItemMultiPart;
public class ModelGenerator
public class BakingModelGenerator implements ModelGenerator
{
private static final class CachedModel implements IBakedModel
{
private final List<BakedQuad>[] faces = new List[6];
@ -96,6 +95,7 @@ public class ModelGenerator
}
}
private int uvRotateBottom;
private int uvRotateEast;
private int uvRotateNorth;
@ -175,21 +175,21 @@ public class ModelGenerator
{
final int alpha = 0xff;
this.color = // alpha << 24 |
whiteVariant;
whiteVariant;
}
public void setColorOpaque( final int r, final int g, final int b )
{
final int alpha = 0xff;
this.color = // alpha << 24 |
r << 16 | g << 8 | b;
r << 16 | g << 8 | b;
}
public void setColorOpaque_F( final int r, final int g, final int b )
{
final int alpha = 0xff;
this.color = // alpha << 24 |
Math.min( 0xff, Math.max( 0, r ) ) << 16 | Math.min( 0xff, Math.max( 0, g ) ) << 8 | Math.min( 0xff, Math.max( 0, b ) );
Math.min( 0xff, Math.max( 0, r ) ) << 16 | Math.min( 0xff, Math.max( 0, g ) ) << 8 | Math.min( 0xff, Math.max( 0, b ) );
}
public void setColorOpaque_F( final float rf, final float bf, final float gf )
@ -199,7 +199,7 @@ public class ModelGenerator
final int b = (int) ( bf * 0xff );
final int alpha = 0xff;
this.color = // alpha << 24 |
Math.min( 0xff, Math.max( 0, r ) ) << 16 | Math.min( 0xff, Math.max( 0, g ) ) << 8 | Math.min( 0xff, Math.max( 0, b ) );
Math.min( 0xff, Math.max( 0, r ) ) << 16 | Math.min( 0xff, Math.max( 0, g ) ) << 8 | Math.min( 0xff, Math.max( 0, b ) );
}
public IAESprite getIcon( final ItemStack is )
@ -298,13 +298,39 @@ public class ModelGenerator
if( this.point == 4 )
{
this.brightness = -1;
final int[] vertData = { Float.floatToRawIntBits( this.points[0][0] ), Float.floatToRawIntBits( this.points[0][1] ), Float.floatToRawIntBits( this.points[0][2] ), this.brightness, Float.floatToRawIntBits( this.points[0][3] ), Float.floatToRawIntBits( this.points[0][4] ), 0,
final int[] vertData = {
Float.floatToRawIntBits( this.points[0][0] ),
Float.floatToRawIntBits( this.points[0][1] ),
Float.floatToRawIntBits( this.points[0][2] ),
this.brightness,
Float.floatToRawIntBits( this.points[0][3] ),
Float.floatToRawIntBits( this.points[0][4] ),
0,
Float.floatToRawIntBits( this.points[1][0] ), Float.floatToRawIntBits( this.points[1][1] ), Float.floatToRawIntBits( this.points[1][2] ), this.brightness, Float.floatToRawIntBits( this.points[1][3] ), Float.floatToRawIntBits( this.points[1][4] ), 0,
Float.floatToRawIntBits( this.points[1][0] ),
Float.floatToRawIntBits( this.points[1][1] ),
Float.floatToRawIntBits( this.points[1][2] ),
this.brightness,
Float.floatToRawIntBits( this.points[1][3] ),
Float.floatToRawIntBits( this.points[1][4] ),
0,
Float.floatToRawIntBits( this.points[2][0] ), Float.floatToRawIntBits( this.points[2][1] ), Float.floatToRawIntBits( this.points[2][2] ), this.brightness, Float.floatToRawIntBits( this.points[2][3] ), Float.floatToRawIntBits( this.points[2][4] ), 0,
Float.floatToRawIntBits( this.points[2][0] ),
Float.floatToRawIntBits( this.points[2][1] ),
Float.floatToRawIntBits( this.points[2][2] ),
this.brightness,
Float.floatToRawIntBits( this.points[2][3] ),
Float.floatToRawIntBits( this.points[2][4] ),
0,
Float.floatToRawIntBits( this.points[3][0] ), Float.floatToRawIntBits( this.points[3][1] ), Float.floatToRawIntBits( this.points[3][2] ), this.brightness, Float.floatToRawIntBits( this.points[3][3] ), Float.floatToRawIntBits( this.points[3][4] ), 0, };
Float.floatToRawIntBits( this.points[3][0] ),
Float.floatToRawIntBits( this.points[3][1] ),
Float.floatToRawIntBits( this.points[3][2] ),
this.brightness,
Float.floatToRawIntBits( this.points[3][3] ),
Float.floatToRawIntBits( this.points[3][4] ),
0,
};
this.generatedModel.general.add( new IColoredBakedQuad.ColoredBakedQuad( vertData, this.color, face ) );
@ -395,17 +421,17 @@ public class ModelGenerator
to_b = 1.0f - to_b;
final float[] afloat = {// :P
16.0f * ( this.quadsUV[0] + this.quadsUV[2] * from_a + this.quadsUV[4] * from_b ), // 0
16.0f * ( this.quadsUV[1] + this.quadsUV[3] * from_a + this.quadsUV[5] * from_b ), // 1
16.0f * ( this.quadsUV[0] + this.quadsUV[2] * from_a + this.quadsUV[4] * from_b ), // 0
16.0f * ( this.quadsUV[1] + this.quadsUV[3] * from_a + this.quadsUV[5] * from_b ), // 1
16.0f * ( this.quadsUV[0] + this.quadsUV[2] * to_a + this.quadsUV[4] * from_b ), // 2
16.0f * ( this.quadsUV[1] + this.quadsUV[3] * to_a + this.quadsUV[5] * from_b ), // 3
16.0f * ( this.quadsUV[0] + this.quadsUV[2] * to_a + this.quadsUV[4] * from_b ), // 2
16.0f * ( this.quadsUV[1] + this.quadsUV[3] * to_a + this.quadsUV[5] * from_b ), // 3
16.0f * ( this.quadsUV[0] + this.quadsUV[2] * to_a + this.quadsUV[4] * to_b ), // 2
16.0f * ( this.quadsUV[1] + this.quadsUV[3] * to_a + this.quadsUV[5] * to_b ), // 3
16.0f * ( this.quadsUV[0] + this.quadsUV[2] * to_a + this.quadsUV[4] * to_b ), // 2
16.0f * ( this.quadsUV[1] + this.quadsUV[3] * to_a + this.quadsUV[5] * to_b ), // 3
16.0f * ( this.quadsUV[0] + this.quadsUV[2] * from_a + this.quadsUV[4] * to_b ), // 0
16.0f * ( this.quadsUV[1] + this.quadsUV[3] * from_a + this.quadsUV[5] * to_b ), // 1
16.0f * ( this.quadsUV[0] + this.quadsUV[2] * from_a + this.quadsUV[4] * to_b ), // 0
16.0f * ( this.quadsUV[1] + this.quadsUV[3] * from_a + this.quadsUV[5] * to_b ), // 1
};
return afloat;
@ -720,5 +746,4 @@ public class ModelGenerator
{
this.renderFaces = renderFaces;
}
}

4
src/main/java/appeng/client/render/BaseBlockRender.java
View File

@ -21,7 +21,6 @@ package appeng.client.render;
import java.nio.FloatBuffer;
import java.util.EnumSet;
import javax.annotation.Nullable;
import org.lwjgl.BufferUtils;
@ -43,10 +42,11 @@ import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import appeng.api.util.AEPartLocation;
import appeng.api.util.IAESprite;
import appeng.api.util.IOrientable;
import appeng.api.util.ModelGenerator;
import appeng.block.AEBaseBlock;
import appeng.client.texture.ExtraBlockTextures;
import appeng.client.texture.IAESprite;
import appeng.core.AppEng;
import appeng.tile.AEBaseTile;
import appeng.util.Platform;

2
src/main/java/appeng/client/render/BlockRenderInfo.java
View File

@ -20,8 +20,8 @@ package appeng.client.render;
import appeng.api.util.AEPartLocation;
import appeng.api.util.IAESprite;
import appeng.client.texture.FlippableIcon;
import appeng.client.texture.IAESprite;
import appeng.client.texture.TmpFlippableIcon;

4
src/main/java/appeng/client/render/BusRenderHelper.java
View File

@ -20,7 +20,6 @@ package appeng.client.render;
import java.util.EnumSet;
import javax.annotation.Nullable;
import com.google.common.base.Function;
@ -37,8 +36,9 @@ import appeng.api.exceptions.MissingDefinition;
import appeng.api.parts.IPartCollisionHelper;
import appeng.api.parts.IPartRenderHelper;
import appeng.api.util.AEPartLocation;
import appeng.api.util.IAESprite;
import appeng.api.util.ModelGenerator;
import appeng.block.AEBaseBlock;
import appeng.client.texture.IAESprite;
import appeng.core.AEConfig;
import appeng.core.features.AEFeature;
import appeng.tile.AEBaseTile;

3
src/main/java/appeng/client/render/BusRenderer.java
View File

@ -19,6 +19,9 @@
package appeng.client.render;
import appeng.api.util.ModelGenerator;
public class BusRenderer
{

1
src/main/java/appeng/client/render/CableRenderHelper.java
View File

@ -34,6 +34,7 @@ import appeng.api.parts.IFacadePart;
import appeng.api.parts.IPart;
import appeng.api.util.AEAxisAlignedBB;
import appeng.api.util.AEPartLocation;
import appeng.api.util.ModelGenerator;
import appeng.parts.BusCollisionHelper;
import appeng.parts.CableBusContainer;

4
src/main/java/appeng/client/render/ISimpleBlockRenderingHandler.java
View File

@ -6,12 +6,12 @@ import net.minecraft.block.Block;
import net.minecraft.util.BlockPos;
import net.minecraft.world.IBlockAccess;
import appeng.api.util.ModelGenerator;
public interface ISimpleBlockRenderingHandler
{
void renderInventoryBlock( Block block, int metadata, int modelID, ModelGenerator renderer );
boolean renderWorldBlock( IBlockAccess world, BlockPos pos, Block block, int modelId, ModelGenerator renderer );
}

2
src/main/java/appeng/client/render/IconUnwrapper.java
View File

@ -4,7 +4,7 @@ package appeng.client.render;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import appeng.client.texture.IAESprite;
import appeng.api.util.IAESprite;
public class IconUnwrapper extends TextureAtlasSprite

2
src/main/java/appeng/client/render/RenderBlocksWorkaround.java
View File

@ -27,7 +27,7 @@ import net.minecraftforge.fml.relauncher.SideOnly;
@SideOnly( Side.CLIENT )
public class RenderBlocksWorkaround extends ModelGenerator
public class RenderBlocksWorkaround extends BakingModelGenerator
{
private boolean flipTexture;

3
src/main/java/appeng/client/render/TESRWrapper.java
View File

@ -28,6 +28,7 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import appeng.api.util.ModelGenerator;
import appeng.block.AEBaseBlock;
import appeng.core.AELog;
import appeng.tile.AEBaseTile;
@ -37,7 +38,7 @@ import appeng.tile.AEBaseTile;
public class TESRWrapper extends TileEntitySpecialRenderer
{
private final ModelGenerator renderBlocksInstance = new ModelGenerator();
private final ModelGenerator renderBlocksInstance = new BakingModelGenerator();
private final BaseBlockRender blkRender;
private final double maxDistance;

3
src/main/java/appeng/client/render/WorldRender.java
View File

@ -28,6 +28,7 @@ import net.minecraft.world.IBlockAccess;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import appeng.api.util.ModelGenerator;
import appeng.block.AEBaseBlock;
import appeng.client.ItemRenderType;
import appeng.core.AELog;
@ -39,7 +40,7 @@ public final class WorldRender implements ISimpleBlockRenderingHandler
private static final WorldRender INSTANCE = new WorldRender();
private final HashMap<AEBaseBlock, BaseBlockRender> blockRenders = new HashMap<AEBaseBlock, BaseBlockRender>();
private final ModelGenerator renderer = new ModelGenerator();
private final ModelGenerator renderer = new BakingModelGenerator();
private boolean hasError = false;
private WorldRender()

4
src/main/java/appeng/client/render/blocks/RenderBlockAssembler.java
View File

@ -33,14 +33,14 @@ import appeng.api.parts.IPart;
import appeng.api.parts.IPartCollisionHelper;
import appeng.api.parts.IPartHost;
import appeng.api.util.AEPartLocation;
import appeng.api.util.IAESprite;
import appeng.api.util.IOrientable;
import appeng.api.util.ModelGenerator;
import appeng.block.crafting.BlockMolecularAssembler;
import appeng.client.ItemRenderType;
import appeng.client.render.BaseBlockRender;
import appeng.client.render.BusRenderer;
import appeng.client.render.ModelGenerator;
import appeng.client.texture.ExtraBlockTextures;
import appeng.client.texture.IAESprite;
import appeng.client.texture.TaughtIcon;
import appeng.parts.networking.PartCable;
import appeng.tile.crafting.TileMolecularAssembler;

2
src/main/java/appeng/client/render/blocks/RenderBlockCharger.java
View File

@ -34,10 +34,10 @@ import net.minecraft.world.IBlockAccess;
import appeng.api.util.AEPartLocation;
import appeng.api.util.IOrientable;
import appeng.api.util.ModelGenerator;
import appeng.block.misc.BlockCharger;
import appeng.client.ItemRenderType;
import appeng.client.render.BaseBlockRender;
import appeng.client.render.ModelGenerator;
import appeng.client.texture.ExtraBlockTextures;
import appeng.core.AELog;
import appeng.tile.misc.TileCharger;

2
src/main/java/appeng/client/render/blocks/RenderBlockController.java
View File

@ -24,10 +24,10 @@ import net.minecraft.util.BlockPos;
import net.minecraft.util.EnumFacing;
import net.minecraft.world.IBlockAccess;
import appeng.api.util.ModelGenerator;
import appeng.block.networking.BlockController;
import appeng.block.networking.BlockController.ControllerBlockState;
import appeng.client.render.BaseBlockRender;
import appeng.client.render.ModelGenerator;
import appeng.client.texture.ExtraBlockTextures;
import appeng.tile.networking.TileController;

4
src/main/java/appeng/client/render/blocks/RenderBlockCraftingCPU.java
View File

@ -32,14 +32,14 @@ import net.minecraftforge.client.MinecraftForgeClient;
import appeng.api.AEApi;
import appeng.api.util.AEColor;
import appeng.api.util.AEPartLocation;
import appeng.api.util.IAESprite;
import appeng.api.util.ModelGenerator;
import appeng.block.crafting.BlockCraftingMonitor;
import appeng.block.crafting.BlockCraftingUnit;
import appeng.client.render.BaseBlockRender;
import appeng.client.render.BusRenderHelper;
import appeng.client.render.BusRenderer;
import appeng.client.render.ModelGenerator;
import appeng.client.texture.ExtraBlockTextures;
import appeng.client.texture.IAESprite;
import appeng.tile.crafting.TileCraftingMonitorTile;
import appeng.tile.crafting.TileCraftingTile;

2
src/main/java/appeng/client/render/blocks/RenderBlockCraftingCPUMonitor.java
View File

@ -31,9 +31,9 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumFacing;
import appeng.api.storage.data.IAEItemStack;
import appeng.api.util.ModelGenerator;
import appeng.block.crafting.BlockCraftingMonitor;
import appeng.client.ClientHelper;
import appeng.client.render.ModelGenerator;
import appeng.core.AELog;
import appeng.tile.crafting.TileCraftingMonitorTile;
import appeng.util.IWideReadableNumberConverter;

2
src/main/java/appeng/client/render/blocks/RenderBlockCrank.java
View File

@ -31,10 +31,10 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.BlockPos;
import net.minecraft.world.IBlockAccess;
import appeng.api.util.ModelGenerator;
import appeng.block.grindstone.BlockCrank;
import appeng.client.ItemRenderType;
import appeng.client.render.BaseBlockRender;
import appeng.client.render.ModelGenerator;
import appeng.tile.grindstone.TileCrank;

2
src/main/java/appeng/client/render/blocks/RenderBlockEnergyCube.java
View File

@ -24,10 +24,10 @@ import net.minecraft.util.BlockPos;
import net.minecraft.world.IBlockAccess;
import appeng.api.implementations.items.IAEItemPowerStorage;
import appeng.api.util.ModelGenerator;
import appeng.block.networking.BlockEnergyCell;
import appeng.client.ItemRenderType;
import appeng.client.render.BaseBlockRender;
import appeng.client.render.ModelGenerator;
import appeng.tile.networking.TileEnergyCell;

4
src/main/java/appeng/client/render/blocks/RenderBlockInscriber.java
View File

@ -38,14 +38,14 @@ import net.minecraft.world.IBlockAccess;
import appeng.api.features.IInscriberRecipe;
import appeng.api.util.AEPartLocation;
import appeng.api.util.IAESprite;
import appeng.api.util.IOrientable;
import appeng.api.util.ModelGenerator;
import appeng.block.AEBaseBlock;
import appeng.block.misc.BlockInscriber;
import appeng.client.ItemRenderType;
import appeng.client.render.BaseBlockRender;
import appeng.client.render.ModelGenerator;
import appeng.client.texture.ExtraBlockTextures;
import appeng.client.texture.IAESprite;
import appeng.core.AELog;
import appeng.tile.AEBaseTile;
import appeng.tile.misc.TileInscriber;

4
src/main/java/appeng/client/render/blocks/RenderBlockInterface.java
View File

@ -22,12 +22,12 @@ package appeng.client.render.blocks;
import net.minecraft.util.BlockPos;
import net.minecraft.world.IBlockAccess;
import appeng.api.util.IAESprite;
import appeng.api.util.ModelGenerator;
import appeng.block.misc.BlockInterface;
import appeng.client.render.BaseBlockRender;
import appeng.client.render.BlockRenderInfo;
import appeng.client.render.ModelGenerator;
import appeng.client.texture.ExtraBlockTextures;
import appeng.client.texture.IAESprite;
import appeng.tile.misc.TileInterface;

4
src/main/java/appeng/client/render/blocks/RenderBlockPaint.java
View File

@ -26,12 +26,12 @@ import net.minecraft.util.BlockPos;
import net.minecraft.util.EnumFacing;
import net.minecraft.world.IBlockAccess;
import appeng.api.util.IAESprite;
import appeng.api.util.ModelGenerator;
import appeng.block.misc.BlockPaint;
import appeng.client.ItemRenderType;
import appeng.client.render.BaseBlockRender;
import appeng.client.render.ModelGenerator;
import appeng.client.texture.ExtraBlockTextures;
import appeng.client.texture.IAESprite;
import appeng.helpers.Splotch;
import appeng.tile.misc.TilePaint;

4
src/main/java/appeng/client/render/blocks/RenderBlockQuartzAccelerator.java
View File

@ -23,11 +23,11 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.BlockPos;
import net.minecraft.world.IBlockAccess;
import appeng.api.util.IAESprite;
import appeng.api.util.ModelGenerator;
import appeng.block.misc.BlockQuartzGrowthAccelerator;
import appeng.client.render.BaseBlockRender;
import appeng.client.render.ModelGenerator;
import appeng.client.texture.ExtraBlockTextures;
import appeng.client.texture.IAESprite;
import appeng.tile.misc.TileQuartzGrowthAccelerator;

2
src/main/java/appeng/client/render/blocks/RenderBlockSkyChest.java
View File

@ -31,11 +31,11 @@ import net.minecraft.util.BlockPos;
import net.minecraft.util.ResourceLocation;
import net.minecraft.world.IBlockAccess;
import appeng.api.util.ModelGenerator;
import appeng.block.storage.BlockSkyChest;
import appeng.block.storage.BlockSkyChest.SkyChestType;
import appeng.client.ItemRenderType;
import appeng.client.render.BaseBlockRender;
import appeng.client.render.ModelGenerator;
import appeng.tile.storage.TileSkyChest;

2
src/main/java/appeng/client/render/blocks/RenderBlockSkyCompass.java
View File

@ -30,10 +30,10 @@ import net.minecraft.util.EnumFacing;
import net.minecraft.util.ResourceLocation;
import net.minecraft.world.IBlockAccess;
import appeng.api.util.ModelGenerator;
import appeng.block.misc.BlockSkyCompass;
import appeng.client.ItemRenderType;
import appeng.client.render.BaseBlockRender;
import appeng.client.render.ModelGenerator;
import appeng.client.render.model.ModelCompass;
import appeng.hooks.CompassManager;
import appeng.hooks.CompassResult;

4
src/main/java/appeng/client/render/blocks/RenderBlockWireless.java
View File

@ -28,14 +28,14 @@ import net.minecraft.world.IBlockAccess;
import appeng.api.util.AEColor;
import appeng.api.util.AEPartLocation;
import appeng.api.util.IAESprite;
import appeng.api.util.ModelGenerator;
import appeng.block.networking.BlockWireless;
import appeng.client.ItemRenderType;
import appeng.client.render.BaseBlockRender;
import appeng.client.render.BlockRenderInfo;
import appeng.client.render.ModelGenerator;
import appeng.client.texture.CableBusTextures;
import appeng.client.texture.ExtraBlockTextures;
import appeng.client.texture.IAESprite;
import appeng.client.texture.OffsetIcon;
import appeng.tile.networking.TileWireless;
import appeng.util.Platform;

4
src/main/java/appeng/client/render/blocks/RenderDrive.java
View File

@ -27,12 +27,12 @@ import net.minecraft.util.EnumFacing;
import net.minecraft.world.IBlockAccess;
import appeng.api.util.AEPartLocation;
import appeng.api.util.IAESprite;
import appeng.api.util.ModelGenerator;
import appeng.block.storage.BlockDrive;
import appeng.client.ItemRenderType;
import appeng.client.render.BaseBlockRender;
import appeng.client.render.ModelGenerator;
import appeng.client.texture.ExtraBlockTextures;
import appeng.client.texture.IAESprite;
import appeng.tile.storage.TileDrive;
import appeng.util.Platform;

4
src/main/java/appeng/client/render/blocks/RenderMEChest.java
View File

@ -30,13 +30,13 @@ import appeng.api.AEApi;
import appeng.api.storage.ICellHandler;
import appeng.api.util.AEColor;
import appeng.api.util.AEPartLocation;
import appeng.api.util.IAESprite;
import appeng.api.util.ModelGenerator;
import appeng.block.storage.BlockChest;
import appeng.client.ItemRenderType;
import appeng.client.render.BaseBlockRender;
import appeng.client.render.ModelGenerator;
import appeng.client.texture.ExtraBlockTextures;
import appeng.client.texture.FlippableIcon;
import appeng.client.texture.IAESprite;
import appeng.client.texture.OffsetIcon;
import appeng.tile.storage.TileChest;
import appeng.util.Platform;

2
src/main/java/appeng/client/render/blocks/RenderNull.java
View File

@ -23,10 +23,10 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.BlockPos;
import net.minecraft.world.IBlockAccess;
import appeng.api.util.ModelGenerator;
import appeng.block.AEBaseBlock;
import appeng.client.ItemRenderType;
import appeng.client.render.BaseBlockRender;
import appeng.client.render.ModelGenerator;
import appeng.tile.AEBaseTile;

4
src/main/java/appeng/client/render/blocks/RenderQNB.java
View File

@ -35,12 +35,12 @@ import appeng.api.definitions.IDefinitions;
import appeng.api.definitions.IParts;
import appeng.api.util.AEColor;
import appeng.api.util.AEPartLocation;
import appeng.api.util.IAESprite;
import appeng.api.util.ModelGenerator;
import appeng.block.qnb.BlockQuantumBase;
import appeng.client.ItemRenderType;
import appeng.client.render.BaseBlockRender;
import appeng.client.render.ModelGenerator;
import appeng.client.texture.ExtraBlockTextures;
import appeng.client.texture.IAESprite;
import appeng.tile.qnb.TileQuantumBridge;

2
src/main/java/appeng/client/render/blocks/RenderQuartzGlass.java
View File

@ -27,9 +27,9 @@ import net.minecraft.world.IBlockAccess;
import appeng.api.AEApi;
import appeng.api.util.AEPartLocation;
import appeng.api.util.ModelGenerator;
import appeng.client.ItemRenderType;
import appeng.client.render.BaseBlockRender;
import appeng.client.render.ModelGenerator;
import appeng.client.texture.ExtraBlockTextures;
import appeng.client.texture.OffsetIcon;
import appeng.decorative.solid.QuartzGlassBlock;

2
src/main/java/appeng/client/render/blocks/RenderQuartzOre.java
View File

@ -23,9 +23,9 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.BlockPos;
import net.minecraft.world.IBlockAccess;
import appeng.api.util.ModelGenerator;
import appeng.client.ItemRenderType;
import appeng.client.render.BaseBlockRender;
import appeng.client.render.ModelGenerator;
import appeng.client.texture.ExtraBlockTextures;
import appeng.decorative.solid.QuartzOreBlock;
import appeng.tile.AEBaseTile;

2
src/main/java/appeng/client/render/blocks/RenderQuartzTorch.java
View File

@ -29,10 +29,10 @@ import net.minecraft.world.IBlockAccess;
import appeng.api.util.AEPartLocation;
import appeng.api.util.IOrientable;
import appeng.api.util.IOrientableBlock;
import appeng.api.util.ModelGenerator;
import appeng.block.AEBaseBlock;
import appeng.client.ItemRenderType;
import appeng.client.render.BaseBlockRender;
import appeng.client.render.ModelGenerator;
import appeng.tile.AEBaseTile;

4
src/main/java/appeng/client/render/blocks/RenderSpatialPylon.java
View File

@ -25,13 +25,13 @@ import net.minecraft.util.EnumFacing;
import net.minecraft.world.IBlockAccess;
import appeng.api.util.AEPartLocation;
import appeng.api.util.IAESprite;
import appeng.api.util.ModelGenerator;
import appeng.block.spatial.BlockSpatialPylon;
import appeng.client.ItemRenderType;
import appeng.client.render.BaseBlockRender;
import appeng.client.render.BlockRenderInfo;
import appeng.client.render.ModelGenerator;
import appeng.client.texture.ExtraBlockTextures;
import appeng.client.texture.IAESprite;
import appeng.tile.spatial.TileSpatialPylon;

2
src/main/java/appeng/client/render/blocks/RenderTinyTNT.java
View File

@ -25,10 +25,10 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.BlockPos;
import net.minecraft.world.IBlockAccess;
import appeng.api.util.ModelGenerator;
import appeng.block.misc.BlockTinyTNT;
import appeng.client.ItemRenderType;
import appeng.client.render.BaseBlockRender;
import appeng.client.render.ModelGenerator;
import appeng.client.texture.FullIcon;
import appeng.tile.AEBaseTile;

2
src/main/java/appeng/client/render/blocks/RendererCableBus.java
View File

@ -33,13 +33,13 @@ import appeng.api.parts.IFacadePart;
import appeng.api.parts.IPart;
import appeng.api.parts.IPartItem;
import appeng.api.util.AEPartLocation;
import appeng.api.util.ModelGenerator;
import appeng.block.networking.BlockCableBus;
import appeng.client.ClientHelper;
import appeng.client.ItemRenderType;
import appeng.client.render.BaseBlockRender;
import appeng.client.render.BusRenderHelper;
import appeng.client.render.BusRenderer;
import appeng.client.render.ModelGenerator;
import appeng.facade.IFacadeItem;
import appeng.tile.AEBaseTile;
import appeng.tile.networking.TileCableBus;

4
src/main/java/appeng/client/render/blocks/RendererSecurity.java
View File

@ -28,12 +28,12 @@ import net.minecraft.world.IBlockAccess;
import appeng.api.util.AEColor;
import appeng.api.util.AEPartLocation;
import appeng.api.util.IAESprite;
import appeng.api.util.ModelGenerator;
import appeng.block.misc.BlockSecurity;
import appeng.client.ItemRenderType;
import appeng.client.render.BaseBlockRender;
import appeng.client.render.ModelGenerator;
import appeng.client.texture.ExtraBlockTextures;
import appeng.client.texture.IAESprite;
import appeng.tile.misc.TileSecurity;

2
src/main/java/appeng/client/texture/BaseIcon.java
View File

@ -4,6 +4,8 @@ package appeng.client.texture;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import appeng.api.util.IAESprite;
public class BaseIcon implements IAESprite
{

1
src/main/java/appeng/client/texture/CableBusTextures.java
View File

@ -26,6 +26,7 @@ import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import appeng.api.util.IAESprite;
import appeng.core.AppEng;

1
src/main/java/appeng/client/texture/ExtraBlockTextures.java
View File

@ -25,6 +25,7 @@ import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import appeng.api.util.IAESprite;
import appeng.core.AppEng;

1
src/main/java/appeng/client/texture/ExtraItemTextures.java
View File

@ -22,6 +22,7 @@ package appeng.client.texture;
import net.minecraft.client.renderer.texture.TextureMap;
import net.minecraft.util.ResourceLocation;
import appeng.api.util.IAESprite;
import appeng.core.AppEng;

2
src/main/java/appeng/client/texture/FlippableIcon.java
View File

@ -23,6 +23,8 @@ import javax.annotation.Nonnull;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import appeng.api.util.IAESprite;
public class FlippableIcon implements IAESprite
{

2
src/main/java/appeng/client/texture/FullIcon.java
View File

@ -23,6 +23,8 @@ import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import appeng.api.util.IAESprite;
public class FullIcon implements IAESprite
{

2
src/main/java/appeng/client/texture/MissingIcon.java
View File

@ -25,6 +25,8 @@ import net.minecraft.client.renderer.texture.TextureMap;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import appeng.api.util.IAESprite;
public class MissingIcon implements IAESprite
{

2
src/main/java/appeng/client/texture/OffsetIcon.java
View File

@ -23,6 +23,8 @@ import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import appeng.api.util.IAESprite;
public class OffsetIcon implements IAESprite
{

2
src/main/java/appeng/client/texture/TaughtIcon.java
View File

@ -23,6 +23,8 @@ import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import appeng.api.util.IAESprite;
public class TaughtIcon implements IAESprite
{

3
src/main/java/appeng/client/texture/TmpFlippableIcon.java
View File

@ -19,6 +19,9 @@
package appeng.client.texture;
import appeng.api.util.IAESprite;
public class TmpFlippableIcon extends FlippableIcon
{

2
src/main/java/appeng/core/features/registries/entries/BasicCellHandler.java
View File

@ -32,8 +32,8 @@ import appeng.api.storage.IMEInventoryHandler;
import appeng.api.storage.ISaveProvider;
import appeng.api.storage.StorageChannel;
import appeng.api.util.AEPartLocation;
import appeng.api.util.IAESprite;
import appeng.client.texture.ExtraBlockTextures;
import appeng.client.texture.IAESprite;
import appeng.core.sync.GuiBridge;
import appeng.me.storage.CellInventory;
import appeng.me.storage.CellInventoryHandler;

2
src/main/java/appeng/core/features/registries/entries/CreativeCellHandler.java
View File

@ -30,8 +30,8 @@ import appeng.api.storage.IMEInventoryHandler;
import appeng.api.storage.ISaveProvider;
import appeng.api.storage.StorageChannel;
import appeng.api.util.AEPartLocation;
import appeng.api.util.IAESprite;
import appeng.client.texture.ExtraBlockTextures;
import appeng.client.texture.IAESprite;
import appeng.core.sync.GuiBridge;
import appeng.items.storage.ItemCreativeStorageCell;
import appeng.me.storage.CreativeCellInventory;

5
src/main/java/appeng/entity/RenderTinyTNTPrimed.java
View File

@ -33,14 +33,15 @@ import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import appeng.client.render.ModelGenerator;
import appeng.api.util.ModelGenerator;
import appeng.client.render.BakingModelGenerator;
@SideOnly( Side.CLIENT )
public class RenderTinyTNTPrimed extends Render
{
private final ModelGenerator blockRenderer = new ModelGenerator();
private final ModelGenerator blockRenderer = new BakingModelGenerator();
public RenderTinyTNTPrimed( final RenderManager p_i46134_1_ )
{

5
src/main/java/appeng/facade/FacadePart.java
View File

@ -20,7 +20,6 @@ package appeng.facade;
import java.util.EnumSet;
import javax.annotation.Nullable;
import net.minecraft.block.Block;
@ -46,10 +45,10 @@ import appeng.api.parts.IPartCollisionHelper;
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.render.BusRenderHelper;
import appeng.client.render.ModelGenerator;
import appeng.client.render.RenderBlocksWorkaround;
import appeng.client.texture.IAESprite;
import appeng.core.AELog;
import appeng.integration.IntegrationRegistry;
import appeng.integration.IntegrationType;

2
src/main/java/appeng/integration/abstraction/IBuildCraftTransport.java
View File

@ -29,7 +29,7 @@ import net.minecraft.util.EnumFacing;
import appeng.api.parts.IFacadePart;
import appeng.api.util.AEPartLocation;
import appeng.client.texture.IAESprite;
import appeng.api.util.IAESprite;
/**

2
src/main/java/appeng/items/AEBaseItem.java
View File

@ -32,8 +32,8 @@ import net.minecraft.item.ItemStack;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import appeng.api.util.IAESprite;
import appeng.client.ClientHelper;
import appeng.client.texture.IAESprite;
import appeng.core.features.AEFeature;
import appeng.core.features.FeatureNameExtractor;
import appeng.core.features.IAEFeature;

3
src/main/java/appeng/items/parts/ItemMultiPart.java
View File

@ -29,7 +29,6 @@ import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
@ -53,8 +52,8 @@ import appeng.api.parts.IPart;
import appeng.api.parts.IPartHelper;
import appeng.api.parts.IPartItem;
import appeng.api.util.AEColor;
import appeng.api.util.IAESprite;
import appeng.client.texture.BaseIcon;
import appeng.client.texture.IAESprite;
import appeng.client.texture.MissingIcon;
import appeng.core.AEConfig;
import appeng.core.AppEng;

2
src/main/java/appeng/parts/AEBasePart.java
View File

@ -64,7 +64,7 @@ import appeng.api.util.AEColor;
import appeng.api.util.AEPartLocation;
import appeng.api.util.DimensionalCoord;
import appeng.api.util.IConfigManager;
import appeng.client.render.ModelGenerator;
import appeng.api.util.ModelGenerator;
import appeng.helpers.ICustomNameObject;
import appeng.helpers.IPriorityHost;
import appeng.me.helpers.AENetworkProxy;

2
src/main/java/appeng/parts/PartBasicState.java
View File

@ -36,7 +36,7 @@ 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.client.render.ModelGenerator;
import appeng.api.util.ModelGenerator;
import appeng.client.texture.CableBusTextures;
import appeng.me.GridAccessException;

4
src/main/java/appeng/parts/automation/PartAnnihilationPlane.java
View File

@ -57,9 +57,9 @@ import appeng.api.parts.IPartHost;
import appeng.api.parts.IPartRenderHelper;
import appeng.api.storage.data.IAEItemStack;
import appeng.api.util.AEPartLocation;
import appeng.client.render.ModelGenerator;
import appeng.api.util.IAESprite;
import appeng.api.util.ModelGenerator;
import appeng.client.texture.CableBusTextures;
import appeng.client.texture.IAESprite;
import appeng.core.settings.TickRates;
import appeng.core.sync.packets.PacketTransitionEffect;
import appeng.hooks.TickHandler;

2
src/main/java/appeng/parts/automation/PartExportBus.java
View File

@ -52,7 +52,7 @@ import appeng.api.parts.IPartRenderHelper;
import appeng.api.storage.IMEInventory;
import appeng.api.storage.IMEMonitor;
import appeng.api.storage.data.IAEItemStack;
import appeng.client.render.ModelGenerator;
import appeng.api.util.ModelGenerator;
import appeng.client.texture.CableBusTextures;
import appeng.core.AELog;
import appeng.core.settings.TickRates;

2
src/main/java/appeng/parts/automation/PartFormationPlane.java
View File

@ -70,7 +70,7 @@ import appeng.api.storage.data.IAEItemStack;
import appeng.api.storage.data.IItemList;
import appeng.api.util.AEPartLocation;
import appeng.api.util.IConfigManager;
import appeng.client.render.ModelGenerator;
import appeng.api.util.ModelGenerator;
import appeng.client.texture.CableBusTextures;
import appeng.core.AEConfig;
import appeng.core.sync.GuiBridge;

4
src/main/java/appeng/parts/automation/PartIdentityAnnihilationPlane.java
View File

@ -37,9 +37,9 @@ import appeng.api.parts.IPart;
import appeng.api.parts.IPartHost;
import appeng.api.parts.IPartRenderHelper;
import appeng.api.util.AEPartLocation;
import appeng.client.render.ModelGenerator;
import appeng.api.util.IAESprite;
import appeng.api.util.ModelGenerator;
import appeng.client.texture.CableBusTextures;
import appeng.client.texture.IAESprite;
public class PartIdentityAnnihilationPlane extends PartAnnihilationPlane

2
src/main/java/appeng/parts/automation/PartImportBus.java
View File

@ -45,7 +45,7 @@ import appeng.api.parts.IPartRenderHelper;
import appeng.api.storage.IMEInventory;
import appeng.api.storage.IMEMonitor;
import appeng.api.storage.data.IAEItemStack;
import appeng.client.render.ModelGenerator;
import appeng.api.util.ModelGenerator;
import appeng.client.texture.CableBusTextures;
import appeng.core.settings.TickRates;
import appeng.core.sync.GuiBridge;

4
src/main/java/appeng/parts/automation/PartLevelEmitter.java
View File

@ -70,10 +70,10 @@ 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.client.render.ModelGenerator;
import appeng.api.util.ModelGenerator;
import appeng.client.texture.CableBusTextures;
import appeng.client.texture.IAESprite;
import appeng.core.sync.GuiBridge;
import appeng.helpers.Reflected;
import appeng.me.GridAccessException;

4
src/main/java/appeng/parts/misc/PartCableAnchor.java
View File

@ -46,8 +46,8 @@ import appeng.api.parts.IPartHost;
import appeng.api.parts.IPartRenderHelper;
import appeng.api.parts.PartItemStack;
import appeng.api.util.AEPartLocation;
import appeng.client.render.ModelGenerator;
import appeng.client.texture.IAESprite;
import appeng.api.util.IAESprite;
import appeng.api.util.ModelGenerator;
public class PartCableAnchor implements IPart

2
src/main/java/appeng/parts/misc/PartInterface.java
View File

@ -60,7 +60,7 @@ import appeng.api.storage.IStorageMonitorable;
import appeng.api.storage.data.IAEFluidStack;
import appeng.api.storage.data.IAEItemStack;
import appeng.api.util.IConfigManager;
import appeng.client.render.ModelGenerator;
import appeng.api.util.ModelGenerator;
import appeng.client.texture.CableBusTextures;
import appeng.core.sync.GuiBridge;
import appeng.helpers.DualityInterface;

2
src/main/java/appeng/parts/misc/PartStorageBus.java
View File

@ -66,7 +66,7 @@ import appeng.api.storage.data.IAEItemStack;
import appeng.api.storage.data.IItemList;
import appeng.api.util.AEPartLocation;
import appeng.api.util.IConfigManager;
import appeng.client.render.ModelGenerator;
import appeng.api.util.ModelGenerator;
import appeng.client.texture.CableBusTextures;
import appeng.core.settings.TickRates;
import appeng.core.stats.Achievements;

2
src/main/java/appeng/parts/misc/PartToggleBus.java
View File

@ -43,7 +43,7 @@ import appeng.api.parts.IPartHost;
import appeng.api.parts.IPartRenderHelper;
import appeng.api.util.AECableType;
import appeng.api.util.AEPartLocation;
import appeng.client.render.ModelGenerator;
import appeng.api.util.ModelGenerator;
import appeng.client.texture.CableBusTextures;
import appeng.helpers.Reflected;
import appeng.me.helpers.AENetworkProxy;

4
src/main/java/appeng/parts/networking/PartCable.java
View File

@ -53,12 +53,12 @@ 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.render.ModelGenerator;
import appeng.client.texture.CableBusTextures;
import appeng.client.texture.FlippableIcon;
import appeng.client.texture.IAESprite;
import appeng.client.texture.TaughtIcon;
import appeng.items.parts.ItemMultiPart;
import appeng.me.GridAccessException;

4
src/main/java/appeng/parts/networking/PartCableCovered.java
View File

@ -41,8 +41,8 @@ import appeng.api.parts.IPartRenderHelper;
import appeng.api.util.AECableType;
import appeng.api.util.AEColor;
import appeng.api.util.AEPartLocation;
import appeng.client.render.ModelGenerator;
import appeng.client.texture.IAESprite;
import appeng.api.util.IAESprite;
import appeng.api.util.ModelGenerator;
import appeng.client.texture.OffsetIcon;
import appeng.helpers.Reflected;
import appeng.util.Platform;

4
src/main/java/appeng/parts/networking/PartCableSmart.java
View File

@ -41,10 +41,10 @@ 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.render.ModelGenerator;
import appeng.client.texture.FlippableIcon;
import appeng.client.texture.IAESprite;
import appeng.client.texture.OffsetIcon;
import appeng.client.texture.TaughtIcon;
import appeng.helpers.Reflected;

4
src/main/java/appeng/parts/networking/PartDenseCable.java
View File

@ -44,11 +44,11 @@ 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.render.ModelGenerator;
import appeng.client.texture.CableBusTextures;
import appeng.client.texture.FlippableIcon;
import appeng.client.texture.IAESprite;
import appeng.client.texture.OffsetIcon;
import appeng.client.texture.TaughtIcon;
import appeng.helpers.Reflected;

4
src/main/java/appeng/parts/networking/PartQuartzFiber.java
View File

@ -42,8 +42,8 @@ import appeng.api.parts.IPartHost;
import appeng.api.parts.IPartRenderHelper;
import appeng.api.util.AECableType;
import appeng.api.util.AEPartLocation;
import appeng.client.render.ModelGenerator;
import appeng.client.texture.IAESprite;
import appeng.api.util.IAESprite;
import appeng.api.util.ModelGenerator;
import appeng.me.GridAccessException;
import appeng.me.helpers.AENetworkProxy;
import appeng.parts.AEBasePart;

4
src/main/java/appeng/parts/p2p/PartP2PTunnel.java
View File

@ -49,9 +49,9 @@ import appeng.api.parts.IPartItem;
import appeng.api.parts.IPartRenderHelper;
import appeng.api.parts.PartItemStack;
import appeng.api.util.AEPartLocation;
import appeng.client.render.ModelGenerator;
import appeng.api.util.IAESprite;
import appeng.api.util.ModelGenerator;
import appeng.client.texture.CableBusTextures;
import appeng.client.texture.IAESprite;
import appeng.core.AEConfig;
import appeng.me.GridAccessException;
import appeng.me.cache.P2PCache;

4
src/main/java/appeng/parts/reporting/AbstractPartDisplay.java
View File

@ -26,9 +26,9 @@ import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import appeng.api.parts.IPartRenderHelper;
import appeng.client.render.ModelGenerator;
import appeng.api.util.IAESprite;
import appeng.api.util.ModelGenerator;
import appeng.client.texture.CableBusTextures;
import appeng.client.texture.IAESprite;
/**

2
src/main/java/appeng/parts/reporting/AbstractPartMonitor.java
View File

@ -52,8 +52,8 @@ 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.client.render.ModelGenerator;
import appeng.core.AELog;
import appeng.core.localization.PlayerMessages;
import appeng.helpers.Reflected;

4
src/main/java/appeng/parts/reporting/AbstractPartPanel.java
View File

@ -27,9 +27,9 @@ import net.minecraftforge.fml.relauncher.SideOnly;
import appeng.api.parts.IPartRenderHelper;
import appeng.api.util.AEColor;
import appeng.client.render.ModelGenerator;
import appeng.api.util.IAESprite;
import appeng.api.util.ModelGenerator;
import appeng.client.texture.CableBusTextures;
import appeng.client.texture.IAESprite;
/**