Formatted code
This commit is contained in:
@@ -95,7 +95,6 @@ public abstract class AEBaseTileBlock extends AEBaseBlock implements IAEFeature,
|
|||||||
this.setTileProvider( this.hasBlockTileEntity() );
|
this.setTileProvider( this.hasBlockTileEntity() );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// update Block value.
|
// update Block value.
|
||||||
private void setTileProvider( final boolean b )
|
private void setTileProvider( final boolean b )
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -1,8 +1,11 @@
|
|||||||
|
|
||||||
package appeng.block;
|
package appeng.block;
|
||||||
|
|
||||||
|
|
||||||
import net.minecraft.world.IBlockAccess;
|
import net.minecraft.world.IBlockAccess;
|
||||||
import net.minecraftforge.common.property.IUnlistedProperty;
|
import net.minecraftforge.common.property.IUnlistedProperty;
|
||||||
|
|
||||||
|
|
||||||
public final class UnlistedBlockAccess implements IUnlistedProperty<IBlockAccess>
|
public final class UnlistedBlockAccess implements IUnlistedProperty<IBlockAccess>
|
||||||
{
|
{
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -1,8 +1,11 @@
|
|||||||
|
|
||||||
package appeng.block;
|
package appeng.block;
|
||||||
|
|
||||||
|
|
||||||
import net.minecraft.util.BlockPos;
|
import net.minecraft.util.BlockPos;
|
||||||
import net.minecraftforge.common.property.IUnlistedProperty;
|
import net.minecraftforge.common.property.IUnlistedProperty;
|
||||||
|
|
||||||
|
|
||||||
public final class UnlistedBlockPos implements IUnlistedProperty<BlockPos>
|
public final class UnlistedBlockPos implements IUnlistedProperty<BlockPos>
|
||||||
{
|
{
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -125,7 +125,8 @@ public class ClientHelper extends ServerHelper
|
|||||||
{
|
{
|
||||||
// final Block fluixBlock = GameRegistry.findBlock( "appliedenergistics2", "fluix" );
|
// final Block fluixBlock = GameRegistry.findBlock( "appliedenergistics2", "fluix" );
|
||||||
// Item fluixItem = Item.getItemFromBlock( fluixBlock );
|
// Item fluixItem = Item.getItemFromBlock( fluixBlock );
|
||||||
// ModelResourceLocation itemModelResourceLocation = new ModelResourceLocation( "appliedenergistics2:fluix", "inventory" );
|
// ModelResourceLocation itemModelResourceLocation = new ModelResourceLocation( "appliedenergistics2:fluix",
|
||||||
|
// "inventory" );
|
||||||
// final int DEFAULT_ITEM_SUBTYPE = 0;
|
// final int DEFAULT_ITEM_SUBTYPE = 0;
|
||||||
// final ItemModelMesher mesher = Minecraft.getMinecraft().getRenderItem().getItemModelMesher();
|
// final ItemModelMesher mesher = Minecraft.getMinecraft().getRenderItem().getItemModelMesher();
|
||||||
// // mesher.register( fluixItem, DEFAULT_ITEM_SUBTYPE, itemModelResourceLocation );
|
// // mesher.register( fluixItem, DEFAULT_ITEM_SUBTYPE, itemModelResourceLocation );
|
||||||
|
|||||||
@@ -416,7 +416,6 @@ public class GuiImgButton extends GuiButton implements ITooltip
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
private static class ButtonAppearance
|
private static class ButtonAppearance
|
||||||
{
|
{
|
||||||
public int index;
|
public int index;
|
||||||
|
|||||||
@@ -1,9 +1,12 @@
|
|||||||
|
|
||||||
package appeng.client.render;
|
package appeng.client.render;
|
||||||
|
|
||||||
|
|
||||||
import net.minecraft.block.Block;
|
import net.minecraft.block.Block;
|
||||||
import net.minecraft.util.BlockPos;
|
import net.minecraft.util.BlockPos;
|
||||||
import net.minecraft.world.IBlockAccess;
|
import net.minecraft.world.IBlockAccess;
|
||||||
|
|
||||||
|
|
||||||
public interface ISimpleBlockRenderingHandler
|
public interface ISimpleBlockRenderingHandler
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
|
|
||||||
package appeng.client.render;
|
package appeng.client.render;
|
||||||
|
|
||||||
|
|
||||||
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
||||||
import appeng.client.texture.IAESprite;
|
import appeng.client.texture.IAESprite;
|
||||||
|
|
||||||
|
|||||||
@@ -1,10 +1,13 @@
|
|||||||
|
|
||||||
package appeng.client.render;
|
package appeng.client.render;
|
||||||
|
|
||||||
|
|
||||||
import javax.vecmath.Vector3f;
|
import javax.vecmath.Vector3f;
|
||||||
|
|
||||||
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
||||||
import net.minecraft.util.EnumFacing;
|
import net.minecraft.util.EnumFacing;
|
||||||
|
|
||||||
|
|
||||||
public class SMFace
|
public class SMFace
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|||||||
@@ -140,12 +140,13 @@ public class RenderBlockCharger extends BaseBlockRender<BlockCharger, TileCharge
|
|||||||
|
|
||||||
final Block blk = Block.getBlockFromItem( sis.getItem() );
|
final Block blk = Block.getBlockFromItem( sis.getItem() );
|
||||||
/*
|
/*
|
||||||
if( sis.getItemSpriteNumber() == 0 && block != null && IRenderHelper.renderItemIn3d( blk.getRenderType() ) )
|
* if( sis.getItemSpriteNumber() == 0 && block != null && IRenderHelper.renderItemIn3d(
|
||||||
{
|
* blk.getRenderType() ) )
|
||||||
GL11.glRotatef( 25.0f, 1.0f, 0.0f, 0.0f );
|
* {
|
||||||
GL11.glRotatef( 15.0f, 0.0f, 1.0f, 0.0f );
|
* GL11.glRotatef( 25.0f, 1.0f, 0.0f, 0.0f );
|
||||||
GL11.glRotatef( 30.0f, 0.0f, 1.0f, 0.0f );
|
* GL11.glRotatef( 15.0f, 0.0f, 1.0f, 0.0f );
|
||||||
}
|
* GL11.glRotatef( 30.0f, 0.0f, 1.0f, 0.0f );
|
||||||
|
* }
|
||||||
*/
|
*/
|
||||||
|
|
||||||
// << 20 | light << 4;
|
// << 20 | light << 4;
|
||||||
|
|||||||
@@ -104,15 +104,13 @@ public class RenderBlockCrank extends BaseBlockRender<BlockCrank, TileCrank>
|
|||||||
Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelRenderer().renderModelBrightnessColor( model, 1.0F, 1.0F, 1.0F, 1.0F );
|
Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelRenderer().renderModelBrightnessColor( model, 1.0F, 1.0F, 1.0F, 1.0F );
|
||||||
|
|
||||||
/*
|
/*
|
||||||
renderBlocks.renderAllFaces = true;
|
* renderBlocks.renderAllFaces = true;
|
||||||
renderBlocks.blockAccess = tc.getWorld();
|
* renderBlocks.blockAccess = tc.getWorld();
|
||||||
|
* renderBlocks.setRenderBounds( 0.5D - 0.05, 0.5D - 0.5, 0.5D - 0.05, 0.5D + 0.05, 0.5D + 0.1, 0.5D + 0.05 );
|
||||||
renderBlocks.setRenderBounds( 0.5D - 0.05, 0.5D - 0.5, 0.5D - 0.05, 0.5D + 0.05, 0.5D + 0.1, 0.5D + 0.05 );
|
* renderBlocks.renderStandardBlock( blk, tc.getPos());
|
||||||
|
* renderBlocks.setRenderBounds( 0.70D - 0.15, 0.55D - 0.05, 0.5D - 0.05, 0.70D + 0.15, 0.55D + 0.05, 0.5D +
|
||||||
renderBlocks.renderStandardBlock( blk, tc.getPos());
|
* 0.05 );
|
||||||
renderBlocks.setRenderBounds( 0.70D - 0.15, 0.55D - 0.05, 0.5D - 0.05, 0.70D + 0.15, 0.55D + 0.05, 0.5D + 0.05 );
|
* renderBlocks.renderStandardBlock( blk, tc.getPos() );
|
||||||
|
|
||||||
renderBlocks.renderStandardBlock( blk, tc.getPos() );
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
// Tessellator.getInstance().draw();
|
// Tessellator.getInstance().draw();
|
||||||
|
|||||||
@@ -279,12 +279,14 @@ public class RenderBlockInscriber extends BaseBlockRender<BlockInscriber, TileIn
|
|||||||
final Block blk = Block.getBlockFromItem( sis.getItem() );
|
final Block blk = Block.getBlockFromItem( sis.getItem() );
|
||||||
|
|
||||||
/*
|
/*
|
||||||
if( sis.getItemSpriteNumber() == 0 && block != null && IRenderHelper.renderItemIn3d( blk.getRenderType() ) )
|
* if( sis.getItemSpriteNumber() == 0 && block != null && IRenderHelper.renderItemIn3d(
|
||||||
{
|
* blk.getRenderType() ) )
|
||||||
GL11.glRotatef( 25.0f, 1.0f, 0.0f, 0.0f );
|
* {
|
||||||
GL11.glRotatef( 15.0f, 0.0f, 1.0f, 0.0f );
|
* GL11.glRotatef( 25.0f, 1.0f, 0.0f, 0.0f );
|
||||||
GL11.glRotatef( 30.0f, 0.0f, 1.0f, 0.0f );
|
* GL11.glRotatef( 15.0f, 0.0f, 1.0f, 0.0f );
|
||||||
}*/
|
* GL11.glRotatef( 30.0f, 0.0f, 1.0f, 0.0f );
|
||||||
|
* }
|
||||||
|
*/
|
||||||
|
|
||||||
GL11.glRotatef( 90.0f, 1, 0, 0 );
|
GL11.glRotatef( 90.0f, 1, 0, 0 );
|
||||||
|
|
||||||
|
|||||||
@@ -191,7 +191,6 @@ public class RenderDrive extends BaseBlockRender<BlockDrive, TileDrive>
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
double u1 = ico.getInterpolatedU( ( spin % 4 < 2 ) ? 1 : 6 );
|
double u1 = ico.getInterpolatedU( ( spin % 4 < 2 ) ? 1 : 6 );
|
||||||
double u2 = ico.getInterpolatedU( ( ( spin + 1 ) % 4 < 2 ) ? 1 : 6 );
|
double u2 = ico.getInterpolatedU( ( ( spin + 1 ) % 4 < 2 ) ? 1 : 6 );
|
||||||
double u3 = ico.getInterpolatedU( ( ( spin + 2 ) % 4 < 2 ) ? 1 : 6 );
|
double u3 = ico.getInterpolatedU( ( ( spin + 2 ) % 4 < 2 ) ? 1 : 6 );
|
||||||
|
|||||||
@@ -42,108 +42,95 @@ public class ToolBiometricCardRender implements IItemRenderer // TileEntityItemS
|
|||||||
public void renderItem( final ItemRenderType type, final ItemStack item, final Object... data )
|
public void renderItem( final ItemRenderType type, final ItemStack item, final Object... data )
|
||||||
{
|
{
|
||||||
/*
|
/*
|
||||||
TextureAtlasSprite par2Icon = item.getIconIndex();
|
* TextureAtlasSprite par2Icon = item.getIconIndex();
|
||||||
|
* float f4 = par2Icon.getMinU();
|
||||||
float f4 = par2Icon.getMinU();
|
* float f5 = par2Icon.getMaxU();
|
||||||
float f5 = par2Icon.getMaxU();
|
* float f6 = par2Icon.getMinV();
|
||||||
float f6 = par2Icon.getMinV();
|
* float f7 = par2Icon.getMaxV();
|
||||||
float f7 = par2Icon.getMaxV();
|
* float f12 = 0.0625F;
|
||||||
float f12 = 0.0625F;
|
* Tessellator tessellator = Tessellator.instance;
|
||||||
|
* GL11.glPushMatrix();
|
||||||
Tessellator tessellator = Tessellator.instance;
|
* GL11.glPushAttrib( GL11.GL_ALL_ATTRIB_BITS );
|
||||||
GL11.glPushMatrix();
|
* if( type == ItemRenderType.INVENTORY )
|
||||||
GL11.glPushAttrib( GL11.GL_ALL_ATTRIB_BITS );
|
* {
|
||||||
|
* GL11.glColor4f( 1, 1, 1, 1.0F );
|
||||||
if( type == ItemRenderType.INVENTORY )
|
* GL11.glScalef( 16F, 16F, 10F );
|
||||||
{
|
* GL11.glTranslatef( 0.0F, 1.0F, 0.0F );
|
||||||
GL11.glColor4f( 1, 1, 1, 1.0F );
|
* GL11.glRotatef( 180F, 1.0F, 0.0F, 0.0F );
|
||||||
GL11.glScalef( 16F, 16F, 10F );
|
* GL11.glEnable( GL11.GL_ALPHA_TEST );
|
||||||
GL11.glTranslatef( 0.0F, 1.0F, 0.0F );
|
* tessellator.startDrawingQuads();
|
||||||
GL11.glRotatef( 180F, 1.0F, 0.0F, 0.0F );
|
* tessellator.setNormal( 0.0F, 1.0F, 0.0F );
|
||||||
GL11.glEnable( GL11.GL_ALPHA_TEST );
|
* tessellator.addVertexWithUV( 0, 0, 0, f4, f7 );
|
||||||
|
* tessellator.addVertexWithUV( 1, 0, 0, f5, f7 );
|
||||||
tessellator.startDrawingQuads();
|
* tessellator.addVertexWithUV( 1, 1, 0, f5, f6 );
|
||||||
tessellator.setNormal( 0.0F, 1.0F, 0.0F );
|
* tessellator.addVertexWithUV( 0, 1, 0, f4, f6 );
|
||||||
tessellator.addVertexWithUV( 0, 0, 0, f4, f7 );
|
* tessellator.draw();
|
||||||
tessellator.addVertexWithUV( 1, 0, 0, f5, f7 );
|
* }
|
||||||
tessellator.addVertexWithUV( 1, 1, 0, f5, f6 );
|
* else
|
||||||
tessellator.addVertexWithUV( 0, 1, 0, f4, f6 );
|
* {
|
||||||
tessellator.draw();
|
* GL11.glTranslatef( -0.5F, -0.3F, 0.01F );
|
||||||
}
|
* ItemRenderer.renderItemIn2D( tessellator, f5, f6, f4, f7, par2Icon.getIconWidth(), par2Icon.getIconHeight(),
|
||||||
else
|
* f12 );
|
||||||
{
|
* GL11.glDisable( GL11.GL_CULL_FACE );
|
||||||
GL11.glTranslatef( -0.5F, -0.3F, 0.01F );
|
* GL11.glColor4f( 1, 1, 1, 1.0F );
|
||||||
ItemRenderer.renderItemIn2D( tessellator, f5, f6, f4, f7, par2Icon.getIconWidth(), par2Icon.getIconHeight(), f12 );
|
* GL11.glScalef( 1F, 1.1F, 1F );
|
||||||
|
* GL11.glTranslatef( 0.0F, 1.07F, f12 / -2.0f );
|
||||||
GL11.glDisable( GL11.GL_CULL_FACE );
|
* GL11.glRotatef( 180F, 1.0F, 0.0F, 0.0F );
|
||||||
GL11.glColor4f( 1, 1, 1, 1.0F );
|
* }
|
||||||
GL11.glScalef( 1F, 1.1F, 1F );
|
* float u = ExtraItemTextures.White.getIcon().getInterpolatedU( 8.1 );
|
||||||
GL11.glTranslatef( 0.0F, 1.07F, f12 / -2.0f );
|
* float v = ExtraItemTextures.White.getIcon().getInterpolatedV( 8.1 );
|
||||||
GL11.glRotatef( 180F, 1.0F, 0.0F, 0.0F );
|
* String username = "";
|
||||||
}
|
* if( item.getItem() instanceof IBiometricCard )
|
||||||
|
* {
|
||||||
float u = ExtraItemTextures.White.getIcon().getInterpolatedU( 8.1 );
|
* GameProfile gp = ( (IBiometricCard) item.getItem() ).getProfile( item );
|
||||||
float v = ExtraItemTextures.White.getIcon().getInterpolatedV( 8.1 );
|
* if( gp != null )
|
||||||
|
* {
|
||||||
String username = "";
|
* username = gp.getName();
|
||||||
if( item.getItem() instanceof IBiometricCard )
|
* }
|
||||||
{
|
* }
|
||||||
GameProfile gp = ( (IBiometricCard) item.getItem() ).getProfile( item );
|
* int hash = username.length() > 0 ? username.hashCode() : 0;
|
||||||
if( gp != null )
|
* GL11.glScalef( 1F / 16F, 1F / 16F, 1F );
|
||||||
{
|
* GL11.glTranslatef( 4, 6, 0 );
|
||||||
username = gp.getName();
|
* GL11.glDisable( GL11.GL_LIGHTING );
|
||||||
}
|
* tessellator.startDrawingQuads();
|
||||||
}
|
* float z = 0;
|
||||||
int hash = username.length() > 0 ? username.hashCode() : 0;
|
* AEColor col = AEColor.values()[Math.abs( 3 + hash ) % AEColor.values().length];
|
||||||
|
* if( hash == 0 )
|
||||||
GL11.glScalef( 1F / 16F, 1F / 16F, 1F );
|
* {
|
||||||
GL11.glTranslatef( 4, 6, 0 );
|
* col = AEColor.Black;
|
||||||
GL11.glDisable( GL11.GL_LIGHTING );
|
* }
|
||||||
|
* for( int x = 0; x < 8; x++ )// 8
|
||||||
tessellator.startDrawingQuads();
|
* {
|
||||||
float z = 0;
|
* for( int y = 0; y < 6; y++ )// 6
|
||||||
|
* {
|
||||||
AEColor col = AEColor.values()[Math.abs( 3 + hash ) % AEColor.values().length];
|
* boolean isLit = false;
|
||||||
if( hash == 0 )
|
* float scale = 0.3f / 255.0f;
|
||||||
{
|
* if( x == 0 || y == 0 || x == 7 || y == 5 )
|
||||||
col = AEColor.Black;
|
* {
|
||||||
}
|
* isLit = false;
|
||||||
|
* }
|
||||||
for( int x = 0; x < 8; x++ )// 8
|
* else
|
||||||
{
|
* {
|
||||||
for( int y = 0; y < 6; y++ )// 6
|
* isLit = ( hash & ( 1 << x ) ) != 0 || ( hash & ( 1 << y ) ) != 0;
|
||||||
{
|
* }
|
||||||
boolean isLit = false;
|
* if( isLit )
|
||||||
float scale = 0.3f / 255.0f;
|
* {
|
||||||
|
* tessellator.setColorOpaque_I( col.mediumVariant );
|
||||||
if( x == 0 || y == 0 || x == 7 || y == 5 )
|
* }
|
||||||
{
|
* else
|
||||||
isLit = false;
|
* {
|
||||||
}
|
* tessellator.setColorOpaque_F( ( ( col.blackVariant >> 16 ) & 0xff ) * scale, ( ( col.blackVariant >> 8 ) &
|
||||||
else
|
* 0xff ) * scale, ( col.blackVariant & 0xff ) * scale );
|
||||||
{
|
* }
|
||||||
isLit = ( hash & ( 1 << x ) ) != 0 || ( hash & ( 1 << y ) ) != 0;
|
* tessellator.addVertexWithUV( x, y, z, u, v );
|
||||||
}
|
* tessellator.addVertexWithUV( x + 1, y, z, u, v );
|
||||||
|
* tessellator.addVertexWithUV( x + 1, y + 1, z, u, v );
|
||||||
if( isLit )
|
* tessellator.addVertexWithUV( x, y + 1, z, u, v );
|
||||||
{
|
* }
|
||||||
tessellator.setColorOpaque_I( col.mediumVariant );
|
* }
|
||||||
}
|
* tessellator.draw();
|
||||||
else
|
* GL11.glPopAttrib();
|
||||||
{
|
* GL11.glPopMatrix();
|
||||||
tessellator.setColorOpaque_F( ( ( col.blackVariant >> 16 ) & 0xff ) * scale, ( ( col.blackVariant >> 8 ) & 0xff ) * scale, ( col.blackVariant & 0xff ) * scale );
|
|
||||||
}
|
|
||||||
|
|
||||||
tessellator.addVertexWithUV( x, y, z, u, v );
|
|
||||||
tessellator.addVertexWithUV( x + 1, y, z, u, v );
|
|
||||||
tessellator.addVertexWithUV( x + 1, y + 1, z, u, v );
|
|
||||||
tessellator.addVertexWithUV( x, y + 1, z, u, v );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
tessellator.draw();
|
|
||||||
|
|
||||||
GL11.glPopAttrib();
|
|
||||||
GL11.glPopMatrix();
|
|
||||||
*/
|
*/
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -42,114 +42,97 @@ public class ToolColorApplicatorRender implements IItemRenderer
|
|||||||
public void renderItem( final ItemRenderType type, final ItemStack item, final Object... data )
|
public void renderItem( final ItemRenderType type, final ItemStack item, final Object... data )
|
||||||
{
|
{
|
||||||
/*
|
/*
|
||||||
TextureAtlasSprite par2Icon = item.getIconIndex();
|
* TextureAtlasSprite par2Icon = item.getIconIndex();
|
||||||
|
* float f4 = par2Icon.getMinU();
|
||||||
float f4 = par2Icon.getMinU();
|
* float f5 = par2Icon.getMaxU();
|
||||||
float f5 = par2Icon.getMaxU();
|
* float f6 = par2Icon.getMinV();
|
||||||
float f6 = par2Icon.getMinV();
|
* float f7 = par2Icon.getMaxV();
|
||||||
float f7 = par2Icon.getMaxV();
|
* float f12 = 0.0625F;
|
||||||
float f12 = 0.0625F;
|
* Tessellator tessellator = Tessellator.instance;
|
||||||
|
* GL11.glPushMatrix();
|
||||||
Tessellator tessellator = Tessellator.instance;
|
* GL11.glPushAttrib( GL11.GL_ALL_ATTRIB_BITS );
|
||||||
GL11.glPushMatrix();
|
* if( type == ItemRenderType.INVENTORY )
|
||||||
GL11.glPushAttrib( GL11.GL_ALL_ATTRIB_BITS );
|
* {
|
||||||
|
* GL11.glColor4f( 1, 1, 1, 1.0F );
|
||||||
if( type == ItemRenderType.INVENTORY )
|
* GL11.glScalef( 16F, 16F, 10F );
|
||||||
{
|
* GL11.glTranslatef( 0.0F, 1.0F, 0.0F );
|
||||||
GL11.glColor4f( 1, 1, 1, 1.0F );
|
* GL11.glRotatef( 180F, 1.0F, 0.0F, 0.0F );
|
||||||
GL11.glScalef( 16F, 16F, 10F );
|
* GL11.glEnable( GL11.GL_ALPHA_TEST );
|
||||||
GL11.glTranslatef( 0.0F, 1.0F, 0.0F );
|
* tessellator.startDrawingQuads();
|
||||||
GL11.glRotatef( 180F, 1.0F, 0.0F, 0.0F );
|
* tessellator.setNormal( 0.0F, 1.0F, 0.0F );
|
||||||
GL11.glEnable( GL11.GL_ALPHA_TEST );
|
* tessellator.addVertexWithUV( 0, 0, 0, f4, f7 );
|
||||||
|
* tessellator.addVertexWithUV( 1, 0, 0, f5, f7 );
|
||||||
tessellator.startDrawingQuads();
|
* tessellator.addVertexWithUV( 1, 1, 0, f5, f6 );
|
||||||
tessellator.setNormal( 0.0F, 1.0F, 0.0F );
|
* tessellator.addVertexWithUV( 0, 1, 0, f4, f6 );
|
||||||
tessellator.addVertexWithUV( 0, 0, 0, f4, f7 );
|
* tessellator.draw();
|
||||||
tessellator.addVertexWithUV( 1, 0, 0, f5, f7 );
|
* }
|
||||||
tessellator.addVertexWithUV( 1, 1, 0, f5, f6 );
|
* else
|
||||||
tessellator.addVertexWithUV( 0, 1, 0, f4, f6 );
|
* {
|
||||||
tessellator.draw();
|
* if( type == ItemRenderType.EQUIPPED_FIRST_PERSON )
|
||||||
}
|
* {
|
||||||
else
|
* GL11.glTranslatef( 0.0F, 0.0F, 0.0F );
|
||||||
{
|
* }
|
||||||
if( type == ItemRenderType.EQUIPPED_FIRST_PERSON )
|
* else if( type == ItemRenderType.EQUIPPED )
|
||||||
{
|
* {
|
||||||
GL11.glTranslatef( 0.0F, 0.0F, 0.0F );
|
* GL11.glTranslatef( 0.0F, 0.0F, 0.0F );
|
||||||
}
|
* }
|
||||||
else if( type == ItemRenderType.EQUIPPED )
|
* else
|
||||||
{
|
* {
|
||||||
GL11.glTranslatef( 0.0F, 0.0F, 0.0F );
|
* GL11.glTranslatef( -0.5F, -0.3F, 0.01F );
|
||||||
}
|
* }
|
||||||
else
|
* ItemRenderer.renderItemIn2D( tessellator, f5, f6, f4, f7, par2Icon.getIconWidth(), par2Icon.getIconHeight(),
|
||||||
{
|
* f12 );
|
||||||
GL11.glTranslatef( -0.5F, -0.3F, 0.01F );
|
* GL11.glDisable( GL11.GL_CULL_FACE );
|
||||||
}
|
* GL11.glColor4f( 1, 1, 1, 1.0F );
|
||||||
ItemRenderer.renderItemIn2D( tessellator, f5, f6, f4, f7, par2Icon.getIconWidth(), par2Icon.getIconHeight(), f12 );
|
* GL11.glScalef( -1F, -1F, 1F );
|
||||||
|
* GL11.glTranslatef( -1.125F, 0.0f, f12 / -2.0f );
|
||||||
GL11.glDisable( GL11.GL_CULL_FACE );
|
* GL11.glRotatef( 180F, 1.0F, 0.0F, 0.0F );
|
||||||
GL11.glColor4f( 1, 1, 1, 1.0F );
|
* }
|
||||||
GL11.glScalef( -1F, -1F, 1F );
|
* TextureAtlasSprite dark = ExtraItemTextures.ToolColorApplicatorTip_Dark.getIcon();
|
||||||
GL11.glTranslatef( -1.125F, 0.0f, f12 / -2.0f );
|
* TextureAtlasSprite med = ExtraItemTextures.ToolColorApplicatorTip_Medium.getIcon();
|
||||||
GL11.glRotatef( 180F, 1.0F, 0.0F, 0.0F );
|
* TextureAtlasSprite light = ExtraItemTextures.ToolColorApplicatorTip_Light.getIcon();
|
||||||
}
|
* GL11.glScalef( 1F / 16F, 1F / 16F, 1F );
|
||||||
|
* if( type != ItemRenderType.INVENTORY )
|
||||||
TextureAtlasSprite dark = ExtraItemTextures.ToolColorApplicatorTip_Dark.getIcon();
|
* {
|
||||||
TextureAtlasSprite med = ExtraItemTextures.ToolColorApplicatorTip_Medium.getIcon();
|
* GL11.glTranslatef( 2, 0, 0 );
|
||||||
TextureAtlasSprite light = ExtraItemTextures.ToolColorApplicatorTip_Light.getIcon();
|
* }
|
||||||
|
* GL11.glDisable( GL11.GL_LIGHTING );
|
||||||
GL11.glScalef( 1F / 16F, 1F / 16F, 1F );
|
* AEColor col = null;
|
||||||
if( type != ItemRenderType.INVENTORY )
|
* col = ( (ToolColorApplicator) item.getItem() ).getActiveColor( item );
|
||||||
{
|
* if( col != null )
|
||||||
GL11.glTranslatef( 2, 0, 0 );
|
* {
|
||||||
}
|
* tessellator.startDrawingQuads();
|
||||||
GL11.glDisable( GL11.GL_LIGHTING );
|
* f4 = dark.getMinU();
|
||||||
|
* f5 = dark.getMaxU();
|
||||||
AEColor col = null;
|
* f6 = dark.getMinV();
|
||||||
|
* f7 = dark.getMaxV();
|
||||||
col = ( (ToolColorApplicator) item.getItem() ).getActiveColor( item );
|
* tessellator.setColorOpaque_I( col.blackVariant );
|
||||||
|
* tessellator.addVertexWithUV( 0, 0, 0, f4, f7 );
|
||||||
if( col != null )
|
* tessellator.addVertexWithUV( 16, 0, 0, f5, f7 );
|
||||||
{
|
* tessellator.addVertexWithUV( 16, 16, 0, f5, f6 );
|
||||||
tessellator.startDrawingQuads();
|
* tessellator.addVertexWithUV( 0, 16, 0, f4, f6 );
|
||||||
|
* f4 = light.getMinU();
|
||||||
f4 = dark.getMinU();
|
* f5 = light.getMaxU();
|
||||||
f5 = dark.getMaxU();
|
* f6 = light.getMinV();
|
||||||
f6 = dark.getMinV();
|
* f7 = light.getMaxV();
|
||||||
f7 = dark.getMaxV();
|
* tessellator.setColorOpaque_I( col.whiteVariant );
|
||||||
|
* tessellator.addVertexWithUV( 0, 0, 0, f4, f7 );
|
||||||
tessellator.setColorOpaque_I( col.blackVariant );
|
* tessellator.addVertexWithUV( 16, 0, 0, f5, f7 );
|
||||||
tessellator.addVertexWithUV( 0, 0, 0, f4, f7 );
|
* tessellator.addVertexWithUV( 16, 16, 0, f5, f6 );
|
||||||
tessellator.addVertexWithUV( 16, 0, 0, f5, f7 );
|
* tessellator.addVertexWithUV( 0, 16, 0, f4, f6 );
|
||||||
tessellator.addVertexWithUV( 16, 16, 0, f5, f6 );
|
* f4 = med.getMinU();
|
||||||
tessellator.addVertexWithUV( 0, 16, 0, f4, f6 );
|
* f5 = med.getMaxU();
|
||||||
|
* f6 = med.getMinV();
|
||||||
f4 = light.getMinU();
|
* f7 = med.getMaxV();
|
||||||
f5 = light.getMaxU();
|
* tessellator.setColorOpaque_I( col.mediumVariant );
|
||||||
f6 = light.getMinV();
|
* tessellator.addVertexWithUV( 0, 0, 0, f4, f7 );
|
||||||
f7 = light.getMaxV();
|
* tessellator.addVertexWithUV( 16, 0, 0, f5, f7 );
|
||||||
|
* tessellator.addVertexWithUV( 16, 16, 0, f5, f6 );
|
||||||
tessellator.setColorOpaque_I( col.whiteVariant );
|
* tessellator.addVertexWithUV( 0, 16, 0, f4, f6 );
|
||||||
tessellator.addVertexWithUV( 0, 0, 0, f4, f7 );
|
* tessellator.draw();
|
||||||
tessellator.addVertexWithUV( 16, 0, 0, f5, f7 );
|
* }
|
||||||
tessellator.addVertexWithUV( 16, 16, 0, f5, f6 );
|
* GL11.glPopAttrib();
|
||||||
tessellator.addVertexWithUV( 0, 16, 0, f4, f6 );
|
* GL11.glPopMatrix();
|
||||||
|
|
||||||
f4 = med.getMinU();
|
|
||||||
f5 = med.getMaxU();
|
|
||||||
f6 = med.getMinV();
|
|
||||||
f7 = med.getMaxV();
|
|
||||||
|
|
||||||
tessellator.setColorOpaque_I( col.mediumVariant );
|
|
||||||
tessellator.addVertexWithUV( 0, 0, 0, f4, f7 );
|
|
||||||
tessellator.addVertexWithUV( 16, 0, 0, f5, f7 );
|
|
||||||
tessellator.addVertexWithUV( 16, 16, 0, f5, f6 );
|
|
||||||
tessellator.addVertexWithUV( 0, 16, 0, f4, f6 );
|
|
||||||
|
|
||||||
tessellator.draw();
|
|
||||||
}
|
|
||||||
|
|
||||||
GL11.glPopAttrib();
|
|
||||||
GL11.glPopMatrix();
|
|
||||||
*/
|
*/
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,7 +1,10 @@
|
|||||||
|
|
||||||
package appeng.client.texture;
|
package appeng.client.texture;
|
||||||
|
|
||||||
|
|
||||||
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
||||||
|
|
||||||
|
|
||||||
public class BaseIcon implements IAESprite
|
public class BaseIcon implements IAESprite
|
||||||
{
|
{
|
||||||
private final TextureAtlasSprite spite;
|
private final TextureAtlasSprite spite;
|
||||||
|
|||||||
@@ -1,7 +1,10 @@
|
|||||||
|
|
||||||
package appeng.client.texture;
|
package appeng.client.texture;
|
||||||
|
|
||||||
|
|
||||||
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
||||||
|
|
||||||
|
|
||||||
public interface IAESprite
|
public interface IAESprite
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|||||||
@@ -42,8 +42,7 @@ public class MissingIcon implements IAESprite
|
|||||||
}
|
}
|
||||||
|
|
||||||
@SideOnly( Side.CLIENT )
|
@SideOnly( Side.CLIENT )
|
||||||
public
|
public static TextureAtlasSprite getMissing()
|
||||||
static TextureAtlasSprite getMissing()
|
|
||||||
{
|
{
|
||||||
return ( (TextureMap) Minecraft.getMinecraft().getTextureManager().getTexture( TextureMap.locationBlocksTexture ) ).getAtlasSprite( "missingno" );
|
return ( (TextureMap) Minecraft.getMinecraft().getTextureManager().getTexture( TextureMap.locationBlocksTexture ) ).getAtlasSprite( "missingno" );
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -21,8 +21,8 @@ package appeng.container.slot;
|
|||||||
|
|
||||||
import net.minecraft.inventory.IInventory;
|
import net.minecraft.inventory.IInventory;
|
||||||
|
|
||||||
// there is nothing special about this slot, its simply used to represent the players inventory, vs a container slot.
|
|
||||||
|
|
||||||
|
// there is nothing special about this slot, its simply used to represent the players inventory, vs a container slot.
|
||||||
|
|
||||||
public class SlotPlayerInv extends AppEngSlot
|
public class SlotPlayerInv extends AppEngSlot
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -144,7 +144,8 @@ public class SlotRestrictedInput extends AppEngSlot
|
|||||||
{
|
{
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
// ICraftingPatternDetails pattern = i.getItem() instanceof ICraftingPatternItem ? ((ICraftingPatternItem)
|
// ICraftingPatternDetails pattern = i.getItem() instanceof ICraftingPatternItem ?
|
||||||
|
// ((ICraftingPatternItem)
|
||||||
// i.getItem()).getPatternForItem( i ) : null;
|
// i.getItem()).getPatternForItem( i ) : null;
|
||||||
return false;// pattern != null;
|
return false;// pattern != null;
|
||||||
}
|
}
|
||||||
@@ -178,8 +179,8 @@ public class SlotRestrictedInput extends AppEngSlot
|
|||||||
|
|
||||||
case INSCRIBER_INPUT:
|
case INSCRIBER_INPUT:
|
||||||
return true;/*
|
return true;/*
|
||||||
* for (ItemStack is : Inscribe.inputs) if ( Platform.isSameItemPrecise( is, i ) ) return true;
|
* for (ItemStack is : Inscribe.inputs) if ( Platform.isSameItemPrecise( is, i ) ) return
|
||||||
*
|
* true;
|
||||||
* return false;
|
* return false;
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|||||||
@@ -70,7 +70,8 @@ public class IMCHandler
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Tries to find every message matching the internal IMC keys. When found the corresponding handler will process the attached message.
|
* Tries to find every message matching the internal IMC keys. When found the corresponding handler will process the
|
||||||
|
* attached message.
|
||||||
*
|
*
|
||||||
* @param event Event carrying the identifier and message for the handlers
|
* @param event Event carrying the identifier and message for the handlers
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -144,14 +144,14 @@ public final class ApiBlocks implements IBlocks
|
|||||||
private final IBlockDefinition chiseledQuartzStair;
|
private final IBlockDefinition chiseledQuartzStair;
|
||||||
private final IBlockDefinition quartzPillarStair;
|
private final IBlockDefinition quartzPillarStair;
|
||||||
/*
|
/*
|
||||||
private final IBlockDefinition skyStoneSlab;
|
* private final IBlockDefinition skyStoneSlab;
|
||||||
private final IBlockDefinition skyStoneBlockSlab;
|
* private final IBlockDefinition skyStoneBlockSlab;
|
||||||
private final IBlockDefinition skyStoneBrickSlab;
|
* private final IBlockDefinition skyStoneBrickSlab;
|
||||||
private final IBlockDefinition skyStoneSmallBrickSlab;
|
* private final IBlockDefinition skyStoneSmallBrickSlab;
|
||||||
private final IBlockDefinition fluixSlab;
|
* private final IBlockDefinition fluixSlab;
|
||||||
private final IBlockDefinition quartzSlab;
|
* private final IBlockDefinition quartzSlab;
|
||||||
private final IBlockDefinition chiseledQuartzSlab;
|
* private final IBlockDefinition chiseledQuartzSlab;
|
||||||
private final IBlockDefinition quartzPillarSlab;
|
* private final IBlockDefinition quartzPillarSlab;
|
||||||
*/
|
*/
|
||||||
|
|
||||||
private final IBlockDefinition itemGen;
|
private final IBlockDefinition itemGen;
|
||||||
@@ -226,14 +226,22 @@ public final class ApiBlocks implements IBlocks
|
|||||||
|
|
||||||
// TODO Re-Add Slabs...
|
// TODO Re-Add Slabs...
|
||||||
/*
|
/*
|
||||||
this.skyStoneSlab = constructor.registerBlockDefinition( new AEBaseSlabBlock( skyStone_stone, EnumSet.of(AEFeature.DecorativeQuartzBlocks), false, "SkyStoneSlabBlock" ) );
|
* this.skyStoneSlab = constructor.registerBlockDefinition( new AEBaseSlabBlock( skyStone_stone,
|
||||||
this.skyStoneBlockSlab = constructor.registerBlockDefinition( new AEBaseSlabBlock( skyStone_block, EnumSet.of(AEFeature.DecorativeQuartzBlocks), false, "SkyStoneBlockSlabBlock" ) );
|
* EnumSet.of(AEFeature.DecorativeQuartzBlocks), false, "SkyStoneSlabBlock" ) );
|
||||||
this.skyStoneBrickSlab = constructor.registerBlockDefinition( new AEBaseSlabBlock( skyStone_brick, EnumSet.of(AEFeature.DecorativeQuartzBlocks), false, "SkyStoneBrickSlabBlock" ) );
|
* this.skyStoneBlockSlab = constructor.registerBlockDefinition( new AEBaseSlabBlock( skyStone_block,
|
||||||
this.skyStoneSmallBrickSlab = constructor.registerBlockDefinition( new AEBaseSlabBlock( skyStone_smallbrick, EnumSet.of(AEFeature.DecorativeQuartzBlocks), false, "SkyStoneSmallBrickSlabBlock" ) );
|
* EnumSet.of(AEFeature.DecorativeQuartzBlocks), false, "SkyStoneBlockSlabBlock" ) );
|
||||||
this.fluixSlab = constructor.registerBlockDefinition( new AEBaseSlabBlock( fluixBlock, EnumSet.of(AEFeature.DecorativeQuartzBlocks), false, "FluixSlabBlock" ) );
|
* this.skyStoneBrickSlab = constructor.registerBlockDefinition( new AEBaseSlabBlock( skyStone_brick,
|
||||||
this.quartzSlab = constructor.registerBlockDefinition( new AEBaseSlabBlock( quartzBlock, EnumSet.of(AEFeature.DecorativeQuartzBlocks), false, "QuartzSlabBlock" ) );
|
* EnumSet.of(AEFeature.DecorativeQuartzBlocks), false, "SkyStoneBrickSlabBlock" ) );
|
||||||
this.chiseledQuartzSlab = constructor.registerBlockDefinition( new AEBaseSlabBlock( chiseledQuartz, EnumSet.of(AEFeature.DecorativeQuartzBlocks), false, "ChiseledQuartzSlabBlock" ) );;
|
* this.skyStoneSmallBrickSlab = constructor.registerBlockDefinition( new AEBaseSlabBlock( skyStone_smallbrick,
|
||||||
this.quartzPillarSlab = constructor.registerBlockDefinition( new AEBaseSlabBlock( quartzPillar, EnumSet.of(AEFeature.DecorativeQuartzBlocks), false, "QuartzPillarSlabBlock" ) )
|
* EnumSet.of(AEFeature.DecorativeQuartzBlocks), false, "SkyStoneSmallBrickSlabBlock" ) );
|
||||||
|
* this.fluixSlab = constructor.registerBlockDefinition( new AEBaseSlabBlock( fluixBlock,
|
||||||
|
* EnumSet.of(AEFeature.DecorativeQuartzBlocks), false, "FluixSlabBlock" ) );
|
||||||
|
* this.quartzSlab = constructor.registerBlockDefinition( new AEBaseSlabBlock( quartzBlock,
|
||||||
|
* EnumSet.of(AEFeature.DecorativeQuartzBlocks), false, "QuartzSlabBlock" ) );
|
||||||
|
* this.chiseledQuartzSlab = constructor.registerBlockDefinition( new AEBaseSlabBlock( chiseledQuartz,
|
||||||
|
* EnumSet.of(AEFeature.DecorativeQuartzBlocks), false, "ChiseledQuartzSlabBlock" ) );;
|
||||||
|
* this.quartzPillarSlab = constructor.registerBlockDefinition( new AEBaseSlabBlock( quartzPillar,
|
||||||
|
* EnumSet.of(AEFeature.DecorativeQuartzBlocks), false, "QuartzPillarSlabBlock" ) )
|
||||||
*/
|
*/
|
||||||
|
|
||||||
this.itemGen = constructor.registerBlockDefinition( new BlockItemGen() );
|
this.itemGen = constructor.registerBlockDefinition( new BlockItemGen() );
|
||||||
@@ -403,53 +411,46 @@ public final class ApiBlocks implements IBlocks
|
|||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@Override
|
* @Override
|
||||||
public IBlockDefinition skyStoneSlab()
|
* public IBlockDefinition skyStoneSlab()
|
||||||
{
|
* {
|
||||||
return this.skyStoneSlab;
|
* return this.skyStoneSlab;
|
||||||
}
|
* }
|
||||||
|
* @Override
|
||||||
@Override
|
* public IBlockDefinition skyStoneBlockSlab()
|
||||||
public IBlockDefinition skyStoneBlockSlab()
|
* {
|
||||||
{
|
* return this.skyStoneBlockSlab;
|
||||||
return this.skyStoneBlockSlab;
|
* }
|
||||||
}
|
* @Override
|
||||||
|
* public IBlockDefinition skyStoneBrickSlab()
|
||||||
@Override
|
* {
|
||||||
public IBlockDefinition skyStoneBrickSlab()
|
* return this.skyStoneBrickSlab;
|
||||||
{
|
* }
|
||||||
return this.skyStoneBrickSlab;
|
* @Override
|
||||||
}
|
* public IBlockDefinition skyStoneSmallBrickSlab()
|
||||||
|
* {
|
||||||
@Override
|
* return this.skyStoneSmallBrickSlab;
|
||||||
public IBlockDefinition skyStoneSmallBrickSlab()
|
* }
|
||||||
{
|
* @Override
|
||||||
return this.skyStoneSmallBrickSlab;
|
* public IBlockDefinition fluixSlab()
|
||||||
}
|
* {
|
||||||
|
* return this.fluixSlab;
|
||||||
@Override
|
* }
|
||||||
public IBlockDefinition fluixSlab()
|
* @Override
|
||||||
{
|
* public IBlockDefinition quartzSlab()
|
||||||
return this.fluixSlab;
|
* {
|
||||||
}
|
* return this.quartzSlab;
|
||||||
|
* }
|
||||||
@Override
|
* @Override
|
||||||
public IBlockDefinition quartzSlab()
|
* public IBlockDefinition chiseledQuartzSlab()
|
||||||
{
|
* {
|
||||||
return this.quartzSlab;
|
* return this.chiseledQuartzSlab;
|
||||||
}
|
* }
|
||||||
|
* @Override
|
||||||
@Override
|
* public IBlockDefinition quartzPillarSlab()
|
||||||
public IBlockDefinition chiseledQuartzSlab()
|
* {
|
||||||
{
|
* return this.quartzPillarSlab;
|
||||||
return this.chiseledQuartzSlab;
|
* }
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public IBlockDefinition quartzPillarSlab()
|
|
||||||
{
|
|
||||||
return this.quartzPillarSlab;
|
|
||||||
}
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -126,7 +126,6 @@ public final class ApiMaterials implements IMaterials
|
|||||||
this.logicProcessorPrint = new DamagedItemDefinition( "material.print.processor.logic", materials.createMaterial( MaterialType.LogicProcessorPrint ) );
|
this.logicProcessorPrint = new DamagedItemDefinition( "material.print.processor.logic", materials.createMaterial( MaterialType.LogicProcessorPrint ) );
|
||||||
this.siliconPrint = new DamagedItemDefinition( "material.print.silicon", materials.createMaterial( MaterialType.SiliconPrint ) );
|
this.siliconPrint = new DamagedItemDefinition( "material.print.silicon", materials.createMaterial( MaterialType.SiliconPrint ) );
|
||||||
|
|
||||||
|
|
||||||
this.logicProcessor = new DamagedItemDefinition( "material.processor.logic", materials.createMaterial( MaterialType.LogicProcessor ) );
|
this.logicProcessor = new DamagedItemDefinition( "material.processor.logic", materials.createMaterial( MaterialType.LogicProcessor ) );
|
||||||
this.calcProcessor = new DamagedItemDefinition( "material.processor.calculation", materials.createMaterial( MaterialType.CalcProcessor ) );
|
this.calcProcessor = new DamagedItemDefinition( "material.processor.calculation", materials.createMaterial( MaterialType.CalcProcessor ) );
|
||||||
this.engProcessor = new DamagedItemDefinition( "material.processor.engineering", materials.createMaterial( MaterialType.EngProcessor ) );
|
this.engProcessor = new DamagedItemDefinition( "material.processor.engineering", materials.createMaterial( MaterialType.EngProcessor ) );
|
||||||
|
|||||||
@@ -104,8 +104,10 @@ public final class ApiParts implements IParts
|
|||||||
// this.p2PTunnelEU = new DamagedItemDefinition( itemMultiPart.createPart( PartType.P2PTunnelEU ) );
|
// this.p2PTunnelEU = new DamagedItemDefinition( itemMultiPart.createPart( PartType.P2PTunnelEU ) );
|
||||||
// this.p2PTunnelRF = new DamagedItemDefinition( itemMultiPart.createPart( PartType.P2PTunnelRF ) );
|
// this.p2PTunnelRF = new DamagedItemDefinition( itemMultiPart.createPart( PartType.P2PTunnelRF ) );
|
||||||
this.p2PTunnelLight = new DamagedItemDefinition( "part.tunnel.light", itemMultiPart.createPart( PartType.P2PTunnelLight ) );
|
this.p2PTunnelLight = new DamagedItemDefinition( "part.tunnel.light", itemMultiPart.createPart( PartType.P2PTunnelLight ) );
|
||||||
//this.p2PTunnelOpenComputers = new DamagedItemDefinition( itemMultiPart.createPart( PartType.P2PTunnelOpenComputers ) );
|
// this.p2PTunnelOpenComputers = new DamagedItemDefinition( itemMultiPart.createPart(
|
||||||
// this.p2PTunnelPneumaticCraft = new DamagedItemDefinition( itemMultiPart.createPart( PartType.P2PTunnelPressure ) );
|
// PartType.P2PTunnelOpenComputers ) );
|
||||||
|
// this.p2PTunnelPneumaticCraft = new DamagedItemDefinition( itemMultiPart.createPart(
|
||||||
|
// PartType.P2PTunnelPressure ) );
|
||||||
this.cableAnchor = new DamagedItemDefinition( "part.cable_anchor", itemMultiPart.createPart( PartType.CableAnchor ) );
|
this.cableAnchor = new DamagedItemDefinition( "part.cable_anchor", itemMultiPart.createPart( PartType.CableAnchor ) );
|
||||||
this.monitor = new DamagedItemDefinition( "part.monitor", itemMultiPart.createPart( PartType.Monitor ) );
|
this.monitor = new DamagedItemDefinition( "part.monitor", itemMultiPart.createPart( PartType.Monitor ) );
|
||||||
this.semiDarkMonitor = new DamagedItemDefinition( "part.monitor.semi_dark", itemMultiPart.createPart( PartType.SemiDarkMonitor ) );
|
this.semiDarkMonitor = new DamagedItemDefinition( "part.monitor.semi_dark", itemMultiPart.createPart( PartType.SemiDarkMonitor ) );
|
||||||
@@ -261,17 +263,16 @@ public final class ApiParts implements IParts
|
|||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@Override
|
* @Override
|
||||||
public IItemDefinition p2PTunnelEU()
|
* public IItemDefinition p2PTunnelEU()
|
||||||
{
|
* {
|
||||||
return this.p2PTunnelEU;
|
* return this.p2PTunnelEU;
|
||||||
}
|
* }
|
||||||
|
* @Override
|
||||||
@Override
|
* public IItemDefinition p2PTunnelRF()
|
||||||
public IItemDefinition p2PTunnelRF()
|
* {
|
||||||
{
|
* return this.p2PTunnelRF;
|
||||||
return this.p2PTunnelRF;
|
* }
|
||||||
}
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -281,17 +282,16 @@ public final class ApiParts implements IParts
|
|||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@Override
|
* @Override
|
||||||
public IItemDefinition p2PTunnelOpenComputers()
|
* public IItemDefinition p2PTunnelOpenComputers()
|
||||||
{
|
* {
|
||||||
return this.p2PTunnelOpenComputers;
|
* return this.p2PTunnelOpenComputers;
|
||||||
}
|
* }
|
||||||
|
* @Override
|
||||||
@Override
|
* public IItemDefinition p2PTunnelPneumaticCraft()
|
||||||
public IItemDefinition p2PTunnelPneumaticCraft()
|
* {
|
||||||
{
|
* return this.p2PTunnelPneumaticCraft;
|
||||||
return this.p2PTunnelPneumaticCraft;
|
* }
|
||||||
}
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
|
||||||
package appeng.core.crash;
|
package appeng.core.crash;
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
|
||||||
package appeng.core.crash;
|
package appeng.core.crash;
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
|
||||||
package appeng.core.features.registries.entries;
|
package appeng.core.features.registries.entries;
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
|
||||||
package appeng.core.features.registries.entries;
|
package appeng.core.features.registries.entries;
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -33,14 +33,17 @@ public class PlayerDifferentiator
|
|||||||
{
|
{
|
||||||
/**
|
/**
|
||||||
* Can determine if an {@link net.minecraft.entity.player.EntityPlayer} is not a real player.
|
* Can determine if an {@link net.minecraft.entity.player.EntityPlayer} is not a real player.
|
||||||
* This is based on if the {@param player} is:
|
* This is based on if the
|
||||||
|
*
|
||||||
|
* @param player is:
|
||||||
* - null
|
* - null
|
||||||
* - dead
|
* - dead
|
||||||
* - fake
|
* - fake
|
||||||
*
|
*
|
||||||
* @param player to be checked player
|
* @param player to be checked player
|
||||||
*
|
*
|
||||||
* @return true if {@param player} is not a real player
|
* @return true if
|
||||||
|
* @param player is not a real player
|
||||||
*/
|
*/
|
||||||
boolean isNoPlayer( final EntityPlayer player )
|
boolean isNoPlayer( final EntityPlayer player )
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -36,20 +36,25 @@ import appeng.core.features.AEFeature;
|
|||||||
public class PlayerStatsRegistration
|
public class PlayerStatsRegistration
|
||||||
{
|
{
|
||||||
/**
|
/**
|
||||||
* {@link net.minecraftforge.fml.common.eventhandler.EventBus} to which the handlers might get posted to depending if the feature is enabled
|
* {@link net.minecraftforge.fml.common.eventhandler.EventBus} to which the handlers might get posted to depending
|
||||||
|
* if the feature is enabled
|
||||||
*/
|
*/
|
||||||
private final EventBus bus;
|
private final EventBus bus;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* is true if the {@link appeng.core.features.AEFeature#Achievements} is enabled in the {@param config}
|
* is true if the {@link appeng.core.features.AEFeature#Achievements} is enabled in the
|
||||||
|
*
|
||||||
|
* @param config}
|
||||||
*/
|
*/
|
||||||
private final boolean isAchievementFeatureEnabled;
|
private final boolean isAchievementFeatureEnabled;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Constructs this with an {@link net.minecraftforge.fml.common.eventhandler.EventBus} and {@link appeng.core.AEConfig}.
|
* Constructs this with an {@link net.minecraftforge.fml.common.eventhandler.EventBus} and
|
||||||
|
* {@link appeng.core.AEConfig}.
|
||||||
*
|
*
|
||||||
* @param bus {@see #bus}
|
* @param bus {@see #bus}
|
||||||
* @param config {@link appeng.core.AEConfig} which is used to determine if the {@link appeng.core.features.AEFeature#Achievements} is enabled
|
* @param config {@link appeng.core.AEConfig} which is used to determine if the
|
||||||
|
* {@link appeng.core.features.AEFeature#Achievements} is enabled
|
||||||
*/
|
*/
|
||||||
public PlayerStatsRegistration( final EventBus bus, final AEConfig config )
|
public PlayerStatsRegistration( final EventBus bus, final AEConfig config )
|
||||||
{
|
{
|
||||||
@@ -58,7 +63,9 @@ public class PlayerStatsRegistration
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Registers the {@link appeng.core.stats.AchievementCraftingHandler} and {@link appeng.core.stats.AchievementPickupHandler} to the {@link #bus} if {@link #isAchievementFeatureEnabled} is true.
|
* Registers the {@link appeng.core.stats.AchievementCraftingHandler} and
|
||||||
|
* {@link appeng.core.stats.AchievementPickupHandler} to the {@link #bus} if {@link #isAchievementFeatureEnabled} is
|
||||||
|
* true.
|
||||||
*/
|
*/
|
||||||
public void registerAchievementHandlers()
|
public void registerAchievementHandlers()
|
||||||
{
|
{
|
||||||
@@ -74,7 +81,8 @@ public class PlayerStatsRegistration
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Registers the {@link appeng.core.stats.AchievementHierarchy} and adds all {@link appeng.core.stats.Achievements} to a new {@link net.minecraftforge.common.AchievementPage}.
|
* Registers the {@link appeng.core.stats.AchievementHierarchy} and adds all {@link appeng.core.stats.Achievements}
|
||||||
|
* to a new {@link net.minecraftforge.common.AchievementPage}.
|
||||||
*/
|
*/
|
||||||
public void registerAchievements()
|
public void registerAchievements()
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -56,7 +56,6 @@ public class AppEngPacketHandlerBase
|
|||||||
{
|
{
|
||||||
private static final Map<Class<? extends AppEngPacket>, PacketTypes> REVERSE_LOOKUP = new HashMap<Class<? extends AppEngPacket>, AppEngPacketHandlerBase.PacketTypes>();
|
private static final Map<Class<? extends AppEngPacket>, PacketTypes> REVERSE_LOOKUP = new HashMap<Class<? extends AppEngPacket>, AppEngPacketHandlerBase.PacketTypes>();
|
||||||
|
|
||||||
|
|
||||||
public enum PacketTypes
|
public enum PacketTypes
|
||||||
{
|
{
|
||||||
PACKET_COMPASS_REQUEST( PacketCompassRequest.class ),
|
PACKET_COMPASS_REQUEST( PacketCompassRequest.class ),
|
||||||
|
|||||||
@@ -1,9 +1,10 @@
|
|||||||
|
|
||||||
package appeng.core.sync;
|
package appeng.core.sync;
|
||||||
|
|
||||||
|
|
||||||
public abstract class PacketCallState
|
public abstract class PacketCallState
|
||||||
{
|
{
|
||||||
|
|
||||||
public abstract void call( AppEngPacket appEngPacket );
|
public abstract void call( AppEngPacket appEngPacket );
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -34,6 +34,7 @@ import net.minecraftforge.fml.common.network.NetworkRegistry;
|
|||||||
import appeng.core.sync.AppEngPacket;
|
import appeng.core.sync.AppEngPacket;
|
||||||
import appeng.core.worlddata.WorldData;
|
import appeng.core.worlddata.WorldData;
|
||||||
|
|
||||||
|
|
||||||
public class NetworkHandler
|
public class NetworkHandler
|
||||||
{
|
{
|
||||||
public static NetworkHandler instance;
|
public static NetworkHandler instance;
|
||||||
|
|||||||
@@ -68,7 +68,8 @@ public class MeteorDataNameEncoder
|
|||||||
* @param chunkX X coordinate of the chunk. Can be any integer
|
* @param chunkX X coordinate of the chunk. Can be any integer
|
||||||
* @param chunkZ Z coordinate of the chunk. Can be any integer
|
* @param chunkZ Z coordinate of the chunk. Can be any integer
|
||||||
*
|
*
|
||||||
* @return encoded file name suggestion in form of <tt>dim_x_y.dat</tt> where <tt>x</tt> and <tt>y</tt> will be shifted to stay conform with the vanilla chunk system
|
* @return encoded file name suggestion in form of <tt>dim_x_y.dat</tt> where <tt>x</tt> and <tt>y</tt> will be
|
||||||
|
* shifted to stay conform with the vanilla chunk system
|
||||||
*
|
*
|
||||||
* @since rv3 05.06.2015
|
* @since rv3 05.06.2015
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -57,7 +57,8 @@ final class SpawnData implements IWorldSpawnData
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void setGenerated( final int dim, final int chunkX, final int chunkZ ) {
|
public void setGenerated( final int dim, final int chunkX, final int chunkZ )
|
||||||
|
{
|
||||||
synchronized( SpawnData.class )
|
synchronized( SpawnData.class )
|
||||||
{
|
{
|
||||||
final NBTTagCompound data = this.loadSpawnData( dim, chunkX, chunkZ );
|
final NBTTagCompound data = this.loadSpawnData( dim, chunkX, chunkZ );
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
|
||||||
package appeng.decorative.solid;
|
package appeng.decorative.solid;
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
|
||||||
package appeng.decorative.solid;
|
package appeng.decorative.solid;
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
|
||||||
package appeng.decorative.stair;
|
package appeng.decorative.stair;
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
|
||||||
package appeng.decorative.stair;
|
package appeng.decorative.stair;
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
|
||||||
package appeng.decorative.stair;
|
package appeng.decorative.stair;
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
|
||||||
package appeng.decorative.stair;
|
package appeng.decorative.stair;
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
|
||||||
package appeng.decorative.stair;
|
package appeng.decorative.stair;
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
|
||||||
package appeng.decorative.stair;
|
package appeng.decorative.stair;
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -147,8 +147,7 @@ public class FacadeContainer implements IFacadeContainer
|
|||||||
|
|
||||||
this.storage.setFacade( x, created );
|
this.storage.setFacade( x, created );
|
||||||
}
|
}
|
||||||
else
|
else if( !isBC )
|
||||||
if( !isBC )
|
|
||||||
{
|
{
|
||||||
for( final Item facadeItem : AEApi.instance().definitions().items().facade().maybeItem().asSet() )
|
for( final Item facadeItem : AEApi.instance().definitions().items().facade().maybeItem().asSet() )
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -1269,7 +1269,6 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
private class InterfaceInventory extends MEMonitorIInventory
|
private class InterfaceInventory extends MEMonitorIInventory
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
|
||||||
package appeng.helpers;
|
package appeng.helpers;
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -18,97 +18,82 @@
|
|||||||
|
|
||||||
package appeng.hooks;
|
package appeng.hooks;
|
||||||
|
|
||||||
|
|
||||||
// TODO Villager Trading!??!?!
|
// TODO Villager Trading!??!?!
|
||||||
|
|
||||||
public class AETrading
|
public class AETrading
|
||||||
{
|
{
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@Override
|
* @Override
|
||||||
public void manipulateTradesForVillager( EntityVillager villager, MerchantRecipeList recipeList, Random random )
|
* public void manipulateTradesForVillager( EntityVillager villager, MerchantRecipeList recipeList, Random random )
|
||||||
{
|
* {
|
||||||
final IMaterials materials = AEApi.instance().definitions().materials();
|
* final IMaterials materials = AEApi.instance().definitions().materials();
|
||||||
|
* this.addMerchant( recipeList, materials.silicon(), 1, random, 2 );
|
||||||
this.addMerchant( recipeList, materials.silicon(), 1, random, 2 );
|
* this.addMerchant( recipeList, materials.certusQuartzCrystal(), 2, random, 4 );
|
||||||
this.addMerchant( recipeList, materials.certusQuartzCrystal(), 2, random, 4 );
|
* this.addMerchant( recipeList, materials.certusQuartzDust(), 1, random, 3 );
|
||||||
this.addMerchant( recipeList, materials.certusQuartzDust(), 1, random, 3 );
|
* this.addTrade( recipeList, materials.certusQuartzDust(), materials.certusQuartzCrystal(), random, 2 );
|
||||||
|
* }
|
||||||
this.addTrade( recipeList, materials.certusQuartzDust(), materials.certusQuartzCrystal(), random, 2 );
|
* private void addMerchant( MerchantRecipeList list, IItemDefinition item, int emera, Random rand, int greed )
|
||||||
}
|
* {
|
||||||
|
* for( ItemStack itemStack : item.maybeStack( 1 ).asSet() )
|
||||||
private void addMerchant( MerchantRecipeList list, IItemDefinition item, int emera, Random rand, int greed )
|
* {
|
||||||
{
|
* // Sell
|
||||||
for( ItemStack itemStack : item.maybeStack( 1 ).asSet() )
|
* ItemStack from = itemStack.copy();
|
||||||
{
|
* ItemStack to = new ItemStack( Items.emerald );
|
||||||
// Sell
|
* int multiplier = ( Math.abs( rand.nextInt() ) % 6 );
|
||||||
ItemStack from = itemStack.copy();
|
* final int emeraldCost = emera + ( Math.abs( rand.nextInt() ) % greed ) - multiplier;
|
||||||
ItemStack to = new ItemStack( Items.emerald );
|
* int mood = rand.nextInt() % 2;
|
||||||
|
* from.stackSize = multiplier + mood;
|
||||||
int multiplier = ( Math.abs( rand.nextInt() ) % 6 );
|
* to.stackSize = multiplier * emeraldCost - mood;
|
||||||
final int emeraldCost = emera + ( Math.abs( rand.nextInt() ) % greed ) - multiplier;
|
* if( to.stackSize < 0 )
|
||||||
int mood = rand.nextInt() % 2;
|
* {
|
||||||
|
* from.stackSize -= to.stackSize;
|
||||||
from.stackSize = multiplier + mood;
|
* to.stackSize -= to.stackSize;
|
||||||
to.stackSize = multiplier * emeraldCost - mood;
|
* }
|
||||||
|
* this.addToList( list, from, to );
|
||||||
if( to.stackSize < 0 )
|
* // Buy
|
||||||
{
|
* ItemStack reverseTo = from.copy();
|
||||||
from.stackSize -= to.stackSize;
|
* ItemStack reverseFrom = to.copy();
|
||||||
to.stackSize -= to.stackSize;
|
* reverseFrom.stackSize *= rand.nextFloat() * 3.0f + 1.0f;
|
||||||
}
|
* this.addToList( list, reverseFrom, reverseTo );
|
||||||
|
* }
|
||||||
this.addToList( list, from, to );
|
* }
|
||||||
|
* private void addTrade( MerchantRecipeList list, IItemDefinition inputDefinition, IItemDefinition
|
||||||
// Buy
|
* outputDefinition, Random rand, int conversionVariance )
|
||||||
ItemStack reverseTo = from.copy();
|
* {
|
||||||
ItemStack reverseFrom = to.copy();
|
* final Optional<ItemStack> maybeInputStack = inputDefinition.maybeStack( 1 );
|
||||||
|
* final Optional<ItemStack> maybeOutputStack = outputDefinition.maybeStack( 1 );
|
||||||
reverseFrom.stackSize *= rand.nextFloat() * 3.0f + 1.0f;
|
* if( maybeInputStack.isPresent() && maybeOutputStack.isPresent() )
|
||||||
|
* {
|
||||||
this.addToList( list, reverseFrom, reverseTo );
|
* // Sell
|
||||||
}
|
* ItemStack inputStack = maybeInputStack.get().copy();
|
||||||
}
|
* ItemStack outputStack = maybeOutputStack.get().copy();
|
||||||
|
* inputStack.stackSize = 1 + ( Math.abs( rand.nextInt() ) % ( 1 + conversionVariance ) );
|
||||||
private void addTrade( MerchantRecipeList list, IItemDefinition inputDefinition, IItemDefinition outputDefinition, Random rand, int conversionVariance )
|
* outputStack.stackSize = 1;
|
||||||
{
|
* this.addToList( list, inputStack, outputStack );
|
||||||
final Optional<ItemStack> maybeInputStack = inputDefinition.maybeStack( 1 );
|
* }
|
||||||
final Optional<ItemStack> maybeOutputStack = outputDefinition.maybeStack( 1 );
|
* }
|
||||||
|
* private void addToList( MerchantRecipeList l, ItemStack a, ItemStack b )
|
||||||
if( maybeInputStack.isPresent() && maybeOutputStack.isPresent() )
|
* {
|
||||||
{
|
* if( a.stackSize < 1 )
|
||||||
// Sell
|
* {
|
||||||
ItemStack inputStack = maybeInputStack.get().copy();
|
* a.stackSize = 1;
|
||||||
ItemStack outputStack = maybeOutputStack.get().copy();
|
* }
|
||||||
|
* if( b.stackSize < 1 )
|
||||||
inputStack.stackSize = 1 + ( Math.abs( rand.nextInt() ) % ( 1 + conversionVariance ) );
|
* {
|
||||||
outputStack.stackSize = 1;
|
* b.stackSize = 1;
|
||||||
|
* }
|
||||||
this.addToList( list, inputStack, outputStack );
|
* if( a.stackSize > a.getMaxStackSize() )
|
||||||
}
|
* {
|
||||||
}
|
* a.stackSize = a.getMaxStackSize();
|
||||||
|
* }
|
||||||
private void addToList( MerchantRecipeList l, ItemStack a, ItemStack b )
|
* if( b.stackSize > b.getMaxStackSize() )
|
||||||
{
|
* {
|
||||||
if( a.stackSize < 1 )
|
* b.stackSize = b.getMaxStackSize();
|
||||||
{
|
* }
|
||||||
a.stackSize = 1;
|
* l.add( new MerchantRecipe( a, b ) );
|
||||||
}
|
* }
|
||||||
if( b.stackSize < 1 )
|
|
||||||
{
|
|
||||||
b.stackSize = 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
if( a.stackSize > a.getMaxStackSize() )
|
|
||||||
{
|
|
||||||
a.stackSize = a.getMaxStackSize();
|
|
||||||
}
|
|
||||||
if( b.stackSize > b.getMaxStackSize() )
|
|
||||||
{
|
|
||||||
b.stackSize = b.getMaxStackSize();
|
|
||||||
}
|
|
||||||
|
|
||||||
l.add( new MerchantRecipe( a, b ) );
|
|
||||||
}
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -316,7 +316,6 @@ public class TickHandler
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public static class PlayerColor
|
public static class PlayerColor
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|||||||
@@ -30,7 +30,8 @@ import net.minecraft.util.BlockPos;
|
|||||||
/**
|
/**
|
||||||
* Contains wrench behaviour
|
* Contains wrench behaviour
|
||||||
*
|
*
|
||||||
* and registers the engines as P2P attunements for RF tunnels (since BC 7, they are part of BC Core) The attunement is currently not public anymore, because it
|
* and registers the engines as P2P attunements for RF tunnels (since BC 7, they are part of BC Core) The attunement is
|
||||||
|
* currently not public anymore, because it
|
||||||
* was only used internally
|
* was only used internally
|
||||||
*
|
*
|
||||||
* @author AlgorithmX2
|
* @author AlgorithmX2
|
||||||
|
|||||||
@@ -86,7 +86,8 @@ public interface IBuildCraftTransport
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* @return texture of buildcraft cobblestone structure pipe or null if something bad happens
|
* @return texture of buildcraft cobblestone structure pipe or null if something bad happens
|
||||||
// */
|
* //
|
||||||
|
*/
|
||||||
@Nullable
|
@Nullable
|
||||||
IAESprite getCobbleStructurePipeTexture();
|
IAESprite getCobbleStructurePipeTexture();
|
||||||
|
|
||||||
|
|||||||
@@ -55,7 +55,6 @@ public class ItemPaintBall extends AEBaseItem
|
|||||||
final ModelResourceLocation sloc = ir.setIcon( this, name + "Shimmer" );
|
final ModelResourceLocation sloc = ir.setIcon( this, name + "Shimmer" );
|
||||||
final ModelResourceLocation loc = ir.setIcon( this, name );
|
final ModelResourceLocation loc = ir.setIcon( this, name );
|
||||||
|
|
||||||
|
|
||||||
Minecraft.getMinecraft().getRenderItem().getItemModelMesher().register( this, new ItemMeshDefinition(){
|
Minecraft.getMinecraft().getRenderItem().getItemModelMesher().register( this, new ItemMeshDefinition(){
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -192,7 +192,6 @@ public final class ItemMultiPart extends AEBaseItem implements IPartItem, IItemG
|
|||||||
return "item.appliedenergistics2." + this.getName( is );
|
return "item.appliedenergistics2." + this.getName( is );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@SideOnly( Side.CLIENT )
|
@SideOnly( Side.CLIENT )
|
||||||
public void registerCustomIcon(
|
public void registerCustomIcon(
|
||||||
|
|||||||
@@ -148,15 +148,19 @@ public enum PartType
|
|||||||
|
|
||||||
P2PTunnelLiquids( 463, EnumSet.of( AEFeature.P2PTunnel, AEFeature.P2PTunnelLiquids ), EnumSet.noneOf( IntegrationType.class ), PartP2PLiquids.class, GuiText.FluidTunnel ),
|
P2PTunnelLiquids( 463, EnumSet.of( AEFeature.P2PTunnel, AEFeature.P2PTunnelLiquids ), EnumSet.noneOf( IntegrationType.class ), PartP2PLiquids.class, GuiText.FluidTunnel ),
|
||||||
|
|
||||||
//P2PTunnelEU( 465, EnumSet.of( AEFeature.P2PTunnel, AEFeature.P2PTunnelEU ), EnumSet.of( IntegrationType.IC2 ), PartP2PIC2Power.class, GuiText.EUTunnel ),
|
// P2PTunnelEU( 465, EnumSet.of( AEFeature.P2PTunnel, AEFeature.P2PTunnelEU ), EnumSet.of( IntegrationType.IC2 ),
|
||||||
|
// PartP2PIC2Power.class, GuiText.EUTunnel ),
|
||||||
|
|
||||||
//P2PTunnelRF( 466, EnumSet.of( AEFeature.P2PTunnel, AEFeature.P2PTunnelRF ), EnumSet.of( IntegrationType.RF ), PartP2PRFPower.class, GuiText.RFTunnel ),
|
// P2PTunnelRF( 466, EnumSet.of( AEFeature.P2PTunnel, AEFeature.P2PTunnelRF ), EnumSet.of( IntegrationType.RF ),
|
||||||
|
// PartP2PRFPower.class, GuiText.RFTunnel ),
|
||||||
|
|
||||||
P2PTunnelLight( 467, EnumSet.of( AEFeature.P2PTunnel, AEFeature.P2PTunnelLight ), EnumSet.noneOf( IntegrationType.class ), PartP2PLight.class, GuiText.LightTunnel ),
|
P2PTunnelLight( 467, EnumSet.of( AEFeature.P2PTunnel, AEFeature.P2PTunnelLight ), EnumSet.noneOf( IntegrationType.class ), PartP2PLight.class, GuiText.LightTunnel ),
|
||||||
|
|
||||||
// P2PTunnelOpenComputers( 468, EnumSet.of( AEFeature.P2PTunnel, AEFeature.P2PTunnelOpenComputers ), EnumSet.of( IntegrationType.OpenComputers ), PartP2POpenComputers.class, GuiText.OCTunnel ),
|
// P2PTunnelOpenComputers( 468, EnumSet.of( AEFeature.P2PTunnel, AEFeature.P2PTunnelOpenComputers ), EnumSet.of(
|
||||||
|
// IntegrationType.OpenComputers ), PartP2POpenComputers.class, GuiText.OCTunnel ),
|
||||||
|
|
||||||
// P2PTunnelPressure( 469, EnumSet.of( AEFeature.P2PTunnel, AEFeature.P2PTunnelPressure ), EnumSet.of( IntegrationType.PneumaticCraft ), PartP2PPressure.class, GuiText.PressureTunnel ),
|
// P2PTunnelPressure( 469, EnumSet.of( AEFeature.P2PTunnel, AEFeature.P2PTunnelPressure ), EnumSet.of(
|
||||||
|
// IntegrationType.PneumaticCraft ), PartP2PPressure.class, GuiText.PressureTunnel ),
|
||||||
|
|
||||||
InterfaceTerminal( 480, EnumSet.of( AEFeature.InterfaceTerminal ), EnumSet.noneOf( IntegrationType.class ), PartInterfaceTerminal.class );
|
InterfaceTerminal( 480, EnumSet.of( AEFeature.InterfaceTerminal ), EnumSet.noneOf( IntegrationType.class ), PartInterfaceTerminal.class );
|
||||||
|
|
||||||
|
|||||||
@@ -53,6 +53,7 @@ import appeng.util.Platform;
|
|||||||
|
|
||||||
import com.google.common.base.Optional;
|
import com.google.common.base.Optional;
|
||||||
|
|
||||||
|
|
||||||
// TODO BC Integration
|
// TODO BC Integration
|
||||||
//@Interface( iface = "buildcraft.api.tools.IToolWrench", iname = IntegrationType.BuildCraftCore )
|
//@Interface( iface = "buildcraft.api.tools.IToolWrench", iname = IntegrationType.BuildCraftCore )
|
||||||
public class ToolNetworkTool extends AEBaseItem implements IGuiItem, IAEWrench /* , IToolWrench */
|
public class ToolNetworkTool extends AEBaseItem implements IGuiItem, IAEWrench /* , IToolWrench */
|
||||||
|
|||||||
@@ -18,6 +18,7 @@
|
|||||||
|
|
||||||
package appeng.items.tools.powered.powersink;
|
package appeng.items.tools.powered.powersink;
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@Interface(iface = "universalelectricity.core.item.IItemElectric", modid = "IC2")
|
@Interface(iface = "universalelectricity.core.item.IItemElectric", modid = "IC2")
|
||||||
public class UniversalElectricity extends ThermalExpansion implements IItemElectric
|
public class UniversalElectricity extends ThermalExpansion implements IItemElectric
|
||||||
|
|||||||
@@ -36,6 +36,7 @@ import appeng.util.Platform;
|
|||||||
|
|
||||||
import com.google.common.base.Optional;
|
import com.google.common.base.Optional;
|
||||||
|
|
||||||
|
|
||||||
// TODO BC Integration
|
// TODO BC Integration
|
||||||
//@Interface( iface = "buildcraft.api.tools.IToolWrench", iname = IntegrationType.BuildCraftCore )
|
//@Interface( iface = "buildcraft.api.tools.IToolWrench", iname = IntegrationType.BuildCraftCore )
|
||||||
public class ToolQuartzWrench extends AEBaseItem implements IAEWrench /* , IToolWrench */
|
public class ToolQuartzWrench extends AEBaseItem implements IAEWrench /* , IToolWrench */
|
||||||
@@ -99,16 +100,15 @@ public class ToolQuartzWrench extends AEBaseItem implements IAEWrench /*, IToolW
|
|||||||
|
|
||||||
// TODO: BC Wrench Integration
|
// TODO: BC Wrench Integration
|
||||||
/*
|
/*
|
||||||
@Override
|
* @Override
|
||||||
public boolean canWrench( EntityPlayer player, int x, int y, int z )
|
* public boolean canWrench( EntityPlayer player, int x, int y, int z )
|
||||||
{
|
* {
|
||||||
return true;
|
* return true;
|
||||||
}
|
* }
|
||||||
|
* @Override
|
||||||
@Override
|
* public void wrenchUsed( EntityPlayer player, int x, int y, int z )
|
||||||
public void wrenchUsed( EntityPlayer player, int x, int y, int z )
|
* {
|
||||||
{
|
* player.swingItem();
|
||||||
player.swingItem();
|
* }
|
||||||
}
|
|
||||||
*/
|
*/
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -29,8 +29,8 @@ import appeng.api.networking.IGridNode;
|
|||||||
/**
|
/**
|
||||||
* Nested iterator for {@link appeng.me.MachineSet}
|
* Nested iterator for {@link appeng.me.MachineSet}
|
||||||
*
|
*
|
||||||
* Traverses first over the {@link appeng.me.MachineSet}
|
* Traverses first over the {@link appeng.me.MachineSet} and then over every containing
|
||||||
* and then over every containing {@link appeng.api.networking.IGridNode}
|
* {@link appeng.api.networking.IGridNode}
|
||||||
*/
|
*/
|
||||||
public class GridNodeIterator implements Iterator<IGridNode>
|
public class GridNodeIterator implements Iterator<IGridNode>
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -41,6 +41,7 @@ public class GridStorage implements IGridStorage
|
|||||||
private final GridStorageSearch mySearchEntry; // keep myself in the list until I'm
|
private final GridStorageSearch mySearchEntry; // keep myself in the list until I'm
|
||||||
private final WeakHashMap<GridStorage, Boolean> divided = new WeakHashMap<GridStorage, Boolean>();
|
private final WeakHashMap<GridStorage, Boolean> divided = new WeakHashMap<GridStorage, Boolean>();
|
||||||
private WeakReference<IGrid> internalGrid = null;
|
private WeakReference<IGrid> internalGrid = null;
|
||||||
|
|
||||||
// lost...
|
// lost...
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -390,7 +390,6 @@ public class GridStorageCache implements IStorageGrid
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
private class CellChangeTracker
|
private class CellChangeTracker
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|||||||
+3
-3
@@ -140,14 +140,14 @@ public class SecurityCache implements ISecurityGrid
|
|||||||
public void populateGridStorage( final IGridStorage destinationStorage )
|
public void populateGridStorage( final IGridStorage destinationStorage )
|
||||||
{
|
{
|
||||||
|
|
||||||
} @Override
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
public boolean isAvailable()
|
public boolean isAvailable()
|
||||||
{
|
{
|
||||||
return this.securityProvider.size() == 1 && this.securityProvider.get( 0 ).isSecurityEnabled();
|
return this.securityProvider.size() == 1 && this.securityProvider.get( 0 ).isSecurityEnabled();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean hasPermission( final EntityPlayer player, final SecurityPermissions perm )
|
public boolean hasPermission( final EntityPlayer player, final SecurityPermissions perm )
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -69,7 +69,9 @@ public class NetworkInventoryHandler<T extends IAEStack<T>> implements IMEInvent
|
|||||||
{
|
{
|
||||||
this.myChannel = chan;
|
this.myChannel = chan;
|
||||||
this.security = security;
|
this.security = security;
|
||||||
this.priorityInventory = new TreeMap<Integer, List<IMEInventoryHandler<T>>>( PRIORITY_SORTER ); // TreeMultimap.create( prioritySorter, hashSorter );
|
this.priorityInventory = new TreeMap<Integer, List<IMEInventoryHandler<T>>>( PRIORITY_SORTER ); // TreeMultimap.create(
|
||||||
|
// prioritySorter,
|
||||||
|
// hashSorter );
|
||||||
}
|
}
|
||||||
|
|
||||||
public void addNewStorage( final IMEInventoryHandler<T> h )
|
public void addNewStorage( final IMEInventoryHandler<T> h )
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
|
||||||
package appeng.parts.automation;
|
package appeng.parts.automation;
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
|
||||||
package appeng.parts.automation;
|
package appeng.parts.automation;
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
|
||||||
package appeng.parts.automation;
|
package appeng.parts.automation;
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -317,7 +317,8 @@ public abstract class AbstractPartMonitor extends AbstractPartDisplay implements
|
|||||||
final AEPartLocation d = this.getSide();
|
final AEPartLocation d = this.getSide();
|
||||||
GL11.glTranslated( d.xOffset * 0.77, d.yOffset * 0.77, d.zOffset * 0.77 );
|
GL11.glTranslated( d.xOffset * 0.77, d.yOffset * 0.77, d.zOffset * 0.77 );
|
||||||
|
|
||||||
switch( d ) {
|
switch( d )
|
||||||
|
{
|
||||||
case UP:
|
case UP:
|
||||||
GL11.glScalef( 1.0f, -1.0f, 1.0f );
|
GL11.glScalef( 1.0f, -1.0f, 1.0f );
|
||||||
GL11.glRotatef( 90.0f, 1.0f, 0.0f, 0.0f );
|
GL11.glRotatef( 90.0f, 1.0f, 0.0f, 0.0f );
|
||||||
|
|||||||
@@ -187,12 +187,9 @@ public class Ingredient implements IIngredient
|
|||||||
/*
|
/*
|
||||||
* Object o = Item.itemRegistry.getObject( nameSpace + ":" + itemName ); if ( o instanceof Item ) return new
|
* Object o = Item.itemRegistry.getObject( nameSpace + ":" + itemName ); if ( o instanceof Item ) return new
|
||||||
* ItemStack( (Item) o, qty, meta );
|
* ItemStack( (Item) o, qty, meta );
|
||||||
*
|
|
||||||
* if ( o instanceof Block ) return new ItemStack( (Block) o, qty, meta );
|
* if ( o instanceof Block ) return new ItemStack( (Block) o, qty, meta );
|
||||||
*
|
|
||||||
* o = Item.itemRegistry.getObject( nameSpace + ":item." + itemName ); if ( o instanceof Item ) return new
|
* o = Item.itemRegistry.getObject( nameSpace + ":item." + itemName ); if ( o instanceof Item ) return new
|
||||||
* ItemStack( (Item) o, qty, meta );
|
* ItemStack( (Item) o, qty, meta );
|
||||||
*
|
|
||||||
* o = Block.blockRegistry.getObject( nameSpace + ":tile." + itemName ); if ( o instanceof Block && (!(o
|
* o = Block.blockRegistry.getObject( nameSpace + ":tile." + itemName ); if ( o instanceof Block && (!(o
|
||||||
* instanceof BlockAir)) ) return new ItemStack( (Block) o, qty, meta );
|
* instanceof BlockAir)) ) return new ItemStack( (Block) o, qty, meta );
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
|
||||||
package appeng.recipes.handlers;
|
package appeng.recipes.handlers;
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -230,7 +230,8 @@ public class RecipeResourceCopier
|
|||||||
try
|
try
|
||||||
{
|
{
|
||||||
final Enumeration<JarEntry> entries = jar.entries(); // gives ALL entries in jar
|
final Enumeration<JarEntry> entries = jar.entries(); // gives ALL entries in jar
|
||||||
final Collection<String> result = new HashSet<String>( INITIAL_RESOURCE_CAPACITY ); // avoid duplicates
|
final Collection<String> result = new HashSet<String>( INITIAL_RESOURCE_CAPACITY ); // avoid
|
||||||
|
// duplicates
|
||||||
|
|
||||||
// in case it is a
|
// in case it is a
|
||||||
// subdirectory
|
// subdirectory
|
||||||
|
|||||||
@@ -238,7 +238,6 @@ public final class CompassService
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
private class CMDirectionRequest implements Runnable
|
private class CMDirectionRequest implements Runnable
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|||||||
@@ -67,7 +67,8 @@ public final class ForgeExportConfig implements ExportConfig
|
|||||||
private final Configuration config;
|
private final Configuration config;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Constructor using the configuration. Apparently there are some race conditions if constructing configurations on multiple file accesses
|
* Constructor using the configuration. Apparently there are some race conditions if constructing configurations on
|
||||||
|
* multiple file accesses
|
||||||
*
|
*
|
||||||
* @param config to be wrapped configuration.
|
* @param config to be wrapped configuration.
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -55,10 +55,12 @@ final class ModListChecker implements Checker<List<ModContainer>>
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Compiles a list of all mods and their versions to a digest which is updated, if it differs from the config. This is used to elevate the need to export
|
* Compiles a list of all mods and their versions to a digest which is updated, if it differs from the config. This
|
||||||
|
* is used to elevate the need to export
|
||||||
* the csv once again, if no change was detected.
|
* the csv once again, if no change was detected.
|
||||||
*
|
*
|
||||||
* @param modContainers all mods and their versions to check if a difference exists between the current instance and the previous instance
|
* @param modContainers all mods and their versions to check if a difference exists between the current instance and
|
||||||
|
* the previous instance
|
||||||
*
|
*
|
||||||
* @return CheckType.EQUAL if no change was detected
|
* @return CheckType.EQUAL if no change was detected
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -18,6 +18,7 @@
|
|||||||
|
|
||||||
package appeng.spatial;
|
package appeng.spatial;
|
||||||
|
|
||||||
|
|
||||||
import net.minecraft.util.BlockPos;
|
import net.minecraft.util.BlockPos;
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -18,66 +18,57 @@
|
|||||||
|
|
||||||
package appeng.tile.powersink;
|
package appeng.tile.powersink;
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
import net.minecraftforge.common.util.ForgeDirection;
|
* import net.minecraftforge.common.util.ForgeDirection;
|
||||||
import universalelectricity.core.block.IElectrical;
|
* import universalelectricity.core.block.IElectrical;
|
||||||
import universalelectricity.core.electricity.ElectricityPack;
|
* import universalelectricity.core.electricity.ElectricityPack;
|
||||||
import appeng.api.config.PowerUnits;
|
* import appeng.api.config.PowerUnits;
|
||||||
|
* public abstract class UniversalElectricity extends ThermalExpansion implements IElectrical
|
||||||
public abstract class UniversalElectricity extends ThermalExpansion implements IElectrical
|
* {
|
||||||
{
|
* @Override
|
||||||
|
* public final boolean canConnect(AEPartLocation direction)
|
||||||
@Override
|
* {
|
||||||
public final boolean canConnect(AEPartLocation direction)
|
* return internalCanAcceptPower && getPowerSides().contains( direction );
|
||||||
{
|
* }
|
||||||
return internalCanAcceptPower && getPowerSides().contains( direction );
|
* @Override
|
||||||
}
|
* public final float receiveElectricity(AEPartLocation from, ElectricityPack receive, boolean doReceive)
|
||||||
|
* {
|
||||||
@Override
|
* float accepted = 0;
|
||||||
public final float receiveElectricity(AEPartLocation from, ElectricityPack receive, boolean doReceive)
|
* double receivedPower = receive.getWatts();
|
||||||
{
|
* if ( doReceive )
|
||||||
float accepted = 0;
|
* {
|
||||||
double receivedPower = receive.getWatts();
|
* accepted = (float) (receivedPower - injectExternalPower( PowerUnits.KJ, receivedPower ));
|
||||||
|
* }
|
||||||
if ( doReceive )
|
* else
|
||||||
{
|
* {
|
||||||
accepted = (float) (receivedPower - injectExternalPower( PowerUnits.KJ, receivedPower ));
|
* double whatIWant = getExternalPowerDemand( PowerUnits.KJ );
|
||||||
}
|
* if ( whatIWant > receivedPower )
|
||||||
else
|
* accepted = (float) receivedPower;
|
||||||
{
|
* else
|
||||||
double whatIWant = getExternalPowerDemand( PowerUnits.KJ );
|
* accepted = (float) whatIWant;
|
||||||
if ( whatIWant > receivedPower )
|
* }
|
||||||
accepted = (float) receivedPower;
|
* return accepted;
|
||||||
else
|
* }
|
||||||
accepted = (float) whatIWant;
|
* @Override
|
||||||
}
|
* public final float getRequest(AEPartLocation direction)
|
||||||
|
* {
|
||||||
return accepted;
|
* return (float) getExternalPowerDemand( PowerUnits.KJ );
|
||||||
}
|
* }
|
||||||
|
* @Override
|
||||||
@Override
|
* public final float getVoltage()
|
||||||
public final float getRequest(AEPartLocation direction)
|
* {
|
||||||
{
|
* return 120;
|
||||||
return (float) getExternalPowerDemand( PowerUnits.KJ );
|
* }
|
||||||
}
|
* @Override
|
||||||
|
* public final ElectricityPack provideElectricity(AEPartLocation from, ElectricityPack request, boolean doProvide)
|
||||||
@Override
|
* {
|
||||||
public final float getVoltage()
|
* return null; // cannot be dis-charged
|
||||||
{
|
* }
|
||||||
return 120;
|
* @Override
|
||||||
}
|
* public final float getProvide(AEPartLocation direction)
|
||||||
|
* {
|
||||||
@Override
|
* return 0;
|
||||||
public final ElectricityPack provideElectricity(AEPartLocation from, ElectricityPack request, boolean doProvide)
|
* }
|
||||||
{
|
* }
|
||||||
return null; // cannot be dis-charged
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public final float getProvide(AEPartLocation direction)
|
|
||||||
{
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
*/
|
*/
|
||||||
@@ -127,5 +127,4 @@ public final class AppEngCore extends DummyModContainer implements IFMLLoadingPl
|
|||||||
return this.getVersion();
|
return this.getVersion();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -36,7 +36,6 @@ public @interface Integration
|
|||||||
Interface[] value();
|
Interface[] value();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@Retention( RetentionPolicy.RUNTIME )
|
@Retention( RetentionPolicy.RUNTIME )
|
||||||
@Target( ElementType.TYPE )
|
@Target( ElementType.TYPE )
|
||||||
@interface Interface
|
@interface Interface
|
||||||
@@ -46,7 +45,6 @@ public @interface Integration
|
|||||||
IntegrationType iname();
|
IntegrationType iname();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@Retention( RetentionPolicy.RUNTIME )
|
@Retention( RetentionPolicy.RUNTIME )
|
||||||
@Target( ElementType.METHOD )
|
@Target( ElementType.METHOD )
|
||||||
@interface Method
|
@interface Method
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
|
||||||
package appeng.util;
|
package appeng.util;
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
|
||||||
package appeng.util;
|
package appeng.util;
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -39,8 +39,8 @@ public interface IWorldCallable<T>
|
|||||||
/**
|
/**
|
||||||
* Similar to {@link Callable#call()}
|
* Similar to {@link Callable#call()}
|
||||||
*
|
*
|
||||||
* @param world this param is given to not hold a reference to the world but let the caller handle it. Do not expect a world here thus can be
|
* @param world this param is given to not hold a reference to the world but let the caller handle it. Do not expect
|
||||||
* <tt>null</tt>.
|
* a world here thus can be <tt>null</tt>.
|
||||||
*
|
*
|
||||||
* @return result of call on the world. Can be <tt>null</tt>.
|
* @return result of call on the world. Can be <tt>null</tt>.
|
||||||
*
|
*
|
||||||
|
|||||||
@@ -1038,11 +1038,11 @@ public class Platform
|
|||||||
{
|
{
|
||||||
// TODO: Build Craft Wrench?
|
// TODO: Build Craft Wrench?
|
||||||
/*
|
/*
|
||||||
if( eq.getItem() instanceof IToolWrench )
|
* if( eq.getItem() instanceof IToolWrench )
|
||||||
{
|
* {
|
||||||
IToolWrench wrench = (IToolWrench) eq.getItem();
|
* IToolWrench wrench = (IToolWrench) eq.getItem();
|
||||||
return wrench.canWrench( player, x, y, z );
|
* return wrench.canWrench( player, x, y, z );
|
||||||
}
|
* }
|
||||||
*/
|
*/
|
||||||
}
|
}
|
||||||
catch( final Throwable ignore )
|
catch( final Throwable ignore )
|
||||||
@@ -1451,13 +1451,10 @@ public class Platform
|
|||||||
|
|
||||||
/*
|
/*
|
||||||
* // test ore dictionary.. int OreID = getOreID( a ); if ( OreID != -1 ) return OreID == getOreID( b );
|
* // test ore dictionary.. int OreID = getOreID( a ); if ( OreID != -1 ) return OreID == getOreID( b );
|
||||||
*
|
|
||||||
* if ( Mode != FuzzyMode.IGNORE_ALL ) { if ( a.hasTagCompound() && !isShared( a.getTagCompound() ) ) { a =
|
* if ( Mode != FuzzyMode.IGNORE_ALL ) { if ( a.hasTagCompound() && !isShared( a.getTagCompound() ) ) { a =
|
||||||
* Platform.getSharedItemStack( AEItemStack.create( a ) ); }
|
* Platform.getSharedItemStack( AEItemStack.create( a ) ); }
|
||||||
*
|
|
||||||
* if ( b.hasTagCompound() && !isShared( b.getTagCompound() ) ) { b = Platform.getSharedItemStack(
|
* if ( b.hasTagCompound() && !isShared( b.getTagCompound() ) ) { b = Platform.getSharedItemStack(
|
||||||
* AEItemStack.create( b ) ); }
|
* AEItemStack.create( b ) ); }
|
||||||
*
|
|
||||||
* // test regular items with damage values and what not... if ( isShared( a.getTagCompound() ) && isShared(
|
* // test regular items with damage values and what not... if ( isShared( a.getTagCompound() ) && isShared(
|
||||||
* b.getTagCompound() ) && a.itemID == b.itemID ) { return ((AppEngSharedNBTTagCompound)
|
* b.getTagCompound() ) && a.itemID == b.itemID ) { return ((AppEngSharedNBTTagCompound)
|
||||||
* a.getTagCompound()).compareFuzzyWithRegistry( (AppEngSharedNBTTagCompound) b.getTagCompound() ); } }
|
* a.getTagCompound()).compareFuzzyWithRegistry( (AppEngSharedNBTTagCompound) b.getTagCompound() ); } }
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
|
||||||
package appeng.util;
|
package appeng.util;
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -112,6 +112,7 @@ public class AdaptorPlayerInventory implements IInventory
|
|||||||
this.src.openInventory( player );
|
this.src.openInventory( player );
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void closeInventory(
|
public void closeInventory(
|
||||||
final EntityPlayer player )
|
final EntityPlayer player )
|
||||||
|
|||||||
@@ -180,6 +180,7 @@ public class WrapperInventoryRange implements IInventory
|
|||||||
{
|
{
|
||||||
this.src.setField( id, value );
|
this.src.setField( id, value );
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean isItemValidForSlot( final int i, final ItemStack itemstack )
|
public boolean isItemValidForSlot( final int i, final ItemStack itemstack )
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
|
||||||
package appeng.worldgen.meteorite;
|
package appeng.worldgen.meteorite;
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
|
||||||
package appeng.worldgen.meteorite;
|
package appeng.worldgen.meteorite;
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
|
||||||
package appeng.worldgen.meteorite;
|
package appeng.worldgen.meteorite;
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
|
||||||
package appeng.worldgen.meteorite;
|
package appeng.worldgen.meteorite;
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
|
||||||
package appeng.worldgen.meteorite;
|
package appeng.worldgen.meteorite;
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
|
|
||||||
package invtweaks.api.container;
|
package invtweaks.api.container;
|
||||||
|
|
||||||
|
|
||||||
public @interface ChestContainer
|
public @interface ChestContainer
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user