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

Fix compile errors

This commit is contained in:
thatsIch 2015-09-30 12:47:23 +02:00
parent c978bf90f8
commit bcb4c0bc02
6 changed files with 13 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -123,24 +123,24 @@ public class RenderQuartzTorch extends BaseBlockRender<AEBaseBlock, AEBaseTile>
}
renderer.setRenderBounds( Point3 + xOff, renderBottom + yOff, Point3 + zOff, Point12 + xOff, renderTop + yOff, Point12 + zOff );
super.renderInWorld( blk, world, pos, renderer );
super.renderInWorld( block, world, pos, renderer );
int r = ( pos.getX() + pos.getY() + pos.getZ() ) % 2;
if( r == 0 )
{
renderer.setRenderBounds( Point3 + xOff, renderTop + yOff, Point3 + zOff, Point3 + singlePixel + xOff, renderTop + singlePixel + yOff, Point3 + singlePixel + zOff );
super.renderInWorld( blk, world, pos, renderer );
super.renderInWorld( block, world, pos, renderer );
renderer.setRenderBounds( Point12 - singlePixel + xOff, renderBottom - singlePixel + yOff, Point12 - singlePixel + zOff, Point12 + xOff, renderBottom + yOff, Point12 + zOff );
super.renderInWorld( blk, world, pos, renderer );
super.renderInWorld( block, world, pos, renderer );
}
else
{
renderer.setRenderBounds( Point3 + xOff, renderBottom - singlePixel + yOff, Point3 + zOff, Point3 + singlePixel + xOff, renderBottom + yOff, Point3 + singlePixel + zOff );
super.renderInWorld( blk, world, pos, renderer );
super.renderInWorld( block, world, pos, renderer );
renderer.setRenderBounds( Point12 - singlePixel + xOff, renderTop + yOff, Point12 - singlePixel + zOff, Point12 + xOff, renderTop + singlePixel + yOff, Point12 + zOff );
super.renderInWorld( blk, world, pos, renderer );
super.renderInWorld( block, world, pos, renderer );
}
block.getRendererInstance().setTemporaryRenderIcon( renderer.getIcon( Blocks.hopper.getDefaultState() )[0] );

7
src/main/java/appeng/core/features/DamagedItemDefinition.java
View File

@ -27,7 +27,6 @@ import com.google.common.base.Preconditions;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.world.IBlockAccess;
import appeng.api.definitions.IItemDefinition;
@ -89,12 +88,6 @@ public final class DamagedItemDefinition implements IItemDefinition
return this.isEnabled() && comparableStack.getItem() == this.source.get().getItem() && comparableStack.getItemDamage() == this.source.get().getDamage();
}
@Override
public boolean isSameAs( IBlockAccess world, int x, int y, int z )
{
return false;
}
private static class ItemTransformer implements Function<IStackSrc, Item>
{
@Override

7
src/main/java/appeng/core/features/ItemDefinition.java
View File

@ -27,7 +27,6 @@ import com.google.common.base.Preconditions;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.world.IBlockAccess;
import appeng.api.definitions.IItemDefinition;
import appeng.util.Platform;
@ -86,12 +85,6 @@ public class ItemDefinition implements IItemDefinition
return this.isEnabled() && Platform.isSameItemType( comparableStack, this.maybeStack( 1 ).get() );
}
@Override
public boolean isSameAs( IBlockAccess world, int x, int y, int z )
{
return false;
}
private static class ItemStackTransformer implements Function<Item, ItemStack>
{
private final int stackSize;

6
src/main/java/appeng/decorative/stair/StairBlockDefinition.java
View File

@ -63,6 +63,12 @@ public class StairBlockDefinition implements IBlockDefinition
return null;
}
@Override
public boolean isEnabled()
{
return false;
}
@Override
public boolean isSameAs( ItemStack comparableStack )
{

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

@ -21,7 +21,6 @@ package appeng.items.parts;
import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.Comparator;
import java.util.EnumSet;
@ -48,7 +47,6 @@ import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import appeng.api.AEApi;
import appeng.api.exceptions.MissingDefinition;
import appeng.api.implementations.items.IItemGroup;
import appeng.api.parts.IPart;
import appeng.api.parts.IPartHelper;
@ -244,16 +242,6 @@ public final class ItemMultiPart extends AEBaseItem implements IPartItem, IItemG
return super.getItemStackDisplayName( is );
}
@Override
public void registerIcons( IIconRegister iconRegister )
{
for( Entry<Integer, PartTypeWithVariant> part : this.registered.entrySet() )
{
String tex = "appliedenergistics2:" + this.getName( new ItemStack( this, 1, part.getKey() ) );
part.getValue().ico = iconRegister.registerIcon( tex );
}
}
@Override
protected void getCheckedSubItems( Item sameItem, CreativeTabs creativeTab, List<ItemStack> itemStacks )
{
@ -406,7 +394,6 @@ public final class ItemMultiPart extends AEBaseItem implements IPartItem, IItemG
return "PartTypeWithVariant{" +
"part=" + this.part +
", variant=" + this.variant +
", ico=" + this.ico +
'}';
}
}

3
src/main/java/appeng/tile/networking/TileController.java
View File

@ -217,7 +217,8 @@ public class TileController extends AENetworkPowerTile
*/
private boolean checkController( BlockPos pos )
{
if( this.worldObj.getChunkProvider().chunkExists( this.xCoord >> 4, this.zCoord >> 4 ) )
final BlockPos ownPos = this.getPos();
if( this.worldObj.getChunkProvider().chunkExists( ownPos.getX() >> 4, ownPos.getZ() >> 4 ) )
{
return this.worldObj.getTileEntity( pos ) instanceof TileController;
}