diff --git a/src/api/java/appeng/api/client/BakingPipeline.java b/src/api/java/appeng/api/client/BakingPipeline.java new file mode 100644 index 00000000..1bd5fa8f --- /dev/null +++ b/src/api/java/appeng/api/client/BakingPipeline.java @@ -0,0 +1,55 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + +package appeng.api.client; + + +import java.util.List; + +import com.google.common.collect.ImmutableList; + +import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.block.model.IBakedModel; +import net.minecraft.util.EnumFacing; + + +public class BakingPipeline implements BakingPipelineElement +{ + + private final ImmutableList> pipeline; + + public BakingPipeline( BakingPipelineElement... pipeline ) + { + this.pipeline = ImmutableList.copyOf( pipeline ); + } + + public List pipe( List things, IBakedModel parent, IBlockState state, EnumFacing side, long rand ) + { + for( BakingPipelineElement pipe : pipeline ) + { + things = pipe.pipe( things, parent, state, side, rand ); + } + return things; + } + +} diff --git a/src/api/java/appeng/api/client/BakingPipelineElement.java b/src/api/java/appeng/api/client/BakingPipelineElement.java new file mode 100644 index 00000000..b3ef084e --- /dev/null +++ b/src/api/java/appeng/api/client/BakingPipelineElement.java @@ -0,0 +1,39 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + +package appeng.api.client; + + +import java.util.List; + +import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.block.model.IBakedModel; +import net.minecraft.util.EnumFacing; + + +public interface BakingPipelineElement +{ + + public List pipe( List elements, IBakedModel parent, IBlockState state, EnumFacing side, long rand ); + +} diff --git a/src/api/java/appeng/api/implementations/parts/IPartCable.java b/src/api/java/appeng/api/implementations/parts/IPartCable.java index 52a1ae69..d730b9a7 100644 --- a/src/api/java/appeng/api/implementations/parts/IPartCable.java +++ b/src/api/java/appeng/api/implementations/parts/IPartCable.java @@ -86,4 +86,5 @@ public interface IPartCable extends IPart, IGridHost * @return true if this side is currently connects to an external block. */ boolean isConnected( EnumFacing side ); + } diff --git a/src/api/java/appeng/api/parts/IFacadePart.java b/src/api/java/appeng/api/parts/IFacadePart.java index 7984d1c8..bcc27f8c 100644 --- a/src/api/java/appeng/api/parts/IFacadePart.java +++ b/src/api/java/appeng/api/parts/IFacadePart.java @@ -24,11 +24,19 @@ package appeng.api.parts; +import java.util.List; + +import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.entity.Entity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumFacing; import net.minecraft.util.math.AxisAlignedBB; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +import appeng.api.client.BakingPipeline; import appeng.api.util.AEPartLocation; @@ -72,4 +80,7 @@ public interface IFacadePart void setThinFacades( boolean useThinFacades ); boolean isTransparent(); + + @SideOnly( Side.CLIENT ) + public List getOrBakeQuads( IPartHost host, BakingPipeline rotatingPipeline, IBlockState state, EnumFacing side, long rand ); } \ No newline at end of file diff --git a/src/api/java/appeng/api/parts/IPart.java b/src/api/java/appeng/api/parts/IPart.java index 2e59adce..b692f9d1 100644 --- a/src/api/java/appeng/api/parts/IPart.java +++ b/src/api/java/appeng/api/parts/IPart.java @@ -30,17 +30,23 @@ import java.util.Random; import io.netty.buffer.ByteBuf; +import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +import appeng.api.client.BakingPipeline; import appeng.api.networking.IGridNode; import appeng.api.util.AEPartLocation; @@ -216,9 +222,10 @@ public interface IPart extends IBoxProvider void getDrops( List drops, boolean wrenched ); /** - * @return 0 - 8, reasonable default 3-4, this controls the cable connection to the node. + * @return 0 - 8, reasonable default 3-4, this controls the cable connection to the node. -1 to render connection + * yourself. */ - int cableConnectionRenderTo(); + int getCableConnectionLength(); /** * same as Block.randomDisplayTick, for but parts. @@ -246,4 +253,8 @@ public interface IPart extends IBoxProvider * @return true if the part can be placed on this support. */ boolean canBePlacedOn( BusSupport what ); + + @SideOnly( Side.CLIENT ) + public List getOrBakeQuads( BakingPipeline rotatingPipeline, IBlockState state, EnumFacing side, long rand ); + } \ No newline at end of file diff --git a/src/api/java/appeng/api/parts/IPartHelper.java b/src/api/java/appeng/api/parts/IPartHelper.java index 319e984c..d8ed38ff 100644 --- a/src/api/java/appeng/api/parts/IPartHelper.java +++ b/src/api/java/appeng/api/parts/IPartHelper.java @@ -26,6 +26,7 @@ package appeng.api.parts; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; @@ -72,7 +73,7 @@ public interface IPartHelper * * @return true if placing was successful */ - boolean placeBus( ItemStack is, BlockPos pos, EnumFacing side, EntityPlayer player, EnumHand hand, World world ); + EnumActionResult placeBus( ItemStack is, BlockPos pos, EnumFacing side, EntityPlayer player, EnumHand hand, World world ); /** * @return the render mode diff --git a/src/api/java/appeng/api/parts/IPartItem.java b/src/api/java/appeng/api/parts/IPartItem.java index 41688c84..82146958 100644 --- a/src/api/java/appeng/api/parts/IPartItem.java +++ b/src/api/java/appeng/api/parts/IPartItem.java @@ -36,26 +36,20 @@ import net.minecraft.item.ItemStack; * * you must register your bus with the Bus renderer, using AEApi.INSTANCE().partHelper().setItemBusRenderer( this ); * - * then simply add these two methods, which tell MC to use the Block Textures, and call AE's Bus Placement Code. + * then simply add this, and call AE's Bus Placement Code. * * 
  * 
- * {@literal @}Override
- * {@literal @}SideOnly(Side.CLIENT)
- * public int getSpriteNumber()
- * {
- *     return 0;
- * }
  *
  * {@literal @}Override
- * public boolean onItemUse(ItemStack is, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ)
- * {
- *     return AEApi.INSTANCE().partHelper().placeBus( is, x, y, z, side, player, world );
- * }
+ * public default EnumActionResult onItemUse(ItemStack is, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ)
+ *	{
+ *		return AEApi.instance().partHelper().placeBus( is, pos, side, player, hand, world );
+ *	}
  * 
  *
*/ -public interface IPartItem +public interface IPartItem

