diff --git a/src/main/java/appeng/core/Registration.java b/src/main/java/appeng/core/Registration.java index e7c2212c..934b9a14 100644 --- a/src/main/java/appeng/core/Registration.java +++ b/src/main/java/appeng/core/Registration.java @@ -74,7 +74,7 @@ import appeng.core.localization.GuiText; import appeng.core.localization.PlayerMessages; import appeng.core.stats.PlayerStatsRegistration; import appeng.hooks.TickHandler; -import appeng.items.materials.MultiItem; +import appeng.items.materials.ItemMultiItem; import appeng.loot.ChestLoot; import appeng.me.cache.CraftingGridCache; import appeng.me.cache.EnergyGridCache; @@ -252,7 +252,7 @@ public final class Registration final IRegistryContainer registries = api.registries(); // Perform ore camouflage! - MultiItem.instance.makeUnique(); + ItemMultiItem.instance.makeUnique(); final Runnable recipeLoader = new RecipeLoader( recipeDirectory, customRecipeConfig, this.recipeHandler ); recipeLoader.run(); diff --git a/src/main/java/appeng/core/api/definitions/ApiBlocks.java b/src/main/java/appeng/core/api/definitions/ApiBlocks.java index 896a789c..f1a0b038 100644 --- a/src/main/java/appeng/core/api/definitions/ApiBlocks.java +++ b/src/main/java/appeng/core/api/definitions/ApiBlocks.java @@ -65,16 +65,16 @@ import appeng.debug.BlockChunkloader; import appeng.debug.BlockCubeGenerator; import appeng.debug.BlockItemGen; import appeng.debug.BlockPhantomNode; -import appeng.decorative.solid.ChargedQuartzOreBlock; -import appeng.decorative.solid.ChiseledQuartzBlock; -import appeng.decorative.solid.FluixBlock; -import appeng.decorative.solid.QuartzBlock; -import appeng.decorative.solid.QuartzGlassBlock; -import appeng.decorative.solid.QuartzLampBlock; -import appeng.decorative.solid.QuartzOreBlock; -import appeng.decorative.solid.QuartzPillarBlock; -import appeng.decorative.solid.SkyStoneBlock; -import appeng.decorative.solid.SkyStoneBlock.SkystoneType; +import appeng.decorative.solid.BlockChargedQuartzOre; +import appeng.decorative.solid.BlockChiseledQuartz; +import appeng.decorative.solid.BlockFluix; +import appeng.decorative.solid.BlockQuartz; +import appeng.decorative.solid.BlockQuartzGlass; +import appeng.decorative.solid.BlockQuartzLamp; +import appeng.decorative.solid.BlockQuartzOre; +import appeng.decorative.solid.BlockQuartzPillar; +import appeng.decorative.solid.BlockSkyStone; +import appeng.decorative.solid.BlockSkyStone.SkystoneType; import appeng.decorative.stair.BlockStairCommon; @@ -162,20 +162,20 @@ public final class ApiBlocks implements IBlocks public ApiBlocks( final DefinitionConstructor constructor ) { // this.quartzOre = new BlockDefinition( "ore.quartz", new OreQuartz() ); - this.quartzOre = constructor.registerBlockDefinition( new QuartzOreBlock() ); - this.quartzOreCharged = constructor.registerBlockDefinition( new ChargedQuartzOreBlock() ); + this.quartzOre = constructor.registerBlockDefinition( new BlockQuartzOre() ); + this.quartzOreCharged = constructor.registerBlockDefinition( new BlockChargedQuartzOre() ); this.matrixFrame = constructor.registerBlockDefinition( new BlockMatrixFrame() ); - this.quartz = constructor.registerBlockDefinition( new QuartzBlock() ); - this.quartzPillar = constructor.registerBlockDefinition( new QuartzPillarBlock() ); - this.quartzChiseled = constructor.registerBlockDefinition( new ChiseledQuartzBlock() ); - this.quartzGlass = constructor.registerBlockDefinition( new QuartzGlassBlock() ); - this.quartzVibrantGlass = constructor.registerBlockDefinition( new QuartzLampBlock() ); + this.quartz = constructor.registerBlockDefinition( new BlockQuartz() ); + this.quartzPillar = constructor.registerBlockDefinition( new BlockQuartzPillar() ); + this.quartzChiseled = constructor.registerBlockDefinition( new BlockChiseledQuartz() ); + this.quartzGlass = constructor.registerBlockDefinition( new BlockQuartzGlass() ); + this.quartzVibrantGlass = constructor.registerBlockDefinition( new BlockQuartzLamp() ); this.quartzTorch = constructor.registerBlockDefinition( new BlockQuartzTorch() ); - this.fluix = constructor.registerBlockDefinition( new FluixBlock() ); - this.skyStone_stone = constructor.registerBlockDefinition( new SkyStoneBlock( SkystoneType.STONE ) ); - this.skyStone_block = constructor.registerBlockDefinition( new SkyStoneBlock( SkystoneType.BLOCK ) ); - this.skyStone_brick = constructor.registerBlockDefinition( new SkyStoneBlock( SkystoneType.BRICK ) ); - this.skyStone_smallbrick = constructor.registerBlockDefinition( new SkyStoneBlock( SkystoneType.SMALL_BRICK ) ); + this.fluix = constructor.registerBlockDefinition( new BlockFluix() ); + this.skyStone_stone = constructor.registerBlockDefinition( new BlockSkyStone( SkystoneType.STONE ) ); + this.skyStone_block = constructor.registerBlockDefinition( new BlockSkyStone( SkystoneType.BLOCK ) ); + this.skyStone_brick = constructor.registerBlockDefinition( new BlockSkyStone( SkystoneType.BRICK ) ); + this.skyStone_smallbrick = constructor.registerBlockDefinition( new BlockSkyStone( SkystoneType.SMALL_BRICK ) ); this.skyChest = constructor.registerBlockDefinition( new BlockSkyChest( SkyChestType.STONE ) ); this.skyChestBlock = constructor.registerBlockDefinition( new BlockSkyChest( SkyChestType.BLOCK ) ); this.skyCompass = constructor.registerBlockDefinition( new BlockSkyCompass() ); diff --git a/src/main/java/appeng/core/api/definitions/ApiMaterials.java b/src/main/java/appeng/core/api/definitions/ApiMaterials.java index 6485467a..038cf29c 100644 --- a/src/main/java/appeng/core/api/definitions/ApiMaterials.java +++ b/src/main/java/appeng/core/api/definitions/ApiMaterials.java @@ -23,7 +23,7 @@ import appeng.api.definitions.IItemDefinition; import appeng.api.definitions.IMaterials; import appeng.core.features.DamagedItemDefinition; import appeng.items.materials.MaterialType; -import appeng.items.materials.MultiItem; +import appeng.items.materials.ItemMultiItem; /** @@ -105,7 +105,7 @@ public final class ApiMaterials implements IMaterials public ApiMaterials( final DefinitionConstructor constructor ) { - final MultiItem materials = new MultiItem(); + final ItemMultiItem materials = new ItemMultiItem(); constructor.registerItemDefinition( materials ); this.cell2SpatialPart = new DamagedItemDefinition( "material.cell.spatial.2", materials.createMaterial( MaterialType.Cell2SpatialPart ) ); diff --git a/src/main/java/appeng/core/features/AEBlockFeatureHandler.java b/src/main/java/appeng/core/features/AEBlockFeatureHandler.java index fb4ce83f..7fd425b8 100644 --- a/src/main/java/appeng/core/features/AEBlockFeatureHandler.java +++ b/src/main/java/appeng/core/features/AEBlockFeatureHandler.java @@ -29,6 +29,7 @@ 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.resources.IReloadableResourceManager; +import net.minecraft.item.Item; import net.minecraft.util.ResourceLocation; import net.minecraft.util.registry.IRegistry; import net.minecraftforge.client.model.ModelLoader; @@ -79,7 +80,11 @@ public final class AEBlockFeatureHandler implements IFeatureHandler { if( this.enabled ) { - final String name = this.extractor.get(); + String name = this.extractor.get(); + if( Item.REGISTRY.containsKey( new ResourceLocation( AppEng.MOD_ID, name ) ) ) + { + name += "_block"; + } this.featured.setCreativeTab( CreativeTab.instance ); this.featured.setUnlocalizedName( "appliedenergistics2." + name ); diff --git a/src/main/java/appeng/core/features/AECableBusFeatureHandler.java b/src/main/java/appeng/core/features/AECableBusFeatureHandler.java index 5201c055..d7e0bde1 100644 --- a/src/main/java/appeng/core/features/AECableBusFeatureHandler.java +++ b/src/main/java/appeng/core/features/AECableBusFeatureHandler.java @@ -83,14 +83,14 @@ public final class AECableBusFeatureHandler implements IFeatureHandler { final String name = this.extractor.get(); this.featured.setCreativeTab( CreativeTab.instance ); - this.featured.setUnlocalizedName( /* "tile." */"appliedenergistics2." + name ); + this.featured.setUnlocalizedName( "appliedenergistics2." + name ); if( Platform.isClient() ) { CommonHelper.proxy.bindTileEntitySpecialRenderer( this.featured.getTileEntityClass(), this.featured ); } - registryName = new ResourceLocation( AppEng.MOD_ID, "tile." + name ); + registryName = new ResourceLocation( AppEng.MOD_ID, name ); // Bypass the forge magic with null to register our own itemblock later. GameRegistry.register( this.featured.setRegistryName( registryName ) ); diff --git a/src/main/java/appeng/core/features/AETileBlockFeatureHandler.java b/src/main/java/appeng/core/features/AETileBlockFeatureHandler.java index 64d8bc18..839e5f9a 100644 --- a/src/main/java/appeng/core/features/AETileBlockFeatureHandler.java +++ b/src/main/java/appeng/core/features/AETileBlockFeatureHandler.java @@ -31,6 +31,7 @@ import net.minecraft.client.renderer.block.model.ModelBakery; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.client.resources.IReloadableResourceManager; +import net.minecraft.item.Item; import net.minecraft.util.ResourceLocation; import net.minecraft.util.registry.IRegistry; import net.minecraftforge.client.ForgeHooksClient; @@ -87,22 +88,26 @@ public final class AETileBlockFeatureHandler implements IFeatureHandler { if( this.enabled ) { - final String name = this.extractor.get(); + String name = this.extractor.get(); + if( Item.REGISTRY.containsKey( new ResourceLocation( AppEng.MOD_ID, name ) ) ) + { + name += "_block"; + } this.featured.setCreativeTab( CreativeTab.instance ); - this.featured.setUnlocalizedName( /* "tile." */"appliedenergistics2." + name ); + this.featured.setUnlocalizedName( "appliedenergistics2." + name ); if( Platform.isClient() ) { CommonHelper.proxy.bindTileEntitySpecialRenderer( this.featured.getTileEntityClass(), this.featured ); } - registryName = new ResourceLocation( AppEng.MOD_ID, "tile." + name ); + registryName = new ResourceLocation( AppEng.MOD_ID, name ); GameRegistry.register( this.featured.setRegistryName( registryName ) ); GameRegistry.register( this.definition.maybeItem().get().setRegistryName( registryName ) ); AEBaseTile.registerTileItem( this.featured.getTileEntityClass(), new BlockStackSrc( this.featured, 0, ActivityState.from( this.isFeatureAvailable() ) ) ); - GameRegistry.registerTileEntity( this.featured.getTileEntityClass(), this.featured.toString() ); + GameRegistry.registerTileEntityWithAlternatives( this.featured.getTileEntityClass(), this.featured.toString() ); if( side == Side.CLIENT ) { diff --git a/src/main/java/appeng/core/features/FeatureNameExtractor.java b/src/main/java/appeng/core/features/FeatureNameExtractor.java index bad846e3..00004ce8 100644 --- a/src/main/java/appeng/core/features/FeatureNameExtractor.java +++ b/src/main/java/appeng/core/features/FeatureNameExtractor.java @@ -19,6 +19,7 @@ package appeng.core.features; +import java.util.regex.Matcher; import java.util.regex.Pattern; import com.google.common.base.Optional; @@ -30,6 +31,9 @@ public class FeatureNameExtractor private static final Pattern PATTERN_ITEM_MULTI_MATERIAL = Pattern.compile( "ItemMultiMaterial", Pattern.LITERAL ); private static final Pattern PATTERN_QUARTZ = Pattern.compile( "Quartz", Pattern.LITERAL ); + private static final Pattern PATTERN_LOWERCASE = Pattern.compile( "([\\p{Upper}])([\\p{Upper}]+)" ); + private static final Pattern PATTERN_LOWERCASER = Pattern.compile( "(.)?([\\p{Upper}])" ); + private final Class clazz; private final Optional subName; @@ -40,6 +44,60 @@ public class FeatureNameExtractor } public String get() + { + String ret; + String name = this.clazz.getSimpleName().replaceFirst( "\\p{Upper}[\\p{Lower}]*(\\p{Upper})", "$1" ); + + if( this.subName.isPresent() ) + { + final String subName = this.subName.get(); + // simple hack to allow me to do get nice names for these without + // mode code outside of AEBaseItem + if( subName.startsWith( "P2PTunnel" ) ) + { + ret = "p2ptunnel"; + } + else if( subName.equals( "CertusQuartzTools" ) ) + { + ret = PATTERN_QUARTZ.matcher( name ).replaceAll( "CertusQuartz" ); + } + else if( subName.equals( "NetherQuartzTools" ) ) + { + ret = PATTERN_QUARTZ.matcher( name ).replaceAll( "NetherQuartz" ); + } + else + { + ret = name + '_' + subName; + } + } + else + { + ret = name; + } + + System.out.println( ret ); + StringBuffer buffer = new StringBuffer(); + Matcher m = PATTERN_LOWERCASE.matcher( ret ); + while( m.find() ) + { + m.appendReplacement( buffer, m.group( 1 ) + m.group( 2 ).toLowerCase() ); + } + m.appendTail( buffer ); + m = PATTERN_LOWERCASER.matcher( buffer.toString() ); + buffer = new StringBuffer(); + while( m.find() ) + { + m.appendReplacement( buffer, ( m.group( 1 ) != null ? m.group( 1 ) + '_' : "" ) + m.group( 2 ).toLowerCase() ); + } + m.appendTail( buffer ); + ret = buffer.toString().replace( '.', '_' ).replaceAll( "_+", "_" ); + System.out.println( ret ); + return ret; + } + + // To Convert devs' test worlds + @Deprecated + public String getOld() { String name = this.clazz.getSimpleName(); diff --git a/src/main/java/appeng/core/features/ItemFeatureHandler.java b/src/main/java/appeng/core/features/ItemFeatureHandler.java index e17f0fae..e460993c 100644 --- a/src/main/java/appeng/core/features/ItemFeatureHandler.java +++ b/src/main/java/appeng/core/features/ItemFeatureHandler.java @@ -77,7 +77,10 @@ public final class ItemFeatureHandler implements IFeatureHandler if( this.enabled ) { String name = this.extractor.get(); - final String itemPhysicalName = name; + if( Item.REGISTRY.containsKey( new ResourceLocation( AppEng.MOD_ID, name ) ) ) + { + name += "_item"; + } // this.item.setTextureName( "appliedenergistics2:" + name ); this.item.setUnlocalizedName( "appliedenergistics2." + name ); @@ -91,15 +94,6 @@ public final class ItemFeatureHandler implements IFeatureHandler this.item.setCreativeTab( CreativeTab.instance ); } - if( name.equals( "ItemMaterial" ) ) - { - name = "ItemMultiMaterial"; - } - else if( name.equals( "ItemPart" ) ) - { - name = "ItemMultiPart"; - } - registryName = new ResourceLocation( AppEng.MOD_ID, name ); GameRegistry.register( this.item.setRegistryName( registryName ) ); diff --git a/src/main/java/appeng/decorative/solid/ChargedQuartzOreBlock.java b/src/main/java/appeng/decorative/solid/BlockChargedQuartzOre.java similarity index 96% rename from src/main/java/appeng/decorative/solid/ChargedQuartzOreBlock.java rename to src/main/java/appeng/decorative/solid/BlockChargedQuartzOre.java index 041f3a0a..852fbb86 100644 --- a/src/main/java/appeng/decorative/solid/ChargedQuartzOreBlock.java +++ b/src/main/java/appeng/decorative/solid/BlockChargedQuartzOre.java @@ -35,10 +35,10 @@ import appeng.core.AEConfig; import appeng.core.CommonHelper; -public final class ChargedQuartzOreBlock extends QuartzOreBlock +public final class BlockChargedQuartzOre extends BlockQuartzOre { - public ChargedQuartzOreBlock() + public BlockChargedQuartzOre() { this.setBoostBrightnessLow( 2 ); this.setBoostBrightnessHigh( 5 ); diff --git a/src/main/java/appeng/decorative/solid/ChiseledQuartzBlock.java b/src/main/java/appeng/decorative/solid/BlockChiseledQuartz.java similarity index 92% rename from src/main/java/appeng/decorative/solid/ChiseledQuartzBlock.java rename to src/main/java/appeng/decorative/solid/BlockChiseledQuartz.java index c2d8e1f1..87dd5d08 100644 --- a/src/main/java/appeng/decorative/solid/ChiseledQuartzBlock.java +++ b/src/main/java/appeng/decorative/solid/BlockChiseledQuartz.java @@ -27,9 +27,9 @@ import appeng.block.AEDecorativeBlock; import appeng.core.features.AEFeature; -public final class ChiseledQuartzBlock extends AEDecorativeBlock +public final class BlockChiseledQuartz extends AEDecorativeBlock { - public ChiseledQuartzBlock() + public BlockChiseledQuartz() { super( Material.ROCK ); diff --git a/src/main/java/appeng/decorative/solid/FluixBlock.java b/src/main/java/appeng/decorative/solid/BlockFluix.java similarity index 93% rename from src/main/java/appeng/decorative/solid/FluixBlock.java rename to src/main/java/appeng/decorative/solid/BlockFluix.java index 090ca06a..ada311fa 100644 --- a/src/main/java/appeng/decorative/solid/FluixBlock.java +++ b/src/main/java/appeng/decorative/solid/BlockFluix.java @@ -27,9 +27,9 @@ import appeng.block.AEDecorativeBlock; import appeng.core.features.AEFeature; -public final class FluixBlock extends AEDecorativeBlock +public final class BlockFluix extends AEDecorativeBlock { - public FluixBlock() + public BlockFluix() { super( Material.ROCK ); diff --git a/src/main/java/appeng/decorative/solid/QuartzBlock.java b/src/main/java/appeng/decorative/solid/BlockQuartz.java similarity index 93% rename from src/main/java/appeng/decorative/solid/QuartzBlock.java rename to src/main/java/appeng/decorative/solid/BlockQuartz.java index 80e44f30..51c3ff55 100644 --- a/src/main/java/appeng/decorative/solid/QuartzBlock.java +++ b/src/main/java/appeng/decorative/solid/BlockQuartz.java @@ -27,9 +27,9 @@ import appeng.block.AEDecorativeBlock; import appeng.core.features.AEFeature; -public final class QuartzBlock extends AEDecorativeBlock +public final class BlockQuartz extends AEDecorativeBlock { - public QuartzBlock() + public BlockQuartz() { super( Material.ROCK ); diff --git a/src/main/java/appeng/decorative/solid/QuartzGlassBlock.java b/src/main/java/appeng/decorative/solid/BlockQuartzGlass.java similarity index 96% rename from src/main/java/appeng/decorative/solid/QuartzGlassBlock.java rename to src/main/java/appeng/decorative/solid/BlockQuartzGlass.java index 749338bc..828f6cf0 100644 --- a/src/main/java/appeng/decorative/solid/QuartzGlassBlock.java +++ b/src/main/java/appeng/decorative/solid/BlockQuartzGlass.java @@ -33,9 +33,9 @@ import appeng.core.features.AEFeature; import appeng.helpers.AEGlassMaterial; -public class QuartzGlassBlock extends AEBaseBlock +public class BlockQuartzGlass extends AEBaseBlock { - public QuartzGlassBlock() + public BlockQuartzGlass() { super( Material.GLASS ); this.setLightOpacity( 0 ); diff --git a/src/main/java/appeng/decorative/solid/QuartzLampBlock.java b/src/main/java/appeng/decorative/solid/BlockQuartzLamp.java similarity index 96% rename from src/main/java/appeng/decorative/solid/QuartzLampBlock.java rename to src/main/java/appeng/decorative/solid/BlockQuartzLamp.java index f4ce0d0f..96f6afc7 100644 --- a/src/main/java/appeng/decorative/solid/QuartzLampBlock.java +++ b/src/main/java/appeng/decorative/solid/BlockQuartzLamp.java @@ -33,10 +33,10 @@ import appeng.core.CommonHelper; import appeng.core.features.AEFeature; -public class QuartzLampBlock extends QuartzGlassBlock +public class BlockQuartzLamp extends BlockQuartzGlass { - public QuartzLampBlock() + public BlockQuartzLamp() { this.setLightLevel( 1.0f ); this.setFeature( EnumSet.of( AEFeature.DecorativeQuartzBlocks, AEFeature.DecorativeLights ) ); diff --git a/src/main/java/appeng/decorative/solid/QuartzOreBlock.java b/src/main/java/appeng/decorative/solid/BlockQuartzOre.java similarity index 98% rename from src/main/java/appeng/decorative/solid/QuartzOreBlock.java rename to src/main/java/appeng/decorative/solid/BlockQuartzOre.java index 1f486d78..43ea169d 100644 --- a/src/main/java/appeng/decorative/solid/QuartzOreBlock.java +++ b/src/main/java/appeng/decorative/solid/BlockQuartzOre.java @@ -39,13 +39,13 @@ import appeng.block.AEBaseBlock; import appeng.core.features.AEFeature; -public class QuartzOreBlock extends AEBaseBlock +public class BlockQuartzOre extends AEBaseBlock { private int boostBrightnessLow; private int boostBrightnessHigh; private boolean enhanceBrightness; - public QuartzOreBlock() + public BlockQuartzOre() { super( Material.ROCK ); this.setHardness( 3.0F ); diff --git a/src/main/java/appeng/decorative/solid/QuartzPillarBlock.java b/src/main/java/appeng/decorative/solid/BlockQuartzPillar.java similarity index 96% rename from src/main/java/appeng/decorative/solid/QuartzPillarBlock.java rename to src/main/java/appeng/decorative/solid/BlockQuartzPillar.java index fe1f491f..14151269 100644 --- a/src/main/java/appeng/decorative/solid/QuartzPillarBlock.java +++ b/src/main/java/appeng/decorative/solid/BlockQuartzPillar.java @@ -36,11 +36,11 @@ import appeng.core.features.AEFeature; import appeng.helpers.MetaRotation; -public class QuartzPillarBlock extends AEBaseBlock implements IOrientableBlock +public class BlockQuartzPillar extends AEBaseBlock implements IOrientableBlock { public static final PropertyEnum AXIS_ORIENTATION = PropertyEnum.create( "axis", EnumFacing.Axis.class ); - public QuartzPillarBlock() + public BlockQuartzPillar() { super( Material.ROCK ); this.setFeature( EnumSet.of( AEFeature.DecorativeQuartzBlocks ) ); diff --git a/src/main/java/appeng/decorative/solid/SkyStoneBlock.java b/src/main/java/appeng/decorative/solid/BlockSkyStone.java similarity index 97% rename from src/main/java/appeng/decorative/solid/SkyStoneBlock.java rename to src/main/java/appeng/decorative/solid/BlockSkyStone.java index f097b30c..1662a7e7 100644 --- a/src/main/java/appeng/decorative/solid/SkyStoneBlock.java +++ b/src/main/java/appeng/decorative/solid/BlockSkyStone.java @@ -39,14 +39,14 @@ import appeng.core.worlddata.WorldData; import appeng.util.Platform; -public class SkyStoneBlock extends AEBaseBlock +public class BlockSkyStone extends AEBaseBlock { private static final float BLOCK_RESISTANCE = 150.0f; private static final float BREAK_SPEAK_SCALAR = 0.1f; private static final double BREAK_SPEAK_THRESHOLD = 7.0; private final SkystoneType type; - public SkyStoneBlock( final SkystoneType type ) + public BlockSkyStone( final SkystoneType type ) { super( Material.ROCK, Optional.of( type.name() ) ); this.setHardness( 50 ); diff --git a/src/main/java/appeng/decorative/solid/FluixIdentifier.java b/src/main/java/appeng/decorative/solid/FluixIdentifier.java deleted file mode 100644 index d32d728c..00000000 --- a/src/main/java/appeng/decorative/solid/FluixIdentifier.java +++ /dev/null @@ -1,21 +0,0 @@ - -package appeng.decorative.solid; - - -import javax.annotation.Nonnull; - - -/** - * @author thatsIch - * @version rv3 - 29.06.2015 - * @since rv3 29.06.2015 - */ -public class FluixIdentifier implements Identifier -{ - @Nonnull - @Override - public String identifier() - { - return "fluix"; - } -} diff --git a/src/main/java/appeng/decorative/solid/Identifier.java b/src/main/java/appeng/decorative/solid/Identifier.java deleted file mode 100644 index c833b6f8..00000000 --- a/src/main/java/appeng/decorative/solid/Identifier.java +++ /dev/null @@ -1,19 +0,0 @@ - -package appeng.decorative.solid; - - -import javax.annotation.Nonnull; - - -/** - * - * - * @author thatsIch - * @version rv3 - 29.06.2015 - * @since rv3 29.06.2015 - */ -public interface Identifier -{ - @Nonnull - String identifier(); -} diff --git a/src/main/java/appeng/decorative/stair/FluixStairBlock.java b/src/main/java/appeng/decorative/stair/BlockFluixStair.java similarity index 61% rename from src/main/java/appeng/decorative/stair/FluixStairBlock.java rename to src/main/java/appeng/decorative/stair/BlockFluixStair.java index 800a6321..fe57ed30 100644 --- a/src/main/java/appeng/decorative/stair/FluixStairBlock.java +++ b/src/main/java/appeng/decorative/stair/BlockFluixStair.java @@ -10,9 +10,9 @@ import net.minecraft.block.Block; * @version rv3 - 30.06.2015 * @since rv3 30.06.2015 */ -public class FluixStairBlock extends BlockStairCommon +public class BlockFluixStair extends BlockStairCommon { - public FluixStairBlock( final Block block, final String type ) + public BlockFluixStair( final Block block, final String type ) { super( block, type ); } diff --git a/src/main/java/appeng/decorative/stair/DecorativeStairIdentifier.java b/src/main/java/appeng/decorative/stair/DecorativeStairIdentifier.java deleted file mode 100644 index ff1deba2..00000000 --- a/src/main/java/appeng/decorative/stair/DecorativeStairIdentifier.java +++ /dev/null @@ -1,59 +0,0 @@ - -package appeng.decorative.stair; - - -import javax.annotation.Nonnull; - -import com.google.common.base.Preconditions; - -import net.minecraft.block.Block; - -import appeng.decorative.solid.Identifier; - - -/** - * An refactor safe implementation for stair identifiers. - * The internal Strings are not supposed to be changed, - * they are used to persist the blocks into the save file. - * - * If you change these, you will break worlds if not countered - * - * @author thatsIch - * @version rv3 - 29.06.2015 - * @since rv3 29.06.2015 - */ -public enum DecorativeStairIdentifier implements Identifier -{ - FLUIX( "stair.fluix" ), - CHISELED_CERTUS_QUARTZ( "stair.quartz.certus.chiseled" ), - CERTUS_QUARTZ( "stair.quartz.certus" ), - CERTUS_QUARTZ_PILLAR( "stair.quartz.certus.pillar" ), - SKYSTONE( "stair.skystone" ), - SKYSTONE_BLOCK( "stair.skystone.block" ), - SKYSTONE_BRICK( "stair.skystone.brick" ), - SKYSTONE_SMALL_BRICK( "stair.skystone.brick.small" ); - - private final String name; - - /** - * Used to register the specific blocks - * - * @param name id of the block or a unique name - * - * @see net.minecraftforge.fml.common.registry.GameRegistry#registerBlock(Block, String) - */ - DecorativeStairIdentifier( @Nonnull final String name ) - { - Preconditions.checkNotNull( name ); - Preconditions.checkArgument( !name.isEmpty() ); - - this.name = name; - } - - @Nonnull - @Override - public String identifier() - { - return this.name; - } -} diff --git a/src/main/java/appeng/decorative/stair/FluixStairComponent.java b/src/main/java/appeng/decorative/stair/FluixStairComponent.java deleted file mode 100644 index 4fa45f73..00000000 --- a/src/main/java/appeng/decorative/stair/FluixStairComponent.java +++ /dev/null @@ -1,12 +0,0 @@ - -package appeng.decorative.stair; - - -/** - * @author thatsIch - * @version rv3 - 30.06.2015 - * @since rv3 30.06.2015 - */ -public class FluixStairComponent -{ -} diff --git a/src/main/java/appeng/decorative/stair/FluixStairIdentifier.java b/src/main/java/appeng/decorative/stair/FluixStairIdentifier.java deleted file mode 100644 index 9d762359..00000000 --- a/src/main/java/appeng/decorative/stair/FluixStairIdentifier.java +++ /dev/null @@ -1,23 +0,0 @@ - -package appeng.decorative.stair; - - -import javax.annotation.Nonnull; - -import appeng.decorative.solid.Identifier; - - -/** - * @author thatsIch - * @version rv3 - 29.06.2015 - * @since rv3 29.06.2015 - */ -public final class FluixStairIdentifier implements Identifier -{ - @Nonnull - @Override - public String identifier() - { - return "stair.fluix"; - } -} diff --git a/src/main/java/appeng/decorative/stair/FluixStairSupplier.java b/src/main/java/appeng/decorative/stair/FluixStairSupplier.java index d2f00e73..163118f3 100644 --- a/src/main/java/appeng/decorative/stair/FluixStairSupplier.java +++ b/src/main/java/appeng/decorative/stair/FluixStairSupplier.java @@ -27,8 +27,8 @@ public class FluixStairSupplier implements Supplier } @Override - public FluixStairBlock get() + public BlockFluixStair get() { - return new FluixStairBlock( this.fluixBlockSupplier.get(), "fluix" ); + return new BlockFluixStair( this.fluixBlockSupplier.get(), "fluix" ); } } diff --git a/src/main/java/appeng/helpers/MetaRotation.java b/src/main/java/appeng/helpers/MetaRotation.java index 17a700d8..192b2e87 100644 --- a/src/main/java/appeng/helpers/MetaRotation.java +++ b/src/main/java/appeng/helpers/MetaRotation.java @@ -29,7 +29,7 @@ import net.minecraft.world.World; import appeng.api.util.IOrientable; import appeng.block.AEBaseBlock; -import appeng.decorative.solid.QuartzPillarBlock; +import appeng.decorative.solid.BlockQuartzPillar; public class MetaRotation implements IOrientable @@ -73,7 +73,7 @@ public class MetaRotation implements IOrientable } //TODO 1.10.2-R - Temp - Axis a = state.getValue( QuartzPillarBlock.AXIS_ORIENTATION ); + Axis a = state.getValue( BlockQuartzPillar.AXIS_ORIENTATION ); if( a == null ) { @@ -104,7 +104,7 @@ public class MetaRotation implements IOrientable else { //TODO 1.10.2-R - Temp - ( (World) this.w ).setBlockState( this.pos, this.w.getBlockState( this.pos ).withProperty( QuartzPillarBlock.AXIS_ORIENTATION, up.getAxis() ) ); + ( (World) this.w ).setBlockState( this.pos, this.w.getBlockState( this.pos ).withProperty( BlockQuartzPillar.AXIS_ORIENTATION, up.getAxis() ) ); } } else diff --git a/src/main/java/appeng/items/materials/MultiItem.java b/src/main/java/appeng/items/materials/ItemMultiItem.java similarity index 98% rename from src/main/java/appeng/items/materials/MultiItem.java rename to src/main/java/appeng/items/materials/ItemMultiItem.java index a4729ba7..bf48b4f3 100644 --- a/src/main/java/appeng/items/materials/MultiItem.java +++ b/src/main/java/appeng/items/materials/ItemMultiItem.java @@ -71,15 +71,15 @@ import appeng.util.InventoryAdaptor; import appeng.util.Platform; -public final class MultiItem extends AEBaseItem implements IStorageComponent, IUpgradeModule +public final class ItemMultiItem extends AEBaseItem implements IStorageComponent, IUpgradeModule { - public static MultiItem instance; + public static ItemMultiItem instance; private static final int KILO_SCALAR = 1024; private final Map dmgToMaterial = new HashMap(); - public MultiItem() + public ItemMultiItem() { this.setFeature( EnumSet.of( AEFeature.Core ) ); this.setHasSubtypes( true ); diff --git a/src/main/java/appeng/items/parts/ItemFacade.java b/src/main/java/appeng/items/parts/ItemFacade.java index 6591ec9d..b102ffac 100644 --- a/src/main/java/appeng/items/parts/ItemFacade.java +++ b/src/main/java/appeng/items/parts/ItemFacade.java @@ -48,7 +48,7 @@ import appeng.api.parts.IAlphaPassItem; import appeng.api.util.AEPartLocation; import appeng.core.FacadeConfig; import appeng.core.features.AEFeature; -import appeng.decorative.solid.QuartzOreBlock; +import appeng.decorative.solid.BlockQuartzOre; import appeng.facade.FacadePart; import appeng.facade.IFacadeItem; import appeng.items.AEBaseItem; @@ -150,7 +150,7 @@ public class ItemFacade extends AEBaseItem implements IFacadeItem, IAlphaPassIte final boolean hasTile = b.hasTileEntity( b.getStateFromMeta( metadata ) ); final boolean enableGlass = b instanceof BlockGlass || b instanceof BlockStainedGlass; - final boolean disableOre = b instanceof QuartzOreBlock; + final boolean disableOre = b instanceof BlockQuartzOre; final boolean defaultValue = ( b.isOpaqueCube(b.getDefaultState()) && !b.getTickRandomly() && !hasTile && !disableOre ) || enableGlass; if( FacadeConfig.instance.checkEnabled( b, metadata, defaultValue ) ) diff --git a/src/main/java/appeng/recipes/AEItemResolver.java b/src/main/java/appeng/recipes/AEItemResolver.java index 429d4f14..48cefcef 100644 --- a/src/main/java/appeng/recipes/AEItemResolver.java +++ b/src/main/java/appeng/recipes/AEItemResolver.java @@ -32,7 +32,7 @@ import appeng.api.util.AEColor; import appeng.api.util.AEColoredItemDefinition; import appeng.core.AppEng; import appeng.items.materials.MaterialType; -import appeng.items.materials.MultiItem; +import appeng.items.materials.ItemMultiItem; import appeng.items.misc.ItemCrystalSeed; import appeng.items.parts.ItemMultiPart; import appeng.items.parts.PartType; @@ -124,7 +124,7 @@ public class AEItemResolver implements ISubItemResolver final String materialName = itemName.substring( itemName.indexOf( '.' ) + 1 ); final MaterialType mt = MaterialType.valueOf( materialName ); // itemName = itemName.substring( 0, itemName.indexOf( "." ) ); - if( mt.getItemInstance() == MultiItem.instance && mt.getDamageValue() >= 0 && mt.isRegistered() ) + if( mt.getItemInstance() == ItemMultiItem.instance && mt.getDamageValue() >= 0 && mt.isRegistered() ) { return new ResolverResult( "ItemMultiMaterial", mt.getDamageValue() ); } diff --git a/src/main/java/appeng/recipes/RecipeHandler.java b/src/main/java/appeng/recipes/RecipeHandler.java index b66071cc..71ef1e49 100644 --- a/src/main/java/appeng/recipes/RecipeHandler.java +++ b/src/main/java/appeng/recipes/RecipeHandler.java @@ -59,7 +59,7 @@ import appeng.core.AEConfig; import appeng.core.AELog; import appeng.core.AppEng; import appeng.core.features.AEFeature; -import appeng.items.materials.MultiItem; +import appeng.items.materials.ItemMultiItem; import appeng.items.misc.ItemCrystalSeed; import appeng.items.parts.ItemMultiPart; import appeng.recipes.handlers.IWebsiteSerializer; @@ -204,10 +204,10 @@ public class RecipeHandler implements IRecipeHandler default: } } - else if( is.getItem() instanceof MultiItem ) + else if( is.getItem() instanceof ItemMultiItem ) { realName = realName.replace( "ItemMultiMaterial", "ItemMaterial" ); - realName += '.' + ( (MultiItem) is.getItem() ).getTypeByStack( is ).name(); + realName += '.' + ( (ItemMultiItem) is.getItem() ).getTypeByStack( is ).name(); } else if( is.getItem() instanceof ItemMultiPart ) { diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/BlockTinyTNT.json b/src/main/resources/assets/appliedenergistics2/blockstates/BlockTinyTNT.json deleted file mode 100644 index d64e1e23..00000000 --- a/src/main/resources/assets/appliedenergistics2/blockstates/BlockTinyTNT.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "appliedenergistics2:BlockTinyTNT" } - } -} diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/ChargedQuartzOreBlock.json b/src/main/resources/assets/appliedenergistics2/blockstates/ChargedQuartzOreBlock.json deleted file mode 100644 index bae0e95d..00000000 --- a/src/main/resources/assets/appliedenergistics2/blockstates/ChargedQuartzOreBlock.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "appliedenergistics2:ChargedQuartzOreBlock" } - } -} diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/ChiseledQuartzBlock.json b/src/main/resources/assets/appliedenergistics2/blockstates/ChiseledQuartzBlock.json deleted file mode 100644 index 554ae455..00000000 --- a/src/main/resources/assets/appliedenergistics2/blockstates/ChiseledQuartzBlock.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "appliedenergistics2:ChiseledQuartzBlock" } - } -} diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/FluixBlock.json b/src/main/resources/assets/appliedenergistics2/blockstates/FluixBlock.json deleted file mode 100644 index d2373fbe..00000000 --- a/src/main/resources/assets/appliedenergistics2/blockstates/FluixBlock.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "appliedenergistics2:FluixBlock" } - } -} diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/QuartzBlock.json b/src/main/resources/assets/appliedenergistics2/blockstates/QuartzBlock.json deleted file mode 100644 index d5eea4f9..00000000 --- a/src/main/resources/assets/appliedenergistics2/blockstates/QuartzBlock.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "appliedenergistics2:QuartzBlock" } - } -} diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/QuartzGlassBlock.json b/src/main/resources/assets/appliedenergistics2/blockstates/QuartzGlassBlock.json deleted file mode 100644 index d5eea4f9..00000000 --- a/src/main/resources/assets/appliedenergistics2/blockstates/QuartzGlassBlock.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "appliedenergistics2:QuartzBlock" } - } -} diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/QuartzOreBlock.json b/src/main/resources/assets/appliedenergistics2/blockstates/QuartzOreBlock.json deleted file mode 100644 index 1980240d..00000000 --- a/src/main/resources/assets/appliedenergistics2/blockstates/QuartzOreBlock.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "appliedenergistics2:QuartzOreBlock" } - } -} diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/QuartzPillarBlock.json b/src/main/resources/assets/appliedenergistics2/blockstates/QuartzPillarBlock.json deleted file mode 100644 index a2fa04b3..00000000 --- a/src/main/resources/assets/appliedenergistics2/blockstates/QuartzPillarBlock.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "variants": { - "axis=y": { "model": "appliedenergistics2:QuartzPillarBlock" }, - "axis=z": { "model": "appliedenergistics2:QuartzPillarBlock", "x": 90 }, - "axis=x": { "model": "appliedenergistics2:QuartzPillarBlock", "x": 90, "y": 90 } - } -} - diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/SkyStoneBlock.BLOCK.json b/src/main/resources/assets/appliedenergistics2/blockstates/SkyStoneBlock.BLOCK.json deleted file mode 100644 index 9bedd088..00000000 --- a/src/main/resources/assets/appliedenergistics2/blockstates/SkyStoneBlock.BLOCK.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "appliedenergistics2:SkyStoneBlock.BLOCK" } - } -} diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/SkyStoneBlock.BRICK.json b/src/main/resources/assets/appliedenergistics2/blockstates/SkyStoneBlock.BRICK.json deleted file mode 100644 index d4f5fa36..00000000 --- a/src/main/resources/assets/appliedenergistics2/blockstates/SkyStoneBlock.BRICK.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "appliedenergistics2:SkyStoneBlock.BRICK" } - } -} diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/SkyStoneBlock.SMALL_BRICK.json b/src/main/resources/assets/appliedenergistics2/blockstates/SkyStoneBlock.SMALL_BRICK.json deleted file mode 100644 index ffa092db..00000000 --- a/src/main/resources/assets/appliedenergistics2/blockstates/SkyStoneBlock.SMALL_BRICK.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "appliedenergistics2:SkyStoneBlock.SMALL_BRICK" } - } -} diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/SkyStoneBlock.STONE.json b/src/main/resources/assets/appliedenergistics2/blockstates/SkyStoneBlock.STONE.json deleted file mode 100644 index 59eae38a..00000000 --- a/src/main/resources/assets/appliedenergistics2/blockstates/SkyStoneBlock.STONE.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "appliedenergistics2:SkyStoneBlock.STONE" } - } -} diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/cell_work_bench.json b/src/main/resources/assets/appliedenergistics2/blockstates/cell_work_bench.json new file mode 100644 index 00000000..f9828a89 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/blockstates/cell_work_bench.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "appliedenergistics2:cell_work_bench" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/charged_quartz_ore.json b/src/main/resources/assets/appliedenergistics2/blockstates/charged_quartz_ore.json new file mode 100644 index 00000000..95869604 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/blockstates/charged_quartz_ore.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "appliedenergistics2:charged_quartz_ore" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/charger.json b/src/main/resources/assets/appliedenergistics2/blockstates/charger.json new file mode 100644 index 00000000..14370fe5 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/blockstates/charger.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "appliedenergistics2:charger" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/chiseled_quartz.json b/src/main/resources/assets/appliedenergistics2/blockstates/chiseled_quartz.json new file mode 100644 index 00000000..1835b5de --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/blockstates/chiseled_quartz.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "appliedenergistics2:chiseled_quartz" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/condenser.json b/src/main/resources/assets/appliedenergistics2/blockstates/condenser.json new file mode 100644 index 00000000..5a1cf098 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/blockstates/condenser.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "appliedenergistics2:condenser" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/controller.json b/src/main/resources/assets/appliedenergistics2/blockstates/controller.json new file mode 100644 index 00000000..10580754 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/blockstates/controller.json @@ -0,0 +1,76 @@ +{ + "multipart": [ + { + "apply": { + "model": "appliedenergistics2:controller/controller_block_offline" + }, + "when": { + "state": "offline", + "type": "block" + } + }, + { + "apply": { + "model": "appliedenergistics2:controller/controller_block_online.uvl" + }, + "when": { + "state": "online", + "type": "block" + } + }, + { + "apply": { + "model": "appliedenergistics2:controller/controller_block_conflicted.uvl" + }, + "when": { + "state": "conflicted", + "type": "block" + } + }, + { + "apply": { + "model": "appliedenergistics2:controller/controller_column_offline" + }, + "when": { + "state": "offline", + "type": "column" + } + }, + { + "apply": { + "model": "appliedenergistics2:controller/controller_column_online.uvl" + }, + "when": { + "state": "online", + "type": "column" + } + }, + { + "apply": { + "model": "appliedenergistics2:controller/controller_column_conflicted.uvl" + }, + "when": { + "state": "conflicted", + "type": "column" + } + }, + { + "apply": { + "model": "appliedenergistics2:controller/controller_inside_a" + }, + "when": { + "state": "offline|online|conflicted", + "type": "inside_a" + } + }, + { + "apply": { + "model": "appliedenergistics2:controller/controller_inside_b" + }, + "when": { + "state": "offline|online|conflicted", + "type": "inside_b" + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/creative_energy_cell.json b/src/main/resources/assets/appliedenergistics2/blockstates/creative_energy_cell.json new file mode 100644 index 00000000..9b9989fa --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/blockstates/creative_energy_cell.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "appliedenergistics2:EnergyCell/creative_energy_cell" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/dense_energy_cell.json b/src/main/resources/assets/appliedenergistics2/blockstates/dense_energy_cell.json new file mode 100644 index 00000000..17ad59ba --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/blockstates/dense_energy_cell.json @@ -0,0 +1,28 @@ +{ + "variants": { + "fullness=0": { + "model": "appliedenergistics2:EnergyCell/dense_energy_cell0" + }, + "fullness=1": { + "model": "appliedenergistics2:EnergyCell/dense_energy_cell1" + }, + "fullness=2": { + "model": "appliedenergistics2:EnergyCell/dense_energy_cell2" + }, + "fullness=3": { + "model": "appliedenergistics2:EnergyCell/dense_energy_cell3" + }, + "fullness=4": { + "model": "appliedenergistics2:EnergyCell/dense_energy_cell4" + }, + "fullness=5": { + "model": "appliedenergistics2:EnergyCell/dense_energy_cell5" + }, + "fullness=6": { + "model": "appliedenergistics2:EnergyCell/dense_energy_cell6" + }, + "fullness=7": { + "model": "appliedenergistics2:EnergyCell/dense_energy_cell7" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/drive.json b/src/main/resources/assets/appliedenergistics2/blockstates/drive.json new file mode 100644 index 00000000..63b2bd47 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/blockstates/drive.json @@ -0,0 +1,20 @@ +{ + "variants": { + "facing=east": { + "model": "appliedenergistics2:drive", + "y": 270 + }, + "facing=north": { + "model": "appliedenergistics2:drive", + "y": 180 + }, + "facing=south": { + "model": "appliedenergistics2:drive", + "y": 0 + }, + "facing=west": { + "model": "appliedenergistics2:drive", + "y": 90 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/energy_acceptor.json b/src/main/resources/assets/appliedenergistics2/blockstates/energy_acceptor.json new file mode 100644 index 00000000..d2fad940 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/blockstates/energy_acceptor.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "appliedenergistics2:energy_acceptor" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/energy_cell.json b/src/main/resources/assets/appliedenergistics2/blockstates/energy_cell.json new file mode 100644 index 00000000..2a629ba4 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/blockstates/energy_cell.json @@ -0,0 +1,28 @@ +{ + "variants": { + "fullness=0": { + "model": "appliedenergistics2:EnergyCell/energy_cell0" + }, + "fullness=1": { + "model": "appliedenergistics2:EnergyCell/energy_cell1" + }, + "fullness=2": { + "model": "appliedenergistics2:EnergyCell/energy_cell2" + }, + "fullness=3": { + "model": "appliedenergistics2:EnergyCell/energy_cell3" + }, + "fullness=4": { + "model": "appliedenergistics2:EnergyCell/energy_cell4" + }, + "fullness=5": { + "model": "appliedenergistics2:EnergyCell/energy_cell5" + }, + "fullness=6": { + "model": "appliedenergistics2:EnergyCell/energy_cell6" + }, + "fullness=7": { + "model": "appliedenergistics2:EnergyCell/energy_cell7" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/fluix.json b/src/main/resources/assets/appliedenergistics2/blockstates/fluix.json new file mode 100644 index 00000000..99d57e74 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/blockstates/fluix.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "appliedenergistics2:fluix" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/grinder.json b/src/main/resources/assets/appliedenergistics2/blockstates/grinder.json new file mode 100644 index 00000000..cac3f39a --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/blockstates/grinder.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "appliedenergistics2:grinder" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/inscriber.json b/src/main/resources/assets/appliedenergistics2/blockstates/inscriber.json new file mode 100644 index 00000000..51f4b8c0 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/blockstates/inscriber.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "appliedenergistics2:inscriber" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/ioport.json b/src/main/resources/assets/appliedenergistics2/blockstates/ioport.json new file mode 100644 index 00000000..3f4106f2 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/blockstates/ioport.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "appliedenergistics2:ioport" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/quartz.json b/src/main/resources/assets/appliedenergistics2/blockstates/quartz.json new file mode 100644 index 00000000..57e34fa7 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/blockstates/quartz.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "appliedenergistics2:quartz" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/quartz_glass.json b/src/main/resources/assets/appliedenergistics2/blockstates/quartz_glass.json new file mode 100644 index 00000000..57e34fa7 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/blockstates/quartz_glass.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "appliedenergistics2:quartz" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/quartz_growth_accelerator.json b/src/main/resources/assets/appliedenergistics2/blockstates/quartz_growth_accelerator.json new file mode 100644 index 00000000..90186a08 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/blockstates/quartz_growth_accelerator.json @@ -0,0 +1,10 @@ +{ + "variants": { + "powered=false": { + "model": "appliedenergistics2:quartz_growth_accelerator_off" + }, + "powered=true": { + "model": "appliedenergistics2:quartz_growth_accelerator_on" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/quartz_ore.json b/src/main/resources/assets/appliedenergistics2/blockstates/quartz_ore.json new file mode 100644 index 00000000..95acbdfa --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/blockstates/quartz_ore.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "appliedenergistics2:quartz_ore" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/quartz_pillar.json b/src/main/resources/assets/appliedenergistics2/blockstates/quartz_pillar.json new file mode 100644 index 00000000..678a3197 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/blockstates/quartz_pillar.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "appliedenergistics2:quartz_pillar", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "appliedenergistics2:quartz_pillar" + }, + "axis=z": { + "model": "appliedenergistics2:quartz_pillar", + "x": 90 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/security.json b/src/main/resources/assets/appliedenergistics2/blockstates/security.json new file mode 100644 index 00000000..ed0c11d8 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/blockstates/security.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "appliedenergistics2:security" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_block_block.json b/src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_block_block.json new file mode 100644 index 00000000..c2aa46a3 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_block_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "appliedenergistics2:sky_stone_block_block" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_block_brick.json b/src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_block_brick.json new file mode 100644 index 00000000..a2d23b83 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_block_brick.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "appliedenergistics2:sky_stone_block_brick" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_block_small_brick.json b/src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_block_small_brick.json new file mode 100644 index 00000000..0fac5d4f --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_block_small_brick.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "appliedenergistics2:sky_stone_block_small_brick" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_block_stone.json b/src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_block_stone.json new file mode 100644 index 00000000..3d5abc8b --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_block_stone.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "appliedenergistics2:sky_stone_block_stone" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/spatial_ioport.json b/src/main/resources/assets/appliedenergistics2/blockstates/spatial_ioport.json new file mode 100644 index 00000000..86856bb2 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/blockstates/spatial_ioport.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "appliedenergistics2:spatial_ioport" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/stair.fluix.json b/src/main/resources/assets/appliedenergistics2/blockstates/stair.fluix.json deleted file mode 100644 index 8bf7364d..00000000 --- a/src/main/resources/assets/appliedenergistics2/blockstates/stair.fluix.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "appliedenergistics2:stairs/fluix" }, - "facing=west,half=bottom,shape=straight": { "model": "appliedenergistics2:stairs/fluix", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "appliedenergistics2:stairs/fluix", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "appliedenergistics2:stairs/fluix", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "appliedenergistics2:stairs/fluix.outer" }, - "facing=west,half=bottom,shape=outer_right": { "model": "appliedenergistics2:stairs/fluix.outer", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "appliedenergistics2:stairs/fluix.outer", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "appliedenergistics2:stairs/fluix.outer", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "appliedenergistics2:stairs/fluix.outer", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "appliedenergistics2:stairs/fluix.outer", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "appliedenergistics2:stairs/fluix.outer" }, - "facing=north,half=bottom,shape=outer_left": { "model": "appliedenergistics2:stairs/fluix.outer", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "appliedenergistics2:stairs/fluix.inner" }, - "facing=west,half=bottom,shape=inner_right": { "model": "appliedenergistics2:stairs/fluix.inner", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "appliedenergistics2:stairs/fluix.inner", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "appliedenergistics2:stairs/fluix.inner", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "appliedenergistics2:stairs/fluix.inner", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "appliedenergistics2:stairs/fluix.inner", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "appliedenergistics2:stairs/fluix.inner" }, - "facing=north,half=bottom,shape=inner_left": { "model": "appliedenergistics2:stairs/fluix.inner", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "appliedenergistics2:stairs/fluix", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "appliedenergistics2:stairs/fluix", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "appliedenergistics2:stairs/fluix", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "appliedenergistics2:stairs/fluix", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "appliedenergistics2:stairs/fluix.outer", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "appliedenergistics2:stairs/fluix.outer", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "appliedenergistics2:stairs/fluix.outer", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "appliedenergistics2:stairs/fluix.outer", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "appliedenergistics2:stairs/fluix.outer", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "appliedenergistics2:stairs/fluix.outer", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "appliedenergistics2:stairs/fluix.outer", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "appliedenergistics2:stairs/fluix.outer", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "appliedenergistics2:stairs/fluix.inner", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "appliedenergistics2:stairs/fluix.inner", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "appliedenergistics2:stairs/fluix.inner", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "appliedenergistics2:stairs/fluix.inner", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "appliedenergistics2:stairs/fluix.inner", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "appliedenergistics2:stairs/fluix.inner", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "appliedenergistics2:stairs/fluix.inner", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "appliedenergistics2:stairs/fluix.inner", "x": 180, "y": 270, "uvlock": true } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/stair.quartz.certus.chiseled.json b/src/main/resources/assets/appliedenergistics2/blockstates/stair.quartz.certus.chiseled.json deleted file mode 100644 index 44ad35d0..00000000 --- a/src/main/resources/assets/appliedenergistics2/blockstates/stair.quartz.certus.chiseled.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "appliedenergistics2:stairs/quartz.certus.chiseled" }, - "facing=west,half=bottom,shape=straight": { "model": "appliedenergistics2:stairs/quartz.certus.chiseled", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "appliedenergistics2:stairs/quartz.certus.chiseled", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "appliedenergistics2:stairs/quartz.certus.chiseled", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "appliedenergistics2:stairs/quartz.certus.chiseled.outer" }, - "facing=west,half=bottom,shape=outer_right": { "model": "appliedenergistics2:stairs/quartz.certus.chiseled.outer", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "appliedenergistics2:stairs/quartz.certus.chiseled.outer", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "appliedenergistics2:stairs/quartz.certus.chiseled.outer", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "appliedenergistics2:stairs/quartz.certus.chiseled.outer", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "appliedenergistics2:stairs/quartz.certus.chiseled.outer", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "appliedenergistics2:stairs/quartz.certus.chiseled.outer" }, - "facing=north,half=bottom,shape=outer_left": { "model": "appliedenergistics2:stairs/quartz.certus.chiseled.outer", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "appliedenergistics2:stairs/quartz.certus.chiseled.inner" }, - "facing=west,half=bottom,shape=inner_right": { "model": "appliedenergistics2:stairs/quartz.certus.chiseled.inner", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "appliedenergistics2:stairs/quartz.certus.chiseled.inner", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "appliedenergistics2:stairs/quartz.certus.chiseled.inner", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "appliedenergistics2:stairs/quartz.certus.chiseled.inner", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "appliedenergistics2:stairs/quartz.certus.chiseled.inner", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "appliedenergistics2:stairs/quartz.certus.chiseled.inner" }, - "facing=north,half=bottom,shape=inner_left": { "model": "appliedenergistics2:stairs/quartz.certus.chiseled.inner", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "appliedenergistics2:stairs/quartz.certus.chiseled", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "appliedenergistics2:stairs/quartz.certus.chiseled", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "appliedenergistics2:stairs/quartz.certus.chiseled", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "appliedenergistics2:stairs/quartz.certus.chiseled", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "appliedenergistics2:stairs/quartz.certus.chiseled.outer", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "appliedenergistics2:stairs/quartz.certus.chiseled.outer", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "appliedenergistics2:stairs/quartz.certus.chiseled.outer", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "appliedenergistics2:stairs/quartz.certus.chiseled.outer", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "appliedenergistics2:stairs/quartz.certus.chiseled.outer", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "appliedenergistics2:stairs/quartz.certus.chiseled.outer", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "appliedenergistics2:stairs/quartz.certus.chiseled.outer", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "appliedenergistics2:stairs/quartz.certus.chiseled.outer", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "appliedenergistics2:stairs/quartz.certus.chiseled.inner", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "appliedenergistics2:stairs/quartz.certus.chiseled.inner", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "appliedenergistics2:stairs/quartz.certus.chiseled.inner", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "appliedenergistics2:stairs/quartz.certus.chiseled.inner", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "appliedenergistics2:stairs/quartz.certus.chiseled.inner", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "appliedenergistics2:stairs/quartz.certus.chiseled.inner", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "appliedenergistics2:stairs/quartz.certus.chiseled.inner", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "appliedenergistics2:stairs/quartz.certus.chiseled.inner", "x": 180, "y": 270, "uvlock": true } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/stair.quartz.certus.json b/src/main/resources/assets/appliedenergistics2/blockstates/stair.quartz.certus.json deleted file mode 100644 index 6b8ed5ed..00000000 --- a/src/main/resources/assets/appliedenergistics2/blockstates/stair.quartz.certus.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "appliedenergistics2:stairs/quartz.certus" }, - "facing=west,half=bottom,shape=straight": { "model": "appliedenergistics2:stairs/quartz.certus", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "appliedenergistics2:stairs/quartz.certus", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "appliedenergistics2:stairs/quartz.certus", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "appliedenergistics2:stairs/quartz.certus.outer" }, - "facing=west,half=bottom,shape=outer_right": { "model": "appliedenergistics2:stairs/quartz.certus.outer", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "appliedenergistics2:stairs/quartz.certus.outer", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "appliedenergistics2:stairs/quartz.certus.outer", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "appliedenergistics2:stairs/quartz.certus.outer", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "appliedenergistics2:stairs/quartz.certus.outer", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "appliedenergistics2:stairs/quartz.certus.outer" }, - "facing=north,half=bottom,shape=outer_left": { "model": "appliedenergistics2:stairs/quartz.certus.outer", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "appliedenergistics2:stairs/quartz.certus.inner" }, - "facing=west,half=bottom,shape=inner_right": { "model": "appliedenergistics2:stairs/quartz.certus.inner", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "appliedenergistics2:stairs/quartz.certus.inner", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "appliedenergistics2:stairs/quartz.certus.inner", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "appliedenergistics2:stairs/quartz.certus.inner", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "appliedenergistics2:stairs/quartz.certus.inner", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "appliedenergistics2:stairs/quartz.certus.inner" }, - "facing=north,half=bottom,shape=inner_left": { "model": "appliedenergistics2:stairs/quartz.certus.inner", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "appliedenergistics2:stairs/quartz.certus", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "appliedenergistics2:stairs/quartz.certus", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "appliedenergistics2:stairs/quartz.certus", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "appliedenergistics2:stairs/quartz.certus", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "appliedenergistics2:stairs/quartz.certus.outer", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "appliedenergistics2:stairs/quartz.certus.outer", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "appliedenergistics2:stairs/quartz.certus.outer", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "appliedenergistics2:stairs/quartz.certus.outer", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "appliedenergistics2:stairs/quartz.certus.outer", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "appliedenergistics2:stairs/quartz.certus.outer", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "appliedenergistics2:stairs/quartz.certus.outer", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "appliedenergistics2:stairs/quartz.certus.outer", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "appliedenergistics2:stairs/quartz.certus.inner", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "appliedenergistics2:stairs/quartz.certus.inner", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "appliedenergistics2:stairs/quartz.certus.inner", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "appliedenergistics2:stairs/quartz.certus.inner", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "appliedenergistics2:stairs/quartz.certus.inner", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "appliedenergistics2:stairs/quartz.certus.inner", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "appliedenergistics2:stairs/quartz.certus.inner", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "appliedenergistics2:stairs/quartz.certus.inner", "x": 180, "y": 270, "uvlock": true } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/stair.quartz.certus.pillar.json b/src/main/resources/assets/appliedenergistics2/blockstates/stair.quartz.certus.pillar.json deleted file mode 100644 index b46ee72e..00000000 --- a/src/main/resources/assets/appliedenergistics2/blockstates/stair.quartz.certus.pillar.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "appliedenergistics2:stairs/quartz.certus.pillar" }, - "facing=west,half=bottom,shape=straight": { "model": "appliedenergistics2:stairs/quartz.certus.pillar", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "appliedenergistics2:stairs/quartz.certus.pillar", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "appliedenergistics2:stairs/quartz.certus.pillar", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "appliedenergistics2:stairs/quartz.certus.pillar.outer" }, - "facing=west,half=bottom,shape=outer_right": { "model": "appliedenergistics2:stairs/quartz.certus.pillar.outer", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "appliedenergistics2:stairs/quartz.certus.pillar.outer", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "appliedenergistics2:stairs/quartz.certus.pillar.outer", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "appliedenergistics2:stairs/quartz.certus.pillar.outer", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "appliedenergistics2:stairs/quartz.certus.pillar.outer", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "appliedenergistics2:stairs/quartz.certus.pillar.outer" }, - "facing=north,half=bottom,shape=outer_left": { "model": "appliedenergistics2:stairs/quartz.certus.pillar.outer", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "appliedenergistics2:stairs/quartz.certus.pillar.inner" }, - "facing=west,half=bottom,shape=inner_right": { "model": "appliedenergistics2:stairs/quartz.certus.pillar.inner", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "appliedenergistics2:stairs/quartz.certus.pillar.inner", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "appliedenergistics2:stairs/quartz.certus.pillar.inner", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "appliedenergistics2:stairs/quartz.certus.pillar.inner", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "appliedenergistics2:stairs/quartz.certus.pillar.inner", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "appliedenergistics2:stairs/quartz.certus.pillar.inner" }, - "facing=north,half=bottom,shape=inner_left": { "model": "appliedenergistics2:stairs/quartz.certus.pillar.inner", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "appliedenergistics2:stairs/quartz.certus.pillar", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "appliedenergistics2:stairs/quartz.certus.pillar", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "appliedenergistics2:stairs/quartz.certus.pillar", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "appliedenergistics2:stairs/quartz.certus.pillar", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "appliedenergistics2:stairs/quartz.certus.pillar.outer", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "appliedenergistics2:stairs/quartz.certus.pillar.outer", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "appliedenergistics2:stairs/quartz.certus.pillar.outer", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "appliedenergistics2:stairs/quartz.certus.pillar.outer", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "appliedenergistics2:stairs/quartz.certus.pillar.outer", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "appliedenergistics2:stairs/quartz.certus.pillar.outer", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "appliedenergistics2:stairs/quartz.certus.pillar.outer", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "appliedenergistics2:stairs/quartz.certus.pillar.outer", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "appliedenergistics2:stairs/quartz.certus.pillar.inner", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "appliedenergistics2:stairs/quartz.certus.pillar.inner", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "appliedenergistics2:stairs/quartz.certus.pillar.inner", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "appliedenergistics2:stairs/quartz.certus.pillar.inner", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "appliedenergistics2:stairs/quartz.certus.pillar.inner", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "appliedenergistics2:stairs/quartz.certus.pillar.inner", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "appliedenergistics2:stairs/quartz.certus.pillar.inner", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "appliedenergistics2:stairs/quartz.certus.pillar.inner", "x": 180, "y": 270, "uvlock": true } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/stair.skystone.block.json b/src/main/resources/assets/appliedenergistics2/blockstates/stair.skystone.block.json deleted file mode 100644 index 30ace0b9..00000000 --- a/src/main/resources/assets/appliedenergistics2/blockstates/stair.skystone.block.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "appliedenergistics2:stairs/skystone.block" }, - "facing=west,half=bottom,shape=straight": { "model": "appliedenergistics2:stairs/skystone.block", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "appliedenergistics2:stairs/skystone.block", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "appliedenergistics2:stairs/skystone.block", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "appliedenergistics2:stairs/skystone.block.outer" }, - "facing=west,half=bottom,shape=outer_right": { "model": "appliedenergistics2:stairs/skystone.block.outer", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "appliedenergistics2:stairs/skystone.block.outer", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "appliedenergistics2:stairs/skystone.block.outer", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "appliedenergistics2:stairs/skystone.block.outer", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "appliedenergistics2:stairs/skystone.block.outer", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "appliedenergistics2:stairs/skystone.block.outer" }, - "facing=north,half=bottom,shape=outer_left": { "model": "appliedenergistics2:stairs/skystone.block.outer", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "appliedenergistics2:stairs/skystone.block.inner" }, - "facing=west,half=bottom,shape=inner_right": { "model": "appliedenergistics2:stairs/skystone.block.inner", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "appliedenergistics2:stairs/skystone.block.inner", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "appliedenergistics2:stairs/skystone.block.inner", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "appliedenergistics2:stairs/skystone.block.inner", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "appliedenergistics2:stairs/skystone.block.inner", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "appliedenergistics2:stairs/skystone.block.inner" }, - "facing=north,half=bottom,shape=inner_left": { "model": "appliedenergistics2:stairs/skystone.block.inner", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "appliedenergistics2:stairs/skystone.block", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "appliedenergistics2:stairs/skystone.block", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "appliedenergistics2:stairs/skystone.block", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "appliedenergistics2:stairs/skystone.block", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "appliedenergistics2:stairs/skystone.block.outer", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "appliedenergistics2:stairs/skystone.block.outer", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "appliedenergistics2:stairs/skystone.block.outer", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "appliedenergistics2:stairs/skystone.block.outer", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "appliedenergistics2:stairs/skystone.block.outer", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "appliedenergistics2:stairs/skystone.block.outer", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "appliedenergistics2:stairs/skystone.block.outer", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "appliedenergistics2:stairs/skystone.block.outer", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "appliedenergistics2:stairs/skystone.block.inner", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "appliedenergistics2:stairs/skystone.block.inner", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "appliedenergistics2:stairs/skystone.block.inner", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "appliedenergistics2:stairs/skystone.block.inner", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "appliedenergistics2:stairs/skystone.block.inner", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "appliedenergistics2:stairs/skystone.block.inner", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "appliedenergistics2:stairs/skystone.block.inner", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "appliedenergistics2:stairs/skystone.block.inner", "x": 180, "y": 270, "uvlock": true } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/stair.skystone.brick.json b/src/main/resources/assets/appliedenergistics2/blockstates/stair.skystone.brick.json deleted file mode 100644 index 4b04611f..00000000 --- a/src/main/resources/assets/appliedenergistics2/blockstates/stair.skystone.brick.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "appliedenergistics2:stairs/skystone.brick" }, - "facing=west,half=bottom,shape=straight": { "model": "appliedenergistics2:stairs/skystone.brick", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "appliedenergistics2:stairs/skystone.brick", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "appliedenergistics2:stairs/skystone.brick", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "appliedenergistics2:stairs/skystone.brick.outer" }, - "facing=west,half=bottom,shape=outer_right": { "model": "appliedenergistics2:stairs/skystone.brick.outer", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "appliedenergistics2:stairs/skystone.brick.outer", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "appliedenergistics2:stairs/skystone.brick.outer", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "appliedenergistics2:stairs/skystone.brick.outer", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "appliedenergistics2:stairs/skystone.brick.outer", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "appliedenergistics2:stairs/skystone.brick.outer" }, - "facing=north,half=bottom,shape=outer_left": { "model": "appliedenergistics2:stairs/skystone.brick.outer", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "appliedenergistics2:stairs/skystone.brick.inner" }, - "facing=west,half=bottom,shape=inner_right": { "model": "appliedenergistics2:stairs/skystone.brick.inner", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "appliedenergistics2:stairs/skystone.brick.inner", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "appliedenergistics2:stairs/skystone.brick.inner", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "appliedenergistics2:stairs/skystone.brick.inner", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "appliedenergistics2:stairs/skystone.brick.inner", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "appliedenergistics2:stairs/skystone.brick.inner" }, - "facing=north,half=bottom,shape=inner_left": { "model": "appliedenergistics2:stairs/skystone.brick.inner", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "appliedenergistics2:stairs/skystone.brick", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "appliedenergistics2:stairs/skystone.brick", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "appliedenergistics2:stairs/skystone.brick", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "appliedenergistics2:stairs/skystone.brick", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "appliedenergistics2:stairs/skystone.brick.outer", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "appliedenergistics2:stairs/skystone.brick.outer", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "appliedenergistics2:stairs/skystone.brick.outer", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "appliedenergistics2:stairs/skystone.brick.outer", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "appliedenergistics2:stairs/skystone.brick.outer", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "appliedenergistics2:stairs/skystone.brick.outer", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "appliedenergistics2:stairs/skystone.brick.outer", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "appliedenergistics2:stairs/skystone.brick.outer", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "appliedenergistics2:stairs/skystone.brick.inner", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "appliedenergistics2:stairs/skystone.brick.inner", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "appliedenergistics2:stairs/skystone.brick.inner", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "appliedenergistics2:stairs/skystone.brick.inner", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "appliedenergistics2:stairs/skystone.brick.inner", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "appliedenergistics2:stairs/skystone.brick.inner", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "appliedenergistics2:stairs/skystone.brick.inner", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "appliedenergistics2:stairs/skystone.brick.inner", "x": 180, "y": 270, "uvlock": true } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/stair.skystone.brick.small.json b/src/main/resources/assets/appliedenergistics2/blockstates/stair.skystone.brick.small.json deleted file mode 100644 index 4a7475dd..00000000 --- a/src/main/resources/assets/appliedenergistics2/blockstates/stair.skystone.brick.small.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "appliedenergistics2:stairs/skystone.brick.small" }, - "facing=west,half=bottom,shape=straight": { "model": "appliedenergistics2:stairs/skystone.brick.small", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "appliedenergistics2:stairs/skystone.brick.small", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "appliedenergistics2:stairs/skystone.brick.small", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "appliedenergistics2:stairs/skystone.brick.small.outer" }, - "facing=west,half=bottom,shape=outer_right": { "model": "appliedenergistics2:stairs/skystone.brick.small.outer", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "appliedenergistics2:stairs/skystone.brick.small.outer", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "appliedenergistics2:stairs/skystone.brick.small.outer", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "appliedenergistics2:stairs/skystone.brick.small.outer", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "appliedenergistics2:stairs/skystone.brick.small.outer", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "appliedenergistics2:stairs/skystone.brick.small.outer" }, - "facing=north,half=bottom,shape=outer_left": { "model": "appliedenergistics2:stairs/skystone.brick.small.outer", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "appliedenergistics2:stairs/skystone.brick.small.inner" }, - "facing=west,half=bottom,shape=inner_right": { "model": "appliedenergistics2:stairs/skystone.brick.small.inner", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "appliedenergistics2:stairs/skystone.brick.small.inner", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "appliedenergistics2:stairs/skystone.brick.small.inner", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "appliedenergistics2:stairs/skystone.brick.small.inner", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "appliedenergistics2:stairs/skystone.brick.small.inner", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "appliedenergistics2:stairs/skystone.brick.small.inner" }, - "facing=north,half=bottom,shape=inner_left": { "model": "appliedenergistics2:stairs/skystone.brick.small.inner", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "appliedenergistics2:stairs/skystone.brick.small", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "appliedenergistics2:stairs/skystone.brick.small", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "appliedenergistics2:stairs/skystone.brick.small", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "appliedenergistics2:stairs/skystone.brick.small", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "appliedenergistics2:stairs/skystone.brick.small.outer", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "appliedenergistics2:stairs/skystone.brick.small.outer", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "appliedenergistics2:stairs/skystone.brick.small.outer", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "appliedenergistics2:stairs/skystone.brick.small.outer", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "appliedenergistics2:stairs/skystone.brick.small.outer", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "appliedenergistics2:stairs/skystone.brick.small.outer", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "appliedenergistics2:stairs/skystone.brick.small.outer", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "appliedenergistics2:stairs/skystone.brick.small.outer", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "appliedenergistics2:stairs/skystone.brick.small.inner", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "appliedenergistics2:stairs/skystone.brick.small.inner", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "appliedenergistics2:stairs/skystone.brick.small.inner", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "appliedenergistics2:stairs/skystone.brick.small.inner", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "appliedenergistics2:stairs/skystone.brick.small.inner", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "appliedenergistics2:stairs/skystone.brick.small.inner", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "appliedenergistics2:stairs/skystone.brick.small.inner", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "appliedenergistics2:stairs/skystone.brick.small.inner", "x": 180, "y": 270, "uvlock": true } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/stair.skystone.stone.json b/src/main/resources/assets/appliedenergistics2/blockstates/stair.skystone.stone.json deleted file mode 100644 index 06553ca2..00000000 --- a/src/main/resources/assets/appliedenergistics2/blockstates/stair.skystone.stone.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "appliedenergistics2:stairs/skystone.stone" }, - "facing=west,half=bottom,shape=straight": { "model": "appliedenergistics2:stairs/skystone.stone", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "appliedenergistics2:stairs/skystone.stone", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "appliedenergistics2:stairs/skystone.stone", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "appliedenergistics2:stairs/skystone.stone.outer" }, - "facing=west,half=bottom,shape=outer_right": { "model": "appliedenergistics2:stairs/skystone.stone.outer", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "appliedenergistics2:stairs/skystone.stone.outer", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "appliedenergistics2:stairs/skystone.stone.outer", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "appliedenergistics2:stairs/skystone.stone.outer", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "appliedenergistics2:stairs/skystone.stone.outer", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "appliedenergistics2:stairs/skystone.stone.outer" }, - "facing=north,half=bottom,shape=outer_left": { "model": "appliedenergistics2:stairs/skystone.stone.outer", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "appliedenergistics2:stairs/skystone.stone.inner" }, - "facing=west,half=bottom,shape=inner_right": { "model": "appliedenergistics2:stairs/skystone.stone.inner", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "appliedenergistics2:stairs/skystone.stone.inner", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "appliedenergistics2:stairs/skystone.stone.inner", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "appliedenergistics2:stairs/skystone.stone.inner", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "appliedenergistics2:stairs/skystone.stone.inner", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "appliedenergistics2:stairs/skystone.stone.inner" }, - "facing=north,half=bottom,shape=inner_left": { "model": "appliedenergistics2:stairs/skystone.stone.inner", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "appliedenergistics2:stairs/skystone.stone", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "appliedenergistics2:stairs/skystone.stone", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "appliedenergistics2:stairs/skystone.stone", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "appliedenergistics2:stairs/skystone.stone", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "appliedenergistics2:stairs/skystone.stone.outer", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "appliedenergistics2:stairs/skystone.stone.outer", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "appliedenergistics2:stairs/skystone.stone.outer", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "appliedenergistics2:stairs/skystone.stone.outer", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "appliedenergistics2:stairs/skystone.stone.outer", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "appliedenergistics2:stairs/skystone.stone.outer", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "appliedenergistics2:stairs/skystone.stone.outer", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "appliedenergistics2:stairs/skystone.stone.outer", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "appliedenergistics2:stairs/skystone.stone.inner", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "appliedenergistics2:stairs/skystone.stone.inner", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "appliedenergistics2:stairs/skystone.stone.inner", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "appliedenergistics2:stairs/skystone.stone.inner", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "appliedenergistics2:stairs/skystone.stone.inner", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "appliedenergistics2:stairs/skystone.stone.inner", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "appliedenergistics2:stairs/skystone.stone.inner", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "appliedenergistics2:stairs/skystone.stone.inner", "x": 180, "y": 270, "uvlock": true } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/stair_fluix.json b/src/main/resources/assets/appliedenergistics2/blockstates/stair_fluix.json new file mode 100644 index 00000000..a15e8912 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/blockstates/stair_fluix.json @@ -0,0 +1,209 @@ +{ + "variants": { + "facing=east,half=bottom,shape=inner_left": { + "model": "appliedenergistics2:stairs/fluix_inner", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "appliedenergistics2:stairs/fluix_inner" + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "appliedenergistics2:stairs/fluix_outer", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "appliedenergistics2:stairs/fluix_outer" + }, + "facing=east,half=bottom,shape=straight": { + "model": "appliedenergistics2:stairs/fluix" + }, + "facing=east,half=top,shape=inner_left": { + "model": "appliedenergistics2:stairs/fluix_inner", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=inner_right": { + "model": "appliedenergistics2:stairs/fluix_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=outer_left": { + "model": "appliedenergistics2:stairs/fluix_outer", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=outer_right": { + "model": "appliedenergistics2:stairs/fluix_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "appliedenergistics2:stairs/fluix", + "uvlock": true, + "x": 180 + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "appliedenergistics2:stairs/fluix_inner", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "appliedenergistics2:stairs/fluix_inner", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "appliedenergistics2:stairs/fluix_outer", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "appliedenergistics2:stairs/fluix_outer", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=straight": { + "model": "appliedenergistics2:stairs/fluix", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { + "model": "appliedenergistics2:stairs/fluix_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=inner_right": { + "model": "appliedenergistics2:stairs/fluix_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "appliedenergistics2:stairs/fluix_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=outer_right": { + "model": "appliedenergistics2:stairs/fluix_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "appliedenergistics2:stairs/fluix", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "appliedenergistics2:stairs/fluix_inner" + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "appliedenergistics2:stairs/fluix_inner", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "appliedenergistics2:stairs/fluix_outer" + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "appliedenergistics2:stairs/fluix_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "appliedenergistics2:stairs/fluix", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "appliedenergistics2:stairs/fluix_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "appliedenergistics2:stairs/fluix_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=outer_left": { + "model": "appliedenergistics2:stairs/fluix_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=outer_right": { + "model": "appliedenergistics2:stairs/fluix_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=straight": { + "model": "appliedenergistics2:stairs/fluix", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "appliedenergistics2:stairs/fluix_inner", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "appliedenergistics2:stairs/fluix_inner", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "appliedenergistics2:stairs/fluix_outer", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "appliedenergistics2:stairs/fluix_outer", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=straight": { + "model": "appliedenergistics2:stairs/fluix", + "uvlock": true, + "y": 180 + }, + "facing=west,half=top,shape=inner_left": { + "model": "appliedenergistics2:stairs/fluix_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=inner_right": { + "model": "appliedenergistics2:stairs/fluix_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=outer_left": { + "model": "appliedenergistics2:stairs/fluix_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=outer_right": { + "model": "appliedenergistics2:stairs/fluix_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=straight": { + "model": "appliedenergistics2:stairs/fluix", + "uvlock": true, + "x": 180, + "y": 180 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/stair_quartz_certus.json b/src/main/resources/assets/appliedenergistics2/blockstates/stair_quartz_certus.json new file mode 100644 index 00000000..17b9316f --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/blockstates/stair_quartz_certus.json @@ -0,0 +1,209 @@ +{ + "variants": { + "facing=east,half=bottom,shape=inner_left": { + "model": "appliedenergistics2:stairs/quartz_certus_inner", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "appliedenergistics2:stairs/quartz_certus_inner" + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "appliedenergistics2:stairs/quartz_certus_outer", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "appliedenergistics2:stairs/quartz_certus_outer" + }, + "facing=east,half=bottom,shape=straight": { + "model": "appliedenergistics2:stairs/quartz_certus" + }, + "facing=east,half=top,shape=inner_left": { + "model": "appliedenergistics2:stairs/quartz_certus_inner", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=inner_right": { + "model": "appliedenergistics2:stairs/quartz_certus_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=outer_left": { + "model": "appliedenergistics2:stairs/quartz_certus_outer", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=outer_right": { + "model": "appliedenergistics2:stairs/quartz_certus_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "appliedenergistics2:stairs/quartz_certus", + "uvlock": true, + "x": 180 + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "appliedenergistics2:stairs/quartz_certus_inner", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "appliedenergistics2:stairs/quartz_certus_inner", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "appliedenergistics2:stairs/quartz_certus_outer", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "appliedenergistics2:stairs/quartz_certus_outer", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=straight": { + "model": "appliedenergistics2:stairs/quartz_certus", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { + "model": "appliedenergistics2:stairs/quartz_certus_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=inner_right": { + "model": "appliedenergistics2:stairs/quartz_certus_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "appliedenergistics2:stairs/quartz_certus_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=outer_right": { + "model": "appliedenergistics2:stairs/quartz_certus_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "appliedenergistics2:stairs/quartz_certus", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "appliedenergistics2:stairs/quartz_certus_inner" + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "appliedenergistics2:stairs/quartz_certus_inner", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "appliedenergistics2:stairs/quartz_certus_outer" + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "appliedenergistics2:stairs/quartz_certus_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "appliedenergistics2:stairs/quartz_certus", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "appliedenergistics2:stairs/quartz_certus_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "appliedenergistics2:stairs/quartz_certus_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=outer_left": { + "model": "appliedenergistics2:stairs/quartz_certus_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=outer_right": { + "model": "appliedenergistics2:stairs/quartz_certus_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=straight": { + "model": "appliedenergistics2:stairs/quartz_certus", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "appliedenergistics2:stairs/quartz_certus_inner", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "appliedenergistics2:stairs/quartz_certus_inner", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "appliedenergistics2:stairs/quartz_certus_outer", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "appliedenergistics2:stairs/quartz_certus_outer", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=straight": { + "model": "appliedenergistics2:stairs/quartz_certus", + "uvlock": true, + "y": 180 + }, + "facing=west,half=top,shape=inner_left": { + "model": "appliedenergistics2:stairs/quartz_certus_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=inner_right": { + "model": "appliedenergistics2:stairs/quartz_certus_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=outer_left": { + "model": "appliedenergistics2:stairs/quartz_certus_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=outer_right": { + "model": "appliedenergistics2:stairs/quartz_certus_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=straight": { + "model": "appliedenergistics2:stairs/quartz_certus", + "uvlock": true, + "x": 180, + "y": 180 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/stair_quartz_certus_chiseled.json b/src/main/resources/assets/appliedenergistics2/blockstates/stair_quartz_certus_chiseled.json new file mode 100644 index 00000000..3442c95f --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/blockstates/stair_quartz_certus_chiseled.json @@ -0,0 +1,209 @@ +{ + "variants": { + "facing=east,half=bottom,shape=inner_left": { + "model": "appliedenergistics2:stairs/quartz_certus_chiseled_inner", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "appliedenergistics2:stairs/quartz_certus_chiseled_inner" + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "appliedenergistics2:stairs/quartz_certus_chiseled_outer", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "appliedenergistics2:stairs/quartz_certus_chiseled_outer" + }, + "facing=east,half=bottom,shape=straight": { + "model": "appliedenergistics2:stairs/quartz_certus_chiseled" + }, + "facing=east,half=top,shape=inner_left": { + "model": "appliedenergistics2:stairs/quartz_certus_chiseled_inner", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=inner_right": { + "model": "appliedenergistics2:stairs/quartz_certus_chiseled_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=outer_left": { + "model": "appliedenergistics2:stairs/quartz_certus_chiseled_outer", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=outer_right": { + "model": "appliedenergistics2:stairs/quartz_certus_chiseled_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "appliedenergistics2:stairs/quartz_certus_chiseled", + "uvlock": true, + "x": 180 + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "appliedenergistics2:stairs/quartz_certus_chiseled_inner", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "appliedenergistics2:stairs/quartz_certus_chiseled_inner", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "appliedenergistics2:stairs/quartz_certus_chiseled_outer", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "appliedenergistics2:stairs/quartz_certus_chiseled_outer", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=straight": { + "model": "appliedenergistics2:stairs/quartz_certus_chiseled", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { + "model": "appliedenergistics2:stairs/quartz_certus_chiseled_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=inner_right": { + "model": "appliedenergistics2:stairs/quartz_certus_chiseled_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "appliedenergistics2:stairs/quartz_certus_chiseled_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=outer_right": { + "model": "appliedenergistics2:stairs/quartz_certus_chiseled_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "appliedenergistics2:stairs/quartz_certus_chiseled", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "appliedenergistics2:stairs/quartz_certus_chiseled_inner" + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "appliedenergistics2:stairs/quartz_certus_chiseled_inner", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "appliedenergistics2:stairs/quartz_certus_chiseled_outer" + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "appliedenergistics2:stairs/quartz_certus_chiseled_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "appliedenergistics2:stairs/quartz_certus_chiseled", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "appliedenergistics2:stairs/quartz_certus_chiseled_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "appliedenergistics2:stairs/quartz_certus_chiseled_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=outer_left": { + "model": "appliedenergistics2:stairs/quartz_certus_chiseled_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=outer_right": { + "model": "appliedenergistics2:stairs/quartz_certus_chiseled_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=straight": { + "model": "appliedenergistics2:stairs/quartz_certus_chiseled", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "appliedenergistics2:stairs/quartz_certus_chiseled_inner", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "appliedenergistics2:stairs/quartz_certus_chiseled_inner", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "appliedenergistics2:stairs/quartz_certus_chiseled_outer", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "appliedenergistics2:stairs/quartz_certus_chiseled_outer", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=straight": { + "model": "appliedenergistics2:stairs/quartz_certus_chiseled", + "uvlock": true, + "y": 180 + }, + "facing=west,half=top,shape=inner_left": { + "model": "appliedenergistics2:stairs/quartz_certus_chiseled_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=inner_right": { + "model": "appliedenergistics2:stairs/quartz_certus_chiseled_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=outer_left": { + "model": "appliedenergistics2:stairs/quartz_certus_chiseled_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=outer_right": { + "model": "appliedenergistics2:stairs/quartz_certus_chiseled_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=straight": { + "model": "appliedenergistics2:stairs/quartz_certus_chiseled", + "uvlock": true, + "x": 180, + "y": 180 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/stair_quartz_certus_pillar.json b/src/main/resources/assets/appliedenergistics2/blockstates/stair_quartz_certus_pillar.json new file mode 100644 index 00000000..5c72154e --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/blockstates/stair_quartz_certus_pillar.json @@ -0,0 +1,209 @@ +{ + "variants": { + "facing=east,half=bottom,shape=inner_left": { + "model": "appliedenergistics2:stairs/quartz_certus_pillar_inner", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "appliedenergistics2:stairs/quartz_certus_pillar_inner" + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "appliedenergistics2:stairs/quartz_certus_pillar_outer", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "appliedenergistics2:stairs/quartz_certus_pillar_outer" + }, + "facing=east,half=bottom,shape=straight": { + "model": "appliedenergistics2:stairs/quartz_certus_pillar" + }, + "facing=east,half=top,shape=inner_left": { + "model": "appliedenergistics2:stairs/quartz_certus_pillar_inner", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=inner_right": { + "model": "appliedenergistics2:stairs/quartz_certus_pillar_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=outer_left": { + "model": "appliedenergistics2:stairs/quartz_certus_pillar_outer", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=outer_right": { + "model": "appliedenergistics2:stairs/quartz_certus_pillar_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "appliedenergistics2:stairs/quartz_certus_pillar", + "uvlock": true, + "x": 180 + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "appliedenergistics2:stairs/quartz_certus_pillar_inner", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "appliedenergistics2:stairs/quartz_certus_pillar_inner", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "appliedenergistics2:stairs/quartz_certus_pillar_outer", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "appliedenergistics2:stairs/quartz_certus_pillar_outer", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=straight": { + "model": "appliedenergistics2:stairs/quartz_certus_pillar", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { + "model": "appliedenergistics2:stairs/quartz_certus_pillar_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=inner_right": { + "model": "appliedenergistics2:stairs/quartz_certus_pillar_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "appliedenergistics2:stairs/quartz_certus_pillar_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=outer_right": { + "model": "appliedenergistics2:stairs/quartz_certus_pillar_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "appliedenergistics2:stairs/quartz_certus_pillar", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "appliedenergistics2:stairs/quartz_certus_pillar_inner" + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "appliedenergistics2:stairs/quartz_certus_pillar_inner", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "appliedenergistics2:stairs/quartz_certus_pillar_outer" + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "appliedenergistics2:stairs/quartz_certus_pillar_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "appliedenergistics2:stairs/quartz_certus_pillar", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "appliedenergistics2:stairs/quartz_certus_pillar_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "appliedenergistics2:stairs/quartz_certus_pillar_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=outer_left": { + "model": "appliedenergistics2:stairs/quartz_certus_pillar_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=outer_right": { + "model": "appliedenergistics2:stairs/quartz_certus_pillar_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=straight": { + "model": "appliedenergistics2:stairs/quartz_certus_pillar", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "appliedenergistics2:stairs/quartz_certus_pillar_inner", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "appliedenergistics2:stairs/quartz_certus_pillar_inner", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "appliedenergistics2:stairs/quartz_certus_pillar_outer", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "appliedenergistics2:stairs/quartz_certus_pillar_outer", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=straight": { + "model": "appliedenergistics2:stairs/quartz_certus_pillar", + "uvlock": true, + "y": 180 + }, + "facing=west,half=top,shape=inner_left": { + "model": "appliedenergistics2:stairs/quartz_certus_pillar_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=inner_right": { + "model": "appliedenergistics2:stairs/quartz_certus_pillar_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=outer_left": { + "model": "appliedenergistics2:stairs/quartz_certus_pillar_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=outer_right": { + "model": "appliedenergistics2:stairs/quartz_certus_pillar_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=straight": { + "model": "appliedenergistics2:stairs/quartz_certus_pillar", + "uvlock": true, + "x": 180, + "y": 180 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/stair_skystone_block.json b/src/main/resources/assets/appliedenergistics2/blockstates/stair_skystone_block.json new file mode 100644 index 00000000..30ed4e47 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/blockstates/stair_skystone_block.json @@ -0,0 +1,209 @@ +{ + "variants": { + "facing=east,half=bottom,shape=inner_left": { + "model": "appliedenergistics2:stairs/skystone_block_inner", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "appliedenergistics2:stairs/skystone_block_inner" + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "appliedenergistics2:stairs/skystone_block_outer", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "appliedenergistics2:stairs/skystone_block_outer" + }, + "facing=east,half=bottom,shape=straight": { + "model": "appliedenergistics2:stairs/skystone_block" + }, + "facing=east,half=top,shape=inner_left": { + "model": "appliedenergistics2:stairs/skystone_block_inner", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=inner_right": { + "model": "appliedenergistics2:stairs/skystone_block_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=outer_left": { + "model": "appliedenergistics2:stairs/skystone_block_outer", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=outer_right": { + "model": "appliedenergistics2:stairs/skystone_block_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "appliedenergistics2:stairs/skystone_block", + "uvlock": true, + "x": 180 + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "appliedenergistics2:stairs/skystone_block_inner", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "appliedenergistics2:stairs/skystone_block_inner", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "appliedenergistics2:stairs/skystone_block_outer", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "appliedenergistics2:stairs/skystone_block_outer", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=straight": { + "model": "appliedenergistics2:stairs/skystone_block", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { + "model": "appliedenergistics2:stairs/skystone_block_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=inner_right": { + "model": "appliedenergistics2:stairs/skystone_block_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "appliedenergistics2:stairs/skystone_block_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=outer_right": { + "model": "appliedenergistics2:stairs/skystone_block_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "appliedenergistics2:stairs/skystone_block", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "appliedenergistics2:stairs/skystone_block_inner" + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "appliedenergistics2:stairs/skystone_block_inner", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "appliedenergistics2:stairs/skystone_block_outer" + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "appliedenergistics2:stairs/skystone_block_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "appliedenergistics2:stairs/skystone_block", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "appliedenergistics2:stairs/skystone_block_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "appliedenergistics2:stairs/skystone_block_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=outer_left": { + "model": "appliedenergistics2:stairs/skystone_block_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=outer_right": { + "model": "appliedenergistics2:stairs/skystone_block_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=straight": { + "model": "appliedenergistics2:stairs/skystone_block", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "appliedenergistics2:stairs/skystone_block_inner", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "appliedenergistics2:stairs/skystone_block_inner", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "appliedenergistics2:stairs/skystone_block_outer", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "appliedenergistics2:stairs/skystone_block_outer", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=straight": { + "model": "appliedenergistics2:stairs/skystone_block", + "uvlock": true, + "y": 180 + }, + "facing=west,half=top,shape=inner_left": { + "model": "appliedenergistics2:stairs/skystone_block_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=inner_right": { + "model": "appliedenergistics2:stairs/skystone_block_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=outer_left": { + "model": "appliedenergistics2:stairs/skystone_block_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=outer_right": { + "model": "appliedenergistics2:stairs/skystone_block_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=straight": { + "model": "appliedenergistics2:stairs/skystone_block", + "uvlock": true, + "x": 180, + "y": 180 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/stair_skystone_brick.json b/src/main/resources/assets/appliedenergistics2/blockstates/stair_skystone_brick.json new file mode 100644 index 00000000..d0788396 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/blockstates/stair_skystone_brick.json @@ -0,0 +1,209 @@ +{ + "variants": { + "facing=east,half=bottom,shape=inner_left": { + "model": "appliedenergistics2:stairs/skystone_brick_inner", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "appliedenergistics2:stairs/skystone_brick_inner" + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "appliedenergistics2:stairs/skystone_brick_outer", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "appliedenergistics2:stairs/skystone_brick_outer" + }, + "facing=east,half=bottom,shape=straight": { + "model": "appliedenergistics2:stairs/skystone_brick" + }, + "facing=east,half=top,shape=inner_left": { + "model": "appliedenergistics2:stairs/skystone_brick_inner", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=inner_right": { + "model": "appliedenergistics2:stairs/skystone_brick_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=outer_left": { + "model": "appliedenergistics2:stairs/skystone_brick_outer", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=outer_right": { + "model": "appliedenergistics2:stairs/skystone_brick_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "appliedenergistics2:stairs/skystone_brick", + "uvlock": true, + "x": 180 + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "appliedenergistics2:stairs/skystone_brick_inner", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "appliedenergistics2:stairs/skystone_brick_inner", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "appliedenergistics2:stairs/skystone_brick_outer", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "appliedenergistics2:stairs/skystone_brick_outer", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=straight": { + "model": "appliedenergistics2:stairs/skystone_brick", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { + "model": "appliedenergistics2:stairs/skystone_brick_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=inner_right": { + "model": "appliedenergistics2:stairs/skystone_brick_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "appliedenergistics2:stairs/skystone_brick_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=outer_right": { + "model": "appliedenergistics2:stairs/skystone_brick_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "appliedenergistics2:stairs/skystone_brick", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "appliedenergistics2:stairs/skystone_brick_inner" + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "appliedenergistics2:stairs/skystone_brick_inner", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "appliedenergistics2:stairs/skystone_brick_outer" + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "appliedenergistics2:stairs/skystone_brick_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "appliedenergistics2:stairs/skystone_brick", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "appliedenergistics2:stairs/skystone_brick_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "appliedenergistics2:stairs/skystone_brick_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=outer_left": { + "model": "appliedenergistics2:stairs/skystone_brick_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=outer_right": { + "model": "appliedenergistics2:stairs/skystone_brick_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=straight": { + "model": "appliedenergistics2:stairs/skystone_brick", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "appliedenergistics2:stairs/skystone_brick_inner", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "appliedenergistics2:stairs/skystone_brick_inner", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "appliedenergistics2:stairs/skystone_brick_outer", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "appliedenergistics2:stairs/skystone_brick_outer", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=straight": { + "model": "appliedenergistics2:stairs/skystone_brick", + "uvlock": true, + "y": 180 + }, + "facing=west,half=top,shape=inner_left": { + "model": "appliedenergistics2:stairs/skystone_brick_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=inner_right": { + "model": "appliedenergistics2:stairs/skystone_brick_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=outer_left": { + "model": "appliedenergistics2:stairs/skystone_brick_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=outer_right": { + "model": "appliedenergistics2:stairs/skystone_brick_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=straight": { + "model": "appliedenergistics2:stairs/skystone_brick", + "uvlock": true, + "x": 180, + "y": 180 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/stair_skystone_brick_small.json b/src/main/resources/assets/appliedenergistics2/blockstates/stair_skystone_brick_small.json new file mode 100644 index 00000000..37b701c0 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/blockstates/stair_skystone_brick_small.json @@ -0,0 +1,209 @@ +{ + "variants": { + "facing=east,half=bottom,shape=inner_left": { + "model": "appliedenergistics2:stairs/skystone_brick_small_inner", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "appliedenergistics2:stairs/skystone_brick_small_inner" + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "appliedenergistics2:stairs/skystone_brick_small_outer", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "appliedenergistics2:stairs/skystone_brick_small_outer" + }, + "facing=east,half=bottom,shape=straight": { + "model": "appliedenergistics2:stairs/skystone_brick_small" + }, + "facing=east,half=top,shape=inner_left": { + "model": "appliedenergistics2:stairs/skystone_brick_small_inner", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=inner_right": { + "model": "appliedenergistics2:stairs/skystone_brick_small_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=outer_left": { + "model": "appliedenergistics2:stairs/skystone_brick_small_outer", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=outer_right": { + "model": "appliedenergistics2:stairs/skystone_brick_small_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "appliedenergistics2:stairs/skystone_brick_small", + "uvlock": true, + "x": 180 + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "appliedenergistics2:stairs/skystone_brick_small_inner", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "appliedenergistics2:stairs/skystone_brick_small_inner", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "appliedenergistics2:stairs/skystone_brick_small_outer", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "appliedenergistics2:stairs/skystone_brick_small_outer", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=straight": { + "model": "appliedenergistics2:stairs/skystone_brick_small", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { + "model": "appliedenergistics2:stairs/skystone_brick_small_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=inner_right": { + "model": "appliedenergistics2:stairs/skystone_brick_small_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "appliedenergistics2:stairs/skystone_brick_small_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=outer_right": { + "model": "appliedenergistics2:stairs/skystone_brick_small_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "appliedenergistics2:stairs/skystone_brick_small", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "appliedenergistics2:stairs/skystone_brick_small_inner" + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "appliedenergistics2:stairs/skystone_brick_small_inner", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "appliedenergistics2:stairs/skystone_brick_small_outer" + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "appliedenergistics2:stairs/skystone_brick_small_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "appliedenergistics2:stairs/skystone_brick_small", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "appliedenergistics2:stairs/skystone_brick_small_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "appliedenergistics2:stairs/skystone_brick_small_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=outer_left": { + "model": "appliedenergistics2:stairs/skystone_brick_small_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=outer_right": { + "model": "appliedenergistics2:stairs/skystone_brick_small_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=straight": { + "model": "appliedenergistics2:stairs/skystone_brick_small", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "appliedenergistics2:stairs/skystone_brick_small_inner", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "appliedenergistics2:stairs/skystone_brick_small_inner", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "appliedenergistics2:stairs/skystone_brick_small_outer", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "appliedenergistics2:stairs/skystone_brick_small_outer", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=straight": { + "model": "appliedenergistics2:stairs/skystone_brick_small", + "uvlock": true, + "y": 180 + }, + "facing=west,half=top,shape=inner_left": { + "model": "appliedenergistics2:stairs/skystone_brick_small_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=inner_right": { + "model": "appliedenergistics2:stairs/skystone_brick_small_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=outer_left": { + "model": "appliedenergistics2:stairs/skystone_brick_small_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=outer_right": { + "model": "appliedenergistics2:stairs/skystone_brick_small_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=straight": { + "model": "appliedenergistics2:stairs/skystone_brick_small", + "uvlock": true, + "x": 180, + "y": 180 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/stair_skystone_stone.json b/src/main/resources/assets/appliedenergistics2/blockstates/stair_skystone_stone.json new file mode 100644 index 00000000..6daacbba --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/blockstates/stair_skystone_stone.json @@ -0,0 +1,209 @@ +{ + "variants": { + "facing=east,half=bottom,shape=inner_left": { + "model": "appliedenergistics2:stairs/skystone_stone_inner", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "appliedenergistics2:stairs/skystone_stone_inner" + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "appliedenergistics2:stairs/skystone_stone_outer", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "appliedenergistics2:stairs/skystone_stone_outer" + }, + "facing=east,half=bottom,shape=straight": { + "model": "appliedenergistics2:stairs/skystone_stone" + }, + "facing=east,half=top,shape=inner_left": { + "model": "appliedenergistics2:stairs/skystone_stone_inner", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=inner_right": { + "model": "appliedenergistics2:stairs/skystone_stone_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=outer_left": { + "model": "appliedenergistics2:stairs/skystone_stone_outer", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=outer_right": { + "model": "appliedenergistics2:stairs/skystone_stone_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "appliedenergistics2:stairs/skystone_stone", + "uvlock": true, + "x": 180 + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "appliedenergistics2:stairs/skystone_stone_inner", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "appliedenergistics2:stairs/skystone_stone_inner", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "appliedenergistics2:stairs/skystone_stone_outer", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "appliedenergistics2:stairs/skystone_stone_outer", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=straight": { + "model": "appliedenergistics2:stairs/skystone_stone", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { + "model": "appliedenergistics2:stairs/skystone_stone_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=inner_right": { + "model": "appliedenergistics2:stairs/skystone_stone_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "appliedenergistics2:stairs/skystone_stone_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=outer_right": { + "model": "appliedenergistics2:stairs/skystone_stone_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "appliedenergistics2:stairs/skystone_stone", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "appliedenergistics2:stairs/skystone_stone_inner" + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "appliedenergistics2:stairs/skystone_stone_inner", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "appliedenergistics2:stairs/skystone_stone_outer" + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "appliedenergistics2:stairs/skystone_stone_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "appliedenergistics2:stairs/skystone_stone", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "appliedenergistics2:stairs/skystone_stone_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "appliedenergistics2:stairs/skystone_stone_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=outer_left": { + "model": "appliedenergistics2:stairs/skystone_stone_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=outer_right": { + "model": "appliedenergistics2:stairs/skystone_stone_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=straight": { + "model": "appliedenergistics2:stairs/skystone_stone", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "appliedenergistics2:stairs/skystone_stone_inner", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "appliedenergistics2:stairs/skystone_stone_inner", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "appliedenergistics2:stairs/skystone_stone_outer", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "appliedenergistics2:stairs/skystone_stone_outer", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=straight": { + "model": "appliedenergistics2:stairs/skystone_stone", + "uvlock": true, + "y": 180 + }, + "facing=west,half=top,shape=inner_left": { + "model": "appliedenergistics2:stairs/skystone_stone_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=inner_right": { + "model": "appliedenergistics2:stairs/skystone_stone_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=outer_left": { + "model": "appliedenergistics2:stairs/skystone_stone_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=outer_right": { + "model": "appliedenergistics2:stairs/skystone_stone_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=straight": { + "model": "appliedenergistics2:stairs/skystone_stone", + "uvlock": true, + "x": 180, + "y": 180 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockCellWorkBench.json b/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockCellWorkBench.json deleted file mode 100644 index 8abe92cf..00000000 --- a/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockCellWorkBench.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "appliedenergistics2:tile.BlockCellWorkBench" } - } -} diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockCharger.json b/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockCharger.json deleted file mode 100644 index dade42d4..00000000 --- a/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockCharger.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "appliedenergistics2:tile.BlockCharger" } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockCondenser.json b/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockCondenser.json deleted file mode 100644 index 8e743a0e..00000000 --- a/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockCondenser.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "appliedenergistics2:tile.BlockCondenser" } - } -} diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockController.json b/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockController.json deleted file mode 100644 index 2076edcc..00000000 --- a/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockController.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "multipart": [ - { - "when": { "type": "block", "state": "offline" }, - "apply": { "model": "appliedenergistics2:controller/controller_block_offline" } - }, - { - "when": { "type": "block", "state": "online" }, - "apply": { "model": "appliedenergistics2:controller/controller_block_online.uvl" } - }, - { - "when": { "type": "block", "state": "conflicted" }, - "apply": { "model": "appliedenergistics2:controller/controller_block_conflicted.uvl" } - }, - { - "when": { "type": "column", "state": "offline" }, - "apply": { "model": "appliedenergistics2:controller/controller_column_offline" } - }, - { - "when": { "type": "column", "state": "online" }, - "apply": { "model": "appliedenergistics2:controller/controller_column_online.uvl" } - }, - { - "when": { "type": "column", "state": "conflicted" }, - "apply": { "model": "appliedenergistics2:controller/controller_column_conflicted.uvl" } - }, - { - "when": { "type": "inside_a", "state": "offline|online|conflicted" }, - "apply": { "model": "appliedenergistics2:controller/controller_inside_a" } - }, - { - "when": { "type": "inside_b", "state": "offline|online|conflicted" }, - "apply": { "model": "appliedenergistics2:controller/controller_inside_b" } - } - ] -} diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockCreativeEnergyCell.json b/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockCreativeEnergyCell.json deleted file mode 100644 index d9d14599..00000000 --- a/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockCreativeEnergyCell.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "appliedenergistics2:EnergyCell/tile.BlockCreativeEnergyCell" } - } -} diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockDenseEnergyCell.json b/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockDenseEnergyCell.json deleted file mode 100644 index eaf1eb23..00000000 --- a/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockDenseEnergyCell.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "variants": { - "fullness=0": { "model": "appliedenergistics2:EnergyCell/tile.BlockDenseEnergyCell0" }, - "fullness=1": { "model": "appliedenergistics2:EnergyCell/tile.BlockDenseEnergyCell1" }, - "fullness=2": { "model": "appliedenergistics2:EnergyCell/tile.BlockDenseEnergyCell2" }, - "fullness=3": { "model": "appliedenergistics2:EnergyCell/tile.BlockDenseEnergyCell3" }, - "fullness=4": { "model": "appliedenergistics2:EnergyCell/tile.BlockDenseEnergyCell4" }, - "fullness=5": { "model": "appliedenergistics2:EnergyCell/tile.BlockDenseEnergyCell5" }, - "fullness=6": { "model": "appliedenergistics2:EnergyCell/tile.BlockDenseEnergyCell6" }, - "fullness=7": { "model": "appliedenergistics2:EnergyCell/tile.BlockDenseEnergyCell7" } - } -} diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockDrive.json b/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockDrive.json deleted file mode 100644 index 2b4f34ab..00000000 --- a/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockDrive.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "variants": { - "facing=north": { "model": "appliedenergistics2:tile.BlockDrive", "y": 180 }, - "facing=south": { "model": "appliedenergistics2:tile.BlockDrive", "y": 0 }, - "facing=west": { "model": "appliedenergistics2:tile.BlockDrive", "y": 90 }, - "facing=east": { "model": "appliedenergistics2:tile.BlockDrive", "y": 270 } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockEnergyAcceptor.json b/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockEnergyAcceptor.json deleted file mode 100644 index f84c5235..00000000 --- a/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockEnergyAcceptor.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "appliedenergistics2:tile.BlockEnergyAcceptor" } - } -} diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockEnergyCell.json b/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockEnergyCell.json deleted file mode 100644 index daa5c0ea..00000000 --- a/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockEnergyCell.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "variants": { - "fullness=0": { "model": "appliedenergistics2:EnergyCell/tile.BlockEnergyCell0" }, - "fullness=1": { "model": "appliedenergistics2:EnergyCell/tile.BlockEnergyCell1" }, - "fullness=2": { "model": "appliedenergistics2:EnergyCell/tile.BlockEnergyCell2" }, - "fullness=3": { "model": "appliedenergistics2:EnergyCell/tile.BlockEnergyCell3" }, - "fullness=4": { "model": "appliedenergistics2:EnergyCell/tile.BlockEnergyCell4" }, - "fullness=5": { "model": "appliedenergistics2:EnergyCell/tile.BlockEnergyCell5" }, - "fullness=6": { "model": "appliedenergistics2:EnergyCell/tile.BlockEnergyCell6" }, - "fullness=7": { "model": "appliedenergistics2:EnergyCell/tile.BlockEnergyCell7" } - } -} diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockGrinder.json b/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockGrinder.json deleted file mode 100644 index c6f572a6..00000000 --- a/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockGrinder.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "appliedenergistics2:tile.BlockGrinder" } - } -} diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockIOPort.json b/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockIOPort.json deleted file mode 100644 index 9bae83df..00000000 --- a/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockIOPort.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "appliedenergistics2:tile.BlockIOPort" } - } -} diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockInscriber.json b/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockInscriber.json deleted file mode 100644 index 096dbd8c..00000000 --- a/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockInscriber.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "appliedenergistics2:tile.BlockInscriber" } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockQuartzGrowthAccelerator.json b/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockQuartzGrowthAccelerator.json deleted file mode 100644 index 921614b1..00000000 --- a/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockQuartzGrowthAccelerator.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "variants": { - "powered=false": { "model": "appliedenergistics2:tile.BlockQuartzGrowthAccelerator.off" }, - "powered=true": { "model": "appliedenergistics2:tile.BlockQuartzGrowthAccelerator.on" } - } -} diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockSecurity.json b/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockSecurity.json deleted file mode 100644 index d65cf719..00000000 --- a/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockSecurity.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "appliedenergistics2:tile.BlockSecurity" } - } -} diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockSpatialIOPort.json b/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockSpatialIOPort.json deleted file mode 100644 index c155ba1f..00000000 --- a/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockSpatialIOPort.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "appliedenergistics2:tile.BlockSpatialIOPort" } - } -} diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockVibrationChamber.json b/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockVibrationChamber.json deleted file mode 100644 index 676b9081..00000000 --- a/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockVibrationChamber.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "variants": { - "active=false": { "model": "appliedenergistics2:tile.BlockVibrationChamber.off" }, - "active=true": { "model": "appliedenergistics2:tile.BlockVibrationChamber.on" } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockWireless.json b/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockWireless.json deleted file mode 100644 index a2870f75..00000000 --- a/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockWireless.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "appliedenergistics2:tile.BlockWireless", "y": 180 } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/tiny_tnt.json b/src/main/resources/assets/appliedenergistics2/blockstates/tiny_tnt.json new file mode 100644 index 00000000..303b8f0c --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/blockstates/tiny_tnt.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "appliedenergistics2:tiny_tnt" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/vibration_chamber.json b/src/main/resources/assets/appliedenergistics2/blockstates/vibration_chamber.json new file mode 100644 index 00000000..6cbca90c --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/blockstates/vibration_chamber.json @@ -0,0 +1,10 @@ +{ + "variants": { + "active=false": { + "model": "appliedenergistics2:vibration_chamber_off" + }, + "active=true": { + "model": "appliedenergistics2:vibration_chamber_on" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/wireless.json b/src/main/resources/assets/appliedenergistics2/blockstates/wireless.json new file mode 100644 index 00000000..7ea8ce8d --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/blockstates/wireless.json @@ -0,0 +1,8 @@ +{ + "variants": { + "normal": { + "model": "appliedenergistics2:wireless", + "y": 180 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/BlockTinyTNT.json b/src/main/resources/assets/appliedenergistics2/models/block/BlockTinyTNT.json deleted file mode 100644 index 3c3e239e..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/BlockTinyTNT.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "parent": "block/block", - "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "textures": { - "0": "blocks/tnt_side", - "1": "blocks/tnt_top", - "2": "blocks/tnt_bottom" - }, - "elements": [ - { - "name": "Cube", - "from": [ 4.0, 0.0, 4.0 ], - "to": [ 12.0, 8.0, 12.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "up": { "texture": "#1", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "down": { "texture": "#2", "uv": [ 0.0, 0.0, 16.0, 16.0 ] } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/ChargedQuartzOreBlock.json b/src/main/resources/assets/appliedenergistics2/models/block/ChargedQuartzOreBlock.json deleted file mode 100644 index c7fed149..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/ChargedQuartzOreBlock.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "appliedenergistics2:blocks/ChargedQuartzOreBlock" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/ChiseledQuartzBlock.json b/src/main/resources/assets/appliedenergistics2/models/block/ChiseledQuartzBlock.json deleted file mode 100644 index 0c159cc3..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/ChiseledQuartzBlock.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_column", - "textures": { - "end": "appliedenergistics2:blocks/ChiseledQuartzBlockTop", - "side": "appliedenergistics2:blocks/ChiseledQuartzBlockSide" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/creative_energy_cell.json b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/creative_energy_cell.json new file mode 100644 index 00000000..e6c879fc --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/creative_energy_cell.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "appliedenergistics2:blocks/creative_energy_cell" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/dense_energy_cell0.json b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/dense_energy_cell0.json new file mode 100644 index 00000000..e7a5effb --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/dense_energy_cell0.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "appliedenergistics2:blocks/energy_cell0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/dense_energy_cell1.json b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/dense_energy_cell1.json new file mode 100644 index 00000000..756b748e --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/dense_energy_cell1.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "appliedenergistics2:blocks/energy_cell1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/dense_energy_cell2.json b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/dense_energy_cell2.json new file mode 100644 index 00000000..dde6c091 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/dense_energy_cell2.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "appliedenergistics2:blocks/energy_cell2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/dense_energy_cell3.json b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/dense_energy_cell3.json new file mode 100644 index 00000000..4376a689 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/dense_energy_cell3.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "appliedenergistics2:blocks/energy_cell3" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/dense_energy_cell4.json b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/dense_energy_cell4.json new file mode 100644 index 00000000..7ec91a16 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/dense_energy_cell4.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "appliedenergistics2:blocks/energy_cell4" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/dense_energy_cell5.json b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/dense_energy_cell5.json new file mode 100644 index 00000000..2e56ec39 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/dense_energy_cell5.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "appliedenergistics2:blocks/energy_cell5" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/dense_energy_cell6.json b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/dense_energy_cell6.json new file mode 100644 index 00000000..be6a2e34 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/dense_energy_cell6.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "appliedenergistics2:blocks/energy_cell6" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/dense_energy_cell7.json b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/dense_energy_cell7.json new file mode 100644 index 00000000..d92a8d2e --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/dense_energy_cell7.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "appliedenergistics2:blocks/energy_cell7" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/energy_cell.json b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/energy_cell.json new file mode 100644 index 00000000..719be018 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/energy_cell.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "appliedenergistics2:blocks/energy_cell" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/energy_cell0.json b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/energy_cell0.json new file mode 100644 index 00000000..e7a5effb --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/energy_cell0.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "appliedenergistics2:blocks/energy_cell0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/energy_cell1.json b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/energy_cell1.json new file mode 100644 index 00000000..756b748e --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/energy_cell1.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "appliedenergistics2:blocks/energy_cell1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/energy_cell2.json b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/energy_cell2.json new file mode 100644 index 00000000..dde6c091 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/energy_cell2.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "appliedenergistics2:blocks/energy_cell2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/energy_cell3.json b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/energy_cell3.json new file mode 100644 index 00000000..4376a689 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/energy_cell3.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "appliedenergistics2:blocks/energy_cell3" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/energy_cell4.json b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/energy_cell4.json new file mode 100644 index 00000000..7ec91a16 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/energy_cell4.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "appliedenergistics2:blocks/energy_cell4" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/energy_cell5.json b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/energy_cell5.json new file mode 100644 index 00000000..2e56ec39 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/energy_cell5.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "appliedenergistics2:blocks/energy_cell5" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/energy_cell6.json b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/energy_cell6.json new file mode 100644 index 00000000..be6a2e34 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/energy_cell6.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "appliedenergistics2:blocks/energy_cell6" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/energy_cell7.json b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/energy_cell7.json new file mode 100644 index 00000000..d92a8d2e --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/energy_cell7.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "appliedenergistics2:blocks/energy_cell7" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockCreativeEnergyCell.json b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockCreativeEnergyCell.json deleted file mode 100644 index c557dfb7..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockCreativeEnergyCell.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "appliedenergistics2:blocks/BlockCreativeEnergyCell" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockDenseEnergyCell0.json b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockDenseEnergyCell0.json deleted file mode 100644 index 85eecdce..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockDenseEnergyCell0.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "appliedenergistics2:blocks/BlockEnergyCell0" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockDenseEnergyCell1.json b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockDenseEnergyCell1.json deleted file mode 100644 index bef53299..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockDenseEnergyCell1.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "appliedenergistics2:blocks/BlockEnergyCell1" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockDenseEnergyCell2.json b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockDenseEnergyCell2.json deleted file mode 100644 index 7e8085ca..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockDenseEnergyCell2.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "appliedenergistics2:blocks/BlockEnergyCell2" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockDenseEnergyCell3.json b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockDenseEnergyCell3.json deleted file mode 100644 index e86676cb..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockDenseEnergyCell3.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "appliedenergistics2:blocks/BlockEnergyCell3" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockDenseEnergyCell4.json b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockDenseEnergyCell4.json deleted file mode 100644 index 072b0653..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockDenseEnergyCell4.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "appliedenergistics2:blocks/BlockEnergyCell4" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockDenseEnergyCell5.json b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockDenseEnergyCell5.json deleted file mode 100644 index 20414972..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockDenseEnergyCell5.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "appliedenergistics2:blocks/BlockEnergyCell5" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockDenseEnergyCell6.json b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockDenseEnergyCell6.json deleted file mode 100644 index fb65733e..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockDenseEnergyCell6.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "appliedenergistics2:blocks/BlockEnergyCell6" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockDenseEnergyCell7.json b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockDenseEnergyCell7.json deleted file mode 100644 index cd13344d..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockDenseEnergyCell7.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "appliedenergistics2:blocks/BlockEnergyCell7" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockEnergyCell.json b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockEnergyCell.json deleted file mode 100644 index 6a3a76e0..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockEnergyCell.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "appliedenergistics2:blocks/BlockEnergyCell" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockEnergyCell0.json b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockEnergyCell0.json deleted file mode 100644 index 85eecdce..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockEnergyCell0.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "appliedenergistics2:blocks/BlockEnergyCell0" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockEnergyCell1.json b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockEnergyCell1.json deleted file mode 100644 index bef53299..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockEnergyCell1.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "appliedenergistics2:blocks/BlockEnergyCell1" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockEnergyCell2.json b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockEnergyCell2.json deleted file mode 100644 index 7e8085ca..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockEnergyCell2.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "appliedenergistics2:blocks/BlockEnergyCell2" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockEnergyCell3.json b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockEnergyCell3.json deleted file mode 100644 index e86676cb..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockEnergyCell3.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "appliedenergistics2:blocks/BlockEnergyCell3" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockEnergyCell4.json b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockEnergyCell4.json deleted file mode 100644 index 072b0653..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockEnergyCell4.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "appliedenergistics2:blocks/BlockEnergyCell4" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockEnergyCell5.json b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockEnergyCell5.json deleted file mode 100644 index 20414972..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockEnergyCell5.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "appliedenergistics2:blocks/BlockEnergyCell5" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockEnergyCell6.json b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockEnergyCell6.json deleted file mode 100644 index fb65733e..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockEnergyCell6.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "appliedenergistics2:blocks/BlockEnergyCell6" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockEnergyCell7.json b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockEnergyCell7.json deleted file mode 100644 index cd13344d..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockEnergyCell7.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "appliedenergistics2:blocks/BlockEnergyCell7" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/FluixBlock.json b/src/main/resources/assets/appliedenergistics2/models/block/FluixBlock.json deleted file mode 100644 index 61385fe1..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/FluixBlock.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "appliedenergistics2:blocks/FluixBlock" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/QuartzBlock.json b/src/main/resources/assets/appliedenergistics2/models/block/QuartzBlock.json deleted file mode 100644 index 18dcd739..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/QuartzBlock.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "appliedenergistics2:blocks/QuartzBlock" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/QuartzGlassBlock.json b/src/main/resources/assets/appliedenergistics2/models/block/QuartzGlassBlock.json deleted file mode 100644 index b783e945..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/QuartzGlassBlock.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "appliedenergistics2:blocks/QuartzOreBlock" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/QuartzOreBlock.json b/src/main/resources/assets/appliedenergistics2/models/block/QuartzOreBlock.json deleted file mode 100644 index b783e945..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/QuartzOreBlock.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "appliedenergistics2:blocks/QuartzOreBlock" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/QuartzPillarBlock.json b/src/main/resources/assets/appliedenergistics2/models/block/QuartzPillarBlock.json deleted file mode 100644 index da4faedd..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/QuartzPillarBlock.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_column", - "textures": { - "end": "appliedenergistics2:blocks/QuartzPillarBlockTop", - "side": "appliedenergistics2:blocks/QuartzPillarBlockSide" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/SkyStoneBlock.BLOCK.json b/src/main/resources/assets/appliedenergistics2/models/block/SkyStoneBlock.BLOCK.json deleted file mode 100644 index dda1bb1a..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/SkyStoneBlock.BLOCK.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "appliedenergistics2:blocks/SkyStoneBlock.BLOCK" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/SkyStoneBlock.BRICK.json b/src/main/resources/assets/appliedenergistics2/models/block/SkyStoneBlock.BRICK.json deleted file mode 100644 index a3cd423f..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/SkyStoneBlock.BRICK.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "appliedenergistics2:blocks/SkyStoneBlock.BRICK" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/SkyStoneBlock.SMALL_BRICK.json b/src/main/resources/assets/appliedenergistics2/models/block/SkyStoneBlock.SMALL_BRICK.json deleted file mode 100644 index a941ae5e..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/SkyStoneBlock.SMALL_BRICK.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "appliedenergistics2:blocks/SkyStoneBlock.SMALL_BRICK" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/SkyStoneBlock.STONE.json b/src/main/resources/assets/appliedenergistics2/models/block/SkyStoneBlock.STONE.json deleted file mode 100644 index 414aca4a..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/SkyStoneBlock.STONE.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "appliedenergistics2:blocks/SkyStoneBlock.STONE" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/Wireless.model b/src/main/resources/assets/appliedenergistics2/models/block/Wireless.model deleted file mode 100644 index c57d0185..00000000 Binary files a/src/main/resources/assets/appliedenergistics2/models/block/Wireless.model and /dev/null differ diff --git a/src/main/resources/assets/appliedenergistics2/models/block/cell_work_bench.json b/src/main/resources/assets/appliedenergistics2/models/block/cell_work_bench.json new file mode 100644 index 00000000..4e7b2609 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/cell_work_bench.json @@ -0,0 +1,8 @@ +{ + "parent": "block/cube_bottom_top", + "textures": { + "bottom": "appliedenergistics2:blocks/cell_work_bench_bottom", + "side": "appliedenergistics2:blocks/cell_work_bench_side", + "top": "appliedenergistics2:blocks/cell_work_bench" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/charged_quartz_ore.json b/src/main/resources/assets/appliedenergistics2/models/block/charged_quartz_ore.json new file mode 100644 index 00000000..7fa1351d --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/charged_quartz_ore.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "appliedenergistics2:blocks/charged_quartz_ore" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/charger.json b/src/main/resources/assets/appliedenergistics2/models/block/charger.json new file mode 100644 index 00000000..e60a5b11 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/charger.json @@ -0,0 +1,356 @@ +{ + "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", + "elements": [ + { + "faces": { + "down": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 4.0, + 1.0 + ] + }, + "east": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 1.0, + 16.0 + ] + }, + "north": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 4.0, + 16.0 + ] + }, + "south": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 4.0, + 16.0 + ] + }, + "up": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 4.0, + 1.0 + ] + }, + "west": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 1.0, + 16.0 + ] + } + }, + "from": [ + 6.0, + 0.0, + 15.0 + ], + "name": "Back", + "to": [ + 10.0, + 16.0, + 16.0 + ] + }, + { + "faces": { + "down": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 12.0, + 13.0 + ] + }, + "east": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 13.0, + 2.0 + ] + }, + "north": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 12.0, + 2.0 + ] + }, + "south": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 12.0, + 2.0 + ] + }, + "up": { + "texture": "#0", + "uv": [ + 2.0, + 2.0, + 14.0, + 15.0 + ] + }, + "west": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 13.0, + 2.0 + ] + } + }, + "from": [ + 2.0, + 0.0, + 2.0 + ], + "name": "Bottom", + "to": [ + 14.0, + 2.0, + 15.0 + ] + }, + { + "faces": { + "down": { + "texture": "#0", + "uv": [ + 2.0, + 1.0, + 14.0, + 14.0 + ] + }, + "east": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 13.0, + 3.0 + ] + }, + "north": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 12.0, + 3.0 + ] + }, + "south": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 12.0, + 3.0 + ] + }, + "up": { + "texture": "#1", + "uv": [ + 2.0, + 2.0, + 14.0, + 15.0 + ] + }, + "west": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 13.0, + 3.0 + ] + } + }, + "from": [ + 2.0, + 13.0, + 2.0 + ], + "name": "Top", + "to": [ + 14.0, + 16.0, + 15.0 + ] + }, + { + "faces": { + "down": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 10.0, + 10.0 + ] + }, + "east": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 10.0, + 1.0 + ] + }, + "north": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 10.0, + 1.0 + ] + }, + "south": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 10.0, + 1.0 + ] + }, + "up": { + "texture": "#2", + "uv": [ + 3.0, + 3.0, + 13.0, + 13.0 + ] + }, + "west": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 10.0, + 1.0 + ] + } + }, + "from": [ + 3.0, + 2.0, + 3.0 + ], + "name": "BottomTop", + "to": [ + 13.0, + 3.0, + 13.0 + ] + }, + { + "faces": { + "down": { + "texture": "#2", + "uv": [ + 3.0, + 3.0, + 13.0, + 13.0 + ] + }, + "east": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 10.0, + 1.0 + ] + }, + "north": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 10.0, + 1.0 + ] + }, + "south": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 10.0, + 1.0 + ] + }, + "up": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 10.0, + 10.0 + ] + }, + "west": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 10.0, + 1.0 + ] + } + }, + "from": [ + 3.0, + 12.0, + 3.0 + ], + "name": "TopTop", + "to": [ + 13.0, + 13.0, + 13.0 + ] + } + ], + "parent": "block/orientable", + "textures": { + "0": "appliedenergistics2:blocks/charger_side", + "1": "appliedenergistics2:blocks/charger", + "2": "appliedenergistics2:blocks/charger_inside" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/chiseled_quartz.json b/src/main/resources/assets/appliedenergistics2/models/block/chiseled_quartz.json new file mode 100644 index 00000000..d8d23d40 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/chiseled_quartz.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cube_column", + "textures": { + "end": "appliedenergistics2:blocks/chiseled_quartz_block_top", + "side": "appliedenergistics2:blocks/chiseled_quartz_block_side" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/condenser.json b/src/main/resources/assets/appliedenergistics2/models/block/condenser.json new file mode 100644 index 00000000..e502d3d0 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/condenser.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "appliedenergistics2:blocks/condenser" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_block_conflicted.uvl.json b/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_block_conflicted.uvl.json deleted file mode 100644 index ce79d3db..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_block_conflicted.uvl.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "parent": "block/block", - "display": { - "firstperson_righthand": { - "rotation": [ 0, 135, 0 ], - "translation": [ 0, 0, 0 ], - "scale": [ 0.40, 0.40, 0.40 ] - } - }, - "textures": { - "particle": "#block", - "block": "appliedenergistics2:blocks/BlockControllerPowered", - "lights": "appliedenergistics2:blocks/BlockControllerConflict" - }, - "elements": [ - { - "from": [ 0, 0, 0 ], - "to": [ 16, 16, 16 ], - "shade": false, - "faces": { - "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#lights", "uvlightmap": { "sky": 0.007, "block": 0.007 }}, - "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#lights", "uvlightmap": { "sky": 0.007, "block": 0.007 }}, - "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#lights", "uvlightmap": { "sky": 0.007, "block": 0.007 }}, - "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#lights", "uvlightmap": { "sky": 0.007, "block": 0.007 }}, - "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#lights", "uvlightmap": { "sky": 0.007, "block": 0.007 }}, - "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#lights", "uvlightmap": { "sky": 0.007, "block": 0.007 }} - } - }, - { - "from": [ 0, 0, 0 ], - "to": [ 16, 16, 16 ], - "faces": { - "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#block"}, - "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#block"}, - "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#block"}, - "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#block"}, - "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#block"}, - "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#block"} - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_block_conflicted_uvl.json b/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_block_conflicted_uvl.json new file mode 100644 index 00000000..46738ddf --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_block_conflicted_uvl.json @@ -0,0 +1,190 @@ +{ + "display": { + "firstperson_righthand": { + "rotation": [ + 0, + 135, + 0 + ], + "scale": [ + 0.40, + 0.40, + 0.40 + ], + "translation": [ + 0, + 0, + 0 + ] + } + }, + "elements": [ + { + "faces": { + "down": { + "texture": "#lights", + "uv": [ + 0, + 0, + 16, + 16 + ], + "uvlightmap": { + "block": 0.007, + "sky": 0.007 + } + }, + "east": { + "texture": "#lights", + "uv": [ + 0, + 0, + 16, + 16 + ], + "uvlightmap": { + "block": 0.007, + "sky": 0.007 + } + }, + "north": { + "texture": "#lights", + "uv": [ + 0, + 0, + 16, + 16 + ], + "uvlightmap": { + "block": 0.007, + "sky": 0.007 + } + }, + "south": { + "texture": "#lights", + "uv": [ + 0, + 0, + 16, + 16 + ], + "uvlightmap": { + "block": 0.007, + "sky": 0.007 + } + }, + "up": { + "texture": "#lights", + "uv": [ + 0, + 0, + 16, + 16 + ], + "uvlightmap": { + "block": 0.007, + "sky": 0.007 + } + }, + "west": { + "texture": "#lights", + "uv": [ + 0, + 0, + 16, + 16 + ], + "uvlightmap": { + "block": 0.007, + "sky": 0.007 + } + } + }, + "from": [ + 0, + 0, + 0 + ], + "shade": false, + "to": [ + 16, + 16, + 16 + ] + }, + { + "faces": { + "down": { + "texture": "#block", + "uv": [ + 0, + 0, + 16, + 16 + ] + }, + "east": { + "texture": "#block", + "uv": [ + 0, + 0, + 16, + 16 + ] + }, + "north": { + "texture": "#block", + "uv": [ + 0, + 0, + 16, + 16 + ] + }, + "south": { + "texture": "#block", + "uv": [ + 0, + 0, + 16, + 16 + ] + }, + "up": { + "texture": "#block", + "uv": [ + 0, + 0, + 16, + 16 + ] + }, + "west": { + "texture": "#block", + "uv": [ + 0, + 0, + 16, + 16 + ] + } + }, + "from": [ + 0, + 0, + 0 + ], + "to": [ + 16, + 16, + 16 + ] + } + ], + "parent": "block/block", + "textures": { + "block": "appliedenergistics2:blocks/controller_powered", + "lights": "appliedenergistics2:blocks/controller_conflict", + "particle": "#block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_block_offline.json b/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_block_offline.json index ce19e30c..570f0e7f 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_block_offline.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_block_offline.json @@ -1,6 +1,6 @@ { "parent": "block/cube_all", "textures": { - "all": "appliedenergistics2:blocks/BlockController" + "all": "appliedenergistics2:blocks/controller" } } \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_block_online.uvl.json b/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_block_online.uvl.json deleted file mode 100644 index a2ee5b38..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_block_online.uvl.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "parent": "block/block", - "display": { - "firstperson_righthand": { - "rotation": [ 0, 135, 0 ], - "translation": [ 0, 0, 0 ], - "scale": [ 0.40, 0.40, 0.40 ] - } - }, - "textures": { - "particle": "#block", - "block": "appliedenergistics2:blocks/BlockControllerPowered", - "lights": "appliedenergistics2:blocks/BlockControllerLights" - }, - "elements": [ - { - "from": [ 0, 0, 0 ], - "to": [ 16, 16, 16 ], - "shade": false, - "faces": { - "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#lights", "uvlightmap": { "sky": 0.007, "block": 0.007 }}, - "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#lights", "uvlightmap": { "sky": 0.007, "block": 0.007 }}, - "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#lights", "uvlightmap": { "sky": 0.007, "block": 0.007 }}, - "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#lights", "uvlightmap": { "sky": 0.007, "block": 0.007 }}, - "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#lights", "uvlightmap": { "sky": 0.007, "block": 0.007 }}, - "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#lights", "uvlightmap": { "sky": 0.007, "block": 0.007 }} - } - }, - { - "from": [ 0, 0, 0 ], - "to": [ 16, 16, 16 ], - "faces": { - "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#block"}, - "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#block"}, - "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#block"}, - "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#block"}, - "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#block"}, - "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#block"} - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_block_online_uvl.json b/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_block_online_uvl.json new file mode 100644 index 00000000..7ac5f246 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_block_online_uvl.json @@ -0,0 +1,190 @@ +{ + "display": { + "firstperson_righthand": { + "rotation": [ + 0, + 135, + 0 + ], + "scale": [ + 0.40, + 0.40, + 0.40 + ], + "translation": [ + 0, + 0, + 0 + ] + } + }, + "elements": [ + { + "faces": { + "down": { + "texture": "#lights", + "uv": [ + 0, + 0, + 16, + 16 + ], + "uvlightmap": { + "block": 0.007, + "sky": 0.007 + } + }, + "east": { + "texture": "#lights", + "uv": [ + 0, + 0, + 16, + 16 + ], + "uvlightmap": { + "block": 0.007, + "sky": 0.007 + } + }, + "north": { + "texture": "#lights", + "uv": [ + 0, + 0, + 16, + 16 + ], + "uvlightmap": { + "block": 0.007, + "sky": 0.007 + } + }, + "south": { + "texture": "#lights", + "uv": [ + 0, + 0, + 16, + 16 + ], + "uvlightmap": { + "block": 0.007, + "sky": 0.007 + } + }, + "up": { + "texture": "#lights", + "uv": [ + 0, + 0, + 16, + 16 + ], + "uvlightmap": { + "block": 0.007, + "sky": 0.007 + } + }, + "west": { + "texture": "#lights", + "uv": [ + 0, + 0, + 16, + 16 + ], + "uvlightmap": { + "block": 0.007, + "sky": 0.007 + } + } + }, + "from": [ + 0, + 0, + 0 + ], + "shade": false, + "to": [ + 16, + 16, + 16 + ] + }, + { + "faces": { + "down": { + "texture": "#block", + "uv": [ + 0, + 0, + 16, + 16 + ] + }, + "east": { + "texture": "#block", + "uv": [ + 0, + 0, + 16, + 16 + ] + }, + "north": { + "texture": "#block", + "uv": [ + 0, + 0, + 16, + 16 + ] + }, + "south": { + "texture": "#block", + "uv": [ + 0, + 0, + 16, + 16 + ] + }, + "up": { + "texture": "#block", + "uv": [ + 0, + 0, + 16, + 16 + ] + }, + "west": { + "texture": "#block", + "uv": [ + 0, + 0, + 16, + 16 + ] + } + }, + "from": [ + 0, + 0, + 0 + ], + "to": [ + 16, + 16, + 16 + ] + } + ], + "parent": "block/block", + "textures": { + "block": "appliedenergistics2:blocks/controller_powered", + "lights": "appliedenergistics2:blocks/controller_lights", + "particle": "#block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_column_conflicted.uvl.json b/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_column_conflicted.uvl.json deleted file mode 100644 index 0dfbdfc0..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_column_conflicted.uvl.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "parent": "block/block", - "display": { - "firstperson_righthand": { - "rotation": [ 0, 135, 0 ], - "translation": [ 0, 0, 0 ], - "scale": [ 0.40, 0.40, 0.40 ] - } - }, - "textures": { - "particle": "#block", - "block": "appliedenergistics2:blocks/BlockControllerColumnPowered", - "lights": "appliedenergistics2:blocks/BlockControllerColumnConflict" - }, - "elements": [ - { - "from": [ 0, 0, 0 ], - "to": [ 16, 16, 16 ], - "shade": false, - "faces": { - "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#lights", "uvlightmap": { "sky": 0.007, "block": 0.007 }}, - "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#lights", "uvlightmap": { "sky": 0.007, "block": 0.007 }}, - "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#lights", "uvlightmap": { "sky": 0.007, "block": 0.007 }}, - "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#lights", "uvlightmap": { "sky": 0.007, "block": 0.007 }}, - "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#lights", "uvlightmap": { "sky": 0.007, "block": 0.007 }}, - "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#lights", "uvlightmap": { "sky": 0.007, "block": 0.007 }} - } - }, - { - "from": [ 0, 0, 0 ], - "to": [ 16, 16, 16 ], - "faces": { - "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#block"}, - "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#block"}, - "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#block"}, - "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#block"}, - "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#block"}, - "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#block"} - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_column_conflicted_uvl.json b/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_column_conflicted_uvl.json new file mode 100644 index 00000000..0b59a7eb --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_column_conflicted_uvl.json @@ -0,0 +1,190 @@ +{ + "display": { + "firstperson_righthand": { + "rotation": [ + 0, + 135, + 0 + ], + "scale": [ + 0.40, + 0.40, + 0.40 + ], + "translation": [ + 0, + 0, + 0 + ] + } + }, + "elements": [ + { + "faces": { + "down": { + "texture": "#lights", + "uv": [ + 0, + 0, + 16, + 16 + ], + "uvlightmap": { + "block": 0.007, + "sky": 0.007 + } + }, + "east": { + "texture": "#lights", + "uv": [ + 0, + 0, + 16, + 16 + ], + "uvlightmap": { + "block": 0.007, + "sky": 0.007 + } + }, + "north": { + "texture": "#lights", + "uv": [ + 0, + 0, + 16, + 16 + ], + "uvlightmap": { + "block": 0.007, + "sky": 0.007 + } + }, + "south": { + "texture": "#lights", + "uv": [ + 0, + 0, + 16, + 16 + ], + "uvlightmap": { + "block": 0.007, + "sky": 0.007 + } + }, + "up": { + "texture": "#lights", + "uv": [ + 0, + 0, + 16, + 16 + ], + "uvlightmap": { + "block": 0.007, + "sky": 0.007 + } + }, + "west": { + "texture": "#lights", + "uv": [ + 0, + 0, + 16, + 16 + ], + "uvlightmap": { + "block": 0.007, + "sky": 0.007 + } + } + }, + "from": [ + 0, + 0, + 0 + ], + "shade": false, + "to": [ + 16, + 16, + 16 + ] + }, + { + "faces": { + "down": { + "texture": "#block", + "uv": [ + 0, + 0, + 16, + 16 + ] + }, + "east": { + "texture": "#block", + "uv": [ + 0, + 0, + 16, + 16 + ] + }, + "north": { + "texture": "#block", + "uv": [ + 0, + 0, + 16, + 16 + ] + }, + "south": { + "texture": "#block", + "uv": [ + 0, + 0, + 16, + 16 + ] + }, + "up": { + "texture": "#block", + "uv": [ + 0, + 0, + 16, + 16 + ] + }, + "west": { + "texture": "#block", + "uv": [ + 0, + 0, + 16, + 16 + ] + } + }, + "from": [ + 0, + 0, + 0 + ], + "to": [ + 16, + 16, + 16 + ] + } + ], + "parent": "block/block", + "textures": { + "block": "appliedenergistics2:blocks/controller_column_powered", + "lights": "appliedenergistics2:blocks/controller_column_conflict", + "particle": "#block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_column_offline.json b/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_column_offline.json index accac3e4..2888093a 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_column_offline.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_column_offline.json @@ -1,6 +1,6 @@ { "parent": "block/cube_all", "textures": { - "all": "appliedenergistics2:blocks/BlockControllerColumn" + "all": "appliedenergistics2:blocks/controller_column" } } \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_column_online.uvl.json b/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_column_online.uvl.json deleted file mode 100644 index 36ddc370..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_column_online.uvl.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "parent": "block/block", - "display": { - "firstperson_righthand": { - "rotation": [ 0, 135, 0 ], - "translation": [ 0, 0, 0 ], - "scale": [ 0.40, 0.40, 0.40 ] - } - }, - "textures": { - "particle": "#block", - "block": "appliedenergistics2:blocks/BlockControllerColumnPowered", - "lights": "appliedenergistics2:blocks/BlockControllerColumnLights" - }, - "elements": [ - { - "from": [ 0, 0, 0 ], - "to": [ 16, 16, 16 ], - "shade": false, - "faces": { - "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#lights", "uvlightmap": { "sky": 0.007, "block": 0.007 }}, - "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#lights", "uvlightmap": { "sky": 0.007, "block": 0.007 }}, - "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#lights", "uvlightmap": { "sky": 0.007, "block": 0.007 }}, - "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#lights", "uvlightmap": { "sky": 0.007, "block": 0.007 }}, - "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#lights", "uvlightmap": { "sky": 0.007, "block": 0.007 }}, - "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#lights", "uvlightmap": { "sky": 0.007, "block": 0.007 }} - } - }, - { - "from": [ 0, 0, 0 ], - "to": [ 16, 16, 16 ], - "faces": { - "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#block"}, - "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#block"}, - "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#block"}, - "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#block"}, - "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#block"}, - "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#block"} - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_column_online_uvl.json b/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_column_online_uvl.json new file mode 100644 index 00000000..93f22817 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_column_online_uvl.json @@ -0,0 +1,190 @@ +{ + "display": { + "firstperson_righthand": { + "rotation": [ + 0, + 135, + 0 + ], + "scale": [ + 0.40, + 0.40, + 0.40 + ], + "translation": [ + 0, + 0, + 0 + ] + } + }, + "elements": [ + { + "faces": { + "down": { + "texture": "#lights", + "uv": [ + 0, + 0, + 16, + 16 + ], + "uvlightmap": { + "block": 0.007, + "sky": 0.007 + } + }, + "east": { + "texture": "#lights", + "uv": [ + 0, + 0, + 16, + 16 + ], + "uvlightmap": { + "block": 0.007, + "sky": 0.007 + } + }, + "north": { + "texture": "#lights", + "uv": [ + 0, + 0, + 16, + 16 + ], + "uvlightmap": { + "block": 0.007, + "sky": 0.007 + } + }, + "south": { + "texture": "#lights", + "uv": [ + 0, + 0, + 16, + 16 + ], + "uvlightmap": { + "block": 0.007, + "sky": 0.007 + } + }, + "up": { + "texture": "#lights", + "uv": [ + 0, + 0, + 16, + 16 + ], + "uvlightmap": { + "block": 0.007, + "sky": 0.007 + } + }, + "west": { + "texture": "#lights", + "uv": [ + 0, + 0, + 16, + 16 + ], + "uvlightmap": { + "block": 0.007, + "sky": 0.007 + } + } + }, + "from": [ + 0, + 0, + 0 + ], + "shade": false, + "to": [ + 16, + 16, + 16 + ] + }, + { + "faces": { + "down": { + "texture": "#block", + "uv": [ + 0, + 0, + 16, + 16 + ] + }, + "east": { + "texture": "#block", + "uv": [ + 0, + 0, + 16, + 16 + ] + }, + "north": { + "texture": "#block", + "uv": [ + 0, + 0, + 16, + 16 + ] + }, + "south": { + "texture": "#block", + "uv": [ + 0, + 0, + 16, + 16 + ] + }, + "up": { + "texture": "#block", + "uv": [ + 0, + 0, + 16, + 16 + ] + }, + "west": { + "texture": "#block", + "uv": [ + 0, + 0, + 16, + 16 + ] + } + }, + "from": [ + 0, + 0, + 0 + ], + "to": [ + 16, + 16, + 16 + ] + } + ], + "parent": "block/block", + "textures": { + "block": "appliedenergistics2:blocks/controller_column_powered", + "lights": "appliedenergistics2:blocks/controller_column_lights", + "particle": "#block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_inside_a.json b/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_inside_a.json index db18e8b3..113d95ca 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_inside_a.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_inside_a.json @@ -1,6 +1,6 @@ { - "parent": "block/cube_all", - "textures": { - "all": "appliedenergistics2:blocks/BlockControllerInsideA" - } + "parent": "block/cube_all", + "textures": { + "all": "appliedenergistics2:blocks/controller_inside_a" + } } \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_inside_b.json b/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_inside_b.json index f21a110a..60847ca1 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_inside_b.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_inside_b.json @@ -1,6 +1,6 @@ { - "parent": "block/cube_all", - "textures": { - "all": "appliedenergistics2:blocks/BlockControllerInsideB" - } + "parent": "block/cube_all", + "textures": { + "all": "appliedenergistics2:blocks/controller_inside_b" + } } \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/cube/cube_AE _all.json b/src/main/resources/assets/appliedenergistics2/models/block/cube/cube_AE _all.json index 11bcd6b5..dbd59267 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/cube/cube_AE _all.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/cube/cube_AE _all.json @@ -1,12 +1,12 @@ { - "parent": "appliedenergistics2:block/cube_AE", + "parent": "appliedenergistics2:block/cube_ae", "textures": { - "particle": "#all", "down": "#all", - "up": "#all", - "north": "#all", "east": "#all", + "north": "#all", + "particle": "#all", "south": "#all", + "up": "#all", "west": "#all" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/cube/cube_AE.json b/src/main/resources/assets/appliedenergistics2/models/block/cube/cube_AE.json index 4cc92aa2..754f2272 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/cube/cube_AE.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/cube/cube_AE.json @@ -1,25 +1,58 @@ { - "parent": "block/block", - "ambientocclusion": false, - "display": { + "ambientocclusion": false, + "display": { "firstperson_righthand": { - "rotation": [ 0, 135, 0 ], - "translation": [ 0, 0, 0 ], - "scale": [ 0.40, 0.40, 0.40 ] + "rotation": [ + 0, + 135, + 0 + ], + "scale": [ + 0.40, + 0.40, + 0.40 + ], + "translation": [ + 0, + 0, + 0 + ] } }, - "elements": [ - { "from": [ 0, 0, 0 ], - "to": [ 16, 16, 16 ], - "shade": false, + "elements": [ + { "faces": { - "down": { "texture": "#down"}, - "up": { "texture": "#up"}, - "north": { "texture": "#north"}, - "south": { "texture": "#south"}, - "west": { "texture": "#west"}, - "east": { "texture": "#east"} - } + "down": { + "texture": "#down" + }, + "east": { + "texture": "#east" + }, + "north": { + "texture": "#north" + }, + "south": { + "texture": "#south" + }, + "up": { + "texture": "#up" + }, + "west": { + "texture": "#west" + } + }, + "from": [ + 0, + 0, + 0 + ], + "shade": false, + "to": [ + 16, + 16, + 16 + ] } - ] + ], + "parent": "block/block" } \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/cube/cube_AE_bottom_top.json b/src/main/resources/assets/appliedenergistics2/models/block/cube/cube_AE_bottom_top.json index b36870d4..d1fb3f5b 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/cube/cube_AE_bottom_top.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/cube/cube_AE_bottom_top.json @@ -1,12 +1,12 @@ { - "parent": "appliedenergistics2:block/cube_AE", + "parent": "appliedenergistics2:block/cube_ae", "textures": { - "particle": "#side", "down": "#bottom", - "up": "#top", - "north": "#side", "east": "#side", + "north": "#side", + "particle": "#side", "south": "#side", + "up": "#top", "west": "#side" } } \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/cube/cube_AE_machine.json b/src/main/resources/assets/appliedenergistics2/models/block/cube/cube_AE_machine.json index 5dcd93ae..3d393f76 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/cube/cube_AE_machine.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/cube/cube_AE_machine.json @@ -1,12 +1,12 @@ { - "parent": "appliedenergistics2:block/cube/cube_AE", + "parent": "appliedenergistics2:block/cube/cube_ae", "textures": { - "particle": "#front", "down": "#bottom", - "up": "#top", - "north": "#front", "east": "#side", + "north": "#front", + "particle": "#front", "south": "#side", + "up": "#top", "west": "#side" } } \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/drive.json b/src/main/resources/assets/appliedenergistics2/models/block/drive.json new file mode 100644 index 00000000..3da8cb2e --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/drive.json @@ -0,0 +1,700 @@ +{ + "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", + "elements": [ + { + "faces": { + "down": { + "texture": "#2", + "uv": [ + 1.0, + 0.0, + 15.0, + 16.0 + ] + }, + "east": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 16.0, + 1.0 + ] + }, + "north": { + "texture": "#0", + "uv": [ + 1.0, + 15.0, + 15.0, + 16.0 + ] + }, + "south": { + "texture": "#1", + "uv": [ + 1.0, + 15.0, + 15.0, + 16.0 + ] + }, + "up": { + "texture": "#2", + "uv": [ + 1.0, + 0.0, + 15.0, + 16.0 + ] + }, + "west": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 16.0, + 1.0 + ] + } + }, + "from": [ + 1.0, + 0.0, + 0.0 + ], + "name": "Bottom", + "to": [ + 15.0, + 1.0, + 16.0 + ] + }, + { + "faces": { + "down": { + "texture": "#2", + "uv": [ + 0.0, + 0.0, + 1.0, + 16.0 + ] + }, + "east": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 16.0, + 16.0 + ] + }, + "north": { + "texture": "#0", + "uv": [ + 15.0, + 0.0, + 16.0, + 16.0 + ] + }, + "south": { + "texture": "#1", + "uv": [ + 0.0, + 0.0, + 1.0, + 16.0 + ] + }, + "up": { + "texture": "#2", + "uv": [ + 0.0, + 0.0, + 1.0, + 16.0 + ] + }, + "west": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 16.0, + 16.0 + ] + } + }, + "from": [ + 0.0, + 0.0, + 0.0 + ], + "name": "Left", + "to": [ + 1.0, + 16.0, + 16.0 + ] + }, + { + "faces": { + "down": { + "texture": "#2", + "uv": [ + 1.0, + 0.0, + 15.0, + 16.0 + ] + }, + "east": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 16.0, + 1.0 + ] + }, + "north": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 14.0, + 1.0 + ] + }, + "south": { + "texture": "#1", + "uv": [ + 1.0, + 0.0, + 15.0, + 1.0 + ] + }, + "up": { + "texture": "#2", + "uv": [ + 1.0, + 0.0, + 15.0, + 16.0 + ] + }, + "west": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 16.0, + 1.0 + ] + } + }, + "from": [ + 1.0, + 15.0, + 0.0 + ], + "name": "Top", + "to": [ + 15.0, + 16.0, + 16.0 + ] + }, + { + "faces": { + "down": { + "texture": "#2", + "uv": [ + 15.0, + 0.0, + 16.0, + 16.0 + ] + }, + "east": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 16.0, + 16.0 + ] + }, + "north": { + "texture": "#2", + "uv": [ + 0.0, + 0.0, + 1.0, + 16.0 + ] + }, + "south": { + "texture": "#1", + "uv": [ + 15.0, + 0.0, + 16.0, + 16.0 + ] + }, + "up": { + "texture": "#2", + "uv": [ + 15.0, + 0.0, + 16.0, + 16.0 + ] + }, + "west": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 16.0, + 16.0 + ] + } + }, + "from": [ + 15.0, + 0.0, + 0.0 + ], + "name": "Right", + "to": [ + 16.0, + 16.0, + 16.0 + ] + }, + { + "faces": { + "down": { + "texture": "#2", + "uv": [ + 1.0, + 1.0, + 15.0, + 15.0 + ] + }, + "east": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 14.0, + 1.0 + ] + }, + "north": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 14.0, + 1.0 + ] + }, + "south": { + "texture": "#1", + "uv": [ + 1.0, + 12.0, + 15.0, + 13.0 + ] + }, + "up": { + "texture": "#2", + "uv": [ + 1.0, + 1.0, + 15.0, + 15.0 + ] + }, + "west": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 14.0, + 1.0 + ] + } + }, + "from": [ + 1.0, + 3.0, + 1.0 + ], + "name": "Rack", + "to": [ + 15.0, + 4.0, + 15.0 + ] + }, + { + "faces": { + "down": { + "texture": "#2", + "uv": [ + 1.0, + 1.0, + 15.0, + 15.0 + ] + }, + "east": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 14.0, + 1.0 + ] + }, + "north": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 14.0, + 1.0 + ] + }, + "south": { + "texture": "#1", + "uv": [ + 1.0, + 9.0, + 15.0, + 10.0 + ] + }, + "up": { + "texture": "#2", + "uv": [ + 1.0, + 1.0, + 15.0, + 15.0 + ] + }, + "west": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 14.0, + 1.0 + ] + } + }, + "from": [ + 1.0, + 6.0, + 1.0 + ], + "name": "Rack 2", + "to": [ + 15.0, + 7.0, + 15.0 + ] + }, + { + "faces": { + "down": { + "texture": "#2", + "uv": [ + 1.0, + 1.0, + 15.0, + 15.0 + ] + }, + "east": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 14.0, + 1.0 + ] + }, + "north": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 14.0, + 1.0 + ] + }, + "south": { + "texture": "#1", + "uv": [ + 1.0, + 6.0, + 15.0, + 7.0 + ] + }, + "up": { + "texture": "#2", + "uv": [ + 1.0, + 1.0, + 15.0, + 15.0 + ] + }, + "west": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 14.0, + 1.0 + ] + } + }, + "from": [ + 1.0, + 9.0, + 1.0 + ], + "name": "Rack 3", + "to": [ + 15.0, + 10.0, + 15.0 + ] + }, + { + "faces": { + "down": { + "texture": "#2", + "uv": [ + 1.0, + 1.0, + 15.0, + 15.0 + ] + }, + "east": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 14.0, + 1.0 + ] + }, + "north": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 14.0, + 1.0 + ] + }, + "south": { + "texture": "#1", + "uv": [ + 1.0, + 3.0, + 15.0, + 4.0 + ] + }, + "up": { + "texture": "#2", + "uv": [ + 1.0, + 1.0, + 15.0, + 15.0 + ] + }, + "west": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 14.0, + 1.0 + ] + } + }, + "from": [ + 1.0, + 12.0, + 1.0 + ], + "name": "Rack4", + "to": [ + 15.0, + 13.0, + 15.0 + ] + }, + { + "faces": { + "down": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 14.0, + 7.0 + ] + }, + "east": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 7.0, + 14.0 + ] + }, + "north": { + "texture": "#0", + "uv": [ + 1.0, + 1.0, + 15.0, + 15.0 + ] + }, + "south": { + "texture": "#1", + "uv": [ + 1.0, + 1.0, + 15.0, + 15.0 + ] + }, + "up": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 14.0, + 7.0 + ] + }, + "west": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 7.0, + 14.0 + ] + } + }, + "from": [ + 1.0, + 1.0, + 0.0 + ], + "name": "Back", + "to": [ + 15.0, + 15.0, + 7.0 + ] + }, + { + "faces": { + "down": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 2.0, + 9.0 + ] + }, + "east": { + "texture": "#0", + "uv": [ + 1.0, + 1.0, + 10.0, + 15.0 + ] + }, + "north": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 2.0, + 14.0 + ] + }, + "south": { + "texture": "#1", + "uv": [ + 7.0, + 1.0, + 9.0, + 15.0 + ] + }, + "up": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 2.0, + 9.0 + ] + }, + "west": { + "texture": "#0", + "uv": [ + 1.0, + 1.0, + 10.0, + 15.0 + ] + } + }, + "from": [ + 7.0, + 1.0, + 7.0 + ], + "name": "Cube", + "to": [ + 9.0, + 15.0, + 16.0 + ] + } + ], + "textures": { + "0": "blocks/BlockDriveSide", + "1": "blocks/BlockDriveFront", + "2": "blocks/BlockDrive" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/energy_acceptor.json b/src/main/resources/assets/appliedenergistics2/models/block/energy_acceptor.json new file mode 100644 index 00000000..27be213b --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/energy_acceptor.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "appliedenergistics2:blocks/energy_acceptor" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/fluix.json b/src/main/resources/assets/appliedenergistics2/models/block/fluix.json new file mode 100644 index 00000000..5b455bcf --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/fluix.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "appliedenergistics2:blocks/fluix" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/grinder.json b/src/main/resources/assets/appliedenergistics2/models/block/grinder.json new file mode 100644 index 00000000..35692671 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/grinder.json @@ -0,0 +1,10 @@ +{ + "ambientocclusion": false, + "parent": "appliedenergistics2:block/cube/cube_ae_machine", + "textures": { + "bottom": "appliedenergistics2:blocks/grinder_bottom", + "front": "appliedenergistics2:blocks/grinder_front", + "side": "appliedenergistics2:blocks/grinder_side", + "top": "appliedenergistics2:blocks/grinder" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/inscriber.json b/src/main/resources/assets/appliedenergistics2/models/block/inscriber.json new file mode 100644 index 00000000..6777853b --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/inscriber.json @@ -0,0 +1,492 @@ +{ + "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", + "elements": [ + { + "faces": { + "down": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 3.0, + 16.0 + ] + }, + "east": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 16.0, + 14.0 + ] + }, + "north": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 3.0, + 14.0 + ] + }, + "south": { + "texture": "#0", + "uv": [ + 13.0, + 0.0, + 16.0, + 14.0 + ] + }, + "up": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 3.0, + 16.0 + ] + }, + "west": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 16.0, + 14.0 + ] + } + }, + "from": [ + 0.0, + 1.0, + 0.0 + ], + "name": "Left", + "to": [ + 3.0, + 15.0, + 16.0 + ] + }, + { + "faces": { + "down": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 14.0, + 14.0 + ] + }, + "east": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 14.0, + 1.0 + ] + }, + "north": { + "texture": "#0", + "uv": [ + 1.0, + 15.0, + 15.0, + 16.0 + ] + }, + "south": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 14.0, + 1.0 + ] + }, + "up": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 14.0, + 14.0 + ] + }, + "west": { + "texture": "#0", + "uv": [ + 1.0, + 0.0, + 15.0, + 1.0 + ] + } + }, + "from": [ + 1.0, + 0.0, + 1.0 + ], + "name": "Bottom", + "to": [ + 15.0, + 1.0, + 15.0 + ] + }, + { + "faces": { + "down": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 3.0, + 16.0 + ] + }, + "east": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 16.0, + 14.0 + ] + }, + "north": { + "texture": "#0", + "uv": [ + 13.0, + 0.0, + 16.0, + 14.0 + ] + }, + "south": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 3.0, + 14.0 + ] + }, + "up": { + "texture": "#0", + "uv": [ + 13.0, + 0.0, + 16.0, + 16.0 + ] + }, + "west": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 16.0, + 14.0 + ] + } + }, + "from": [ + 13.0, + 1.0, + 0.0 + ], + "name": "Right", + "to": [ + 16.0, + 15.0, + 16.0 + ] + }, + { + "faces": { + "down": { + "texture": "#-1", + "uv": [ + 1.0, + 1.0, + 15.0, + 15.0 + ] + }, + "east": { + "texture": "#0", + "uv": [ + 1.0, + 0.0, + 15.0, + 1.0 + ] + }, + "north": { + "texture": "#0", + "uv": [ + 1.0, + 15.0, + 15.0, + 16.0 + ] + }, + "south": { + "texture": "#0", + "uv": [ + 1.0, + 0.0, + 15.0, + 1.0 + ] + }, + "up": { + "texture": "#0", + "uv": [ + 1.0, + 1.0, + 15.0, + 15.0 + ] + }, + "west": { + "texture": "#0", + "uv": [ + 1.0, + 15.0, + 15.0, + 16.0 + ] + } + }, + "from": [ + 1.0, + 15.0, + 1.0 + ], + "name": "Top", + "to": [ + 15.0, + 16.0, + 15.0 + ] + }, + { + "faces": { + "down": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 10.0, + 12.0 + ] + }, + "east": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 12.0, + 3.0 + ] + }, + "north": { + "texture": "#0", + "uv": [ + 3.0, + 12.0, + 13.0, + 15.0 + ] + }, + "south": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 10.0, + 3.0 + ] + }, + "up": { + "texture": "#0", + "uv": [ + 3.0, + 1.0, + 13.0, + 13.0 + ] + }, + "west": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 12.0, + 3.0 + ] + } + }, + "from": [ + 3.0, + 1.0, + 1.0 + ], + "name": "BottomFill", + "to": [ + 13.0, + 4.0, + 13.0 + ] + }, + { + "faces": { + "down": { + "texture": "#0", + "uv": [ + 3.0, + 1.0, + 13.0, + 11.0 + ] + }, + "east": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 10.0, + 3.0 + ] + }, + "north": { + "texture": "#0", + "uv": [ + 3.0, + 1.0, + 13.0, + 4.0 + ] + }, + "south": { + "texture": "#0", + "uv": [ + 3.0, + 1.0, + 13.0, + 4.0 + ] + }, + "up": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 10.0, + 10.0 + ] + }, + "west": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 10.0, + 3.0 + ] + } + }, + "from": [ + 3.0, + 12.0, + 1.0 + ], + "name": "TopFill", + "to": [ + 13.0, + 15.0, + 11.0 + ] + }, + { + "faces": { + "down": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 10.0, + 3.0 + ] + }, + "east": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 3.0, + 14.0 + ] + }, + "north": { + "texture": "#0", + "uv": [ + 3.0, + 1.0, + 13.0, + 15.0 + ] + }, + "south": { + "texture": "#0", + "uv": [ + 3.0, + 0.0, + 13.0, + 14.0 + ] + }, + "up": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 10.0, + 3.0 + ] + }, + "west": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 3.0, + 14.0 + ] + } + }, + "from": [ + 3.0, + 1.0, + 13.0 + ], + "name": "Back", + "to": [ + 13.0, + 15.0, + 16.0 + ] + } + ], + "parent": "block/orientable", + "textures": { + "0": "appliedenergistics2:blocks/inscriber" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/ioport.json b/src/main/resources/assets/appliedenergistics2/models/block/ioport.json new file mode 100644 index 00000000..3f919fb7 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/ioport.json @@ -0,0 +1,8 @@ +{ + "parent": "block/cube_bottom_top", + "textures": { + "bottom": "appliedenergistics2:blocks/ioport_bottom", + "side": "appliedenergistics2:blocks/ioport_side", + "top": "appliedenergistics2:blocks/ioport" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/quartz.json b/src/main/resources/assets/appliedenergistics2/models/block/quartz.json new file mode 100644 index 00000000..b4c173f1 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/quartz.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "appliedenergistics2:blocks/quartz" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/quartz_glass.json b/src/main/resources/assets/appliedenergistics2/models/block/quartz_glass.json new file mode 100644 index 00000000..594e770f --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/quartz_glass.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "appliedenergistics2:blocks/quartz_ore" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/quartz_growth_accelerator_off.json b/src/main/resources/assets/appliedenergistics2/models/block/quartz_growth_accelerator_off.json new file mode 100644 index 00000000..5d0eca70 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/quartz_growth_accelerator_off.json @@ -0,0 +1,8 @@ +{ + "parent": "block/cube_bottom_top", + "textures": { + "bottom": "appliedenergistics2:blocks/quartz_growth_accelerator", + "side": "appliedenergistics2:blocks/quartz_growth_accelerator_side", + "top": "appliedenergistics2:blocks/quartz_growth_accelerator" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/quartz_growth_accelerator_on.json b/src/main/resources/assets/appliedenergistics2/models/block/quartz_growth_accelerator_on.json new file mode 100644 index 00000000..68e48be9 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/quartz_growth_accelerator_on.json @@ -0,0 +1,8 @@ +{ + "parent": "block/cube_bottom_top", + "textures": { + "bottom": "appliedenergistics2:blocks/quartz_growth_accelerator_on", + "side": "appliedenergistics2:blocks/quartz_growth_accelerator_side_on", + "top": "appliedenergistics2:blocks/quartz_growth_accelerator_on" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/quartz_ore.json b/src/main/resources/assets/appliedenergistics2/models/block/quartz_ore.json new file mode 100644 index 00000000..594e770f --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/quartz_ore.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "appliedenergistics2:blocks/quartz_ore" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/quartz_pillar.json b/src/main/resources/assets/appliedenergistics2/models/block/quartz_pillar.json new file mode 100644 index 00000000..1af1d48c --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/quartz_pillar.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cube_column", + "textures": { + "end": "appliedenergistics2:blocks/quartz_pillar_block_top", + "side": "appliedenergistics2:blocks/quartz_pillar_block_side" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/security.json b/src/main/resources/assets/appliedenergistics2/models/block/security.json new file mode 100644 index 00000000..464f0ba0 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/security.json @@ -0,0 +1,8 @@ +{ + "parent": "block/cube_bottom_top", + "textures": { + "bottom": "appliedenergistics2:blocks/security_bottom", + "side": "appliedenergistics2:blocks/security_side", + "top": "appliedenergistics2:blocks/security" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/sky_stone_block_block.json b/src/main/resources/assets/appliedenergistics2/models/block/sky_stone_block_block.json new file mode 100644 index 00000000..6012d79b --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/sky_stone_block_block.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "appliedenergistics2:blocks/sky_stone_block_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/sky_stone_block_brick.json b/src/main/resources/assets/appliedenergistics2/models/block/sky_stone_block_brick.json new file mode 100644 index 00000000..9ce5d8ee --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/sky_stone_block_brick.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "appliedenergistics2:blocks/sky_stone_block_brick" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/sky_stone_block_small_brick.json b/src/main/resources/assets/appliedenergistics2/models/block/sky_stone_block_small_brick.json new file mode 100644 index 00000000..655b8101 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/sky_stone_block_small_brick.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "appliedenergistics2:blocks/sky_stone_block_small_brick" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/sky_stone_block_stone.json b/src/main/resources/assets/appliedenergistics2/models/block/sky_stone_block_stone.json new file mode 100644 index 00000000..69dcc5c1 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/sky_stone_block_stone.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "appliedenergistics2:blocks/sky_stone_block_stone" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/skystone.block.stairs.inner.json b/src/main/resources/assets/appliedenergistics2/models/block/skystone.block.stairs.inner.json deleted file mode 100644 index 37836264..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/skystone.block.stairs.inner.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/inner_stairs", - "textures": { - "side": "appliedenergistics2:blocks/SkyStoneBlock.BLOCK", - "top": "appliedenergistics2:blocks/SkyStoneBlock.BLOCK", - "bottom": "appliedenergistics2:blocks/SkyStoneBlock.BLOCK" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/skystone.block.stairs.json b/src/main/resources/assets/appliedenergistics2/models/block/skystone.block.stairs.json deleted file mode 100644 index f3183323..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/skystone.block.stairs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/stairs", - "textures": { - "side": "appliedenergistics2:blocks/SkyStoneBlock.BLOCK", - "top": "appliedenergistics2:blocks/SkyStoneBlock.BLOCK", - "bottom": "appliedenergistics2:blocks/SkyStoneBlock.BLOCK" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/skystone.block.stairs.outer.json b/src/main/resources/assets/appliedenergistics2/models/block/skystone.block.stairs.outer.json deleted file mode 100644 index ca5a7954..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/skystone.block.stairs.outer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/outer_stairs", - "textures": { - "side": "appliedenergistics2:blocks/SkyStoneBlock.BLOCK", - "top": "appliedenergistics2:blocks/SkyStoneBlock.BLOCK", - "bottom": "appliedenergistics2:blocks/SkyStoneBlock.BLOCK" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/skystone_block_stairs.json b/src/main/resources/assets/appliedenergistics2/models/block/skystone_block_stairs.json new file mode 100644 index 00000000..3f1c2915 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/skystone_block_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "block/stairs", + "textures": { + "bottom": "appliedenergistics2:blocks/sky_stone_block_block", + "side": "appliedenergistics2:blocks/sky_stone_block_block", + "top": "appliedenergistics2:blocks/sky_stone_block_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/skystone_block_stairs_inner.json b/src/main/resources/assets/appliedenergistics2/models/block/skystone_block_stairs_inner.json new file mode 100644 index 00000000..334efbb5 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/skystone_block_stairs_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "block/inner_stairs", + "textures": { + "bottom": "appliedenergistics2:blocks/sky_stone_block_block", + "side": "appliedenergistics2:blocks/sky_stone_block_block", + "top": "appliedenergistics2:blocks/sky_stone_block_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/skystone_block_stairs_outer.json b/src/main/resources/assets/appliedenergistics2/models/block/skystone_block_stairs_outer.json new file mode 100644 index 00000000..7fe1e122 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/skystone_block_stairs_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "block/outer_stairs", + "textures": { + "bottom": "appliedenergistics2:blocks/sky_stone_block_block", + "side": "appliedenergistics2:blocks/sky_stone_block_block", + "top": "appliedenergistics2:blocks/sky_stone_block_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/spatial_ioport.json b/src/main/resources/assets/appliedenergistics2/models/block/spatial_ioport.json new file mode 100644 index 00000000..506ce32c --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/spatial_ioport.json @@ -0,0 +1,8 @@ +{ + "parent": "block/cube_bottom_top", + "textures": { + "bottom": "appliedenergistics2:blocks/spatial_ioport_bottom", + "side": "appliedenergistics2:blocks/spatial_ioport_side", + "top": "appliedenergistics2:blocks/spatial_ioport" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/fluix.inner.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/fluix.inner.json deleted file mode 100644 index 04547b23..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/stairs/fluix.inner.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/inner_stairs", - "textures": { - "side": "appliedenergistics2:blocks/FluixBlock", - "top": "appliedenergistics2:blocks/FluixBlock", - "bottom": "appliedenergistics2:blocks/FluixBlock" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/fluix.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/fluix.json index 3fe2ce19..ced8dc6c 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/stairs/fluix.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/stairs/fluix.json @@ -1,8 +1,8 @@ { - "parent": "block/stairs", - "textures": { - "side": "appliedenergistics2:blocks/FluixBlock", - "top": "appliedenergistics2:blocks/FluixBlock", - "bottom": "appliedenergistics2:blocks/FluixBlock" - } + "parent": "block/stairs", + "textures": { + "bottom": "appliedenergistics2:blocks/fluix", + "side": "appliedenergistics2:blocks/fluix", + "top": "appliedenergistics2:blocks/fluix" + } } \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/fluix.outer.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/fluix.outer.json deleted file mode 100644 index 9619005e..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/stairs/fluix.outer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/outer_stairs", - "textures": { - "side": "appliedenergistics2:blocks/FluixBlock", - "top": "appliedenergistics2:blocks/FluixBlock", - "bottom": "appliedenergistics2:blocks/FluixBlock" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/fluix_inner.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/fluix_inner.json new file mode 100644 index 00000000..fd2c5d4c --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/stairs/fluix_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "block/inner_stairs", + "textures": { + "bottom": "appliedenergistics2:blocks/fluix", + "side": "appliedenergistics2:blocks/fluix", + "top": "appliedenergistics2:blocks/fluix" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/fluix_outer.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/fluix_outer.json new file mode 100644 index 00000000..21222bff --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/stairs/fluix_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "block/outer_stairs", + "textures": { + "bottom": "appliedenergistics2:blocks/fluix", + "side": "appliedenergistics2:blocks/fluix", + "top": "appliedenergistics2:blocks/fluix" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz.certus.chiseled.inner.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz.certus.chiseled.inner.json deleted file mode 100644 index c9a4a875..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz.certus.chiseled.inner.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/inner_stairs", - "textures": { - "side": "appliedenergistics2:blocks/ChiseledQuartzBlockSide", - "top": "appliedenergistics2:blocks/ChiseledQuartzBlockTop", - "bottom": "appliedenergistics2:blocks/ChiseledQuartzBlockTop" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz.certus.chiseled.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz.certus.chiseled.json deleted file mode 100644 index a3e8a2a4..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz.certus.chiseled.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/stairs", - "textures": { - "side": "appliedenergistics2:blocks/ChiseledQuartzBlockSide", - "top": "appliedenergistics2:blocks/ChiseledQuartzBlockTop", - "bottom": "appliedenergistics2:blocks/ChiseledQuartzBlockTop" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz.certus.chiseled.outer.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz.certus.chiseled.outer.json deleted file mode 100644 index d78d351f..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz.certus.chiseled.outer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/outer_stairs", - "textures": { - "side": "appliedenergistics2:blocks/ChiseledQuartzBlockSide", - "top": "appliedenergistics2:blocks/ChiseledQuartzBlockTop", - "bottom": "appliedenergistics2:blocks/ChiseledQuartzBlockTop" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz.certus.inner.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz.certus.inner.json deleted file mode 100644 index 97ee6faf..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz.certus.inner.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/inner_stairs", - "textures": { - "side": "appliedenergistics2:blocks/QuartzBlock", - "top": "appliedenergistics2:blocks/QuartzBlock", - "bottom": "appliedenergistics2:blocks/QuartzBlock" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz.certus.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz.certus.json deleted file mode 100644 index e047870d..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz.certus.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/stairs", - "textures": { - "side": "appliedenergistics2:blocks/QuartzBlock", - "top": "appliedenergistics2:blocks/QuartzBlock", - "bottom": "appliedenergistics2:blocks/QuartzBlock" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz.certus.outer.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz.certus.outer.json deleted file mode 100644 index 2ac5d06d..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz.certus.outer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/outer_stairs", - "textures": { - "side": "appliedenergistics2:blocks/QuartzBlock", - "top": "appliedenergistics2:blocks/QuartzBlock", - "bottom": "appliedenergistics2:blocks/QuartzBlock" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz.certus.pillar.inner.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz.certus.pillar.inner.json deleted file mode 100644 index f839aed6..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz.certus.pillar.inner.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/inner_stairs", - "textures": { - "side": "appliedenergistics2:blocks/QuartzPillarBlockSide", - "top": "appliedenergistics2:blocks/QuartzPillarBlockTop", - "bottom": "appliedenergistics2:blocks/QuartzPillarBlockTop" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz.certus.pillar.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz.certus.pillar.json deleted file mode 100644 index a7704f6b..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz.certus.pillar.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/stairs", - "textures": { - "side": "appliedenergistics2:blocks/QuartzPillarBlockSide", - "top": "appliedenergistics2:blocks/QuartzPillarBlockTop", - "bottom": "appliedenergistics2:blocks/QuartzPillarBlockTop" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz.certus.pillar.outer.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz.certus.pillar.outer.json deleted file mode 100644 index 329c6815..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz.certus.pillar.outer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/outer_stairs", - "textures": { - "side": "appliedenergistics2:blocks/QuartzPillarBlockSide", - "top": "appliedenergistics2:blocks/QuartzPillarBlockTop", - "bottom": "appliedenergistics2:blocks/QuartzPillarBlockTop" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_certus.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_certus.json new file mode 100644 index 00000000..c64d9194 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_certus.json @@ -0,0 +1,8 @@ +{ + "parent": "block/stairs", + "textures": { + "bottom": "appliedenergistics2:blocks/quartz", + "side": "appliedenergistics2:blocks/quartz", + "top": "appliedenergistics2:blocks/quartz" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_certus_chiseled.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_certus_chiseled.json new file mode 100644 index 00000000..f0f915d3 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_certus_chiseled.json @@ -0,0 +1,8 @@ +{ + "parent": "block/stairs", + "textures": { + "bottom": "appliedenergistics2:blocks/chiseled_quartz_block_top", + "side": "appliedenergistics2:blocks/chiseled_quartz_block_side", + "top": "appliedenergistics2:blocks/chiseled_quartz_block_top" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_certus_chiseled_inner.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_certus_chiseled_inner.json new file mode 100644 index 00000000..52ea7056 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_certus_chiseled_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "block/inner_stairs", + "textures": { + "bottom": "appliedenergistics2:blocks/chiseled_quartz_block_top", + "side": "appliedenergistics2:blocks/chiseled_quartz_block_side", + "top": "appliedenergistics2:blocks/chiseled_quartz_block_top" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_certus_chiseled_outer.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_certus_chiseled_outer.json new file mode 100644 index 00000000..9650e6ca --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_certus_chiseled_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "block/outer_stairs", + "textures": { + "bottom": "appliedenergistics2:blocks/chiseled_quartz_block_top", + "side": "appliedenergistics2:blocks/chiseled_quartz_block_side", + "top": "appliedenergistics2:blocks/chiseled_quartz_block_top" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_certus_inner.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_certus_inner.json new file mode 100644 index 00000000..1e9d4487 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_certus_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "block/inner_stairs", + "textures": { + "bottom": "appliedenergistics2:blocks/quartz", + "side": "appliedenergistics2:blocks/quartz", + "top": "appliedenergistics2:blocks/quartz" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_certus_outer.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_certus_outer.json new file mode 100644 index 00000000..7e7cf8b5 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_certus_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "block/outer_stairs", + "textures": { + "bottom": "appliedenergistics2:blocks/quartz", + "side": "appliedenergistics2:blocks/quartz", + "top": "appliedenergistics2:blocks/quartz" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_certus_pillar.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_certus_pillar.json new file mode 100644 index 00000000..0ae584d2 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_certus_pillar.json @@ -0,0 +1,8 @@ +{ + "parent": "block/stairs", + "textures": { + "bottom": "appliedenergistics2:blocks/quartz_pillar_block_top", + "side": "appliedenergistics2:blocks/quartz_pillar_block_side", + "top": "appliedenergistics2:blocks/quartz_pillar_block_top" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_certus_pillar_inner.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_certus_pillar_inner.json new file mode 100644 index 00000000..cad653fe --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_certus_pillar_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "block/inner_stairs", + "textures": { + "bottom": "appliedenergistics2:blocks/quartz_pillar_block_top", + "side": "appliedenergistics2:blocks/quartz_pillar_block_side", + "top": "appliedenergistics2:blocks/quartz_pillar_block_top" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_certus_pillar_outer.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_certus_pillar_outer.json new file mode 100644 index 00000000..43923a3a --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_certus_pillar_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "block/outer_stairs", + "textures": { + "bottom": "appliedenergistics2:blocks/quartz_pillar_block_top", + "side": "appliedenergistics2:blocks/quartz_pillar_block_side", + "top": "appliedenergistics2:blocks/quartz_pillar_block_top" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone.block.inner.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone.block.inner.json deleted file mode 100644 index 37836264..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone.block.inner.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/inner_stairs", - "textures": { - "side": "appliedenergistics2:blocks/SkyStoneBlock.BLOCK", - "top": "appliedenergistics2:blocks/SkyStoneBlock.BLOCK", - "bottom": "appliedenergistics2:blocks/SkyStoneBlock.BLOCK" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone.block.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone.block.json deleted file mode 100644 index f3183323..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone.block.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/stairs", - "textures": { - "side": "appliedenergistics2:blocks/SkyStoneBlock.BLOCK", - "top": "appliedenergistics2:blocks/SkyStoneBlock.BLOCK", - "bottom": "appliedenergistics2:blocks/SkyStoneBlock.BLOCK" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone.block.outer.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone.block.outer.json deleted file mode 100644 index ca5a7954..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone.block.outer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/outer_stairs", - "textures": { - "side": "appliedenergistics2:blocks/SkyStoneBlock.BLOCK", - "top": "appliedenergistics2:blocks/SkyStoneBlock.BLOCK", - "bottom": "appliedenergistics2:blocks/SkyStoneBlock.BLOCK" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone.brick.inner.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone.brick.inner.json deleted file mode 100644 index a029a76f..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone.brick.inner.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/inner_stairs", - "textures": { - "side": "appliedenergistics2:blocks/SkyStoneBlock.BRICK", - "top": "appliedenergistics2:blocks/SkyStoneBlock.BRICK", - "bottom": "appliedenergistics2:blocks/SkyStoneBlock.BRICK" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone.brick.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone.brick.json deleted file mode 100644 index d26f5c38..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone.brick.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/stairs", - "textures": { - "side": "appliedenergistics2:blocks/SkyStoneBlock.BRICK", - "top": "appliedenergistics2:blocks/SkyStoneBlock.BRICK", - "bottom": "appliedenergistics2:blocks/SkyStoneBlock.BRICK" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone.brick.outer.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone.brick.outer.json deleted file mode 100644 index 1cafa9b5..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone.brick.outer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/outer_stairs", - "textures": { - "side": "appliedenergistics2:blocks/SkyStoneBlock.BRICK", - "top": "appliedenergistics2:blocks/SkyStoneBlock.BRICK", - "bottom": "appliedenergistics2:blocks/SkyStoneBlock.BRICK" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone.brick.small.inner.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone.brick.small.inner.json deleted file mode 100644 index 03956170..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone.brick.small.inner.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/inner_stairs", - "textures": { - "side": "appliedenergistics2:blocks/SkyStoneBlock.SMALL_BRICK", - "top": "appliedenergistics2:blocks/SkyStoneBlock.SMALL_BRICK", - "bottom": "appliedenergistics2:blocks/SkyStoneBlock.SMALL_BRICK" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone.brick.small.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone.brick.small.json deleted file mode 100644 index 799f53d6..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone.brick.small.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/stairs", - "textures": { - "side": "appliedenergistics2:blocks/SkyStoneBlock.SMALL_BRICK", - "top": "appliedenergistics2:blocks/SkyStoneBlock.SMALL_BRICK", - "bottom": "appliedenergistics2:blocks/SkyStoneBlock.SMALL_BRICK" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone.brick.small.outer.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone.brick.small.outer.json deleted file mode 100644 index 5e9a19d9..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone.brick.small.outer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/outer_stairs", - "textures": { - "side": "appliedenergistics2:blocks/SkyStoneBlock.SMALL_BRICK", - "top": "appliedenergistics2:blocks/SkyStoneBlock.SMALL_BRICK", - "bottom": "appliedenergistics2:blocks/SkyStoneBlock.SMALL_BRICK" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone.stone.inner.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone.stone.inner.json deleted file mode 100644 index 7c0c4d26..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone.stone.inner.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/inner_stairs", - "textures": { - "side": "appliedenergistics2:blocks/SkyStoneBlock.STONE", - "top": "appliedenergistics2:blocks/SkyStoneBlock.STONE", - "bottom": "appliedenergistics2:blocks/SkyStoneBlock.STONE" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone.stone.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone.stone.json deleted file mode 100644 index 3cc77402..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone.stone.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/stairs", - "textures": { - "side": "appliedenergistics2:blocks/SkyStoneBlock.STONE", - "top": "appliedenergistics2:blocks/SkyStoneBlock.STONE", - "bottom": "appliedenergistics2:blocks/SkyStoneBlock.STONE" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone.stone.outer.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone.stone.outer.json deleted file mode 100644 index ed596c2d..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone.stone.outer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/outer_stairs", - "textures": { - "side": "appliedenergistics2:blocks/SkyStoneBlock.STONE", - "top": "appliedenergistics2:blocks/SkyStoneBlock.STONE", - "bottom": "appliedenergistics2:blocks/SkyStoneBlock.STONE" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_block.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_block.json new file mode 100644 index 00000000..3f1c2915 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_block.json @@ -0,0 +1,8 @@ +{ + "parent": "block/stairs", + "textures": { + "bottom": "appliedenergistics2:blocks/sky_stone_block_block", + "side": "appliedenergistics2:blocks/sky_stone_block_block", + "top": "appliedenergistics2:blocks/sky_stone_block_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_block_inner.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_block_inner.json new file mode 100644 index 00000000..334efbb5 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_block_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "block/inner_stairs", + "textures": { + "bottom": "appliedenergistics2:blocks/sky_stone_block_block", + "side": "appliedenergistics2:blocks/sky_stone_block_block", + "top": "appliedenergistics2:blocks/sky_stone_block_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_block_outer.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_block_outer.json new file mode 100644 index 00000000..7fe1e122 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_block_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "block/outer_stairs", + "textures": { + "bottom": "appliedenergistics2:blocks/sky_stone_block_block", + "side": "appliedenergistics2:blocks/sky_stone_block_block", + "top": "appliedenergistics2:blocks/sky_stone_block_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_brick.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_brick.json new file mode 100644 index 00000000..5ec48756 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_brick.json @@ -0,0 +1,8 @@ +{ + "parent": "block/stairs", + "textures": { + "bottom": "appliedenergistics2:blocks/sky_stone_block_brick", + "side": "appliedenergistics2:blocks/sky_stone_block_brick", + "top": "appliedenergistics2:blocks/sky_stone_block_brick" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_brick_inner.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_brick_inner.json new file mode 100644 index 00000000..1be61406 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_brick_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "block/inner_stairs", + "textures": { + "bottom": "appliedenergistics2:blocks/sky_stone_block_brick", + "side": "appliedenergistics2:blocks/sky_stone_block_brick", + "top": "appliedenergistics2:blocks/sky_stone_block_brick" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_brick_outer.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_brick_outer.json new file mode 100644 index 00000000..28a562a5 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_brick_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "block/outer_stairs", + "textures": { + "bottom": "appliedenergistics2:blocks/sky_stone_block_brick", + "side": "appliedenergistics2:blocks/sky_stone_block_brick", + "top": "appliedenergistics2:blocks/sky_stone_block_brick" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_brick_small.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_brick_small.json new file mode 100644 index 00000000..412ec16f --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_brick_small.json @@ -0,0 +1,8 @@ +{ + "parent": "block/stairs", + "textures": { + "bottom": "appliedenergistics2:blocks/sky_stone_block_small_brick", + "side": "appliedenergistics2:blocks/sky_stone_block_small_brick", + "top": "appliedenergistics2:blocks/sky_stone_block_small_brick" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_brick_small_inner.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_brick_small_inner.json new file mode 100644 index 00000000..8c283291 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_brick_small_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "block/inner_stairs", + "textures": { + "bottom": "appliedenergistics2:blocks/sky_stone_block_small_brick", + "side": "appliedenergistics2:blocks/sky_stone_block_small_brick", + "top": "appliedenergistics2:blocks/sky_stone_block_small_brick" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_brick_small_outer.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_brick_small_outer.json new file mode 100644 index 00000000..181c116e --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_brick_small_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "block/outer_stairs", + "textures": { + "bottom": "appliedenergistics2:blocks/sky_stone_block_small_brick", + "side": "appliedenergistics2:blocks/sky_stone_block_small_brick", + "top": "appliedenergistics2:blocks/sky_stone_block_small_brick" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_stone.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_stone.json new file mode 100644 index 00000000..88edfd66 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_stone.json @@ -0,0 +1,8 @@ +{ + "parent": "block/stairs", + "textures": { + "bottom": "appliedenergistics2:blocks/sky_stone_block_stone", + "side": "appliedenergistics2:blocks/sky_stone_block_stone", + "top": "appliedenergistics2:blocks/sky_stone_block_stone" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_stone_inner.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_stone_inner.json new file mode 100644 index 00000000..21d61520 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_stone_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "block/inner_stairs", + "textures": { + "bottom": "appliedenergistics2:blocks/sky_stone_block_stone", + "side": "appliedenergistics2:blocks/sky_stone_block_stone", + "top": "appliedenergistics2:blocks/sky_stone_block_stone" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_stone_outer.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_stone_outer.json new file mode 100644 index 00000000..9062bb3d --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_stone_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "block/outer_stairs", + "textures": { + "bottom": "appliedenergistics2:blocks/sky_stone_block_stone", + "side": "appliedenergistics2:blocks/sky_stone_block_stone", + "top": "appliedenergistics2:blocks/sky_stone_block_stone" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/test.json b/src/main/resources/assets/appliedenergistics2/models/block/test.json index 7c5577b1..5adc457c 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/test.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/test.json @@ -1,72 +1,353 @@ { "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "textures": { - }, "elements": [ { - "name": "Cube", - "from": [ 0.0, 0.0, 15.0 ], - "to": [ 16.0, 16.0, 16.0 ], "faces": { - "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 16.0 ] }, - "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 16.0 ] }, - "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 1.0 ] }, - "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 1.0 ] } - } + "down": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 16.0, + 1.0 + ] + }, + "east": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 1.0, + 16.0 + ] + }, + "north": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 16.0, + 16.0 + ] + }, + "south": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 16.0, + 16.0 + ] + }, + "up": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 16.0, + 1.0 + ] + }, + "west": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 1.0, + 16.0 + ] + } + }, + "from": [ + 0.0, + 0.0, + 15.0 + ], + "name": "Cube", + "to": [ + 16.0, + 16.0, + 16.0 + ] }, { - "name": "Cube", - "from": [ 0.0, 0.0, 0.0 ], - "to": [ 16.0, 6.0, 1.0 ], "faces": { - "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 6.0 ] }, - "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 6.0 ] }, - "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 6.0 ] }, - "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 6.0 ] }, - "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 1.0 ] }, - "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 1.0 ] } - } + "down": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 16.0, + 1.0 + ] + }, + "east": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 1.0, + 6.0 + ] + }, + "north": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 16.0, + 6.0 + ] + }, + "south": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 16.0, + 6.0 + ] + }, + "up": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 16.0, + 1.0 + ] + }, + "west": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 1.0, + 6.0 + ] + } + }, + "from": [ + 0.0, + 0.0, + 0.0 + ], + "name": "Cube", + "to": [ + 16.0, + 6.0, + 1.0 + ] }, { - "name": "Cube", - "from": [ 0.0, 6.0, 0.0 ], - "to": [ 1.0, 7.0, 15.0 ], "faces": { - "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 15.0, 1.0 ] }, - "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 15.0, 1.0 ] }, - "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 15.0 ] }, - "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 15.0 ] } - } + "down": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 1.0, + 15.0 + ] + }, + "east": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 15.0, + 1.0 + ] + }, + "north": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 1.0, + 1.0 + ] + }, + "south": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 1.0, + 1.0 + ] + }, + "up": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 1.0, + 15.0 + ] + }, + "west": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 15.0, + 1.0 + ] + } + }, + "from": [ + 0.0, + 6.0, + 0.0 + ], + "name": "Cube", + "to": [ + 1.0, + 7.0, + 15.0 + ] }, { - "name": "Cube", - "from": [ 15.0, 0.0, 0.0 ], - "to": [ 16.0, 5.0, 15.0 ], "faces": { - "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 5.0 ] }, - "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 15.0, 5.0 ] }, - "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 5.0 ] }, - "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 15.0, 5.0 ] }, - "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 15.0 ] }, - "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 15.0 ] } - } + "down": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 1.0, + 15.0 + ] + }, + "east": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 15.0, + 5.0 + ] + }, + "north": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 1.0, + 5.0 + ] + }, + "south": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 1.0, + 5.0 + ] + }, + "up": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 1.0, + 15.0 + ] + }, + "west": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 15.0, + 5.0 + ] + } + }, + "from": [ + 15.0, + 0.0, + 0.0 + ], + "name": "Cube", + "to": [ + 16.0, + 5.0, + 15.0 + ] }, { - "name": "Cube", - "from": [ 3.0, 15.0, 0.0 ], - "to": [ 13.0, 16.0, 15.0 ], "faces": { - "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 10.0, 1.0 ] }, - "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 15.0, 1.0 ] }, - "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 10.0, 1.0 ] }, - "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 15.0, 1.0 ] }, - "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 10.0, 15.0 ] }, - "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 10.0, 15.0 ] } - } + "down": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 10.0, + 15.0 + ] + }, + "east": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 15.0, + 1.0 + ] + }, + "north": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 10.0, + 1.0 + ] + }, + "south": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 10.0, + 1.0 + ] + }, + "up": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 10.0, + 15.0 + ] + }, + "west": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 15.0, + 1.0 + ] + } + }, + "from": [ + 3.0, + 15.0, + 0.0 + ], + "name": "Cube", + "to": [ + 13.0, + 16.0, + 15.0 + ] } - ] + ], + "textures": { + + } } \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockCellWorkBench.json b/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockCellWorkBench.json deleted file mode 100644 index 108d0a62..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockCellWorkBench.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/cube_bottom_top", - "textures": { - "side": "appliedenergistics2:blocks/BlockCellWorkBenchSide", - "bottom": "appliedenergistics2:blocks/BlockCellWorkBenchBottom", - "top": "appliedenergistics2:blocks/BlockCellWorkBench" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockCharger.json b/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockCharger.json deleted file mode 100644 index e9cb249b..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockCharger.json +++ /dev/null @@ -1,76 +0,0 @@ -{ - "parent": "block/orientable", - "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "textures": { - "0": "appliedenergistics2:blocks/BlockChargerSide", - "1": "appliedenergistics2:blocks/BlockCharger", - "2": "appliedenergistics2:blocks/BlockChargerInside" - }, - "elements": [ - { - "name": "Back", - "from": [ 6.0, 0.0, 15.0 ], - "to": [ 10.0, 16.0, 16.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 16.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 16.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 16.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 16.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 1.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 1.0 ] } - } - }, - { - "name": "Bottom", - "from": [ 2.0, 0.0, 2.0 ], - "to": [ 14.0, 2.0, 15.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 12.0, 2.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 13.0, 2.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 12.0, 2.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 13.0, 2.0 ] }, - "up": { "texture": "#0", "uv": [ 2.0, 2.0, 14.0, 15.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 12.0, 13.0 ] } - } - }, - { - "name": "Top", - "from": [ 2.0, 13.0, 2.0 ], - "to": [ 14.0, 16.0, 15.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 12.0, 3.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 13.0, 3.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 12.0, 3.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 13.0, 3.0 ] }, - "up": { "texture": "#1", "uv": [ 2.0, 2.0, 14.0, 15.0 ] }, - "down": { "texture": "#0", "uv": [ 2.0, 1.0, 14.0, 14.0 ] } - } - }, - { - "name": "BottomTop", - "from": [ 3.0, 2.0, 3.0 ], - "to": [ 13.0, 3.0, 13.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 10.0, 1.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 10.0, 1.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 10.0, 1.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 10.0, 1.0 ] }, - "up": { "texture": "#2", "uv": [ 3.0, 3.0, 13.0, 13.0 ] }, - "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 10.0, 10.0 ] } - } - }, - { - "name": "TopTop", - "from": [ 3.0, 12.0, 3.0 ], - "to": [ 13.0, 13.0, 13.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 10.0, 1.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 10.0, 1.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 10.0, 1.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 10.0, 1.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 10.0, 10.0 ] }, - "down": { "texture": "#2", "uv": [ 3.0, 3.0, 13.0, 13.0 ] } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockCondenser.json b/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockCondenser.json deleted file mode 100644 index 8d3df6cd..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockCondenser.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "appliedenergistics2:blocks/BlockCondenser" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockDrive.json b/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockDrive.json deleted file mode 100644 index 98c8d53b..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockDrive.json +++ /dev/null @@ -1,140 +0,0 @@ -{ - "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "textures": { - "0": "blocks/BlockDriveSide", - "1": "blocks/BlockDriveFront", - "2": "blocks/BlockDrive" - }, - "elements": [ - { - "name": "Bottom", - "from": [ 1.0, 0.0, 0.0 ], - "to": [ 15.0, 1.0, 16.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 1.0, 15.0, 15.0, 16.0 ] }, - "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 1.0 ] }, - "south": { "texture": "#1", "uv": [ 1.0, 15.0, 15.0, 16.0 ] }, - "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 1.0 ] }, - "up": { "texture": "#2", "uv": [ 1.0, 0.0, 15.0, 16.0 ] }, - "down": { "texture": "#2", "uv": [ 1.0, 0.0, 15.0, 16.0 ] } - } - }, - { - "name": "Left", - "from": [ 0.0, 0.0, 0.0 ], - "to": [ 1.0, 16.0, 16.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 15.0, 0.0, 16.0, 16.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "south": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 16.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "up": { "texture": "#2", "uv": [ 0.0, 0.0, 1.0, 16.0 ] }, - "down": { "texture": "#2", "uv": [ 0.0, 0.0, 1.0, 16.0 ] } - } - }, - { - "name": "Top", - "from": [ 1.0, 15.0, 0.0 ], - "to": [ 15.0, 16.0, 16.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 14.0, 1.0 ] }, - "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 1.0 ] }, - "south": { "texture": "#1", "uv": [ 1.0, 0.0, 15.0, 1.0 ] }, - "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 1.0 ] }, - "up": { "texture": "#2", "uv": [ 1.0, 0.0, 15.0, 16.0 ] }, - "down": { "texture": "#2", "uv": [ 1.0, 0.0, 15.0, 16.0 ] } - } - }, - { - "name": "Right", - "from": [ 15.0, 0.0, 0.0 ], - "to": [ 16.0, 16.0, 16.0 ], - "faces": { - "north": { "texture": "#2", "uv": [ 0.0, 0.0, 1.0, 16.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "south": { "texture": "#1", "uv": [ 15.0, 0.0, 16.0, 16.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "up": { "texture": "#2", "uv": [ 15.0, 0.0, 16.0, 16.0 ] }, - "down": { "texture": "#2", "uv": [ 15.0, 0.0, 16.0, 16.0 ] } - } - }, - { - "name": "Rack", - "from": [ 1.0, 3.0, 1.0 ], - "to": [ 15.0, 4.0, 15.0 ], - "faces": { - "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 14.0, 1.0 ] }, - "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 14.0, 1.0 ] }, - "south": { "texture": "#1", "uv": [ 1.0, 12.0, 15.0, 13.0 ] }, - "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 14.0, 1.0 ] }, - "up": { "texture": "#2", "uv": [ 1.0, 1.0, 15.0, 15.0 ] }, - "down": { "texture": "#2", "uv": [ 1.0, 1.0, 15.0, 15.0 ] } - } - }, - { - "name": "Rack 2", - "from": [ 1.0, 6.0, 1.0 ], - "to": [ 15.0, 7.0, 15.0 ], - "faces": { - "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 14.0, 1.0 ] }, - "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 14.0, 1.0 ] }, - "south": { "texture": "#1", "uv": [ 1.0, 9.0, 15.0, 10.0 ] }, - "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 14.0, 1.0 ] }, - "up": { "texture": "#2", "uv": [ 1.0, 1.0, 15.0, 15.0 ] }, - "down": { "texture": "#2", "uv": [ 1.0, 1.0, 15.0, 15.0 ] } - } - }, - { - "name": "Rack 3", - "from": [ 1.0, 9.0, 1.0 ], - "to": [ 15.0, 10.0, 15.0 ], - "faces": { - "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 14.0, 1.0 ] }, - "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 14.0, 1.0 ] }, - "south": { "texture": "#1", "uv": [ 1.0, 6.0, 15.0, 7.0 ] }, - "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 14.0, 1.0 ] }, - "up": { "texture": "#2", "uv": [ 1.0, 1.0, 15.0, 15.0 ] }, - "down": { "texture": "#2", "uv": [ 1.0, 1.0, 15.0, 15.0 ] } - } - }, - { - "name": "Rack4", - "from": [ 1.0, 12.0, 1.0 ], - "to": [ 15.0, 13.0, 15.0 ], - "faces": { - "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 14.0, 1.0 ] }, - "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 14.0, 1.0 ] }, - "south": { "texture": "#1", "uv": [ 1.0, 3.0, 15.0, 4.0 ] }, - "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 14.0, 1.0 ] }, - "up": { "texture": "#2", "uv": [ 1.0, 1.0, 15.0, 15.0 ] }, - "down": { "texture": "#2", "uv": [ 1.0, 1.0, 15.0, 15.0 ] } - } - }, - { - "name": "Back", - "from": [ 1.0, 1.0, 0.0 ], - "to": [ 15.0, 15.0, 7.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 1.0, 1.0, 15.0, 15.0 ] }, - "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 7.0, 14.0 ] }, - "south": { "texture": "#1", "uv": [ 1.0, 1.0, 15.0, 15.0 ] }, - "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 7.0, 14.0 ] }, - "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 14.0, 7.0 ] }, - "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 14.0, 7.0 ] } - } - }, - { - "name": "Cube", - "from": [ 7.0, 1.0, 7.0 ], - "to": [ 9.0, 15.0, 16.0 ], - "faces": { - "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 2.0, 14.0 ] }, - "east": { "texture": "#0", "uv": [ 1.0, 1.0, 10.0, 15.0 ] }, - "south": { "texture": "#1", "uv": [ 7.0, 1.0, 9.0, 15.0 ] }, - "west": { "texture": "#0", "uv": [ 1.0, 1.0, 10.0, 15.0 ] }, - "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 2.0, 9.0 ] }, - "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 2.0, 9.0 ] } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockEnergyAcceptor.json b/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockEnergyAcceptor.json deleted file mode 100644 index 484e6793..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockEnergyAcceptor.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "appliedenergistics2:blocks/BlockEnergyAcceptor" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockGrinder.json b/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockGrinder.json deleted file mode 100644 index 6c150a80..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockGrinder.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "appliedenergistics2:block/cube/cube_AE_machine", - "ambientocclusion": false, - "textures": { - "top": "appliedenergistics2:blocks/BlockGrinder", - "bottom": "appliedenergistics2:blocks/BlockGrinderBottom", - "front": "appliedenergistics2:blocks/BlockGrinderFront", - "side": "appliedenergistics2:blocks/BlockGrinderSide" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockIOPort.json b/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockIOPort.json deleted file mode 100644 index 25ea2382..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockIOPort.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/cube_bottom_top", - "textures": { - "side": "appliedenergistics2:blocks/BlockIOPortSide", - "bottom": "appliedenergistics2:blocks/BlockIOPortBottom", - "top": "appliedenergistics2:blocks/BlockIOPort" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockInscriber.json b/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockInscriber.json deleted file mode 100644 index 24bf42ba..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockInscriber.json +++ /dev/null @@ -1,100 +0,0 @@ -{ - "parent": "block/orientable", - "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "textures": { - "0": "appliedenergistics2:blocks/BlockInscriber" - }, - "elements": [ - { - "name": "Left", - "from": [ 0.0, 1.0, 0.0 ], - "to": [ 3.0, 15.0, 16.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 3.0, 14.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 14.0 ] }, - "south": { "texture": "#0", "uv": [ 13.0, 0.0, 16.0, 14.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 14.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 3.0, 16.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 3.0, 16.0 ] } - } - }, - { - "name": "Bottom", - "from": [ 1.0, 0.0, 1.0 ], - "to": [ 15.0, 1.0, 15.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 1.0, 15.0, 15.0, 16.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 14.0, 1.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 14.0, 1.0 ] }, - "west": { "texture": "#0", "uv": [ 1.0, 0.0, 15.0, 1.0 ] }, - "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 14.0, 14.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 14.0, 14.0 ] } - } - }, - { - "name": "Right", - "from": [ 13.0, 1.0, 0.0 ], - "to": [ 16.0, 15.0, 16.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 13.0, 0.0, 16.0, 14.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 14.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 3.0, 14.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 14.0 ] }, - "up": { "texture": "#0", "uv": [ 13.0, 0.0, 16.0, 16.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 3.0, 16.0 ] } - } - }, - { - "name": "Top", - "from": [ 1.0, 15.0, 1.0 ], - "to": [ 15.0, 16.0, 15.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 1.0, 15.0, 15.0, 16.0 ] }, - "east": { "texture": "#0", "uv": [ 1.0, 0.0, 15.0, 1.0 ] }, - "south": { "texture": "#0", "uv": [ 1.0, 0.0, 15.0, 1.0 ] }, - "west": { "texture": "#0", "uv": [ 1.0, 15.0, 15.0, 16.0 ] }, - "up": { "texture": "#0", "uv": [ 1.0, 1.0, 15.0, 15.0 ] }, - "down": { "texture": "#-1", "uv": [ 1.0, 1.0, 15.0, 15.0 ] } - } - }, - { - "name": "BottomFill", - "from": [ 3.0, 1.0, 1.0 ], - "to": [ 13.0, 4.0, 13.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 3.0, 12.0, 13.0, 15.0 ] }, - "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 12.0, 3.0 ] }, - "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 10.0, 3.0 ] }, - "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 12.0, 3.0 ] }, - "up": { "texture": "#0", "uv": [ 3.0, 1.0, 13.0, 13.0 ] }, - "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 10.0, 12.0 ] } - } - }, - { - "name": "TopFill", - "from": [ 3.0, 12.0, 1.0 ], - "to": [ 13.0, 15.0, 11.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 3.0, 1.0, 13.0, 4.0 ] }, - "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 10.0, 3.0 ] }, - "south": { "texture": "#0", "uv": [ 3.0, 1.0, 13.0, 4.0 ] }, - "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 10.0, 3.0 ] }, - "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 10.0, 10.0 ] }, - "down": { "texture": "#0", "uv": [ 3.0, 1.0, 13.0, 11.0 ] } - } - }, - { - "name": "Back", - "from": [ 3.0, 1.0, 13.0 ], - "to": [ 13.0, 15.0, 16.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 3.0, 1.0, 13.0, 15.0 ] }, - "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 3.0, 14.0 ] }, - "south": { "texture": "#0", "uv": [ 3.0, 0.0, 13.0, 14.0 ] }, - "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 3.0, 14.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 10.0, 3.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 10.0, 3.0 ] } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockQuartzGrowthAccelerator.off.json b/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockQuartzGrowthAccelerator.off.json deleted file mode 100644 index de3d38e0..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockQuartzGrowthAccelerator.off.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/cube_bottom_top", - "textures": { - "side": "appliedenergistics2:blocks/BlockQuartzGrowthAcceleratorSide", - "bottom": "appliedenergistics2:blocks/BlockQuartzGrowthAccelerator", - "top": "appliedenergistics2:blocks/BlockQuartzGrowthAccelerator" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockQuartzGrowthAccelerator.on.json b/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockQuartzGrowthAccelerator.on.json deleted file mode 100644 index 87fabfcd..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockQuartzGrowthAccelerator.on.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/cube_bottom_top", - "textures": { - "side": "appliedenergistics2:blocks/BlockQuartzGrowthAcceleratorSideOn", - "bottom": "appliedenergistics2:blocks/BlockQuartzGrowthAcceleratorOn", - "top": "appliedenergistics2:blocks/BlockQuartzGrowthAcceleratorOn" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockSecurity.json b/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockSecurity.json deleted file mode 100644 index 12cdb25e..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockSecurity.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/cube_bottom_top", - "textures": { - "side": "appliedenergistics2:blocks/BlockSecuritySide", - "bottom": "appliedenergistics2:blocks/BlockSecurityBottom", - "top": "appliedenergistics2:blocks/BlockSecurity" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockSpatialIOPort.json b/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockSpatialIOPort.json deleted file mode 100644 index 3213acca..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockSpatialIOPort.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/cube_bottom_top", - "textures": { - "side": "appliedenergistics2:blocks/BlockSpatialIOPortSide", - "bottom": "appliedenergistics2:blocks/BlockSpatialIOPortBottom", - "top": "appliedenergistics2:blocks/BlockSpatialIOPort" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockVibrationChamber.off.json b/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockVibrationChamber.off.json deleted file mode 100644 index 7901c0b8..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockVibrationChamber.off.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "parent": "appliedenergistics2:block/cube/cube_AE_machine", - "textures": { - "front": "appliedenergistics2:blocks/BlockVibrationChamberFront", - "side": "appliedenergistics2:blocks/BlockVibrationChamber", - "top": "appliedenergistics2:blocks/BlockVibrationChamber", - "bottom": "appliedenergistics2:blocks/BlockVibrationChamber" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockVibrationChamber.on.json b/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockVibrationChamber.on.json deleted file mode 100644 index 4c1e3776..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockVibrationChamber.on.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "appliedenergistics2:block/tile.BlockVibrationChamber.off", - "textures": { - "front": "appliedenergistics2:blocks/BlockVibrationChamberFrontOn" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockWireless.json b/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockWireless.json deleted file mode 100644 index c9b12d08..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockWireless.json +++ /dev/null @@ -1,152 +0,0 @@ -{ - "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "textures": { - "0": "appliedenergistics2:blocks/BlockWirelessInside", - "1": "appliedenergistics2:blocks/BlockWireless" - }, - "elements": [ - { - "name": "Base", - "from": [ 4.0, 0.0, 4.0 ], - "to": [ 12.0, 2.0, 12.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 4.0, 14.0, 12.0, 16.0 ] }, - "east": { "texture": "#0", "uv": [ 4.0, 0.0, 12.0, 2.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 8.0, 2.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 8.0, 2.0 ] }, - "up": { "texture": "#0", "uv": [ 4.0, 4.0, 12.0, 12.0 ] }, - "down": { "texture": "#0", "uv": [ 4.0, 4.0, 12.0, 12.0 ] } - } - }, - { - "name": "Front_B", - "from": [ 5.0, 2.0, 3.0 ], - "to": [ 11.0, 4.0, 5.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 6.0, 2.0 ] }, - "east": { "texture": "#0", "uv": [ 15.0, 7.0, 13.0, 5.0 ] }, - "south": { "texture": "#0", "uv": [ 11.0, 3.0, 5.0, 5.0 ] }, - "west": { "texture": "#0", "uv": [ 13.0, 3.0, 15.0, 5.0 ] }, - "up": { "texture": "#0", "uv": [ 5.0, 13.0, 11.0, 15.0 ] }, - "down": { "texture": "#0", "uv": [ 5.0, 1.0, 11.0, 3.0 ] } - } - }, - { - "name": "Back_B", - "from": [ 5.0, 2.0, 11.0 ], - "to": [ 11.0, 4.0, 13.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 10.0, 0.0, 16.0, 2.0 ] }, - "east": { "texture": "#0", "uv": [ 13.0, 4.0, 15.0, 6.0 ] }, - "south": { "texture": "#0", "uv": [ 11.0, 11.0, 5.0, 13.0 ] }, - "west": { "texture": "#0", "uv": [ 1.0, 4.0, 3.0, 6.0 ] }, - "up": { "texture": "#0", "uv": [ 5.0, 1.0, 11.0, 3.0 ] }, - "down": { "texture": "#0", "uv": [ 5.0, 13.0, 11.0, 15.0 ] } - } - }, - { - "name": "Left_B", - "from": [ 11.0, 2.0, 5.0 ], - "to": [ 13.0, 4.0, 11.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 13.0, 4.0, 15.0, 6.0 ] }, - "east": { "texture": "#0", "uv": [ 5.0, 11.0, 11.0, 13.0 ] }, - "south": { "texture": "#0", "uv": [ 1.0, 6.0, 3.0, 8.0 ] }, - "west": { "texture": "#0", "uv": [ 5.0, 3.0, 11.0, 5.0 ] }, - "up": { "texture": "#0", "uv": [ 1.0, 5.0, 3.0, 11.0 ] }, - "down": { "texture": "#0", "uv": [ 1.0, 5.0, 3.0, 11.0 ] } - } - }, - { - "name": "Right_B", - "from": [ 3.0, 2.0, 5.0 ], - "to": [ 5.0, 4.0, 11.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 1.0, 4.0, 3.0, 6.0 ] }, - "east": { "texture": "#0", "uv": [ 5.0, 11.0, 11.0, 13.0 ] }, - "south": { "texture": "#0", "uv": [ 13.0, 6.0, 15.0, 8.0 ] }, - "west": { "texture": "#0", "uv": [ 5.0, 3.0, 11.0, 5.0 ] }, - "up": { "texture": "#0", "uv": [ 13.0, 5.0, 15.0, 11.0 ] }, - "down": { "texture": "#0", "uv": [ 13.0, 5.0, 15.0, 11.0 ] } - } - }, - { - "name": "Front_S", - "from": [ 7.0, 3.0, 2.0 ], - "to": [ 9.0, 8.0, 3.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 5.0, 2.0, 10.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 5.0, 1.0, 10.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 5.0, 2.0, 10.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 5.0, 1.0, 10.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 2.0, 1.0 ] } - } - }, - { - "name": "Back_S", - "from": [ 7.0, 3.0, 13.0 ], - "to": [ 9.0, 8.0, 14.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 14.0, 2.0, 16.0, 7.0 ] }, - "east": { "texture": "#0", "uv": [ 14.0, 2.0, 15.0, 7.0 ] }, - "south": { "texture": "#0", "uv": [ 14.0, 2.0, 16.0, 7.0 ] }, - "west": { "texture": "#0", "uv": [ 15.0, 2.0, 16.0, 7.0 ] }, - "up": { "texture": "#0", "uv": [ 14.0, 0.0, 16.0, 1.0 ] }, - "down": { "texture": "#0", "uv": [ 14.0, 1.0, 16.0, 2.0 ] } - } - }, - { - "name": "Left_S", - "from": [ 2.0, 3.0, 7.0 ], - "to": [ 3.0, 8.0, 9.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 12.0, 3.0, 13.0, 8.0 ] }, - "east": { "texture": "#0", "uv": [ 11.0, 3.0, 13.0, 8.0 ] }, - "south": { "texture": "#0", "uv": [ 13.0, 3.0, 11.0, 8.0 ] }, - "west": { "texture": "#0", "uv": [ 11.0, 3.0, 13.0, 8.0 ] }, - "up": { "texture": "#0", "uv": [ 12.0, 3.0, 13.0, 5.0 ] }, - "down": { "texture": "#0", "uv": [ 11.0, 3.0, 12.0, 5.0 ] } - } - }, - { - "name": "Right_S", - "from": [ 13.0, 3.0, 7.0 ], - "to": [ 14.0, 8.0, 9.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 5.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 2.0, 5.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 5.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 2.0, 5.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 2.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 2.0 ] } - } - }, - { - "name": "Torch_B", - "from": [ 7.0, 2.0, 7.0 ], - "to": [ 9.0, 8.0, 9.0 ], - "faces": { - "north": { "texture": "#1", "uv": [ 7.0, 9.0, 9.0, 15.0 ] }, - "east": { "texture": "#1", "uv": [ 7.0, 9.0, 9.0, 15.0 ] }, - "south": { "texture": "#1", "uv": [ 7.0, 9.0, 9.0, 15.0 ] }, - "west": { "texture": "#1", "uv": [ 7.0, 9.0, 9.0, 15.0 ] }, - "up": { "texture": "#1", "uv": [ 7.0, 9.0, 9.0, 11.0 ] }, - "down": { "texture": "#1", "uv": [ 7.0, 9.0, 9.0, 11.0 ] } - } - }, - { - "name": "Torch_Off", - "from": [ 7.0, 8.0, 7.0 ], - "to": [ 9.0, 10.0, 9.0 ], - "faces": { - "north": { "texture": "#1", "uv": [ 7.0, 7.0, 9.0, 9.0 ] }, - "east": { "texture": "#1", "uv": [ 7.0, 7.0, 9.0, 9.0 ] }, - "south": { "texture": "#1", "uv": [ 7.0, 7.0, 9.0, 9.0 ] }, - "west": { "texture": "#1", "uv": [ 7.0, 7.0, 9.0, 9.0 ] }, - "up": { "texture": "#1", "uv": [ 7.0, 7.0, 9.0, 9.0 ] }, - "down": { "texture": "#1", "uv": [ 7.0, 7.0, 9.0, 9.0 ] } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/tiny_tnt.json b/src/main/resources/assets/appliedenergistics2/models/block/tiny_tnt.json new file mode 100644 index 00000000..0049a541 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/tiny_tnt.json @@ -0,0 +1,80 @@ +{ + "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", + "elements": [ + { + "faces": { + "down": { + "texture": "#2", + "uv": [ + 0.0, + 0.0, + 16.0, + 16.0 + ] + }, + "east": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 16.0, + 16.0 + ] + }, + "north": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 16.0, + 16.0 + ] + }, + "south": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 16.0, + 16.0 + ] + }, + "up": { + "texture": "#1", + "uv": [ + 0.0, + 0.0, + 16.0, + 16.0 + ] + }, + "west": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 16.0, + 16.0 + ] + } + }, + "from": [ + 4.0, + 0.0, + 4.0 + ], + "name": "Cube", + "to": [ + 12.0, + 8.0, + 12.0 + ] + } + ], + "parent": "block/block", + "textures": { + "0": "blocks/tnt_side", + "1": "blocks/tnt_top", + "2": "blocks/tnt_bottom" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/tnt.model b/src/main/resources/assets/appliedenergistics2/models/block/tnt.model deleted file mode 100644 index c2c0f035..00000000 Binary files a/src/main/resources/assets/appliedenergistics2/models/block/tnt.model and /dev/null differ diff --git a/src/main/resources/assets/appliedenergistics2/models/block/vibration_chamber_off.json b/src/main/resources/assets/appliedenergistics2/models/block/vibration_chamber_off.json new file mode 100644 index 00000000..6b2b0e1d --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/vibration_chamber_off.json @@ -0,0 +1,9 @@ +{ + "parent": "appliedenergistics2:block/cube/cube_ae_machine", + "textures": { + "bottom": "appliedenergistics2:blocks/vibration_chamber", + "front": "appliedenergistics2:blocks/vibration_chamber_front", + "side": "appliedenergistics2:blocks/vibration_chamber", + "top": "appliedenergistics2:blocks/vibration_chamber" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/vibration_chamber_on.json b/src/main/resources/assets/appliedenergistics2/models/block/vibration_chamber_on.json new file mode 100644 index 00000000..6947c5da --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/vibration_chamber_on.json @@ -0,0 +1,6 @@ +{ + "parent": "appliedenergistics2:block/vibration_chamber_off", + "textures": { + "front": "appliedenergistics2:blocks/vibration_chamber_front_on" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/wireless.json b/src/main/resources/assets/appliedenergistics2/models/block/wireless.json new file mode 100644 index 00000000..e6c03365 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/wireless.json @@ -0,0 +1,768 @@ +{ + "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", + "elements": [ + { + "faces": { + "down": { + "texture": "#0", + "uv": [ + 4.0, + 4.0, + 12.0, + 12.0 + ] + }, + "east": { + "texture": "#0", + "uv": [ + 4.0, + 0.0, + 12.0, + 2.0 + ] + }, + "north": { + "texture": "#0", + "uv": [ + 4.0, + 14.0, + 12.0, + 16.0 + ] + }, + "south": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 8.0, + 2.0 + ] + }, + "up": { + "texture": "#0", + "uv": [ + 4.0, + 4.0, + 12.0, + 12.0 + ] + }, + "west": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 8.0, + 2.0 + ] + } + }, + "from": [ + 4.0, + 0.0, + 4.0 + ], + "name": "Base", + "to": [ + 12.0, + 2.0, + 12.0 + ] + }, + { + "faces": { + "down": { + "texture": "#0", + "uv": [ + 5.0, + 1.0, + 11.0, + 3.0 + ] + }, + "east": { + "texture": "#0", + "uv": [ + 15.0, + 7.0, + 13.0, + 5.0 + ] + }, + "north": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 6.0, + 2.0 + ] + }, + "south": { + "texture": "#0", + "uv": [ + 11.0, + 3.0, + 5.0, + 5.0 + ] + }, + "up": { + "texture": "#0", + "uv": [ + 5.0, + 13.0, + 11.0, + 15.0 + ] + }, + "west": { + "texture": "#0", + "uv": [ + 13.0, + 3.0, + 15.0, + 5.0 + ] + } + }, + "from": [ + 5.0, + 2.0, + 3.0 + ], + "name": "Front_B", + "to": [ + 11.0, + 4.0, + 5.0 + ] + }, + { + "faces": { + "down": { + "texture": "#0", + "uv": [ + 5.0, + 13.0, + 11.0, + 15.0 + ] + }, + "east": { + "texture": "#0", + "uv": [ + 13.0, + 4.0, + 15.0, + 6.0 + ] + }, + "north": { + "texture": "#0", + "uv": [ + 10.0, + 0.0, + 16.0, + 2.0 + ] + }, + "south": { + "texture": "#0", + "uv": [ + 11.0, + 11.0, + 5.0, + 13.0 + ] + }, + "up": { + "texture": "#0", + "uv": [ + 5.0, + 1.0, + 11.0, + 3.0 + ] + }, + "west": { + "texture": "#0", + "uv": [ + 1.0, + 4.0, + 3.0, + 6.0 + ] + } + }, + "from": [ + 5.0, + 2.0, + 11.0 + ], + "name": "Back_B", + "to": [ + 11.0, + 4.0, + 13.0 + ] + }, + { + "faces": { + "down": { + "texture": "#0", + "uv": [ + 1.0, + 5.0, + 3.0, + 11.0 + ] + }, + "east": { + "texture": "#0", + "uv": [ + 5.0, + 11.0, + 11.0, + 13.0 + ] + }, + "north": { + "texture": "#0", + "uv": [ + 13.0, + 4.0, + 15.0, + 6.0 + ] + }, + "south": { + "texture": "#0", + "uv": [ + 1.0, + 6.0, + 3.0, + 8.0 + ] + }, + "up": { + "texture": "#0", + "uv": [ + 1.0, + 5.0, + 3.0, + 11.0 + ] + }, + "west": { + "texture": "#0", + "uv": [ + 5.0, + 3.0, + 11.0, + 5.0 + ] + } + }, + "from": [ + 11.0, + 2.0, + 5.0 + ], + "name": "Left_B", + "to": [ + 13.0, + 4.0, + 11.0 + ] + }, + { + "faces": { + "down": { + "texture": "#0", + "uv": [ + 13.0, + 5.0, + 15.0, + 11.0 + ] + }, + "east": { + "texture": "#0", + "uv": [ + 5.0, + 11.0, + 11.0, + 13.0 + ] + }, + "north": { + "texture": "#0", + "uv": [ + 1.0, + 4.0, + 3.0, + 6.0 + ] + }, + "south": { + "texture": "#0", + "uv": [ + 13.0, + 6.0, + 15.0, + 8.0 + ] + }, + "up": { + "texture": "#0", + "uv": [ + 13.0, + 5.0, + 15.0, + 11.0 + ] + }, + "west": { + "texture": "#0", + "uv": [ + 5.0, + 3.0, + 11.0, + 5.0 + ] + } + }, + "from": [ + 3.0, + 2.0, + 5.0 + ], + "name": "Right_B", + "to": [ + 5.0, + 4.0, + 11.0 + ] + }, + { + "faces": { + "down": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 2.0, + 1.0 + ] + }, + "east": { + "texture": "#0", + "uv": [ + 0.0, + 5.0, + 1.0, + 10.0 + ] + }, + "north": { + "texture": "#0", + "uv": [ + 0.0, + 5.0, + 2.0, + 10.0 + ] + }, + "south": { + "texture": "#0", + "uv": [ + 0.0, + 5.0, + 2.0, + 10.0 + ] + }, + "up": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 2.0, + 1.0 + ] + }, + "west": { + "texture": "#0", + "uv": [ + 0.0, + 5.0, + 1.0, + 10.0 + ] + } + }, + "from": [ + 7.0, + 3.0, + 2.0 + ], + "name": "Front_S", + "to": [ + 9.0, + 8.0, + 3.0 + ] + }, + { + "faces": { + "down": { + "texture": "#0", + "uv": [ + 14.0, + 1.0, + 16.0, + 2.0 + ] + }, + "east": { + "texture": "#0", + "uv": [ + 14.0, + 2.0, + 15.0, + 7.0 + ] + }, + "north": { + "texture": "#0", + "uv": [ + 14.0, + 2.0, + 16.0, + 7.0 + ] + }, + "south": { + "texture": "#0", + "uv": [ + 14.0, + 2.0, + 16.0, + 7.0 + ] + }, + "up": { + "texture": "#0", + "uv": [ + 14.0, + 0.0, + 16.0, + 1.0 + ] + }, + "west": { + "texture": "#0", + "uv": [ + 15.0, + 2.0, + 16.0, + 7.0 + ] + } + }, + "from": [ + 7.0, + 3.0, + 13.0 + ], + "name": "Back_S", + "to": [ + 9.0, + 8.0, + 14.0 + ] + }, + { + "faces": { + "down": { + "texture": "#0", + "uv": [ + 11.0, + 3.0, + 12.0, + 5.0 + ] + }, + "east": { + "texture": "#0", + "uv": [ + 11.0, + 3.0, + 13.0, + 8.0 + ] + }, + "north": { + "texture": "#0", + "uv": [ + 12.0, + 3.0, + 13.0, + 8.0 + ] + }, + "south": { + "texture": "#0", + "uv": [ + 13.0, + 3.0, + 11.0, + 8.0 + ] + }, + "up": { + "texture": "#0", + "uv": [ + 12.0, + 3.0, + 13.0, + 5.0 + ] + }, + "west": { + "texture": "#0", + "uv": [ + 11.0, + 3.0, + 13.0, + 8.0 + ] + } + }, + "from": [ + 2.0, + 3.0, + 7.0 + ], + "name": "Left_S", + "to": [ + 3.0, + 8.0, + 9.0 + ] + }, + { + "faces": { + "down": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 1.0, + 2.0 + ] + }, + "east": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 2.0, + 5.0 + ] + }, + "north": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 1.0, + 5.0 + ] + }, + "south": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 1.0, + 5.0 + ] + }, + "up": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 1.0, + 2.0 + ] + }, + "west": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 2.0, + 5.0 + ] + } + }, + "from": [ + 13.0, + 3.0, + 7.0 + ], + "name": "Right_S", + "to": [ + 14.0, + 8.0, + 9.0 + ] + }, + { + "faces": { + "down": { + "texture": "#1", + "uv": [ + 7.0, + 9.0, + 9.0, + 11.0 + ] + }, + "east": { + "texture": "#1", + "uv": [ + 7.0, + 9.0, + 9.0, + 15.0 + ] + }, + "north": { + "texture": "#1", + "uv": [ + 7.0, + 9.0, + 9.0, + 15.0 + ] + }, + "south": { + "texture": "#1", + "uv": [ + 7.0, + 9.0, + 9.0, + 15.0 + ] + }, + "up": { + "texture": "#1", + "uv": [ + 7.0, + 9.0, + 9.0, + 11.0 + ] + }, + "west": { + "texture": "#1", + "uv": [ + 7.0, + 9.0, + 9.0, + 15.0 + ] + } + }, + "from": [ + 7.0, + 2.0, + 7.0 + ], + "name": "Torch_B", + "to": [ + 9.0, + 8.0, + 9.0 + ] + }, + { + "faces": { + "down": { + "texture": "#1", + "uv": [ + 7.0, + 7.0, + 9.0, + 9.0 + ] + }, + "east": { + "texture": "#1", + "uv": [ + 7.0, + 7.0, + 9.0, + 9.0 + ] + }, + "north": { + "texture": "#1", + "uv": [ + 7.0, + 7.0, + 9.0, + 9.0 + ] + }, + "south": { + "texture": "#1", + "uv": [ + 7.0, + 7.0, + 9.0, + 9.0 + ] + }, + "up": { + "texture": "#1", + "uv": [ + 7.0, + 7.0, + 9.0, + 9.0 + ] + }, + "west": { + "texture": "#1", + "uv": [ + 7.0, + 7.0, + 9.0, + 9.0 + ] + } + }, + "from": [ + 7.0, + 8.0, + 7.0 + ], + "name": "Torch_Off", + "to": [ + 9.0, + 10.0, + 9.0 + ] + } + ], + "textures": { + "0": "appliedenergistics2:blocks/wireless_inside", + "1": "appliedenergistics2:blocks/wireless" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/BlockTinyTNT.json b/src/main/resources/assets/appliedenergistics2/models/item/BlockTinyTNT.json deleted file mode 100644 index 9ced22fe..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/BlockTinyTNT.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "appliedenergistics2:BlockTinyTNT" -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/ItemBasicStorageCell.16k.json b/src/main/resources/assets/appliedenergistics2/models/item/ItemBasicStorageCell.16k.json deleted file mode 100644 index 8d7c46f5..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/ItemBasicStorageCell.16k.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"item/generated", - "textures": { - "layer0":"appliedenergistics2:items/ItemBasicStorageCell.16k" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/ItemBasicStorageCell.1k.json b/src/main/resources/assets/appliedenergistics2/models/item/ItemBasicStorageCell.1k.json deleted file mode 100644 index 8ad1a6ea..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/ItemBasicStorageCell.1k.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"item/generated", - "textures": { - "layer0":"appliedenergistics2:items/ItemBasicStorageCell.1k" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/ItemBasicStorageCell.4k.json b/src/main/resources/assets/appliedenergistics2/models/item/ItemBasicStorageCell.4k.json deleted file mode 100644 index 1de0e8b8..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/ItemBasicStorageCell.4k.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"item/generated", - "textures": { - "layer0":"appliedenergistics2:items/ItemBasicStorageCell.4k" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/ItemBasicStorageCell.64k.json b/src/main/resources/assets/appliedenergistics2/models/item/ItemBasicStorageCell.64k.json deleted file mode 100644 index a737ebc7..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/ItemBasicStorageCell.64k.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"item/generated", - "textures": { - "layer0":"appliedenergistics2:items/ItemBasicStorageCell.64k" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/ItemCreativeStorageCell.json b/src/main/resources/assets/appliedenergistics2/models/item/ItemCreativeStorageCell.json deleted file mode 100644 index 0646894e..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/ItemCreativeStorageCell.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"item/generated", - "textures": { - "layer0":"appliedenergistics2:items/ItemCreativeStorageCell" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/ItemCrystalSeed.Certus.json b/src/main/resources/assets/appliedenergistics2/models/item/ItemCrystalSeed.Certus.json deleted file mode 100644 index 9b160247..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/ItemCrystalSeed.Certus.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"item/generated", - "textures": { - "layer0":"appliedenergistics2:items/ItemCrystalSeed.Certus" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/ItemCrystalSeed.Certus2.json b/src/main/resources/assets/appliedenergistics2/models/item/ItemCrystalSeed.Certus2.json deleted file mode 100644 index 69f95da4..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/ItemCrystalSeed.Certus2.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"item/generated", - "textures": { - "layer0":"appliedenergistics2:items/ItemCrystalSeed.Certus2" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/ItemCrystalSeed.Certus3.json b/src/main/resources/assets/appliedenergistics2/models/item/ItemCrystalSeed.Certus3.json deleted file mode 100644 index 82b52049..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/ItemCrystalSeed.Certus3.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"item/generated", - "textures": { - "layer0":"appliedenergistics2:items/ItemCrystalSeed.Certus3" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/ItemCrystalSeed.Fluix.json b/src/main/resources/assets/appliedenergistics2/models/item/ItemCrystalSeed.Fluix.json deleted file mode 100644 index 0650c5d8..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/ItemCrystalSeed.Fluix.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"item/generated", - "textures": { - "layer0":"appliedenergistics2:items/ItemCrystalSeed.Fluix" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/ItemCrystalSeed.Fluix2.json b/src/main/resources/assets/appliedenergistics2/models/item/ItemCrystalSeed.Fluix2.json deleted file mode 100644 index c07e2265..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/ItemCrystalSeed.Fluix2.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"item/generated", - "textures": { - "layer0":"appliedenergistics2:items/ItemCrystalSeed.Fluix2" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/ItemCrystalSeed.Fluix3.json b/src/main/resources/assets/appliedenergistics2/models/item/ItemCrystalSeed.Fluix3.json deleted file mode 100644 index 1e26f8d1..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/ItemCrystalSeed.Fluix3.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"item/generated", - "textures": { - "layer0":"appliedenergistics2:items/ItemCrystalSeed.Fluix3" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/ItemCrystalSeed.Nether.json b/src/main/resources/assets/appliedenergistics2/models/item/ItemCrystalSeed.Nether.json deleted file mode 100644 index 99f1dd4d..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/ItemCrystalSeed.Nether.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"item/generated", - "textures": { - "layer0":"appliedenergistics2:items/ItemCrystalSeed.Nether" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/ItemCrystalSeed.Nether2.json b/src/main/resources/assets/appliedenergistics2/models/item/ItemCrystalSeed.Nether2.json deleted file mode 100644 index dc0f2266..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/ItemCrystalSeed.Nether2.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"item/generated", - "textures": { - "layer0":"appliedenergistics2:items/ItemCrystalSeed.Nether2" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/ItemCrystalSeed.Nether3.json b/src/main/resources/assets/appliedenergistics2/models/item/ItemCrystalSeed.Nether3.json deleted file mode 100644 index 69a5452d..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/ItemCrystalSeed.Nether3.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"item/generated", - "textures": { - "layer0":"appliedenergistics2:items/ItemCrystalSeed.Nether3" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/ItemEncodedPattern.json b/src/main/resources/assets/appliedenergistics2/models/item/ItemEncodedPattern.json deleted file mode 100644 index 93185dbc..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/ItemEncodedPattern.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"item/generated", - "textures": { - "layer0":"appliedenergistics2:items/ItemEncodedPattern" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.AdvCard.json b/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.AdvCard.json deleted file mode 100644 index 67a02113..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.AdvCard.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"item/generated", - "textures": { - "layer0":"appliedenergistics2:items/ItemMaterial.AdvCard" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.AnnihilationCore.json b/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.AnnihilationCore.json deleted file mode 100644 index e698b270..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.AnnihilationCore.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"item/generated", - "textures": { - "layer0":"appliedenergistics2:items/ItemMaterial.AnnihilationCore" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.BasicCard.json b/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.BasicCard.json deleted file mode 100644 index 2c773fbf..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.BasicCard.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"item/generated", - "textures": { - "layer0":"appliedenergistics2:items/ItemMaterial.BasicCard" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.BlankPattern.json b/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.BlankPattern.json deleted file mode 100644 index 873614e0..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.BlankPattern.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"item/generated", - "textures": { - "layer0":"appliedenergistics2:items/ItemMaterial.BlankPattern" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.CalcProcessor.json b/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.CalcProcessor.json deleted file mode 100644 index 4bf92f01..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.CalcProcessor.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"item/generated", - "textures": { - "layer0":"appliedenergistics2:items/ItemMaterial.CalcProcessor" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.CalcProcessorPress.json b/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.CalcProcessorPress.json deleted file mode 100644 index 7d8da15b..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.CalcProcessorPress.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"item/generated", - "textures": { - "layer0":"appliedenergistics2:items/ItemMaterial.CalcProcessorPress" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.CalcProcessorPrint.json b/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.CalcProcessorPrint.json deleted file mode 100644 index d5677249..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.CalcProcessorPrint.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"item/generated", - "textures": { - "layer0":"appliedenergistics2:items/ItemMaterial.CalcProcessorPrint" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.CardCapacity.json b/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.CardCapacity.json deleted file mode 100644 index 626cdaba..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.CardCapacity.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"item/generated", - "textures": { - "layer0":"appliedenergistics2:items/ItemMaterial.CardCapacity" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.CardCrafting.json b/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.CardCrafting.json deleted file mode 100644 index ceb5bdee..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.CardCrafting.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"item/generated", - "textures": { - "layer0":"appliedenergistics2:items/ItemMaterial.CardCrafting" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.CardFuzzy.json b/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.CardFuzzy.json deleted file mode 100644 index c7cca527..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.CardFuzzy.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"item/generated", - "textures": { - "layer0":"appliedenergistics2:items/ItemMaterial.CardFuzzy" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.CardInverter.json b/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.CardInverter.json deleted file mode 100644 index 6c854d12..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.CardInverter.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"item/generated", - "textures": { - "layer0":"appliedenergistics2:items/ItemMaterial.CardInverter" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.CardRedstone.json b/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.CardRedstone.json deleted file mode 100644 index 5fd01f86..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.CardRedstone.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"item/generated", - "textures": { - "layer0":"appliedenergistics2:items/ItemMaterial.CardRedstone" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.CardSpeed.json b/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.CardSpeed.json deleted file mode 100644 index ee0cbfd7..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.CardSpeed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"item/generated", - "textures": { - "layer0":"appliedenergistics2:items/ItemMaterial.CardSpeed" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.Cell128SpatialPart.json b/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.Cell128SpatialPart.json deleted file mode 100644 index 38ecc0d5..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.Cell128SpatialPart.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"item/generated", - "textures": { - "layer0":"appliedenergistics2:items/ItemMaterial.Cell128SpatialPart" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.Cell16SpatialPart.json b/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.Cell16SpatialPart.json deleted file mode 100644 index 76b93235..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.Cell16SpatialPart.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"item/generated", - "textures": { - "layer0":"appliedenergistics2:items/ItemMaterial.Cell16SpatialPart" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.Cell16kPart.json b/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.Cell16kPart.json deleted file mode 100644 index 4c296316..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.Cell16kPart.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"item/generated", - "textures": { - "layer0":"appliedenergistics2:items/ItemMaterial.Cell16kPart" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.Cell1kPart.json b/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.Cell1kPart.json deleted file mode 100644 index 8b972741..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.Cell1kPart.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"item/generated", - "textures": { - "layer0":"appliedenergistics2:items/ItemMaterial.Cell1kPart" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.Cell2SpatialPart.json b/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.Cell2SpatialPart.json deleted file mode 100644 index 8dd43ad4..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.Cell2SpatialPart.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"item/generated", - "textures": { - "layer0":"appliedenergistics2:items/ItemMaterial.Cell2SpatialPart" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.Cell4kPart.json b/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.Cell4kPart.json deleted file mode 100644 index c63e718a..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.Cell4kPart.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"item/generated", - "textures": { - "layer0":"appliedenergistics2:items/ItemMaterial.Cell4kPart" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.Cell64kPart.json b/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.Cell64kPart.json deleted file mode 100644 index 1251e60c..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.Cell64kPart.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"item/generated", - "textures": { - "layer0":"appliedenergistics2:items/ItemMaterial.Cell64kPart" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.CertusQuartzCrystal.json b/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.CertusQuartzCrystal.json deleted file mode 100644 index c5b689de..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.CertusQuartzCrystal.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"item/generated", - "textures": { - "layer0":"appliedenergistics2:items/ItemMaterial.CertusQuartzCrystal" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.CertusQuartzCrystalCharged.json b/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.CertusQuartzCrystalCharged.json deleted file mode 100644 index 9e15e1e3..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.CertusQuartzCrystalCharged.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"item/generated", - "textures": { - "layer0":"appliedenergistics2:items/ItemMaterial.CertusQuartzCrystalCharged" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.CertusQuartzDust.json b/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.CertusQuartzDust.json deleted file mode 100644 index f6fe8898..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.CertusQuartzDust.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"item/generated", - "textures": { - "layer0":"appliedenergistics2:items/ItemMaterial.CertusQuartzDust" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.EmptyStorageCell.json b/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.EmptyStorageCell.json deleted file mode 100644 index cc4ed52f..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.EmptyStorageCell.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"item/generated", - "textures": { - "layer0":"appliedenergistics2:items/ItemMaterial.EmptyStorageCell" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.EnderDust.json b/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.EnderDust.json deleted file mode 100644 index 9ca62312..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.EnderDust.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"item/generated", - "textures": { - "layer0":"appliedenergistics2:items/ItemMaterial.EnderDust" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.EngProcessor.json b/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.EngProcessor.json deleted file mode 100644 index 99507aba..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.EngProcessor.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"item/generated", - "textures": { - "layer0":"appliedenergistics2:items/ItemMaterial.EngProcessor" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.EngProcessorPress.json b/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.EngProcessorPress.json deleted file mode 100644 index c0360cf7..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.EngProcessorPress.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"item/generated", - "textures": { - "layer0":"appliedenergistics2:items/ItemMaterial.EngProcessorPress" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.EngProcessorPrint.json b/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.EngProcessorPrint.json deleted file mode 100644 index 06264cb3..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.EngProcessorPrint.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"item/generated", - "textures": { - "layer0":"appliedenergistics2:items/ItemMaterial.EngProcessorPrint" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.Flour.json b/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.Flour.json deleted file mode 100644 index 96075e9b..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.Flour.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"item/generated", - "textures": { - "layer0":"appliedenergistics2:items/ItemMaterial.Flour" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.FluixCrystal.json b/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.FluixCrystal.json deleted file mode 100644 index 00f5dc5c..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.FluixCrystal.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"item/generated", - "textures": { - "layer0":"appliedenergistics2:items/ItemMaterial.FluixCrystal" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.FluixDust.json b/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.FluixDust.json deleted file mode 100644 index c0eeb89a..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.FluixDust.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"item/generated", - "textures": { - "layer0":"appliedenergistics2:items/ItemMaterial.FluixDust" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.FluixPearl.json b/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.FluixPearl.json deleted file mode 100644 index b1dcdaa1..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.FluixPearl.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"item/generated", - "textures": { - "layer0":"appliedenergistics2:items/ItemMaterial.FluixPearl" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.FormationCore.json b/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.FormationCore.json deleted file mode 100644 index f0787339..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.FormationCore.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"item/generated", - "textures": { - "layer0":"appliedenergistics2:items/ItemMaterial.FormationCore" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.GoldDust.json b/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.GoldDust.json deleted file mode 100644 index d1059f90..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.GoldDust.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"item/generated", - "textures": { - "layer0":"appliedenergistics2:items/ItemMaterial.GoldDust" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.IronDust.json b/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.IronDust.json deleted file mode 100644 index 075233c3..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.IronDust.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"item/generated", - "textures": { - "layer0":"appliedenergistics2:items/ItemMaterial.IronDust" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.IronNugget.json b/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.IronNugget.json deleted file mode 100644 index d6719c44..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.IronNugget.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"item/generated", - "textures": { - "layer0":"appliedenergistics2:items/ItemMaterial.IronNugget" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.LogicProcessor.json b/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.LogicProcessor.json deleted file mode 100644 index 70c208f7..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.LogicProcessor.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"item/generated", - "textures": { - "layer0":"appliedenergistics2:items/ItemMaterial.LogicProcessor" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.LogicProcessorPress.json b/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.LogicProcessorPress.json deleted file mode 100644 index 6211e180..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.LogicProcessorPress.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"item/generated", - "textures": { - "layer0":"appliedenergistics2:items/ItemMaterial.LogicProcessorPress" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.LogicProcessorPrint.json b/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.LogicProcessorPrint.json deleted file mode 100644 index 35486724..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.LogicProcessorPrint.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"item/generated", - "textures": { - "layer0":"appliedenergistics2:items/ItemMaterial.LogicProcessorPrint" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.MatterBall.json b/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.MatterBall.json deleted file mode 100644 index 8faba35d..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.MatterBall.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"item/generated", - "textures": { - "layer0":"appliedenergistics2:items/ItemMaterial.MatterBall" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.NamePress.json b/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.NamePress.json deleted file mode 100644 index 8e1ce2db..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.NamePress.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"item/generated", - "textures": { - "layer0":"appliedenergistics2:items/ItemMaterial.NamePress" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.NetherQuartzDust.json b/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.NetherQuartzDust.json deleted file mode 100644 index 3994eb25..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.NetherQuartzDust.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"item/generated", - "textures": { - "layer0":"appliedenergistics2:items/ItemMaterial.NetherQuartzDust" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.PurifiedCertusQuartzCrystal.json b/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.PurifiedCertusQuartzCrystal.json deleted file mode 100644 index b96a4e42..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.PurifiedCertusQuartzCrystal.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"item/generated", - "textures": { - "layer0":"appliedenergistics2:items/ItemMaterial.PurifiedCertusQuartzCrystal" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.PurifiedFluixCrystal.json b/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.PurifiedFluixCrystal.json deleted file mode 100644 index d8fd81ab..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.PurifiedFluixCrystal.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"item/generated", - "textures": { - "layer0":"appliedenergistics2:items/ItemMaterial.PurifiedFluixCrystal" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.PurifiedNetherQuartzCrystal.json b/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.PurifiedNetherQuartzCrystal.json deleted file mode 100644 index d05b6266..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.PurifiedNetherQuartzCrystal.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"item/generated", - "textures": { - "layer0":"appliedenergistics2:items/ItemMaterial.PurifiedNetherQuartzCrystal" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.QESingularity.json b/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.QESingularity.json deleted file mode 100644 index a63b829c..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.QESingularity.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"item/generated", - "textures": { - "layer0":"appliedenergistics2:items/ItemMaterial.QESingularity" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.Silicon.json b/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.Silicon.json deleted file mode 100644 index 4e6f46bb..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.Silicon.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"item/generated", - "textures": { - "layer0":"appliedenergistics2:items/ItemMaterial.Silicon" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.SiliconPress.json b/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.SiliconPress.json deleted file mode 100644 index b1169a1e..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.SiliconPress.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"item/generated", - "textures": { - "layer0":"appliedenergistics2:items/ItemMaterial.SiliconPress" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.SiliconPrint.json b/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.SiliconPrint.json deleted file mode 100644 index 2ee567fc..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.SiliconPrint.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"item/generated", - "textures": { - "layer0":"appliedenergistics2:items/ItemMaterial.SiliconPrint" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.Singularity.json b/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.Singularity.json deleted file mode 100644 index d17cdb9c..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.Singularity.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"item/generated", - "textures": { - "layer0":"appliedenergistics2:items/ItemMaterial.Singularity" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.SkyDust.json b/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.SkyDust.json deleted file mode 100644 index 3188fa2e..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.SkyDust.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"item/generated", - "textures": { - "layer0":"appliedenergistics2:items/ItemMaterial.SkyDust" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.Wireless.json b/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.Wireless.json deleted file mode 100644 index 740c3013..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.Wireless.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"item/generated", - "textures": { - "layer0":"appliedenergistics2:items/ItemMaterial.Wireless" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.WirelessBooster.json b/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.WirelessBooster.json deleted file mode 100644 index 1b9ffe88..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.WirelessBooster.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"item/generated", - "textures": { - "layer0":"appliedenergistics2:items/ItemMaterial.WirelessBooster" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.WoodenCrank.json b/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.WoodenCrank.json deleted file mode 100644 index 0adcc342..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.WoodenCrank.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"item/generated", - "textures": { - "layer0":"appliedenergistics2:items/ItemMaterial.WoodenCrank" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.WoodenGear.json b/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.WoodenGear.json deleted file mode 100644 index cf408bd9..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.WoodenGear.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"item/generated", - "textures": { - "layer0":"appliedenergistics2:items/ItemMaterial.WoodenGear" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/ItemPaintBall.json b/src/main/resources/assets/appliedenergistics2/models/item/ItemPaintBall.json deleted file mode 100644 index 59571562..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/ItemPaintBall.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"item/generated", - "textures": { - "layer0":"appliedenergistics2:items/ItemPaintBall" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/ItemPaintBallShimmer.json b/src/main/resources/assets/appliedenergistics2/models/item/ItemPaintBallShimmer.json deleted file mode 100644 index 5753dcca..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/ItemPaintBallShimmer.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"item/generated", - "textures": { - "layer0":"appliedenergistics2:items/ItemPaintBallShimmer" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/ItemSpatialStorageCell.128Cubed.json b/src/main/resources/assets/appliedenergistics2/models/item/ItemSpatialStorageCell.128Cubed.json deleted file mode 100644 index 80ff85c7..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/ItemSpatialStorageCell.128Cubed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"item/generated", - "textures": { - "layer0":"appliedenergistics2:items/ItemSpatialStorageCell.128Cubed" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/ItemSpatialStorageCell.16Cubed.json b/src/main/resources/assets/appliedenergistics2/models/item/ItemSpatialStorageCell.16Cubed.json deleted file mode 100644 index 2f323bdb..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/ItemSpatialStorageCell.16Cubed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"item/generated", - "textures": { - "layer0":"appliedenergistics2:items/ItemSpatialStorageCell.16Cubed" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/ItemSpatialStorageCell.2Cubed.json b/src/main/resources/assets/appliedenergistics2/models/item/ItemSpatialStorageCell.2Cubed.json deleted file mode 100644 index 73464fbc..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/ItemSpatialStorageCell.2Cubed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"item/generated", - "textures": { - "layer0":"appliedenergistics2:items/ItemSpatialStorageCell.2Cubed" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/ItemViewCell.json b/src/main/resources/assets/appliedenergistics2/models/item/ItemViewCell.json deleted file mode 100644 index dcac9b74..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/ItemViewCell.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"item/generated", - "textures": { - "layer0":"appliedenergistics2:items/ItemViewCell" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/QuartzPillarBlock.json b/src/main/resources/assets/appliedenergistics2/models/item/QuartzPillarBlock.json deleted file mode 100644 index 5f732115..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/QuartzPillarBlock.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "appliedenergistics2:block/QuartzPillarBlock" -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/ToolBiometricCard.json b/src/main/resources/assets/appliedenergistics2/models/item/ToolBiometricCard.json deleted file mode 100644 index 0f34b7fb..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/ToolBiometricCard.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"item/generated", - "textures": { - "layer0":"appliedenergistics2:items/ToolBiometricCard" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/ToolCertusQuartzAxe.json b/src/main/resources/assets/appliedenergistics2/models/item/ToolCertusQuartzAxe.json deleted file mode 100644 index e2b0203c..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/ToolCertusQuartzAxe.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"item/generated", - "textures": { - "layer0":"appliedenergistics2:items/ToolCertusQuartzAxe" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/ToolCertusQuartzCuttingKnife.json b/src/main/resources/assets/appliedenergistics2/models/item/ToolCertusQuartzCuttingKnife.json deleted file mode 100644 index e80bb352..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/ToolCertusQuartzCuttingKnife.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"item/generated", - "textures": { - "layer0":"appliedenergistics2:items/ToolCertusQuartzCuttingKnife" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/ToolCertusQuartzHoe.json b/src/main/resources/assets/appliedenergistics2/models/item/ToolCertusQuartzHoe.json deleted file mode 100644 index f6dcd9b7..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/ToolCertusQuartzHoe.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"item/generated", - "textures": { - "layer0":"appliedenergistics2:items/ToolCertusQuartzHoe" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/ToolCertusQuartzPickaxe.json b/src/main/resources/assets/appliedenergistics2/models/item/ToolCertusQuartzPickaxe.json deleted file mode 100644 index 765b6e82..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/ToolCertusQuartzPickaxe.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"item/generated", - "textures": { - "layer0":"appliedenergistics2:items/ToolCertusQuartzPickaxe" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/ToolCertusQuartzSpade.json b/src/main/resources/assets/appliedenergistics2/models/item/ToolCertusQuartzSpade.json deleted file mode 100644 index 2d0b89e5..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/ToolCertusQuartzSpade.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"item/generated", - "textures": { - "layer0":"appliedenergistics2:items/ToolCertusQuartzSpade" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/ToolCertusQuartzSword.json b/src/main/resources/assets/appliedenergistics2/models/item/ToolCertusQuartzSword.json deleted file mode 100644 index 2b77f706..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/ToolCertusQuartzSword.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"item/generated", - "textures": { - "layer0":"appliedenergistics2:items/ToolCertusQuartzSword" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/ToolCertusQuartzWrench.json b/src/main/resources/assets/appliedenergistics2/models/item/ToolCertusQuartzWrench.json deleted file mode 100644 index 502636e8..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/ToolCertusQuartzWrench.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"item/generated", - "textures": { - "layer0":"appliedenergistics2:items/ToolCertusQuartzWrench" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/ToolChargedStaff.json b/src/main/resources/assets/appliedenergistics2/models/item/ToolChargedStaff.json deleted file mode 100644 index 6ff6efe0..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/ToolChargedStaff.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"item/generated", - "textures": { - "layer0":"appliedenergistics2:items/ToolChargedStaff" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/ToolColorApplicator.json b/src/main/resources/assets/appliedenergistics2/models/item/ToolColorApplicator.json deleted file mode 100644 index 67a09f75..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/ToolColorApplicator.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"item/generated", - "textures": { - "layer0":"appliedenergistics2:items/ToolColorApplicator" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/ToolColorApplicatorTip_Dark.json b/src/main/resources/assets/appliedenergistics2/models/item/ToolColorApplicatorTip_Dark.json deleted file mode 100644 index 847a52b3..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/ToolColorApplicatorTip_Dark.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"item/generated", - "textures": { - "layer0":"appliedenergistics2:items/ToolColorApplicatorTip_Dark" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/ToolColorApplicatorTip_Light.json b/src/main/resources/assets/appliedenergistics2/models/item/ToolColorApplicatorTip_Light.json deleted file mode 100644 index a2747c26..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/ToolColorApplicatorTip_Light.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"item/generated", - "textures": { - "layer0":"appliedenergistics2:items/ToolColorApplicatorTip_Light" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/ToolColorApplicatorTip_Medium.json b/src/main/resources/assets/appliedenergistics2/models/item/ToolColorApplicatorTip_Medium.json deleted file mode 100644 index ccda6f55..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/ToolColorApplicatorTip_Medium.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"item/generated", - "textures": { - "layer0":"appliedenergistics2:items/ToolColorApplicatorTip_Medium" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/ToolDebugCard.json b/src/main/resources/assets/appliedenergistics2/models/item/ToolDebugCard.json deleted file mode 100644 index 07d8ccd6..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/ToolDebugCard.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"item/generated", - "textures": { - "layer0":"appliedenergistics2:items/ToolDebugCard" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/ToolEntropyManipulator.json b/src/main/resources/assets/appliedenergistics2/models/item/ToolEntropyManipulator.json deleted file mode 100644 index 13ed9641..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/ToolEntropyManipulator.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"item/generated", - "textures": { - "layer0":"appliedenergistics2:items/ToolEntropyManipulator" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/ToolMassCannon.json b/src/main/resources/assets/appliedenergistics2/models/item/ToolMassCannon.json deleted file mode 100644 index 04f9da13..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/ToolMassCannon.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"item/generated", - "textures": { - "layer0":"appliedenergistics2:items/ToolMassCannon" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/ToolMemoryCard.json b/src/main/resources/assets/appliedenergistics2/models/item/ToolMemoryCard.json deleted file mode 100644 index d120c7bc..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/ToolMemoryCard.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"item/generated", - "textures": { - "layer0":"appliedenergistics2:items/ToolMemoryCard" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/ToolNetherQuartzAxe.json b/src/main/resources/assets/appliedenergistics2/models/item/ToolNetherQuartzAxe.json deleted file mode 100644 index 118286fa..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/ToolNetherQuartzAxe.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"item/generated", - "textures": { - "layer0":"appliedenergistics2:items/ToolNetherQuartzAxe" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/ToolNetherQuartzCuttingKnife.json b/src/main/resources/assets/appliedenergistics2/models/item/ToolNetherQuartzCuttingKnife.json deleted file mode 100644 index cbd87cd3..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/ToolNetherQuartzCuttingKnife.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"item/generated", - "textures": { - "layer0":"appliedenergistics2:items/ToolNetherQuartzCuttingKnife" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/ToolNetherQuartzHoe.json b/src/main/resources/assets/appliedenergistics2/models/item/ToolNetherQuartzHoe.json deleted file mode 100644 index 374f14b2..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/ToolNetherQuartzHoe.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"item/generated", - "textures": { - "layer0":"appliedenergistics2:items/ToolNetherQuartzHoe" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/ToolNetherQuartzPickaxe.json b/src/main/resources/assets/appliedenergistics2/models/item/ToolNetherQuartzPickaxe.json deleted file mode 100644 index ad39a9aa..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/ToolNetherQuartzPickaxe.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"item/generated", - "textures": { - "layer0":"appliedenergistics2:items/ToolNetherQuartzPickaxe" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/ToolNetherQuartzSpade.json b/src/main/resources/assets/appliedenergistics2/models/item/ToolNetherQuartzSpade.json deleted file mode 100644 index c48cd511..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/ToolNetherQuartzSpade.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"item/generated", - "textures": { - "layer0":"appliedenergistics2:items/ToolNetherQuartzSpade" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/ToolNetherQuartzSword.json b/src/main/resources/assets/appliedenergistics2/models/item/ToolNetherQuartzSword.json deleted file mode 100644 index c2ba5260..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/ToolNetherQuartzSword.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"item/generated", - "textures": { - "layer0":"appliedenergistics2:items/ToolNetherQuartzSword" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/ToolNetherQuartzWrench.json b/src/main/resources/assets/appliedenergistics2/models/item/ToolNetherQuartzWrench.json deleted file mode 100644 index 41c5d3bb..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/ToolNetherQuartzWrench.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"item/generated", - "textures": { - "layer0":"appliedenergistics2:items/ToolNetherQuartzWrench" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/ToolNetworkTool.json b/src/main/resources/assets/appliedenergistics2/models/item/ToolNetworkTool.json deleted file mode 100644 index 37ffe4c0..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/ToolNetworkTool.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"item/generated", - "textures": { - "layer0":"appliedenergistics2:items/ToolNetworkTool" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/ToolPortableCell.json b/src/main/resources/assets/appliedenergistics2/models/item/ToolPortableCell.json deleted file mode 100644 index 5603eda2..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/ToolPortableCell.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"item/generated", - "textures": { - "layer0":"appliedenergistics2:items/ToolPortableCell" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/ToolReplicatorCard.json b/src/main/resources/assets/appliedenergistics2/models/item/ToolReplicatorCard.json deleted file mode 100644 index 43b572f6..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/ToolReplicatorCard.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"item/generated", - "textures": { - "layer0":"appliedenergistics2:items/ToolReplicatorCard" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/ToolWirelessTerminal.json b/src/main/resources/assets/appliedenergistics2/models/item/ToolWirelessTerminal.json deleted file mode 100644 index 4e0189d3..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/ToolWirelessTerminal.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"item/generated", - "textures": { - "layer0":"appliedenergistics2:items/ToolWirelessTerminal" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/basic_storage_cell_16k.json b/src/main/resources/assets/appliedenergistics2/models/item/basic_storage_cell_16k.json new file mode 100644 index 00000000..6bcb7e86 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/basic_storage_cell_16k.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "appliedenergistics2:items/basic_storage_cell_16k" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/basic_storage_cell_1k.json b/src/main/resources/assets/appliedenergistics2/models/item/basic_storage_cell_1k.json new file mode 100644 index 00000000..32e5de36 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/basic_storage_cell_1k.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "appliedenergistics2:items/basic_storage_cell_1k" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/basic_storage_cell_4k.json b/src/main/resources/assets/appliedenergistics2/models/item/basic_storage_cell_4k.json new file mode 100644 index 00000000..ed85e6fc --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/basic_storage_cell_4k.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "appliedenergistics2:items/basic_storage_cell_4k" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/basic_storage_cell_64k.json b/src/main/resources/assets/appliedenergistics2/models/item/basic_storage_cell_64k.json new file mode 100644 index 00000000..d05c9590 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/basic_storage_cell_64k.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "appliedenergistics2:items/basic_storage_cell_64k" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/biometric_card.json b/src/main/resources/assets/appliedenergistics2/models/item/biometric_card.json new file mode 100644 index 00000000..265d8ea0 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/biometric_card.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "appliedenergistics2:items/biometric_card" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/cell_workbench.json b/src/main/resources/assets/appliedenergistics2/models/item/cell_workbench.json new file mode 100644 index 00000000..03a9ba86 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/cell_workbench.json @@ -0,0 +1,3 @@ +{ + "parent": "appliedenergistics2:block/cell_workbench" +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/certus_quartz_axe.json b/src/main/resources/assets/appliedenergistics2/models/item/certus_quartz_axe.json new file mode 100644 index 00000000..91e6d926 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/certus_quartz_axe.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "appliedenergistics2:items/certus_quartz_axe" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/certus_quartz_cutting_knife.json b/src/main/resources/assets/appliedenergistics2/models/item/certus_quartz_cutting_knife.json new file mode 100644 index 00000000..51a68e94 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/certus_quartz_cutting_knife.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "appliedenergistics2:items/certus_quartz_cutting_knife" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/certus_quartz_hoe.json b/src/main/resources/assets/appliedenergistics2/models/item/certus_quartz_hoe.json new file mode 100644 index 00000000..f8b0c876 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/certus_quartz_hoe.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "appliedenergistics2:items/certus_quartz_hoe" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/certus_quartz_pickaxe.json b/src/main/resources/assets/appliedenergistics2/models/item/certus_quartz_pickaxe.json new file mode 100644 index 00000000..d8d0c594 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/certus_quartz_pickaxe.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "appliedenergistics2:items/certus_quartz_pickaxe" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/certus_quartz_spade.json b/src/main/resources/assets/appliedenergistics2/models/item/certus_quartz_spade.json new file mode 100644 index 00000000..934493d7 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/certus_quartz_spade.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "appliedenergistics2:items/certus_quartz_spade" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/certus_quartz_sword.json b/src/main/resources/assets/appliedenergistics2/models/item/certus_quartz_sword.json new file mode 100644 index 00000000..554de650 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/certus_quartz_sword.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "appliedenergistics2:items/certus_quartz_sword" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/certus_quartz_wrench.json b/src/main/resources/assets/appliedenergistics2/models/item/certus_quartz_wrench.json new file mode 100644 index 00000000..453ee725 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/certus_quartz_wrench.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "appliedenergistics2:items/certus_quartz_wrench" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/charged_staff.json b/src/main/resources/assets/appliedenergistics2/models/item/charged_staff.json new file mode 100644 index 00000000..e372b6e4 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/charged_staff.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "appliedenergistics2:items/charged_staff" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/charger.json b/src/main/resources/assets/appliedenergistics2/models/item/charger.json new file mode 100644 index 00000000..53e7f463 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/charger.json @@ -0,0 +1,3 @@ +{ + "parent": "appliedenergistics2:block/charger" +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/color_applicator.json b/src/main/resources/assets/appliedenergistics2/models/item/color_applicator.json new file mode 100644 index 00000000..a341e814 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/color_applicator.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "appliedenergistics2:items/color_applicator" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/color_applicator_tip_dark.json b/src/main/resources/assets/appliedenergistics2/models/item/color_applicator_tip_dark.json new file mode 100644 index 00000000..0730b734 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/color_applicator_tip_dark.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "appliedenergistics2:items/color_applicator_tip_dark" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/color_applicator_tip_light.json b/src/main/resources/assets/appliedenergistics2/models/item/color_applicator_tip_light.json new file mode 100644 index 00000000..818f5a26 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/color_applicator_tip_light.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "appliedenergistics2:items/color_applicator_tip_light" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/color_applicator_tip_medium.json b/src/main/resources/assets/appliedenergistics2/models/item/color_applicator_tip_medium.json new file mode 100644 index 00000000..f1851f93 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/color_applicator_tip_medium.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "appliedenergistics2:items/color_applicator_tip_medium" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/condenser.json b/src/main/resources/assets/appliedenergistics2/models/item/condenser.json new file mode 100644 index 00000000..4ac1f7bc --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/condenser.json @@ -0,0 +1,3 @@ +{ + "parent": "appliedenergistics2:block/condenser" +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/tile.BlockController.json b/src/main/resources/assets/appliedenergistics2/models/item/controller.json similarity index 100% rename from src/main/resources/assets/appliedenergistics2/models/item/tile.BlockController.json rename to src/main/resources/assets/appliedenergistics2/models/item/controller.json diff --git a/src/main/resources/assets/appliedenergistics2/models/item/creative_storage_cell.json b/src/main/resources/assets/appliedenergistics2/models/item/creative_storage_cell.json new file mode 100644 index 00000000..c48d4c39 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/creative_storage_cell.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "appliedenergistics2:items/creative_storage_cell" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/crystal_seed_certus.json b/src/main/resources/assets/appliedenergistics2/models/item/crystal_seed_certus.json new file mode 100644 index 00000000..9fea38a1 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/crystal_seed_certus.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "appliedenergistics2:items/crystal_seed_certus" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/crystal_seed_certus2.json b/src/main/resources/assets/appliedenergistics2/models/item/crystal_seed_certus2.json new file mode 100644 index 00000000..234a239f --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/crystal_seed_certus2.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "appliedenergistics2:items/crystal_seed_certus2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/crystal_seed_certus3.json b/src/main/resources/assets/appliedenergistics2/models/item/crystal_seed_certus3.json new file mode 100644 index 00000000..3f5fdef1 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/crystal_seed_certus3.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "appliedenergistics2:items/crystal_seed_certus3" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/crystal_seed_fluix.json b/src/main/resources/assets/appliedenergistics2/models/item/crystal_seed_fluix.json new file mode 100644 index 00000000..09bf4230 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/crystal_seed_fluix.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "appliedenergistics2:items/crystal_seed_fluix" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/crystal_seed_fluix2.json b/src/main/resources/assets/appliedenergistics2/models/item/crystal_seed_fluix2.json new file mode 100644 index 00000000..5ba44e75 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/crystal_seed_fluix2.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "appliedenergistics2:items/crystal_seed_fluix2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/crystal_seed_fluix3.json b/src/main/resources/assets/appliedenergistics2/models/item/crystal_seed_fluix3.json new file mode 100644 index 00000000..00e961b6 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/crystal_seed_fluix3.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "appliedenergistics2:items/crystal_seed_fluix3" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/crystal_seed_nether.json b/src/main/resources/assets/appliedenergistics2/models/item/crystal_seed_nether.json new file mode 100644 index 00000000..1507bee6 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/crystal_seed_nether.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "appliedenergistics2:items/crystal_seed_nether" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/crystal_seed_nether2.json b/src/main/resources/assets/appliedenergistics2/models/item/crystal_seed_nether2.json new file mode 100644 index 00000000..b62a35ce --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/crystal_seed_nether2.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "appliedenergistics2:items/crystal_seed_nether2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/crystal_seed_nether3.json b/src/main/resources/assets/appliedenergistics2/models/item/crystal_seed_nether3.json new file mode 100644 index 00000000..3890d97c --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/crystal_seed_nether3.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "appliedenergistics2:items/crystal_seed_nether3" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/debug_card.json b/src/main/resources/assets/appliedenergistics2/models/item/debug_card.json new file mode 100644 index 00000000..00537b2b --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/debug_card.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "appliedenergistics2:items/debug_card" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/drive.json b/src/main/resources/assets/appliedenergistics2/models/item/drive.json new file mode 100644 index 00000000..062cbf86 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/drive.json @@ -0,0 +1,3 @@ +{ + "parent": "appliedenergistics2:block/drive" +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/encoded_pattern.json b/src/main/resources/assets/appliedenergistics2/models/item/encoded_pattern.json new file mode 100644 index 00000000..f47af859 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/encoded_pattern.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "appliedenergistics2:items/encoded_pattern" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/energy_acceptor.json b/src/main/resources/assets/appliedenergistics2/models/item/energy_acceptor.json new file mode 100644 index 00000000..0695d3c6 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/energy_acceptor.json @@ -0,0 +1,3 @@ +{ + "parent": "appliedenergistics2:block/energy_acceptor" +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/entropy_manipulator.json b/src/main/resources/assets/appliedenergistics2/models/item/entropy_manipulator.json new file mode 100644 index 00000000..90817dc2 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/entropy_manipulator.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "appliedenergistics2:items/entropy_manipulator" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/fluix.json b/src/main/resources/assets/appliedenergistics2/models/item/fluix.json index ab652d74..a7bc039e 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/fluix.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/fluix.json @@ -1,10 +1,22 @@ { - "parent": "appliedenergistics2:fluix/block", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 + ] + } + }, + "parent": "appliedenergistics2:fluix/block" +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/grinder.json b/src/main/resources/assets/appliedenergistics2/models/item/grinder.json new file mode 100644 index 00000000..b9bba63b --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/grinder.json @@ -0,0 +1,3 @@ +{ + "parent": "appliedenergistics2:block/grinder" +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/inscriber.json b/src/main/resources/assets/appliedenergistics2/models/item/inscriber.json new file mode 100644 index 00000000..15d38164 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/inscriber.json @@ -0,0 +1,3 @@ +{ + "parent": "appliedenergistics2:block/inscriber" +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/ioport.json b/src/main/resources/assets/appliedenergistics2/models/item/ioport.json new file mode 100644 index 00000000..5dc3e2c5 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/ioport.json @@ -0,0 +1,3 @@ +{ + "parent": "appliedenergistics2:block/ioport" +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/mass_cannon.json b/src/main/resources/assets/appliedenergistics2/models/item/mass_cannon.json new file mode 100644 index 00000000..e50f78ec --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/mass_cannon.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "appliedenergistics2:items/mass_cannon" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/material_adv_card.json b/src/main/resources/assets/appliedenergistics2/models/item/material_adv_card.json new file mode 100644 index 00000000..d5c8f59f --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/material_adv_card.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "appliedenergistics2:items/material_adv_card" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/material_annihilation_core.json b/src/main/resources/assets/appliedenergistics2/models/item/material_annihilation_core.json new file mode 100644 index 00000000..68602a96 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/material_annihilation_core.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "appliedenergistics2:items/material_annihilation_core" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/material_basic_card.json b/src/main/resources/assets/appliedenergistics2/models/item/material_basic_card.json new file mode 100644 index 00000000..a082945c --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/material_basic_card.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "appliedenergistics2:items/material_basic_card" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/material_blank_pattern.json b/src/main/resources/assets/appliedenergistics2/models/item/material_blank_pattern.json new file mode 100644 index 00000000..b657fe08 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/material_blank_pattern.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "appliedenergistics2:items/material_blank_pattern" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/material_calc_processor.json b/src/main/resources/assets/appliedenergistics2/models/item/material_calc_processor.json new file mode 100644 index 00000000..7df059dd --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/material_calc_processor.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "appliedenergistics2:items/material_calc_processor" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/material_calc_processor_press.json b/src/main/resources/assets/appliedenergistics2/models/item/material_calc_processor_press.json new file mode 100644 index 00000000..fdb2ed76 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/material_calc_processor_press.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "appliedenergistics2:items/material_calc_processor_press" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/material_calc_processor_print.json b/src/main/resources/assets/appliedenergistics2/models/item/material_calc_processor_print.json new file mode 100644 index 00000000..0b2f9e00 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/material_calc_processor_print.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "appliedenergistics2:items/material_calc_processor_print" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/material_card_capacity.json b/src/main/resources/assets/appliedenergistics2/models/item/material_card_capacity.json new file mode 100644 index 00000000..4adae3fa --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/material_card_capacity.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "appliedenergistics2:items/material_card_capacity" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/material_card_crafting.json b/src/main/resources/assets/appliedenergistics2/models/item/material_card_crafting.json new file mode 100644 index 00000000..14a769f2 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/material_card_crafting.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "appliedenergistics2:items/material_card_crafting" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/material_card_fuzzy.json b/src/main/resources/assets/appliedenergistics2/models/item/material_card_fuzzy.json new file mode 100644 index 00000000..fe7cfaaa --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/material_card_fuzzy.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "appliedenergistics2:items/material_card_fuzzy" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/material_card_inverter.json b/src/main/resources/assets/appliedenergistics2/models/item/material_card_inverter.json new file mode 100644 index 00000000..0351b934 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/material_card_inverter.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "appliedenergistics2:items/material_card_inverter" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/material_card_redstone.json b/src/main/resources/assets/appliedenergistics2/models/item/material_card_redstone.json new file mode 100644 index 00000000..5165a155 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/material_card_redstone.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "appliedenergistics2:items/material_card_redstone" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/material_card_speed.json b/src/main/resources/assets/appliedenergistics2/models/item/material_card_speed.json new file mode 100644 index 00000000..232c5e06 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/material_card_speed.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "appliedenergistics2:items/material_card_speed" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/material_cell128_spatial_part.json b/src/main/resources/assets/appliedenergistics2/models/item/material_cell128_spatial_part.json new file mode 100644 index 00000000..3c3b4d99 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/material_cell128_spatial_part.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "appliedenergistics2:items/material_cell128_spatial_part" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/material_cell16_spatial_part.json b/src/main/resources/assets/appliedenergistics2/models/item/material_cell16_spatial_part.json new file mode 100644 index 00000000..175c2bfb --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/material_cell16_spatial_part.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "appliedenergistics2:items/material_cell16_spatial_part" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/material_cell16k_part.json b/src/main/resources/assets/appliedenergistics2/models/item/material_cell16k_part.json new file mode 100644 index 00000000..04df7ce6 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/material_cell16k_part.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "appliedenergistics2:items/material_cell16k_part" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/material_cell1k_part.json b/src/main/resources/assets/appliedenergistics2/models/item/material_cell1k_part.json new file mode 100644 index 00000000..0eb181d2 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/material_cell1k_part.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "appliedenergistics2:items/material_cell1k_part" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/material_cell2_spatial_part.json b/src/main/resources/assets/appliedenergistics2/models/item/material_cell2_spatial_part.json new file mode 100644 index 00000000..1a7e7836 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/material_cell2_spatial_part.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "appliedenergistics2:items/material_cell2_spatial_part" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/material_cell4k_part.json b/src/main/resources/assets/appliedenergistics2/models/item/material_cell4k_part.json new file mode 100644 index 00000000..ac603687 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/material_cell4k_part.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "appliedenergistics2:items/material_cell4k_part" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/material_cell64k_part.json b/src/main/resources/assets/appliedenergistics2/models/item/material_cell64k_part.json new file mode 100644 index 00000000..a6675384 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/material_cell64k_part.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "appliedenergistics2:items/material_cell64k_part" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/material_certus_quartz_crystal.json b/src/main/resources/assets/appliedenergistics2/models/item/material_certus_quartz_crystal.json new file mode 100644 index 00000000..7967f68c --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/material_certus_quartz_crystal.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "appliedenergistics2:items/material_certus_quartz_crystal" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/material_certus_quartz_crystal_charged.json b/src/main/resources/assets/appliedenergistics2/models/item/material_certus_quartz_crystal_charged.json new file mode 100644 index 00000000..dd22c3fd --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/material_certus_quartz_crystal_charged.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "appliedenergistics2:items/material_certus_quartz_crystal_charged" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/material_certus_quartz_dust.json b/src/main/resources/assets/appliedenergistics2/models/item/material_certus_quartz_dust.json new file mode 100644 index 00000000..29ad3f33 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/material_certus_quartz_dust.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "appliedenergistics2:items/material_certus_quartz_dust" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/material_empty_storage_cell.json b/src/main/resources/assets/appliedenergistics2/models/item/material_empty_storage_cell.json new file mode 100644 index 00000000..fa9bc1f7 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/material_empty_storage_cell.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "appliedenergistics2:items/material_empty_storage_cell" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/material_ender_dust.json b/src/main/resources/assets/appliedenergistics2/models/item/material_ender_dust.json new file mode 100644 index 00000000..fefed2f7 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/material_ender_dust.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "appliedenergistics2:items/material_ender_dust" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/material_eng_processor.json b/src/main/resources/assets/appliedenergistics2/models/item/material_eng_processor.json new file mode 100644 index 00000000..7f8ff03b --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/material_eng_processor.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "appliedenergistics2:items/material_eng_processor" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/material_eng_processor_press.json b/src/main/resources/assets/appliedenergistics2/models/item/material_eng_processor_press.json new file mode 100644 index 00000000..1e75a54d --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/material_eng_processor_press.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "appliedenergistics2:items/material_eng_processor_press" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/material_eng_processor_print.json b/src/main/resources/assets/appliedenergistics2/models/item/material_eng_processor_print.json new file mode 100644 index 00000000..9c32dff2 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/material_eng_processor_print.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "appliedenergistics2:items/material_eng_processor_print" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/material_flour.json b/src/main/resources/assets/appliedenergistics2/models/item/material_flour.json new file mode 100644 index 00000000..82a9687f --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/material_flour.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "appliedenergistics2:items/material_flour" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/material_fluix_crystal.json b/src/main/resources/assets/appliedenergistics2/models/item/material_fluix_crystal.json new file mode 100644 index 00000000..a525846e --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/material_fluix_crystal.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "appliedenergistics2:items/material_fluix_crystal" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/material_fluix_dust.json b/src/main/resources/assets/appliedenergistics2/models/item/material_fluix_dust.json new file mode 100644 index 00000000..b5c67a75 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/material_fluix_dust.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "appliedenergistics2:items/material_fluix_dust" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/material_fluix_pearl.json b/src/main/resources/assets/appliedenergistics2/models/item/material_fluix_pearl.json new file mode 100644 index 00000000..394442d8 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/material_fluix_pearl.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "appliedenergistics2:items/material_fluix_pearl" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/material_formation_core.json b/src/main/resources/assets/appliedenergistics2/models/item/material_formation_core.json new file mode 100644 index 00000000..ee265207 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/material_formation_core.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "appliedenergistics2:items/material_formation_core" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/material_gold_dust.json b/src/main/resources/assets/appliedenergistics2/models/item/material_gold_dust.json new file mode 100644 index 00000000..c1b9e846 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/material_gold_dust.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "appliedenergistics2:items/material_gold_dust" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/material_iron_dust.json b/src/main/resources/assets/appliedenergistics2/models/item/material_iron_dust.json new file mode 100644 index 00000000..3db854b9 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/material_iron_dust.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "appliedenergistics2:items/material_iron_dust" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/material_iron_nugget.json b/src/main/resources/assets/appliedenergistics2/models/item/material_iron_nugget.json new file mode 100644 index 00000000..1c3cf30f --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/material_iron_nugget.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "appliedenergistics2:items/material_iron_nugget" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/material_logic_processor.json b/src/main/resources/assets/appliedenergistics2/models/item/material_logic_processor.json new file mode 100644 index 00000000..48e700c1 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/material_logic_processor.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "appliedenergistics2:items/material_logic_processor" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/material_logic_processor_press.json b/src/main/resources/assets/appliedenergistics2/models/item/material_logic_processor_press.json new file mode 100644 index 00000000..42ce01ab --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/material_logic_processor_press.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "appliedenergistics2:items/material_logic_processor_press" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/material_logic_processor_print.json b/src/main/resources/assets/appliedenergistics2/models/item/material_logic_processor_print.json new file mode 100644 index 00000000..c86f9e2a --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/material_logic_processor_print.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "appliedenergistics2:items/material_logic_processor_print" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/material_matter_ball.json b/src/main/resources/assets/appliedenergistics2/models/item/material_matter_ball.json new file mode 100644 index 00000000..feb2e217 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/material_matter_ball.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "appliedenergistics2:items/material_matter_ball" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/material_name_press.json b/src/main/resources/assets/appliedenergistics2/models/item/material_name_press.json new file mode 100644 index 00000000..2f2eabf2 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/material_name_press.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "appliedenergistics2:items/material_name_press" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/material_nether_quartz_dust.json b/src/main/resources/assets/appliedenergistics2/models/item/material_nether_quartz_dust.json new file mode 100644 index 00000000..0089d8db --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/material_nether_quartz_dust.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "appliedenergistics2:items/material_nether_quartz_dust" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/material_purified_certus_quartz_crystal.json b/src/main/resources/assets/appliedenergistics2/models/item/material_purified_certus_quartz_crystal.json new file mode 100644 index 00000000..27aa47c6 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/material_purified_certus_quartz_crystal.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "appliedenergistics2:items/material_purified_certus_quartz_crystal" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/material_purified_fluix_crystal.json b/src/main/resources/assets/appliedenergistics2/models/item/material_purified_fluix_crystal.json new file mode 100644 index 00000000..9a76f2e6 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/material_purified_fluix_crystal.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "appliedenergistics2:items/material_purified_fluix_crystal" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/material_purified_nether_quartz_crystal.json b/src/main/resources/assets/appliedenergistics2/models/item/material_purified_nether_quartz_crystal.json new file mode 100644 index 00000000..69e3f98c --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/material_purified_nether_quartz_crystal.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "appliedenergistics2:items/material_purified_nether_quartz_crystal" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/material_qesingularity.json b/src/main/resources/assets/appliedenergistics2/models/item/material_qesingularity.json new file mode 100644 index 00000000..52d95514 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/material_qesingularity.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "appliedenergistics2:items/material_qesingularity" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/material_silicon.json b/src/main/resources/assets/appliedenergistics2/models/item/material_silicon.json new file mode 100644 index 00000000..d8a25d7e --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/material_silicon.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "appliedenergistics2:items/material_silicon" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/material_silicon_press.json b/src/main/resources/assets/appliedenergistics2/models/item/material_silicon_press.json new file mode 100644 index 00000000..9be16572 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/material_silicon_press.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "appliedenergistics2:items/material_silicon_press" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/material_silicon_print.json b/src/main/resources/assets/appliedenergistics2/models/item/material_silicon_print.json new file mode 100644 index 00000000..67aa3ebb --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/material_silicon_print.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "appliedenergistics2:items/material_silicon_print" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/material_singularity.json b/src/main/resources/assets/appliedenergistics2/models/item/material_singularity.json new file mode 100644 index 00000000..0037cea9 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/material_singularity.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "appliedenergistics2:items/material_singularity" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/material_sky_dust.json b/src/main/resources/assets/appliedenergistics2/models/item/material_sky_dust.json new file mode 100644 index 00000000..4e376c41 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/material_sky_dust.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "appliedenergistics2:items/material_sky_dust" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/material_wireless.json b/src/main/resources/assets/appliedenergistics2/models/item/material_wireless.json new file mode 100644 index 00000000..37e825ca --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/material_wireless.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "appliedenergistics2:items/material_wireless" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/material_wireless_booster.json b/src/main/resources/assets/appliedenergistics2/models/item/material_wireless_booster.json new file mode 100644 index 00000000..3e18e384 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/material_wireless_booster.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "appliedenergistics2:items/material_wireless_booster" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/material_wooden_crank.json b/src/main/resources/assets/appliedenergistics2/models/item/material_wooden_crank.json new file mode 100644 index 00000000..d6469693 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/material_wooden_crank.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "appliedenergistics2:items/material_wooden_crank" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/material_wooden_gear.json b/src/main/resources/assets/appliedenergistics2/models/item/material_wooden_gear.json new file mode 100644 index 00000000..13cebae5 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/material_wooden_gear.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "appliedenergistics2:items/material_wooden_gear" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/memory_card.json b/src/main/resources/assets/appliedenergistics2/models/item/memory_card.json new file mode 100644 index 00000000..32accf3d --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/memory_card.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "appliedenergistics2:items/memory_card" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/nether_quartz_axe.json b/src/main/resources/assets/appliedenergistics2/models/item/nether_quartz_axe.json new file mode 100644 index 00000000..1c1ef8ca --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/nether_quartz_axe.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "appliedenergistics2:items/nether_quartz_axe" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/nether_quartz_cutting_knife.json b/src/main/resources/assets/appliedenergistics2/models/item/nether_quartz_cutting_knife.json new file mode 100644 index 00000000..56540d9b --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/nether_quartz_cutting_knife.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "appliedenergistics2:items/nether_quartz_cutting_knife" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/nether_quartz_hoe.json b/src/main/resources/assets/appliedenergistics2/models/item/nether_quartz_hoe.json new file mode 100644 index 00000000..6d7a1285 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/nether_quartz_hoe.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "appliedenergistics2:items/nether_quartz_hoe" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/nether_quartz_pickaxe.json b/src/main/resources/assets/appliedenergistics2/models/item/nether_quartz_pickaxe.json new file mode 100644 index 00000000..c47571e4 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/nether_quartz_pickaxe.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "appliedenergistics2:items/nether_quartz_pickaxe" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/nether_quartz_spade.json b/src/main/resources/assets/appliedenergistics2/models/item/nether_quartz_spade.json new file mode 100644 index 00000000..83627ea0 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/nether_quartz_spade.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "appliedenergistics2:items/nether_quartz_spade" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/nether_quartz_sword.json b/src/main/resources/assets/appliedenergistics2/models/item/nether_quartz_sword.json new file mode 100644 index 00000000..dd7a72ad --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/nether_quartz_sword.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "appliedenergistics2:items/nether_quartz_sword" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/nether_quartz_wrench.json b/src/main/resources/assets/appliedenergistics2/models/item/nether_quartz_wrench.json new file mode 100644 index 00000000..413548e6 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/nether_quartz_wrench.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "appliedenergistics2:items/nether_quartz_wrench" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/network_tool.json b/src/main/resources/assets/appliedenergistics2/models/item/network_tool.json new file mode 100644 index 00000000..deb41b42 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/network_tool.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "appliedenergistics2:items/network_tool" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/paint_ball.json b/src/main/resources/assets/appliedenergistics2/models/item/paint_ball.json new file mode 100644 index 00000000..c82e92c6 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/paint_ball.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "appliedenergistics2:items/paint_ball" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/paint_ball_shimmer.json b/src/main/resources/assets/appliedenergistics2/models/item/paint_ball_shimmer.json new file mode 100644 index 00000000..addfbab6 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/paint_ball_shimmer.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "appliedenergistics2:items/paint_ball_shimmer" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/portable_cell.json b/src/main/resources/assets/appliedenergistics2/models/item/portable_cell.json new file mode 100644 index 00000000..9f450bf2 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/portable_cell.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "appliedenergistics2:items/portable_cell" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/quartz_growth_accelerator.json b/src/main/resources/assets/appliedenergistics2/models/item/quartz_growth_accelerator.json new file mode 100644 index 00000000..3de4c60c --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/quartz_growth_accelerator.json @@ -0,0 +1,3 @@ +{ + "parent": "appliedenergistics2:block/quartz_growth_accelerator_off" +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/quartz_pillar.json b/src/main/resources/assets/appliedenergistics2/models/item/quartz_pillar.json new file mode 100644 index 00000000..9e2d5bc0 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/quartz_pillar.json @@ -0,0 +1,3 @@ +{ + "parent": "appliedenergistics2:block/quartz_pillar" +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/replicator_card.json b/src/main/resources/assets/appliedenergistics2/models/item/replicator_card.json new file mode 100644 index 00000000..b74f8441 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/replicator_card.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "appliedenergistics2:items/replicator_card" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/security.json b/src/main/resources/assets/appliedenergistics2/models/item/security.json new file mode 100644 index 00000000..4cda4779 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/security.json @@ -0,0 +1,3 @@ +{ + "parent": "appliedenergistics2:block/security" +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/tile.BlockSkyChest.STONE.json b/src/main/resources/assets/appliedenergistics2/models/item/sky_chest_block.json similarity index 99% rename from src/main/resources/assets/appliedenergistics2/models/item/tile.BlockSkyChest.STONE.json rename to src/main/resources/assets/appliedenergistics2/models/item/sky_chest_block.json index 8ac33562..7bfe2e69 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/tile.BlockSkyChest.STONE.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/sky_chest_block.json @@ -32,4 +32,4 @@ "scale": [ 0.4, 0.4, 0.4 ] } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/appliedenergistics2/models/item/sky_chest_stone.json b/src/main/resources/assets/appliedenergistics2/models/item/sky_chest_stone.json new file mode 100644 index 00000000..7bfe2e69 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/sky_chest_stone.json @@ -0,0 +1,35 @@ +{ + "parent": "builtin/entity", + "display": { + "gui": { + "rotation": [ 30, 45, 0 ], + "translation": [ 0, 0, 0], + "scale":[ 0.625, 0.625, 0.625 ] + }, + "ground": { + "rotation": [ 0, 0, 0 ], + "translation": [ 0, 3, 0], + "scale":[ 0.25, 0.25, 0.25 ] + }, + "head": { + "rotation": [ 0, 180, 0 ], + "translation": [ 0, 0, 0], + "scale":[ 1, 1, 1] + }, + "fixed": { + "rotation": [ 0, 180, 0 ], + "translation": [ 0, 0, 0], + "scale":[ 0.5, 0.5, 0.5 ] + }, + "thirdperson_righthand": { + "rotation": [ 75, 315, 0 ], + "translation": [ 0, 2.5, 0], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "firstperson_righthand": { + "rotation": [ 0, 315, 0 ], + "translation": [ 0, 0, 0], + "scale": [ 0.4, 0.4, 0.4 ] + } + } +} diff --git a/src/main/resources/assets/appliedenergistics2/models/item/spatial_ioport.json b/src/main/resources/assets/appliedenergistics2/models/item/spatial_ioport.json new file mode 100644 index 00000000..65d64384 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/spatial_ioport.json @@ -0,0 +1,3 @@ +{ + "parent": "appliedenergistics2:block/spatial_ioport" +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/spatial_storage_cell_128_cubed.json b/src/main/resources/assets/appliedenergistics2/models/item/spatial_storage_cell_128_cubed.json new file mode 100644 index 00000000..ed8cf4d3 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/spatial_storage_cell_128_cubed.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "appliedenergistics2:items/spatial_storage_cell_128_cubed" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/spatial_storage_cell_16_cubed.json b/src/main/resources/assets/appliedenergistics2/models/item/spatial_storage_cell_16_cubed.json new file mode 100644 index 00000000..75a510c2 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/spatial_storage_cell_16_cubed.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "appliedenergistics2:items/spatial_storage_cell_16_cubed" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/spatial_storage_cell_2_cubed.json b/src/main/resources/assets/appliedenergistics2/models/item/spatial_storage_cell_2_cubed.json new file mode 100644 index 00000000..f7ef8de0 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/spatial_storage_cell_2_cubed.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "appliedenergistics2:items/spatial_storage_cell_2_cubed" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/stair.fluix.json b/src/main/resources/assets/appliedenergistics2/models/item/stair.fluix.json deleted file mode 100644 index 5196f2d5..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/stair.fluix.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "appliedenergistics2:block/stairs/fluix" -} diff --git a/src/main/resources/assets/appliedenergistics2/models/item/stair.quartz.certus.chiseled.json b/src/main/resources/assets/appliedenergistics2/models/item/stair.quartz.certus.chiseled.json deleted file mode 100644 index 0ac31601..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/stair.quartz.certus.chiseled.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "appliedenergistics2:block/stairs/quartz.certus.chiseled" -} diff --git a/src/main/resources/assets/appliedenergistics2/models/item/stair.quartz.certus.json b/src/main/resources/assets/appliedenergistics2/models/item/stair.quartz.certus.json deleted file mode 100644 index c2c1e7cd..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/stair.quartz.certus.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "appliedenergistics2:block/stairs/quartz.certus" -} diff --git a/src/main/resources/assets/appliedenergistics2/models/item/stair.quartz.certus.pillar.json b/src/main/resources/assets/appliedenergistics2/models/item/stair.quartz.certus.pillar.json deleted file mode 100644 index 9859adcd..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/stair.quartz.certus.pillar.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "appliedenergistics2:block/stairs/quartz.certus.pillar" -} diff --git a/src/main/resources/assets/appliedenergistics2/models/item/stair.skystone.block.json b/src/main/resources/assets/appliedenergistics2/models/item/stair.skystone.block.json deleted file mode 100644 index e2032c9d..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/stair.skystone.block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "appliedenergistics2:block/stairs/skystone.block" -} diff --git a/src/main/resources/assets/appliedenergistics2/models/item/stair.skystone.brick.json b/src/main/resources/assets/appliedenergistics2/models/item/stair.skystone.brick.json deleted file mode 100644 index 64c496df..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/stair.skystone.brick.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "appliedenergistics2:block/stairs/skystone.brick" -} diff --git a/src/main/resources/assets/appliedenergistics2/models/item/stair.skystone.brick.small.json b/src/main/resources/assets/appliedenergistics2/models/item/stair.skystone.brick.small.json deleted file mode 100644 index 7060c436..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/stair.skystone.brick.small.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "appliedenergistics2:block/stairs/skystone.brick.small" -} diff --git a/src/main/resources/assets/appliedenergistics2/models/item/stair.skystone.stone.json b/src/main/resources/assets/appliedenergistics2/models/item/stair.skystone.stone.json deleted file mode 100644 index 50b61298..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/stair.skystone.stone.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "appliedenergistics2:block/stairs/skystone.stone" -} diff --git a/src/main/resources/assets/appliedenergistics2/models/item/stair_fluix.json b/src/main/resources/assets/appliedenergistics2/models/item/stair_fluix.json new file mode 100644 index 00000000..df240d66 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/stair_fluix.json @@ -0,0 +1,3 @@ +{ + "parent": "appliedenergistics2:block/stairs/fluix" +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/stair_quartz_certus.json b/src/main/resources/assets/appliedenergistics2/models/item/stair_quartz_certus.json new file mode 100644 index 00000000..1c4e01b4 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/stair_quartz_certus.json @@ -0,0 +1,3 @@ +{ + "parent": "appliedenergistics2:block/stairs/quartz_certus" +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/stair_quartz_certus_chiseled.json b/src/main/resources/assets/appliedenergistics2/models/item/stair_quartz_certus_chiseled.json new file mode 100644 index 00000000..c9d8a006 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/stair_quartz_certus_chiseled.json @@ -0,0 +1,3 @@ +{ + "parent": "appliedenergistics2:block/stairs/quartz_certus_chiseled" +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/stair_quartz_certus_pillar.json b/src/main/resources/assets/appliedenergistics2/models/item/stair_quartz_certus_pillar.json new file mode 100644 index 00000000..ab984e0b --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/stair_quartz_certus_pillar.json @@ -0,0 +1,3 @@ +{ + "parent": "appliedenergistics2:block/stairs/quartz_certus_pillar" +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/stair_skystone_block.json b/src/main/resources/assets/appliedenergistics2/models/item/stair_skystone_block.json new file mode 100644 index 00000000..758de5f4 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/stair_skystone_block.json @@ -0,0 +1,3 @@ +{ + "parent": "appliedenergistics2:block/stairs/skystone_block" +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/stair_skystone_brick.json b/src/main/resources/assets/appliedenergistics2/models/item/stair_skystone_brick.json new file mode 100644 index 00000000..7471f1b5 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/stair_skystone_brick.json @@ -0,0 +1,3 @@ +{ + "parent": "appliedenergistics2:block/stairs/skystone_brick" +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/stair_skystone_brick_small.json b/src/main/resources/assets/appliedenergistics2/models/item/stair_skystone_brick_small.json new file mode 100644 index 00000000..6d7c4bb5 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/stair_skystone_brick_small.json @@ -0,0 +1,3 @@ +{ + "parent": "appliedenergistics2:block/stairs/skystone_brick_small" +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/stair_skystone_stone.json b/src/main/resources/assets/appliedenergistics2/models/item/stair_skystone_stone.json new file mode 100644 index 00000000..e95d773f --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/stair_skystone_stone.json @@ -0,0 +1,3 @@ +{ + "parent": "appliedenergistics2:block/stairs/skystone_stone" +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/tile.BlockCellWorkbench.json b/src/main/resources/assets/appliedenergistics2/models/item/tile.BlockCellWorkbench.json deleted file mode 100644 index a7a5dd68..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/tile.BlockCellWorkbench.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "appliedenergistics2:block/tile.BlockCellWorkbench" -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/tile.BlockCharger.json b/src/main/resources/assets/appliedenergistics2/models/item/tile.BlockCharger.json deleted file mode 100644 index 8a99b54b..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/tile.BlockCharger.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "appliedenergistics2:block/tile.BlockCharger" -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/tile.BlockCondenser.json b/src/main/resources/assets/appliedenergistics2/models/item/tile.BlockCondenser.json deleted file mode 100644 index 6938b754..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/tile.BlockCondenser.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "appliedenergistics2:block/tile.BlockCondenser" -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/tile.BlockDrive.json b/src/main/resources/assets/appliedenergistics2/models/item/tile.BlockDrive.json deleted file mode 100644 index f40c9a4b..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/tile.BlockDrive.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "appliedenergistics2:block/tile.BlockDrive" -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/tile.BlockEnergyAcceptor.json b/src/main/resources/assets/appliedenergistics2/models/item/tile.BlockEnergyAcceptor.json deleted file mode 100644 index 4f481484..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/tile.BlockEnergyAcceptor.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "appliedenergistics2:block/tile.BlockEnergyAcceptor" -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/tile.BlockGrinder.json b/src/main/resources/assets/appliedenergistics2/models/item/tile.BlockGrinder.json deleted file mode 100644 index 923b1c9a..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/tile.BlockGrinder.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "appliedenergistics2:block/tile.BlockGrinder" -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/tile.BlockIOPort.json b/src/main/resources/assets/appliedenergistics2/models/item/tile.BlockIOPort.json deleted file mode 100644 index 472c40b5..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/tile.BlockIOPort.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "appliedenergistics2:block/tile.BlockIOPort" -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/tile.BlockInscriber.json b/src/main/resources/assets/appliedenergistics2/models/item/tile.BlockInscriber.json deleted file mode 100644 index a88f4c16..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/tile.BlockInscriber.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "appliedenergistics2:block/tile.BlockInscriber" -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/tile.BlockQuartzGrowthAccelerator.json b/src/main/resources/assets/appliedenergistics2/models/item/tile.BlockQuartzGrowthAccelerator.json deleted file mode 100644 index bb40520b..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/tile.BlockQuartzGrowthAccelerator.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "appliedenergistics2:block/tile.BlockQuartzGrowthAccelerator.off" -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/tile.BlockSecurity.json b/src/main/resources/assets/appliedenergistics2/models/item/tile.BlockSecurity.json deleted file mode 100644 index 28833942..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/tile.BlockSecurity.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "appliedenergistics2:block/tile.BlockSecurity" -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/tile.BlockSkyChest.BLOCK.json b/src/main/resources/assets/appliedenergistics2/models/item/tile.BlockSkyChest.BLOCK.json deleted file mode 100644 index 59571562..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/tile.BlockSkyChest.BLOCK.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"item/generated", - "textures": { - "layer0":"appliedenergistics2:items/ItemPaintBall" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/tile.BlockSpatialIOPort.json b/src/main/resources/assets/appliedenergistics2/models/item/tile.BlockSpatialIOPort.json deleted file mode 100644 index 0d6a4b2b..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/tile.BlockSpatialIOPort.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "appliedenergistics2:block/tile.BlockSpatialIOPort" -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/tile.BlockVibrationChamber.json b/src/main/resources/assets/appliedenergistics2/models/item/tile.BlockVibrationChamber.json deleted file mode 100644 index 19fd2abb..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/tile.BlockVibrationChamber.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "appliedenergistics2:block/tile.BlockVibrationChamber.off" -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/tile.BlockWireless.json b/src/main/resources/assets/appliedenergistics2/models/item/tile.BlockWireless.json deleted file mode 100644 index 447ae632..00000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/tile.BlockWireless.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "appliedenergistics2:block/tile.BlockWireless" -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/tiny_tnt.json b/src/main/resources/assets/appliedenergistics2/models/item/tiny_tnt.json new file mode 100644 index 00000000..af083a07 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/tiny_tnt.json @@ -0,0 +1,3 @@ +{ + "parent": "appliedenergistics2:tiny_tnt" +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/vibration_chamber.json b/src/main/resources/assets/appliedenergistics2/models/item/vibration_chamber.json new file mode 100644 index 00000000..249236b4 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/vibration_chamber.json @@ -0,0 +1,3 @@ +{ + "parent": "appliedenergistics2:block/vibration_chamber_off" +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/view_cell.json b/src/main/resources/assets/appliedenergistics2/models/item/view_cell.json new file mode 100644 index 00000000..7d3028ae --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/view_cell.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "appliedenergistics2:items/view_cell" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/wireless.json b/src/main/resources/assets/appliedenergistics2/models/item/wireless.json new file mode 100644 index 00000000..523d5699 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/wireless.json @@ -0,0 +1,3 @@ +{ + "parent": "appliedenergistics2:block/wireless" +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/wireless_terminal.json b/src/main/resources/assets/appliedenergistics2/models/item/wireless_terminal.json new file mode 100644 index 00000000..79ec47f8 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/wireless_terminal.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "appliedenergistics2:items/wireless_terminal" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/BlockCellWorkbench.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/cell_workbench.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/blocks/BlockCellWorkbench.png rename to src/main/resources/assets/appliedenergistics2/textures/blocks/cell_workbench.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/BlockCellWorkbenchBottom.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/cell_workbench_bottom.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/blocks/BlockCellWorkbenchBottom.png rename to src/main/resources/assets/appliedenergistics2/textures/blocks/cell_workbench_bottom.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/BlockCellWorkbenchSide.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/cell_workbench_side.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/blocks/BlockCellWorkbenchSide.png rename to src/main/resources/assets/appliedenergistics2/textures/blocks/cell_workbench_side.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/ChargedQuartzOreBlock.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/charged_quartz_ore.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/blocks/ChargedQuartzOreBlock.png rename to src/main/resources/assets/appliedenergistics2/textures/blocks/charged_quartz_ore.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/BlockCharger.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/charger.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/blocks/BlockCharger.png rename to src/main/resources/assets/appliedenergistics2/textures/blocks/charger.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/BlockChargerInside.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/charger_inside.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/blocks/BlockChargerInside.png rename to src/main/resources/assets/appliedenergistics2/textures/blocks/charger_inside.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/BlockChargerSide.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/charger_side.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/blocks/BlockChargerSide.png rename to src/main/resources/assets/appliedenergistics2/textures/blocks/charger_side.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/ChiseledQuartzBlockSide.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/chiseled_quartz_block_side.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/blocks/ChiseledQuartzBlockSide.png rename to src/main/resources/assets/appliedenergistics2/textures/blocks/chiseled_quartz_block_side.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/ChiseledQuartzBlockTop.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/chiseled_quartz_block_top.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/blocks/ChiseledQuartzBlockTop.png rename to src/main/resources/assets/appliedenergistics2/textures/blocks/chiseled_quartz_block_top.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/BlockCondenser.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/condenser.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/blocks/BlockCondenser.png rename to src/main/resources/assets/appliedenergistics2/textures/blocks/condenser.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/BlockController.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/controller.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/blocks/BlockController.png rename to src/main/resources/assets/appliedenergistics2/textures/blocks/controller.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/BlockControllerColumn.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/controller_column.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/blocks/BlockControllerColumn.png rename to src/main/resources/assets/appliedenergistics2/textures/blocks/controller_column.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/BlockControllerColumnConflict.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/controller_column_conflict.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/blocks/BlockControllerColumnConflict.png rename to src/main/resources/assets/appliedenergistics2/textures/blocks/controller_column_conflict.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/BlockControllerColumnLights.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/controller_column_lights.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/blocks/BlockControllerColumnLights.png rename to src/main/resources/assets/appliedenergistics2/textures/blocks/controller_column_lights.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/BlockControllerColumnLights.png.mcmeta b/src/main/resources/assets/appliedenergistics2/textures/blocks/controller_column_lights.png.mcmeta similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/blocks/BlockControllerColumnLights.png.mcmeta rename to src/main/resources/assets/appliedenergistics2/textures/blocks/controller_column_lights.png.mcmeta diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/BlockControllerColumnPowered.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/controller_column_powered.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/blocks/BlockControllerColumnPowered.png rename to src/main/resources/assets/appliedenergistics2/textures/blocks/controller_column_powered.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/BlockControllerConflict.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/controller_conflict.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/blocks/BlockControllerConflict.png rename to src/main/resources/assets/appliedenergistics2/textures/blocks/controller_conflict.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/BlockControllerInsideA.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/controller_inside_a.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/blocks/BlockControllerInsideA.png rename to src/main/resources/assets/appliedenergistics2/textures/blocks/controller_inside_a.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/BlockControllerInsideB.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/controller_inside_b.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/blocks/BlockControllerInsideB.png rename to src/main/resources/assets/appliedenergistics2/textures/blocks/controller_inside_b.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/BlockControllerLights.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/controller_lights.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/blocks/BlockControllerLights.png rename to src/main/resources/assets/appliedenergistics2/textures/blocks/controller_lights.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/BlockControllerLights.png.mcmeta b/src/main/resources/assets/appliedenergistics2/textures/blocks/controller_lights.png.mcmeta similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/blocks/BlockControllerLights.png.mcmeta rename to src/main/resources/assets/appliedenergistics2/textures/blocks/controller_lights.png.mcmeta diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/BlockControllerPowered.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/controller_powered.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/blocks/BlockControllerPowered.png rename to src/main/resources/assets/appliedenergistics2/textures/blocks/controller_powered.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/BlockCreativeEnergyCell.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/creative_energy_cell.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/blocks/BlockCreativeEnergyCell.png rename to src/main/resources/assets/appliedenergistics2/textures/blocks/creative_energy_cell.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/BlockEnergyAcceptor.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/energy_acceptor.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/blocks/BlockEnergyAcceptor.png rename to src/main/resources/assets/appliedenergistics2/textures/blocks/energy_acceptor.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/BlockEnergyCell.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/energy_cell.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/blocks/BlockEnergyCell.png rename to src/main/resources/assets/appliedenergistics2/textures/blocks/energy_cell.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/BlockEnergyCell0.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/energy_cell0.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/blocks/BlockEnergyCell0.png rename to src/main/resources/assets/appliedenergistics2/textures/blocks/energy_cell0.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/BlockEnergyCell1.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/energy_cell1.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/blocks/BlockEnergyCell1.png rename to src/main/resources/assets/appliedenergistics2/textures/blocks/energy_cell1.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/BlockEnergyCell2.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/energy_cell2.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/blocks/BlockEnergyCell2.png rename to src/main/resources/assets/appliedenergistics2/textures/blocks/energy_cell2.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/BlockEnergyCell3.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/energy_cell3.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/blocks/BlockEnergyCell3.png rename to src/main/resources/assets/appliedenergistics2/textures/blocks/energy_cell3.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/BlockEnergyCell4.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/energy_cell4.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/blocks/BlockEnergyCell4.png rename to src/main/resources/assets/appliedenergistics2/textures/blocks/energy_cell4.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/BlockEnergyCell5.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/energy_cell5.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/blocks/BlockEnergyCell5.png rename to src/main/resources/assets/appliedenergistics2/textures/blocks/energy_cell5.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/BlockEnergyCell6.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/energy_cell6.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/blocks/BlockEnergyCell6.png rename to src/main/resources/assets/appliedenergistics2/textures/blocks/energy_cell6.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/BlockEnergyCell7.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/energy_cell7.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/blocks/BlockEnergyCell7.png rename to src/main/resources/assets/appliedenergistics2/textures/blocks/energy_cell7.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/FluixBlock.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/fluix.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/blocks/FluixBlock.png rename to src/main/resources/assets/appliedenergistics2/textures/blocks/fluix.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/BlockGrinder.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/grinder.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/blocks/BlockGrinder.png rename to src/main/resources/assets/appliedenergistics2/textures/blocks/grinder.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/BlockGrinderBottom.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/grinder_bottom.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/blocks/BlockGrinderBottom.png rename to src/main/resources/assets/appliedenergistics2/textures/blocks/grinder_bottom.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/BlockGrinderFront.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/grinder_front.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/blocks/BlockGrinderFront.png rename to src/main/resources/assets/appliedenergistics2/textures/blocks/grinder_front.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/BlockGrinderSide.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/grinder_side.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/blocks/BlockGrinderSide.png rename to src/main/resources/assets/appliedenergistics2/textures/blocks/grinder_side.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/BlockInscriber.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/inscriber.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/blocks/BlockInscriber.png rename to src/main/resources/assets/appliedenergistics2/textures/blocks/inscriber.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/BlockInscriberInside.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/inscriber_inside.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/blocks/BlockInscriberInside.png rename to src/main/resources/assets/appliedenergistics2/textures/blocks/inscriber_inside.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/BlockIOPort.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/ioport.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/blocks/BlockIOPort.png rename to src/main/resources/assets/appliedenergistics2/textures/blocks/ioport.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/BlockIOPortBottom.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/ioport_bottom.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/blocks/BlockIOPortBottom.png rename to src/main/resources/assets/appliedenergistics2/textures/blocks/ioport_bottom.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/BlockIOPortSide.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/ioport_side.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/blocks/BlockIOPortSide.png rename to src/main/resources/assets/appliedenergistics2/textures/blocks/ioport_side.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/QuartzBlock.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/quartz.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/blocks/QuartzBlock.png rename to src/main/resources/assets/appliedenergistics2/textures/blocks/quartz.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/BlockQuartzGrowthAccelerator.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/quartz_growth_accelerator.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/blocks/BlockQuartzGrowthAccelerator.png rename to src/main/resources/assets/appliedenergistics2/textures/blocks/quartz_growth_accelerator.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/BlockQuartzGrowthAcceleratorOn.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/quartz_growth_accelerator_on.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/blocks/BlockQuartzGrowthAcceleratorOn.png rename to src/main/resources/assets/appliedenergistics2/textures/blocks/quartz_growth_accelerator_on.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/BlockQuartzGrowthAcceleratorOn.png.mcmeta b/src/main/resources/assets/appliedenergistics2/textures/blocks/quartz_growth_accelerator_on.png.mcmeta similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/blocks/BlockQuartzGrowthAcceleratorOn.png.mcmeta rename to src/main/resources/assets/appliedenergistics2/textures/blocks/quartz_growth_accelerator_on.png.mcmeta diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/BlockQuartzGrowthAcceleratorSide.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/quartz_growth_accelerator_side.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/blocks/BlockQuartzGrowthAcceleratorSide.png rename to src/main/resources/assets/appliedenergistics2/textures/blocks/quartz_growth_accelerator_side.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/BlockQuartzGrowthAcceleratorSideOn.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/quartz_growth_accelerator_side_on.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/blocks/BlockQuartzGrowthAcceleratorSideOn.png rename to src/main/resources/assets/appliedenergistics2/textures/blocks/quartz_growth_accelerator_side_on.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/BlockQuartzGrowthAcceleratorSideOn.png.mcmeta b/src/main/resources/assets/appliedenergistics2/textures/blocks/quartz_growth_accelerator_side_on.png.mcmeta similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/blocks/BlockQuartzGrowthAcceleratorSideOn.png.mcmeta rename to src/main/resources/assets/appliedenergistics2/textures/blocks/quartz_growth_accelerator_side_on.png.mcmeta diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/QuartzOreBlock.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/quartz_ore.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/blocks/QuartzOreBlock.png rename to src/main/resources/assets/appliedenergistics2/textures/blocks/quartz_ore.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/QuartzPillarBlockSide.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/quartz_pillar_block_side.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/blocks/QuartzPillarBlockSide.png rename to src/main/resources/assets/appliedenergistics2/textures/blocks/quartz_pillar_block_side.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/QuartzPillarBlockTop.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/quartz_pillar_block_top.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/blocks/QuartzPillarBlockTop.png rename to src/main/resources/assets/appliedenergistics2/textures/blocks/quartz_pillar_block_top.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/BlockSecurity.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/security.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/blocks/BlockSecurity.png rename to src/main/resources/assets/appliedenergistics2/textures/blocks/security.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/BlockSecurityBottom.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/security_bottom.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/blocks/BlockSecurityBottom.png rename to src/main/resources/assets/appliedenergistics2/textures/blocks/security_bottom.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/BlockSecuritySide.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/security_side.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/blocks/BlockSecuritySide.png rename to src/main/resources/assets/appliedenergistics2/textures/blocks/security_side.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/SkyStoneBlock.BLOCK.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/sky_stone_block_block.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/blocks/SkyStoneBlock.BLOCK.png rename to src/main/resources/assets/appliedenergistics2/textures/blocks/sky_stone_block_block.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/SkyStoneBlock.BRICK.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/sky_stone_block_brick.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/blocks/SkyStoneBlock.BRICK.png rename to src/main/resources/assets/appliedenergistics2/textures/blocks/sky_stone_block_brick.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/SkyStoneBlock.SMALL_BRICK.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/sky_stone_block_small_brick.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/blocks/SkyStoneBlock.SMALL_BRICK.png rename to src/main/resources/assets/appliedenergistics2/textures/blocks/sky_stone_block_small_brick.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/SkyStoneBlock.STONE.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/sky_stone_block_stone.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/blocks/SkyStoneBlock.STONE.png rename to src/main/resources/assets/appliedenergistics2/textures/blocks/sky_stone_block_stone.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/BlockSpatialIOPort.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/spatial_ioport.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/blocks/BlockSpatialIOPort.png rename to src/main/resources/assets/appliedenergistics2/textures/blocks/spatial_ioport.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/BlockSpatialIOPortBottom.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/spatial_ioport_bottom.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/blocks/BlockSpatialIOPortBottom.png rename to src/main/resources/assets/appliedenergistics2/textures/blocks/spatial_ioport_bottom.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/BlockSpatialIOPortSide.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/spatial_ioport_side.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/blocks/BlockSpatialIOPortSide.png rename to src/main/resources/assets/appliedenergistics2/textures/blocks/spatial_ioport_side.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/BlockVibrationChamber.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/vibration_chamber.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/blocks/BlockVibrationChamber.png rename to src/main/resources/assets/appliedenergistics2/textures/blocks/vibration_chamber.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/BlockVibrationChamberFront.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/vibration_chamber_front.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/blocks/BlockVibrationChamberFront.png rename to src/main/resources/assets/appliedenergistics2/textures/blocks/vibration_chamber_front.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/BlockVibrationChamberFrontOn.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/vibration_chamber_front_on.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/blocks/BlockVibrationChamberFrontOn.png rename to src/main/resources/assets/appliedenergistics2/textures/blocks/vibration_chamber_front_on.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/BlockWireless.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/wireless.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/blocks/BlockWireless.png rename to src/main/resources/assets/appliedenergistics2/textures/blocks/wireless.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/BlockWirelessInside.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/wireless_inside.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/blocks/BlockWirelessInside.png rename to src/main/resources/assets/appliedenergistics2/textures/blocks/wireless_inside.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/BlockWirelessOn.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/wireless_on.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/blocks/BlockWirelessOn.png rename to src/main/resources/assets/appliedenergistics2/textures/blocks/wireless_on.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ItemBasicStorageCell.16k.png b/src/main/resources/assets/appliedenergistics2/textures/items/basic_storage_cell_16k.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/items/ItemBasicStorageCell.16k.png rename to src/main/resources/assets/appliedenergistics2/textures/items/basic_storage_cell_16k.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ItemBasicStorageCell.1k.png b/src/main/resources/assets/appliedenergistics2/textures/items/basic_storage_cell_1k.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/items/ItemBasicStorageCell.1k.png rename to src/main/resources/assets/appliedenergistics2/textures/items/basic_storage_cell_1k.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ItemBasicStorageCell.4k.png b/src/main/resources/assets/appliedenergistics2/textures/items/basic_storage_cell_4k.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/items/ItemBasicStorageCell.4k.png rename to src/main/resources/assets/appliedenergistics2/textures/items/basic_storage_cell_4k.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ItemBasicStorageCell.64k.png b/src/main/resources/assets/appliedenergistics2/textures/items/basic_storage_cell_64k.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/items/ItemBasicStorageCell.64k.png rename to src/main/resources/assets/appliedenergistics2/textures/items/basic_storage_cell_64k.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ToolBiometricCard.png b/src/main/resources/assets/appliedenergistics2/textures/items/biometric_card.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/items/ToolBiometricCard.png rename to src/main/resources/assets/appliedenergistics2/textures/items/biometric_card.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ToolCertusQuartzAxe.png b/src/main/resources/assets/appliedenergistics2/textures/items/certus_quartz_axe.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/items/ToolCertusQuartzAxe.png rename to src/main/resources/assets/appliedenergistics2/textures/items/certus_quartz_axe.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ToolCertusQuartzCuttingKnife.png b/src/main/resources/assets/appliedenergistics2/textures/items/certus_quartz_cutting_knife.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/items/ToolCertusQuartzCuttingKnife.png rename to src/main/resources/assets/appliedenergistics2/textures/items/certus_quartz_cutting_knife.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ToolCertusQuartzHoe.png b/src/main/resources/assets/appliedenergistics2/textures/items/certus_quartz_hoe.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/items/ToolCertusQuartzHoe.png rename to src/main/resources/assets/appliedenergistics2/textures/items/certus_quartz_hoe.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ToolCertusQuartzPickaxe.png b/src/main/resources/assets/appliedenergistics2/textures/items/certus_quartz_pickaxe.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/items/ToolCertusQuartzPickaxe.png rename to src/main/resources/assets/appliedenergistics2/textures/items/certus_quartz_pickaxe.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ToolCertusQuartzSpade.png b/src/main/resources/assets/appliedenergistics2/textures/items/certus_quartz_spade.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/items/ToolCertusQuartzSpade.png rename to src/main/resources/assets/appliedenergistics2/textures/items/certus_quartz_spade.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ToolCertusQuartzSword.png b/src/main/resources/assets/appliedenergistics2/textures/items/certus_quartz_sword.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/items/ToolCertusQuartzSword.png rename to src/main/resources/assets/appliedenergistics2/textures/items/certus_quartz_sword.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ToolCertusQuartzWrench.png b/src/main/resources/assets/appliedenergistics2/textures/items/certus_quartz_wrench.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/items/ToolCertusQuartzWrench.png rename to src/main/resources/assets/appliedenergistics2/textures/items/certus_quartz_wrench.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ToolChargedStaff.png b/src/main/resources/assets/appliedenergistics2/textures/items/charged_staff.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/items/ToolChargedStaff.png rename to src/main/resources/assets/appliedenergistics2/textures/items/charged_staff.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ToolColorApplicator.png b/src/main/resources/assets/appliedenergistics2/textures/items/color_applicator.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/items/ToolColorApplicator.png rename to src/main/resources/assets/appliedenergistics2/textures/items/color_applicator.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ToolColorApplicatorTip_Dark.png b/src/main/resources/assets/appliedenergistics2/textures/items/color_applicator_tip_dark.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/items/ToolColorApplicatorTip_Dark.png rename to src/main/resources/assets/appliedenergistics2/textures/items/color_applicator_tip_dark.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ToolColorApplicatorTip_Light.png b/src/main/resources/assets/appliedenergistics2/textures/items/color_applicator_tip_light.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/items/ToolColorApplicatorTip_Light.png rename to src/main/resources/assets/appliedenergistics2/textures/items/color_applicator_tip_light.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ToolColorApplicatorTip_Medium.png b/src/main/resources/assets/appliedenergistics2/textures/items/color_applicator_tip_medium.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/items/ToolColorApplicatorTip_Medium.png rename to src/main/resources/assets/appliedenergistics2/textures/items/color_applicator_tip_medium.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ItemCreativeStorageCell.png b/src/main/resources/assets/appliedenergistics2/textures/items/creative_storage_cell.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/items/ItemCreativeStorageCell.png rename to src/main/resources/assets/appliedenergistics2/textures/items/creative_storage_cell.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ItemCrystalSeed.Certus.png b/src/main/resources/assets/appliedenergistics2/textures/items/crystal_seed_certus.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/items/ItemCrystalSeed.Certus.png rename to src/main/resources/assets/appliedenergistics2/textures/items/crystal_seed_certus.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ItemCrystalSeed.Certus2.png b/src/main/resources/assets/appliedenergistics2/textures/items/crystal_seed_certus2.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/items/ItemCrystalSeed.Certus2.png rename to src/main/resources/assets/appliedenergistics2/textures/items/crystal_seed_certus2.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ItemCrystalSeed.Certus3.png b/src/main/resources/assets/appliedenergistics2/textures/items/crystal_seed_certus3.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/items/ItemCrystalSeed.Certus3.png rename to src/main/resources/assets/appliedenergistics2/textures/items/crystal_seed_certus3.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ItemCrystalSeed.Fluix.png b/src/main/resources/assets/appliedenergistics2/textures/items/crystal_seed_fluix.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/items/ItemCrystalSeed.Fluix.png rename to src/main/resources/assets/appliedenergistics2/textures/items/crystal_seed_fluix.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ItemCrystalSeed.Fluix2.png b/src/main/resources/assets/appliedenergistics2/textures/items/crystal_seed_fluix2.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/items/ItemCrystalSeed.Fluix2.png rename to src/main/resources/assets/appliedenergistics2/textures/items/crystal_seed_fluix2.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ItemCrystalSeed.Fluix3.png b/src/main/resources/assets/appliedenergistics2/textures/items/crystal_seed_fluix3.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/items/ItemCrystalSeed.Fluix3.png rename to src/main/resources/assets/appliedenergistics2/textures/items/crystal_seed_fluix3.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ItemCrystalSeed.Nether.png b/src/main/resources/assets/appliedenergistics2/textures/items/crystal_seed_nether.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/items/ItemCrystalSeed.Nether.png rename to src/main/resources/assets/appliedenergistics2/textures/items/crystal_seed_nether.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ItemCrystalSeed.Nether2.png b/src/main/resources/assets/appliedenergistics2/textures/items/crystal_seed_nether2.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/items/ItemCrystalSeed.Nether2.png rename to src/main/resources/assets/appliedenergistics2/textures/items/crystal_seed_nether2.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ItemCrystalSeed.Nether3.png b/src/main/resources/assets/appliedenergistics2/textures/items/crystal_seed_nether3.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/items/ItemCrystalSeed.Nether3.png rename to src/main/resources/assets/appliedenergistics2/textures/items/crystal_seed_nether3.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ToolDebugCard.png b/src/main/resources/assets/appliedenergistics2/textures/items/debug_card.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/items/ToolDebugCard.png rename to src/main/resources/assets/appliedenergistics2/textures/items/debug_card.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ItemEncodedPattern.png b/src/main/resources/assets/appliedenergistics2/textures/items/encoded_pattern.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/items/ItemEncodedPattern.png rename to src/main/resources/assets/appliedenergistics2/textures/items/encoded_pattern.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ToolEntropyManipulator.png b/src/main/resources/assets/appliedenergistics2/textures/items/entropy_manipulator.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/items/ToolEntropyManipulator.png rename to src/main/resources/assets/appliedenergistics2/textures/items/entropy_manipulator.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ToolMassCannon.png b/src/main/resources/assets/appliedenergistics2/textures/items/mass_cannon.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/items/ToolMassCannon.png rename to src/main/resources/assets/appliedenergistics2/textures/items/mass_cannon.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.AdvCard.png b/src/main/resources/assets/appliedenergistics2/textures/items/material_adv_card.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.AdvCard.png rename to src/main/resources/assets/appliedenergistics2/textures/items/material_adv_card.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.AnnihilationCore.png b/src/main/resources/assets/appliedenergistics2/textures/items/material_annihilation_core.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.AnnihilationCore.png rename to src/main/resources/assets/appliedenergistics2/textures/items/material_annihilation_core.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.BasicCard.png b/src/main/resources/assets/appliedenergistics2/textures/items/material_basic_card.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.BasicCard.png rename to src/main/resources/assets/appliedenergistics2/textures/items/material_basic_card.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.BlankPattern.png b/src/main/resources/assets/appliedenergistics2/textures/items/material_blank_pattern.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.BlankPattern.png rename to src/main/resources/assets/appliedenergistics2/textures/items/material_blank_pattern.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.CalcProcessor.png b/src/main/resources/assets/appliedenergistics2/textures/items/material_calc_processor.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.CalcProcessor.png rename to src/main/resources/assets/appliedenergistics2/textures/items/material_calc_processor.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.CalcProcessorPress.png b/src/main/resources/assets/appliedenergistics2/textures/items/material_calc_processor_press.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.CalcProcessorPress.png rename to src/main/resources/assets/appliedenergistics2/textures/items/material_calc_processor_press.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.CalcProcessorPrint.png b/src/main/resources/assets/appliedenergistics2/textures/items/material_calc_processor_print.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.CalcProcessorPrint.png rename to src/main/resources/assets/appliedenergistics2/textures/items/material_calc_processor_print.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.CardCapacity.png b/src/main/resources/assets/appliedenergistics2/textures/items/material_card_capacity.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.CardCapacity.png rename to src/main/resources/assets/appliedenergistics2/textures/items/material_card_capacity.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.CardCrafting.png b/src/main/resources/assets/appliedenergistics2/textures/items/material_card_crafting.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.CardCrafting.png rename to src/main/resources/assets/appliedenergistics2/textures/items/material_card_crafting.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.CardFuzzy.png b/src/main/resources/assets/appliedenergistics2/textures/items/material_card_fuzzy.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.CardFuzzy.png rename to src/main/resources/assets/appliedenergistics2/textures/items/material_card_fuzzy.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.CardInverter.png b/src/main/resources/assets/appliedenergistics2/textures/items/material_card_inverter.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.CardInverter.png rename to src/main/resources/assets/appliedenergistics2/textures/items/material_card_inverter.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.CardRedstone.png b/src/main/resources/assets/appliedenergistics2/textures/items/material_card_redstone.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.CardRedstone.png rename to src/main/resources/assets/appliedenergistics2/textures/items/material_card_redstone.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.CardSpeed.png b/src/main/resources/assets/appliedenergistics2/textures/items/material_card_speed.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.CardSpeed.png rename to src/main/resources/assets/appliedenergistics2/textures/items/material_card_speed.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.Cell128SpatialPart.png b/src/main/resources/assets/appliedenergistics2/textures/items/material_cell128_spatial_part.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.Cell128SpatialPart.png rename to src/main/resources/assets/appliedenergistics2/textures/items/material_cell128_spatial_part.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.Cell16SpatialPart.png b/src/main/resources/assets/appliedenergistics2/textures/items/material_cell16_spatial_part.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.Cell16SpatialPart.png rename to src/main/resources/assets/appliedenergistics2/textures/items/material_cell16_spatial_part.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.Cell16kPart.png b/src/main/resources/assets/appliedenergistics2/textures/items/material_cell16k_part.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.Cell16kPart.png rename to src/main/resources/assets/appliedenergistics2/textures/items/material_cell16k_part.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.Cell1kPart.png b/src/main/resources/assets/appliedenergistics2/textures/items/material_cell1k_part.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.Cell1kPart.png rename to src/main/resources/assets/appliedenergistics2/textures/items/material_cell1k_part.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.Cell2SpatialPart.png b/src/main/resources/assets/appliedenergistics2/textures/items/material_cell2_spatial_part.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.Cell2SpatialPart.png rename to src/main/resources/assets/appliedenergistics2/textures/items/material_cell2_spatial_part.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.Cell4kPart.png b/src/main/resources/assets/appliedenergistics2/textures/items/material_cell4k_part.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.Cell4kPart.png rename to src/main/resources/assets/appliedenergistics2/textures/items/material_cell4k_part.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.Cell64kPart.png b/src/main/resources/assets/appliedenergistics2/textures/items/material_cell64k_part.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.Cell64kPart.png rename to src/main/resources/assets/appliedenergistics2/textures/items/material_cell64k_part.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.CertusQuartzCrystal.png b/src/main/resources/assets/appliedenergistics2/textures/items/material_certus_quartz_crystal.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.CertusQuartzCrystal.png rename to src/main/resources/assets/appliedenergistics2/textures/items/material_certus_quartz_crystal.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.CertusQuartzCrystalCharged.png b/src/main/resources/assets/appliedenergistics2/textures/items/material_certus_quartz_crystal_charged.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.CertusQuartzCrystalCharged.png rename to src/main/resources/assets/appliedenergistics2/textures/items/material_certus_quartz_crystal_charged.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.CertusQuartzDust.png b/src/main/resources/assets/appliedenergistics2/textures/items/material_certus_quartz_dust.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.CertusQuartzDust.png rename to src/main/resources/assets/appliedenergistics2/textures/items/material_certus_quartz_dust.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.EmptyStorageCell.png b/src/main/resources/assets/appliedenergistics2/textures/items/material_empty_storage_cell.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.EmptyStorageCell.png rename to src/main/resources/assets/appliedenergistics2/textures/items/material_empty_storage_cell.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.EnderDust.png b/src/main/resources/assets/appliedenergistics2/textures/items/material_ender_dust.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.EnderDust.png rename to src/main/resources/assets/appliedenergistics2/textures/items/material_ender_dust.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.EngProcessor.png b/src/main/resources/assets/appliedenergistics2/textures/items/material_eng_processor.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.EngProcessor.png rename to src/main/resources/assets/appliedenergistics2/textures/items/material_eng_processor.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.EngProcessorPress.png b/src/main/resources/assets/appliedenergistics2/textures/items/material_eng_processor_press.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.EngProcessorPress.png rename to src/main/resources/assets/appliedenergistics2/textures/items/material_eng_processor_press.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.EngProcessorPrint.png b/src/main/resources/assets/appliedenergistics2/textures/items/material_eng_processor_print.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.EngProcessorPrint.png rename to src/main/resources/assets/appliedenergistics2/textures/items/material_eng_processor_print.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.Flour.png b/src/main/resources/assets/appliedenergistics2/textures/items/material_flour.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.Flour.png rename to src/main/resources/assets/appliedenergistics2/textures/items/material_flour.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.FluixCrystal.png b/src/main/resources/assets/appliedenergistics2/textures/items/material_fluix_crystal.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.FluixCrystal.png rename to src/main/resources/assets/appliedenergistics2/textures/items/material_fluix_crystal.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.FluixDust.png b/src/main/resources/assets/appliedenergistics2/textures/items/material_fluix_dust.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.FluixDust.png rename to src/main/resources/assets/appliedenergistics2/textures/items/material_fluix_dust.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.FluixPearl.png b/src/main/resources/assets/appliedenergistics2/textures/items/material_fluix_pearl.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.FluixPearl.png rename to src/main/resources/assets/appliedenergistics2/textures/items/material_fluix_pearl.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.FormationCore.png b/src/main/resources/assets/appliedenergistics2/textures/items/material_formation_core.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.FormationCore.png rename to src/main/resources/assets/appliedenergistics2/textures/items/material_formation_core.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.GoldDust.png b/src/main/resources/assets/appliedenergistics2/textures/items/material_gold_dust.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.GoldDust.png rename to src/main/resources/assets/appliedenergistics2/textures/items/material_gold_dust.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.IronDust.png b/src/main/resources/assets/appliedenergistics2/textures/items/material_iron_dust.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.IronDust.png rename to src/main/resources/assets/appliedenergistics2/textures/items/material_iron_dust.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.IronNugget.png b/src/main/resources/assets/appliedenergistics2/textures/items/material_iron_nugget.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.IronNugget.png rename to src/main/resources/assets/appliedenergistics2/textures/items/material_iron_nugget.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.LogicProcessor.png b/src/main/resources/assets/appliedenergistics2/textures/items/material_logic_processor.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.LogicProcessor.png rename to src/main/resources/assets/appliedenergistics2/textures/items/material_logic_processor.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.LogicProcessorPress.png b/src/main/resources/assets/appliedenergistics2/textures/items/material_logic_processor_press.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.LogicProcessorPress.png rename to src/main/resources/assets/appliedenergistics2/textures/items/material_logic_processor_press.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.LogicProcessorPrint.png b/src/main/resources/assets/appliedenergistics2/textures/items/material_logic_processor_print.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.LogicProcessorPrint.png rename to src/main/resources/assets/appliedenergistics2/textures/items/material_logic_processor_print.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.MatterBall.png b/src/main/resources/assets/appliedenergistics2/textures/items/material_matter_ball.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.MatterBall.png rename to src/main/resources/assets/appliedenergistics2/textures/items/material_matter_ball.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.NamePress.png b/src/main/resources/assets/appliedenergistics2/textures/items/material_name_press.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.NamePress.png rename to src/main/resources/assets/appliedenergistics2/textures/items/material_name_press.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.NetherQuartzDust.png b/src/main/resources/assets/appliedenergistics2/textures/items/material_nether_quartz_dust.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.NetherQuartzDust.png rename to src/main/resources/assets/appliedenergistics2/textures/items/material_nether_quartz_dust.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.PurifiedCertusQuartzCrystal.png b/src/main/resources/assets/appliedenergistics2/textures/items/material_purified_certus_quartz_crystal.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.PurifiedCertusQuartzCrystal.png rename to src/main/resources/assets/appliedenergistics2/textures/items/material_purified_certus_quartz_crystal.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.PurifiedFluixCrystal.png b/src/main/resources/assets/appliedenergistics2/textures/items/material_purified_fluix_crystal.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.PurifiedFluixCrystal.png rename to src/main/resources/assets/appliedenergistics2/textures/items/material_purified_fluix_crystal.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.PurifiedNetherQuartzCrystal.png b/src/main/resources/assets/appliedenergistics2/textures/items/material_purified_nether_quartz_crystal.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.PurifiedNetherQuartzCrystal.png rename to src/main/resources/assets/appliedenergistics2/textures/items/material_purified_nether_quartz_crystal.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.QESingularity.png b/src/main/resources/assets/appliedenergistics2/textures/items/material_qesingularity.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.QESingularity.png rename to src/main/resources/assets/appliedenergistics2/textures/items/material_qesingularity.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.Silicon.png b/src/main/resources/assets/appliedenergistics2/textures/items/material_silicon.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.Silicon.png rename to src/main/resources/assets/appliedenergistics2/textures/items/material_silicon.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.SiliconPress.png b/src/main/resources/assets/appliedenergistics2/textures/items/material_silicon_press.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.SiliconPress.png rename to src/main/resources/assets/appliedenergistics2/textures/items/material_silicon_press.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.SiliconPrint.png b/src/main/resources/assets/appliedenergistics2/textures/items/material_silicon_print.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.SiliconPrint.png rename to src/main/resources/assets/appliedenergistics2/textures/items/material_silicon_print.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.Singularity.png b/src/main/resources/assets/appliedenergistics2/textures/items/material_singularity.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.Singularity.png rename to src/main/resources/assets/appliedenergistics2/textures/items/material_singularity.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.SkyDust.png b/src/main/resources/assets/appliedenergistics2/textures/items/material_sky_dust.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.SkyDust.png rename to src/main/resources/assets/appliedenergistics2/textures/items/material_sky_dust.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.Wireless.png b/src/main/resources/assets/appliedenergistics2/textures/items/material_wireless.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.Wireless.png rename to src/main/resources/assets/appliedenergistics2/textures/items/material_wireless.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.WirelessBooster.png b/src/main/resources/assets/appliedenergistics2/textures/items/material_wireless_booster.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.WirelessBooster.png rename to src/main/resources/assets/appliedenergistics2/textures/items/material_wireless_booster.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.WoodenCrank.png b/src/main/resources/assets/appliedenergistics2/textures/items/material_wooden_crank.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.WoodenCrank.png rename to src/main/resources/assets/appliedenergistics2/textures/items/material_wooden_crank.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.WoodenGear.png b/src/main/resources/assets/appliedenergistics2/textures/items/material_wooden_gear.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.WoodenGear.png rename to src/main/resources/assets/appliedenergistics2/textures/items/material_wooden_gear.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ToolMemoryCard.png b/src/main/resources/assets/appliedenergistics2/textures/items/memory_card.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/items/ToolMemoryCard.png rename to src/main/resources/assets/appliedenergistics2/textures/items/memory_card.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ToolNetherQuartzAxe.png b/src/main/resources/assets/appliedenergistics2/textures/items/nether_quartz_axe.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/items/ToolNetherQuartzAxe.png rename to src/main/resources/assets/appliedenergistics2/textures/items/nether_quartz_axe.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ToolNetherQuartzCuttingKnife.png b/src/main/resources/assets/appliedenergistics2/textures/items/nether_quartz_cutting_knife.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/items/ToolNetherQuartzCuttingKnife.png rename to src/main/resources/assets/appliedenergistics2/textures/items/nether_quartz_cutting_knife.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ToolNetherQuartzHoe.png b/src/main/resources/assets/appliedenergistics2/textures/items/nether_quartz_hoe.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/items/ToolNetherQuartzHoe.png rename to src/main/resources/assets/appliedenergistics2/textures/items/nether_quartz_hoe.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ToolNetherQuartzPickaxe.png b/src/main/resources/assets/appliedenergistics2/textures/items/nether_quartz_pickaxe.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/items/ToolNetherQuartzPickaxe.png rename to src/main/resources/assets/appliedenergistics2/textures/items/nether_quartz_pickaxe.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ToolNetherQuartzSpade.png b/src/main/resources/assets/appliedenergistics2/textures/items/nether_quartz_spade.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/items/ToolNetherQuartzSpade.png rename to src/main/resources/assets/appliedenergistics2/textures/items/nether_quartz_spade.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ToolNetherQuartzSword.png b/src/main/resources/assets/appliedenergistics2/textures/items/nether_quartz_sword.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/items/ToolNetherQuartzSword.png rename to src/main/resources/assets/appliedenergistics2/textures/items/nether_quartz_sword.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ToolNetherQuartzWrench.png b/src/main/resources/assets/appliedenergistics2/textures/items/nether_quartz_wrench.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/items/ToolNetherQuartzWrench.png rename to src/main/resources/assets/appliedenergistics2/textures/items/nether_quartz_wrench.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ToolNetworkTool.png b/src/main/resources/assets/appliedenergistics2/textures/items/network_tool.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/items/ToolNetworkTool.png rename to src/main/resources/assets/appliedenergistics2/textures/items/network_tool.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ItemPaintBall.png b/src/main/resources/assets/appliedenergistics2/textures/items/paint_ball.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/items/ItemPaintBall.png rename to src/main/resources/assets/appliedenergistics2/textures/items/paint_ball.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ItemPaintBallShimmer.png b/src/main/resources/assets/appliedenergistics2/textures/items/paint_ball_shimmer.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/items/ItemPaintBallShimmer.png rename to src/main/resources/assets/appliedenergistics2/textures/items/paint_ball_shimmer.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ItemPaintBallShimmer.png.mcmeta b/src/main/resources/assets/appliedenergistics2/textures/items/paint_ball_shimmer.png.mcmeta similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/items/ItemPaintBallShimmer.png.mcmeta rename to src/main/resources/assets/appliedenergistics2/textures/items/paint_ball_shimmer.png.mcmeta diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ToolPortableCell.png b/src/main/resources/assets/appliedenergistics2/textures/items/portable_cell.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/items/ToolPortableCell.png rename to src/main/resources/assets/appliedenergistics2/textures/items/portable_cell.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ToolReplicatorCard.png b/src/main/resources/assets/appliedenergistics2/textures/items/replicator_card.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/items/ToolReplicatorCard.png rename to src/main/resources/assets/appliedenergistics2/textures/items/replicator_card.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ItemSpatialStorageCell.128Cubed.png b/src/main/resources/assets/appliedenergistics2/textures/items/spatial_storage_cell_128_cubed.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/items/ItemSpatialStorageCell.128Cubed.png rename to src/main/resources/assets/appliedenergistics2/textures/items/spatial_storage_cell_128_cubed.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ItemSpatialStorageCell.16Cubed.png b/src/main/resources/assets/appliedenergistics2/textures/items/spatial_storage_cell_16_cubed.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/items/ItemSpatialStorageCell.16Cubed.png rename to src/main/resources/assets/appliedenergistics2/textures/items/spatial_storage_cell_16_cubed.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ItemSpatialStorageCell.2Cubed.png b/src/main/resources/assets/appliedenergistics2/textures/items/spatial_storage_cell_2_cubed.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/items/ItemSpatialStorageCell.2Cubed.png rename to src/main/resources/assets/appliedenergistics2/textures/items/spatial_storage_cell_2_cubed.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ItemViewCell.png b/src/main/resources/assets/appliedenergistics2/textures/items/view_cell.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/items/ItemViewCell.png rename to src/main/resources/assets/appliedenergistics2/textures/items/view_cell.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ToolWirelessTerminal.png b/src/main/resources/assets/appliedenergistics2/textures/items/wireless_terminal.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/items/ToolWirelessTerminal.png rename to src/main/resources/assets/appliedenergistics2/textures/items/wireless_terminal.png