From 71a88aa668f16dc90b662da3cdccba3672480c28 Mon Sep 17 00:00:00 2001 From: Sebastian Hartte Date: Fri, 26 Aug 2016 19:07:15 +0200 Subject: [PATCH] Implemented item models for cables. --- .../block/networking/BlockCableBus.java | 6 +- .../block/networking/CableBusRendering.java | 52 ++++++++ .../networking/CableModelCustomizer.java | 29 ---- .../core/api/definitions/ApiBlocks.java | 14 +- .../items/parts/ItemMultipartRendering.java | 15 ++- .../java/appeng/items/parts/PartType.java | 124 +++++++++++++----- .../models/item/part/cable_covered_base.json | 18 +++ .../models/item/part/cable_covered_black.json | 6 + .../models/item/part/cable_covered_blue.json | 6 + .../models/item/part/cable_covered_brown.json | 6 + .../models/item/part/cable_covered_cyan.json | 6 + .../models/item/part/cable_covered_gray.json | 6 + .../models/item/part/cable_covered_green.json | 6 + .../item/part/cable_covered_lightblue.json | 6 + .../item/part/cable_covered_lightgray.json | 6 + .../models/item/part/cable_covered_lime.json | 6 + .../item/part/cable_covered_magenta.json | 6 + .../item/part/cable_covered_orange.json | 6 + .../models/item/part/cable_covered_pink.json | 6 + .../item/part/cable_covered_purple.json | 6 + .../models/item/part/cable_covered_red.json | 6 + .../item/part/cable_covered_transparent.json | 6 + .../models/item/part/cable_covered_white.json | 6 + .../item/part/cable_covered_yellow.json | 6 + .../models/item/part/cable_dense_base.json | 34 +++++ .../models/item/part/cable_dense_black.json | 6 + .../models/item/part/cable_dense_blue.json | 6 + .../models/item/part/cable_dense_brown.json | 6 + .../models/item/part/cable_dense_cyan.json | 6 + .../models/item/part/cable_dense_gray.json | 6 + .../models/item/part/cable_dense_green.json | 6 + .../item/part/cable_dense_lightblue.json | 6 + .../item/part/cable_dense_lightgray.json | 6 + .../models/item/part/cable_dense_lime.json | 6 + .../models/item/part/cable_dense_magenta.json | 6 + .../models/item/part/cable_dense_orange.json | 6 + .../models/item/part/cable_dense_pink.json | 6 + .../models/item/part/cable_dense_purple.json | 6 + .../models/item/part/cable_dense_red.json | 6 + .../item/part/cable_dense_transparent.json | 6 + .../models/item/part/cable_dense_white.json | 6 + .../models/item/part/cable_dense_yellow.json | 6 + .../models/item/part/cable_glass_base.json | 44 +++++++ .../models/item/part/cable_glass_black.json | 6 + .../models/item/part/cable_glass_blue.json | 6 + .../models/item/part/cable_glass_brown.json | 6 + .../models/item/part/cable_glass_cyan.json | 6 + .../models/item/part/cable_glass_gray.json | 6 + .../models/item/part/cable_glass_green.json | 6 + .../item/part/cable_glass_lightblue.json | 6 + .../item/part/cable_glass_lightgray.json | 6 + .../models/item/part/cable_glass_lime.json | 6 + .../models/item/part/cable_glass_magenta.json | 6 + .../models/item/part/cable_glass_orange.json | 6 + .../models/item/part/cable_glass_pink.json | 6 + .../models/item/part/cable_glass_purple.json | 6 + .../models/item/part/cable_glass_red.json | 6 + .../item/part/cable_glass_transparent.json | 6 + .../models/item/part/cable_glass_white.json | 6 + .../models/item/part/cable_glass_yellow.json | 6 + .../models/item/part/cable_smart_base.json | 34 +++++ .../models/item/part/cable_smart_black.json | 6 + .../models/item/part/cable_smart_blue.json | 6 + .../models/item/part/cable_smart_brown.json | 6 + .../models/item/part/cable_smart_cyan.json | 6 + .../models/item/part/cable_smart_gray.json | 6 + .../models/item/part/cable_smart_green.json | 6 + .../item/part/cable_smart_lightblue.json | 6 + .../item/part/cable_smart_lightgray.json | 6 + .../models/item/part/cable_smart_lime.json | 6 + .../models/item/part/cable_smart_magenta.json | 6 + .../models/item/part/cable_smart_orange.json | 6 + .../models/item/part/cable_smart_pink.json | 6 + .../models/item/part/cable_smart_purple.json | 6 + .../models/item/part/cable_smart_red.json | 6 + .../item/part/cable_smart_transparent.json | 6 + .../models/item/part/cable_smart_white.json | 6 + .../models/item/part/cable_smart_yellow.json | 6 + .../parts/cable/glass/{Grey.png => Gray.png} | Bin 79 files changed, 695 insertions(+), 83 deletions(-) create mode 100644 src/main/java/appeng/block/networking/CableBusRendering.java delete mode 100644 src/main/java/appeng/block/networking/CableModelCustomizer.java create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/part/cable_covered_base.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/part/cable_covered_black.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/part/cable_covered_blue.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/part/cable_covered_brown.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/part/cable_covered_cyan.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/part/cable_covered_gray.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/part/cable_covered_green.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/part/cable_covered_lightblue.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/part/cable_covered_lightgray.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/part/cable_covered_lime.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/part/cable_covered_magenta.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/part/cable_covered_orange.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/part/cable_covered_pink.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/part/cable_covered_purple.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/part/cable_covered_red.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/part/cable_covered_transparent.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/part/cable_covered_white.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/part/cable_covered_yellow.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_base.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_black.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_blue.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_brown.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_cyan.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_gray.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_green.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_lightblue.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_lightgray.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_lime.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_magenta.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_orange.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_pink.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_purple.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_red.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_transparent.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_white.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_yellow.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/part/cable_glass_base.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/part/cable_glass_black.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/part/cable_glass_blue.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/part/cable_glass_brown.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/part/cable_glass_cyan.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/part/cable_glass_gray.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/part/cable_glass_green.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/part/cable_glass_lightblue.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/part/cable_glass_lightgray.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/part/cable_glass_lime.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/part/cable_glass_magenta.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/part/cable_glass_orange.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/part/cable_glass_pink.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/part/cable_glass_purple.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/part/cable_glass_red.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/part/cable_glass_transparent.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/part/cable_glass_white.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/part/cable_glass_yellow.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/part/cable_smart_base.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/part/cable_smart_black.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/part/cable_smart_blue.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/part/cable_smart_brown.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/part/cable_smart_cyan.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/part/cable_smart_gray.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/part/cable_smart_green.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/part/cable_smart_lightblue.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/part/cable_smart_lightgray.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/part/cable_smart_lime.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/part/cable_smart_magenta.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/part/cable_smart_orange.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/part/cable_smart_pink.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/part/cable_smart_purple.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/part/cable_smart_red.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/part/cable_smart_transparent.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/part/cable_smart_white.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/part/cable_smart_yellow.json rename src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/{Grey.png => Gray.png} (100%) diff --git a/src/main/java/appeng/block/networking/BlockCableBus.java b/src/main/java/appeng/block/networking/BlockCableBus.java index ccec0af4..22c04aec 100644 --- a/src/main/java/appeng/block/networking/BlockCableBus.java +++ b/src/main/java/appeng/block/networking/BlockCableBus.java @@ -152,14 +152,10 @@ public class BlockCableBus extends AEBaseTileBlock @Override public int getLightValue( final IBlockState state, final IBlockAccess world, final BlockPos pos ) { - if( state != null && state.getBlock() != this ) + if( state.getBlock() != this ) { return state.getBlock().getLightValue( state, world, pos ); } - if( state == null ) - { - return 0; - } return this.cb( world, pos ).getLightValue(); } diff --git a/src/main/java/appeng/block/networking/CableBusRendering.java b/src/main/java/appeng/block/networking/CableBusRendering.java new file mode 100644 index 00000000..fee8e31b --- /dev/null +++ b/src/main/java/appeng/block/networking/CableBusRendering.java @@ -0,0 +1,52 @@ +package appeng.block.networking; + + +import net.minecraft.client.renderer.block.model.BakedQuad; +import net.minecraft.client.renderer.block.model.IBakedModel; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import appeng.api.client.BakingPipeline; +import appeng.bootstrap.BlockRenderingCustomizer; +import appeng.bootstrap.IBlockRendering; +import appeng.bootstrap.IItemRendering; +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; + + +/** + * Customizes the rendering behavior for cable busses, which are the biggest multipart of AE2. + */ +public class CableBusRendering extends BlockRenderingCustomizer +{ + + private final BakingPipeline rotatingPipeline = new BakingPipeline<>( TypeTransformer.quads2vecs, new FacingQuadRotator(), TypeTransformer.vecs2quads ); + private final TintIndexModifier tintIndexModifier = new TintIndexModifier( tint -> tint ); + private final BakingPipeline tintIndexFixPipeline = new BakingPipeline<>( TypeTransformer.quads2vecs, tintIndexModifier, TypeTransformer.vecs2quads ); + + @Override + @SideOnly( Side.CLIENT ) + public void customize( IBlockRendering rendering, IItemRendering itemRendering ) + { + rendering.modelCustomizer( this::customizeModel ); + rendering.blockColor( new CableBusColor() ); + } + + private IBakedModel customizeModel( ResourceLocation location, IBakedModel model ) + { + return new BakingPipelineBakedModel( model, + new Merge<>( + new CableAndConnections( rotatingPipeline, tintIndexModifier, tintIndexFixPipeline ), + new Facades( rotatingPipeline, tintIndexModifier, tintIndexFixPipeline ), + new Parts( rotatingPipeline, tintIndexModifier, tintIndexFixPipeline ) + ) + ); + } +} diff --git a/src/main/java/appeng/block/networking/CableModelCustomizer.java b/src/main/java/appeng/block/networking/CableModelCustomizer.java deleted file mode 100644 index df564aea..00000000 --- a/src/main/java/appeng/block/networking/CableModelCustomizer.java +++ /dev/null @@ -1,29 +0,0 @@ -package appeng.block.networking; - - -import net.minecraft.client.renderer.block.model.IBakedModel; -import net.minecraft.client.renderer.block.model.ModelResourceLocation; - -import appeng.api.client.BakingPipeline; -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; - - -public class CableModelCustomizer -{ - - private final BakingPipeline rotatingPipeline = new BakingPipeline( TypeTransformer.quads2vecs, new FacingQuadRotator(), TypeTransformer.vecs2quads ); - private final TintIndexModifier tintIndexModifier = new TintIndexModifier( tint -> tint ); - private final BakingPipeline tintIndexFixPipeline = new BakingPipeline( TypeTransformer.quads2vecs, tintIndexModifier, TypeTransformer.vecs2quads ); - - public IBakedModel customizeModel( ModelResourceLocation location, IBakedModel model ) - { - return new BakingPipelineBakedModel( model, new Merge( new CableAndConnections( rotatingPipeline, tintIndexModifier, tintIndexFixPipeline ), new Facades( rotatingPipeline, tintIndexModifier, tintIndexFixPipeline ), new Parts( rotatingPipeline, tintIndexModifier, tintIndexFixPipeline ) ) ); - } -} diff --git a/src/main/java/appeng/core/api/definitions/ApiBlocks.java b/src/main/java/appeng/core/api/definitions/ApiBlocks.java index 2e5e378f..ddbd56f3 100644 --- a/src/main/java/appeng/core/api/definitions/ApiBlocks.java +++ b/src/main/java/appeng/core/api/definitions/ApiBlocks.java @@ -62,8 +62,7 @@ import appeng.block.networking.BlockEnergyAcceptor; import appeng.block.networking.BlockEnergyCell; import appeng.block.networking.BlockEnergyCellRendering; import appeng.block.networking.BlockWireless; -import appeng.block.networking.CableBusColor; -import appeng.block.networking.CableModelCustomizer; +import appeng.block.networking.CableBusRendering; import appeng.block.networking.ControllerRendering; import appeng.block.qnb.BlockQuantumLinkChamber; import appeng.block.qnb.BlockQuantumRing; @@ -338,16 +337,7 @@ public final class ApiBlocks implements IBlocks this.quartzPillarStairs = makeStairs( "quartz_pillar_stairs", registry, this.quartzPillar() ); this.multiPart = registry.block( "multipart_block", BlockCableBus::new ) - .rendering( new BlockRenderingCustomizer() - { - @Override - @SideOnly( Side.CLIENT ) - public void customize( IBlockRendering rendering, IItemRendering itemRendering ) - { - rendering.modelCustomizer( new CableModelCustomizer()::customizeModel ) - .blockColor( new CableBusColor() ); - } - } ) + .rendering( new CableBusRendering() ) .build(); // TODO Re-Add Slabs... diff --git a/src/main/java/appeng/items/parts/ItemMultipartRendering.java b/src/main/java/appeng/items/parts/ItemMultipartRendering.java index 871a0053..41542202 100644 --- a/src/main/java/appeng/items/parts/ItemMultipartRendering.java +++ b/src/main/java/appeng/items/parts/ItemMultipartRendering.java @@ -1,6 +1,9 @@ package appeng.items.parts; +import java.util.Arrays; +import java.util.stream.Collectors; + import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.item.ItemStack; @@ -21,13 +24,19 @@ public class ItemMultipartRendering extends ItemRenderingCustomizer @Override public void customize( IItemRendering rendering ) { + rendering.meshDefinition( this::getItemMeshDefinition ); + + // Register all item models as variants so they get loaded + rendering.variants( Arrays.stream( PartType.values() ) + .flatMap( part -> part.getItemModels().stream() ) + .collect( Collectors.toList() ) ); } private ModelResourceLocation getItemMeshDefinition( ItemStack is ) { - // TODO: Avoid object creation here. This happens every frame - return new ModelResourceLocation( item.getTypeByStack( is ).getModel(), null ); + PartType partType = item.getTypeByStack( is ); + int variant = item.variantOf( is.getItemDamage() ); + return partType.getItemModels().get( variant ); } - } diff --git a/src/main/java/appeng/items/parts/PartType.java b/src/main/java/appeng/items/parts/PartType.java index f09dacde..a7445124 100644 --- a/src/main/java/appeng/items/parts/PartType.java +++ b/src/main/java/appeng/items/parts/PartType.java @@ -20,13 +20,20 @@ package appeng.items.parts; import java.lang.reflect.Constructor; +import java.util.Arrays; import java.util.Collections; import java.util.EnumSet; +import java.util.List; import java.util.Set; +import java.util.stream.Collectors; +import com.google.common.collect.ImmutableList; + +import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.util.ResourceLocation; import appeng.api.parts.IPart; +import appeng.api.util.AEColor; import appeng.core.AppEng; import appeng.core.features.AEFeature; import appeng.core.localization.GuiText; @@ -65,91 +72,123 @@ import appeng.parts.reporting.PartTerminal; public enum PartType { - InvalidType( -1, new ResourceLocation( AppEng.MOD_ID, "invalid" ), EnumSet.of( AEFeature.Core ), EnumSet.noneOf( IntegrationType.class ), null ), + InvalidType( -1, "invalid" , EnumSet.of( AEFeature.Core ), EnumSet.noneOf( IntegrationType.class ), null ), - CableGlass( 0, new ResourceLocation( AppEng.MOD_ID, "cable_glass" ), EnumSet.of( AEFeature.Core ), EnumSet.noneOf( IntegrationType.class ), PartCableGlass.class ) + CableGlass( 0, "cable_glass" , EnumSet.of( AEFeature.Core ), EnumSet.noneOf( IntegrationType.class ), PartCableGlass.class ) { @Override public boolean isCable() { return true; } + + @Override + protected List createItemModels( String baseName ) + { + return Arrays.stream( AEColor.values() ) + .map( color -> modelFromBaseName( baseName + "_" + color.name().toLowerCase() ) ) + .collect( Collectors.toList()); + } }, - CableCovered( 20, new ResourceLocation( AppEng.MOD_ID, "cable_covered" ), EnumSet.of( AEFeature.Core ), EnumSet.noneOf( IntegrationType.class ), PartCableCovered.class ) + CableCovered( 20, "cable_covered" , EnumSet.of( AEFeature.Core ), EnumSet.noneOf( IntegrationType.class ), PartCableCovered.class ) { @Override public boolean isCable() { return true; } + + @Override + protected List createItemModels( String baseName ) + { + return Arrays.stream( AEColor.values() ) + .map( color -> modelFromBaseName( baseName + "_" + color.name().toLowerCase() ) ) + .collect( Collectors.toList()); + } }, - CableSmart( 40, new ResourceLocation( AppEng.MOD_ID, "cable_smart" ), EnumSet.of( AEFeature.Channels ), EnumSet.noneOf( IntegrationType.class ), PartCableSmart.class ) + CableSmart( 40, "cable_smart" , EnumSet.of( AEFeature.Channels ), EnumSet.noneOf( IntegrationType.class ), PartCableSmart.class ) { @Override public boolean isCable() { return true; } + + @Override + protected List createItemModels( String baseName ) + { + return Arrays.stream( AEColor.values() ) + .map( color -> modelFromBaseName( baseName + "_" + color.name().toLowerCase() ) ) + .collect( Collectors.toList()); + } }, - CableDense( 60, new ResourceLocation( AppEng.MOD_ID, "cable_dense" ), EnumSet.of( AEFeature.Channels ), EnumSet.noneOf( IntegrationType.class ), PartDenseCable.class ) + CableDense( 60, "cable_dense" , EnumSet.of( AEFeature.Channels ), EnumSet.noneOf( IntegrationType.class ), PartDenseCable.class ) { @Override public boolean isCable() { return true; } + + @Override + protected List createItemModels( String baseName ) + { + return Arrays.stream( AEColor.values() ) + .map( color -> modelFromBaseName( baseName + "_" + color.name().toLowerCase() ) ) + .collect( Collectors.toList()); + } }, - ToggleBus( 80, new ResourceLocation( AppEng.MOD_ID, "toggle_bus" ), EnumSet.of( AEFeature.Core ), EnumSet.noneOf( IntegrationType.class ), PartToggleBus.class ), + ToggleBus( 80, "toggle_bus" , EnumSet.of( AEFeature.Core ), EnumSet.noneOf( IntegrationType.class ), PartToggleBus.class ), - InvertedToggleBus( 100, new ResourceLocation( AppEng.MOD_ID, "inverted_toggle_bus" ), EnumSet.of( AEFeature.Core ), EnumSet.noneOf( IntegrationType.class ), PartInvertedToggleBus.class ), + InvertedToggleBus( 100, "inverted_toggle_bus" , EnumSet.of( AEFeature.Core ), EnumSet.noneOf( IntegrationType.class ), PartInvertedToggleBus.class ), - CableAnchor( 120, new ResourceLocation( AppEng.MOD_ID, "cable_anchor" ), EnumSet.of( AEFeature.Core ), EnumSet.noneOf( IntegrationType.class ), PartCableAnchor.class ), + CableAnchor( 120, "cable_anchor" , EnumSet.of( AEFeature.Core ), EnumSet.noneOf( IntegrationType.class ), PartCableAnchor.class ), - QuartzFiber( 140, new ResourceLocation( AppEng.MOD_ID, "quartz_fiber" ), EnumSet.of( AEFeature.Core ), EnumSet.noneOf( IntegrationType.class ), PartQuartzFiber.class ), + QuartzFiber( 140, "quartz_fiber" , EnumSet.of( AEFeature.Core ), EnumSet.noneOf( IntegrationType.class ), PartQuartzFiber.class ), - Monitor( 160, new ResourceLocation( AppEng.MOD_ID, "monitor" ), EnumSet.of( AEFeature.Core ), EnumSet.noneOf( IntegrationType.class ), PartPanel.class ), + Monitor( 160, "monitor" , EnumSet.of( AEFeature.Core ), EnumSet.noneOf( IntegrationType.class ), PartPanel.class ), - SemiDarkMonitor( 180, new ResourceLocation( AppEng.MOD_ID, "semi_dark_monitor" ), EnumSet.of( AEFeature.Core ), EnumSet.noneOf( IntegrationType.class ), PartSemiDarkPanel.class ), + SemiDarkMonitor( 180, "semi_dark_monitor" , EnumSet.of( AEFeature.Core ), EnumSet.noneOf( IntegrationType.class ), PartSemiDarkPanel.class ), - DarkMonitor( 200, new ResourceLocation( AppEng.MOD_ID, "dark_monitor" ), EnumSet.of( AEFeature.Core ), EnumSet.noneOf( IntegrationType.class ), PartDarkPanel.class ), + DarkMonitor( 200, "dark_monitor" , EnumSet.of( AEFeature.Core ), EnumSet.noneOf( IntegrationType.class ), PartDarkPanel.class ), - StorageBus( 220, new ResourceLocation( AppEng.MOD_ID, "storage_bus" ), EnumSet.of( AEFeature.StorageBus ), EnumSet.noneOf( IntegrationType.class ), PartStorageBus.class ), + StorageBus( 220, "storage_bus" , EnumSet.of( AEFeature.StorageBus ), EnumSet.noneOf( IntegrationType.class ), PartStorageBus.class ), - ImportBus( 240, new ResourceLocation( AppEng.MOD_ID, "import_bus" ), EnumSet.of( AEFeature.ImportBus ), EnumSet.noneOf( IntegrationType.class ), PartImportBus.class ), + ImportBus( 240, "import_bus" , EnumSet.of( AEFeature.ImportBus ), EnumSet.noneOf( IntegrationType.class ), PartImportBus.class ), - ExportBus( 260, new ResourceLocation( AppEng.MOD_ID, "export_bus" ), EnumSet.of( AEFeature.ExportBus ), EnumSet.noneOf( IntegrationType.class ), PartExportBus.class ), + ExportBus( 260, "export_bus" , EnumSet.of( AEFeature.ExportBus ), EnumSet.noneOf( IntegrationType.class ), PartExportBus.class ), - LevelEmitter( 280, new ResourceLocation( AppEng.MOD_ID, "level_emitter" ), EnumSet.of( AEFeature.LevelEmitter ), EnumSet.noneOf( IntegrationType.class ), PartLevelEmitter.class ), + LevelEmitter( 280, "level_emitter" , EnumSet.of( AEFeature.LevelEmitter ), EnumSet.noneOf( IntegrationType.class ), PartLevelEmitter.class ), - AnnihilationPlane( 300, new ResourceLocation( AppEng.MOD_ID, "annihilation_plane" ), EnumSet.of( AEFeature.AnnihilationPlane ), EnumSet.noneOf( IntegrationType.class ), PartAnnihilationPlane.class ), + AnnihilationPlane( 300, "annihilation_plane" , EnumSet.of( AEFeature.AnnihilationPlane ), EnumSet.noneOf( IntegrationType.class ), PartAnnihilationPlane.class ), - IdentityAnnihilationPlane( 301, new ResourceLocation( AppEng.MOD_ID, "identity_annihilation_plane" ), EnumSet.of( AEFeature.AnnihilationPlane, AEFeature.IdentityAnnihilationPlane ), EnumSet.noneOf( IntegrationType.class ), PartIdentityAnnihilationPlane.class ), + IdentityAnnihilationPlane( 301, "identity_annihilation_plane" , EnumSet.of( AEFeature.AnnihilationPlane, AEFeature.IdentityAnnihilationPlane ), EnumSet.noneOf( IntegrationType.class ), PartIdentityAnnihilationPlane.class ), - FormationPlane( 320, new ResourceLocation( AppEng.MOD_ID, "formation_plane" ), EnumSet.of( AEFeature.FormationPlane ), EnumSet.noneOf( IntegrationType.class ), PartFormationPlane.class ), + FormationPlane( 320, "formation_plane" , EnumSet.of( AEFeature.FormationPlane ), EnumSet.noneOf( IntegrationType.class ), PartFormationPlane.class ), - PatternTerminal( 340, new ResourceLocation( AppEng.MOD_ID, "pattern_terminal" ), EnumSet.of( AEFeature.Patterns ), EnumSet.noneOf( IntegrationType.class ), PartPatternTerminal.class ), + PatternTerminal( 340, "pattern_terminal" , EnumSet.of( AEFeature.Patterns ), EnumSet.noneOf( IntegrationType.class ), PartPatternTerminal.class ), - CraftingTerminal( 360, new ResourceLocation( AppEng.MOD_ID, "crafting_terminal" ), EnumSet.of( AEFeature.CraftingTerminal ), EnumSet.noneOf( IntegrationType.class ), PartCraftingTerminal.class ), + CraftingTerminal( 360, "crafting_terminal" , EnumSet.of( AEFeature.CraftingTerminal ), EnumSet.noneOf( IntegrationType.class ), PartCraftingTerminal.class ), - Terminal( 380, new ResourceLocation( AppEng.MOD_ID, "terminal" ), EnumSet.of( AEFeature.Core ), EnumSet.noneOf( IntegrationType.class ), PartTerminal.class ), + Terminal( 380, "terminal" , EnumSet.of( AEFeature.Core ), EnumSet.noneOf( IntegrationType.class ), PartTerminal.class ), - StorageMonitor( 400, new ResourceLocation( AppEng.MOD_ID, "storage_monitor" ), EnumSet.of( AEFeature.StorageMonitor ), EnumSet.noneOf( IntegrationType.class ), PartStorageMonitor.class ), + StorageMonitor( 400, "storage_monitor" , EnumSet.of( AEFeature.StorageMonitor ), EnumSet.noneOf( IntegrationType.class ), PartStorageMonitor.class ), - ConversionMonitor( 420, new ResourceLocation( AppEng.MOD_ID, "conversion_monitor" ), EnumSet.of( AEFeature.PartConversionMonitor ), EnumSet.noneOf( IntegrationType.class ), PartConversionMonitor.class ), + ConversionMonitor( 420, "conversion_monitor" , EnumSet.of( AEFeature.PartConversionMonitor ), EnumSet.noneOf( IntegrationType.class ), PartConversionMonitor.class ), - Interface( 440, new ResourceLocation( AppEng.MOD_ID, "interface" ), EnumSet.of( AEFeature.Core ), EnumSet.noneOf( IntegrationType.class ), PartInterface.class ), + Interface( 440, "interface" , EnumSet.of( AEFeature.Core ), EnumSet.noneOf( IntegrationType.class ), PartInterface.class ), - P2PTunnelME( 460, new ResourceLocation( AppEng.MOD_ID, "p2p_tunnel_me" ), EnumSet.of( AEFeature.P2PTunnel, AEFeature.P2PTunnelME ), EnumSet.noneOf( IntegrationType.class ), PartP2PTunnelME.class, GuiText.METunnel ), + P2PTunnelME( 460, "p2p_tunnel_me" , EnumSet.of( AEFeature.P2PTunnel, AEFeature.P2PTunnelME ), EnumSet.noneOf( IntegrationType.class ), PartP2PTunnelME.class, GuiText.METunnel ), - P2PTunnelRedstone( 461, new ResourceLocation( AppEng.MOD_ID, "p2p_tunnel_redstone" ), EnumSet.of( AEFeature.P2PTunnel, AEFeature.P2PTunnelRedstone ), EnumSet.noneOf( IntegrationType.class ), PartP2PRedstone.class, GuiText.RedstoneTunnel ), + P2PTunnelRedstone( 461, "p2p_tunnel_redstone" , EnumSet.of( AEFeature.P2PTunnel, AEFeature.P2PTunnelRedstone ), EnumSet.noneOf( IntegrationType.class ), PartP2PRedstone.class, GuiText.RedstoneTunnel ), - P2PTunnelItems( 462, new ResourceLocation( AppEng.MOD_ID, "p2p_tunnel_items" ), EnumSet.of( AEFeature.P2PTunnel, AEFeature.P2PTunnelItems ), EnumSet.noneOf( IntegrationType.class ), PartP2PItems.class, GuiText.ItemTunnel ), + P2PTunnelItems( 462, "p2p_tunnel_items" , EnumSet.of( AEFeature.P2PTunnel, AEFeature.P2PTunnelItems ), EnumSet.noneOf( IntegrationType.class ), PartP2PItems.class, GuiText.ItemTunnel ), - P2PTunnelLiquids( 463, new ResourceLocation( AppEng.MOD_ID, "p2p_tunnel_liquids" ), EnumSet.of( AEFeature.P2PTunnel, AEFeature.P2PTunnelLiquids ), EnumSet.noneOf( IntegrationType.class ), PartP2PLiquids.class, GuiText.FluidTunnel ), + P2PTunnelLiquids( 463, "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 ), @@ -157,7 +196,7 @@ public enum PartType // P2PTunnelRF( 466, EnumSet.of( AEFeature.P2PTunnel, AEFeature.P2PTunnelRF ), EnumSet.of( IntegrationType.RF ), // PartP2PRFPower.class, GuiText.RFTunnel ), - P2PTunnelLight( 467, new ResourceLocation( AppEng.MOD_ID, "p2p_tunnel_light" ), EnumSet.of( AEFeature.P2PTunnel, AEFeature.P2PTunnelLight ), EnumSet.noneOf( IntegrationType.class ), PartP2PLight.class, GuiText.LightTunnel ), + P2PTunnelLight( 467, "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 ), @@ -165,7 +204,7 @@ public enum PartType // P2PTunnelPressure( 469, EnumSet.of( AEFeature.P2PTunnel, AEFeature.P2PTunnelPressure ), EnumSet.of( // IntegrationType.PneumaticCraft ), PartP2PPressure.class, GuiText.PressureTunnel ), - InterfaceTerminal( 480, new ResourceLocation( AppEng.MOD_ID, "interface_terminal" ), EnumSet.of( AEFeature.InterfaceTerminal ), EnumSet.noneOf( IntegrationType.class ), PartInterfaceTerminal.class ); + InterfaceTerminal( 480, "interface_terminal" , EnumSet.of( AEFeature.InterfaceTerminal ), EnumSet.noneOf( IntegrationType.class ), PartInterfaceTerminal.class ); private final int baseDamage; private final ResourceLocation name; @@ -173,21 +212,33 @@ public enum PartType private final Set integrations; private final Class myPart; private final GuiText extraName; + private final List itemModels; private Constructor constructor; - PartType( final int baseMetaValue, final ResourceLocation name, final Set features, final Set integrations, final Class c ) + PartType( final int baseMetaValue, final String name, final Set features, final Set integrations, final Class c ) { this( baseMetaValue, name, features, integrations, c, null ); } - PartType( final int baseMetaValue, final ResourceLocation name, final Set features, final Set integrations, final Class c, final GuiText en ) + PartType( final int baseMetaValue, final String name, final Set features, final Set integrations, final Class c, final GuiText en ) { this.baseDamage = baseMetaValue; - this.name = name; + this.name = new ResourceLocation( AppEng.MOD_ID, name ); this.features = Collections.unmodifiableSet( features ); this.integrations = Collections.unmodifiableSet( integrations ); this.myPart = c; this.extraName = en; + this.itemModels = createItemModels( name ); + } + + protected List createItemModels( String baseName ) + { + return ImmutableList.of( modelFromBaseName( baseName ) ); + } + + private static ModelResourceLocation modelFromBaseName( String baseName ) + { + return new ModelResourceLocation( new ResourceLocation( AppEng.MOD_ID, "part/" + baseName ), "inventory" ); } int getBaseDamage() @@ -240,4 +291,9 @@ public enum PartType this.constructor = constructor; } + public List getItemModels() + { + return itemModels; + } + } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_covered_base.json b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_covered_base.json new file mode 100644 index 00000000..53f0a7ee --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_covered_base.json @@ -0,0 +1,18 @@ +{ + "parent": "block/block", + "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/item/part/cable_covered_black.json b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_covered_black.json new file mode 100644 index 00000000..eaa283c0 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_covered_black.json @@ -0,0 +1,6 @@ +{ + "parent": "appliedenergistics2:item/part/cable_covered_base", + "textures": { + "base": "appliedenergistics2:parts/cable/covered/black" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_covered_blue.json b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_covered_blue.json new file mode 100644 index 00000000..40f6931f --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_covered_blue.json @@ -0,0 +1,6 @@ +{ + "parent": "appliedenergistics2:item/part/cable_covered_base", + "textures": { + "base": "appliedenergistics2:parts/cable/covered/blue" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_covered_brown.json b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_covered_brown.json new file mode 100644 index 00000000..1f382c28 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_covered_brown.json @@ -0,0 +1,6 @@ +{ + "parent": "appliedenergistics2:item/part/cable_covered_base", + "textures": { + "base": "appliedenergistics2:parts/cable/covered/brown" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_covered_cyan.json b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_covered_cyan.json new file mode 100644 index 00000000..96e59643 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_covered_cyan.json @@ -0,0 +1,6 @@ +{ + "parent": "appliedenergistics2:item/part/cable_covered_base", + "textures": { + "base": "appliedenergistics2:parts/cable/covered/cyan" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_covered_gray.json b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_covered_gray.json new file mode 100644 index 00000000..25f62832 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_covered_gray.json @@ -0,0 +1,6 @@ +{ + "parent": "appliedenergistics2:item/part/cable_covered_base", + "textures": { + "base": "appliedenergistics2:parts/cable/covered/gray" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_covered_green.json b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_covered_green.json new file mode 100644 index 00000000..cbb49965 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_covered_green.json @@ -0,0 +1,6 @@ +{ + "parent": "appliedenergistics2:item/part/cable_covered_base", + "textures": { + "base": "appliedenergistics2:parts/cable/covered/green" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_covered_lightblue.json b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_covered_lightblue.json new file mode 100644 index 00000000..c8c63e85 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_covered_lightblue.json @@ -0,0 +1,6 @@ +{ + "parent": "appliedenergistics2:item/part/cable_covered_base", + "textures": { + "base": "appliedenergistics2:parts/cable/covered/lightblue" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_covered_lightgray.json b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_covered_lightgray.json new file mode 100644 index 00000000..27800ef3 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_covered_lightgray.json @@ -0,0 +1,6 @@ +{ + "parent": "appliedenergistics2:item/part/cable_covered_base", + "textures": { + "base": "appliedenergistics2:parts/cable/covered/lightgrey" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_covered_lime.json b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_covered_lime.json new file mode 100644 index 00000000..0cbe2d46 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_covered_lime.json @@ -0,0 +1,6 @@ +{ + "parent": "appliedenergistics2:item/part/cable_covered_base", + "textures": { + "base": "appliedenergistics2:parts/cable/covered/lime" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_covered_magenta.json b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_covered_magenta.json new file mode 100644 index 00000000..5efa4b54 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_covered_magenta.json @@ -0,0 +1,6 @@ +{ + "parent": "appliedenergistics2:item/part/cable_covered_base", + "textures": { + "base": "appliedenergistics2:parts/cable/covered/magenta" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_covered_orange.json b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_covered_orange.json new file mode 100644 index 00000000..57b12dcd --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_covered_orange.json @@ -0,0 +1,6 @@ +{ + "parent": "appliedenergistics2:item/part/cable_covered_base", + "textures": { + "base": "appliedenergistics2:parts/cable/covered/orange" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_covered_pink.json b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_covered_pink.json new file mode 100644 index 00000000..3fa44e68 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_covered_pink.json @@ -0,0 +1,6 @@ +{ + "parent": "appliedenergistics2:item/part/cable_covered_base", + "textures": { + "base": "appliedenergistics2:parts/cable/covered/pink" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_covered_purple.json b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_covered_purple.json new file mode 100644 index 00000000..a71ef94e --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_covered_purple.json @@ -0,0 +1,6 @@ +{ + "parent": "appliedenergistics2:item/part/cable_covered_base", + "textures": { + "base": "appliedenergistics2:parts/cable/covered/purple" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_covered_red.json b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_covered_red.json new file mode 100644 index 00000000..3a811181 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_covered_red.json @@ -0,0 +1,6 @@ +{ + "parent": "appliedenergistics2:item/part/cable_covered_base", + "textures": { + "base": "appliedenergistics2:parts/cable/covered/red" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_covered_transparent.json b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_covered_transparent.json new file mode 100644 index 00000000..031fadfa --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_covered_transparent.json @@ -0,0 +1,6 @@ +{ + "parent": "appliedenergistics2:item/part/cable_covered_base", + "textures": { + "base": "appliedenergistics2:parts/cable/covered/transparent" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_covered_white.json b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_covered_white.json new file mode 100644 index 00000000..6142e159 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_covered_white.json @@ -0,0 +1,6 @@ +{ + "parent": "appliedenergistics2:item/part/cable_covered_base", + "textures": { + "base": "appliedenergistics2:parts/cable/covered/white" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_covered_yellow.json b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_covered_yellow.json new file mode 100644 index 00000000..63d74594 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_covered_yellow.json @@ -0,0 +1,6 @@ +{ + "parent": "appliedenergistics2:item/part/cable_covered_base", + "textures": { + "base": "appliedenergistics2:parts/cable/covered/yellow" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_base.json b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_base.json new file mode 100644 index 00000000..8c8a7025 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_base.json @@ -0,0 +1,34 @@ +{ + "parent": "block/block", + "textures": { + "channels": "appliedenergistics2:parts/cable/dense/0" + }, + "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/item/part/cable_dense_black.json b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_black.json new file mode 100644 index 00000000..037030c6 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_black.json @@ -0,0 +1,6 @@ +{ + "parent": "appliedenergistics2:item/part/cable_dense_base", + "textures": { + "base": "appliedenergistics2:parts/cable/dense/black" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_blue.json b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_blue.json new file mode 100644 index 00000000..17bf74a7 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_blue.json @@ -0,0 +1,6 @@ +{ + "parent": "appliedenergistics2:item/part/cable_dense_base", + "textures": { + "base": "appliedenergistics2:parts/cable/dense/blue" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_brown.json b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_brown.json new file mode 100644 index 00000000..eaec7c08 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_brown.json @@ -0,0 +1,6 @@ +{ + "parent": "appliedenergistics2:item/part/cable_dense_base", + "textures": { + "base": "appliedenergistics2:parts/cable/dense/brown" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_cyan.json b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_cyan.json new file mode 100644 index 00000000..9c425acc --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_cyan.json @@ -0,0 +1,6 @@ +{ + "parent": "appliedenergistics2:item/part/cable_dense_base", + "textures": { + "base": "appliedenergistics2:parts/cable/dense/cyan" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_gray.json b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_gray.json new file mode 100644 index 00000000..79548a91 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_gray.json @@ -0,0 +1,6 @@ +{ + "parent": "appliedenergistics2:item/part/cable_dense_base", + "textures": { + "base": "appliedenergistics2:parts/cable/dense/gray" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_green.json b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_green.json new file mode 100644 index 00000000..43625b97 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_green.json @@ -0,0 +1,6 @@ +{ + "parent": "appliedenergistics2:item/part/cable_dense_base", + "textures": { + "base": "appliedenergistics2:parts/cable/dense/green" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_lightblue.json b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_lightblue.json new file mode 100644 index 00000000..e3962f3c --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_lightblue.json @@ -0,0 +1,6 @@ +{ + "parent": "appliedenergistics2:item/part/cable_dense_base", + "textures": { + "base": "appliedenergistics2:parts/cable/dense/lightblue" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_lightgray.json b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_lightgray.json new file mode 100644 index 00000000..2ed75e35 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_lightgray.json @@ -0,0 +1,6 @@ +{ + "parent": "appliedenergistics2:item/part/cable_dense_base", + "textures": { + "base": "appliedenergistics2:parts/cable/dense/lightgrey" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_lime.json b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_lime.json new file mode 100644 index 00000000..9db44ba6 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_lime.json @@ -0,0 +1,6 @@ +{ + "parent": "appliedenergistics2:item/part/cable_dense_base", + "textures": { + "base": "appliedenergistics2:parts/cable/dense/lime" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_magenta.json b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_magenta.json new file mode 100644 index 00000000..9c653c22 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_magenta.json @@ -0,0 +1,6 @@ +{ + "parent": "appliedenergistics2:item/part/cable_dense_base", + "textures": { + "base": "appliedenergistics2:parts/cable/dense/magenta" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_orange.json b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_orange.json new file mode 100644 index 00000000..2c7ab046 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_orange.json @@ -0,0 +1,6 @@ +{ + "parent": "appliedenergistics2:item/part/cable_dense_base", + "textures": { + "base": "appliedenergistics2:parts/cable/dense/orange" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_pink.json b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_pink.json new file mode 100644 index 00000000..e6e0783f --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_pink.json @@ -0,0 +1,6 @@ +{ + "parent": "appliedenergistics2:item/part/cable_dense_base", + "textures": { + "base": "appliedenergistics2:parts/cable/dense/pink" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_purple.json b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_purple.json new file mode 100644 index 00000000..ca075639 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_purple.json @@ -0,0 +1,6 @@ +{ + "parent": "appliedenergistics2:item/part/cable_dense_base", + "textures": { + "base": "appliedenergistics2:parts/cable/dense/purple" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_red.json b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_red.json new file mode 100644 index 00000000..c07feb5f --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_red.json @@ -0,0 +1,6 @@ +{ + "parent": "appliedenergistics2:item/part/cable_dense_base", + "textures": { + "base": "appliedenergistics2:parts/cable/dense/red" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_transparent.json b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_transparent.json new file mode 100644 index 00000000..36e4705a --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_transparent.json @@ -0,0 +1,6 @@ +{ + "parent": "appliedenergistics2:item/part/cable_dense_base", + "textures": { + "base": "appliedenergistics2:parts/cable/dense/transparent" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_white.json b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_white.json new file mode 100644 index 00000000..6434089d --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_white.json @@ -0,0 +1,6 @@ +{ + "parent": "appliedenergistics2:item/part/cable_dense_base", + "textures": { + "base": "appliedenergistics2:parts/cable/dense/white" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_yellow.json b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_yellow.json new file mode 100644 index 00000000..df86bf24 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_yellow.json @@ -0,0 +1,6 @@ +{ + "parent": "appliedenergistics2:item/part/cable_dense_base", + "textures": { + "base": "appliedenergistics2:parts/cable/dense/yellow" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_glass_base.json b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_glass_base.json new file mode 100644 index 00000000..fbcb2838 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_glass_base.json @@ -0,0 +1,44 @@ +{ + "parent": "block/block", + "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/item/part/cable_glass_black.json b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_glass_black.json new file mode 100644 index 00000000..e028e9a8 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_glass_black.json @@ -0,0 +1,6 @@ +{ + "parent": "appliedenergistics2:item/part/cable_glass_base", + "textures": { + "base": "appliedenergistics2:parts/cable/glass/black" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_glass_blue.json b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_glass_blue.json new file mode 100644 index 00000000..8a67417e --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_glass_blue.json @@ -0,0 +1,6 @@ +{ + "parent": "appliedenergistics2:item/part/cable_glass_base", + "textures": { + "base": "appliedenergistics2:parts/cable/glass/blue" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_glass_brown.json b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_glass_brown.json new file mode 100644 index 00000000..8d7d814b --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_glass_brown.json @@ -0,0 +1,6 @@ +{ + "parent": "appliedenergistics2:item/part/cable_glass_base", + "textures": { + "base": "appliedenergistics2:parts/cable/glass/brown" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_glass_cyan.json b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_glass_cyan.json new file mode 100644 index 00000000..36b64ecc --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_glass_cyan.json @@ -0,0 +1,6 @@ +{ + "parent": "appliedenergistics2:item/part/cable_glass_base", + "textures": { + "base": "appliedenergistics2:parts/cable/glass/cyan" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_glass_gray.json b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_glass_gray.json new file mode 100644 index 00000000..e56c9af7 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_glass_gray.json @@ -0,0 +1,6 @@ +{ + "parent": "appliedenergistics2:item/part/cable_glass_base", + "textures": { + "base": "appliedenergistics2:parts/cable/glass/gray" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_glass_green.json b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_glass_green.json new file mode 100644 index 00000000..04580ffe --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_glass_green.json @@ -0,0 +1,6 @@ +{ + "parent": "appliedenergistics2:item/part/cable_glass_base", + "textures": { + "base": "appliedenergistics2:parts/cable/glass/green" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_glass_lightblue.json b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_glass_lightblue.json new file mode 100644 index 00000000..c9aee24e --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_glass_lightblue.json @@ -0,0 +1,6 @@ +{ + "parent": "appliedenergistics2:item/part/cable_glass_base", + "textures": { + "base": "appliedenergistics2:parts/cable/glass/lightblue" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_glass_lightgray.json b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_glass_lightgray.json new file mode 100644 index 00000000..8eefc4da --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_glass_lightgray.json @@ -0,0 +1,6 @@ +{ + "parent": "appliedenergistics2:item/part/cable_glass_base", + "textures": { + "base": "appliedenergistics2:parts/cable/glass/lightgrey" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_glass_lime.json b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_glass_lime.json new file mode 100644 index 00000000..51521478 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_glass_lime.json @@ -0,0 +1,6 @@ +{ + "parent": "appliedenergistics2:item/part/cable_glass_base", + "textures": { + "base": "appliedenergistics2:parts/cable/glass/lime" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_glass_magenta.json b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_glass_magenta.json new file mode 100644 index 00000000..3718c287 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_glass_magenta.json @@ -0,0 +1,6 @@ +{ + "parent": "appliedenergistics2:item/part/cable_glass_base", + "textures": { + "base": "appliedenergistics2:parts/cable/glass/magenta" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_glass_orange.json b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_glass_orange.json new file mode 100644 index 00000000..f949b924 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_glass_orange.json @@ -0,0 +1,6 @@ +{ + "parent": "appliedenergistics2:item/part/cable_glass_base", + "textures": { + "base": "appliedenergistics2:parts/cable/glass/orange" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_glass_pink.json b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_glass_pink.json new file mode 100644 index 00000000..e4e6fbcf --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_glass_pink.json @@ -0,0 +1,6 @@ +{ + "parent": "appliedenergistics2:item/part/cable_glass_base", + "textures": { + "base": "appliedenergistics2:parts/cable/glass/pink" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_glass_purple.json b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_glass_purple.json new file mode 100644 index 00000000..5c2b693c --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_glass_purple.json @@ -0,0 +1,6 @@ +{ + "parent": "appliedenergistics2:item/part/cable_glass_base", + "textures": { + "base": "appliedenergistics2:parts/cable/glass/purple" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_glass_red.json b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_glass_red.json new file mode 100644 index 00000000..203d9356 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_glass_red.json @@ -0,0 +1,6 @@ +{ + "parent": "appliedenergistics2:item/part/cable_glass_base", + "textures": { + "base": "appliedenergistics2:parts/cable/glass/red" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_glass_transparent.json b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_glass_transparent.json new file mode 100644 index 00000000..36c5c7ba --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_glass_transparent.json @@ -0,0 +1,6 @@ +{ + "parent": "appliedenergistics2:item/part/cable_glass_base", + "textures": { + "base": "appliedenergistics2:parts/cable/glass/transparent" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_glass_white.json b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_glass_white.json new file mode 100644 index 00000000..6cb0747a --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_glass_white.json @@ -0,0 +1,6 @@ +{ + "parent": "appliedenergistics2:item/part/cable_glass_base", + "textures": { + "base": "appliedenergistics2:parts/cable/glass/white" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_glass_yellow.json b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_glass_yellow.json new file mode 100644 index 00000000..bd95eef0 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_glass_yellow.json @@ -0,0 +1,6 @@ +{ + "parent": "appliedenergistics2:item/part/cable_glass_base", + "textures": { + "base": "appliedenergistics2:parts/cable/glass/yellow" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_smart_base.json b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_smart_base.json new file mode 100644 index 00000000..348a64bf --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_smart_base.json @@ -0,0 +1,34 @@ +{ + "parent": "block/block", + "textures": { + "channels": "appliedenergistics2:parts/cable/smart/0" + }, + "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/item/part/cable_smart_black.json b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_smart_black.json new file mode 100644 index 00000000..64b2a920 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_smart_black.json @@ -0,0 +1,6 @@ +{ + "parent": "appliedenergistics2:item/part/cable_smart_base", + "textures": { + "base": "appliedenergistics2:parts/cable/smart/black" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_smart_blue.json b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_smart_blue.json new file mode 100644 index 00000000..caf56c54 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_smart_blue.json @@ -0,0 +1,6 @@ +{ + "parent": "appliedenergistics2:item/part/cable_smart_base", + "textures": { + "base": "appliedenergistics2:parts/cable/smart/blue" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_smart_brown.json b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_smart_brown.json new file mode 100644 index 00000000..7c8edf9a --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_smart_brown.json @@ -0,0 +1,6 @@ +{ + "parent": "appliedenergistics2:item/part/cable_smart_base", + "textures": { + "base": "appliedenergistics2:parts/cable/smart/brown" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_smart_cyan.json b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_smart_cyan.json new file mode 100644 index 00000000..4350dafb --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_smart_cyan.json @@ -0,0 +1,6 @@ +{ + "parent": "appliedenergistics2:item/part/cable_smart_base", + "textures": { + "base": "appliedenergistics2:parts/cable/smart/cyan" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_smart_gray.json b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_smart_gray.json new file mode 100644 index 00000000..383e36cf --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_smart_gray.json @@ -0,0 +1,6 @@ +{ + "parent": "appliedenergistics2:item/part/cable_smart_base", + "textures": { + "base": "appliedenergistics2:parts/cable/smart/gray" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_smart_green.json b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_smart_green.json new file mode 100644 index 00000000..1b659ea6 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_smart_green.json @@ -0,0 +1,6 @@ +{ + "parent": "appliedenergistics2:item/part/cable_smart_base", + "textures": { + "base": "appliedenergistics2:parts/cable/smart/green" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_smart_lightblue.json b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_smart_lightblue.json new file mode 100644 index 00000000..0d730ac2 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_smart_lightblue.json @@ -0,0 +1,6 @@ +{ + "parent": "appliedenergistics2:item/part/cable_smart_base", + "textures": { + "base": "appliedenergistics2:parts/cable/smart/lightblue" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_smart_lightgray.json b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_smart_lightgray.json new file mode 100644 index 00000000..89bb254b --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_smart_lightgray.json @@ -0,0 +1,6 @@ +{ + "parent": "appliedenergistics2:item/part/cable_smart_base", + "textures": { + "base": "appliedenergistics2:parts/cable/smart/lightgrey" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_smart_lime.json b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_smart_lime.json new file mode 100644 index 00000000..abf3727f --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_smart_lime.json @@ -0,0 +1,6 @@ +{ + "parent": "appliedenergistics2:item/part/cable_smart_base", + "textures": { + "base": "appliedenergistics2:parts/cable/smart/lime" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_smart_magenta.json b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_smart_magenta.json new file mode 100644 index 00000000..800559b7 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_smart_magenta.json @@ -0,0 +1,6 @@ +{ + "parent": "appliedenergistics2:item/part/cable_smart_base", + "textures": { + "base": "appliedenergistics2:parts/cable/smart/magenta" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_smart_orange.json b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_smart_orange.json new file mode 100644 index 00000000..2f8d6c68 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_smart_orange.json @@ -0,0 +1,6 @@ +{ + "parent": "appliedenergistics2:item/part/cable_smart_base", + "textures": { + "base": "appliedenergistics2:parts/cable/smart/orange" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_smart_pink.json b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_smart_pink.json new file mode 100644 index 00000000..f2379aa7 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_smart_pink.json @@ -0,0 +1,6 @@ +{ + "parent": "appliedenergistics2:item/part/cable_smart_base", + "textures": { + "base": "appliedenergistics2:parts/cable/smart/pink" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_smart_purple.json b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_smart_purple.json new file mode 100644 index 00000000..9e3c3781 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_smart_purple.json @@ -0,0 +1,6 @@ +{ + "parent": "appliedenergistics2:item/part/cable_smart_base", + "textures": { + "base": "appliedenergistics2:parts/cable/smart/purple" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_smart_red.json b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_smart_red.json new file mode 100644 index 00000000..49871300 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_smart_red.json @@ -0,0 +1,6 @@ +{ + "parent": "appliedenergistics2:item/part/cable_smart_base", + "textures": { + "base": "appliedenergistics2:parts/cable/smart/red" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_smart_transparent.json b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_smart_transparent.json new file mode 100644 index 00000000..82a2b244 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_smart_transparent.json @@ -0,0 +1,6 @@ +{ + "parent": "appliedenergistics2:item/part/cable_smart_base", + "textures": { + "base": "appliedenergistics2:parts/cable/smart/transparent" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_smart_white.json b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_smart_white.json new file mode 100644 index 00000000..b92df59f --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_smart_white.json @@ -0,0 +1,6 @@ +{ + "parent": "appliedenergistics2:item/part/cable_smart_base", + "textures": { + "base": "appliedenergistics2:parts/cable/smart/white" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_smart_yellow.json b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_smart_yellow.json new file mode 100644 index 00000000..f885da2b --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_smart_yellow.json @@ -0,0 +1,6 @@ +{ + "parent": "appliedenergistics2:item/part/cable_smart_base", + "textures": { + "base": "appliedenergistics2:parts/cable/smart/yellow" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/Grey.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/Gray.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/Grey.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/Gray.png