{ /** @@ -66,5 +60,6 @@ public interface IPartItem * @return part from item */ @Nullable - IPart createPartFromItemStack( ItemStack is ); + P createPartFromItemStack( ItemStack is ); + } \ No newline at end of file diff --git a/src/api/java/appeng/api/util/AECableType.java b/src/api/java/appeng/api/util/AECableType.java index 5d6f3464..39369247 100644 --- a/src/api/java/appeng/api/util/AECableType.java +++ b/src/api/java/appeng/api/util/AECableType.java @@ -24,31 +24,71 @@ package appeng.api.util; +import net.minecraft.util.ResourceLocation; + + public enum AECableType { /** * No Cable present. */ - NONE, + NONE( null, 0 ), /** * Connections to this block should render as glass. */ - GLASS, + GLASS( "glass", 0 ), /** * Connections to this block should render as covered. */ - COVERED, + COVERED( "covered", 0 ), /** * Connections to this block should render as smart. */ - SMART, + SMART( "smart", 8 ), /** * Dense Cable, represents a tier 2 block that can carry 32 channels. */ - DENSE, + DENSE( "dense", 32 ); + + public static final AECableType[] VALIDCABLES = { GLASS, COVERED, SMART, DENSE }; + + private final String type; + private final int displayedChannels; + private final ResourceLocation model; + private final ResourceLocation connectionModel; + private final ResourceLocation straightModel; + + private AECableType( String type, int displayedChannels ) + { + this.type = type; + this.displayedChannels = displayedChannels; + this.model = new ResourceLocation( "appliedenergistics2", "part/cable/" + type + "/center" ); + this.connectionModel = new ResourceLocation( "appliedenergistics2", "part/cable/" + type + "/connection" ); + this.straightModel = new ResourceLocation( "appliedenergistics2", "part/cable/" + type + "/straight" ); + } + + public int displayedChannels() + { + return displayedChannels; + } + + public ResourceLocation getModel() + { + return model; + } + + public ResourceLocation getConnectionModel() + { + return connectionModel; + } + + public ResourceLocation getStraightModel() + { + return straightModel; + } } diff --git a/src/main/java/appeng/block/networking/BlockCableBus.java b/src/main/java/appeng/block/networking/BlockCableBus.java index 8b482cca..e3232f34 100644 --- a/src/main/java/appeng/block/networking/BlockCableBus.java +++ b/src/main/java/appeng/block/networking/BlockCableBus.java @@ -26,6 +26,8 @@ import java.util.Random; import javax.annotation.Nullable; import net.minecraft.block.Block; +import net.minecraft.block.properties.IProperty; +import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.client.particle.ParticleManager; import net.minecraft.creativetab.CreativeTabs; @@ -44,6 +46,9 @@ import net.minecraft.util.math.RayTraceResult; import net.minecraft.util.math.Vec3d; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import net.minecraftforge.common.property.ExtendedBlockState; +import net.minecraftforge.common.property.IExtendedBlockState; +import net.minecraftforge.common.property.IUnlistedProperty; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -55,11 +60,9 @@ import appeng.api.util.AEColor; import appeng.block.AEBaseTileBlock; import appeng.core.AEConfig; import appeng.core.Api; -import appeng.core.CommonHelper; import appeng.core.features.AECableBusFeatureHandler; import appeng.core.features.AEFeature; import appeng.helpers.AEGlassMaterial; -import appeng.helpers.Reflected; import appeng.integration.IntegrationRegistry; import appeng.integration.IntegrationType; import appeng.integration.abstraction.IFMP; @@ -67,30 +70,14 @@ import appeng.parts.ICableBusContainer; import appeng.parts.NullCableBusContainer; import appeng.tile.AEBaseTile; import appeng.tile.networking.TileCableBus; -import appeng.tile.networking.TileCableBusTESR; import appeng.util.Platform; -// TODO: MFR INTEGRATION -//@Interface( iface = "powercrystals.minefactoryreloaded.api.rednet.connectivity.IRedNetConnection", iname = IntegrationType.MFR ) -public class BlockCableBus extends AEBaseTileBlock // implements -// IRedNetConnection +public class BlockCableBus extends AEBaseTileBlock { private static final ICableBusContainer NULL_CABLE_BUS = new NullCableBusContainer(); private static Class noTesrTile; - private static Class tesrTile; - - /** - * Immibis MB Support. - * - * It will look for a field named - * ImmibisMicroblocks_TransformableBlockMarker or - * ImmibisMicroblocks_TransformableTileEntityMarker, modifiers, type, etc - * can be ignored. - */ - @Reflected - private static final boolean ImmibisMicroblocks_TransformableBlockMarker = true; public BlockCableBus() { @@ -104,6 +91,26 @@ public class BlockCableBus extends AEBaseTileBlock // implements this.setFeature( EnumSet.of( AEFeature.Core ) ); } + public static final CableBusContainerUnlistedProperty cableBus = new CableBusContainerUnlistedProperty(); + + @Override + protected BlockStateContainer createBlockState() + { + return new ExtendedBlockState( this, new IProperty[0], new IUnlistedProperty[] { cableBus } ); + } + + @Override + public IBlockState getActualState( IBlockState state, IBlockAccess world, BlockPos pos ) + { + return state; + } + + @Override + public IBlockState getExtendedState( IBlockState state, IBlockAccess world, BlockPos pos ) + { + return ( (IExtendedBlockState) state ).withProperty( cableBus, ( (TileCableBus) world.getTileEntity( pos ) ).getCableBus() ); + } + @Override public void randomDisplayTick( final IBlockState state, final World worldIn, final BlockPos pos, final Random rand ) { @@ -146,8 +153,8 @@ public class BlockCableBus extends AEBaseTileBlock // implements public int getStrongPower( final IBlockState state, final IBlockAccess w, final BlockPos pos, final EnumFacing side ) { return this.cb( w, pos ).isProvidingStrongPower( side.getOpposite() ); // TODO: - // IS - // OPPOSITE!? + // IS + // OPPOSITE!? } @Override @@ -236,7 +243,7 @@ public class BlockCableBus extends AEBaseTileBlock // implements return null; } - + @Override @SideOnly( Side.CLIENT ) public boolean addHitEffects( final IBlockState state, final World world, final RayTraceResult target, final ParticleManager effectRenderer ) @@ -352,24 +359,6 @@ public class BlockCableBus extends AEBaseTileBlock // implements // do nothing } - @Override - public T getTileEntity( final IBlockAccess w, final BlockPos pos ) - { - final TileEntity te = w.getTileEntity( pos ); - - if( noTesrTile.isInstance( te ) ) - { - return (T) te; - } - - if( tesrTile != null && tesrTile.isInstance( te ) ) - { - return (T) te; - } - - return null; - } - @Override protected void setFeature( final EnumSet f ) { @@ -382,17 +371,6 @@ public class BlockCableBus extends AEBaseTileBlock // implements noTesrTile = Api.INSTANCE.partHelper().getCombinedInstance( TileCableBus.class.getName() ); this.setTileEntity( noTesrTile ); GameRegistry.registerTileEntity( noTesrTile, "BlockCableBus" ); - if( Platform.isClient() ) - { - tesrTile = Api.INSTANCE.partHelper().getCombinedInstance( TileCableBusTESR.class.getName() ); - GameRegistry.registerTileEntity( tesrTile, "ClientOnly_TESR_CableBus" ); - CommonHelper.proxy.bindTileEntitySpecialRenderer( tesrTile, this ); - } - } - - public static Class getTesrTile() - { - return tesrTile; } public static Class getNoTesrTile() @@ -400,19 +378,4 @@ public class BlockCableBus extends AEBaseTileBlock // implements return noTesrTile; } - // TODO MFR Integration - // @Override - // @Method( iname = IntegrationType.MFR ) - // public RedNetConnectionType getConnectionType( World world, int x, int y, - // int z, ForgeDirection side ) - // { - // return this.cb( world, x, y, z ).canConnectRedstone( EnumSet.allOf( - // ForgeDirection.class ) ) ? - // RedNetConnectionType.CableSingle : RedNetConnectionType.None; - // } - // - // public void setRenderColor( int color ) - // { - // this.myColorMultiplier = color; - // } } diff --git a/src/main/java/appeng/block/networking/CableBusContainerUnlistedProperty.java b/src/main/java/appeng/block/networking/CableBusContainerUnlistedProperty.java new file mode 100644 index 00000000..e9b454a4 --- /dev/null +++ b/src/main/java/appeng/block/networking/CableBusContainerUnlistedProperty.java @@ -0,0 +1,34 @@ +package appeng.block.networking; + +import net.minecraftforge.common.property.IUnlistedProperty; + +import appeng.parts.CableBusContainer; + +public class CableBusContainerUnlistedProperty implements IUnlistedProperty +{ + + @Override + public String getName() + { + return "bus"; + } + + @Override + public boolean isValid( CableBusContainer value ) + { + return true; + } + + @Override + public Class getType() + { + return CableBusContainer.class; + } + + @Override + public String valueToString( CableBusContainer value ) + { + return null; + } + +} diff --git a/src/main/java/appeng/client/ClientHelper.java b/src/main/java/appeng/client/ClientHelper.java index 78cefb34..b94fc1ac 100644 --- a/src/main/java/appeng/client/ClientHelper.java +++ b/src/main/java/appeng/client/ClientHelper.java @@ -24,15 +24,16 @@ import java.util.ArrayList; import java.util.List; import java.util.Random; +import com.google.common.collect.ImmutableMap; + import org.lwjgl.opengl.GL11; -import net.minecraft.block.Block; -import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.block.model.ModelResourceLocation; -import net.minecraft.client.renderer.color.IBlockColor; +import net.minecraft.client.renderer.color.IItemColor; import net.minecraft.client.renderer.color.ItemColors; import net.minecraft.client.renderer.entity.RenderManager; +import net.minecraft.client.resources.IReloadableResourceManager; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; @@ -40,20 +41,21 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumHand; -import net.minecraft.util.math.BlockPos; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.RayTraceResult; import net.minecraft.util.math.Vec3d; -import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.client.event.ModelBakeEvent; import net.minecraftforge.client.event.MouseEvent; import net.minecraftforge.client.event.RenderLivingEvent; import net.minecraftforge.client.event.TextureStitchEvent; +import net.minecraftforge.client.model.IModel; import net.minecraftforge.client.model.ModelLoaderRegistry; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import appeng.api.parts.CableRenderMode; +import appeng.api.util.AECableType; import appeng.api.util.AEColor; import appeng.block.AEBaseBlock; import appeng.client.render.effects.AssemblerFX; @@ -63,11 +65,13 @@ import appeng.client.render.effects.LightningArcFX; import appeng.client.render.effects.LightningFX; import appeng.client.render.effects.VibrantFX; import appeng.client.render.model.GlassModelLoader; +import appeng.client.render.model.ModelsCache; import appeng.client.render.model.UVLModelLoader; import appeng.client.render.textures.ParticleTextures; import appeng.core.AEConfig; import appeng.core.AELog; import appeng.core.Api; +import appeng.core.AppEng; import appeng.core.CommonHelper; import appeng.core.features.IAEFeature; import appeng.core.sync.network.NetworkHandler; @@ -81,6 +85,8 @@ import appeng.helpers.IMouseWheelItem; import appeng.hooks.TickHandler; import appeng.hooks.TickHandler.PlayerColor; import appeng.items.misc.ItemPaintBall; +import appeng.items.parts.PartType; +import appeng.parts.AEBasePart; import appeng.server.ServerHelper; import appeng.transformer.MissingCoreMod; import appeng.util.Platform; @@ -95,6 +101,7 @@ public class ClientHelper extends ServerHelper MinecraftForge.EVENT_BUS.register( this ); ModelLoaderRegistry.registerLoader( UVLModelLoader.INSTANCE ); ModelLoaderRegistry.registerLoader( new GlassModelLoader() ); + ( (IReloadableResourceManager) Minecraft.getMinecraft().getResourceManager() ).registerReloadListener( ModelsCache.INSTANCE ); for( IAEFeature feature : Api.INSTANCE.definitions().getFeatureRegistry().getRegisteredFeatures() ) { feature.handler().registerStateMapper(); @@ -125,10 +132,6 @@ public class ClientHelper extends ServerHelper for( IAEFeature feature : Api.INSTANCE.definitions().getFeatureRegistry().getRegisteredFeatures() ) { feature.handler().registerModel(); - if( feature instanceof AEBaseBlock ) - { - Minecraft.getMinecraft().getBlockColors().registerBlockColorHandler( new AEBaseBlockColor(), (Block) feature ); - } } // Register color handling for paintball items @@ -296,12 +299,6 @@ public class ClientHelper extends ServerHelper throw new MissingCoreMod(); } - @SubscribeEvent - public void modelsBake( ModelBakeEvent event ) - { - UVLModelLoader.INSTANCE.setLoader( event.getModelLoader() ); - } - @SubscribeEvent public void postPlayerRender( final RenderLivingEvent.Pre p ) { @@ -383,9 +380,10 @@ public class ClientHelper extends ServerHelper @SubscribeEvent public void onModelBakeEvent( final ModelBakeEvent event ) { + UVLModelLoader.INSTANCE.setLoader( event.getModelLoader() ); for( IAEFeature feature : Api.INSTANCE.definitions().getFeatureRegistry().getRegisteredFeatures() ) { - feature.handler().registerCustomModelOverride(event.getModelRegistry()); + feature.handler().registerCustomModelOverride( event.getModelRegistry() ); } } @@ -432,6 +430,48 @@ public class ClientHelper extends ServerHelper public void onTextureStitch( final TextureStitchEvent.Pre event ) { ParticleTextures.registerSprite( event ); + for( AECableType type : AECableType.VALIDCABLES ) + { + for( IModel model : new IModel[] { ModelsCache.INSTANCE.getOrLoadModel( type.getModel() ), ModelsCache.INSTANCE.getOrLoadModel( type.getConnectionModel() ), ModelsCache.INSTANCE.getOrLoadModel( type.getStraightModel() ) } ) + { + for( ResourceLocation location : model.getTextures() ) + { + for( AEColor color : AEColor.values() ) + { + if( type.displayedChannels() > 0 ) + { + for( int i = 0; i <= type.displayedChannels(); i++ ) + { + event.getMap().registerSprite( AEBasePart.replaceProperties( location, ImmutableMap.of( "color", color.name(), "channels", String.valueOf( i ) ) ) ); + } + } + else + { + event.getMap().registerSprite( AEBasePart.replaceProperties( location, ImmutableMap.of( "color", color.name() ) ) ); + } + } + } + } + } + for( PartType part : PartType.values() ) + { + if( !part.isCable() ) + { + IModel model = ModelsCache.INSTANCE.getOrLoadModel( part.getModel() ); + for( ResourceLocation location : model.getTextures() ) + { + for( AEColor color : AEColor.values() ) + { + event.getMap().registerSprite( AEBasePart.replaceProperties( location, ImmutableMap.of( "color", color.name() ) ) ); + } + } + } + } + + for( ResourceLocation location : ModelsCache.INSTANCE.getOrLoadModel( new ResourceLocation( AppEng.MOD_ID, "part/cable_facade" ) ).getTextures() ) + { + event.getMap().registerSprite( location ); + } } private static class IconReg @@ -458,15 +498,29 @@ public class ClientHelper extends ServerHelper } } - - public static class AEBaseBlockColor implements IBlockColor + public class ItemPaintBallColor implements IItemColor { @Override - public int colorMultiplier( IBlockState state, IBlockAccess worldIn, BlockPos pos, int tintIndex ) + public int getColorFromItemstack( ItemStack stack, int tintIndex ) { - return tintIndex; + final AEColor col = ( (ItemPaintBall) stack.getItem() ).getColor( stack ); + + final int colorValue = stack.getItemDamage() >= 20 ? col.mediumVariant : col.mediumVariant; + final int r = ( colorValue >> 16 ) & 0xff; + final int g = ( colorValue >> 8 ) & 0xff; + final int b = ( colorValue ) & 0xff; + + if( stack.getItemDamage() >= 20 ) + { + final float fail = 0.7f; + final int full = (int) ( 255 * 0.3 ); + return (int) ( full + r * fail ) << 16 | (int) ( full + g * fail ) << 8 | (int) ( full + b * fail ) | 0xff << 24; + } + else + { + return r << 16 | g << 8 | b | 0xff << 24; + } } } - } \ No newline at end of file diff --git a/src/main/java/appeng/client/render/model/ModelsCache.java b/src/main/java/appeng/client/render/model/ModelsCache.java new file mode 100644 index 00000000..7c4518d7 --- /dev/null +++ b/src/main/java/appeng/client/render/model/ModelsCache.java @@ -0,0 +1,119 @@ + +package appeng.client.render.model; + + +import java.util.HashMap; +import java.util.Map; + +import com.google.common.base.Function; +import com.google.common.base.Optional; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.block.model.IBakedModel; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.renderer.vertex.DefaultVertexFormats; +import net.minecraft.client.renderer.vertex.VertexFormat; +import net.minecraft.client.resources.IResourceManager; +import net.minecraft.client.resources.IResourceManagerReloadListener; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.client.model.IModel; +import net.minecraftforge.client.model.ModelLoaderRegistry; +import net.minecraftforge.common.model.IModelState; + + +public enum ModelsCache implements IResourceManagerReloadListener +{ + + INSTANCE; + + public static final IModelState DEFAULTMODELSTATE = opt -> Optional.absent(); + public static final VertexFormat DEFAULTVERTEXFORMAT = DefaultVertexFormats.BLOCK; + public static final Function DEFAULTTEXTUREGETTER = texture -> Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite( texture.toString() ); + + private final Map cache = new HashMap<>(); + private final Map bakedCache = new HashMap<>(); + + public IModel getOrLoadModel( ResourceLocation location ) + { + IModel model = cache.get( location ); + if( model == null ) + { + try + { + model = ModelLoaderRegistry.getModel( location ); + } + catch( Exception e ) + { + // TODO 1.10.2-R - log this in pretty way + e.printStackTrace(); + model = ModelLoaderRegistry.getMissingModel(); + } + cache.put( location, model ); + } + return model; + } + + public IBakedModel getModel( ResourceLocation key ) + { + return bakedCache.get( key ); + } + + public IBakedModel getOrLoadModel( ResourceLocation key, ResourceLocation location, IModelState state, VertexFormat format, Function textureGetter ) + { + IBakedModel model = getModel( key ); + if( model == null ) + { + model = getOrLoadModel( location ).bake( state, format, textureGetter ); + bakedCache.put( key, model ); + } + return model; + } + + public IBakedModel getOrLoadModel( ResourceLocation key, ResourceLocation location, IModelState state, VertexFormat format ) + { + return getOrLoadModel( key, location, state, format, DEFAULTTEXTUREGETTER ); + } + + public IBakedModel getOrLoadModel( ResourceLocation key, ResourceLocation location, IModelState state, Function textureGetter ) + { + return getOrLoadModel( key, location, state, DEFAULTVERTEXFORMAT, textureGetter ); + } + + public IBakedModel getOrLoadModel( ResourceLocation key, ResourceLocation location, VertexFormat format, Function textureGetter ) + { + return getOrLoadModel( key, location, DEFAULTMODELSTATE, format, textureGetter ); + } + + public IBakedModel getOrLoadModel( ResourceLocation key, ResourceLocation location, IModelState state ) + { + return getOrLoadModel( key, location, state, DEFAULTVERTEXFORMAT, DEFAULTTEXTUREGETTER ); + } + + public IBakedModel getOrLoadModel( ResourceLocation key, ResourceLocation location, VertexFormat format ) + { + return getOrLoadModel( key, location, DEFAULTMODELSTATE, format, DEFAULTTEXTUREGETTER ); + } + + public IBakedModel getOrLoadModel( ResourceLocation key, ResourceLocation location, Function textureGetter ) + { + return getOrLoadModel( key, location, DEFAULTMODELSTATE, DEFAULTVERTEXFORMAT, textureGetter ); + } + + public IBakedModel getOrLoadModel( ResourceLocation key, ResourceLocation location ) + { + return getOrLoadModel( key, location, DEFAULTMODELSTATE, DEFAULTVERTEXFORMAT, DEFAULTTEXTUREGETTER ); + } + + public IBakedModel getOrLoadBakedModel( ResourceLocation location ) + { + return getOrLoadModel( location, location, DEFAULTMODELSTATE, DEFAULTVERTEXFORMAT, DEFAULTTEXTUREGETTER ); + } + + @Override + public void onResourceManagerReload( IResourceManager resourceManager ) + { + cache.clear(); + bakedCache.clear(); + } + +} diff --git a/src/main/java/appeng/client/render/model/pipeline/BakingPipelineBakedModel.java b/src/main/java/appeng/client/render/model/pipeline/BakingPipelineBakedModel.java new file mode 100644 index 00000000..57757357 --- /dev/null +++ b/src/main/java/appeng/client/render/model/pipeline/BakingPipelineBakedModel.java @@ -0,0 +1,72 @@ + +package appeng.client.render.model.pipeline; + + +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.block.model.BakedQuad; +import net.minecraft.client.renderer.block.model.IBakedModel; +import net.minecraft.client.renderer.block.model.ItemCameraTransforms; +import net.minecraft.client.renderer.block.model.ItemOverrideList; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.util.EnumFacing; + +import appeng.api.client.BakingPipeline; +import appeng.api.client.BakingPipelineElement; + + +public class BakingPipelineBakedModel extends BakingPipeline implements IBakedModel +{ + + private final IBakedModel parent; + public BakingPipelineBakedModel( IBakedModel parent, BakingPipelineElement... pipeline ) + { + super( pipeline ); + this.parent = parent; + } + + @Override + public List getQuads( IBlockState state, EnumFacing side, long rand ) + { + return pipe( new ArrayList(), parent, state, side, rand ); + } + + @Override + public boolean isAmbientOcclusion() + { + return parent.isAmbientOcclusion(); + } + + @Override + public boolean isGui3d() + { + return parent.isGui3d(); + } + + @Override + public boolean isBuiltInRenderer() + { + return parent.isBuiltInRenderer(); + } + + @Override + public TextureAtlasSprite getParticleTexture() + { + return parent.getParticleTexture(); + } + + @Override + public ItemCameraTransforms getItemCameraTransforms() + { + return parent.getItemCameraTransforms(); + } + + @Override + public ItemOverrideList getOverrides() + { + return parent.getOverrides(); + } + +} diff --git a/src/main/java/appeng/client/render/model/pipeline/DoubleFacingQuadRotator.java b/src/main/java/appeng/client/render/model/pipeline/DoubleFacingQuadRotator.java new file mode 100644 index 00000000..7a3a79fe --- /dev/null +++ b/src/main/java/appeng/client/render/model/pipeline/DoubleFacingQuadRotator.java @@ -0,0 +1,107 @@ + +package appeng.client.render.model.pipeline; + + +import java.util.ArrayList; +import java.util.List; + +import javax.vecmath.Vector3f; +import javax.vecmath.Vector4f; + +import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.block.model.IBakedModel; +import net.minecraft.client.renderer.vertex.VertexFormatElement; +import net.minecraft.util.EnumFacing; + +import appeng.api.client.BakingPipelineElement; +import appeng.block.AEBaseTileBlock; +import appeng.client.render.FacingToRotation; + + +public class DoubleFacingQuadRotator implements BakingPipelineElement +{ + + @Override + public List pipe( List elements, IBakedModel parent, IBlockState state, EnumFacing side, long rand ) + { + if( state != null ) + { + final EnumFacing forward = state.getValue( AEBaseTileBlock.AE_BLOCK_FORWARD ); + final EnumFacing up = state.getValue( AEBaseTileBlock.AE_BLOCK_UP ); + final FacingToRotation f2r = FacingToRotation.get( forward, up ); + List rotated = new ArrayList(); + for( QuadVertexData data : elements ) + { + data.setFace( f2r.rotate( data.getFace() ) ); + float[][][] qd = data.getData(); + for( int v = 0; v < 4; v++ ) + { + for( int e = 0; e < data.getFormat().getElementCount(); e++ ) + { + VertexFormatElement element = data.getFormat().getElement( e ); + if( element.getUsage() == VertexFormatElement.EnumUsage.POSITION ) + { + qd[v][e] = transform( f2r, qd[v][e] ); + } + else if( element.getUsage() == VertexFormatElement.EnumUsage.NORMAL ) + { + qd[v][e] = transformNormal( f2r, qd[v][e] ); + } + } + } + rotated.add( new QuadVertexData( data.getFormat(), qd, data.getTintIndex(), data.getFace(), data.getSprite(), data.shouldApplyDiffuseLighting() ) ); + } + return rotated; + } + return elements; + } + + private float[] transform( FacingToRotation f2r, float[] fs ) + { + switch( fs.length ) + { + case 3: + Vector3f vec = new Vector3f( fs[0], fs[1], fs[2] ); + vec.x -= 0.5f; + vec.y -= 0.5f; + vec.z -= 0.5f; + f2r.getMat().transform( vec ); + vec.x += 0.5f; + vec.y += 0.5f; + vec.z += 0.5f; + return new float[] { vec.x, vec.y, vec.z }; + case 4: + Vector4f vecc = new Vector4f( fs[0], fs[1], fs[2], fs[3] ); + vecc.x -= 0.5f; + vecc.y -= 0.5f; + vecc.z -= 0.5f; + f2r.getMat().transform( vecc ); + vecc.x += 0.5f; + vecc.y += 0.5f; + vecc.z += 0.5f; + return new float[] { vecc.x, vecc.y, vecc.z, vecc.w }; + + default: + return fs; + } + } + + private float[] transformNormal( FacingToRotation f2r, float[] fs ) + { + switch( fs.length ) + { + case 3: + Vector3f vec = new Vector3f( fs[0], fs[1], fs[2] ); + f2r.getMat().transform( vec ); + return new float[] { vec.x, vec.y, vec.z }; + case 4: + Vector4f vecc = new Vector4f( fs[0], fs[1], fs[2], fs[3] ); + f2r.getMat().transform( vecc ); + return new float[] { vecc.x, vecc.y, vecc.z, vecc.w }; + + default: + return fs; + } + } + +} diff --git a/src/main/java/appeng/client/render/model/pipeline/FacingQuadRotator.java b/src/main/java/appeng/client/render/model/pipeline/FacingQuadRotator.java new file mode 100644 index 00000000..4f2664a7 --- /dev/null +++ b/src/main/java/appeng/client/render/model/pipeline/FacingQuadRotator.java @@ -0,0 +1,39 @@ + +package appeng.client.render.model.pipeline; + + +import java.util.List; + +import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.block.model.IBakedModel; +import net.minecraft.util.EnumFacing; +import net.minecraftforge.common.model.TRSRTransformation; + + +public class FacingQuadRotator extends MatVecApplicator +{ + + private EnumFacing override; + + public FacingQuadRotator( EnumFacing override ) + { + super( TRSRTransformation.getMatrix( override ) ); + this.override = override; + } + + public FacingQuadRotator() + { + this.override = null; + } + + @Override + public List pipe( List elements, IBakedModel parent, IBlockState state, EnumFacing side, long rand ) + { + if( override == null ) + { + setMatrix( TRSRTransformation.getMatrix( side ) ); + } + return super.pipe( elements, parent, state, side, rand ); + } + +} diff --git a/src/main/java/appeng/client/render/model/pipeline/MatVecApplicator.java b/src/main/java/appeng/client/render/model/pipeline/MatVecApplicator.java new file mode 100644 index 00000000..cffcbd6b --- /dev/null +++ b/src/main/java/appeng/client/render/model/pipeline/MatVecApplicator.java @@ -0,0 +1,141 @@ + +package appeng.client.render.model.pipeline; + + +import java.util.ArrayList; +import java.util.List; + +import javax.vecmath.Matrix4f; +import javax.vecmath.Vector3f; +import javax.vecmath.Vector4f; + +import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.block.model.IBakedModel; +import net.minecraft.client.renderer.vertex.VertexFormatElement; +import net.minecraft.util.EnumFacing; +import net.minecraftforge.common.model.TRSRTransformation; + +import appeng.api.client.BakingPipelineElement; + + +public class MatVecApplicator implements BakingPipelineElement +{ + + private Matrix4f matrix; + private boolean forceTranslate; + + public MatVecApplicator( Matrix4f matrix, boolean forceTranslate ) + { + this.matrix = matrix; + this.forceTranslate = forceTranslate; + } + + public MatVecApplicator( Matrix4f matrix ) + { + this( matrix, false ); + } + + public MatVecApplicator() + { + this( new Matrix4f() ); + } + + public Matrix4f getMatrix() + { + return matrix; + } + + public void setMatrix( Matrix4f matrix ) + { + this.matrix = matrix; + } + + public boolean forceTranslate() + { + return forceTranslate; + } + + public void setForceTranslate( boolean forceTranslate ) + { + this.forceTranslate = forceTranslate; + } + + @Override + public List pipe( List elements, IBakedModel parent, IBlockState state, EnumFacing side, long rand ) + { + List rotated = new ArrayList(); + for( QuadVertexData data : elements ) + { + float[][][] qd = data.getData(); + data.setFace( side != null ? TRSRTransformation.rotate( matrix, side ) : side ); + for( int v = 0; v < 4; v++ ) + { + for( int e = 0; e < data.getFormat().getElementCount(); e++ ) + { + VertexFormatElement element = data.getFormat().getElement( e ); + if( element.getUsage() == VertexFormatElement.EnumUsage.POSITION ) + { + qd[v][e] = transform( qd[v][e] ); + } + else if( element.getUsage() == VertexFormatElement.EnumUsage.NORMAL ) + { + qd[v][e] = transformNormal( qd[v][e] ); + } + } + } + rotated.add( new QuadVertexData( data.getFormat(), qd, data.getTintIndex(), data.getFace(), data.getSprite(), data.shouldApplyDiffuseLighting() ) ); + } + return rotated; + } + + private float[] transform( float[] fs ) + { + switch( fs.length ) + { + case 3: + Vector4f vec = new Vector4f( fs[0], fs[1], fs[2], forceTranslate ? 1 : 0 ); + vec.x -= 0.5f; + vec.y -= 0.5f; + vec.z -= 0.5f; + this.matrix.transform( vec ); + vec.x += 0.5f; + vec.y += 0.5f; + vec.z += 0.5f; + return new float[] { vec.x, vec.y, vec.z }; + case 4: + Vector4f vecc = new Vector4f( fs[0], fs[1], fs[2], forceTranslate ? 1 : fs[3] ); + vecc.x -= 0.5f; + vecc.y -= 0.5f; + vecc.z -= 0.5f; + this.matrix.transform( vecc ); + vecc.x += 0.5f; + vecc.y += 0.5f; + vecc.z += 0.5f; + return new float[] { vecc.x, vecc.y, vecc.z, vecc.w }; + + default: + return fs; + } + } + + private float[] transformNormal( float[] fs ) + { + switch( fs.length ) + { + case 3: + Vector3f vec = new Vector3f( fs[0], fs[1], fs[2] ); + this.matrix.transform( vec ); + vec.normalize(); + return new float[] { vec.x, vec.y, vec.z }; + case 4: + Vector4f vecc = new Vector4f( fs[0], fs[1], fs[2], fs[3] ); + this.matrix.transform( vecc ); + vecc.normalize(); + return new float[] { vecc.x, vecc.y, vecc.z, vecc.w }; + + default: + return fs; + } + } + +} diff --git a/src/main/java/appeng/client/render/model/pipeline/Merge.java b/src/main/java/appeng/client/render/model/pipeline/Merge.java new file mode 100644 index 00000000..a6b60ffd --- /dev/null +++ b/src/main/java/appeng/client/render/model/pipeline/Merge.java @@ -0,0 +1,37 @@ + +package appeng.client.render.model.pipeline; + + +import java.util.ArrayList; +import java.util.List; + +import com.google.common.collect.ImmutableList; + +import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.block.model.IBakedModel; +import net.minecraft.util.EnumFacing; + +import appeng.api.client.BakingPipelineElement; + + +public class Merge implements BakingPipelineElement +{ + + private final ImmutableList> pipeline; + + public Merge( BakingPipelineElement... pipeline ) + { + this.pipeline = ImmutableList.copyOf( pipeline ); + } + + @Override + public List pipe( List elements, IBakedModel parent, IBlockState state, EnumFacing side, long rand ) + { + for( BakingPipelineElement element : pipeline ) + { + elements.addAll( element.pipe( new ArrayList<>(), parent, state, side, rand ) ); + } + return elements; + } + +} diff --git a/src/main/java/appeng/client/render/model/pipeline/ParentQuads.java b/src/main/java/appeng/client/render/model/pipeline/ParentQuads.java new file mode 100644 index 00000000..bd45579f --- /dev/null +++ b/src/main/java/appeng/client/render/model/pipeline/ParentQuads.java @@ -0,0 +1,21 @@ +package appeng.client.render.model.pipeline; + +import java.util.List; + +import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.block.model.BakedQuad; +import net.minecraft.client.renderer.block.model.IBakedModel; +import net.minecraft.util.EnumFacing; + +import appeng.api.client.BakingPipelineElement; + +public class ParentQuads implements BakingPipelineElement +{ + + @Override + public List pipe( List elements, IBakedModel parent, IBlockState state, EnumFacing side, long rand ) + { + return parent.getQuads( state, side, rand ); + } + +} diff --git a/src/main/java/appeng/client/render/model/pipeline/QuadVertexData.java b/src/main/java/appeng/client/render/model/pipeline/QuadVertexData.java new file mode 100644 index 00000000..993b281c --- /dev/null +++ b/src/main/java/appeng/client/render/model/pipeline/QuadVertexData.java @@ -0,0 +1,121 @@ + +package appeng.client.render.model.pipeline; + + +import java.lang.reflect.Field; + +import com.google.common.base.Throwables; + +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.renderer.vertex.VertexFormat; +import net.minecraft.util.EnumFacing; +import net.minecraftforge.client.model.pipeline.UnpackedBakedQuad; +import net.minecraftforge.fml.relauncher.ReflectionHelper; + + +public final class QuadVertexData +{ + + private static final Field unpackedData = ReflectionHelper.findField( UnpackedBakedQuad.class, "unpackedData" ); + + private static float[][][] unpackedData( UnpackedBakedQuad quad ) + { + try + { + return (float[][][]) unpackedData.get( quad ); + } + catch( Exception e ) + { + throw Throwables.propagate( e ); + } + } + + private VertexFormat format; + private float[][][] data; + + private int tintIndex; + private EnumFacing face; + private TextureAtlasSprite sprite; + protected boolean applyDiffuseLighting; + + public QuadVertexData( VertexFormat format, float[][][] data, int tintIndex, EnumFacing face, TextureAtlasSprite sprite, boolean applyDiffuseLighting ) + { + this.format = format; + this.data = data; + this.tintIndex = tintIndex; + this.face = face; + this.sprite = sprite; + this.applyDiffuseLighting = applyDiffuseLighting; + } + + public QuadVertexData( UnpackedBakedQuad quad ) + { + this( quad.getFormat(), unpackedData( quad ), quad.getTintIndex(), quad.getFace(), quad.getSprite(), quad.shouldApplyDiffuseLighting() ); + } + + public UnpackedBakedQuad toQuad() + { + return new UnpackedBakedQuad( data, tintIndex, face, sprite, applyDiffuseLighting, format ); + } + + public VertexFormat getFormat() + { + return format; + } + + public void setFormat( VertexFormat format ) + { + this.format = format; + } + + public float[][][] getData() + { + return data; + } + + public void setData( float[][][] data ) + { + this.data = data; + } + + public int getTintIndex() + { + return tintIndex; + } + + public void setTintIndex( int tintIndex ) + { + this.tintIndex = tintIndex; + } + + public EnumFacing getFace() + { + return face; + } + + public void setFace( EnumFacing face ) + { + this.face = face; + } + + public TextureAtlasSprite getSprite() + { + return sprite; + } + + public void setSprite( TextureAtlasSprite sprite ) + { + this.sprite = sprite; + } + + public boolean shouldApplyDiffuseLighting() + { + return applyDiffuseLighting; + } + + public void setApplyDiffuseLighting( boolean applyDiffuseLighting ) + { + this.applyDiffuseLighting = applyDiffuseLighting; + } + +} diff --git a/src/main/java/appeng/client/render/model/pipeline/StatePosRecolorator.java b/src/main/java/appeng/client/render/model/pipeline/StatePosRecolorator.java new file mode 100644 index 00000000..ce9186ce --- /dev/null +++ b/src/main/java/appeng/client/render/model/pipeline/StatePosRecolorator.java @@ -0,0 +1,71 @@ + +package appeng.client.render.model.pipeline; + + +import java.util.List; + +import net.minecraft.block.state.IBlockState; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.block.model.IBakedModel; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.IBlockAccess; + +import appeng.api.client.BakingPipelineElement; + + +public class StatePosRecolorator implements BakingPipelineElement +{ + + private IBlockAccess blockAccess; + private BlockPos pos; + private IBlockState state; + + public StatePosRecolorator( IBlockAccess blockAccess, BlockPos pos, IBlockState state ) + { + this.blockAccess = blockAccess; + this.pos = pos; + this.state = state; + } + + public IBlockAccess getBlockAccess() + { + return blockAccess; + } + + public void setBlockAccess( IBlockAccess blockAccess ) + { + this.blockAccess = blockAccess; + } + + public BlockPos getPos() + { + return pos; + } + + public void setPos( BlockPos pos ) + { + this.pos = pos; + } + + public IBlockState getState() + { + return state; + } + + public void setState( IBlockState state ) + { + this.state = state; + } + + @Override + public List pipe( List elements, IBakedModel parent, IBlockState state, EnumFacing side, long rand ) + { + for( QuadVertexData data : elements ) + { + data.setTintIndex( Minecraft.getMinecraft().getBlockColors().colorMultiplier( this.state, blockAccess, this.pos, data.getTintIndex() ) ); + } + return elements; + } + +} diff --git a/src/main/java/appeng/client/render/model/pipeline/TintIndexModifier.java b/src/main/java/appeng/client/render/model/pipeline/TintIndexModifier.java new file mode 100644 index 00000000..575dbea0 --- /dev/null +++ b/src/main/java/appeng/client/render/model/pipeline/TintIndexModifier.java @@ -0,0 +1,45 @@ + +package appeng.client.render.model.pipeline; + + +import java.util.List; +import java.util.function.Function; + +import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.block.model.IBakedModel; +import net.minecraft.util.EnumFacing; + +import appeng.api.client.BakingPipelineElement; + + +public class TintIndexModifier implements BakingPipelineElement +{ + + private Function tintTransformer; + + public TintIndexModifier( Function tintTransformer ) + { + this.tintTransformer = tintTransformer; + } + + public Function getTintTransformer() + { + return tintTransformer; + } + + public void setTintTransformer( Function tintTransformer ) + { + this.tintTransformer = tintTransformer; + } + + @Override + public List pipe( List elements, IBakedModel parent, IBlockState state, EnumFacing side, long rand ) + { + for( QuadVertexData quad : elements ) + { + quad.setTintIndex( tintTransformer.apply( quad.getTintIndex() ) ); + } + return elements; + } + +} diff --git a/src/main/java/appeng/client/render/model/pipeline/TypeTransformer.java b/src/main/java/appeng/client/render/model/pipeline/TypeTransformer.java new file mode 100644 index 00000000..34f59532 --- /dev/null +++ b/src/main/java/appeng/client/render/model/pipeline/TypeTransformer.java @@ -0,0 +1,63 @@ + +package appeng.client.render.model.pipeline; + + +import java.util.List; + +import com.google.common.collect.Lists; + +import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.block.model.BakedQuad; +import net.minecraft.client.renderer.block.model.IBakedModel; +import net.minecraft.util.EnumFacing; +import net.minecraftforge.client.model.pipeline.LightUtil; +import net.minecraftforge.client.model.pipeline.UnpackedBakedQuad; + +import appeng.api.client.BakingPipelineElement; + + +public class TypeTransformer +{ + + public static final BakingPipelineElement quads2vecs = new BakingPipelineElement(){ + + @Override + public List pipe( List elements, IBakedModel parent, IBlockState state, EnumFacing side, long rand ) + { + return Lists.transform( elements, ( quad ) -> { + if( quad instanceof UnpackedBakedQuad ) + { + return new QuadVertexData( (UnpackedBakedQuad) quad ); + } + else + { + int[] qdata = quad.getVertexData(); + float[][][] data = new float[4][quad.getFormat().getElementCount()][4]; + for( int v = 0; v < data.length; v++ ) + { + float[][] vd = data[v]; + for( int e = 0; e < vd.length; e++ ) + { + LightUtil.unpack( qdata, vd[e], quad.getFormat(), v, e ); + } + } + return new QuadVertexData( quad.getFormat(), data, quad.getTintIndex(), quad.getFace(), quad.getSprite(), quad.shouldApplyDiffuseLighting() ); + } + } ); + } + + }; + + public static final BakingPipelineElement vecs2quads = new BakingPipelineElement(){ + + @Override + public List pipe( List elements, IBakedModel parent, IBlockState state, EnumFacing side, long rand ) + { + return Lists.transform( elements, ( data ) -> { + return data.toQuad(); + } ); + } + + }; + +} diff --git a/src/main/java/appeng/client/render/model/pipeline/cable/CableAndConnections.java b/src/main/java/appeng/client/render/model/pipeline/cable/CableAndConnections.java new file mode 100644 index 00000000..26921c91 --- /dev/null +++ b/src/main/java/appeng/client/render/model/pipeline/cable/CableAndConnections.java @@ -0,0 +1,53 @@ + +package appeng.client.render.model.pipeline.cable; + + +import java.util.List; + +import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.block.model.BakedQuad; +import net.minecraft.client.renderer.block.model.IBakedModel; +import net.minecraft.util.EnumFacing; +import net.minecraftforge.common.property.IExtendedBlockState; + +import appeng.api.client.BakingPipeline; +import appeng.api.client.BakingPipelineElement; +import appeng.api.implementations.parts.IPartCable; +import appeng.api.parts.IPart; +import appeng.api.util.AEPartLocation; +import appeng.block.networking.BlockCableBus; +import appeng.client.render.model.pipeline.TintIndexModifier; +import appeng.parts.CableBusContainer; + + +public class CableAndConnections implements BakingPipelineElement +{ + + private final BakingPipeline rotatingPipeline; + private final TintIndexModifier tintIndexModifier; + private final BakingPipeline tintIndexFixPipeline; + + public CableAndConnections( BakingPipeline rotatingPipeline, TintIndexModifier tintIndexModifier, BakingPipeline tintIndexFixPipeline ) + { + this.rotatingPipeline = rotatingPipeline; + this.tintIndexModifier = tintIndexModifier; + this.tintIndexFixPipeline = tintIndexFixPipeline; + } + + @Override + public List pipe( List elements, IBakedModel parent, IBlockState state, EnumFacing side, long rand ) + { + if( state != null ) + { + CableBusContainer cableBus = ( (IExtendedBlockState) state ).getValue( BlockCableBus.cableBus ); + IPart part = cableBus.getPart( AEPartLocation.INTERNAL ); + if( part instanceof IPartCable ) + { + tintIndexModifier.setTintTransformer( tint -> ( AEPartLocation.INTERNAL.ordinal() << 2 ) | tint ); + elements.addAll( tintIndexFixPipeline.pipe( ( (IPartCable) part ).getOrBakeQuads( rotatingPipeline, state, side, rand ), parent, state, side, rand ) ); + } + } + return elements; + } + +} diff --git a/src/main/java/appeng/client/render/model/pipeline/cable/Facades.java b/src/main/java/appeng/client/render/model/pipeline/cable/Facades.java new file mode 100644 index 00000000..6b5fcdec --- /dev/null +++ b/src/main/java/appeng/client/render/model/pipeline/cable/Facades.java @@ -0,0 +1,55 @@ + +package appeng.client.render.model.pipeline.cable; + + +import java.util.List; + +import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.block.model.BakedQuad; +import net.minecraft.client.renderer.block.model.IBakedModel; +import net.minecraft.util.EnumFacing; +import net.minecraftforge.common.property.IExtendedBlockState; + +import appeng.api.client.BakingPipeline; +import appeng.api.client.BakingPipelineElement; +import appeng.api.parts.IFacadePart; +import appeng.api.util.AEPartLocation; +import appeng.block.networking.BlockCableBus; +import appeng.client.render.model.pipeline.TintIndexModifier; +import appeng.parts.CableBusContainer; + + +public class Facades implements BakingPipelineElement +{ + + private final BakingPipeline rotatingPipeline; + private final TintIndexModifier tintIndexModifier; + private final BakingPipeline tintIndexFixPipeline; + + public Facades( BakingPipeline rotatingPipeline, TintIndexModifier tintIndexModifier, BakingPipeline tintIndexFixPipeline ) + { + this.rotatingPipeline = rotatingPipeline; + this.tintIndexModifier = tintIndexModifier; + this.tintIndexFixPipeline = tintIndexFixPipeline; + } + + @Override + public List pipe( List elements, IBakedModel parent, IBlockState state, EnumFacing side, long rand ) + { + if( state != null ) + { + CableBusContainer cableBus = ( (IExtendedBlockState) state ).getValue( BlockCableBus.cableBus ); + for( AEPartLocation facing : AEPartLocation.SIDE_LOCATIONS ) + { + IFacadePart facade = cableBus.getFacadeContainer().getFacade( facing ); + if( facade != null ) + { + tintIndexModifier.setTintTransformer( tint -> ( facing.ordinal() << 2 ) | tint ); + elements.addAll( tintIndexFixPipeline.pipe( facade.getOrBakeQuads( cableBus, rotatingPipeline, state, side, rand ), parent, state, side, rand ) ); + } + } + } + return elements; + } + +} diff --git a/src/main/java/appeng/client/render/model/pipeline/cable/Parts.java b/src/main/java/appeng/client/render/model/pipeline/cable/Parts.java new file mode 100644 index 00000000..bcd04125 --- /dev/null +++ b/src/main/java/appeng/client/render/model/pipeline/cable/Parts.java @@ -0,0 +1,55 @@ + +package appeng.client.render.model.pipeline.cable; + + +import java.util.List; + +import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.block.model.BakedQuad; +import net.minecraft.client.renderer.block.model.IBakedModel; +import net.minecraft.util.EnumFacing; +import net.minecraftforge.common.property.IExtendedBlockState; + +import appeng.api.client.BakingPipeline; +import appeng.api.client.BakingPipelineElement; +import appeng.api.parts.IPart; +import appeng.api.util.AEPartLocation; +import appeng.block.networking.BlockCableBus; +import appeng.client.render.model.pipeline.TintIndexModifier; +import appeng.parts.CableBusContainer; + + +public class Parts implements BakingPipelineElement +{ + + private final BakingPipeline rotatingPipeline; + private final TintIndexModifier tintIndexModifier; + private final BakingPipeline tintIndexFixPipeline; + + public Parts( BakingPipeline rotatingPipeline, TintIndexModifier tintIndexModifier, BakingPipeline tintIndexFixPipeline ) + { + this.rotatingPipeline = rotatingPipeline; + this.tintIndexModifier = tintIndexModifier; + this.tintIndexFixPipeline = tintIndexFixPipeline; + } + + @Override + public List pipe( List elements, IBakedModel parent, IBlockState state, EnumFacing side, long rand ) + { + if( state != null ) + { + CableBusContainer cableBus = ( (IExtendedBlockState) state ).getValue( BlockCableBus.cableBus ); + for( AEPartLocation facing : AEPartLocation.SIDE_LOCATIONS ) + { + IPart part = cableBus.getPart( facing ); + if( part != null ) + { + tintIndexModifier.setTintTransformer( tint -> ( facing.ordinal() << 2 ) | tint ); + elements.addAll( tintIndexFixPipeline.pipe( part.getOrBakeQuads( rotatingPipeline, state, side, rand ), parent, state, side, rand ) ); + } + } + } + return elements; + } + +} diff --git a/src/main/java/appeng/core/FacadeConfig.java b/src/main/java/appeng/core/FacadeConfig.java index dda88f33..98d0f745 100644 --- a/src/main/java/appeng/core/FacadeConfig.java +++ b/src/main/java/appeng/core/FacadeConfig.java @@ -58,7 +58,7 @@ public class FacadeConfig extends Configuration { if( f.get( Block.class ) == id ) { - return this.get( "minecraft", f.getName() + ( metadata == 0 ? "" : "." + metadata ), automatic ).getBoolean( automatic ); + return this.get( "minecraft", f.getName() + ( metadata == 0 ? "" : "/" + metadata ), automatic ).getBoolean( automatic ); } } catch( final Throwable e ) diff --git a/src/main/java/appeng/core/api/ApiPart.java b/src/main/java/appeng/core/api/ApiPart.java index fbe7bd59..72803205 100644 --- a/src/main/java/appeng/core/api/ApiPart.java +++ b/src/main/java/appeng/core/api/ApiPart.java @@ -42,6 +42,7 @@ import org.objectweb.asm.tree.MethodNode; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; @@ -326,7 +327,7 @@ public class ApiPart implements IPartHelper } @Override - public boolean placeBus( final ItemStack is, final BlockPos pos, final EnumFacing side, final EntityPlayer player, final EnumHand hand, final World w ) + public EnumActionResult placeBus( final ItemStack is, final BlockPos pos, final EnumFacing side, final EntityPlayer player, final EnumHand hand, final World w ) { return PartPlacement.place( is, pos, side, player, hand, w, PartPlacement.PlaceType.PLACE_ITEM, 0 ); } diff --git a/src/main/java/appeng/core/features/AECableBusFeatureHandler.java b/src/main/java/appeng/core/features/AECableBusFeatureHandler.java index d7e0bde1..f8924796 100644 --- a/src/main/java/appeng/core/features/AECableBusFeatureHandler.java +++ b/src/main/java/appeng/core/features/AECableBusFeatureHandler.java @@ -20,25 +20,43 @@ package appeng.core.features; import java.util.EnumSet; +import java.util.Set; import com.google.common.base.Optional; +import com.google.common.collect.Sets; +import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.block.model.IBakedModel; import net.minecraft.client.renderer.block.model.ModelBakery; import net.minecraft.client.renderer.block.model.ModelResourceLocation; +import net.minecraft.client.renderer.color.IBlockColor; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.registry.IRegistry; +import net.minecraft.world.IBlockAccess; +import net.minecraftforge.common.property.IExtendedBlockState; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; +import appeng.api.client.BakingPipeline; import appeng.api.definitions.ITileDefinition; +import appeng.api.util.AEPartLocation; import appeng.block.AEBaseTileBlock; import appeng.block.networking.BlockCableBus; +import appeng.client.render.model.pipeline.BakingPipelineBakedModel; +import appeng.client.render.model.pipeline.FacingQuadRotator; +import appeng.client.render.model.pipeline.Merge; +import appeng.client.render.model.pipeline.TintIndexModifier; +import appeng.client.render.model.pipeline.TypeTransformer; +import appeng.client.render.model.pipeline.cable.CableAndConnections; +import appeng.client.render.model.pipeline.cable.Facades; +import appeng.client.render.model.pipeline.cable.Parts; import appeng.core.AppEng; import appeng.core.CommonHelper; import appeng.core.CreativeTab; +import appeng.parts.CableBusContainer; import appeng.util.Platform; @@ -106,6 +124,7 @@ public final class AECableBusFeatureHandler implements IFeatureHandler @Override public void registerModel() { + Minecraft.getMinecraft().getBlockColors().registerBlockColorHandler( new CableBusColor(), this.featured ); Minecraft.getMinecraft().getRenderItem().getItemModelMesher().register( this.definition.maybeItem().get(), 0, new ModelResourceLocation( registryName, "normal" ) ); } @@ -118,6 +137,40 @@ public final class AECableBusFeatureHandler implements IFeatureHandler @Override public void registerCustomModelOverride( IRegistry modelRegistry ) { + final BakingPipeline rotatingPipeline = new BakingPipeline( TypeTransformer.quads2vecs, new FacingQuadRotator(), TypeTransformer.vecs2quads ); + final TintIndexModifier tintIndexModifier = new TintIndexModifier( tint -> tint ); + final BakingPipeline tintIndexFixPipeline = new BakingPipeline( TypeTransformer.quads2vecs, tintIndexModifier, TypeTransformer.vecs2quads ); + Set keys = Sets.newHashSet( modelRegistry.getKeys() ); + for( ModelResourceLocation model : keys ) + { + if( model.getResourceDomain().equals( registryName.getResourceDomain() ) && model.getResourcePath().equals( registryName.getResourcePath() ) ) + { + modelRegistry.putObject( model, new BakingPipelineBakedModel( modelRegistry.getObject( model ), new Merge( new CableAndConnections( rotatingPipeline, tintIndexModifier, tintIndexFixPipeline ), new Facades( rotatingPipeline, tintIndexModifier, tintIndexFixPipeline ), new Parts( rotatingPipeline, tintIndexModifier, tintIndexFixPipeline ) ) ) ); + } + } + } + public static class CableBusColor implements IBlockColor + { + + @Override + public int colorMultiplier( IBlockState state, IBlockAccess worldIn, BlockPos pos, int color ) + { + AEPartLocation side = AEPartLocation.fromOrdinal( ( color >> 2 ) & 7 ); + CableBusContainer bus = ( (IExtendedBlockState) state ).getValue( BlockCableBus.cableBus ); + switch( color & 3 ) + { + case 0: + return bus.getGridNode( side ) != null && bus.getGridNode( side ).isActive() ? 0xffffff : 0; + case 1: + return bus.getColor().blackVariant; + case 2: + return bus.getColor().mediumVariant; + case 3: + return bus.getColor().whiteVariant; + default: + return color; + } + } } } diff --git a/src/main/java/appeng/facade/FacadePart.java b/src/main/java/appeng/facade/FacadePart.java index 786c1d58..85d2a3af 100644 --- a/src/main/java/appeng/facade/FacadePart.java +++ b/src/main/java/appeng/facade/FacadePart.java @@ -19,27 +19,48 @@ package appeng.facade; +import java.util.ArrayList; import java.util.EnumSet; +import java.util.List; import javax.annotation.Nullable; +import org.lwjgl.util.vector.Matrix4f; +import org.lwjgl.util.vector.Vector3f; + import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Vec3i; import net.minecraft.world.IBlockAccess; +import net.minecraftforge.common.model.TRSRTransformation; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import appeng.api.AEApi; +import appeng.api.client.BakingPipeline; import appeng.api.parts.IBoxProvider; import appeng.api.parts.IFacadeContainer; import appeng.api.parts.IFacadePart; import appeng.api.parts.IPartCollisionHelper; import appeng.api.parts.IPartHost; import appeng.api.util.AEPartLocation; +import appeng.client.render.model.ModelsCache; +import appeng.client.render.model.pipeline.MatVecApplicator; +import appeng.client.render.model.pipeline.ParentQuads; +import appeng.client.render.model.pipeline.StatePosRecolorator; +import appeng.client.render.model.pipeline.TypeTransformer; +import appeng.core.AppEng; import appeng.integration.IntegrationRegistry; import appeng.integration.IntegrationType; import appeng.integration.abstraction.IBuildCraftTransport; @@ -147,7 +168,7 @@ public class FacadePart implements IFacadePart, IBoxProvider final ItemStack is = this.getTexture(); final Block blk = Block.getBlockFromItem( is.getItem() ); - return !blk.isOpaqueCube(blk.getDefaultState()); + return !blk.isOpaqueCube( blk.getDefaultState() ); } @Nullable @@ -237,7 +258,7 @@ public class FacadePart implements IFacadePart, IBoxProvider * if ( out.contains( AEPartLocation.EAST ) && (side.offsetY != 0) ) { IFacadePart fp = fc.getFacade( * AEPartLocation.EAST ); if ( fp != null && (fp.isTransparent() == facade.isTransparent()) ) out.remove( * AEPartLocation.EAST ); } - * if ( out.contains( AEPartLocation.WEST ) && (side.offsetY != 0) ) { IFacadePart fp = fc.getFacade( + * if ( out.contains( AEPartLocation.WEST ) && (side.offsetY != 0) ) { IFacadePart fp = fc.getFacade(s * AEPartLocation.WEST ); if ( fp != null && (fp.isTransparent() == facade.isTransparent()) ) out.remove( * AEPartLocation.WEST ); } */ @@ -262,4 +283,24 @@ public class FacadePart implements IFacadePart, IBoxProvider { this.getBoxes( bch, null ); } + + @Override + @SideOnly( Side.CLIENT ) + public List getOrBakeQuads( IPartHost host, BakingPipeline rotatingPipeline, IBlockState state, EnumFacing side, long rand ) + { + List elements = new ArrayList(); + elements.addAll( rotatingPipeline.pipe( ModelsCache.INSTANCE.getOrLoadBakedModel( new ResourceLocation( AppEng.MOD_ID, "part/cable_facade" ) ).getQuads( state, side, rand ), null, state, getSide().getFacing(), rand ) ); + + ItemStack titem = getTexture(); + if( titem != null && titem.getItem() != null && Block.getBlockFromItem( titem.getItem() ) != null ) + { + Block tblock = Block.getBlockFromItem( titem.getItem() ); + IBlockState tstate = tblock.getStateFromMeta( titem.getItem().getMetadata( titem.getItemDamage() ) ); + Vec3i s = getSide().getFacing().getDirectionVec(); + Vector3f scale = new Vector3f( s.getX() == 0 ? 0.9999f : 0.125f, s.getY() == 0 ? 0.9999f : 0.125f, s.getZ() == 0 ? 0.9999f : 0.125f ); + Vector3f trans = new Vector3f( s.getX() * 3.5f, s.getY() * 3.5f, s.getZ() * 3.5f ); + elements.addAll( new BakingPipeline( new ParentQuads(), TypeTransformer.quads2vecs, new MatVecApplicator( TRSRTransformation.toVecmath( new Matrix4f().scale( scale ).translate( trans ) ), true ), new StatePosRecolorator( host.getTile().getWorld(), host.getLocation().getPos(), tstate ), TypeTransformer.vecs2quads ).pipe( new ArrayList<>(), Minecraft.getMinecraft().getBlockRendererDispatcher().getModelForState( tstate ), tstate, side, rand ) ); + } + return elements; + } } diff --git a/src/main/java/appeng/items/parts/ItemFacade.java b/src/main/java/appeng/items/parts/ItemFacade.java index b102ffac..9ca04489 100644 --- a/src/main/java/appeng/items/parts/ItemFacade.java +++ b/src/main/java/appeng/items/parts/ItemFacade.java @@ -48,7 +48,6 @@ import appeng.api.parts.IAlphaPassItem; import appeng.api.util.AEPartLocation; import appeng.core.FacadeConfig; import appeng.core.features.AEFeature; -import appeng.decorative.solid.BlockQuartzOre; import appeng.facade.FacadePart; import appeng.facade.IFacadeItem; import appeng.items.AEBaseItem; @@ -68,7 +67,7 @@ public class ItemFacade extends AEBaseItem implements IFacadeItem, IAlphaPassIte @Override public EnumActionResult onItemUseFirst( final ItemStack is, final EntityPlayer player, final World world, final BlockPos pos, final EnumFacing side, final float hitX, final float hitY, final float hitZ, final EnumHand hand ) { - return AEApi.instance().partHelper().placeBus( is, pos, side, player, hand, world ) ? EnumActionResult.SUCCESS : EnumActionResult.FAIL; + return AEApi.instance().partHelper().placeBus( is, pos, side, player, hand, world ); } @Override @@ -148,11 +147,8 @@ public class ItemFacade extends AEBaseItem implements IFacadeItem, IAlphaPassIte final int metadata = l.getItem().getMetadata( l.getItemDamage() ); - final boolean hasTile = b.hasTileEntity( b.getStateFromMeta( metadata ) ); - final boolean enableGlass = b instanceof BlockGlass || b instanceof BlockStainedGlass; - final boolean disableOre = b instanceof BlockQuartzOre; - - final boolean defaultValue = ( b.isOpaqueCube(b.getDefaultState()) && !b.getTickRandomly() && !hasTile && !disableOre ) || enableGlass; + // TODO 1.10.2-R - XD + final boolean defaultValue = true || b instanceof BlockGlass || b instanceof BlockStainedGlass; if( FacadeConfig.instance.checkEnabled( b, metadata, defaultValue ) ) { if( returnItem ) diff --git a/src/main/java/appeng/items/parts/ItemMultiPart.java b/src/main/java/appeng/items/parts/ItemMultiPart.java index a3fce691..c210af3a 100644 --- a/src/main/java/appeng/items/parts/ItemMultiPart.java +++ b/src/main/java/appeng/items/parts/ItemMultiPart.java @@ -35,6 +35,8 @@ import javax.annotation.Nullable; import com.google.common.base.Preconditions; +import net.minecraft.client.renderer.ItemMeshDefinition; +import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -81,6 +83,12 @@ public final class ItemMultiPart extends AEBaseItem implements IPartItem, IItemG instance = this; } + @Override + public ItemMeshDefinition getItemMeshDefinition() + { + return itemstack -> new ModelResourceLocation( getTypeByStack( itemstack ).getModel(), null ); + } + @Nonnull public final ItemStackSrc createPart( final PartType mat ) { @@ -177,7 +185,7 @@ public final class ItemMultiPart extends AEBaseItem implements IPartItem, IItemG return EnumActionResult.PASS; } - return AEApi.instance().partHelper().placeBus( is, pos, side, player, hand, w ) ? EnumActionResult.SUCCESS : EnumActionResult.FAIL; + return AEApi.instance().partHelper().placeBus( is, pos, side, player, hand, w ); } @Override diff --git a/src/main/java/appeng/items/parts/PartType.java b/src/main/java/appeng/items/parts/PartType.java index c7564b39..f09dacde 100644 --- a/src/main/java/appeng/items/parts/PartType.java +++ b/src/main/java/appeng/items/parts/PartType.java @@ -24,7 +24,10 @@ import java.util.Collections; import java.util.EnumSet; import java.util.Set; +import net.minecraft.util.ResourceLocation; + import appeng.api.parts.IPart; +import appeng.core.AppEng; import appeng.core.features.AEFeature; import appeng.core.localization.GuiText; import appeng.integration.IntegrationType; @@ -62,9 +65,9 @@ import appeng.parts.reporting.PartTerminal; public enum PartType { - InvalidType( -1, EnumSet.of( AEFeature.Core ), EnumSet.noneOf( IntegrationType.class ), null ), + InvalidType( -1, new ResourceLocation( AppEng.MOD_ID, "invalid" ), EnumSet.of( AEFeature.Core ), EnumSet.noneOf( IntegrationType.class ), null ), - CableGlass( 0, EnumSet.of( AEFeature.Core ), EnumSet.noneOf( IntegrationType.class ), PartCableGlass.class ) + CableGlass( 0, new ResourceLocation( AppEng.MOD_ID, "cable_glass" ), EnumSet.of( AEFeature.Core ), EnumSet.noneOf( IntegrationType.class ), PartCableGlass.class ) { @Override public boolean isCable() @@ -73,7 +76,7 @@ public enum PartType } }, - CableCovered( 20, EnumSet.of( AEFeature.Core ), EnumSet.noneOf( IntegrationType.class ), PartCableCovered.class ) + CableCovered( 20, new ResourceLocation( AppEng.MOD_ID, "cable_covered" ), EnumSet.of( AEFeature.Core ), EnumSet.noneOf( IntegrationType.class ), PartCableCovered.class ) { @Override public boolean isCable() @@ -82,7 +85,7 @@ public enum PartType } }, - CableSmart( 40, EnumSet.of( AEFeature.Channels ), EnumSet.noneOf( IntegrationType.class ), PartCableSmart.class ) + CableSmart( 40, new ResourceLocation( AppEng.MOD_ID, "cable_smart" ), EnumSet.of( AEFeature.Channels ), EnumSet.noneOf( IntegrationType.class ), PartCableSmart.class ) { @Override public boolean isCable() @@ -91,7 +94,7 @@ public enum PartType } }, - CableDense( 60, EnumSet.of( AEFeature.Channels ), EnumSet.noneOf( IntegrationType.class ), PartDenseCable.class ) + CableDense( 60, new ResourceLocation( AppEng.MOD_ID, "cable_dense" ), EnumSet.of( AEFeature.Channels ), EnumSet.noneOf( IntegrationType.class ), PartDenseCable.class ) { @Override public boolean isCable() @@ -100,53 +103,53 @@ public enum PartType } }, - ToggleBus( 80, EnumSet.of( AEFeature.Core ), EnumSet.noneOf( IntegrationType.class ), PartToggleBus.class ), + ToggleBus( 80, new ResourceLocation( AppEng.MOD_ID, "toggle_bus" ), EnumSet.of( AEFeature.Core ), EnumSet.noneOf( IntegrationType.class ), PartToggleBus.class ), - InvertedToggleBus( 100, EnumSet.of( AEFeature.Core ), EnumSet.noneOf( IntegrationType.class ), PartInvertedToggleBus.class ), + InvertedToggleBus( 100, new ResourceLocation( AppEng.MOD_ID, "inverted_toggle_bus" ), EnumSet.of( AEFeature.Core ), EnumSet.noneOf( IntegrationType.class ), PartInvertedToggleBus.class ), - CableAnchor( 120, EnumSet.of( AEFeature.Core ), EnumSet.noneOf( IntegrationType.class ), PartCableAnchor.class ), + CableAnchor( 120, new ResourceLocation( AppEng.MOD_ID, "cable_anchor" ), EnumSet.of( AEFeature.Core ), EnumSet.noneOf( IntegrationType.class ), PartCableAnchor.class ), - QuartzFiber( 140, EnumSet.of( AEFeature.Core ), EnumSet.noneOf( IntegrationType.class ), PartQuartzFiber.class ), + QuartzFiber( 140, new ResourceLocation( AppEng.MOD_ID, "quartz_fiber" ), EnumSet.of( AEFeature.Core ), EnumSet.noneOf( IntegrationType.class ), PartQuartzFiber.class ), - Monitor( 160, EnumSet.of( AEFeature.Core ), EnumSet.noneOf( IntegrationType.class ), PartPanel.class ), + Monitor( 160, new ResourceLocation( AppEng.MOD_ID, "monitor" ), EnumSet.of( AEFeature.Core ), EnumSet.noneOf( IntegrationType.class ), PartPanel.class ), - SemiDarkMonitor( 180, EnumSet.of( AEFeature.Core ), EnumSet.noneOf( IntegrationType.class ), PartSemiDarkPanel.class ), + SemiDarkMonitor( 180, new ResourceLocation( AppEng.MOD_ID, "semi_dark_monitor" ), EnumSet.of( AEFeature.Core ), EnumSet.noneOf( IntegrationType.class ), PartSemiDarkPanel.class ), - DarkMonitor( 200, EnumSet.of( AEFeature.Core ), EnumSet.noneOf( IntegrationType.class ), PartDarkPanel.class ), + DarkMonitor( 200, new ResourceLocation( AppEng.MOD_ID, "dark_monitor" ), EnumSet.of( AEFeature.Core ), EnumSet.noneOf( IntegrationType.class ), PartDarkPanel.class ), - StorageBus( 220, EnumSet.of( AEFeature.StorageBus ), EnumSet.noneOf( IntegrationType.class ), PartStorageBus.class ), + StorageBus( 220, new ResourceLocation( AppEng.MOD_ID, "storage_bus" ), EnumSet.of( AEFeature.StorageBus ), EnumSet.noneOf( IntegrationType.class ), PartStorageBus.class ), - ImportBus( 240, EnumSet.of( AEFeature.ImportBus ), EnumSet.noneOf( IntegrationType.class ), PartImportBus.class ), + ImportBus( 240, new ResourceLocation( AppEng.MOD_ID, "import_bus" ), EnumSet.of( AEFeature.ImportBus ), EnumSet.noneOf( IntegrationType.class ), PartImportBus.class ), - ExportBus( 260, EnumSet.of( AEFeature.ExportBus ), EnumSet.noneOf( IntegrationType.class ), PartExportBus.class ), + ExportBus( 260, new ResourceLocation( AppEng.MOD_ID, "export_bus" ), EnumSet.of( AEFeature.ExportBus ), EnumSet.noneOf( IntegrationType.class ), PartExportBus.class ), - LevelEmitter( 280, EnumSet.of( AEFeature.LevelEmitter ), EnumSet.noneOf( IntegrationType.class ), PartLevelEmitter.class ), + LevelEmitter( 280, new ResourceLocation( AppEng.MOD_ID, "level_emitter" ), EnumSet.of( AEFeature.LevelEmitter ), EnumSet.noneOf( IntegrationType.class ), PartLevelEmitter.class ), - AnnihilationPlane( 300, EnumSet.of( AEFeature.AnnihilationPlane ), EnumSet.noneOf( IntegrationType.class ), PartAnnihilationPlane.class ), + AnnihilationPlane( 300, new ResourceLocation( AppEng.MOD_ID, "annihilation_plane" ), EnumSet.of( AEFeature.AnnihilationPlane ), EnumSet.noneOf( IntegrationType.class ), PartAnnihilationPlane.class ), - IdentityAnnihilationPlane( 301, EnumSet.of( AEFeature.AnnihilationPlane, AEFeature.IdentityAnnihilationPlane ), EnumSet.noneOf( IntegrationType.class ), PartIdentityAnnihilationPlane.class ), + IdentityAnnihilationPlane( 301, new ResourceLocation( AppEng.MOD_ID, "identity_annihilation_plane" ), EnumSet.of( AEFeature.AnnihilationPlane, AEFeature.IdentityAnnihilationPlane ), EnumSet.noneOf( IntegrationType.class ), PartIdentityAnnihilationPlane.class ), - FormationPlane( 320, EnumSet.of( AEFeature.FormationPlane ), EnumSet.noneOf( IntegrationType.class ), PartFormationPlane.class ), + FormationPlane( 320, new ResourceLocation( AppEng.MOD_ID, "formation_plane" ), EnumSet.of( AEFeature.FormationPlane ), EnumSet.noneOf( IntegrationType.class ), PartFormationPlane.class ), - PatternTerminal( 340, EnumSet.of( AEFeature.Patterns ), EnumSet.noneOf( IntegrationType.class ), PartPatternTerminal.class ), + PatternTerminal( 340, new ResourceLocation( AppEng.MOD_ID, "pattern_terminal" ), EnumSet.of( AEFeature.Patterns ), EnumSet.noneOf( IntegrationType.class ), PartPatternTerminal.class ), - CraftingTerminal( 360, EnumSet.of( AEFeature.CraftingTerminal ), EnumSet.noneOf( IntegrationType.class ), PartCraftingTerminal.class ), + CraftingTerminal( 360, new ResourceLocation( AppEng.MOD_ID, "crafting_terminal" ), EnumSet.of( AEFeature.CraftingTerminal ), EnumSet.noneOf( IntegrationType.class ), PartCraftingTerminal.class ), - Terminal( 380, EnumSet.of( AEFeature.Core ), EnumSet.noneOf( IntegrationType.class ), PartTerminal.class ), + Terminal( 380, new ResourceLocation( AppEng.MOD_ID, "terminal" ), EnumSet.of( AEFeature.Core ), EnumSet.noneOf( IntegrationType.class ), PartTerminal.class ), - StorageMonitor( 400, EnumSet.of( AEFeature.StorageMonitor ), EnumSet.noneOf( IntegrationType.class ), PartStorageMonitor.class ), + StorageMonitor( 400, new ResourceLocation( AppEng.MOD_ID, "storage_monitor" ), EnumSet.of( AEFeature.StorageMonitor ), EnumSet.noneOf( IntegrationType.class ), PartStorageMonitor.class ), - ConversionMonitor( 420, EnumSet.of( AEFeature.PartConversionMonitor ), EnumSet.noneOf( IntegrationType.class ), PartConversionMonitor.class ), + ConversionMonitor( 420, new ResourceLocation( AppEng.MOD_ID, "conversion_monitor" ), EnumSet.of( AEFeature.PartConversionMonitor ), EnumSet.noneOf( IntegrationType.class ), PartConversionMonitor.class ), - Interface( 440, EnumSet.of( AEFeature.Core ), EnumSet.noneOf( IntegrationType.class ), PartInterface.class ), + Interface( 440, new ResourceLocation( AppEng.MOD_ID, "interface" ), EnumSet.of( AEFeature.Core ), EnumSet.noneOf( IntegrationType.class ), PartInterface.class ), - P2PTunnelME( 460, EnumSet.of( AEFeature.P2PTunnel, AEFeature.P2PTunnelME ), EnumSet.noneOf( IntegrationType.class ), PartP2PTunnelME.class, GuiText.METunnel ), + P2PTunnelME( 460, new ResourceLocation( AppEng.MOD_ID, "p2p_tunnel_me" ), EnumSet.of( AEFeature.P2PTunnel, AEFeature.P2PTunnelME ), EnumSet.noneOf( IntegrationType.class ), PartP2PTunnelME.class, GuiText.METunnel ), - P2PTunnelRedstone( 461, EnumSet.of( AEFeature.P2PTunnel, AEFeature.P2PTunnelRedstone ), EnumSet.noneOf( IntegrationType.class ), PartP2PRedstone.class, GuiText.RedstoneTunnel ), + P2PTunnelRedstone( 461, new ResourceLocation( AppEng.MOD_ID, "p2p_tunnel_redstone" ), EnumSet.of( AEFeature.P2PTunnel, AEFeature.P2PTunnelRedstone ), EnumSet.noneOf( IntegrationType.class ), PartP2PRedstone.class, GuiText.RedstoneTunnel ), - P2PTunnelItems( 462, EnumSet.of( AEFeature.P2PTunnel, AEFeature.P2PTunnelItems ), EnumSet.noneOf( IntegrationType.class ), PartP2PItems.class, GuiText.ItemTunnel ), + P2PTunnelItems( 462, new ResourceLocation( AppEng.MOD_ID, "p2p_tunnel_items" ), EnumSet.of( AEFeature.P2PTunnel, AEFeature.P2PTunnelItems ), EnumSet.noneOf( IntegrationType.class ), PartP2PItems.class, GuiText.ItemTunnel ), - P2PTunnelLiquids( 463, EnumSet.of( AEFeature.P2PTunnel, AEFeature.P2PTunnelLiquids ), EnumSet.noneOf( IntegrationType.class ), PartP2PLiquids.class, GuiText.FluidTunnel ), + P2PTunnelLiquids( 463, new ResourceLocation( AppEng.MOD_ID, "p2p_tunnel_liquids" ), 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 ), @@ -154,7 +157,7 @@ public enum PartType // 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, new ResourceLocation( AppEng.MOD_ID, "p2p_tunnel_light" ), 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 ), @@ -162,27 +165,44 @@ public enum PartType // 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, new ResourceLocation( AppEng.MOD_ID, "interface_terminal" ), EnumSet.of( AEFeature.InterfaceTerminal ), EnumSet.noneOf( IntegrationType.class ), PartInterfaceTerminal.class ); private final int baseDamage; + private final ResourceLocation name; private final Set features; private final Set integrations; private final Class myPart; private final GuiText extraName; private Constructor constructor; - PartType( final int baseMetaValue, final Set features, final Set integrations, final Class c ) + PartType( final int baseMetaValue, final ResourceLocation name, final Set features, final Set integrations, final Class c ) { - this( baseMetaValue, features, integrations, c, null ); + this( baseMetaValue, name, features, integrations, c, null ); } - PartType( final int baseMetaValue, final Set features, final Set integrations, final Class c, final GuiText en ) + PartType( final int baseMetaValue, final ResourceLocation name, final Set features, final Set integrations, final Class c, final GuiText en ) { + this.baseDamage = baseMetaValue; + this.name = name; this.features = Collections.unmodifiableSet( features ); this.integrations = Collections.unmodifiableSet( integrations ); this.myPart = c; this.extraName = en; - this.baseDamage = baseMetaValue; + } + + int getBaseDamage() + { + return this.baseDamage; + } + + public ResourceLocation getName() + { + return name; + } + + public ResourceLocation getModel() + { + return new ResourceLocation( name.getResourceDomain(), "part/" + name.getResourcePath() ); } public boolean isCable() @@ -220,9 +240,4 @@ public enum PartType this.constructor = constructor; } - int getBaseDamage() - { - return this.baseDamage; - } - } diff --git a/src/main/java/appeng/parts/AEBasePart.java b/src/main/java/appeng/parts/AEBasePart.java index 1eadaf42..454fd76e 100644 --- a/src/main/java/appeng/parts/AEBasePart.java +++ b/src/main/java/appeng/parts/AEBasePart.java @@ -24,11 +24,17 @@ import java.util.ArrayList; import java.util.EnumSet; import java.util.List; import java.util.Random; +import java.util.regex.Matcher; +import java.util.regex.Pattern; +import com.google.common.base.Function; import com.google.common.base.Preconditions; +import com.google.common.collect.ImmutableMap; import io.netty.buffer.ByteBuf; +import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.crash.CrashReportCategory; import net.minecraft.entity.Entity; @@ -40,6 +46,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; @@ -47,6 +54,7 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import appeng.api.AEApi; +import appeng.api.client.BakingPipeline; import appeng.api.config.Upgrades; import appeng.api.definitions.IDefinitions; import appeng.api.implementations.IUpgradeableHost; @@ -64,8 +72,11 @@ import appeng.api.util.AEColor; import appeng.api.util.AEPartLocation; import appeng.api.util.DimensionalCoord; import appeng.api.util.IConfigManager; +import appeng.client.render.model.ModelsCache; import appeng.helpers.ICustomNameObject; import appeng.helpers.IPriorityHost; +import appeng.items.parts.ItemMultiPart; +import appeng.items.parts.PartType; import appeng.me.helpers.AENetworkProxy; import appeng.me.helpers.IGridProxyable; import appeng.parts.networking.PartCable; @@ -77,6 +88,35 @@ import appeng.util.SettingsFrom; public abstract class AEBasePart implements IPart, IGridProxyable, IActionHost, IUpgradeableHost, ICustomNameObject { + private static final Pattern PROPERTY_PATTERN = Pattern.compile( "\\$\\{([\\p{Alnum}_\\-\\.]+)\\}" ); + + public static final ResourceLocation replaceProperties( ResourceLocation location, ImmutableMap properties ) + { + Matcher m = PROPERTY_PATTERN.matcher( location.getResourcePath() ); + StringBuffer buffer = new StringBuffer(); + while( m.find() ) + { + m.appendReplacement( buffer, properties.get( m.group( 1 ) ) ); + } + m.appendTail( buffer ); + return new ResourceLocation( location.getResourceDomain(), buffer.toString() ); + } + + protected static final Function propertyTextureGetter( ImmutableMap properties ) + { + return location -> ModelsCache.DEFAULTTEXTUREGETTER.apply( replaceProperties( location, properties ) ); + } + + protected static final Function propertyTextureGetter( ImmutableMap.Builder properties ) + { + return propertyTextureGetter( properties.build() ); + } + + protected static final ResourceLocation withProperties( ResourceLocation location, ImmutableMap.Builder properties ) + { + return new ResourceLocation( location.getResourceDomain(), location.getResourcePath() + properties.build().toString() ); + } + private final AENetworkProxy proxy; private final ItemStack is; private TileEntity tile = null; @@ -97,6 +137,16 @@ public abstract class AEBasePart implements IPart, IGridProxyable, IActionHost, return this.host; } + public PartType getType() + { + return ItemMultiPart.instance.getTypeByStack( is ); + } + + public ResourceLocation getDefaultModelLocation() + { + return getType().getModel(); + } + @Override public IGridNode getGridNode( final AEPartLocation dir ) { @@ -319,7 +369,7 @@ public abstract class AEBasePart implements IPart, IGridProxyable, IActionHost, } @Override - public int cableConnectionRenderTo() + public int getCableConnectionLength() { return 3; } @@ -515,6 +565,18 @@ public abstract class AEBasePart implements IPart, IGridProxyable, IActionHost, return false; } + @Override + @SideOnly( Side.CLIENT ) + public List getOrBakeQuads( BakingPipeline rotatingPipeline, IBlockState state, EnumFacing side, long rand ) + { + return rotatingPipeline.pipe( ModelsCache.INSTANCE.getOrLoadModel( withProperties( getDefaultModelLocation(), propertiesForModel( getSide().getFacing() ) ), getDefaultModelLocation(), propertyTextureGetter( propertiesForModel( getSide().getFacing() ) ) ).getQuads( state, side, rand ), null, state, getSide().getFacing(), rand ); + } + + protected ImmutableMap.Builder propertiesForModel( EnumFacing facing ) + { + return ImmutableMap.builder().put( "color", getColor().name() ); + } + public AEPartLocation getSide() { return this.side; diff --git a/src/main/java/appeng/parts/CableBusContainer.java b/src/main/java/appeng/parts/CableBusContainer.java index 1a9eda6e..1b0acfff 100644 --- a/src/main/java/appeng/parts/CableBusContainer.java +++ b/src/main/java/appeng/parts/CableBusContainer.java @@ -80,6 +80,7 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I private final EnumSet myLayerFlags = EnumSet.noneOf( LayerFlags.class ); private YesNo hasRedstone = YesNo.UNDECIDED; private IPartHost tcb; + //TODO 1.10.2-R - does somebody seriously want to make parts TESR??? Hope not. private boolean requiresDynamicRender = false; private boolean inWorld = false; diff --git a/src/main/java/appeng/parts/PartPlacement.java b/src/main/java/appeng/parts/PartPlacement.java index dec45c84..200b48f9 100644 --- a/src/main/java/appeng/parts/PartPlacement.java +++ b/src/main/java/appeng/parts/PartPlacement.java @@ -32,6 +32,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.SoundCategory; @@ -75,18 +76,18 @@ public class PartPlacement private final ThreadLocal placing = new ThreadLocal(); private boolean wasCanceled = false; - public static boolean place( final ItemStack held, final BlockPos pos, EnumFacing side, final EntityPlayer player, final EnumHand hand, final World world, PlaceType pass, final int depth ) + public static EnumActionResult place( final ItemStack held, final BlockPos pos, EnumFacing side, final EntityPlayer player, final EnumHand hand, final World world, PlaceType pass, final int depth ) { if( depth > 3 ) { - return false; + return EnumActionResult.FAIL; } if( held != null && Platform.isWrench( player, held, pos ) && player.isSneaking() ) { if( !Platform.hasPermissions( new DimensionalCoord( world, pos ), player ) ) { - return false; + return EnumActionResult.FAIL; } final Block block = world.getBlockState( pos ).getBlock(); @@ -140,10 +141,10 @@ public class PartPlacement player.swingArm( hand ); NetworkHandler.instance.sendToServer( new PacketPartPlacement( pos, side, getEyeOffset( player ), hand ) ); } - return true; + return EnumActionResult.SUCCESS; } - return false; + return EnumActionResult.PASS; } TileEntity tile = world.getTileEntity( pos ); @@ -165,7 +166,7 @@ public class PartPlacement { if( host.getPart( AEPartLocation.INTERNAL ) == null ) { - return false; + return EnumActionResult.FAIL; } if( host.canAddPart( held, AEPartLocation.fromFacing( side ) ) ) @@ -182,7 +183,7 @@ public class PartPlacement MinecraftForge.EVENT_BUS.post( new PlayerDestroyItemEvent( player, held, hand ) ); } } - return true; + return EnumActionResult.SUCCESS; } } } @@ -190,10 +191,10 @@ public class PartPlacement { player.swingArm( hand ); NetworkHandler.instance.sendToServer( new PacketPartPlacement( pos, side, getEyeOffset( player ), hand ) ); - return true; + return EnumActionResult.SUCCESS; } } - return false; + return EnumActionResult.FAIL; } } @@ -233,7 +234,7 @@ public class PartPlacement { NetworkHandler.instance.sendToServer( new PacketPartPlacement( pos, side, getEyeOffset( player ), hand ) ); } - return true; + return EnumActionResult.SUCCESS; } } } @@ -242,7 +243,7 @@ public class PartPlacement if( held == null || !( held.getItem() instanceof IPartItem ) ) { - return false; + return EnumActionResult.PASS; } BlockPos te_pos = pos; @@ -312,18 +313,18 @@ public class PartPlacement { player.swingArm( hand ); NetworkHandler.instance.sendToServer( new PacketPartPlacement( pos, side, getEyeOffset( player ), hand ) ); - return true; + return EnumActionResult.SUCCESS; } } else if( host != null && !host.canAddPart( held, AEPartLocation.fromFacing( side ) ) ) { - return false; + return EnumActionResult.FAIL; } } if( host == null ) { - return false; + return EnumActionResult.PASS; } if( !host.canAddPart( held, AEPartLocation.fromFacing( side ) ) ) @@ -341,13 +342,13 @@ public class PartPlacement } if( ( blkID == null || blkID.isReplaceable( world, te_pos ) || host != null ) ) // /&& side != - // AEPartLocation.INTERNAL - // ) + // AEPartLocation.INTERNAL + // ) { return place( held, te_pos, side.getOpposite(), player, hand, world, pass == PlaceType.INTERACT_FIRST_PASS ? PlaceType.INTERACT_SECOND_PASS : PlaceType.PLACE_ITEM, depth + 1 ); } } - return false; + return EnumActionResult.PASS; } if( !world.isRemote ) @@ -364,7 +365,7 @@ public class PartPlacement { if( !player.isSneaking() && sp.part.onActivate( player, hand, mop.hitVec ) ) { - return false; + return EnumActionResult.FAIL; } } } @@ -372,7 +373,7 @@ public class PartPlacement final DimensionalCoord dc = host.getLocation(); if( !Platform.hasPermissions( dc, player ) ) { - return false; + return EnumActionResult.FAIL; } final AEPartLocation mySide = host.addPart( held, AEPartLocation.fromFacing( side ), player, hand ); @@ -401,7 +402,7 @@ public class PartPlacement player.swingArm( hand ); NetworkHandler.instance.sendToServer( new PacketPartPlacement( pos, side, getEyeOffset( player ), hand ) ); } - return true; + return EnumActionResult.SUCCESS; } private static float getEyeOffset( final EntityPlayer p ) @@ -494,7 +495,7 @@ public class PartPlacement this.placing.set( event ); final ItemStack held = event.getEntityPlayer().getHeldItem( event.getHand() ); - if( place( held, event.getPos(), event.getFace(), event.getEntityPlayer(), event.getHand(), event.getEntityPlayer().worldObj, PlaceType.INTERACT_FIRST_PASS, 0 ) ) + if( place( held, event.getPos(), event.getFace(), event.getEntityPlayer(), event.getHand(), event.getEntityPlayer().worldObj, PlaceType.INTERACT_FIRST_PASS, 0 ) == EnumActionResult.SUCCESS ) { event.setCanceled( true ); this.wasCanceled = true; diff --git a/src/main/java/appeng/parts/automation/PartAnnihilationPlane.java b/src/main/java/appeng/parts/automation/PartAnnihilationPlane.java index 4b0cc7d3..053cf418 100644 --- a/src/main/java/appeng/parts/automation/PartAnnihilationPlane.java +++ b/src/main/java/appeng/parts/automation/PartAnnihilationPlane.java @@ -208,7 +208,7 @@ public class PartAnnihilationPlane extends PartBasicState implements IGridTickab } @Override - public int cableConnectionRenderTo() + public int getCableConnectionLength() { return 1; } diff --git a/src/main/java/appeng/parts/automation/PartExportBus.java b/src/main/java/appeng/parts/automation/PartExportBus.java index 4db177b1..d5113412 100644 --- a/src/main/java/appeng/parts/automation/PartExportBus.java +++ b/src/main/java/appeng/parts/automation/PartExportBus.java @@ -184,7 +184,7 @@ public class PartExportBus extends PartSharedItemBus implements ICraftingRequest } @Override - public int cableConnectionRenderTo() + public int getCableConnectionLength() { return 5; } diff --git a/src/main/java/appeng/parts/automation/PartFormationPlane.java b/src/main/java/appeng/parts/automation/PartFormationPlane.java index 06744d7f..34de96cf 100644 --- a/src/main/java/appeng/parts/automation/PartFormationPlane.java +++ b/src/main/java/appeng/parts/automation/PartFormationPlane.java @@ -274,7 +274,7 @@ public class PartFormationPlane extends PartUpgradeable implements ICellContaine } @Override - public int cableConnectionRenderTo() + public int getCableConnectionLength() { return 1; } diff --git a/src/main/java/appeng/parts/automation/PartImportBus.java b/src/main/java/appeng/parts/automation/PartImportBus.java index bdbdb84a..e25e8b8a 100644 --- a/src/main/java/appeng/parts/automation/PartImportBus.java +++ b/src/main/java/appeng/parts/automation/PartImportBus.java @@ -95,7 +95,7 @@ public class PartImportBus extends PartSharedItemBus implements IInventoryDestin } @Override - public int cableConnectionRenderTo() + public int getCableConnectionLength() { return 5; } diff --git a/src/main/java/appeng/parts/automation/PartLevelEmitter.java b/src/main/java/appeng/parts/automation/PartLevelEmitter.java index 4c36dbd0..222ca547 100644 --- a/src/main/java/appeng/parts/automation/PartLevelEmitter.java +++ b/src/main/java/appeng/parts/automation/PartLevelEmitter.java @@ -425,7 +425,7 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH } @Override - public int cableConnectionRenderTo() + public int getCableConnectionLength() { return 16; } diff --git a/src/main/java/appeng/parts/misc/PartCableAnchor.java b/src/main/java/appeng/parts/misc/PartCableAnchor.java index ebc85433..4209f855 100644 --- a/src/main/java/appeng/parts/misc/PartCableAnchor.java +++ b/src/main/java/appeng/parts/misc/PartCableAnchor.java @@ -25,17 +25,23 @@ import java.util.Random; import io.netty.buffer.ByteBuf; +import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +import appeng.api.client.BakingPipeline; import appeng.api.networking.IGridNode; import appeng.api.parts.BusSupport; import appeng.api.parts.IPart; @@ -204,7 +210,7 @@ public class PartCableAnchor implements IPart } @Override - public int cableConnectionRenderTo() + public int getCableConnectionLength() { return 0; } @@ -226,4 +232,12 @@ public class PartCableAnchor implements IPart { return what == BusSupport.CABLE || what == BusSupport.DENSE_CABLE; } + + @Override + @SideOnly( Side.CLIENT ) + public List getOrBakeQuads( BakingPipeline rotatingPipeline, IBlockState state, EnumFacing side, long rand ) + { + return null; + } + } diff --git a/src/main/java/appeng/parts/misc/PartInterface.java b/src/main/java/appeng/parts/misc/PartInterface.java index 88ed7710..dd9b8665 100644 --- a/src/main/java/appeng/parts/misc/PartInterface.java +++ b/src/main/java/appeng/parts/misc/PartInterface.java @@ -138,7 +138,7 @@ public class PartInterface extends PartBasicState implements IGridTickable, ISto } @Override - public int cableConnectionRenderTo() + public int getCableConnectionLength() { return 4; } diff --git a/src/main/java/appeng/parts/misc/PartStorageBus.java b/src/main/java/appeng/parts/misc/PartStorageBus.java index 00ed2c7c..5994a514 100644 --- a/src/main/java/appeng/parts/misc/PartStorageBus.java +++ b/src/main/java/appeng/parts/misc/PartStorageBus.java @@ -265,7 +265,7 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC } @Override - public int cableConnectionRenderTo() + public int getCableConnectionLength() { return 4; } diff --git a/src/main/java/appeng/parts/misc/PartToggleBus.java b/src/main/java/appeng/parts/misc/PartToggleBus.java index 7463d9ab..9bc83afc 100644 --- a/src/main/java/appeng/parts/misc/PartToggleBus.java +++ b/src/main/java/appeng/parts/misc/PartToggleBus.java @@ -159,7 +159,7 @@ public class PartToggleBus extends PartBasicState } @Override - public int cableConnectionRenderTo() + public int getCableConnectionLength() { return 5; } diff --git a/src/main/java/appeng/parts/networking/PartCable.java b/src/main/java/appeng/parts/networking/PartCable.java index 5e8e8e8c..917544af 100644 --- a/src/main/java/appeng/parts/networking/PartCable.java +++ b/src/main/java/appeng/parts/networking/PartCable.java @@ -20,16 +20,29 @@ package appeng.parts.networking; import java.io.IOException; +import java.util.ArrayList; import java.util.EnumSet; +import java.util.List; + +import com.google.common.collect.ImmutableSet; + +import org.lwjgl.util.vector.Matrix4f; +import org.lwjgl.util.vector.Vector3f; import io.netty.buffer.ByteBuf; +import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; +import net.minecraftforge.common.model.TRSRTransformation; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import appeng.api.AEApi; +import appeng.api.client.BakingPipeline; import appeng.api.config.SecurityPermissions; import appeng.api.definitions.IParts; import appeng.api.implementations.parts.IPartCable; @@ -45,6 +58,10 @@ import appeng.api.util.AECableType; import appeng.api.util.AEColor; import appeng.api.util.AEPartLocation; import appeng.api.util.IReadOnlyCollection; +import appeng.client.render.model.ModelsCache; +import appeng.client.render.model.pipeline.FacingQuadRotator; +import appeng.client.render.model.pipeline.MatVecApplicator; +import appeng.client.render.model.pipeline.TypeTransformer; import appeng.items.parts.ItemMultiPart; import appeng.me.GridAccessException; import appeng.parts.AEBasePart; @@ -54,6 +71,8 @@ import appeng.util.Platform; public class PartCable extends AEBasePart implements IPartCable { + private static final ImmutableSet STRAIGHT_PART_LOCATIONS = ImmutableSet.of( AEPartLocation.DOWN, AEPartLocation.NORTH, AEPartLocation.EAST ); + private final int[] channelsOnSide = { 0, 0, 0, 0, 0, 0 }; private EnumSet connections = EnumSet.noneOf( AEPartLocation.class ); @@ -180,7 +199,7 @@ public class PartCable extends AEBasePart implements IPartCable final IPart p = ph.getPart( dir ); if( p instanceof IGridHost ) { - final double dist = p.cableConnectionRenderTo(); + final double dist = p.getCableConnectionLength(); if( dist > 8 ) { @@ -281,14 +300,7 @@ public class PartCable extends AEBasePart implements IPartCable final IReadOnlyCollection set = part.getGridNode().getConnections(); for( final IGridConnection gc : set ) { - if( this.getProxy().getNode().hasFlag( GridFlags.DENSE_CAPACITY ) && gc.getOtherSide( this.getProxy().getNode() ).hasFlag( GridFlags.DENSE_CAPACITY ) ) - { - sideOut |= ( gc.getUsedChannels() / 4 ) << ( 4 * thisSide.ordinal() ); - } - else - { - sideOut |= ( gc.getUsedChannels() ) << ( 4 * thisSide.ordinal() ); - } + sideOut |= ( gc.getUsedChannels() ) << ( 5 * thisSide.ordinal() ); } } } @@ -299,17 +311,7 @@ public class PartCable extends AEBasePart implements IPartCable final AEPartLocation side = gc.getDirection( n ); if( side != AEPartLocation.INTERNAL ) { - final boolean isTier2a = this.getProxy().getNode().hasFlag( GridFlags.DENSE_CAPACITY ); - final boolean isTier2b = gc.getOtherSide( this.getProxy().getNode() ).hasFlag( GridFlags.DENSE_CAPACITY ); - - if( isTier2a && isTier2b ) - { - sideOut |= ( gc.getUsedChannels() / 4 ) << ( 4 * side.ordinal() ); - } - else - { - sideOut |= gc.getUsedChannels() << ( 4 * side.ordinal() ); - } + sideOut |= gc.getUsedChannels() << ( 5 * side.ordinal() ); cs |= ( 1 << side.ordinal() ); } } @@ -346,7 +348,7 @@ public class PartCable extends AEBasePart implements IPartCable { if( d != AEPartLocation.INTERNAL ) { - final int ch = ( sideOut >> ( d.ordinal() * 4 ) ) & 0xF; + final int ch = ( sideOut >> ( d.ordinal() * 5 ) ) & 0x1F; if( ch != this.getChannelsOnSide( d.ordinal() ) ) { channelsChanged = true; @@ -379,9 +381,53 @@ public class PartCable extends AEBasePart implements IPartCable return !myC.equals( this.getConnections() ) || wasPowered != this.powered || channelsChanged; } - protected boolean nonLinear( final EnumSet sides ) + @Override + @SideOnly( Side.CLIENT ) + public List getOrBakeQuads( BakingPipeline rotatingPipeline, IBlockState state, EnumFacing side, long rand ) { - return ( sides.contains( AEPartLocation.EAST ) && sides.contains( AEPartLocation.WEST ) ) || ( sides.contains( AEPartLocation.NORTH ) && sides.contains( AEPartLocation.SOUTH ) ) || ( sides.contains( AEPartLocation.UP ) && sides.contains( AEPartLocation.DOWN ) ); + List elements = new ArrayList<>(); + if( isStraight( getHost(), connections ) ) + { + EnumFacing facing = getConnections().contains( AEPartLocation.DOWN ) ? EnumFacing.DOWN : getConnections().contains( AEPartLocation.NORTH ) ? EnumFacing.NORTH : getConnections().contains( AEPartLocation.EAST ) ? EnumFacing.EAST : EnumFacing.NORTH; + elements.addAll( rotatingPipeline.pipe( ModelsCache.INSTANCE.getOrLoadModel( withProperties( getCableConnectionType().getStraightModel(), propertiesForModel( facing ) ), getCableConnectionType().getStraightModel(), propertyTextureGetter( propertiesForModel( facing ) ) ).getQuads( state, side, rand ), null, state, connections.contains( AEPartLocation.DOWN ) ? EnumFacing.DOWN : connections.contains( AEPartLocation.NORTH ) ? EnumFacing.NORTH : connections.contains( AEPartLocation.EAST ) ? EnumFacing.EAST : EnumFacing.NORTH, rand ) ); + } + else + { + elements.addAll( ModelsCache.INSTANCE.getOrLoadModel( withProperties( getCableConnectionType().getModel(), propertiesForModel( null ) ), getCableConnectionType().getModel(), propertyTextureGetter( propertiesForModel( null ) ) ).getQuads( state, side, rand ) ); + for( EnumFacing facing : EnumFacing.values() ) + { + if( isConnected( facing ) ) + { + elements.addAll( rotatingPipeline.pipe( ModelsCache.INSTANCE.getOrLoadModel( withProperties( getCableConnectionType().getConnectionModel(), propertiesForModel( facing ) ), getCableConnectionType().getConnectionModel(), propertyTextureGetter( propertiesForModel( facing ) ) ).getQuads( state, side, rand ), null, state, facing, rand ) ); + } + else if( getHost().getPart( facing ) != null ) + { + IPart part = getHost().getPart( facing ); + if( part.getCableConnectionLength() != -1 ) + { + elements.addAll( new BakingPipeline( TypeTransformer.quads2vecs, new MatVecApplicator( TRSRTransformation.toVecmath( new Matrix4f().scale( new Vector3f( 1, 1, part.getCableConnectionLength() / 4f ) ) ) ), new FacingQuadRotator( facing ), TypeTransformer.vecs2quads ).pipe( ModelsCache.INSTANCE.getOrLoadModel( withProperties( getCableConnectionType().getConnectionModel(), propertiesForModel( facing ) ), getCableConnectionType().getConnectionModel(), propertyTextureGetter( propertiesForModel( facing ) ) ).getQuads( state, side, rand ), null, state, facing, rand ) ); + } + } + } + } + return elements; + } + + protected boolean isStraight( IPartHost host, final EnumSet sides ) + { + boolean b = false; + for( EnumFacing facing : EnumFacing.values() ) + { + b |= host.getPart( facing ) != null; + } + if( !b && sides.size() == 2 ) + { + return ( sides.contains( AEPartLocation.EAST ) && sides.contains( AEPartLocation.WEST ) ) || ( sides.contains( AEPartLocation.NORTH ) && sides.contains( AEPartLocation.SOUTH ) ) || ( sides.contains( AEPartLocation.UP ) && sides.contains( AEPartLocation.DOWN ) ); + } + else + { + return false; + } } int getChannelsOnSide( final int i ) diff --git a/src/main/java/appeng/parts/networking/PartCableSmart.java b/src/main/java/appeng/parts/networking/PartCableSmart.java index 5997cc59..310af029 100644 --- a/src/main/java/appeng/parts/networking/PartCableSmart.java +++ b/src/main/java/appeng/parts/networking/PartCableSmart.java @@ -19,7 +19,10 @@ package appeng.parts.networking; +import com.google.common.collect.ImmutableMap; + import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumFacing; import appeng.api.networking.IGridNode; import appeng.api.networking.events.MENetworkChannelsChanged; @@ -102,4 +105,11 @@ public class PartCableSmart extends PartCable } } } + + @Override + protected ImmutableMap.Builder propertiesForModel( EnumFacing facing ) + { + return facing != null ? super.propertiesForModel( facing ).put( "channels", String.valueOf( getChannelsOnSide( facing.ordinal() ) ) ) : super.propertiesForModel( facing ); + } + } diff --git a/src/main/java/appeng/parts/networking/PartDenseCable.java b/src/main/java/appeng/parts/networking/PartDenseCable.java index 4b5d0839..acab24c2 100644 --- a/src/main/java/appeng/parts/networking/PartDenseCable.java +++ b/src/main/java/appeng/parts/networking/PartDenseCable.java @@ -19,8 +19,11 @@ package appeng.parts.networking; +import com.google.common.collect.ImmutableMap.Builder; + import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumFacing; import appeng.api.networking.GridFlags; import appeng.api.networking.IGridHost; @@ -168,4 +171,11 @@ public class PartDenseCable extends PartCable { this.getHost().markForUpdate(); } + + @Override + protected Builder propertiesForModel( EnumFacing facing ) + { + return facing != null ? super.propertiesForModel( facing ).put( "channels", String.valueOf( getChannelsOnSide( facing.ordinal() ) ) ) : super.propertiesForModel( facing ); + } + } diff --git a/src/main/java/appeng/parts/networking/PartQuartzFiber.java b/src/main/java/appeng/parts/networking/PartQuartzFiber.java index be471a20..d19001c0 100644 --- a/src/main/java/appeng/parts/networking/PartQuartzFiber.java +++ b/src/main/java/appeng/parts/networking/PartQuartzFiber.java @@ -110,7 +110,7 @@ public class PartQuartzFiber extends AEBasePart implements IEnergyGridProvider } @Override - public int cableConnectionRenderTo() + public int getCableConnectionLength() { return 16; } diff --git a/src/main/java/appeng/parts/p2p/PartP2PTunnel.java b/src/main/java/appeng/parts/p2p/PartP2PTunnel.java index 8fb07d56..0e04dbc6 100644 --- a/src/main/java/appeng/parts/p2p/PartP2PTunnel.java +++ b/src/main/java/appeng/parts/p2p/PartP2PTunnel.java @@ -149,7 +149,7 @@ public abstract class PartP2PTunnel extends PartBasicSt } @Override - public int cableConnectionRenderTo() + public int getCableConnectionLength() { return 1; } diff --git a/src/main/java/appeng/tile/networking/TileCableBus.java b/src/main/java/appeng/tile/networking/TileCableBus.java index 19cc1cde..62de70b2 100644 --- a/src/main/java/appeng/tile/networking/TileCableBus.java +++ b/src/main/java/appeng/tile/networking/TileCableBus.java @@ -45,7 +45,6 @@ import appeng.api.util.AECableType; import appeng.api.util.AEColor; import appeng.api.util.AEPartLocation; import appeng.api.util.DimensionalCoord; -import appeng.block.networking.BlockCableBus; import appeng.helpers.AEMultiTile; import appeng.helpers.ICustomCollision; import appeng.hooks.TickHandler; @@ -64,10 +63,6 @@ public class TileCableBus extends AEBaseTile implements AEMultiTile, ICustomColl private CableBusContainer cb = new CableBusContainer( this ); - /** - * Immibis MB Support - */ - private final boolean ImmibisMicroblocks_TransformableTileEntityMarker = true; private int oldLV = -1; // on re-calculate light when it changes @TileEvent( TileEventType.WORLD_NBT_READ ) @@ -94,27 +89,9 @@ public class TileCableBus extends AEBaseTile implements AEMultiTile, ICustomColl this.worldObj.checkLight( this.pos ); } - this.updateTileSetting(); return ret; } - protected void updateTileSetting() - { - if( this.getCableBus().isRequiresDynamicRender() ) - { - try - { - final TileCableBus tcb = (TileCableBus) BlockCableBus.getTesrTile().newInstance(); - tcb.copyFrom( this ); - this.getWorld().setTileEntity( this.pos, tcb ); - } - catch( final Throwable ignored ) - { - - } - } - } - protected void copyFrom( final TileCableBus oldTile ) { final CableBusContainer tmpCB = this.getCableBus(); @@ -285,7 +262,8 @@ public class TileCableBus extends AEBaseTile implements AEMultiTile, ICustomColl @Override public boolean isBlocked( final EnumFacing side ) { - return !this.ImmibisMicroblocks_isSideOpen( side ); + //TODO 1.10.2-R - Stuff. + return false; } @Override @@ -369,16 +347,6 @@ public class TileCableBus extends AEBaseTile implements AEMultiTile, ICustomColl return this.getCableBus().isInWorld(); } - private boolean ImmibisMicroblocks_isSideOpen( final EnumFacing side ) - { - return true; - } - - public void ImmibisMicroblocks_onMicroblocksChanged() - { - this.getCableBus().updateConnections(); - } - @Override public boolean recolourBlock( final EnumFacing side, final AEColor colour, final EntityPlayer who ) { diff --git a/src/main/java/appeng/tile/networking/TileCableBusTESR.java b/src/main/java/appeng/tile/networking/TileCableBusTESR.java deleted file mode 100644 index 1de4bee9..00000000 --- a/src/main/java/appeng/tile/networking/TileCableBusTESR.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * This file is part of Applied Energistics 2. - * Copyright (c) 2013 - 2014, AlgorithmX2, All rights reserved. - * - * Applied Energistics 2 is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Applied Energistics 2 is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Applied Energistics 2. If not, see . - */ - -package appeng.tile.networking; - - -import appeng.block.networking.BlockCableBus; - - -public class TileCableBusTESR extends TileCableBus -{ - - @Override - protected void updateTileSetting() - { - if( !this.getCableBus().isRequiresDynamicRender() ) - { - try - { - final TileCableBus tcb = (TileCableBus) BlockCableBus.getNoTesrTile().newInstance(); - tcb.copyFrom( this ); - this.getWorld().setTileEntity( this.pos, tcb ); - } - catch( final Throwable ignored ) - { - - } - } - } -} diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/crafting_terminal.json b/src/main/resources/assets/appliedenergistics2/models/item/part/crafting_terminal.json new file mode 100644 index 00000000..a39647c6 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/part/crafting_terminal.json @@ -0,0 +1,3 @@ +{ + "parent": "appliedenergistics2:part/crafting_terminal" +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/part/cable/covered/center.json b/src/main/resources/assets/appliedenergistics2/models/part/cable/covered/center.json new file mode 100644 index 00000000..e9de8342 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/part/cable/covered/center.json @@ -0,0 +1,20 @@ +{ + "textures": { + "base": "appliedenergistics2:parts/cable/covered/${color}" + }, + "elements": [ + { + "name": "Element", + "from": [ 5.0, 5.0, 5.0 ], + "to": [ 11.0, 11.0, 11.0 ], + "faces": { + "north": { "texture": "#base", "uv": [ 5.0, 5.0, 11.0, 11.0 ] }, + "east": { "texture": "#base", "uv": [ 5.0, 5.0, 11.0, 11.0 ] }, + "south": { "texture": "#base", "uv": [ 11.0, 5.0, 5.0, 11.0 ] }, + "west": { "texture": "#base", "uv": [ 11.0, 5.0, 5.0, 11.0 ] }, + "up": { "texture": "#base", "uv": [ 5.0, 5.0, 11.0, 11.0 ] }, + "down": { "texture": "#base", "uv": [ 5.0, 5.0, 11.0, 11.0 ] } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/part/cable/covered/connection.json b/src/main/resources/assets/appliedenergistics2/models/part/cable/covered/connection.json new file mode 100644 index 00000000..2e1f0efa --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/part/cable/covered/connection.json @@ -0,0 +1,20 @@ +{ + "textures": { + "base": "appliedenergistics2:parts/cable/covered/${color}" + }, + "elements": [ + { + "name": "Element", + "from": [ 6.0, 6.0, 0.0 ], + "to": [ 10.0, 10.0, 5.0 ], + "faces": { + "north": { "texture": "#base", "uv": [ 6.0, 6.0, 10.0, 10.0 ] }, + "east": { "texture": "#base", "uv": [ 11.0, 6.0, 16.0, 10.0 ] }, + "south": { "texture": "#base", "uv": [ 10.0, 6.0, 6.0, 10.0 ] }, + "west": { "texture": "#base", "uv": [ 16.0, 6.0, 11.0, 10.0 ] }, + "up": { "texture": "#base", "uv": [ 6.0, 0.0, 10.0, 5.0 ] }, + "down": { "texture": "#base", "uv": [ 6.0, 11.0, 10.0, 16.0 ] } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/part/cable/covered/straight.json b/src/main/resources/assets/appliedenergistics2/models/part/cable/covered/straight.json new file mode 100644 index 00000000..1cc416cb --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/part/cable/covered/straight.json @@ -0,0 +1,20 @@ +{ + "textures": { + "base": "appliedenergistics2:parts/cable/covered/${color}" + }, + "elements": [ + { + "name": "Element", + "from": [ 5.0, 5.0, 0.0 ], + "to": [ 11.0, 11.0, 16.0 ], + "faces": { + "north": { "texture": "#base", "uv": [ 5.0, 5.0, 11.0, 11.0 ] }, + "east": { "texture": "#base", "uv": [ 0.0, 5.0, 5.0, 11.0 ] }, + "south": { "texture": "#base", "uv": [ 11.0, 5.0, 5.0, 11.0 ] }, + "west": { "texture": "#base", "uv": [ 5.0, 5.0, 0.0, 11.0 ] }, + "up": { "texture": "#base", "uv": [ 5.0, 0.0, 11.0, 5.0 ] }, + "down": { "texture": "#base", "uv": [ 5.0, 11.0, 11.0, 16.0 ] } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/part/cable/dense/center.json b/src/main/resources/assets/appliedenergistics2/models/part/cable/dense/center.json new file mode 100644 index 00000000..cdaff367 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/part/cable/dense/center.json @@ -0,0 +1,20 @@ +{ + "textures": { + "base": "appliedenergistics2:parts/cable/dense/${color}" + }, + "elements": [ + { + "name": "Base", + "from": [ 3.0, 3.0, 3.0 ], + "to": [ 13.0, 13.0, 13.0 ], + "faces": { + "north": { "texture": "#base", "uv": [ 5.5, 5.5, 10.5, 10.5 ] }, + "east": { "texture": "#base", "uv": [ 5.5, 5.5, 10.5, 10.5 ] }, + "south": { "texture": "#base", "uv": [ 10.5, 5.5, 5.5, 10.5 ] }, + "west": { "texture": "#base", "uv": [ 10.5, 5.5, 5.5, 10.5 ] }, + "up": { "texture": "#base", "uv": [ 5.5, 5.5, 10.5, 10.5 ] }, + "down": { "texture": "#base", "uv": [ 5.5, 5.5, 10.5, 10.5 ] } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/part/cable/dense/connection.json b/src/main/resources/assets/appliedenergistics2/models/part/cable/dense/connection.json new file mode 100644 index 00000000..3f717524 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/part/cable/dense/connection.json @@ -0,0 +1,34 @@ +{ + "textures": { + "base": "appliedenergistics2:parts/cable/dense/${color}", + "channels": "appliedenergistics2:parts/cable/dense/${channels}" + }, + "elements": [ + { + "name": "Base", + "from": [ 4.0, 4.0, 0.0 ], + "to": [ 12.0, 12.0, 3.0 ], + "faces": { + "north": { "texture": "#base", "uv": [ 5.5, 5.5, 10.5, 10.5 ] }, + "east": { "texture": "#base", "uv": [ 11.0, 5.5, 16.0, 10.5 ] }, + "south": { "texture": "#base", "uv": [ 10.5, 10.5, 5.5, 5.5 ] }, + "west": { "texture": "#base", "uv": [ 16.0, 5.5, 11.0, 10.5 ] }, + "up": { "texture": "#base", "uv": [ 5.5, 0.0, 10.5, 5.0 ] }, + "down": { "texture": "#base", "uv": [ 5.5, 11.0, 10.5, 16.0 ] } + } + }, + { + "name": "Channels", + "from": [ 4.0, 4.0, 0.0 ], + "to": [ 12.0, 12.0, 3.0 ], + "faces": { + "north": { "texture": "#channels", "uv": [ 5.5, 5.5, 10.5, 10.5 ] }, + "east": { "texture": "#channels", "uv": [ 11.0, 5.5, 16.0, 10.5 ] }, + "south": { "texture": "#channels", "uv": [ 10.5, 10.5, 5.5, 5.5 ] }, + "west": { "texture": "#channels", "uv": [ 16.0, 5.5, 11.0, 10.5 ] }, + "up": { "texture": "#channels", "uv": [ 5.5, 0.0, 10.5, 5.0 ] }, + "down": { "texture": "#channels", "uv": [ 5.5, 11.0, 10.5, 16.0 ] } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/part/cable/dense/straight.json b/src/main/resources/assets/appliedenergistics2/models/part/cable/dense/straight.json new file mode 100644 index 00000000..269109c2 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/part/cable/dense/straight.json @@ -0,0 +1,34 @@ +{ + "textures": { + "base": "appliedenergistics2:parts/cable/dense/${color}", + "channels": "appliedenergistics2:parts/cable/dense/${channels}" + }, + "elements": [ + { + "name": "Base", + "from": [ 3.0, 3.0, 0.0 ], + "to": [ 13.0, 13.0, 16.0 ], + "faces": { + "north": { "texture": "#base", "uv": [ 5.0, 5.0, 11.0, 11.0 ] }, + "east": { "texture": "#base", "uv": [ 0.0, 5.0, 5.0, 11.0 ] }, + "south": { "texture": "#base", "uv": [ 11.0, 5.0, 5.0, 11.0 ] }, + "west": { "texture": "#base", "uv": [ 5.0, 5.0, 0.0, 11.0 ] }, + "up": { "texture": "#base", "uv": [ 5.0, 0.0, 11.0, 5.0 ] }, + "down": { "texture": "#base", "uv": [ 5.0, 11.0, 11.0, 16.0 ] } + } + }, + { + "name": "Channels", + "from": [ 3.0, 3.0, 0.0 ], + "to": [ 13.0, 13.0, 16.0 ], + "faces": { + "north": { "texture": "#channels", "uv": [ 5.0, 5.0, 11.0, 11.0 ] }, + "east": { "texture": "#channels", "uv": [ 0.0, 5.0, 5.0, 11.0 ] }, + "south": { "texture": "#channels", "uv": [ 11.0, 5.0, 5.0, 11.0 ] }, + "west": { "texture": "#channels", "uv": [ 5.0, 5.0, 0.0, 11.0 ] }, + "up": { "texture": "#channels", "uv": [ 5.0, 0.0, 11.0, 5.0 ] }, + "down": { "texture": "#channels", "uv": [ 5.0, 11.0, 11.0, 16.0 ] } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/part/cable/glass/center.json b/src/main/resources/assets/appliedenergistics2/models/part/cable/glass/center.json new file mode 100644 index 00000000..774c00f3 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/part/cable/glass/center.json @@ -0,0 +1,20 @@ +{ + "textures": { + "base": "appliedenergistics2:parts/cable/glass/${color}" + }, + "elements": [ + { + "name": "Element", + "from": [ 6.0, 6.0, 6.0 ], + "to": [ 10.0, 10.0, 10.0 ], + "faces": { + "north": { "texture": "#base", "uv": [ 6.0, 6.0, 10.0, 10.0 ] }, + "east": { "texture": "#base", "uv": [ 6.0, 6.0, 10.0, 10.0 ] }, + "south": { "texture": "#base", "uv": [ 10.0, 6.0, 6.0, 10.0 ] }, + "west": { "texture": "#base", "uv": [ 10.0, 6.0, 6.0, 10.0 ] }, + "up": { "texture": "#base", "uv": [ 6.0, 6.0, 10.0, 10.0 ] }, + "down": { "texture": "#base", "uv": [ 6.0, 6.0, 10.0, 10.0 ] } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/part/cable/glass/connection.json b/src/main/resources/assets/appliedenergistics2/models/part/cable/glass/connection.json new file mode 100644 index 00000000..deb41034 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/part/cable/glass/connection.json @@ -0,0 +1,20 @@ +{ + "textures": { + "base": "appliedenergistics2:parts/cable/glass/${color}" + }, + "elements": [ + { + "name": "Element", + "from": [ 6.0, 6.0, 0.0 ], + "to": [ 10.0, 10.0, 6.0 ], + "faces": { + "north": { "texture": "#base", "uv": [ 6.0, 6.0, 10.0, 10.0 ] }, + "east": { "texture": "#base", "uv": [ 10.0, 6.0, 16.0, 10.0 ] }, + "south": { "texture": "#base", "uv": [ 10.0, 6.0, 6.0, 10.0 ] }, + "west": { "texture": "#base", "uv": [ 16.0, 6.0, 10.0, 10.0 ] }, + "up": { "texture": "#base", "uv": [ 6.0, 0.0, 10.0, 6.0 ] }, + "down": { "texture": "#base", "uv": [ 6.0, 10.0, 10.0, 16.0 ] } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/part/cable/glass/straight.json b/src/main/resources/assets/appliedenergistics2/models/part/cable/glass/straight.json new file mode 100644 index 00000000..23ccfab6 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/part/cable/glass/straight.json @@ -0,0 +1,46 @@ +{ + "textures": { + "base": "appliedenergistics2:parts/cable/glass/${color}" + }, + "elements": [ + { + "name": "Element", + "from": [ 6.0, 6.0, 6.0 ], + "to": [ 10.0, 10.0, 10.0 ], + "faces": { + "north": { "texture": "#base", "uv": [ 6.0, 6.0, 10.0, 10.0 ] }, + "east": { "texture": "#base", "uv": [ 6.0, 6.0, 10.0, 10.0 ] }, + "south": { "texture": "#base", "uv": [ 10.0, 6.0, 6.0, 10.0 ] }, + "west": { "texture": "#base", "uv": [ 10.0, 6.0, 6.0, 10.0 ] }, + "up": { "texture": "#base", "uv": [ 6.0, 6.0, 10.0, 10.0 ] }, + "down": { "texture": "#base", "uv": [ 6.0, 6.0, 10.0, 10.0 ] } + } + }, + { + "name": "Element", + "from": [ 6.0, 6.0, 0.0 ], + "to": [ 10.0, 10.0, 6.0 ], + "faces": { + "north": { "texture": "#base", "uv": [ 6.0, 6.0, 10.0, 10.0 ] }, + "east": { "texture": "#base", "uv": [ 10.0, 6.0, 16.0, 10.0 ] }, + "south": { "texture": "#base", "uv": [ 10.0, 6.0, 6.0, 10.0 ] }, + "west": { "texture": "#base", "uv": [ 16.0, 6.0, 10.0, 10.0 ] }, + "up": { "texture": "#base", "uv": [ 6.0, 0.0, 10.0, 6.0 ] }, + "down": { "texture": "#base", "uv": [ 6.0, 10.0, 10.0, 16.0 ] } + } + }, + { + "name": "Element", + "from": [ 6.0, 6.0, 10.0 ], + "to": [ 10.0, 10.0, 16.0 ], + "faces": { + "north": { "texture": "#base", "uv": [ 6.0, 6.0, 10.0, 10.0 ] }, + "east": { "texture": "#base", "uv": [ 0.0, 6.0, 6.0, 10.0 ] }, + "south": { "texture": "#base", "uv": [ 10.0, 6.0, 6.0, 10.0 ] }, + "west": { "texture": "#base", "uv": [ 6.0, 6.0, 0.0, 10.0 ] }, + "up": { "texture": "#base", "uv": [ 6.0, 10.0, 10.0, 16.0 ] }, + "down": { "texture": "#base", "uv": [ 6.0, 0.0, 10.0, 6.0 ] } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/part/cable/smart/center.json b/src/main/resources/assets/appliedenergistics2/models/part/cable/smart/center.json new file mode 100644 index 00000000..145a8170 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/part/cable/smart/center.json @@ -0,0 +1,20 @@ +{ + "textures": { + "base": "appliedenergistics2:parts/cable/smart/${color}" + }, + "elements": [ + { + "name": "Element", + "from": [ 5.0, 5.0, 5.0 ], + "to": [ 11.0, 11.0, 11.0 ], + "faces": { + "north": { "texture": "#base", "uv": [ 5.0, 5.0, 11.0, 11.0 ] }, + "east": { "texture": "#base", "uv": [ 5.0, 5.0, 11.0, 11.0 ] }, + "south": { "texture": "#base", "uv": [ 11.0, 5.0, 5.0, 11.0 ] }, + "west": { "texture": "#base", "uv": [ 11.0, 5.0, 5.0, 11.0 ] }, + "up": { "texture": "#base", "uv": [ 5.0, 5.0, 11.0, 11.0 ] }, + "down": { "texture": "#base", "uv": [ 5.0, 5.0, 11.0, 11.0 ] } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/part/cable/smart/connection.json b/src/main/resources/assets/appliedenergistics2/models/part/cable/smart/connection.json new file mode 100644 index 00000000..f6e59854 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/part/cable/smart/connection.json @@ -0,0 +1,34 @@ +{ + "textures": { + "base": "appliedenergistics2:parts/cable/smart/${color}", + "channels": "appliedenergistics2:parts/cable/smart/${channels}" + }, + "elements": [ + { + "name": "Element", + "from": [ 6.0, 6.0, 0.0 ], + "to": [ 10.0, 10.0, 5.0 ], + "faces": { + "north": { "texture": "#base", "uv": [ 6.0, 6.0, 10.0, 10.0 ] }, + "east": { "texture": "#base", "uv": [ 11.0, 6.0, 16.0, 10.0 ] }, + "south": { "texture": "#base", "uv": [ 10.0, 6.0, 6.0, 10.0 ] }, + "west": { "texture": "#base", "uv": [ 16.0, 6.0, 11.0, 10.0 ] }, + "up": { "texture": "#base", "uv": [ 6.0, 0.0, 10.0, 5.0 ] }, + "down": { "texture": "#base", "uv": [ 6.0, 11.0, 10.0, 16.0 ] } + } + }, + { + "name": "Channels", + "from": [ 6.0, 6.0, 0.0 ], + "to": [ 10.0, 10.0, 5.0 ], + "faces": { + "north": { "texture": "#channels", "uv": [ 6.0, 6.0, 10.0, 10.0 ] }, + "east": { "texture": "#channels", "uv": [ 11.0, 6.0, 16.0, 10.0 ] }, + "south": { "texture": "#channels", "uv": [ 10.0, 6.0, 6.0, 10.0 ] }, + "west": { "texture": "#channels", "uv": [ 16.0, 6.0, 11.0, 10.0 ] }, + "up": { "texture": "#channels", "uv": [ 6.0, 0.0, 10.0, 5.0 ] }, + "down": { "texture": "#channels", "uv": [ 6.0, 11.0, 10.0, 16.0 ] } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/part/cable/smart/straight.json b/src/main/resources/assets/appliedenergistics2/models/part/cable/smart/straight.json new file mode 100644 index 00000000..c30d6206 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/part/cable/smart/straight.json @@ -0,0 +1,34 @@ +{ + "textures": { + "base": "appliedenergistics2:parts/cable/smart/${color}", + "channels": "appliedenergistics2:parts/cable/smart/${channels}" + }, + "elements": [ + { + "name": "Element", + "from": [ 5.0, 5.0, 0.0 ], + "to": [ 11.0, 11.0, 16.0 ], + "faces": { + "north": { "texture": "#base", "uv": [ 5.0, 5.0, 11.0, 11.0 ] }, + "east": { "texture": "#base", "uv": [ 0.0, 5.0, 5.0, 11.0 ] }, + "south": { "texture": "#base", "uv": [ 11.0, 5.0, 5.0, 11.0 ] }, + "west": { "texture": "#base", "uv": [ 5.0, 5.0, 0.0, 11.0 ] }, + "up": { "texture": "#base", "uv": [ 5.0, 0.0, 11.0, 5.0 ] }, + "down": { "texture": "#base", "uv": [ 5.0, 11.0, 11.0, 16.0 ] } + } + }, + { + "name": "Channels", + "from": [ 5.0, 5.0, 0.0 ], + "to": [ 11.0, 11.0, 16.0 ], + "faces": { + "north": { "texture": "#channels", "uv": [ 5.0, 5.0, 11.0, 11.0 ] }, + "east": { "texture": "#channels", "uv": [ 0.0, 5.0, 5.0, 11.0 ] }, + "south": { "texture": "#channels", "uv": [ 11.0, 5.0, 5.0, 11.0 ] }, + "west": { "texture": "#channels", "uv": [ 5.0, 5.0, 0.0, 11.0 ] }, + "up": { "texture": "#channels", "uv": [ 5.0, 0.0, 11.0, 5.0 ] }, + "down": { "texture": "#channels", "uv": [ 5.0, 11.0, 11.0, 16.0 ] } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/part/cable_anchor.json b/src/main/resources/assets/appliedenergistics2/models/part/cable_anchor.json new file mode 100644 index 00000000..52c6fe62 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/part/cable_anchor.json @@ -0,0 +1,20 @@ +{ + "textures": { + "0": "appliedenergistics2:parts/CableAnchor" + }, + "elements": [ + { + "name": "Element", + "from": [ 7.0, 7.0, 0.0 ], + "to": [ 9.0, 9.0, 6.0 ], + "faces": { + "north": { "texture": "#0", "uv": [ 0.0, 0.0, 2.0, 2.0 ] }, + "east": { "texture": "#0", "uv": [ 0.0, 0.0, 6.0, 2.0 ] }, + "south": { "texture": "#0", "uv": [ 0.0, 0.0, 2.0, 2.0 ] }, + "west": { "texture": "#0", "uv": [ 0.0, 0.0, 6.0, 2.0 ] }, + "up": { "texture": "#0", "uv": [ 0.0, 0.0, 2.0, 6.0 ] }, + "down": { "texture": "#0", "uv": [ 0.0, 0.0, 2.0, 6.0 ] } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/part/cable_facade.json b/src/main/resources/assets/appliedenergistics2/models/part/cable_facade.json new file mode 100644 index 00000000..272e1350 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/part/cable_facade.json @@ -0,0 +1,3 @@ +{ + "parent": "appliedenergistics2:parts/cableanchor" +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/part/crafting_terminal.json b/src/main/resources/assets/appliedenergistics2/models/part/crafting_terminal.json new file mode 100644 index 00000000..3f0425f6 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/part/crafting_terminal.json @@ -0,0 +1,75 @@ +{ + "textures": { + "frame": "appliedenergistics2:parts/crafting_terminal/frame", + "sides": "appliedenergistics2:parts/crafting_terminal/sides", + "back": "appliedenergistics2:parts/crafting_terminal/back", + "l0": "appliedenergistics2:parts/crafting_terminal/l0", + "l1": "appliedenergistics2:parts/crafting_terminal/l1", + "l2": "appliedenergistics2:parts/crafting_terminal/l2", + "SidesStatus": "appliedenergistics2:parts/crafting_terminal/sidesstatus", + "Backlights": "appliedenergistics2:parts/crafting_terminal/backlights" + }, + "elements": [ + { + "name": "Base", + "from": [ 2.0, 2.0, 0.0 ], + "to": [ 14.0, 14.0, 1.0 ], + "faces": { + "north": { "texture": "frame", "uv": [ 2.0, 2.0, 14.0, 14.0 ] }, + "east": { "texture": "sides", "uv": [ 0.0, 2.0, 1.0, 14.0 ] }, + "south": { "texture": "back", "uv": [ 2.0, 2.0, 14.0, 14.0 ] }, + "west": { "texture": "sides", "uv": [ 15.0, 2.0, 16.0, 14.0 ] }, + "up": { "texture": "sides", "uv": [ 2.0, 0.0, 14.0, 1.0 ] }, + "down": { "texture": "sides", "uv": [ 2.0, 15.0, 14.0, 16.0 ] } + } + }, + { + "name": "l0", + "from": [ 2.0, 2.0, 0.0 ], + "to": [ 14.0, 14.0, 1.0 ], + "faces": { + "north": { "texture": "l0", "tintindex": 1, "uv": [ 2.0, 2.0, 14.0, 14.0 ] } + } + }, + { + "name": "l1", + "from": [ 2.0, 2.0, 0.0 ], + "to": [ 14.0, 14.0, 1.0 ], + "faces": { + "north": { "texture": "l1", "tintindex": 2, "uv": [ 2.0, 2.0, 14.0, 14.0 ] } + } + }, + { + "name": "l2", + "from": [ 2.0, 2.0, 0.0 ], + "to": [ 14.0, 14.0, 1.0 ], + "faces": { + "north": { "texture": "l2", "tintindex": 3, "uv": [ 2.0, 2.0, 14.0, 14.0 ] } + } + }, + { + "name": "Back", + "from": [ 4.0, 4.0, 1.0 ], + "to": [ 12.0, 12.0, 2.0 ], + "faces": { + "north": { "texture": "back", "uv": [ 4.0, 4.0, 12.0, 12.0 ] }, + "east": { "texture": "SidesStatus", "uv": [ 0.0, 4.0, 1.0, 12.0 ] }, + "south": { "texture": "back", "uv": [ 4.0, 4.0, 12.0, 12.0 ] }, + "west": { "texture": "SidesStatus", "uv": [ 15.0, 4.0, 16.0, 12.0 ] }, + "up": { "texture": "SidesStatus", "uv": [ 4.0, 0.0, 12.0, 1.0 ] }, + "down": { "texture": "SidesStatus", "uv": [ 4.0, 15.0, 12.0, 16.0 ] } + } + }, + { + "name": "Backlights", + "from": [ 4.0, 4.0, 1.0 ], + "to": [ 12.0, 12.0, 2.0 ], + "faces": { + "east": { "texture": "Backlights", "tintindex": 0, "uv": [ 0.0, 4.0, 1.0, 12.0 ] }, + "west": { "texture": "Backlights", "tintindex": 0, "uv": [ 15.0, 4.0, 16.0, 12.0 ] }, + "up": { "texture": "Backlights", "tintindex": 0, "uv": [ 4.0, 0.0, 12.0, 1.0 ] }, + "down": { "texture": "Backlights", "tintindex": 0, "uv": [ 4.0, 15.0, 12.0, 16.0 ] } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/CableAnchor.png b/src/main/resources/assets/appliedenergistics2/textures/parts/CableAnchor.png new file mode 100644 index 00000000..2615c94f Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/CableAnchor.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/Black.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/Black.png new file mode 100644 index 00000000..be8d1cee Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/Black.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/Blue.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/Blue.png new file mode 100644 index 00000000..e59e547e Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/Blue.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/Brown.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/Brown.png new file mode 100644 index 00000000..70c8c57a Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/Brown.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/Cyan.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/Cyan.png new file mode 100644 index 00000000..7e1ac7e7 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/Cyan.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/Gray.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/Gray.png new file mode 100644 index 00000000..d0a99df2 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/Gray.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/Green.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/Green.png new file mode 100644 index 00000000..990574ee Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/Green.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/LightBlue.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/LightBlue.png new file mode 100644 index 00000000..a65687f8 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/LightBlue.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/LightGrey.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/LightGrey.png new file mode 100644 index 00000000..ba16a837 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/LightGrey.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/Lime.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/Lime.png new file mode 100644 index 00000000..4cae7679 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/Lime.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/Magenta.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/Magenta.png new file mode 100644 index 00000000..1ffc9d53 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/Magenta.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/Orange.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/Orange.png new file mode 100644 index 00000000..99d579dc Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/Orange.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/Pink.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/Pink.png new file mode 100644 index 00000000..6343b8c4 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/Pink.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/Purple.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/Purple.png new file mode 100644 index 00000000..8727b9cd Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/Purple.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/Red.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/Red.png new file mode 100644 index 00000000..b2470e73 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/Red.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/Transparent.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/Transparent.png new file mode 100644 index 00000000..d7237101 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/Transparent.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/White.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/White.png new file mode 100644 index 00000000..23d24bb2 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/White.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/Yellow.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/Yellow.png new file mode 100644 index 00000000..4e3923fb Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/Yellow.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/0.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/0.png new file mode 100644 index 00000000..d63a978c Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/0.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/1.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/1.png new file mode 100644 index 00000000..d63a978c Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/1.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/10.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/10.png new file mode 100644 index 00000000..c1c2d6d7 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/10.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/11.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/11.png new file mode 100644 index 00000000..c1c2d6d7 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/11.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/12.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/12.png new file mode 100644 index 00000000..e3b95105 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/12.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/13.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/13.png new file mode 100644 index 00000000..e3b95105 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/13.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/14.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/14.png new file mode 100644 index 00000000..e3b95105 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/14.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/15.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/15.png new file mode 100644 index 00000000..e3b95105 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/15.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/16.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/16.png new file mode 100644 index 00000000..2cf5601a Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/16.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/17.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/17.png new file mode 100644 index 00000000..2cf5601a Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/17.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/18.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/18.png new file mode 100644 index 00000000..2cf5601a Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/18.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/19.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/19.png new file mode 100644 index 00000000..2cf5601a Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/19.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/2.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/2.png new file mode 100644 index 00000000..d63a978c Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/2.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/20.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/20.png new file mode 100644 index 00000000..3eb6c342 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/20.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/21.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/21.png new file mode 100644 index 00000000..3eb6c342 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/21.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/22.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/22.png new file mode 100644 index 00000000..3eb6c342 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/22.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/23.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/23.png new file mode 100644 index 00000000..3eb6c342 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/23.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/24.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/24.png new file mode 100644 index 00000000..ac6a20a1 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/24.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/25.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/25.png new file mode 100644 index 00000000..ac6a20a1 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/25.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/26.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/26.png new file mode 100644 index 00000000..ac6a20a1 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/26.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/27.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/27.png new file mode 100644 index 00000000..ac6a20a1 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/27.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/28.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/28.png new file mode 100644 index 00000000..a73015de Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/28.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/29.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/29.png new file mode 100644 index 00000000..a73015de Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/29.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/3.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/3.png new file mode 100644 index 00000000..d63a978c Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/3.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/30.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/30.png new file mode 100644 index 00000000..a73015de Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/30.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/31.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/31.png new file mode 100644 index 00000000..a73015de Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/31.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/32.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/32.png new file mode 100644 index 00000000..0d74dc97 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/32.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/4.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/4.png new file mode 100644 index 00000000..0bc8ce43 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/4.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/5.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/5.png new file mode 100644 index 00000000..0bc8ce43 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/5.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/6.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/6.png new file mode 100644 index 00000000..0bc8ce43 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/6.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/7.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/7.png new file mode 100644 index 00000000..0bc8ce43 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/7.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/8.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/8.png new file mode 100644 index 00000000..c1c2d6d7 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/8.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/9.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/9.png new file mode 100644 index 00000000..c1c2d6d7 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/9.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/Black.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/Black.png new file mode 100644 index 00000000..ca759c71 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/Black.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/Blue.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/Blue.png new file mode 100644 index 00000000..0698a8b7 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/Blue.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/Brown.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/Brown.png new file mode 100644 index 00000000..2c34472f Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/Brown.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/Cyan.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/Cyan.png new file mode 100644 index 00000000..b705d97f Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/Cyan.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/Gray.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/Gray.png new file mode 100644 index 00000000..bb86b7b1 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/Gray.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/Green.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/Green.png new file mode 100644 index 00000000..a5e7c48e Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/Green.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/LightBlue.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/LightBlue.png new file mode 100644 index 00000000..dc341da6 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/LightBlue.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/LightGrey.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/LightGrey.png new file mode 100644 index 00000000..85918fc5 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/LightGrey.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/Lime.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/Lime.png new file mode 100644 index 00000000..6b7164b9 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/Lime.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/Magenta.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/Magenta.png new file mode 100644 index 00000000..4d2097da Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/Magenta.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/Orange.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/Orange.png new file mode 100644 index 00000000..a4fe8a11 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/Orange.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/Pink.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/Pink.png new file mode 100644 index 00000000..84eeab90 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/Pink.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/Purple.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/Purple.png new file mode 100644 index 00000000..44b6c5d4 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/Purple.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/Red.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/Red.png new file mode 100644 index 00000000..a0a341b0 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/Red.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/Transparent.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/Transparent.png new file mode 100644 index 00000000..dc47ab47 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/Transparent.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/White.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/White.png new file mode 100644 index 00000000..9ca58b2d Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/White.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/Yellow.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/Yellow.png new file mode 100644 index 00000000..dd04e23d Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense/Yellow.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/Black.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/Black.png new file mode 100644 index 00000000..6c9d898d Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/Black.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/Blue.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/Blue.png new file mode 100644 index 00000000..e7913f6f Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/Blue.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/Brown.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/Brown.png new file mode 100644 index 00000000..3c4247c5 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/Brown.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/Cyan.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/Cyan.png new file mode 100644 index 00000000..84907c97 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/Cyan.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/Green.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/Green.png new file mode 100644 index 00000000..a9fd11bd Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/Green.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/Grey.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/Grey.png new file mode 100644 index 00000000..12c94eea Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/Grey.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/LightBlue.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/LightBlue.png new file mode 100644 index 00000000..853e17d0 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/LightBlue.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/LightGrey.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/LightGrey.png new file mode 100644 index 00000000..0b4d0087 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/LightGrey.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/Lime.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/Lime.png new file mode 100644 index 00000000..d208a457 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/Lime.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/Magenta.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/Magenta.png new file mode 100644 index 00000000..aede2d06 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/Magenta.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/Orange.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/Orange.png new file mode 100644 index 00000000..17f56381 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/Orange.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/Pink.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/Pink.png new file mode 100644 index 00000000..6dd845e2 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/Pink.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/Purple.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/Purple.png new file mode 100644 index 00000000..3fd0bd11 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/Purple.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/Red.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/Red.png new file mode 100644 index 00000000..b37bd466 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/Red.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/Transparent.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/Transparent.png new file mode 100644 index 00000000..78ebee7c Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/Transparent.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/White.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/White.png new file mode 100644 index 00000000..f5a8d5ae Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/White.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/Yellow.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/Yellow.png new file mode 100644 index 00000000..3871cf87 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/Yellow.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/0.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/0.png new file mode 100644 index 00000000..d63a978c Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/0.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/1.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/1.png new file mode 100644 index 00000000..0bc8ce43 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/1.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/2.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/2.png new file mode 100644 index 00000000..c1c2d6d7 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/2.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/3.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/3.png new file mode 100644 index 00000000..e3b95105 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/3.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/4.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/4.png new file mode 100644 index 00000000..2cf5601a Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/4.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/5.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/5.png new file mode 100644 index 00000000..3eb6c342 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/5.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/6.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/6.png new file mode 100644 index 00000000..ac6a20a1 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/6.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/7.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/7.png new file mode 100644 index 00000000..a73015de Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/7.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/8.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/8.png new file mode 100644 index 00000000..0d74dc97 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/8.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/Black.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/Black.png new file mode 100644 index 00000000..e1affe79 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/Black.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/Blue.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/Blue.png new file mode 100644 index 00000000..8dd44883 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/Blue.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/Brown.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/Brown.png new file mode 100644 index 00000000..d5f805b6 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/Brown.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/Cyan.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/Cyan.png new file mode 100644 index 00000000..56392eca Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/Cyan.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/Gray.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/Gray.png new file mode 100644 index 00000000..580dc9dc Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/Gray.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/Green.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/Green.png new file mode 100644 index 00000000..8bbdbee8 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/Green.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/LightBlue.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/LightBlue.png new file mode 100644 index 00000000..24f21173 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/LightBlue.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/LightGrey.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/LightGrey.png new file mode 100644 index 00000000..9ff3331d Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/LightGrey.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/Lime.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/Lime.png new file mode 100644 index 00000000..1ed3faed Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/Lime.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/Magenta.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/Magenta.png new file mode 100644 index 00000000..59a06788 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/Magenta.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/Orange.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/Orange.png new file mode 100644 index 00000000..ef2d0279 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/Orange.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/Pink.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/Pink.png new file mode 100644 index 00000000..5921c759 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/Pink.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/Purple.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/Purple.png new file mode 100644 index 00000000..2a831553 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/Purple.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/Red.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/Red.png new file mode 100644 index 00000000..2504d85a Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/Red.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/Transparent.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/Transparent.png new file mode 100644 index 00000000..f7bc454f Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/Transparent.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/White.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/White.png new file mode 100644 index 00000000..c347720e Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/White.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/Yellow.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/Yellow.png new file mode 100644 index 00000000..fe058e24 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/Yellow.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal/back.png b/src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal/back.png new file mode 100644 index 00000000..f225dcf4 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal/back.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal/backlights.png b/src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal/backlights.png new file mode 100644 index 00000000..b9ac5164 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal/backlights.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal/frame.png b/src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal/frame.png new file mode 100644 index 00000000..5c35091f Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal/frame.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal/l0.png b/src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal/l0.png new file mode 100644 index 00000000..aea32385 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal/l0.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal/l1.png b/src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal/l1.png new file mode 100644 index 00000000..c48de089 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal/l1.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal/l2.png b/src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal/l2.png new file mode 100644 index 00000000..bf283814 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal/l2.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal/sides.png b/src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal/sides.png new file mode 100644 index 00000000..8b1f6f9f Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal/sides.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal/sidesstatus.png b/src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal/sidesstatus.png new file mode 100644 index 00000000..142f3851 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal/sidesstatus.png differ