From 3d2ba425ecd31621583384f16dedeaf4a5789fbc Mon Sep 17 00:00:00 2001 From: elix-x Date: Fri, 19 Aug 2016 12:38:21 +0200 Subject: [PATCH] Change of naming convention Changed naming convention. All AE blocks, items and TEs were affected. Most of assets were transfered, but some sill need help. Localizations will be transfered in a separate commit. Closes #46. --- src/main/java/appeng/core/Registration.java | 4 +- .../core/api/definitions/ApiBlocks.java | 44 +- .../core/api/definitions/ApiMaterials.java | 4 +- .../core/features/AEBlockFeatureHandler.java | 7 +- .../features/AECableBusFeatureHandler.java | 4 +- .../features/AETileBlockFeatureHandler.java | 13 +- .../core/features/FeatureNameExtractor.java | 58 ++ .../core/features/ItemFeatureHandler.java | 14 +- ...eBlock.java => BlockChargedQuartzOre.java} | 4 +- ...rtzBlock.java => BlockChiseledQuartz.java} | 4 +- .../{FluixBlock.java => BlockFluix.java} | 4 +- .../{QuartzBlock.java => BlockQuartz.java} | 4 +- ...zGlassBlock.java => BlockQuartzGlass.java} | 4 +- ...rtzLampBlock.java => BlockQuartzLamp.java} | 4 +- ...uartzOreBlock.java => BlockQuartzOre.java} | 4 +- ...illarBlock.java => BlockQuartzPillar.java} | 4 +- ...{SkyStoneBlock.java => BlockSkyStone.java} | 4 +- .../decorative/solid/FluixIdentifier.java | 21 - .../appeng/decorative/solid/Identifier.java | 19 - ...ixStairBlock.java => BlockFluixStair.java} | 4 +- .../stair/DecorativeStairIdentifier.java | 59 -- .../decorative/stair/FluixStairComponent.java | 12 - .../stair/FluixStairIdentifier.java | 23 - .../decorative/stair/FluixStairSupplier.java | 4 +- .../java/appeng/helpers/MetaRotation.java | 6 +- .../{MultiItem.java => ItemMultiItem.java} | 6 +- .../java/appeng/items/parts/ItemFacade.java | 4 +- .../java/appeng/recipes/AEItemResolver.java | 4 +- .../java/appeng/recipes/RecipeHandler.java | 6 +- .../blockstates/BlockTinyTNT.json | 5 - .../blockstates/ChargedQuartzOreBlock.json | 5 - .../blockstates/ChiseledQuartzBlock.json | 5 - .../blockstates/FluixBlock.json | 5 - .../blockstates/QuartzBlock.json | 5 - .../blockstates/QuartzGlassBlock.json | 5 - .../blockstates/QuartzOreBlock.json | 5 - .../blockstates/QuartzPillarBlock.json | 8 - .../blockstates/SkyStoneBlock.BLOCK.json | 5 - .../blockstates/SkyStoneBlock.BRICK.json | 5 - .../SkyStoneBlock.SMALL_BRICK.json | 5 - .../blockstates/SkyStoneBlock.STONE.json | 5 - .../blockstates/cell_work_bench.json | 7 + .../blockstates/charged_quartz_ore.json | 7 + .../blockstates/charger.json | 7 + .../blockstates/chiseled_quartz.json | 7 + .../blockstates/condenser.json | 7 + .../blockstates/controller.json | 76 ++ .../blockstates/creative_energy_cell.json | 7 + .../blockstates/dense_energy_cell.json | 28 + .../blockstates/drive.json | 20 + .../blockstates/energy_acceptor.json | 7 + .../blockstates/energy_cell.json | 28 + .../blockstates/fluix.json | 7 + .../blockstates/grinder.json | 7 + .../blockstates/inscriber.json | 7 + .../blockstates/ioport.json | 7 + .../blockstates/quartz.json | 7 + .../blockstates/quartz_glass.json | 7 + .../quartz_growth_accelerator.json | 10 + .../blockstates/quartz_ore.json | 7 + .../blockstates/quartz_pillar.json | 16 + .../blockstates/security.json | 7 + .../blockstates/sky_stone_block_block.json | 7 + .../blockstates/sky_stone_block_brick.json | 7 + .../sky_stone_block_small_brick.json | 7 + .../blockstates/sky_stone_block_stone.json | 7 + .../blockstates/spatial_ioport.json | 7 + .../blockstates/stair.fluix.json | 44 - .../stair.quartz.certus.chiseled.json | 44 - .../blockstates/stair.quartz.certus.json | 44 - .../stair.quartz.certus.pillar.json | 44 - .../blockstates/stair.skystone.block.json | 44 - .../blockstates/stair.skystone.brick.json | 44 - .../stair.skystone.brick.small.json | 44 - .../blockstates/stair.skystone.stone.json | 44 - .../blockstates/stair_fluix.json | 209 +++++ .../blockstates/stair_quartz_certus.json | 209 +++++ .../stair_quartz_certus_chiseled.json | 209 +++++ .../stair_quartz_certus_pillar.json | 209 +++++ .../blockstates/stair_skystone_block.json | 209 +++++ .../blockstates/stair_skystone_brick.json | 209 +++++ .../stair_skystone_brick_small.json | 209 +++++ .../blockstates/stair_skystone_stone.json | 209 +++++ .../blockstates/tile.BlockCellWorkBench.json | 5 - .../blockstates/tile.BlockCharger.json | 5 - .../blockstates/tile.BlockCondenser.json | 5 - .../blockstates/tile.BlockController.json | 36 - .../tile.BlockCreativeEnergyCell.json | 5 - .../tile.BlockDenseEnergyCell.json | 12 - .../blockstates/tile.BlockDrive.json | 8 - .../blockstates/tile.BlockEnergyAcceptor.json | 5 - .../blockstates/tile.BlockEnergyCell.json | 12 - .../blockstates/tile.BlockGrinder.json | 5 - .../blockstates/tile.BlockIOPort.json | 5 - .../blockstates/tile.BlockInscriber.json | 5 - .../tile.BlockQuartzGrowthAccelerator.json | 6 - .../blockstates/tile.BlockSecurity.json | 5 - .../blockstates/tile.BlockSpatialIOPort.json | 5 - .../tile.BlockVibrationChamber.json | 6 - .../blockstates/tile.BlockWireless.json | 5 - .../blockstates/tiny_tnt.json | 7 + .../blockstates/vibration_chamber.json | 10 + .../blockstates/wireless.json | 8 + .../models/block/BlockTinyTNT.json | 24 - .../models/block/ChargedQuartzOreBlock.json | 6 - .../models/block/ChiseledQuartzBlock.json | 7 - .../EnergyCell/creative_energy_cell.json | 6 + .../dense_energy_cell0.json} | 2 +- .../block/EnergyCell/dense_energy_cell1.json | 6 + .../block/EnergyCell/dense_energy_cell2.json | 6 + .../block/EnergyCell/dense_energy_cell3.json | 6 + .../block/EnergyCell/dense_energy_cell4.json | 6 + .../block/EnergyCell/dense_energy_cell5.json | 6 + .../block/EnergyCell/dense_energy_cell6.json | 6 + .../block/EnergyCell/dense_energy_cell7.json | 6 + .../models/block/EnergyCell/energy_cell.json | 6 + .../models/block/EnergyCell/energy_cell0.json | 6 + .../models/block/EnergyCell/energy_cell1.json | 6 + .../models/block/EnergyCell/energy_cell2.json | 6 + .../models/block/EnergyCell/energy_cell3.json | 6 + .../models/block/EnergyCell/energy_cell4.json | 6 + .../models/block/EnergyCell/energy_cell5.json | 6 + .../models/block/EnergyCell/energy_cell6.json | 6 + .../models/block/EnergyCell/energy_cell7.json | 6 + .../tile.BlockCreativeEnergyCell.json | 6 - .../tile.BlockDenseEnergyCell0.json | 6 - .../tile.BlockDenseEnergyCell1.json | 6 - .../tile.BlockDenseEnergyCell2.json | 6 - .../tile.BlockDenseEnergyCell3.json | 6 - .../tile.BlockDenseEnergyCell4.json | 6 - .../tile.BlockDenseEnergyCell5.json | 6 - .../tile.BlockDenseEnergyCell6.json | 6 - .../tile.BlockDenseEnergyCell7.json | 6 - .../EnergyCell/tile.BlockEnergyCell.json | 6 - .../EnergyCell/tile.BlockEnergyCell0.json | 6 - .../EnergyCell/tile.BlockEnergyCell1.json | 6 - .../EnergyCell/tile.BlockEnergyCell2.json | 6 - .../EnergyCell/tile.BlockEnergyCell3.json | 6 - .../EnergyCell/tile.BlockEnergyCell4.json | 6 - .../EnergyCell/tile.BlockEnergyCell5.json | 6 - .../EnergyCell/tile.BlockEnergyCell6.json | 6 - .../EnergyCell/tile.BlockEnergyCell7.json | 6 - .../models/block/FluixBlock.json | 6 - .../models/block/QuartzBlock.json | 6 - .../models/block/QuartzGlassBlock.json | 6 - .../models/block/QuartzOreBlock.json | 6 - .../models/block/QuartzPillarBlock.json | 7 - .../models/block/SkyStoneBlock.BLOCK.json | 6 - .../models/block/SkyStoneBlock.BRICK.json | 6 - .../block/SkyStoneBlock.SMALL_BRICK.json | 6 - .../models/block/SkyStoneBlock.STONE.json | 6 - .../models/block/Wireless.model | Bin 2007 -> 0 bytes .../models/block/cell_work_bench.json | 8 + .../models/block/charged_quartz_ore.json | 6 + .../models/block/charger.json | 356 ++++++++ .../models/block/chiseled_quartz.json | 7 + .../models/block/condenser.json | 6 + .../controller_block_conflicted.uvl.json | 42 - .../controller_block_conflicted_uvl.json | 190 +++++ .../controller/controller_block_offline.json | 2 +- .../controller_block_online.uvl.json | 42 - .../controller_block_online_uvl.json | 190 +++++ .../controller_column_conflicted.uvl.json | 42 - .../controller_column_conflicted_uvl.json | 190 +++++ .../controller/controller_column_offline.json | 2 +- .../controller_column_online.uvl.json | 42 - .../controller_column_online_uvl.json | 190 +++++ .../block/controller/controller_inside_a.json | 8 +- .../block/controller/controller_inside_b.json | 8 +- .../models/block/cube/cube_AE _all.json | 10 +- .../models/block/cube/cube_AE.json | 69 +- .../models/block/cube/cube_AE_bottom_top.json | 8 +- .../models/block/cube/cube_AE_machine.json | 8 +- .../models/block/drive.json | 700 ++++++++++++++++ .../models/block/energy_acceptor.json | 6 + .../models/block/fluix.json | 6 + .../models/block/grinder.json | 10 + .../models/block/inscriber.json | 492 +++++++++++ .../models/block/ioport.json | 8 + .../models/block/quartz.json | 6 + .../models/block/quartz_glass.json | 6 + .../block/quartz_growth_accelerator_off.json | 8 + .../block/quartz_growth_accelerator_on.json | 8 + .../models/block/quartz_ore.json | 6 + .../models/block/quartz_pillar.json | 7 + .../models/block/security.json | 8 + .../models/block/sky_stone_block_block.json | 6 + .../models/block/sky_stone_block_brick.json | 6 + .../block/sky_stone_block_small_brick.json | 6 + .../models/block/sky_stone_block_stone.json | 6 + .../block/skystone.block.stairs.inner.json | 8 - .../models/block/skystone.block.stairs.json | 8 - .../block/skystone.block.stairs.outer.json | 8 - .../models/block/skystone_block_stairs.json | 8 + .../block/skystone_block_stairs_inner.json | 8 + .../block/skystone_block_stairs_outer.json | 8 + .../models/block/spatial_ioport.json | 8 + .../models/block/stairs/fluix.inner.json | 8 - .../models/block/stairs/fluix.json | 12 +- .../models/block/stairs/fluix.outer.json | 8 - .../models/block/stairs/fluix_inner.json | 8 + .../models/block/stairs/fluix_outer.json | 8 + .../stairs/quartz.certus.chiseled.inner.json | 8 - .../block/stairs/quartz.certus.chiseled.json | 8 - .../stairs/quartz.certus.chiseled.outer.json | 8 - .../block/stairs/quartz.certus.inner.json | 8 - .../models/block/stairs/quartz.certus.json | 8 - .../block/stairs/quartz.certus.outer.json | 8 - .../stairs/quartz.certus.pillar.inner.json | 8 - .../block/stairs/quartz.certus.pillar.json | 8 - .../stairs/quartz.certus.pillar.outer.json | 8 - .../models/block/stairs/quartz_certus.json | 8 + .../block/stairs/quartz_certus_chiseled.json | 8 + .../stairs/quartz_certus_chiseled_inner.json | 8 + .../stairs/quartz_certus_chiseled_outer.json | 8 + .../block/stairs/quartz_certus_inner.json | 8 + .../block/stairs/quartz_certus_outer.json | 8 + .../block/stairs/quartz_certus_pillar.json | 8 + .../stairs/quartz_certus_pillar_inner.json | 8 + .../stairs/quartz_certus_pillar_outer.json | 8 + .../block/stairs/skystone.block.inner.json | 8 - .../models/block/stairs/skystone.block.json | 8 - .../block/stairs/skystone.block.outer.json | 8 - .../block/stairs/skystone.brick.inner.json | 8 - .../models/block/stairs/skystone.brick.json | 8 - .../block/stairs/skystone.brick.outer.json | 8 - .../stairs/skystone.brick.small.inner.json | 8 - .../block/stairs/skystone.brick.small.json | 8 - .../stairs/skystone.brick.small.outer.json | 8 - .../block/stairs/skystone.stone.inner.json | 8 - .../models/block/stairs/skystone.stone.json | 8 - .../block/stairs/skystone.stone.outer.json | 8 - .../models/block/stairs/skystone_block.json | 8 + .../block/stairs/skystone_block_inner.json | 8 + .../block/stairs/skystone_block_outer.json | 8 + .../models/block/stairs/skystone_brick.json | 8 + .../block/stairs/skystone_brick_inner.json | 8 + .../block/stairs/skystone_brick_outer.json | 8 + .../block/stairs/skystone_brick_small.json | 8 + .../stairs/skystone_brick_small_inner.json | 8 + .../stairs/skystone_brick_small_outer.json | 8 + .../models/block/stairs/skystone_stone.json | 8 + .../block/stairs/skystone_stone_inner.json | 8 + .../block/stairs/skystone_stone_outer.json | 8 + .../models/block/test.json | 387 +++++++-- .../models/block/tile.BlockCellWorkBench.json | 8 - .../models/block/tile.BlockCharger.json | 76 -- .../models/block/tile.BlockDrive.json | 140 ---- .../block/tile.BlockEnergyAcceptor.json | 6 - .../models/block/tile.BlockGrinder.json | 10 - .../models/block/tile.BlockIOPort.json | 8 - .../models/block/tile.BlockInscriber.json | 100 --- ...tile.BlockQuartzGrowthAccelerator.off.json | 8 - .../tile.BlockQuartzGrowthAccelerator.on.json | 8 - .../models/block/tile.BlockSecurity.json | 8 - .../models/block/tile.BlockSpatialIOPort.json | 8 - .../block/tile.BlockVibrationChamber.off.json | 9 - .../block/tile.BlockVibrationChamber.on.json | 6 - .../models/block/tile.BlockWireless.json | 152 ---- .../models/block/tiny_tnt.json | 80 ++ .../models/block/tnt.model | Bin 1385 -> 0 bytes .../models/block/vibration_chamber_off.json | 9 + .../models/block/vibration_chamber_on.json | 6 + .../models/block/wireless.json | 768 ++++++++++++++++++ .../models/item/BlockTinyTNT.json | 3 - .../models/item/ItemBasicStorageCell.16k.json | 6 - .../models/item/ItemBasicStorageCell.1k.json | 6 - .../models/item/ItemBasicStorageCell.4k.json | 6 - .../models/item/ItemBasicStorageCell.64k.json | 6 - .../models/item/ItemCreativeStorageCell.json | 6 - .../models/item/ItemCrystalSeed.Certus.json | 6 - .../models/item/ItemCrystalSeed.Certus2.json | 6 - .../models/item/ItemCrystalSeed.Certus3.json | 6 - .../models/item/ItemCrystalSeed.Fluix.json | 6 - .../models/item/ItemCrystalSeed.Fluix2.json | 6 - .../models/item/ItemCrystalSeed.Fluix3.json | 6 - .../models/item/ItemCrystalSeed.Nether.json | 6 - .../models/item/ItemCrystalSeed.Nether2.json | 6 - .../models/item/ItemCrystalSeed.Nether3.json | 6 - .../models/item/ItemEncodedPattern.json | 6 - .../models/item/ItemMaterial.AdvCard.json | 6 - .../item/ItemMaterial.AnnihilationCore.json | 6 - .../models/item/ItemMaterial.BasicCard.json | 6 - .../item/ItemMaterial.BlankPattern.json | 6 - .../item/ItemMaterial.CalcProcessor.json | 6 - .../item/ItemMaterial.CalcProcessorPress.json | 6 - .../item/ItemMaterial.CalcProcessorPrint.json | 6 - .../item/ItemMaterial.CardCapacity.json | 6 - .../item/ItemMaterial.CardCrafting.json | 6 - .../models/item/ItemMaterial.CardFuzzy.json | 6 - .../item/ItemMaterial.CardInverter.json | 6 - .../item/ItemMaterial.CardRedstone.json | 6 - .../models/item/ItemMaterial.CardSpeed.json | 6 - .../item/ItemMaterial.Cell128SpatialPart.json | 6 - .../item/ItemMaterial.Cell16SpatialPart.json | 6 - .../models/item/ItemMaterial.Cell16kPart.json | 6 - .../models/item/ItemMaterial.Cell1kPart.json | 6 - .../item/ItemMaterial.Cell2SpatialPart.json | 6 - .../models/item/ItemMaterial.Cell4kPart.json | 6 - .../models/item/ItemMaterial.Cell64kPart.json | 6 - .../ItemMaterial.CertusQuartzCrystal.json | 6 - ...emMaterial.CertusQuartzCrystalCharged.json | 6 - .../item/ItemMaterial.CertusQuartzDust.json | 6 - .../item/ItemMaterial.EmptyStorageCell.json | 6 - .../models/item/ItemMaterial.EnderDust.json | 6 - .../item/ItemMaterial.EngProcessor.json | 6 - .../item/ItemMaterial.EngProcessorPress.json | 6 - .../item/ItemMaterial.EngProcessorPrint.json | 6 - .../models/item/ItemMaterial.Flour.json | 6 - .../item/ItemMaterial.FluixCrystal.json | 6 - .../models/item/ItemMaterial.FluixDust.json | 6 - .../models/item/ItemMaterial.FluixPearl.json | 6 - .../item/ItemMaterial.FormationCore.json | 6 - .../models/item/ItemMaterial.GoldDust.json | 6 - .../models/item/ItemMaterial.IronDust.json | 6 - .../models/item/ItemMaterial.IronNugget.json | 6 - .../item/ItemMaterial.LogicProcessor.json | 6 - .../ItemMaterial.LogicProcessorPress.json | 6 - .../ItemMaterial.LogicProcessorPrint.json | 6 - .../models/item/ItemMaterial.MatterBall.json | 6 - .../models/item/ItemMaterial.NamePress.json | 6 - .../item/ItemMaterial.NetherQuartzDust.json | 6 - ...mMaterial.PurifiedCertusQuartzCrystal.json | 6 - .../ItemMaterial.PurifiedFluixCrystal.json | 6 - ...mMaterial.PurifiedNetherQuartzCrystal.json | 6 - .../item/ItemMaterial.QESingularity.json | 6 - .../models/item/ItemMaterial.Silicon.json | 6 - .../item/ItemMaterial.SiliconPress.json | 6 - .../item/ItemMaterial.SiliconPrint.json | 6 - .../models/item/ItemMaterial.Singularity.json | 6 - .../models/item/ItemMaterial.SkyDust.json | 6 - .../models/item/ItemMaterial.Wireless.json | 6 - .../item/ItemMaterial.WirelessBooster.json | 6 - .../models/item/ItemMaterial.WoodenCrank.json | 6 - .../models/item/ItemMaterial.WoodenGear.json | 6 - .../models/item/ItemPaintBall.json | 6 - .../models/item/ItemPaintBallShimmer.json | 6 - .../item/ItemSpatialStorageCell.128Cubed.json | 6 - .../item/ItemSpatialStorageCell.16Cubed.json | 6 - .../item/ItemSpatialStorageCell.2Cubed.json | 6 - .../models/item/ItemViewCell.json | 6 - .../models/item/QuartzPillarBlock.json | 3 - .../models/item/ToolBiometricCard.json | 6 - .../models/item/ToolCertusQuartzAxe.json | 6 - .../item/ToolCertusQuartzCuttingKnife.json | 6 - .../models/item/ToolCertusQuartzHoe.json | 6 - .../models/item/ToolCertusQuartzPickaxe.json | 6 - .../models/item/ToolCertusQuartzSpade.json | 6 - .../models/item/ToolCertusQuartzSword.json | 6 - .../models/item/ToolCertusQuartzWrench.json | 6 - .../models/item/ToolChargedStaff.json | 6 - .../models/item/ToolColorApplicator.json | 6 - .../item/ToolColorApplicatorTip_Dark.json | 6 - .../item/ToolColorApplicatorTip_Light.json | 6 - .../item/ToolColorApplicatorTip_Medium.json | 6 - .../models/item/ToolDebugCard.json | 6 - .../models/item/ToolEntropyManipulator.json | 6 - .../models/item/ToolMassCannon.json | 6 - .../models/item/ToolMemoryCard.json | 6 - .../models/item/ToolNetherQuartzAxe.json | 6 - .../item/ToolNetherQuartzCuttingKnife.json | 6 - .../models/item/ToolNetherQuartzHoe.json | 6 - .../models/item/ToolNetherQuartzPickaxe.json | 6 - .../models/item/ToolNetherQuartzSpade.json | 6 - .../models/item/ToolNetherQuartzSword.json | 6 - .../models/item/ToolNetherQuartzWrench.json | 6 - .../models/item/ToolNetworkTool.json | 6 - .../models/item/ToolPortableCell.json | 6 - .../models/item/ToolReplicatorCard.json | 6 - .../models/item/ToolWirelessTerminal.json | 6 - .../models/item/basic_storage_cell_16k.json | 6 + .../models/item/basic_storage_cell_1k.json | 6 + .../models/item/basic_storage_cell_4k.json | 6 + .../models/item/basic_storage_cell_64k.json | 6 + .../models/item/biometric_card.json | 6 + .../models/item/cell_workbench.json | 3 + .../models/item/certus_quartz_axe.json | 6 + .../item/certus_quartz_cutting_knife.json | 6 + .../models/item/certus_quartz_hoe.json | 6 + .../models/item/certus_quartz_pickaxe.json | 6 + .../models/item/certus_quartz_spade.json | 6 + .../models/item/certus_quartz_sword.json | 6 + .../models/item/certus_quartz_wrench.json | 6 + .../models/item/charged_staff.json | 6 + .../models/item/charger.json | 3 + .../models/item/color_applicator.json | 6 + .../item/color_applicator_tip_dark.json | 6 + .../item/color_applicator_tip_light.json | 6 + .../item/color_applicator_tip_medium.json | 6 + .../models/item/condenser.json | 3 + ...e.BlockController.json => controller.json} | 0 .../models/item/creative_storage_cell.json | 6 + .../models/item/crystal_seed_certus.json | 6 + .../models/item/crystal_seed_certus2.json | 6 + .../models/item/crystal_seed_certus3.json | 6 + .../models/item/crystal_seed_fluix.json | 6 + .../models/item/crystal_seed_fluix2.json | 6 + .../models/item/crystal_seed_fluix3.json | 6 + .../models/item/crystal_seed_nether.json | 6 + .../models/item/crystal_seed_nether2.json | 6 + .../models/item/crystal_seed_nether3.json | 6 + .../models/item/debug_card.json | 6 + .../models/item/drive.json | 3 + .../models/item/encoded_pattern.json | 6 + .../models/item/energy_acceptor.json | 3 + .../models/item/entropy_manipulator.json | 6 + .../models/item/fluix.json | 30 +- .../models/item/grinder.json | 3 + .../models/item/inscriber.json | 3 + .../models/item/ioport.json | 3 + .../models/item/mass_cannon.json | 6 + .../models/item/material_adv_card.json | 6 + .../item/material_annihilation_core.json | 6 + .../models/item/material_basic_card.json | 6 + .../models/item/material_blank_pattern.json | 6 + .../models/item/material_calc_processor.json | 6 + .../item/material_calc_processor_press.json | 6 + .../item/material_calc_processor_print.json | 6 + .../models/item/material_card_capacity.json | 6 + .../models/item/material_card_crafting.json | 6 + .../models/item/material_card_fuzzy.json | 6 + .../models/item/material_card_inverter.json | 6 + .../models/item/material_card_redstone.json | 6 + .../models/item/material_card_speed.json | 6 + .../item/material_cell128_spatial_part.json | 6 + .../item/material_cell16_spatial_part.json | 6 + .../models/item/material_cell16k_part.json | 6 + .../models/item/material_cell1k_part.json | 6 + .../item/material_cell2_spatial_part.json | 6 + .../models/item/material_cell4k_part.json | 6 + .../models/item/material_cell64k_part.json | 6 + .../item/material_certus_quartz_crystal.json | 6 + ...aterial_certus_quartz_crystal_charged.json | 6 + .../item/material_certus_quartz_dust.json | 6 + .../item/material_empty_storage_cell.json | 6 + .../models/item/material_ender_dust.json | 6 + .../models/item/material_eng_processor.json | 6 + .../item/material_eng_processor_press.json | 6 + .../item/material_eng_processor_print.json | 6 + .../models/item/material_flour.json | 6 + .../models/item/material_fluix_crystal.json | 6 + .../models/item/material_fluix_dust.json | 6 + .../models/item/material_fluix_pearl.json | 6 + .../models/item/material_formation_core.json | 6 + .../models/item/material_gold_dust.json | 6 + .../models/item/material_iron_dust.json | 6 + .../models/item/material_iron_nugget.json | 6 + .../models/item/material_logic_processor.json | 6 + .../item/material_logic_processor_press.json | 6 + .../item/material_logic_processor_print.json | 6 + .../models/item/material_matter_ball.json | 6 + .../models/item/material_name_press.json | 6 + .../item/material_nether_quartz_dust.json | 6 + ...terial_purified_certus_quartz_crystal.json | 6 + .../item/material_purified_fluix_crystal.json | 6 + ...terial_purified_nether_quartz_crystal.json | 6 + .../models/item/material_qesingularity.json | 6 + .../models/item/material_silicon.json | 6 + .../models/item/material_silicon_press.json | 6 + .../models/item/material_silicon_print.json | 6 + .../models/item/material_singularity.json | 6 + .../models/item/material_sky_dust.json | 6 + .../models/item/material_wireless.json | 6 + .../item/material_wireless_booster.json | 6 + .../models/item/material_wooden_crank.json | 6 + .../models/item/material_wooden_gear.json | 6 + .../models/item/memory_card.json | 6 + .../models/item/nether_quartz_axe.json | 6 + .../item/nether_quartz_cutting_knife.json | 6 + .../models/item/nether_quartz_hoe.json | 6 + .../models/item/nether_quartz_pickaxe.json | 6 + .../models/item/nether_quartz_spade.json | 6 + .../models/item/nether_quartz_sword.json | 6 + .../models/item/nether_quartz_wrench.json | 6 + .../models/item/network_tool.json | 6 + .../models/item/paint_ball.json | 6 + .../models/item/paint_ball_shimmer.json | 6 + .../models/item/portable_cell.json | 6 + .../item/quartz_growth_accelerator.json | 3 + .../models/item/quartz_pillar.json | 3 + .../models/item/replicator_card.json | 6 + .../models/item/security.json | 3 + ...yChest.STONE.json => sky_chest_block.json} | 2 +- .../models/item/sky_chest_stone.json | 35 + .../models/item/spatial_ioport.json | 3 + .../item/spatial_storage_cell_128_cubed.json | 6 + .../item/spatial_storage_cell_16_cubed.json | 6 + .../item/spatial_storage_cell_2_cubed.json | 6 + .../models/item/stair.fluix.json | 3 - .../item/stair.quartz.certus.chiseled.json | 3 - .../models/item/stair.quartz.certus.json | 3 - .../item/stair.quartz.certus.pillar.json | 3 - .../models/item/stair.skystone.block.json | 3 - .../models/item/stair.skystone.brick.json | 3 - .../item/stair.skystone.brick.small.json | 3 - .../models/item/stair.skystone.stone.json | 3 - .../models/item/stair_fluix.json | 3 + .../models/item/stair_quartz_certus.json | 3 + .../item/stair_quartz_certus_chiseled.json | 3 + .../item/stair_quartz_certus_pillar.json | 3 + .../models/item/stair_skystone_block.json | 3 + .../models/item/stair_skystone_brick.json | 3 + .../item/stair_skystone_brick_small.json | 3 + .../models/item/stair_skystone_stone.json | 3 + .../models/item/tile.BlockCellWorkbench.json | 3 - .../models/item/tile.BlockCharger.json | 3 - .../models/item/tile.BlockCondenser.json | 3 - .../models/item/tile.BlockDrive.json | 3 - .../models/item/tile.BlockEnergyAcceptor.json | 3 - .../models/item/tile.BlockGrinder.json | 3 - .../models/item/tile.BlockIOPort.json | 3 - .../models/item/tile.BlockInscriber.json | 3 - .../tile.BlockQuartzGrowthAccelerator.json | 3 - .../models/item/tile.BlockSecurity.json | 3 - .../models/item/tile.BlockSkyChest.BLOCK.json | 6 - .../models/item/tile.BlockSpatialIOPort.json | 3 - .../item/tile.BlockVibrationChamber.json | 3 - .../models/item/tile.BlockWireless.json | 3 - .../models/item/tiny_tnt.json | 3 + .../models/item/vibration_chamber.json | 3 + .../models/item/view_cell.json | 6 + .../models/item/wireless.json | 3 + .../models/item/wireless_terminal.json | 6 + ...ckCellWorkbench.png => cell_workbench.png} | Bin ...chBottom.png => cell_workbench_bottom.png} | Bin ...kbenchSide.png => cell_workbench_side.png} | Bin ...rtzOreBlock.png => charged_quartz_ore.png} | Bin .../blocks/{BlockCharger.png => charger.png} | Bin ...ckChargerInside.png => charger_inside.png} | Bin ...{BlockChargerSide.png => charger_side.png} | Bin ...ide.png => chiseled_quartz_block_side.png} | Bin ...kTop.png => chiseled_quartz_block_top.png} | Bin .../{BlockCondenser.png => condenser.png} | Bin .../{BlockController.png => controller.png} | Bin ...rollerColumn.png => controller_column.png} | Bin ...ict.png => controller_column_conflict.png} | Bin ...ights.png => controller_column_lights.png} | Bin ...ta => controller_column_lights.png.mcmeta} | 0 ...ered.png => controller_column_powered.png} | Bin ...erConflict.png => controller_conflict.png} | Bin ...lerInsideA.png => controller_inside_a.png} | Bin ...lerInsideB.png => controller_inside_b.png} | Bin ...rollerLights.png => controller_lights.png} | Bin ...ng.mcmeta => controller_lights.png.mcmeta} | 0 ...llerPowered.png => controller_powered.png} | Bin ...nergyCell.png => creative_energy_cell.png} | Bin ...EnergyAcceptor.png => energy_acceptor.png} | Bin .../{BlockEnergyCell.png => energy_cell.png} | Bin ...{BlockEnergyCell0.png => energy_cell0.png} | Bin ...{BlockEnergyCell1.png => energy_cell1.png} | Bin ...{BlockEnergyCell2.png => energy_cell2.png} | Bin ...{BlockEnergyCell3.png => energy_cell3.png} | Bin ...{BlockEnergyCell4.png => energy_cell4.png} | Bin ...{BlockEnergyCell5.png => energy_cell5.png} | Bin ...{BlockEnergyCell6.png => energy_cell6.png} | Bin ...{BlockEnergyCell7.png => energy_cell7.png} | Bin .../blocks/{FluixBlock.png => fluix.png} | Bin .../blocks/{BlockGrinder.png => grinder.png} | Bin ...ckGrinderBottom.png => grinder_bottom.png} | Bin ...lockGrinderFront.png => grinder_front.png} | Bin ...{BlockGrinderSide.png => grinder_side.png} | Bin .../{BlockInscriber.png => inscriber.png} | Bin ...scriberInside.png => inscriber_inside.png} | Bin .../blocks/{BlockIOPort.png => ioport.png} | Bin ...lockIOPortBottom.png => ioport_bottom.png} | Bin .../{BlockIOPortSide.png => ioport_side.png} | Bin .../blocks/{QuartzBlock.png => quartz.png} | Bin ...ator.png => quartz_growth_accelerator.png} | Bin ...n.png => quartz_growth_accelerator_on.png} | Bin ...> quartz_growth_accelerator_on.png.mcmeta} | 0 ...png => quartz_growth_accelerator_side.png} | Bin ... => quartz_growth_accelerator_side_on.png} | Bin ...rtz_growth_accelerator_side_on.png.mcmeta} | 0 .../{QuartzOreBlock.png => quartz_ore.png} | Bin ...kSide.png => quartz_pillar_block_side.png} | Bin ...ockTop.png => quartz_pillar_block_top.png} | Bin .../{BlockSecurity.png => security.png} | Bin ...SecurityBottom.png => security_bottom.png} | Bin ...lockSecuritySide.png => security_side.png} | Bin ...ck.BLOCK.png => sky_stone_block_block.png} | Bin ...ck.BRICK.png => sky_stone_block_brick.png} | Bin ...CK.png => sky_stone_block_small_brick.png} | Bin ...ck.STONE.png => sky_stone_block_stone.png} | Bin ...ckSpatialIOPort.png => spatial_ioport.png} | Bin ...rtBottom.png => spatial_ioport_bottom.png} | Bin ...IOPortSide.png => spatial_ioport_side.png} | Bin ...ationChamber.png => vibration_chamber.png} | Bin ...rFront.png => vibration_chamber_front.png} | Bin ...tOn.png => vibration_chamber_front_on.png} | Bin .../{BlockWireless.png => wireless.png} | Bin ...WirelessInside.png => wireless_inside.png} | Bin .../{BlockWirelessOn.png => wireless_on.png} | Bin ...ell.16k.png => basic_storage_cell_16k.png} | Bin ...eCell.1k.png => basic_storage_cell_1k.png} | Bin ...eCell.4k.png => basic_storage_cell_4k.png} | Bin ...ell.64k.png => basic_storage_cell_64k.png} | Bin ...olBiometricCard.png => biometric_card.png} | Bin ...tusQuartzAxe.png => certus_quartz_axe.png} | Bin ...fe.png => certus_quartz_cutting_knife.png} | Bin ...tusQuartzHoe.png => certus_quartz_hoe.png} | Bin ...zPickaxe.png => certus_quartz_pickaxe.png} | Bin ...uartzSpade.png => certus_quartz_spade.png} | Bin ...uartzSword.png => certus_quartz_sword.png} | Bin ...rtzWrench.png => certus_quartz_wrench.png} | Bin ...ToolChargedStaff.png => charged_staff.png} | Bin ...lorApplicator.png => color_applicator.png} | Bin ...Dark.png => color_applicator_tip_dark.png} | Bin ...ght.png => color_applicator_tip_light.png} | Bin ...um.png => color_applicator_tip_medium.png} | Bin ...rageCell.png => creative_storage_cell.png} | Bin ...eed.Certus.png => crystal_seed_certus.png} | Bin ...d.Certus2.png => crystal_seed_certus2.png} | Bin ...d.Certus3.png => crystal_seed_certus3.png} | Bin ...lSeed.Fluix.png => crystal_seed_fluix.png} | Bin ...eed.Fluix2.png => crystal_seed_fluix2.png} | Bin ...eed.Fluix3.png => crystal_seed_fluix3.png} | Bin ...eed.Nether.png => crystal_seed_nether.png} | Bin ...d.Nether2.png => crystal_seed_nether2.png} | Bin ...d.Nether3.png => crystal_seed_nether3.png} | Bin .../{ToolDebugCard.png => debug_card.png} | Bin ...EncodedPattern.png => encoded_pattern.png} | Bin ...anipulator.png => entropy_manipulator.png} | Bin .../{ToolMassCannon.png => mass_cannon.png} | Bin ...rial.AdvCard.png => material_adv_card.png} | Bin ...ore.png => material_annihilation_core.png} | Bin ....BasicCard.png => material_basic_card.png} | Bin ...Pattern.png => material_blank_pattern.png} | Bin ...cessor.png => material_calc_processor.png} | Bin ....png => material_calc_processor_press.png} | Bin ....png => material_calc_processor_print.png} | Bin ...apacity.png => material_card_capacity.png} | Bin ...rafting.png => material_card_crafting.png} | Bin ....CardFuzzy.png => material_card_fuzzy.png} | Bin ...nverter.png => material_card_inverter.png} | Bin ...edstone.png => material_card_redstone.png} | Bin ....CardSpeed.png => material_card_speed.png} | Bin ....png => material_cell128_spatial_part.png} | Bin ...t.png => material_cell16_spatial_part.png} | Bin ...l16kPart.png => material_cell16k_part.png} | Bin ...ell1kPart.png => material_cell1k_part.png} | Bin ...rt.png => material_cell2_spatial_part.png} | Bin ...ell4kPart.png => material_cell4k_part.png} | Bin ...l64kPart.png => material_cell64k_part.png} | Bin ...png => material_certus_quartz_crystal.png} | Bin ...aterial_certus_quartz_crystal_charged.png} | Bin ...st.png => material_certus_quartz_dust.png} | Bin ...ll.png => material_empty_storage_cell.png} | Bin ....EnderDust.png => material_ender_dust.png} | Bin ...ocessor.png => material_eng_processor.png} | Bin ...s.png => material_eng_processor_press.png} | Bin ...t.png => material_eng_processor_print.png} | Bin ...mMaterial.Flour.png => material_flour.png} | Bin ...Crystal.png => material_fluix_crystal.png} | Bin ....FluixDust.png => material_fluix_dust.png} | Bin ...luixPearl.png => material_fluix_pearl.png} | Bin ...onCore.png => material_formation_core.png} | Bin ...al.GoldDust.png => material_gold_dust.png} | Bin ...al.IronDust.png => material_iron_dust.png} | Bin ...ronNugget.png => material_iron_nugget.png} | Bin ...essor.png => material_logic_processor.png} | Bin ...png => material_logic_processor_press.png} | Bin ...png => material_logic_processor_print.png} | Bin ...atterBall.png => material_matter_ball.png} | Bin ....NamePress.png => material_name_press.png} | Bin ...st.png => material_nether_quartz_dust.png} | Bin ...terial_purified_certus_quartz_crystal.png} | Bin ...ng => material_purified_fluix_crystal.png} | Bin ...terial_purified_nether_quartz_crystal.png} | Bin ...ularity.png => material_qesingularity.png} | Bin ...erial.Silicon.png => material_silicon.png} | Bin ...onPress.png => material_silicon_press.png} | Bin ...onPrint.png => material_silicon_print.png} | Bin ...ngularity.png => material_singularity.png} | Bin ...rial.SkyDust.png => material_sky_dust.png} | Bin ...ial.Wireless.png => material_wireless.png} | Bin ...ster.png => material_wireless_booster.png} | Bin ...denCrank.png => material_wooden_crank.png} | Bin ...oodenGear.png => material_wooden_gear.png} | Bin .../{ToolMemoryCard.png => memory_card.png} | Bin ...herQuartzAxe.png => nether_quartz_axe.png} | Bin ...fe.png => nether_quartz_cutting_knife.png} | Bin ...herQuartzHoe.png => nether_quartz_hoe.png} | Bin ...zPickaxe.png => nether_quartz_pickaxe.png} | Bin ...uartzSpade.png => nether_quartz_spade.png} | Bin ...uartzSword.png => nether_quartz_sword.png} | Bin ...rtzWrench.png => nether_quartz_wrench.png} | Bin .../{ToolNetworkTool.png => network_tool.png} | Bin .../{ItemPaintBall.png => paint_ball.png} | Bin ...BallShimmer.png => paint_ball_shimmer.png} | Bin ...g.mcmeta => paint_ball_shimmer.png.mcmeta} | 0 ...ToolPortableCell.png => portable_cell.png} | Bin ...ReplicatorCard.png => replicator_card.png} | Bin ...png => spatial_storage_cell_128_cubed.png} | Bin ....png => spatial_storage_cell_16_cubed.png} | Bin ...d.png => spatial_storage_cell_2_cubed.png} | Bin .../items/{ItemViewCell.png => view_cell.png} | Bin ...lessTerminal.png => wireless_terminal.png} | Bin 697 files changed, 6939 insertions(+), 2695 deletions(-) rename src/main/java/appeng/decorative/solid/{ChargedQuartzOreBlock.java => BlockChargedQuartzOre.java} (96%) rename src/main/java/appeng/decorative/solid/{ChiseledQuartzBlock.java => BlockChiseledQuartz.java} (92%) rename src/main/java/appeng/decorative/solid/{FluixBlock.java => BlockFluix.java} (93%) rename src/main/java/appeng/decorative/solid/{QuartzBlock.java => BlockQuartz.java} (93%) rename src/main/java/appeng/decorative/solid/{QuartzGlassBlock.java => BlockQuartzGlass.java} (96%) rename src/main/java/appeng/decorative/solid/{QuartzLampBlock.java => BlockQuartzLamp.java} (96%) rename src/main/java/appeng/decorative/solid/{QuartzOreBlock.java => BlockQuartzOre.java} (98%) rename src/main/java/appeng/decorative/solid/{QuartzPillarBlock.java => BlockQuartzPillar.java} (96%) rename src/main/java/appeng/decorative/solid/{SkyStoneBlock.java => BlockSkyStone.java} (97%) delete mode 100644 src/main/java/appeng/decorative/solid/FluixIdentifier.java delete mode 100644 src/main/java/appeng/decorative/solid/Identifier.java rename src/main/java/appeng/decorative/stair/{FluixStairBlock.java => BlockFluixStair.java} (61%) delete mode 100644 src/main/java/appeng/decorative/stair/DecorativeStairIdentifier.java delete mode 100644 src/main/java/appeng/decorative/stair/FluixStairComponent.java delete mode 100644 src/main/java/appeng/decorative/stair/FluixStairIdentifier.java rename src/main/java/appeng/items/materials/{MultiItem.java => ItemMultiItem.java} (98%) delete mode 100644 src/main/resources/assets/appliedenergistics2/blockstates/BlockTinyTNT.json delete mode 100644 src/main/resources/assets/appliedenergistics2/blockstates/ChargedQuartzOreBlock.json delete mode 100644 src/main/resources/assets/appliedenergistics2/blockstates/ChiseledQuartzBlock.json delete mode 100644 src/main/resources/assets/appliedenergistics2/blockstates/FluixBlock.json delete mode 100644 src/main/resources/assets/appliedenergistics2/blockstates/QuartzBlock.json delete mode 100644 src/main/resources/assets/appliedenergistics2/blockstates/QuartzGlassBlock.json delete mode 100644 src/main/resources/assets/appliedenergistics2/blockstates/QuartzOreBlock.json delete mode 100644 src/main/resources/assets/appliedenergistics2/blockstates/QuartzPillarBlock.json delete mode 100644 src/main/resources/assets/appliedenergistics2/blockstates/SkyStoneBlock.BLOCK.json delete mode 100644 src/main/resources/assets/appliedenergistics2/blockstates/SkyStoneBlock.BRICK.json delete mode 100644 src/main/resources/assets/appliedenergistics2/blockstates/SkyStoneBlock.SMALL_BRICK.json delete mode 100644 src/main/resources/assets/appliedenergistics2/blockstates/SkyStoneBlock.STONE.json create mode 100644 src/main/resources/assets/appliedenergistics2/blockstates/cell_work_bench.json create mode 100644 src/main/resources/assets/appliedenergistics2/blockstates/charged_quartz_ore.json create mode 100644 src/main/resources/assets/appliedenergistics2/blockstates/charger.json create mode 100644 src/main/resources/assets/appliedenergistics2/blockstates/chiseled_quartz.json create mode 100644 src/main/resources/assets/appliedenergistics2/blockstates/condenser.json create mode 100644 src/main/resources/assets/appliedenergistics2/blockstates/controller.json create mode 100644 src/main/resources/assets/appliedenergistics2/blockstates/creative_energy_cell.json create mode 100644 src/main/resources/assets/appliedenergistics2/blockstates/dense_energy_cell.json create mode 100644 src/main/resources/assets/appliedenergistics2/blockstates/drive.json create mode 100644 src/main/resources/assets/appliedenergistics2/blockstates/energy_acceptor.json create mode 100644 src/main/resources/assets/appliedenergistics2/blockstates/energy_cell.json create mode 100644 src/main/resources/assets/appliedenergistics2/blockstates/fluix.json create mode 100644 src/main/resources/assets/appliedenergistics2/blockstates/grinder.json create mode 100644 src/main/resources/assets/appliedenergistics2/blockstates/inscriber.json create mode 100644 src/main/resources/assets/appliedenergistics2/blockstates/ioport.json create mode 100644 src/main/resources/assets/appliedenergistics2/blockstates/quartz.json create mode 100644 src/main/resources/assets/appliedenergistics2/blockstates/quartz_glass.json create mode 100644 src/main/resources/assets/appliedenergistics2/blockstates/quartz_growth_accelerator.json create mode 100644 src/main/resources/assets/appliedenergistics2/blockstates/quartz_ore.json create mode 100644 src/main/resources/assets/appliedenergistics2/blockstates/quartz_pillar.json create mode 100644 src/main/resources/assets/appliedenergistics2/blockstates/security.json create mode 100644 src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_block_block.json create mode 100644 src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_block_brick.json create mode 100644 src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_block_small_brick.json create mode 100644 src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_block_stone.json create mode 100644 src/main/resources/assets/appliedenergistics2/blockstates/spatial_ioport.json delete mode 100644 src/main/resources/assets/appliedenergistics2/blockstates/stair.fluix.json delete mode 100644 src/main/resources/assets/appliedenergistics2/blockstates/stair.quartz.certus.chiseled.json delete mode 100644 src/main/resources/assets/appliedenergistics2/blockstates/stair.quartz.certus.json delete mode 100644 src/main/resources/assets/appliedenergistics2/blockstates/stair.quartz.certus.pillar.json delete mode 100644 src/main/resources/assets/appliedenergistics2/blockstates/stair.skystone.block.json delete mode 100644 src/main/resources/assets/appliedenergistics2/blockstates/stair.skystone.brick.json delete mode 100644 src/main/resources/assets/appliedenergistics2/blockstates/stair.skystone.brick.small.json delete mode 100644 src/main/resources/assets/appliedenergistics2/blockstates/stair.skystone.stone.json create mode 100644 src/main/resources/assets/appliedenergistics2/blockstates/stair_fluix.json create mode 100644 src/main/resources/assets/appliedenergistics2/blockstates/stair_quartz_certus.json create mode 100644 src/main/resources/assets/appliedenergistics2/blockstates/stair_quartz_certus_chiseled.json create mode 100644 src/main/resources/assets/appliedenergistics2/blockstates/stair_quartz_certus_pillar.json create mode 100644 src/main/resources/assets/appliedenergistics2/blockstates/stair_skystone_block.json create mode 100644 src/main/resources/assets/appliedenergistics2/blockstates/stair_skystone_brick.json create mode 100644 src/main/resources/assets/appliedenergistics2/blockstates/stair_skystone_brick_small.json create mode 100644 src/main/resources/assets/appliedenergistics2/blockstates/stair_skystone_stone.json delete mode 100644 src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockCellWorkBench.json delete mode 100644 src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockCharger.json delete mode 100644 src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockCondenser.json delete mode 100644 src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockController.json delete mode 100644 src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockCreativeEnergyCell.json delete mode 100644 src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockDenseEnergyCell.json delete mode 100644 src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockDrive.json delete mode 100644 src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockEnergyAcceptor.json delete mode 100644 src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockEnergyCell.json delete mode 100644 src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockGrinder.json delete mode 100644 src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockIOPort.json delete mode 100644 src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockInscriber.json delete mode 100644 src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockQuartzGrowthAccelerator.json delete mode 100644 src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockSecurity.json delete mode 100644 src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockSpatialIOPort.json delete mode 100644 src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockVibrationChamber.json delete mode 100644 src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockWireless.json create mode 100644 src/main/resources/assets/appliedenergistics2/blockstates/tiny_tnt.json create mode 100644 src/main/resources/assets/appliedenergistics2/blockstates/vibration_chamber.json create mode 100644 src/main/resources/assets/appliedenergistics2/blockstates/wireless.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/block/BlockTinyTNT.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/block/ChargedQuartzOreBlock.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/block/ChiseledQuartzBlock.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/creative_energy_cell.json rename src/main/resources/assets/appliedenergistics2/models/block/{tile.BlockCondenser.json => EnergyCell/dense_energy_cell0.json} (50%) create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/dense_energy_cell1.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/dense_energy_cell2.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/dense_energy_cell3.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/dense_energy_cell4.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/dense_energy_cell5.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/dense_energy_cell6.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/dense_energy_cell7.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/energy_cell.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/energy_cell0.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/energy_cell1.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/energy_cell2.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/energy_cell3.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/energy_cell4.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/energy_cell5.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/energy_cell6.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/energy_cell7.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockCreativeEnergyCell.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockDenseEnergyCell0.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockDenseEnergyCell1.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockDenseEnergyCell2.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockDenseEnergyCell3.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockDenseEnergyCell4.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockDenseEnergyCell5.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockDenseEnergyCell6.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockDenseEnergyCell7.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockEnergyCell.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockEnergyCell0.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockEnergyCell1.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockEnergyCell2.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockEnergyCell3.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockEnergyCell4.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockEnergyCell5.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockEnergyCell6.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockEnergyCell7.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/block/FluixBlock.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/block/QuartzBlock.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/block/QuartzGlassBlock.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/block/QuartzOreBlock.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/block/QuartzPillarBlock.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/block/SkyStoneBlock.BLOCK.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/block/SkyStoneBlock.BRICK.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/block/SkyStoneBlock.SMALL_BRICK.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/block/SkyStoneBlock.STONE.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/block/Wireless.model create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/cell_work_bench.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/charged_quartz_ore.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/charger.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/chiseled_quartz.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/condenser.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/block/controller/controller_block_conflicted.uvl.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/controller/controller_block_conflicted_uvl.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/block/controller/controller_block_online.uvl.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/controller/controller_block_online_uvl.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/block/controller/controller_column_conflicted.uvl.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/controller/controller_column_conflicted_uvl.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/block/controller/controller_column_online.uvl.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/controller/controller_column_online_uvl.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/drive.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/energy_acceptor.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/fluix.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/grinder.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/inscriber.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/ioport.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/quartz.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/quartz_glass.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/quartz_growth_accelerator_off.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/quartz_growth_accelerator_on.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/quartz_ore.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/quartz_pillar.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/security.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/sky_stone_block_block.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/sky_stone_block_brick.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/sky_stone_block_small_brick.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/sky_stone_block_stone.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/block/skystone.block.stairs.inner.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/block/skystone.block.stairs.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/block/skystone.block.stairs.outer.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/skystone_block_stairs.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/skystone_block_stairs_inner.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/skystone_block_stairs_outer.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/spatial_ioport.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/block/stairs/fluix.inner.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/block/stairs/fluix.outer.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/stairs/fluix_inner.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/stairs/fluix_outer.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz.certus.chiseled.inner.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz.certus.chiseled.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz.certus.chiseled.outer.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz.certus.inner.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz.certus.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz.certus.outer.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz.certus.pillar.inner.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz.certus.pillar.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz.certus.pillar.outer.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_certus.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_certus_chiseled.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_certus_chiseled_inner.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_certus_chiseled_outer.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_certus_inner.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_certus_outer.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_certus_pillar.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_certus_pillar_inner.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_certus_pillar_outer.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone.block.inner.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone.block.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone.block.outer.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone.brick.inner.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone.brick.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone.brick.outer.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone.brick.small.inner.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone.brick.small.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone.brick.small.outer.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone.stone.inner.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone.stone.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone.stone.outer.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_block.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_block_inner.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_block_outer.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_brick.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_brick_inner.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_brick_outer.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_brick_small.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_brick_small_inner.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_brick_small_outer.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_stone.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_stone_inner.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_stone_outer.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/block/tile.BlockCellWorkBench.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/block/tile.BlockCharger.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/block/tile.BlockDrive.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/block/tile.BlockEnergyAcceptor.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/block/tile.BlockGrinder.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/block/tile.BlockIOPort.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/block/tile.BlockInscriber.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/block/tile.BlockQuartzGrowthAccelerator.off.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/block/tile.BlockQuartzGrowthAccelerator.on.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/block/tile.BlockSecurity.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/block/tile.BlockSpatialIOPort.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/block/tile.BlockVibrationChamber.off.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/block/tile.BlockVibrationChamber.on.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/block/tile.BlockWireless.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/tiny_tnt.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/block/tnt.model create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/vibration_chamber_off.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/vibration_chamber_on.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/wireless.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/BlockTinyTNT.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/ItemBasicStorageCell.16k.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/ItemBasicStorageCell.1k.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/ItemBasicStorageCell.4k.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/ItemBasicStorageCell.64k.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/ItemCreativeStorageCell.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/ItemCrystalSeed.Certus.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/ItemCrystalSeed.Certus2.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/ItemCrystalSeed.Certus3.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/ItemCrystalSeed.Fluix.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/ItemCrystalSeed.Fluix2.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/ItemCrystalSeed.Fluix3.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/ItemCrystalSeed.Nether.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/ItemCrystalSeed.Nether2.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/ItemCrystalSeed.Nether3.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/ItemEncodedPattern.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.AdvCard.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.AnnihilationCore.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.BasicCard.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.BlankPattern.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.CalcProcessor.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.CalcProcessorPress.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.CalcProcessorPrint.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.CardCapacity.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.CardCrafting.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.CardFuzzy.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.CardInverter.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.CardRedstone.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.CardSpeed.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.Cell128SpatialPart.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.Cell16SpatialPart.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.Cell16kPart.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.Cell1kPart.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.Cell2SpatialPart.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.Cell4kPart.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.Cell64kPart.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.CertusQuartzCrystal.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.CertusQuartzCrystalCharged.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.CertusQuartzDust.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.EmptyStorageCell.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.EnderDust.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.EngProcessor.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.EngProcessorPress.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.EngProcessorPrint.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.Flour.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.FluixCrystal.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.FluixDust.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.FluixPearl.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.FormationCore.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.GoldDust.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.IronDust.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.IronNugget.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.LogicProcessor.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.LogicProcessorPress.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.LogicProcessorPrint.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.MatterBall.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.NamePress.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.NetherQuartzDust.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.PurifiedCertusQuartzCrystal.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.PurifiedFluixCrystal.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.PurifiedNetherQuartzCrystal.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.QESingularity.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.Silicon.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.SiliconPress.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.SiliconPrint.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.Singularity.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.SkyDust.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.Wireless.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.WirelessBooster.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.WoodenCrank.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/ItemMaterial.WoodenGear.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/ItemPaintBall.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/ItemPaintBallShimmer.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/ItemSpatialStorageCell.128Cubed.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/ItemSpatialStorageCell.16Cubed.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/ItemSpatialStorageCell.2Cubed.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/ItemViewCell.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/QuartzPillarBlock.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/ToolBiometricCard.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/ToolCertusQuartzAxe.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/ToolCertusQuartzCuttingKnife.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/ToolCertusQuartzHoe.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/ToolCertusQuartzPickaxe.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/ToolCertusQuartzSpade.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/ToolCertusQuartzSword.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/ToolCertusQuartzWrench.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/ToolChargedStaff.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/ToolColorApplicator.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/ToolColorApplicatorTip_Dark.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/ToolColorApplicatorTip_Light.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/ToolColorApplicatorTip_Medium.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/ToolDebugCard.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/ToolEntropyManipulator.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/ToolMassCannon.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/ToolMemoryCard.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/ToolNetherQuartzAxe.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/ToolNetherQuartzCuttingKnife.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/ToolNetherQuartzHoe.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/ToolNetherQuartzPickaxe.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/ToolNetherQuartzSpade.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/ToolNetherQuartzSword.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/ToolNetherQuartzWrench.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/ToolNetworkTool.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/ToolPortableCell.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/ToolReplicatorCard.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/ToolWirelessTerminal.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/basic_storage_cell_16k.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/basic_storage_cell_1k.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/basic_storage_cell_4k.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/basic_storage_cell_64k.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/biometric_card.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/cell_workbench.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/certus_quartz_axe.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/certus_quartz_cutting_knife.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/certus_quartz_hoe.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/certus_quartz_pickaxe.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/certus_quartz_spade.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/certus_quartz_sword.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/certus_quartz_wrench.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/charged_staff.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/charger.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/color_applicator.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/color_applicator_tip_dark.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/color_applicator_tip_light.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/color_applicator_tip_medium.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/condenser.json rename src/main/resources/assets/appliedenergistics2/models/item/{tile.BlockController.json => controller.json} (100%) create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/creative_storage_cell.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/crystal_seed_certus.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/crystal_seed_certus2.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/crystal_seed_certus3.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/crystal_seed_fluix.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/crystal_seed_fluix2.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/crystal_seed_fluix3.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/crystal_seed_nether.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/crystal_seed_nether2.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/crystal_seed_nether3.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/debug_card.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/drive.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/encoded_pattern.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/energy_acceptor.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/entropy_manipulator.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/grinder.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/inscriber.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/ioport.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/mass_cannon.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/material_adv_card.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/material_annihilation_core.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/material_basic_card.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/material_blank_pattern.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/material_calc_processor.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/material_calc_processor_press.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/material_calc_processor_print.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/material_card_capacity.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/material_card_crafting.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/material_card_fuzzy.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/material_card_inverter.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/material_card_redstone.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/material_card_speed.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/material_cell128_spatial_part.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/material_cell16_spatial_part.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/material_cell16k_part.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/material_cell1k_part.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/material_cell2_spatial_part.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/material_cell4k_part.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/material_cell64k_part.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/material_certus_quartz_crystal.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/material_certus_quartz_crystal_charged.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/material_certus_quartz_dust.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/material_empty_storage_cell.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/material_ender_dust.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/material_eng_processor.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/material_eng_processor_press.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/material_eng_processor_print.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/material_flour.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/material_fluix_crystal.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/material_fluix_dust.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/material_fluix_pearl.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/material_formation_core.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/material_gold_dust.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/material_iron_dust.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/material_iron_nugget.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/material_logic_processor.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/material_logic_processor_press.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/material_logic_processor_print.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/material_matter_ball.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/material_name_press.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/material_nether_quartz_dust.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/material_purified_certus_quartz_crystal.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/material_purified_fluix_crystal.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/material_purified_nether_quartz_crystal.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/material_qesingularity.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/material_silicon.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/material_silicon_press.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/material_silicon_print.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/material_singularity.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/material_sky_dust.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/material_wireless.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/material_wireless_booster.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/material_wooden_crank.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/material_wooden_gear.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/memory_card.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/nether_quartz_axe.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/nether_quartz_cutting_knife.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/nether_quartz_hoe.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/nether_quartz_pickaxe.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/nether_quartz_spade.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/nether_quartz_sword.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/nether_quartz_wrench.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/network_tool.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/paint_ball.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/paint_ball_shimmer.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/portable_cell.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/quartz_growth_accelerator.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/quartz_pillar.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/replicator_card.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/security.json rename src/main/resources/assets/appliedenergistics2/models/item/{tile.BlockSkyChest.STONE.json => sky_chest_block.json} (99%) create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/sky_chest_stone.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/spatial_ioport.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/spatial_storage_cell_128_cubed.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/spatial_storage_cell_16_cubed.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/spatial_storage_cell_2_cubed.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/stair.fluix.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/stair.quartz.certus.chiseled.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/stair.quartz.certus.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/stair.quartz.certus.pillar.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/stair.skystone.block.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/stair.skystone.brick.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/stair.skystone.brick.small.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/stair.skystone.stone.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/stair_fluix.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/stair_quartz_certus.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/stair_quartz_certus_chiseled.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/stair_quartz_certus_pillar.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/stair_skystone_block.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/stair_skystone_brick.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/stair_skystone_brick_small.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/stair_skystone_stone.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/tile.BlockCellWorkbench.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/tile.BlockCharger.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/tile.BlockCondenser.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/tile.BlockDrive.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/tile.BlockEnergyAcceptor.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/tile.BlockGrinder.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/tile.BlockIOPort.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/tile.BlockInscriber.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/tile.BlockQuartzGrowthAccelerator.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/tile.BlockSecurity.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/tile.BlockSkyChest.BLOCK.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/tile.BlockSpatialIOPort.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/tile.BlockVibrationChamber.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/tile.BlockWireless.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/tiny_tnt.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/vibration_chamber.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/view_cell.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/wireless.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/wireless_terminal.json rename src/main/resources/assets/appliedenergistics2/textures/blocks/{BlockCellWorkbench.png => cell_workbench.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/blocks/{BlockCellWorkbenchBottom.png => cell_workbench_bottom.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/blocks/{BlockCellWorkbenchSide.png => cell_workbench_side.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/blocks/{ChargedQuartzOreBlock.png => charged_quartz_ore.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/blocks/{BlockCharger.png => charger.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/blocks/{BlockChargerInside.png => charger_inside.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/blocks/{BlockChargerSide.png => charger_side.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/blocks/{ChiseledQuartzBlockSide.png => chiseled_quartz_block_side.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/blocks/{ChiseledQuartzBlockTop.png => chiseled_quartz_block_top.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/blocks/{BlockCondenser.png => condenser.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/blocks/{BlockController.png => controller.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/blocks/{BlockControllerColumn.png => controller_column.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/blocks/{BlockControllerColumnConflict.png => controller_column_conflict.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/blocks/{BlockControllerColumnLights.png => controller_column_lights.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/blocks/{BlockControllerColumnLights.png.mcmeta => controller_column_lights.png.mcmeta} (100%) rename src/main/resources/assets/appliedenergistics2/textures/blocks/{BlockControllerColumnPowered.png => controller_column_powered.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/blocks/{BlockControllerConflict.png => controller_conflict.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/blocks/{BlockControllerInsideA.png => controller_inside_a.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/blocks/{BlockControllerInsideB.png => controller_inside_b.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/blocks/{BlockControllerLights.png => controller_lights.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/blocks/{BlockControllerLights.png.mcmeta => controller_lights.png.mcmeta} (100%) rename src/main/resources/assets/appliedenergistics2/textures/blocks/{BlockControllerPowered.png => controller_powered.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/blocks/{BlockCreativeEnergyCell.png => creative_energy_cell.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/blocks/{BlockEnergyAcceptor.png => energy_acceptor.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/blocks/{BlockEnergyCell.png => energy_cell.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/blocks/{BlockEnergyCell0.png => energy_cell0.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/blocks/{BlockEnergyCell1.png => energy_cell1.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/blocks/{BlockEnergyCell2.png => energy_cell2.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/blocks/{BlockEnergyCell3.png => energy_cell3.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/blocks/{BlockEnergyCell4.png => energy_cell4.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/blocks/{BlockEnergyCell5.png => energy_cell5.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/blocks/{BlockEnergyCell6.png => energy_cell6.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/blocks/{BlockEnergyCell7.png => energy_cell7.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/blocks/{FluixBlock.png => fluix.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/blocks/{BlockGrinder.png => grinder.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/blocks/{BlockGrinderBottom.png => grinder_bottom.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/blocks/{BlockGrinderFront.png => grinder_front.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/blocks/{BlockGrinderSide.png => grinder_side.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/blocks/{BlockInscriber.png => inscriber.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/blocks/{BlockInscriberInside.png => inscriber_inside.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/blocks/{BlockIOPort.png => ioport.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/blocks/{BlockIOPortBottom.png => ioport_bottom.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/blocks/{BlockIOPortSide.png => ioport_side.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/blocks/{QuartzBlock.png => quartz.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/blocks/{BlockQuartzGrowthAccelerator.png => quartz_growth_accelerator.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/blocks/{BlockQuartzGrowthAcceleratorOn.png => quartz_growth_accelerator_on.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/blocks/{BlockQuartzGrowthAcceleratorOn.png.mcmeta => quartz_growth_accelerator_on.png.mcmeta} (100%) rename src/main/resources/assets/appliedenergistics2/textures/blocks/{BlockQuartzGrowthAcceleratorSide.png => quartz_growth_accelerator_side.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/blocks/{BlockQuartzGrowthAcceleratorSideOn.png => quartz_growth_accelerator_side_on.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/blocks/{BlockQuartzGrowthAcceleratorSideOn.png.mcmeta => quartz_growth_accelerator_side_on.png.mcmeta} (100%) rename src/main/resources/assets/appliedenergistics2/textures/blocks/{QuartzOreBlock.png => quartz_ore.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/blocks/{QuartzPillarBlockSide.png => quartz_pillar_block_side.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/blocks/{QuartzPillarBlockTop.png => quartz_pillar_block_top.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/blocks/{BlockSecurity.png => security.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/blocks/{BlockSecurityBottom.png => security_bottom.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/blocks/{BlockSecuritySide.png => security_side.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/blocks/{SkyStoneBlock.BLOCK.png => sky_stone_block_block.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/blocks/{SkyStoneBlock.BRICK.png => sky_stone_block_brick.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/blocks/{SkyStoneBlock.SMALL_BRICK.png => sky_stone_block_small_brick.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/blocks/{SkyStoneBlock.STONE.png => sky_stone_block_stone.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/blocks/{BlockSpatialIOPort.png => spatial_ioport.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/blocks/{BlockSpatialIOPortBottom.png => spatial_ioport_bottom.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/blocks/{BlockSpatialIOPortSide.png => spatial_ioport_side.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/blocks/{BlockVibrationChamber.png => vibration_chamber.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/blocks/{BlockVibrationChamberFront.png => vibration_chamber_front.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/blocks/{BlockVibrationChamberFrontOn.png => vibration_chamber_front_on.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/blocks/{BlockWireless.png => wireless.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/blocks/{BlockWirelessInside.png => wireless_inside.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/blocks/{BlockWirelessOn.png => wireless_on.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/items/{ItemBasicStorageCell.16k.png => basic_storage_cell_16k.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/items/{ItemBasicStorageCell.1k.png => basic_storage_cell_1k.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/items/{ItemBasicStorageCell.4k.png => basic_storage_cell_4k.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/items/{ItemBasicStorageCell.64k.png => basic_storage_cell_64k.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/items/{ToolBiometricCard.png => biometric_card.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/items/{ToolCertusQuartzAxe.png => certus_quartz_axe.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/items/{ToolCertusQuartzCuttingKnife.png => certus_quartz_cutting_knife.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/items/{ToolCertusQuartzHoe.png => certus_quartz_hoe.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/items/{ToolCertusQuartzPickaxe.png => certus_quartz_pickaxe.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/items/{ToolCertusQuartzSpade.png => certus_quartz_spade.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/items/{ToolCertusQuartzSword.png => certus_quartz_sword.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/items/{ToolCertusQuartzWrench.png => certus_quartz_wrench.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/items/{ToolChargedStaff.png => charged_staff.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/items/{ToolColorApplicator.png => color_applicator.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/items/{ToolColorApplicatorTip_Dark.png => color_applicator_tip_dark.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/items/{ToolColorApplicatorTip_Light.png => color_applicator_tip_light.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/items/{ToolColorApplicatorTip_Medium.png => color_applicator_tip_medium.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/items/{ItemCreativeStorageCell.png => creative_storage_cell.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/items/{ItemCrystalSeed.Certus.png => crystal_seed_certus.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/items/{ItemCrystalSeed.Certus2.png => crystal_seed_certus2.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/items/{ItemCrystalSeed.Certus3.png => crystal_seed_certus3.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/items/{ItemCrystalSeed.Fluix.png => crystal_seed_fluix.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/items/{ItemCrystalSeed.Fluix2.png => crystal_seed_fluix2.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/items/{ItemCrystalSeed.Fluix3.png => crystal_seed_fluix3.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/items/{ItemCrystalSeed.Nether.png => crystal_seed_nether.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/items/{ItemCrystalSeed.Nether2.png => crystal_seed_nether2.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/items/{ItemCrystalSeed.Nether3.png => crystal_seed_nether3.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/items/{ToolDebugCard.png => debug_card.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/items/{ItemEncodedPattern.png => encoded_pattern.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/items/{ToolEntropyManipulator.png => entropy_manipulator.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/items/{ToolMassCannon.png => mass_cannon.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/items/{ItemMaterial.AdvCard.png => material_adv_card.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/items/{ItemMaterial.AnnihilationCore.png => material_annihilation_core.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/items/{ItemMaterial.BasicCard.png => material_basic_card.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/items/{ItemMaterial.BlankPattern.png => material_blank_pattern.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/items/{ItemMaterial.CalcProcessor.png => material_calc_processor.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/items/{ItemMaterial.CalcProcessorPress.png => material_calc_processor_press.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/items/{ItemMaterial.CalcProcessorPrint.png => material_calc_processor_print.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/items/{ItemMaterial.CardCapacity.png => material_card_capacity.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/items/{ItemMaterial.CardCrafting.png => material_card_crafting.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/items/{ItemMaterial.CardFuzzy.png => material_card_fuzzy.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/items/{ItemMaterial.CardInverter.png => material_card_inverter.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/items/{ItemMaterial.CardRedstone.png => material_card_redstone.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/items/{ItemMaterial.CardSpeed.png => material_card_speed.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/items/{ItemMaterial.Cell128SpatialPart.png => material_cell128_spatial_part.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/items/{ItemMaterial.Cell16SpatialPart.png => material_cell16_spatial_part.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/items/{ItemMaterial.Cell16kPart.png => material_cell16k_part.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/items/{ItemMaterial.Cell1kPart.png => material_cell1k_part.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/items/{ItemMaterial.Cell2SpatialPart.png => material_cell2_spatial_part.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/items/{ItemMaterial.Cell4kPart.png => material_cell4k_part.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/items/{ItemMaterial.Cell64kPart.png => material_cell64k_part.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/items/{ItemMaterial.CertusQuartzCrystal.png => material_certus_quartz_crystal.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/items/{ItemMaterial.CertusQuartzCrystalCharged.png => material_certus_quartz_crystal_charged.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/items/{ItemMaterial.CertusQuartzDust.png => material_certus_quartz_dust.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/items/{ItemMaterial.EmptyStorageCell.png => material_empty_storage_cell.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/items/{ItemMaterial.EnderDust.png => material_ender_dust.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/items/{ItemMaterial.EngProcessor.png => material_eng_processor.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/items/{ItemMaterial.EngProcessorPress.png => material_eng_processor_press.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/items/{ItemMaterial.EngProcessorPrint.png => material_eng_processor_print.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/items/{ItemMaterial.Flour.png => material_flour.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/items/{ItemMaterial.FluixCrystal.png => material_fluix_crystal.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/items/{ItemMaterial.FluixDust.png => material_fluix_dust.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/items/{ItemMaterial.FluixPearl.png => material_fluix_pearl.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/items/{ItemMaterial.FormationCore.png => material_formation_core.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/items/{ItemMaterial.GoldDust.png => material_gold_dust.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/items/{ItemMaterial.IronDust.png => material_iron_dust.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/items/{ItemMaterial.IronNugget.png => material_iron_nugget.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/items/{ItemMaterial.LogicProcessor.png => material_logic_processor.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/items/{ItemMaterial.LogicProcessorPress.png => material_logic_processor_press.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/items/{ItemMaterial.LogicProcessorPrint.png => material_logic_processor_print.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/items/{ItemMaterial.MatterBall.png => material_matter_ball.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/items/{ItemMaterial.NamePress.png => material_name_press.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/items/{ItemMaterial.NetherQuartzDust.png => material_nether_quartz_dust.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/items/{ItemMaterial.PurifiedCertusQuartzCrystal.png => material_purified_certus_quartz_crystal.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/items/{ItemMaterial.PurifiedFluixCrystal.png => material_purified_fluix_crystal.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/items/{ItemMaterial.PurifiedNetherQuartzCrystal.png => material_purified_nether_quartz_crystal.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/items/{ItemMaterial.QESingularity.png => material_qesingularity.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/items/{ItemMaterial.Silicon.png => material_silicon.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/items/{ItemMaterial.SiliconPress.png => material_silicon_press.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/items/{ItemMaterial.SiliconPrint.png => material_silicon_print.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/items/{ItemMaterial.Singularity.png => material_singularity.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/items/{ItemMaterial.SkyDust.png => material_sky_dust.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/items/{ItemMaterial.Wireless.png => material_wireless.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/items/{ItemMaterial.WirelessBooster.png => material_wireless_booster.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/items/{ItemMaterial.WoodenCrank.png => material_wooden_crank.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/items/{ItemMaterial.WoodenGear.png => material_wooden_gear.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/items/{ToolMemoryCard.png => memory_card.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/items/{ToolNetherQuartzAxe.png => nether_quartz_axe.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/items/{ToolNetherQuartzCuttingKnife.png => nether_quartz_cutting_knife.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/items/{ToolNetherQuartzHoe.png => nether_quartz_hoe.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/items/{ToolNetherQuartzPickaxe.png => nether_quartz_pickaxe.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/items/{ToolNetherQuartzSpade.png => nether_quartz_spade.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/items/{ToolNetherQuartzSword.png => nether_quartz_sword.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/items/{ToolNetherQuartzWrench.png => nether_quartz_wrench.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/items/{ToolNetworkTool.png => network_tool.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/items/{ItemPaintBall.png => paint_ball.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/items/{ItemPaintBallShimmer.png => paint_ball_shimmer.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/items/{ItemPaintBallShimmer.png.mcmeta => paint_ball_shimmer.png.mcmeta} (100%) rename src/main/resources/assets/appliedenergistics2/textures/items/{ToolPortableCell.png => portable_cell.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/items/{ToolReplicatorCard.png => replicator_card.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/items/{ItemSpatialStorageCell.128Cubed.png => spatial_storage_cell_128_cubed.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/items/{ItemSpatialStorageCell.16Cubed.png => spatial_storage_cell_16_cubed.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/items/{ItemSpatialStorageCell.2Cubed.png => spatial_storage_cell_2_cubed.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/items/{ItemViewCell.png => view_cell.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/items/{ToolWirelessTerminal.png => wireless_terminal.png} (100%) diff --git a/src/main/java/appeng/core/Registration.java b/src/main/java/appeng/core/Registration.java index e7c2212c1..934b9a14e 100644 --- a/src/main/java/appeng/core/Registration.java +++ b/src/main/java/appeng/core/Registration.java @@ -74,7 +74,7 @@ import appeng.core.localization.GuiText; import appeng.core.localization.PlayerMessages; import appeng.core.stats.PlayerStatsRegistration; import appeng.hooks.TickHandler; -import appeng.items.materials.MultiItem; +import appeng.items.materials.ItemMultiItem; import appeng.loot.ChestLoot; import appeng.me.cache.CraftingGridCache; import appeng.me.cache.EnergyGridCache; @@ -252,7 +252,7 @@ public final class Registration final IRegistryContainer registries = api.registries(); // Perform ore camouflage! - MultiItem.instance.makeUnique(); + ItemMultiItem.instance.makeUnique(); final Runnable recipeLoader = new RecipeLoader( recipeDirectory, customRecipeConfig, this.recipeHandler ); recipeLoader.run(); diff --git a/src/main/java/appeng/core/api/definitions/ApiBlocks.java b/src/main/java/appeng/core/api/definitions/ApiBlocks.java index 896a789ca..f1a0b0389 100644 --- a/src/main/java/appeng/core/api/definitions/ApiBlocks.java +++ b/src/main/java/appeng/core/api/definitions/ApiBlocks.java @@ -65,16 +65,16 @@ import appeng.debug.BlockChunkloader; import appeng.debug.BlockCubeGenerator; import appeng.debug.BlockItemGen; import appeng.debug.BlockPhantomNode; -import appeng.decorative.solid.ChargedQuartzOreBlock; -import appeng.decorative.solid.ChiseledQuartzBlock; -import appeng.decorative.solid.FluixBlock; -import appeng.decorative.solid.QuartzBlock; -import appeng.decorative.solid.QuartzGlassBlock; -import appeng.decorative.solid.QuartzLampBlock; -import appeng.decorative.solid.QuartzOreBlock; -import appeng.decorative.solid.QuartzPillarBlock; -import appeng.decorative.solid.SkyStoneBlock; -import appeng.decorative.solid.SkyStoneBlock.SkystoneType; +import appeng.decorative.solid.BlockChargedQuartzOre; +import appeng.decorative.solid.BlockChiseledQuartz; +import appeng.decorative.solid.BlockFluix; +import appeng.decorative.solid.BlockQuartz; +import appeng.decorative.solid.BlockQuartzGlass; +import appeng.decorative.solid.BlockQuartzLamp; +import appeng.decorative.solid.BlockQuartzOre; +import appeng.decorative.solid.BlockQuartzPillar; +import appeng.decorative.solid.BlockSkyStone; +import appeng.decorative.solid.BlockSkyStone.SkystoneType; import appeng.decorative.stair.BlockStairCommon; @@ -162,20 +162,20 @@ public final class ApiBlocks implements IBlocks public ApiBlocks( final DefinitionConstructor constructor ) { // this.quartzOre = new BlockDefinition( "ore.quartz", new OreQuartz() ); - this.quartzOre = constructor.registerBlockDefinition( new QuartzOreBlock() ); - this.quartzOreCharged = constructor.registerBlockDefinition( new ChargedQuartzOreBlock() ); + this.quartzOre = constructor.registerBlockDefinition( new BlockQuartzOre() ); + this.quartzOreCharged = constructor.registerBlockDefinition( new BlockChargedQuartzOre() ); this.matrixFrame = constructor.registerBlockDefinition( new BlockMatrixFrame() ); - this.quartz = constructor.registerBlockDefinition( new QuartzBlock() ); - this.quartzPillar = constructor.registerBlockDefinition( new QuartzPillarBlock() ); - this.quartzChiseled = constructor.registerBlockDefinition( new ChiseledQuartzBlock() ); - this.quartzGlass = constructor.registerBlockDefinition( new QuartzGlassBlock() ); - this.quartzVibrantGlass = constructor.registerBlockDefinition( new QuartzLampBlock() ); + this.quartz = constructor.registerBlockDefinition( new BlockQuartz() ); + this.quartzPillar = constructor.registerBlockDefinition( new BlockQuartzPillar() ); + this.quartzChiseled = constructor.registerBlockDefinition( new BlockChiseledQuartz() ); + this.quartzGlass = constructor.registerBlockDefinition( new BlockQuartzGlass() ); + this.quartzVibrantGlass = constructor.registerBlockDefinition( new BlockQuartzLamp() ); this.quartzTorch = constructor.registerBlockDefinition( new BlockQuartzTorch() ); - this.fluix = constructor.registerBlockDefinition( new FluixBlock() ); - this.skyStone_stone = constructor.registerBlockDefinition( new SkyStoneBlock( SkystoneType.STONE ) ); - this.skyStone_block = constructor.registerBlockDefinition( new SkyStoneBlock( SkystoneType.BLOCK ) ); - this.skyStone_brick = constructor.registerBlockDefinition( new SkyStoneBlock( SkystoneType.BRICK ) ); - this.skyStone_smallbrick = constructor.registerBlockDefinition( new SkyStoneBlock( SkystoneType.SMALL_BRICK ) ); + this.fluix = constructor.registerBlockDefinition( new BlockFluix() ); + this.skyStone_stone = constructor.registerBlockDefinition( new BlockSkyStone( SkystoneType.STONE ) ); + this.skyStone_block = constructor.registerBlockDefinition( new BlockSkyStone( SkystoneType.BLOCK ) ); + this.skyStone_brick = constructor.registerBlockDefinition( new BlockSkyStone( SkystoneType.BRICK ) ); + this.skyStone_smallbrick = constructor.registerBlockDefinition( new BlockSkyStone( SkystoneType.SMALL_BRICK ) ); this.skyChest = constructor.registerBlockDefinition( new BlockSkyChest( SkyChestType.STONE ) ); this.skyChestBlock = constructor.registerBlockDefinition( new BlockSkyChest( SkyChestType.BLOCK ) ); this.skyCompass = constructor.registerBlockDefinition( new BlockSkyCompass() ); diff --git a/src/main/java/appeng/core/api/definitions/ApiMaterials.java b/src/main/java/appeng/core/api/definitions/ApiMaterials.java index 6485467a4..038cf29c5 100644 --- a/src/main/java/appeng/core/api/definitions/ApiMaterials.java +++ b/src/main/java/appeng/core/api/definitions/ApiMaterials.java @@ -23,7 +23,7 @@ import appeng.api.definitions.IItemDefinition; import appeng.api.definitions.IMaterials; import appeng.core.features.DamagedItemDefinition; import appeng.items.materials.MaterialType; -import appeng.items.materials.MultiItem; +import appeng.items.materials.ItemMultiItem; /** @@ -105,7 +105,7 @@ public final class ApiMaterials implements IMaterials public ApiMaterials( final DefinitionConstructor constructor ) { - final MultiItem materials = new MultiItem(); + final ItemMultiItem materials = new ItemMultiItem(); constructor.registerItemDefinition( materials ); this.cell2SpatialPart = new DamagedItemDefinition( "material.cell.spatial.2", materials.createMaterial( MaterialType.Cell2SpatialPart ) ); diff --git a/src/main/java/appeng/core/features/AEBlockFeatureHandler.java b/src/main/java/appeng/core/features/AEBlockFeatureHandler.java index fb4ce83f2..7fd425b87 100644 --- a/src/main/java/appeng/core/features/AEBlockFeatureHandler.java +++ b/src/main/java/appeng/core/features/AEBlockFeatureHandler.java @@ -29,6 +29,7 @@ import net.minecraft.client.renderer.block.model.IBakedModel; import net.minecraft.client.renderer.block.model.ModelBakery; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.client.resources.IReloadableResourceManager; +import net.minecraft.item.Item; import net.minecraft.util.ResourceLocation; import net.minecraft.util.registry.IRegistry; import net.minecraftforge.client.model.ModelLoader; @@ -79,7 +80,11 @@ public final class AEBlockFeatureHandler implements IFeatureHandler { if( this.enabled ) { - final String name = this.extractor.get(); + String name = this.extractor.get(); + if( Item.REGISTRY.containsKey( new ResourceLocation( AppEng.MOD_ID, name ) ) ) + { + name += "_block"; + } this.featured.setCreativeTab( CreativeTab.instance ); this.featured.setUnlocalizedName( "appliedenergistics2." + name ); diff --git a/src/main/java/appeng/core/features/AECableBusFeatureHandler.java b/src/main/java/appeng/core/features/AECableBusFeatureHandler.java index 5201c055c..d7e0bde1c 100644 --- a/src/main/java/appeng/core/features/AECableBusFeatureHandler.java +++ b/src/main/java/appeng/core/features/AECableBusFeatureHandler.java @@ -83,14 +83,14 @@ public final class AECableBusFeatureHandler implements IFeatureHandler { final String name = this.extractor.get(); this.featured.setCreativeTab( CreativeTab.instance ); - this.featured.setUnlocalizedName( /* "tile." */"appliedenergistics2." + name ); + this.featured.setUnlocalizedName( "appliedenergistics2." + name ); if( Platform.isClient() ) { CommonHelper.proxy.bindTileEntitySpecialRenderer( this.featured.getTileEntityClass(), this.featured ); } - registryName = new ResourceLocation( AppEng.MOD_ID, "tile." + name ); + registryName = new ResourceLocation( AppEng.MOD_ID, name ); // Bypass the forge magic with null to register our own itemblock later. GameRegistry.register( this.featured.setRegistryName( registryName ) ); diff --git a/src/main/java/appeng/core/features/AETileBlockFeatureHandler.java b/src/main/java/appeng/core/features/AETileBlockFeatureHandler.java index 64d8bc18f..839e5f9a8 100644 --- a/src/main/java/appeng/core/features/AETileBlockFeatureHandler.java +++ b/src/main/java/appeng/core/features/AETileBlockFeatureHandler.java @@ -31,6 +31,7 @@ import net.minecraft.client.renderer.block.model.ModelBakery; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.client.resources.IReloadableResourceManager; +import net.minecraft.item.Item; import net.minecraft.util.ResourceLocation; import net.minecraft.util.registry.IRegistry; import net.minecraftforge.client.ForgeHooksClient; @@ -87,22 +88,26 @@ public final class AETileBlockFeatureHandler implements IFeatureHandler { if( this.enabled ) { - final String name = this.extractor.get(); + String name = this.extractor.get(); + if( Item.REGISTRY.containsKey( new ResourceLocation( AppEng.MOD_ID, name ) ) ) + { + name += "_block"; + } this.featured.setCreativeTab( CreativeTab.instance ); - this.featured.setUnlocalizedName( /* "tile." */"appliedenergistics2." + name ); + this.featured.setUnlocalizedName( "appliedenergistics2." + name ); if( Platform.isClient() ) { CommonHelper.proxy.bindTileEntitySpecialRenderer( this.featured.getTileEntityClass(), this.featured ); } - registryName = new ResourceLocation( AppEng.MOD_ID, "tile." + name ); + registryName = new ResourceLocation( AppEng.MOD_ID, name ); GameRegistry.register( this.featured.setRegistryName( registryName ) ); GameRegistry.register( this.definition.maybeItem().get().setRegistryName( registryName ) ); AEBaseTile.registerTileItem( this.featured.getTileEntityClass(), new BlockStackSrc( this.featured, 0, ActivityState.from( this.isFeatureAvailable() ) ) ); - GameRegistry.registerTileEntity( this.featured.getTileEntityClass(), this.featured.toString() ); + GameRegistry.registerTileEntityWithAlternatives( this.featured.getTileEntityClass(), this.featured.toString() ); if( side == Side.CLIENT ) { diff --git a/src/main/java/appeng/core/features/FeatureNameExtractor.java b/src/main/java/appeng/core/features/FeatureNameExtractor.java index bad846e3e..00004ce88 100644 --- a/src/main/java/appeng/core/features/FeatureNameExtractor.java +++ b/src/main/java/appeng/core/features/FeatureNameExtractor.java @@ -19,6 +19,7 @@ package appeng.core.features; +import java.util.regex.Matcher; import java.util.regex.Pattern; import com.google.common.base.Optional; @@ -30,6 +31,9 @@ public class FeatureNameExtractor private static final Pattern PATTERN_ITEM_MULTI_MATERIAL = Pattern.compile( "ItemMultiMaterial", Pattern.LITERAL ); private static final Pattern PATTERN_QUARTZ = Pattern.compile( "Quartz", Pattern.LITERAL ); + private static final Pattern PATTERN_LOWERCASE = Pattern.compile( "([\\p{Upper}])([\\p{Upper}]+)" ); + private static final Pattern PATTERN_LOWERCASER = Pattern.compile( "(.)?([\\p{Upper}])" ); + private final Class clazz; private final Optional subName; @@ -40,6 +44,60 @@ public class FeatureNameExtractor } public String get() + { + String ret; + String name = this.clazz.getSimpleName().replaceFirst( "\\p{Upper}[\\p{Lower}]*(\\p{Upper})", "$1" ); + + if( this.subName.isPresent() ) + { + final String subName = this.subName.get(); + // simple hack to allow me to do get nice names for these without + // mode code outside of AEBaseItem + if( subName.startsWith( "P2PTunnel" ) ) + { + ret = "p2ptunnel"; + } + else if( subName.equals( "CertusQuartzTools" ) ) + { + ret = PATTERN_QUARTZ.matcher( name ).replaceAll( "CertusQuartz" ); + } + else if( subName.equals( "NetherQuartzTools" ) ) + { + ret = PATTERN_QUARTZ.matcher( name ).replaceAll( "NetherQuartz" ); + } + else + { + ret = name + '_' + subName; + } + } + else + { + ret = name; + } + + System.out.println( ret ); + StringBuffer buffer = new StringBuffer(); + Matcher m = PATTERN_LOWERCASE.matcher( ret ); + while( m.find() ) + { + m.appendReplacement( buffer, m.group( 1 ) + m.group( 2 ).toLowerCase() ); + } + m.appendTail( buffer ); + m = PATTERN_LOWERCASER.matcher( buffer.toString() ); + buffer = new StringBuffer(); + while( m.find() ) + { + m.appendReplacement( buffer, ( m.group( 1 ) != null ? m.group( 1 ) + '_' : "" ) + m.group( 2 ).toLowerCase() ); + } + m.appendTail( buffer ); + ret = buffer.toString().replace( '.', '_' ).replaceAll( "_+", "_" ); + System.out.println( ret ); + return ret; + } + + // To Convert devs' test worlds + @Deprecated + public String getOld() { String name = this.clazz.getSimpleName(); diff --git a/src/main/java/appeng/core/features/ItemFeatureHandler.java b/src/main/java/appeng/core/features/ItemFeatureHandler.java index e17f0fae6..e460993cf 100644 --- a/src/main/java/appeng/core/features/ItemFeatureHandler.java +++ b/src/main/java/appeng/core/features/ItemFeatureHandler.java @@ -77,7 +77,10 @@ public final class ItemFeatureHandler implements IFeatureHandler if( this.enabled ) { String name = this.extractor.get(); - final String itemPhysicalName = name; + if( Item.REGISTRY.containsKey( new ResourceLocation( AppEng.MOD_ID, name ) ) ) + { + name += "_item"; + } // this.item.setTextureName( "appliedenergistics2:" + name ); this.item.setUnlocalizedName( "appliedenergistics2." + name ); @@ -91,15 +94,6 @@ public final class ItemFeatureHandler implements IFeatureHandler this.item.setCreativeTab( CreativeTab.instance ); } - if( name.equals( "ItemMaterial" ) ) - { - name = "ItemMultiMaterial"; - } - else if( name.equals( "ItemPart" ) ) - { - name = "ItemMultiPart"; - } - registryName = new ResourceLocation( AppEng.MOD_ID, name ); GameRegistry.register( this.item.setRegistryName( registryName ) ); diff --git a/src/main/java/appeng/decorative/solid/ChargedQuartzOreBlock.java b/src/main/java/appeng/decorative/solid/BlockChargedQuartzOre.java similarity index 96% rename from src/main/java/appeng/decorative/solid/ChargedQuartzOreBlock.java rename to src/main/java/appeng/decorative/solid/BlockChargedQuartzOre.java index 041f3a0a0..852fbb868 100644 --- a/src/main/java/appeng/decorative/solid/ChargedQuartzOreBlock.java +++ b/src/main/java/appeng/decorative/solid/BlockChargedQuartzOre.java @@ -35,10 +35,10 @@ import appeng.core.AEConfig; import appeng.core.CommonHelper; -public final class ChargedQuartzOreBlock extends QuartzOreBlock +public final class BlockChargedQuartzOre extends BlockQuartzOre { - public ChargedQuartzOreBlock() + public BlockChargedQuartzOre() { this.setBoostBrightnessLow( 2 ); this.setBoostBrightnessHigh( 5 ); diff --git a/src/main/java/appeng/decorative/solid/ChiseledQuartzBlock.java b/src/main/java/appeng/decorative/solid/BlockChiseledQuartz.java similarity index 92% rename from src/main/java/appeng/decorative/solid/ChiseledQuartzBlock.java rename to src/main/java/appeng/decorative/solid/BlockChiseledQuartz.java index c2d8e1f1f..87dd5d08a 100644 --- a/src/main/java/appeng/decorative/solid/ChiseledQuartzBlock.java +++ b/src/main/java/appeng/decorative/solid/BlockChiseledQuartz.java @@ -27,9 +27,9 @@ import appeng.block.AEDecorativeBlock; import appeng.core.features.AEFeature; -public final class ChiseledQuartzBlock extends AEDecorativeBlock +public final class BlockChiseledQuartz extends AEDecorativeBlock { - public ChiseledQuartzBlock() + public BlockChiseledQuartz() { super( Material.ROCK ); diff --git a/src/main/java/appeng/decorative/solid/FluixBlock.java b/src/main/java/appeng/decorative/solid/BlockFluix.java similarity index 93% rename from src/main/java/appeng/decorative/solid/FluixBlock.java rename to src/main/java/appeng/decorative/solid/BlockFluix.java index 090ca06ac..ada311fa7 100644 --- a/src/main/java/appeng/decorative/solid/FluixBlock.java +++ b/src/main/java/appeng/decorative/solid/BlockFluix.java @@ -27,9 +27,9 @@ import appeng.block.AEDecorativeBlock; import appeng.core.features.AEFeature; -public final class FluixBlock extends AEDecorativeBlock +public final class BlockFluix extends AEDecorativeBlock { - public FluixBlock() + public BlockFluix() { super( Material.ROCK ); diff --git a/src/main/java/appeng/decorative/solid/QuartzBlock.java b/src/main/java/appeng/decorative/solid/BlockQuartz.java similarity index 93% rename from src/main/java/appeng/decorative/solid/QuartzBlock.java rename to src/main/java/appeng/decorative/solid/BlockQuartz.java index 80e44f306..51c3ff556 100644 --- a/src/main/java/appeng/decorative/solid/QuartzBlock.java +++ b/src/main/java/appeng/decorative/solid/BlockQuartz.java @@ -27,9 +27,9 @@ import appeng.block.AEDecorativeBlock; import appeng.core.features.AEFeature; -public final class QuartzBlock extends AEDecorativeBlock +public final class BlockQuartz extends AEDecorativeBlock { - public QuartzBlock() + public BlockQuartz() { super( Material.ROCK ); diff --git a/src/main/java/appeng/decorative/solid/QuartzGlassBlock.java b/src/main/java/appeng/decorative/solid/BlockQuartzGlass.java similarity index 96% rename from src/main/java/appeng/decorative/solid/QuartzGlassBlock.java rename to src/main/java/appeng/decorative/solid/BlockQuartzGlass.java index 749338bc6..828f6cf01 100644 --- a/src/main/java/appeng/decorative/solid/QuartzGlassBlock.java +++ b/src/main/java/appeng/decorative/solid/BlockQuartzGlass.java @@ -33,9 +33,9 @@ import appeng.core.features.AEFeature; import appeng.helpers.AEGlassMaterial; -public class QuartzGlassBlock extends AEBaseBlock +public class BlockQuartzGlass extends AEBaseBlock { - public QuartzGlassBlock() + public BlockQuartzGlass() { super( Material.GLASS ); this.setLightOpacity( 0 ); diff --git a/src/main/java/appeng/decorative/solid/QuartzLampBlock.java b/src/main/java/appeng/decorative/solid/BlockQuartzLamp.java similarity index 96% rename from src/main/java/appeng/decorative/solid/QuartzLampBlock.java rename to src/main/java/appeng/decorative/solid/BlockQuartzLamp.java index f4ce0d0fa..96f6afc7a 100644 --- a/src/main/java/appeng/decorative/solid/QuartzLampBlock.java +++ b/src/main/java/appeng/decorative/solid/BlockQuartzLamp.java @@ -33,10 +33,10 @@ import appeng.core.CommonHelper; import appeng.core.features.AEFeature; -public class QuartzLampBlock extends QuartzGlassBlock +public class BlockQuartzLamp extends BlockQuartzGlass { - public QuartzLampBlock() + public BlockQuartzLamp() { this.setLightLevel( 1.0f ); this.setFeature( EnumSet.of( AEFeature.DecorativeQuartzBlocks, AEFeature.DecorativeLights ) ); diff --git a/src/main/java/appeng/decorative/solid/QuartzOreBlock.java b/src/main/java/appeng/decorative/solid/BlockQuartzOre.java similarity index 98% rename from src/main/java/appeng/decorative/solid/QuartzOreBlock.java rename to src/main/java/appeng/decorative/solid/BlockQuartzOre.java index 1f486d78c..43ea169d4 100644 --- a/src/main/java/appeng/decorative/solid/QuartzOreBlock.java +++ b/src/main/java/appeng/decorative/solid/BlockQuartzOre.java @@ -39,13 +39,13 @@ import appeng.block.AEBaseBlock; import appeng.core.features.AEFeature; -public class QuartzOreBlock extends AEBaseBlock +public class BlockQuartzOre extends AEBaseBlock { private int boostBrightnessLow; private int boostBrightnessHigh; private boolean enhanceBrightness; - public QuartzOreBlock() + public BlockQuartzOre() { super( Material.ROCK ); this.setHardness( 3.0F ); diff --git a/src/main/java/appeng/decorative/solid/QuartzPillarBlock.java b/src/main/java/appeng/decorative/solid/BlockQuartzPillar.java similarity index 96% rename from src/main/java/appeng/decorative/solid/QuartzPillarBlock.java rename to src/main/java/appeng/decorative/solid/BlockQuartzPillar.java index fe1f491f6..14151269e 100644 --- a/src/main/java/appeng/decorative/solid/QuartzPillarBlock.java +++ b/src/main/java/appeng/decorative/solid/BlockQuartzPillar.java @@ -36,11 +36,11 @@ import appeng.core.features.AEFeature; import appeng.helpers.MetaRotation; -public class QuartzPillarBlock extends AEBaseBlock implements IOrientableBlock +public class BlockQuartzPillar extends AEBaseBlock implements IOrientableBlock { public static final PropertyEnum AXIS_ORIENTATION = PropertyEnum.create( "axis", EnumFacing.Axis.class ); - public QuartzPillarBlock() + public BlockQuartzPillar() { super( Material.ROCK ); this.setFeature( EnumSet.of( AEFeature.DecorativeQuartzBlocks ) ); diff --git a/src/main/java/appeng/decorative/solid/SkyStoneBlock.java b/src/main/java/appeng/decorative/solid/BlockSkyStone.java similarity index 97% rename from src/main/java/appeng/decorative/solid/SkyStoneBlock.java rename to src/main/java/appeng/decorative/solid/BlockSkyStone.java index f097b30c4..1662a7e7e 100644 --- a/src/main/java/appeng/decorative/solid/SkyStoneBlock.java +++ b/src/main/java/appeng/decorative/solid/BlockSkyStone.java @@ -39,14 +39,14 @@ import appeng.core.worlddata.WorldData; import appeng.util.Platform; -public class SkyStoneBlock extends AEBaseBlock +public class BlockSkyStone extends AEBaseBlock { private static final float BLOCK_RESISTANCE = 150.0f; private static final float BREAK_SPEAK_SCALAR = 0.1f; private static final double BREAK_SPEAK_THRESHOLD = 7.0; private final SkystoneType type; - public SkyStoneBlock( final SkystoneType type ) + public BlockSkyStone( final SkystoneType type ) { super( Material.ROCK, Optional.of( type.name() ) ); this.setHardness( 50 ); diff --git a/src/main/java/appeng/decorative/solid/FluixIdentifier.java b/src/main/java/appeng/decorative/solid/FluixIdentifier.java deleted file mode 100644 index d32d728cb..000000000 --- a/src/main/java/appeng/decorative/solid/FluixIdentifier.java +++ /dev/null @@ -1,21 +0,0 @@ - -package appeng.decorative.solid; - - -import javax.annotation.Nonnull; - - -/** - * @author thatsIch - * @version rv3 - 29.06.2015 - * @since rv3 29.06.2015 - */ -public class FluixIdentifier implements Identifier -{ - @Nonnull - @Override - public String identifier() - { - return "fluix"; - } -} diff --git a/src/main/java/appeng/decorative/solid/Identifier.java b/src/main/java/appeng/decorative/solid/Identifier.java deleted file mode 100644 index c833b6f8e..000000000 --- a/src/main/java/appeng/decorative/solid/Identifier.java +++ /dev/null @@ -1,19 +0,0 @@ - -package appeng.decorative.solid; - - -import javax.annotation.Nonnull; - - -/** - * - * - * @author thatsIch - * @version rv3 - 29.06.2015 - * @since rv3 29.06.2015 - */ -public interface Identifier -{ - @Nonnull - String identifier(); -} diff --git a/src/main/java/appeng/decorative/stair/FluixStairBlock.java b/src/main/java/appeng/decorative/stair/BlockFluixStair.java similarity index 61% rename from src/main/java/appeng/decorative/stair/FluixStairBlock.java rename to src/main/java/appeng/decorative/stair/BlockFluixStair.java index 800a6321a..fe57ed309 100644 --- a/src/main/java/appeng/decorative/stair/FluixStairBlock.java +++ b/src/main/java/appeng/decorative/stair/BlockFluixStair.java @@ -10,9 +10,9 @@ import net.minecraft.block.Block; * @version rv3 - 30.06.2015 * @since rv3 30.06.2015 */ -public class FluixStairBlock extends BlockStairCommon +public class BlockFluixStair extends BlockStairCommon { - public FluixStairBlock( final Block block, final String type ) + public BlockFluixStair( final Block block, final String type ) { super( block, type ); } diff --git a/src/main/java/appeng/decorative/stair/DecorativeStairIdentifier.java b/src/main/java/appeng/decorative/stair/DecorativeStairIdentifier.java deleted file mode 100644 index ff1deba2c..000000000 --- a/src/main/java/appeng/decorative/stair/DecorativeStairIdentifier.java +++ /dev/null @@ -1,59 +0,0 @@ - -package appeng.decorative.stair; - - -import javax.annotation.Nonnull; - -import com.google.common.base.Preconditions; - -import net.minecraft.block.Block; - -import appeng.decorative.solid.Identifier; - - -/** - * An refactor safe implementation for stair identifiers. - * The internal Strings are not supposed to be changed, - * they are used to persist the blocks into the save file. - * - * If you change these, you will break worlds if not countered - * - * @author thatsIch - * @version rv3 - 29.06.2015 - * @since rv3 29.06.2015 - */ -public enum DecorativeStairIdentifier implements Identifier -{ - FLUIX( "stair.fluix" ), - CHISELED_CERTUS_QUARTZ( "stair.quartz.certus.chiseled" ), - CERTUS_QUARTZ( "stair.quartz.certus" ), - CERTUS_QUARTZ_PILLAR( "stair.quartz.certus.pillar" ), - SKYSTONE( "stair.skystone" ), - SKYSTONE_BLOCK( "stair.skystone.block" ), - SKYSTONE_BRICK( "stair.skystone.brick" ), - SKYSTONE_SMALL_BRICK( "stair.skystone.brick.small" ); - - private final String name; - - /** - * Used to register the specific blocks - * - * @param name id of the block or a unique name - * - * @see net.minecraftforge.fml.common.registry.GameRegistry#registerBlock(Block, String) - */ - DecorativeStairIdentifier( @Nonnull final String name ) - { - Preconditions.checkNotNull( name ); - Preconditions.checkArgument( !name.isEmpty() ); - - this.name = name; - } - - @Nonnull - @Override - public String identifier() - { - return this.name; - } -} diff --git a/src/main/java/appeng/decorative/stair/FluixStairComponent.java b/src/main/java/appeng/decorative/stair/FluixStairComponent.java deleted file mode 100644 index 4fa45f738..000000000 --- a/src/main/java/appeng/decorative/stair/FluixStairComponent.java +++ /dev/null @@ -1,12 +0,0 @@ - -package appeng.decorative.stair; - - -/** - * @author thatsIch - * @version rv3 - 30.06.2015 - * @since rv3 30.06.2015 - */ -public class FluixStairComponent -{ -} diff --git a/src/main/java/appeng/decorative/stair/FluixStairIdentifier.java b/src/main/java/appeng/decorative/stair/FluixStairIdentifier.java deleted file mode 100644 index 9d762359a..000000000 --- a/src/main/java/appeng/decorative/stair/FluixStairIdentifier.java +++ /dev/null @@ -1,23 +0,0 @@ - -package appeng.decorative.stair; - - -import javax.annotation.Nonnull; - -import appeng.decorative.solid.Identifier; - - -/** - * @author thatsIch - * @version rv3 - 29.06.2015 - * @since rv3 29.06.2015 - */ -public final class FluixStairIdentifier implements Identifier -{ - @Nonnull - @Override - public String identifier() - { - return "stair.fluix"; - } -} diff --git a/src/main/java/appeng/decorative/stair/FluixStairSupplier.java b/src/main/java/appeng/decorative/stair/FluixStairSupplier.java index d2f00e73f..163118f3c 100644 --- a/src/main/java/appeng/decorative/stair/FluixStairSupplier.java +++ b/src/main/java/appeng/decorative/stair/FluixStairSupplier.java @@ -27,8 +27,8 @@ public class FluixStairSupplier implements Supplier } @Override - public FluixStairBlock get() + public BlockFluixStair get() { - return new FluixStairBlock( this.fluixBlockSupplier.get(), "fluix" ); + return new BlockFluixStair( this.fluixBlockSupplier.get(), "fluix" ); } } diff --git a/src/main/java/appeng/helpers/MetaRotation.java b/src/main/java/appeng/helpers/MetaRotation.java index 17a700d8b..192b2e873 100644 --- a/src/main/java/appeng/helpers/MetaRotation.java +++ b/src/main/java/appeng/helpers/MetaRotation.java @@ -29,7 +29,7 @@ import net.minecraft.world.World; import appeng.api.util.IOrientable; import appeng.block.AEBaseBlock; -import appeng.decorative.solid.QuartzPillarBlock; +import appeng.decorative.solid.BlockQuartzPillar; public class MetaRotation implements IOrientable @@ -73,7 +73,7 @@ public class MetaRotation implements IOrientable } //TODO 1.10.2-R - Temp - Axis a = state.getValue( QuartzPillarBlock.AXIS_ORIENTATION ); + Axis a = state.getValue( BlockQuartzPillar.AXIS_ORIENTATION ); if( a == null ) { @@ -104,7 +104,7 @@ public class MetaRotation implements IOrientable else { //TODO 1.10.2-R - Temp - ( (World) this.w ).setBlockState( this.pos, this.w.getBlockState( this.pos ).withProperty( QuartzPillarBlock.AXIS_ORIENTATION, up.getAxis() ) ); + ( (World) this.w ).setBlockState( this.pos, this.w.getBlockState( this.pos ).withProperty( BlockQuartzPillar.AXIS_ORIENTATION, up.getAxis() ) ); } } else diff --git a/src/main/java/appeng/items/materials/MultiItem.java b/src/main/java/appeng/items/materials/ItemMultiItem.java similarity index 98% rename from src/main/java/appeng/items/materials/MultiItem.java rename to src/main/java/appeng/items/materials/ItemMultiItem.java index a4729ba7d..bf48b4f39 100644 --- a/src/main/java/appeng/items/materials/MultiItem.java +++ b/src/main/java/appeng/items/materials/ItemMultiItem.java @@ -71,15 +71,15 @@ import appeng.util.InventoryAdaptor; import appeng.util.Platform; -public final class MultiItem extends AEBaseItem implements IStorageComponent, IUpgradeModule +public final class ItemMultiItem extends AEBaseItem implements IStorageComponent, IUpgradeModule { - public static MultiItem instance; + public static ItemMultiItem instance; private static final int KILO_SCALAR = 1024; private final Map dmgToMaterial = new HashMap(); - public MultiItem() + public ItemMultiItem() { this.setFeature( EnumSet.of( AEFeature.Core ) ); this.setHasSubtypes( true ); diff --git a/src/main/java/appeng/items/parts/ItemFacade.java b/src/main/java/appeng/items/parts/ItemFacade.java index 6591ec9d0..b102ffac5 100644 --- a/src/main/java/appeng/items/parts/ItemFacade.java +++ b/src/main/java/appeng/items/parts/ItemFacade.java @@ -48,7 +48,7 @@ import appeng.api.parts.IAlphaPassItem; import appeng.api.util.AEPartLocation; import appeng.core.FacadeConfig; import appeng.core.features.AEFeature; -import appeng.decorative.solid.QuartzOreBlock; +import appeng.decorative.solid.BlockQuartzOre; import appeng.facade.FacadePart; import appeng.facade.IFacadeItem; import appeng.items.AEBaseItem; @@ -150,7 +150,7 @@ public class ItemFacade extends AEBaseItem implements IFacadeItem, IAlphaPassIte final boolean hasTile = b.hasTileEntity( b.getStateFromMeta( metadata ) ); final boolean enableGlass = b instanceof BlockGlass || b instanceof BlockStainedGlass; - final boolean disableOre = b instanceof QuartzOreBlock; + final boolean disableOre = b instanceof BlockQuartzOre; final boolean defaultValue = ( b.isOpaqueCube(b.getDefaultState()) && !b.getTickRandomly() && !hasTile && !disableOre ) || enableGlass; if( FacadeConfig.instance.checkEnabled( b, metadata, defaultValue ) ) diff --git a/src/main/java/appeng/recipes/AEItemResolver.java b/src/main/java/appeng/recipes/AEItemResolver.java index 429d4f141..48cefcefb 100644 --- a/src/main/java/appeng/recipes/AEItemResolver.java +++ b/src/main/java/appeng/recipes/AEItemResolver.java @@ -32,7 +32,7 @@ import appeng.api.util.AEColor; import appeng.api.util.AEColoredItemDefinition; import appeng.core.AppEng; import appeng.items.materials.MaterialType; -import appeng.items.materials.MultiItem; +import appeng.items.materials.ItemMultiItem; import appeng.items.misc.ItemCrystalSeed; import appeng.items.parts.ItemMultiPart; import appeng.items.parts.PartType; @@ -124,7 +124,7 @@ public class AEItemResolver implements ISubItemResolver final String materialName = itemName.substring( itemName.indexOf( '.' ) + 1 ); final MaterialType mt = MaterialType.valueOf( materialName ); // itemName = itemName.substring( 0, itemName.indexOf( "." ) ); - if( mt.getItemInstance() == MultiItem.instance && mt.getDamageValue() >= 0 && mt.isRegistered() ) + if( mt.getItemInstance() == ItemMultiItem.instance && mt.getDamageValue() >= 0 && mt.isRegistered() ) { return new ResolverResult( "ItemMultiMaterial", mt.getDamageValue() ); } diff --git a/src/main/java/appeng/recipes/RecipeHandler.java b/src/main/java/appeng/recipes/RecipeHandler.java index b66071cc7..71ef1e497 100644 --- a/src/main/java/appeng/recipes/RecipeHandler.java +++ b/src/main/java/appeng/recipes/RecipeHandler.java @@ -59,7 +59,7 @@ import appeng.core.AEConfig; import appeng.core.AELog; import appeng.core.AppEng; import appeng.core.features.AEFeature; -import appeng.items.materials.MultiItem; +import appeng.items.materials.ItemMultiItem; import appeng.items.misc.ItemCrystalSeed; import appeng.items.parts.ItemMultiPart; import appeng.recipes.handlers.IWebsiteSerializer; @@ -204,10 +204,10 @@ public class RecipeHandler implements IRecipeHandler default: } } - else if( is.getItem() instanceof MultiItem ) + else if( is.getItem() instanceof ItemMultiItem ) { realName = realName.replace( "ItemMultiMaterial", "ItemMaterial" ); - realName += '.' + ( (MultiItem) is.getItem() ).getTypeByStack( is ).name(); + realName += '.' + ( (ItemMultiItem) is.getItem() ).getTypeByStack( is ).name(); } else if( is.getItem() instanceof ItemMultiPart ) { diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/BlockTinyTNT.json b/src/main/resources/assets/appliedenergistics2/blockstates/BlockTinyTNT.json deleted file mode 100644 index d64e1e233..000000000 --- a/src/main/resources/assets/appliedenergistics2/blockstates/BlockTinyTNT.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "appliedenergistics2:BlockTinyTNT" } - } -} diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/ChargedQuartzOreBlock.json b/src/main/resources/assets/appliedenergistics2/blockstates/ChargedQuartzOreBlock.json deleted file mode 100644 index bae0e95d4..000000000 --- a/src/main/resources/assets/appliedenergistics2/blockstates/ChargedQuartzOreBlock.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "appliedenergistics2:ChargedQuartzOreBlock" } - } -} diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/ChiseledQuartzBlock.json b/src/main/resources/assets/appliedenergistics2/blockstates/ChiseledQuartzBlock.json deleted file mode 100644 index 554ae455e..000000000 --- a/src/main/resources/assets/appliedenergistics2/blockstates/ChiseledQuartzBlock.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "appliedenergistics2:ChiseledQuartzBlock" } - } -} diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/FluixBlock.json b/src/main/resources/assets/appliedenergistics2/blockstates/FluixBlock.json deleted file mode 100644 index d2373fbe8..000000000 --- a/src/main/resources/assets/appliedenergistics2/blockstates/FluixBlock.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "appliedenergistics2:FluixBlock" } - } -} diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/QuartzBlock.json b/src/main/resources/assets/appliedenergistics2/blockstates/QuartzBlock.json deleted file mode 100644 index d5eea4f99..000000000 --- a/src/main/resources/assets/appliedenergistics2/blockstates/QuartzBlock.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "appliedenergistics2:QuartzBlock" } - } -} diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/QuartzGlassBlock.json b/src/main/resources/assets/appliedenergistics2/blockstates/QuartzGlassBlock.json deleted file mode 100644 index d5eea4f99..000000000 --- a/src/main/resources/assets/appliedenergistics2/blockstates/QuartzGlassBlock.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "appliedenergistics2:QuartzBlock" } - } -} diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/QuartzOreBlock.json b/src/main/resources/assets/appliedenergistics2/blockstates/QuartzOreBlock.json deleted file mode 100644 index 1980240d3..000000000 --- a/src/main/resources/assets/appliedenergistics2/blockstates/QuartzOreBlock.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "appliedenergistics2:QuartzOreBlock" } - } -} diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/QuartzPillarBlock.json b/src/main/resources/assets/appliedenergistics2/blockstates/QuartzPillarBlock.json deleted file mode 100644 index a2fa04b3a..000000000 --- a/src/main/resources/assets/appliedenergistics2/blockstates/QuartzPillarBlock.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "variants": { - "axis=y": { "model": "appliedenergistics2:QuartzPillarBlock" }, - "axis=z": { "model": "appliedenergistics2:QuartzPillarBlock", "x": 90 }, - "axis=x": { "model": "appliedenergistics2:QuartzPillarBlock", "x": 90, "y": 90 } - } -} - diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/SkyStoneBlock.BLOCK.json b/src/main/resources/assets/appliedenergistics2/blockstates/SkyStoneBlock.BLOCK.json deleted file mode 100644 index 9bedd0883..000000000 --- a/src/main/resources/assets/appliedenergistics2/blockstates/SkyStoneBlock.BLOCK.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "appliedenergistics2:SkyStoneBlock.BLOCK" } - } -} diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/SkyStoneBlock.BRICK.json b/src/main/resources/assets/appliedenergistics2/blockstates/SkyStoneBlock.BRICK.json deleted file mode 100644 index d4f5fa36a..000000000 --- a/src/main/resources/assets/appliedenergistics2/blockstates/SkyStoneBlock.BRICK.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "appliedenergistics2:SkyStoneBlock.BRICK" } - } -} diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/SkyStoneBlock.SMALL_BRICK.json b/src/main/resources/assets/appliedenergistics2/blockstates/SkyStoneBlock.SMALL_BRICK.json deleted file mode 100644 index ffa092db0..000000000 --- a/src/main/resources/assets/appliedenergistics2/blockstates/SkyStoneBlock.SMALL_BRICK.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "appliedenergistics2:SkyStoneBlock.SMALL_BRICK" } - } -} diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/SkyStoneBlock.STONE.json b/src/main/resources/assets/appliedenergistics2/blockstates/SkyStoneBlock.STONE.json deleted file mode 100644 index 59eae38a0..000000000 --- a/src/main/resources/assets/appliedenergistics2/blockstates/SkyStoneBlock.STONE.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "appliedenergistics2:SkyStoneBlock.STONE" } - } -} diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/cell_work_bench.json b/src/main/resources/assets/appliedenergistics2/blockstates/cell_work_bench.json new file mode 100644 index 000000000..f9828a893 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/blockstates/cell_work_bench.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "appliedenergistics2:cell_work_bench" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/charged_quartz_ore.json b/src/main/resources/assets/appliedenergistics2/blockstates/charged_quartz_ore.json new file mode 100644 index 000000000..958696046 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/blockstates/charged_quartz_ore.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "appliedenergistics2:charged_quartz_ore" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/charger.json b/src/main/resources/assets/appliedenergistics2/blockstates/charger.json new file mode 100644 index 000000000..14370fe52 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/blockstates/charger.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "appliedenergistics2:charger" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/chiseled_quartz.json b/src/main/resources/assets/appliedenergistics2/blockstates/chiseled_quartz.json new file mode 100644 index 000000000..1835b5deb --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/blockstates/chiseled_quartz.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "appliedenergistics2:chiseled_quartz" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/condenser.json b/src/main/resources/assets/appliedenergistics2/blockstates/condenser.json new file mode 100644 index 000000000..5a1cf0987 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/blockstates/condenser.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "appliedenergistics2:condenser" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/controller.json b/src/main/resources/assets/appliedenergistics2/blockstates/controller.json new file mode 100644 index 000000000..105807547 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/blockstates/controller.json @@ -0,0 +1,76 @@ +{ + "multipart": [ + { + "apply": { + "model": "appliedenergistics2:controller/controller_block_offline" + }, + "when": { + "state": "offline", + "type": "block" + } + }, + { + "apply": { + "model": "appliedenergistics2:controller/controller_block_online.uvl" + }, + "when": { + "state": "online", + "type": "block" + } + }, + { + "apply": { + "model": "appliedenergistics2:controller/controller_block_conflicted.uvl" + }, + "when": { + "state": "conflicted", + "type": "block" + } + }, + { + "apply": { + "model": "appliedenergistics2:controller/controller_column_offline" + }, + "when": { + "state": "offline", + "type": "column" + } + }, + { + "apply": { + "model": "appliedenergistics2:controller/controller_column_online.uvl" + }, + "when": { + "state": "online", + "type": "column" + } + }, + { + "apply": { + "model": "appliedenergistics2:controller/controller_column_conflicted.uvl" + }, + "when": { + "state": "conflicted", + "type": "column" + } + }, + { + "apply": { + "model": "appliedenergistics2:controller/controller_inside_a" + }, + "when": { + "state": "offline|online|conflicted", + "type": "inside_a" + } + }, + { + "apply": { + "model": "appliedenergistics2:controller/controller_inside_b" + }, + "when": { + "state": "offline|online|conflicted", + "type": "inside_b" + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/creative_energy_cell.json b/src/main/resources/assets/appliedenergistics2/blockstates/creative_energy_cell.json new file mode 100644 index 000000000..9b9989fa1 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/blockstates/creative_energy_cell.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "appliedenergistics2:EnergyCell/creative_energy_cell" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/dense_energy_cell.json b/src/main/resources/assets/appliedenergistics2/blockstates/dense_energy_cell.json new file mode 100644 index 000000000..17ad59ba2 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/blockstates/dense_energy_cell.json @@ -0,0 +1,28 @@ +{ + "variants": { + "fullness=0": { + "model": "appliedenergistics2:EnergyCell/dense_energy_cell0" + }, + "fullness=1": { + "model": "appliedenergistics2:EnergyCell/dense_energy_cell1" + }, + "fullness=2": { + "model": "appliedenergistics2:EnergyCell/dense_energy_cell2" + }, + "fullness=3": { + "model": "appliedenergistics2:EnergyCell/dense_energy_cell3" + }, + "fullness=4": { + "model": "appliedenergistics2:EnergyCell/dense_energy_cell4" + }, + "fullness=5": { + "model": "appliedenergistics2:EnergyCell/dense_energy_cell5" + }, + "fullness=6": { + "model": "appliedenergistics2:EnergyCell/dense_energy_cell6" + }, + "fullness=7": { + "model": "appliedenergistics2:EnergyCell/dense_energy_cell7" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/drive.json b/src/main/resources/assets/appliedenergistics2/blockstates/drive.json new file mode 100644 index 000000000..63b2bd47e --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/blockstates/drive.json @@ -0,0 +1,20 @@ +{ + "variants": { + "facing=east": { + "model": "appliedenergistics2:drive", + "y": 270 + }, + "facing=north": { + "model": "appliedenergistics2:drive", + "y": 180 + }, + "facing=south": { + "model": "appliedenergistics2:drive", + "y": 0 + }, + "facing=west": { + "model": "appliedenergistics2:drive", + "y": 90 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/energy_acceptor.json b/src/main/resources/assets/appliedenergistics2/blockstates/energy_acceptor.json new file mode 100644 index 000000000..d2fad940e --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/blockstates/energy_acceptor.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "appliedenergistics2:energy_acceptor" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/energy_cell.json b/src/main/resources/assets/appliedenergistics2/blockstates/energy_cell.json new file mode 100644 index 000000000..2a629ba48 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/blockstates/energy_cell.json @@ -0,0 +1,28 @@ +{ + "variants": { + "fullness=0": { + "model": "appliedenergistics2:EnergyCell/energy_cell0" + }, + "fullness=1": { + "model": "appliedenergistics2:EnergyCell/energy_cell1" + }, + "fullness=2": { + "model": "appliedenergistics2:EnergyCell/energy_cell2" + }, + "fullness=3": { + "model": "appliedenergistics2:EnergyCell/energy_cell3" + }, + "fullness=4": { + "model": "appliedenergistics2:EnergyCell/energy_cell4" + }, + "fullness=5": { + "model": "appliedenergistics2:EnergyCell/energy_cell5" + }, + "fullness=6": { + "model": "appliedenergistics2:EnergyCell/energy_cell6" + }, + "fullness=7": { + "model": "appliedenergistics2:EnergyCell/energy_cell7" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/fluix.json b/src/main/resources/assets/appliedenergistics2/blockstates/fluix.json new file mode 100644 index 000000000..99d57e74f --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/blockstates/fluix.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "appliedenergistics2:fluix" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/grinder.json b/src/main/resources/assets/appliedenergistics2/blockstates/grinder.json new file mode 100644 index 000000000..cac3f39a0 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/blockstates/grinder.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "appliedenergistics2:grinder" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/inscriber.json b/src/main/resources/assets/appliedenergistics2/blockstates/inscriber.json new file mode 100644 index 000000000..51f4b8c0b --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/blockstates/inscriber.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "appliedenergistics2:inscriber" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/ioport.json b/src/main/resources/assets/appliedenergistics2/blockstates/ioport.json new file mode 100644 index 000000000..3f4106f2e --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/blockstates/ioport.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "appliedenergistics2:ioport" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/quartz.json b/src/main/resources/assets/appliedenergistics2/blockstates/quartz.json new file mode 100644 index 000000000..57e34fa7e --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/blockstates/quartz.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "appliedenergistics2:quartz" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/quartz_glass.json b/src/main/resources/assets/appliedenergistics2/blockstates/quartz_glass.json new file mode 100644 index 000000000..57e34fa7e --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/blockstates/quartz_glass.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "appliedenergistics2:quartz" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/quartz_growth_accelerator.json b/src/main/resources/assets/appliedenergistics2/blockstates/quartz_growth_accelerator.json new file mode 100644 index 000000000..90186a080 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/blockstates/quartz_growth_accelerator.json @@ -0,0 +1,10 @@ +{ + "variants": { + "powered=false": { + "model": "appliedenergistics2:quartz_growth_accelerator_off" + }, + "powered=true": { + "model": "appliedenergistics2:quartz_growth_accelerator_on" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/quartz_ore.json b/src/main/resources/assets/appliedenergistics2/blockstates/quartz_ore.json new file mode 100644 index 000000000..95acbdfa8 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/blockstates/quartz_ore.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "appliedenergistics2:quartz_ore" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/quartz_pillar.json b/src/main/resources/assets/appliedenergistics2/blockstates/quartz_pillar.json new file mode 100644 index 000000000..678a3197a --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/blockstates/quartz_pillar.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "appliedenergistics2:quartz_pillar", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "appliedenergistics2:quartz_pillar" + }, + "axis=z": { + "model": "appliedenergistics2:quartz_pillar", + "x": 90 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/security.json b/src/main/resources/assets/appliedenergistics2/blockstates/security.json new file mode 100644 index 000000000..ed0c11d86 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/blockstates/security.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "appliedenergistics2:security" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_block_block.json b/src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_block_block.json new file mode 100644 index 000000000..c2aa46a3a --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_block_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "appliedenergistics2:sky_stone_block_block" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_block_brick.json b/src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_block_brick.json new file mode 100644 index 000000000..a2d23b83d --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_block_brick.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "appliedenergistics2:sky_stone_block_brick" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_block_small_brick.json b/src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_block_small_brick.json new file mode 100644 index 000000000..0fac5d4f1 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_block_small_brick.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "appliedenergistics2:sky_stone_block_small_brick" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_block_stone.json b/src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_block_stone.json new file mode 100644 index 000000000..3d5abc8bd --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_block_stone.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "appliedenergistics2:sky_stone_block_stone" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/spatial_ioport.json b/src/main/resources/assets/appliedenergistics2/blockstates/spatial_ioport.json new file mode 100644 index 000000000..86856bb2e --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/blockstates/spatial_ioport.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "appliedenergistics2:spatial_ioport" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/stair.fluix.json b/src/main/resources/assets/appliedenergistics2/blockstates/stair.fluix.json deleted file mode 100644 index 8bf7364db..000000000 --- a/src/main/resources/assets/appliedenergistics2/blockstates/stair.fluix.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "appliedenergistics2:stairs/fluix" }, - "facing=west,half=bottom,shape=straight": { "model": "appliedenergistics2:stairs/fluix", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "appliedenergistics2:stairs/fluix", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "appliedenergistics2:stairs/fluix", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "appliedenergistics2:stairs/fluix.outer" }, - "facing=west,half=bottom,shape=outer_right": { "model": "appliedenergistics2:stairs/fluix.outer", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "appliedenergistics2:stairs/fluix.outer", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "appliedenergistics2:stairs/fluix.outer", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "appliedenergistics2:stairs/fluix.outer", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "appliedenergistics2:stairs/fluix.outer", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "appliedenergistics2:stairs/fluix.outer" }, - "facing=north,half=bottom,shape=outer_left": { "model": "appliedenergistics2:stairs/fluix.outer", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "appliedenergistics2:stairs/fluix.inner" }, - "facing=west,half=bottom,shape=inner_right": { "model": "appliedenergistics2:stairs/fluix.inner", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "appliedenergistics2:stairs/fluix.inner", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "appliedenergistics2:stairs/fluix.inner", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "appliedenergistics2:stairs/fluix.inner", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "appliedenergistics2:stairs/fluix.inner", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "appliedenergistics2:stairs/fluix.inner" }, - "facing=north,half=bottom,shape=inner_left": { "model": "appliedenergistics2:stairs/fluix.inner", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "appliedenergistics2:stairs/fluix", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "appliedenergistics2:stairs/fluix", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "appliedenergistics2:stairs/fluix", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "appliedenergistics2:stairs/fluix", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "appliedenergistics2:stairs/fluix.outer", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "appliedenergistics2:stairs/fluix.outer", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "appliedenergistics2:stairs/fluix.outer", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "appliedenergistics2:stairs/fluix.outer", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "appliedenergistics2:stairs/fluix.outer", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "appliedenergistics2:stairs/fluix.outer", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "appliedenergistics2:stairs/fluix.outer", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "appliedenergistics2:stairs/fluix.outer", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "appliedenergistics2:stairs/fluix.inner", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "appliedenergistics2:stairs/fluix.inner", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "appliedenergistics2:stairs/fluix.inner", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "appliedenergistics2:stairs/fluix.inner", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "appliedenergistics2:stairs/fluix.inner", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "appliedenergistics2:stairs/fluix.inner", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "appliedenergistics2:stairs/fluix.inner", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "appliedenergistics2:stairs/fluix.inner", "x": 180, "y": 270, "uvlock": true } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/stair.quartz.certus.chiseled.json b/src/main/resources/assets/appliedenergistics2/blockstates/stair.quartz.certus.chiseled.json deleted file mode 100644 index 44ad35d01..000000000 --- a/src/main/resources/assets/appliedenergistics2/blockstates/stair.quartz.certus.chiseled.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "appliedenergistics2:stairs/quartz.certus.chiseled" }, - "facing=west,half=bottom,shape=straight": { "model": "appliedenergistics2:stairs/quartz.certus.chiseled", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "appliedenergistics2:stairs/quartz.certus.chiseled", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "appliedenergistics2:stairs/quartz.certus.chiseled", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "appliedenergistics2:stairs/quartz.certus.chiseled.outer" }, - "facing=west,half=bottom,shape=outer_right": { "model": "appliedenergistics2:stairs/quartz.certus.chiseled.outer", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "appliedenergistics2:stairs/quartz.certus.chiseled.outer", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "appliedenergistics2:stairs/quartz.certus.chiseled.outer", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "appliedenergistics2:stairs/quartz.certus.chiseled.outer", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "appliedenergistics2:stairs/quartz.certus.chiseled.outer", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "appliedenergistics2:stairs/quartz.certus.chiseled.outer" }, - "facing=north,half=bottom,shape=outer_left": { "model": "appliedenergistics2:stairs/quartz.certus.chiseled.outer", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "appliedenergistics2:stairs/quartz.certus.chiseled.inner" }, - "facing=west,half=bottom,shape=inner_right": { "model": "appliedenergistics2:stairs/quartz.certus.chiseled.inner", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "appliedenergistics2:stairs/quartz.certus.chiseled.inner", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "appliedenergistics2:stairs/quartz.certus.chiseled.inner", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "appliedenergistics2:stairs/quartz.certus.chiseled.inner", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "appliedenergistics2:stairs/quartz.certus.chiseled.inner", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "appliedenergistics2:stairs/quartz.certus.chiseled.inner" }, - "facing=north,half=bottom,shape=inner_left": { "model": "appliedenergistics2:stairs/quartz.certus.chiseled.inner", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "appliedenergistics2:stairs/quartz.certus.chiseled", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "appliedenergistics2:stairs/quartz.certus.chiseled", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "appliedenergistics2:stairs/quartz.certus.chiseled", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "appliedenergistics2:stairs/quartz.certus.chiseled", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "appliedenergistics2:stairs/quartz.certus.chiseled.outer", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "appliedenergistics2:stairs/quartz.certus.chiseled.outer", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "appliedenergistics2:stairs/quartz.certus.chiseled.outer", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "appliedenergistics2:stairs/quartz.certus.chiseled.outer", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "appliedenergistics2:stairs/quartz.certus.chiseled.outer", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "appliedenergistics2:stairs/quartz.certus.chiseled.outer", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "appliedenergistics2:stairs/quartz.certus.chiseled.outer", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "appliedenergistics2:stairs/quartz.certus.chiseled.outer", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "appliedenergistics2:stairs/quartz.certus.chiseled.inner", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "appliedenergistics2:stairs/quartz.certus.chiseled.inner", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "appliedenergistics2:stairs/quartz.certus.chiseled.inner", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "appliedenergistics2:stairs/quartz.certus.chiseled.inner", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "appliedenergistics2:stairs/quartz.certus.chiseled.inner", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "appliedenergistics2:stairs/quartz.certus.chiseled.inner", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "appliedenergistics2:stairs/quartz.certus.chiseled.inner", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "appliedenergistics2:stairs/quartz.certus.chiseled.inner", "x": 180, "y": 270, "uvlock": true } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/stair.quartz.certus.json b/src/main/resources/assets/appliedenergistics2/blockstates/stair.quartz.certus.json deleted file mode 100644 index 6b8ed5ede..000000000 --- a/src/main/resources/assets/appliedenergistics2/blockstates/stair.quartz.certus.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "appliedenergistics2:stairs/quartz.certus" }, - "facing=west,half=bottom,shape=straight": { "model": "appliedenergistics2:stairs/quartz.certus", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "appliedenergistics2:stairs/quartz.certus", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "appliedenergistics2:stairs/quartz.certus", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "appliedenergistics2:stairs/quartz.certus.outer" }, - "facing=west,half=bottom,shape=outer_right": { "model": "appliedenergistics2:stairs/quartz.certus.outer", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "appliedenergistics2:stairs/quartz.certus.outer", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "appliedenergistics2:stairs/quartz.certus.outer", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "appliedenergistics2:stairs/quartz.certus.outer", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "appliedenergistics2:stairs/quartz.certus.outer", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "appliedenergistics2:stairs/quartz.certus.outer" }, - "facing=north,half=bottom,shape=outer_left": { "model": "appliedenergistics2:stairs/quartz.certus.outer", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "appliedenergistics2:stairs/quartz.certus.inner" }, - "facing=west,half=bottom,shape=inner_right": { "model": "appliedenergistics2:stairs/quartz.certus.inner", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "appliedenergistics2:stairs/quartz.certus.inner", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "appliedenergistics2:stairs/quartz.certus.inner", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "appliedenergistics2:stairs/quartz.certus.inner", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "appliedenergistics2:stairs/quartz.certus.inner", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "appliedenergistics2:stairs/quartz.certus.inner" }, - "facing=north,half=bottom,shape=inner_left": { "model": "appliedenergistics2:stairs/quartz.certus.inner", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "appliedenergistics2:stairs/quartz.certus", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "appliedenergistics2:stairs/quartz.certus", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "appliedenergistics2:stairs/quartz.certus", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "appliedenergistics2:stairs/quartz.certus", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "appliedenergistics2:stairs/quartz.certus.outer", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "appliedenergistics2:stairs/quartz.certus.outer", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "appliedenergistics2:stairs/quartz.certus.outer", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "appliedenergistics2:stairs/quartz.certus.outer", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "appliedenergistics2:stairs/quartz.certus.outer", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "appliedenergistics2:stairs/quartz.certus.outer", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "appliedenergistics2:stairs/quartz.certus.outer", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "appliedenergistics2:stairs/quartz.certus.outer", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "appliedenergistics2:stairs/quartz.certus.inner", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "appliedenergistics2:stairs/quartz.certus.inner", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "appliedenergistics2:stairs/quartz.certus.inner", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "appliedenergistics2:stairs/quartz.certus.inner", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "appliedenergistics2:stairs/quartz.certus.inner", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "appliedenergistics2:stairs/quartz.certus.inner", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "appliedenergistics2:stairs/quartz.certus.inner", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "appliedenergistics2:stairs/quartz.certus.inner", "x": 180, "y": 270, "uvlock": true } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/stair.quartz.certus.pillar.json b/src/main/resources/assets/appliedenergistics2/blockstates/stair.quartz.certus.pillar.json deleted file mode 100644 index b46ee72e9..000000000 --- a/src/main/resources/assets/appliedenergistics2/blockstates/stair.quartz.certus.pillar.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "appliedenergistics2:stairs/quartz.certus.pillar" }, - "facing=west,half=bottom,shape=straight": { "model": "appliedenergistics2:stairs/quartz.certus.pillar", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "appliedenergistics2:stairs/quartz.certus.pillar", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "appliedenergistics2:stairs/quartz.certus.pillar", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "appliedenergistics2:stairs/quartz.certus.pillar.outer" }, - "facing=west,half=bottom,shape=outer_right": { "model": "appliedenergistics2:stairs/quartz.certus.pillar.outer", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "appliedenergistics2:stairs/quartz.certus.pillar.outer", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "appliedenergistics2:stairs/quartz.certus.pillar.outer", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "appliedenergistics2:stairs/quartz.certus.pillar.outer", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "appliedenergistics2:stairs/quartz.certus.pillar.outer", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "appliedenergistics2:stairs/quartz.certus.pillar.outer" }, - "facing=north,half=bottom,shape=outer_left": { "model": "appliedenergistics2:stairs/quartz.certus.pillar.outer", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "appliedenergistics2:stairs/quartz.certus.pillar.inner" }, - "facing=west,half=bottom,shape=inner_right": { "model": "appliedenergistics2:stairs/quartz.certus.pillar.inner", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "appliedenergistics2:stairs/quartz.certus.pillar.inner", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "appliedenergistics2:stairs/quartz.certus.pillar.inner", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "appliedenergistics2:stairs/quartz.certus.pillar.inner", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "appliedenergistics2:stairs/quartz.certus.pillar.inner", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "appliedenergistics2:stairs/quartz.certus.pillar.inner" }, - "facing=north,half=bottom,shape=inner_left": { "model": "appliedenergistics2:stairs/quartz.certus.pillar.inner", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "appliedenergistics2:stairs/quartz.certus.pillar", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "appliedenergistics2:stairs/quartz.certus.pillar", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "appliedenergistics2:stairs/quartz.certus.pillar", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "appliedenergistics2:stairs/quartz.certus.pillar", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "appliedenergistics2:stairs/quartz.certus.pillar.outer", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "appliedenergistics2:stairs/quartz.certus.pillar.outer", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "appliedenergistics2:stairs/quartz.certus.pillar.outer", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "appliedenergistics2:stairs/quartz.certus.pillar.outer", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "appliedenergistics2:stairs/quartz.certus.pillar.outer", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "appliedenergistics2:stairs/quartz.certus.pillar.outer", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "appliedenergistics2:stairs/quartz.certus.pillar.outer", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "appliedenergistics2:stairs/quartz.certus.pillar.outer", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "appliedenergistics2:stairs/quartz.certus.pillar.inner", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "appliedenergistics2:stairs/quartz.certus.pillar.inner", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "appliedenergistics2:stairs/quartz.certus.pillar.inner", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "appliedenergistics2:stairs/quartz.certus.pillar.inner", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "appliedenergistics2:stairs/quartz.certus.pillar.inner", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "appliedenergistics2:stairs/quartz.certus.pillar.inner", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "appliedenergistics2:stairs/quartz.certus.pillar.inner", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "appliedenergistics2:stairs/quartz.certus.pillar.inner", "x": 180, "y": 270, "uvlock": true } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/stair.skystone.block.json b/src/main/resources/assets/appliedenergistics2/blockstates/stair.skystone.block.json deleted file mode 100644 index 30ace0b93..000000000 --- a/src/main/resources/assets/appliedenergistics2/blockstates/stair.skystone.block.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "appliedenergistics2:stairs/skystone.block" }, - "facing=west,half=bottom,shape=straight": { "model": "appliedenergistics2:stairs/skystone.block", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "appliedenergistics2:stairs/skystone.block", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "appliedenergistics2:stairs/skystone.block", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "appliedenergistics2:stairs/skystone.block.outer" }, - "facing=west,half=bottom,shape=outer_right": { "model": "appliedenergistics2:stairs/skystone.block.outer", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "appliedenergistics2:stairs/skystone.block.outer", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "appliedenergistics2:stairs/skystone.block.outer", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "appliedenergistics2:stairs/skystone.block.outer", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "appliedenergistics2:stairs/skystone.block.outer", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "appliedenergistics2:stairs/skystone.block.outer" }, - "facing=north,half=bottom,shape=outer_left": { "model": "appliedenergistics2:stairs/skystone.block.outer", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "appliedenergistics2:stairs/skystone.block.inner" }, - "facing=west,half=bottom,shape=inner_right": { "model": "appliedenergistics2:stairs/skystone.block.inner", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "appliedenergistics2:stairs/skystone.block.inner", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "appliedenergistics2:stairs/skystone.block.inner", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "appliedenergistics2:stairs/skystone.block.inner", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "appliedenergistics2:stairs/skystone.block.inner", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "appliedenergistics2:stairs/skystone.block.inner" }, - "facing=north,half=bottom,shape=inner_left": { "model": "appliedenergistics2:stairs/skystone.block.inner", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "appliedenergistics2:stairs/skystone.block", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "appliedenergistics2:stairs/skystone.block", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "appliedenergistics2:stairs/skystone.block", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "appliedenergistics2:stairs/skystone.block", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "appliedenergistics2:stairs/skystone.block.outer", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "appliedenergistics2:stairs/skystone.block.outer", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "appliedenergistics2:stairs/skystone.block.outer", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "appliedenergistics2:stairs/skystone.block.outer", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "appliedenergistics2:stairs/skystone.block.outer", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "appliedenergistics2:stairs/skystone.block.outer", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "appliedenergistics2:stairs/skystone.block.outer", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "appliedenergistics2:stairs/skystone.block.outer", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "appliedenergistics2:stairs/skystone.block.inner", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "appliedenergistics2:stairs/skystone.block.inner", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "appliedenergistics2:stairs/skystone.block.inner", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "appliedenergistics2:stairs/skystone.block.inner", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "appliedenergistics2:stairs/skystone.block.inner", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "appliedenergistics2:stairs/skystone.block.inner", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "appliedenergistics2:stairs/skystone.block.inner", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "appliedenergistics2:stairs/skystone.block.inner", "x": 180, "y": 270, "uvlock": true } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/stair.skystone.brick.json b/src/main/resources/assets/appliedenergistics2/blockstates/stair.skystone.brick.json deleted file mode 100644 index 4b04611f2..000000000 --- a/src/main/resources/assets/appliedenergistics2/blockstates/stair.skystone.brick.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "appliedenergistics2:stairs/skystone.brick" }, - "facing=west,half=bottom,shape=straight": { "model": "appliedenergistics2:stairs/skystone.brick", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "appliedenergistics2:stairs/skystone.brick", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "appliedenergistics2:stairs/skystone.brick", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "appliedenergistics2:stairs/skystone.brick.outer" }, - "facing=west,half=bottom,shape=outer_right": { "model": "appliedenergistics2:stairs/skystone.brick.outer", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "appliedenergistics2:stairs/skystone.brick.outer", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "appliedenergistics2:stairs/skystone.brick.outer", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "appliedenergistics2:stairs/skystone.brick.outer", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "appliedenergistics2:stairs/skystone.brick.outer", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "appliedenergistics2:stairs/skystone.brick.outer" }, - "facing=north,half=bottom,shape=outer_left": { "model": "appliedenergistics2:stairs/skystone.brick.outer", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "appliedenergistics2:stairs/skystone.brick.inner" }, - "facing=west,half=bottom,shape=inner_right": { "model": "appliedenergistics2:stairs/skystone.brick.inner", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "appliedenergistics2:stairs/skystone.brick.inner", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "appliedenergistics2:stairs/skystone.brick.inner", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "appliedenergistics2:stairs/skystone.brick.inner", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "appliedenergistics2:stairs/skystone.brick.inner", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "appliedenergistics2:stairs/skystone.brick.inner" }, - "facing=north,half=bottom,shape=inner_left": { "model": "appliedenergistics2:stairs/skystone.brick.inner", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "appliedenergistics2:stairs/skystone.brick", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "appliedenergistics2:stairs/skystone.brick", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "appliedenergistics2:stairs/skystone.brick", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "appliedenergistics2:stairs/skystone.brick", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "appliedenergistics2:stairs/skystone.brick.outer", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "appliedenergistics2:stairs/skystone.brick.outer", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "appliedenergistics2:stairs/skystone.brick.outer", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "appliedenergistics2:stairs/skystone.brick.outer", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "appliedenergistics2:stairs/skystone.brick.outer", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "appliedenergistics2:stairs/skystone.brick.outer", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "appliedenergistics2:stairs/skystone.brick.outer", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "appliedenergistics2:stairs/skystone.brick.outer", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "appliedenergistics2:stairs/skystone.brick.inner", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "appliedenergistics2:stairs/skystone.brick.inner", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "appliedenergistics2:stairs/skystone.brick.inner", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "appliedenergistics2:stairs/skystone.brick.inner", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "appliedenergistics2:stairs/skystone.brick.inner", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "appliedenergistics2:stairs/skystone.brick.inner", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "appliedenergistics2:stairs/skystone.brick.inner", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "appliedenergistics2:stairs/skystone.brick.inner", "x": 180, "y": 270, "uvlock": true } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/stair.skystone.brick.small.json b/src/main/resources/assets/appliedenergistics2/blockstates/stair.skystone.brick.small.json deleted file mode 100644 index 4a7475dd3..000000000 --- a/src/main/resources/assets/appliedenergistics2/blockstates/stair.skystone.brick.small.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "appliedenergistics2:stairs/skystone.brick.small" }, - "facing=west,half=bottom,shape=straight": { "model": "appliedenergistics2:stairs/skystone.brick.small", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "appliedenergistics2:stairs/skystone.brick.small", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "appliedenergistics2:stairs/skystone.brick.small", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "appliedenergistics2:stairs/skystone.brick.small.outer" }, - "facing=west,half=bottom,shape=outer_right": { "model": "appliedenergistics2:stairs/skystone.brick.small.outer", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "appliedenergistics2:stairs/skystone.brick.small.outer", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "appliedenergistics2:stairs/skystone.brick.small.outer", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "appliedenergistics2:stairs/skystone.brick.small.outer", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "appliedenergistics2:stairs/skystone.brick.small.outer", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "appliedenergistics2:stairs/skystone.brick.small.outer" }, - "facing=north,half=bottom,shape=outer_left": { "model": "appliedenergistics2:stairs/skystone.brick.small.outer", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "appliedenergistics2:stairs/skystone.brick.small.inner" }, - "facing=west,half=bottom,shape=inner_right": { "model": "appliedenergistics2:stairs/skystone.brick.small.inner", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "appliedenergistics2:stairs/skystone.brick.small.inner", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "appliedenergistics2:stairs/skystone.brick.small.inner", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "appliedenergistics2:stairs/skystone.brick.small.inner", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "appliedenergistics2:stairs/skystone.brick.small.inner", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "appliedenergistics2:stairs/skystone.brick.small.inner" }, - "facing=north,half=bottom,shape=inner_left": { "model": "appliedenergistics2:stairs/skystone.brick.small.inner", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "appliedenergistics2:stairs/skystone.brick.small", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "appliedenergistics2:stairs/skystone.brick.small", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "appliedenergistics2:stairs/skystone.brick.small", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "appliedenergistics2:stairs/skystone.brick.small", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "appliedenergistics2:stairs/skystone.brick.small.outer", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "appliedenergistics2:stairs/skystone.brick.small.outer", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "appliedenergistics2:stairs/skystone.brick.small.outer", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "appliedenergistics2:stairs/skystone.brick.small.outer", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "appliedenergistics2:stairs/skystone.brick.small.outer", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "appliedenergistics2:stairs/skystone.brick.small.outer", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "appliedenergistics2:stairs/skystone.brick.small.outer", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "appliedenergistics2:stairs/skystone.brick.small.outer", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "appliedenergistics2:stairs/skystone.brick.small.inner", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "appliedenergistics2:stairs/skystone.brick.small.inner", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "appliedenergistics2:stairs/skystone.brick.small.inner", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "appliedenergistics2:stairs/skystone.brick.small.inner", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "appliedenergistics2:stairs/skystone.brick.small.inner", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "appliedenergistics2:stairs/skystone.brick.small.inner", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "appliedenergistics2:stairs/skystone.brick.small.inner", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "appliedenergistics2:stairs/skystone.brick.small.inner", "x": 180, "y": 270, "uvlock": true } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/stair.skystone.stone.json b/src/main/resources/assets/appliedenergistics2/blockstates/stair.skystone.stone.json deleted file mode 100644 index 06553ca2f..000000000 --- a/src/main/resources/assets/appliedenergistics2/blockstates/stair.skystone.stone.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "appliedenergistics2:stairs/skystone.stone" }, - "facing=west,half=bottom,shape=straight": { "model": "appliedenergistics2:stairs/skystone.stone", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "appliedenergistics2:stairs/skystone.stone", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "appliedenergistics2:stairs/skystone.stone", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "appliedenergistics2:stairs/skystone.stone.outer" }, - "facing=west,half=bottom,shape=outer_right": { "model": "appliedenergistics2:stairs/skystone.stone.outer", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "appliedenergistics2:stairs/skystone.stone.outer", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "appliedenergistics2:stairs/skystone.stone.outer", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "appliedenergistics2:stairs/skystone.stone.outer", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "appliedenergistics2:stairs/skystone.stone.outer", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "appliedenergistics2:stairs/skystone.stone.outer" }, - "facing=north,half=bottom,shape=outer_left": { "model": "appliedenergistics2:stairs/skystone.stone.outer", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "appliedenergistics2:stairs/skystone.stone.inner" }, - "facing=west,half=bottom,shape=inner_right": { "model": "appliedenergistics2:stairs/skystone.stone.inner", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "appliedenergistics2:stairs/skystone.stone.inner", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "appliedenergistics2:stairs/skystone.stone.inner", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "appliedenergistics2:stairs/skystone.stone.inner", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "appliedenergistics2:stairs/skystone.stone.inner", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "appliedenergistics2:stairs/skystone.stone.inner" }, - "facing=north,half=bottom,shape=inner_left": { "model": "appliedenergistics2:stairs/skystone.stone.inner", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "appliedenergistics2:stairs/skystone.stone", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "appliedenergistics2:stairs/skystone.stone", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "appliedenergistics2:stairs/skystone.stone", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "appliedenergistics2:stairs/skystone.stone", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "appliedenergistics2:stairs/skystone.stone.outer", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "appliedenergistics2:stairs/skystone.stone.outer", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "appliedenergistics2:stairs/skystone.stone.outer", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "appliedenergistics2:stairs/skystone.stone.outer", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "appliedenergistics2:stairs/skystone.stone.outer", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "appliedenergistics2:stairs/skystone.stone.outer", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "appliedenergistics2:stairs/skystone.stone.outer", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "appliedenergistics2:stairs/skystone.stone.outer", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "appliedenergistics2:stairs/skystone.stone.inner", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "appliedenergistics2:stairs/skystone.stone.inner", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "appliedenergistics2:stairs/skystone.stone.inner", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "appliedenergistics2:stairs/skystone.stone.inner", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "appliedenergistics2:stairs/skystone.stone.inner", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "appliedenergistics2:stairs/skystone.stone.inner", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "appliedenergistics2:stairs/skystone.stone.inner", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "appliedenergistics2:stairs/skystone.stone.inner", "x": 180, "y": 270, "uvlock": true } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/stair_fluix.json b/src/main/resources/assets/appliedenergistics2/blockstates/stair_fluix.json new file mode 100644 index 000000000..a15e89127 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/blockstates/stair_fluix.json @@ -0,0 +1,209 @@ +{ + "variants": { + "facing=east,half=bottom,shape=inner_left": { + "model": "appliedenergistics2:stairs/fluix_inner", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "appliedenergistics2:stairs/fluix_inner" + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "appliedenergistics2:stairs/fluix_outer", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "appliedenergistics2:stairs/fluix_outer" + }, + "facing=east,half=bottom,shape=straight": { + "model": "appliedenergistics2:stairs/fluix" + }, + "facing=east,half=top,shape=inner_left": { + "model": "appliedenergistics2:stairs/fluix_inner", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=inner_right": { + "model": "appliedenergistics2:stairs/fluix_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=outer_left": { + "model": "appliedenergistics2:stairs/fluix_outer", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=outer_right": { + "model": "appliedenergistics2:stairs/fluix_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "appliedenergistics2:stairs/fluix", + "uvlock": true, + "x": 180 + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "appliedenergistics2:stairs/fluix_inner", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "appliedenergistics2:stairs/fluix_inner", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "appliedenergistics2:stairs/fluix_outer", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "appliedenergistics2:stairs/fluix_outer", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=straight": { + "model": "appliedenergistics2:stairs/fluix", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { + "model": "appliedenergistics2:stairs/fluix_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=inner_right": { + "model": "appliedenergistics2:stairs/fluix_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "appliedenergistics2:stairs/fluix_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=outer_right": { + "model": "appliedenergistics2:stairs/fluix_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "appliedenergistics2:stairs/fluix", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "appliedenergistics2:stairs/fluix_inner" + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "appliedenergistics2:stairs/fluix_inner", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "appliedenergistics2:stairs/fluix_outer" + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "appliedenergistics2:stairs/fluix_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "appliedenergistics2:stairs/fluix", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "appliedenergistics2:stairs/fluix_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "appliedenergistics2:stairs/fluix_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=outer_left": { + "model": "appliedenergistics2:stairs/fluix_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=outer_right": { + "model": "appliedenergistics2:stairs/fluix_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=straight": { + "model": "appliedenergistics2:stairs/fluix", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "appliedenergistics2:stairs/fluix_inner", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "appliedenergistics2:stairs/fluix_inner", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "appliedenergistics2:stairs/fluix_outer", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "appliedenergistics2:stairs/fluix_outer", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=straight": { + "model": "appliedenergistics2:stairs/fluix", + "uvlock": true, + "y": 180 + }, + "facing=west,half=top,shape=inner_left": { + "model": "appliedenergistics2:stairs/fluix_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=inner_right": { + "model": "appliedenergistics2:stairs/fluix_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=outer_left": { + "model": "appliedenergistics2:stairs/fluix_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=outer_right": { + "model": "appliedenergistics2:stairs/fluix_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=straight": { + "model": "appliedenergistics2:stairs/fluix", + "uvlock": true, + "x": 180, + "y": 180 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/stair_quartz_certus.json b/src/main/resources/assets/appliedenergistics2/blockstates/stair_quartz_certus.json new file mode 100644 index 000000000..17b9316f6 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/blockstates/stair_quartz_certus.json @@ -0,0 +1,209 @@ +{ + "variants": { + "facing=east,half=bottom,shape=inner_left": { + "model": "appliedenergistics2:stairs/quartz_certus_inner", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "appliedenergistics2:stairs/quartz_certus_inner" + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "appliedenergistics2:stairs/quartz_certus_outer", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "appliedenergistics2:stairs/quartz_certus_outer" + }, + "facing=east,half=bottom,shape=straight": { + "model": "appliedenergistics2:stairs/quartz_certus" + }, + "facing=east,half=top,shape=inner_left": { + "model": "appliedenergistics2:stairs/quartz_certus_inner", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=inner_right": { + "model": "appliedenergistics2:stairs/quartz_certus_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=outer_left": { + "model": "appliedenergistics2:stairs/quartz_certus_outer", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=outer_right": { + "model": "appliedenergistics2:stairs/quartz_certus_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "appliedenergistics2:stairs/quartz_certus", + "uvlock": true, + "x": 180 + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "appliedenergistics2:stairs/quartz_certus_inner", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "appliedenergistics2:stairs/quartz_certus_inner", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "appliedenergistics2:stairs/quartz_certus_outer", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "appliedenergistics2:stairs/quartz_certus_outer", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=straight": { + "model": "appliedenergistics2:stairs/quartz_certus", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { + "model": "appliedenergistics2:stairs/quartz_certus_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=inner_right": { + "model": "appliedenergistics2:stairs/quartz_certus_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "appliedenergistics2:stairs/quartz_certus_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=outer_right": { + "model": "appliedenergistics2:stairs/quartz_certus_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "appliedenergistics2:stairs/quartz_certus", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "appliedenergistics2:stairs/quartz_certus_inner" + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "appliedenergistics2:stairs/quartz_certus_inner", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "appliedenergistics2:stairs/quartz_certus_outer" + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "appliedenergistics2:stairs/quartz_certus_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "appliedenergistics2:stairs/quartz_certus", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "appliedenergistics2:stairs/quartz_certus_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "appliedenergistics2:stairs/quartz_certus_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=outer_left": { + "model": "appliedenergistics2:stairs/quartz_certus_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=outer_right": { + "model": "appliedenergistics2:stairs/quartz_certus_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=straight": { + "model": "appliedenergistics2:stairs/quartz_certus", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "appliedenergistics2:stairs/quartz_certus_inner", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "appliedenergistics2:stairs/quartz_certus_inner", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "appliedenergistics2:stairs/quartz_certus_outer", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "appliedenergistics2:stairs/quartz_certus_outer", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=straight": { + "model": "appliedenergistics2:stairs/quartz_certus", + "uvlock": true, + "y": 180 + }, + "facing=west,half=top,shape=inner_left": { + "model": "appliedenergistics2:stairs/quartz_certus_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=inner_right": { + "model": "appliedenergistics2:stairs/quartz_certus_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=outer_left": { + "model": "appliedenergistics2:stairs/quartz_certus_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=outer_right": { + "model": "appliedenergistics2:stairs/quartz_certus_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=straight": { + "model": "appliedenergistics2:stairs/quartz_certus", + "uvlock": true, + "x": 180, + "y": 180 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/stair_quartz_certus_chiseled.json b/src/main/resources/assets/appliedenergistics2/blockstates/stair_quartz_certus_chiseled.json new file mode 100644 index 000000000..3442c95fa --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/blockstates/stair_quartz_certus_chiseled.json @@ -0,0 +1,209 @@ +{ + "variants": { + "facing=east,half=bottom,shape=inner_left": { + "model": "appliedenergistics2:stairs/quartz_certus_chiseled_inner", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "appliedenergistics2:stairs/quartz_certus_chiseled_inner" + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "appliedenergistics2:stairs/quartz_certus_chiseled_outer", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "appliedenergistics2:stairs/quartz_certus_chiseled_outer" + }, + "facing=east,half=bottom,shape=straight": { + "model": "appliedenergistics2:stairs/quartz_certus_chiseled" + }, + "facing=east,half=top,shape=inner_left": { + "model": "appliedenergistics2:stairs/quartz_certus_chiseled_inner", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=inner_right": { + "model": "appliedenergistics2:stairs/quartz_certus_chiseled_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=outer_left": { + "model": "appliedenergistics2:stairs/quartz_certus_chiseled_outer", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=outer_right": { + "model": "appliedenergistics2:stairs/quartz_certus_chiseled_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "appliedenergistics2:stairs/quartz_certus_chiseled", + "uvlock": true, + "x": 180 + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "appliedenergistics2:stairs/quartz_certus_chiseled_inner", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "appliedenergistics2:stairs/quartz_certus_chiseled_inner", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "appliedenergistics2:stairs/quartz_certus_chiseled_outer", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "appliedenergistics2:stairs/quartz_certus_chiseled_outer", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=straight": { + "model": "appliedenergistics2:stairs/quartz_certus_chiseled", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { + "model": "appliedenergistics2:stairs/quartz_certus_chiseled_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=inner_right": { + "model": "appliedenergistics2:stairs/quartz_certus_chiseled_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "appliedenergistics2:stairs/quartz_certus_chiseled_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=outer_right": { + "model": "appliedenergistics2:stairs/quartz_certus_chiseled_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "appliedenergistics2:stairs/quartz_certus_chiseled", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "appliedenergistics2:stairs/quartz_certus_chiseled_inner" + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "appliedenergistics2:stairs/quartz_certus_chiseled_inner", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "appliedenergistics2:stairs/quartz_certus_chiseled_outer" + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "appliedenergistics2:stairs/quartz_certus_chiseled_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "appliedenergistics2:stairs/quartz_certus_chiseled", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "appliedenergistics2:stairs/quartz_certus_chiseled_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "appliedenergistics2:stairs/quartz_certus_chiseled_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=outer_left": { + "model": "appliedenergistics2:stairs/quartz_certus_chiseled_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=outer_right": { + "model": "appliedenergistics2:stairs/quartz_certus_chiseled_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=straight": { + "model": "appliedenergistics2:stairs/quartz_certus_chiseled", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "appliedenergistics2:stairs/quartz_certus_chiseled_inner", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "appliedenergistics2:stairs/quartz_certus_chiseled_inner", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "appliedenergistics2:stairs/quartz_certus_chiseled_outer", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "appliedenergistics2:stairs/quartz_certus_chiseled_outer", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=straight": { + "model": "appliedenergistics2:stairs/quartz_certus_chiseled", + "uvlock": true, + "y": 180 + }, + "facing=west,half=top,shape=inner_left": { + "model": "appliedenergistics2:stairs/quartz_certus_chiseled_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=inner_right": { + "model": "appliedenergistics2:stairs/quartz_certus_chiseled_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=outer_left": { + "model": "appliedenergistics2:stairs/quartz_certus_chiseled_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=outer_right": { + "model": "appliedenergistics2:stairs/quartz_certus_chiseled_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=straight": { + "model": "appliedenergistics2:stairs/quartz_certus_chiseled", + "uvlock": true, + "x": 180, + "y": 180 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/stair_quartz_certus_pillar.json b/src/main/resources/assets/appliedenergistics2/blockstates/stair_quartz_certus_pillar.json new file mode 100644 index 000000000..5c72154e1 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/blockstates/stair_quartz_certus_pillar.json @@ -0,0 +1,209 @@ +{ + "variants": { + "facing=east,half=bottom,shape=inner_left": { + "model": "appliedenergistics2:stairs/quartz_certus_pillar_inner", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "appliedenergistics2:stairs/quartz_certus_pillar_inner" + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "appliedenergistics2:stairs/quartz_certus_pillar_outer", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "appliedenergistics2:stairs/quartz_certus_pillar_outer" + }, + "facing=east,half=bottom,shape=straight": { + "model": "appliedenergistics2:stairs/quartz_certus_pillar" + }, + "facing=east,half=top,shape=inner_left": { + "model": "appliedenergistics2:stairs/quartz_certus_pillar_inner", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=inner_right": { + "model": "appliedenergistics2:stairs/quartz_certus_pillar_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=outer_left": { + "model": "appliedenergistics2:stairs/quartz_certus_pillar_outer", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=outer_right": { + "model": "appliedenergistics2:stairs/quartz_certus_pillar_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "appliedenergistics2:stairs/quartz_certus_pillar", + "uvlock": true, + "x": 180 + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "appliedenergistics2:stairs/quartz_certus_pillar_inner", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "appliedenergistics2:stairs/quartz_certus_pillar_inner", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "appliedenergistics2:stairs/quartz_certus_pillar_outer", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "appliedenergistics2:stairs/quartz_certus_pillar_outer", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=straight": { + "model": "appliedenergistics2:stairs/quartz_certus_pillar", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { + "model": "appliedenergistics2:stairs/quartz_certus_pillar_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=inner_right": { + "model": "appliedenergistics2:stairs/quartz_certus_pillar_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "appliedenergistics2:stairs/quartz_certus_pillar_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=outer_right": { + "model": "appliedenergistics2:stairs/quartz_certus_pillar_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "appliedenergistics2:stairs/quartz_certus_pillar", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "appliedenergistics2:stairs/quartz_certus_pillar_inner" + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "appliedenergistics2:stairs/quartz_certus_pillar_inner", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "appliedenergistics2:stairs/quartz_certus_pillar_outer" + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "appliedenergistics2:stairs/quartz_certus_pillar_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "appliedenergistics2:stairs/quartz_certus_pillar", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "appliedenergistics2:stairs/quartz_certus_pillar_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "appliedenergistics2:stairs/quartz_certus_pillar_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=outer_left": { + "model": "appliedenergistics2:stairs/quartz_certus_pillar_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=outer_right": { + "model": "appliedenergistics2:stairs/quartz_certus_pillar_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=straight": { + "model": "appliedenergistics2:stairs/quartz_certus_pillar", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "appliedenergistics2:stairs/quartz_certus_pillar_inner", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "appliedenergistics2:stairs/quartz_certus_pillar_inner", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "appliedenergistics2:stairs/quartz_certus_pillar_outer", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "appliedenergistics2:stairs/quartz_certus_pillar_outer", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=straight": { + "model": "appliedenergistics2:stairs/quartz_certus_pillar", + "uvlock": true, + "y": 180 + }, + "facing=west,half=top,shape=inner_left": { + "model": "appliedenergistics2:stairs/quartz_certus_pillar_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=inner_right": { + "model": "appliedenergistics2:stairs/quartz_certus_pillar_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=outer_left": { + "model": "appliedenergistics2:stairs/quartz_certus_pillar_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=outer_right": { + "model": "appliedenergistics2:stairs/quartz_certus_pillar_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=straight": { + "model": "appliedenergistics2:stairs/quartz_certus_pillar", + "uvlock": true, + "x": 180, + "y": 180 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/stair_skystone_block.json b/src/main/resources/assets/appliedenergistics2/blockstates/stair_skystone_block.json new file mode 100644 index 000000000..30ed4e47d --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/blockstates/stair_skystone_block.json @@ -0,0 +1,209 @@ +{ + "variants": { + "facing=east,half=bottom,shape=inner_left": { + "model": "appliedenergistics2:stairs/skystone_block_inner", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "appliedenergistics2:stairs/skystone_block_inner" + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "appliedenergistics2:stairs/skystone_block_outer", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "appliedenergistics2:stairs/skystone_block_outer" + }, + "facing=east,half=bottom,shape=straight": { + "model": "appliedenergistics2:stairs/skystone_block" + }, + "facing=east,half=top,shape=inner_left": { + "model": "appliedenergistics2:stairs/skystone_block_inner", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=inner_right": { + "model": "appliedenergistics2:stairs/skystone_block_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=outer_left": { + "model": "appliedenergistics2:stairs/skystone_block_outer", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=outer_right": { + "model": "appliedenergistics2:stairs/skystone_block_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "appliedenergistics2:stairs/skystone_block", + "uvlock": true, + "x": 180 + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "appliedenergistics2:stairs/skystone_block_inner", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "appliedenergistics2:stairs/skystone_block_inner", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "appliedenergistics2:stairs/skystone_block_outer", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "appliedenergistics2:stairs/skystone_block_outer", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=straight": { + "model": "appliedenergistics2:stairs/skystone_block", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { + "model": "appliedenergistics2:stairs/skystone_block_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=inner_right": { + "model": "appliedenergistics2:stairs/skystone_block_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "appliedenergistics2:stairs/skystone_block_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=outer_right": { + "model": "appliedenergistics2:stairs/skystone_block_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "appliedenergistics2:stairs/skystone_block", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "appliedenergistics2:stairs/skystone_block_inner" + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "appliedenergistics2:stairs/skystone_block_inner", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "appliedenergistics2:stairs/skystone_block_outer" + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "appliedenergistics2:stairs/skystone_block_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "appliedenergistics2:stairs/skystone_block", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "appliedenergistics2:stairs/skystone_block_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "appliedenergistics2:stairs/skystone_block_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=outer_left": { + "model": "appliedenergistics2:stairs/skystone_block_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=outer_right": { + "model": "appliedenergistics2:stairs/skystone_block_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=straight": { + "model": "appliedenergistics2:stairs/skystone_block", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "appliedenergistics2:stairs/skystone_block_inner", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "appliedenergistics2:stairs/skystone_block_inner", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "appliedenergistics2:stairs/skystone_block_outer", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "appliedenergistics2:stairs/skystone_block_outer", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=straight": { + "model": "appliedenergistics2:stairs/skystone_block", + "uvlock": true, + "y": 180 + }, + "facing=west,half=top,shape=inner_left": { + "model": "appliedenergistics2:stairs/skystone_block_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=inner_right": { + "model": "appliedenergistics2:stairs/skystone_block_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=outer_left": { + "model": "appliedenergistics2:stairs/skystone_block_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=outer_right": { + "model": "appliedenergistics2:stairs/skystone_block_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=straight": { + "model": "appliedenergistics2:stairs/skystone_block", + "uvlock": true, + "x": 180, + "y": 180 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/stair_skystone_brick.json b/src/main/resources/assets/appliedenergistics2/blockstates/stair_skystone_brick.json new file mode 100644 index 000000000..d07883966 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/blockstates/stair_skystone_brick.json @@ -0,0 +1,209 @@ +{ + "variants": { + "facing=east,half=bottom,shape=inner_left": { + "model": "appliedenergistics2:stairs/skystone_brick_inner", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "appliedenergistics2:stairs/skystone_brick_inner" + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "appliedenergistics2:stairs/skystone_brick_outer", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "appliedenergistics2:stairs/skystone_brick_outer" + }, + "facing=east,half=bottom,shape=straight": { + "model": "appliedenergistics2:stairs/skystone_brick" + }, + "facing=east,half=top,shape=inner_left": { + "model": "appliedenergistics2:stairs/skystone_brick_inner", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=inner_right": { + "model": "appliedenergistics2:stairs/skystone_brick_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=outer_left": { + "model": "appliedenergistics2:stairs/skystone_brick_outer", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=outer_right": { + "model": "appliedenergistics2:stairs/skystone_brick_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "appliedenergistics2:stairs/skystone_brick", + "uvlock": true, + "x": 180 + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "appliedenergistics2:stairs/skystone_brick_inner", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "appliedenergistics2:stairs/skystone_brick_inner", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "appliedenergistics2:stairs/skystone_brick_outer", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "appliedenergistics2:stairs/skystone_brick_outer", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=straight": { + "model": "appliedenergistics2:stairs/skystone_brick", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { + "model": "appliedenergistics2:stairs/skystone_brick_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=inner_right": { + "model": "appliedenergistics2:stairs/skystone_brick_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "appliedenergistics2:stairs/skystone_brick_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=outer_right": { + "model": "appliedenergistics2:stairs/skystone_brick_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "appliedenergistics2:stairs/skystone_brick", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "appliedenergistics2:stairs/skystone_brick_inner" + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "appliedenergistics2:stairs/skystone_brick_inner", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "appliedenergistics2:stairs/skystone_brick_outer" + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "appliedenergistics2:stairs/skystone_brick_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "appliedenergistics2:stairs/skystone_brick", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "appliedenergistics2:stairs/skystone_brick_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "appliedenergistics2:stairs/skystone_brick_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=outer_left": { + "model": "appliedenergistics2:stairs/skystone_brick_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=outer_right": { + "model": "appliedenergistics2:stairs/skystone_brick_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=straight": { + "model": "appliedenergistics2:stairs/skystone_brick", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "appliedenergistics2:stairs/skystone_brick_inner", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "appliedenergistics2:stairs/skystone_brick_inner", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "appliedenergistics2:stairs/skystone_brick_outer", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "appliedenergistics2:stairs/skystone_brick_outer", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=straight": { + "model": "appliedenergistics2:stairs/skystone_brick", + "uvlock": true, + "y": 180 + }, + "facing=west,half=top,shape=inner_left": { + "model": "appliedenergistics2:stairs/skystone_brick_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=inner_right": { + "model": "appliedenergistics2:stairs/skystone_brick_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=outer_left": { + "model": "appliedenergistics2:stairs/skystone_brick_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=outer_right": { + "model": "appliedenergistics2:stairs/skystone_brick_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=straight": { + "model": "appliedenergistics2:stairs/skystone_brick", + "uvlock": true, + "x": 180, + "y": 180 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/stair_skystone_brick_small.json b/src/main/resources/assets/appliedenergistics2/blockstates/stair_skystone_brick_small.json new file mode 100644 index 000000000..37b701c02 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/blockstates/stair_skystone_brick_small.json @@ -0,0 +1,209 @@ +{ + "variants": { + "facing=east,half=bottom,shape=inner_left": { + "model": "appliedenergistics2:stairs/skystone_brick_small_inner", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "appliedenergistics2:stairs/skystone_brick_small_inner" + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "appliedenergistics2:stairs/skystone_brick_small_outer", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "appliedenergistics2:stairs/skystone_brick_small_outer" + }, + "facing=east,half=bottom,shape=straight": { + "model": "appliedenergistics2:stairs/skystone_brick_small" + }, + "facing=east,half=top,shape=inner_left": { + "model": "appliedenergistics2:stairs/skystone_brick_small_inner", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=inner_right": { + "model": "appliedenergistics2:stairs/skystone_brick_small_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=outer_left": { + "model": "appliedenergistics2:stairs/skystone_brick_small_outer", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=outer_right": { + "model": "appliedenergistics2:stairs/skystone_brick_small_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "appliedenergistics2:stairs/skystone_brick_small", + "uvlock": true, + "x": 180 + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "appliedenergistics2:stairs/skystone_brick_small_inner", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "appliedenergistics2:stairs/skystone_brick_small_inner", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "appliedenergistics2:stairs/skystone_brick_small_outer", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "appliedenergistics2:stairs/skystone_brick_small_outer", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=straight": { + "model": "appliedenergistics2:stairs/skystone_brick_small", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { + "model": "appliedenergistics2:stairs/skystone_brick_small_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=inner_right": { + "model": "appliedenergistics2:stairs/skystone_brick_small_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "appliedenergistics2:stairs/skystone_brick_small_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=outer_right": { + "model": "appliedenergistics2:stairs/skystone_brick_small_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "appliedenergistics2:stairs/skystone_brick_small", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "appliedenergistics2:stairs/skystone_brick_small_inner" + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "appliedenergistics2:stairs/skystone_brick_small_inner", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "appliedenergistics2:stairs/skystone_brick_small_outer" + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "appliedenergistics2:stairs/skystone_brick_small_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "appliedenergistics2:stairs/skystone_brick_small", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "appliedenergistics2:stairs/skystone_brick_small_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "appliedenergistics2:stairs/skystone_brick_small_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=outer_left": { + "model": "appliedenergistics2:stairs/skystone_brick_small_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=outer_right": { + "model": "appliedenergistics2:stairs/skystone_brick_small_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=straight": { + "model": "appliedenergistics2:stairs/skystone_brick_small", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "appliedenergistics2:stairs/skystone_brick_small_inner", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "appliedenergistics2:stairs/skystone_brick_small_inner", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "appliedenergistics2:stairs/skystone_brick_small_outer", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "appliedenergistics2:stairs/skystone_brick_small_outer", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=straight": { + "model": "appliedenergistics2:stairs/skystone_brick_small", + "uvlock": true, + "y": 180 + }, + "facing=west,half=top,shape=inner_left": { + "model": "appliedenergistics2:stairs/skystone_brick_small_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=inner_right": { + "model": "appliedenergistics2:stairs/skystone_brick_small_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=outer_left": { + "model": "appliedenergistics2:stairs/skystone_brick_small_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=outer_right": { + "model": "appliedenergistics2:stairs/skystone_brick_small_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=straight": { + "model": "appliedenergistics2:stairs/skystone_brick_small", + "uvlock": true, + "x": 180, + "y": 180 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/stair_skystone_stone.json b/src/main/resources/assets/appliedenergistics2/blockstates/stair_skystone_stone.json new file mode 100644 index 000000000..6daacbbac --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/blockstates/stair_skystone_stone.json @@ -0,0 +1,209 @@ +{ + "variants": { + "facing=east,half=bottom,shape=inner_left": { + "model": "appliedenergistics2:stairs/skystone_stone_inner", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "appliedenergistics2:stairs/skystone_stone_inner" + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "appliedenergistics2:stairs/skystone_stone_outer", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "appliedenergistics2:stairs/skystone_stone_outer" + }, + "facing=east,half=bottom,shape=straight": { + "model": "appliedenergistics2:stairs/skystone_stone" + }, + "facing=east,half=top,shape=inner_left": { + "model": "appliedenergistics2:stairs/skystone_stone_inner", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=inner_right": { + "model": "appliedenergistics2:stairs/skystone_stone_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=outer_left": { + "model": "appliedenergistics2:stairs/skystone_stone_outer", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=outer_right": { + "model": "appliedenergistics2:stairs/skystone_stone_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "appliedenergistics2:stairs/skystone_stone", + "uvlock": true, + "x": 180 + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "appliedenergistics2:stairs/skystone_stone_inner", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "appliedenergistics2:stairs/skystone_stone_inner", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "appliedenergistics2:stairs/skystone_stone_outer", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "appliedenergistics2:stairs/skystone_stone_outer", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=straight": { + "model": "appliedenergistics2:stairs/skystone_stone", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { + "model": "appliedenergistics2:stairs/skystone_stone_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=inner_right": { + "model": "appliedenergistics2:stairs/skystone_stone_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "appliedenergistics2:stairs/skystone_stone_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=outer_right": { + "model": "appliedenergistics2:stairs/skystone_stone_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "appliedenergistics2:stairs/skystone_stone", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "appliedenergistics2:stairs/skystone_stone_inner" + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "appliedenergistics2:stairs/skystone_stone_inner", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "appliedenergistics2:stairs/skystone_stone_outer" + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "appliedenergistics2:stairs/skystone_stone_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "appliedenergistics2:stairs/skystone_stone", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "appliedenergistics2:stairs/skystone_stone_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "appliedenergistics2:stairs/skystone_stone_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=outer_left": { + "model": "appliedenergistics2:stairs/skystone_stone_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=outer_right": { + "model": "appliedenergistics2:stairs/skystone_stone_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=straight": { + "model": "appliedenergistics2:stairs/skystone_stone", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "appliedenergistics2:stairs/skystone_stone_inner", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "appliedenergistics2:stairs/skystone_stone_inner", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "appliedenergistics2:stairs/skystone_stone_outer", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "appliedenergistics2:stairs/skystone_stone_outer", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=straight": { + "model": "appliedenergistics2:stairs/skystone_stone", + "uvlock": true, + "y": 180 + }, + "facing=west,half=top,shape=inner_left": { + "model": "appliedenergistics2:stairs/skystone_stone_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=inner_right": { + "model": "appliedenergistics2:stairs/skystone_stone_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=outer_left": { + "model": "appliedenergistics2:stairs/skystone_stone_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=outer_right": { + "model": "appliedenergistics2:stairs/skystone_stone_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=straight": { + "model": "appliedenergistics2:stairs/skystone_stone", + "uvlock": true, + "x": 180, + "y": 180 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockCellWorkBench.json b/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockCellWorkBench.json deleted file mode 100644 index 8abe92cfd..000000000 --- a/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockCellWorkBench.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "appliedenergistics2:tile.BlockCellWorkBench" } - } -} diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockCharger.json b/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockCharger.json deleted file mode 100644 index dade42d41..000000000 --- a/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockCharger.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "appliedenergistics2:tile.BlockCharger" } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockCondenser.json b/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockCondenser.json deleted file mode 100644 index 8e743a0e7..000000000 --- a/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockCondenser.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "appliedenergistics2:tile.BlockCondenser" } - } -} diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockController.json b/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockController.json deleted file mode 100644 index 2076edcce..000000000 --- a/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockController.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "multipart": [ - { - "when": { "type": "block", "state": "offline" }, - "apply": { "model": "appliedenergistics2:controller/controller_block_offline" } - }, - { - "when": { "type": "block", "state": "online" }, - "apply": { "model": "appliedenergistics2:controller/controller_block_online.uvl" } - }, - { - "when": { "type": "block", "state": "conflicted" }, - "apply": { "model": "appliedenergistics2:controller/controller_block_conflicted.uvl" } - }, - { - "when": { "type": "column", "state": "offline" }, - "apply": { "model": "appliedenergistics2:controller/controller_column_offline" } - }, - { - "when": { "type": "column", "state": "online" }, - "apply": { "model": "appliedenergistics2:controller/controller_column_online.uvl" } - }, - { - "when": { "type": "column", "state": "conflicted" }, - "apply": { "model": "appliedenergistics2:controller/controller_column_conflicted.uvl" } - }, - { - "when": { "type": "inside_a", "state": "offline|online|conflicted" }, - "apply": { "model": "appliedenergistics2:controller/controller_inside_a" } - }, - { - "when": { "type": "inside_b", "state": "offline|online|conflicted" }, - "apply": { "model": "appliedenergistics2:controller/controller_inside_b" } - } - ] -} diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockCreativeEnergyCell.json b/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockCreativeEnergyCell.json deleted file mode 100644 index d9d145993..000000000 --- a/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockCreativeEnergyCell.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "appliedenergistics2:EnergyCell/tile.BlockCreativeEnergyCell" } - } -} diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockDenseEnergyCell.json b/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockDenseEnergyCell.json deleted file mode 100644 index eaf1eb23a..000000000 --- a/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockDenseEnergyCell.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "variants": { - "fullness=0": { "model": "appliedenergistics2:EnergyCell/tile.BlockDenseEnergyCell0" }, - "fullness=1": { "model": "appliedenergistics2:EnergyCell/tile.BlockDenseEnergyCell1" }, - "fullness=2": { "model": "appliedenergistics2:EnergyCell/tile.BlockDenseEnergyCell2" }, - "fullness=3": { "model": "appliedenergistics2:EnergyCell/tile.BlockDenseEnergyCell3" }, - "fullness=4": { "model": "appliedenergistics2:EnergyCell/tile.BlockDenseEnergyCell4" }, - "fullness=5": { "model": "appliedenergistics2:EnergyCell/tile.BlockDenseEnergyCell5" }, - "fullness=6": { "model": "appliedenergistics2:EnergyCell/tile.BlockDenseEnergyCell6" }, - "fullness=7": { "model": "appliedenergistics2:EnergyCell/tile.BlockDenseEnergyCell7" } - } -} diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockDrive.json b/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockDrive.json deleted file mode 100644 index 2b4f34ab8..000000000 --- a/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockDrive.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "variants": { - "facing=north": { "model": "appliedenergistics2:tile.BlockDrive", "y": 180 }, - "facing=south": { "model": "appliedenergistics2:tile.BlockDrive", "y": 0 }, - "facing=west": { "model": "appliedenergistics2:tile.BlockDrive", "y": 90 }, - "facing=east": { "model": "appliedenergistics2:tile.BlockDrive", "y": 270 } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockEnergyAcceptor.json b/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockEnergyAcceptor.json deleted file mode 100644 index f84c52357..000000000 --- a/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockEnergyAcceptor.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "appliedenergistics2:tile.BlockEnergyAcceptor" } - } -} diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockEnergyCell.json b/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockEnergyCell.json deleted file mode 100644 index daa5c0eaa..000000000 --- a/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockEnergyCell.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "variants": { - "fullness=0": { "model": "appliedenergistics2:EnergyCell/tile.BlockEnergyCell0" }, - "fullness=1": { "model": "appliedenergistics2:EnergyCell/tile.BlockEnergyCell1" }, - "fullness=2": { "model": "appliedenergistics2:EnergyCell/tile.BlockEnergyCell2" }, - "fullness=3": { "model": "appliedenergistics2:EnergyCell/tile.BlockEnergyCell3" }, - "fullness=4": { "model": "appliedenergistics2:EnergyCell/tile.BlockEnergyCell4" }, - "fullness=5": { "model": "appliedenergistics2:EnergyCell/tile.BlockEnergyCell5" }, - "fullness=6": { "model": "appliedenergistics2:EnergyCell/tile.BlockEnergyCell6" }, - "fullness=7": { "model": "appliedenergistics2:EnergyCell/tile.BlockEnergyCell7" } - } -} diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockGrinder.json b/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockGrinder.json deleted file mode 100644 index c6f572a64..000000000 --- a/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockGrinder.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "appliedenergistics2:tile.BlockGrinder" } - } -} diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockIOPort.json b/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockIOPort.json deleted file mode 100644 index 9bae83dfd..000000000 --- a/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockIOPort.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "appliedenergistics2:tile.BlockIOPort" } - } -} diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockInscriber.json b/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockInscriber.json deleted file mode 100644 index 096dbd8ca..000000000 --- a/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockInscriber.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "appliedenergistics2:tile.BlockInscriber" } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockQuartzGrowthAccelerator.json b/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockQuartzGrowthAccelerator.json deleted file mode 100644 index 921614b15..000000000 --- a/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockQuartzGrowthAccelerator.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "variants": { - "powered=false": { "model": "appliedenergistics2:tile.BlockQuartzGrowthAccelerator.off" }, - "powered=true": { "model": "appliedenergistics2:tile.BlockQuartzGrowthAccelerator.on" } - } -} diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockSecurity.json b/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockSecurity.json deleted file mode 100644 index d65cf719a..000000000 --- a/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockSecurity.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "appliedenergistics2:tile.BlockSecurity" } - } -} diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockSpatialIOPort.json b/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockSpatialIOPort.json deleted file mode 100644 index c155ba1f5..000000000 --- a/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockSpatialIOPort.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "appliedenergistics2:tile.BlockSpatialIOPort" } - } -} diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockVibrationChamber.json b/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockVibrationChamber.json deleted file mode 100644 index 676b9081d..000000000 --- a/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockVibrationChamber.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "variants": { - "active=false": { "model": "appliedenergistics2:tile.BlockVibrationChamber.off" }, - "active=true": { "model": "appliedenergistics2:tile.BlockVibrationChamber.on" } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockWireless.json b/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockWireless.json deleted file mode 100644 index a2870f75a..000000000 --- a/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockWireless.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "appliedenergistics2:tile.BlockWireless", "y": 180 } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/tiny_tnt.json b/src/main/resources/assets/appliedenergistics2/blockstates/tiny_tnt.json new file mode 100644 index 000000000..303b8f0c5 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/blockstates/tiny_tnt.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "appliedenergistics2:tiny_tnt" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/vibration_chamber.json b/src/main/resources/assets/appliedenergistics2/blockstates/vibration_chamber.json new file mode 100644 index 000000000..6cbca90c0 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/blockstates/vibration_chamber.json @@ -0,0 +1,10 @@ +{ + "variants": { + "active=false": { + "model": "appliedenergistics2:vibration_chamber_off" + }, + "active=true": { + "model": "appliedenergistics2:vibration_chamber_on" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/wireless.json b/src/main/resources/assets/appliedenergistics2/blockstates/wireless.json new file mode 100644 index 000000000..7ea8ce8d4 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/blockstates/wireless.json @@ -0,0 +1,8 @@ +{ + "variants": { + "normal": { + "model": "appliedenergistics2:wireless", + "y": 180 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/BlockTinyTNT.json b/src/main/resources/assets/appliedenergistics2/models/block/BlockTinyTNT.json deleted file mode 100644 index 3c3e239ea..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/BlockTinyTNT.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "parent": "block/block", - "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "textures": { - "0": "blocks/tnt_side", - "1": "blocks/tnt_top", - "2": "blocks/tnt_bottom" - }, - "elements": [ - { - "name": "Cube", - "from": [ 4.0, 0.0, 4.0 ], - "to": [ 12.0, 8.0, 12.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "up": { "texture": "#1", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "down": { "texture": "#2", "uv": [ 0.0, 0.0, 16.0, 16.0 ] } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/ChargedQuartzOreBlock.json b/src/main/resources/assets/appliedenergistics2/models/block/ChargedQuartzOreBlock.json deleted file mode 100644 index c7fed1498..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/ChargedQuartzOreBlock.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "appliedenergistics2:blocks/ChargedQuartzOreBlock" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/ChiseledQuartzBlock.json b/src/main/resources/assets/appliedenergistics2/models/block/ChiseledQuartzBlock.json deleted file mode 100644 index 0c159cc34..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/ChiseledQuartzBlock.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_column", - "textures": { - "end": "appliedenergistics2:blocks/ChiseledQuartzBlockTop", - "side": "appliedenergistics2:blocks/ChiseledQuartzBlockSide" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/creative_energy_cell.json b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/creative_energy_cell.json new file mode 100644 index 000000000..e6c879fc7 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/creative_energy_cell.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "appliedenergistics2:blocks/creative_energy_cell" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockCondenser.json b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/dense_energy_cell0.json similarity index 50% rename from src/main/resources/assets/appliedenergistics2/models/block/tile.BlockCondenser.json rename to src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/dense_energy_cell0.json index 8d3df6cda..e7a5effbf 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockCondenser.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/dense_energy_cell0.json @@ -1,6 +1,6 @@ { "parent": "block/cube_all", "textures": { - "all": "appliedenergistics2:blocks/BlockCondenser" + "all": "appliedenergistics2:blocks/energy_cell0" } } \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/dense_energy_cell1.json b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/dense_energy_cell1.json new file mode 100644 index 000000000..756b748e6 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/dense_energy_cell1.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "appliedenergistics2:blocks/energy_cell1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/dense_energy_cell2.json b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/dense_energy_cell2.json new file mode 100644 index 000000000..dde6c0917 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/dense_energy_cell2.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "appliedenergistics2:blocks/energy_cell2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/dense_energy_cell3.json b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/dense_energy_cell3.json new file mode 100644 index 000000000..4376a6897 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/dense_energy_cell3.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "appliedenergistics2:blocks/energy_cell3" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/dense_energy_cell4.json b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/dense_energy_cell4.json new file mode 100644 index 000000000..7ec91a16d --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/dense_energy_cell4.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "appliedenergistics2:blocks/energy_cell4" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/dense_energy_cell5.json b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/dense_energy_cell5.json new file mode 100644 index 000000000..2e56ec392 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/dense_energy_cell5.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "appliedenergistics2:blocks/energy_cell5" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/dense_energy_cell6.json b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/dense_energy_cell6.json new file mode 100644 index 000000000..be6a2e349 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/dense_energy_cell6.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "appliedenergistics2:blocks/energy_cell6" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/dense_energy_cell7.json b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/dense_energy_cell7.json new file mode 100644 index 000000000..d92a8d2ec --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/dense_energy_cell7.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "appliedenergistics2:blocks/energy_cell7" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/energy_cell.json b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/energy_cell.json new file mode 100644 index 000000000..719be0187 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/energy_cell.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "appliedenergistics2:blocks/energy_cell" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/energy_cell0.json b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/energy_cell0.json new file mode 100644 index 000000000..e7a5effbf --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/energy_cell0.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "appliedenergistics2:blocks/energy_cell0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/energy_cell1.json b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/energy_cell1.json new file mode 100644 index 000000000..756b748e6 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/energy_cell1.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "appliedenergistics2:blocks/energy_cell1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/energy_cell2.json b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/energy_cell2.json new file mode 100644 index 000000000..dde6c0917 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/energy_cell2.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "appliedenergistics2:blocks/energy_cell2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/energy_cell3.json b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/energy_cell3.json new file mode 100644 index 000000000..4376a6897 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/energy_cell3.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "appliedenergistics2:blocks/energy_cell3" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/energy_cell4.json b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/energy_cell4.json new file mode 100644 index 000000000..7ec91a16d --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/energy_cell4.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "appliedenergistics2:blocks/energy_cell4" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/energy_cell5.json b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/energy_cell5.json new file mode 100644 index 000000000..2e56ec392 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/energy_cell5.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "appliedenergistics2:blocks/energy_cell5" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/energy_cell6.json b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/energy_cell6.json new file mode 100644 index 000000000..be6a2e349 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/energy_cell6.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "appliedenergistics2:blocks/energy_cell6" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/energy_cell7.json b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/energy_cell7.json new file mode 100644 index 000000000..d92a8d2ec --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/energy_cell7.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "appliedenergistics2:blocks/energy_cell7" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockCreativeEnergyCell.json b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockCreativeEnergyCell.json deleted file mode 100644 index c557dfb71..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockCreativeEnergyCell.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "appliedenergistics2:blocks/BlockCreativeEnergyCell" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockDenseEnergyCell0.json b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockDenseEnergyCell0.json deleted file mode 100644 index 85eecdcee..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockDenseEnergyCell0.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "appliedenergistics2:blocks/BlockEnergyCell0" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockDenseEnergyCell1.json b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockDenseEnergyCell1.json deleted file mode 100644 index bef532994..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockDenseEnergyCell1.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "appliedenergistics2:blocks/BlockEnergyCell1" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockDenseEnergyCell2.json b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockDenseEnergyCell2.json deleted file mode 100644 index 7e8085caa..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockDenseEnergyCell2.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "appliedenergistics2:blocks/BlockEnergyCell2" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockDenseEnergyCell3.json b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockDenseEnergyCell3.json deleted file mode 100644 index e86676cb6..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockDenseEnergyCell3.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "appliedenergistics2:blocks/BlockEnergyCell3" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockDenseEnergyCell4.json b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockDenseEnergyCell4.json deleted file mode 100644 index 072b0653d..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockDenseEnergyCell4.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "appliedenergistics2:blocks/BlockEnergyCell4" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockDenseEnergyCell5.json b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockDenseEnergyCell5.json deleted file mode 100644 index 204149721..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockDenseEnergyCell5.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "appliedenergistics2:blocks/BlockEnergyCell5" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockDenseEnergyCell6.json b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockDenseEnergyCell6.json deleted file mode 100644 index fb65733e7..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockDenseEnergyCell6.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "appliedenergistics2:blocks/BlockEnergyCell6" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockDenseEnergyCell7.json b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockDenseEnergyCell7.json deleted file mode 100644 index cd13344d3..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockDenseEnergyCell7.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "appliedenergistics2:blocks/BlockEnergyCell7" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockEnergyCell.json b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockEnergyCell.json deleted file mode 100644 index 6a3a76e01..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockEnergyCell.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "appliedenergistics2:blocks/BlockEnergyCell" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockEnergyCell0.json b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockEnergyCell0.json deleted file mode 100644 index 85eecdcee..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockEnergyCell0.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "appliedenergistics2:blocks/BlockEnergyCell0" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockEnergyCell1.json b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockEnergyCell1.json deleted file mode 100644 index bef532994..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockEnergyCell1.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "appliedenergistics2:blocks/BlockEnergyCell1" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockEnergyCell2.json b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockEnergyCell2.json deleted file mode 100644 index 7e8085caa..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockEnergyCell2.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "appliedenergistics2:blocks/BlockEnergyCell2" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockEnergyCell3.json b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockEnergyCell3.json deleted file mode 100644 index e86676cb6..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockEnergyCell3.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "appliedenergistics2:blocks/BlockEnergyCell3" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockEnergyCell4.json b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockEnergyCell4.json deleted file mode 100644 index 072b0653d..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockEnergyCell4.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "appliedenergistics2:blocks/BlockEnergyCell4" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockEnergyCell5.json b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockEnergyCell5.json deleted file mode 100644 index 204149721..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockEnergyCell5.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "appliedenergistics2:blocks/BlockEnergyCell5" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockEnergyCell6.json b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockEnergyCell6.json deleted file mode 100644 index fb65733e7..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockEnergyCell6.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "appliedenergistics2:blocks/BlockEnergyCell6" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockEnergyCell7.json b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockEnergyCell7.json deleted file mode 100644 index cd13344d3..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/tile.BlockEnergyCell7.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "appliedenergistics2:blocks/BlockEnergyCell7" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/FluixBlock.json b/src/main/resources/assets/appliedenergistics2/models/block/FluixBlock.json deleted file mode 100644 index 61385fe10..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/FluixBlock.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "appliedenergistics2:blocks/FluixBlock" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/QuartzBlock.json b/src/main/resources/assets/appliedenergistics2/models/block/QuartzBlock.json deleted file mode 100644 index 18dcd739e..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/QuartzBlock.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "appliedenergistics2:blocks/QuartzBlock" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/QuartzGlassBlock.json b/src/main/resources/assets/appliedenergistics2/models/block/QuartzGlassBlock.json deleted file mode 100644 index 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/QuartzOreBlock.json b/src/main/resources/assets/appliedenergistics2/models/block/QuartzOreBlock.json deleted file mode 100644 index b783e9457..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/QuartzOreBlock.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "appliedenergistics2:blocks/QuartzOreBlock" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/QuartzPillarBlock.json b/src/main/resources/assets/appliedenergistics2/models/block/QuartzPillarBlock.json deleted file mode 100644 index da4faeddd..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/QuartzPillarBlock.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_column", - "textures": { - "end": "appliedenergistics2:blocks/QuartzPillarBlockTop", - "side": "appliedenergistics2:blocks/QuartzPillarBlockSide" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/SkyStoneBlock.BLOCK.json b/src/main/resources/assets/appliedenergistics2/models/block/SkyStoneBlock.BLOCK.json deleted file mode 100644 index dda1bb1ae..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/SkyStoneBlock.BLOCK.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "appliedenergistics2:blocks/SkyStoneBlock.BLOCK" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/SkyStoneBlock.BRICK.json b/src/main/resources/assets/appliedenergistics2/models/block/SkyStoneBlock.BRICK.json deleted file mode 100644 index a3cd423f4..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/SkyStoneBlock.BRICK.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "appliedenergistics2:blocks/SkyStoneBlock.BRICK" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/SkyStoneBlock.SMALL_BRICK.json b/src/main/resources/assets/appliedenergistics2/models/block/SkyStoneBlock.SMALL_BRICK.json deleted file mode 100644 index a941ae5e3..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/SkyStoneBlock.SMALL_BRICK.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "appliedenergistics2:blocks/SkyStoneBlock.SMALL_BRICK" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/SkyStoneBlock.STONE.json b/src/main/resources/assets/appliedenergistics2/models/block/SkyStoneBlock.STONE.json deleted file mode 100644 index 414aca4a6..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/SkyStoneBlock.STONE.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "appliedenergistics2:blocks/SkyStoneBlock.STONE" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/Wireless.model b/src/main/resources/assets/appliedenergistics2/models/block/Wireless.model deleted file mode 100644 index c57d0185032a43bb57782a5b9f3ac3a3cb060756..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2007 zcmWIWW@Zs#;Nak3NL}{Yg8>O}F)%RX=BK3Q=w%h>=bfDqm_OS<;P`#*uhtQ75@(B; zN;qBmVmMXJH_9|~_LlaQT@r@AR~V)$zFxNKeyt(fZO;Sy5-v<*Z=dkE{`uqf_h(K& zWxZ8D=c&=DNi9oSi<{@{&T-xLqH#$}8*Ajk*nOVz7i9M?eK@~j^7{MFI%eMq5)zYi zeSgjMV~Mexy2&b^b>E5}w@A9)N&9n8GISr;r`G_t~w-(O$6#Vt_v3u;ZmL4s-*cY#`;nUV1iGr~PEVZAO`S6+_?UB=aZlYcMqPxR- z^YP_z+?iL;eE8UKigET8pC7D6Z8mOe1dTr*f4XGWedfAugQ}K`$7`BC96mcI>QlRF z!wz<)TFJZs$6Q|pdFGkT=Xkmv)HvrDF!@i|_;5XAx;B&j#E9Mh3d7@m9|{v*apzK6 zNG_*Mv!roj<0Q8nC$^>q5wrfTDk^)fKfzl;tnxkEf*O^Y%Jf}KH#IH%T&lnQy-teB*71Q4`vQH2 zIsAv_mw!;mI4#{^&lApkJ#J}C)YW^%O~#+f=a{WNyIyMM@)ch%{K;ep*|b`9g1ziv z#T7Yqyfay@#YK9)xwrQKv-R`6^EC}B9EUOul!{~@T(>yNxLo$=tOJ)l=f)N>CfP3dZrR8CA@=Zt$N5j&7Qa_u zo%W$|%YrwJM;cxEWo$NAsu>&N|P3h-v<$YXHZ?##@<5Fx|BfII6c zFfcHbq*j!a7Nr*JJLTjjXNPANrRJm-7klOvXQrg;738HezG4*p*BRjF&dVhQ%BsAc z9xg!)3=9Gw%)!RMz##wmeAR^~G>Fi4fSMwA5Sru zXJBBA^mK6yvG7m5WS++y$m4o3vNu}1iP5x4>gk-Ne=7vz-fidaRqub$q+owIb;irG z-Lckk{clUGw*IZVzvuk(&zI|Lo>eCiSnF&dTD~me$E%a|Hf^bk;y0` zp0G8_lxad{&-p%vj6-Y_q$|v4pI!Ah!9b&zE8)J6(=P^Liv?+O8;)2o|EQ?1p14Ng z8^6MdlZ*^2UaZc3``P`*pV|XS8&_PlQjSz+SbVulg#CeEX2RW{HUHQRTF*~uVfZyE zw78(spCMiCL>}L=hPBckx2;Q?d~!*WK0{QH!lbueH)cAl>-70(qqIsd=V;wShegb6 z1>2b2Zh!s%)y`1Hj(1im=S$4&=J(A!6x|c6Ex>T)-?>SjmS5u9bnJcg z&3%mbF5jB{G<52DP+{!p>gTe~DWM6Jcsg_*?SIe6!0?I@U*eHsz?FDF$>ufBhvMf? zCp}6^NOh}~v%kTKS6@QHi&sJ-PSwC5;%q{Kfc}il+85X~4n{r@j68GTz;>P%$=mPOoMGqk zn!3Yn3d{55Q>UnlEj40MNqaW+#m}8>8dD@+&wM2*wX43&h<(+kk0pgX8$b9@OR&`u zPrUQ#y3NzW{Qs6u{vngL)N95Z6Mu_as=wl+yk50b9(tdjKi{MN$N&9x?Ax8ssj%^< z^&K|kyDbr1X1pP@z|cM^AuX+7?Y7?=OJ3~`TdqsF@S<@wcn;qpBWe! z{xE=oj*&@(0a588=Sfgb0tGt)BdWjvZ&ZEA(E-Y_2tC!zxS{}&f6+}tb|EMV5vJ{6 b#bp{OLIb>6L7AO_nSq(%90LQxXD|-{y}M8W diff --git a/src/main/resources/assets/appliedenergistics2/models/block/cell_work_bench.json b/src/main/resources/assets/appliedenergistics2/models/block/cell_work_bench.json new file mode 100644 index 000000000..4e7b2609e --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/cell_work_bench.json @@ -0,0 +1,8 @@ +{ + "parent": "block/cube_bottom_top", + "textures": { + "bottom": "appliedenergistics2:blocks/cell_work_bench_bottom", + "side": "appliedenergistics2:blocks/cell_work_bench_side", + "top": "appliedenergistics2:blocks/cell_work_bench" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/charged_quartz_ore.json b/src/main/resources/assets/appliedenergistics2/models/block/charged_quartz_ore.json new file mode 100644 index 000000000..7fa1351d0 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/charged_quartz_ore.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "appliedenergistics2:blocks/charged_quartz_ore" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/charger.json b/src/main/resources/assets/appliedenergistics2/models/block/charger.json new file mode 100644 index 000000000..e60a5b116 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/charger.json @@ -0,0 +1,356 @@ +{ + "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", + "elements": [ + { + "faces": { + "down": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 4.0, + 1.0 + ] + }, + "east": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 1.0, + 16.0 + ] + }, + "north": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 4.0, + 16.0 + ] + }, + "south": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 4.0, + 16.0 + ] + }, + "up": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 4.0, + 1.0 + ] + }, + "west": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 1.0, + 16.0 + ] + } + }, + "from": [ + 6.0, + 0.0, + 15.0 + ], + "name": "Back", + "to": [ + 10.0, + 16.0, + 16.0 + ] + }, + { + "faces": { + "down": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 12.0, + 13.0 + ] + }, + "east": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 13.0, + 2.0 + ] + }, + "north": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 12.0, + 2.0 + ] + }, + "south": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 12.0, + 2.0 + ] + }, + "up": { + "texture": "#0", + "uv": [ + 2.0, + 2.0, + 14.0, + 15.0 + ] + }, + "west": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 13.0, + 2.0 + ] + } + }, + "from": [ + 2.0, + 0.0, + 2.0 + ], + "name": "Bottom", + "to": [ + 14.0, + 2.0, + 15.0 + ] + }, + { + "faces": { + "down": { + "texture": "#0", + "uv": [ + 2.0, + 1.0, + 14.0, + 14.0 + ] + }, + "east": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 13.0, + 3.0 + ] + }, + "north": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 12.0, + 3.0 + ] + }, + "south": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 12.0, + 3.0 + ] + }, + "up": { + "texture": "#1", + "uv": [ + 2.0, + 2.0, + 14.0, + 15.0 + ] + }, + "west": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 13.0, + 3.0 + ] + } + }, + "from": [ + 2.0, + 13.0, + 2.0 + ], + "name": "Top", + "to": [ + 14.0, + 16.0, + 15.0 + ] + }, + { + "faces": { + "down": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 10.0, + 10.0 + ] + }, + "east": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 10.0, + 1.0 + ] + }, + "north": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 10.0, + 1.0 + ] + }, + "south": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 10.0, + 1.0 + ] + }, + "up": { + "texture": "#2", + "uv": [ + 3.0, + 3.0, + 13.0, + 13.0 + ] + }, + "west": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 10.0, + 1.0 + ] + } + }, + "from": [ + 3.0, + 2.0, + 3.0 + ], + "name": "BottomTop", + "to": [ + 13.0, + 3.0, + 13.0 + ] + }, + { + "faces": { + "down": { + "texture": "#2", + "uv": [ + 3.0, + 3.0, + 13.0, + 13.0 + ] + }, + "east": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 10.0, + 1.0 + ] + }, + "north": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 10.0, + 1.0 + ] + }, + "south": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 10.0, + 1.0 + ] + }, + "up": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 10.0, + 10.0 + ] + }, + "west": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 10.0, + 1.0 + ] + } + }, + "from": [ + 3.0, + 12.0, + 3.0 + ], + "name": "TopTop", + "to": [ + 13.0, + 13.0, + 13.0 + ] + } + ], + "parent": "block/orientable", + "textures": { + "0": "appliedenergistics2:blocks/charger_side", + "1": "appliedenergistics2:blocks/charger", + "2": "appliedenergistics2:blocks/charger_inside" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/chiseled_quartz.json b/src/main/resources/assets/appliedenergistics2/models/block/chiseled_quartz.json new file mode 100644 index 000000000..d8d23d408 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/chiseled_quartz.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cube_column", + "textures": { + "end": "appliedenergistics2:blocks/chiseled_quartz_block_top", + "side": "appliedenergistics2:blocks/chiseled_quartz_block_side" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/condenser.json b/src/main/resources/assets/appliedenergistics2/models/block/condenser.json new file mode 100644 index 000000000..e502d3d0f --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/condenser.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "appliedenergistics2:blocks/condenser" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_block_conflicted.uvl.json b/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_block_conflicted.uvl.json deleted file mode 100644 index ce79d3db0..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_block_conflicted.uvl.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "parent": "block/block", - "display": { - "firstperson_righthand": { - "rotation": [ 0, 135, 0 ], - "translation": [ 0, 0, 0 ], - "scale": [ 0.40, 0.40, 0.40 ] - } - }, - "textures": { - "particle": "#block", - "block": "appliedenergistics2:blocks/BlockControllerPowered", - "lights": "appliedenergistics2:blocks/BlockControllerConflict" - }, - "elements": [ - { - "from": [ 0, 0, 0 ], - "to": [ 16, 16, 16 ], - "shade": false, - "faces": { - "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#lights", "uvlightmap": { "sky": 0.007, "block": 0.007 }}, - "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#lights", "uvlightmap": { "sky": 0.007, "block": 0.007 }}, - "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#lights", "uvlightmap": { "sky": 0.007, "block": 0.007 }}, - "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#lights", "uvlightmap": { "sky": 0.007, "block": 0.007 }}, - "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#lights", "uvlightmap": { "sky": 0.007, "block": 0.007 }}, - "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#lights", "uvlightmap": { "sky": 0.007, "block": 0.007 }} - } - }, - { - "from": [ 0, 0, 0 ], - "to": [ 16, 16, 16 ], - "faces": { - "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#block"}, - "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#block"}, - "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#block"}, - "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#block"}, - "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#block"}, - "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#block"} - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_block_conflicted_uvl.json b/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_block_conflicted_uvl.json new file mode 100644 index 000000000..46738ddfa --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_block_conflicted_uvl.json @@ -0,0 +1,190 @@ +{ + "display": { + "firstperson_righthand": { + "rotation": [ + 0, + 135, + 0 + ], + "scale": [ + 0.40, + 0.40, + 0.40 + ], + "translation": [ + 0, + 0, + 0 + ] + } + }, + "elements": [ + { + "faces": { + "down": { + "texture": "#lights", + "uv": [ + 0, + 0, + 16, + 16 + ], + "uvlightmap": { + "block": 0.007, + "sky": 0.007 + } + }, + "east": { + "texture": "#lights", + "uv": [ + 0, + 0, + 16, + 16 + ], + "uvlightmap": { + "block": 0.007, + "sky": 0.007 + } + }, + "north": { + "texture": "#lights", + "uv": [ + 0, + 0, + 16, + 16 + ], + "uvlightmap": { + "block": 0.007, + "sky": 0.007 + } + }, + "south": { + "texture": "#lights", + "uv": [ + 0, + 0, + 16, + 16 + ], + "uvlightmap": { + "block": 0.007, + "sky": 0.007 + } + }, + "up": { + "texture": "#lights", + "uv": [ + 0, + 0, + 16, + 16 + ], + "uvlightmap": { + "block": 0.007, + "sky": 0.007 + } + }, + "west": { + "texture": "#lights", + "uv": [ + 0, + 0, + 16, + 16 + ], + "uvlightmap": { + "block": 0.007, + "sky": 0.007 + } + } + }, + "from": [ + 0, + 0, + 0 + ], + "shade": false, + "to": [ + 16, + 16, + 16 + ] + }, + { + "faces": { + "down": { + "texture": "#block", + "uv": [ + 0, + 0, + 16, + 16 + ] + }, + "east": { + "texture": "#block", + "uv": [ + 0, + 0, + 16, + 16 + ] + }, + "north": { + "texture": "#block", + "uv": [ + 0, + 0, + 16, + 16 + ] + }, + "south": { + "texture": "#block", + "uv": [ + 0, + 0, + 16, + 16 + ] + }, + "up": { + "texture": "#block", + "uv": [ + 0, + 0, + 16, + 16 + ] + }, + "west": { + "texture": "#block", + "uv": [ + 0, + 0, + 16, + 16 + ] + } + }, + "from": [ + 0, + 0, + 0 + ], + "to": [ + 16, + 16, + 16 + ] + } + ], + "parent": "block/block", + "textures": { + "block": "appliedenergistics2:blocks/controller_powered", + "lights": "appliedenergistics2:blocks/controller_conflict", + "particle": "#block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_block_offline.json b/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_block_offline.json index ce19e30cb..570f0e7f3 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_block_offline.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_block_offline.json @@ -1,6 +1,6 @@ { "parent": "block/cube_all", "textures": { - "all": "appliedenergistics2:blocks/BlockController" + "all": "appliedenergistics2:blocks/controller" } } \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_block_online.uvl.json b/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_block_online.uvl.json deleted file mode 100644 index a2ee5b384..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_block_online.uvl.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "parent": "block/block", - "display": { - "firstperson_righthand": { - "rotation": [ 0, 135, 0 ], - "translation": [ 0, 0, 0 ], - "scale": [ 0.40, 0.40, 0.40 ] - } - }, - "textures": { - "particle": "#block", - "block": "appliedenergistics2:blocks/BlockControllerPowered", - "lights": "appliedenergistics2:blocks/BlockControllerLights" - }, - "elements": [ - { - "from": [ 0, 0, 0 ], - "to": [ 16, 16, 16 ], - "shade": false, - "faces": { - "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#lights", "uvlightmap": { "sky": 0.007, "block": 0.007 }}, - "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#lights", "uvlightmap": { "sky": 0.007, "block": 0.007 }}, - "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#lights", "uvlightmap": { "sky": 0.007, "block": 0.007 }}, - "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#lights", "uvlightmap": { "sky": 0.007, "block": 0.007 }}, - "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#lights", "uvlightmap": { "sky": 0.007, "block": 0.007 }}, - "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#lights", "uvlightmap": { "sky": 0.007, "block": 0.007 }} - } - }, - { - "from": [ 0, 0, 0 ], - "to": [ 16, 16, 16 ], - "faces": { - "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#block"}, - "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#block"}, - "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#block"}, - "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#block"}, - "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#block"}, - "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#block"} - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_block_online_uvl.json b/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_block_online_uvl.json new file mode 100644 index 000000000..7ac5f246e --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_block_online_uvl.json @@ -0,0 +1,190 @@ +{ + "display": { + "firstperson_righthand": { + "rotation": [ + 0, + 135, + 0 + ], + "scale": [ + 0.40, + 0.40, + 0.40 + ], + "translation": [ + 0, + 0, + 0 + ] + } + }, + "elements": [ + { + "faces": { + "down": { + "texture": "#lights", + "uv": [ + 0, + 0, + 16, + 16 + ], + "uvlightmap": { + "block": 0.007, + "sky": 0.007 + } + }, + "east": { + "texture": "#lights", + "uv": [ + 0, + 0, + 16, + 16 + ], + "uvlightmap": { + "block": 0.007, + "sky": 0.007 + } + }, + "north": { + "texture": "#lights", + "uv": [ + 0, + 0, + 16, + 16 + ], + "uvlightmap": { + "block": 0.007, + "sky": 0.007 + } + }, + "south": { + "texture": "#lights", + "uv": [ + 0, + 0, + 16, + 16 + ], + "uvlightmap": { + "block": 0.007, + "sky": 0.007 + } + }, + "up": { + "texture": "#lights", + "uv": [ + 0, + 0, + 16, + 16 + ], + "uvlightmap": { + "block": 0.007, + "sky": 0.007 + } + }, + "west": { + "texture": "#lights", + "uv": [ + 0, + 0, + 16, + 16 + ], + "uvlightmap": { + "block": 0.007, + "sky": 0.007 + } + } + }, + "from": [ + 0, + 0, + 0 + ], + "shade": false, + "to": [ + 16, + 16, + 16 + ] + }, + { + "faces": { + "down": { + "texture": "#block", + "uv": [ + 0, + 0, + 16, + 16 + ] + }, + "east": { + "texture": "#block", + "uv": [ + 0, + 0, + 16, + 16 + ] + }, + "north": { + "texture": "#block", + "uv": [ + 0, + 0, + 16, + 16 + ] + }, + "south": { + "texture": "#block", + "uv": [ + 0, + 0, + 16, + 16 + ] + }, + "up": { + "texture": "#block", + "uv": [ + 0, + 0, + 16, + 16 + ] + }, + "west": { + "texture": "#block", + "uv": [ + 0, + 0, + 16, + 16 + ] + } + }, + "from": [ + 0, + 0, + 0 + ], + "to": [ + 16, + 16, + 16 + ] + } + ], + "parent": "block/block", + "textures": { + "block": "appliedenergistics2:blocks/controller_powered", + "lights": "appliedenergistics2:blocks/controller_lights", + "particle": "#block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_column_conflicted.uvl.json b/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_column_conflicted.uvl.json deleted file mode 100644 index 0dfbdfc0c..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_column_conflicted.uvl.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "parent": "block/block", - "display": { - "firstperson_righthand": { - "rotation": [ 0, 135, 0 ], - "translation": [ 0, 0, 0 ], - "scale": [ 0.40, 0.40, 0.40 ] - } - }, - "textures": { - "particle": "#block", - "block": "appliedenergistics2:blocks/BlockControllerColumnPowered", - "lights": "appliedenergistics2:blocks/BlockControllerColumnConflict" - }, - "elements": [ - { - "from": [ 0, 0, 0 ], - "to": [ 16, 16, 16 ], - "shade": false, - "faces": { - "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#lights", "uvlightmap": { "sky": 0.007, "block": 0.007 }}, - "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#lights", "uvlightmap": { "sky": 0.007, "block": 0.007 }}, - "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#lights", "uvlightmap": { "sky": 0.007, "block": 0.007 }}, - "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#lights", "uvlightmap": { "sky": 0.007, "block": 0.007 }}, - "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#lights", "uvlightmap": { "sky": 0.007, "block": 0.007 }}, - "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#lights", "uvlightmap": { "sky": 0.007, "block": 0.007 }} - } - }, - { - "from": [ 0, 0, 0 ], - "to": [ 16, 16, 16 ], - "faces": { - "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#block"}, - "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#block"}, - "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#block"}, - "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#block"}, - "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#block"}, - "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#block"} - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_column_conflicted_uvl.json b/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_column_conflicted_uvl.json new file mode 100644 index 000000000..0b59a7eb9 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_column_conflicted_uvl.json @@ -0,0 +1,190 @@ +{ + "display": { + "firstperson_righthand": { + "rotation": [ + 0, + 135, + 0 + ], + "scale": [ + 0.40, + 0.40, + 0.40 + ], + "translation": [ + 0, + 0, + 0 + ] + } + }, + "elements": [ + { + "faces": { + "down": { + "texture": "#lights", + "uv": [ + 0, + 0, + 16, + 16 + ], + "uvlightmap": { + "block": 0.007, + "sky": 0.007 + } + }, + "east": { + "texture": "#lights", + "uv": [ + 0, + 0, + 16, + 16 + ], + "uvlightmap": { + "block": 0.007, + "sky": 0.007 + } + }, + "north": { + "texture": "#lights", + "uv": [ + 0, + 0, + 16, + 16 + ], + "uvlightmap": { + "block": 0.007, + "sky": 0.007 + } + }, + "south": { + "texture": "#lights", + "uv": [ + 0, + 0, + 16, + 16 + ], + "uvlightmap": { + "block": 0.007, + "sky": 0.007 + } + }, + "up": { + "texture": "#lights", + "uv": [ + 0, + 0, + 16, + 16 + ], + "uvlightmap": { + "block": 0.007, + "sky": 0.007 + } + }, + "west": { + "texture": "#lights", + "uv": [ + 0, + 0, + 16, + 16 + ], + "uvlightmap": { + "block": 0.007, + "sky": 0.007 + } + } + }, + "from": [ + 0, + 0, + 0 + ], + "shade": false, + "to": [ + 16, + 16, + 16 + ] + }, + { + "faces": { + "down": { + "texture": "#block", + "uv": [ + 0, + 0, + 16, + 16 + ] + }, + "east": { + "texture": "#block", + "uv": [ + 0, + 0, + 16, + 16 + ] + }, + "north": { + "texture": "#block", + "uv": [ + 0, + 0, + 16, + 16 + ] + }, + "south": { + "texture": "#block", + "uv": [ + 0, + 0, + 16, + 16 + ] + }, + "up": { + "texture": "#block", + "uv": [ + 0, + 0, + 16, + 16 + ] + }, + "west": { + "texture": "#block", + "uv": [ + 0, + 0, + 16, + 16 + ] + } + }, + "from": [ + 0, + 0, + 0 + ], + "to": [ + 16, + 16, + 16 + ] + } + ], + "parent": "block/block", + "textures": { + "block": "appliedenergistics2:blocks/controller_column_powered", + "lights": "appliedenergistics2:blocks/controller_column_conflict", + "particle": "#block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_column_offline.json b/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_column_offline.json index accac3e47..2888093a9 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_column_offline.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_column_offline.json @@ -1,6 +1,6 @@ { "parent": "block/cube_all", "textures": { - "all": "appliedenergistics2:blocks/BlockControllerColumn" + "all": "appliedenergistics2:blocks/controller_column" } } \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_column_online.uvl.json b/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_column_online.uvl.json deleted file mode 100644 index 36ddc3700..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_column_online.uvl.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "parent": "block/block", - "display": { - "firstperson_righthand": { - "rotation": [ 0, 135, 0 ], - "translation": [ 0, 0, 0 ], - "scale": [ 0.40, 0.40, 0.40 ] - } - }, - "textures": { - "particle": "#block", - "block": "appliedenergistics2:blocks/BlockControllerColumnPowered", - "lights": "appliedenergistics2:blocks/BlockControllerColumnLights" - }, - "elements": [ - { - "from": [ 0, 0, 0 ], - "to": [ 16, 16, 16 ], - "shade": false, - "faces": { - "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#lights", "uvlightmap": { "sky": 0.007, "block": 0.007 }}, - "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#lights", "uvlightmap": { "sky": 0.007, "block": 0.007 }}, - "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#lights", "uvlightmap": { "sky": 0.007, "block": 0.007 }}, - "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#lights", "uvlightmap": { "sky": 0.007, "block": 0.007 }}, - "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#lights", "uvlightmap": { "sky": 0.007, "block": 0.007 }}, - "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#lights", "uvlightmap": { "sky": 0.007, "block": 0.007 }} - } - }, - { - "from": [ 0, 0, 0 ], - "to": [ 16, 16, 16 ], - "faces": { - "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#block"}, - "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#block"}, - "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#block"}, - "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#block"}, - "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#block"}, - "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#block"} - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_column_online_uvl.json b/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_column_online_uvl.json new file mode 100644 index 000000000..93f228171 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_column_online_uvl.json @@ -0,0 +1,190 @@ +{ + "display": { + "firstperson_righthand": { + "rotation": [ + 0, + 135, + 0 + ], + "scale": [ + 0.40, + 0.40, + 0.40 + ], + "translation": [ + 0, + 0, + 0 + ] + } + }, + "elements": [ + { + "faces": { + "down": { + "texture": "#lights", + "uv": [ + 0, + 0, + 16, + 16 + ], + "uvlightmap": { + "block": 0.007, + "sky": 0.007 + } + }, + "east": { + "texture": "#lights", + "uv": [ + 0, + 0, + 16, + 16 + ], + "uvlightmap": { + "block": 0.007, + "sky": 0.007 + } + }, + "north": { + "texture": "#lights", + "uv": [ + 0, + 0, + 16, + 16 + ], + "uvlightmap": { + "block": 0.007, + "sky": 0.007 + } + }, + "south": { + "texture": "#lights", + "uv": [ + 0, + 0, + 16, + 16 + ], + "uvlightmap": { + "block": 0.007, + "sky": 0.007 + } + }, + "up": { + "texture": "#lights", + "uv": [ + 0, + 0, + 16, + 16 + ], + "uvlightmap": { + "block": 0.007, + "sky": 0.007 + } + }, + "west": { + "texture": "#lights", + "uv": [ + 0, + 0, + 16, + 16 + ], + "uvlightmap": { + "block": 0.007, + "sky": 0.007 + } + } + }, + "from": [ + 0, + 0, + 0 + ], + "shade": false, + "to": [ + 16, + 16, + 16 + ] + }, + { + "faces": { + "down": { + "texture": "#block", + "uv": [ + 0, + 0, + 16, + 16 + ] + }, + "east": { + "texture": "#block", + "uv": [ + 0, + 0, + 16, + 16 + ] + }, + "north": { + "texture": "#block", + "uv": [ + 0, + 0, + 16, + 16 + ] + }, + "south": { + "texture": "#block", + "uv": [ + 0, + 0, + 16, + 16 + ] + }, + "up": { + "texture": "#block", + "uv": [ + 0, + 0, + 16, + 16 + ] + }, + "west": { + "texture": "#block", + "uv": [ + 0, + 0, + 16, + 16 + ] + } + }, + "from": [ + 0, + 0, + 0 + ], + "to": [ + 16, + 16, + 16 + ] + } + ], + "parent": "block/block", + "textures": { + "block": "appliedenergistics2:blocks/controller_column_powered", + "lights": "appliedenergistics2:blocks/controller_column_lights", + "particle": "#block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_inside_a.json b/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_inside_a.json index db18e8b3a..113d95caa 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_inside_a.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_inside_a.json @@ -1,6 +1,6 @@ { - "parent": "block/cube_all", - "textures": { - "all": "appliedenergistics2:blocks/BlockControllerInsideA" - } + "parent": "block/cube_all", + "textures": { + "all": "appliedenergistics2:blocks/controller_inside_a" + } } \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_inside_b.json b/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_inside_b.json index f21a110ab..60847ca1b 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_inside_b.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_inside_b.json @@ -1,6 +1,6 @@ { - "parent": "block/cube_all", - "textures": { - "all": "appliedenergistics2:blocks/BlockControllerInsideB" - } + "parent": "block/cube_all", + "textures": { + "all": "appliedenergistics2:blocks/controller_inside_b" + } } \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/cube/cube_AE _all.json b/src/main/resources/assets/appliedenergistics2/models/block/cube/cube_AE _all.json index 11bcd6b55..dbd59267f 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/cube/cube_AE _all.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/cube/cube_AE _all.json @@ -1,12 +1,12 @@ { - "parent": "appliedenergistics2:block/cube_AE", + "parent": "appliedenergistics2:block/cube_ae", "textures": { - "particle": "#all", "down": "#all", - "up": "#all", - "north": "#all", "east": "#all", + "north": "#all", + "particle": "#all", "south": "#all", + "up": "#all", "west": "#all" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/cube/cube_AE.json b/src/main/resources/assets/appliedenergistics2/models/block/cube/cube_AE.json index 4cc92aa27..754f22726 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/cube/cube_AE.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/cube/cube_AE.json @@ -1,25 +1,58 @@ { - "parent": "block/block", - "ambientocclusion": false, - "display": { + "ambientocclusion": false, + "display": { "firstperson_righthand": { - "rotation": [ 0, 135, 0 ], - "translation": [ 0, 0, 0 ], - "scale": [ 0.40, 0.40, 0.40 ] + "rotation": [ + 0, + 135, + 0 + ], + "scale": [ + 0.40, + 0.40, + 0.40 + ], + "translation": [ + 0, + 0, + 0 + ] } }, - "elements": [ - { "from": [ 0, 0, 0 ], - "to": [ 16, 16, 16 ], - "shade": false, + "elements": [ + { "faces": { - "down": { "texture": "#down"}, - "up": { "texture": "#up"}, - "north": { "texture": "#north"}, - "south": { "texture": "#south"}, - "west": { "texture": "#west"}, - "east": { "texture": "#east"} - } + "down": { + "texture": "#down" + }, + "east": { + "texture": "#east" + }, + "north": { + "texture": "#north" + }, + "south": { + "texture": "#south" + }, + "up": { + "texture": "#up" + }, + "west": { + "texture": "#west" + } + }, + "from": [ + 0, + 0, + 0 + ], + "shade": false, + "to": [ + 16, + 16, + 16 + ] } - ] + ], + "parent": "block/block" } \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/cube/cube_AE_bottom_top.json b/src/main/resources/assets/appliedenergistics2/models/block/cube/cube_AE_bottom_top.json index b36870d4d..d1fb3f5b7 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/cube/cube_AE_bottom_top.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/cube/cube_AE_bottom_top.json @@ -1,12 +1,12 @@ { - "parent": "appliedenergistics2:block/cube_AE", + "parent": "appliedenergistics2:block/cube_ae", "textures": { - "particle": "#side", "down": "#bottom", - "up": "#top", - "north": "#side", "east": "#side", + "north": "#side", + "particle": "#side", "south": "#side", + "up": "#top", "west": "#side" } } \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/cube/cube_AE_machine.json b/src/main/resources/assets/appliedenergistics2/models/block/cube/cube_AE_machine.json index 5dcd93ae8..3d393f765 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/cube/cube_AE_machine.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/cube/cube_AE_machine.json @@ -1,12 +1,12 @@ { - "parent": "appliedenergistics2:block/cube/cube_AE", + "parent": "appliedenergistics2:block/cube/cube_ae", "textures": { - "particle": "#front", "down": "#bottom", - "up": "#top", - "north": "#front", "east": "#side", + "north": "#front", + "particle": "#front", "south": "#side", + "up": "#top", "west": "#side" } } \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/drive.json b/src/main/resources/assets/appliedenergistics2/models/block/drive.json new file mode 100644 index 000000000..3da8cb2ea --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/drive.json @@ -0,0 +1,700 @@ +{ + "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", + "elements": [ + { + "faces": { + "down": { + "texture": "#2", + "uv": [ + 1.0, + 0.0, + 15.0, + 16.0 + ] + }, + "east": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 16.0, + 1.0 + ] + }, + "north": { + "texture": "#0", + "uv": [ + 1.0, + 15.0, + 15.0, + 16.0 + ] + }, + "south": { + "texture": "#1", + "uv": [ + 1.0, + 15.0, + 15.0, + 16.0 + ] + }, + "up": { + "texture": "#2", + "uv": [ + 1.0, + 0.0, + 15.0, + 16.0 + ] + }, + "west": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 16.0, + 1.0 + ] + } + }, + "from": [ + 1.0, + 0.0, + 0.0 + ], + "name": "Bottom", + "to": [ + 15.0, + 1.0, + 16.0 + ] + }, + { + "faces": { + "down": { + "texture": "#2", + "uv": [ + 0.0, + 0.0, + 1.0, + 16.0 + ] + }, + "east": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 16.0, + 16.0 + ] + }, + "north": { + "texture": "#0", + "uv": [ + 15.0, + 0.0, + 16.0, + 16.0 + ] + }, + "south": { + "texture": "#1", + "uv": [ + 0.0, + 0.0, + 1.0, + 16.0 + ] + }, + "up": { + "texture": "#2", + "uv": [ + 0.0, + 0.0, + 1.0, + 16.0 + ] + }, + "west": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 16.0, + 16.0 + ] + } + }, + "from": [ + 0.0, + 0.0, + 0.0 + ], + "name": "Left", + "to": [ + 1.0, + 16.0, + 16.0 + ] + }, + { + "faces": { + "down": { + "texture": "#2", + "uv": [ + 1.0, + 0.0, + 15.0, + 16.0 + ] + }, + "east": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 16.0, + 1.0 + ] + }, + "north": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 14.0, + 1.0 + ] + }, + "south": { + "texture": "#1", + "uv": [ + 1.0, + 0.0, + 15.0, + 1.0 + ] + }, + "up": { + "texture": "#2", + "uv": [ + 1.0, + 0.0, + 15.0, + 16.0 + ] + }, + "west": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 16.0, + 1.0 + ] + } + }, + "from": [ + 1.0, + 15.0, + 0.0 + ], + "name": "Top", + "to": [ + 15.0, + 16.0, + 16.0 + ] + }, + { + "faces": { + "down": { + "texture": "#2", + "uv": [ + 15.0, + 0.0, + 16.0, + 16.0 + ] + }, + "east": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 16.0, + 16.0 + ] + }, + "north": { + "texture": "#2", + "uv": [ + 0.0, + 0.0, + 1.0, + 16.0 + ] + }, + "south": { + "texture": "#1", + "uv": [ + 15.0, + 0.0, + 16.0, + 16.0 + ] + }, + "up": { + "texture": "#2", + "uv": [ + 15.0, + 0.0, + 16.0, + 16.0 + ] + }, + "west": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 16.0, + 16.0 + ] + } + }, + "from": [ + 15.0, + 0.0, + 0.0 + ], + "name": "Right", + "to": [ + 16.0, + 16.0, + 16.0 + ] + }, + { + "faces": { + "down": { + "texture": "#2", + "uv": [ + 1.0, + 1.0, + 15.0, + 15.0 + ] + }, + "east": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 14.0, + 1.0 + ] + }, + "north": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 14.0, + 1.0 + ] + }, + "south": { + "texture": "#1", + "uv": [ + 1.0, + 12.0, + 15.0, + 13.0 + ] + }, + "up": { + "texture": "#2", + "uv": [ + 1.0, + 1.0, + 15.0, + 15.0 + ] + }, + "west": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 14.0, + 1.0 + ] + } + }, + "from": [ + 1.0, + 3.0, + 1.0 + ], + "name": "Rack", + "to": [ + 15.0, + 4.0, + 15.0 + ] + }, + { + "faces": { + "down": { + "texture": "#2", + "uv": [ + 1.0, + 1.0, + 15.0, + 15.0 + ] + }, + "east": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 14.0, + 1.0 + ] + }, + "north": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 14.0, + 1.0 + ] + }, + "south": { + "texture": "#1", + "uv": [ + 1.0, + 9.0, + 15.0, + 10.0 + ] + }, + "up": { + "texture": "#2", + "uv": [ + 1.0, + 1.0, + 15.0, + 15.0 + ] + }, + "west": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 14.0, + 1.0 + ] + } + }, + "from": [ + 1.0, + 6.0, + 1.0 + ], + "name": "Rack 2", + "to": [ + 15.0, + 7.0, + 15.0 + ] + }, + { + "faces": { + "down": { + "texture": "#2", + "uv": [ + 1.0, + 1.0, + 15.0, + 15.0 + ] + }, + "east": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 14.0, + 1.0 + ] + }, + "north": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 14.0, + 1.0 + ] + }, + "south": { + "texture": "#1", + "uv": [ + 1.0, + 6.0, + 15.0, + 7.0 + ] + }, + "up": { + "texture": "#2", + "uv": [ + 1.0, + 1.0, + 15.0, + 15.0 + ] + }, + "west": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 14.0, + 1.0 + ] + } + }, + "from": [ + 1.0, + 9.0, + 1.0 + ], + "name": "Rack 3", + "to": [ + 15.0, + 10.0, + 15.0 + ] + }, + { + "faces": { + "down": { + "texture": "#2", + "uv": [ + 1.0, + 1.0, + 15.0, + 15.0 + ] + }, + "east": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 14.0, + 1.0 + ] + }, + "north": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 14.0, + 1.0 + ] + }, + "south": { + "texture": "#1", + "uv": [ + 1.0, + 3.0, + 15.0, + 4.0 + ] + }, + "up": { + "texture": "#2", + "uv": [ + 1.0, + 1.0, + 15.0, + 15.0 + ] + }, + "west": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 14.0, + 1.0 + ] + } + }, + "from": [ + 1.0, + 12.0, + 1.0 + ], + "name": "Rack4", + "to": [ + 15.0, + 13.0, + 15.0 + ] + }, + { + "faces": { + "down": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 14.0, + 7.0 + ] + }, + "east": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 7.0, + 14.0 + ] + }, + "north": { + "texture": "#0", + "uv": [ + 1.0, + 1.0, + 15.0, + 15.0 + ] + }, + "south": { + "texture": "#1", + "uv": [ + 1.0, + 1.0, + 15.0, + 15.0 + ] + }, + "up": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 14.0, + 7.0 + ] + }, + "west": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 7.0, + 14.0 + ] + } + }, + "from": [ + 1.0, + 1.0, + 0.0 + ], + "name": "Back", + "to": [ + 15.0, + 15.0, + 7.0 + ] + }, + { + "faces": { + "down": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 2.0, + 9.0 + ] + }, + "east": { + "texture": "#0", + "uv": [ + 1.0, + 1.0, + 10.0, + 15.0 + ] + }, + "north": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 2.0, + 14.0 + ] + }, + "south": { + "texture": "#1", + "uv": [ + 7.0, + 1.0, + 9.0, + 15.0 + ] + }, + "up": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 2.0, + 9.0 + ] + }, + "west": { + "texture": "#0", + "uv": [ + 1.0, + 1.0, + 10.0, + 15.0 + ] + } + }, + "from": [ + 7.0, + 1.0, + 7.0 + ], + "name": "Cube", + "to": [ + 9.0, + 15.0, + 16.0 + ] + } + ], + "textures": { + "0": "blocks/BlockDriveSide", + "1": "blocks/BlockDriveFront", + "2": "blocks/BlockDrive" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/energy_acceptor.json b/src/main/resources/assets/appliedenergistics2/models/block/energy_acceptor.json new file mode 100644 index 000000000..27be213bc --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/energy_acceptor.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "appliedenergistics2:blocks/energy_acceptor" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/fluix.json b/src/main/resources/assets/appliedenergistics2/models/block/fluix.json new file mode 100644 index 000000000..5b455bcf5 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/fluix.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "appliedenergistics2:blocks/fluix" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/grinder.json b/src/main/resources/assets/appliedenergistics2/models/block/grinder.json new file mode 100644 index 000000000..356926713 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/grinder.json @@ -0,0 +1,10 @@ +{ + "ambientocclusion": false, + "parent": "appliedenergistics2:block/cube/cube_ae_machine", + "textures": { + "bottom": "appliedenergistics2:blocks/grinder_bottom", + "front": "appliedenergistics2:blocks/grinder_front", + "side": "appliedenergistics2:blocks/grinder_side", + "top": "appliedenergistics2:blocks/grinder" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/inscriber.json b/src/main/resources/assets/appliedenergistics2/models/block/inscriber.json new file mode 100644 index 000000000..6777853b1 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/inscriber.json @@ -0,0 +1,492 @@ +{ + "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", + "elements": [ + { + "faces": { + "down": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 3.0, + 16.0 + ] + }, + "east": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 16.0, + 14.0 + ] + }, + "north": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 3.0, + 14.0 + ] + }, + "south": { + "texture": "#0", + "uv": [ + 13.0, + 0.0, + 16.0, + 14.0 + ] + }, + "up": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 3.0, + 16.0 + ] + }, + "west": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 16.0, + 14.0 + ] + } + }, + "from": [ + 0.0, + 1.0, + 0.0 + ], + "name": "Left", + "to": [ + 3.0, + 15.0, + 16.0 + ] + }, + { + "faces": { + "down": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 14.0, + 14.0 + ] + }, + "east": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 14.0, + 1.0 + ] + }, + "north": { + "texture": "#0", + "uv": [ + 1.0, + 15.0, + 15.0, + 16.0 + ] + }, + "south": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 14.0, + 1.0 + ] + }, + "up": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 14.0, + 14.0 + ] + }, + "west": { + "texture": "#0", + "uv": [ + 1.0, + 0.0, + 15.0, + 1.0 + ] + } + }, + "from": [ + 1.0, + 0.0, + 1.0 + ], + "name": "Bottom", + "to": [ + 15.0, + 1.0, + 15.0 + ] + }, + { + "faces": { + "down": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 3.0, + 16.0 + ] + }, + "east": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 16.0, + 14.0 + ] + }, + "north": { + "texture": "#0", + "uv": [ + 13.0, + 0.0, + 16.0, + 14.0 + ] + }, + "south": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 3.0, + 14.0 + ] + }, + "up": { + "texture": "#0", + "uv": [ + 13.0, + 0.0, + 16.0, + 16.0 + ] + }, + "west": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 16.0, + 14.0 + ] + } + }, + "from": [ + 13.0, + 1.0, + 0.0 + ], + "name": "Right", + "to": [ + 16.0, + 15.0, + 16.0 + ] + }, + { + "faces": { + "down": { + "texture": "#-1", + "uv": [ + 1.0, + 1.0, + 15.0, + 15.0 + ] + }, + "east": { + "texture": "#0", + "uv": [ + 1.0, + 0.0, + 15.0, + 1.0 + ] + }, + "north": { + "texture": "#0", + "uv": [ + 1.0, + 15.0, + 15.0, + 16.0 + ] + }, + "south": { + "texture": "#0", + "uv": [ + 1.0, + 0.0, + 15.0, + 1.0 + ] + }, + "up": { + "texture": "#0", + "uv": [ + 1.0, + 1.0, + 15.0, + 15.0 + ] + }, + "west": { + "texture": "#0", + "uv": [ + 1.0, + 15.0, + 15.0, + 16.0 + ] + } + }, + "from": [ + 1.0, + 15.0, + 1.0 + ], + "name": "Top", + "to": [ + 15.0, + 16.0, + 15.0 + ] + }, + { + "faces": { + "down": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 10.0, + 12.0 + ] + }, + "east": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 12.0, + 3.0 + ] + }, + "north": { + "texture": "#0", + "uv": [ + 3.0, + 12.0, + 13.0, + 15.0 + ] + }, + "south": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 10.0, + 3.0 + ] + }, + "up": { + "texture": "#0", + "uv": [ + 3.0, + 1.0, + 13.0, + 13.0 + ] + }, + "west": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 12.0, + 3.0 + ] + } + }, + "from": [ + 3.0, + 1.0, + 1.0 + ], + "name": "BottomFill", + "to": [ + 13.0, + 4.0, + 13.0 + ] + }, + { + "faces": { + "down": { + "texture": "#0", + "uv": [ + 3.0, + 1.0, + 13.0, + 11.0 + ] + }, + "east": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 10.0, + 3.0 + ] + }, + "north": { + "texture": "#0", + "uv": [ + 3.0, + 1.0, + 13.0, + 4.0 + ] + }, + "south": { + "texture": "#0", + "uv": [ + 3.0, + 1.0, + 13.0, + 4.0 + ] + }, + "up": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 10.0, + 10.0 + ] + }, + "west": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 10.0, + 3.0 + ] + } + }, + "from": [ + 3.0, + 12.0, + 1.0 + ], + "name": "TopFill", + "to": [ + 13.0, + 15.0, + 11.0 + ] + }, + { + "faces": { + "down": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 10.0, + 3.0 + ] + }, + "east": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 3.0, + 14.0 + ] + }, + "north": { + "texture": "#0", + "uv": [ + 3.0, + 1.0, + 13.0, + 15.0 + ] + }, + "south": { + "texture": "#0", + "uv": [ + 3.0, + 0.0, + 13.0, + 14.0 + ] + }, + "up": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 10.0, + 3.0 + ] + }, + "west": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 3.0, + 14.0 + ] + } + }, + "from": [ + 3.0, + 1.0, + 13.0 + ], + "name": "Back", + "to": [ + 13.0, + 15.0, + 16.0 + ] + } + ], + "parent": "block/orientable", + "textures": { + "0": "appliedenergistics2:blocks/inscriber" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/ioport.json b/src/main/resources/assets/appliedenergistics2/models/block/ioport.json new file mode 100644 index 000000000..3f919fb76 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/ioport.json @@ -0,0 +1,8 @@ +{ + "parent": "block/cube_bottom_top", + "textures": { + "bottom": "appliedenergistics2:blocks/ioport_bottom", + "side": "appliedenergistics2:blocks/ioport_side", + "top": "appliedenergistics2:blocks/ioport" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/quartz.json b/src/main/resources/assets/appliedenergistics2/models/block/quartz.json new file mode 100644 index 000000000..b4c173f1c --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/quartz.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "appliedenergistics2:blocks/quartz" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/quartz_glass.json b/src/main/resources/assets/appliedenergistics2/models/block/quartz_glass.json new file mode 100644 index 000000000..594e770fd --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/quartz_glass.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "appliedenergistics2:blocks/quartz_ore" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/quartz_growth_accelerator_off.json b/src/main/resources/assets/appliedenergistics2/models/block/quartz_growth_accelerator_off.json new file mode 100644 index 000000000..5d0eca70d --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/quartz_growth_accelerator_off.json @@ -0,0 +1,8 @@ +{ + "parent": "block/cube_bottom_top", + "textures": { + "bottom": "appliedenergistics2:blocks/quartz_growth_accelerator", + "side": "appliedenergistics2:blocks/quartz_growth_accelerator_side", + "top": "appliedenergistics2:blocks/quartz_growth_accelerator" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/quartz_growth_accelerator_on.json b/src/main/resources/assets/appliedenergistics2/models/block/quartz_growth_accelerator_on.json new file mode 100644 index 000000000..68e48be93 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/quartz_growth_accelerator_on.json @@ -0,0 +1,8 @@ +{ + "parent": "block/cube_bottom_top", + "textures": { + "bottom": "appliedenergistics2:blocks/quartz_growth_accelerator_on", + "side": "appliedenergistics2:blocks/quartz_growth_accelerator_side_on", + "top": "appliedenergistics2:blocks/quartz_growth_accelerator_on" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/quartz_ore.json b/src/main/resources/assets/appliedenergistics2/models/block/quartz_ore.json new file mode 100644 index 000000000..594e770fd --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/quartz_ore.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "appliedenergistics2:blocks/quartz_ore" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/quartz_pillar.json b/src/main/resources/assets/appliedenergistics2/models/block/quartz_pillar.json new file mode 100644 index 000000000..1af1d48ca --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/quartz_pillar.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cube_column", + "textures": { + "end": "appliedenergistics2:blocks/quartz_pillar_block_top", + "side": "appliedenergistics2:blocks/quartz_pillar_block_side" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/security.json b/src/main/resources/assets/appliedenergistics2/models/block/security.json new file mode 100644 index 000000000..464f0ba01 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/security.json @@ -0,0 +1,8 @@ +{ + "parent": "block/cube_bottom_top", + "textures": { + "bottom": "appliedenergistics2:blocks/security_bottom", + "side": "appliedenergistics2:blocks/security_side", + "top": "appliedenergistics2:blocks/security" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/sky_stone_block_block.json b/src/main/resources/assets/appliedenergistics2/models/block/sky_stone_block_block.json new file mode 100644 index 000000000..6012d79b7 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/sky_stone_block_block.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "appliedenergistics2:blocks/sky_stone_block_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/sky_stone_block_brick.json b/src/main/resources/assets/appliedenergistics2/models/block/sky_stone_block_brick.json new file mode 100644 index 000000000..9ce5d8ee2 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/sky_stone_block_brick.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "appliedenergistics2:blocks/sky_stone_block_brick" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/sky_stone_block_small_brick.json b/src/main/resources/assets/appliedenergistics2/models/block/sky_stone_block_small_brick.json new file mode 100644 index 000000000..655b81010 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/sky_stone_block_small_brick.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "appliedenergistics2:blocks/sky_stone_block_small_brick" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/sky_stone_block_stone.json b/src/main/resources/assets/appliedenergistics2/models/block/sky_stone_block_stone.json new file mode 100644 index 000000000..69dcc5c1b --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/sky_stone_block_stone.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "appliedenergistics2:blocks/sky_stone_block_stone" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/skystone.block.stairs.inner.json b/src/main/resources/assets/appliedenergistics2/models/block/skystone.block.stairs.inner.json deleted file mode 100644 index 37836264a..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": { - "side": "appliedenergistics2:blocks/SkyStoneBlock.BLOCK", - "top": "appliedenergistics2:blocks/SkyStoneBlock.BLOCK", - "bottom": "appliedenergistics2:blocks/SkyStoneBlock.BLOCK" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/skystone.block.stairs.json b/src/main/resources/assets/appliedenergistics2/models/block/skystone.block.stairs.json deleted file mode 100644 index f31833235..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/skystone.block.stairs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/stairs", - "textures": { - "side": "appliedenergistics2:blocks/SkyStoneBlock.BLOCK", - "top": "appliedenergistics2:blocks/SkyStoneBlock.BLOCK", - "bottom": "appliedenergistics2:blocks/SkyStoneBlock.BLOCK" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/skystone.block.stairs.outer.json b/src/main/resources/assets/appliedenergistics2/models/block/skystone.block.stairs.outer.json deleted file mode 100644 index ca5a7954a..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": { - "side": "appliedenergistics2:blocks/SkyStoneBlock.BLOCK", - "top": "appliedenergistics2:blocks/SkyStoneBlock.BLOCK", - "bottom": "appliedenergistics2:blocks/SkyStoneBlock.BLOCK" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/skystone_block_stairs.json b/src/main/resources/assets/appliedenergistics2/models/block/skystone_block_stairs.json new file mode 100644 index 000000000..3f1c29150 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/skystone_block_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "block/stairs", + "textures": { + "bottom": "appliedenergistics2:blocks/sky_stone_block_block", + "side": "appliedenergistics2:blocks/sky_stone_block_block", + "top": "appliedenergistics2:blocks/sky_stone_block_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/skystone_block_stairs_inner.json b/src/main/resources/assets/appliedenergistics2/models/block/skystone_block_stairs_inner.json new file mode 100644 index 000000000..334efbb54 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/skystone_block_stairs_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "block/inner_stairs", + "textures": { + "bottom": "appliedenergistics2:blocks/sky_stone_block_block", + "side": "appliedenergistics2:blocks/sky_stone_block_block", + "top": "appliedenergistics2:blocks/sky_stone_block_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/skystone_block_stairs_outer.json b/src/main/resources/assets/appliedenergistics2/models/block/skystone_block_stairs_outer.json new file mode 100644 index 000000000..7fe1e1225 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/skystone_block_stairs_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "block/outer_stairs", + "textures": { + "bottom": "appliedenergistics2:blocks/sky_stone_block_block", + "side": "appliedenergistics2:blocks/sky_stone_block_block", + "top": "appliedenergistics2:blocks/sky_stone_block_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/spatial_ioport.json b/src/main/resources/assets/appliedenergistics2/models/block/spatial_ioport.json new file mode 100644 index 000000000..506ce32cf --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/spatial_ioport.json @@ -0,0 +1,8 @@ +{ + "parent": "block/cube_bottom_top", + "textures": { + "bottom": "appliedenergistics2:blocks/spatial_ioport_bottom", + "side": "appliedenergistics2:blocks/spatial_ioport_side", + "top": "appliedenergistics2:blocks/spatial_ioport" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/fluix.inner.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/fluix.inner.json deleted file mode 100644 index 04547b233..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/stairs/fluix.inner.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/inner_stairs", - "textures": { - "side": "appliedenergistics2:blocks/FluixBlock", - "top": "appliedenergistics2:blocks/FluixBlock", - "bottom": "appliedenergistics2:blocks/FluixBlock" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/fluix.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/fluix.json index 3fe2ce191..ced8dc6c4 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/stairs/fluix.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/stairs/fluix.json @@ -1,8 +1,8 @@ { - "parent": "block/stairs", - "textures": { - "side": "appliedenergistics2:blocks/FluixBlock", - "top": "appliedenergistics2:blocks/FluixBlock", - "bottom": "appliedenergistics2:blocks/FluixBlock" - } + "parent": "block/stairs", + "textures": { + "bottom": "appliedenergistics2:blocks/fluix", + "side": "appliedenergistics2:blocks/fluix", + "top": "appliedenergistics2:blocks/fluix" + } } \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/fluix.outer.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/fluix.outer.json deleted file mode 100644 index 9619005e0..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/stairs/fluix.outer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/outer_stairs", - "textures": { - "side": "appliedenergistics2:blocks/FluixBlock", - "top": "appliedenergistics2:blocks/FluixBlock", - "bottom": "appliedenergistics2:blocks/FluixBlock" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/fluix_inner.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/fluix_inner.json new file mode 100644 index 000000000..fd2c5d4cf --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/stairs/fluix_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "block/inner_stairs", + "textures": { + "bottom": "appliedenergistics2:blocks/fluix", + "side": "appliedenergistics2:blocks/fluix", + "top": "appliedenergistics2:blocks/fluix" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/fluix_outer.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/fluix_outer.json new file mode 100644 index 000000000..21222bff1 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/stairs/fluix_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "block/outer_stairs", + "textures": { + "bottom": "appliedenergistics2:blocks/fluix", + "side": "appliedenergistics2:blocks/fluix", + "top": "appliedenergistics2:blocks/fluix" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz.certus.chiseled.inner.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz.certus.chiseled.inner.json deleted file mode 100644 index c9a4a8752..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz.certus.chiseled.inner.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/inner_stairs", - "textures": { - "side": "appliedenergistics2:blocks/ChiseledQuartzBlockSide", - "top": "appliedenergistics2:blocks/ChiseledQuartzBlockTop", - "bottom": "appliedenergistics2:blocks/ChiseledQuartzBlockTop" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz.certus.chiseled.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz.certus.chiseled.json deleted file mode 100644 index a3e8a2a4f..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz.certus.chiseled.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/stairs", - "textures": { - "side": "appliedenergistics2:blocks/ChiseledQuartzBlockSide", - "top": "appliedenergistics2:blocks/ChiseledQuartzBlockTop", - "bottom": "appliedenergistics2:blocks/ChiseledQuartzBlockTop" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz.certus.chiseled.outer.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz.certus.chiseled.outer.json deleted file mode 100644 index d78d351ff..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz.certus.chiseled.outer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/outer_stairs", - "textures": { - "side": "appliedenergistics2:blocks/ChiseledQuartzBlockSide", - "top": "appliedenergistics2:blocks/ChiseledQuartzBlockTop", - "bottom": "appliedenergistics2:blocks/ChiseledQuartzBlockTop" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz.certus.inner.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz.certus.inner.json deleted file mode 100644 index 97ee6faf0..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": { - "side": "appliedenergistics2:blocks/QuartzBlock", - "top": "appliedenergistics2:blocks/QuartzBlock", - "bottom": "appliedenergistics2:blocks/QuartzBlock" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz.certus.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz.certus.json deleted file mode 100644 index e047870d5..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz.certus.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/stairs", - "textures": { - "side": "appliedenergistics2:blocks/QuartzBlock", - "top": "appliedenergistics2:blocks/QuartzBlock", - "bottom": "appliedenergistics2:blocks/QuartzBlock" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz.certus.outer.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz.certus.outer.json deleted file mode 100644 index 2ac5d06d8..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": { - "side": "appliedenergistics2:blocks/QuartzBlock", - "top": "appliedenergistics2:blocks/QuartzBlock", - "bottom": "appliedenergistics2:blocks/QuartzBlock" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz.certus.pillar.inner.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz.certus.pillar.inner.json deleted file mode 100644 index f839aed66..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": { - "side": "appliedenergistics2:blocks/QuartzPillarBlockSide", - "top": "appliedenergistics2:blocks/QuartzPillarBlockTop", - "bottom": "appliedenergistics2:blocks/QuartzPillarBlockTop" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz.certus.pillar.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz.certus.pillar.json deleted file mode 100644 index a7704f6b4..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz.certus.pillar.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/stairs", - "textures": { - "side": "appliedenergistics2:blocks/QuartzPillarBlockSide", - "top": "appliedenergistics2:blocks/QuartzPillarBlockTop", - "bottom": "appliedenergistics2:blocks/QuartzPillarBlockTop" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz.certus.pillar.outer.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz.certus.pillar.outer.json deleted file mode 100644 index 329c68154..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": { - "side": "appliedenergistics2:blocks/QuartzPillarBlockSide", - "top": "appliedenergistics2:blocks/QuartzPillarBlockTop", - "bottom": "appliedenergistics2:blocks/QuartzPillarBlockTop" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_certus.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_certus.json new file mode 100644 index 000000000..c64d91948 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_certus.json @@ -0,0 +1,8 @@ +{ + "parent": "block/stairs", + "textures": { + "bottom": "appliedenergistics2:blocks/quartz", + "side": "appliedenergistics2:blocks/quartz", + "top": "appliedenergistics2:blocks/quartz" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_certus_chiseled.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_certus_chiseled.json new file mode 100644 index 000000000..f0f915d3e --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_certus_chiseled.json @@ -0,0 +1,8 @@ +{ + "parent": "block/stairs", + "textures": { + "bottom": "appliedenergistics2:blocks/chiseled_quartz_block_top", + "side": "appliedenergistics2:blocks/chiseled_quartz_block_side", + "top": "appliedenergistics2:blocks/chiseled_quartz_block_top" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_certus_chiseled_inner.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_certus_chiseled_inner.json new file mode 100644 index 000000000..52ea70568 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_certus_chiseled_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "block/inner_stairs", + "textures": { + "bottom": "appliedenergistics2:blocks/chiseled_quartz_block_top", + "side": "appliedenergistics2:blocks/chiseled_quartz_block_side", + "top": "appliedenergistics2:blocks/chiseled_quartz_block_top" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_certus_chiseled_outer.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_certus_chiseled_outer.json new file mode 100644 index 000000000..9650e6ca2 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_certus_chiseled_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "block/outer_stairs", + "textures": { + "bottom": "appliedenergistics2:blocks/chiseled_quartz_block_top", + "side": "appliedenergistics2:blocks/chiseled_quartz_block_side", + "top": "appliedenergistics2:blocks/chiseled_quartz_block_top" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_certus_inner.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_certus_inner.json new file mode 100644 index 000000000..1e9d4487c --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_certus_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "block/inner_stairs", + "textures": { + "bottom": "appliedenergistics2:blocks/quartz", + "side": "appliedenergistics2:blocks/quartz", + "top": "appliedenergistics2:blocks/quartz" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_certus_outer.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_certus_outer.json new file mode 100644 index 000000000..7e7cf8b58 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_certus_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "block/outer_stairs", + "textures": { + "bottom": "appliedenergistics2:blocks/quartz", + "side": "appliedenergistics2:blocks/quartz", + "top": "appliedenergistics2:blocks/quartz" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_certus_pillar.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_certus_pillar.json new file mode 100644 index 000000000..0ae584d21 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_certus_pillar.json @@ -0,0 +1,8 @@ +{ + "parent": "block/stairs", + "textures": { + "bottom": "appliedenergistics2:blocks/quartz_pillar_block_top", + "side": "appliedenergistics2:blocks/quartz_pillar_block_side", + "top": "appliedenergistics2:blocks/quartz_pillar_block_top" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_certus_pillar_inner.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_certus_pillar_inner.json new file mode 100644 index 000000000..cad653fe5 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_certus_pillar_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "block/inner_stairs", + "textures": { + "bottom": "appliedenergistics2:blocks/quartz_pillar_block_top", + "side": "appliedenergistics2:blocks/quartz_pillar_block_side", + "top": "appliedenergistics2:blocks/quartz_pillar_block_top" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_certus_pillar_outer.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_certus_pillar_outer.json new file mode 100644 index 000000000..43923a3ad --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_certus_pillar_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "block/outer_stairs", + "textures": { + "bottom": "appliedenergistics2:blocks/quartz_pillar_block_top", + "side": "appliedenergistics2:blocks/quartz_pillar_block_side", + "top": "appliedenergistics2:blocks/quartz_pillar_block_top" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone.block.inner.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone.block.inner.json deleted file mode 100644 index 37836264a..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": { - "side": "appliedenergistics2:blocks/SkyStoneBlock.BLOCK", - "top": "appliedenergistics2:blocks/SkyStoneBlock.BLOCK", - "bottom": "appliedenergistics2:blocks/SkyStoneBlock.BLOCK" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone.block.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone.block.json deleted file mode 100644 index f31833235..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone.block.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/stairs", - "textures": { - "side": "appliedenergistics2:blocks/SkyStoneBlock.BLOCK", - "top": "appliedenergistics2:blocks/SkyStoneBlock.BLOCK", - "bottom": "appliedenergistics2:blocks/SkyStoneBlock.BLOCK" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone.block.outer.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone.block.outer.json deleted file mode 100644 index ca5a7954a..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": { - "side": "appliedenergistics2:blocks/SkyStoneBlock.BLOCK", - "top": "appliedenergistics2:blocks/SkyStoneBlock.BLOCK", - "bottom": "appliedenergistics2:blocks/SkyStoneBlock.BLOCK" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone.brick.inner.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone.brick.inner.json deleted file mode 100644 index a029a76f9..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": { - "side": "appliedenergistics2:blocks/SkyStoneBlock.BRICK", - "top": "appliedenergistics2:blocks/SkyStoneBlock.BRICK", - "bottom": "appliedenergistics2:blocks/SkyStoneBlock.BRICK" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone.brick.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone.brick.json deleted file mode 100644 index d26f5c382..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone.brick.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/stairs", - "textures": { - "side": "appliedenergistics2:blocks/SkyStoneBlock.BRICK", - "top": "appliedenergistics2:blocks/SkyStoneBlock.BRICK", - "bottom": "appliedenergistics2:blocks/SkyStoneBlock.BRICK" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone.brick.outer.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone.brick.outer.json deleted file mode 100644 index 1cafa9b56..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": { - "side": "appliedenergistics2:blocks/SkyStoneBlock.BRICK", - "top": "appliedenergistics2:blocks/SkyStoneBlock.BRICK", - "bottom": "appliedenergistics2:blocks/SkyStoneBlock.BRICK" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone.brick.small.inner.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone.brick.small.inner.json deleted file mode 100644 index 03956170b..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": { - "side": "appliedenergistics2:blocks/SkyStoneBlock.SMALL_BRICK", - "top": "appliedenergistics2:blocks/SkyStoneBlock.SMALL_BRICK", - "bottom": "appliedenergistics2:blocks/SkyStoneBlock.SMALL_BRICK" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone.brick.small.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone.brick.small.json deleted file mode 100644 index 799f53d68..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone.brick.small.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/stairs", - "textures": { - "side": "appliedenergistics2:blocks/SkyStoneBlock.SMALL_BRICK", - "top": "appliedenergistics2:blocks/SkyStoneBlock.SMALL_BRICK", - "bottom": "appliedenergistics2:blocks/SkyStoneBlock.SMALL_BRICK" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone.brick.small.outer.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone.brick.small.outer.json deleted file mode 100644 index 5e9a19d92..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": { - "side": "appliedenergistics2:blocks/SkyStoneBlock.SMALL_BRICK", - "top": "appliedenergistics2:blocks/SkyStoneBlock.SMALL_BRICK", - "bottom": "appliedenergistics2:blocks/SkyStoneBlock.SMALL_BRICK" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone.stone.inner.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone.stone.inner.json deleted file mode 100644 index 7c0c4d26d..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": { - "side": "appliedenergistics2:blocks/SkyStoneBlock.STONE", - "top": "appliedenergistics2:blocks/SkyStoneBlock.STONE", - "bottom": "appliedenergistics2:blocks/SkyStoneBlock.STONE" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone.stone.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone.stone.json deleted file mode 100644 index 3cc77402e..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone.stone.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/stairs", - "textures": { - "side": "appliedenergistics2:blocks/SkyStoneBlock.STONE", - "top": "appliedenergistics2:blocks/SkyStoneBlock.STONE", - "bottom": "appliedenergistics2:blocks/SkyStoneBlock.STONE" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone.stone.outer.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone.stone.outer.json deleted file mode 100644 index ed596c2d7..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": { - "side": "appliedenergistics2:blocks/SkyStoneBlock.STONE", - "top": "appliedenergistics2:blocks/SkyStoneBlock.STONE", - "bottom": "appliedenergistics2:blocks/SkyStoneBlock.STONE" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_block.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_block.json new file mode 100644 index 000000000..3f1c29150 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_block.json @@ -0,0 +1,8 @@ +{ + "parent": "block/stairs", + "textures": { + "bottom": "appliedenergistics2:blocks/sky_stone_block_block", + "side": "appliedenergistics2:blocks/sky_stone_block_block", + "top": "appliedenergistics2:blocks/sky_stone_block_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_block_inner.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_block_inner.json new file mode 100644 index 000000000..334efbb54 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_block_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "block/inner_stairs", + "textures": { + "bottom": "appliedenergistics2:blocks/sky_stone_block_block", + "side": "appliedenergistics2:blocks/sky_stone_block_block", + "top": "appliedenergistics2:blocks/sky_stone_block_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_block_outer.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_block_outer.json new file mode 100644 index 000000000..7fe1e1225 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_block_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "block/outer_stairs", + "textures": { + "bottom": "appliedenergistics2:blocks/sky_stone_block_block", + "side": "appliedenergistics2:blocks/sky_stone_block_block", + "top": "appliedenergistics2:blocks/sky_stone_block_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_brick.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_brick.json new file mode 100644 index 000000000..5ec487565 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_brick.json @@ -0,0 +1,8 @@ +{ + "parent": "block/stairs", + "textures": { + "bottom": "appliedenergistics2:blocks/sky_stone_block_brick", + "side": "appliedenergistics2:blocks/sky_stone_block_brick", + "top": "appliedenergistics2:blocks/sky_stone_block_brick" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_brick_inner.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_brick_inner.json new file mode 100644 index 000000000..1be614064 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_brick_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "block/inner_stairs", + "textures": { + "bottom": "appliedenergistics2:blocks/sky_stone_block_brick", + "side": "appliedenergistics2:blocks/sky_stone_block_brick", + "top": "appliedenergistics2:blocks/sky_stone_block_brick" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_brick_outer.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_brick_outer.json new file mode 100644 index 000000000..28a562a5b --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_brick_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "block/outer_stairs", + "textures": { + "bottom": "appliedenergistics2:blocks/sky_stone_block_brick", + "side": "appliedenergistics2:blocks/sky_stone_block_brick", + "top": "appliedenergistics2:blocks/sky_stone_block_brick" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_brick_small.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_brick_small.json new file mode 100644 index 000000000..412ec16f6 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_brick_small.json @@ -0,0 +1,8 @@ +{ + "parent": "block/stairs", + "textures": { + "bottom": "appliedenergistics2:blocks/sky_stone_block_small_brick", + "side": "appliedenergistics2:blocks/sky_stone_block_small_brick", + "top": "appliedenergistics2:blocks/sky_stone_block_small_brick" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_brick_small_inner.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_brick_small_inner.json new file mode 100644 index 000000000..8c283291f --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_brick_small_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "block/inner_stairs", + "textures": { + "bottom": "appliedenergistics2:blocks/sky_stone_block_small_brick", + "side": "appliedenergistics2:blocks/sky_stone_block_small_brick", + "top": "appliedenergistics2:blocks/sky_stone_block_small_brick" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_brick_small_outer.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_brick_small_outer.json new file mode 100644 index 000000000..181c116e7 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_brick_small_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "block/outer_stairs", + "textures": { + "bottom": "appliedenergistics2:blocks/sky_stone_block_small_brick", + "side": "appliedenergistics2:blocks/sky_stone_block_small_brick", + "top": "appliedenergistics2:blocks/sky_stone_block_small_brick" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_stone.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_stone.json new file mode 100644 index 000000000..88edfd669 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_stone.json @@ -0,0 +1,8 @@ +{ + "parent": "block/stairs", + "textures": { + "bottom": "appliedenergistics2:blocks/sky_stone_block_stone", + "side": "appliedenergistics2:blocks/sky_stone_block_stone", + "top": "appliedenergistics2:blocks/sky_stone_block_stone" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_stone_inner.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_stone_inner.json new file mode 100644 index 000000000..21d61520d --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_stone_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "block/inner_stairs", + "textures": { + "bottom": "appliedenergistics2:blocks/sky_stone_block_stone", + "side": "appliedenergistics2:blocks/sky_stone_block_stone", + "top": "appliedenergistics2:blocks/sky_stone_block_stone" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_stone_outer.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_stone_outer.json new file mode 100644 index 000000000..9062bb3dd --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/stairs/skystone_stone_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "block/outer_stairs", + "textures": { + "bottom": "appliedenergistics2:blocks/sky_stone_block_stone", + "side": "appliedenergistics2:blocks/sky_stone_block_stone", + "top": "appliedenergistics2:blocks/sky_stone_block_stone" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/test.json b/src/main/resources/assets/appliedenergistics2/models/block/test.json index 7c5577b18..5adc457c1 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/test.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/test.json @@ -1,72 +1,353 @@ { "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "textures": { - }, "elements": [ { - "name": "Cube", - "from": [ 0.0, 0.0, 15.0 ], - "to": [ 16.0, 16.0, 16.0 ], "faces": { - "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 16.0 ] }, - "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 16.0 ] }, - "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 1.0 ] }, - "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 1.0 ] } - } + "down": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 16.0, + 1.0 + ] + }, + "east": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 1.0, + 16.0 + ] + }, + "north": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 16.0, + 16.0 + ] + }, + "south": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 16.0, + 16.0 + ] + }, + "up": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 16.0, + 1.0 + ] + }, + "west": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 1.0, + 16.0 + ] + } + }, + "from": [ + 0.0, + 0.0, + 15.0 + ], + "name": "Cube", + "to": [ + 16.0, + 16.0, + 16.0 + ] }, { - "name": "Cube", - "from": [ 0.0, 0.0, 0.0 ], - "to": [ 16.0, 6.0, 1.0 ], "faces": { - "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 6.0 ] }, - "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 6.0 ] }, - "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 6.0 ] }, - "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 6.0 ] }, - "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 1.0 ] }, - "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 1.0 ] } - } + "down": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 16.0, + 1.0 + ] + }, + "east": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 1.0, + 6.0 + ] + }, + "north": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 16.0, + 6.0 + ] + }, + "south": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 16.0, + 6.0 + ] + }, + "up": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 16.0, + 1.0 + ] + }, + "west": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 1.0, + 6.0 + ] + } + }, + "from": [ + 0.0, + 0.0, + 0.0 + ], + "name": "Cube", + "to": [ + 16.0, + 6.0, + 1.0 + ] }, { - "name": "Cube", - "from": [ 0.0, 6.0, 0.0 ], - "to": [ 1.0, 7.0, 15.0 ], "faces": { - "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 15.0, 1.0 ] }, - "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 15.0, 1.0 ] }, - "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 15.0 ] }, - "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 15.0 ] } - } + "down": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 1.0, + 15.0 + ] + }, + "east": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 15.0, + 1.0 + ] + }, + "north": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 1.0, + 1.0 + ] + }, + "south": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 1.0, + 1.0 + ] + }, + "up": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 1.0, + 15.0 + ] + }, + "west": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 15.0, + 1.0 + ] + } + }, + "from": [ + 0.0, + 6.0, + 0.0 + ], + "name": "Cube", + "to": [ + 1.0, + 7.0, + 15.0 + ] }, { - "name": "Cube", - "from": [ 15.0, 0.0, 0.0 ], - "to": [ 16.0, 5.0, 15.0 ], "faces": { - "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 5.0 ] }, - "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 15.0, 5.0 ] }, - "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 5.0 ] }, - "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 15.0, 5.0 ] }, - "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 15.0 ] }, - "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 15.0 ] } - } + "down": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 1.0, + 15.0 + ] + }, + "east": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 15.0, + 5.0 + ] + }, + "north": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 1.0, + 5.0 + ] + }, + "south": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 1.0, + 5.0 + ] + }, + "up": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 1.0, + 15.0 + ] + }, + "west": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 15.0, + 5.0 + ] + } + }, + "from": [ + 15.0, + 0.0, + 0.0 + ], + "name": "Cube", + "to": [ + 16.0, + 5.0, + 15.0 + ] }, { - "name": "Cube", - "from": [ 3.0, 15.0, 0.0 ], - "to": [ 13.0, 16.0, 15.0 ], "faces": { - "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 10.0, 1.0 ] }, - "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 15.0, 1.0 ] }, - "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 10.0, 1.0 ] }, - "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 15.0, 1.0 ] }, - "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 10.0, 15.0 ] }, - "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 10.0, 15.0 ] } - } + "down": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 10.0, + 15.0 + ] + }, + "east": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 15.0, + 1.0 + ] + }, + "north": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 10.0, + 1.0 + ] + }, + "south": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 10.0, + 1.0 + ] + }, + "up": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 10.0, + 15.0 + ] + }, + "west": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 15.0, + 1.0 + ] + } + }, + "from": [ + 3.0, + 15.0, + 0.0 + ], + "name": "Cube", + "to": [ + 13.0, + 16.0, + 15.0 + ] } - ] + ], + "textures": { + + } } \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockCellWorkBench.json b/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockCellWorkBench.json deleted file mode 100644 index 108d0a628..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockCellWorkBench.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/cube_bottom_top", - "textures": { - "side": "appliedenergistics2:blocks/BlockCellWorkBenchSide", - "bottom": "appliedenergistics2:blocks/BlockCellWorkBenchBottom", - "top": "appliedenergistics2:blocks/BlockCellWorkBench" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockCharger.json b/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockCharger.json deleted file mode 100644 index e9cb249bf..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockCharger.json +++ /dev/null @@ -1,76 +0,0 @@ -{ - "parent": "block/orientable", - "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "textures": { - "0": "appliedenergistics2:blocks/BlockChargerSide", - "1": "appliedenergistics2:blocks/BlockCharger", - "2": "appliedenergistics2:blocks/BlockChargerInside" - }, - "elements": [ - { - "name": "Back", - "from": [ 6.0, 0.0, 15.0 ], - "to": [ 10.0, 16.0, 16.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 16.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 16.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 16.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 16.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 1.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 1.0 ] } - } - }, - { - "name": "Bottom", - "from": [ 2.0, 0.0, 2.0 ], - "to": [ 14.0, 2.0, 15.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 12.0, 2.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 13.0, 2.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 12.0, 2.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 13.0, 2.0 ] }, - "up": { "texture": "#0", "uv": [ 2.0, 2.0, 14.0, 15.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 12.0, 13.0 ] } - } - }, - { - "name": "Top", - "from": [ 2.0, 13.0, 2.0 ], - "to": [ 14.0, 16.0, 15.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 12.0, 3.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 13.0, 3.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 12.0, 3.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 13.0, 3.0 ] }, - "up": { "texture": "#1", "uv": [ 2.0, 2.0, 14.0, 15.0 ] }, - "down": { "texture": "#0", "uv": [ 2.0, 1.0, 14.0, 14.0 ] } - } - }, - { - "name": "BottomTop", - "from": [ 3.0, 2.0, 3.0 ], - "to": [ 13.0, 3.0, 13.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 10.0, 1.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 10.0, 1.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 10.0, 1.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 10.0, 1.0 ] }, - "up": { "texture": "#2", "uv": [ 3.0, 3.0, 13.0, 13.0 ] }, - "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 10.0, 10.0 ] } - } - }, - { - "name": "TopTop", - "from": [ 3.0, 12.0, 3.0 ], - "to": [ 13.0, 13.0, 13.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 10.0, 1.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 10.0, 1.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 10.0, 1.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 10.0, 1.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 10.0, 10.0 ] }, - "down": { "texture": "#2", "uv": [ 3.0, 3.0, 13.0, 13.0 ] } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockDrive.json b/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockDrive.json deleted file mode 100644 index 98c8d53ba..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockDrive.json +++ /dev/null @@ -1,140 +0,0 @@ -{ - "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "textures": { - "0": "blocks/BlockDriveSide", - "1": "blocks/BlockDriveFront", - "2": "blocks/BlockDrive" - }, - "elements": [ - { - "name": "Bottom", - "from": [ 1.0, 0.0, 0.0 ], - "to": [ 15.0, 1.0, 16.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 1.0, 15.0, 15.0, 16.0 ] }, - "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 1.0 ] }, - "south": { "texture": "#1", "uv": [ 1.0, 15.0, 15.0, 16.0 ] }, - "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 1.0 ] }, - "up": { "texture": "#2", "uv": [ 1.0, 0.0, 15.0, 16.0 ] }, - "down": { "texture": "#2", "uv": [ 1.0, 0.0, 15.0, 16.0 ] } - } - }, - { - "name": "Left", - "from": [ 0.0, 0.0, 0.0 ], - "to": [ 1.0, 16.0, 16.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 15.0, 0.0, 16.0, 16.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "south": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 16.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "up": { "texture": "#2", "uv": [ 0.0, 0.0, 1.0, 16.0 ] }, - "down": { "texture": "#2", "uv": [ 0.0, 0.0, 1.0, 16.0 ] } - } - }, - { - "name": "Top", - "from": [ 1.0, 15.0, 0.0 ], - "to": [ 15.0, 16.0, 16.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 14.0, 1.0 ] }, - "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 1.0 ] }, - "south": { "texture": "#1", "uv": [ 1.0, 0.0, 15.0, 1.0 ] }, - "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 1.0 ] }, - "up": { "texture": "#2", "uv": [ 1.0, 0.0, 15.0, 16.0 ] }, - "down": { "texture": "#2", "uv": [ 1.0, 0.0, 15.0, 16.0 ] } - } - }, - { - "name": "Right", - "from": [ 15.0, 0.0, 0.0 ], - "to": [ 16.0, 16.0, 16.0 ], - "faces": { - "north": { "texture": "#2", "uv": [ 0.0, 0.0, 1.0, 16.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "south": { "texture": "#1", "uv": [ 15.0, 0.0, 16.0, 16.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "up": { "texture": "#2", "uv": [ 15.0, 0.0, 16.0, 16.0 ] }, - "down": { "texture": "#2", "uv": [ 15.0, 0.0, 16.0, 16.0 ] } - } - }, - { - "name": "Rack", - "from": [ 1.0, 3.0, 1.0 ], - "to": [ 15.0, 4.0, 15.0 ], - "faces": { - "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 14.0, 1.0 ] }, - "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 14.0, 1.0 ] }, - "south": { "texture": "#1", "uv": [ 1.0, 12.0, 15.0, 13.0 ] }, - "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 14.0, 1.0 ] }, - "up": { "texture": "#2", "uv": [ 1.0, 1.0, 15.0, 15.0 ] }, - "down": { "texture": "#2", "uv": [ 1.0, 1.0, 15.0, 15.0 ] } - } - }, - { - "name": "Rack 2", - "from": [ 1.0, 6.0, 1.0 ], - "to": [ 15.0, 7.0, 15.0 ], - "faces": { - "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 14.0, 1.0 ] }, - "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 14.0, 1.0 ] }, - "south": { "texture": "#1", "uv": [ 1.0, 9.0, 15.0, 10.0 ] }, - "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 14.0, 1.0 ] }, - "up": { "texture": "#2", "uv": [ 1.0, 1.0, 15.0, 15.0 ] }, - "down": { "texture": "#2", "uv": [ 1.0, 1.0, 15.0, 15.0 ] } - } - }, - { - "name": "Rack 3", - "from": [ 1.0, 9.0, 1.0 ], - "to": [ 15.0, 10.0, 15.0 ], - "faces": { - "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 14.0, 1.0 ] }, - "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 14.0, 1.0 ] }, - "south": { "texture": "#1", "uv": [ 1.0, 6.0, 15.0, 7.0 ] }, - "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 14.0, 1.0 ] }, - "up": { "texture": "#2", "uv": [ 1.0, 1.0, 15.0, 15.0 ] }, - "down": { "texture": "#2", "uv": [ 1.0, 1.0, 15.0, 15.0 ] } - } - }, - { - "name": "Rack4", - "from": [ 1.0, 12.0, 1.0 ], - "to": [ 15.0, 13.0, 15.0 ], - "faces": { - "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 14.0, 1.0 ] }, - "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 14.0, 1.0 ] }, - "south": { "texture": "#1", "uv": [ 1.0, 3.0, 15.0, 4.0 ] }, - "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 14.0, 1.0 ] }, - "up": { "texture": "#2", "uv": [ 1.0, 1.0, 15.0, 15.0 ] }, - "down": { "texture": "#2", "uv": [ 1.0, 1.0, 15.0, 15.0 ] } - } - }, - { - "name": "Back", - "from": [ 1.0, 1.0, 0.0 ], - "to": [ 15.0, 15.0, 7.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 1.0, 1.0, 15.0, 15.0 ] }, - "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 7.0, 14.0 ] }, - "south": { "texture": "#1", "uv": [ 1.0, 1.0, 15.0, 15.0 ] }, - "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 7.0, 14.0 ] }, - "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 14.0, 7.0 ] }, - "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 14.0, 7.0 ] } - } - }, - { - "name": "Cube", - "from": [ 7.0, 1.0, 7.0 ], - "to": [ 9.0, 15.0, 16.0 ], - "faces": { - "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 2.0, 14.0 ] }, - "east": { "texture": "#0", "uv": [ 1.0, 1.0, 10.0, 15.0 ] }, - "south": { "texture": "#1", "uv": [ 7.0, 1.0, 9.0, 15.0 ] }, - "west": { "texture": "#0", "uv": [ 1.0, 1.0, 10.0, 15.0 ] }, - "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 2.0, 9.0 ] }, - "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 2.0, 9.0 ] } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockEnergyAcceptor.json b/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockEnergyAcceptor.json deleted file mode 100644 index 484e67935..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockEnergyAcceptor.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "appliedenergistics2:blocks/BlockEnergyAcceptor" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockGrinder.json b/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockGrinder.json deleted file mode 100644 index 6c150a80e..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockGrinder.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "appliedenergistics2:block/cube/cube_AE_machine", - "ambientocclusion": false, - "textures": { - "top": "appliedenergistics2:blocks/BlockGrinder", - "bottom": "appliedenergistics2:blocks/BlockGrinderBottom", - "front": "appliedenergistics2:blocks/BlockGrinderFront", - "side": "appliedenergistics2:blocks/BlockGrinderSide" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockIOPort.json b/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockIOPort.json deleted file mode 100644 index 25ea2382f..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockIOPort.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/cube_bottom_top", - "textures": { - "side": "appliedenergistics2:blocks/BlockIOPortSide", - "bottom": "appliedenergistics2:blocks/BlockIOPortBottom", - "top": "appliedenergistics2:blocks/BlockIOPort" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockInscriber.json b/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockInscriber.json deleted file mode 100644 index 24bf42ba9..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockInscriber.json +++ /dev/null @@ -1,100 +0,0 @@ -{ - "parent": "block/orientable", - "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "textures": { - "0": "appliedenergistics2:blocks/BlockInscriber" - }, - "elements": [ - { - "name": "Left", - "from": [ 0.0, 1.0, 0.0 ], - "to": [ 3.0, 15.0, 16.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 3.0, 14.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 14.0 ] }, - "south": { "texture": "#0", "uv": [ 13.0, 0.0, 16.0, 14.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 14.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 3.0, 16.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 3.0, 16.0 ] } - } - }, - { - "name": "Bottom", - "from": [ 1.0, 0.0, 1.0 ], - "to": [ 15.0, 1.0, 15.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 1.0, 15.0, 15.0, 16.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 14.0, 1.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 14.0, 1.0 ] }, - "west": { "texture": "#0", "uv": [ 1.0, 0.0, 15.0, 1.0 ] }, - "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 14.0, 14.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 14.0, 14.0 ] } - } - }, - { - "name": "Right", - "from": [ 13.0, 1.0, 0.0 ], - "to": [ 16.0, 15.0, 16.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 13.0, 0.0, 16.0, 14.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 14.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 3.0, 14.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 14.0 ] }, - "up": { "texture": "#0", "uv": [ 13.0, 0.0, 16.0, 16.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 3.0, 16.0 ] } - } - }, - { - "name": "Top", - "from": [ 1.0, 15.0, 1.0 ], - "to": [ 15.0, 16.0, 15.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 1.0, 15.0, 15.0, 16.0 ] }, - "east": { "texture": "#0", "uv": [ 1.0, 0.0, 15.0, 1.0 ] }, - "south": { "texture": "#0", "uv": [ 1.0, 0.0, 15.0, 1.0 ] }, - "west": { "texture": "#0", "uv": [ 1.0, 15.0, 15.0, 16.0 ] }, - "up": { "texture": "#0", "uv": [ 1.0, 1.0, 15.0, 15.0 ] }, - "down": { "texture": "#-1", "uv": [ 1.0, 1.0, 15.0, 15.0 ] } - } - }, - { - "name": "BottomFill", - "from": [ 3.0, 1.0, 1.0 ], - "to": [ 13.0, 4.0, 13.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 3.0, 12.0, 13.0, 15.0 ] }, - "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 12.0, 3.0 ] }, - "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 10.0, 3.0 ] }, - "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 12.0, 3.0 ] }, - "up": { "texture": "#0", "uv": [ 3.0, 1.0, 13.0, 13.0 ] }, - "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 10.0, 12.0 ] } - } - }, - { - "name": "TopFill", - "from": [ 3.0, 12.0, 1.0 ], - "to": [ 13.0, 15.0, 11.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 3.0, 1.0, 13.0, 4.0 ] }, - "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 10.0, 3.0 ] }, - "south": { "texture": "#0", "uv": [ 3.0, 1.0, 13.0, 4.0 ] }, - "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 10.0, 3.0 ] }, - "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 10.0, 10.0 ] }, - "down": { "texture": "#0", "uv": [ 3.0, 1.0, 13.0, 11.0 ] } - } - }, - { - "name": "Back", - "from": [ 3.0, 1.0, 13.0 ], - "to": [ 13.0, 15.0, 16.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 3.0, 1.0, 13.0, 15.0 ] }, - "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 3.0, 14.0 ] }, - "south": { "texture": "#0", "uv": [ 3.0, 0.0, 13.0, 14.0 ] }, - "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 3.0, 14.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 10.0, 3.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 10.0, 3.0 ] } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockQuartzGrowthAccelerator.off.json b/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockQuartzGrowthAccelerator.off.json deleted file mode 100644 index de3d38e07..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockQuartzGrowthAccelerator.off.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/cube_bottom_top", - "textures": { - "side": "appliedenergistics2:blocks/BlockQuartzGrowthAcceleratorSide", - "bottom": "appliedenergistics2:blocks/BlockQuartzGrowthAccelerator", - "top": "appliedenergistics2:blocks/BlockQuartzGrowthAccelerator" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockQuartzGrowthAccelerator.on.json b/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockQuartzGrowthAccelerator.on.json deleted file mode 100644 index 87fabfcd5..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockQuartzGrowthAccelerator.on.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/cube_bottom_top", - "textures": { - "side": "appliedenergistics2:blocks/BlockQuartzGrowthAcceleratorSideOn", - "bottom": "appliedenergistics2:blocks/BlockQuartzGrowthAcceleratorOn", - "top": "appliedenergistics2:blocks/BlockQuartzGrowthAcceleratorOn" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockSecurity.json b/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockSecurity.json deleted file mode 100644 index 12cdb25e2..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockSecurity.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/cube_bottom_top", - "textures": { - "side": "appliedenergistics2:blocks/BlockSecuritySide", - "bottom": "appliedenergistics2:blocks/BlockSecurityBottom", - "top": "appliedenergistics2:blocks/BlockSecurity" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockSpatialIOPort.json b/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockSpatialIOPort.json deleted file mode 100644 index 3213accae..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockSpatialIOPort.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/cube_bottom_top", - "textures": { - "side": "appliedenergistics2:blocks/BlockSpatialIOPortSide", - "bottom": "appliedenergistics2:blocks/BlockSpatialIOPortBottom", - "top": "appliedenergistics2:blocks/BlockSpatialIOPort" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockVibrationChamber.off.json b/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockVibrationChamber.off.json deleted file mode 100644 index 7901c0b88..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockVibrationChamber.off.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "parent": "appliedenergistics2:block/cube/cube_AE_machine", - "textures": { - "front": "appliedenergistics2:blocks/BlockVibrationChamberFront", - "side": "appliedenergistics2:blocks/BlockVibrationChamber", - "top": "appliedenergistics2:blocks/BlockVibrationChamber", - "bottom": "appliedenergistics2:blocks/BlockVibrationChamber" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockVibrationChamber.on.json b/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockVibrationChamber.on.json deleted file mode 100644 index 4c1e37767..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockVibrationChamber.on.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "appliedenergistics2:block/tile.BlockVibrationChamber.off", - "textures": { - "front": "appliedenergistics2:blocks/BlockVibrationChamberFrontOn" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockWireless.json b/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockWireless.json deleted file mode 100644 index c9b12d081..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockWireless.json +++ /dev/null @@ -1,152 +0,0 @@ -{ - "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "textures": { - "0": "appliedenergistics2:blocks/BlockWirelessInside", - "1": "appliedenergistics2:blocks/BlockWireless" - }, - "elements": [ - { - "name": "Base", - "from": [ 4.0, 0.0, 4.0 ], - "to": [ 12.0, 2.0, 12.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 4.0, 14.0, 12.0, 16.0 ] }, - "east": { "texture": "#0", "uv": [ 4.0, 0.0, 12.0, 2.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 8.0, 2.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 8.0, 2.0 ] }, - "up": { "texture": "#0", "uv": [ 4.0, 4.0, 12.0, 12.0 ] }, - "down": { "texture": "#0", "uv": [ 4.0, 4.0, 12.0, 12.0 ] } - } - }, - { - "name": "Front_B", - "from": [ 5.0, 2.0, 3.0 ], - "to": [ 11.0, 4.0, 5.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 6.0, 2.0 ] }, - "east": { "texture": "#0", "uv": [ 15.0, 7.0, 13.0, 5.0 ] }, - "south": { "texture": "#0", "uv": [ 11.0, 3.0, 5.0, 5.0 ] }, - "west": { "texture": "#0", "uv": [ 13.0, 3.0, 15.0, 5.0 ] }, - "up": { "texture": "#0", "uv": [ 5.0, 13.0, 11.0, 15.0 ] }, - "down": { "texture": "#0", "uv": [ 5.0, 1.0, 11.0, 3.0 ] } - } - }, - { - "name": "Back_B", - "from": [ 5.0, 2.0, 11.0 ], - "to": [ 11.0, 4.0, 13.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 10.0, 0.0, 16.0, 2.0 ] }, - "east": { "texture": "#0", "uv": [ 13.0, 4.0, 15.0, 6.0 ] }, - "south": { "texture": "#0", "uv": [ 11.0, 11.0, 5.0, 13.0 ] }, - "west": { "texture": "#0", "uv": [ 1.0, 4.0, 3.0, 6.0 ] }, - "up": { "texture": "#0", "uv": [ 5.0, 1.0, 11.0, 3.0 ] }, - "down": { "texture": "#0", "uv": [ 5.0, 13.0, 11.0, 15.0 ] } - } - }, - { - "name": "Left_B", - "from": [ 11.0, 2.0, 5.0 ], - "to": [ 13.0, 4.0, 11.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 13.0, 4.0, 15.0, 6.0 ] }, - "east": { "texture": "#0", "uv": [ 5.0, 11.0, 11.0, 13.0 ] }, - "south": { "texture": "#0", "uv": [ 1.0, 6.0, 3.0, 8.0 ] }, - "west": { "texture": "#0", "uv": [ 5.0, 3.0, 11.0, 5.0 ] }, - "up": { "texture": "#0", "uv": [ 1.0, 5.0, 3.0, 11.0 ] }, - "down": { "texture": "#0", "uv": [ 1.0, 5.0, 3.0, 11.0 ] } - } - }, - { - "name": "Right_B", - "from": [ 3.0, 2.0, 5.0 ], - "to": [ 5.0, 4.0, 11.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 1.0, 4.0, 3.0, 6.0 ] }, - "east": { "texture": "#0", "uv": [ 5.0, 11.0, 11.0, 13.0 ] }, - "south": { "texture": "#0", "uv": [ 13.0, 6.0, 15.0, 8.0 ] }, - "west": { "texture": "#0", "uv": [ 5.0, 3.0, 11.0, 5.0 ] }, - "up": { "texture": "#0", "uv": [ 13.0, 5.0, 15.0, 11.0 ] }, - "down": { "texture": "#0", "uv": [ 13.0, 5.0, 15.0, 11.0 ] } - } - }, - { - "name": "Front_S", - "from": [ 7.0, 3.0, 2.0 ], - "to": [ 9.0, 8.0, 3.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 5.0, 2.0, 10.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 5.0, 1.0, 10.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 5.0, 2.0, 10.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 5.0, 1.0, 10.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 2.0, 1.0 ] } - } - }, - { - "name": "Back_S", - "from": [ 7.0, 3.0, 13.0 ], - "to": [ 9.0, 8.0, 14.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 14.0, 2.0, 16.0, 7.0 ] }, - "east": { "texture": "#0", "uv": [ 14.0, 2.0, 15.0, 7.0 ] }, - "south": { "texture": "#0", "uv": [ 14.0, 2.0, 16.0, 7.0 ] }, - "west": { "texture": "#0", "uv": [ 15.0, 2.0, 16.0, 7.0 ] }, - "up": { "texture": "#0", "uv": [ 14.0, 0.0, 16.0, 1.0 ] }, - "down": { "texture": "#0", "uv": [ 14.0, 1.0, 16.0, 2.0 ] } - } - }, - { - "name": "Left_S", - "from": [ 2.0, 3.0, 7.0 ], - "to": [ 3.0, 8.0, 9.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 12.0, 3.0, 13.0, 8.0 ] }, - "east": { "texture": "#0", "uv": [ 11.0, 3.0, 13.0, 8.0 ] }, - "south": { "texture": "#0", "uv": [ 13.0, 3.0, 11.0, 8.0 ] }, - "west": { "texture": "#0", "uv": [ 11.0, 3.0, 13.0, 8.0 ] }, - "up": { "texture": "#0", "uv": [ 12.0, 3.0, 13.0, 5.0 ] }, - "down": { "texture": "#0", "uv": [ 11.0, 3.0, 12.0, 5.0 ] } - } - }, - { - "name": "Right_S", - "from": [ 13.0, 3.0, 7.0 ], - "to": [ 14.0, 8.0, 9.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 5.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 2.0, 5.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 5.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 2.0, 5.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 2.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 2.0 ] } - } - }, - { - "name": "Torch_B", - "from": [ 7.0, 2.0, 7.0 ], - "to": [ 9.0, 8.0, 9.0 ], - "faces": { - "north": { "texture": "#1", "uv": [ 7.0, 9.0, 9.0, 15.0 ] }, - "east": { "texture": "#1", "uv": [ 7.0, 9.0, 9.0, 15.0 ] }, - "south": { "texture": "#1", "uv": [ 7.0, 9.0, 9.0, 15.0 ] }, - "west": { "texture": "#1", "uv": [ 7.0, 9.0, 9.0, 15.0 ] }, - "up": { "texture": "#1", "uv": [ 7.0, 9.0, 9.0, 11.0 ] }, - "down": { "texture": "#1", "uv": [ 7.0, 9.0, 9.0, 11.0 ] } - } - }, - { - "name": "Torch_Off", - "from": [ 7.0, 8.0, 7.0 ], - "to": [ 9.0, 10.0, 9.0 ], - "faces": { - "north": { "texture": "#1", "uv": [ 7.0, 7.0, 9.0, 9.0 ] }, - "east": { "texture": "#1", "uv": [ 7.0, 7.0, 9.0, 9.0 ] }, - "south": { "texture": "#1", "uv": [ 7.0, 7.0, 9.0, 9.0 ] }, - "west": { "texture": "#1", "uv": [ 7.0, 7.0, 9.0, 9.0 ] }, - "up": { "texture": "#1", "uv": [ 7.0, 7.0, 9.0, 9.0 ] }, - "down": { "texture": "#1", "uv": [ 7.0, 7.0, 9.0, 9.0 ] } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/tiny_tnt.json b/src/main/resources/assets/appliedenergistics2/models/block/tiny_tnt.json new file mode 100644 index 000000000..0049a5419 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/tiny_tnt.json @@ -0,0 +1,80 @@ +{ + "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", + "elements": [ + { + "faces": { + "down": { + "texture": "#2", + "uv": [ + 0.0, + 0.0, + 16.0, + 16.0 + ] + }, + "east": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 16.0, + 16.0 + ] + }, + "north": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 16.0, + 16.0 + ] + }, + "south": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 16.0, + 16.0 + ] + }, + "up": { + "texture": "#1", + "uv": [ + 0.0, + 0.0, + 16.0, + 16.0 + ] + }, + "west": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 16.0, + 16.0 + ] + } + }, + "from": [ + 4.0, + 0.0, + 4.0 + ], + "name": "Cube", + "to": [ + 12.0, + 8.0, + 12.0 + ] + } + ], + "parent": "block/block", + "textures": { + "0": "blocks/tnt_side", + "1": "blocks/tnt_top", + "2": "blocks/tnt_bottom" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/tnt.model b/src/main/resources/assets/appliedenergistics2/models/block/tnt.model deleted file mode 100644 index c2c0f035611da778a276231be9e9fa5d5d137df6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1385 zcmWIWW@Zs#;Nak3kXZTJg8>O}F)%RX=BK3Q=w%h>=dGP^I<^+ZL*M%3l)z0&NNd?(gTF3x6NYWvvE zIQ@gtA0^$u(y-_MPRLasvs&r$Yhg^5Mp$aw<383utPYFjo^3vABj~ay&9+eT?nb9# z|HuF8V)t<-t!%rV@x*EF8K)bGde%4dWaG-_G0)SCWuM5*J)!03p92c{%VvBNH+cT? zlkK{|mL-SIESqk8P|oHV!{zzc4$Ln4u|ByqW7lUNzMYG{UYT+syUqIHtcNAl>!1D) z))rp=EKc`F^R1XS&&o3vzkT+JIl!BpqwnUKtI~`N4DHMe47h_-l!1YvB(^5Uo`ql{jZ$9|F4428*@aaX#8KD|JLT?{^Ib<_2-xWxpSuS`~Q#f zb#-~~-v2Xx_vnnY{=X-N2`S0Rn-e~lotUHe`0!=16PG7g9M*jLqF1>wUQWXJPUwuo z+tljz$M`>5B5Y}y)4ty1zm4ML$&W*h6z@K`c}3yF_WzYTd;hzJUv22gpC5Fv=usNi zefPrtHUVq4m5=SRADL+^VVZmL!OK_AH=Wa5$jJZ-mlZ*oaaS1_7_Knj3l|aea4E?z z00j%4Dz4s zCPki>-A$eT?;gxnwqQ=4xTDqDlINL+U6I&N-j53xil5rLcUr|=ectMO=W@l{=R{?1 zKmPSf*+&J9r8O)Z?k?s({T^6^w8_lWJ0Rfn#PG*rruUwVDTQyY{<+eSV0207s*Y(x z?2MeBC6hdv-&;!W{l3X}a>Q9ndpB_*AE_Tt&81bBZfMKkol^&N^sDWd7 zyB=G8E&~HY0ocWiOd<@3A_X~TfZ`D3TLeZFFah4E`jAr&DBmFT1T*5uMd(H#2c!r> xKLZ0pHWQi=&;*BW0