Make the project buildable with gradlew build by externalizing the model generator and expose it as an interface
This commit is contained in:
thatsIch
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
|
||||
@@ -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 )
|
||||
|
||||
@@ -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 )
|
||||
{
|
||||
|
||||
@@ -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 );
|
||||
|
||||
@@ -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 ) )
|
||||
{
|
||||
|
||||
@@ -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 ) )
|
||||
{
|
||||
|
||||
@@ -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 );
|
||||
|
||||
+46
-21
@@ -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;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -19,6 +19,9 @@
|
||||
package appeng.client.render;
|
||||
|
||||
|
||||
import appeng.api.util.ModelGenerator;
|
||||
|
||||
|
||||
public class BusRenderer
|
||||
{
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -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 );
|
||||
|
||||
}
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -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()
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
|
||||
@@ -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
|
||||
{
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
|
||||
@@ -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
|
||||
{
|
||||
|
||||
@@ -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
|
||||
{
|
||||
|
||||
@@ -1,31 +0,0 @@
|
||||
|
||||
package appeng.client.texture;
|
||||
|
||||
|
||||
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
||||
|
||||
|
||||
public interface IAESprite
|
||||
{
|
||||
|
||||
int getIconWidth();
|
||||
|
||||
int getIconHeight();
|
||||
|
||||
float getMaxU();
|
||||
|
||||
float getInterpolatedU( double px );
|
||||
|
||||
float getMinV();
|
||||
|
||||
float getMaxV();
|
||||
|
||||
String getIconName();
|
||||
|
||||
float getInterpolatedV( double px );
|
||||
|
||||
float getMinU();
|
||||
|
||||
TextureAtlasSprite getAtlas();
|
||||
|
||||
}
|
||||
@@ -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
|
||||
{
|
||||
|
||||
@@ -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
|
||||
{
|
||||
|
||||
@@ -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
|
||||
{
|
||||
|
||||
@@ -19,6 +19,9 @@
|
||||
package appeng.client.texture;
|
||||
|
||||
|
||||
import appeng.api.util.IAESprite;
|
||||
|
||||
|
||||
public class TmpFlippableIcon extends FlippableIcon
|
||||
{
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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_ )
|
||||
{
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
/**
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
/**
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user