diff --git a/src/main/java/appeng/block/storage/SkyChestRenderingCustomizer.java b/src/main/java/appeng/block/storage/SkyChestRenderingCustomizer.java index 9ae030112..252b49628 100644 --- a/src/main/java/appeng/block/storage/SkyChestRenderingCustomizer.java +++ b/src/main/java/appeng/block/storage/SkyChestRenderingCustomizer.java @@ -39,10 +39,10 @@ public class SkyChestRenderingCustomizer extends BlockRenderingCustomizer { default: case STONE: - modelName = "sky_chest_stone"; + modelName = "sky_stone_chest"; break; case BLOCK: - modelName = "sky_chest_block"; + modelName = "smooth_sky_stone_chest"; break; } return modelName; diff --git a/src/main/java/appeng/core/api/definitions/ApiBlocks.java b/src/main/java/appeng/core/api/definitions/ApiBlocks.java index 05aa3b4ab..e032d7329 100644 --- a/src/main/java/appeng/core/api/definitions/ApiBlocks.java +++ b/src/main/java/appeng/core/api/definitions/ApiBlocks.java @@ -198,28 +198,39 @@ public final class ApiBlocks implements IBlocks this.quartzBlock = deco.block( "quartz_block", BlockQuartz::new ).build(); this.quartzPillar = deco.block( "quartz_pillar", BlockQuartzPillar::new ).build(); this.chiseledQuartzBlock = deco.block( "chiseled_quartz_block", BlockChiseledQuartz::new ).build(); - this.quartzGlass = deco.block( "quartz_glass", BlockQuartzGlass::new ).build(); - this.quartzVibrantGlass = deco.block( "quartz_vibrant_glass", BlockQuartzLamp::new ).addFeatures( AEFeature.DecorativeLights ).build(); - this.quartzFixture = registry.block( "quartz_fixture", BlockQuartzFixture::new ).features( AEFeature.DecorativeLights ).build(); + this.quartzGlass = deco.block( "quartz_glass", BlockQuartzGlass::new ) + .useCustomItemModel() + .build(); + this.quartzVibrantGlass = deco.block( "quartz_vibrant_glass", BlockQuartzLamp::new ) + .addFeatures( AEFeature.DecorativeLights ) + .useCustomItemModel() + .build(); + this.quartzFixture = registry.block( "quartz_fixture", BlockQuartzFixture::new ) + .features( AEFeature.DecorativeLights ) + .useCustomItemModel() + .build(); this.fluixBlock = deco.block( "fluix_block", BlockFluix::new ).build(); this.skyStoneBlock = deco.block( "sky_stone_block", () -> new BlockSkyStone( SkystoneType.STONE ) ).build(); - this.smoothSkyStoneBlock = deco.block( "smooth_skystone", () -> new BlockSkyStone( SkystoneType.BLOCK ) ).build(); - this.skyStoneBrick = deco.block( "skystone_brick", () -> new BlockSkyStone( SkystoneType.BRICK ) ).build(); - this.skyStoneSmallBrick = deco.block( "skystone_small_brick", () -> new BlockSkyStone( SkystoneType.SMALL_BRICK ) ).build(); + this.smoothSkyStoneBlock = deco.block( "smooth_sky_stone_block", () -> new BlockSkyStone( SkystoneType.BLOCK ) ).build(); + this.skyStoneBrick = deco.block( "sky_stone_brick", () -> new BlockSkyStone( SkystoneType.BRICK ) ).build(); + this.skyStoneSmallBrick = deco.block( "sky_stone_small_brick", () -> new BlockSkyStone( SkystoneType.SMALL_BRICK ) ).build(); - this.skyStoneChest = registry.block( "skystone_chest", () -> new BlockSkyChest( SkyChestType.STONE ) ) + this.skyStoneChest = registry.block( "sky_stone_chest", () -> new BlockSkyChest( SkyChestType.STONE ) ) .features( AEFeature.SkyStoneChests ) .rendering( new SkyChestRenderingCustomizer( SkyChestType.STONE ) ) .build(); - this.smoothSkyStoneChest = registry.block( "smooth_skystone_chest", () -> new BlockSkyChest( SkyChestType.BLOCK ) ) + this.smoothSkyStoneChest = registry.block( "smooth_sky_stone_chest", () -> new BlockSkyChest( SkyChestType.BLOCK ) ) .features( AEFeature.SkyStoneChests ) .rendering( new SkyChestRenderingCustomizer( SkyChestType.BLOCK ) ) .build(); this.skyCompass = registry.block( "sky_compass", BlockSkyCompass::new ).features( AEFeature.MeteoriteCompass ).build(); this.grindstone = registry.block( "grindstone", BlockGrinder::new ).features( AEFeature.GrindStone ).build(); - this.crank = registry.block( "crank", BlockCrank::new ).features( AEFeature.GrindStone ).build(); + this.crank = registry.block( "crank", BlockCrank::new ) + .features( AEFeature.GrindStone ) + .useCustomItemModel() + .build(); this.inscriber = registry.block( "inscriber", BlockInscriber::new ).features( AEFeature.Inscriber ).build(); this.wirelessAccessPoint = registry.block( "wireless_access_point", BlockWireless::new ).features( AEFeature.WirelessAccessTerminal ).build(); this.charger = registry.block( "charger", BlockCharger::new ) @@ -288,10 +299,10 @@ public final class ApiBlocks implements IBlocks this.lightDetector = registry.block( "light_detector", BlockLightDetector::new ).features( AEFeature.LightDetector ).build(); this.paint = registry.block( "paint", BlockPaint::new ).features( AEFeature.PaintBalls ).build(); - this.skyStoneStairs = makeStairs( "skystone_stairs", registry, this.skyStoneBlock() ); - this.smoothSkyStoneStairs = makeStairs( "smooth_skystone_stairs", registry, this.smoothSkyStoneBlock() ); - this.skyStoneBrickStairs = makeStairs( "skystone_brick_stairs", registry, this.skyStoneBrick() ); - this.skyStoneSmallBrickStairs = makeStairs( "skystone_small_brick_stairs", registry, this.skyStoneSmallBrick() ); + this.skyStoneStairs = makeStairs( "sky_stone_stairs", registry, this.skyStoneBlock() ); + this.smoothSkyStoneStairs = makeStairs( "smooth_sky_stone_stairs", registry, this.smoothSkyStoneBlock() ); + this.skyStoneBrickStairs = makeStairs( "sky_stone_brick_stairs", registry, this.skyStoneBrick() ); + this.skyStoneSmallBrickStairs = makeStairs( "sky_stone_small_brick_stairs", registry, this.skyStoneSmallBrick() ); this.fluixStairs = makeStairs( "fluix_stairs", registry, this.fluixBlock() ); this.quartzStairs = makeStairs( "quartz_stairs", registry, this.quartzBlock() ); this.chiseledQuartzStairs = makeStairs( "chiseled_quartz_stairs", registry, this.chiseledQuartzBlock() ); diff --git a/src/main/java/appeng/core/api/definitions/ApiMaterials.java b/src/main/java/appeng/core/api/definitions/ApiMaterials.java index 29b03c01f..e8469f60d 100644 --- a/src/main/java/appeng/core/api/definitions/ApiMaterials.java +++ b/src/main/java/appeng/core/api/definitions/ApiMaterials.java @@ -136,7 +136,7 @@ public final class ApiMaterials implements IMaterials this.cell128SpatialPart = new DamagedItemDefinition( "material.cell.spatial.128", materials.createMaterial( MaterialType.Cell128SpatialPart ) ); this.silicon = new DamagedItemDefinition( "material.silicon", materials.createMaterial( MaterialType.Silicon ) ); - this.skyDust = new DamagedItemDefinition( "material.dust.skystone", materials.createMaterial( MaterialType.SkyDust ) ); + this.skyDust = new DamagedItemDefinition( "material.dust.sky_stone", materials.createMaterial( MaterialType.SkyDust ) ); this.calcProcessorPress = new DamagedItemDefinition( "material.press.processor.calculation", materials.createMaterial( MaterialType.CalcProcessorPress ) ); this.engProcessorPress = new DamagedItemDefinition( "material.press.processor.engineering", materials.createMaterial( MaterialType.EngProcessorPress ) ); diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/cell_workbench.json b/src/main/resources/assets/appliedenergistics2/blockstates/cell_workbench.json index f9828a893..e4bd6617d 100644 --- a/src/main/resources/assets/appliedenergistics2/blockstates/cell_workbench.json +++ b/src/main/resources/assets/appliedenergistics2/blockstates/cell_workbench.json @@ -1,7 +1,7 @@ { "variants": { "normal": { - "model": "appliedenergistics2:cell_work_bench" + "model": "appliedenergistics2:cell_workbench" } } } \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/chiseled_quartz_block.json b/src/main/resources/assets/appliedenergistics2/blockstates/chiseled_quartz_block.json index 1835b5deb..7db904b74 100644 --- a/src/main/resources/assets/appliedenergistics2/blockstates/chiseled_quartz_block.json +++ b/src/main/resources/assets/appliedenergistics2/blockstates/chiseled_quartz_block.json @@ -1,7 +1,7 @@ { "variants": { "normal": { - "model": "appliedenergistics2:chiseled_quartz" + "model": "appliedenergistics2:chiseled_quartz_block" } } } \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/chiseled_quartz_stairs.json b/src/main/resources/assets/appliedenergistics2/blockstates/chiseled_quartz_stairs.json index 3442c95fa..64d63c188 100644 --- a/src/main/resources/assets/appliedenergistics2/blockstates/chiseled_quartz_stairs.json +++ b/src/main/resources/assets/appliedenergistics2/blockstates/chiseled_quartz_stairs.json @@ -1,206 +1,206 @@ { "variants": { "facing=east,half=bottom,shape=inner_left": { - "model": "appliedenergistics2:stairs/quartz_certus_chiseled_inner", + "model": "appliedenergistics2:stairs/chiseled_quartz_inner", "uvlock": true, "y": 270 }, "facing=east,half=bottom,shape=inner_right": { - "model": "appliedenergistics2:stairs/quartz_certus_chiseled_inner" + "model": "appliedenergistics2:stairs/chiseled_quartz_inner" }, "facing=east,half=bottom,shape=outer_left": { - "model": "appliedenergistics2:stairs/quartz_certus_chiseled_outer", + "model": "appliedenergistics2:stairs/chiseled_quartz_outer", "uvlock": true, "y": 270 }, "facing=east,half=bottom,shape=outer_right": { - "model": "appliedenergistics2:stairs/quartz_certus_chiseled_outer" + "model": "appliedenergistics2:stairs/chiseled_quartz_outer" }, "facing=east,half=bottom,shape=straight": { - "model": "appliedenergistics2:stairs/quartz_certus_chiseled" + "model": "appliedenergistics2:stairs/chiseled_quartz" }, "facing=east,half=top,shape=inner_left": { - "model": "appliedenergistics2:stairs/quartz_certus_chiseled_inner", + "model": "appliedenergistics2:stairs/chiseled_quartz_inner", "uvlock": true, "x": 180 }, "facing=east,half=top,shape=inner_right": { - "model": "appliedenergistics2:stairs/quartz_certus_chiseled_inner", + "model": "appliedenergistics2:stairs/chiseled_quartz_inner", "uvlock": true, "x": 180, "y": 90 }, "facing=east,half=top,shape=outer_left": { - "model": "appliedenergistics2:stairs/quartz_certus_chiseled_outer", + "model": "appliedenergistics2:stairs/chiseled_quartz_outer", "uvlock": true, "x": 180 }, "facing=east,half=top,shape=outer_right": { - "model": "appliedenergistics2:stairs/quartz_certus_chiseled_outer", + "model": "appliedenergistics2:stairs/chiseled_quartz_outer", "uvlock": true, "x": 180, "y": 90 }, "facing=east,half=top,shape=straight": { - "model": "appliedenergistics2:stairs/quartz_certus_chiseled", + "model": "appliedenergistics2:stairs/chiseled_quartz", "uvlock": true, "x": 180 }, "facing=north,half=bottom,shape=inner_left": { - "model": "appliedenergistics2:stairs/quartz_certus_chiseled_inner", + "model": "appliedenergistics2:stairs/chiseled_quartz_inner", "uvlock": true, "y": 180 }, "facing=north,half=bottom,shape=inner_right": { - "model": "appliedenergistics2:stairs/quartz_certus_chiseled_inner", + "model": "appliedenergistics2:stairs/chiseled_quartz_inner", "uvlock": true, "y": 270 }, "facing=north,half=bottom,shape=outer_left": { - "model": "appliedenergistics2:stairs/quartz_certus_chiseled_outer", + "model": "appliedenergistics2:stairs/chiseled_quartz_outer", "uvlock": true, "y": 180 }, "facing=north,half=bottom,shape=outer_right": { - "model": "appliedenergistics2:stairs/quartz_certus_chiseled_outer", + "model": "appliedenergistics2:stairs/chiseled_quartz_outer", "uvlock": true, "y": 270 }, "facing=north,half=bottom,shape=straight": { - "model": "appliedenergistics2:stairs/quartz_certus_chiseled", + "model": "appliedenergistics2:stairs/chiseled_quartz", "uvlock": true, "y": 270 }, "facing=north,half=top,shape=inner_left": { - "model": "appliedenergistics2:stairs/quartz_certus_chiseled_inner", + "model": "appliedenergistics2:stairs/chiseled_quartz_inner", "uvlock": true, "x": 180, "y": 270 }, "facing=north,half=top,shape=inner_right": { - "model": "appliedenergistics2:stairs/quartz_certus_chiseled_inner", + "model": "appliedenergistics2:stairs/chiseled_quartz_inner", "uvlock": true, "x": 180 }, "facing=north,half=top,shape=outer_left": { - "model": "appliedenergistics2:stairs/quartz_certus_chiseled_outer", + "model": "appliedenergistics2:stairs/chiseled_quartz_outer", "uvlock": true, "x": 180, "y": 270 }, "facing=north,half=top,shape=outer_right": { - "model": "appliedenergistics2:stairs/quartz_certus_chiseled_outer", + "model": "appliedenergistics2:stairs/chiseled_quartz_outer", "uvlock": true, "x": 180 }, "facing=north,half=top,shape=straight": { - "model": "appliedenergistics2:stairs/quartz_certus_chiseled", + "model": "appliedenergistics2:stairs/chiseled_quartz", "uvlock": true, "x": 180, "y": 270 }, "facing=south,half=bottom,shape=inner_left": { - "model": "appliedenergistics2:stairs/quartz_certus_chiseled_inner" + "model": "appliedenergistics2:stairs/chiseled_quartz_inner" }, "facing=south,half=bottom,shape=inner_right": { - "model": "appliedenergistics2:stairs/quartz_certus_chiseled_inner", + "model": "appliedenergistics2:stairs/chiseled_quartz_inner", "uvlock": true, "y": 90 }, "facing=south,half=bottom,shape=outer_left": { - "model": "appliedenergistics2:stairs/quartz_certus_chiseled_outer" + "model": "appliedenergistics2:stairs/chiseled_quartz_outer" }, "facing=south,half=bottom,shape=outer_right": { - "model": "appliedenergistics2:stairs/quartz_certus_chiseled_outer", + "model": "appliedenergistics2:stairs/chiseled_quartz_outer", "uvlock": true, "y": 90 }, "facing=south,half=bottom,shape=straight": { - "model": "appliedenergistics2:stairs/quartz_certus_chiseled", + "model": "appliedenergistics2:stairs/chiseled_quartz", "uvlock": true, "y": 90 }, "facing=south,half=top,shape=inner_left": { - "model": "appliedenergistics2:stairs/quartz_certus_chiseled_inner", + "model": "appliedenergistics2:stairs/chiseled_quartz_inner", "uvlock": true, "x": 180, "y": 90 }, "facing=south,half=top,shape=inner_right": { - "model": "appliedenergistics2:stairs/quartz_certus_chiseled_inner", + "model": "appliedenergistics2:stairs/chiseled_quartz_inner", "uvlock": true, "x": 180, "y": 180 }, "facing=south,half=top,shape=outer_left": { - "model": "appliedenergistics2:stairs/quartz_certus_chiseled_outer", + "model": "appliedenergistics2:stairs/chiseled_quartz_outer", "uvlock": true, "x": 180, "y": 90 }, "facing=south,half=top,shape=outer_right": { - "model": "appliedenergistics2:stairs/quartz_certus_chiseled_outer", + "model": "appliedenergistics2:stairs/chiseled_quartz_outer", "uvlock": true, "x": 180, "y": 180 }, "facing=south,half=top,shape=straight": { - "model": "appliedenergistics2:stairs/quartz_certus_chiseled", + "model": "appliedenergistics2:stairs/chiseled_quartz", "uvlock": true, "x": 180, "y": 90 }, "facing=west,half=bottom,shape=inner_left": { - "model": "appliedenergistics2:stairs/quartz_certus_chiseled_inner", + "model": "appliedenergistics2:stairs/chiseled_quartz_inner", "uvlock": true, "y": 90 }, "facing=west,half=bottom,shape=inner_right": { - "model": "appliedenergistics2:stairs/quartz_certus_chiseled_inner", + "model": "appliedenergistics2:stairs/chiseled_quartz_inner", "uvlock": true, "y": 180 }, "facing=west,half=bottom,shape=outer_left": { - "model": "appliedenergistics2:stairs/quartz_certus_chiseled_outer", + "model": "appliedenergistics2:stairs/chiseled_quartz_outer", "uvlock": true, "y": 90 }, "facing=west,half=bottom,shape=outer_right": { - "model": "appliedenergistics2:stairs/quartz_certus_chiseled_outer", + "model": "appliedenergistics2:stairs/chiseled_quartz_outer", "uvlock": true, "y": 180 }, "facing=west,half=bottom,shape=straight": { - "model": "appliedenergistics2:stairs/quartz_certus_chiseled", + "model": "appliedenergistics2:stairs/chiseled_quartz", "uvlock": true, "y": 180 }, "facing=west,half=top,shape=inner_left": { - "model": "appliedenergistics2:stairs/quartz_certus_chiseled_inner", + "model": "appliedenergistics2:stairs/chiseled_quartz_inner", "uvlock": true, "x": 180, "y": 180 }, "facing=west,half=top,shape=inner_right": { - "model": "appliedenergistics2:stairs/quartz_certus_chiseled_inner", + "model": "appliedenergistics2:stairs/chiseled_quartz_inner", "uvlock": true, "x": 180, "y": 270 }, "facing=west,half=top,shape=outer_left": { - "model": "appliedenergistics2:stairs/quartz_certus_chiseled_outer", + "model": "appliedenergistics2:stairs/chiseled_quartz_outer", "uvlock": true, "x": 180, "y": 180 }, "facing=west,half=top,shape=outer_right": { - "model": "appliedenergistics2:stairs/quartz_certus_chiseled_outer", + "model": "appliedenergistics2:stairs/chiseled_quartz_outer", "uvlock": true, "x": 180, "y": 270 }, "facing=west,half=top,shape=straight": { - "model": "appliedenergistics2:stairs/quartz_certus_chiseled", + "model": "appliedenergistics2:stairs/chiseled_quartz", "uvlock": true, "x": 180, "y": 180 diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/fluix_block.json b/src/main/resources/assets/appliedenergistics2/blockstates/fluix_block.json index 99d57e74f..225ecece7 100644 --- a/src/main/resources/assets/appliedenergistics2/blockstates/fluix_block.json +++ b/src/main/resources/assets/appliedenergistics2/blockstates/fluix_block.json @@ -1,7 +1,7 @@ { "variants": { "normal": { - "model": "appliedenergistics2:fluix" + "model": "appliedenergistics2:fluix_block" } } } \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/grindstone.json b/src/main/resources/assets/appliedenergistics2/blockstates/grindstone.json index cac3f39a0..c1fbceb24 100644 --- a/src/main/resources/assets/appliedenergistics2/blockstates/grindstone.json +++ b/src/main/resources/assets/appliedenergistics2/blockstates/grindstone.json @@ -1,7 +1,7 @@ { "variants": { "normal": { - "model": "appliedenergistics2:grinder" + "model": "appliedenergistics2:grindstone" } } } \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/quartz_block.json b/src/main/resources/assets/appliedenergistics2/blockstates/quartz_block.json index 57e34fa7e..132536ded 100644 --- a/src/main/resources/assets/appliedenergistics2/blockstates/quartz_block.json +++ b/src/main/resources/assets/appliedenergistics2/blockstates/quartz_block.json @@ -1,7 +1,7 @@ { "variants": { "normal": { - "model": "appliedenergistics2:quartz" + "model": "appliedenergistics2:quartz_block" } } } \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/quartz_pillar_stairs.json b/src/main/resources/assets/appliedenergistics2/blockstates/quartz_pillar_stairs.json index 5c72154e1..903511347 100644 --- a/src/main/resources/assets/appliedenergistics2/blockstates/quartz_pillar_stairs.json +++ b/src/main/resources/assets/appliedenergistics2/blockstates/quartz_pillar_stairs.json @@ -1,206 +1,206 @@ { "variants": { "facing=east,half=bottom,shape=inner_left": { - "model": "appliedenergistics2:stairs/quartz_certus_pillar_inner", + "model": "appliedenergistics2:stairs/quartz_pillar_inner", "uvlock": true, "y": 270 }, "facing=east,half=bottom,shape=inner_right": { - "model": "appliedenergistics2:stairs/quartz_certus_pillar_inner" + "model": "appliedenergistics2:stairs/quartz_pillar_inner" }, "facing=east,half=bottom,shape=outer_left": { - "model": "appliedenergistics2:stairs/quartz_certus_pillar_outer", + "model": "appliedenergistics2:stairs/quartz_pillar_outer", "uvlock": true, "y": 270 }, "facing=east,half=bottom,shape=outer_right": { - "model": "appliedenergistics2:stairs/quartz_certus_pillar_outer" + "model": "appliedenergistics2:stairs/quartz_pillar_outer" }, "facing=east,half=bottom,shape=straight": { - "model": "appliedenergistics2:stairs/quartz_certus_pillar" + "model": "appliedenergistics2:stairs/quartz_pillar" }, "facing=east,half=top,shape=inner_left": { - "model": "appliedenergistics2:stairs/quartz_certus_pillar_inner", + "model": "appliedenergistics2:stairs/quartz_pillar_inner", "uvlock": true, "x": 180 }, "facing=east,half=top,shape=inner_right": { - "model": "appliedenergistics2:stairs/quartz_certus_pillar_inner", + "model": "appliedenergistics2:stairs/quartz_pillar_inner", "uvlock": true, "x": 180, "y": 90 }, "facing=east,half=top,shape=outer_left": { - "model": "appliedenergistics2:stairs/quartz_certus_pillar_outer", + "model": "appliedenergistics2:stairs/quartz_pillar_outer", "uvlock": true, "x": 180 }, "facing=east,half=top,shape=outer_right": { - "model": "appliedenergistics2:stairs/quartz_certus_pillar_outer", + "model": "appliedenergistics2:stairs/quartz_pillar_outer", "uvlock": true, "x": 180, "y": 90 }, "facing=east,half=top,shape=straight": { - "model": "appliedenergistics2:stairs/quartz_certus_pillar", + "model": "appliedenergistics2:stairs/quartz_pillar", "uvlock": true, "x": 180 }, "facing=north,half=bottom,shape=inner_left": { - "model": "appliedenergistics2:stairs/quartz_certus_pillar_inner", + "model": "appliedenergistics2:stairs/quartz_pillar_inner", "uvlock": true, "y": 180 }, "facing=north,half=bottom,shape=inner_right": { - "model": "appliedenergistics2:stairs/quartz_certus_pillar_inner", + "model": "appliedenergistics2:stairs/quartz_pillar_inner", "uvlock": true, "y": 270 }, "facing=north,half=bottom,shape=outer_left": { - "model": "appliedenergistics2:stairs/quartz_certus_pillar_outer", + "model": "appliedenergistics2:stairs/quartz_pillar_outer", "uvlock": true, "y": 180 }, "facing=north,half=bottom,shape=outer_right": { - "model": "appliedenergistics2:stairs/quartz_certus_pillar_outer", + "model": "appliedenergistics2:stairs/quartz_pillar_outer", "uvlock": true, "y": 270 }, "facing=north,half=bottom,shape=straight": { - "model": "appliedenergistics2:stairs/quartz_certus_pillar", + "model": "appliedenergistics2:stairs/quartz_pillar", "uvlock": true, "y": 270 }, "facing=north,half=top,shape=inner_left": { - "model": "appliedenergistics2:stairs/quartz_certus_pillar_inner", + "model": "appliedenergistics2:stairs/quartz_pillar_inner", "uvlock": true, "x": 180, "y": 270 }, "facing=north,half=top,shape=inner_right": { - "model": "appliedenergistics2:stairs/quartz_certus_pillar_inner", + "model": "appliedenergistics2:stairs/quartz_pillar_inner", "uvlock": true, "x": 180 }, "facing=north,half=top,shape=outer_left": { - "model": "appliedenergistics2:stairs/quartz_certus_pillar_outer", + "model": "appliedenergistics2:stairs/quartz_pillar_outer", "uvlock": true, "x": 180, "y": 270 }, "facing=north,half=top,shape=outer_right": { - "model": "appliedenergistics2:stairs/quartz_certus_pillar_outer", + "model": "appliedenergistics2:stairs/quartz_pillar_outer", "uvlock": true, "x": 180 }, "facing=north,half=top,shape=straight": { - "model": "appliedenergistics2:stairs/quartz_certus_pillar", + "model": "appliedenergistics2:stairs/quartz_pillar", "uvlock": true, "x": 180, "y": 270 }, "facing=south,half=bottom,shape=inner_left": { - "model": "appliedenergistics2:stairs/quartz_certus_pillar_inner" + "model": "appliedenergistics2:stairs/quartz_pillar_inner" }, "facing=south,half=bottom,shape=inner_right": { - "model": "appliedenergistics2:stairs/quartz_certus_pillar_inner", + "model": "appliedenergistics2:stairs/quartz_pillar_inner", "uvlock": true, "y": 90 }, "facing=south,half=bottom,shape=outer_left": { - "model": "appliedenergistics2:stairs/quartz_certus_pillar_outer" + "model": "appliedenergistics2:stairs/quartz_pillar_outer" }, "facing=south,half=bottom,shape=outer_right": { - "model": "appliedenergistics2:stairs/quartz_certus_pillar_outer", + "model": "appliedenergistics2:stairs/quartz_pillar_outer", "uvlock": true, "y": 90 }, "facing=south,half=bottom,shape=straight": { - "model": "appliedenergistics2:stairs/quartz_certus_pillar", + "model": "appliedenergistics2:stairs/quartz_pillar", "uvlock": true, "y": 90 }, "facing=south,half=top,shape=inner_left": { - "model": "appliedenergistics2:stairs/quartz_certus_pillar_inner", + "model": "appliedenergistics2:stairs/quartz_pillar_inner", "uvlock": true, "x": 180, "y": 90 }, "facing=south,half=top,shape=inner_right": { - "model": "appliedenergistics2:stairs/quartz_certus_pillar_inner", + "model": "appliedenergistics2:stairs/quartz_pillar_inner", "uvlock": true, "x": 180, "y": 180 }, "facing=south,half=top,shape=outer_left": { - "model": "appliedenergistics2:stairs/quartz_certus_pillar_outer", + "model": "appliedenergistics2:stairs/quartz_pillar_outer", "uvlock": true, "x": 180, "y": 90 }, "facing=south,half=top,shape=outer_right": { - "model": "appliedenergistics2:stairs/quartz_certus_pillar_outer", + "model": "appliedenergistics2:stairs/quartz_pillar_outer", "uvlock": true, "x": 180, "y": 180 }, "facing=south,half=top,shape=straight": { - "model": "appliedenergistics2:stairs/quartz_certus_pillar", + "model": "appliedenergistics2:stairs/quartz_pillar", "uvlock": true, "x": 180, "y": 90 }, "facing=west,half=bottom,shape=inner_left": { - "model": "appliedenergistics2:stairs/quartz_certus_pillar_inner", + "model": "appliedenergistics2:stairs/quartz_pillar_inner", "uvlock": true, "y": 90 }, "facing=west,half=bottom,shape=inner_right": { - "model": "appliedenergistics2:stairs/quartz_certus_pillar_inner", + "model": "appliedenergistics2:stairs/quartz_pillar_inner", "uvlock": true, "y": 180 }, "facing=west,half=bottom,shape=outer_left": { - "model": "appliedenergistics2:stairs/quartz_certus_pillar_outer", + "model": "appliedenergistics2:stairs/quartz_pillar_outer", "uvlock": true, "y": 90 }, "facing=west,half=bottom,shape=outer_right": { - "model": "appliedenergistics2:stairs/quartz_certus_pillar_outer", + "model": "appliedenergistics2:stairs/quartz_pillar_outer", "uvlock": true, "y": 180 }, "facing=west,half=bottom,shape=straight": { - "model": "appliedenergistics2:stairs/quartz_certus_pillar", + "model": "appliedenergistics2:stairs/quartz_pillar", "uvlock": true, "y": 180 }, "facing=west,half=top,shape=inner_left": { - "model": "appliedenergistics2:stairs/quartz_certus_pillar_inner", + "model": "appliedenergistics2:stairs/quartz_pillar_inner", "uvlock": true, "x": 180, "y": 180 }, "facing=west,half=top,shape=inner_right": { - "model": "appliedenergistics2:stairs/quartz_certus_pillar_inner", + "model": "appliedenergistics2:stairs/quartz_pillar_inner", "uvlock": true, "x": 180, "y": 270 }, "facing=west,half=top,shape=outer_left": { - "model": "appliedenergistics2:stairs/quartz_certus_pillar_outer", + "model": "appliedenergistics2:stairs/quartz_pillar_outer", "uvlock": true, "x": 180, "y": 180 }, "facing=west,half=top,shape=outer_right": { - "model": "appliedenergistics2:stairs/quartz_certus_pillar_outer", + "model": "appliedenergistics2:stairs/quartz_pillar_outer", "uvlock": true, "x": 180, "y": 270 }, "facing=west,half=top,shape=straight": { - "model": "appliedenergistics2:stairs/quartz_certus_pillar", + "model": "appliedenergistics2:stairs/quartz_pillar", "uvlock": true, "x": 180, "y": 180 diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/quartz_stairs.json b/src/main/resources/assets/appliedenergistics2/blockstates/quartz_stairs.json index 17b9316f6..596bf8adf 100644 --- a/src/main/resources/assets/appliedenergistics2/blockstates/quartz_stairs.json +++ b/src/main/resources/assets/appliedenergistics2/blockstates/quartz_stairs.json @@ -1,206 +1,206 @@ { "variants": { "facing=east,half=bottom,shape=inner_left": { - "model": "appliedenergistics2:stairs/quartz_certus_inner", + "model": "appliedenergistics2:stairs/quartz_inner", "uvlock": true, "y": 270 }, "facing=east,half=bottom,shape=inner_right": { - "model": "appliedenergistics2:stairs/quartz_certus_inner" + "model": "appliedenergistics2:stairs/quartz_inner" }, "facing=east,half=bottom,shape=outer_left": { - "model": "appliedenergistics2:stairs/quartz_certus_outer", + "model": "appliedenergistics2:stairs/quartz_outer", "uvlock": true, "y": 270 }, "facing=east,half=bottom,shape=outer_right": { - "model": "appliedenergistics2:stairs/quartz_certus_outer" + "model": "appliedenergistics2:stairs/quartz_outer" }, "facing=east,half=bottom,shape=straight": { - "model": "appliedenergistics2:stairs/quartz_certus" + "model": "appliedenergistics2:stairs/quartz" }, "facing=east,half=top,shape=inner_left": { - "model": "appliedenergistics2:stairs/quartz_certus_inner", + "model": "appliedenergistics2:stairs/quartz_inner", "uvlock": true, "x": 180 }, "facing=east,half=top,shape=inner_right": { - "model": "appliedenergistics2:stairs/quartz_certus_inner", + "model": "appliedenergistics2:stairs/quartz_inner", "uvlock": true, "x": 180, "y": 90 }, "facing=east,half=top,shape=outer_left": { - "model": "appliedenergistics2:stairs/quartz_certus_outer", + "model": "appliedenergistics2:stairs/quartz_outer", "uvlock": true, "x": 180 }, "facing=east,half=top,shape=outer_right": { - "model": "appliedenergistics2:stairs/quartz_certus_outer", + "model": "appliedenergistics2:stairs/quartz_outer", "uvlock": true, "x": 180, "y": 90 }, "facing=east,half=top,shape=straight": { - "model": "appliedenergistics2:stairs/quartz_certus", + "model": "appliedenergistics2:stairs/quartz", "uvlock": true, "x": 180 }, "facing=north,half=bottom,shape=inner_left": { - "model": "appliedenergistics2:stairs/quartz_certus_inner", + "model": "appliedenergistics2:stairs/quartz_inner", "uvlock": true, "y": 180 }, "facing=north,half=bottom,shape=inner_right": { - "model": "appliedenergistics2:stairs/quartz_certus_inner", + "model": "appliedenergistics2:stairs/quartz_inner", "uvlock": true, "y": 270 }, "facing=north,half=bottom,shape=outer_left": { - "model": "appliedenergistics2:stairs/quartz_certus_outer", + "model": "appliedenergistics2:stairs/quartz_outer", "uvlock": true, "y": 180 }, "facing=north,half=bottom,shape=outer_right": { - "model": "appliedenergistics2:stairs/quartz_certus_outer", + "model": "appliedenergistics2:stairs/quartz_outer", "uvlock": true, "y": 270 }, "facing=north,half=bottom,shape=straight": { - "model": "appliedenergistics2:stairs/quartz_certus", + "model": "appliedenergistics2:stairs/quartz", "uvlock": true, "y": 270 }, "facing=north,half=top,shape=inner_left": { - "model": "appliedenergistics2:stairs/quartz_certus_inner", + "model": "appliedenergistics2:stairs/quartz_inner", "uvlock": true, "x": 180, "y": 270 }, "facing=north,half=top,shape=inner_right": { - "model": "appliedenergistics2:stairs/quartz_certus_inner", + "model": "appliedenergistics2:stairs/quartz_inner", "uvlock": true, "x": 180 }, "facing=north,half=top,shape=outer_left": { - "model": "appliedenergistics2:stairs/quartz_certus_outer", + "model": "appliedenergistics2:stairs/quartz_outer", "uvlock": true, "x": 180, "y": 270 }, "facing=north,half=top,shape=outer_right": { - "model": "appliedenergistics2:stairs/quartz_certus_outer", + "model": "appliedenergistics2:stairs/quartz_outer", "uvlock": true, "x": 180 }, "facing=north,half=top,shape=straight": { - "model": "appliedenergistics2:stairs/quartz_certus", + "model": "appliedenergistics2:stairs/quartz", "uvlock": true, "x": 180, "y": 270 }, "facing=south,half=bottom,shape=inner_left": { - "model": "appliedenergistics2:stairs/quartz_certus_inner" + "model": "appliedenergistics2:stairs/quartz_inner" }, "facing=south,half=bottom,shape=inner_right": { - "model": "appliedenergistics2:stairs/quartz_certus_inner", + "model": "appliedenergistics2:stairs/quartz_inner", "uvlock": true, "y": 90 }, "facing=south,half=bottom,shape=outer_left": { - "model": "appliedenergistics2:stairs/quartz_certus_outer" + "model": "appliedenergistics2:stairs/quartz_outer" }, "facing=south,half=bottom,shape=outer_right": { - "model": "appliedenergistics2:stairs/quartz_certus_outer", + "model": "appliedenergistics2:stairs/quartz_outer", "uvlock": true, "y": 90 }, "facing=south,half=bottom,shape=straight": { - "model": "appliedenergistics2:stairs/quartz_certus", + "model": "appliedenergistics2:stairs/quartz", "uvlock": true, "y": 90 }, "facing=south,half=top,shape=inner_left": { - "model": "appliedenergistics2:stairs/quartz_certus_inner", + "model": "appliedenergistics2:stairs/quartz_inner", "uvlock": true, "x": 180, "y": 90 }, "facing=south,half=top,shape=inner_right": { - "model": "appliedenergistics2:stairs/quartz_certus_inner", + "model": "appliedenergistics2:stairs/quartz_inner", "uvlock": true, "x": 180, "y": 180 }, "facing=south,half=top,shape=outer_left": { - "model": "appliedenergistics2:stairs/quartz_certus_outer", + "model": "appliedenergistics2:stairs/quartz_outer", "uvlock": true, "x": 180, "y": 90 }, "facing=south,half=top,shape=outer_right": { - "model": "appliedenergistics2:stairs/quartz_certus_outer", + "model": "appliedenergistics2:stairs/quartz_outer", "uvlock": true, "x": 180, "y": 180 }, "facing=south,half=top,shape=straight": { - "model": "appliedenergistics2:stairs/quartz_certus", + "model": "appliedenergistics2:stairs/quartz", "uvlock": true, "x": 180, "y": 90 }, "facing=west,half=bottom,shape=inner_left": { - "model": "appliedenergistics2:stairs/quartz_certus_inner", + "model": "appliedenergistics2:stairs/quartz_inner", "uvlock": true, "y": 90 }, "facing=west,half=bottom,shape=inner_right": { - "model": "appliedenergistics2:stairs/quartz_certus_inner", + "model": "appliedenergistics2:stairs/quartz_inner", "uvlock": true, "y": 180 }, "facing=west,half=bottom,shape=outer_left": { - "model": "appliedenergistics2:stairs/quartz_certus_outer", + "model": "appliedenergistics2:stairs/quartz_outer", "uvlock": true, "y": 90 }, "facing=west,half=bottom,shape=outer_right": { - "model": "appliedenergistics2:stairs/quartz_certus_outer", + "model": "appliedenergistics2:stairs/quartz_outer", "uvlock": true, "y": 180 }, "facing=west,half=bottom,shape=straight": { - "model": "appliedenergistics2:stairs/quartz_certus", + "model": "appliedenergistics2:stairs/quartz", "uvlock": true, "y": 180 }, "facing=west,half=top,shape=inner_left": { - "model": "appliedenergistics2:stairs/quartz_certus_inner", + "model": "appliedenergistics2:stairs/quartz_inner", "uvlock": true, "x": 180, "y": 180 }, "facing=west,half=top,shape=inner_right": { - "model": "appliedenergistics2:stairs/quartz_certus_inner", + "model": "appliedenergistics2:stairs/quartz_inner", "uvlock": true, "x": 180, "y": 270 }, "facing=west,half=top,shape=outer_left": { - "model": "appliedenergistics2:stairs/quartz_certus_outer", + "model": "appliedenergistics2:stairs/quartz_outer", "uvlock": true, "x": 180, "y": 180 }, "facing=west,half=top,shape=outer_right": { - "model": "appliedenergistics2:stairs/quartz_certus_outer", + "model": "appliedenergistics2:stairs/quartz_outer", "uvlock": true, "x": 180, "y": 270 }, "facing=west,half=top,shape=straight": { - "model": "appliedenergistics2:stairs/quartz_certus", + "model": "appliedenergistics2:stairs/quartz", "uvlock": true, "x": 180, "y": 180 diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_block.json b/src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_block.json index 3d5abc8bd..0f9b80004 100644 --- a/src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_block.json +++ b/src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_block.json @@ -1,7 +1,7 @@ { "variants": { "normal": { - "model": "appliedenergistics2:sky_stone_block_stone" + "model": "appliedenergistics2:sky_stone_block" } } } \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_brick.json b/src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_brick.json index a2d23b83d..af095ed64 100644 --- a/src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_brick.json +++ b/src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_brick.json @@ -1,7 +1,7 @@ { "variants": { "normal": { - "model": "appliedenergistics2:sky_stone_block_brick" + "model": "appliedenergistics2:sky_stone_brick" } } } \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_brick_stairs.json b/src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_brick_stairs.json index d07883966..27e9f0d2c 100644 --- a/src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_brick_stairs.json +++ b/src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_brick_stairs.json @@ -1,206 +1,206 @@ { "variants": { "facing=east,half=bottom,shape=inner_left": { - "model": "appliedenergistics2:stairs/skystone_brick_inner", + "model": "appliedenergistics2:stairs/sky_stone_brick_inner", "uvlock": true, "y": 270 }, "facing=east,half=bottom,shape=inner_right": { - "model": "appliedenergistics2:stairs/skystone_brick_inner" + "model": "appliedenergistics2:stairs/sky_stone_brick_inner" }, "facing=east,half=bottom,shape=outer_left": { - "model": "appliedenergistics2:stairs/skystone_brick_outer", + "model": "appliedenergistics2:stairs/sky_stone_brick_outer", "uvlock": true, "y": 270 }, "facing=east,half=bottom,shape=outer_right": { - "model": "appliedenergistics2:stairs/skystone_brick_outer" + "model": "appliedenergistics2:stairs/sky_stone_brick_outer" }, "facing=east,half=bottom,shape=straight": { - "model": "appliedenergistics2:stairs/skystone_brick" + "model": "appliedenergistics2:stairs/sky_stone_brick" }, "facing=east,half=top,shape=inner_left": { - "model": "appliedenergistics2:stairs/skystone_brick_inner", + "model": "appliedenergistics2:stairs/sky_stone_brick_inner", "uvlock": true, "x": 180 }, "facing=east,half=top,shape=inner_right": { - "model": "appliedenergistics2:stairs/skystone_brick_inner", + "model": "appliedenergistics2:stairs/sky_stone_brick_inner", "uvlock": true, "x": 180, "y": 90 }, "facing=east,half=top,shape=outer_left": { - "model": "appliedenergistics2:stairs/skystone_brick_outer", + "model": "appliedenergistics2:stairs/sky_stone_brick_outer", "uvlock": true, "x": 180 }, "facing=east,half=top,shape=outer_right": { - "model": "appliedenergistics2:stairs/skystone_brick_outer", + "model": "appliedenergistics2:stairs/sky_stone_brick_outer", "uvlock": true, "x": 180, "y": 90 }, "facing=east,half=top,shape=straight": { - "model": "appliedenergistics2:stairs/skystone_brick", + "model": "appliedenergistics2:stairs/sky_stone_brick", "uvlock": true, "x": 180 }, "facing=north,half=bottom,shape=inner_left": { - "model": "appliedenergistics2:stairs/skystone_brick_inner", + "model": "appliedenergistics2:stairs/sky_stone_brick_inner", "uvlock": true, "y": 180 }, "facing=north,half=bottom,shape=inner_right": { - "model": "appliedenergistics2:stairs/skystone_brick_inner", + "model": "appliedenergistics2:stairs/sky_stone_brick_inner", "uvlock": true, "y": 270 }, "facing=north,half=bottom,shape=outer_left": { - "model": "appliedenergistics2:stairs/skystone_brick_outer", + "model": "appliedenergistics2:stairs/sky_stone_brick_outer", "uvlock": true, "y": 180 }, "facing=north,half=bottom,shape=outer_right": { - "model": "appliedenergistics2:stairs/skystone_brick_outer", + "model": "appliedenergistics2:stairs/sky_stone_brick_outer", "uvlock": true, "y": 270 }, "facing=north,half=bottom,shape=straight": { - "model": "appliedenergistics2:stairs/skystone_brick", + "model": "appliedenergistics2:stairs/sky_stone_brick", "uvlock": true, "y": 270 }, "facing=north,half=top,shape=inner_left": { - "model": "appliedenergistics2:stairs/skystone_brick_inner", + "model": "appliedenergistics2:stairs/sky_stone_brick_inner", "uvlock": true, "x": 180, "y": 270 }, "facing=north,half=top,shape=inner_right": { - "model": "appliedenergistics2:stairs/skystone_brick_inner", + "model": "appliedenergistics2:stairs/sky_stone_brick_inner", "uvlock": true, "x": 180 }, "facing=north,half=top,shape=outer_left": { - "model": "appliedenergistics2:stairs/skystone_brick_outer", + "model": "appliedenergistics2:stairs/sky_stone_brick_outer", "uvlock": true, "x": 180, "y": 270 }, "facing=north,half=top,shape=outer_right": { - "model": "appliedenergistics2:stairs/skystone_brick_outer", + "model": "appliedenergistics2:stairs/sky_stone_brick_outer", "uvlock": true, "x": 180 }, "facing=north,half=top,shape=straight": { - "model": "appliedenergistics2:stairs/skystone_brick", + "model": "appliedenergistics2:stairs/sky_stone_brick", "uvlock": true, "x": 180, "y": 270 }, "facing=south,half=bottom,shape=inner_left": { - "model": "appliedenergistics2:stairs/skystone_brick_inner" + "model": "appliedenergistics2:stairs/sky_stone_brick_inner" }, "facing=south,half=bottom,shape=inner_right": { - "model": "appliedenergistics2:stairs/skystone_brick_inner", + "model": "appliedenergistics2:stairs/sky_stone_brick_inner", "uvlock": true, "y": 90 }, "facing=south,half=bottom,shape=outer_left": { - "model": "appliedenergistics2:stairs/skystone_brick_outer" + "model": "appliedenergistics2:stairs/sky_stone_brick_outer" }, "facing=south,half=bottom,shape=outer_right": { - "model": "appliedenergistics2:stairs/skystone_brick_outer", + "model": "appliedenergistics2:stairs/sky_stone_brick_outer", "uvlock": true, "y": 90 }, "facing=south,half=bottom,shape=straight": { - "model": "appliedenergistics2:stairs/skystone_brick", + "model": "appliedenergistics2:stairs/sky_stone_brick", "uvlock": true, "y": 90 }, "facing=south,half=top,shape=inner_left": { - "model": "appliedenergistics2:stairs/skystone_brick_inner", + "model": "appliedenergistics2:stairs/sky_stone_brick_inner", "uvlock": true, "x": 180, "y": 90 }, "facing=south,half=top,shape=inner_right": { - "model": "appliedenergistics2:stairs/skystone_brick_inner", + "model": "appliedenergistics2:stairs/sky_stone_brick_inner", "uvlock": true, "x": 180, "y": 180 }, "facing=south,half=top,shape=outer_left": { - "model": "appliedenergistics2:stairs/skystone_brick_outer", + "model": "appliedenergistics2:stairs/sky_stone_brick_outer", "uvlock": true, "x": 180, "y": 90 }, "facing=south,half=top,shape=outer_right": { - "model": "appliedenergistics2:stairs/skystone_brick_outer", + "model": "appliedenergistics2:stairs/sky_stone_brick_outer", "uvlock": true, "x": 180, "y": 180 }, "facing=south,half=top,shape=straight": { - "model": "appliedenergistics2:stairs/skystone_brick", + "model": "appliedenergistics2:stairs/sky_stone_brick", "uvlock": true, "x": 180, "y": 90 }, "facing=west,half=bottom,shape=inner_left": { - "model": "appliedenergistics2:stairs/skystone_brick_inner", + "model": "appliedenergistics2:stairs/sky_stone_brick_inner", "uvlock": true, "y": 90 }, "facing=west,half=bottom,shape=inner_right": { - "model": "appliedenergistics2:stairs/skystone_brick_inner", + "model": "appliedenergistics2:stairs/sky_stone_brick_inner", "uvlock": true, "y": 180 }, "facing=west,half=bottom,shape=outer_left": { - "model": "appliedenergistics2:stairs/skystone_brick_outer", + "model": "appliedenergistics2:stairs/sky_stone_brick_outer", "uvlock": true, "y": 90 }, "facing=west,half=bottom,shape=outer_right": { - "model": "appliedenergistics2:stairs/skystone_brick_outer", + "model": "appliedenergistics2:stairs/sky_stone_brick_outer", "uvlock": true, "y": 180 }, "facing=west,half=bottom,shape=straight": { - "model": "appliedenergistics2:stairs/skystone_brick", + "model": "appliedenergistics2:stairs/sky_stone_brick", "uvlock": true, "y": 180 }, "facing=west,half=top,shape=inner_left": { - "model": "appliedenergistics2:stairs/skystone_brick_inner", + "model": "appliedenergistics2:stairs/sky_stone_brick_inner", "uvlock": true, "x": 180, "y": 180 }, "facing=west,half=top,shape=inner_right": { - "model": "appliedenergistics2:stairs/skystone_brick_inner", + "model": "appliedenergistics2:stairs/sky_stone_brick_inner", "uvlock": true, "x": 180, "y": 270 }, "facing=west,half=top,shape=outer_left": { - "model": "appliedenergistics2:stairs/skystone_brick_outer", + "model": "appliedenergistics2:stairs/sky_stone_brick_outer", "uvlock": true, "x": 180, "y": 180 }, "facing=west,half=top,shape=outer_right": { - "model": "appliedenergistics2:stairs/skystone_brick_outer", + "model": "appliedenergistics2:stairs/sky_stone_brick_outer", "uvlock": true, "x": 180, "y": 270 }, "facing=west,half=top,shape=straight": { - "model": "appliedenergistics2:stairs/skystone_brick", + "model": "appliedenergistics2:stairs/sky_stone_brick", "uvlock": true, "x": 180, "y": 180 diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_small_brick.json b/src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_small_brick.json index 0fac5d4f1..3ee8d76a9 100644 --- a/src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_small_brick.json +++ b/src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_small_brick.json @@ -1,7 +1,7 @@ { "variants": { "normal": { - "model": "appliedenergistics2:sky_stone_block_small_brick" + "model": "appliedenergistics2:sky_stone_small_brick" } } } \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_small_brick_stairs.json b/src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_small_brick_stairs.json index 37b701c02..f232ec5b2 100644 --- a/src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_small_brick_stairs.json +++ b/src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_small_brick_stairs.json @@ -1,206 +1,206 @@ { "variants": { "facing=east,half=bottom,shape=inner_left": { - "model": "appliedenergistics2:stairs/skystone_brick_small_inner", + "model": "appliedenergistics2:stairs/sky_stone_small_brick_inner", "uvlock": true, "y": 270 }, "facing=east,half=bottom,shape=inner_right": { - "model": "appliedenergistics2:stairs/skystone_brick_small_inner" + "model": "appliedenergistics2:stairs/sky_stone_small_brick_inner" }, "facing=east,half=bottom,shape=outer_left": { - "model": "appliedenergistics2:stairs/skystone_brick_small_outer", + "model": "appliedenergistics2:stairs/sky_stone_small_brick_outer", "uvlock": true, "y": 270 }, "facing=east,half=bottom,shape=outer_right": { - "model": "appliedenergistics2:stairs/skystone_brick_small_outer" + "model": "appliedenergistics2:stairs/sky_stone_small_brick_outer" }, "facing=east,half=bottom,shape=straight": { - "model": "appliedenergistics2:stairs/skystone_brick_small" + "model": "appliedenergistics2:stairs/sky_stone_small_brick" }, "facing=east,half=top,shape=inner_left": { - "model": "appliedenergistics2:stairs/skystone_brick_small_inner", + "model": "appliedenergistics2:stairs/sky_stone_small_brick_inner", "uvlock": true, "x": 180 }, "facing=east,half=top,shape=inner_right": { - "model": "appliedenergistics2:stairs/skystone_brick_small_inner", + "model": "appliedenergistics2:stairs/sky_stone_small_brick_inner", "uvlock": true, "x": 180, "y": 90 }, "facing=east,half=top,shape=outer_left": { - "model": "appliedenergistics2:stairs/skystone_brick_small_outer", + "model": "appliedenergistics2:stairs/sky_stone_small_brick_outer", "uvlock": true, "x": 180 }, "facing=east,half=top,shape=outer_right": { - "model": "appliedenergistics2:stairs/skystone_brick_small_outer", + "model": "appliedenergistics2:stairs/sky_stone_small_brick_outer", "uvlock": true, "x": 180, "y": 90 }, "facing=east,half=top,shape=straight": { - "model": "appliedenergistics2:stairs/skystone_brick_small", + "model": "appliedenergistics2:stairs/sky_stone_small_brick", "uvlock": true, "x": 180 }, "facing=north,half=bottom,shape=inner_left": { - "model": "appliedenergistics2:stairs/skystone_brick_small_inner", + "model": "appliedenergistics2:stairs/sky_stone_small_brick_inner", "uvlock": true, "y": 180 }, "facing=north,half=bottom,shape=inner_right": { - "model": "appliedenergistics2:stairs/skystone_brick_small_inner", + "model": "appliedenergistics2:stairs/sky_stone_small_brick_inner", "uvlock": true, "y": 270 }, "facing=north,half=bottom,shape=outer_left": { - "model": "appliedenergistics2:stairs/skystone_brick_small_outer", + "model": "appliedenergistics2:stairs/sky_stone_small_brick_outer", "uvlock": true, "y": 180 }, "facing=north,half=bottom,shape=outer_right": { - "model": "appliedenergistics2:stairs/skystone_brick_small_outer", + "model": "appliedenergistics2:stairs/sky_stone_small_brick_outer", "uvlock": true, "y": 270 }, "facing=north,half=bottom,shape=straight": { - "model": "appliedenergistics2:stairs/skystone_brick_small", + "model": "appliedenergistics2:stairs/sky_stone_small_brick", "uvlock": true, "y": 270 }, "facing=north,half=top,shape=inner_left": { - "model": "appliedenergistics2:stairs/skystone_brick_small_inner", + "model": "appliedenergistics2:stairs/sky_stone_small_brick_inner", "uvlock": true, "x": 180, "y": 270 }, "facing=north,half=top,shape=inner_right": { - "model": "appliedenergistics2:stairs/skystone_brick_small_inner", + "model": "appliedenergistics2:stairs/sky_stone_small_brick_inner", "uvlock": true, "x": 180 }, "facing=north,half=top,shape=outer_left": { - "model": "appliedenergistics2:stairs/skystone_brick_small_outer", + "model": "appliedenergistics2:stairs/sky_stone_small_brick_outer", "uvlock": true, "x": 180, "y": 270 }, "facing=north,half=top,shape=outer_right": { - "model": "appliedenergistics2:stairs/skystone_brick_small_outer", + "model": "appliedenergistics2:stairs/sky_stone_small_brick_outer", "uvlock": true, "x": 180 }, "facing=north,half=top,shape=straight": { - "model": "appliedenergistics2:stairs/skystone_brick_small", + "model": "appliedenergistics2:stairs/sky_stone_small_brick", "uvlock": true, "x": 180, "y": 270 }, "facing=south,half=bottom,shape=inner_left": { - "model": "appliedenergistics2:stairs/skystone_brick_small_inner" + "model": "appliedenergistics2:stairs/sky_stone_small_brick_inner" }, "facing=south,half=bottom,shape=inner_right": { - "model": "appliedenergistics2:stairs/skystone_brick_small_inner", + "model": "appliedenergistics2:stairs/sky_stone_small_brick_inner", "uvlock": true, "y": 90 }, "facing=south,half=bottom,shape=outer_left": { - "model": "appliedenergistics2:stairs/skystone_brick_small_outer" + "model": "appliedenergistics2:stairs/sky_stone_small_brick_outer" }, "facing=south,half=bottom,shape=outer_right": { - "model": "appliedenergistics2:stairs/skystone_brick_small_outer", + "model": "appliedenergistics2:stairs/sky_stone_small_brick_outer", "uvlock": true, "y": 90 }, "facing=south,half=bottom,shape=straight": { - "model": "appliedenergistics2:stairs/skystone_brick_small", + "model": "appliedenergistics2:stairs/sky_stone_small_brick", "uvlock": true, "y": 90 }, "facing=south,half=top,shape=inner_left": { - "model": "appliedenergistics2:stairs/skystone_brick_small_inner", + "model": "appliedenergistics2:stairs/sky_stone_small_brick_inner", "uvlock": true, "x": 180, "y": 90 }, "facing=south,half=top,shape=inner_right": { - "model": "appliedenergistics2:stairs/skystone_brick_small_inner", + "model": "appliedenergistics2:stairs/sky_stone_small_brick_inner", "uvlock": true, "x": 180, "y": 180 }, "facing=south,half=top,shape=outer_left": { - "model": "appliedenergistics2:stairs/skystone_brick_small_outer", + "model": "appliedenergistics2:stairs/sky_stone_small_brick_outer", "uvlock": true, "x": 180, "y": 90 }, "facing=south,half=top,shape=outer_right": { - "model": "appliedenergistics2:stairs/skystone_brick_small_outer", + "model": "appliedenergistics2:stairs/sky_stone_small_brick_outer", "uvlock": true, "x": 180, "y": 180 }, "facing=south,half=top,shape=straight": { - "model": "appliedenergistics2:stairs/skystone_brick_small", + "model": "appliedenergistics2:stairs/sky_stone_small_brick", "uvlock": true, "x": 180, "y": 90 }, "facing=west,half=bottom,shape=inner_left": { - "model": "appliedenergistics2:stairs/skystone_brick_small_inner", + "model": "appliedenergistics2:stairs/sky_stone_small_brick_inner", "uvlock": true, "y": 90 }, "facing=west,half=bottom,shape=inner_right": { - "model": "appliedenergistics2:stairs/skystone_brick_small_inner", + "model": "appliedenergistics2:stairs/sky_stone_small_brick_inner", "uvlock": true, "y": 180 }, "facing=west,half=bottom,shape=outer_left": { - "model": "appliedenergistics2:stairs/skystone_brick_small_outer", + "model": "appliedenergistics2:stairs/sky_stone_small_brick_outer", "uvlock": true, "y": 90 }, "facing=west,half=bottom,shape=outer_right": { - "model": "appliedenergistics2:stairs/skystone_brick_small_outer", + "model": "appliedenergistics2:stairs/sky_stone_small_brick_outer", "uvlock": true, "y": 180 }, "facing=west,half=bottom,shape=straight": { - "model": "appliedenergistics2:stairs/skystone_brick_small", + "model": "appliedenergistics2:stairs/sky_stone_small_brick", "uvlock": true, "y": 180 }, "facing=west,half=top,shape=inner_left": { - "model": "appliedenergistics2:stairs/skystone_brick_small_inner", + "model": "appliedenergistics2:stairs/sky_stone_small_brick_inner", "uvlock": true, "x": 180, "y": 180 }, "facing=west,half=top,shape=inner_right": { - "model": "appliedenergistics2:stairs/skystone_brick_small_inner", + "model": "appliedenergistics2:stairs/sky_stone_small_brick_inner", "uvlock": true, "x": 180, "y": 270 }, "facing=west,half=top,shape=outer_left": { - "model": "appliedenergistics2:stairs/skystone_brick_small_outer", + "model": "appliedenergistics2:stairs/sky_stone_small_brick_outer", "uvlock": true, "x": 180, "y": 180 }, "facing=west,half=top,shape=outer_right": { - "model": "appliedenergistics2:stairs/skystone_brick_small_outer", + "model": "appliedenergistics2:stairs/sky_stone_small_brick_outer", "uvlock": true, "x": 180, "y": 270 }, "facing=west,half=top,shape=straight": { - "model": "appliedenergistics2:stairs/skystone_brick_small", + "model": "appliedenergistics2:stairs/sky_stone_small_brick", "uvlock": true, "x": 180, "y": 180 diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_stairs.json b/src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_stairs.json index 6daacbbac..bbd13affa 100644 --- a/src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_stairs.json +++ b/src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_stairs.json @@ -1,206 +1,206 @@ { "variants": { "facing=east,half=bottom,shape=inner_left": { - "model": "appliedenergistics2:stairs/skystone_stone_inner", + "model": "appliedenergistics2:stairs/sky_stone_inner", "uvlock": true, "y": 270 }, "facing=east,half=bottom,shape=inner_right": { - "model": "appliedenergistics2:stairs/skystone_stone_inner" + "model": "appliedenergistics2:stairs/sky_stone_inner" }, "facing=east,half=bottom,shape=outer_left": { - "model": "appliedenergistics2:stairs/skystone_stone_outer", + "model": "appliedenergistics2:stairs/sky_stone_outer", "uvlock": true, "y": 270 }, "facing=east,half=bottom,shape=outer_right": { - "model": "appliedenergistics2:stairs/skystone_stone_outer" + "model": "appliedenergistics2:stairs/sky_stone_outer" }, "facing=east,half=bottom,shape=straight": { - "model": "appliedenergistics2:stairs/skystone_stone" + "model": "appliedenergistics2:stairs/sky_stone" }, "facing=east,half=top,shape=inner_left": { - "model": "appliedenergistics2:stairs/skystone_stone_inner", + "model": "appliedenergistics2:stairs/sky_stone_inner", "uvlock": true, "x": 180 }, "facing=east,half=top,shape=inner_right": { - "model": "appliedenergistics2:stairs/skystone_stone_inner", + "model": "appliedenergistics2:stairs/sky_stone_inner", "uvlock": true, "x": 180, "y": 90 }, "facing=east,half=top,shape=outer_left": { - "model": "appliedenergistics2:stairs/skystone_stone_outer", + "model": "appliedenergistics2:stairs/sky_stone_outer", "uvlock": true, "x": 180 }, "facing=east,half=top,shape=outer_right": { - "model": "appliedenergistics2:stairs/skystone_stone_outer", + "model": "appliedenergistics2:stairs/sky_stone_outer", "uvlock": true, "x": 180, "y": 90 }, "facing=east,half=top,shape=straight": { - "model": "appliedenergistics2:stairs/skystone_stone", + "model": "appliedenergistics2:stairs/sky_stone", "uvlock": true, "x": 180 }, "facing=north,half=bottom,shape=inner_left": { - "model": "appliedenergistics2:stairs/skystone_stone_inner", + "model": "appliedenergistics2:stairs/sky_stone_inner", "uvlock": true, "y": 180 }, "facing=north,half=bottom,shape=inner_right": { - "model": "appliedenergistics2:stairs/skystone_stone_inner", + "model": "appliedenergistics2:stairs/sky_stone_inner", "uvlock": true, "y": 270 }, "facing=north,half=bottom,shape=outer_left": { - "model": "appliedenergistics2:stairs/skystone_stone_outer", + "model": "appliedenergistics2:stairs/sky_stone_outer", "uvlock": true, "y": 180 }, "facing=north,half=bottom,shape=outer_right": { - "model": "appliedenergistics2:stairs/skystone_stone_outer", + "model": "appliedenergistics2:stairs/sky_stone_outer", "uvlock": true, "y": 270 }, "facing=north,half=bottom,shape=straight": { - "model": "appliedenergistics2:stairs/skystone_stone", + "model": "appliedenergistics2:stairs/sky_stone", "uvlock": true, "y": 270 }, "facing=north,half=top,shape=inner_left": { - "model": "appliedenergistics2:stairs/skystone_stone_inner", + "model": "appliedenergistics2:stairs/sky_stone_inner", "uvlock": true, "x": 180, "y": 270 }, "facing=north,half=top,shape=inner_right": { - "model": "appliedenergistics2:stairs/skystone_stone_inner", + "model": "appliedenergistics2:stairs/sky_stone_inner", "uvlock": true, "x": 180 }, "facing=north,half=top,shape=outer_left": { - "model": "appliedenergistics2:stairs/skystone_stone_outer", + "model": "appliedenergistics2:stairs/sky_stone_outer", "uvlock": true, "x": 180, "y": 270 }, "facing=north,half=top,shape=outer_right": { - "model": "appliedenergistics2:stairs/skystone_stone_outer", + "model": "appliedenergistics2:stairs/sky_stone_outer", "uvlock": true, "x": 180 }, "facing=north,half=top,shape=straight": { - "model": "appliedenergistics2:stairs/skystone_stone", + "model": "appliedenergistics2:stairs/sky_stone", "uvlock": true, "x": 180, "y": 270 }, "facing=south,half=bottom,shape=inner_left": { - "model": "appliedenergistics2:stairs/skystone_stone_inner" + "model": "appliedenergistics2:stairs/sky_stone_inner" }, "facing=south,half=bottom,shape=inner_right": { - "model": "appliedenergistics2:stairs/skystone_stone_inner", + "model": "appliedenergistics2:stairs/sky_stone_inner", "uvlock": true, "y": 90 }, "facing=south,half=bottom,shape=outer_left": { - "model": "appliedenergistics2:stairs/skystone_stone_outer" + "model": "appliedenergistics2:stairs/sky_stone_outer" }, "facing=south,half=bottom,shape=outer_right": { - "model": "appliedenergistics2:stairs/skystone_stone_outer", + "model": "appliedenergistics2:stairs/sky_stone_outer", "uvlock": true, "y": 90 }, "facing=south,half=bottom,shape=straight": { - "model": "appliedenergistics2:stairs/skystone_stone", + "model": "appliedenergistics2:stairs/sky_stone", "uvlock": true, "y": 90 }, "facing=south,half=top,shape=inner_left": { - "model": "appliedenergistics2:stairs/skystone_stone_inner", + "model": "appliedenergistics2:stairs/sky_stone_inner", "uvlock": true, "x": 180, "y": 90 }, "facing=south,half=top,shape=inner_right": { - "model": "appliedenergistics2:stairs/skystone_stone_inner", + "model": "appliedenergistics2:stairs/sky_stone_inner", "uvlock": true, "x": 180, "y": 180 }, "facing=south,half=top,shape=outer_left": { - "model": "appliedenergistics2:stairs/skystone_stone_outer", + "model": "appliedenergistics2:stairs/sky_stone_outer", "uvlock": true, "x": 180, "y": 90 }, "facing=south,half=top,shape=outer_right": { - "model": "appliedenergistics2:stairs/skystone_stone_outer", + "model": "appliedenergistics2:stairs/sky_stone_outer", "uvlock": true, "x": 180, "y": 180 }, "facing=south,half=top,shape=straight": { - "model": "appliedenergistics2:stairs/skystone_stone", + "model": "appliedenergistics2:stairs/sky_stone", "uvlock": true, "x": 180, "y": 90 }, "facing=west,half=bottom,shape=inner_left": { - "model": "appliedenergistics2:stairs/skystone_stone_inner", + "model": "appliedenergistics2:stairs/sky_stone_inner", "uvlock": true, "y": 90 }, "facing=west,half=bottom,shape=inner_right": { - "model": "appliedenergistics2:stairs/skystone_stone_inner", + "model": "appliedenergistics2:stairs/sky_stone_inner", "uvlock": true, "y": 180 }, "facing=west,half=bottom,shape=outer_left": { - "model": "appliedenergistics2:stairs/skystone_stone_outer", + "model": "appliedenergistics2:stairs/sky_stone_outer", "uvlock": true, "y": 90 }, "facing=west,half=bottom,shape=outer_right": { - "model": "appliedenergistics2:stairs/skystone_stone_outer", + "model": "appliedenergistics2:stairs/sky_stone_outer", "uvlock": true, "y": 180 }, "facing=west,half=bottom,shape=straight": { - "model": "appliedenergistics2:stairs/skystone_stone", + "model": "appliedenergistics2:stairs/sky_stone", "uvlock": true, "y": 180 }, "facing=west,half=top,shape=inner_left": { - "model": "appliedenergistics2:stairs/skystone_stone_inner", + "model": "appliedenergistics2:stairs/sky_stone_inner", "uvlock": true, "x": 180, "y": 180 }, "facing=west,half=top,shape=inner_right": { - "model": "appliedenergistics2:stairs/skystone_stone_inner", + "model": "appliedenergistics2:stairs/sky_stone_inner", "uvlock": true, "x": 180, "y": 270 }, "facing=west,half=top,shape=outer_left": { - "model": "appliedenergistics2:stairs/skystone_stone_outer", + "model": "appliedenergistics2:stairs/sky_stone_outer", "uvlock": true, "x": 180, "y": 180 }, "facing=west,half=top,shape=outer_right": { - "model": "appliedenergistics2:stairs/skystone_stone_outer", + "model": "appliedenergistics2:stairs/sky_stone_outer", "uvlock": true, "x": 180, "y": 270 }, "facing=west,half=top,shape=straight": { - "model": "appliedenergistics2:stairs/skystone_stone", + "model": "appliedenergistics2:stairs/sky_stone", "uvlock": true, "x": 180, "y": 180 diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_stone.json b/src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_stone.json deleted file mode 100644 index 475760752..000000000 --- a/src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_stone.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "normal": { - "model": "appliedenergistics2:sky_stone_stone" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/smooth_sky_stone_block.json b/src/main/resources/assets/appliedenergistics2/blockstates/smooth_sky_stone_block.json index c2aa46a3a..c80668414 100644 --- a/src/main/resources/assets/appliedenergistics2/blockstates/smooth_sky_stone_block.json +++ b/src/main/resources/assets/appliedenergistics2/blockstates/smooth_sky_stone_block.json @@ -1,7 +1,7 @@ { "variants": { "normal": { - "model": "appliedenergistics2:sky_stone_block_block" + "model": "appliedenergistics2:smooth_sky_stone_block" } } } \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/smooth_sky_stone_stairs.json b/src/main/resources/assets/appliedenergistics2/blockstates/smooth_sky_stone_stairs.json index 30ed4e47d..b2504bea1 100644 --- a/src/main/resources/assets/appliedenergistics2/blockstates/smooth_sky_stone_stairs.json +++ b/src/main/resources/assets/appliedenergistics2/blockstates/smooth_sky_stone_stairs.json @@ -1,206 +1,206 @@ { "variants": { "facing=east,half=bottom,shape=inner_left": { - "model": "appliedenergistics2:stairs/skystone_block_inner", + "model": "appliedenergistics2:stairs/smooth_sky_stone_inner", "uvlock": true, "y": 270 }, "facing=east,half=bottom,shape=inner_right": { - "model": "appliedenergistics2:stairs/skystone_block_inner" + "model": "appliedenergistics2:stairs/smooth_sky_stone_inner" }, "facing=east,half=bottom,shape=outer_left": { - "model": "appliedenergistics2:stairs/skystone_block_outer", + "model": "appliedenergistics2:stairs/smooth_sky_stone_outer", "uvlock": true, "y": 270 }, "facing=east,half=bottom,shape=outer_right": { - "model": "appliedenergistics2:stairs/skystone_block_outer" + "model": "appliedenergistics2:stairs/smooth_sky_stone_outer" }, "facing=east,half=bottom,shape=straight": { - "model": "appliedenergistics2:stairs/skystone_block" + "model": "appliedenergistics2:stairs/smooth_sky_stone" }, "facing=east,half=top,shape=inner_left": { - "model": "appliedenergistics2:stairs/skystone_block_inner", + "model": "appliedenergistics2:stairs/smooth_sky_stone_inner", "uvlock": true, "x": 180 }, "facing=east,half=top,shape=inner_right": { - "model": "appliedenergistics2:stairs/skystone_block_inner", + "model": "appliedenergistics2:stairs/smooth_sky_stone_inner", "uvlock": true, "x": 180, "y": 90 }, "facing=east,half=top,shape=outer_left": { - "model": "appliedenergistics2:stairs/skystone_block_outer", + "model": "appliedenergistics2:stairs/smooth_sky_stone_outer", "uvlock": true, "x": 180 }, "facing=east,half=top,shape=outer_right": { - "model": "appliedenergistics2:stairs/skystone_block_outer", + "model": "appliedenergistics2:stairs/smooth_sky_stone_outer", "uvlock": true, "x": 180, "y": 90 }, "facing=east,half=top,shape=straight": { - "model": "appliedenergistics2:stairs/skystone_block", + "model": "appliedenergistics2:stairs/smooth_sky_stone", "uvlock": true, "x": 180 }, "facing=north,half=bottom,shape=inner_left": { - "model": "appliedenergistics2:stairs/skystone_block_inner", + "model": "appliedenergistics2:stairs/smooth_sky_stone_inner", "uvlock": true, "y": 180 }, "facing=north,half=bottom,shape=inner_right": { - "model": "appliedenergistics2:stairs/skystone_block_inner", + "model": "appliedenergistics2:stairs/smooth_sky_stone_inner", "uvlock": true, "y": 270 }, "facing=north,half=bottom,shape=outer_left": { - "model": "appliedenergistics2:stairs/skystone_block_outer", + "model": "appliedenergistics2:stairs/smooth_sky_stone_outer", "uvlock": true, "y": 180 }, "facing=north,half=bottom,shape=outer_right": { - "model": "appliedenergistics2:stairs/skystone_block_outer", + "model": "appliedenergistics2:stairs/smooth_sky_stone_outer", "uvlock": true, "y": 270 }, "facing=north,half=bottom,shape=straight": { - "model": "appliedenergistics2:stairs/skystone_block", + "model": "appliedenergistics2:stairs/smooth_sky_stone", "uvlock": true, "y": 270 }, "facing=north,half=top,shape=inner_left": { - "model": "appliedenergistics2:stairs/skystone_block_inner", + "model": "appliedenergistics2:stairs/smooth_sky_stone_inner", "uvlock": true, "x": 180, "y": 270 }, "facing=north,half=top,shape=inner_right": { - "model": "appliedenergistics2:stairs/skystone_block_inner", + "model": "appliedenergistics2:stairs/smooth_sky_stone_inner", "uvlock": true, "x": 180 }, "facing=north,half=top,shape=outer_left": { - "model": "appliedenergistics2:stairs/skystone_block_outer", + "model": "appliedenergistics2:stairs/smooth_sky_stone_outer", "uvlock": true, "x": 180, "y": 270 }, "facing=north,half=top,shape=outer_right": { - "model": "appliedenergistics2:stairs/skystone_block_outer", + "model": "appliedenergistics2:stairs/smooth_sky_stone_outer", "uvlock": true, "x": 180 }, "facing=north,half=top,shape=straight": { - "model": "appliedenergistics2:stairs/skystone_block", + "model": "appliedenergistics2:stairs/smooth_sky_stone", "uvlock": true, "x": 180, "y": 270 }, "facing=south,half=bottom,shape=inner_left": { - "model": "appliedenergistics2:stairs/skystone_block_inner" + "model": "appliedenergistics2:stairs/smooth_sky_stone_inner" }, "facing=south,half=bottom,shape=inner_right": { - "model": "appliedenergistics2:stairs/skystone_block_inner", + "model": "appliedenergistics2:stairs/smooth_sky_stone_inner", "uvlock": true, "y": 90 }, "facing=south,half=bottom,shape=outer_left": { - "model": "appliedenergistics2:stairs/skystone_block_outer" + "model": "appliedenergistics2:stairs/smooth_sky_stone_outer" }, "facing=south,half=bottom,shape=outer_right": { - "model": "appliedenergistics2:stairs/skystone_block_outer", + "model": "appliedenergistics2:stairs/smooth_sky_stone_outer", "uvlock": true, "y": 90 }, "facing=south,half=bottom,shape=straight": { - "model": "appliedenergistics2:stairs/skystone_block", + "model": "appliedenergistics2:stairs/smooth_sky_stone", "uvlock": true, "y": 90 }, "facing=south,half=top,shape=inner_left": { - "model": "appliedenergistics2:stairs/skystone_block_inner", + "model": "appliedenergistics2:stairs/smooth_sky_stone_inner", "uvlock": true, "x": 180, "y": 90 }, "facing=south,half=top,shape=inner_right": { - "model": "appliedenergistics2:stairs/skystone_block_inner", + "model": "appliedenergistics2:stairs/smooth_sky_stone_inner", "uvlock": true, "x": 180, "y": 180 }, "facing=south,half=top,shape=outer_left": { - "model": "appliedenergistics2:stairs/skystone_block_outer", + "model": "appliedenergistics2:stairs/smooth_sky_stone_outer", "uvlock": true, "x": 180, "y": 90 }, "facing=south,half=top,shape=outer_right": { - "model": "appliedenergistics2:stairs/skystone_block_outer", + "model": "appliedenergistics2:stairs/smooth_sky_stone_outer", "uvlock": true, "x": 180, "y": 180 }, "facing=south,half=top,shape=straight": { - "model": "appliedenergistics2:stairs/skystone_block", + "model": "appliedenergistics2:stairs/smooth_sky_stone", "uvlock": true, "x": 180, "y": 90 }, "facing=west,half=bottom,shape=inner_left": { - "model": "appliedenergistics2:stairs/skystone_block_inner", + "model": "appliedenergistics2:stairs/smooth_sky_stone_inner", "uvlock": true, "y": 90 }, "facing=west,half=bottom,shape=inner_right": { - "model": "appliedenergistics2:stairs/skystone_block_inner", + "model": "appliedenergistics2:stairs/smooth_sky_stone_inner", "uvlock": true, "y": 180 }, "facing=west,half=bottom,shape=outer_left": { - "model": "appliedenergistics2:stairs/skystone_block_outer", + "model": "appliedenergistics2:stairs/smooth_sky_stone_outer", "uvlock": true, "y": 90 }, "facing=west,half=bottom,shape=outer_right": { - "model": "appliedenergistics2:stairs/skystone_block_outer", + "model": "appliedenergistics2:stairs/smooth_sky_stone_outer", "uvlock": true, "y": 180 }, "facing=west,half=bottom,shape=straight": { - "model": "appliedenergistics2:stairs/skystone_block", + "model": "appliedenergistics2:stairs/smooth_sky_stone", "uvlock": true, "y": 180 }, "facing=west,half=top,shape=inner_left": { - "model": "appliedenergistics2:stairs/skystone_block_inner", + "model": "appliedenergistics2:stairs/smooth_sky_stone_inner", "uvlock": true, "x": 180, "y": 180 }, "facing=west,half=top,shape=inner_right": { - "model": "appliedenergistics2:stairs/skystone_block_inner", + "model": "appliedenergistics2:stairs/smooth_sky_stone_inner", "uvlock": true, "x": 180, "y": 270 }, "facing=west,half=top,shape=outer_left": { - "model": "appliedenergistics2:stairs/skystone_block_outer", + "model": "appliedenergistics2:stairs/smooth_sky_stone_outer", "uvlock": true, "x": 180, "y": 180 }, "facing=west,half=top,shape=outer_right": { - "model": "appliedenergistics2:stairs/skystone_block_outer", + "model": "appliedenergistics2:stairs/smooth_sky_stone_outer", "uvlock": true, "x": 180, "y": 270 }, "facing=west,half=top,shape=straight": { - "model": "appliedenergistics2:stairs/skystone_block", + "model": "appliedenergistics2:stairs/smooth_sky_stone", "uvlock": true, "x": 180, "y": 180 diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/wireless_access_point.json b/src/main/resources/assets/appliedenergistics2/blockstates/wireless_access_point.json index 7ea8ce8d4..902fe3054 100644 --- a/src/main/resources/assets/appliedenergistics2/blockstates/wireless_access_point.json +++ b/src/main/resources/assets/appliedenergistics2/blockstates/wireless_access_point.json @@ -1,7 +1,7 @@ { "variants": { "normal": { - "model": "appliedenergistics2:wireless", + "model": "appliedenergistics2:wireless_access_point", "y": 180 } } diff --git a/src/main/resources/assets/appliedenergistics2/models/block/QuartzGlassBlock.json b/src/main/resources/assets/appliedenergistics2/models/block/QuartzGlassBlock.json deleted file mode 100644 index b783e9457..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/QuartzGlassBlock.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "appliedenergistics2:blocks/QuartzOreBlock" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/chiseled_quartz.json b/src/main/resources/assets/appliedenergistics2/models/block/chiseled_quartz_block.json similarity index 100% rename from src/main/resources/assets/appliedenergistics2/models/block/chiseled_quartz.json rename to src/main/resources/assets/appliedenergistics2/models/block/chiseled_quartz_block.json diff --git a/src/main/resources/assets/appliedenergistics2/models/block/cube/cube_AE.json b/src/main/resources/assets/appliedenergistics2/models/block/cube/cube_ae.json similarity index 100% rename from src/main/resources/assets/appliedenergistics2/models/block/cube/cube_AE.json rename to src/main/resources/assets/appliedenergistics2/models/block/cube/cube_ae.json diff --git a/src/main/resources/assets/appliedenergistics2/models/block/cube/cube_AE _all.json b/src/main/resources/assets/appliedenergistics2/models/block/cube/cube_ae_all.json similarity index 100% rename from src/main/resources/assets/appliedenergistics2/models/block/cube/cube_AE _all.json rename to src/main/resources/assets/appliedenergistics2/models/block/cube/cube_ae_all.json diff --git a/src/main/resources/assets/appliedenergistics2/models/block/cube/cube_AE_bottom_top.json b/src/main/resources/assets/appliedenergistics2/models/block/cube/cube_ae_bottom_top.json similarity index 100% rename from src/main/resources/assets/appliedenergistics2/models/block/cube/cube_AE_bottom_top.json rename to src/main/resources/assets/appliedenergistics2/models/block/cube/cube_ae_bottom_top.json diff --git a/src/main/resources/assets/appliedenergistics2/models/block/cube/cube_AE_machine.json b/src/main/resources/assets/appliedenergistics2/models/block/cube/cube_ae_machine.json similarity index 100% rename from src/main/resources/assets/appliedenergistics2/models/block/cube/cube_AE_machine.json rename to src/main/resources/assets/appliedenergistics2/models/block/cube/cube_ae_machine.json diff --git a/src/main/resources/assets/appliedenergistics2/models/block/fluix.json b/src/main/resources/assets/appliedenergistics2/models/block/fluix_block.json similarity index 51% rename from src/main/resources/assets/appliedenergistics2/models/block/fluix.json rename to src/main/resources/assets/appliedenergistics2/models/block/fluix_block.json index 5b455bcf5..bfeeb17ff 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/fluix.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/fluix_block.json @@ -1,6 +1,6 @@ { "parent": "block/cube_all", "textures": { - "all": "appliedenergistics2:blocks/fluix" + "all": "appliedenergistics2:blocks/fluix_block" } } \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/grinder.json b/src/main/resources/assets/appliedenergistics2/models/block/grinder.json deleted file mode 100644 index 14ae1eecd..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/grinder.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "parent": "appliedenergistics2:block/cube/cube_ae_machine", - "textures": { - "bottom": "appliedenergistics2:blocks/grinder_bottom", - "front": "appliedenergistics2:blocks/grinder_front", - "side": "appliedenergistics2:blocks/grinder_side", - "top": "appliedenergistics2:blocks/grinder" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/grindstone.json b/src/main/resources/assets/appliedenergistics2/models/block/grindstone.json new file mode 100644 index 000000000..ad28e942b --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/grindstone.json @@ -0,0 +1,9 @@ +{ + "parent": "appliedenergistics2:block/cube/cube_ae_machine", + "textures": { + "bottom": "appliedenergistics2:blocks/grindstone_bottom", + "front": "appliedenergistics2:blocks/grindstone_front", + "side": "appliedenergistics2:blocks/grindstone_side", + "top": "appliedenergistics2:blocks/grindstone" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/quartz.json b/src/main/resources/assets/appliedenergistics2/models/block/quartz_block.json similarity index 50% rename from src/main/resources/assets/appliedenergistics2/models/block/quartz.json rename to src/main/resources/assets/appliedenergistics2/models/block/quartz_block.json index b4c173f1c..732df47bf 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/quartz.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/quartz_block.json @@ -1,6 +1,6 @@ { "parent": "block/cube_all", "textures": { - "all": "appliedenergistics2:blocks/quartz" + "all": "appliedenergistics2:blocks/quartz_block" } } \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/quartz_pillar.json b/src/main/resources/assets/appliedenergistics2/models/block/quartz_pillar.json index 1af1d48ca..d9a3de172 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/quartz_pillar.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/quartz_pillar.json @@ -1,7 +1,7 @@ { "parent": "block/cube_column", "textures": { - "end": "appliedenergistics2:blocks/quartz_pillar_block_top", - "side": "appliedenergistics2:blocks/quartz_pillar_block_side" + "end": "appliedenergistics2:blocks/quartz_pillar_top", + "side": "appliedenergistics2:blocks/quartz_pillar_side" } } \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/sky_stone_block.json b/src/main/resources/assets/appliedenergistics2/models/block/sky_stone_block.json index 6012d79b7..0317c7a66 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/sky_stone_block.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/sky_stone_block.json @@ -1,6 +1,6 @@ { "parent": "block/cube_all", "textures": { - "all": "appliedenergistics2:blocks/sky_stone_block_block" + "all": "appliedenergistics2:blocks/sky_stone_block" } } \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/sky_stone_brick.json b/src/main/resources/assets/appliedenergistics2/models/block/sky_stone_brick.json index 9ce5d8ee2..b075968a9 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/sky_stone_brick.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/sky_stone_brick.json @@ -1,6 +1,6 @@ { "parent": "block/cube_all", "textures": { - "all": "appliedenergistics2:blocks/sky_stone_block_brick" + "all": "appliedenergistics2:blocks/sky_stone_brick" } } \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/sky_stone_small_brick.json b/src/main/resources/assets/appliedenergistics2/models/block/sky_stone_small_brick.json index 655b81010..8d6b60150 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/sky_stone_small_brick.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/sky_stone_small_brick.json @@ -1,6 +1,6 @@ { "parent": "block/cube_all", "textures": { - "all": "appliedenergistics2:blocks/sky_stone_block_small_brick" + "all": "appliedenergistics2:blocks/sky_stone_small_brick" } } \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/sky_stone_stone.json b/src/main/resources/assets/appliedenergistics2/models/block/sky_stone_stone.json deleted file mode 100644 index 69dcc5c1b..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/sky_stone_stone.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "appliedenergistics2:blocks/sky_stone_block_stone" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/skystone_block_stairs.json b/src/main/resources/assets/appliedenergistics2/models/block/skystone_block_stairs.json deleted file mode 100644 index 3f1c29150..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/skystone_block_stairs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/stairs", - "textures": { - "bottom": "appliedenergistics2:blocks/sky_stone_block_block", - "side": "appliedenergistics2:blocks/sky_stone_block_block", - "top": "appliedenergistics2:blocks/sky_stone_block_block" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/skystone_block_stairs_inner.json b/src/main/resources/assets/appliedenergistics2/models/block/skystone_block_stairs_inner.json deleted file mode 100644 index 334efbb54..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/skystone_block_stairs_inner.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/inner_stairs", - "textures": { - "bottom": "appliedenergistics2:blocks/sky_stone_block_block", - "side": "appliedenergistics2:blocks/sky_stone_block_block", - "top": "appliedenergistics2:blocks/sky_stone_block_block" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/skystone_block_stairs_outer.json b/src/main/resources/assets/appliedenergistics2/models/block/skystone_block_stairs_outer.json deleted file mode 100644 index 7fe1e1225..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/skystone_block_stairs_outer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/outer_stairs", - "textures": { - "bottom": "appliedenergistics2:blocks/sky_stone_block_block", - "side": "appliedenergistics2:blocks/sky_stone_block_block", - "top": "appliedenergistics2:blocks/sky_stone_block_block" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/smooth_sky_stone_block.json b/src/main/resources/assets/appliedenergistics2/models/block/smooth_sky_stone_block.json new file mode 100644 index 000000000..474a80ee1 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/smooth_sky_stone_block.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "appliedenergistics2:blocks/smooth_sky_stone_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_certus_chiseled.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/chiseled_quartz.json similarity index 100% rename from src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_certus_chiseled.json rename to src/main/resources/assets/appliedenergistics2/models/block/stairs/chiseled_quartz.json diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_certus_chiseled_inner.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/chiseled_quartz_inner.json similarity index 100% rename from src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_certus_chiseled_inner.json rename to src/main/resources/assets/appliedenergistics2/models/block/stairs/chiseled_quartz_inner.json diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_certus_chiseled_outer.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/chiseled_quartz_outer.json similarity index 100% rename from src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_certus_chiseled_outer.json rename to src/main/resources/assets/appliedenergistics2/models/block/stairs/chiseled_quartz_outer.json diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/fluix.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/fluix.json index ced8dc6c4..939bec1a6 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/stairs/fluix.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/stairs/fluix.json @@ -1,8 +1,8 @@ { "parent": "block/stairs", "textures": { - "bottom": "appliedenergistics2:blocks/fluix", - "side": "appliedenergistics2:blocks/fluix", - "top": "appliedenergistics2:blocks/fluix" + "bottom": "appliedenergistics2:blocks/fluix_block", + "side": "appliedenergistics2:blocks/fluix_block", + "top": "appliedenergistics2:blocks/fluix_block" } } \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/fluix_inner.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/fluix_inner.json index fd2c5d4cf..0a109f620 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/stairs/fluix_inner.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/stairs/fluix_inner.json @@ -1,8 +1,8 @@ { "parent": "block/inner_stairs", "textures": { - "bottom": "appliedenergistics2:blocks/fluix", - "side": "appliedenergistics2:blocks/fluix", - "top": "appliedenergistics2:blocks/fluix" + "bottom": "appliedenergistics2:blocks/fluix_block", + "side": "appliedenergistics2:blocks/fluix_block", + "top": "appliedenergistics2:blocks/fluix_block" } } \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/fluix_outer.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/fluix_outer.json index 21222bff1..592325e81 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/stairs/fluix_outer.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/stairs/fluix_outer.json @@ -1,8 +1,8 @@ { "parent": "block/outer_stairs", "textures": { - "bottom": "appliedenergistics2:blocks/fluix", - "side": "appliedenergistics2:blocks/fluix", - "top": "appliedenergistics2:blocks/fluix" + "bottom": "appliedenergistics2:blocks/fluix_block", + "side": "appliedenergistics2:blocks/fluix_block", + "top": "appliedenergistics2:blocks/fluix_block" } } \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz.json new file mode 100644 index 000000000..ecbc17167 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz.json @@ -0,0 +1,8 @@ +{ + "parent": "block/stairs", + "textures": { + "bottom": "appliedenergistics2:blocks/quartz_block", + "side": "appliedenergistics2:blocks/quartz_block", + "top": "appliedenergistics2:blocks/quartz_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_certus.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_certus.json deleted file mode 100644 index c64d91948..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_certus.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/stairs", - "textures": { - "bottom": "appliedenergistics2:blocks/quartz", - "side": "appliedenergistics2:blocks/quartz", - "top": "appliedenergistics2:blocks/quartz" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_certus_inner.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_certus_inner.json deleted file mode 100644 index 1e9d4487c..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_certus_inner.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/inner_stairs", - "textures": { - "bottom": "appliedenergistics2:blocks/quartz", - "side": "appliedenergistics2:blocks/quartz", - "top": "appliedenergistics2:blocks/quartz" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_certus_outer.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_certus_outer.json deleted file mode 100644 index 7e7cf8b58..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_certus_outer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/outer_stairs", - "textures": { - "bottom": "appliedenergistics2:blocks/quartz", - "side": "appliedenergistics2:blocks/quartz", - "top": "appliedenergistics2:blocks/quartz" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_certus_pillar.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_certus_pillar.json deleted file mode 100644 index 0ae584d21..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_certus_pillar.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/stairs", - "textures": { - "bottom": "appliedenergistics2:blocks/quartz_pillar_block_top", - "side": "appliedenergistics2:blocks/quartz_pillar_block_side", - "top": "appliedenergistics2:blocks/quartz_pillar_block_top" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_certus_pillar_inner.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_certus_pillar_inner.json deleted file mode 100644 index cad653fe5..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_certus_pillar_inner.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/inner_stairs", - "textures": { - "bottom": "appliedenergistics2:blocks/quartz_pillar_block_top", - "side": "appliedenergistics2:blocks/quartz_pillar_block_side", - "top": "appliedenergistics2:blocks/quartz_pillar_block_top" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_certus_pillar_outer.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_certus_pillar_outer.json deleted file mode 100644 index 43923a3ad..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_certus_pillar_outer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/outer_stairs", - "textures": { - "bottom": "appliedenergistics2:blocks/quartz_pillar_block_top", - "side": "appliedenergistics2:blocks/quartz_pillar_block_side", - "top": "appliedenergistics2:blocks/quartz_pillar_block_top" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_inner.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_inner.json new file mode 100644 index 000000000..a4c29b38b --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "block/inner_stairs", + "textures": { + "bottom": "appliedenergistics2:blocks/quartz_block", + "side": "appliedenergistics2:blocks/quartz_block", + "top": "appliedenergistics2:blocks/quartz_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_outer.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_outer.json new file mode 100644 index 000000000..e473eddca --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "block/outer_stairs", + "textures": { + "bottom": "appliedenergistics2:blocks/quartz_block", + "side": "appliedenergistics2:blocks/quartz_block", + "top": "appliedenergistics2:blocks/quartz_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_pillar.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_pillar.json new file mode 100644 index 000000000..02fe431bc --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_pillar.json @@ -0,0 +1,8 @@ +{ + "parent": "block/stairs", + "textures": { + "bottom": "appliedenergistics2:blocks/quartz_pillar_top", + "side": "appliedenergistics2:blocks/quartz_pillar_side", + "top": "appliedenergistics2:blocks/quartz_pillar_top" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_pillar_inner.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_pillar_inner.json new file mode 100644 index 000000000..9862b932c --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_pillar_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "block/inner_stairs", + "textures": { + "bottom": "appliedenergistics2:blocks/quartz_pillar_top", + "side": "appliedenergistics2:blocks/quartz_pillar_side", + "top": "appliedenergistics2:blocks/quartz_pillar_top" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_pillar_outer.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_pillar_outer.json new file mode 100644 index 000000000..7855e0714 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_pillar_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "block/outer_stairs", + "textures": { + "bottom": "appliedenergistics2:blocks/quartz_pillar_top", + "side": "appliedenergistics2:blocks/quartz_pillar_side", + "top": "appliedenergistics2:blocks/quartz_pillar_top" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/sky_stone.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/sky_stone.json new file mode 100644 index 000000000..a8bb40c30 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/stairs/sky_stone.json @@ -0,0 +1,8 @@ +{ + "parent": "block/stairs", + "textures": { + "bottom": "appliedenergistics2:blocks/sky_stone_block", + "side": "appliedenergistics2:blocks/sky_stone_block", + "top": "appliedenergistics2:blocks/sky_stone_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/sky_stone_brick.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/sky_stone_brick.json new file mode 100644 index 000000000..05efe0c2c --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/stairs/sky_stone_brick.json @@ -0,0 +1,8 @@ +{ + "parent": "block/stairs", + "textures": { + "bottom": "appliedenergistics2:blocks/sky_stone_brick", + "side": "appliedenergistics2:blocks/sky_stone_brick", + "top": "appliedenergistics2:blocks/sky_stone_brick" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/sky_stone_brick_inner.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/sky_stone_brick_inner.json new file mode 100644 index 000000000..6a3c3d7e4 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/stairs/sky_stone_brick_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "block/inner_stairs", + "textures": { + "bottom": "appliedenergistics2:blocks/sky_stone_brick", + "side": "appliedenergistics2:blocks/sky_stone_brick", + "top": "appliedenergistics2:blocks/sky_stone_brick" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/sky_stone_brick_outer.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/sky_stone_brick_outer.json new file mode 100644 index 000000000..f208da26b --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/stairs/sky_stone_brick_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "block/outer_stairs", + "textures": { + "bottom": "appliedenergistics2:blocks/sky_stone_brick", + "side": "appliedenergistics2:blocks/sky_stone_brick", + "top": "appliedenergistics2:blocks/sky_stone_brick" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/sky_stone_inner.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/sky_stone_inner.json new file mode 100644 index 000000000..78113425f --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/stairs/sky_stone_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "block/inner_stairs", + "textures": { + "bottom": "appliedenergistics2:blocks/sky_stone_block", + "side": "appliedenergistics2:blocks/sky_stone_block", + "top": "appliedenergistics2:blocks/sky_stone_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/sky_stone_outer.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/sky_stone_outer.json new file mode 100644 index 000000000..6f6e35bc0 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/stairs/sky_stone_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "block/outer_stairs", + "textures": { + "bottom": "appliedenergistics2:blocks/sky_stone_block", + "side": "appliedenergistics2:blocks/sky_stone_block", + "top": "appliedenergistics2:blocks/sky_stone_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/sky_stone_small_brick.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/sky_stone_small_brick.json new file mode 100644 index 000000000..0a738251a --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/stairs/sky_stone_small_brick.json @@ -0,0 +1,8 @@ +{ + "parent": "block/stairs", + "textures": { + "bottom": "appliedenergistics2:blocks/sky_stone_small_brick", + "side": "appliedenergistics2:blocks/sky_stone_small_brick", + "top": "appliedenergistics2:blocks/sky_stone_small_brick" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/sky_stone_small_brick_inner.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/sky_stone_small_brick_inner.json new file mode 100644 index 000000000..6413d2c54 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/stairs/sky_stone_small_brick_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "block/inner_stairs", + "textures": { + "bottom": "appliedenergistics2:blocks/sky_stone_small_brick", + "side": "appliedenergistics2:blocks/sky_stone_small_brick", + "top": "appliedenergistics2:blocks/sky_stone_small_brick" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/sky_stone_small_brick_outer.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/sky_stone_small_brick_outer.json new file mode 100644 index 000000000..94ef86f34 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/stairs/sky_stone_small_brick_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "block/outer_stairs", + "textures": { + "bottom": "appliedenergistics2:blocks/sky_stone_small_brick", + "side": "appliedenergistics2:blocks/sky_stone_small_brick", + "top": "appliedenergistics2:blocks/sky_stone_small_brick" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_block.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_block.json deleted file mode 100644 index 3f1c29150..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_block.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/stairs", - "textures": { - "bottom": "appliedenergistics2:blocks/sky_stone_block_block", - "side": "appliedenergistics2:blocks/sky_stone_block_block", - "top": "appliedenergistics2:blocks/sky_stone_block_block" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_block_inner.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_block_inner.json deleted file mode 100644 index 334efbb54..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_block_inner.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/inner_stairs", - "textures": { - "bottom": "appliedenergistics2:blocks/sky_stone_block_block", - "side": "appliedenergistics2:blocks/sky_stone_block_block", - "top": "appliedenergistics2:blocks/sky_stone_block_block" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_block_outer.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_block_outer.json deleted file mode 100644 index 7fe1e1225..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_block_outer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/outer_stairs", - "textures": { - "bottom": "appliedenergistics2:blocks/sky_stone_block_block", - "side": "appliedenergistics2:blocks/sky_stone_block_block", - "top": "appliedenergistics2:blocks/sky_stone_block_block" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_brick.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_brick.json deleted file mode 100644 index 5ec487565..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_brick.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/stairs", - "textures": { - "bottom": "appliedenergistics2:blocks/sky_stone_block_brick", - "side": "appliedenergistics2:blocks/sky_stone_block_brick", - "top": "appliedenergistics2:blocks/sky_stone_block_brick" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_brick_inner.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_brick_inner.json deleted file mode 100644 index 1be614064..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_brick_inner.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/inner_stairs", - "textures": { - "bottom": "appliedenergistics2:blocks/sky_stone_block_brick", - "side": "appliedenergistics2:blocks/sky_stone_block_brick", - "top": "appliedenergistics2:blocks/sky_stone_block_brick" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_brick_outer.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_brick_outer.json deleted file mode 100644 index 28a562a5b..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_brick_outer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/outer_stairs", - "textures": { - "bottom": "appliedenergistics2:blocks/sky_stone_block_brick", - "side": "appliedenergistics2:blocks/sky_stone_block_brick", - "top": "appliedenergistics2:blocks/sky_stone_block_brick" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_brick_small.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_brick_small.json deleted file mode 100644 index 412ec16f6..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_brick_small.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/stairs", - "textures": { - "bottom": "appliedenergistics2:blocks/sky_stone_block_small_brick", - "side": "appliedenergistics2:blocks/sky_stone_block_small_brick", - "top": "appliedenergistics2:blocks/sky_stone_block_small_brick" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_brick_small_inner.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_brick_small_inner.json deleted file mode 100644 index 8c283291f..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_brick_small_inner.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/inner_stairs", - "textures": { - "bottom": "appliedenergistics2:blocks/sky_stone_block_small_brick", - "side": "appliedenergistics2:blocks/sky_stone_block_small_brick", - "top": "appliedenergistics2:blocks/sky_stone_block_small_brick" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_brick_small_outer.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_brick_small_outer.json deleted file mode 100644 index 181c116e7..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_brick_small_outer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/outer_stairs", - "textures": { - "bottom": "appliedenergistics2:blocks/sky_stone_block_small_brick", - "side": "appliedenergistics2:blocks/sky_stone_block_small_brick", - "top": "appliedenergistics2:blocks/sky_stone_block_small_brick" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_stone.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_stone.json deleted file mode 100644 index 88edfd669..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_stone.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/stairs", - "textures": { - "bottom": "appliedenergistics2:blocks/sky_stone_block_stone", - "side": "appliedenergistics2:blocks/sky_stone_block_stone", - "top": "appliedenergistics2:blocks/sky_stone_block_stone" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_stone_inner.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_stone_inner.json deleted file mode 100644 index 21d61520d..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_stone_inner.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/inner_stairs", - "textures": { - "bottom": "appliedenergistics2:blocks/sky_stone_block_stone", - "side": "appliedenergistics2:blocks/sky_stone_block_stone", - "top": "appliedenergistics2:blocks/sky_stone_block_stone" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_stone_outer.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_stone_outer.json deleted file mode 100644 index 9062bb3dd..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_stone_outer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/outer_stairs", - "textures": { - "bottom": "appliedenergistics2:blocks/sky_stone_block_stone", - "side": "appliedenergistics2:blocks/sky_stone_block_stone", - "top": "appliedenergistics2:blocks/sky_stone_block_stone" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/smooth_sky_stone.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/smooth_sky_stone.json new file mode 100644 index 000000000..5f78212ff --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/stairs/smooth_sky_stone.json @@ -0,0 +1,8 @@ +{ + "parent": "block/stairs", + "textures": { + "bottom": "appliedenergistics2:blocks/smooth_sky_stone_block", + "side": "appliedenergistics2:blocks/smooth_sky_stone_block", + "top": "appliedenergistics2:blocks/smooth_sky_stone_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/smooth_sky_stone_inner.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/smooth_sky_stone_inner.json new file mode 100644 index 000000000..c66345cce --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/stairs/smooth_sky_stone_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "block/inner_stairs", + "textures": { + "bottom": "appliedenergistics2:blocks/smooth_sky_stone_block", + "side": "appliedenergistics2:blocks/smooth_sky_stone_block", + "top": "appliedenergistics2:blocks/smooth_sky_stone_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/smooth_sky_stone_outer.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/smooth_sky_stone_outer.json new file mode 100644 index 000000000..bc947e552 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/stairs/smooth_sky_stone_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "block/outer_stairs", + "textures": { + "bottom": "appliedenergistics2:blocks/smooth_sky_stone_block", + "side": "appliedenergistics2:blocks/smooth_sky_stone_block", + "top": "appliedenergistics2:blocks/smooth_sky_stone_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/test.json b/src/main/resources/assets/appliedenergistics2/models/block/test.json deleted file mode 100644 index 5adc457c1..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/test.json +++ /dev/null @@ -1,353 +0,0 @@ -{ - "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "elements": [ - { - "faces": { - "down": { - "texture": "#-1", - "uv": [ - 0.0, - 0.0, - 16.0, - 1.0 - ] - }, - "east": { - "texture": "#-1", - "uv": [ - 0.0, - 0.0, - 1.0, - 16.0 - ] - }, - "north": { - "texture": "#-1", - "uv": [ - 0.0, - 0.0, - 16.0, - 16.0 - ] - }, - "south": { - "texture": "#-1", - "uv": [ - 0.0, - 0.0, - 16.0, - 16.0 - ] - }, - "up": { - "texture": "#-1", - "uv": [ - 0.0, - 0.0, - 16.0, - 1.0 - ] - }, - "west": { - "texture": "#-1", - "uv": [ - 0.0, - 0.0, - 1.0, - 16.0 - ] - } - }, - "from": [ - 0.0, - 0.0, - 15.0 - ], - "name": "Cube", - "to": [ - 16.0, - 16.0, - 16.0 - ] - }, - { - "faces": { - "down": { - "texture": "#-1", - "uv": [ - 0.0, - 0.0, - 16.0, - 1.0 - ] - }, - "east": { - "texture": "#-1", - "uv": [ - 0.0, - 0.0, - 1.0, - 6.0 - ] - }, - "north": { - "texture": "#-1", - "uv": [ - 0.0, - 0.0, - 16.0, - 6.0 - ] - }, - "south": { - "texture": "#-1", - "uv": [ - 0.0, - 0.0, - 16.0, - 6.0 - ] - }, - "up": { - "texture": "#-1", - "uv": [ - 0.0, - 0.0, - 16.0, - 1.0 - ] - }, - "west": { - "texture": "#-1", - "uv": [ - 0.0, - 0.0, - 1.0, - 6.0 - ] - } - }, - "from": [ - 0.0, - 0.0, - 0.0 - ], - "name": "Cube", - "to": [ - 16.0, - 6.0, - 1.0 - ] - }, - { - "faces": { - "down": { - "texture": "#-1", - "uv": [ - 0.0, - 0.0, - 1.0, - 15.0 - ] - }, - "east": { - "texture": "#-1", - "uv": [ - 0.0, - 0.0, - 15.0, - 1.0 - ] - }, - "north": { - "texture": "#-1", - "uv": [ - 0.0, - 0.0, - 1.0, - 1.0 - ] - }, - "south": { - "texture": "#-1", - "uv": [ - 0.0, - 0.0, - 1.0, - 1.0 - ] - }, - "up": { - "texture": "#-1", - "uv": [ - 0.0, - 0.0, - 1.0, - 15.0 - ] - }, - "west": { - "texture": "#-1", - "uv": [ - 0.0, - 0.0, - 15.0, - 1.0 - ] - } - }, - "from": [ - 0.0, - 6.0, - 0.0 - ], - "name": "Cube", - "to": [ - 1.0, - 7.0, - 15.0 - ] - }, - { - "faces": { - "down": { - "texture": "#-1", - "uv": [ - 0.0, - 0.0, - 1.0, - 15.0 - ] - }, - "east": { - "texture": "#-1", - "uv": [ - 0.0, - 0.0, - 15.0, - 5.0 - ] - }, - "north": { - "texture": "#-1", - "uv": [ - 0.0, - 0.0, - 1.0, - 5.0 - ] - }, - "south": { - "texture": "#-1", - "uv": [ - 0.0, - 0.0, - 1.0, - 5.0 - ] - }, - "up": { - "texture": "#-1", - "uv": [ - 0.0, - 0.0, - 1.0, - 15.0 - ] - }, - "west": { - "texture": "#-1", - "uv": [ - 0.0, - 0.0, - 15.0, - 5.0 - ] - } - }, - "from": [ - 15.0, - 0.0, - 0.0 - ], - "name": "Cube", - "to": [ - 16.0, - 5.0, - 15.0 - ] - }, - { - "faces": { - "down": { - "texture": "#-1", - "uv": [ - 0.0, - 0.0, - 10.0, - 15.0 - ] - }, - "east": { - "texture": "#-1", - "uv": [ - 0.0, - 0.0, - 15.0, - 1.0 - ] - }, - "north": { - "texture": "#-1", - "uv": [ - 0.0, - 0.0, - 10.0, - 1.0 - ] - }, - "south": { - "texture": "#-1", - "uv": [ - 0.0, - 0.0, - 10.0, - 1.0 - ] - }, - "up": { - "texture": "#-1", - "uv": [ - 0.0, - 0.0, - 10.0, - 15.0 - ] - }, - "west": { - "texture": "#-1", - "uv": [ - 0.0, - 0.0, - 15.0, - 1.0 - ] - } - }, - "from": [ - 3.0, - 15.0, - 0.0 - ], - "name": "Cube", - "to": [ - 13.0, - 16.0, - 15.0 - ] - } - ], - "textures": { - - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/wireless.json b/src/main/resources/assets/appliedenergistics2/models/block/wireless_access_point.json similarity index 98% rename from src/main/resources/assets/appliedenergistics2/models/block/wireless.json rename to src/main/resources/assets/appliedenergistics2/models/block/wireless_access_point.json index 28f96470a..8d88f6d9a 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/wireless.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/wireless_access_point.json @@ -1,5 +1,5 @@ { - "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", + "parent": "block/block", "elements": [ { "faces": { @@ -762,8 +762,8 @@ } ], "textures": { - "particle": "appliedenergistics2:blocks/wireless_inside", - "0": "appliedenergistics2:blocks/wireless_inside", - "1": "appliedenergistics2:blocks/wireless" + "particle": "appliedenergistics2:blocks/wireless_access_point_inside", + "0": "appliedenergistics2:blocks/wireless_access_point_inside", + "1": "appliedenergistics2:blocks/wireless_access_point" } } \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/cell_workbench.json b/src/main/resources/assets/appliedenergistics2/models/item/cell_workbench.json deleted file mode 100644 index 03a9ba865..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/cell_workbench.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "appliedenergistics2:block/cell_workbench" -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/charger.json b/src/main/resources/assets/appliedenergistics2/models/item/charger.json deleted file mode 100644 index 53e7f4631..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/charger.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "appliedenergistics2:block/charger" -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/condenser.json b/src/main/resources/assets/appliedenergistics2/models/item/condenser.json deleted file mode 100644 index 4ac1f7bc1..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/condenser.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "appliedenergistics2:block/condenser" -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/drive.json b/src/main/resources/assets/appliedenergistics2/models/item/drive.json deleted file mode 100644 index 062cbf865..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/drive.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "appliedenergistics2:block/drive" -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/energy_acceptor.json b/src/main/resources/assets/appliedenergistics2/models/item/energy_acceptor.json deleted file mode 100644 index 0695d3c68..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/energy_acceptor.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "appliedenergistics2:block/energy_acceptor" -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/grinder.json b/src/main/resources/assets/appliedenergistics2/models/item/grinder.json deleted file mode 100644 index b9bba63b8..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/grinder.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "appliedenergistics2:block/grinder" -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/inscriber.json b/src/main/resources/assets/appliedenergistics2/models/item/inscriber.json deleted file mode 100644 index 15d381647..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/inscriber.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "appliedenergistics2:block/inscriber" -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/ioport.json b/src/main/resources/assets/appliedenergistics2/models/item/ioport.json deleted file mode 100644 index 5dc3e2c51..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/ioport.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "appliedenergistics2:block/ioport" -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/quartz_growth_accelerator.json b/src/main/resources/assets/appliedenergistics2/models/item/quartz_growth_accelerator.json deleted file mode 100644 index 3de4c60c7..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/quartz_growth_accelerator.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "appliedenergistics2:block/quartz_growth_accelerator_off" -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/sky_chest_stone.json b/src/main/resources/assets/appliedenergistics2/models/item/sky_stone_chest.json similarity index 100% rename from src/main/resources/assets/appliedenergistics2/models/item/sky_chest_stone.json rename to src/main/resources/assets/appliedenergistics2/models/item/sky_stone_chest.json diff --git a/src/main/resources/assets/appliedenergistics2/models/item/sky_chest_block.json b/src/main/resources/assets/appliedenergistics2/models/item/smooth_sky_stone_chest.json similarity index 71% rename from src/main/resources/assets/appliedenergistics2/models/item/sky_chest_block.json rename to src/main/resources/assets/appliedenergistics2/models/item/smooth_sky_stone_chest.json index e08076bad..e979caaf6 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/sky_chest_block.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/smooth_sky_stone_chest.json @@ -1,5 +1,5 @@ { - "parent": "appliedenergistics2:item/sky_chest_stone", + "parent": "appliedenergistics2:item/sky_stone_chest", "textures": { "particle": "appliedenergistics2:models/skyblockchest", "0": "appliedenergistics2:models/skyblockchest" diff --git a/src/main/resources/assets/appliedenergistics2/models/item/spatial_ioport.json b/src/main/resources/assets/appliedenergistics2/models/item/spatial_ioport.json deleted file mode 100644 index 65d643846..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/spatial_ioport.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "appliedenergistics2:block/spatial_ioport" -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/stair_common_fluix.json b/src/main/resources/assets/appliedenergistics2/models/item/stair_common_fluix.json deleted file mode 100644 index df240d66e..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/stair_common_fluix.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "appliedenergistics2:block/stairs/fluix" -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/stair_common_quartz_certus.json b/src/main/resources/assets/appliedenergistics2/models/item/stair_common_quartz_certus.json deleted file mode 100644 index 1c4e01b49..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/stair_common_quartz_certus.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "appliedenergistics2:block/stairs/quartz_certus" -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/stair_common_quartz_certus_chiseled.json b/src/main/resources/assets/appliedenergistics2/models/item/stair_common_quartz_certus_chiseled.json deleted file mode 100644 index c9d8a0066..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/stair_common_quartz_certus_chiseled.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "appliedenergistics2:block/stairs/quartz_certus_chiseled" -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/stair_common_quartz_certus_pillar.json b/src/main/resources/assets/appliedenergistics2/models/item/stair_common_quartz_certus_pillar.json deleted file mode 100644 index ab984e0bb..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/stair_common_quartz_certus_pillar.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "appliedenergistics2:block/stairs/quartz_certus_pillar" -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/stair_common_skystone_block.json b/src/main/resources/assets/appliedenergistics2/models/item/stair_common_skystone_block.json deleted file mode 100644 index 758de5f42..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/stair_common_skystone_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "appliedenergistics2:block/stairs/skystone_block" -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/stair_common_skystone_brick.json b/src/main/resources/assets/appliedenergistics2/models/item/stair_common_skystone_brick.json deleted file mode 100644 index 7471f1b5b..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/stair_common_skystone_brick.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "appliedenergistics2:block/stairs/skystone_brick" -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/stair_common_skystone_brick_small.json b/src/main/resources/assets/appliedenergistics2/models/item/stair_common_skystone_brick_small.json deleted file mode 100644 index 6d7c4bb59..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/stair_common_skystone_brick_small.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "appliedenergistics2:block/stairs/skystone_brick_small" -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/stair_common_skystone_stone.json b/src/main/resources/assets/appliedenergistics2/models/item/stair_common_skystone_stone.json deleted file mode 100644 index e95d773f9..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/stair_common_skystone_stone.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "appliedenergistics2:block/stairs/skystone_stone" -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/vibration_chamber.json b/src/main/resources/assets/appliedenergistics2/models/item/vibration_chamber.json deleted file mode 100644 index 249236b44..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/vibration_chamber.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "appliedenergistics2:block/vibration_chamber_off" -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/wireless.json b/src/main/resources/assets/appliedenergistics2/models/item/wireless.json deleted file mode 100644 index 523d5699c..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/item/wireless.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "appliedenergistics2:block/wireless" -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/fluix.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/fluix_block.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/blocks/fluix.png rename to src/main/resources/assets/appliedenergistics2/textures/blocks/fluix_block.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/grinder.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/grindstone.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/blocks/grinder.png rename to src/main/resources/assets/appliedenergistics2/textures/blocks/grindstone.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/grinder_bottom.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/grindstone_bottom.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/blocks/grinder_bottom.png rename to src/main/resources/assets/appliedenergistics2/textures/blocks/grindstone_bottom.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/grinder_front.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/grindstone_front.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/blocks/grinder_front.png rename to src/main/resources/assets/appliedenergistics2/textures/blocks/grindstone_front.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/grinder_side.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/grindstone_side.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/blocks/grinder_side.png rename to src/main/resources/assets/appliedenergistics2/textures/blocks/grindstone_side.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/quartz.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/quartz_block.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/blocks/quartz.png rename to src/main/resources/assets/appliedenergistics2/textures/blocks/quartz_block.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/quartz_pillar_block_side.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/quartz_pillar_side.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/blocks/quartz_pillar_block_side.png rename to src/main/resources/assets/appliedenergistics2/textures/blocks/quartz_pillar_side.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/quartz_pillar_block_top.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/quartz_pillar_top.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/blocks/quartz_pillar_block_top.png rename to src/main/resources/assets/appliedenergistics2/textures/blocks/quartz_pillar_top.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/sky_stone_block_stone.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/sky_stone_block.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/blocks/sky_stone_block_stone.png rename to src/main/resources/assets/appliedenergistics2/textures/blocks/sky_stone_block.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/sky_stone_block_brick.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/sky_stone_brick.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/blocks/sky_stone_block_brick.png rename to src/main/resources/assets/appliedenergistics2/textures/blocks/sky_stone_brick.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/sky_stone_block_small_brick.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/sky_stone_small_brick.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/blocks/sky_stone_block_small_brick.png rename to src/main/resources/assets/appliedenergistics2/textures/blocks/sky_stone_small_brick.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/sky_stone_block_block.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/smooth_sky_stone_block.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/blocks/sky_stone_block_block.png rename to src/main/resources/assets/appliedenergistics2/textures/blocks/smooth_sky_stone_block.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/wireless.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/wireless_access_point.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/blocks/wireless.png rename to src/main/resources/assets/appliedenergistics2/textures/blocks/wireless_access_point.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/wireless_inside.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/wireless_access_point_inside.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/blocks/wireless_inside.png rename to src/main/resources/assets/appliedenergistics2/textures/blocks/wireless_access_point_inside.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/wireless_on.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/wireless_access_point_on.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/blocks/wireless_on.png rename to src/main/resources/assets/appliedenergistics2/textures/blocks/wireless_access_point_on.png