diff --git a/src/main/java/appeng/core/api/definitions/ApiBlocks.java b/src/main/java/appeng/core/api/definitions/ApiBlocks.java index 9db934783..721f8908e 100644 --- a/src/main/java/appeng/core/api/definitions/ApiBlocks.java +++ b/src/main/java/appeng/core/api/definitions/ApiBlocks.java @@ -34,11 +34,14 @@ import appeng.decorative.AEDecorativeBlock; import appeng.decorative.solid.*; import appeng.tile.storage.TileSkyChest; import net.minecraft.block.Block; +import net.minecraft.block.Blocks; +import net.minecraft.block.SlabBlock; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.RenderType; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; + import static appeng.decorative.solid.BlockSkyStone.SkystoneType; @@ -438,14 +441,37 @@ public final class ApiBlocks implements IBlocks // .bootstrap( ( block, item ) -> (IPostInitComponent) side -> ( (BlockCableBus) block ).setupTile() ) // .build(); -// this.skyStoneSlab = makeSlab( "sky_stone_slab", "sky_stone_double_slab", registry, this.skyStoneBlock() ); -// this.smoothSkyStoneSlab = makeSlab( "smooth_sky_stone_slab", "smooth_sky_stone_double_slab", registry, this.smoothSkyStoneBlock() ); -// this.skyStoneBrickSlab = makeSlab( "sky_stone_brick_slab", "sky_stone_brick_double_slab", registry, this.skyStoneBrick() ); -// this.skyStoneSmallBrickSlab = makeSlab( "sky_stone_small_brick_slab", "sky_stone_small_brick_double_slab", registry, this.skyStoneSmallBrick() ); -// this.fluixSlab = makeSlab( "fluix_slab", "fluix_double_slab", registry, this.fluixBlock() ); -// this.quartzSlab = makeSlab( "quartz_slab", "quartz_double_slab", registry, this.quartzBlock() ); -// this.chiseledQuartzSlab = makeSlab( "chiseled_quartz_slab", "chiseled_quartz_double_slab", registry, this.chiseledQuartzBlock() ); -// this.quartzPillarSlab = makeSlab( "quartz_pillar_slab", "quartz_pillar_double_slab", registry, this.quartzPillar() ); + Block.Properties skystoneSlabProperties = Block.Properties.create( Material.ROCK ) + .hardnessAndResistance( 50, 150 ); + + this.skyStoneSlab = deco.block( "sky_stone_slab", () -> new SlabBlock( skystoneSlabProperties ) ) + .addFeatures( AEFeature.SKY_STONE ) + .build(); + this.smoothSkyStoneSlab = deco.block( "smooth_sky_stone_slab", () -> new SlabBlock( skystoneSlabProperties ) ) + .addFeatures( AEFeature.SKY_STONE ) + .build(); + this.skyStoneBrickSlab = deco.block( "sky_stone_brick_slab", () -> new SlabBlock( skystoneSlabProperties ) ) + .addFeatures( AEFeature.SKY_STONE ) + .build(); + this.skyStoneSmallBrickSlab = deco.block( "sky_stone_small_brick_slab", () -> new SlabBlock( skystoneSlabProperties ) ) + .addFeatures( AEFeature.SKY_STONE ) + .build(); + + Block.Properties quartzSlabProperties = Block.Properties.create( Material.ROCK ) + .hardnessAndResistance( 2.0F, 6.0F ); + + this.fluixSlab = deco.block( "fluix_slab", () -> new SlabBlock( quartzSlabProperties ) ) + .addFeatures( AEFeature.FLUIX ) + .build(); + this.quartzSlab = deco.block( "quartz_slab", () -> new SlabBlock( quartzSlabProperties ) ) + .addFeatures( AEFeature.CERTUS ) + .build(); + this.chiseledQuartzSlab = deco.block( "chiseled_quartz_slab", () -> new SlabBlock( quartzSlabProperties ) ) + .addFeatures( AEFeature.CERTUS ) + .build(); + this.quartzPillarSlab = deco.block( "quartz_pillar_slab", () -> new SlabBlock( quartzSlabProperties ) ) + .addFeatures( AEFeature.CERTUS ) + .build(); // this.itemGen = registry.block( "debug_item_gen", BlockItemGen::new ) // .features( AEFeature.UNSUPPORTED_DEVELOPER_TOOLS, AEFeature.CREATIVE ) @@ -478,49 +504,6 @@ public final class ApiBlocks implements IBlocks return new BlockQuartzOre(Block.Properties.create(Material.ROCK).hardnessAndResistance(3, 5)); } - // FIXME redo slabs -// private static IBlockDefinition makeSlab( String slabId, String doubleSlabId, FeatureFactory registry, IBlockDefinition blockDef ) -// { -// if( !blockDef.maybeBlock().isPresent() ) -// { -// return new BlockDefinition( slabId, null, null ); -// } -// -// Block block = blockDef.maybeBlock().get(); -// -// IBlockDefinition slabDef = registry.block( slabId, () -> new BlockSlabCommon.Half( block ) ) -// .features( AEFeature.DECORATIVE_BLOCKS ) -// .disableItem() -// .build(); -// -// if( !slabDef.maybeBlock().isPresent() ) -// { -// return new BlockDefinition( slabId, null, null ); -// } -// -// SlabBlock slabBlock = (SlabBlock) slabDef.maybeBlock().get(); -// -// // Reigster the double slab variant as well -// IBlockDefinition doubleSlabDef = registry.block( doubleSlabId, () -> new CommonSlabBlock.Double( slabBlock, block ) ) -// .features( AEFeature.DECORATIVE_BLOCKS ) -// .disableItem() -// .build(); -// -// Verify.verify( doubleSlabDef.maybeBlock().isPresent() ); -// -// SlabBlock doubleSlabBlock = (SlabBlock) doubleSlabDef.maybeBlock().get(); -// -// // Make the slab item -// IItemDefinition itemDef = registry.item( slabId, () -> new ItemSlab( slabBlock, slabBlock, doubleSlabBlock ) ) -// .features( AEFeature.DECORATIVE_BLOCKS ) -// .build(); -// -// Verify.verify( itemDef.maybeItem().isPresent() ); -// -// // Return a new composite block definition that combines the single slab block with the slab item -// return new BlockDefinition( slabId, slabBlock, (BlockItem) itemDef.maybeItem().get() ); -// } - // private static IBlockDefinition makeStairs( String registryName, FeatureFactory registry, IBlockDefinition block ) // { // return registry.block( registryName, () -> new BlockStairCommon( block.maybeBlock().get(), block.identifier() ) ) diff --git a/src/main/java/appeng/decorative/slab/CommonSlabBlock.java b/src/main/java/appeng/decorative/slab/CommonSlabBlock.java deleted file mode 100644 index c011c1cf1..000000000 --- a/src/main/java/appeng/decorative/slab/CommonSlabBlock.java +++ /dev/null @@ -1,170 +0,0 @@ - -package appeng.decorative.slab; - - -import java.util.Random; - -import javax.annotation.Nullable; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockSlab; -import net.minecraft.block.SlabBlock; -import net.minecraft.block.BlockStateContainer; -import net.minecraft.block.BlockState; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.state.IProperty; -import net.minecraft.util.IStringSerializable; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - - -public abstract class CommonSlabBlock extends SlabBlock -{ - - private CommonSlabBlock( Block block ) - { - super( block.getMaterial( block.getDefaultState() ) ); - this.setHardness( block.getBlockHardness( block.getDefaultState(), null, null ) ); - this.setResistance( block.getExplosionResistance( null ) * 5.0F / 3.0F ); - - BlockState BlockState = this.blockState.getBaseState(); - - if( !this.isDouble() ) - { - BlockState = BlockState.with( HALF, BlockSlab.EnumBlockHalf.BOTTOM ); - } - - this.setDefaultState( BlockState.with( VARIANT, Variant.DEFAULT ) ); - this.setCreativeTab( CreativeTabs.BUILDING_BLOCKS ); - this.useNeighborBrightness = true; - } - - /** - * Convert the given metadata into a BlockState for this Block - */ - @Override - public BlockState getStateFromMeta( int meta ) - { - BlockState BlockState = this.getDefaultState().with( VARIANT, Variant.DEFAULT ); - - if( !this.isDouble() ) - { - BlockState = BlockState.with( HALF, ( meta & 8 ) == 0 ? BlockSlab.EnumBlockHalf.BOTTOM : BlockSlab.EnumBlockHalf.TOP ); - } - - return BlockState; - } - - /** - * Convert the BlockState into the correct metadata value - */ - @Override - public int getMetaFromState( BlockState state ) - { - int i = 0; - - if( !this.isDouble() && state.getValue( HALF ) == BlockSlab.EnumBlockHalf.TOP ) - { - i |= 8; - } - - return i; - } - - @Override - protected BlockStateContainer createBlockState() - { - return this.isDouble() ? new BlockStateContainer( this, VARIANT ) : new BlockStateContainer( this, HALF, VARIANT ); - } - - @Override - @Nullable - public Item getItemDropped( BlockState state, Random rand, int fortune ) - { - return Item.getItemFromBlock( this ); - } - - @Override - public ItemStack getItem( World worldIn, BlockPos pos, BlockState state ) - { - return new ItemStack( this, 1, 0 ); - } - - @Override - public String getTranslationKey( int meta ) - { - return this.getTranslationKey(); - } - - @Override - public IProperty getVariantProperty() - { - return VARIANT; - } - - @Override - public Comparable getTypeForItem( ItemStack stack ) - { - return Variant.DEFAULT; - } - - public static class Double extends CommonSlabBlock - { - - private final Block halfSlabBlock; - - public Double( Block halfSlabBlock, Block block ) - { - super( block ); - this.halfSlabBlock = halfSlabBlock; - } - - @Override - public boolean isDouble() - { - return true; - } - - @Override - @Nullable - public Item getItemDropped( BlockState state, Random rand, int fortune ) - { - return Item.getItemFromBlock( this.halfSlabBlock ); - } - - @Override - public ItemStack getItem( World worldIn, BlockPos pos, BlockState state ) - { - return new ItemStack( this.halfSlabBlock, 1, 0 ); - } - - } - - public static class Half extends CommonSlabBlock - { - - public Half( Block block ) - { - super( block ); - } - - @Override - public boolean isDouble() - { - return false; - } - } - - public enum Variant implements IStringSerializable - { - DEFAULT; - - @Override - public String getName() - { - return "default"; - } - } -} diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/chiseled_quartz_double_slab.json b/src/main/resources/assets/appliedenergistics2/blockstates/chiseled_quartz_double_slab.json deleted file mode 100644 index 9bb614bb1..000000000 --- a/src/main/resources/assets/appliedenergistics2/blockstates/chiseled_quartz_double_slab.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "variant=default": { - "model": "appliedenergistics2:block/chiseled_quartz_block" - } - } -} diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/chiseled_quartz_slab.json b/src/main/resources/assets/appliedenergistics2/blockstates/chiseled_quartz_slab.json index 21c8ac3e9..5673d00aa 100644 --- a/src/main/resources/assets/appliedenergistics2/blockstates/chiseled_quartz_slab.json +++ b/src/main/resources/assets/appliedenergistics2/blockstates/chiseled_quartz_slab.json @@ -1,10 +1,13 @@ { "variants": { - "half=bottom,variant=default": { + "type=bottom": { "model": "appliedenergistics2:block/slabs/chiseled_quartz_half" }, - "half=top,variant=default": { + "type=top": { "model": "appliedenergistics2:block/slabs/chiseled_quartz_upper" + }, + "type=double": { + "model": "appliedenergistics2:block/chiseled_quartz_block" } } } diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/fluix_double_slab.json b/src/main/resources/assets/appliedenergistics2/blockstates/fluix_double_slab.json deleted file mode 100644 index 31f8e48b0..000000000 --- a/src/main/resources/assets/appliedenergistics2/blockstates/fluix_double_slab.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "variant=default": { - "model": "appliedenergistics2:block/fluix_block" - } - } -} diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/fluix_slab.json b/src/main/resources/assets/appliedenergistics2/blockstates/fluix_slab.json index 6f1bfe2d1..790ca1cf9 100644 --- a/src/main/resources/assets/appliedenergistics2/blockstates/fluix_slab.json +++ b/src/main/resources/assets/appliedenergistics2/blockstates/fluix_slab.json @@ -1,10 +1,13 @@ { "variants": { - "half=bottom,variant=default": { + "type=bottom": { "model": "appliedenergistics2:block/slabs/fluix_half" }, - "half=top,variant=default": { + "type=top": { "model": "appliedenergistics2:block/slabs/fluix_upper" + }, + "type=double": { + "model": "appliedenergistics2:block/fluix_block" } } } diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/quartz_double_slab.json b/src/main/resources/assets/appliedenergistics2/blockstates/quartz_double_slab.json deleted file mode 100644 index bbe2ccce1..000000000 --- a/src/main/resources/assets/appliedenergistics2/blockstates/quartz_double_slab.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "variant=default": { - "model": "appliedenergistics2:block/quartz_block" - } - } -} diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/quartz_pillar_double_slab.json b/src/main/resources/assets/appliedenergistics2/blockstates/quartz_pillar_double_slab.json deleted file mode 100644 index ab82c2a04..000000000 --- a/src/main/resources/assets/appliedenergistics2/blockstates/quartz_pillar_double_slab.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "variant=default": { - "model": "appliedenergistics2:block/quartz_pillar" - } - } -} diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/quartz_pillar_slab.json b/src/main/resources/assets/appliedenergistics2/blockstates/quartz_pillar_slab.json index 97dc676cd..d16cdcf75 100644 --- a/src/main/resources/assets/appliedenergistics2/blockstates/quartz_pillar_slab.json +++ b/src/main/resources/assets/appliedenergistics2/blockstates/quartz_pillar_slab.json @@ -1,10 +1,13 @@ { "variants": { - "half=bottom,variant=default": { + "type=bottom": { "model": "appliedenergistics2:block/slabs/quartz_pillar_half" }, - "half=top,variant=default": { + "type=top": { "model": "appliedenergistics2:block/slabs/quartz_pillar_upper" + }, + "type=double": { + "model": "appliedenergistics2:block/quartz_pillar" } } } diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/quartz_slab.json b/src/main/resources/assets/appliedenergistics2/blockstates/quartz_slab.json index 886615be1..513938ac7 100644 --- a/src/main/resources/assets/appliedenergistics2/blockstates/quartz_slab.json +++ b/src/main/resources/assets/appliedenergistics2/blockstates/quartz_slab.json @@ -1,10 +1,13 @@ { "variants": { - "half=bottom,variant=default": { + "type=bottom": { "model": "appliedenergistics2:block/slabs/quartz_half" }, - "half=top,variant=default": { + "type=top": { "model": "appliedenergistics2:block/slabs/quartz_upper" + }, + "type=double": { + "model": "appliedenergistics2:block/quartz_block" } } } diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_brick_double_slab.json b/src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_brick_double_slab.json deleted file mode 100644 index 886dd7114..000000000 --- a/src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_brick_double_slab.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "variant=default": { - "model": "appliedenergistics2:block/sky_stone_brick" - } - } -} diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_brick_slab.json b/src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_brick_slab.json index cc501aaef..786e19447 100644 --- a/src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_brick_slab.json +++ b/src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_brick_slab.json @@ -1,10 +1,13 @@ { "variants": { - "half=bottom,variant=default": { + "type=bottom": { "model": "appliedenergistics2:block/slabs/sky_stone_brick_half" }, - "half=top,variant=default": { + "type=top": { "model": "appliedenergistics2:block/slabs/sky_stone_brick_upper" + }, + "type=double": { + "model": "appliedenergistics2:block/sky_stone_brick" } } } diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_double_slab.json b/src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_double_slab.json deleted file mode 100644 index 0898c3be3..000000000 --- a/src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_double_slab.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "variant=default": { - "model": "appliedenergistics2:block/sky_stone_block" - } - } -} diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_slab.json b/src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_slab.json index ac343f32d..e18be9227 100644 --- a/src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_slab.json +++ b/src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_slab.json @@ -1,10 +1,13 @@ { "variants": { - "half=bottom,variant=default": { + "type=bottom": { "model": "appliedenergistics2:block/slabs/sky_stone_half" }, - "half=top,variant=default": { + "type=top": { "model": "appliedenergistics2:block/slabs/sky_stone_upper" + }, + "type=double": { + "model": "appliedenergistics2:block/sky_stone_block" } } } diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_small_brick_double_slab.json b/src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_small_brick_double_slab.json deleted file mode 100644 index c212b2f34..000000000 --- a/src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_small_brick_double_slab.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "variant=default": { - "model": "appliedenergistics2:block/sky_stone_small_brick" - } - } -} diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_small_brick_slab.json b/src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_small_brick_slab.json index 694d20502..db90e6b7a 100644 --- a/src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_small_brick_slab.json +++ b/src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_small_brick_slab.json @@ -1,10 +1,13 @@ { "variants": { - "half=bottom,variant=default": { + "type=bottom": { "model": "appliedenergistics2:block/slabs/sky_stone_small_brick_half" }, - "half=top,variant=default": { + "type=top": { "model": "appliedenergistics2:block/slabs/sky_stone_small_brick_upper" + }, + "type=double": { + "model": "appliedenergistics2:block/sky_stone_small_brick" } } } diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/smooth_sky_stone_double_slab.json b/src/main/resources/assets/appliedenergistics2/blockstates/smooth_sky_stone_double_slab.json deleted file mode 100644 index f4340c2a3..000000000 --- a/src/main/resources/assets/appliedenergistics2/blockstates/smooth_sky_stone_double_slab.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "variant=default": { - "model": "appliedenergistics2:block/smooth_sky_stone_block" - } - } -} diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/smooth_sky_stone_slab.json b/src/main/resources/assets/appliedenergistics2/blockstates/smooth_sky_stone_slab.json index c9e43f786..a233f90b8 100644 --- a/src/main/resources/assets/appliedenergistics2/blockstates/smooth_sky_stone_slab.json +++ b/src/main/resources/assets/appliedenergistics2/blockstates/smooth_sky_stone_slab.json @@ -1,10 +1,13 @@ { "variants": { - "half=bottom,variant=default": { + "type=bottom": { "model": "appliedenergistics2:block/slabs/smooth_sky_stone_half" }, - "half=top,variant=default": { + "type=top": { "model": "appliedenergistics2:block/slabs/smooth_sky_stone_upper" + }, + "type=double": { + "model": "appliedenergistics2:block/smooth_sky_stone_block" } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/block/slabs/chiseled_quartz_half.json b/src/main/resources/assets/appliedenergistics2/models/block/slabs/chiseled_quartz_half.json index 05dbded5d..b7e3a53ec 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/slabs/chiseled_quartz_half.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/slabs/chiseled_quartz_half.json @@ -1,5 +1,5 @@ { - "parent": "block/half_slab", + "parent": "block/slab", "textures": { "bottom": "appliedenergistics2:block/chiseled_quartz_block_top", "side": "appliedenergistics2:block/chiseled_quartz_block_side", diff --git a/src/main/resources/assets/appliedenergistics2/models/block/slabs/chiseled_quartz_upper.json b/src/main/resources/assets/appliedenergistics2/models/block/slabs/chiseled_quartz_upper.json index 330bf408d..16e346134 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/slabs/chiseled_quartz_upper.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/slabs/chiseled_quartz_upper.json @@ -1,5 +1,5 @@ { - "parent": "block/upper_slab", + "parent": "block/slab_top", "textures": { "bottom": "appliedenergistics2:block/chiseled_quartz_block_top", "side": "appliedenergistics2:block/chiseled_quartz_block_side", diff --git a/src/main/resources/assets/appliedenergistics2/models/block/slabs/fluix_half.json b/src/main/resources/assets/appliedenergistics2/models/block/slabs/fluix_half.json index d74c26e24..96ac741c2 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/slabs/fluix_half.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/slabs/fluix_half.json @@ -1,5 +1,5 @@ { - "parent": "block/half_slab", + "parent": "block/slab", "textures": { "bottom": "appliedenergistics2:block/fluix_block", "side": "appliedenergistics2:block/fluix_block", diff --git a/src/main/resources/assets/appliedenergistics2/models/block/slabs/fluix_upper.json b/src/main/resources/assets/appliedenergistics2/models/block/slabs/fluix_upper.json index 7ce9ccde6..5a39d60b7 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/slabs/fluix_upper.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/slabs/fluix_upper.json @@ -1,5 +1,5 @@ { - "parent": "block/upper_slab", + "parent": "block/slab_top", "textures": { "bottom": "appliedenergistics2:block/fluix_block", "side": "appliedenergistics2:block/fluix_block", diff --git a/src/main/resources/assets/appliedenergistics2/models/block/slabs/quartz_half.json b/src/main/resources/assets/appliedenergistics2/models/block/slabs/quartz_half.json index b908bf14f..e08d9093f 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/slabs/quartz_half.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/slabs/quartz_half.json @@ -1,5 +1,5 @@ { - "parent": "block/half_slab", + "parent": "block/slab", "textures": { "bottom": "appliedenergistics2:block/quartz_block", "side": "appliedenergistics2:block/quartz_block", diff --git a/src/main/resources/assets/appliedenergistics2/models/block/slabs/quartz_pillar_half.json b/src/main/resources/assets/appliedenergistics2/models/block/slabs/quartz_pillar_half.json index 979560505..b71ce6b46 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/slabs/quartz_pillar_half.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/slabs/quartz_pillar_half.json @@ -1,5 +1,5 @@ { - "parent": "block/half_slab", + "parent": "block/slab", "textures": { "bottom": "appliedenergistics2:block/quartz_pillar_top", "side": "appliedenergistics2:block/quartz_pillar_side", diff --git a/src/main/resources/assets/appliedenergistics2/models/block/slabs/quartz_pillar_upper.json b/src/main/resources/assets/appliedenergistics2/models/block/slabs/quartz_pillar_upper.json index 7fbc65b78..0e58599ee 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/slabs/quartz_pillar_upper.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/slabs/quartz_pillar_upper.json @@ -1,5 +1,5 @@ { - "parent": "block/upper_slab", + "parent": "block/slab_top", "textures": { "bottom": "appliedenergistics2:block/quartz_pillar_top", "side": "appliedenergistics2:block/quartz_pillar_side", diff --git a/src/main/resources/assets/appliedenergistics2/models/block/slabs/quartz_upper.json b/src/main/resources/assets/appliedenergistics2/models/block/slabs/quartz_upper.json index e2e08c1d6..f79f38108 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/slabs/quartz_upper.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/slabs/quartz_upper.json @@ -1,5 +1,5 @@ { - "parent": "block/upper_slab", + "parent": "block/slab_top", "textures": { "bottom": "appliedenergistics2:block/quartz_block", "side": "appliedenergistics2:block/quartz_block", diff --git a/src/main/resources/assets/appliedenergistics2/models/block/slabs/sky_stone_brick_half.json b/src/main/resources/assets/appliedenergistics2/models/block/slabs/sky_stone_brick_half.json index 6d9cbc881..498d55a8b 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/slabs/sky_stone_brick_half.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/slabs/sky_stone_brick_half.json @@ -1,5 +1,5 @@ { - "parent": "block/half_slab", + "parent": "block/slab", "textures": { "bottom": "appliedenergistics2:block/sky_stone_brick", "side": "appliedenergistics2:block/sky_stone_brick", diff --git a/src/main/resources/assets/appliedenergistics2/models/block/slabs/sky_stone_brick_upper.json b/src/main/resources/assets/appliedenergistics2/models/block/slabs/sky_stone_brick_upper.json index ffd239130..40bf5a881 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/slabs/sky_stone_brick_upper.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/slabs/sky_stone_brick_upper.json @@ -1,5 +1,5 @@ { - "parent": "block/upper_slab", + "parent": "block/slab_top", "textures": { "bottom": "appliedenergistics2:block/sky_stone_brick", "side": "appliedenergistics2:block/sky_stone_brick", diff --git a/src/main/resources/assets/appliedenergistics2/models/block/slabs/sky_stone_half.json b/src/main/resources/assets/appliedenergistics2/models/block/slabs/sky_stone_half.json index 1dfe0cbb2..4f3104633 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/slabs/sky_stone_half.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/slabs/sky_stone_half.json @@ -1,5 +1,5 @@ { - "parent": "block/half_slab", + "parent": "block/slab", "textures": { "bottom": "appliedenergistics2:block/sky_stone_block", "side": "appliedenergistics2:block/sky_stone_block", diff --git a/src/main/resources/assets/appliedenergistics2/models/block/slabs/sky_stone_small_brick_half.json b/src/main/resources/assets/appliedenergistics2/models/block/slabs/sky_stone_small_brick_half.json index 86da53776..173d04ebd 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/slabs/sky_stone_small_brick_half.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/slabs/sky_stone_small_brick_half.json @@ -1,5 +1,5 @@ { - "parent": "block/half_slab", + "parent": "block/slab", "textures": { "bottom": "appliedenergistics2:block/sky_stone_small_brick", "side": "appliedenergistics2:block/sky_stone_small_brick", diff --git a/src/main/resources/assets/appliedenergistics2/models/block/slabs/sky_stone_small_brick_upper.json b/src/main/resources/assets/appliedenergistics2/models/block/slabs/sky_stone_small_brick_upper.json index 31c3c6686..39465ecba 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/slabs/sky_stone_small_brick_upper.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/slabs/sky_stone_small_brick_upper.json @@ -1,5 +1,5 @@ { - "parent": "block/upper_slab", + "parent": "block/slab_top", "textures": { "bottom": "appliedenergistics2:block/sky_stone_small_brick", "side": "appliedenergistics2:block/sky_stone_small_brick", diff --git a/src/main/resources/assets/appliedenergistics2/models/block/slabs/sky_stone_upper.json b/src/main/resources/assets/appliedenergistics2/models/block/slabs/sky_stone_upper.json index 64fa2999f..70178f784 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/slabs/sky_stone_upper.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/slabs/sky_stone_upper.json @@ -1,5 +1,5 @@ { - "parent": "block/upper_slab", + "parent": "block/slab_top", "textures": { "bottom": "appliedenergistics2:block/sky_stone_block", "side": "appliedenergistics2:block/sky_stone_block", diff --git a/src/main/resources/assets/appliedenergistics2/models/block/slabs/smooth_sky_stone_half.json b/src/main/resources/assets/appliedenergistics2/models/block/slabs/smooth_sky_stone_half.json index 232b436cd..03e846e86 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/slabs/smooth_sky_stone_half.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/slabs/smooth_sky_stone_half.json @@ -1,5 +1,5 @@ { - "parent": "block/half_slab", + "parent": "block/slab", "textures": { "bottom": "appliedenergistics2:block/smooth_sky_stone_block", "side": "appliedenergistics2:block/smooth_sky_stone_block", diff --git a/src/main/resources/assets/appliedenergistics2/models/block/slabs/smooth_sky_stone_upper.json b/src/main/resources/assets/appliedenergistics2/models/block/slabs/smooth_sky_stone_upper.json index ba1db28e1..6492ab795 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/slabs/smooth_sky_stone_upper.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/slabs/smooth_sky_stone_upper.json @@ -1,5 +1,5 @@ { - "parent": "block/upper_slab", + "parent": "block/slab_top", "textures": { "bottom": "appliedenergistics2:block/smooth_sky_stone_block", "side": "appliedenergistics2:block/smooth_sky_stone_block", diff --git a/src/main/resources/assets/appliedenergistics2/models/item/chiseled_quartz_double_slab.json b/src/main/resources/assets/appliedenergistics2/models/item/chiseled_quartz_double_slab.json deleted file mode 100644 index bddbfd3a0..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/chiseled_quartz_double_slab.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "MISSING" -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/chiseled_quartz_slab.json b/src/main/resources/assets/appliedenergistics2/models/item/chiseled_quartz_slab.json index bddbfd3a0..343f73e44 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/chiseled_quartz_slab.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/chiseled_quartz_slab.json @@ -1,3 +1,3 @@ { - "parent": "MISSING" + "parent": "appliedenergistics2:block/slabs/chiseled_quartz_half" } \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/fluix_double_slab.json b/src/main/resources/assets/appliedenergistics2/models/item/fluix_double_slab.json deleted file mode 100644 index bddbfd3a0..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/fluix_double_slab.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "MISSING" -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/fluix_slab.json b/src/main/resources/assets/appliedenergistics2/models/item/fluix_slab.json index bddbfd3a0..28c9b0396 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/fluix_slab.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/fluix_slab.json @@ -1,3 +1,3 @@ { - "parent": "MISSING" + "parent": "appliedenergistics2:block/slabs/fluix_half" } \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/quartz_double_slab.json b/src/main/resources/assets/appliedenergistics2/models/item/quartz_double_slab.json deleted file mode 100644 index bddbfd3a0..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/quartz_double_slab.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "MISSING" -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/quartz_pillar_double_slab.json b/src/main/resources/assets/appliedenergistics2/models/item/quartz_pillar_double_slab.json deleted file mode 100644 index bddbfd3a0..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/quartz_pillar_double_slab.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "MISSING" -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/quartz_pillar_slab.json b/src/main/resources/assets/appliedenergistics2/models/item/quartz_pillar_slab.json index bddbfd3a0..e273d5841 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/quartz_pillar_slab.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/quartz_pillar_slab.json @@ -1,3 +1,3 @@ { - "parent": "MISSING" + "parent": "appliedenergistics2:block/slabs/quartz_pillar_half" } \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/quartz_slab.json b/src/main/resources/assets/appliedenergistics2/models/item/quartz_slab.json index bddbfd3a0..67c5770bd 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/quartz_slab.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/quartz_slab.json @@ -1,3 +1,3 @@ { - "parent": "MISSING" + "parent": "appliedenergistics2:block/slabs/quartz_half" } \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/sky_stone_brick_double_slab.json b/src/main/resources/assets/appliedenergistics2/models/item/sky_stone_brick_double_slab.json deleted file mode 100644 index bddbfd3a0..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/sky_stone_brick_double_slab.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "MISSING" -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/sky_stone_brick_slab.json b/src/main/resources/assets/appliedenergistics2/models/item/sky_stone_brick_slab.json index bddbfd3a0..9a35ec5ef 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/sky_stone_brick_slab.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/sky_stone_brick_slab.json @@ -1,3 +1,3 @@ { - "parent": "MISSING" + "parent": "appliedenergistics2:block/slabs/sky_stone_brick_half" } \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/sky_stone_double_slab.json b/src/main/resources/assets/appliedenergistics2/models/item/sky_stone_double_slab.json deleted file mode 100644 index bddbfd3a0..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/sky_stone_double_slab.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "MISSING" -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/sky_stone_slab.json b/src/main/resources/assets/appliedenergistics2/models/item/sky_stone_slab.json index bddbfd3a0..a610a0416 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/sky_stone_slab.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/sky_stone_slab.json @@ -1,3 +1,3 @@ { - "parent": "MISSING" + "parent": "appliedenergistics2:block/slabs/sky_stone_half" } \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/sky_stone_small_brick_double_slab.json b/src/main/resources/assets/appliedenergistics2/models/item/sky_stone_small_brick_double_slab.json deleted file mode 100644 index bddbfd3a0..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/sky_stone_small_brick_double_slab.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "MISSING" -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/sky_stone_small_brick_slab.json b/src/main/resources/assets/appliedenergistics2/models/item/sky_stone_small_brick_slab.json index bddbfd3a0..7eec93e15 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/sky_stone_small_brick_slab.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/sky_stone_small_brick_slab.json @@ -1,3 +1,3 @@ { - "parent": "MISSING" + "parent": "appliedenergistics2:block/slabs/sky_stone_small_brick_half" } \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/smooth_sky_stone_double_slab.json b/src/main/resources/assets/appliedenergistics2/models/item/smooth_sky_stone_double_slab.json deleted file mode 100644 index bddbfd3a0..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/smooth_sky_stone_double_slab.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "MISSING" -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/smooth_sky_stone_slab.json b/src/main/resources/assets/appliedenergistics2/models/item/smooth_sky_stone_slab.json index bddbfd3a0..a2db9e4cf 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/smooth_sky_stone_slab.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/smooth_sky_stone_slab.json @@ -1,3 +1,3 @@ { - "parent": "MISSING" + "parent": "appliedenergistics2:block/slabs/smooth_sky_stone_half" } \ No newline at end of file