From c2a239a12fa9a814fa5691fae5c91f008f654787 Mon Sep 17 00:00:00 2001 From: shartte Date: Wed, 24 Aug 2016 09:34:48 +0200 Subject: [PATCH] Implemented registry renaming as discussed in #70 (#89) - Implemented registry renaming as discussed in #70 (#89) --- .../java/appeng/api/definitions/IBlocks.java | 40 ++-- src/main/java/appeng/client/ClientHelper.java | 2 +- src/main/java/appeng/core/CreativeTab.java | 2 +- .../core/api/definitions/ApiBlocks.java | 184 +++++++++--------- .../java/appeng/recipes/RecipeHandler.java | 4 +- .../java/appeng/services/CompassService.java | 2 +- .../java/appeng/worldgen/MeteoritePlacer.java | 4 +- .../blockstates/cell_workbench.json | 2 +- ...quartz.json => chiseled_quartz_block.json} | 0 ...seled.json => chiseled_quartz_stairs.json} | 0 .../{fluix.json => fluix_block.json} | 0 ...ir_common_fluix.json => fluix_stairs.json} | 0 .../{grinder.json => grindstone.json} | 0 .../{quartz.json => quartz_block.json} | 0 ...{quartz_torch.json => quartz_fixture.json} | 0 ..._pillar.json => quartz_pillar_stairs.json} | 0 ..._quartz_certus.json => quartz_stairs.json} | 0 ...tz_lamp.json => quartz_vibrant_glass.json} | 0 .../{security.json => security_station.json} | 0 .../blockstates/sky_stone_block.json | 2 +- .../blockstates/sky_stone_brick.json | 2 +- ...brick.json => sky_stone_brick_stairs.json} | 0 .../blockstates/sky_stone_small_brick.json | 2 +- ...json => sky_stone_small_brick_stairs.json} | 0 ...stone_stone.json => sky_stone_stairs.json} | 0 .../blockstates/smooth_sky_stone_block.json | 7 + ...lock.json => smooth_sky_stone_stairs.json} | 0 ...reless.json => wireless_access_point.json} | 0 28 files changed, 130 insertions(+), 123 deletions(-) rename src/main/resources/assets/appliedenergistics2/blockstates/{chiseled_quartz.json => chiseled_quartz_block.json} (100%) rename src/main/resources/assets/appliedenergistics2/blockstates/{stair_common_quartz_certus_chiseled.json => chiseled_quartz_stairs.json} (100%) rename src/main/resources/assets/appliedenergistics2/blockstates/{fluix.json => fluix_block.json} (100%) rename src/main/resources/assets/appliedenergistics2/blockstates/{stair_common_fluix.json => fluix_stairs.json} (100%) rename src/main/resources/assets/appliedenergistics2/blockstates/{grinder.json => grindstone.json} (100%) rename src/main/resources/assets/appliedenergistics2/blockstates/{quartz.json => quartz_block.json} (100%) rename src/main/resources/assets/appliedenergistics2/blockstates/{quartz_torch.json => quartz_fixture.json} (100%) rename src/main/resources/assets/appliedenergistics2/blockstates/{stair_common_quartz_certus_pillar.json => quartz_pillar_stairs.json} (100%) rename src/main/resources/assets/appliedenergistics2/blockstates/{stair_common_quartz_certus.json => quartz_stairs.json} (100%) rename src/main/resources/assets/appliedenergistics2/blockstates/{quartz_lamp.json => quartz_vibrant_glass.json} (100%) rename src/main/resources/assets/appliedenergistics2/blockstates/{security.json => security_station.json} (100%) rename src/main/resources/assets/appliedenergistics2/blockstates/{stair_common_skystone_brick.json => sky_stone_brick_stairs.json} (100%) rename src/main/resources/assets/appliedenergistics2/blockstates/{stair_common_skystone_brick_small.json => sky_stone_small_brick_stairs.json} (100%) rename src/main/resources/assets/appliedenergistics2/blockstates/{stair_common_skystone_stone.json => sky_stone_stairs.json} (100%) create mode 100644 src/main/resources/assets/appliedenergistics2/blockstates/smooth_sky_stone_block.json rename src/main/resources/assets/appliedenergistics2/blockstates/{stair_common_skystone_block.json => smooth_sky_stone_stairs.json} (100%) rename src/main/resources/assets/appliedenergistics2/blockstates/{wireless.json => wireless_access_point.json} (100%) diff --git a/src/api/java/appeng/api/definitions/IBlocks.java b/src/api/java/appeng/api/definitions/IBlocks.java index 11c71b77..8aa1947d 100644 --- a/src/api/java/appeng/api/definitions/IBlocks.java +++ b/src/api/java/appeng/api/definitions/IBlocks.java @@ -41,49 +41,49 @@ public interface IBlocks /* * decorative */ - IBlockDefinition quartz(); + IBlockDefinition quartzBlock(); IBlockDefinition quartzPillar(); - IBlockDefinition quartzChiseled(); + IBlockDefinition chiseledQuartzBlock(); IBlockDefinition quartzGlass(); IBlockDefinition quartzVibrantGlass(); - IBlockDefinition quartzTorch(); + IBlockDefinition quartzFixture(); - IBlockDefinition fluix(); - - IBlockDefinition skyStone(); + IBlockDefinition fluixBlock(); IBlockDefinition skyStoneBlock(); + IBlockDefinition smoothSkyStoneBlock(); + IBlockDefinition skyStoneBrick(); IBlockDefinition skyStoneSmallBrick(); - IBlockDefinition skyChest(); + IBlockDefinition skyStoneChest(); - IBlockDefinition skyChestBlock(); + IBlockDefinition smoothSkyStoneChest(); IBlockDefinition skyCompass(); - IBlockDefinition skyStoneStair(); + IBlockDefinition skyStoneStairs(); - IBlockDefinition skyStoneBlockStair(); + IBlockDefinition smoothSkyStoneStairs(); - IBlockDefinition skyStoneBrickStair(); + IBlockDefinition skyStoneBrickStairs(); - IBlockDefinition skyStoneSmallBrickStair(); + IBlockDefinition skyStoneSmallBrickStairs(); - IBlockDefinition fluixStair(); + IBlockDefinition fluixStairs(); - IBlockDefinition quartzStair(); + IBlockDefinition quartzStairs(); - IBlockDefinition chiseledQuartzStair(); + IBlockDefinition chiseledQuartzStairs(); - IBlockDefinition quartzPillarStair(); + IBlockDefinition quartzPillarStairs(); /* * IBlockDefinition skyStoneSlab(); @@ -99,19 +99,19 @@ public interface IBlocks /* * misc */ - ITileDefinition grindStone(); + ITileDefinition grindstone(); - ITileDefinition crankHandle(); + ITileDefinition crank(); ITileDefinition inscriber(); - ITileDefinition wireless(); + ITileDefinition wirelessAccessPoint(); ITileDefinition charger(); IBlockDefinition tinyTNT(); - ITileDefinition security(); + ITileDefinition securityStation(); /* * quantum Network Bridge diff --git a/src/main/java/appeng/client/ClientHelper.java b/src/main/java/appeng/client/ClientHelper.java index 38725505..47892003 100644 --- a/src/main/java/appeng/client/ClientHelper.java +++ b/src/main/java/appeng/client/ClientHelper.java @@ -110,7 +110,7 @@ public class ClientHelper extends ServerHelper // final ModelResourceLocation fluixStairModel = new ModelResourceLocation( resource, "inventory" ); // AELog.info( "FluixStairModel: " + fluixStairModel ); // - // final Set items = AEApi.instance().definitions().blocks().fluixStair().maybeItem().asSet(); + // final Set items = AEApi.instance().definitions().blocks().fluixStairs().maybeItem().asSet(); // for( Item item : items ) // { // AELog.info( "Registering with %s with unlocalized %s", item, item.getUnlocalizedName() ); diff --git a/src/main/java/appeng/core/CreativeTab.java b/src/main/java/appeng/core/CreativeTab.java index af4d0b33..3b4f1556 100644 --- a/src/main/java/appeng/core/CreativeTab.java +++ b/src/main/java/appeng/core/CreativeTab.java @@ -60,7 +60,7 @@ public final class CreativeTab extends CreativeTabs final IItems items = definitions.items(); final IMaterials materials = definitions.materials(); - return this.findFirst( blocks.controller(), blocks.chest(), blocks.cellWorkbench(), blocks.fluix(), items.cell1k(), items.networkTool(), materials.fluixCrystal(), materials.certusQuartzCrystal() ); + return this.findFirst( blocks.controller(), blocks.chest(), blocks.cellWorkbench(), blocks.fluixBlock(), items.cell1k(), items.networkTool(), materials.fluixCrystal(), materials.certusQuartzCrystal() ); } private ItemStack findFirst( final IItemDefinition... choices ) diff --git a/src/main/java/appeng/core/api/definitions/ApiBlocks.java b/src/main/java/appeng/core/api/definitions/ApiBlocks.java index 8dc5d4cb..ff143081 100644 --- a/src/main/java/appeng/core/api/definitions/ApiBlocks.java +++ b/src/main/java/appeng/core/api/definitions/ApiBlocks.java @@ -104,27 +104,27 @@ public final class ApiBlocks implements IBlocks private final IBlockDefinition quartzOre; private final IBlockDefinition quartzOreCharged; private final IBlockDefinition matrixFrame; - private final IBlockDefinition quartz; + private final IBlockDefinition quartzBlock; private final IBlockDefinition quartzPillar; - private final IBlockDefinition quartzChiseled; + private final IBlockDefinition chiseledQuartzBlock; private final IBlockDefinition quartzGlass; private final IBlockDefinition quartzVibrantGlass; - private final IBlockDefinition quartzTorch; - private final IBlockDefinition fluix; - private final IBlockDefinition skyStone_stone; - private final IBlockDefinition skyStone_block; - private final IBlockDefinition skyStone_brick; - private final IBlockDefinition skyStone_smallbrick; - private final IBlockDefinition skyChest; - private final IBlockDefinition skyChestBlock; + private final IBlockDefinition quartzFixture; + private final IBlockDefinition fluixBlock; + private final IBlockDefinition skyStoneBlock; + private final IBlockDefinition smoothSkyStoneBlock; + private final IBlockDefinition skyStoneBrick; + private final IBlockDefinition skyStoneSmallBrick; + private final IBlockDefinition skyStoneChest; + private final IBlockDefinition smoothSkyStoneChest; private final IBlockDefinition skyCompass; - private final ITileDefinition grindStone; - private final ITileDefinition crankHandle; + private final ITileDefinition grindstone; + private final ITileDefinition crank; private final ITileDefinition inscriber; - private final ITileDefinition wireless; + private final ITileDefinition wirelessAccessPoint; private final ITileDefinition charger; private final IBlockDefinition tinyTNT; - private final ITileDefinition security; + private final ITileDefinition securityStation; private final ITileDefinition quantumRing; private final ITileDefinition quantumLink; private final ITileDefinition spatialPylon; @@ -153,14 +153,14 @@ public final class ApiBlocks implements IBlocks private final ITileDefinition molecularAssembler; private final ITileDefinition lightDetector; private final ITileDefinition paint; - private final IBlockDefinition skyStoneStair; - private final IBlockDefinition skyStoneBlockStair; - private final IBlockDefinition skyStoneBrickStair; - private final IBlockDefinition skyStoneSmallBrickStair; - private final IBlockDefinition fluixStair; - private final IBlockDefinition quartzStair; - private final IBlockDefinition chiseledQuartzStair; - private final IBlockDefinition quartzPillarStair; + private final IBlockDefinition skyStoneStairs; + private final IBlockDefinition smoothSkyStoneStairs; + private final IBlockDefinition skyStoneBrickStairs; + private final IBlockDefinition skyStoneSmallBrickStairs; + private final IBlockDefinition fluixStairs; + private final IBlockDefinition quartzStairs; + private final IBlockDefinition chiseledQuartzStairs; + private final IBlockDefinition quartzPillarStairs; /* * private final IBlockDefinition skyStoneSlab; * private final IBlockDefinition skyStoneBlockSlab; @@ -195,33 +195,33 @@ public final class ApiBlocks implements IBlocks this.matrixFrame = registry.block( "matrix_frame", BlockMatrixFrame::new ).features( AEFeature.SpatialIO ).build(); FeatureFactory deco = registry.features( AEFeature.DecorativeQuartzBlocks ); - this.quartz = deco.block( "quartz", BlockQuartz::new ).build(); + this.quartzBlock = deco.block( "quartz_block", BlockQuartz::new ).build(); this.quartzPillar = deco.block( "quartz_pillar", BlockQuartzPillar::new ).build(); - this.quartzChiseled = deco.block( "chiseled_quartz", BlockChiseledQuartz::new ).build(); + this.chiseledQuartzBlock = deco.block( "chiseled_quartz_block", BlockChiseledQuartz::new ).build(); this.quartzGlass = deco.block( "quartz_glass", BlockQuartzGlass::new ).build(); - this.quartzVibrantGlass = deco.block( "quartz_lamp", BlockQuartzLamp::new ).addFeatures( AEFeature.DecorativeLights ).build(); - this.quartzTorch = registry.block( "quartz_torch", BlockQuartzTorch::new ).features( AEFeature.DecorativeLights ).build(); + this.quartzVibrantGlass = deco.block( "quartz_vibrant_glass", BlockQuartzLamp::new ).addFeatures( AEFeature.DecorativeLights ).build(); + this.quartzFixture = registry.block( "quartz_fixture", BlockQuartzTorch::new ).features( AEFeature.DecorativeLights ).build(); - this.fluix = deco.block( "fluix", BlockFluix::new ).build(); - this.skyStone_stone = deco.block( "sky_stone_block_stone", () -> new BlockSkyStone( SkystoneType.STONE ) ).build(); - this.skyStone_block = deco.block( "sky_stone_block_block", () -> new BlockSkyStone( SkystoneType.BLOCK ) ).build(); - this.skyStone_brick = deco.block( "sky_stone_block_brick", () -> new BlockSkyStone( SkystoneType.BRICK ) ).build(); - this.skyStone_smallbrick = deco.block( "sky_stone_block_small_brick", () -> new BlockSkyStone( SkystoneType.SMALL_BRICK ) ).build(); + this.fluixBlock = deco.block( "fluix_block", BlockFluix::new ).build(); + this.skyStoneBlock = deco.block( "sky_stone_block", () -> new BlockSkyStone( SkystoneType.STONE ) ).build(); + this.smoothSkyStoneBlock = deco.block( "smooth_skystone", () -> new BlockSkyStone( SkystoneType.BLOCK ) ).build(); + this.skyStoneBrick = deco.block( "skystone_brick", () -> new BlockSkyStone( SkystoneType.BRICK ) ).build(); + this.skyStoneSmallBrick = deco.block( "skystone_small_brick", () -> new BlockSkyStone( SkystoneType.SMALL_BRICK ) ).build(); - this.skyChest = registry.block( "sky_chest_stone", () -> new BlockSkyChest( SkyChestType.STONE ) ) + this.skyStoneChest = registry.block( "skystone_chest", () -> new BlockSkyChest( SkyChestType.STONE ) ) .features( AEFeature.SkyStoneChests ) .rendering( new SkyChestRenderingCustomizer( SkyChestType.STONE ) ) .build(); - this.skyChestBlock = registry.block( "sky_chest_block", () -> new BlockSkyChest( SkyChestType.BLOCK ) ) + this.smoothSkyStoneChest = registry.block( "smooth_skystone_chest", () -> new BlockSkyChest( SkyChestType.BLOCK ) ) .features( AEFeature.SkyStoneChests ) .rendering( new SkyChestRenderingCustomizer( SkyChestType.BLOCK ) ) .build(); this.skyCompass = registry.block( "sky_compass", BlockSkyCompass::new ).features( AEFeature.MeteoriteCompass ).build(); - this.grindStone = registry.block( "grinder", BlockGrinder::new ).features( AEFeature.GrindStone ).build(); - this.crankHandle = registry.block( "crank", BlockCrank::new ).features( AEFeature.GrindStone ).build(); + this.grindstone = registry.block( "grindstone", BlockGrinder::new ).features( AEFeature.GrindStone ).build(); + this.crank = registry.block( "crank", BlockCrank::new ).features( AEFeature.GrindStone ).build(); this.inscriber = registry.block( "inscriber", BlockInscriber::new ).features( AEFeature.Inscriber ).build(); - this.wireless = registry.block( "wireless", BlockWireless::new ).features( AEFeature.WirelessAccessTerminal ).build(); + this.wirelessAccessPoint = registry.block( "wireless_access_point", BlockWireless::new ).features( AEFeature.WirelessAccessTerminal ).build(); this.charger = registry.block( "charger", BlockCharger::new ) .rendering( new BlockRenderingCustomizer() { @@ -238,7 +238,7 @@ public final class ApiBlocks implements IBlocks BlockDispenser.DISPENSE_BEHAVIOR_REGISTRY.putObject( item, new DispenserBehaviorTinyTNT() ); } ) .build(); - this.security = registry.block( "security", BlockSecurity::new ).features( AEFeature.Security ).build(); + this.securityStation = registry.block( "security_station", BlockSecurity::new ).features( AEFeature.Security ).build(); this.quantumRing = registry.block( "quantum_ring", BlockQuantumRing::new ).features( AEFeature.QuantumNetworkBridge ).build(); this.quantumLink = registry.block( "quantum_link", BlockQuantumLinkChamber::new ).features( AEFeature.QuantumNetworkBridge ).build(); this.spatialPylon = registry.block( "spatial_pylon", BlockSpatialPylon::new ).features( AEFeature.SpatialIO ).build(); @@ -247,7 +247,7 @@ public final class ApiBlocks implements IBlocks this.drive = registry.block( "drive", BlockDrive::new ).features( AEFeature.StorageCells, AEFeature.MEDrive ).build(); this.chest = registry.block( "chest", BlockChest::new ).features( AEFeature.StorageCells, AEFeature.MEChest ).build(); this.iface = registry.block( "interface", BlockInterface::new ).build(); - this.cellWorkbench = registry.block( "cell_work_bench", BlockCellWorkbench::new ).features( AEFeature.StorageCells ).build(); + this.cellWorkbench = registry.block( "cell_workbench", BlockCellWorkbench::new ).features( AEFeature.StorageCells ).build(); this.iOPort = registry.block( "ioport", BlockIOPort::new ).features( AEFeature.StorageCells, AEFeature.IOPort ).build(); this.condenser = registry.block( "condenser", BlockCondenser::new ).build(); this.energyAcceptor = registry.block( "energy_acceptor", BlockEnergyAcceptor::new ).build(); @@ -288,14 +288,14 @@ public final class ApiBlocks implements IBlocks this.lightDetector = registry.block( "light_detector", BlockLightDetector::new ).features( AEFeature.LightDetector ).build(); this.paint = registry.block( "paint", BlockPaint::new ).features( AEFeature.PaintBalls ).build(); - this.skyStoneStair = makeStairs( "stair_skystone_stone", registry, this.skyStone() ); - this.skyStoneBlockStair = makeStairs( "stair_skystone_block", registry, this.skyStoneBlock() ); - this.skyStoneBrickStair = makeStairs( "stair_skystone_brick", registry, this.skyStoneBrick() ); - this.skyStoneSmallBrickStair = makeStairs( "stair_skystone_brick_small", registry, this.skyStoneSmallBrick() ); - this.fluixStair = makeStairs( "stair_fluix", registry, this.fluix() ); - this.quartzStair = makeStairs( "stair_quartz_certus", registry, this.quartz() ); - this.chiseledQuartzStair = makeStairs( "stair_quartz_certus_chiseled", registry, this.quartzChiseled() ); - this.quartzPillarStair = makeStairs( "stair_quartz_certus_pillar", registry, this.quartzPillar() ); + this.skyStoneStairs = makeStairs( "skystone_stairs", registry, this.skyStoneBlock() ); + this.smoothSkyStoneStairs = makeStairs( "smooth_skystone_stairs", registry, this.smoothSkyStoneBlock() ); + this.skyStoneBrickStairs = makeStairs( "skystone_brick_stairs", registry, this.skyStoneBrick() ); + this.skyStoneSmallBrickStairs = makeStairs( "skystone_small_brick_stairs", registry, this.skyStoneSmallBrick() ); + this.fluixStairs = makeStairs( "fluix_stairs", registry, this.fluixBlock() ); + this.quartzStairs = makeStairs( "quartz_stairs", registry, this.quartzBlock() ); + this.chiseledQuartzStairs = makeStairs( "chiseled_quartz_stairs", registry, this.chiseledQuartzBlock() ); + this.quartzPillarStairs = makeStairs( "quartz_pillar_stairs", registry, this.quartzPillar() ); this.multiPart = registry.block( "multipart_block", BlockCableBus::new ) .rendering( new BlockRenderingCustomizer() @@ -324,7 +324,7 @@ public final class ApiBlocks implements IBlocks * EnumSet.of(AEFeature.DecorativeQuartzBlocks), false, "FluixSlabBlock" ) ); * this.quartzSlab = constructor.registerBlockDefinition( new AEBaseSlabBlock( quartzBlock, * EnumSet.of(AEFeature.DecorativeQuartzBlocks), false, "QuartzSlabBlock" ) ); - * this.chiseledQuartzSlab = constructor.registerBlockDefinition( new AEBaseSlabBlock( chiseledQuartz, + * this.chiseledQuartzSlab = constructor.registerBlockDefinition( new AEBaseSlabBlock( chiseledQuartzBlock, * EnumSet.of(AEFeature.DecorativeQuartzBlocks), false, "ChiseledQuartzSlabBlock" ) ); * this.quartzPillarSlab = constructor.registerBlockDefinition( new AEBaseSlabBlock( quartzPillar, * EnumSet.of(AEFeature.DecorativeQuartzBlocks), false, "QuartzPillarSlabBlock" ) ) @@ -362,9 +362,9 @@ public final class ApiBlocks implements IBlocks } @Override - public IBlockDefinition quartz() + public IBlockDefinition quartzBlock() { - return this.quartz; + return this.quartzBlock; } @Override @@ -374,9 +374,9 @@ public final class ApiBlocks implements IBlocks } @Override - public IBlockDefinition quartzChiseled() + public IBlockDefinition chiseledQuartzBlock() { - return this.quartzChiseled; + return this.chiseledQuartzBlock; } @Override @@ -392,51 +392,51 @@ public final class ApiBlocks implements IBlocks } @Override - public IBlockDefinition quartzTorch() + public IBlockDefinition quartzFixture() { - return this.quartzTorch; + return this.quartzFixture; } @Override - public IBlockDefinition fluix() + public IBlockDefinition fluixBlock() { - return this.fluix; - } - - @Override - public IBlockDefinition skyStone() - { - return this.skyStone_stone; + return this.fluixBlock; } @Override public IBlockDefinition skyStoneBlock() { - return this.skyStone_block; + return this.skyStoneBlock; + } + + @Override + public IBlockDefinition smoothSkyStoneBlock() + { + return this.smoothSkyStoneBlock; } @Override public IBlockDefinition skyStoneBrick() { - return this.skyStone_brick; + return this.skyStoneBrick; } @Override public IBlockDefinition skyStoneSmallBrick() { - return this.skyStone_smallbrick; + return this.skyStoneSmallBrick; } @Override - public IBlockDefinition skyChest() + public IBlockDefinition skyStoneChest() { - return this.skyChest; + return this.skyStoneChest; } @Override - public IBlockDefinition skyChestBlock() + public IBlockDefinition smoothSkyStoneChest() { - return this.skyChestBlock; + return this.smoothSkyStoneChest; } @Override @@ -446,51 +446,51 @@ public final class ApiBlocks implements IBlocks } @Override - public IBlockDefinition skyStoneStair() + public IBlockDefinition skyStoneStairs() { - return this.skyStoneStair; + return this.skyStoneStairs; } @Override - public IBlockDefinition skyStoneBlockStair() + public IBlockDefinition smoothSkyStoneStairs() { - return this.skyStoneBlockStair; + return this.smoothSkyStoneStairs; } @Override - public IBlockDefinition skyStoneBrickStair() + public IBlockDefinition skyStoneBrickStairs() { - return this.skyStoneBrickStair; + return this.skyStoneBrickStairs; } @Override - public IBlockDefinition skyStoneSmallBrickStair() + public IBlockDefinition skyStoneSmallBrickStairs() { - return this.skyStoneSmallBrickStair; + return this.skyStoneSmallBrickStairs; } @Override - public IBlockDefinition fluixStair() + public IBlockDefinition fluixStairs() { - return this.fluixStair; + return this.fluixStairs; } @Override - public IBlockDefinition quartzStair() + public IBlockDefinition quartzStairs() { - return this.quartzStair; + return this.quartzStairs; } @Override - public IBlockDefinition chiseledQuartzStair() + public IBlockDefinition chiseledQuartzStairs() { - return this.chiseledQuartzStair; + return this.chiseledQuartzStairs; } @Override - public IBlockDefinition quartzPillarStair() + public IBlockDefinition quartzPillarStairs() { - return this.quartzPillarStair; + return this.quartzPillarStairs; } /* @@ -537,15 +537,15 @@ public final class ApiBlocks implements IBlocks */ @Override - public ITileDefinition grindStone() + public ITileDefinition grindstone() { - return this.grindStone; + return this.grindstone; } @Override - public ITileDefinition crankHandle() + public ITileDefinition crank() { - return this.crankHandle; + return this.crank; } @Override @@ -555,9 +555,9 @@ public final class ApiBlocks implements IBlocks } @Override - public ITileDefinition wireless() + public ITileDefinition wirelessAccessPoint() { - return this.wireless; + return this.wirelessAccessPoint; } @Override @@ -573,9 +573,9 @@ public final class ApiBlocks implements IBlocks } @Override - public ITileDefinition security() + public ITileDefinition securityStation() { - return this.security; + return this.securityStation; } @Override diff --git a/src/main/java/appeng/recipes/RecipeHandler.java b/src/main/java/appeng/recipes/RecipeHandler.java index 71ef1e49..99786fd7 100644 --- a/src/main/java/appeng/recipes/RecipeHandler.java +++ b/src/main/java/appeng/recipes/RecipeHandler.java @@ -131,10 +131,10 @@ public class RecipeHandler implements IRecipeHandler final IBlocks blocks = definitions.blocks(); final Optional maybeCrystalSeedItem = items.crystalSeed().maybeItem(); - final Optional maybeSkyStoneItem = blocks.skyStone().maybeItem(); + final Optional maybeSkyStoneItem = blocks.skyStoneBlock().maybeItem(); final Optional maybeCStorageItem = blocks.craftingStorage1k().maybeItem(); final Optional maybeCUnitItem = blocks.craftingUnit().maybeItem(); - final Optional maybeSkyChestItem = blocks.skyChest().maybeItem(); + final Optional maybeSkyChestItem = blocks.skyStoneChest().maybeItem(); if( maybeCrystalSeedItem.isPresent() && is.getItem() == maybeCrystalSeedItem.get() ) { diff --git a/src/main/java/appeng/services/CompassService.java b/src/main/java/appeng/services/CompassService.java index 8cfab95e..6c8edf96 100644 --- a/src/main/java/appeng/services/CompassService.java +++ b/src/main/java/appeng/services/CompassService.java @@ -133,7 +133,7 @@ public final class CompassService // lower level... final Chunk c = w.getChunkFromChunkCoords( cx, cz ); - for( final Block skyStoneBlock : AEApi.instance().definitions().blocks().skyStone().maybeBlock().asSet() ) + for( final Block skyStoneBlock : AEApi.instance().definitions().blocks().skyStoneBlock().maybeBlock().asSet() ) { for( int i = 0; i < CHUNK_SIZE; i++ ) { diff --git a/src/main/java/appeng/worldgen/MeteoritePlacer.java b/src/main/java/appeng/worldgen/MeteoritePlacer.java index e69a9dd2..5b68cae9 100644 --- a/src/main/java/appeng/worldgen/MeteoritePlacer.java +++ b/src/main/java/appeng/worldgen/MeteoritePlacer.java @@ -75,8 +75,8 @@ public final class MeteoritePlacer { final IBlocks blocks = AEApi.instance().definitions().blocks(); - this.skyChestDefinition = blocks.skyChest(); - this.skyStoneDefinition = blocks.skyStone(); + this.skyChestDefinition = blocks.skyStoneChest(); + this.skyStoneDefinition = blocks.skyStoneBlock(); this.validSpawn.add( Blocks.STONE ); this.validSpawn.add( Blocks.COBBLESTONE ); diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/cell_workbench.json b/src/main/resources/assets/appliedenergistics2/blockstates/cell_workbench.json index e4bd6617..f9828a89 100644 --- a/src/main/resources/assets/appliedenergistics2/blockstates/cell_workbench.json +++ b/src/main/resources/assets/appliedenergistics2/blockstates/cell_workbench.json @@ -1,7 +1,7 @@ { "variants": { "normal": { - "model": "appliedenergistics2:cell_workbench" + "model": "appliedenergistics2:cell_work_bench" } } } \ 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_block.json similarity index 100% rename from src/main/resources/assets/appliedenergistics2/blockstates/chiseled_quartz.json rename to src/main/resources/assets/appliedenergistics2/blockstates/chiseled_quartz_block.json diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/stair_common_quartz_certus_chiseled.json b/src/main/resources/assets/appliedenergistics2/blockstates/chiseled_quartz_stairs.json similarity index 100% rename from src/main/resources/assets/appliedenergistics2/blockstates/stair_common_quartz_certus_chiseled.json rename to src/main/resources/assets/appliedenergistics2/blockstates/chiseled_quartz_stairs.json diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/fluix.json b/src/main/resources/assets/appliedenergistics2/blockstates/fluix_block.json similarity index 100% rename from src/main/resources/assets/appliedenergistics2/blockstates/fluix.json rename to src/main/resources/assets/appliedenergistics2/blockstates/fluix_block.json diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/stair_common_fluix.json b/src/main/resources/assets/appliedenergistics2/blockstates/fluix_stairs.json similarity index 100% rename from src/main/resources/assets/appliedenergistics2/blockstates/stair_common_fluix.json rename to src/main/resources/assets/appliedenergistics2/blockstates/fluix_stairs.json diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/grinder.json b/src/main/resources/assets/appliedenergistics2/blockstates/grindstone.json similarity index 100% rename from src/main/resources/assets/appliedenergistics2/blockstates/grinder.json rename to src/main/resources/assets/appliedenergistics2/blockstates/grindstone.json diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/quartz.json b/src/main/resources/assets/appliedenergistics2/blockstates/quartz_block.json similarity index 100% rename from src/main/resources/assets/appliedenergistics2/blockstates/quartz.json rename to src/main/resources/assets/appliedenergistics2/blockstates/quartz_block.json diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/quartz_torch.json b/src/main/resources/assets/appliedenergistics2/blockstates/quartz_fixture.json similarity index 100% rename from src/main/resources/assets/appliedenergistics2/blockstates/quartz_torch.json rename to src/main/resources/assets/appliedenergistics2/blockstates/quartz_fixture.json diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/stair_common_quartz_certus_pillar.json b/src/main/resources/assets/appliedenergistics2/blockstates/quartz_pillar_stairs.json similarity index 100% rename from src/main/resources/assets/appliedenergistics2/blockstates/stair_common_quartz_certus_pillar.json rename to src/main/resources/assets/appliedenergistics2/blockstates/quartz_pillar_stairs.json diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/stair_common_quartz_certus.json b/src/main/resources/assets/appliedenergistics2/blockstates/quartz_stairs.json similarity index 100% rename from src/main/resources/assets/appliedenergistics2/blockstates/stair_common_quartz_certus.json rename to src/main/resources/assets/appliedenergistics2/blockstates/quartz_stairs.json diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/quartz_lamp.json b/src/main/resources/assets/appliedenergistics2/blockstates/quartz_vibrant_glass.json similarity index 100% rename from src/main/resources/assets/appliedenergistics2/blockstates/quartz_lamp.json rename to src/main/resources/assets/appliedenergistics2/blockstates/quartz_vibrant_glass.json diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/security.json b/src/main/resources/assets/appliedenergistics2/blockstates/security_station.json similarity index 100% rename from src/main/resources/assets/appliedenergistics2/blockstates/security.json rename to src/main/resources/assets/appliedenergistics2/blockstates/security_station.json diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_block.json b/src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_block.json index 0f9b8000..3d5abc8b 100644 --- a/src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_block.json +++ b/src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_block.json @@ -1,7 +1,7 @@ { "variants": { "normal": { - "model": "appliedenergistics2:sky_stone_block" + "model": "appliedenergistics2:sky_stone_block_stone" } } } \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_brick.json b/src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_brick.json index af095ed6..a2d23b83 100644 --- a/src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_brick.json +++ b/src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_brick.json @@ -1,7 +1,7 @@ { "variants": { "normal": { - "model": "appliedenergistics2:sky_stone_brick" + "model": "appliedenergistics2:sky_stone_block_brick" } } } \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/stair_common_skystone_brick.json b/src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_brick_stairs.json similarity index 100% rename from src/main/resources/assets/appliedenergistics2/blockstates/stair_common_skystone_brick.json rename to src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_brick_stairs.json diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_small_brick.json b/src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_small_brick.json index 3ee8d76a..0fac5d4f 100644 --- a/src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_small_brick.json +++ b/src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_small_brick.json @@ -1,7 +1,7 @@ { "variants": { "normal": { - "model": "appliedenergistics2:sky_stone_small_brick" + "model": "appliedenergistics2:sky_stone_block_small_brick" } } } \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/stair_common_skystone_brick_small.json b/src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_small_brick_stairs.json similarity index 100% rename from src/main/resources/assets/appliedenergistics2/blockstates/stair_common_skystone_brick_small.json rename to src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_small_brick_stairs.json diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/stair_common_skystone_stone.json b/src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_stairs.json similarity index 100% rename from src/main/resources/assets/appliedenergistics2/blockstates/stair_common_skystone_stone.json rename to src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_stairs.json diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/smooth_sky_stone_block.json b/src/main/resources/assets/appliedenergistics2/blockstates/smooth_sky_stone_block.json new file mode 100644 index 00000000..c2aa46a3 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/blockstates/smooth_sky_stone_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/stair_common_skystone_block.json b/src/main/resources/assets/appliedenergistics2/blockstates/smooth_sky_stone_stairs.json similarity index 100% rename from src/main/resources/assets/appliedenergistics2/blockstates/stair_common_skystone_block.json rename to src/main/resources/assets/appliedenergistics2/blockstates/smooth_sky_stone_stairs.json diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/wireless.json b/src/main/resources/assets/appliedenergistics2/blockstates/wireless_access_point.json similarity index 100% rename from src/main/resources/assets/appliedenergistics2/blockstates/wireless.json rename to src/main/resources/assets/appliedenergistics2/blockstates/wireless_access_point.json