Code format
This commit is contained in:
@@ -1,9 +1,13 @@
|
|||||||
|
|
||||||
package appeng.block;
|
package appeng.block;
|
||||||
|
|
||||||
|
|
||||||
import net.minecraft.block.Block;
|
import net.minecraft.block.Block;
|
||||||
import net.minecraft.item.ItemSlab;
|
import net.minecraft.item.ItemSlab;
|
||||||
|
|
||||||
public class AEBaseItemBlockSlab extends ItemSlab {
|
|
||||||
|
public class AEBaseItemBlockSlab extends ItemSlab
|
||||||
|
{
|
||||||
|
|
||||||
public AEBaseItemBlockSlab( Block block, AEBaseSlabBlock singleSlab, AEBaseSlabBlock doubleSlab, Boolean isDoubleSlab )
|
public AEBaseItemBlockSlab( Block block, AEBaseSlabBlock singleSlab, AEBaseSlabBlock doubleSlab, Boolean isDoubleSlab )
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -56,7 +56,8 @@ public class AEBaseSlabBlock extends BlockSlab implements IAEFeature
|
|||||||
this.setResistance( block.getExplosionResistance( null ) * 5.0F / 3.0F );
|
this.setResistance( block.getExplosionResistance( null ) * 5.0F / 3.0F );
|
||||||
this.setStepSound( block.stepSound );
|
this.setStepSound( block.stepSound );
|
||||||
this.useNeighborBrightness = true;
|
this.useNeighborBrightness = true;
|
||||||
if (!field_150004_a) this.doubleSlabs = new AEBaseSlabBlock( block, meta, features, true, name + ".double" ).setSlabs(this);
|
if( !field_150004_a )
|
||||||
|
this.doubleSlabs = new AEBaseSlabBlock( block, meta, features, true, name + ".double" ).setSlabs( this );
|
||||||
this.features = !field_150004_a ? new SlabBlockFeatureHandler( features, this ) : null;
|
this.features = !field_150004_a ? new SlabBlockFeatureHandler( features, this ) : null;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -101,7 +102,9 @@ public class AEBaseSlabBlock extends BlockSlab implements IAEFeature
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void registerBlockIcons(IIconRegister reg) { }
|
public void registerBlockIcons( IIconRegister reg )
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Item getItemDropped( int meta, Random rand, int fortune )
|
public Item getItemDropped( int meta, Random rand, int fortune )
|
||||||
@@ -114,8 +117,10 @@ public class AEBaseSlabBlock extends BlockSlab implements IAEFeature
|
|||||||
{
|
{
|
||||||
AEBaseSlabBlock block = (AEBaseSlabBlock) world.getBlock( x, y, z );
|
AEBaseSlabBlock block = (AEBaseSlabBlock) world.getBlock( x, y, z );
|
||||||
|
|
||||||
if (block == null) return null;
|
if( block == null )
|
||||||
if (block.field_150004_a) block = this.slabs;
|
return null;
|
||||||
|
if( block.field_150004_a )
|
||||||
|
block = this.slabs;
|
||||||
|
|
||||||
int meta = world.getBlockMetadata( x, y, z ) & 7;
|
int meta = world.getBlockMetadata( x, y, z ) & 7;
|
||||||
return new ItemStack( block, 1, meta );
|
return new ItemStack( block, 1, meta );
|
||||||
|
|||||||
@@ -455,7 +455,8 @@ public class BlockCableBus extends AEBaseTileBlock implements IRedNetConnection
|
|||||||
return this.cb( world, x, y, z ).recolourBlock( side, AEColor.values()[colour], who );
|
return this.cb( world, x, y, z ).recolourBlock( side, AEColor.values()[colour], who );
|
||||||
}
|
}
|
||||||
catch( Throwable ignored )
|
catch( Throwable ignored )
|
||||||
{}
|
{
|
||||||
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -394,7 +394,6 @@ public class GuiImgButton extends GuiButton implements ITooltip
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
private static class ButtonAppearance
|
private static class ButtonAppearance
|
||||||
{
|
{
|
||||||
public int index;
|
public int index;
|
||||||
|
|||||||
@@ -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
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -145,7 +145,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;
|
||||||
}
|
}
|
||||||
@@ -179,8 +180,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;
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|||||||
@@ -247,7 +247,8 @@ public final class ApiBlocks implements IBlocks
|
|||||||
this.skyStoneSmallBrickSlab = constructor.registerBlockDefinition( new AEBaseSlabBlock( skyStone, 3, EnumSet.of( AEFeature.DecorativeQuartzBlocks ), false, "SkyStoneSmallBrickSlabBlock" ) );
|
this.skyStoneSmallBrickSlab = constructor.registerBlockDefinition( new AEBaseSlabBlock( skyStone, 3, EnumSet.of( AEFeature.DecorativeQuartzBlocks ), false, "SkyStoneSmallBrickSlabBlock" ) );
|
||||||
this.fluixSlab = constructor.registerBlockDefinition( new AEBaseSlabBlock( fluixBlock, 0, EnumSet.of( AEFeature.DecorativeQuartzBlocks ), false, "FluixSlabBlock" ) );
|
this.fluixSlab = constructor.registerBlockDefinition( new AEBaseSlabBlock( fluixBlock, 0, EnumSet.of( AEFeature.DecorativeQuartzBlocks ), false, "FluixSlabBlock" ) );
|
||||||
this.quartzSlab = constructor.registerBlockDefinition( new AEBaseSlabBlock( quartzBlock, 0, EnumSet.of( AEFeature.DecorativeQuartzBlocks ), false, "QuartzSlabBlock" ) );
|
this.quartzSlab = constructor.registerBlockDefinition( new AEBaseSlabBlock( quartzBlock, 0, EnumSet.of( AEFeature.DecorativeQuartzBlocks ), false, "QuartzSlabBlock" ) );
|
||||||
this.chiseledQuartzSlab = constructor.registerBlockDefinition( new AEBaseSlabBlock( chiseledQuartz, 0, EnumSet.of(AEFeature.DecorativeQuartzBlocks), false, "ChiseledQuartzSlabBlock" ) );;
|
this.chiseledQuartzSlab = constructor.registerBlockDefinition( new AEBaseSlabBlock( chiseledQuartz, 0, EnumSet.of( AEFeature.DecorativeQuartzBlocks ), false, "ChiseledQuartzSlabBlock" ) );
|
||||||
|
;
|
||||||
this.quartzPillarSlab = constructor.registerBlockDefinition( new AEBaseSlabBlock( quartzPillar, 0, EnumSet.of( AEFeature.DecorativeQuartzBlocks ), false, "QuartzPillarSlabBlock" ) );
|
this.quartzPillarSlab = constructor.registerBlockDefinition( new AEBaseSlabBlock( quartzPillar, 0, EnumSet.of( AEFeature.DecorativeQuartzBlocks ), false, "QuartzPillarSlabBlock" ) );
|
||||||
|
|
||||||
this.itemGen = constructor.registerBlockDefinition( new BlockItemGen() );
|
this.itemGen = constructor.registerBlockDefinition( new BlockItemGen() );
|
||||||
|
|||||||
@@ -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;
|
package appeng.core.features;
|
||||||
|
|
||||||
|
|
||||||
@@ -92,7 +93,6 @@ public final class DefinitionConverter
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
private static class AEItem extends AEComparable
|
private static class AEItem extends AEComparable
|
||||||
{
|
{
|
||||||
private final IItemDefinition definition;
|
private final IItemDefinition definition;
|
||||||
@@ -119,7 +119,6 @@ public final class DefinitionConverter
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
private static class AEBlock extends AEItem
|
private static class AEBlock extends AEItem
|
||||||
{
|
{
|
||||||
private final IBlockDefinition definition;
|
private final IBlockDefinition definition;
|
||||||
@@ -145,7 +144,6 @@ public final class DefinitionConverter
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
private static class AETile extends AEBlock
|
private static class AETile extends AEBlock
|
||||||
{
|
{
|
||||||
private final ITileDefinition definition;
|
private final ITileDefinition definition;
|
||||||
|
|||||||
@@ -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;
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -38,12 +38,15 @@ import appeng.core.features.AEFeature;
|
|||||||
public class PlayerStatsRegistration
|
public class PlayerStatsRegistration
|
||||||
{
|
{
|
||||||
/**
|
/**
|
||||||
* {@link cpw.mods.fml.common.eventhandler.EventBus} to which the handlers might get posted to depending if the feature is enabled
|
* {@link cpw.mods.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;
|
||||||
|
|
||||||
@@ -51,7 +54,8 @@ public class PlayerStatsRegistration
|
|||||||
* Constructs this with an {@link cpw.mods.fml.common.eventhandler.EventBus} and {@link appeng.core.AEConfig}.
|
* Constructs this with an {@link cpw.mods.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( EventBus bus, AEConfig config )
|
public PlayerStatsRegistration( EventBus bus, AEConfig config )
|
||||||
{
|
{
|
||||||
@@ -60,7 +64,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()
|
||||||
{
|
{
|
||||||
@@ -76,7 +82,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 ),
|
||||||
|
|||||||
@@ -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( int dim, int chunkX, int chunkZ ) {
|
public void setGenerated( int dim, int chunkX, int chunkZ )
|
||||||
|
{
|
||||||
synchronized( SpawnData.class )
|
synchronized( SpawnData.class )
|
||||||
{
|
{
|
||||||
NBTTagCompound data = this.loadSpawnData( dim, chunkX, chunkZ );
|
NBTTagCompound data = this.loadSpawnData( dim, chunkX, chunkZ );
|
||||||
|
|||||||
@@ -536,23 +536,18 @@ public class FacadePart implements IFacadePart, IBoxProvider
|
|||||||
* if ( out.contains( ForgeDirection.EAST ) && (side.offsetZ != 0) ) { IFacadePart fp = fc.getFacade(
|
* if ( out.contains( ForgeDirection.EAST ) && (side.offsetZ != 0) ) { IFacadePart fp = fc.getFacade(
|
||||||
* ForgeDirection.EAST ); if ( fp != null && (fp.isTransparent() == facade.isTransparent()) ) out.remove(
|
* ForgeDirection.EAST ); if ( fp != null && (fp.isTransparent() == facade.isTransparent()) ) out.remove(
|
||||||
* ForgeDirection.EAST ); }
|
* ForgeDirection.EAST ); }
|
||||||
*
|
|
||||||
* if ( out.contains( ForgeDirection.WEST ) && (side.offsetZ != 0) ) { IFacadePart fp = fc.getFacade(
|
* if ( out.contains( ForgeDirection.WEST ) && (side.offsetZ != 0) ) { IFacadePart fp = fc.getFacade(
|
||||||
* ForgeDirection.WEST ); if ( fp != null && (fp.isTransparent() == facade.isTransparent()) ) out.remove(
|
* ForgeDirection.WEST ); if ( fp != null && (fp.isTransparent() == facade.isTransparent()) ) out.remove(
|
||||||
* ForgeDirection.WEST ); }
|
* ForgeDirection.WEST ); }
|
||||||
*
|
|
||||||
* if ( out.contains( ForgeDirection.NORTH ) && (side.offsetY != 0) ) { IFacadePart fp = fc.getFacade(
|
* if ( out.contains( ForgeDirection.NORTH ) && (side.offsetY != 0) ) { IFacadePart fp = fc.getFacade(
|
||||||
* ForgeDirection.NORTH ); if ( fp != null && (fp.isTransparent() == facade.isTransparent()) ) out.remove(
|
* ForgeDirection.NORTH ); if ( fp != null && (fp.isTransparent() == facade.isTransparent()) ) out.remove(
|
||||||
* ForgeDirection.NORTH ); }
|
* ForgeDirection.NORTH ); }
|
||||||
*
|
|
||||||
* if ( out.contains( ForgeDirection.SOUTH ) && (side.offsetY != 0) ) { IFacadePart fp = fc.getFacade(
|
* if ( out.contains( ForgeDirection.SOUTH ) && (side.offsetY != 0) ) { IFacadePart fp = fc.getFacade(
|
||||||
* ForgeDirection.SOUTH ); if ( fp != null && (fp.isTransparent() == facade.isTransparent()) ) out.remove(
|
* ForgeDirection.SOUTH ); if ( fp != null && (fp.isTransparent() == facade.isTransparent()) ) out.remove(
|
||||||
* ForgeDirection.SOUTH ); }
|
* ForgeDirection.SOUTH ); }
|
||||||
*
|
|
||||||
* if ( out.contains( ForgeDirection.EAST ) && (side.offsetY != 0) ) { IFacadePart fp = fc.getFacade(
|
* if ( out.contains( ForgeDirection.EAST ) && (side.offsetY != 0) ) { IFacadePart fp = fc.getFacade(
|
||||||
* ForgeDirection.EAST ); if ( fp != null && (fp.isTransparent() == facade.isTransparent()) ) out.remove(
|
* ForgeDirection.EAST ); if ( fp != null && (fp.isTransparent() == facade.isTransparent()) ) out.remove(
|
||||||
* ForgeDirection.EAST ); }
|
* ForgeDirection.EAST ); }
|
||||||
*
|
|
||||||
* if ( out.contains( ForgeDirection.WEST ) && (side.offsetY != 0) ) { IFacadePart fp = fc.getFacade(
|
* if ( out.contains( ForgeDirection.WEST ) && (side.offsetY != 0) ) { IFacadePart fp = fc.getFacade(
|
||||||
* ForgeDirection.WEST ); if ( fp != null && (fp.isTransparent() == facade.isTransparent()) ) out.remove(
|
* ForgeDirection.WEST ); if ( fp != null && (fp.isTransparent() == facade.isTransparent()) ) out.remove(
|
||||||
* ForgeDirection.WEST ); }
|
* ForgeDirection.WEST ); }
|
||||||
|
|||||||
@@ -373,7 +373,6 @@ public class PatternHelper implements ICraftingPatternDetails, Comparable<Patter
|
|||||||
ACCEPT, DECLINE, TEST
|
ACCEPT, DECLINE, TEST
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static class TestLookup
|
static class TestLookup
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
|
||||||
package appeng.helpers;
|
package appeng.helpers;
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -317,7 +317,6 @@ public class TickHandler
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public static class PlayerColor
|
public static class PlayerColor
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|||||||
@@ -18,6 +18,7 @@
|
|||||||
|
|
||||||
package appeng.integration.modules;
|
package appeng.integration.modules;
|
||||||
|
|
||||||
|
|
||||||
import li.cil.oc.api.Items;
|
import li.cil.oc.api.Items;
|
||||||
|
|
||||||
import appeng.api.AEApi;
|
import appeng.api.AEApi;
|
||||||
@@ -25,6 +26,7 @@ import appeng.api.config.TunnelType;
|
|||||||
import appeng.api.features.IP2PTunnelRegistry;
|
import appeng.api.features.IP2PTunnelRegistry;
|
||||||
import appeng.integration.BaseModule;
|
import appeng.integration.BaseModule;
|
||||||
|
|
||||||
|
|
||||||
public class OpenComputers extends BaseModule
|
public class OpenComputers extends BaseModule
|
||||||
{
|
{
|
||||||
public static OpenComputers instance;
|
public static OpenComputers instance;
|
||||||
|
|||||||
@@ -54,8 +54,8 @@ public final class ChannelWailaDataProvider extends BasePartWailaDataProvider
|
|||||||
/**
|
/**
|
||||||
* Used cache for channels if the channel was not transmitted through the server.
|
* Used cache for channels if the channel was not transmitted through the server.
|
||||||
* <p/>
|
* <p/>
|
||||||
* This is useful, when a player just started to look at a tile
|
* This is useful, when a player just started to look at a tile and thus just requested the new information from the
|
||||||
* and thus just requested the new information from the server.
|
* server.
|
||||||
* <p/>
|
* <p/>
|
||||||
* The cache will be updated from the server.
|
* The cache will be updated from the server.
|
||||||
*/
|
*/
|
||||||
@@ -91,9 +91,8 @@ public final class ChannelWailaDataProvider extends BasePartWailaDataProvider
|
|||||||
/**
|
/**
|
||||||
* Determines the source of the channel.
|
* Determines the source of the channel.
|
||||||
* <p/>
|
* <p/>
|
||||||
* If the client received information of the channels on the server, they are used,
|
* If the client received information of the channels on the server, they are used, else if the cache contains a
|
||||||
* else if the cache contains a previous stored value, this will be used.
|
* previous stored value, this will be used. Default value is 0.
|
||||||
* Default value is 0.
|
|
||||||
*
|
*
|
||||||
* @param part part to be looked at
|
* @param part part to be looked at
|
||||||
* @param tag tag maybe containing the channel information
|
* @param tag tag maybe containing the channel information
|
||||||
@@ -125,9 +124,8 @@ public final class ChannelWailaDataProvider extends BasePartWailaDataProvider
|
|||||||
/**
|
/**
|
||||||
* Called on server to transfer information from server to client.
|
* Called on server to transfer information from server to client.
|
||||||
* <p/>
|
* <p/>
|
||||||
* If the part is a cable,
|
* If the part is a cable, it writes the channel information in the {@code #tag} using the {@code ID_USED_CHANNELS}
|
||||||
* it writes the channel information in the {@code #tag}
|
* key.
|
||||||
* using the {@code ID_USED_CHANNELS} key.
|
|
||||||
*
|
*
|
||||||
* @param player player looking at the part
|
* @param player player looking at the part
|
||||||
* @param part part being looked at
|
* @param part part being looked at
|
||||||
|
|||||||
@@ -34,7 +34,8 @@ import appeng.api.parts.IPart;
|
|||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* An abstraction layer of the {@link appeng.integration.modules.waila.part.IPartWailaDataProvider} for {@link appeng.api.parts.IPart}.
|
* An abstraction layer of the {@link appeng.integration.modules.waila.part.IPartWailaDataProvider} for
|
||||||
|
* {@link appeng.api.parts.IPart}.
|
||||||
*
|
*
|
||||||
* @author thatsIch
|
* @author thatsIch
|
||||||
* @version rv2
|
* @version rv2
|
||||||
|
|||||||
@@ -42,8 +42,8 @@ public final class PartAccessor
|
|||||||
/**
|
/**
|
||||||
* Hits a {@link appeng.api.parts.IPartHost} with {@link net.minecraft.util.MovingObjectPosition}.
|
* Hits a {@link appeng.api.parts.IPartHost} with {@link net.minecraft.util.MovingObjectPosition}.
|
||||||
* <p/>
|
* <p/>
|
||||||
* You can derive the looked at {@link appeng.api.parts.IPart} by doing that.
|
* You can derive the looked at {@link appeng.api.parts.IPart} by doing that. If a facade is being looked at, it is
|
||||||
* If a facade is being looked at, it is defined as being absent.
|
* defined as being absent.
|
||||||
*
|
*
|
||||||
* @param te being looked at {@link net.minecraft.tileentity.TileEntity}
|
* @param te being looked at {@link net.minecraft.tileentity.TileEntity}
|
||||||
* @param mop type of ray-trace
|
* @param mop type of ray-trace
|
||||||
|
|||||||
@@ -18,6 +18,7 @@
|
|||||||
|
|
||||||
package appeng.integration.modules.waila.part;
|
package appeng.integration.modules.waila.part;
|
||||||
|
|
||||||
|
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
|
|
||||||
import mcp.mobius.waila.api.IWailaConfigHandler;
|
import mcp.mobius.waila.api.IWailaConfigHandler;
|
||||||
@@ -25,6 +26,7 @@ import mcp.mobius.waila.api.IWailaConfigHandler;
|
|||||||
import appeng.api.parts.IPart;
|
import appeng.api.parts.IPart;
|
||||||
import appeng.api.parts.PartItemStack;
|
import appeng.api.parts.PartItemStack;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Part ItemStack provider for WAILA
|
* Part ItemStack provider for WAILA
|
||||||
*
|
*
|
||||||
@@ -32,7 +34,8 @@ import appeng.api.parts.PartItemStack;
|
|||||||
* @version rv2
|
* @version rv2
|
||||||
* @since rv2
|
* @since rv2
|
||||||
*/
|
*/
|
||||||
public class PartStackWailaDataProvider extends BasePartWailaDataProvider {
|
public class PartStackWailaDataProvider extends BasePartWailaDataProvider
|
||||||
|
{
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public ItemStack getWailaStack( IPart part, IWailaConfigHandler config, ItemStack partStack )
|
public ItemStack getWailaStack( IPart part, IWailaConfigHandler config, ItemStack partStack )
|
||||||
|
|||||||
+6
-8
@@ -56,8 +56,8 @@ public final class PowerStorageWailaDataProvider extends BaseWailaDataProvider
|
|||||||
/**
|
/**
|
||||||
* Used cache for power if the power was not transmitted through the server.
|
* Used cache for power if the power was not transmitted through the server.
|
||||||
* <p/>
|
* <p/>
|
||||||
* This is useful, when a player just started to look at a tile
|
* This is useful, when a player just started to look at a tile and thus just requested the new information from the
|
||||||
* and thus just requested the new information from the server.
|
* server.
|
||||||
* <p/>
|
* <p/>
|
||||||
* The cache will be updated from the server.
|
* The cache will be updated from the server.
|
||||||
*/
|
*/
|
||||||
@@ -106,9 +106,8 @@ public final class PowerStorageWailaDataProvider extends BaseWailaDataProvider
|
|||||||
/**
|
/**
|
||||||
* Called on server to transfer information from server to client.
|
* Called on server to transfer information from server to client.
|
||||||
* <p/>
|
* <p/>
|
||||||
* If the {@link net.minecraft.tileentity.TileEntity} is a {@link appeng.api.networking.energy.IAEPowerStorage},
|
* If the {@link net.minecraft.tileentity.TileEntity} is a {@link appeng.api.networking.energy.IAEPowerStorage}, it
|
||||||
* it writes the power information to the {@code #tag}
|
* writes the power information to the {@code #tag} using the {@code #ID_CURRENT_POWER} key.
|
||||||
* using the {@code #ID_CURRENT_POWER} key.
|
|
||||||
*
|
*
|
||||||
* @param player player looking at the power storage
|
* @param player player looking at the power storage
|
||||||
* @param te power storage
|
* @param te power storage
|
||||||
@@ -141,9 +140,8 @@ public final class PowerStorageWailaDataProvider extends BaseWailaDataProvider
|
|||||||
/**
|
/**
|
||||||
* Determines the current power.
|
* Determines the current power.
|
||||||
* <p/>
|
* <p/>
|
||||||
* If the client received power information on the server, they are used,
|
* If the client received power information on the server, they are used, else if the cache contains a previous
|
||||||
* else if the cache contains a previous stored value, this will be used.
|
* stored value, this will be used. Default value is 0.
|
||||||
* Default value is 0.
|
|
||||||
*
|
*
|
||||||
* @param te te to be looked at
|
* @param te te to be looked at
|
||||||
* @param tag tag maybe containing the channel information
|
* @param tag tag maybe containing the channel information
|
||||||
|
|||||||
@@ -190,7 +190,6 @@ public final class ItemMultiMaterial extends AEBaseItem implements IStorageCompo
|
|||||||
mat.markReady();
|
mat.markReady();
|
||||||
int newMaterialNum = mat.damageValue;
|
int newMaterialNum = mat.damageValue;
|
||||||
|
|
||||||
|
|
||||||
if( this.dmgToMaterial.get( newMaterialNum ) == null )
|
if( this.dmgToMaterial.get( newMaterialNum ) == null )
|
||||||
{
|
{
|
||||||
this.dmgToMaterial.put( newMaterialNum, mat );
|
this.dmgToMaterial.put( newMaterialNum, mat );
|
||||||
|
|||||||
@@ -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
|
||||||
|
|||||||
@@ -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>
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -43,6 +43,7 @@ public class GridStorage implements IGridStorage
|
|||||||
private final WeakHashMap<GridStorage, Boolean> divided = new WeakHashMap<GridStorage, Boolean>();
|
private final WeakHashMap<GridStorage, Boolean> divided = new WeakHashMap<GridStorage, Boolean>();
|
||||||
public boolean isDirty = false;
|
public boolean isDirty = false;
|
||||||
private WeakReference<IGrid> internalGrid = null;
|
private WeakReference<IGrid> internalGrid = null;
|
||||||
|
|
||||||
// lost...
|
// lost...
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -162,7 +162,6 @@ public class NetworkEventBus
|
|||||||
private static final long serialVersionUID = -3079021487019171205L;
|
private static final long serialVersionUID = -3079021487019171205L;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
class EventMethod
|
class EventMethod
|
||||||
{
|
{
|
||||||
|
|
||||||
@@ -199,7 +198,6 @@ public class NetworkEventBus
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
class MENetworkEventInfo
|
class MENetworkEventInfo
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|||||||
@@ -380,7 +380,6 @@ public class GridStorageCache implements IStorageGrid
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
private class CellChangeTracker
|
private class CellChangeTracker
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|||||||
+3
-3
@@ -141,14 +141,14 @@ public class SecurityCache implements ISecurityGrid
|
|||||||
public void populateGridStorage( IGridStorage destinationStorage )
|
public void populateGridStorage( 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( EntityPlayer player, SecurityPermissions perm )
|
public boolean hasPermission( EntityPlayer player, 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( IMEInventoryHandler<T> h )
|
public void addNewStorage( 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;
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -508,10 +508,10 @@ public class PartFormationPlane extends PartUpgradeable implements ICellContaine
|
|||||||
{
|
{
|
||||||
|
|
||||||
is.stackSize = (int) maxStorage;
|
is.stackSize = (int) maxStorage;
|
||||||
EntityItem ei = new EntityItem( w, // w
|
EntityItem ei = new EntityItem( w,
|
||||||
( ( side.offsetX != 0 ? 0.0 : 0.7 ) * ( Platform.getRandomFloat() - 0.5f ) ) + 0.5 + side.offsetX * -0.3 + x, // spawn
|
( ( side.offsetX != 0 ? 0.0 : 0.7 ) * ( Platform.getRandomFloat() - 0.5f ) ) + 0.5 + side.offsetX * -0.3 + x,
|
||||||
( ( side.offsetY != 0 ? 0.0 : 0.7 ) * ( Platform.getRandomFloat() - 0.5f ) ) + 0.5 + side.offsetY * -0.3 + y, // spawn
|
( ( side.offsetY != 0 ? 0.0 : 0.7 ) * ( Platform.getRandomFloat() - 0.5f ) ) + 0.5 + side.offsetY * -0.3 + y,
|
||||||
( ( side.offsetZ != 0 ? 0.0 : 0.7 ) * ( Platform.getRandomFloat() - 0.5f ) ) + 0.5 + side.offsetZ * -0.3 + z, // spawn
|
( ( side.offsetZ != 0 ? 0.0 : 0.7 ) * ( Platform.getRandomFloat() - 0.5f ) ) + 0.5 + side.offsetZ * -0.3 + z,
|
||||||
is.copy() );
|
is.copy() );
|
||||||
|
|
||||||
Entity result = ei;
|
Entity result = ei;
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
|
||||||
package appeng.parts.automation;
|
package appeng.parts.automation;
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -18,6 +18,7 @@
|
|||||||
|
|
||||||
package appeng.parts.layers;
|
package appeng.parts.layers;
|
||||||
|
|
||||||
|
|
||||||
import javax.annotation.Nullable;
|
import javax.annotation.Nullable;
|
||||||
|
|
||||||
import net.minecraftforge.common.util.ForgeDirection;
|
import net.minecraftforge.common.util.ForgeDirection;
|
||||||
|
|||||||
@@ -368,33 +368,32 @@ public class PartDenseCable extends PartCable
|
|||||||
boolean isGlass = false;
|
boolean isGlass = false;
|
||||||
AEColor myColor = this.getCableColor();
|
AEColor myColor = this.getCableColor();
|
||||||
/*
|
/*
|
||||||
* ( ghh != null && partHost != null && ghh.getCableConnectionType( of ) == AECableType.GLASS && partHost.getPart(
|
* ( ghh != null && partHost != null && ghh.getCableConnectionType( of ) == AECableType.GLASS &&
|
||||||
* of.getOpposite() ) == null ) { isGlass = true; rh.setTexture( getGlassTexture( myColor = partHost.getColor() ) );
|
* partHost.getPart(
|
||||||
|
* of.getOpposite() ) == null ) { isGlass = true; rh.setTexture( getGlassTexture( myColor = partHost.getColor()
|
||||||
|
* ) );
|
||||||
* } else if ( partHost == null && ghh != null && ghh.getCableConnectionType( of ) != AECableType.GLASS ) {
|
* } else if ( partHost == null && ghh != null && ghh.getCableConnectionType( of ) != AECableType.GLASS ) {
|
||||||
* rh.setTexture( getSmartTexture( myColor ) ); switch (of) { case DOWN: rh.setBounds( 3, 0, 3, 13, 4, 13 );
|
* rh.setTexture( getSmartTexture( myColor ) ); switch (of) { case DOWN: rh.setBounds( 3, 0, 3, 13, 4, 13 );
|
||||||
* break; case EAST: rh.setBounds( 12, 3, 3, 16, 13, 13 ); break; case NORTH: rh.setBounds( 3, 3, 0, 13, 13, 4
|
* break; case EAST: rh.setBounds( 12, 3, 3, 16, 13, 13 ); break; case NORTH: rh.setBounds( 3, 3, 0, 13, 13, 4
|
||||||
* ); break; case SOUTH: rh.setBounds( 3, 3, 12, 13, 13, 16 ); break; case UP: rh.setBounds( 3, 12, 3, 13, 16,
|
* ); break; case SOUTH: rh.setBounds( 3, 3, 12, 13, 13, 16 ); break; case UP: rh.setBounds( 3, 12, 3, 13, 16,
|
||||||
* 13 ); break; case WEST: rh.setBounds( 0, 3, 3, 4, 13, 13 ); break; default: return; } rh.renderBlock( x, y,
|
* 13 ); break; case WEST: rh.setBounds( 0, 3, 3, 4, 13, 13 ); break; default: return; } rh.renderBlock( x, y,
|
||||||
* z, renderer );
|
* z, renderer );
|
||||||
*
|
|
||||||
* if ( true ) { setSmartConnectionRotations( of, renderer ); IIcon firstIcon = new TaughtIcon( getChannelTex(
|
* if ( true ) { setSmartConnectionRotations( of, renderer ); IIcon firstIcon = new TaughtIcon( getChannelTex(
|
||||||
* channels, false ).getIcon(), -0.2f ); IIcon secondIcon = new TaughtIcon( getChannelTex( channels, true ).getIcon(),
|
* channels, false ).getIcon(), -0.2f ); IIcon secondIcon = new TaughtIcon( getChannelTex( channels, true
|
||||||
|
* ).getIcon(),
|
||||||
* -0.2f );
|
* -0.2f );
|
||||||
*
|
|
||||||
* if ( of == ForgeDirection.EAST || of == ForgeDirection.WEST ) { AEBaseBlock blk = (AEBaseBlock)
|
* if ( of == ForgeDirection.EAST || of == ForgeDirection.WEST ) { AEBaseBlock blk = (AEBaseBlock)
|
||||||
* rh.getBlock(); FlippableIcon ico = blk.getRendererInstance().getTexture( ForgeDirection.EAST ); ico.setFlip(
|
* rh.getBlock(); FlippableIcon ico = blk.getRendererInstance().getTexture( ForgeDirection.EAST ); ico.setFlip(
|
||||||
* false, true ); }
|
* false, true ); }
|
||||||
*
|
|
||||||
* Tessellator.INSTANCE.setBrightness( 15 << 20 | 15 << 5 ); Tessellator.INSTANCE.setColorOpaque_I(
|
* Tessellator.INSTANCE.setBrightness( 15 << 20 | 15 << 5 ); Tessellator.INSTANCE.setColorOpaque_I(
|
||||||
* myColor.mediumVariant ); rh.setTexture( firstIcon, firstIcon, firstIcon, firstIcon, firstIcon, firstIcon ); renderAllFaces( (AEBaseBlock)
|
* myColor.mediumVariant ); rh.setTexture( firstIcon, firstIcon, firstIcon, firstIcon, firstIcon, firstIcon );
|
||||||
|
* renderAllFaces( (AEBaseBlock)
|
||||||
* rh.getBlock(), x, y, z, renderer );
|
* rh.getBlock(), x, y, z, renderer );
|
||||||
*
|
* Tessellator.INSTANCE.setColorOpaque_I( myColor.whiteVariant ); rh.setTexture( secondIcon, secondIcon,
|
||||||
* Tessellator.INSTANCE.setColorOpaque_I( myColor.whiteVariant ); rh.setTexture( secondIcon, secondIcon, secondIcon, secondIcon, secondIcon,
|
* secondIcon, secondIcon, secondIcon,
|
||||||
* secondIcon ); renderAllFaces( (AEBaseBlock) rh.getBlock(), x, y, z, renderer );
|
* secondIcon ); renderAllFaces( (AEBaseBlock) rh.getBlock(), x, y, z, renderer );
|
||||||
*
|
|
||||||
* renderer.uvRotateBottom = renderer.uvRotateEast = renderer.uvRotateNorth = renderer.uvRotateSouth =
|
* renderer.uvRotateBottom = renderer.uvRotateEast = renderer.uvRotateNorth = renderer.uvRotateSouth =
|
||||||
* renderer.uvRotateTop = renderer.uvRotateWest = 0; }
|
* renderer.uvRotateTop = renderer.uvRotateWest = 0; }
|
||||||
*
|
|
||||||
* rh.setTexture( getTexture( getCableColor() ) ); }
|
* rh.setTexture( getTexture( getCableColor() ) ); }
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|||||||
@@ -212,15 +212,18 @@ public final class PartP2POpenComputers extends PartP2PTunnel<PartP2POpenCompute
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onConnect(Node node) {
|
public void onConnect( Node node )
|
||||||
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onDisconnect(Node node) {
|
public void onDisconnect( Node node )
|
||||||
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onMessage(Message message) {
|
public void onMessage( Message message )
|
||||||
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
@Nullable
|
@Nullable
|
||||||
|
|||||||
@@ -185,12 +185,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;
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -147,12 +147,15 @@ public class RecipeResourceCopier
|
|||||||
if( dirURL != null && dirURL.getProtocol().equals( "jar" ) )
|
if( dirURL != null && dirURL.getProtocol().equals( "jar" ) )
|
||||||
{
|
{
|
||||||
/* A JAR path */
|
/* A JAR path */
|
||||||
final String jarPath = dirURL.getPath().substring( 5, dirURL.getPath().indexOf( '!' ) ); //strip out only the JAR file
|
final String jarPath = dirURL.getPath().substring( 5, dirURL.getPath().indexOf( '!' ) ); // strip out only
|
||||||
|
// the JAR file
|
||||||
final JarFile jar = new JarFile( URLDecoder.decode( jarPath, "UTF-8" ) );
|
final JarFile jar = new JarFile( URLDecoder.decode( jarPath, "UTF-8" ) );
|
||||||
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 in case it is a subdirectory
|
final Collection<String> result = new HashSet<String>( INITIAL_RESOURCE_CAPACITY ); // avoid duplicates
|
||||||
|
// in case it is a
|
||||||
|
// subdirectory
|
||||||
while( entries.hasMoreElements() )
|
while( entries.hasMoreElements() )
|
||||||
{
|
{
|
||||||
final String name = entries.nextElement().getName();
|
final String name = entries.nextElement().getName();
|
||||||
|
|||||||
@@ -220,7 +220,6 @@ public final class CompassService
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
private class CMDirectionRequest implements Runnable
|
private class CMDirectionRequest implements Runnable
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
|
||||||
package appeng.services.version;
|
package appeng.services.version;
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
|
||||||
package appeng.services.version;
|
package appeng.services.version;
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
|
||||||
package appeng.services.version;
|
package appeng.services.version;
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
|
||||||
package appeng.services.version;
|
package appeng.services.version;
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
|
||||||
package appeng.services.version;
|
package appeng.services.version;
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
|
||||||
package appeng.services.version.github;
|
package appeng.services.version.github;
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
|
||||||
package appeng.services.version.github;
|
package appeng.services.version.github;
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
|
||||||
package appeng.services.version.github;
|
package appeng.services.version.github;
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
|
||||||
package appeng.services.version.github;
|
package appeng.services.version.github;
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
|
||||||
package appeng.services.version.github;
|
package appeng.services.version.github;
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -207,7 +207,9 @@ public class StorageHelper
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void swapRegions( World src /** over world **/, World dst /** storage cell **/, int x, int y, int z, int i, int j, int k, int scaleX, int scaleY, int scaleZ )
|
public void swapRegions( World src /** over world **/
|
||||||
|
, World dst /** storage cell **/
|
||||||
|
, int x, int y, int z, int i, int j, int k, int scaleX, int scaleY, int scaleZ )
|
||||||
{
|
{
|
||||||
for( Block matrixFrameBlock : AEApi.instance().definitions().blocks().matrixFrame().maybeBlock().asSet() )
|
for( Block matrixFrameBlock : AEApi.instance().definitions().blocks().matrixFrame().maybeBlock().asSet() )
|
||||||
{
|
{
|
||||||
@@ -254,9 +256,9 @@ public class StorageHelper
|
|||||||
this.transverseEdges( i, j, k, i + scaleX, j + scaleY, k + scaleZ, new TriggerUpdates( dst ) );
|
this.transverseEdges( i, j, k, i + scaleX, j + scaleY, k + scaleZ, new TriggerUpdates( dst ) );
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* IChunkProvider cp = destination.getChunkProvider(); if ( cp instanceof ChunkProviderServer ) { ChunkProviderServer
|
* IChunkProvider cp = destination.getChunkProvider(); if ( cp instanceof ChunkProviderServer ) {
|
||||||
|
* ChunkProviderServer
|
||||||
* srv = (ChunkProviderServer) cp; srv.unloadAllChunks(); }
|
* srv = (ChunkProviderServer) cp; srv.unloadAllChunks(); }
|
||||||
*
|
|
||||||
* cp.unloadQueuedChunks();
|
* cp.unloadQueuedChunks();
|
||||||
*/
|
*/
|
||||||
|
|
||||||
@@ -280,7 +282,6 @@ public class StorageHelper
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static class WrapInMatrixFrame implements ISpatialVisitor
|
static class WrapInMatrixFrame implements ISpatialVisitor
|
||||||
{
|
{
|
||||||
|
|
||||||
@@ -302,7 +303,6 @@ public class StorageHelper
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static class TelDestination
|
static class TelDestination
|
||||||
{
|
{
|
||||||
|
|
||||||
@@ -326,7 +326,6 @@ public class StorageHelper
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static class METeleporter extends Teleporter
|
static class METeleporter extends Teleporter
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|||||||
@@ -373,7 +373,8 @@ public class AEBaseTile extends TileEntity implements IOrientable, ICommonTile,
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Nonnull
|
@Nonnull
|
||||||
private List<AETileEventHandler> getHandlers( Map<TileEventType, List<AETileEventHandler>> eventToHandlers, TileEventType event ) {
|
private List<AETileEventHandler> getHandlers( Map<TileEventType, List<AETileEventHandler>> eventToHandlers, TileEventType event )
|
||||||
|
{
|
||||||
final List<AETileEventHandler> oldHandlers = eventToHandlers.get( event );
|
final List<AETileEventHandler> oldHandlers = eventToHandlers.get( event );
|
||||||
|
|
||||||
if( oldHandlers == null )
|
if( oldHandlers == null )
|
||||||
|
|||||||
@@ -279,7 +279,9 @@ public class TileCableBus extends AEBaseTile implements AEMultiTile, ICustomColl
|
|||||||
public boolean isBlocked( ForgeDirection side )
|
public boolean isBlocked( ForgeDirection side )
|
||||||
{
|
{
|
||||||
return !this.ImmibisMicroblocks_isSideOpen( side.ordinal() );
|
return !this.ImmibisMicroblocks_isSideOpen( side.ordinal() );
|
||||||
} @Override
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
public Iterable<AxisAlignedBB> getSelectedBoundingBoxesFromPool( World w, int x, int y, int z, Entity e, boolean visual )
|
public Iterable<AxisAlignedBB> getSelectedBoundingBoxesFromPool( World w, int x, int y, int z, Entity e, boolean visual )
|
||||||
{
|
{
|
||||||
return this.cb.getSelectedBoundingBoxesFromPool( false, true, e, visual );
|
return this.cb.getSelectedBoundingBoxesFromPool( false, true, e, visual );
|
||||||
@@ -334,7 +336,9 @@ public class TileCableBus extends AEBaseTile implements AEMultiTile, ICustomColl
|
|||||||
}
|
}
|
||||||
|
|
||||||
this.getWorldObj().setBlock( this.xCoord, this.yCoord, this.zCoord, Platform.AIR_BLOCK );
|
this.getWorldObj().setBlock( this.xCoord, this.yCoord, this.zCoord, Platform.AIR_BLOCK );
|
||||||
} @Override
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
public void addCollidingBlockToList( World w, int x, int y, int z, AxisAlignedBB bb, List<AxisAlignedBB> out, Entity e )
|
public void addCollidingBlockToList( World w, int x, int y, int z, AxisAlignedBB bb, List<AxisAlignedBB> out, Entity e )
|
||||||
{
|
{
|
||||||
for( AxisAlignedBB bx : this.getSelectedBoundingBoxesFromPool( w, x, y, z, e, false ) )
|
for( AxisAlignedBB bx : this.getSelectedBoundingBoxesFromPool( w, x, y, z, e, false ) )
|
||||||
@@ -374,7 +378,4 @@ public class TileCableBus extends AEBaseTile implements AEMultiTile, ICustomColl
|
|||||||
return this.cb.recolourBlock( side, colour, who );
|
return this.cb.recolourBlock( side, colour, who );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -34,6 +34,7 @@ import appeng.transformer.annotations.Integration.Interface;
|
|||||||
import appeng.transformer.annotations.Integration.InterfaceList;
|
import appeng.transformer.annotations.Integration.InterfaceList;
|
||||||
import appeng.transformer.annotations.Integration.Method;
|
import appeng.transformer.annotations.Integration.Method;
|
||||||
|
|
||||||
|
|
||||||
@InterfaceList( value = { @Interface( iname = "RotaryCraft", iface = "Reika.RotaryCraft.API.Power.AdvancedShaftPowerReceiver" ), @Interface( iname = "RotaryCraft", iface = "Reika.RotaryCraft.API.Interfaces.Transducerable" ) } )
|
@InterfaceList( value = { @Interface( iname = "RotaryCraft", iface = "Reika.RotaryCraft.API.Power.AdvancedShaftPowerReceiver" ), @Interface( iname = "RotaryCraft", iface = "Reika.RotaryCraft.API.Interfaces.Transducerable" ) } )
|
||||||
public abstract class RotaryCraft extends IC2 implements AdvancedShaftPowerReceiver, Transducerable
|
public abstract class RotaryCraft extends IC2 implements AdvancedShaftPowerReceiver, Transducerable
|
||||||
{
|
{
|
||||||
@@ -176,7 +177,6 @@ public abstract class RotaryCraft extends IC2 implements AdvancedShaftPowerRecei
|
|||||||
out = String.format( "Receiving %d W @ %d rad/s.", power, omega );
|
out = String.format( "Receiving %d W @ %d rad/s.", power, omega );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
ArrayList<String> messages = new ArrayList<String>( 1 );
|
ArrayList<String> messages = new ArrayList<String>( 1 );
|
||||||
messages.add( out );
|
messages.add( out );
|
||||||
return messages;
|
return messages;
|
||||||
|
|||||||
@@ -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(ForgeDirection direction)
|
||||||
@Override
|
* {
|
||||||
public final boolean canConnect(ForgeDirection direction)
|
* return internalCanAcceptPower && getPowerSides().contains( direction );
|
||||||
{
|
* }
|
||||||
return internalCanAcceptPower && getPowerSides().contains( direction );
|
* @Override
|
||||||
}
|
* public final float receiveElectricity(ForgeDirection from, ElectricityPack receive, boolean doReceive)
|
||||||
|
* {
|
||||||
@Override
|
* float accepted = 0;
|
||||||
public final float receiveElectricity(ForgeDirection 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(ForgeDirection direction)
|
||||||
|
* {
|
||||||
return accepted;
|
* return (float) getExternalPowerDemand( PowerUnits.KJ );
|
||||||
}
|
* }
|
||||||
|
* @Override
|
||||||
@Override
|
* public final float getVoltage()
|
||||||
public final float getRequest(ForgeDirection direction)
|
* {
|
||||||
{
|
* return 120;
|
||||||
return (float) getExternalPowerDemand( PowerUnits.KJ );
|
* }
|
||||||
}
|
* @Override
|
||||||
|
* public final ElectricityPack provideElectricity(ForgeDirection from, ElectricityPack request, boolean doProvide)
|
||||||
@Override
|
* {
|
||||||
public final float getVoltage()
|
* return null; // cannot be dis-charged
|
||||||
{
|
* }
|
||||||
return 120;
|
* @Override
|
||||||
}
|
* public final float getProvide(ForgeDirection direction)
|
||||||
|
* {
|
||||||
@Override
|
* return 0;
|
||||||
public final ElectricityPack provideElectricity(ForgeDirection from, ElectricityPack request, boolean doProvide)
|
* }
|
||||||
{
|
* }
|
||||||
return null; // cannot be dis-charged
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public final float getProvide(ForgeDirection direction)
|
|
||||||
{
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
*/
|
*/
|
||||||
@@ -866,7 +866,6 @@ public class TileChest extends AENetworkPowerTile implements IMEChest, IFluidHan
|
|||||||
private static final long serialVersionUID = 7995805326136526631L;
|
private static final long serialVersionUID = 7995805326136526631L;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
class ChestNetNotifier<T extends IAEStack<T>> implements IMEMonitorHandlerReceiver<T>
|
class ChestNetNotifier<T extends IAEStack<T>> implements IMEMonitorHandlerReceiver<T>
|
||||||
{
|
{
|
||||||
|
|
||||||
@@ -919,7 +918,6 @@ public class TileChest extends AENetworkPowerTile implements IMEChest, IFluidHan
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
class ChestMonitorHandler<T extends IAEStack> extends MEMonitorHandler<T>
|
class ChestMonitorHandler<T extends IAEStack> extends MEMonitorHandler<T>
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|||||||
@@ -34,7 +34,6 @@ public @interface Integration
|
|||||||
Interface[] value();
|
Interface[] value();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@Retention( RetentionPolicy.RUNTIME )
|
@Retention( RetentionPolicy.RUNTIME )
|
||||||
@Target( ElementType.TYPE )
|
@Target( ElementType.TYPE )
|
||||||
@interface Interface
|
@interface Interface
|
||||||
@@ -44,7 +43,6 @@ public @interface Integration
|
|||||||
String iname();
|
String 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;
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1306,13 +1306,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;
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -87,7 +87,6 @@ public final class AEItemStack extends AEStack<IAEItemStack> implements IAEItemS
|
|||||||
|
|
||||||
/*
|
/*
|
||||||
* Super hackery.
|
* Super hackery.
|
||||||
*
|
|
||||||
* is.itemID = appeng.api.Materials.matQuartz.itemID; damageValue = is.getItemDamage(); is.itemID = itemID;
|
* is.itemID = appeng.api.Materials.matQuartz.itemID; damageValue = is.getItemDamage(); is.itemID = itemID;
|
||||||
*/
|
*/
|
||||||
|
|
||||||
@@ -478,7 +477,8 @@ public final class AEItemStack extends AEStack<IAEItemStack> implements IAEItemS
|
|||||||
{
|
{
|
||||||
if( ia instanceof AEItemStack )
|
if( ia instanceof AEItemStack )
|
||||||
{
|
{
|
||||||
return ( (AEItemStack) ia ).def.equals( this.def );// && def.tagCompound == ((AEItemStack) ia).def.tagCompound;
|
return ( (AEItemStack) ia ).def.equals( this.def );// && def.tagCompound == ((AEItemStack)
|
||||||
|
// ia).def.tagCompound;
|
||||||
}
|
}
|
||||||
else if( ia instanceof ItemStack )
|
else if( ia instanceof 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,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;
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user