diff --git a/build.gradle b/build.gradle index 63131d96..be7feec9 100644 --- a/build.gradle +++ b/build.gradle @@ -94,8 +94,9 @@ sourceSets { srcDirs += 'src/main/java/' // excludes integration due to not being available upon port - exclude 'appeng/integration/**' + exclude 'appeng/integration/modules/**' exclude 'appeng/fmp/**' + exclude 'appeng/parts/layers/**' } resources { @@ -103,6 +104,9 @@ sourceSets { include "assets/appliedenergistics2/recipes/*.recipe", "assets/appliedenergistics2/recipes/README.html", "assets/appliedenergistics2/lang/*.lang", + "assets/appliedenergistics2/blockstates/*.json", + "assets/appliedenergistics2/models/block/*.json", + "assets/appliedenergistics2/models/item/*.json", "assets/appliedenergistics2/textures/blocks/*", "assets/appliedenergistics2/textures/guis/*", "assets/appliedenergistics2/textures/models/*", diff --git a/src/main/java/appeng/core/AppEng.java b/src/main/java/appeng/core/AppEng.java index 82040113..43d67aaf 100644 --- a/src/main/java/appeng/core/AppEng.java +++ b/src/main/java/appeng/core/AppEng.java @@ -58,6 +58,10 @@ public final class AppEng { public static final String MOD_ID = "appliedenergistics2"; public static final String MOD_NAME = "Applied Energistics 2"; + + public static final String MODID = "appliedenergistics2"; + public static final String ASSETS = "appliedenergistics2:"; + public static final String MOD_DEPENDENCIES = // a few mods, AE should load after, probably. // required-after:AppliedEnergistics2API|all; @@ -70,6 +74,17 @@ public final class AppEng + net.minecraftforge.common.ForgeVersion.revisionVersion + '.' // revisionVersion + net.minecraftforge.common.ForgeVersion.buildVersion + ",)"; // buildVersion +// public static final String nameCustomWall = "custom_wall"; +// public static final BlockWall blockCustomWall = new BlockWall( Blocks.cobblestone); +// public static final ItemMultiTexture itemCustomWall = new ItemMultiTexture(blockCustomWall, blockCustomWall, new Function() +// { +// @Override +// public String apply(ItemStack stack) +// { +// return BlockWall.EnumType.byMetadata(stack.getMetadata()).getUnlocalizedName(); +// } +// }); + @Nonnull private static final AppEng INSTANCE = new AppEng(); @@ -138,9 +153,45 @@ public final class AppEng this.startService( "AE2 VersionChecker", versionCheckerThread ); } +// blockCustomWall.setUnlocalizedName(MODID + ".customWall"); +// GameRegistry.registerBlock( blockCustomWall, null, nameCustomWall ); +// GameRegistry.registerItem(itemCustomWall, nameCustomWall); +// GameData.getBlockItemMap().put( blockCustomWall, itemCustomWall ); +// +// if (event.getSide() == Side.CLIENT) +// preInitClient(event); + AELog.info( "Pre Initialization ( ended after " + watch.elapsed( TimeUnit.MILLISECONDS ) + "ms )" ); } +// @SideOnly(Side.CLIENT) +// public void preInitClient(FMLPreInitializationEvent event) +// { +// ModelLoader.setCustomStateMapper( blockCustomWall, new IStateMapper() +// { +// StateMap stateMap = new StateMap.Builder().setProperty( BlockWall.VARIANT ).setBuilderSuffix( "_wall" ).build(); +// +// @Override +// public Map putStateModelLocations( Block block ) +// { +// Map map = (Map) stateMap.putStateModelLocations( block ); +// Map newMap = Maps.newHashMap(); +// +// for( Map.Entry e : map.entrySet() ) +// { +// ModelResourceLocation loc = e.getValue(); +// newMap.put( e.getKey(), new ModelResourceLocation( ASSETS + loc.getResourcePath(), loc.getVariant() ) ); +// } +// +// return newMap; +// } +// } ); +// Item customWallItem = Item.getItemFromBlock(blockCustomWall); +// ModelLoader.setCustomModelResourceLocation(customWallItem, 0, new ModelResourceLocation(ASSETS + "cobblestone_wall", "inventory")); +// ModelLoader.setCustomModelResourceLocation(customWallItem, 1, new ModelResourceLocation(ASSETS + "mossy_cobblestone_wall", "inventory")); +// ModelBakery.addVariantName( customWallItem, ASSETS + "cobblestone_wall", ASSETS + "mossy_cobblestone_wall" ); +// } + private void startService( String serviceName, Thread thread ) { thread.setName( serviceName ); diff --git a/src/main/java/appeng/core/api/definitions/ApiBlocks.java b/src/main/java/appeng/core/api/definitions/ApiBlocks.java index 4eb3e38d..d674dc48 100644 --- a/src/main/java/appeng/core/api/definitions/ApiBlocks.java +++ b/src/main/java/appeng/core/api/definitions/ApiBlocks.java @@ -212,14 +212,14 @@ public final class ApiBlocks implements IBlocks this.lightDetector = constructor.registerTileDefinition( new BlockLightDetector() ); this.paint = constructor.registerTileDefinition( new BlockPaint() ); - this.skyStoneStair = makeStairs( constructor,skyStone_stone, "skystone_stone" ) ; - this.skyStoneBlockStair = makeStairs( constructor,skyStone_block, "skystone_block" ) ; - this.skyStoneBrickStair = makeStairs( constructor,skyStone_brick, "skystone_brick" ) ; - this.skyStoneSmallBrickStair = makeStairs( constructor, skyStone_smallbrick, "skystone_smallbrick" ) ; + this.skyStoneStair = makeStairs( constructor,skyStone_stone, "skystone" ) ; + this.skyStoneBlockStair = makeStairs( constructor,skyStone_block, "skystone.block" ) ; + this.skyStoneBrickStair = makeStairs( constructor,skyStone_brick, "skystone.brick" ) ; + this.skyStoneSmallBrickStair = makeStairs( constructor, skyStone_smallbrick, "skystone.brick.small" ) ; this.fluixStair = makeStairs( constructor, fluix, "fluix" ) ; - this.quartzStair = makeStairs( constructor,quartz, "quartz" ) ; - this.chiseledQuartzStair = makeStairs( constructor, quartzChiseled, "quartz_chiseled" ) ; - this.quartzPillarStair = makeStairs( constructor, quartzPillar, "quartz_pillar" ) ; + this.quartzStair = makeStairs( constructor,quartz, "quartz.certus" ) ; + this.chiseledQuartzStair = makeStairs( constructor, quartzChiseled, "quartz.certus.chiseled" ) ; + this.quartzPillarStair = makeStairs( constructor, quartzPillar, "quartz.certus.pillar" ) ; // TODO Re-Add Slabs... /* @@ -239,8 +239,7 @@ public final class ApiBlocks implements IBlocks this.cubeGenerator = constructor.registerBlockDefinition( new BlockCubeGenerator() ); } - private IBlockDefinition makeStairs(DefinitionConstructor constructor, - IBlockDefinition block, String name ) + private IBlockDefinition makeStairs(DefinitionConstructor constructor, IBlockDefinition block, String name ) { if ( block.maybeBlock().isPresent() ) return constructor.registerBlockDefinition( new BlockStairCommon( block.maybeBlock().get(), name )); diff --git a/src/main/java/appeng/core/features/FeatureNameExtractor.java b/src/main/java/appeng/core/features/FeatureNameExtractor.java index 75f47c74..787b58c6 100644 --- a/src/main/java/appeng/core/features/FeatureNameExtractor.java +++ b/src/main/java/appeng/core/features/FeatureNameExtractor.java @@ -51,6 +51,10 @@ public class FeatureNameExtractor { name = PATTERN_ITEM_MULTI_MATERIAL.matcher( name ).replaceAll( "ItemMaterial" ); } + else if ( name.startsWith( "BlockStairCommon" ) ) + { + name = "stair"; + } if( this.subName.isPresent() ) { diff --git a/src/main/java/appeng/core/features/StairBlockFeatureHandler.java b/src/main/java/appeng/core/features/StairBlockFeatureHandler.java index daa78dcf..5c76c8a6 100644 --- a/src/main/java/appeng/core/features/StairBlockFeatureHandler.java +++ b/src/main/java/appeng/core/features/StairBlockFeatureHandler.java @@ -21,14 +21,15 @@ package appeng.core.features; import java.util.EnumSet; +import com.google.common.base.Optional; + import net.minecraft.block.BlockStairs; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; + import appeng.api.definitions.IBlockDefinition; import appeng.core.CreativeTab; -import com.google.common.base.Optional; - public class StairBlockFeatureHandler implements IFeatureHandler { @@ -60,16 +61,16 @@ public class StairBlockFeatureHandler implements IFeatureHandler } @Override - public final void register(Side side) + public final void register( Side side ) { if( this.enabled ) { String name = this.extractor.get(); this.stairs.setCreativeTab( CreativeTab.instance ); this.stairs.setUnlocalizedName( "appliedenergistics2." + name ); - //this.stairs.setBlockTextureName( "appliedenergistics2:" + name ); - GameRegistry.registerBlock( this.stairs, "tile." + name ); + // "tile." + + GameRegistry.registerBlock( this.stairs, name ); } } } diff --git a/src/main/java/appeng/services/version/github/ReleaseFetcher.java b/src/main/java/appeng/services/version/github/ReleaseFetcher.java index 676907ac..676cd85f 100644 --- a/src/main/java/appeng/services/version/github/ReleaseFetcher.java +++ b/src/main/java/appeng/services/version/github/ReleaseFetcher.java @@ -3,9 +3,13 @@ package appeng.services.version.github; import java.io.IOException; import java.lang.reflect.Type; +import java.net.MalformedURLException; import java.net.URL; import java.util.List; +import com.google.gson.Gson; +import com.google.gson.reflect.TypeToken; + import org.apache.commons.io.IOUtils; import appeng.core.AELog; @@ -14,9 +18,6 @@ import appeng.services.version.Version; import appeng.services.version.VersionCheckerConfig; import appeng.services.version.VersionParser; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; - public final class ReleaseFetcher { @@ -49,12 +50,16 @@ public final class ReleaseFetcher return latestFitRelease; } - catch( Exception e ) + catch( MalformedURLException e ) { AELog.error( e ); - - return EXCEPTIONAL_RELEASE; } + catch( IOException e ) + { + AELog.warning( "Could not connect to %s.", GITHUB_RELEASES_URL ); + } + + return EXCEPTIONAL_RELEASE; } private String getRawReleases( URL url ) throws IOException 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..a0811126 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/blockstates/stair.fluix.json @@ -0,0 +1,44 @@ +{ + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "stair.fluix" }, + "facing=west,half=bottom,shape=straight": { "model": "stair.fluix", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "stair.fluix", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "stair.fluix", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "stair.fluix.outer" }, + "facing=west,half=bottom,shape=outer_right": { "model": "stair.fluix.outer", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "stair.fluix.outer", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "stair.fluix.outer", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "stair.fluix.outer", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "stair.fluix.outer", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "stair.fluix.outer" }, + "facing=north,half=bottom,shape=outer_left": { "model": "stair.fluix.outer", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "stair.fluix.inner" }, + "facing=west,half=bottom,shape=inner_right": { "model": "stair.fluix.inner", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "stair.fluix.inner", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "stair.fluix.inner", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "stair.fluix.inner", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "stair.fluix.inner", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "stair.fluix.inner" }, + "facing=north,half=bottom,shape=inner_left": { "model": "stair.fluix.inner", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "stair.fluix", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "stair.fluix", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "stair.fluix", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "stair.fluix", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "stair.fluix.outer", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "stair.fluix.outer", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "stair.fluix.outer", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "stair.fluix.outer", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "stair.fluix.outer", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "stair.fluix.outer", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "stair.fluix.outer", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "stair.fluix.outer", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "stair.fluix.inner", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "stair.fluix.inner", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "stair.fluix.inner", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "stair.fluix.inner", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "stair.fluix.inner", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "stair.fluix.inner", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "stair.fluix.inner", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "stair.fluix.inner", "x": 180, "uvlock": true } + } +} 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..ffdfd4e3 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/blockstates/stair.quartz.certus.chiseled.json @@ -0,0 +1,44 @@ +{ + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "stair.quartz.certus.chiseled" }, + "facing=west,half=bottom,shape=straight": { "model": "stair.quartz.certus.chiseled", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "stair.quartz.certus.chiseled", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "stair.quartz.certus.chiseled", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "stair.quartz.certus.chiseled.outer" }, + "facing=west,half=bottom,shape=outer_right": { "model": "stair.quartz.certus.chiseled.outer", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "stair.quartz.certus.chiseled.outer", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "stair.quartz.certus.chiseled.outer", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "stair.quartz.certus.chiseled.outer", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "stair.quartz.certus.chiseled.outer", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "stair.quartz.certus.chiseled.outer" }, + "facing=north,half=bottom,shape=outer_left": { "model": "stair.quartz.certus.chiseled.outer", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "stair.quartz.certus.chiseled.inner" }, + "facing=west,half=bottom,shape=inner_right": { "model": "stair.quartz.certus.chiseled.inner", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "stair.quartz.certus.chiseled.inner", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "stair.quartz.certus.chiseled.inner", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "stair.quartz.certus.chiseled.inner", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "stair.quartz.certus.chiseled.inner", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "stair.quartz.certus.chiseled.inner" }, + "facing=north,half=bottom,shape=inner_left": { "model": "stair.quartz.certus.chiseled.inner", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "stair.quartz.certus.chiseled", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "stair.quartz.certus.chiseled", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "stair.quartz.certus.chiseled", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "stair.quartz.certus.chiseled", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "stair.quartz.certus.chiseled.outer", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "stair.quartz.certus.chiseled.outer", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "stair.quartz.certus.chiseled.outer", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "stair.quartz.certus.chiseled.outer", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "stair.quartz.certus.chiseled.outer", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "stair.quartz.certus.chiseled.outer", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "stair.quartz.certus.chiseled.outer", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "stair.quartz.certus.chiseled.outer", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "stair.quartz.certus.chiseled.inner", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "stair.quartz.certus.chiseled.inner", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "stair.quartz.certus.chiseled.inner", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "stair.quartz.certus.chiseled.inner", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "stair.quartz.certus.chiseled.inner", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "stair.quartz.certus.chiseled.inner", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "stair.quartz.certus.chiseled.inner", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "stair.quartz.certus.chiseled.inner", "x": 180, "uvlock": true } + } +} 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..f3eea3ea --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/blockstates/stair.quartz.certus.json @@ -0,0 +1,44 @@ +{ + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "stair.quartz.certus" }, + "facing=west,half=bottom,shape=straight": { "model": "stair.quartz.certus", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "stair.quartz.certus", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "stair.quartz.certus", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "stair.quartz.certus.outer" }, + "facing=west,half=bottom,shape=outer_right": { "model": "stair.quartz.certus.outer", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "stair.quartz.certus.outer", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "stair.quartz.certus.outer", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "stair.quartz.certus.outer", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "stair.quartz.certus.outer", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "stair.quartz.certus.outer" }, + "facing=north,half=bottom,shape=outer_left": { "model": "stair.quartz.certus.outer", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "stair.quartz.certus.inner" }, + "facing=west,half=bottom,shape=inner_right": { "model": "stair.quartz.certus.inner", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "stair.quartz.certus.inner", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "stair.quartz.certus.inner", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "stair.quartz.certus.inner", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "stair.quartz.certus.inner", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "stair.quartz.certus.inner" }, + "facing=north,half=bottom,shape=inner_left": { "model": "stair.quartz.certus.inner", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "stair.quartz.certus", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "stair.quartz.certus", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "stair.quartz.certus", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "stair.quartz.certus", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "stair.quartz.certus.outer", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "stair.quartz.certus.outer", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "stair.quartz.certus.outer", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "stair.quartz.certus.outer", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "stair.quartz.certus.outer", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "stair.quartz.certus.outer", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "stair.quartz.certus.outer", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "stair.quartz.certus.outer", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "stair.quartz.certus.inner", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "stair.quartz.certus.inner", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "stair.quartz.certus.inner", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "stair.quartz.certus.inner", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "stair.quartz.certus.inner", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "stair.quartz.certus.inner", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "stair.quartz.certus.inner", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "stair.quartz.certus.inner", "x": 180, "uvlock": true } + } +} 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..6b31f6be --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/blockstates/stair.quartz.certus.pillar.json @@ -0,0 +1,44 @@ +{ + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "stair.quartz.certus.pillar" }, + "facing=west,half=bottom,shape=straight": { "model": "stair.quartz.certus.pillar", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "stair.quartz.certus.pillar", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "stair.quartz.certus.pillar", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "stair.quartz.certus.pillar.outer" }, + "facing=west,half=bottom,shape=outer_right": { "model": "stair.quartz.certus.pillar.outer", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "stair.quartz.certus.pillar.outer", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "stair.quartz.certus.pillar.outer", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "stair.quartz.certus.pillar.outer", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "stair.quartz.certus.pillar.outer", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "stair.quartz.certus.pillar.outer" }, + "facing=north,half=bottom,shape=outer_left": { "model": "stair.quartz.certus.pillar.outer", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "stair.quartz.certus.pillar.inner" }, + "facing=west,half=bottom,shape=inner_right": { "model": "stair.quartz.certus.pillar.inner", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "stair.quartz.certus.pillar.inner", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "stair.quartz.certus.pillar.inner", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "stair.quartz.certus.pillar.inner", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "stair.quartz.certus.pillar.inner", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "stair.quartz.certus.pillar.inner" }, + "facing=north,half=bottom,shape=inner_left": { "model": "stair.quartz.certus.pillar.inner", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "stair.quartz.certus.pillar", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "stair.quartz.certus.pillar", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "stair.quartz.certus.pillar", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "stair.quartz.certus.pillar", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "stair.quartz.certus.pillar.outer", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "stair.quartz.certus.pillar.outer", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "stair.quartz.certus.pillar.outer", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "stair.quartz.certus.pillar.outer", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "stair.quartz.certus.pillar.outer", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "stair.quartz.certus.pillar.outer", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "stair.quartz.certus.pillar.outer", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "stair.quartz.certus.pillar.outer", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "stair.quartz.certus.pillar.inner", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "stair.quartz.certus.pillar.inner", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "stair.quartz.certus.pillar.inner", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "stair.quartz.certus.pillar.inner", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "stair.quartz.certus.pillar.inner", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "stair.quartz.certus.pillar.inner", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "stair.quartz.certus.pillar.inner", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "stair.quartz.certus.pillar.inner", "x": 180, "uvlock": true } + } +} 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..18e8c419 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/blockstates/stair.skystone.block.json @@ -0,0 +1,44 @@ +{ + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "stair.skystone.block" }, + "facing=west,half=bottom,shape=straight": { "model": "stair.skystone.block", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "stair.skystone.block", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "stair.skystone.block", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "stair.skystone.block.outer" }, + "facing=west,half=bottom,shape=outer_right": { "model": "stair.skystone.block.outer", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "stair.skystone.block.outer", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "stair.skystone.block.outer", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "stair.skystone.block.outer", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "stair.skystone.block.outer", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "stair.skystone.block.outer" }, + "facing=north,half=bottom,shape=outer_left": { "model": "stair.skystone.block.outer", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "stair.skystone.block.inner" }, + "facing=west,half=bottom,shape=inner_right": { "model": "stair.skystone.block.inner", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "stair.skystone.block.inner", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "stair.skystone.block.inner", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "stair.skystone.block.inner", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "stair.skystone.block.inner", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "stair.skystone.block.inner" }, + "facing=north,half=bottom,shape=inner_left": { "model": "stair.skystone.block.inner", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "stair.skystone.block", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "stair.skystone.block", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "stair.skystone.block", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "stair.skystone.block", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "stair.skystone.block.outer", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "stair.skystone.block.outer", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "stair.skystone.block.outer", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "stair.skystone.block.outer", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "stair.skystone.block.outer", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "stair.skystone.block.outer", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "stair.skystone.block.outer", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "stair.skystone.block.outer", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "stair.skystone.block.inner", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "stair.skystone.block.inner", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "stair.skystone.block.inner", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "stair.skystone.block.inner", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "stair.skystone.block.inner", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "stair.skystone.block.inner", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "stair.skystone.block.inner", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "stair.skystone.block.inner", "x": 180, "uvlock": true } + } +} 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..4d10e247 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/blockstates/stair.skystone.brick.json @@ -0,0 +1,44 @@ +{ + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "stair.skystone.brick" }, + "facing=west,half=bottom,shape=straight": { "model": "stair.skystone.brick", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "stair.skystone.brick", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "stair.skystone.brick", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "stair.skystone.brick.outer" }, + "facing=west,half=bottom,shape=outer_right": { "model": "stair.skystone.brick.outer", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "stair.skystone.brick.outer", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "stair.skystone.brick.outer", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "stair.skystone.brick.outer", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "stair.skystone.brick.outer", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "stair.skystone.brick.outer" }, + "facing=north,half=bottom,shape=outer_left": { "model": "stair.skystone.brick.outer", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "stair.skystone.brick.inner" }, + "facing=west,half=bottom,shape=inner_right": { "model": "stair.skystone.brick.inner", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "stair.skystone.brick.inner", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "stair.skystone.brick.inner", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "stair.skystone.brick.inner", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "stair.skystone.brick.inner", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "stair.skystone.brick.inner" }, + "facing=north,half=bottom,shape=inner_left": { "model": "stair.skystone.brick.inner", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "stair.skystone.brick", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "stair.skystone.brick", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "stair.skystone.brick", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "stair.skystone.brick", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "stair.skystone.brick.outer", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "stair.skystone.brick.outer", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "stair.skystone.brick.outer", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "stair.skystone.brick.outer", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "stair.skystone.brick.outer", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "stair.skystone.brick.outer", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "stair.skystone.brick.outer", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "stair.skystone.brick.outer", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "stair.skystone.brick.inner", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "stair.skystone.brick.inner", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "stair.skystone.brick.inner", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "stair.skystone.brick.inner", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "stair.skystone.brick.inner", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "stair.skystone.brick.inner", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "stair.skystone.brick.inner", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "stair.skystone.brick.inner", "x": 180, "uvlock": true } + } +} 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..063d6b70 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/blockstates/stair.skystone.brick.small.json @@ -0,0 +1,44 @@ +{ + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "stair.skystone.brick.small" }, + "facing=west,half=bottom,shape=straight": { "model": "stair.skystone.brick.small", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "stair.skystone.brick.small", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "stair.skystone.brick.small", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "stair.skystone.brick.small.outer" }, + "facing=west,half=bottom,shape=outer_right": { "model": "stair.skystone.brick.small.outer", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "stair.skystone.brick.small.outer", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "stair.skystone.brick.small.outer", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "stair.skystone.brick.small.outer", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "stair.skystone.brick.small.outer", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "stair.skystone.brick.small.outer" }, + "facing=north,half=bottom,shape=outer_left": { "model": "stair.skystone.brick.small.outer", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "stair.skystone.brick.small.inner" }, + "facing=west,half=bottom,shape=inner_right": { "model": "stair.skystone.brick.small.inner", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "stair.skystone.brick.small.inner", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "stair.skystone.brick.small.inner", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "stair.skystone.brick.small.inner", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "stair.skystone.brick.small.inner", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "stair.skystone.brick.small.inner" }, + "facing=north,half=bottom,shape=inner_left": { "model": "stair.skystone.brick.small.inner", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "stair.skystone.brick.small", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "stair.skystone.brick.small", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "stair.skystone.brick.small", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "stair.skystone.brick.small", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "stair.skystone.brick.small.outer", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "stair.skystone.brick.small.outer", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "stair.skystone.brick.small.outer", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "stair.skystone.brick.small.outer", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "stair.skystone.brick.small.outer", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "stair.skystone.brick.small.outer", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "stair.skystone.brick.small.outer", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "stair.skystone.brick.small.outer", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "stair.skystone.brick.small.inner", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "stair.skystone.brick.small.inner", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "stair.skystone.brick.small.inner", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "stair.skystone.brick.small.inner", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "stair.skystone.brick.small.inner", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "stair.skystone.brick.small.inner", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "stair.skystone.brick.small.inner", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "stair.skystone.brick.small.inner", "x": 180, "uvlock": true } + } +} diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/stair.skystone.json b/src/main/resources/assets/appliedenergistics2/blockstates/stair.skystone.json new file mode 100644 index 00000000..4b4d3989 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/blockstates/stair.skystone.json @@ -0,0 +1,44 @@ +{ + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "stair.skystone" }, + "facing=west,half=bottom,shape=straight": { "model": "stair.skystone", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "stair.skystone", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "stair.skystone", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "stair.skystone.outer" }, + "facing=west,half=bottom,shape=outer_right": { "model": "stair.skystone.outer", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "stair.skystone.outer", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "stair.skystone.outer", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "stair.skystone.outer", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "stair.skystone.outer", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "stair.skystone.outer" }, + "facing=north,half=bottom,shape=outer_left": { "model": "stair.skystone.outer", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "stair.skystone.inner" }, + "facing=west,half=bottom,shape=inner_right": { "model": "stair.skystone.inner", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "stair.skystone.inner", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "stair.skystone.inner", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "stair.skystone.inner", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "stair.skystone.inner", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "stair.skystone.inner" }, + "facing=north,half=bottom,shape=inner_left": { "model": "stair.skystone.inner", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "stair.skystone", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "stair.skystone", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "stair.skystone", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "stair.skystone", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "stair.skystone.outer", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "stair.skystone.outer", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "stair.skystone.outer", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "stair.skystone.outer", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "stair.skystone.outer", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "stair.skystone.outer", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "stair.skystone.outer", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "stair.skystone.outer", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "stair.skystone.inner", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "stair.skystone.inner", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "stair.skystone.inner", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "stair.skystone.inner", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "stair.skystone.inner", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "stair.skystone.inner", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "stair.skystone.inner", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "stair.skystone.inner", "x": 180, "uvlock": true } + } +} diff --git a/src/main/resources/assets/appliedenergistics2/lang/en_US.lang b/src/main/resources/assets/appliedenergistics2/lang/en_US.lang index 007c050f..5448f4c6 100644 --- a/src/main/resources/assets/appliedenergistics2/lang/en_US.lang +++ b/src/main/resources/assets/appliedenergistics2/lang/en_US.lang @@ -52,10 +52,10 @@ tile.appliedenergistics2.BlockCraftingUnit.name=Crafting Unit tile.appliedenergistics2.BlockMolecularAssembler.name=Molecular Assembler // Stairs -tile.appliedenergistics2.ChiseledQuartzStairBlock.name=Chiseled Certus Quartz Stairs -tile.appliedenergistics2.FluixStairBlock.name=Fluix Stairs -tile.appliedenergistics2.QuartzPillarStairBlock.name=Certus Quartz Pillar Stairs -tile.appliedenergistics2.QuartzStairBlock.name=Certus Quartz Stairs +tile.appliedenergistics2.stair.fluix.name=Fluix Stairs +tile.appliedenergistics2.stair.quartz.certus.name=Certus Quartz Stairs +tile.appliedenergistics2.stair.quartz.certus.chiseled.name=Chiseled Certus Quartz Stairs +tile.appliedenergistics2.stair.quartz.certus.pillar.name=Certus Quartz Pillar Stairs tile.appliedenergistics2.SkyStoneBlockStairBlock.name=Sky Stone Block Stairs tile.appliedenergistics2.SkyStoneBrickStairBlock.name=Sky Stone Brick Stairs tile.appliedenergistics2.SkyStoneSmallBrickStairBlock.name=Sky Stone Small Brick Stairs diff --git a/src/main/resources/assets/appliedenergistics2/lang/fr_FR.lang b/src/main/resources/assets/appliedenergistics2/lang/fr_FR.lang index f8e310c8..5d9808ce 100644 --- a/src/main/resources/assets/appliedenergistics2/lang/fr_FR.lang +++ b/src/main/resources/assets/appliedenergistics2/lang/fr_FR.lang @@ -53,7 +53,7 @@ tile.appliedenergistics2.BlockMolecularAssembler.name=Assembleur moléculaire // Stairs tile.appliedenergistics2.ChiseledQuartzStairBlock.name=Escaliers de Quartz Certus ciselé -tile.appliedenergistics2.FluixStairBlock.name=Escaliers de Fluix +tile.appliedenergistics2.stair.fluix.name=Escaliers de Fluix tile.appliedenergistics2.QuartzPillarStairBlock.name=Escaliers de pilier de Quartz Certus tile.appliedenergistics2.QuartzStairBlock.name=Escaliers de Quartz Certus tile.appliedenergistics2.SkyStoneBlockStairBlock.name=Escaliers de bloc de pierre de ciel diff --git a/src/main/resources/assets/appliedenergistics2/lang/it_IT.lang b/src/main/resources/assets/appliedenergistics2/lang/it_IT.lang index f0861515..b86e5c87 100644 --- a/src/main/resources/assets/appliedenergistics2/lang/it_IT.lang +++ b/src/main/resources/assets/appliedenergistics2/lang/it_IT.lang @@ -53,7 +53,7 @@ tile.appliedenergistics2.BlockMolecularAssembler.name=Assemblatore moleculare // Stairs tile.appliedenergistics2.ChiseledQuartzStairBlock.name=Scalini di quarzo certus intagliato -tile.appliedenergistics2.FluixStairBlock.name=Scalini di fluix +tile.appliedenergistics2.stair.fluix.name=Scalini di fluix tile.appliedenergistics2.QuartzPillarStairBlock.name=Scalini di pilastro di quarzo certus tile.appliedenergistics2.QuartzStairBlock.name=Scalini di quarzo certus tile.appliedenergistics2.SkyStoneBlockStairBlock.name=Scalini di blocco di roccia del cielo diff --git a/src/main/resources/assets/appliedenergistics2/lang/ko_KR.lang b/src/main/resources/assets/appliedenergistics2/lang/ko_KR.lang index 62226036..2ebb1d3c 100644 --- a/src/main/resources/assets/appliedenergistics2/lang/ko_KR.lang +++ b/src/main/resources/assets/appliedenergistics2/lang/ko_KR.lang @@ -52,7 +52,7 @@ tile.appliedenergistics2.BlockMolecularAssembler.name=분자 조합기 // Stairs tile.appliedenergistics2.ChiseledQuartzStairBlock.name=Chiseled Certus Quartz Stairs -tile.appliedenergistics2.FluixStairBlock.name=Fluix Stairs +tile.appliedenergistics2.stair.fluix.name=Fluix Stairs tile.appliedenergistics2.QuartzPillarStairBlock.name=Certus Quartz Pillar Stairs tile.appliedenergistics2.QuartzStairBlock.name=세투스 석영 계단 tile.appliedenergistics2.SkyStoneBlockStairBlock.name=스카이 스톤 블록 계단 diff --git a/src/main/resources/assets/appliedenergistics2/lang/pt_BR.lang b/src/main/resources/assets/appliedenergistics2/lang/pt_BR.lang index a7eaa034..800d4573 100644 --- a/src/main/resources/assets/appliedenergistics2/lang/pt_BR.lang +++ b/src/main/resources/assets/appliedenergistics2/lang/pt_BR.lang @@ -53,7 +53,7 @@ tile.appliedenergistics2.BlockMolecularAssembler.name=Montador Molecular // Escadas tile.appliedenergistics2.ChiseledQuartzStairBlock.name=Escadas de Quartzo Certus Talhadas -tile.appliedenergistics2.FluixStairBlock.name=Escadas de Fluix +tile.appliedenergistics2.stair.fluix.name=Escadas de Fluix tile.appliedenergistics2.QuartzPillarStairBlock.name=Escadas de Pilar de Quartzo Certus tile.appliedenergistics2.QuartzStairBlock.name=Escadas de Quartzo Certus tile.appliedenergistics2.SkyStoneBlockStairBlock.name=Escadas de Bloco de Pedra do Céu diff --git a/src/main/resources/assets/appliedenergistics2/lang/ru_RU.lang b/src/main/resources/assets/appliedenergistics2/lang/ru_RU.lang index 5a92dad8..3ed504af 100644 --- a/src/main/resources/assets/appliedenergistics2/lang/ru_RU.lang +++ b/src/main/resources/assets/appliedenergistics2/lang/ru_RU.lang @@ -53,7 +53,7 @@ tile.appliedenergistics2.BlockMolecularAssembler.name=Молекулярный // Stairs tile.appliedenergistics2.ChiseledQuartzStairBlock.name=Ступеньки из резного истинного кварца -tile.appliedenergistics2.FluixStairBlock.name=Изменчивые ступеньки +tile.appliedenergistics2.stair.fluix.name=Изменчивые ступеньки tile.appliedenergistics2.QuartzPillarStairBlock.name=Ступеньки из колонны истинного кварца tile.appliedenergistics2.QuartzStairBlock.name=Ступеньки из истинного кварца tile.appliedenergistics2.SkyStoneBlockStairBlock.name=Ступеньки из блока небесного камня diff --git a/src/main/resources/assets/appliedenergistics2/lang/zh_CN.lang b/src/main/resources/assets/appliedenergistics2/lang/zh_CN.lang index 6c847d7b..2fcecb87 100644 --- a/src/main/resources/assets/appliedenergistics2/lang/zh_CN.lang +++ b/src/main/resources/assets/appliedenergistics2/lang/zh_CN.lang @@ -53,7 +53,7 @@ tile.appliedenergistics2.BlockMolecularAssembler.name=分子装配室 // 楼梯 tile.appliedenergistics2.ChiseledQuartzStairBlock.name=錾制赛特斯石英楼梯 -tile.appliedenergistics2.FluixStairBlock.name=福鲁伊克斯楼梯 +tile.appliedenergistics2.stair.fluix.name=福鲁伊克斯楼梯 tile.appliedenergistics2.QuartzPillarStairBlock.name=竖纹赛特斯石英楼梯 tile.appliedenergistics2.QuartzStairBlock.name=赛特斯石英楼梯 tile.appliedenergistics2.SkyStoneBlockStairBlock.name=陨石块楼梯 diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stair.fluix.inner.json b/src/main/resources/assets/appliedenergistics2/models/block/stair.fluix.inner.json new file mode 100644 index 00000000..42a50200 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/stair.fluix.inner.json @@ -0,0 +1,8 @@ +{ + "parent": "block/inner_stairs", + "textures": { + "bottom": "appliedenergistics2:blocks/BlockFluix", + "top": "appliedenergistics2:blocks/BlockFluix", + "side": "appliedenergistics2:blocks/BlockFluix" + } +} diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stair.fluix.json b/src/main/resources/assets/appliedenergistics2/models/block/stair.fluix.json new file mode 100644 index 00000000..4b5861f0 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/stair.fluix.json @@ -0,0 +1,8 @@ +{ + "parent": "block/stairs", + "textures": { + "bottom": "appliedenergistics2:blocks/BlockFluix", + "top": "appliedenergistics2:blocks/BlockFluix", + "side": "appliedenergistics2:blocks/BlockFluix" + } +} diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stair.fluix.outer.json b/src/main/resources/assets/appliedenergistics2/models/block/stair.fluix.outer.json new file mode 100644 index 00000000..51d7e3dd --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/stair.fluix.outer.json @@ -0,0 +1,8 @@ +{ + "parent": "block/outer_stairs", + "textures": { + "bottom": "appliedenergistics2:blocks/BlockFluix", + "top": "appliedenergistics2:blocks/BlockFluix", + "side": "appliedenergistics2:blocks/BlockFluix" + } +} diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stair.quartz.certus.chiseled.inner.json b/src/main/resources/assets/appliedenergistics2/models/block/stair.quartz.certus.chiseled.inner.json new file mode 100644 index 00000000..d4a3867f --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/stair.quartz.certus.chiseled.inner.json @@ -0,0 +1,8 @@ +{ + "parent": "block/inner_stairs", + "textures": { + "bottom": "appliedenergistics2:blocks/BlockQuartzChiseled", + "top": "appliedenergistics2:blocks/BlockQuartzChiseled", + "side": "appliedenergistics2:blocks/BlockQuartzChiseledSide" + } +} diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stair.quartz.certus.chiseled.json b/src/main/resources/assets/appliedenergistics2/models/block/stair.quartz.certus.chiseled.json new file mode 100644 index 00000000..f4e3afc9 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/stair.quartz.certus.chiseled.json @@ -0,0 +1,8 @@ +{ + "parent": "block/stairs", + "textures": { + "bottom": "appliedenergistics2:blocks/BlockQuartzChiseled", + "top": "appliedenergistics2:blocks/BlockQuartzChiseled", + "side": "appliedenergistics2:blocks/BlockQuartzChiseledSide" + } +} diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stair.quartz.certus.chiseled.outer.json b/src/main/resources/assets/appliedenergistics2/models/block/stair.quartz.certus.chiseled.outer.json new file mode 100644 index 00000000..d37342d0 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/stair.quartz.certus.chiseled.outer.json @@ -0,0 +1,8 @@ +{ + "parent": "block/outer_stairs", + "textures": { + "bottom": "appliedenergistics2:blocks/BlockQuartzChiseled", + "top": "appliedenergistics2:blocks/BlockQuartzChiseled", + "side": "appliedenergistics2:blocks/BlockQuartzChiseledSide" + } +} diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stair.quartz.certus.inner.json b/src/main/resources/assets/appliedenergistics2/models/block/stair.quartz.certus.inner.json new file mode 100644 index 00000000..c0d08b22 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/stair.quartz.certus.inner.json @@ -0,0 +1,8 @@ +{ + "parent": "block/inner_stairs", + "textures": { + "bottom": "appliedenergistics2:blocks/BlockQuartz", + "top": "appliedenergistics2:blocks/BlockQuartz", + "side": "appliedenergistics2:blocks/BlockQuartz" + } +} diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stair.quartz.certus.json b/src/main/resources/assets/appliedenergistics2/models/block/stair.quartz.certus.json new file mode 100644 index 00000000..82f6f811 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/stair.quartz.certus.json @@ -0,0 +1,8 @@ +{ + "parent": "block/stairs", + "textures": { + "bottom": "appliedenergistics2:blocks/BlockQuartz", + "top": "appliedenergistics2:blocks/BlockQuartz", + "side": "appliedenergistics2:blocks/BlockQuartz" + } +} diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stair.quartz.certus.outer.json b/src/main/resources/assets/appliedenergistics2/models/block/stair.quartz.certus.outer.json new file mode 100644 index 00000000..c6d8491e --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/stair.quartz.certus.outer.json @@ -0,0 +1,8 @@ +{ + "parent": "block/outer_stairs", + "textures": { + "bottom": "appliedenergistics2:blocks/BlockQuartz", + "top": "appliedenergistics2:blocks/BlockQuartz", + "side": "appliedenergistics2:blocks/BlockQuartz" + } +} diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stair.quartz.certus.pillar.inner.json b/src/main/resources/assets/appliedenergistics2/models/block/stair.quartz.certus.pillar.inner.json new file mode 100644 index 00000000..cda5e0ab --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/stair.quartz.certus.pillar.inner.json @@ -0,0 +1,8 @@ +{ + "parent": "block/inner_stairs", + "textures": { + "bottom": "appliedenergistics2:blocks/BlockQuartzPillar", + "top": "appliedenergistics2:blocks/BlockQuartzPillar", + "side": "appliedenergistics2:blocks/BlockQuartzPillarSide" + } +} diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stair.quartz.certus.pillar.json b/src/main/resources/assets/appliedenergistics2/models/block/stair.quartz.certus.pillar.json new file mode 100644 index 00000000..8c1329e9 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/stair.quartz.certus.pillar.json @@ -0,0 +1,8 @@ +{ + "parent": "block/stairs", + "textures": { + "bottom": "appliedenergistics2:blocks/BlockQuartzPillar", + "top": "appliedenergistics2:blocks/BlockQuartzPillar", + "side": "appliedenergistics2:blocks/BlockQuartzPillarSide" + } +} diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stair.quartz.certus.pillar.outer.json b/src/main/resources/assets/appliedenergistics2/models/block/stair.quartz.certus.pillar.outer.json new file mode 100644 index 00000000..5d0c4d0b --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/stair.quartz.certus.pillar.outer.json @@ -0,0 +1,8 @@ +{ + "parent": "block/outer_stairs", + "textures": { + "bottom": "appliedenergistics2:blocks/BlockQuartzPillar", + "top": "appliedenergistics2:blocks/BlockQuartzPillar", + "side": "appliedenergistics2:blocks/BlockQuartzPillar" + } +} diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stair.skystone.block.inner.json b/src/main/resources/assets/appliedenergistics2/models/block/stair.skystone.block.inner.json new file mode 100644 index 00000000..113c1206 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/stair.skystone.block.inner.json @@ -0,0 +1,6 @@ +{ + "parent": "block/inner_stairs", + "textures": { + "all": "appliedenergistics2:blocks/BlockSkystone.Block" + } +} diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stair.skystone.block.json b/src/main/resources/assets/appliedenergistics2/models/block/stair.skystone.block.json new file mode 100644 index 00000000..b4014898 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/stair.skystone.block.json @@ -0,0 +1,6 @@ +{ + "parent": "block/stairs", + "textures": { + "all": "appliedenergistics2:blocks/BlockSkystone.Block" + } +} diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stair.skystone.block.outer.json b/src/main/resources/assets/appliedenergistics2/models/block/stair.skystone.block.outer.json new file mode 100644 index 00000000..bce3d59b --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/stair.skystone.block.outer.json @@ -0,0 +1,6 @@ +{ + "parent": "block/outer_stairs", + "textures": { + "all": "appliedenergistics2:blocks/BlockSkystone.Block" + } +} diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stair.skystone.brick.inner.json b/src/main/resources/assets/appliedenergistics2/models/block/stair.skystone.brick.inner.json new file mode 100644 index 00000000..19147547 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/stair.skystone.brick.inner.json @@ -0,0 +1,6 @@ +{ + "parent": "block/inner_stairs", + "textures": { + "all": "appliedenergistics2:blocks/BlockSkystone.Brick" + } +} diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stair.skystone.brick.json b/src/main/resources/assets/appliedenergistics2/models/block/stair.skystone.brick.json new file mode 100644 index 00000000..387462d1 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/stair.skystone.brick.json @@ -0,0 +1,6 @@ +{ + "parent": "block/stairs", + "textures": { + "all": "appliedenergistics2:blocks/BlockSkystone.Brick" + } +} diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stair.skystone.brick.outer.json b/src/main/resources/assets/appliedenergistics2/models/block/stair.skystone.brick.outer.json new file mode 100644 index 00000000..418f26a0 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/stair.skystone.brick.outer.json @@ -0,0 +1,6 @@ +{ + "parent": "block/outer_stairs", + "textures": { + "all": "appliedenergistics2:blocks/BlockSkystone.Brick" + } +} diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stair.skystone.brick.small.inner.json b/src/main/resources/assets/appliedenergistics2/models/block/stair.skystone.brick.small.inner.json new file mode 100644 index 00000000..b005bca0 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/stair.skystone.brick.small.inner.json @@ -0,0 +1,6 @@ +{ + "parent": "block/inner_stairs", + "textures": { + "all": "appliedenergistics2:blocks/BlockSkystone.SmallBrick" + } +} diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stair.skystone.brick.small.json b/src/main/resources/assets/appliedenergistics2/models/block/stair.skystone.brick.small.json new file mode 100644 index 00000000..9dfe88b7 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/stair.skystone.brick.small.json @@ -0,0 +1,6 @@ +{ + "parent": "block/stairs", + "textures": { + "all": "appliedenergistics2:blocks/BlockSkystone.SmallBrick" + } +} diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stair.skystone.brick.small.outer.json b/src/main/resources/assets/appliedenergistics2/models/block/stair.skystone.brick.small.outer.json new file mode 100644 index 00000000..05423e5d --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/stair.skystone.brick.small.outer.json @@ -0,0 +1,6 @@ +{ + "parent": "block/outer_stairs", + "textures": { + "all": "appliedenergistics2:blocks/BlockSkystone.SmallBrick" + } +} diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stair.skystone.inner.json b/src/main/resources/assets/appliedenergistics2/models/block/stair.skystone.inner.json new file mode 100644 index 00000000..163a54cd --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/stair.skystone.inner.json @@ -0,0 +1,6 @@ +{ + "parent": "block/inner_stairs", + "textures": { + "all": "appliedenergistics2:blocks/BlockSkystone.Stone" + } +} diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stair.skystone.json b/src/main/resources/assets/appliedenergistics2/models/block/stair.skystone.json new file mode 100644 index 00000000..e7b0caea --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/stair.skystone.json @@ -0,0 +1,6 @@ +{ + "parent": "block/stairs", + "textures": { + "all": "appliedenergistics2:blocks/BlockSkystone.Stone" + } +} diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stair.skystone.outer.json b/src/main/resources/assets/appliedenergistics2/models/block/stair.skystone.outer.json new file mode 100644 index 00000000..f81db4e8 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/stair.skystone.outer.json @@ -0,0 +1,6 @@ +{ + "parent": "block/outer_stairs", + "textures": { + "all": "appliedenergistics2:blocks/BlockSkystone.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..19138f10 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/stair.fluix.json @@ -0,0 +1,13 @@ +{ + "parent": "block/stair.fluix", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": [ 0, 180, 0 ] + } + } +} 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..b4936554 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/stair.quartz.certus.chiseled.json @@ -0,0 +1,13 @@ +{ + "parent": "block/stair.quartz.certus.chiseled", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": [ 0, 180, 0 ] + } + } +} 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..67ca3f16 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/stair.quartz.certus.json @@ -0,0 +1,13 @@ +{ + "parent": "block/stair.quartz.certus", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": [ 0, 180, 0 ] + } + } +} 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..219b2fbe --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/stair.quartz.certus.pillar.json @@ -0,0 +1,13 @@ +{ + "parent": "block/stair.quartz.certus.pillar", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": [ 0, 180, 0 ] + } + } +} 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..6b13ac7d --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/stair.skystone.block.json @@ -0,0 +1,13 @@ +{ + "parent": "block/stair.skystone.block", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": [ 0, 180, 0 ] + } + } +} 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..df4f2716 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/stair.skystone.brick.json @@ -0,0 +1,13 @@ +{ + "parent": "block/stair.skystone.brick", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": [ 0, 180, 0 ] + } + } +} 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..c9bc142c --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/stair.skystone.brick.small.json @@ -0,0 +1,13 @@ +{ + "parent": "block/stair.skystone.brick.small", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": [ 0, 180, 0 ] + } + } +} diff --git a/src/main/resources/assets/appliedenergistics2/models/item/stair.skystone.json b/src/main/resources/assets/appliedenergistics2/models/item/stair.skystone.json new file mode 100644 index 00000000..8e307abf --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/stair.skystone.json @@ -0,0 +1,13 @@ +{ + "parent": "block/stair.skystone", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": [ 0, 180, 0 ] + } + } +}