From 59dbfb145212019364f67c17646d25feec534a07 Mon Sep 17 00:00:00 2001 From: thatsIch Date: Tue, 29 Sep 2015 15:47:55 +0200 Subject: [PATCH] Fixed stairs --- build.gradle | 28 +-- gradle.properties | 10 +- gradle/scripts/artifacts.gradle | 2 + gradle/scripts/autoinstallruntime.gradle | 21 +- gradle/scripts/dependencies.gradle | 8 +- gradle/scripts/integration.gradle | 5 + gradle/scripts/optional.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 +- .../api/definitions/IItemDefinition.java | 12 +- .../appeng/api/definitions/IMaterials.java | 2 +- .../java/appeng/block/AEBaseStairBlock.java | 13 +- .../block/crafting/BlockCraftingUnit.java | 190 +++++++++--------- .../appeng/block/misc/BlockInscriber.java | 7 + .../java/appeng/block/misc/BlockTinyTNT.java | 85 +++----- src/main/java/appeng/client/ClientHelper.java | 54 ++--- .../appeng/client/me/SlotDisconnected.java | 2 +- src/main/java/appeng/client/me/SlotME.java | 3 +- .../render/blocks/RenderQuartzGlass.java | 14 +- .../client/render/blocks/RenderQuartzOre.java | 10 +- .../client/render/effects/AssemblerFX.java | 2 +- .../client/render/effects/CraftingFx.java | 2 +- .../client/render/effects/EnergyFx.java | 2 +- .../client/render/effects/LightningFX.java | 2 +- .../client/render/effects/MatterCannonFX.java | 2 +- .../ContainerCellWorkbench.java | 2 +- .../ContainerMEMonitorable.java | 5 +- .../implementations/ContainerQuartzKnife.java | 2 +- .../java/appeng/container/slot/NullSlot.java | 2 +- src/main/java/appeng/core/AELog.java | 20 +- src/main/java/appeng/core/AppEng.java | 8 +- src/main/java/appeng/core/CommonHelper.java | 3 +- src/main/java/appeng/core/Registration.java | 4 +- .../core/api/definitions/ApiBlocks.java | 49 ++--- .../core/api/definitions/ApiMaterials.java | 121 ++++++----- .../appeng/core/api/definitions/ApiParts.java | 52 ++--- .../core/features/AEBlockFeatureHandler.java | 23 ++- .../features/AECableBusFeatureHandler.java | 7 +- .../java/appeng/core/features/AEFeature.java | 110 +++++++--- .../features/AETileBlockFeatureHandler.java | 25 ++- .../appeng/core/features/BlockDefinition.java | 13 +- .../core/features/DamagedItemDefinition.java | 36 ++-- .../appeng/core/features/ItemDefinition.java | 15 +- .../core/features/ItemFeatureHandler.java | 4 +- .../features/StairBlockFeatureHandler.java | 12 +- .../appeng/core/features/TileDefinition.java | 15 +- .../appeng/core/worlddata/PlayerData.java | 3 +- .../appeng/core/worlddata/PlayerMapping.java | 7 +- .../worlddata/PlayerMappingsInitializer.java | 6 +- src/main/java/appeng/debug/TileItemGen.java | 2 +- .../solid/ChargedQuartzOreBlock.java} | 6 +- .../solid/ChiseledQuartzBlock.java} | 6 +- .../solid/FluixBlock.java} | 6 +- .../decorative/solid/FluixIdentifier.java | 20 ++ .../appeng/decorative/solid/Identifier.java | 18 ++ .../solid/QuartzBlock.java} | 6 +- .../solid/QuartzGlassBlock.java} | 6 +- .../solid/QuartzLampBlock.java} | 6 +- .../solid/QuartzOreBlock.java} | 6 +- .../solid/QuartzPillarBlock.java} | 6 +- .../solid/SkyStoneBlock.java} | 67 +++--- .../stair/BlockStairCommon.java | 8 +- .../stair/DecorativeStairIdentifier.java | 58 ++++++ .../decorative/stair/FluixStairBlock.java | 18 ++ .../decorative/stair/FluixStairComponent.java | 11 + .../stair/FluixStairIdentifier.java | 22 ++ .../decorative/stair/FluixStairSupplier.java | 33 +++ .../stair/StairBlockDefinition.java | 71 +++++++ .../items/contents/NetworkToolViewer.java | 4 +- ...{ItemMultiMaterial.java => MultiItem.java} | 6 +- .../java/appeng/items/parts/ItemFacade.java | 4 +- .../items/tools/powered/ToolChargedStaff.java | 13 +- .../items/tools/powered/ToolMassCannon.java | 4 +- .../java/appeng/parts/misc/PartInterface.java | 9 +- .../java/appeng/parts/p2p/PartP2PItems.java | 2 +- .../java/appeng/recipes/AEItemResolver.java | 4 +- .../java/appeng/recipes/RecipeHandler.java | 6 +- src/main/java/appeng/server/AECommand.java | 10 +- src/main/java/appeng/server/ServerHelper.java | 3 +- .../appeng/spatial/StorageChunkProvider.java | 5 +- src/main/java/appeng/tile/AEBaseInvTile.java | 61 +++--- .../inventory/AppEngInternalAEInventory.java | 2 +- .../inventory/AppEngInternalInventory.java | 2 +- .../tile/inventory/AppEngNullInventory.java | 2 +- .../java/appeng/transformer/AppEngCore.java | 8 +- src/main/java/appeng/util/Platform.java | 2 +- .../util/inv/AdaptorPlayerInventory.java | 4 +- .../java/appeng/util/inv/WrapperBCPipe.java | 2 +- .../util/inv/WrapperChainedInventory.java | 6 +- .../java/appeng/util/inv/WrapperInvSlot.java | 4 +- .../util/inv/WrapperInventoryRange.java | 4 +- .../java/appeng/worldgen/QuartzWorldGen.java | 2 +- .../blockstates/fluix.json | 2 +- .../blockstates/stair.fluix.json | 80 ++++---- .../stair.quartz.certus.chiseled.json | 80 ++++---- .../blockstates/stair.quartz.certus.json | 80 ++++---- .../stair.quartz.certus.pillar.json | 80 ++++---- .../blockstates/stair.skystone.block.json | 80 ++++---- .../blockstates/stair.skystone.brick.json | 80 ++++---- .../stair.skystone.brick.small.json | 80 ++++---- .../blockstates/stair.skystone.json | 44 ---- .../blockstates/stair.skystone.stone.json | 44 ++++ .../appliedenergistics2/lang/en_US.lang | 10 +- .../block/{fluix.json => fluix/block.json} | 0 .../stair.quartz.certus.chiseled.inner.json | 8 - .../block/stair.quartz.certus.chiseled.json | 8 - .../stair.quartz.certus.chiseled.outer.json | 8 - .../block/stair.quartz.certus.inner.json | 8 - .../models/block/stair.quartz.certus.json | 8 - .../block/stair.quartz.certus.outer.json | 8 - .../stair.quartz.certus.pillar.inner.json | 8 - .../block/stair.quartz.certus.pillar.json | 8 - .../stair.quartz.certus.pillar.outer.json | 8 - .../block/stair.skystone.block.inner.json | 6 - .../models/block/stair.skystone.block.json | 6 - .../block/stair.skystone.block.outer.json | 6 - .../block/stair.skystone.brick.inner.json | 6 - .../models/block/stair.skystone.brick.json | 6 - .../block/stair.skystone.brick.outer.json | 6 - .../stair.skystone.brick.small.inner.json | 6 - .../block/stair.skystone.brick.small.json | 6 - .../stair.skystone.brick.small.outer.json | 6 - .../models/block/stair.skystone.inner.json | 6 - .../models/block/stair.skystone.json | 6 - .../models/block/stair.skystone.outer.json | 6 - .../fluix/block.json} | 0 .../fluix/inner.json} | 0 .../fluix/outer.json} | 0 .../block/stair/quartz/certus/block.json | 8 + .../stair/quartz/certus/chiseled/block.json | 8 + .../stair/quartz/certus/chiseled/inner.json | 8 + .../stair/quartz/certus/chiseled/outer.json | 8 + .../block/stair/quartz/certus/inner.json | 8 + .../block/stair/quartz/certus/outer.json | 8 + .../stair/quartz/certus/pillar/block.json | 8 + .../stair/quartz/certus/pillar/inner.json | 8 + .../stair/quartz/certus/pillar/outer.json | 8 + .../block/stair/skystone/block/block.json | 8 + .../block/stair/skystone/block/inner.json | 8 + .../block/stair/skystone/block/outer.json | 8 + .../block/stair/skystone/brick/block.json | 8 + .../block/stair/skystone/brick/inner.json | 8 + .../block/stair/skystone/brick/outer.json | 8 + .../stair/skystone/brick/small/block.json | 8 + .../stair/skystone/brick/small/inner.json | 8 + .../stair/skystone/brick/small/outer.json | 8 + .../block/stair/skystone/stone/block.json | 8 + .../block/stair/skystone/stone/inner.json | 8 + .../block/stair/skystone/stone/outer.json | 8 + .../models/item/fluix.json | 2 +- .../models/item/stair.fluix.json | 2 +- .../item/stair.quartz.certus.chiseled.json | 2 +- .../models/item/stair.quartz.certus.json | 2 +- .../item/stair.quartz.certus.pillar.json | 2 +- .../models/item/stair.skystone.block.json | 2 +- .../models/item/stair.skystone.brick.json | 2 +- .../item/stair.skystone.brick.small.json | 2 +- ...kystone.json => stair.skystone.stone.json} | 2 +- .../appliedenergistics2/recipes/index.recipe | 4 +- .../textures/quartz/certus/all.png | Bin 0 -> 774 bytes .../quartz/certus/chiseled/bottom.png | Bin 0 -> 834 bytes .../textures/quartz/certus/chiseled/side.png | Bin 0 -> 804 bytes .../textures/quartz/certus/chiseled/top.png | Bin 0 -> 834 bytes .../certus/pillar/bottom.png} | Bin .../certus/pillar/side.png} | Bin .../textures/quartz/certus/pillar/top.png | Bin 0 -> 690 bytes .../block/all.png} | Bin .../brick/all.png} | Bin .../brick/small/all.png} | Bin .../stone/all.png} | Bin 169 files changed, 1470 insertions(+), 1095 deletions(-) rename src/main/java/appeng/{block/solids/OreQuartzCharged.java => decorative/solid/ChargedQuartzOreBlock.java} (95%) rename src/main/java/appeng/{block/solids/BlockQuartzChiseled.java => decorative/solid/ChiseledQuartzBlock.java} (89%) rename src/main/java/appeng/{block/solids/BlockFluix.java => decorative/solid/FluixBlock.java} (90%) create mode 100644 src/main/java/appeng/decorative/solid/FluixIdentifier.java create mode 100644 src/main/java/appeng/decorative/solid/Identifier.java rename src/main/java/appeng/{block/solids/BlockQuartz.java => decorative/solid/QuartzBlock.java} (90%) rename src/main/java/appeng/{block/solids/BlockQuartzGlass.java => decorative/solid/QuartzGlassBlock.java} (95%) rename src/main/java/appeng/{block/solids/BlockQuartzLamp.java => decorative/solid/QuartzLampBlock.java} (94%) rename src/main/java/appeng/{block/solids/OreQuartz.java => decorative/solid/QuartzOreBlock.java} (97%) rename src/main/java/appeng/{block/solids/BlockQuartzPillar.java => decorative/solid/QuartzPillarBlock.java} (93%) rename src/main/java/appeng/{block/solids/BlockSkyStone.java => decorative/solid/SkyStoneBlock.java} (77%) rename src/main/java/appeng/{block => decorative}/stair/BlockStairCommon.java (81%) create mode 100644 src/main/java/appeng/decorative/stair/DecorativeStairIdentifier.java create mode 100644 src/main/java/appeng/decorative/stair/FluixStairBlock.java create mode 100644 src/main/java/appeng/decorative/stair/FluixStairComponent.java create mode 100644 src/main/java/appeng/decorative/stair/FluixStairIdentifier.java create mode 100644 src/main/java/appeng/decorative/stair/FluixStairSupplier.java create mode 100644 src/main/java/appeng/decorative/stair/StairBlockDefinition.java rename src/main/java/appeng/items/materials/{ItemMultiMaterial.java => MultiItem.java} (98%) delete mode 100644 src/main/resources/assets/appliedenergistics2/blockstates/stair.skystone.json create mode 100644 src/main/resources/assets/appliedenergistics2/blockstates/stair.skystone.stone.json rename src/main/resources/assets/appliedenergistics2/models/block/{fluix.json => fluix/block.json} (100%) delete mode 100644 src/main/resources/assets/appliedenergistics2/models/block/stair.quartz.certus.chiseled.inner.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/block/stair.quartz.certus.chiseled.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/block/stair.quartz.certus.chiseled.outer.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/block/stair.quartz.certus.inner.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/block/stair.quartz.certus.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/block/stair.quartz.certus.outer.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/block/stair.quartz.certus.pillar.inner.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/block/stair.quartz.certus.pillar.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/block/stair.quartz.certus.pillar.outer.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/block/stair.skystone.block.inner.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/block/stair.skystone.block.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/block/stair.skystone.block.outer.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/block/stair.skystone.brick.inner.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/block/stair.skystone.brick.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/block/stair.skystone.brick.outer.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/block/stair.skystone.brick.small.inner.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/block/stair.skystone.brick.small.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/block/stair.skystone.brick.small.outer.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/block/stair.skystone.inner.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/block/stair.skystone.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/block/stair.skystone.outer.json rename src/main/resources/assets/appliedenergistics2/models/block/{stair.fluix.json => stair/fluix/block.json} (100%) rename src/main/resources/assets/appliedenergistics2/models/block/{stair.fluix.inner.json => stair/fluix/inner.json} (100%) rename src/main/resources/assets/appliedenergistics2/models/block/{stair.fluix.outer.json => stair/fluix/outer.json} (100%) create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/stair/quartz/certus/block.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/stair/quartz/certus/chiseled/block.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/stair/quartz/certus/chiseled/inner.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/stair/quartz/certus/chiseled/outer.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/stair/quartz/certus/inner.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/stair/quartz/certus/outer.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/stair/quartz/certus/pillar/block.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/stair/quartz/certus/pillar/inner.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/stair/quartz/certus/pillar/outer.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/stair/skystone/block/block.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/stair/skystone/block/inner.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/stair/skystone/block/outer.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/stair/skystone/brick/block.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/stair/skystone/brick/inner.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/stair/skystone/brick/outer.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/stair/skystone/brick/small/block.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/stair/skystone/brick/small/inner.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/stair/skystone/brick/small/outer.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/stair/skystone/stone/block.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/stair/skystone/stone/inner.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/stair/skystone/stone/outer.json rename src/main/resources/assets/appliedenergistics2/models/item/{stair.skystone.json => stair.skystone.stone.json} (76%) create mode 100644 src/main/resources/assets/appliedenergistics2/textures/quartz/certus/all.png create mode 100644 src/main/resources/assets/appliedenergistics2/textures/quartz/certus/chiseled/bottom.png create mode 100644 src/main/resources/assets/appliedenergistics2/textures/quartz/certus/chiseled/side.png create mode 100644 src/main/resources/assets/appliedenergistics2/textures/quartz/certus/chiseled/top.png rename src/main/resources/assets/appliedenergistics2/textures/{blocks/BlockQuartzPillar.png => quartz/certus/pillar/bottom.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/{blocks/BlockQuartzPillarSide.png => quartz/certus/pillar/side.png} (100%) create mode 100644 src/main/resources/assets/appliedenergistics2/textures/quartz/certus/pillar/top.png rename src/main/resources/assets/appliedenergistics2/textures/{blocks/BlockSkyStone.Block.png => skystone/block/all.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/{blocks/BlockSkyStone.Brick.png => skystone/brick/all.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/{blocks/BlockSkyStone.SmallBrick.png => skystone/brick/small/all.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/{blocks/BlockSkyStone.Stone.png => skystone/stone/all.png} (100%) diff --git a/build.gradle b/build.gradle index be7feec97..f35763c11 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ /* * This file is part of Applied Energistics 2. - * Copyright (c) 2013 - 2014, AlgorithmX2, All rights reserved. + * Copyright (c) 2013 - 2015, AlgorithmX2, All rights reserved. * * Applied Energistics 2 is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by @@ -15,8 +15,7 @@ * You should have received a copy of the GNU Lesser General Public License * along with Applied Energistics 2. If not, see . */ - -apply plugin: 'forge' +apply plugin: 'net.minecraftforge.gradle.forge' apply from: 'gradle/scripts/dependencies.gradle' apply from: 'gradle/scripts/artifacts.gradle' @@ -28,6 +27,7 @@ buildscript { repositories { mavenLocal() mavenCentral() + jcenter() maven { name = "forge" @@ -41,7 +41,7 @@ buildscript { } dependencies { - classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT' + classpath 'net.minecraftforge.gradle:ForgeGradle:2.0-SNAPSHOT' } } @@ -84,7 +84,7 @@ minecraft { // used when launching minecraft in dev env runDir = "run" - mappings = "snapshot_20141130" + mappings = "snapshot_20150928" } sourceSets { @@ -92,25 +92,17 @@ sourceSets { java { srcDirs += 'src/api/java' srcDirs += 'src/main/java/' - - // excludes integration due to not being available upon port - exclude 'appeng/integration/modules/**' - exclude 'appeng/fmp/**' - exclude 'appeng/parts/layers/**' } resources { srcDir "src/main/resources/" - include "assets/appliedenergistics2/recipes/*.recipe", + include "assets/appliedenergistics2/recipes/**/*.recipe", "assets/appliedenergistics2/recipes/README.html", "assets/appliedenergistics2/lang/*.lang", - "assets/appliedenergistics2/blockstates/*.json", - "assets/appliedenergistics2/models/block/*.json", - "assets/appliedenergistics2/models/item/*.json", - "assets/appliedenergistics2/textures/blocks/*", - "assets/appliedenergistics2/textures/guis/*", - "assets/appliedenergistics2/textures/models/*", - "assets/appliedenergistics2/textures/items/*", + "assets/appliedenergistics2/blockstates/**/*.json", + "assets/appliedenergistics2/models/**/*.json", + "assets/appliedenergistics2/textures/**/*.png", + "assets/appliedenergistics2/textures/**/*.mcmeta", "assets/appliedenergistics2/meta/*", "mcmod.info", "pack.mcmeta" diff --git a/gradle.properties b/gradle.properties index d1f4de023..75d8d8e27 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -aeversion=rv4 +aeversion=rv3 aechannel=alpha aebuild=0 aegroup=appeng @@ -8,12 +8,12 @@ aebasename=appliedenergistics2 # Versions # ######################################################### minecraft_version=1.8 -forge_version=11.14.3.1450 +forge_version=11.14.3.1516 ######################################################### # Installable # ######################################################### -waila_version=1.5.10 +waila_version=1.6.0_B1 jabba_version=1.2.1a enderstorage_version=1.4.7.33 translocator_version=1.1.1.14 @@ -24,7 +24,7 @@ enderio_version=2.3.0.375_beta #texpansion_version=4.0.0-176 #tfoundation_version=1.0.0-82 betterstorage_version=0.11.3.123.20 -invtweaks_version=1.60-dev-14 +invtweaks_version=1.59 ######################################################### # Provided APIs # @@ -34,7 +34,7 @@ code_chicken_lib_version=1.1.2.139 code_chicken_core_version=1.0.5.36 nei_version=1.0.5.104 bc_version=7.0.9 -opencomputers_version=1.5.9.21 +opencomputers_version=1.5.18.39 ######################################################### # Self Compiled APIs # diff --git a/gradle/scripts/artifacts.gradle b/gradle/scripts/artifacts.gradle index 6b00b8e6b..d9db8e3fe 100644 --- a/gradle/scripts/artifacts.gradle +++ b/gradle/scripts/artifacts.gradle @@ -10,10 +10,12 @@ task javadocJar(type: Jar, dependsOn: myJavadocs) { from 'build/docs/javadoc/' } +/* task sourceJar(type: Jar, dependsOn: classes) { classifier = 'sources' from sourceSets.main.allSource } +*/ task devJar(type: Jar) { diff --git a/gradle/scripts/autoinstallruntime.gradle b/gradle/scripts/autoinstallruntime.gradle index 3ec4c26a9..cafbd76a7 100644 --- a/gradle/scripts/autoinstallruntime.gradle +++ b/gradle/scripts/autoinstallruntime.gradle @@ -1,12 +1,13 @@ // searches for NEI and Chicken stuff from compile set // and adds them to the mods in run dir -task copyChicken(type: Copy, dependsOn: "extractUserDev") { - from { configurations.compile } - include "**/*Chicken*.jar", "**/*NotEnoughItems*.jar" - exclude "**/CodeChickenLib*" // because CCC downloads it anyways.. -_- - into file(minecraft.runDir + "/mods") - mustRunAfter "deobfBinJar" - mustRunAfter "repackMinecraft" -} -tasks.setupDevWorkspace.dependsOn copyChicken -tasks.setupDecompWorkspace.dependsOn copyChicken \ No newline at end of file + +// task copyChicken(type: Copy, dependsOn: "extractUserDev") { +// from { configurations.compile } +// include "**/*Chicken*.jar", "**/*NotEnoughItems*.jar" +// exclude "**/CodeChickenLib*" // because CCC downloads it anyways.. -_- +// into file(minecraft.runDir + "/mods") +// mustRunAfter "deobfBinJar" +// mustRunAfter "repackMinecraft" +// } +// tasks.setupDevWorkspace.dependsOn copyChicken +// tasks.setupDecompWorkspace.dependsOn copyChicken diff --git a/gradle/scripts/dependencies.gradle b/gradle/scripts/dependencies.gradle index 2c6e98015..3b8a6265b 100644 --- a/gradle/scripts/dependencies.gradle +++ b/gradle/scripts/dependencies.gradle @@ -89,7 +89,7 @@ configurations { dependencies { // installable -// mods "mcp.mobius.waila:Waila:${waila_version}_${minecraft_version}:dev" +// mods "mcp.mobius.waila:Waila:${waila_version}_1.8.1:dev" // mods "mcp.mobius.jabba:Jabba:${jabba_version}_${minecraft_version}:dev" // mods "codechicken:EnderStorage:${minecraft_version}-${enderstorage_version}:dev" // mods "codechicken:Translocator:${minecraft_version}-${translocator_version}:dev" @@ -105,9 +105,9 @@ dependencies { // mods name: 'ThermalFoundation', version: "[${minecraft_version}]${tfoundation_version}-dev", ext: 'jar' // compile "codechicken:ForgeMultipart:${minecraft_version}-${fmp_version}:dev" - compile "codechicken:CodeChickenLib:${minecraft_version}-${code_chicken_lib_version}:dev" - compile "codechicken:CodeChickenCore:${minecraft_version}-${code_chicken_core_version}:dev" - compile "codechicken:NotEnoughItems:${minecraft_version}-${nei_version}:dev" +// compile "codechicken:CodeChickenLib:${minecraft_version}-${code_chicken_lib_version}:dev" +// compile "codechicken:CodeChickenCore:${minecraft_version}-${code_chicken_core_version}:dev" +// compile "codechicken:NotEnoughItems:${minecraft_version}-${nei_version}:dev" // compile "com.mod-buildcraft:buildcraft:${bc_version}:dev" // provided APIs diff --git a/gradle/scripts/integration.gradle b/gradle/scripts/integration.gradle index c96f5316b..5789624ec 100644 --- a/gradle/scripts/integration.gradle +++ b/gradle/scripts/integration.gradle @@ -3,5 +3,10 @@ apply plugin: 'idea' idea { module { inheritOutputDirs = true + + // excludes integration due to not being available upon port + excludeDirs += file('src/main/java/appeng/integration/modules/') + excludeDirs += file('src/main/java/appeng/fmp/') + excludeDirs += file('src/main/java/appeng/parts/layers/') } } \ No newline at end of file diff --git a/gradle/scripts/optional.gradle b/gradle/scripts/optional.gradle index 66fd65874..b71b1f1ce 100644 --- a/gradle/scripts/optional.gradle +++ b/gradle/scripts/optional.gradle @@ -1,5 +1,5 @@ task wrapper(type: Wrapper) { - gradleVersion = "2.4" + gradleVersion = "2.7" } // WAILA diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 9bc3894c7..22f1d88cf 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Jun 17 12:06:23 CEST 2015 +#Mon Sep 28 22:02:24 CEST 2015 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.7-all.zip diff --git a/src/api/java/appeng/api/definitions/IItemDefinition.java b/src/api/java/appeng/api/definitions/IItemDefinition.java index 805d58deb..5432359f1 100644 --- a/src/api/java/appeng/api/definitions/IItemDefinition.java +++ b/src/api/java/appeng/api/definitions/IItemDefinition.java @@ -1,14 +1,22 @@ package appeng.api.definitions; +import javax.annotation.Nonnull; + +import com.google.common.base.Optional; + import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import com.google.common.base.Optional; - public interface IItemDefinition extends IComparableDefinition { + /** + * @return the unique name of the definition which will be used to register the underlying structure. Will never be null + */ + @Nonnull + String identifier(); + /** * @return the {@link Item} Implementation if applicable */ diff --git a/src/api/java/appeng/api/definitions/IMaterials.java b/src/api/java/appeng/api/definitions/IMaterials.java index 8a52bfd53..54868b1fa 100644 --- a/src/api/java/appeng/api/definitions/IMaterials.java +++ b/src/api/java/appeng/api/definitions/IMaterials.java @@ -123,7 +123,7 @@ public interface IMaterials IItemDefinition woodenGear(); - IItemDefinition wireless(); + IItemDefinition wirelessReceiver(); IItemDefinition wirelessBooster(); diff --git a/src/main/java/appeng/block/AEBaseStairBlock.java b/src/main/java/appeng/block/AEBaseStairBlock.java index f03e83f8b..900e86486 100644 --- a/src/main/java/appeng/block/AEBaseStairBlock.java +++ b/src/main/java/appeng/block/AEBaseStairBlock.java @@ -22,6 +22,7 @@ package appeng.block; import java.util.EnumSet; import com.google.common.base.Optional; +import com.google.common.base.Preconditions; import net.minecraft.block.Block; import net.minecraft.block.BlockStairs; @@ -36,13 +37,17 @@ public abstract class AEBaseStairBlock extends BlockStairs implements IAEFeature { private final IFeatureHandler features; - protected AEBaseStairBlock( Block block, EnumSet features, String type ) + protected AEBaseStairBlock( Block block, EnumSet features, String type ) { - super( block.getDefaultState() ); + super( block.getStateFromMeta( 0 ) ); - this.features = new StairBlockFeatureHandler( features, this, Optional.of(type) ); - setUnlocalizedName( block.getUnlocalizedName() ); + Preconditions.checkNotNull( block ); + Preconditions.checkNotNull( block.getUnlocalizedName() ); + Preconditions.checkArgument( block.getUnlocalizedName().length() > 0 ); + this.features = new StairBlockFeatureHandler( features, this, Optional.of( type ) ); + + this.setUnlocalizedName( "stair." + type ); this.setLightOpacity( 0 ); } diff --git a/src/main/java/appeng/block/crafting/BlockCraftingUnit.java b/src/main/java/appeng/block/crafting/BlockCraftingUnit.java index 4ef3511de..aa9cc3bd6 100644 --- a/src/main/java/appeng/block/crafting/BlockCraftingUnit.java +++ b/src/main/java/appeng/block/crafting/BlockCraftingUnit.java @@ -22,6 +22,8 @@ package appeng.block.crafting; import java.util.EnumSet; import java.util.List; +import com.google.common.base.Optional; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; @@ -37,6 +39,7 @@ import net.minecraft.util.EnumWorldBlockLayer; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; + import appeng.api.util.AEPartLocation; import appeng.block.AEBaseTileBlock; import appeng.client.render.BaseBlockRender; @@ -47,22 +50,49 @@ import appeng.core.sync.GuiBridge; import appeng.tile.crafting.TileCraftingTile; import appeng.util.Platform; -import com.google.common.base.Optional; - +/** + * + */ public class BlockCraftingUnit extends AEBaseTileBlock { - public static final PropertyBool POWERED = PropertyBool.create("powered"); - public static final PropertyBool FORMED = PropertyBool.create("formed"); - - public static final int FLAG_FORMED = 8; + public static final PropertyBool POWERED = PropertyBool.create( "powered" ); + public static final PropertyBool FORMED = PropertyBool.create( "formed" ); final public CraftingUnitType type; - - public static enum CraftingUnitType + + public BlockCraftingUnit( CraftingUnitType type ) { - UNIT, ACCELERATOR, STORAGE_1K,STORAGE_4K, STORAGE_16K, STORAGE_64K, MONITOR - }; + super( Material.iron, Optional.of( type.name() ) ); + + this.type = type; + this.setTileEntity( TileCraftingTile.class ); + this.setFeature( EnumSet.of( AEFeature.CraftingCPU ) ); + } + + @Override + public IBlockState getStateFromMeta( int meta ) + { + return getDefaultState().withProperty( POWERED, ( meta & 1 ) == 1 ).withProperty( FORMED, ( meta & 2 ) == 2 ); + } + + @Override + public int getMetaFromState( IBlockState state ) + { + boolean p = (boolean) state.getValue( POWERED ); + boolean f = (boolean) state.getValue( FORMED ); + return ( p ? 1 : 0 ) | ( f ? 2 : 0 ); + } + + @Override + public void onNeighborBlockChange( World worldIn, BlockPos pos, IBlockState state, Block neighborBlock ) + { + TileCraftingTile cp = this.getTileEntity( worldIn, pos ); + if( cp != null ) + { + cp.updateMultiBlock(); + } + } @Override public EnumWorldBlockLayer getBlockLayer() @@ -71,63 +101,20 @@ public class BlockCraftingUnit extends AEBaseTileBlock } @Override - public int getMetaFromState( - IBlockState state ) + public void breakBlock( World w, BlockPos pos, IBlockState state ) { - boolean p = (boolean)state.getValue( POWERED ); - boolean f = (boolean)state.getValue( FORMED ); - return (p ? 1 : 0) | (f?2 : 0); - } - - @Override - public IBlockState getStateFromMeta( int meta ) - { - return getDefaultState().withProperty( POWERED, ( meta & 1 ) == 1 ? true : false ).withProperty( FORMED, ( meta & 2 ) == 2 ? true : false ); - } - - public BlockCraftingUnit( CraftingUnitType type ) - { - super( Material.iron, Optional.of(type.name()) ); - - this.type = type; - this.setTileEntity( TileCraftingTile.class ); - this.setFeature( EnumSet.of( AEFeature.CraftingCPU ) ); - } - - @Override - protected Class getRenderer() - { - return RenderBlockCraftingCPU.class; - } - - @Override - public appeng.client.texture.IAESprite getIcon(EnumFacing side, IBlockState state) - { - if ( type == CraftingUnitType.ACCELERATOR ) + TileCraftingTile cp = this.getTileEntity( w, pos ); + if( cp != null ) { - if ( (boolean)state.getValue( FORMED ) ) - return ExtraBlockTextures.BlockCraftingAcceleratorFit.getIcon(); - - return ExtraBlockTextures.BlockCraftingAccelerator.getIcon(); + cp.breakCluster(); } - - if ( (boolean)state.getValue( FORMED ) ) - return ExtraBlockTextures.BlockCraftingUnitFit.getIcon(); - return super.getIcon( side,state ); + super.breakBlock( w, pos, state ); } -@Override -public boolean onBlockActivated( - World w, - BlockPos pos, - IBlockState state, - EntityPlayer p, - EnumFacing side, - float hitX, - float hitY, - float hitZ ) -{ + @Override + public boolean onBlockActivated( World w, BlockPos pos, IBlockState state, EntityPlayer p, EnumFacing side, float hitX, float hitY, float hitZ ) + { TileCraftingTile tg = this.getTileEntity( w, pos ); if( tg != null && !p.isSneaking() && tg.isFormed() && tg.isActive() ) { @@ -143,6 +130,47 @@ public boolean onBlockActivated( return false; } + protected String getItemUnlocalizedName( ItemStack is ) + { + return super.getUnlocalizedName( is ); + } + + @Override + protected IProperty[] getAEStates() + { + return new IProperty[] { + POWERED, + FORMED + }; + } + + @Override + protected Class getRenderer() + { + return RenderBlockCraftingCPU.class; + } + + @Override + public appeng.client.texture.IAESprite getIcon( EnumFacing side, IBlockState state ) + { + if( type == CraftingUnitType.ACCELERATOR ) + { + if( (boolean) state.getValue( FORMED ) ) + { + return ExtraBlockTextures.BlockCraftingAcceleratorFit.getIcon(); + } + + return ExtraBlockTextures.BlockCraftingAccelerator.getIcon(); + } + + if( (boolean) state.getValue( FORMED ) ) + { + return ExtraBlockTextures.BlockCraftingUnitFit.getIcon(); + } + + return super.getIcon( side, state ); + } + @Override @SideOnly( Side.CLIENT ) public void getCheckedSubBlocks( Item item, CreativeTabs tabs, List itemStacks ) @@ -151,21 +179,6 @@ public boolean onBlockActivated( itemStacks.add( new ItemStack( this, 1, 1 ) ); } - @Override - public void breakBlock( - World w, - BlockPos pos, - IBlockState state ) - { - TileCraftingTile cp = this.getTileEntity( w, pos ); - if( cp != null ) - { - cp.breakCluster(); - } - - super.breakBlock( w, pos, state ); - } - @Override public String getUnlocalizedName( ItemStack is ) { @@ -177,29 +190,8 @@ public boolean onBlockActivated( return this.getItemUnlocalizedName( is ); } - protected String getItemUnlocalizedName( ItemStack is ) + public enum CraftingUnitType { - return super.getUnlocalizedName( is ); + UNIT, ACCELERATOR, STORAGE_1K, STORAGE_4K, STORAGE_16K, STORAGE_64K, MONITOR } - - @Override - protected IProperty[] getAEStates() - { - return new IProperty[]{POWERED, FORMED }; - } - - @Override - public void onNeighborBlockChange( - World worldIn, - BlockPos pos, - IBlockState state, - Block neighborBlock ) - { - TileCraftingTile cp = this.getTileEntity( worldIn, pos ); - if( cp != null ) - { - cp.updateMultiBlock(); - } - } - } diff --git a/src/main/java/appeng/block/misc/BlockInscriber.java b/src/main/java/appeng/block/misc/BlockInscriber.java index 803ab1eef..db9aaef72 100644 --- a/src/main/java/appeng/block/misc/BlockInscriber.java +++ b/src/main/java/appeng/block/misc/BlockInscriber.java @@ -23,6 +23,7 @@ import java.util.EnumSet; import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; @@ -81,4 +82,10 @@ public class BlockInscriber extends AEBaseTileBlock } return false; } + + @Override + public String getUnlocalizedName( ItemStack is ) + { + return super.getUnlocalizedName( is ); + } } diff --git a/src/main/java/appeng/block/misc/BlockTinyTNT.java b/src/main/java/appeng/block/misc/BlockTinyTNT.java index 716395f49..f5b32f99f 100644 --- a/src/main/java/appeng/block/misc/BlockTinyTNT.java +++ b/src/main/java/appeng/block/misc/BlockTinyTNT.java @@ -39,9 +39,9 @@ import net.minecraft.util.EnumFacing; import net.minecraft.world.Explosion; import net.minecraft.world.World; import net.minecraftforge.fml.common.registry.EntityRegistry; + import appeng.block.AEBaseBlock; import appeng.client.render.BaseBlockRender; -import appeng.client.render.blocks.RenderTinyTNT; import appeng.core.AppEng; import appeng.core.features.AEFeature; import appeng.entity.EntityIds; @@ -80,14 +80,7 @@ public class BlockTinyTNT extends AEBaseBlock implements ICustomCollision } @Override - public boolean onActivated( - World w, - BlockPos pos, - EntityPlayer player, - EnumFacing side, - float hitX, - float hitY, - float hitZ ) + public boolean onActivated( World w, BlockPos pos, EntityPlayer player, EnumFacing side, float hitX, float hitY, float hitZ ) { if( player.getCurrentEquippedItem() != null && player.getCurrentEquippedItem().getItem() == Items.flint_and_steel ) { @@ -111,12 +104,19 @@ public class BlockTinyTNT extends AEBaseBlock implements ICustomCollision w.playSoundAtEntity( primedTinyTNTEntity, "game.tnt.primed", 1.0F, 1.0F ); } } - + @Override - public void onBlockAdded( - World w, - BlockPos pos, - IBlockState state ) + public void onNeighborBlockChange( World w, BlockPos pos, IBlockState state, Block neighborBlock ) + { + if( w.isBlockIndirectlyGettingPowered( pos ) > 0 ) + { + this.startFuse( w, pos, null ); + w.setBlockToAir( pos ); + } + } + + @Override + public void onBlockAdded( World w, BlockPos pos, IBlockState state ) { super.onBlockAdded( w, pos, state ); @@ -128,38 +128,7 @@ public class BlockTinyTNT extends AEBaseBlock implements ICustomCollision } @Override - public void onNeighborBlockChange( - World w, - BlockPos pos, - IBlockState state, - Block neighborBlock ) - { - if( w.isBlockIndirectlyGettingPowered( pos ) > 0 ) - { - this.startFuse( w, pos, null ); - w.setBlockToAir( pos ); - } - } - - @Override - public void onBlockExploded( - World w, - BlockPos pos, - Explosion exp ) - { - if( !w.isRemote ) - { - EntityTinyTNTPrimed primedTinyTNTEntity = new EntityTinyTNTPrimed( w, pos.getX() + 0.5F, pos.getY() + 0.5F, pos.getZ() + 0.5F, exp.getExplosivePlacedBy() ); - primedTinyTNTEntity.fuse = w.rand.nextInt( primedTinyTNTEntity.fuse / 4 ) + primedTinyTNTEntity.fuse / 8; - w.spawnEntityInWorld( primedTinyTNTEntity ); - } - } - - @Override - public void onEntityCollidedWithBlock( - World w, - BlockPos pos, - Entity entity ) + public void onEntityCollidedWithBlock( World w, BlockPos pos, Entity entity ) { if( entity instanceof EntityArrow && !w.isRemote ) { @@ -180,22 +149,24 @@ public class BlockTinyTNT extends AEBaseBlock implements ICustomCollision } @Override - public Iterable getSelectedBoundingBoxesFromPool( - World w, - BlockPos pos, - Entity thePlayer, - boolean b ) + public void onBlockExploded( World w, BlockPos pos, Explosion exp ) + { + if( !w.isRemote ) + { + EntityTinyTNTPrimed primedTinyTNTEntity = new EntityTinyTNTPrimed( w, pos.getX() + 0.5F, pos.getY() + 0.5F, pos.getZ() + 0.5F, exp.getExplosivePlacedBy() ); + primedTinyTNTEntity.fuse = w.rand.nextInt( primedTinyTNTEntity.fuse / 4 ) + primedTinyTNTEntity.fuse / 8; + w.spawnEntityInWorld( primedTinyTNTEntity ); + } + } + + @Override + public Iterable getSelectedBoundingBoxesFromPool( World w, BlockPos pos, Entity thePlayer, boolean b ) { return Collections.singletonList( AxisAlignedBB.fromBounds( 0.25, 0, 0.25, 0.75, 0.5, 0.75 ) ); } @Override - public void addCollidingBlockToList( - World w, - BlockPos pos, - AxisAlignedBB bb, - List out, - Entity e ) + public void addCollidingBlockToList( World w, BlockPos pos, AxisAlignedBB bb, List out, Entity e ) { out.add( AxisAlignedBB.fromBounds( 0.25, 0, 0.25, 0.75, 0.5, 0.75 ) ); } diff --git a/src/main/java/appeng/client/ClientHelper.java b/src/main/java/appeng/client/ClientHelper.java index 1e897d02f..a8b74b6d4 100644 --- a/src/main/java/appeng/client/ClientHelper.java +++ b/src/main/java/appeng/client/ClientHelper.java @@ -43,6 +43,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.ResourceLocation; import net.minecraft.util.Vec3; @@ -101,12 +102,11 @@ public class ClientHelper extends ServerHelper private static final RenderItem ITEM_RENDERER = Minecraft.getMinecraft().getRenderItem(); private static final ModelGenerator BLOCK_RENDERER = new ModelGenerator(); - final ModelResourceLocation partRenderer = new ModelResourceLocation( new ResourceLocation( AppEng.MOD_ID, "DynamicPartRenderer" ), "inventory" ); + private final ModelResourceLocation partRenderer = new ModelResourceLocation( new ResourceLocation( AppEng.MOD_ID, "DynamicPartRenderer" ), "inventory" ); - ; - public Map> iconRegistrations = new HashMap(); - public List iconTmp = new ArrayList<>(); - public List extraIcons = new ArrayList<>(); + private Map> iconRegistrations = new HashMap<>(); + private List iconTmp = new ArrayList<>(); + private List extraIcons = new ArrayList<>(); @Override public void configureIcon( Object item, String name ) @@ -123,10 +123,23 @@ public class ClientHelper extends ServerHelper @Override public void init() { - Item fluixItem = GameRegistry.findItem( "appliedenergistics2", "fluix" ); - ModelResourceLocation itemModelResourceLocation = new ModelResourceLocation( "appliedenergistics2:fluix", "inventory" ); - final int DEFAULT_ITEM_SUBTYPE = 0; - Minecraft.getMinecraft().getRenderItem().getItemModelMesher().register( fluixItem, DEFAULT_ITEM_SUBTYPE, itemModelResourceLocation ); + // final Block fluixBlock = GameRegistry.findBlock( "appliedenergistics2", "fluix" ); + // Item fluixItem = Item.getItemFromBlock( fluixBlock ); + // ModelResourceLocation itemModelResourceLocation = new ModelResourceLocation( "appliedenergistics2:fluix", "inventory" ); +// final int DEFAULT_ITEM_SUBTYPE = 0; +// final ItemModelMesher mesher = Minecraft.getMinecraft().getRenderItem().getItemModelMesher(); +// // mesher.register( fluixItem, DEFAULT_ITEM_SUBTYPE, itemModelResourceLocation ); +// +// final ResourceLocation resource = new ResourceLocation( "appliedenergistics2", "stair.fluix" ); +// final ModelResourceLocation fluixStairModel = new ModelResourceLocation( resource, "inventory" ); +// AELog.info( "FluixStairModel: " + fluixStairModel ); +// +// final Set items = AEApi.instance().definitions().blocks().fluixStair().maybeItem().asSet(); +// for( Item item : items ) +// { +// AELog.info( "Registering with %s with unlocalized %s", item, item.getUnlocalizedName() ); +// mesher.register( item, DEFAULT_ITEM_SUBTYPE, fluixStairModel ); +// } } @Override @@ -143,7 +156,7 @@ public class ClientHelper extends ServerHelper } @Override - public void bindTileEntitySpecialRenderer( Class tile, AEBaseBlock blk ) + public void bindTileEntitySpecialRenderer( Class tile, AEBaseBlock blk ) { BaseBlockRender bbr = blk.getRendererInstance().rendererInstance; if( bbr.hasTESR() && tile != null ) @@ -157,7 +170,7 @@ public class ClientHelper extends ServerHelper { if( Platform.isClient() ) { - List o = new ArrayList(); + List o = new ArrayList<>(); o.add( Minecraft.getMinecraft().thePlayer ); return o; } @@ -282,15 +295,7 @@ public class ClientHelper extends ServerHelper addIcon( reg.name ); - mesher.register( reg.item instanceof Item ? (Item) reg.item : Item.getItemFromBlock( (Block) reg.item ), new ItemMeshDefinition() - { - - @Override - public ModelResourceLocation getModelLocation( ItemStack stack ) - { - return renderer.rendererInstance.getResourcePath(); - } - } ); + mesher.register( reg.item instanceof Item ? (Item) reg.item : Item.getItemFromBlock( (Block) reg.item ), stack -> renderer.rendererInstance.getResourcePath() ); continue; } @@ -385,7 +390,7 @@ public class ClientHelper extends ServerHelper List reg = iconRegistrations.get( item ); if( reg == null ) { - iconRegistrations.put( item, reg = new LinkedList() ); + iconRegistrations.put( item, reg = new LinkedList<>() ); } ModelResourceLocation res = new ModelResourceLocation( new ResourceLocation( AppEng.MOD_ID, name ), "inventory" ); @@ -398,7 +403,7 @@ public class ClientHelper extends ServerHelper List reg = iconRegistrations.get( item ); if( reg == null ) { - iconRegistrations.put( item, reg = new LinkedList() ); + iconRegistrations.put( item, reg = new LinkedList<>() ); } ModelResourceLocation res = new ModelResourceLocation( new ResourceLocation( AppEng.MOD_ID, name ), "inventory" ); @@ -567,10 +572,7 @@ public class ClientHelper extends ServerHelper } } - for( ResourceLocation res : extraIcons ) - { - ev.map.registerSprite( res ); - } + extraIcons.forEach( ev.map::registerSprite ); //if( ev.map.getTextureType() == ITEM_RENDERER ) { diff --git a/src/main/java/appeng/client/me/SlotDisconnected.java b/src/main/java/appeng/client/me/SlotDisconnected.java index 920982c7e..b09c4cebd 100644 --- a/src/main/java/appeng/client/me/SlotDisconnected.java +++ b/src/main/java/appeng/client/me/SlotDisconnected.java @@ -99,7 +99,7 @@ public class SlotDisconnected extends AppEngSlot } @Override - public boolean isSlotInInventory( IInventory par1iInventory, int par2 ) + public boolean isHere( IInventory inv, int slotIn ) { return false; } diff --git a/src/main/java/appeng/client/me/SlotME.java b/src/main/java/appeng/client/me/SlotME.java index 94e8e3657..054be5056 100644 --- a/src/main/java/appeng/client/me/SlotME.java +++ b/src/main/java/appeng/client/me/SlotME.java @@ -23,6 +23,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; + import appeng.api.storage.data.IAEItemStack; @@ -96,7 +97,7 @@ public class SlotME extends Slot } @Override - public boolean isSlotInInventory( IInventory par1iInventory, int par2 ) + public boolean isHere( IInventory inv, int slotIn ) { return false; } diff --git a/src/main/java/appeng/client/render/blocks/RenderQuartzGlass.java b/src/main/java/appeng/client/render/blocks/RenderQuartzGlass.java index 472b6e351..25a7a4af1 100644 --- a/src/main/java/appeng/client/render/blocks/RenderQuartzGlass.java +++ b/src/main/java/appeng/client/render/blocks/RenderQuartzGlass.java @@ -27,7 +27,7 @@ import net.minecraft.world.IBlockAccess; import net.minecraftforge.client.IItemRenderer.ItemRenderType; import appeng.api.AEApi; import appeng.api.util.AEPartLocation; -import appeng.block.solids.BlockQuartzGlass; +import appeng.decorative.solid.QuartzGlassBlock; import appeng.client.render.BaseBlockRender; import appeng.client.render.ModelGenerator; import appeng.client.texture.ExtraBlockTextures; @@ -35,7 +35,7 @@ import appeng.client.texture.OffsetIcon; import appeng.tile.AEBaseTile; -public class RenderQuartzGlass extends BaseBlockRender +public class RenderQuartzGlass extends BaseBlockRender { static byte[][][] offsets; @@ -58,7 +58,7 @@ public class RenderQuartzGlass extends BaseBlockRender +public class RenderQuartzOre extends BaseBlockRender { public RenderQuartzOre() @@ -39,7 +39,7 @@ public class RenderQuartzOre extends BaseBlockRender } @Override - public void renderInventory( OreQuartz blk, ItemStack is, ModelGenerator renderer, ItemRenderType type, Object[] obj ) + public void renderInventory( QuartzOreBlock blk, ItemStack is, ModelGenerator renderer, ItemRenderType type, Object[] obj ) { super.renderInventory( blk, is, renderer, type, obj ); blk.getRendererInstance().setTemporaryRenderIcon( ExtraBlockTextures.OreQuartzStone.getIcon() ); @@ -48,9 +48,9 @@ public class RenderQuartzOre extends BaseBlockRender } @Override - public boolean renderInWorld( OreQuartz block, IBlockAccess world, BlockPos pos, ModelGenerator renderer ) + public boolean renderInWorld( QuartzOreBlock block, IBlockAccess world, BlockPos pos, ModelGenerator renderer ) { - OreQuartz blk = block; + QuartzOreBlock blk = block; blk.setEnhanceBrightness( true ); super.renderInWorld( block, world, pos, renderer ); blk.setEnhanceBrightness( false ); diff --git a/src/main/java/appeng/client/render/effects/AssemblerFX.java b/src/main/java/appeng/client/render/effects/AssemblerFX.java index f49896a41..34abdc038 100644 --- a/src/main/java/appeng/client/render/effects/AssemblerFX.java +++ b/src/main/java/appeng/client/render/effects/AssemblerFX.java @@ -75,7 +75,7 @@ public class AssemblerFX extends EntityFX } @Override - public void func_180434_a(WorldRenderer par1Tessellator, Entity p_180434_2_, float l, float rX, float rY, float rZ, float rYZ, float rXY ) + public void renderParticle(WorldRenderer par1Tessellator, Entity p_180434_2_, float l, float rX, float rY, float rZ, float rYZ, float rXY ) { this.time += l; if( this.time > 4.0 ) diff --git a/src/main/java/appeng/client/render/effects/CraftingFx.java b/src/main/java/appeng/client/render/effects/CraftingFx.java index 7d370301e..6260160fa 100644 --- a/src/main/java/appeng/client/render/effects/CraftingFx.java +++ b/src/main/java/appeng/client/render/effects/CraftingFx.java @@ -68,7 +68,7 @@ public class CraftingFx extends EntityBreakingFX } @Override - public void func_180434_a(WorldRenderer par1Tessellator, Entity p_180434_2_, float partialTick, float x, float y, float z, float rx, float rz) + public void renderParticle(WorldRenderer par1Tessellator, Entity p_180434_2_, float partialTick, float x, float y, float z, float rx, float rz) { if( partialTick < 0 || partialTick > 1 ) { diff --git a/src/main/java/appeng/client/render/effects/EnergyFx.java b/src/main/java/appeng/client/render/effects/EnergyFx.java index 5dd00895e..2dcd61dd1 100644 --- a/src/main/java/appeng/client/render/effects/EnergyFx.java +++ b/src/main/java/appeng/client/render/effects/EnergyFx.java @@ -67,7 +67,7 @@ public class EnergyFx extends EntityBreakingFX } @Override - public void func_180434_a(WorldRenderer par1Tessellator, Entity p_180434_2_, float par2, float par3, float par4, float par5, float par6, float par7) + public void renderParticle(WorldRenderer par1Tessellator, Entity p_180434_2_, float par2, float par3, float par4, float par5, float par6, float par7) { float f6 = this.particleTextureIndex.getMinU(); float f7 = this.particleTextureIndex.getMaxU(); diff --git a/src/main/java/appeng/client/render/effects/LightningFX.java b/src/main/java/appeng/client/render/effects/LightningFX.java index cc0c25325..bb6636fcc 100644 --- a/src/main/java/appeng/client/render/effects/LightningFX.java +++ b/src/main/java/appeng/client/render/effects/LightningFX.java @@ -84,7 +84,7 @@ public class LightningFX extends EntityFX } @Override - public void func_180434_a(WorldRenderer tess, Entity p_180434_2_, float l, float rX, float rY, float rZ, float rYZ, float rXY ) + public void renderParticle(WorldRenderer tess, Entity p_180434_2_, float l, float rX, float rY, float rZ, float rYZ, float rXY ) { float j = 1.0f; tess.setColorRGBA_F( this.particleRed * j * 0.9f, this.particleGreen * j * 0.95f, this.particleBlue * j, this.particleAlpha ); diff --git a/src/main/java/appeng/client/render/effects/MatterCannonFX.java b/src/main/java/appeng/client/render/effects/MatterCannonFX.java index e417ccdc6..fb5b3b4ff 100644 --- a/src/main/java/appeng/client/render/effects/MatterCannonFX.java +++ b/src/main/java/appeng/client/render/effects/MatterCannonFX.java @@ -70,7 +70,7 @@ public class MatterCannonFX extends EntityBreakingFX } @Override - public void func_180434_a(WorldRenderer par1Tessellator, Entity p_180434_2_, float par2, float par3, float par4, float par5, float par6, float par7 ) + public void renderParticle(WorldRenderer par1Tessellator, Entity p_180434_2_, float par2, float par3, float par4, float par5, float par6, float par7 ) { float f6 = this.particleTextureIndex.getMinU(); float f7 = this.particleTextureIndex.getMaxU(); diff --git a/src/main/java/appeng/container/implementations/ContainerCellWorkbench.java b/src/main/java/appeng/container/implementations/ContainerCellWorkbench.java index ea3675e75..73acf513b 100644 --- a/src/main/java/appeng/container/implementations/ContainerCellWorkbench.java +++ b/src/main/java/appeng/container/implementations/ContainerCellWorkbench.java @@ -295,7 +295,7 @@ public class ContainerCellWorkbench extends ContainerUpgradeable } @Override - public String getName() + public String getCommandSenderName() { return "Upgrades"; } diff --git a/src/main/java/appeng/container/implementations/ContainerMEMonitorable.java b/src/main/java/appeng/container/implementations/ContainerMEMonitorable.java index 533d1bd3b..cfe88547e 100644 --- a/src/main/java/appeng/container/implementations/ContainerMEMonitorable.java +++ b/src/main/java/appeng/container/implementations/ContainerMEMonitorable.java @@ -298,9 +298,10 @@ public class ContainerMEMonitorable extends AEBaseContainer implements IConfigMa } @Override - public void addCraftingToCrafters( ICrafting c ) + public void onCraftGuiOpened( ICrafting c ) { - super.addCraftingToCrafters( c ); + super.onCraftGuiOpened( c ); + this.queueInventory( c ); } diff --git a/src/main/java/appeng/container/implementations/ContainerQuartzKnife.java b/src/main/java/appeng/container/implementations/ContainerQuartzKnife.java index c64aa35e2..b7c096703 100644 --- a/src/main/java/appeng/container/implementations/ContainerQuartzKnife.java +++ b/src/main/java/appeng/container/implementations/ContainerQuartzKnife.java @@ -194,7 +194,7 @@ public class ContainerQuartzKnife extends AEBaseContainer implements IAEAppEngIn } @Override - public String getName() + public String getCommandSenderName() { return "Quartz Knife Output"; } diff --git a/src/main/java/appeng/container/slot/NullSlot.java b/src/main/java/appeng/container/slot/NullSlot.java index 0645e05df..d46f3b8b6 100644 --- a/src/main/java/appeng/container/slot/NullSlot.java +++ b/src/main/java/appeng/container/slot/NullSlot.java @@ -82,7 +82,7 @@ public class NullSlot extends Slot } @Override - public boolean isSlotInInventory( IInventory par1IInventory, int par2 ) + public boolean isHere( IInventory inv, int slotIn ) { return false; } diff --git a/src/main/java/appeng/core/AELog.java b/src/main/java/appeng/core/AELog.java index 34acce490..887c83051 100644 --- a/src/main/java/appeng/core/AELog.java +++ b/src/main/java/appeng/core/AELog.java @@ -19,10 +19,11 @@ package appeng.core; -import net.minecraft.util.BlockPos; -import net.minecraftforge.fml.relauncher.FMLRelaunchLog; - import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import net.minecraft.util.BlockPos; import appeng.core.features.AEFeature; import appeng.tile.AEBaseTile; @@ -31,8 +32,8 @@ import appeng.util.Platform; public final class AELog { - - public static final FMLRelaunchLog INSTANCE = FMLRelaunchLog.log; + private static final Logger SERVER = LogManager.getFormatterLogger( "AE2:S" ); + private static final Logger CLIENT = LogManager.getFormatterLogger( "AE2:C" ); private AELog() { @@ -47,7 +48,14 @@ public final class AELog { if( AEConfig.instance == null || AEConfig.instance.isFeatureEnabled( AEFeature.Logging ) ) { - FMLRelaunchLog.log( "AE2:" + ( Platform.isServer() ? "S" : "C" ), level, format, data ); + if( Platform.isServer() ) + { + SERVER.log( level, format, data ); + } + else + { + CLIENT.log( level, format, data ); + } } } diff --git a/src/main/java/appeng/core/AppEng.java b/src/main/java/appeng/core/AppEng.java index 823f038c3..4cfdccd6b 100644 --- a/src/main/java/appeng/core/AppEng.java +++ b/src/main/java/appeng/core/AppEng.java @@ -59,7 +59,6 @@ public final class AppEng public static final String MOD_ID = "appliedenergistics2"; public static final String MOD_NAME = "Applied Energistics 2"; - public static final String MODID = "appliedenergistics2"; public static final String ASSETS = "appliedenergistics2:"; public static final String MOD_DEPENDENCIES = @@ -162,6 +161,7 @@ public final class AppEng Registration.INSTANCE.initialize( event ); IntegrationRegistry.INSTANCE.init(); + CommonHelper.proxy.init(); AELog.info( "Initialization ( ended after " + star.elapsed( TimeUnit.MILLISECONDS ) + "ms )" ); } @@ -183,6 +183,12 @@ public final class AppEng NetworkHandler.instance = new NetworkHandler( "AE2" ); AELog.info( "Post Initialization ( ended after " + star.elapsed( TimeUnit.MILLISECONDS ) + "ms )" ); + +// System.out.println( "REGISTRY:" ); +// for( Block block : GameData.getBlockRegistry().typeSafeIterable() ) +// { +// System.out.println( "block = " + block + ", " + block.getUnlocalizedName() + ", " + block.getLocalizedName() ); +// } } @EventHandler diff --git a/src/main/java/appeng/core/CommonHelper.java b/src/main/java/appeng/core/CommonHelper.java index 7cb66b4ef..0332687f4 100644 --- a/src/main/java/appeng/core/CommonHelper.java +++ b/src/main/java/appeng/core/CommonHelper.java @@ -24,6 +24,7 @@ import java.util.Random; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; @@ -47,7 +48,7 @@ public abstract class CommonHelper public abstract World getWorld(); - public abstract void bindTileEntitySpecialRenderer( Class tile, AEBaseBlock blk ); + public abstract void bindTileEntitySpecialRenderer( Class tile, AEBaseBlock blk ); public abstract List getPlayers(); diff --git a/src/main/java/appeng/core/Registration.java b/src/main/java/appeng/core/Registration.java index be8796533..ed05b4fcf 100644 --- a/src/main/java/appeng/core/Registration.java +++ b/src/main/java/appeng/core/Registration.java @@ -68,7 +68,7 @@ import appeng.core.localization.GuiText; import appeng.core.localization.PlayerMessages; import appeng.core.stats.PlayerStatsRegistration; import appeng.hooks.TickHandler; -import appeng.items.materials.ItemMultiMaterial; +import appeng.items.materials.MultiItem; import appeng.me.cache.CraftingGridCache; import appeng.me.cache.EnergyGridCache; import appeng.me.cache.GridStorageCache; @@ -222,7 +222,7 @@ public final class Registration final IRegistryContainer registries = api.registries(); // Perform ore camouflage! - ItemMultiMaterial.instance.makeUnique(); + MultiItem.instance.makeUnique(); final Runnable recipeLoader = new RecipeLoader( 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 f6d2c9cd3..16128b28b 100644 --- a/src/main/java/appeng/core/api/definitions/ApiBlocks.java +++ b/src/main/java/appeng/core/api/definitions/ApiBlocks.java @@ -53,20 +53,20 @@ import appeng.block.networking.BlockEnergyCell; import appeng.block.networking.BlockWireless; import appeng.block.qnb.BlockQuantumLinkChamber; import appeng.block.qnb.BlockQuantumRing; -import appeng.block.solids.BlockFluix; -import appeng.block.solids.BlockQuartz; -import appeng.block.solids.BlockQuartzChiseled; -import appeng.block.solids.BlockQuartzGlass; -import appeng.block.solids.BlockQuartzLamp; -import appeng.block.solids.BlockQuartzPillar; -import appeng.block.solids.BlockSkyStone; -import appeng.block.solids.BlockSkyStone.SkystoneType; -import appeng.block.solids.OreQuartz; -import appeng.block.solids.OreQuartzCharged; +import appeng.decorative.solid.FluixBlock; +import appeng.decorative.solid.QuartzBlock; +import appeng.decorative.solid.ChiseledQuartzBlock; +import appeng.decorative.solid.QuartzGlassBlock; +import appeng.decorative.solid.QuartzLampBlock; +import appeng.decorative.solid.QuartzPillarBlock; +import appeng.decorative.solid.SkyStoneBlock; +import appeng.decorative.solid.SkyStoneBlock.SkystoneType; +import appeng.decorative.solid.QuartzOreBlock; +import appeng.decorative.solid.ChargedQuartzOreBlock; import appeng.block.spatial.BlockMatrixFrame; import appeng.block.spatial.BlockSpatialIOPort; import appeng.block.spatial.BlockSpatialPylon; -import appeng.block.stair.BlockStairCommon; +import appeng.decorative.stair.BlockStairCommon; import appeng.block.storage.BlockChest; import appeng.block.storage.BlockDrive; import appeng.block.storage.BlockIOPort; @@ -161,20 +161,21 @@ public final class ApiBlocks implements IBlocks public ApiBlocks( DefinitionConstructor constructor ) { - this.quartzOre = constructor.registerBlockDefinition( new OreQuartz() ); - this.quartzOreCharged = constructor.registerBlockDefinition( new OreQuartzCharged() ); +// this.quartzOre = new BlockDefinition( "ore.quartz", new OreQuartz() ); + this.quartzOre = constructor.registerBlockDefinition( new QuartzOreBlock() ); + this.quartzOreCharged = constructor.registerBlockDefinition( new ChargedQuartzOreBlock() ); this.matrixFrame = constructor.registerBlockDefinition( new BlockMatrixFrame() ); - this.quartz = constructor.registerBlockDefinition( new BlockQuartz() ); - this.quartzPillar = constructor.registerBlockDefinition( new BlockQuartzPillar() ); - this.quartzChiseled = constructor.registerBlockDefinition( new BlockQuartzChiseled() ); - this.quartzGlass = constructor.registerBlockDefinition( new BlockQuartzGlass() ); - this.quartzVibrantGlass = constructor.registerBlockDefinition( new BlockQuartzLamp() ); + 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.quartzTorch = constructor.registerBlockDefinition( new BlockQuartzTorch() ); - 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.smallbrick ) ); + 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.skyChest = constructor.registerBlockDefinition( new BlockSkyChest( SkyChestType.STONE ) ); this.skyChestBlock = constructor.registerBlockDefinition( new BlockSkyChest( SkyChestType.BLOCK ) ); this.skyCompass = constructor.registerBlockDefinition( new BlockSkyCompass() ); @@ -214,7 +215,7 @@ public final class ApiBlocks implements IBlocks this.lightDetector = constructor.registerTileDefinition( new BlockLightDetector() ); this.paint = constructor.registerTileDefinition( new BlockPaint() ); - this.skyStoneStair = makeStairs( constructor, skyStone_stone, "skystone" ); + this.skyStoneStair = makeStairs( constructor, skyStone_stone, "skystone.stone" ); this.skyStoneBlockStair = makeStairs( constructor, skyStone_block, "skystone.block" ); this.skyStoneBrickStair = makeStairs( constructor, skyStone_brick, "skystone.brick" ); this.skyStoneSmallBrickStair = makeStairs( constructor, skyStone_smallbrick, "skystone.brick.small" ); diff --git a/src/main/java/appeng/core/api/definitions/ApiMaterials.java b/src/main/java/appeng/core/api/definitions/ApiMaterials.java index 4deb5f0e6..7d79508ef 100644 --- a/src/main/java/appeng/core/api/definitions/ApiMaterials.java +++ b/src/main/java/appeng/core/api/definitions/ApiMaterials.java @@ -22,7 +22,7 @@ package appeng.core.api.definitions; import appeng.api.definitions.IItemDefinition; import appeng.api.definitions.IMaterials; import appeng.core.features.DamagedItemDefinition; -import appeng.items.materials.ItemMultiMaterial; +import appeng.items.materials.MultiItem; import appeng.items.materials.MaterialType; @@ -93,7 +93,7 @@ public final class ApiMaterials implements IMaterials private final IItemDefinition woodenGear; - private final IItemDefinition wireless; + private final IItemDefinition wirelessReceiver; private final IItemDefinition wirelessBooster; private final IItemDefinition annihilationCore; @@ -105,80 +105,79 @@ public final class ApiMaterials implements IMaterials public ApiMaterials( DefinitionConstructor constructor ) { - final ItemMultiMaterial itemMultiMaterial = new ItemMultiMaterial(); - constructor.registerItemDefinition( itemMultiMaterial ); + final MultiItem materials = new MultiItem(); + constructor.registerItemDefinition( materials ); - this.cell2SpatialPart = new DamagedItemDefinition( itemMultiMaterial.createMaterial( MaterialType.Cell2SpatialPart ) ); - this.cell16SpatialPart = new DamagedItemDefinition( itemMultiMaterial.createMaterial( MaterialType.Cell16SpatialPart ) ); - this.cell128SpatialPart = new DamagedItemDefinition( itemMultiMaterial.createMaterial( MaterialType.Cell128SpatialPart ) ); + this.cell2SpatialPart = new DamagedItemDefinition( "material.cell.spatial.2", materials.createMaterial( MaterialType.Cell2SpatialPart ) ); + this.cell16SpatialPart = new DamagedItemDefinition( "material.cell.spatial.16", materials.createMaterial( MaterialType.Cell16SpatialPart ) ); + this.cell128SpatialPart = new DamagedItemDefinition( "material.cell.spatial.128", materials.createMaterial( MaterialType.Cell128SpatialPart ) ); - this.silicon = new DamagedItemDefinition( itemMultiMaterial.createMaterial( MaterialType.Silicon ) ); - this.skyDust = new DamagedItemDefinition( itemMultiMaterial.createMaterial( MaterialType.SkyDust ) ); + this.silicon = new DamagedItemDefinition( "material.silicon", materials.createMaterial( MaterialType.Silicon ) ); + this.skyDust = new DamagedItemDefinition( "material.dust.skystone", materials.createMaterial( MaterialType.SkyDust ) ); - this.calcProcessorPress = new DamagedItemDefinition( itemMultiMaterial.createMaterial( MaterialType.CalcProcessorPress ) ); - this.engProcessorPress = new DamagedItemDefinition( itemMultiMaterial.createMaterial( MaterialType.EngProcessorPress ) ); - this.logicProcessorPress = new DamagedItemDefinition( itemMultiMaterial.createMaterial( MaterialType.LogicProcessorPress ) ); + this.calcProcessorPress = new DamagedItemDefinition( "material.press.processor.calculation", materials.createMaterial( MaterialType.CalcProcessorPress ) ); + this.engProcessorPress = new DamagedItemDefinition( "material.press.processor.engineering", materials.createMaterial( MaterialType.EngProcessorPress ) ); + this.logicProcessorPress = new DamagedItemDefinition( "material.press.processor.logic", materials.createMaterial( MaterialType.LogicProcessorPress ) ); + this.siliconPress = new DamagedItemDefinition( "material.press.silicon", materials.createMaterial( MaterialType.SiliconPress ) ); + this.namePress = new DamagedItemDefinition( "material.press.name", materials.createMaterial( MaterialType.NamePress ) ); - this.calcProcessorPrint = new DamagedItemDefinition( itemMultiMaterial.createMaterial( MaterialType.CalcProcessorPrint ) ); - this.engProcessorPrint = new DamagedItemDefinition( itemMultiMaterial.createMaterial( MaterialType.EngProcessorPrint ) ); - this.logicProcessorPrint = new DamagedItemDefinition( itemMultiMaterial.createMaterial( MaterialType.LogicProcessorPrint ) ); + this.calcProcessorPrint = new DamagedItemDefinition( "material.print.processor.calculation", materials.createMaterial( MaterialType.CalcProcessorPrint ) ); + this.engProcessorPrint = new DamagedItemDefinition( "material.print.processor.engineering", materials.createMaterial( MaterialType.EngProcessorPrint ) ); + this.logicProcessorPrint = new DamagedItemDefinition( "material.print.processor.logic", materials.createMaterial( MaterialType.LogicProcessorPrint ) ); + this.siliconPrint = new DamagedItemDefinition( "material.print.silicon", materials.createMaterial( MaterialType.SiliconPrint ) ); - this.siliconPress = new DamagedItemDefinition( itemMultiMaterial.createMaterial( MaterialType.SiliconPress ) ); - this.siliconPrint = new DamagedItemDefinition( itemMultiMaterial.createMaterial( MaterialType.SiliconPrint ) ); - this.namePress = new DamagedItemDefinition( itemMultiMaterial.createMaterial( MaterialType.NamePress ) ); + this.logicProcessor = new DamagedItemDefinition( "material.processor.logic", materials.createMaterial( MaterialType.LogicProcessor ) ); + this.calcProcessor = new DamagedItemDefinition( "material.processor.calculation", materials.createMaterial( MaterialType.CalcProcessor ) ); + this.engProcessor = new DamagedItemDefinition( "material.processor.engineering", materials.createMaterial( MaterialType.EngProcessor ) ); - this.logicProcessor = new DamagedItemDefinition( itemMultiMaterial.createMaterial( MaterialType.LogicProcessor ) ); - this.calcProcessor = new DamagedItemDefinition( itemMultiMaterial.createMaterial( MaterialType.CalcProcessor ) ); - this.engProcessor = new DamagedItemDefinition( itemMultiMaterial.createMaterial( MaterialType.EngProcessor ) ); + this.basicCard = new DamagedItemDefinition( "material.card.basic", materials.createMaterial( MaterialType.BasicCard ) ); + this.advCard = new DamagedItemDefinition( "material.card.advanced", materials.createMaterial( MaterialType.AdvCard ) ); - this.basicCard = new DamagedItemDefinition( itemMultiMaterial.createMaterial( MaterialType.BasicCard ) ); - this.advCard = new DamagedItemDefinition( itemMultiMaterial.createMaterial( MaterialType.AdvCard ) ); + this.purifiedCertusQuartzCrystal = new DamagedItemDefinition( "material.crystal.quartz.certus.purified", materials.createMaterial( MaterialType.PurifiedCertusQuartzCrystal ) ); + this.purifiedNetherQuartzCrystal = new DamagedItemDefinition( "material.crystal.quartz.nether.purified", materials.createMaterial( MaterialType.PurifiedNetherQuartzCrystal ) ); + this.purifiedFluixCrystal = new DamagedItemDefinition( "material.crystal.fluix.purified", materials.createMaterial( MaterialType.PurifiedFluixCrystal ) ); - this.purifiedCertusQuartzCrystal = new DamagedItemDefinition( itemMultiMaterial.createMaterial( MaterialType.PurifiedCertusQuartzCrystal ) ); - this.purifiedNetherQuartzCrystal = new DamagedItemDefinition( itemMultiMaterial.createMaterial( MaterialType.PurifiedNetherQuartzCrystal ) ); - this.purifiedFluixCrystal = new DamagedItemDefinition( itemMultiMaterial.createMaterial( MaterialType.PurifiedFluixCrystal ) ); + this.cell1kPart = new DamagedItemDefinition( "material.cell.storage.1k", materials.createMaterial( MaterialType.Cell1kPart ) ); + this.cell4kPart = new DamagedItemDefinition( "material.cell.storage.4k", materials.createMaterial( MaterialType.Cell4kPart ) ); + this.cell16kPart = new DamagedItemDefinition( "material.cell.storage.16k", materials.createMaterial( MaterialType.Cell16kPart ) ); + this.cell64kPart = new DamagedItemDefinition( "material.cell.storage.64k", materials.createMaterial( MaterialType.Cell64kPart ) ); + this.emptyStorageCell = new DamagedItemDefinition( "material.cell.storage.empty", materials.createMaterial( MaterialType.EmptyStorageCell ) ); - this.cell1kPart = new DamagedItemDefinition( itemMultiMaterial.createMaterial( MaterialType.Cell1kPart ) ); - this.cell4kPart = new DamagedItemDefinition( itemMultiMaterial.createMaterial( MaterialType.Cell4kPart ) ); - this.cell16kPart = new DamagedItemDefinition( itemMultiMaterial.createMaterial( MaterialType.Cell16kPart ) ); - this.cell64kPart = new DamagedItemDefinition( itemMultiMaterial.createMaterial( MaterialType.Cell64kPart ) ); - this.emptyStorageCell = new DamagedItemDefinition( itemMultiMaterial.createMaterial( MaterialType.EmptyStorageCell ) ); + this.cardRedstone = new DamagedItemDefinition( "material.card.redstone", materials.createMaterial( MaterialType.CardRedstone ) ); + this.cardSpeed = new DamagedItemDefinition( "material.card.acceleration", materials.createMaterial( MaterialType.CardSpeed ) ); + this.cardCapacity = new DamagedItemDefinition( "material.card.capacity", materials.createMaterial( MaterialType.CardCapacity ) ); + this.cardFuzzy = new DamagedItemDefinition( "material.card.fuzzy", materials.createMaterial( MaterialType.CardFuzzy ) ); + this.cardInverter = new DamagedItemDefinition( "material.card.inverter", materials.createMaterial( MaterialType.CardInverter ) ); + this.cardCrafting = new DamagedItemDefinition( "material.card.crafting", materials.createMaterial( MaterialType.CardCrafting ) ); - this.cardRedstone = new DamagedItemDefinition( itemMultiMaterial.createMaterial( MaterialType.CardRedstone ) ); - this.cardSpeed = new DamagedItemDefinition( itemMultiMaterial.createMaterial( MaterialType.CardSpeed ) ); - this.cardCapacity = new DamagedItemDefinition( itemMultiMaterial.createMaterial( MaterialType.CardCapacity ) ); - this.cardFuzzy = new DamagedItemDefinition( itemMultiMaterial.createMaterial( MaterialType.CardFuzzy ) ); - this.cardInverter = new DamagedItemDefinition( itemMultiMaterial.createMaterial( MaterialType.CardInverter ) ); - this.cardCrafting = new DamagedItemDefinition( itemMultiMaterial.createMaterial( MaterialType.CardCrafting ) ); + this.enderDust = new DamagedItemDefinition( "material.dust.ender", materials.createMaterial( MaterialType.EnderDust ) ); + this.flour = new DamagedItemDefinition( "material.flour", materials.createMaterial( MaterialType.Flour ) ); + this.goldDust = new DamagedItemDefinition( "material.dust.gold", materials.createMaterial( MaterialType.GoldDust ) ); + this.ironDust = new DamagedItemDefinition( "material.dust.iron", materials.createMaterial( MaterialType.IronDust ) ); + this.fluixDust = new DamagedItemDefinition( "material.dust.fluix", materials.createMaterial( MaterialType.FluixDust ) ); + this.certusQuartzDust = new DamagedItemDefinition( "material.dust.quartz.certus", materials.createMaterial( MaterialType.CertusQuartzDust ) ); + this.netherQuartzDust = new DamagedItemDefinition( "material.dust.quartz.nether", materials.createMaterial( MaterialType.NetherQuartzDust ) ); - this.enderDust = new DamagedItemDefinition( itemMultiMaterial.createMaterial( MaterialType.EnderDust ) ); - this.flour = new DamagedItemDefinition( itemMultiMaterial.createMaterial( MaterialType.Flour ) ); - this.goldDust = new DamagedItemDefinition( itemMultiMaterial.createMaterial( MaterialType.GoldDust ) ); - this.ironDust = new DamagedItemDefinition( itemMultiMaterial.createMaterial( MaterialType.IronDust ) ); - this.fluixDust = new DamagedItemDefinition( itemMultiMaterial.createMaterial( MaterialType.FluixDust ) ); - this.certusQuartzDust = new DamagedItemDefinition( itemMultiMaterial.createMaterial( MaterialType.CertusQuartzDust ) ); - this.netherQuartzDust = new DamagedItemDefinition( itemMultiMaterial.createMaterial( MaterialType.NetherQuartzDust ) ); + this.matterBall = new DamagedItemDefinition( "material.ammo.matter_ball", materials.createMaterial( MaterialType.MatterBall ) ); + this.ironNugget = new DamagedItemDefinition( "material.ammo.nugget.iron", materials.createMaterial( MaterialType.IronNugget ) ); - this.matterBall = new DamagedItemDefinition( itemMultiMaterial.createMaterial( MaterialType.MatterBall ) ); - this.ironNugget = new DamagedItemDefinition( itemMultiMaterial.createMaterial( MaterialType.IronNugget ) ); + this.certusQuartzCrystal = new DamagedItemDefinition( "material.crystal.quartz.certus", materials.createMaterial( MaterialType.CertusQuartzCrystal ) ); + this.certusQuartzCrystalCharged = new DamagedItemDefinition( "material.crystal.quartz.certus.charged", materials.createMaterial( MaterialType.CertusQuartzCrystalCharged ) ); + this.fluixCrystal = new DamagedItemDefinition( "material.crystal.fluix", materials.createMaterial( MaterialType.FluixCrystal ) ); + this.fluixPearl = new DamagedItemDefinition( "material.pearl.fluix", materials.createMaterial( MaterialType.FluixPearl ) ); - this.certusQuartzCrystal = new DamagedItemDefinition( itemMultiMaterial.createMaterial( MaterialType.CertusQuartzCrystal ) ); - this.certusQuartzCrystalCharged = new DamagedItemDefinition( itemMultiMaterial.createMaterial( MaterialType.CertusQuartzCrystalCharged ) ); - this.fluixCrystal = new DamagedItemDefinition( itemMultiMaterial.createMaterial( MaterialType.FluixCrystal ) ); - this.fluixPearl = new DamagedItemDefinition( itemMultiMaterial.createMaterial( MaterialType.FluixPearl ) ); + this.woodenGear = new DamagedItemDefinition( "material.gear.wooden", materials.createMaterial( MaterialType.WoodenGear ) ); - this.woodenGear = new DamagedItemDefinition( itemMultiMaterial.createMaterial( MaterialType.WoodenGear ) ); + this.wirelessReceiver = new DamagedItemDefinition( "material.wireless.receiver", materials.createMaterial( MaterialType.Wireless ) ); + this.wirelessBooster = new DamagedItemDefinition( "material.wireless.booster", materials.createMaterial( MaterialType.WirelessBooster ) ); - this.wireless = new DamagedItemDefinition( itemMultiMaterial.createMaterial( MaterialType.Wireless ) ); - this.wirelessBooster = new DamagedItemDefinition( itemMultiMaterial.createMaterial( MaterialType.WirelessBooster ) ); + this.annihilationCore = new DamagedItemDefinition( "material.core.annihilation", materials.createMaterial( MaterialType.AnnihilationCore ) ); + this.formationCore = new DamagedItemDefinition( "material.core.formation", materials.createMaterial( MaterialType.FormationCore ) ); - this.annihilationCore = new DamagedItemDefinition( itemMultiMaterial.createMaterial( MaterialType.AnnihilationCore ) ); - this.formationCore = new DamagedItemDefinition( itemMultiMaterial.createMaterial( MaterialType.FormationCore ) ); - - this.singularity = new DamagedItemDefinition( itemMultiMaterial.createMaterial( MaterialType.Singularity ) ); - this.qESingularity = new DamagedItemDefinition( itemMultiMaterial.createMaterial( MaterialType.QESingularity ) ); - this.blankPattern = new DamagedItemDefinition( itemMultiMaterial.createMaterial( MaterialType.BlankPattern ) ); + this.singularity = new DamagedItemDefinition( "material.singularity", materials.createMaterial( MaterialType.Singularity ) ); + this.qESingularity = new DamagedItemDefinition( "material.singularity.entangled.quantum", materials.createMaterial( MaterialType.QESingularity ) ); + this.blankPattern = new DamagedItemDefinition( "material.pattern.blank", materials.createMaterial( MaterialType.BlankPattern ) ); } @Override @@ -464,9 +463,9 @@ public final class ApiMaterials implements IMaterials } @Override - public IItemDefinition wireless() + public IItemDefinition wirelessReceiver() { - return this.wireless; + return this.wirelessReceiver; } @Override diff --git a/src/main/java/appeng/core/api/definitions/ApiParts.java b/src/main/java/appeng/core/api/definitions/ApiParts.java index 581f18051..2c7c482dc 100644 --- a/src/main/java/appeng/core/api/definitions/ApiParts.java +++ b/src/main/java/appeng/core/api/definitions/ApiParts.java @@ -85,35 +85,35 @@ public final class ApiParts implements IParts // this.lumenCableCovered = Optional.absent(); // has yet to be implemented, no PartType defined for it yet // this.lumenCableGlass = Optional.absent(); // has yet to be implemented, no PartType defined for it yet // this.lumenCableDense = Optional.absent(); // has yet to be implemented, no PartType defined for it yet - this.quartzFiber = new DamagedItemDefinition( itemMultiPart.createPart( PartType.QuartzFiber ) ); - this.toggleBus = new DamagedItemDefinition( itemMultiPart.createPart( PartType.ToggleBus ) ); - this.invertedToggleBus = new DamagedItemDefinition( itemMultiPart.createPart( PartType.InvertedToggleBus ) ); - this.storageBus = new DamagedItemDefinition( itemMultiPart.createPart( PartType.StorageBus ) ); - this.importBus = new DamagedItemDefinition( itemMultiPart.createPart( PartType.ImportBus ) ); - this.exportBus = new DamagedItemDefinition( itemMultiPart.createPart( PartType.ExportBus ) ); - this.iface = new DamagedItemDefinition( itemMultiPart.createPart( PartType.Interface ) ); - this.levelEmitter = new DamagedItemDefinition( itemMultiPart.createPart( PartType.LevelEmitter ) ); - this.annihilationPlane = new DamagedItemDefinition( itemMultiPart.createPart( PartType.AnnihilationPlane ) ); - this.identityAnnihilationPlane = new DamagedItemDefinition( itemMultiPart.createPart( PartType.IdentityAnnihilationPlane ) ); - this.formationPlane = new DamagedItemDefinition( itemMultiPart.createPart( PartType.FormationPlane ) ); - this.p2PTunnelME = new DamagedItemDefinition( itemMultiPart.createPart( PartType.P2PTunnelME ) ); - this.p2PTunnelRedstone = new DamagedItemDefinition( itemMultiPart.createPart( PartType.P2PTunnelRedstone ) ); - this.p2PTunnelItems = new DamagedItemDefinition( itemMultiPart.createPart( PartType.P2PTunnelItems ) ); - this.p2PTunnelLiquids = new DamagedItemDefinition( itemMultiPart.createPart( PartType.P2PTunnelLiquids ) ); + this.quartzFiber = new DamagedItemDefinition( "part.quartz_fiber", itemMultiPart.createPart( PartType.QuartzFiber ) ); + this.toggleBus = new DamagedItemDefinition( "part.toggle_bus", itemMultiPart.createPart( PartType.ToggleBus ) ); + this.invertedToggleBus = new DamagedItemDefinition( "part.toggle_bus.inverted", itemMultiPart.createPart( PartType.InvertedToggleBus ) ); + this.storageBus = new DamagedItemDefinition( "part.bus.storage", itemMultiPart.createPart( PartType.StorageBus ) ); + this.importBus = new DamagedItemDefinition( "part.bus.import", itemMultiPart.createPart( PartType.ImportBus ) ); + this.exportBus = new DamagedItemDefinition( "part.bus.export", itemMultiPart.createPart( PartType.ExportBus ) ); + this.iface = new DamagedItemDefinition( "part.interface", itemMultiPart.createPart( PartType.Interface ) ); + this.levelEmitter = new DamagedItemDefinition( "part.level_emitter", itemMultiPart.createPart( PartType.LevelEmitter ) ); + this.annihilationPlane = new DamagedItemDefinition( "part.plane.annihilation", itemMultiPart.createPart( PartType.AnnihilationPlane ) ); + this.identityAnnihilationPlane = new DamagedItemDefinition( "part.plane.annihiliation.identity", itemMultiPart.createPart( PartType.IdentityAnnihilationPlane ) ); + this.formationPlane = new DamagedItemDefinition( "part.plane.formation", itemMultiPart.createPart( PartType.FormationPlane ) ); + this.p2PTunnelME = new DamagedItemDefinition( "part.tunnel.me", itemMultiPart.createPart( PartType.P2PTunnelME ) ); + this.p2PTunnelRedstone = new DamagedItemDefinition( "part.tunnel.redstone", itemMultiPart.createPart( PartType.P2PTunnelRedstone ) ); + this.p2PTunnelItems = new DamagedItemDefinition( "part.tunnel.item", itemMultiPart.createPart( PartType.P2PTunnelItems ) ); + this.p2PTunnelLiquids = new DamagedItemDefinition( "part.tunnel.fluid", itemMultiPart.createPart( PartType.P2PTunnelLiquids ) ); //this.p2PTunnelEU = new DamagedItemDefinition( itemMultiPart.createPart( PartType.P2PTunnelEU ) ); //this.p2PTunnelRF = new DamagedItemDefinition( itemMultiPart.createPart( PartType.P2PTunnelRF ) ); - this.p2PTunnelLight = new DamagedItemDefinition( itemMultiPart.createPart( PartType.P2PTunnelLight ) ); + this.p2PTunnelLight = new DamagedItemDefinition( "part.tunnel.light", itemMultiPart.createPart( PartType.P2PTunnelLight ) ); //this.p2PTunnelOpenComputers = new DamagedItemDefinition( itemMultiPart.createPart( PartType.P2PTunnelOpenComputers ) ); - this.cableAnchor = new DamagedItemDefinition( itemMultiPart.createPart( PartType.CableAnchor ) ); - this.monitor = new DamagedItemDefinition( itemMultiPart.createPart( PartType.Monitor ) ); - this.semiDarkMonitor = new DamagedItemDefinition( itemMultiPart.createPart( PartType.SemiDarkMonitor ) ); - this.darkMonitor = new DamagedItemDefinition( itemMultiPart.createPart( PartType.DarkMonitor ) ); - this.interfaceTerminal = new DamagedItemDefinition( itemMultiPart.createPart( PartType.InterfaceTerminal ) ); - this.patternTerminal = new DamagedItemDefinition( itemMultiPart.createPart( PartType.PatternTerminal ) ); - this.craftingTerminal = new DamagedItemDefinition( itemMultiPart.createPart( PartType.CraftingTerminal ) ); - this.terminal = new DamagedItemDefinition( itemMultiPart.createPart( PartType.Terminal ) ); - this.storageMonitor = new DamagedItemDefinition( itemMultiPart.createPart( PartType.StorageMonitor ) ); - this.conversionMonitor = new DamagedItemDefinition( itemMultiPart.createPart( PartType.ConversionMonitor ) ); + this.cableAnchor = new DamagedItemDefinition( "part.cable_anchor", itemMultiPart.createPart( PartType.CableAnchor ) ); + this.monitor = new DamagedItemDefinition( "part.monitor", itemMultiPart.createPart( PartType.Monitor ) ); + this.semiDarkMonitor = new DamagedItemDefinition( "part.monitor.semi_dark", itemMultiPart.createPart( PartType.SemiDarkMonitor ) ); + this.darkMonitor = new DamagedItemDefinition( "part.monitor.dark", itemMultiPart.createPart( PartType.DarkMonitor ) ); + this.interfaceTerminal = new DamagedItemDefinition( "part.terminal.interface", itemMultiPart.createPart( PartType.InterfaceTerminal ) ); + this.patternTerminal = new DamagedItemDefinition( "part.terminal.pattern", itemMultiPart.createPart( PartType.PatternTerminal ) ); + this.craftingTerminal = new DamagedItemDefinition( "part.terminal.crafting", itemMultiPart.createPart( PartType.CraftingTerminal ) ); + this.terminal = new DamagedItemDefinition( "part.terminal", itemMultiPart.createPart( PartType.Terminal ) ); + this.storageMonitor = new DamagedItemDefinition( "part.monitor.storage", itemMultiPart.createPart( PartType.StorageMonitor ) ); + this.conversionMonitor = new DamagedItemDefinition( "part.monitor.conversion", itemMultiPart.createPart( PartType.ConversionMonitor ) ); } @Override diff --git a/src/main/java/appeng/core/features/AEBlockFeatureHandler.java b/src/main/java/appeng/core/features/AEBlockFeatureHandler.java index 75c5ed3b6..bebf4ea34 100644 --- a/src/main/java/appeng/core/features/AEBlockFeatureHandler.java +++ b/src/main/java/appeng/core/features/AEBlockFeatureHandler.java @@ -47,7 +47,8 @@ public final class AEBlockFeatureHandler implements IFeatureHandler this.featured = featured; this.extractor = new FeatureNameExtractor( featured.getClass(), subName ); this.enabled = state == ActivityState.Enabled; - this.definition = new BlockDefinition( featured, state ); + // TODO use real identifier + this.definition = new BlockDefinition( featured.getClass().getSimpleName(), featured, state ); } @Override @@ -63,25 +64,29 @@ public final class AEBlockFeatureHandler implements IFeatureHandler } @Override - public void register(Side side) + public void register( Side side ) { if( this.enabled ) { String name = this.extractor.get(); this.featured.setCreativeTab( CreativeTab.instance ); - this.featured.setUnlocalizedName( /* "tile." */"appliedenergistics2." + name ); + this.featured.setUnlocalizedName( "appliedenergistics2." + name ); this.featured.setBlockTextureName( name ); // Bypass the forge magic with null to register our own itemblock later. GameRegistry.registerBlock( this.featured, null, name ); GameRegistry.registerItem( this.definition.maybeItem().get(), name ); - + // register the block/item conversion... - if ( this.definition.maybeItem().isPresent() ) - GameData.getBlockItemMap().put( this.featured, this.definition.maybeItem().get() ); - - if ( side == Side.CLIENT) - CommonHelper.proxy.configureIcon( this.featured, name ); + if( this.definition.maybeItem().isPresent() ) + { + GameData.getBlockItemMap().put( this.featured, this.definition.maybeItem().get() ); + } + + if( side == Side.CLIENT ) + { + CommonHelper.proxy.configureIcon( this.featured, name ); + } } } } diff --git a/src/main/java/appeng/core/features/AECableBusFeatureHandler.java b/src/main/java/appeng/core/features/AECableBusFeatureHandler.java index e4977b17a..2fa30ab6d 100644 --- a/src/main/java/appeng/core/features/AECableBusFeatureHandler.java +++ b/src/main/java/appeng/core/features/AECableBusFeatureHandler.java @@ -21,10 +21,13 @@ package appeng.core.features; import java.util.EnumSet; +import com.google.common.base.Optional; + import net.minecraft.tileentity.TileEntity; import net.minecraftforge.fml.common.registry.GameData; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; + import appeng.api.definitions.ITileDefinition; import appeng.block.AEBaseTileBlock; import appeng.block.networking.BlockCableBus; @@ -32,8 +35,6 @@ import appeng.core.CommonHelper; import appeng.core.CreativeTab; import appeng.util.Platform; -import com.google.common.base.Optional; - public final class AECableBusFeatureHandler implements IFeatureHandler { @@ -49,7 +50,7 @@ public final class AECableBusFeatureHandler implements IFeatureHandler this.featured = featured; this.extractor = new FeatureNameExtractor( featured.getClass(), subName ); this.enabled = state == ActivityState.Enabled; - this.definition = new TileDefinition( featured, state ); + this.definition = new TileDefinition( featured.getClass().getSimpleName(), featured, state ); } @Override diff --git a/src/main/java/appeng/core/features/AEFeature.java b/src/main/java/appeng/core/features/AEFeature.java index 95c81b57e..00811a7f6 100644 --- a/src/main/java/appeng/core/features/AEFeature.java +++ b/src/main/java/appeng/core/features/AEFeature.java @@ -25,53 +25,111 @@ public enum AEFeature // is just flat out required by tons of // important stuff. - CertusQuartzWorldGen( "World" ), MeteoriteWorldGen( "World" ), - - DecorativeLights( "World" ), DecorativeQuartzBlocks( "World" ), SkyStoneChests( "World" ), SpawnPressesInMeteorites( "World" ), - - GrindStone( "World" ), Flour( "World" ), Inscriber( "World" ), - - ChestLoot( "World" ), VillagerTrading( "World" ), - + CertusQuartzWorldGen( "World" ), + MeteoriteWorldGen( "World" ), + DecorativeLights( "World" ), + DecorativeQuartzBlocks( "World" ), + SkyStoneChests( "World" ), + SpawnPressesInMeteorites( "World" ), + GrindStone( "World" ), + Flour( "World" ), + Inscriber( "World" ), + ChestLoot( "World" ), + VillagerTrading( "World" ), TinyTNT( "World" ), PoweredTools( "ToolsClassifications" ), - CertusQuartzTools( "ToolsClassifications" ), - NetherQuartzTools( "ToolsClassifications" ), - QuartzHoe( "Tools" ), QuartzSpade( "Tools" ), QuartzSword( "Tools" ), QuartzPickaxe( "Tools" ), QuartzAxe( "Tools" ), QuartzKnife( "Tools" ), QuartzWrench( "Tools" ), + QuartzHoe( "Tools" ), + QuartzSpade( "Tools" ), + QuartzSword( "Tools" ), + QuartzPickaxe( "Tools" ), + QuartzAxe( "Tools" ), + QuartzKnife( "Tools" ), + QuartzWrench( "Tools" ), + ChargedStaff( "Tools" ), + EntropyManipulator( "Tools" ), + MatterCannon( "Tools" ), + WirelessAccessTerminal( "Tools" ), + ColorApplicator( "Tools" ), + PaintBalls( "Tools" ), + MeteoriteCompass( "Tools" ), - ChargedStaff( "Tools" ), EntropyManipulator( "Tools" ), MatterCannon( "Tools" ), WirelessAccessTerminal( "Tools" ), ColorApplicator( "Tools" ), + CraftingCPU( "CraftingFeatures" ), - CraftingCPU( "CraftingFeatures" ), PowerGen( "NetworkFeatures" ), Security( "NetworkFeatures" ), + PowerGen( "NetworkFeatures" ), + Security( "NetworkFeatures" ), + SpatialIO( "NetworkFeatures" ), + QuantumNetworkBridge( "NetworkFeatures" ), + Channels( "NetworkFeatures" ), - SpatialIO( "NetworkFeatures" ), QuantumNetworkBridge( "NetworkFeatures" ), Channels( "NetworkFeatures" ), + LevelEmitter( "NetworkBuses" ), + CraftingTerminal( "NetworkBuses" ), + StorageMonitor( "NetworkBuses" ), + P2PTunnel( "NetworkBuses" ), + FormationPlane( "NetworkBuses" ), + AnnihilationPlane( "NetworkBuses" ), + IdentityAnnihilationPlane( "NetworkBuses" ), + ImportBus( "NetworkBuses" ), + ExportBus( "NetworkBuses" ), + StorageBus( "NetworkBuses" ), + PartConversionMonitor( "NetworkBuses" ), - LevelEmitter( "NetworkBuses" ), CraftingTerminal( "NetworkBuses" ), StorageMonitor( "NetworkBuses" ), P2PTunnel( "NetworkBuses" ), FormationPlane( "NetworkBuses" ), AnnihilationPlane( "NetworkBuses" ), IdentityAnnihilationPlane( "NetworkBuses" ), ImportBus( "NetworkBuses" ), ExportBus( "NetworkBuses" ), StorageBus( "NetworkBuses" ), PartConversionMonitor( "NetworkBuses" ), + StorageCells( "Storage" ), + MEChest( "Storage" ), + MEDrive( "Storage" ), + IOPort( "Storage" ), - StorageCells( "Storage" ), PortableCell( "PortableCell" ), MEChest( "Storage" ), MEDrive( "Storage" ), IOPort( "Storage" ), + PortableCell( "PortableCell" ), NetworkTool( "NetworkTool" ), - DenseEnergyCells( "HigherCapacity" ), DenseCables( "HigherCapacity" ), + DenseEnergyCells( "HigherCapacity" ), + DenseCables( "HigherCapacity" ), - P2PTunnelRF( "P2PTunnels" ), P2PTunnelME( "P2PTunnels" ), P2PTunnelItems( "P2PTunnels" ), P2PTunnelRedstone( "P2PTunnels" ), P2PTunnelEU( "P2PTunnels" ), P2PTunnelLiquids( "P2PTunnels" ), P2PTunnelLight( "P2PTunnels" ), P2PTunnelOpenComputers( "P2PTunnels" ), + P2PTunnelRF( "P2PTunnels" ), + P2PTunnelME( "P2PTunnels" ), + P2PTunnelItems( "P2PTunnels" ), + P2PTunnelRedstone( "P2PTunnels" ), + P2PTunnelEU( "P2PTunnels" ), + P2PTunnelLiquids( "P2PTunnels" ), + P2PTunnelLight( "P2PTunnels" ), + P2PTunnelOpenComputers( "P2PTunnels" ), - MassCannonBlockDamage( "BlockFeatures" ), TinyTNTBlockDamage( "BlockFeatures" ), Facades( "Facades" ), + MassCannonBlockDamage( "BlockFeatures" ), + TinyTNTBlockDamage( "BlockFeatures" ), - UnsupportedDeveloperTools( "Misc", false ), Creative( "Misc" ), + Facades( "Facades" ), - GrinderLogging( "Misc", false ), Logging( "Misc" ), IntegrationLogging( "Misc", false ), WebsiteRecipes( "Misc", false ), + UnsupportedDeveloperTools( "Misc", false ), + Creative( "Misc" ), + GrinderLogging( "Misc", false ), + Logging( "Misc" ), + IntegrationLogging( "Misc", false ), + WebsiteRecipes( "Misc", false ), + UpdateLogging( "Misc", false ), + PacketLogging( "Misc", false ), + CraftingLog( "Misc", false ), + LightDetector( "Misc" ), + LogSecurityAudits( "Misc", false ), + Achievements( "Misc" ), - enableFacadeCrafting( "Crafting" ), inWorldSingularity( "Crafting" ), inWorldFluix( "Crafting" ), inWorldPurification( "Crafting" ), UpdateLogging( "Misc", false ), + enableFacadeCrafting( "Crafting" ), + inWorldSingularity( "Crafting" ), + inWorldFluix( "Crafting" ), + inWorldPurification( "Crafting" ), + InterfaceTerminal( "Crafting" ), - AlphaPass( "Rendering" ), PaintBalls( "Tools" ), PacketLogging( "Misc", false ), CraftingLog( "Misc", false ), InterfaceTerminal( "Crafting" ), LightDetector( "Misc" ), + AlphaPass( "Rendering" ), - enableDisassemblyCrafting( "Crafting" ), MolecularAssembler( "CraftingFeatures" ), MeteoriteCompass( "Tools" ), Patterns( "CraftingFeatures" ), + MolecularAssembler( "CraftingFeatures" ), - ChunkLoggerTrace( "Commands", false ), LogSecurityAudits( "Misc", false ), Achievements( "Misc" ); + enableDisassemblyCrafting( "Crafting" ), + Patterns( "CraftingFeatures" ), + + ChunkLoggerTrace( "Commands", false ); public final String category; public final boolean isVisible; @@ -79,7 +137,7 @@ public enum AEFeature AEFeature( String cat ) { - this(cat, true); + this( cat, true ); } AEFeature( String cat, boolean defaultValue ) diff --git a/src/main/java/appeng/core/features/AETileBlockFeatureHandler.java b/src/main/java/appeng/core/features/AETileBlockFeatureHandler.java index d1346ef66..0de978fb2 100644 --- a/src/main/java/appeng/core/features/AETileBlockFeatureHandler.java +++ b/src/main/java/appeng/core/features/AETileBlockFeatureHandler.java @@ -21,17 +21,18 @@ package appeng.core.features; import java.util.EnumSet; +import com.google.common.base.Optional; + import net.minecraftforge.fml.common.registry.GameData; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; + import appeng.api.definitions.ITileDefinition; import appeng.block.AEBaseTileBlock; import appeng.core.CommonHelper; import appeng.core.CreativeTab; import appeng.util.Platform; -import com.google.common.base.Optional; - public final class AETileBlockFeatureHandler implements IFeatureHandler { @@ -47,7 +48,7 @@ public final class AETileBlockFeatureHandler implements IFeatureHandler this.featured = featured; this.extractor = new FeatureNameExtractor( featured.getClass(), subName ); this.enabled = state == ActivityState.Enabled; - this.definition = new TileDefinition( featured, state ); + this.definition = new TileDefinition( featured.getClass().getSimpleName(), featured, state ); } @Override @@ -63,7 +64,7 @@ public final class AETileBlockFeatureHandler implements IFeatureHandler } @Override - public void register(Side side) + public void register( Side side ) { if( this.enabled ) { @@ -82,15 +83,19 @@ public final class AETileBlockFeatureHandler implements IFeatureHandler // Bypass the forge magic with null to register our own itemblock later. GameRegistry.registerBlock( this.featured, null, registryName ); GameRegistry.registerItem( this.definition.maybeItem().get(), registryName ); - + // register the block/item conversion... - if ( this.featured != null && this.definition.maybeItem().isPresent() ) - GameData.getBlockItemMap().put( this.featured, this.definition.maybeItem().get() ); - + if( this.definition.maybeItem().isPresent() ) + { + GameData.getBlockItemMap().put( this.featured, this.definition.maybeItem().get() ); + } + GameRegistry.registerTileEntity( this.featured.getTileEntityClass(), this.featured.toString() ); - if ( side == Side.CLIENT) - CommonHelper.proxy.configureIcon( this.featured, name ); + if( side == Side.CLIENT ) + { + CommonHelper.proxy.configureIcon( this.featured, name ); + } } } } diff --git a/src/main/java/appeng/core/features/BlockDefinition.java b/src/main/java/appeng/core/features/BlockDefinition.java index 80097de80..e20c992b9 100644 --- a/src/main/java/appeng/core/features/BlockDefinition.java +++ b/src/main/java/appeng/core/features/BlockDefinition.java @@ -21,28 +21,29 @@ package appeng.core.features; import java.lang.reflect.Constructor; +import com.google.common.base.Optional; +import com.google.common.base.Preconditions; +import com.google.common.collect.ObjectArrays; + import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; import net.minecraft.world.IBlockAccess; + import appeng.api.definitions.IBlockDefinition; import appeng.block.AEBaseBlock; -import com.google.common.base.Optional; -import com.google.common.base.Preconditions; -import com.google.common.collect.ObjectArrays; - public class BlockDefinition extends ItemDefinition implements IBlockDefinition { private final Block block; private final boolean enabled; - public BlockDefinition( Block block, ActivityState state ) + public BlockDefinition( final String identifier, Block block, ActivityState state ) { - super( constructItemFromBlock( block ), state ); + super( identifier, constructItemFromBlock( block ), state ); Preconditions.checkNotNull( block ); Preconditions.checkNotNull( state ); diff --git a/src/main/java/appeng/core/features/DamagedItemDefinition.java b/src/main/java/appeng/core/features/DamagedItemDefinition.java index f33ea9200..72259cbd8 100644 --- a/src/main/java/appeng/core/features/DamagedItemDefinition.java +++ b/src/main/java/appeng/core/features/DamagedItemDefinition.java @@ -21,23 +21,35 @@ package appeng.core.features; import javax.annotation.Nonnull; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; -import net.minecraft.world.IBlockAccess; -import appeng.api.definitions.IItemDefinition; - import com.google.common.base.Optional; import com.google.common.base.Preconditions; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; + +import appeng.api.definitions.IItemDefinition; + public final class DamagedItemDefinition implements IItemDefinition { + private final String identifier; private final IStackSrc source; - public DamagedItemDefinition( @Nonnull IStackSrc source ) + public DamagedItemDefinition( @Nonnull String identifier, @Nonnull IStackSrc source ) { - this.source = Preconditions.checkNotNull( source ); + Preconditions.checkNotNull( identifier ); + Preconditions.checkArgument( !identifier.isEmpty() ); + Preconditions.checkNotNull( source ); + + this.identifier = identifier; + this.source = source; + } + + @Nonnull + @Override + public String identifier() + { + return this.identifier; } @Override @@ -59,11 +71,7 @@ public final class DamagedItemDefinition implements IItemDefinition @Override public boolean isSameAs( ItemStack comparableStack ) { - if( comparableStack == null ) - { - return false; - } - - return comparableStack.getItem() == this.source.getItem() && comparableStack.getItemDamage() == this.source.getDamage(); + // is available && is same item && has same damage + return comparableStack != null && comparableStack.getItem() == this.source.getItem() && comparableStack.getItemDamage() == this.source.getDamage(); } } diff --git a/src/main/java/appeng/core/features/ItemDefinition.java b/src/main/java/appeng/core/features/ItemDefinition.java index 2399bd969..7391aa3e4 100644 --- a/src/main/java/appeng/core/features/ItemDefinition.java +++ b/src/main/java/appeng/core/features/ItemDefinition.java @@ -19,6 +19,8 @@ package appeng.core.features; +import javax.annotation.Nonnull; + import com.google.common.base.Optional; import com.google.common.base.Preconditions; @@ -31,18 +33,29 @@ import appeng.util.Platform; public class ItemDefinition implements IItemDefinition { + private final String identifier; private final Item item; private final boolean enabled; - public ItemDefinition( Item item, ActivityState state ) + public ItemDefinition( String identifier, Item item, ActivityState state ) { + Preconditions.checkNotNull( identifier ); + Preconditions.checkArgument( !identifier.isEmpty() ); Preconditions.checkNotNull( item ); Preconditions.checkNotNull( state ); + this.identifier = identifier; this.item = item; this.enabled = state == ActivityState.Enabled; } + @Nonnull + @Override + public String identifier() + { + return this.identifier; + } + @Override public final Optional maybeItem() { diff --git a/src/main/java/appeng/core/features/ItemFeatureHandler.java b/src/main/java/appeng/core/features/ItemFeatureHandler.java index ea0ed56d9..c5bca8015 100644 --- a/src/main/java/appeng/core/features/ItemFeatureHandler.java +++ b/src/main/java/appeng/core/features/ItemFeatureHandler.java @@ -48,7 +48,7 @@ public final class ItemFeatureHandler implements IFeatureHandler this.item = item; this.extractor = new FeatureNameExtractor( featured.getClass(), subName ); this.enabled = state == ActivityState.Enabled; - this.definition = new ItemDefinition( item, state ); + this.definition = new ItemDefinition( item.getClass().getSimpleName(), item, state ); } @Override @@ -72,7 +72,7 @@ public final class ItemFeatureHandler implements IFeatureHandler String itemPhysicalName = name; //this.item.setTextureName( "appliedenergistics2:" + name ); - this.item.setUnlocalizedName( /* "item." */"appliedenergistics2." + name ); + this.item.setUnlocalizedName( "appliedenergistics2." + name ); if( this.item instanceof ItemFacade ) { diff --git a/src/main/java/appeng/core/features/StairBlockFeatureHandler.java b/src/main/java/appeng/core/features/StairBlockFeatureHandler.java index 5c76c8a6b..d2b3fee60 100644 --- a/src/main/java/appeng/core/features/StairBlockFeatureHandler.java +++ b/src/main/java/appeng/core/features/StairBlockFeatureHandler.java @@ -24,10 +24,13 @@ import java.util.EnumSet; import com.google.common.base.Optional; import net.minecraft.block.BlockStairs; +import net.minecraft.item.Item; +import net.minecraft.item.ItemBlock; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; import appeng.api.definitions.IBlockDefinition; +import appeng.core.CommonHelper; import appeng.core.CreativeTab; @@ -45,7 +48,7 @@ public class StairBlockFeatureHandler implements IFeatureHandler this.stairs = stairs; this.extractor = new FeatureNameExtractor( stairs.getClass(), subName ); this.enabled = state == ActivityState.Enabled; - this.definition = new BlockDefinition( stairs, state ); + this.definition = new BlockDefinition( stairs.getClass().getSimpleName(), stairs, state ); } @Override @@ -69,8 +72,13 @@ public class StairBlockFeatureHandler implements IFeatureHandler this.stairs.setCreativeTab( CreativeTab.instance ); this.stairs.setUnlocalizedName( "appliedenergistics2." + name ); - // "tile." + GameRegistry.registerBlock( this.stairs, name ); + + if( side == Side.CLIENT ) + { + final Item item = ItemBlock.getItemFromBlock( this.stairs ); + CommonHelper.proxy.configureIcon( item, name ); + } } } } diff --git a/src/main/java/appeng/core/features/TileDefinition.java b/src/main/java/appeng/core/features/TileDefinition.java index 2e67401d3..84527a33d 100644 --- a/src/main/java/appeng/core/features/TileDefinition.java +++ b/src/main/java/appeng/core/features/TileDefinition.java @@ -19,25 +19,26 @@ package appeng.core.features; -import net.minecraft.tileentity.TileEntity; -import appeng.api.definitions.ITileDefinition; -import appeng.block.AEBaseTileBlock; +import javax.annotation.Nonnull; import com.google.common.base.Optional; import com.google.common.base.Preconditions; +import net.minecraft.tileentity.TileEntity; + +import appeng.api.definitions.ITileDefinition; +import appeng.block.AEBaseTileBlock; + public final class TileDefinition extends BlockDefinition implements ITileDefinition { private final AEBaseTileBlock block; - public TileDefinition( AEBaseTileBlock block, ActivityState state ) + public TileDefinition( @Nonnull final String identifier, AEBaseTileBlock block, ActivityState state ) { - super( block, state ); + super( identifier, block, state ); Preconditions.checkNotNull( block ); - Preconditions.checkNotNull( state ); - Preconditions.checkNotNull( block.getTileEntityClass() ); this.block = block; } diff --git a/src/main/java/appeng/core/worlddata/PlayerData.java b/src/main/java/appeng/core/worlddata/PlayerData.java index 23c5b6a25..a486cd3ab 100644 --- a/src/main/java/appeng/core/worlddata/PlayerData.java +++ b/src/main/java/appeng/core/worlddata/PlayerData.java @@ -33,7 +33,6 @@ import net.minecraftforge.common.config.ConfigCategory; import net.minecraftforge.common.config.Configuration; import net.minecraftforge.common.config.Property; -import appeng.core.AELog; import appeng.core.CommonHelper; @@ -66,7 +65,7 @@ final class PlayerData implements IWorldPlayerData, IOnWorldStartable, IOnWorldS this.config = new Configuration( configFile, configVersion ); final ConfigCategory playerList = this.config.getCategory( "players" ); - this.playerMapping = new PlayerMapping( playerList, AELog.INSTANCE ); + this.playerMapping = new PlayerMapping( playerList ); } @Nullable diff --git a/src/main/java/appeng/core/worlddata/PlayerMapping.java b/src/main/java/appeng/core/worlddata/PlayerMapping.java index b2d23c0e3..ae67aee8e 100644 --- a/src/main/java/appeng/core/worlddata/PlayerMapping.java +++ b/src/main/java/appeng/core/worlddata/PlayerMapping.java @@ -27,9 +27,6 @@ import com.google.common.base.Optional; import com.google.common.base.Preconditions; import net.minecraftforge.common.config.ConfigCategory; -import net.minecraftforge.fml.relauncher.FMLRelaunchLog; - -import com.google.common.base.Optional; /** @@ -46,9 +43,9 @@ final class PlayerMapping implements IWorldPlayerMapping */ private final Map mappings; - public PlayerMapping( ConfigCategory category, FMLRelaunchLog log ) + public PlayerMapping( ConfigCategory category ) { - final PlayerMappingsInitializer init = new PlayerMappingsInitializer( category, log ); + final PlayerMappingsInitializer init = new PlayerMappingsInitializer( category ); this.mappings = init.getPlayerMappings(); } diff --git a/src/main/java/appeng/core/worlddata/PlayerMappingsInitializer.java b/src/main/java/appeng/core/worlddata/PlayerMappingsInitializer.java index b82f83412..55e8deb6b 100644 --- a/src/main/java/appeng/core/worlddata/PlayerMappingsInitializer.java +++ b/src/main/java/appeng/core/worlddata/PlayerMappingsInitializer.java @@ -25,7 +25,6 @@ import java.util.UUID; import net.minecraftforge.common.config.ConfigCategory; import net.minecraftforge.common.config.Property; -import net.minecraftforge.fml.relauncher.FMLRelaunchLog; import appeng.core.AELog; import appeng.util.UUIDMatcher; @@ -50,9 +49,8 @@ class PlayerMappingsInitializer * where the UUIDs were introduced. * * @param playerList the category for the player list, generally extracted using the "players" tag - * @param log the logger used to warn the server or user of faulty entries */ - PlayerMappingsInitializer( ConfigCategory playerList, FMLRelaunchLog log ) + PlayerMappingsInitializer( ConfigCategory playerList ) { // Matcher for UUIDs final UUIDMatcher matcher = new UUIDMatcher(); @@ -61,7 +59,7 @@ class PlayerMappingsInitializer final int capacity = playerList.size(); // Mappings for the IDs is a regular HashMap - this.playerMappings = new HashMap( capacity ); + this.playerMappings = new HashMap<>( capacity ); // Iterates through every pair of UUID to ID for( Map.Entry entry : playerList.getValues().entrySet() ) diff --git a/src/main/java/appeng/debug/TileItemGen.java b/src/main/java/appeng/debug/TileItemGen.java index 7f49a0e96..93fab9fe9 100644 --- a/src/main/java/appeng/debug/TileItemGen.java +++ b/src/main/java/appeng/debug/TileItemGen.java @@ -104,7 +104,7 @@ public class TileItemGen extends AEBaseTile implements IInventory } @Override - public String getName() + public String getCommandSenderName() { return null; } diff --git a/src/main/java/appeng/block/solids/OreQuartzCharged.java b/src/main/java/appeng/decorative/solid/ChargedQuartzOreBlock.java similarity index 95% rename from src/main/java/appeng/block/solids/OreQuartzCharged.java rename to src/main/java/appeng/decorative/solid/ChargedQuartzOreBlock.java index 5ab52e22c..91d8f4741 100644 --- a/src/main/java/appeng/block/solids/OreQuartzCharged.java +++ b/src/main/java/appeng/decorative/solid/ChargedQuartzOreBlock.java @@ -16,7 +16,7 @@ * along with Applied Energistics 2. If not, see . */ -package appeng.block.solids; +package appeng.decorative.solid; import java.util.Random; @@ -34,10 +34,10 @@ import appeng.core.AEConfig; import appeng.core.CommonHelper; -public class OreQuartzCharged extends OreQuartz +public final class ChargedQuartzOreBlock extends QuartzOreBlock { - public OreQuartzCharged() + public ChargedQuartzOreBlock() { this.setBoostBrightnessLow( 2 ); this.setBoostBrightnessHigh( 5 ); diff --git a/src/main/java/appeng/block/solids/BlockQuartzChiseled.java b/src/main/java/appeng/decorative/solid/ChiseledQuartzBlock.java similarity index 89% rename from src/main/java/appeng/block/solids/BlockQuartzChiseled.java rename to src/main/java/appeng/decorative/solid/ChiseledQuartzBlock.java index 51be4ed93..76ede9b78 100644 --- a/src/main/java/appeng/block/solids/BlockQuartzChiseled.java +++ b/src/main/java/appeng/decorative/solid/ChiseledQuartzBlock.java @@ -16,7 +16,7 @@ * along with Applied Energistics 2. If not, see . */ -package appeng.block.solids; +package appeng.decorative.solid; import java.util.EnumSet; @@ -27,9 +27,9 @@ import appeng.block.AEDecorativeBlock; import appeng.core.features.AEFeature; -public final class BlockQuartzChiseled extends AEDecorativeBlock +public final class ChiseledQuartzBlock extends AEDecorativeBlock { - public BlockQuartzChiseled() + public ChiseledQuartzBlock() { super( Material.rock ); diff --git a/src/main/java/appeng/block/solids/BlockFluix.java b/src/main/java/appeng/decorative/solid/FluixBlock.java similarity index 90% rename from src/main/java/appeng/block/solids/BlockFluix.java rename to src/main/java/appeng/decorative/solid/FluixBlock.java index d1a4fbd1d..84030b561 100644 --- a/src/main/java/appeng/block/solids/BlockFluix.java +++ b/src/main/java/appeng/decorative/solid/FluixBlock.java @@ -16,7 +16,7 @@ * along with Applied Energistics 2. If not, see . */ -package appeng.block.solids; +package appeng.decorative.solid; import java.util.EnumSet; @@ -27,9 +27,9 @@ import appeng.block.AEDecorativeBlock; import appeng.core.features.AEFeature; -public final class BlockFluix extends AEDecorativeBlock +public final class FluixBlock extends AEDecorativeBlock { - public BlockFluix() + public FluixBlock() { super( Material.rock ); diff --git a/src/main/java/appeng/decorative/solid/FluixIdentifier.java b/src/main/java/appeng/decorative/solid/FluixIdentifier.java new file mode 100644 index 000000000..3aae6acd2 --- /dev/null +++ b/src/main/java/appeng/decorative/solid/FluixIdentifier.java @@ -0,0 +1,20 @@ +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 new file mode 100644 index 000000000..a252ee5b6 --- /dev/null +++ b/src/main/java/appeng/decorative/solid/Identifier.java @@ -0,0 +1,18 @@ +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/block/solids/BlockQuartz.java b/src/main/java/appeng/decorative/solid/QuartzBlock.java similarity index 90% rename from src/main/java/appeng/block/solids/BlockQuartz.java rename to src/main/java/appeng/decorative/solid/QuartzBlock.java index 446d493d1..b1772a00d 100644 --- a/src/main/java/appeng/block/solids/BlockQuartz.java +++ b/src/main/java/appeng/decorative/solid/QuartzBlock.java @@ -16,7 +16,7 @@ * along with Applied Energistics 2. If not, see . */ -package appeng.block.solids; +package appeng.decorative.solid; import java.util.EnumSet; @@ -27,9 +27,9 @@ import appeng.block.AEDecorativeBlock; import appeng.core.features.AEFeature; -public final class BlockQuartz extends AEDecorativeBlock +public final class QuartzBlock extends AEDecorativeBlock { - public BlockQuartz() + public QuartzBlock() { super( Material.rock ); diff --git a/src/main/java/appeng/block/solids/BlockQuartzGlass.java b/src/main/java/appeng/decorative/solid/QuartzGlassBlock.java similarity index 95% rename from src/main/java/appeng/block/solids/BlockQuartzGlass.java rename to src/main/java/appeng/decorative/solid/QuartzGlassBlock.java index 0bcafcdf8..1e6f743a4 100644 --- a/src/main/java/appeng/block/solids/BlockQuartzGlass.java +++ b/src/main/java/appeng/decorative/solid/QuartzGlassBlock.java @@ -16,7 +16,7 @@ * along with Applied Energistics 2. If not, see . */ -package appeng.block.solids; +package appeng.decorative.solid; import java.util.EnumSet; @@ -35,9 +35,9 @@ import appeng.core.features.AEFeature; import appeng.helpers.AEGlassMaterial; -public class BlockQuartzGlass extends AEBaseBlock +public class QuartzGlassBlock extends AEBaseBlock { - public BlockQuartzGlass() + public QuartzGlassBlock() { super( Material.glass ); this.setLightOpacity( 0 ); diff --git a/src/main/java/appeng/block/solids/BlockQuartzLamp.java b/src/main/java/appeng/decorative/solid/QuartzLampBlock.java similarity index 94% rename from src/main/java/appeng/block/solids/BlockQuartzLamp.java rename to src/main/java/appeng/decorative/solid/QuartzLampBlock.java index c69b4633e..169992edb 100644 --- a/src/main/java/appeng/block/solids/BlockQuartzLamp.java +++ b/src/main/java/appeng/decorative/solid/QuartzLampBlock.java @@ -16,7 +16,7 @@ * along with Applied Energistics 2. If not, see . */ -package appeng.block.solids; +package appeng.decorative.solid; import java.util.EnumSet; @@ -32,10 +32,10 @@ import appeng.core.CommonHelper; import appeng.core.features.AEFeature; -public class BlockQuartzLamp extends BlockQuartzGlass +public class QuartzLampBlock extends QuartzGlassBlock { - public BlockQuartzLamp() + public QuartzLampBlock() { this.setLightLevel( 1.0f ); this.setBlockTextureName( "BlockQuartzGlass" ); diff --git a/src/main/java/appeng/block/solids/OreQuartz.java b/src/main/java/appeng/decorative/solid/QuartzOreBlock.java similarity index 97% rename from src/main/java/appeng/block/solids/OreQuartz.java rename to src/main/java/appeng/decorative/solid/QuartzOreBlock.java index a31461988..b398214ae 100644 --- a/src/main/java/appeng/block/solids/OreQuartz.java +++ b/src/main/java/appeng/decorative/solid/QuartzOreBlock.java @@ -16,7 +16,7 @@ * along with Applied Energistics 2. If not, see . */ -package appeng.block.solids; +package appeng.decorative.solid; import java.util.EnumSet; @@ -40,13 +40,13 @@ import appeng.client.render.blocks.RenderQuartzOre; import appeng.core.features.AEFeature; -public class OreQuartz extends AEBaseBlock +public class QuartzOreBlock extends AEBaseBlock { private int boostBrightnessLow; private int boostBrightnessHigh; private boolean enhanceBrightness; - public OreQuartz() + public QuartzOreBlock() { super( Material.rock ); this.setHardness( 3.0F ); diff --git a/src/main/java/appeng/block/solids/BlockQuartzPillar.java b/src/main/java/appeng/decorative/solid/QuartzPillarBlock.java similarity index 93% rename from src/main/java/appeng/block/solids/BlockQuartzPillar.java rename to src/main/java/appeng/decorative/solid/QuartzPillarBlock.java index ffd3827ff..bfd977852 100644 --- a/src/main/java/appeng/block/solids/BlockQuartzPillar.java +++ b/src/main/java/appeng/decorative/solid/QuartzPillarBlock.java @@ -16,7 +16,7 @@ * along with Applied Energistics 2. If not, see . */ -package appeng.block.solids; +package appeng.decorative.solid; import java.util.EnumSet; @@ -34,10 +34,10 @@ import appeng.helpers.MetaRotation; // TODO Quartz Rotation. -public class BlockQuartzPillar extends AEBaseBlock implements IOrientableBlock +public class QuartzPillarBlock extends AEBaseBlock implements IOrientableBlock { - public BlockQuartzPillar() + public QuartzPillarBlock() { super( Material.rock ); this.setFeature( EnumSet.of( AEFeature.DecorativeQuartzBlocks ) ); diff --git a/src/main/java/appeng/block/solids/BlockSkyStone.java b/src/main/java/appeng/decorative/solid/SkyStoneBlock.java similarity index 77% rename from src/main/java/appeng/block/solids/BlockSkyStone.java rename to src/main/java/appeng/decorative/solid/SkyStoneBlock.java index f27fe2d4b..b3939f4f4 100644 --- a/src/main/java/appeng/block/solids/BlockSkyStone.java +++ b/src/main/java/appeng/decorative/solid/SkyStoneBlock.java @@ -16,7 +16,7 @@ * along with Applied Energistics 2. If not, see . */ -package appeng.block.solids; +package appeng.decorative.solid; import java.util.EnumSet; @@ -38,30 +38,27 @@ import appeng.core.worlddata.WorldData; import appeng.util.Platform; -public class BlockSkyStone extends AEBaseBlock +public class SkyStoneBlock extends AEBaseBlock { private static final float BLOCK_RESISTANCE = 150.0f; private static final double BREAK_SPEAK_SCALAR = 0.1; private static final double BREAK_SPEAK_THRESHOLD = 7.0; + private final SkystoneType type; - public static enum SkystoneType { - stone,block,brick,smallbrick - }; - - SkystoneType type; - - public BlockSkyStone( SkystoneType type ) + public SkyStoneBlock( SkystoneType type ) { - super( Material.rock, Optional.of( type.name()) ); + super( Material.rock, Optional.of( type.name() ) ); this.setHardness( 50 ); this.hasSubtypes = true; this.blockResistance = BLOCK_RESISTANCE; - if ( type == SkystoneType.stone ) + if( type == SkystoneType.STONE ) + { this.setHarvestLevel( "pickaxe", 3 ); + } this.setFeature( EnumSet.of( AEFeature.Core ) ); this.type = type; - + MinecraftForge.EVENT_BUS.register( this ); } @@ -78,7 +75,7 @@ public class BlockSkyStone extends AEBaseBlock level = is.getItem().getHarvestLevel( is, "pickaxe" ); } - if( type != SkystoneType.stone || level >= 3 || event.originalSpeed > BREAK_SPEAK_THRESHOLD ) + if( type != SkystoneType.STONE || level >= 3 || event.originalSpeed > BREAK_SPEAK_THRESHOLD ) { event.newSpeed /= BREAK_SPEAK_SCALAR; } @@ -86,10 +83,7 @@ public class BlockSkyStone extends AEBaseBlock } @Override - public void onBlockAdded( - World w, - BlockPos pos, - IBlockState state ) + public void onBlockAdded( World w, BlockPos pos, IBlockState state ) { super.onBlockAdded( w, pos, state ); if( Platform.isServer() ) @@ -99,27 +93,34 @@ public class BlockSkyStone extends AEBaseBlock } @Override - public String getUnlocalizedName( ItemStack is ) - { - switch(type) - { - case block: return this.getUnlocalizedName() + ".Block"; - case brick: return this.getUnlocalizedName() + ".Brick"; - case smallbrick: return this.getUnlocalizedName() + ".SmallBrick"; - default: return this.getUnlocalizedName(); - } - } - - @Override - public void breakBlock( - World w, - BlockPos pos, - IBlockState state ) + public void breakBlock( World w, BlockPos pos, IBlockState state ) { super.breakBlock( w, pos, state ); + if( Platform.isServer() ) { WorldData.instance().compassData().service().updateArea( w, pos.getX(), pos.getY(), pos.getZ() ); } } + + @Override + public String getUnlocalizedName( ItemStack is ) + { + switch( type ) + { + case BLOCK: + return this.getUnlocalizedName() + ".Block"; + case BRICK: + return this.getUnlocalizedName() + ".Brick"; + case SMALL_BRICK: + return this.getUnlocalizedName() + ".SmallBrick"; + default: + return this.getUnlocalizedName(); + } + } + + public enum SkystoneType + { + STONE, BLOCK, BRICK, SMALL_BRICK + } } diff --git a/src/main/java/appeng/block/stair/BlockStairCommon.java b/src/main/java/appeng/decorative/stair/BlockStairCommon.java similarity index 81% rename from src/main/java/appeng/block/stair/BlockStairCommon.java rename to src/main/java/appeng/decorative/stair/BlockStairCommon.java index 1d492d7f5..b7b6a3a55 100644 --- a/src/main/java/appeng/block/stair/BlockStairCommon.java +++ b/src/main/java/appeng/decorative/stair/BlockStairCommon.java @@ -16,7 +16,7 @@ * along with Applied Energistics 2. If not, see . */ -package appeng.block.stair; +package appeng.decorative.stair; import java.util.EnumSet; @@ -27,10 +27,10 @@ import appeng.block.AEBaseStairBlock; import appeng.core.features.AEFeature; -public final class BlockStairCommon extends AEBaseStairBlock +public class BlockStairCommon extends AEBaseStairBlock { - public BlockStairCommon( Block material, String type ) + public BlockStairCommon( Block block, String type ) { - super( material,EnumSet.of( AEFeature.DecorativeQuartzBlocks ), type ); + super( block, EnumSet.of( AEFeature.DecorativeQuartzBlocks ), type ); } } diff --git a/src/main/java/appeng/decorative/stair/DecorativeStairIdentifier.java b/src/main/java/appeng/decorative/stair/DecorativeStairIdentifier.java new file mode 100644 index 000000000..909582620 --- /dev/null +++ b/src/main/java/appeng/decorative/stair/DecorativeStairIdentifier.java @@ -0,0 +1,58 @@ +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 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/FluixStairBlock.java b/src/main/java/appeng/decorative/stair/FluixStairBlock.java new file mode 100644 index 000000000..1eea266c7 --- /dev/null +++ b/src/main/java/appeng/decorative/stair/FluixStairBlock.java @@ -0,0 +1,18 @@ +package appeng.decorative.stair; + + +import net.minecraft.block.Block; + + +/** + * @author thatsIch + * @version rv3 - 30.06.2015 + * @since rv3 30.06.2015 + */ +public class FluixStairBlock extends BlockStairCommon +{ + public FluixStairBlock( Block block, String type ) + { + super( block, type ); + } +} diff --git a/src/main/java/appeng/decorative/stair/FluixStairComponent.java b/src/main/java/appeng/decorative/stair/FluixStairComponent.java new file mode 100644 index 000000000..078ad9451 --- /dev/null +++ b/src/main/java/appeng/decorative/stair/FluixStairComponent.java @@ -0,0 +1,11 @@ +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 new file mode 100644 index 000000000..e9fb79412 --- /dev/null +++ b/src/main/java/appeng/decorative/stair/FluixStairIdentifier.java @@ -0,0 +1,22 @@ +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 new file mode 100644 index 000000000..98e5b98fe --- /dev/null +++ b/src/main/java/appeng/decorative/stair/FluixStairSupplier.java @@ -0,0 +1,33 @@ +package appeng.decorative.stair; + + +import java.util.function.Supplier; + +import com.google.common.base.Preconditions; + +import net.minecraft.block.Block; +import net.minecraft.block.BlockStairs; + + +/** + * @author thatsIch + * @version rv3 - 30.06.2015 + * @since rv3 30.06.2015 + */ +public class FluixStairSupplier implements Supplier +{ + private final Supplier fluixBlockSupplier; + + public FluixStairSupplier( Supplier fluixBlockSupplier ) + { + Preconditions.checkNotNull( fluixBlockSupplier ); + + this.fluixBlockSupplier = fluixBlockSupplier; + } + + @Override + public FluixStairBlock get() + { + return new FluixStairBlock( this.fluixBlockSupplier.get(), "fluix" ); + } +} diff --git a/src/main/java/appeng/decorative/stair/StairBlockDefinition.java b/src/main/java/appeng/decorative/stair/StairBlockDefinition.java new file mode 100644 index 000000000..7ce5e72e0 --- /dev/null +++ b/src/main/java/appeng/decorative/stair/StairBlockDefinition.java @@ -0,0 +1,71 @@ +package appeng.decorative.stair; + + +import javax.annotation.Nonnull; + +import com.google.common.base.Optional; + +import net.minecraft.block.Block; +import net.minecraft.item.Item; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; +import net.minecraft.world.IBlockAccess; + +import appeng.api.definitions.IBlockDefinition; + + +/** + * @author thatsIch + * @version rv3 - 29.06.2015 + * @since rv3 29.06.2015 + */ +public class StairBlockDefinition implements IBlockDefinition +{ + public StairBlockDefinition() + { + } + + @Override + public Optional maybeBlock() + { + return null; + } + + @Override + public Optional maybeItemBlock() + { + return null; + } + + @Override + public boolean isSameAs( IBlockAccess world, BlockPos pos ) + { + return false; + } + + @Nonnull + @Override + public String identifier() + { + return null; + } + + @Override + public Optional maybeItem() + { + return null; + } + + @Override + public Optional maybeStack( int stackSize ) + { + return null; + } + + @Override + public boolean isSameAs( ItemStack comparableStack ) + { + return false; + } +} diff --git a/src/main/java/appeng/items/contents/NetworkToolViewer.java b/src/main/java/appeng/items/contents/NetworkToolViewer.java index 4a26efd7a..be326eb22 100644 --- a/src/main/java/appeng/items/contents/NetworkToolViewer.java +++ b/src/main/java/appeng/items/contents/NetworkToolViewer.java @@ -78,9 +78,9 @@ public class NetworkToolViewer implements INetworkTool } @Override - public String getName() + public String getCommandSenderName() { - return this.inv.getName(); + return this.inv.getCommandSenderName(); } @Override diff --git a/src/main/java/appeng/items/materials/ItemMultiMaterial.java b/src/main/java/appeng/items/materials/MultiItem.java similarity index 98% rename from src/main/java/appeng/items/materials/ItemMultiMaterial.java rename to src/main/java/appeng/items/materials/MultiItem.java index 2224c244d..5b0900835 100644 --- a/src/main/java/appeng/items/materials/ItemMultiMaterial.java +++ b/src/main/java/appeng/items/materials/MultiItem.java @@ -69,14 +69,14 @@ import appeng.util.InventoryAdaptor; import appeng.util.Platform; -public final class ItemMultiMaterial extends AEBaseItem implements IStorageComponent, IUpgradeModule +public final class MultiItem extends AEBaseItem implements IStorageComponent, IUpgradeModule { public static final int KILO_SCALAR = 1024; - public static ItemMultiMaterial instance; + public static MultiItem instance; private final Map dmgToMaterial = new HashMap(); - public ItemMultiMaterial() + public MultiItem() { 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 5fc701423..e470edfe3 100644 --- a/src/main/java/appeng/items/parts/ItemFacade.java +++ b/src/main/java/appeng/items/parts/ItemFacade.java @@ -45,7 +45,7 @@ import appeng.api.AEApi; import appeng.api.exceptions.MissingDefinition; import appeng.api.parts.IAlphaPassItem; import appeng.api.util.AEPartLocation; -import appeng.block.solids.OreQuartz; +import appeng.decorative.solid.QuartzOreBlock; import appeng.client.texture.BaseIcon; import appeng.core.AppEng; import appeng.core.FacadeConfig; @@ -159,7 +159,7 @@ public class ItemFacade extends AEBaseItem implements IFacadeItem, IAlphaPassIte boolean hasTile = b.hasTileEntity( b.getStateFromMeta( metadata ) ); boolean enableGlass = b instanceof BlockGlass || b instanceof BlockStainedGlass; - boolean disableOre = b instanceof OreQuartz; + boolean disableOre = b instanceof QuartzOreBlock; boolean defaultValue = ( b.isOpaqueCube() && !b.getTickRandomly() && !hasTile && !disableOre ) || enableGlass; if( FacadeConfig.instance.checkEnabled( b, metadata, defaultValue ) ) diff --git a/src/main/java/appeng/items/tools/powered/ToolChargedStaff.java b/src/main/java/appeng/items/tools/powered/ToolChargedStaff.java index 419c28cb9..395ac6bd8 100644 --- a/src/main/java/appeng/items/tools/powered/ToolChargedStaff.java +++ b/src/main/java/appeng/items/tools/powered/ToolChargedStaff.java @@ -21,9 +21,13 @@ package appeng.items.tools.powered; import java.util.EnumSet; +import com.google.common.base.Optional; + import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; +import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.DamageSource; + import appeng.core.AEConfig; import appeng.core.features.AEFeature; import appeng.core.sync.packets.PacketLightning; @@ -31,8 +35,6 @@ import appeng.items.tools.powered.powersink.AEBasePoweredItem; import appeng.server.ServerHelper; import appeng.util.Platform; -import com.google.common.base.Optional; - public class ToolChargedStaff extends AEBasePoweredItem { @@ -53,9 +55,10 @@ public class ToolChargedStaff extends AEBasePoweredItem { for( int x = 0; x < 2; x++ ) { - float dx = (float) ( Platform.getRandomFloat() * target.width + target.getBoundingBox().minX ); - float dy = (float) ( Platform.getRandomFloat() * target.height + target.getBoundingBox().minY ); - float dz = (float) ( Platform.getRandomFloat() * target.width + target.getBoundingBox().minZ ); + final AxisAlignedBB entityBoundingBox = target.getEntityBoundingBox(); + float dx = (float) ( Platform.getRandomFloat() * target.width + entityBoundingBox.minX ); + float dy = (float) ( Platform.getRandomFloat() * target.height + entityBoundingBox.minY ); + float dz = (float) ( Platform.getRandomFloat() * target.width + entityBoundingBox.minZ ); ServerHelper.proxy.sendToAllNearExcept( null, dx, dy, dz, 32.0, target.worldObj, new PacketLightning( dx, dy, dz ) ); } } diff --git a/src/main/java/appeng/items/tools/powered/ToolMassCannon.java b/src/main/java/appeng/items/tools/powered/ToolMassCannon.java index 47cfe22a8..3d1b39cfb 100644 --- a/src/main/java/appeng/items/tools/powered/ToolMassCannon.java +++ b/src/main/java/appeng/items/tools/powered/ToolMassCannon.java @@ -222,7 +222,7 @@ public class ToolMassCannon extends AEBasePoweredItem implements IStorageCell float f1 = 0.3F; - AxisAlignedBB boundingBox = entity1.getBoundingBox().expand( f1, f1, f1 ); + AxisAlignedBB boundingBox = entity1.getEntityBoundingBox().expand( f1, f1, f1 ); MovingObjectPosition movingObjectPosition = boundingBox.calculateIntercept( vec3, vec31 ); if( movingObjectPosition != null ) @@ -341,7 +341,7 @@ public class ToolMassCannon extends AEBasePoweredItem implements IStorageCell float f1 = 0.3F; - AxisAlignedBB boundingBox = entity1.getBoundingBox().expand( f1, f1, f1 ); + AxisAlignedBB boundingBox = entity1.getEntityBoundingBox().expand( f1, f1, f1 ); MovingObjectPosition movingObjectPosition = boundingBox.calculateIntercept( vec3, vec31 ); if( movingObjectPosition != null ) diff --git a/src/main/java/appeng/parts/misc/PartInterface.java b/src/main/java/appeng/parts/misc/PartInterface.java index 295f7d5b0..202d3c480 100644 --- a/src/main/java/appeng/parts/misc/PartInterface.java +++ b/src/main/java/appeng/parts/misc/PartInterface.java @@ -22,6 +22,8 @@ package appeng.parts.misc; import java.util.EnumSet; import java.util.List; +import com.google.common.collect.ImmutableSet; + import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; @@ -36,6 +38,7 @@ import net.minecraft.util.IChatComponent; import net.minecraft.util.Vec3; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; + import appeng.api.config.Actionable; import appeng.api.config.Upgrades; import appeng.api.implementations.tiles.ITileStorageMonitorable; @@ -70,8 +73,6 @@ import appeng.tile.inventory.InvOperation; import appeng.util.Platform; import appeng.util.inv.IInventoryDestination; -import com.google.common.collect.ImmutableSet; - public class PartInterface extends PartBasicState implements IGridTickable, IStorageMonitorable, IInventoryDestination, IInterfaceHost, ISidedInventory, IAEAppEngInventory, ITileStorageMonitorable, IPriorityHost { @@ -281,9 +282,9 @@ public class PartInterface extends PartBasicState implements IGridTickable, ISto } @Override - public String getName() + public String getCommandSenderName() { - return this.duality.getStorage().getName(); + return this.duality.getStorage().getCommandSenderName(); } @Override diff --git a/src/main/java/appeng/parts/p2p/PartP2PItems.java b/src/main/java/appeng/parts/p2p/PartP2PItems.java index fe6aba80e..825da7bc8 100644 --- a/src/main/java/appeng/parts/p2p/PartP2PItems.java +++ b/src/main/java/appeng/parts/p2p/PartP2PItems.java @@ -307,7 +307,7 @@ public class PartP2PItems extends PartP2PTunnel implements ISidedI } @Override - public String getName() + public String getCommandSenderName() { return null; } diff --git a/src/main/java/appeng/recipes/AEItemResolver.java b/src/main/java/appeng/recipes/AEItemResolver.java index 53dabd371..164e0e58d 100644 --- a/src/main/java/appeng/recipes/AEItemResolver.java +++ b/src/main/java/appeng/recipes/AEItemResolver.java @@ -30,7 +30,7 @@ import appeng.api.recipes.ResolverResultSet; import appeng.api.util.AEColor; import appeng.api.util.AEColoredItemDefinition; import appeng.core.AppEng; -import appeng.items.materials.ItemMultiMaterial; +import appeng.items.materials.MultiItem; import appeng.items.materials.MaterialType; import appeng.items.misc.ItemCrystalSeed; import appeng.items.parts.ItemMultiPart; @@ -123,7 +123,7 @@ public class AEItemResolver implements ISubItemResolver String materialName = itemName.substring( itemName.indexOf( '.' ) + 1 ); MaterialType mt = MaterialType.valueOf( materialName ); // itemName = itemName.substring( 0, itemName.indexOf( "." ) ); - if( mt.itemInstance == ItemMultiMaterial.instance && mt.damageValue >= 0 && mt.isRegistered() ) + if( mt.itemInstance == MultiItem.instance && mt.damageValue >= 0 && mt.isRegistered() ) { return new ResolverResult( "ItemMultiMaterial", mt.damageValue ); } diff --git a/src/main/java/appeng/recipes/RecipeHandler.java b/src/main/java/appeng/recipes/RecipeHandler.java index a38caab08..34534128b 100644 --- a/src/main/java/appeng/recipes/RecipeHandler.java +++ b/src/main/java/appeng/recipes/RecipeHandler.java @@ -54,7 +54,7 @@ import appeng.core.AEConfig; import appeng.core.AELog; import appeng.core.AppEng; import appeng.core.features.AEFeature; -import appeng.items.materials.ItemMultiMaterial; +import appeng.items.materials.MultiItem; import appeng.items.misc.ItemCrystalSeed; import appeng.items.parts.ItemMultiPart; import appeng.recipes.handlers.IWebsiteSerializer; @@ -200,10 +200,10 @@ public class RecipeHandler implements IRecipeHandler default: } } - else if( is.getItem() instanceof ItemMultiMaterial ) + else if( is.getItem() instanceof MultiItem ) { realName = realName.replace( "ItemMultiMaterial", "ItemMaterial" ); - realName += '.' + ( (ItemMultiMaterial) is.getItem() ).getTypeByStack( is ).name(); + realName += '.' + ( (MultiItem) is.getItem() ).getTypeByStack( is ).name(); } else if( is.getItem() instanceof ItemMultiPart ) { diff --git a/src/main/java/appeng/server/AECommand.java b/src/main/java/appeng/server/AECommand.java index c57580f70..595193083 100644 --- a/src/main/java/appeng/server/AECommand.java +++ b/src/main/java/appeng/server/AECommand.java @@ -19,14 +19,14 @@ package appeng.server; +import com.google.common.base.Joiner; + import net.minecraft.command.CommandBase; import net.minecraft.command.CommandException; import net.minecraft.command.ICommandSender; import net.minecraft.command.WrongUsageException; import net.minecraft.server.MinecraftServer; -import com.google.common.base.Joiner; - public final class AECommand extends CommandBase { @@ -53,7 +53,7 @@ public final class AECommand extends CommandBase } @Override - public String getName() + public String getCommandName() { return "ae2"; } @@ -65,7 +65,7 @@ public final class AECommand extends CommandBase } @Override - public void execute( + public void processCommand( ICommandSender sender, String[] args ) throws CommandException { @@ -101,7 +101,7 @@ public final class AECommand extends CommandBase try { Commands c = Commands.valueOf( args[0] ); - if( sender.canUseCommand( c.level, this.getName() ) ) + if( sender.canCommandSenderUseCommand( c.level, this.getCommandName() ) ) { c.command.call( this.srv, args, sender ); } diff --git a/src/main/java/appeng/server/ServerHelper.java b/src/main/java/appeng/server/ServerHelper.java index c3bdc612f..753936a2a 100644 --- a/src/main/java/appeng/server/ServerHelper.java +++ b/src/main/java/appeng/server/ServerHelper.java @@ -29,6 +29,7 @@ import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.server.MinecraftServer; +import net.minecraft.tileentity.TileEntity; import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; @@ -68,7 +69,7 @@ public class ServerHelper extends CommonHelper } @Override - public void bindTileEntitySpecialRenderer( Class tile, AEBaseBlock blk ) + public void bindTileEntitySpecialRenderer( Class tile, AEBaseBlock blk ) { throw new UnsupportedOperationException( "This is a server..." ); } diff --git a/src/main/java/appeng/spatial/StorageChunkProvider.java b/src/main/java/appeng/spatial/StorageChunkProvider.java index 3e3882f86..fa072916c 100644 --- a/src/main/java/appeng/spatial/StorageChunkProvider.java +++ b/src/main/java/appeng/spatial/StorageChunkProvider.java @@ -29,6 +29,7 @@ import net.minecraft.world.World; import net.minecraft.world.chunk.Chunk; import net.minecraft.world.chunk.IChunkProvider; import net.minecraft.world.gen.ChunkProviderGenerate; + import appeng.api.AEApi; import appeng.core.AEConfig; @@ -94,9 +95,7 @@ public class StorageChunkProvider extends ChunkProviderGenerate } @Override - public List func_177458_a( - EnumCreatureType p_177458_1_, - BlockPos p_177458_2_ ) + public List getPossibleCreatures( EnumCreatureType creatureType, BlockPos pos ) { return new ArrayList(); } diff --git a/src/main/java/appeng/tile/AEBaseInvTile.java b/src/main/java/appeng/tile/AEBaseInvTile.java index 78af76614..99cb76c55 100644 --- a/src/main/java/appeng/tile/AEBaseInvTile.java +++ b/src/main/java/appeng/tile/AEBaseInvTile.java @@ -31,6 +31,7 @@ import net.minecraft.util.ChatComponentText; import net.minecraft.util.ChatComponentTranslation; import net.minecraft.util.EnumFacing; import net.minecraft.util.IChatComponent; + import appeng.block.AEBaseBlock; import appeng.tile.events.TileEventType; import appeng.tile.inventory.IAEAppEngInventory; @@ -39,6 +40,11 @@ import appeng.tile.inventory.InvOperation; public abstract class AEBaseInvTile extends AEBaseTile implements ISidedInventory, IAEAppEngInventory { + @Override + public String getCommandSenderName() + { + return this.getCustomName(); + } @TileEvent( TileEventType.WORLD_NBT_READ ) public void readFromNBT_AEBaseInvTile( net.minecraft.nbt.NBTTagCompound data ) @@ -102,15 +108,6 @@ public abstract class AEBaseInvTile extends AEBaseTile implements ISidedInventor this.getInternalInventory().setInventorySlotContents( i, itemstack ); } - /** - * Returns the name of the inventory - */ - @Override - public String getName() - { - return this.getCustomName(); - } - /** * Returns if the inventory is named */ @@ -135,15 +132,17 @@ public abstract class AEBaseInvTile extends AEBaseTile implements ISidedInventor } @Override - public void openInventory(EntityPlayer player) { - - }; - - @Override - public void closeInventory( - EntityPlayer player ) + public void openInventory( EntityPlayer player ) { - + + } + + ; + + @Override + public void closeInventory( EntityPlayer player ) + { + } @Override @@ -156,8 +155,7 @@ public abstract class AEBaseInvTile extends AEBaseTile implements ISidedInventor public abstract void onChangeInventory( IInventory inv, int slot, InvOperation mc, ItemStack removed, ItemStack added ); @Override - public int[] getSlotsForFace( - EnumFacing side ) + public int[] getSlotsForFace( EnumFacing side ) { Block blk = this.worldObj.getBlockState( pos ).getBlock(); if( blk instanceof AEBaseBlock ) @@ -178,41 +176,40 @@ public abstract class AEBaseInvTile extends AEBaseTile implements ISidedInventor { return true; } - + @Override public void clear() { this.getInternalInventory().clear(); } - + @Override - public int getField( - int id ) + public int getField( int id ) { return 0; } + @Override - public void setField( - int id, - int value ) + public void setField( int id, int value ) { - + } - + @Override public int getFieldCount() { return 0; } - + @Override public IChatComponent getDisplayName() { - if ( hasCustomName() ) - return new ChatComponentText(getName()); + if( hasCustomName() ) + { + return new ChatComponentText( this.getCustomName() ); + } return new ChatComponentTranslation( getBlockType().getUnlocalizedName() ); } - public abstract int[] getAccessibleSlotsBySide( EnumFacing whichSide ); } diff --git a/src/main/java/appeng/tile/inventory/AppEngInternalAEInventory.java b/src/main/java/appeng/tile/inventory/AppEngInternalAEInventory.java index f97b70eaa..95cce33eb 100644 --- a/src/main/java/appeng/tile/inventory/AppEngInternalAEInventory.java +++ b/src/main/java/appeng/tile/inventory/AppEngInternalAEInventory.java @@ -218,7 +218,7 @@ public class AppEngInternalAEInventory implements IInventory, Iterable } @Override - public String getName() + public String getCommandSenderName() { return "appeng-internal"; } diff --git a/src/main/java/appeng/tile/inventory/AppEngNullInventory.java b/src/main/java/appeng/tile/inventory/AppEngNullInventory.java index 81a1cc422..67c4ccf9e 100644 --- a/src/main/java/appeng/tile/inventory/AppEngNullInventory.java +++ b/src/main/java/appeng/tile/inventory/AppEngNullInventory.java @@ -68,7 +68,7 @@ public class AppEngNullInventory implements IInventory } @Override - public String getName() + public String getCommandSenderName() { return "appeng-internal"; } diff --git a/src/main/java/appeng/transformer/AppEngCore.java b/src/main/java/appeng/transformer/AppEngCore.java index 631459bf4..287f154a0 100644 --- a/src/main/java/appeng/transformer/AppEngCore.java +++ b/src/main/java/appeng/transformer/AppEngCore.java @@ -20,9 +20,10 @@ package appeng.transformer; import java.util.Map; - import javax.annotation.Nullable; +import com.google.common.eventbus.EventBus; + import net.minecraftforge.fml.common.DummyModContainer; import net.minecraftforge.fml.common.LoadController; import net.minecraftforge.fml.common.Mod.EventHandler; @@ -31,9 +32,8 @@ import net.minecraftforge.fml.common.event.FMLInitializationEvent; import net.minecraftforge.fml.relauncher.FMLRelaunchLog; import net.minecraftforge.fml.relauncher.IFMLLoadingPlugin; import net.minecraftforge.fml.relauncher.IFMLLoadingPlugin.MCVersion; -import appeng.core.AEConfig; -import com.google.common.eventbus.EventBus; +import appeng.core.AEConfig; @MCVersion( "1.8" ) @@ -126,4 +126,6 @@ public final class AppEngCore extends DummyModContainer implements IFMLLoadingPl { return this.getVersion(); } + + } diff --git a/src/main/java/appeng/util/Platform.java b/src/main/java/appeng/util/Platform.java index e34eba38c..0acb7c3de 100644 --- a/src/main/java/appeng/util/Platform.java +++ b/src/main/java/appeng/util/Platform.java @@ -1541,7 +1541,7 @@ public class Platform } f1 = 0.3F; - AxisAlignedBB boundingBox = entity1.getBoundingBox().expand( f1, f1, f1 ); + AxisAlignedBB boundingBox = entity1.getEntityBoundingBox().expand( f1, f1, f1 ); MovingObjectPosition movingObjectPosition = boundingBox.calculateIntercept( vec3, vec31 ); if( movingObjectPosition != null ) diff --git a/src/main/java/appeng/util/inv/AdaptorPlayerInventory.java b/src/main/java/appeng/util/inv/AdaptorPlayerInventory.java index 828dff167..c491620d2 100644 --- a/src/main/java/appeng/util/inv/AdaptorPlayerInventory.java +++ b/src/main/java/appeng/util/inv/AdaptorPlayerInventory.java @@ -126,9 +126,9 @@ public class AdaptorPlayerInventory implements IInventory } @Override - public String getName() + public String getCommandSenderName() { - return src.getName(); + return src.getCommandSenderName(); } @Override diff --git a/src/main/java/appeng/util/inv/WrapperBCPipe.java b/src/main/java/appeng/util/inv/WrapperBCPipe.java index 16bbb18d4..33d9fc0b7 100644 --- a/src/main/java/appeng/util/inv/WrapperBCPipe.java +++ b/src/main/java/appeng/util/inv/WrapperBCPipe.java @@ -138,7 +138,7 @@ public class WrapperBCPipe implements IInventory } @Override - public String getName() + public String getCommandSenderName() { return null; } diff --git a/src/main/java/appeng/util/inv/WrapperChainedInventory.java b/src/main/java/appeng/util/inv/WrapperChainedInventory.java index 60a682a66..f0ddcd017 100644 --- a/src/main/java/appeng/util/inv/WrapperChainedInventory.java +++ b/src/main/java/appeng/util/inv/WrapperChainedInventory.java @@ -24,13 +24,13 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import com.google.common.collect.ImmutableList; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.util.IChatComponent; -import com.google.common.collect.ImmutableList; - public class WrapperChainedInventory implements IInventory { @@ -168,7 +168,7 @@ public class WrapperChainedInventory implements IInventory } @Override - public String getName() + public String getCommandSenderName() { return "ChainedInv"; } diff --git a/src/main/java/appeng/util/inv/WrapperInvSlot.java b/src/main/java/appeng/util/inv/WrapperInvSlot.java index e64795902..10bc322c0 100644 --- a/src/main/java/appeng/util/inv/WrapperInvSlot.java +++ b/src/main/java/appeng/util/inv/WrapperInvSlot.java @@ -106,9 +106,9 @@ public class WrapperInvSlot } @Override - public String getName() + public String getCommandSenderName() { - return this.inv.getName(); + return this.inv.getCommandSenderName(); } @Override diff --git a/src/main/java/appeng/util/inv/WrapperInventoryRange.java b/src/main/java/appeng/util/inv/WrapperInventoryRange.java index 235e23283..51e865b1a 100644 --- a/src/main/java/appeng/util/inv/WrapperInventoryRange.java +++ b/src/main/java/appeng/util/inv/WrapperInventoryRange.java @@ -123,9 +123,9 @@ public class WrapperInventoryRange implements IInventory } @Override - public String getName() + public String getCommandSenderName() { - return this.src.getName(); + return this.src.getCommandSenderName(); } @Override diff --git a/src/main/java/appeng/worldgen/QuartzWorldGen.java b/src/main/java/appeng/worldgen/QuartzWorldGen.java index b57bfbabd..e0f946f30 100644 --- a/src/main/java/appeng/worldgen/QuartzWorldGen.java +++ b/src/main/java/appeng/worldgen/QuartzWorldGen.java @@ -62,7 +62,7 @@ public final class QuartzWorldGen implements IWorldGenerator { int x = ( chunkX << 4 ) + 8; int z = ( chunkZ << 4 ) + 8; - seaLevel = w.getHorizon( new BlockPos( x, 0, z) ).getY(); + seaLevel = (int) w.getHorizon(); } if( this.oreNormal == null || this.oreCharged == null ) diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/fluix.json b/src/main/resources/assets/appliedenergistics2/blockstates/fluix.json index b38a0e09a..3c4b5ef82 100644 --- a/src/main/resources/assets/appliedenergistics2/blockstates/fluix.json +++ b/src/main/resources/assets/appliedenergistics2/blockstates/fluix.json @@ -1,5 +1,5 @@ { "variants": { - "normal": { "model": "appliedenergistics2:fluix" } + "normal": { "model": "appliedenergistics2:fluix/block" } } } diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/stair.fluix.json b/src/main/resources/assets/appliedenergistics2/blockstates/stair.fluix.json index 7c9680d31..1d197e821 100644 --- a/src/main/resources/assets/appliedenergistics2/blockstates/stair.fluix.json +++ b/src/main/resources/assets/appliedenergistics2/blockstates/stair.fluix.json @@ -1,44 +1,44 @@ { "variants": { - "facing=east,half=bottom,shape=straight": { "model": "appliedenergistics2:stair.fluix" }, - "facing=west,half=bottom,shape=straight": { "model": "appliedenergistics2:stair.fluix", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "appliedenergistics2:stair.fluix", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "appliedenergistics2:stair.fluix", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "appliedenergistics2:stair.fluix.outer" }, - "facing=west,half=bottom,shape=outer_right": { "model": "appliedenergistics2:stair.fluix.outer", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "appliedenergistics2:stair.fluix.outer", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "appliedenergistics2:stair.fluix.outer", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "appliedenergistics2:stair.fluix.outer", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "appliedenergistics2:stair.fluix.outer", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "appliedenergistics2:stair.fluix.outer" }, - "facing=north,half=bottom,shape=outer_left": { "model": "appliedenergistics2:stair.fluix.outer", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "appliedenergistics2:stair.fluix.inner" }, - "facing=west,half=bottom,shape=inner_right": { "model": "appliedenergistics2:stair.fluix.inner", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "appliedenergistics2:stair.fluix.inner", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "appliedenergistics2:stair.fluix.inner", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "appliedenergistics2:stair.fluix.inner", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "appliedenergistics2:stair.fluix.inner", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "appliedenergistics2:stair.fluix.inner" }, - "facing=north,half=bottom,shape=inner_left": { "model": "appliedenergistics2:stair.fluix.inner", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "appliedenergistics2:stair.fluix", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "appliedenergistics2:stair.fluix", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "appliedenergistics2:stair.fluix", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "appliedenergistics2:stair.fluix", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "appliedenergistics2:stair.fluix.outer", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "appliedenergistics2:stair.fluix.outer", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "appliedenergistics2:stair.fluix.outer", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "appliedenergistics2:stair.fluix.outer", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "appliedenergistics2:stair.fluix.outer", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "appliedenergistics2:stair.fluix.outer", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "appliedenergistics2:stair.fluix.outer", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "appliedenergistics2:stair.fluix.outer", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "appliedenergistics2:stair.fluix.inner", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "appliedenergistics2:stair.fluix.inner", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "appliedenergistics2:stair.fluix.inner", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "appliedenergistics2:stair.fluix.inner", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "appliedenergistics2:stair.fluix.inner", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "appliedenergistics2:stair.fluix.inner", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "appliedenergistics2:stair.fluix.inner", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "appliedenergistics2:stair.fluix.inner", "x": 180, "uvlock": true } + "facing=east,half=bottom,shape=straight": { "model": "appliedenergistics2:stair/fluix/block" }, + "facing=west,half=bottom,shape=straight": { "model": "appliedenergistics2:stair/fluix/block", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "appliedenergistics2:stair/fluix/block", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "appliedenergistics2:stair/fluix/block", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "appliedenergistics2:stair/fluix/outer" }, + "facing=west,half=bottom,shape=outer_right": { "model": "appliedenergistics2:stair/fluix/outer", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "appliedenergistics2:stair/fluix/outer", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "appliedenergistics2:stair/fluix/outer", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "appliedenergistics2:stair/fluix/outer", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "appliedenergistics2:stair/fluix/outer", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "appliedenergistics2:stair/fluix/outer" }, + "facing=north,half=bottom,shape=outer_left": { "model": "appliedenergistics2:stair/fluix/outer", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "appliedenergistics2:stair/fluix/inner" }, + "facing=west,half=bottom,shape=inner_right": { "model": "appliedenergistics2:stair/fluix/inner", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "appliedenergistics2:stair/fluix/inner", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "appliedenergistics2:stair/fluix/inner", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "appliedenergistics2:stair/fluix/inner", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "appliedenergistics2:stair/fluix/inner", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "appliedenergistics2:stair/fluix/inner" }, + "facing=north,half=bottom,shape=inner_left": { "model": "appliedenergistics2:stair/fluix/inner", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "appliedenergistics2:stair/fluix/block", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "appliedenergistics2:stair/fluix/block", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "appliedenergistics2:stair/fluix/block", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "appliedenergistics2:stair/fluix/block", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "appliedenergistics2:stair/fluix/outer", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "appliedenergistics2:stair/fluix/outer", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "appliedenergistics2:stair/fluix/outer", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "appliedenergistics2:stair/fluix/outer", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "appliedenergistics2:stair/fluix/outer", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "appliedenergistics2:stair/fluix/outer", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "appliedenergistics2:stair/fluix/outer", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "appliedenergistics2:stair/fluix/outer", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "appliedenergistics2:stair/fluix/inner", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "appliedenergistics2:stair/fluix/inner", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "appliedenergistics2:stair/fluix/inner", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "appliedenergistics2:stair/fluix/inner", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "appliedenergistics2:stair/fluix/inner", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "appliedenergistics2:stair/fluix/inner", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "appliedenergistics2:stair/fluix/inner", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "appliedenergistics2:stair/fluix/inner", "x": 180, "uvlock": true } } } diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/stair.quartz.certus.chiseled.json b/src/main/resources/assets/appliedenergistics2/blockstates/stair.quartz.certus.chiseled.json index ffdfd4e31..71923c82e 100644 --- a/src/main/resources/assets/appliedenergistics2/blockstates/stair.quartz.certus.chiseled.json +++ b/src/main/resources/assets/appliedenergistics2/blockstates/stair.quartz.certus.chiseled.json @@ -1,44 +1,44 @@ { "variants": { - "facing=east,half=bottom,shape=straight": { "model": "stair.quartz.certus.chiseled" }, - "facing=west,half=bottom,shape=straight": { "model": "stair.quartz.certus.chiseled", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "stair.quartz.certus.chiseled", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "stair.quartz.certus.chiseled", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "stair.quartz.certus.chiseled.outer" }, - "facing=west,half=bottom,shape=outer_right": { "model": "stair.quartz.certus.chiseled.outer", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "stair.quartz.certus.chiseled.outer", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "stair.quartz.certus.chiseled.outer", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "stair.quartz.certus.chiseled.outer", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "stair.quartz.certus.chiseled.outer", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "stair.quartz.certus.chiseled.outer" }, - "facing=north,half=bottom,shape=outer_left": { "model": "stair.quartz.certus.chiseled.outer", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "stair.quartz.certus.chiseled.inner" }, - "facing=west,half=bottom,shape=inner_right": { "model": "stair.quartz.certus.chiseled.inner", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "stair.quartz.certus.chiseled.inner", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "stair.quartz.certus.chiseled.inner", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "stair.quartz.certus.chiseled.inner", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "stair.quartz.certus.chiseled.inner", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "stair.quartz.certus.chiseled.inner" }, - "facing=north,half=bottom,shape=inner_left": { "model": "stair.quartz.certus.chiseled.inner", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "stair.quartz.certus.chiseled", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "stair.quartz.certus.chiseled", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "stair.quartz.certus.chiseled", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "stair.quartz.certus.chiseled", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "stair.quartz.certus.chiseled.outer", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "stair.quartz.certus.chiseled.outer", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "stair.quartz.certus.chiseled.outer", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "stair.quartz.certus.chiseled.outer", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "stair.quartz.certus.chiseled.outer", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "stair.quartz.certus.chiseled.outer", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "stair.quartz.certus.chiseled.outer", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "stair.quartz.certus.chiseled.outer", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "stair.quartz.certus.chiseled.inner", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "stair.quartz.certus.chiseled.inner", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "stair.quartz.certus.chiseled.inner", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "stair.quartz.certus.chiseled.inner", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "stair.quartz.certus.chiseled.inner", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "stair.quartz.certus.chiseled.inner", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "stair.quartz.certus.chiseled.inner", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "stair.quartz.certus.chiseled.inner", "x": 180, "uvlock": true } + "facing=east,half=bottom,shape=straight": { "model": "appliedenergistics2:stair/quartz/certus/chiseled/block" }, + "facing=west,half=bottom,shape=straight": { "model": "appliedenergistics2:stair/quartz/certus/chiseled/block", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "appliedenergistics2:stair/quartz/certus/chiseled/block", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "appliedenergistics2:stair/quartz/certus/chiseled/block", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "appliedenergistics2:stair/quartz/certus/chiseled/outer" }, + "facing=west,half=bottom,shape=outer_right": { "model": "appliedenergistics2:stair/quartz/certus/chiseled/outer", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "appliedenergistics2:stair/quartz/certus/chiseled/outer", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "appliedenergistics2:stair/quartz/certus/chiseled/outer", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "appliedenergistics2:stair/quartz/certus/chiseled/outer", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "appliedenergistics2:stair/quartz/certus/chiseled/outer", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "appliedenergistics2:stair/quartz/certus/chiseled/outer" }, + "facing=north,half=bottom,shape=outer_left": { "model": "appliedenergistics2:stair/quartz/certus/chiseled/outer", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "appliedenergistics2:stair/quartz/certus/chiseled/inner" }, + "facing=west,half=bottom,shape=inner_right": { "model": "appliedenergistics2:stair/quartz/certus/chiseled/inner", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "appliedenergistics2:stair/quartz/certus/chiseled/inner", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "appliedenergistics2:stair/quartz/certus/chiseled/inner", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "appliedenergistics2:stair/quartz/certus/chiseled/inner", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "appliedenergistics2:stair/quartz/certus/chiseled/inner", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "appliedenergistics2:stair/quartz/certus/chiseled/inner" }, + "facing=north,half=bottom,shape=inner_left": { "model": "appliedenergistics2:stair/quartz/certus/chiseled/inner", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "appliedenergistics2:stair/quartz/certus/chiseled/block", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "appliedenergistics2:stair/quartz/certus/chiseled/block", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "appliedenergistics2:stair/quartz/certus/chiseled/block", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "appliedenergistics2:stair/quartz/certus/chiseled/block", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "appliedenergistics2:stair/quartz/certus/chiseled/outer", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "appliedenergistics2:stair/quartz/certus/chiseled/outer", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "appliedenergistics2:stair/quartz/certus/chiseled/outer", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "appliedenergistics2:stair/quartz/certus/chiseled/outer", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "appliedenergistics2:stair/quartz/certus/chiseled/outer", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "appliedenergistics2:stair/quartz/certus/chiseled/outer", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "appliedenergistics2:stair/quartz/certus/chiseled/outer", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "appliedenergistics2:stair/quartz/certus/chiseled/outer", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "appliedenergistics2:stair/quartz/certus/chiseled/inner", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "appliedenergistics2:stair/quartz/certus/chiseled/inner", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "appliedenergistics2:stair/quartz/certus/chiseled/inner", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "appliedenergistics2:stair/quartz/certus/chiseled/inner", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "appliedenergistics2:stair/quartz/certus/chiseled/inner", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "appliedenergistics2:stair/quartz/certus/chiseled/inner", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "appliedenergistics2:stair/quartz/certus/chiseled/inner", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "appliedenergistics2:stair/quartz/certus/chiseled/inner", "x": 180, "uvlock": true } } } diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/stair.quartz.certus.json b/src/main/resources/assets/appliedenergistics2/blockstates/stair.quartz.certus.json index f3eea3ea2..f64f456d7 100644 --- a/src/main/resources/assets/appliedenergistics2/blockstates/stair.quartz.certus.json +++ b/src/main/resources/assets/appliedenergistics2/blockstates/stair.quartz.certus.json @@ -1,44 +1,44 @@ { "variants": { - "facing=east,half=bottom,shape=straight": { "model": "stair.quartz.certus" }, - "facing=west,half=bottom,shape=straight": { "model": "stair.quartz.certus", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "stair.quartz.certus", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "stair.quartz.certus", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "stair.quartz.certus.outer" }, - "facing=west,half=bottom,shape=outer_right": { "model": "stair.quartz.certus.outer", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "stair.quartz.certus.outer", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "stair.quartz.certus.outer", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "stair.quartz.certus.outer", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "stair.quartz.certus.outer", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "stair.quartz.certus.outer" }, - "facing=north,half=bottom,shape=outer_left": { "model": "stair.quartz.certus.outer", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "stair.quartz.certus.inner" }, - "facing=west,half=bottom,shape=inner_right": { "model": "stair.quartz.certus.inner", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "stair.quartz.certus.inner", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "stair.quartz.certus.inner", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "stair.quartz.certus.inner", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "stair.quartz.certus.inner", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "stair.quartz.certus.inner" }, - "facing=north,half=bottom,shape=inner_left": { "model": "stair.quartz.certus.inner", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "stair.quartz.certus", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "stair.quartz.certus", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "stair.quartz.certus", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "stair.quartz.certus", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "stair.quartz.certus.outer", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "stair.quartz.certus.outer", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "stair.quartz.certus.outer", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "stair.quartz.certus.outer", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "stair.quartz.certus.outer", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "stair.quartz.certus.outer", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "stair.quartz.certus.outer", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "stair.quartz.certus.outer", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "stair.quartz.certus.inner", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "stair.quartz.certus.inner", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "stair.quartz.certus.inner", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "stair.quartz.certus.inner", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "stair.quartz.certus.inner", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "stair.quartz.certus.inner", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "stair.quartz.certus.inner", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "stair.quartz.certus.inner", "x": 180, "uvlock": true } + "facing=east,half=bottom,shape=straight": { "model": "appliedenergistics2:stair/quartz/certus/block" }, + "facing=west,half=bottom,shape=straight": { "model": "appliedenergistics2:stair/quartz/certus/block", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "appliedenergistics2:stair/quartz/certus/block", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "appliedenergistics2:stair/quartz/certus/block", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "appliedenergistics2:stair/quartz/certus/outer" }, + "facing=west,half=bottom,shape=outer_right": { "model": "appliedenergistics2:stair/quartz/certus/outer", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "appliedenergistics2:stair/quartz/certus/outer", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "appliedenergistics2:stair/quartz/certus/outer", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "appliedenergistics2:stair/quartz/certus/outer", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "appliedenergistics2:stair/quartz/certus/outer", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "appliedenergistics2:stair/quartz/certus/outer" }, + "facing=north,half=bottom,shape=outer_left": { "model": "appliedenergistics2:stair/quartz/certus/outer", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "appliedenergistics2:stair/quartz/certus/inner" }, + "facing=west,half=bottom,shape=inner_right": { "model": "appliedenergistics2:stair/quartz/certus/inner", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "appliedenergistics2:stair/quartz/certus/inner", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "appliedenergistics2:stair/quartz/certus/inner", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "appliedenergistics2:stair/quartz/certus/inner", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "appliedenergistics2:stair/quartz/certus/inner", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "appliedenergistics2:stair/quartz/certus/inner" }, + "facing=north,half=bottom,shape=inner_left": { "model": "appliedenergistics2:stair/quartz/certus/inner", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "appliedenergistics2:stair/quartz/certus/block", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "appliedenergistics2:stair/quartz/certus/block", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "appliedenergistics2:stair/quartz/certus/block", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "appliedenergistics2:stair/quartz/certus/block", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "appliedenergistics2:stair/quartz/certus/outer", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "appliedenergistics2:stair/quartz/certus/outer", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "appliedenergistics2:stair/quartz/certus/outer", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "appliedenergistics2:stair/quartz/certus/outer", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "appliedenergistics2:stair/quartz/certus/outer", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "appliedenergistics2:stair/quartz/certus/outer", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "appliedenergistics2:stair/quartz/certus/outer", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "appliedenergistics2:stair/quartz/certus/outer", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "appliedenergistics2:stair/quartz/certus/inner", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "appliedenergistics2:stair/quartz/certus/inner", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "appliedenergistics2:stair/quartz/certus/inner", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "appliedenergistics2:stair/quartz/certus/inner", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "appliedenergistics2:stair/quartz/certus/inner", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "appliedenergistics2:stair/quartz/certus/inner", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "appliedenergistics2:stair/quartz/certus/inner", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "appliedenergistics2:stair/quartz/certus/inner", "x": 180, "uvlock": true } } } diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/stair.quartz.certus.pillar.json b/src/main/resources/assets/appliedenergistics2/blockstates/stair.quartz.certus.pillar.json index 6b31f6be2..ff55e5c6e 100644 --- a/src/main/resources/assets/appliedenergistics2/blockstates/stair.quartz.certus.pillar.json +++ b/src/main/resources/assets/appliedenergistics2/blockstates/stair.quartz.certus.pillar.json @@ -1,44 +1,44 @@ { "variants": { - "facing=east,half=bottom,shape=straight": { "model": "stair.quartz.certus.pillar" }, - "facing=west,half=bottom,shape=straight": { "model": "stair.quartz.certus.pillar", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "stair.quartz.certus.pillar", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "stair.quartz.certus.pillar", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "stair.quartz.certus.pillar.outer" }, - "facing=west,half=bottom,shape=outer_right": { "model": "stair.quartz.certus.pillar.outer", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "stair.quartz.certus.pillar.outer", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "stair.quartz.certus.pillar.outer", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "stair.quartz.certus.pillar.outer", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "stair.quartz.certus.pillar.outer", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "stair.quartz.certus.pillar.outer" }, - "facing=north,half=bottom,shape=outer_left": { "model": "stair.quartz.certus.pillar.outer", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "stair.quartz.certus.pillar.inner" }, - "facing=west,half=bottom,shape=inner_right": { "model": "stair.quartz.certus.pillar.inner", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "stair.quartz.certus.pillar.inner", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "stair.quartz.certus.pillar.inner", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "stair.quartz.certus.pillar.inner", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "stair.quartz.certus.pillar.inner", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "stair.quartz.certus.pillar.inner" }, - "facing=north,half=bottom,shape=inner_left": { "model": "stair.quartz.certus.pillar.inner", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "stair.quartz.certus.pillar", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "stair.quartz.certus.pillar", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "stair.quartz.certus.pillar", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "stair.quartz.certus.pillar", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "stair.quartz.certus.pillar.outer", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "stair.quartz.certus.pillar.outer", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "stair.quartz.certus.pillar.outer", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "stair.quartz.certus.pillar.outer", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "stair.quartz.certus.pillar.outer", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "stair.quartz.certus.pillar.outer", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "stair.quartz.certus.pillar.outer", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "stair.quartz.certus.pillar.outer", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "stair.quartz.certus.pillar.inner", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "stair.quartz.certus.pillar.inner", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "stair.quartz.certus.pillar.inner", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "stair.quartz.certus.pillar.inner", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "stair.quartz.certus.pillar.inner", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "stair.quartz.certus.pillar.inner", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "stair.quartz.certus.pillar.inner", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "stair.quartz.certus.pillar.inner", "x": 180, "uvlock": true } + "facing=east,half=bottom,shape=straight": { "model": "appliedenergistics2:stair/quartz/certus/pillar/block" }, + "facing=west,half=bottom,shape=straight": { "model": "appliedenergistics2:stair/quartz/certus/pillar/block", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "appliedenergistics2:stair/quartz/certus/pillar/block", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "appliedenergistics2:stair/quartz/certus/pillar/block", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "appliedenergistics2:stair/quartz/certus/pillar/outer" }, + "facing=west,half=bottom,shape=outer_right": { "model": "appliedenergistics2:stair/quartz/certus/pillar/outer", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "appliedenergistics2:stair/quartz/certus/pillar/outer", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "appliedenergistics2:stair/quartz/certus/pillar/outer", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "appliedenergistics2:stair/quartz/certus/pillar/outer", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "appliedenergistics2:stair/quartz/certus/pillar/outer", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "appliedenergistics2:stair/quartz/certus/pillar/outer" }, + "facing=north,half=bottom,shape=outer_left": { "model": "appliedenergistics2:stair/quartz/certus/pillar/outer", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "appliedenergistics2:stair/quartz/certus/pillar/inner" }, + "facing=west,half=bottom,shape=inner_right": { "model": "appliedenergistics2:stair/quartz/certus/pillar/inner", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "appliedenergistics2:stair/quartz/certus/pillar/inner", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "appliedenergistics2:stair/quartz/certus/pillar/inner", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "appliedenergistics2:stair/quartz/certus/pillar/inner", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "appliedenergistics2:stair/quartz/certus/pillar/inner", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "appliedenergistics2:stair/quartz/certus/pillar/inner" }, + "facing=north,half=bottom,shape=inner_left": { "model": "appliedenergistics2:stair/quartz/certus/pillar/inner", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "appliedenergistics2:stair/quartz/certus/pillar/block", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "appliedenergistics2:stair/quartz/certus/pillar/block", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "appliedenergistics2:stair/quartz/certus/pillar/block", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "appliedenergistics2:stair/quartz/certus/pillar/block", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "appliedenergistics2:stair/quartz/certus/pillar/outer", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "appliedenergistics2:stair/quartz/certus/pillar/outer", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "appliedenergistics2:stair/quartz/certus/pillar/outer", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "appliedenergistics2:stair/quartz/certus/pillar/outer", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "appliedenergistics2:stair/quartz/certus/pillar/outer", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "appliedenergistics2:stair/quartz/certus/pillar/outer", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "appliedenergistics2:stair/quartz/certus/pillar/outer", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "appliedenergistics2:stair/quartz/certus/pillar/outer", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "appliedenergistics2:stair/quartz/certus/pillar/inner", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "appliedenergistics2:stair/quartz/certus/pillar/inner", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "appliedenergistics2:stair/quartz/certus/pillar/inner", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "appliedenergistics2:stair/quartz/certus/pillar/inner", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "appliedenergistics2:stair/quartz/certus/pillar/inner", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "appliedenergistics2:stair/quartz/certus/pillar/inner", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "appliedenergistics2:stair/quartz/certus/pillar/inner", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "appliedenergistics2:stair/quartz/certus/pillar/inner", "x": 180, "uvlock": true } } } diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/stair.skystone.block.json b/src/main/resources/assets/appliedenergistics2/blockstates/stair.skystone.block.json index 18e8c4194..c995b4f39 100644 --- a/src/main/resources/assets/appliedenergistics2/blockstates/stair.skystone.block.json +++ b/src/main/resources/assets/appliedenergistics2/blockstates/stair.skystone.block.json @@ -1,44 +1,44 @@ { "variants": { - "facing=east,half=bottom,shape=straight": { "model": "stair.skystone.block" }, - "facing=west,half=bottom,shape=straight": { "model": "stair.skystone.block", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "stair.skystone.block", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "stair.skystone.block", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "stair.skystone.block.outer" }, - "facing=west,half=bottom,shape=outer_right": { "model": "stair.skystone.block.outer", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "stair.skystone.block.outer", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "stair.skystone.block.outer", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "stair.skystone.block.outer", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "stair.skystone.block.outer", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "stair.skystone.block.outer" }, - "facing=north,half=bottom,shape=outer_left": { "model": "stair.skystone.block.outer", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "stair.skystone.block.inner" }, - "facing=west,half=bottom,shape=inner_right": { "model": "stair.skystone.block.inner", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "stair.skystone.block.inner", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "stair.skystone.block.inner", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "stair.skystone.block.inner", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "stair.skystone.block.inner", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "stair.skystone.block.inner" }, - "facing=north,half=bottom,shape=inner_left": { "model": "stair.skystone.block.inner", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "stair.skystone.block", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "stair.skystone.block", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "stair.skystone.block", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "stair.skystone.block", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "stair.skystone.block.outer", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "stair.skystone.block.outer", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "stair.skystone.block.outer", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "stair.skystone.block.outer", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "stair.skystone.block.outer", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "stair.skystone.block.outer", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "stair.skystone.block.outer", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "stair.skystone.block.outer", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "stair.skystone.block.inner", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "stair.skystone.block.inner", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "stair.skystone.block.inner", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "stair.skystone.block.inner", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "stair.skystone.block.inner", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "stair.skystone.block.inner", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "stair.skystone.block.inner", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "stair.skystone.block.inner", "x": 180, "uvlock": true } + "facing=east,half=bottom,shape=straight": { "model": "appliedenergistics2:stair/skystone/block/block" }, + "facing=west,half=bottom,shape=straight": { "model": "appliedenergistics2:stair/skystone/block/block", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "appliedenergistics2:stair/skystone/block/block", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "appliedenergistics2:stair/skystone/block/block", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "appliedenergistics2:stair/skystone/block/outer" }, + "facing=west,half=bottom,shape=outer_right": { "model": "appliedenergistics2:stair/skystone/block/outer", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "appliedenergistics2:stair/skystone/block/outer", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "appliedenergistics2:stair/skystone/block/outer", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "appliedenergistics2:stair/skystone/block/outer", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "appliedenergistics2:stair/skystone/block/outer", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "appliedenergistics2:stair/skystone/block/outer" }, + "facing=north,half=bottom,shape=outer_left": { "model": "appliedenergistics2:stair/skystone/block/outer", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "appliedenergistics2:stair/skystone/block/inner" }, + "facing=west,half=bottom,shape=inner_right": { "model": "appliedenergistics2:stair/skystone/block/inner", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "appliedenergistics2:stair/skystone/block/inner", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "appliedenergistics2:stair/skystone/block/inner", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "appliedenergistics2:stair/skystone/block/inner", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "appliedenergistics2:stair/skystone/block/inner", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "appliedenergistics2:stair/skystone/block/inner" }, + "facing=north,half=bottom,shape=inner_left": { "model": "appliedenergistics2:stair/skystone/block/inner", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "appliedenergistics2:stair/skystone/block/block", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "appliedenergistics2:stair/skystone/block/block", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "appliedenergistics2:stair/skystone/block/block", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "appliedenergistics2:stair/skystone/block/block", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "appliedenergistics2:stair/skystone/block/outer", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "appliedenergistics2:stair/skystone/block/outer", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "appliedenergistics2:stair/skystone/block/outer", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "appliedenergistics2:stair/skystone/block/outer", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "appliedenergistics2:stair/skystone/block/outer", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "appliedenergistics2:stair/skystone/block/outer", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "appliedenergistics2:stair/skystone/block/outer", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "appliedenergistics2:stair/skystone/block/outer", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "appliedenergistics2:stair/skystone/block/inner", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "appliedenergistics2:stair/skystone/block/inner", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "appliedenergistics2:stair/skystone/block/inner", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "appliedenergistics2:stair/skystone/block/inner", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "appliedenergistics2:stair/skystone/block/inner", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "appliedenergistics2:stair/skystone/block/inner", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "appliedenergistics2:stair/skystone/block/inner", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "appliedenergistics2:stair/skystone/block/inner", "x": 180, "uvlock": true } } } diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/stair.skystone.brick.json b/src/main/resources/assets/appliedenergistics2/blockstates/stair.skystone.brick.json index 4d10e2474..b997fd8e8 100644 --- a/src/main/resources/assets/appliedenergistics2/blockstates/stair.skystone.brick.json +++ b/src/main/resources/assets/appliedenergistics2/blockstates/stair.skystone.brick.json @@ -1,44 +1,44 @@ { "variants": { - "facing=east,half=bottom,shape=straight": { "model": "stair.skystone.brick" }, - "facing=west,half=bottom,shape=straight": { "model": "stair.skystone.brick", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "stair.skystone.brick", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "stair.skystone.brick", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "stair.skystone.brick.outer" }, - "facing=west,half=bottom,shape=outer_right": { "model": "stair.skystone.brick.outer", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "stair.skystone.brick.outer", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "stair.skystone.brick.outer", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "stair.skystone.brick.outer", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "stair.skystone.brick.outer", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "stair.skystone.brick.outer" }, - "facing=north,half=bottom,shape=outer_left": { "model": "stair.skystone.brick.outer", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "stair.skystone.brick.inner" }, - "facing=west,half=bottom,shape=inner_right": { "model": "stair.skystone.brick.inner", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "stair.skystone.brick.inner", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "stair.skystone.brick.inner", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "stair.skystone.brick.inner", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "stair.skystone.brick.inner", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "stair.skystone.brick.inner" }, - "facing=north,half=bottom,shape=inner_left": { "model": "stair.skystone.brick.inner", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "stair.skystone.brick", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "stair.skystone.brick", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "stair.skystone.brick", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "stair.skystone.brick", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "stair.skystone.brick.outer", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "stair.skystone.brick.outer", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "stair.skystone.brick.outer", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "stair.skystone.brick.outer", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "stair.skystone.brick.outer", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "stair.skystone.brick.outer", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "stair.skystone.brick.outer", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "stair.skystone.brick.outer", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "stair.skystone.brick.inner", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "stair.skystone.brick.inner", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "stair.skystone.brick.inner", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "stair.skystone.brick.inner", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "stair.skystone.brick.inner", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "stair.skystone.brick.inner", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "stair.skystone.brick.inner", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "stair.skystone.brick.inner", "x": 180, "uvlock": true } + "facing=east,half=bottom,shape=straight": { "model": "appliedenergistics2:stair/skystone/brick/block" }, + "facing=west,half=bottom,shape=straight": { "model": "appliedenergistics2:stair/skystone/brick/block", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "appliedenergistics2:stair/skystone/brick/block", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "appliedenergistics2:stair/skystone/brick/block", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "appliedenergistics2:stair/skystone/brick/outer" }, + "facing=west,half=bottom,shape=outer_right": { "model": "appliedenergistics2:stair/skystone/brick/outer", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "appliedenergistics2:stair/skystone/brick/outer", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "appliedenergistics2:stair/skystone/brick/outer", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "appliedenergistics2:stair/skystone/brick/outer", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "appliedenergistics2:stair/skystone/brick/outer", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "appliedenergistics2:stair/skystone/brick/outer" }, + "facing=north,half=bottom,shape=outer_left": { "model": "appliedenergistics2:stair/skystone/brick/outer", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "appliedenergistics2:stair/skystone/brick/inner" }, + "facing=west,half=bottom,shape=inner_right": { "model": "appliedenergistics2:stair/skystone/brick/inner", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "appliedenergistics2:stair/skystone/brick/inner", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "appliedenergistics2:stair/skystone/brick/inner", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "appliedenergistics2:stair/skystone/brick/inner", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "appliedenergistics2:stair/skystone/brick/inner", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "appliedenergistics2:stair/skystone/brick/inner" }, + "facing=north,half=bottom,shape=inner_left": { "model": "appliedenergistics2:stair/skystone/brick/inner", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "appliedenergistics2:stair/skystone/brick/block", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "appliedenergistics2:stair/skystone/brick/block", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "appliedenergistics2:stair/skystone/brick/block", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "appliedenergistics2:stair/skystone/brick/block", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "appliedenergistics2:stair/skystone/brick/outer", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "appliedenergistics2:stair/skystone/brick/outer", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "appliedenergistics2:stair/skystone/brick/outer", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "appliedenergistics2:stair/skystone/brick/outer", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "appliedenergistics2:stair/skystone/brick/outer", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "appliedenergistics2:stair/skystone/brick/outer", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "appliedenergistics2:stair/skystone/brick/outer", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "appliedenergistics2:stair/skystone/brick/outer", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "appliedenergistics2:stair/skystone/brick/inner", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "appliedenergistics2:stair/skystone/brick/inner", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "appliedenergistics2:stair/skystone/brick/inner", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "appliedenergistics2:stair/skystone/brick/inner", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "appliedenergistics2:stair/skystone/brick/inner", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "appliedenergistics2:stair/skystone/brick/inner", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "appliedenergistics2:stair/skystone/brick/inner", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "appliedenergistics2:stair/skystone/brick/inner", "x": 180, "uvlock": true } } } diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/stair.skystone.brick.small.json b/src/main/resources/assets/appliedenergistics2/blockstates/stair.skystone.brick.small.json index 063d6b704..bfd4b8e91 100644 --- a/src/main/resources/assets/appliedenergistics2/blockstates/stair.skystone.brick.small.json +++ b/src/main/resources/assets/appliedenergistics2/blockstates/stair.skystone.brick.small.json @@ -1,44 +1,44 @@ { "variants": { - "facing=east,half=bottom,shape=straight": { "model": "stair.skystone.brick.small" }, - "facing=west,half=bottom,shape=straight": { "model": "stair.skystone.brick.small", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "stair.skystone.brick.small", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "stair.skystone.brick.small", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "stair.skystone.brick.small.outer" }, - "facing=west,half=bottom,shape=outer_right": { "model": "stair.skystone.brick.small.outer", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "stair.skystone.brick.small.outer", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "stair.skystone.brick.small.outer", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "stair.skystone.brick.small.outer", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "stair.skystone.brick.small.outer", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "stair.skystone.brick.small.outer" }, - "facing=north,half=bottom,shape=outer_left": { "model": "stair.skystone.brick.small.outer", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "stair.skystone.brick.small.inner" }, - "facing=west,half=bottom,shape=inner_right": { "model": "stair.skystone.brick.small.inner", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "stair.skystone.brick.small.inner", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "stair.skystone.brick.small.inner", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "stair.skystone.brick.small.inner", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "stair.skystone.brick.small.inner", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "stair.skystone.brick.small.inner" }, - "facing=north,half=bottom,shape=inner_left": { "model": "stair.skystone.brick.small.inner", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "stair.skystone.brick.small", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "stair.skystone.brick.small", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "stair.skystone.brick.small", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "stair.skystone.brick.small", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "stair.skystone.brick.small.outer", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "stair.skystone.brick.small.outer", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "stair.skystone.brick.small.outer", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "stair.skystone.brick.small.outer", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "stair.skystone.brick.small.outer", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "stair.skystone.brick.small.outer", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "stair.skystone.brick.small.outer", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "stair.skystone.brick.small.outer", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "stair.skystone.brick.small.inner", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "stair.skystone.brick.small.inner", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "stair.skystone.brick.small.inner", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "stair.skystone.brick.small.inner", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "stair.skystone.brick.small.inner", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "stair.skystone.brick.small.inner", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "stair.skystone.brick.small.inner", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "stair.skystone.brick.small.inner", "x": 180, "uvlock": true } + "facing=east,half=bottom,shape=straight": { "model": "appliedenergistics2:stair/skystone/brick/small/block" }, + "facing=west,half=bottom,shape=straight": { "model": "appliedenergistics2:stair/skystone/brick/small/block", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "appliedenergistics2:stair/skystone/brick/small/block", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "appliedenergistics2:stair/skystone/brick/small/block", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "appliedenergistics2:stair/skystone/brick/small/outer" }, + "facing=west,half=bottom,shape=outer_right": { "model": "appliedenergistics2:stair/skystone/brick/small/outer", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "appliedenergistics2:stair/skystone/brick/small/outer", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "appliedenergistics2:stair/skystone/brick/small/outer", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "appliedenergistics2:stair/skystone/brick/small/outer", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "appliedenergistics2:stair/skystone/brick/small/outer", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "appliedenergistics2:stair/skystone/brick/small/outer" }, + "facing=north,half=bottom,shape=outer_left": { "model": "appliedenergistics2:stair/skystone/brick/small/outer", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "appliedenergistics2:stair/skystone/brick/small/inner" }, + "facing=west,half=bottom,shape=inner_right": { "model": "appliedenergistics2:stair/skystone/brick/small/inner", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "appliedenergistics2:stair/skystone/brick/small/inner", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "appliedenergistics2:stair/skystone/brick/small/inner", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "appliedenergistics2:stair/skystone/brick/small/inner", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "appliedenergistics2:stair/skystone/brick/small/inner", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "appliedenergistics2:stair/skystone/brick/small/inner" }, + "facing=north,half=bottom,shape=inner_left": { "model": "appliedenergistics2:stair/skystone/brick/small/inner", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "appliedenergistics2:stair/skystone/brick/small/block", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "appliedenergistics2:stair/skystone/brick/small/block", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "appliedenergistics2:stair/skystone/brick/small/block", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "appliedenergistics2:stair/skystone/brick/small/block", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "appliedenergistics2:stair/skystone/brick/small/outer", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "appliedenergistics2:stair/skystone/brick/small/outer", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "appliedenergistics2:stair/skystone/brick/small/outer", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "appliedenergistics2:stair/skystone/brick/small/outer", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "appliedenergistics2:stair/skystone/brick/small/outer", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "appliedenergistics2:stair/skystone/brick/small/outer", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "appliedenergistics2:stair/skystone/brick/small/outer", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "appliedenergistics2:stair/skystone/brick/small/outer", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "appliedenergistics2:stair/skystone/brick/small/inner", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "appliedenergistics2:stair/skystone/brick/small/inner", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "appliedenergistics2:stair/skystone/brick/small/inner", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "appliedenergistics2:stair/skystone/brick/small/inner", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "appliedenergistics2:stair/skystone/brick/small/inner", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "appliedenergistics2:stair/skystone/brick/small/inner", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "appliedenergistics2:stair/skystone/brick/small/inner", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "appliedenergistics2:stair/skystone/brick/small/inner", "x": 180, "uvlock": true } } } diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/stair.skystone.json b/src/main/resources/assets/appliedenergistics2/blockstates/stair.skystone.json deleted file mode 100644 index 4b4d39899..000000000 --- a/src/main/resources/assets/appliedenergistics2/blockstates/stair.skystone.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "stair.skystone" }, - "facing=west,half=bottom,shape=straight": { "model": "stair.skystone", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "stair.skystone", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "stair.skystone", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "stair.skystone.outer" }, - "facing=west,half=bottom,shape=outer_right": { "model": "stair.skystone.outer", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "stair.skystone.outer", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "stair.skystone.outer", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "stair.skystone.outer", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "stair.skystone.outer", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "stair.skystone.outer" }, - "facing=north,half=bottom,shape=outer_left": { "model": "stair.skystone.outer", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "stair.skystone.inner" }, - "facing=west,half=bottom,shape=inner_right": { "model": "stair.skystone.inner", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "stair.skystone.inner", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "stair.skystone.inner", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "stair.skystone.inner", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "stair.skystone.inner", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "stair.skystone.inner" }, - "facing=north,half=bottom,shape=inner_left": { "model": "stair.skystone.inner", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "stair.skystone", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "stair.skystone", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "stair.skystone", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "stair.skystone", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "stair.skystone.outer", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "stair.skystone.outer", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "stair.skystone.outer", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "stair.skystone.outer", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "stair.skystone.outer", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "stair.skystone.outer", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "stair.skystone.outer", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "stair.skystone.outer", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "stair.skystone.inner", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "stair.skystone.inner", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "stair.skystone.inner", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "stair.skystone.inner", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "stair.skystone.inner", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "stair.skystone.inner", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "stair.skystone.inner", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "stair.skystone.inner", "x": 180, "uvlock": true } - } -} diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/stair.skystone.stone.json b/src/main/resources/assets/appliedenergistics2/blockstates/stair.skystone.stone.json new file mode 100644 index 000000000..83361be8a --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/blockstates/stair.skystone.stone.json @@ -0,0 +1,44 @@ +{ + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "appliedenergistics2:stair/skystone/stone/block" }, + "facing=west,half=bottom,shape=straight": { "model": "appliedenergistics2:stair/skystone/stone/block", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "appliedenergistics2:stair/skystone/stone/block", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "appliedenergistics2:stair/skystone/stone/block", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "appliedenergistics2:stair/skystone/stone/outer" }, + "facing=west,half=bottom,shape=outer_right": { "model": "appliedenergistics2:stair/skystone/stone/outer", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "appliedenergistics2:stair/skystone/stone/outer", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "appliedenergistics2:stair/skystone/stone/outer", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "appliedenergistics2:stair/skystone/stone/outer", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "appliedenergistics2:stair/skystone/stone/outer", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "appliedenergistics2:stair/skystone/stone/outer" }, + "facing=north,half=bottom,shape=outer_left": { "model": "appliedenergistics2:stair/skystone/stone/outer", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "appliedenergistics2:stair/skystone/stone/inner" }, + "facing=west,half=bottom,shape=inner_right": { "model": "appliedenergistics2:stair/skystone/stone/inner", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "appliedenergistics2:stair/skystone/stone/inner", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "appliedenergistics2:stair/skystone/stone/inner", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "appliedenergistics2:stair/skystone/stone/inner", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "appliedenergistics2:stair/skystone/stone/inner", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "appliedenergistics2:stair/skystone/stone/inner" }, + "facing=north,half=bottom,shape=inner_left": { "model": "appliedenergistics2:stair/skystone/stone/inner", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "appliedenergistics2:stair/skystone/stone/block", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "appliedenergistics2:stair/skystone/stone/block", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "appliedenergistics2:stair/skystone/stone/block", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "appliedenergistics2:stair/skystone/stone/block", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "appliedenergistics2:stair/skystone/stone/outer", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "appliedenergistics2:stair/skystone/stone/outer", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "appliedenergistics2:stair/skystone/stone/outer", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "appliedenergistics2:stair/skystone/stone/outer", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "appliedenergistics2:stair/skystone/stone/outer", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "appliedenergistics2:stair/skystone/stone/outer", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "appliedenergistics2:stair/skystone/stone/outer", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "appliedenergistics2:stair/skystone/stone/outer", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "appliedenergistics2:stair/skystone/stone/inner", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "appliedenergistics2:stair/skystone/stone/inner", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "appliedenergistics2:stair/skystone/stone/inner", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "appliedenergistics2:stair/skystone/stone/inner", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "appliedenergistics2:stair/skystone/stone/inner", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "appliedenergistics2:stair/skystone/stone/inner", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "appliedenergistics2:stair/skystone/stone/inner", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "appliedenergistics2:stair/skystone/stone/inner", "x": 180, "uvlock": true } + } +} diff --git a/src/main/resources/assets/appliedenergistics2/lang/en_US.lang b/src/main/resources/assets/appliedenergistics2/lang/en_US.lang index 5448f4c6c..cc8247e07 100644 --- a/src/main/resources/assets/appliedenergistics2/lang/en_US.lang +++ b/src/main/resources/assets/appliedenergistics2/lang/en_US.lang @@ -18,7 +18,7 @@ tile.appliedenergistics2.BlockInscriber.name=Inscriber tile.appliedenergistics2.BlockInterface.name=ME Interface tile.appliedenergistics2.BlockQuantumLinkChamber.name=ME Quantum Link Chamber tile.appliedenergistics2.BlockQuantumRing.name=ME Quantum Ring -tile.appliedenergistics2.BlockFluix.name=Fluix Block +tile.appliedenergistics2.fluix.name=Fluix Block tile.appliedenergistics2.BlockQuartz.name=Certus Quartz Block tile.appliedenergistics2.BlockQuartzChiseled.name=Chiseled Certus Quartz Block tile.appliedenergistics2.BlockQuartzGlass.name=Quartz Glass @@ -56,10 +56,10 @@ tile.appliedenergistics2.stair.fluix.name=Fluix Stairs tile.appliedenergistics2.stair.quartz.certus.name=Certus Quartz Stairs tile.appliedenergistics2.stair.quartz.certus.chiseled.name=Chiseled Certus Quartz Stairs tile.appliedenergistics2.stair.quartz.certus.pillar.name=Certus Quartz Pillar Stairs -tile.appliedenergistics2.SkyStoneBlockStairBlock.name=Sky Stone Block Stairs -tile.appliedenergistics2.SkyStoneBrickStairBlock.name=Sky Stone Brick Stairs -tile.appliedenergistics2.SkyStoneSmallBrickStairBlock.name=Sky Stone Small Brick Stairs -tile.appliedenergistics2.SkyStoneStairBlock.name=Sky Stone Stairs +tile.appliedenergistics2.stair.skystone.block.name=Sky Stone Block Stairs +tile.appliedenergistics2.stair.skystone.brick.name=Sky Stone Brick Stairs +tile.appliedenergistics2.stair.skystone.brick.small.name=Sky Stone Small Brick Stairs +tile.appliedenergistics2.stair.skystone.stone.name=Sky Stone Stairs // Slabs tile.appliedenergistics2.ChiseledQuartzSlabBlock.name=Chiseled Certus Quartz Slabs diff --git a/src/main/resources/assets/appliedenergistics2/models/block/fluix.json b/src/main/resources/assets/appliedenergistics2/models/block/fluix/block.json similarity index 100% rename from src/main/resources/assets/appliedenergistics2/models/block/fluix.json rename to src/main/resources/assets/appliedenergistics2/models/block/fluix/block.json diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stair.quartz.certus.chiseled.inner.json b/src/main/resources/assets/appliedenergistics2/models/block/stair.quartz.certus.chiseled.inner.json deleted file mode 100644 index d4a3867ff..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/stair.quartz.certus.chiseled.inner.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/inner_stairs", - "textures": { - "bottom": "appliedenergistics2:blocks/BlockQuartzChiseled", - "top": "appliedenergistics2:blocks/BlockQuartzChiseled", - "side": "appliedenergistics2:blocks/BlockQuartzChiseledSide" - } -} diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stair.quartz.certus.chiseled.json b/src/main/resources/assets/appliedenergistics2/models/block/stair.quartz.certus.chiseled.json deleted file mode 100644 index f4e3afc9d..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/stair.quartz.certus.chiseled.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/stairs", - "textures": { - "bottom": "appliedenergistics2:blocks/BlockQuartzChiseled", - "top": "appliedenergistics2:blocks/BlockQuartzChiseled", - "side": "appliedenergistics2:blocks/BlockQuartzChiseledSide" - } -} diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stair.quartz.certus.chiseled.outer.json b/src/main/resources/assets/appliedenergistics2/models/block/stair.quartz.certus.chiseled.outer.json deleted file mode 100644 index d37342d05..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/stair.quartz.certus.chiseled.outer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/outer_stairs", - "textures": { - "bottom": "appliedenergistics2:blocks/BlockQuartzChiseled", - "top": "appliedenergistics2:blocks/BlockQuartzChiseled", - "side": "appliedenergistics2:blocks/BlockQuartzChiseledSide" - } -} diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stair.quartz.certus.inner.json b/src/main/resources/assets/appliedenergistics2/models/block/stair.quartz.certus.inner.json deleted file mode 100644 index c0d08b22d..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/stair.quartz.certus.inner.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/inner_stairs", - "textures": { - "bottom": "appliedenergistics2:blocks/BlockQuartz", - "top": "appliedenergistics2:blocks/BlockQuartz", - "side": "appliedenergistics2:blocks/BlockQuartz" - } -} diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stair.quartz.certus.json b/src/main/resources/assets/appliedenergistics2/models/block/stair.quartz.certus.json deleted file mode 100644 index 82f6f8115..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/stair.quartz.certus.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/stairs", - "textures": { - "bottom": "appliedenergistics2:blocks/BlockQuartz", - "top": "appliedenergistics2:blocks/BlockQuartz", - "side": "appliedenergistics2:blocks/BlockQuartz" - } -} diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stair.quartz.certus.outer.json b/src/main/resources/assets/appliedenergistics2/models/block/stair.quartz.certus.outer.json deleted file mode 100644 index c6d8491eb..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/stair.quartz.certus.outer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/outer_stairs", - "textures": { - "bottom": "appliedenergistics2:blocks/BlockQuartz", - "top": "appliedenergistics2:blocks/BlockQuartz", - "side": "appliedenergistics2:blocks/BlockQuartz" - } -} diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stair.quartz.certus.pillar.inner.json b/src/main/resources/assets/appliedenergistics2/models/block/stair.quartz.certus.pillar.inner.json deleted file mode 100644 index cda5e0ab0..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/stair.quartz.certus.pillar.inner.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/inner_stairs", - "textures": { - "bottom": "appliedenergistics2:blocks/BlockQuartzPillar", - "top": "appliedenergistics2:blocks/BlockQuartzPillar", - "side": "appliedenergistics2:blocks/BlockQuartzPillarSide" - } -} diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stair.quartz.certus.pillar.json b/src/main/resources/assets/appliedenergistics2/models/block/stair.quartz.certus.pillar.json deleted file mode 100644 index 8c1329e97..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/stair.quartz.certus.pillar.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/stairs", - "textures": { - "bottom": "appliedenergistics2:blocks/BlockQuartzPillar", - "top": "appliedenergistics2:blocks/BlockQuartzPillar", - "side": "appliedenergistics2:blocks/BlockQuartzPillarSide" - } -} diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stair.quartz.certus.pillar.outer.json b/src/main/resources/assets/appliedenergistics2/models/block/stair.quartz.certus.pillar.outer.json deleted file mode 100644 index 5d0c4d0b7..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/stair.quartz.certus.pillar.outer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/outer_stairs", - "textures": { - "bottom": "appliedenergistics2:blocks/BlockQuartzPillar", - "top": "appliedenergistics2:blocks/BlockQuartzPillar", - "side": "appliedenergistics2:blocks/BlockQuartzPillar" - } -} diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stair.skystone.block.inner.json b/src/main/resources/assets/appliedenergistics2/models/block/stair.skystone.block.inner.json deleted file mode 100644 index 113c12066..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/stair.skystone.block.inner.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/inner_stairs", - "textures": { - "all": "appliedenergistics2:blocks/BlockSkystone.Block" - } -} diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stair.skystone.block.json b/src/main/resources/assets/appliedenergistics2/models/block/stair.skystone.block.json deleted file mode 100644 index b4014898c..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/stair.skystone.block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/stairs", - "textures": { - "all": "appliedenergistics2:blocks/BlockSkystone.Block" - } -} diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stair.skystone.block.outer.json b/src/main/resources/assets/appliedenergistics2/models/block/stair.skystone.block.outer.json deleted file mode 100644 index bce3d59be..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/stair.skystone.block.outer.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/outer_stairs", - "textures": { - "all": "appliedenergistics2:blocks/BlockSkystone.Block" - } -} diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stair.skystone.brick.inner.json b/src/main/resources/assets/appliedenergistics2/models/block/stair.skystone.brick.inner.json deleted file mode 100644 index 191475477..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/stair.skystone.brick.inner.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/inner_stairs", - "textures": { - "all": "appliedenergistics2:blocks/BlockSkystone.Brick" - } -} diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stair.skystone.brick.json b/src/main/resources/assets/appliedenergistics2/models/block/stair.skystone.brick.json deleted file mode 100644 index 387462d13..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/stair.skystone.brick.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/stairs", - "textures": { - "all": "appliedenergistics2:blocks/BlockSkystone.Brick" - } -} diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stair.skystone.brick.outer.json b/src/main/resources/assets/appliedenergistics2/models/block/stair.skystone.brick.outer.json deleted file mode 100644 index 418f26a03..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/stair.skystone.brick.outer.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/outer_stairs", - "textures": { - "all": "appliedenergistics2:blocks/BlockSkystone.Brick" - } -} diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stair.skystone.brick.small.inner.json b/src/main/resources/assets/appliedenergistics2/models/block/stair.skystone.brick.small.inner.json deleted file mode 100644 index b005bca0e..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/stair.skystone.brick.small.inner.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/inner_stairs", - "textures": { - "all": "appliedenergistics2:blocks/BlockSkystone.SmallBrick" - } -} diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stair.skystone.brick.small.json b/src/main/resources/assets/appliedenergistics2/models/block/stair.skystone.brick.small.json deleted file mode 100644 index 9dfe88b73..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/stair.skystone.brick.small.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/stairs", - "textures": { - "all": "appliedenergistics2:blocks/BlockSkystone.SmallBrick" - } -} diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stair.skystone.brick.small.outer.json b/src/main/resources/assets/appliedenergistics2/models/block/stair.skystone.brick.small.outer.json deleted file mode 100644 index 05423e5d7..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/stair.skystone.brick.small.outer.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/outer_stairs", - "textures": { - "all": "appliedenergistics2:blocks/BlockSkystone.SmallBrick" - } -} diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stair.skystone.inner.json b/src/main/resources/assets/appliedenergistics2/models/block/stair.skystone.inner.json deleted file mode 100644 index 163a54cd6..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/stair.skystone.inner.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/inner_stairs", - "textures": { - "all": "appliedenergistics2:blocks/BlockSkystone.Stone" - } -} diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stair.skystone.json b/src/main/resources/assets/appliedenergistics2/models/block/stair.skystone.json deleted file mode 100644 index e7b0caea5..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/stair.skystone.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/stairs", - "textures": { - "all": "appliedenergistics2:blocks/BlockSkystone.Stone" - } -} diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stair.skystone.outer.json b/src/main/resources/assets/appliedenergistics2/models/block/stair.skystone.outer.json deleted file mode 100644 index f81db4e80..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/stair.skystone.outer.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/outer_stairs", - "textures": { - "all": "appliedenergistics2:blocks/BlockSkystone.Stone" - } -} diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stair.fluix.json b/src/main/resources/assets/appliedenergistics2/models/block/stair/fluix/block.json similarity index 100% rename from src/main/resources/assets/appliedenergistics2/models/block/stair.fluix.json rename to src/main/resources/assets/appliedenergistics2/models/block/stair/fluix/block.json diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stair.fluix.inner.json b/src/main/resources/assets/appliedenergistics2/models/block/stair/fluix/inner.json similarity index 100% rename from src/main/resources/assets/appliedenergistics2/models/block/stair.fluix.inner.json rename to src/main/resources/assets/appliedenergistics2/models/block/stair/fluix/inner.json diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stair.fluix.outer.json b/src/main/resources/assets/appliedenergistics2/models/block/stair/fluix/outer.json similarity index 100% rename from src/main/resources/assets/appliedenergistics2/models/block/stair.fluix.outer.json rename to src/main/resources/assets/appliedenergistics2/models/block/stair/fluix/outer.json diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stair/quartz/certus/block.json b/src/main/resources/assets/appliedenergistics2/models/block/stair/quartz/certus/block.json new file mode 100644 index 000000000..6700b8843 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/stair/quartz/certus/block.json @@ -0,0 +1,8 @@ +{ + "parent": "block/stairs", + "textures": { + "bottom": "appliedenergistics2:quartz/certus/all", + "top": "appliedenergistics2:quartz/certus/all", + "side": "appliedenergistics2:quartz/certus/all" + } +} diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stair/quartz/certus/chiseled/block.json b/src/main/resources/assets/appliedenergistics2/models/block/stair/quartz/certus/chiseled/block.json new file mode 100644 index 000000000..dd1638e94 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/stair/quartz/certus/chiseled/block.json @@ -0,0 +1,8 @@ +{ + "parent": "block/stairs", + "textures": { + "bottom": "appliedenergistics2:quartz/certus/chiseled/bottom", + "top": "appliedenergistics2:quartz/certus/chiseled/top", + "side": "appliedenergistics2:quartz/certus/chiseled/side" + } +} diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stair/quartz/certus/chiseled/inner.json b/src/main/resources/assets/appliedenergistics2/models/block/stair/quartz/certus/chiseled/inner.json new file mode 100644 index 000000000..36b9518ad --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/stair/quartz/certus/chiseled/inner.json @@ -0,0 +1,8 @@ +{ + "parent": "block/inner_stairs", + "textures": { + "bottom": "appliedenergistics2:quartz/certus/chiseled/bottom", + "top": "appliedenergistics2:quartz/certus/chiseled/top", + "side": "appliedenergistics2:quartz/certus/chiseled/side" + } +} diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stair/quartz/certus/chiseled/outer.json b/src/main/resources/assets/appliedenergistics2/models/block/stair/quartz/certus/chiseled/outer.json new file mode 100644 index 000000000..5903db1ee --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/stair/quartz/certus/chiseled/outer.json @@ -0,0 +1,8 @@ +{ + "parent": "block/outer_stairs", + "textures": { + "bottom": "appliedenergistics2:quartz/certus/chiseled/bottom", + "top": "appliedenergistics2:quartz/certus/chiseled/top", + "side": "appliedenergistics2:quartz/certus/chiseled/side" + } +} diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stair/quartz/certus/inner.json b/src/main/resources/assets/appliedenergistics2/models/block/stair/quartz/certus/inner.json new file mode 100644 index 000000000..8d1db6508 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/stair/quartz/certus/inner.json @@ -0,0 +1,8 @@ +{ + "parent": "block/inner_stairs", + "textures": { + "bottom": "appliedenergistics2:quartz/certus/all", + "top": "appliedenergistics2:quartz/certus/all", + "side": "appliedenergistics2:quartz/certus/all" + } +} diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stair/quartz/certus/outer.json b/src/main/resources/assets/appliedenergistics2/models/block/stair/quartz/certus/outer.json new file mode 100644 index 000000000..a54e6502a --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/stair/quartz/certus/outer.json @@ -0,0 +1,8 @@ +{ + "parent": "block/outer_stairs", + "textures": { + "bottom": "appliedenergistics2:quartz/certus/all", + "top": "appliedenergistics2:quartz/certus/all", + "side": "appliedenergistics2:quartz/certus/all" + } +} diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stair/quartz/certus/pillar/block.json b/src/main/resources/assets/appliedenergistics2/models/block/stair/quartz/certus/pillar/block.json new file mode 100644 index 000000000..f02a9ea4d --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/stair/quartz/certus/pillar/block.json @@ -0,0 +1,8 @@ +{ + "parent": "block/stairs", + "textures": { + "bottom": "appliedenergistics2:quartz/certus/pillar/bottom", + "top": "appliedenergistics2:quartz/certus/pillar/top", + "side": "appliedenergistics2:quartz/certus/pillar/side" + } +} diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stair/quartz/certus/pillar/inner.json b/src/main/resources/assets/appliedenergistics2/models/block/stair/quartz/certus/pillar/inner.json new file mode 100644 index 000000000..caea7651a --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/stair/quartz/certus/pillar/inner.json @@ -0,0 +1,8 @@ +{ + "parent": "block/inner_stairs", + "textures": { + "bottom": "appliedenergistics2:quartz/certus/pillar/bottom", + "top": "appliedenergistics2:quartz/certus/pillar/top", + "side": "appliedenergistics2:quartz/certus/pillar/side" + } +} diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stair/quartz/certus/pillar/outer.json b/src/main/resources/assets/appliedenergistics2/models/block/stair/quartz/certus/pillar/outer.json new file mode 100644 index 000000000..f114926c0 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/stair/quartz/certus/pillar/outer.json @@ -0,0 +1,8 @@ +{ + "parent": "block/outer_stairs", + "textures": { + "bottom": "appliedenergistics2:quartz/certus/pillar/bottom", + "top": "appliedenergistics2:quartz/certus/pillar/top", + "side": "appliedenergistics2:quartz/certus/pillar/side" + } +} diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stair/skystone/block/block.json b/src/main/resources/assets/appliedenergistics2/models/block/stair/skystone/block/block.json new file mode 100644 index 000000000..18553e274 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/stair/skystone/block/block.json @@ -0,0 +1,8 @@ +{ + "parent": "block/stairs", + "textures": { + "bottom": "appliedenergistics2:skystone/block/all", + "top": "appliedenergistics2:skystone/block/all", + "side": "appliedenergistics2:skystone/block/all" + } +} diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stair/skystone/block/inner.json b/src/main/resources/assets/appliedenergistics2/models/block/stair/skystone/block/inner.json new file mode 100644 index 000000000..285d2fbc8 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/stair/skystone/block/inner.json @@ -0,0 +1,8 @@ +{ + "parent": "block/inner_stairs", + "textures": { + "bottom": "appliedenergistics2:skystone/block/all", + "top": "appliedenergistics2:skystone/block/all", + "side": "appliedenergistics2:skystone/block/all" + } +} diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stair/skystone/block/outer.json b/src/main/resources/assets/appliedenergistics2/models/block/stair/skystone/block/outer.json new file mode 100644 index 000000000..436126fd4 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/stair/skystone/block/outer.json @@ -0,0 +1,8 @@ +{ + "parent": "block/outer_stairs", + "textures": { + "bottom": "appliedenergistics2:skystone/block/all", + "top": "appliedenergistics2:skystone/block/all", + "side": "appliedenergistics2:skystone/block/all" + } +} diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stair/skystone/brick/block.json b/src/main/resources/assets/appliedenergistics2/models/block/stair/skystone/brick/block.json new file mode 100644 index 000000000..52d71ca15 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/stair/skystone/brick/block.json @@ -0,0 +1,8 @@ +{ + "parent": "block/stairs", + "textures": { + "bottom": "appliedenergistics2:skystone/brick/all", + "top": "appliedenergistics2:skystone/brick/all", + "side": "appliedenergistics2:skystone/brick/all" + } +} diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stair/skystone/brick/inner.json b/src/main/resources/assets/appliedenergistics2/models/block/stair/skystone/brick/inner.json new file mode 100644 index 000000000..d623723ed --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/stair/skystone/brick/inner.json @@ -0,0 +1,8 @@ +{ + "parent": "block/inner_stairs", + "textures": { + "bottom": "appliedenergistics2:skystone/brick/all", + "top": "appliedenergistics2:skystone/brick/all", + "side": "appliedenergistics2:skystone/brick/all" + } +} diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stair/skystone/brick/outer.json b/src/main/resources/assets/appliedenergistics2/models/block/stair/skystone/brick/outer.json new file mode 100644 index 000000000..2c8227ae2 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/stair/skystone/brick/outer.json @@ -0,0 +1,8 @@ +{ + "parent": "block/outer_stairs", + "textures": { + "bottom": "appliedenergistics2:skystone/brick/all", + "top": "appliedenergistics2:skystone/brick/all", + "side": "appliedenergistics2:skystone/brick/all" + } +} diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stair/skystone/brick/small/block.json b/src/main/resources/assets/appliedenergistics2/models/block/stair/skystone/brick/small/block.json new file mode 100644 index 000000000..2ee2f06d7 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/stair/skystone/brick/small/block.json @@ -0,0 +1,8 @@ +{ + "parent": "block/stairs", + "textures": { + "bottom": "appliedenergistics2:skystone/brick/small/all", + "top": "appliedenergistics2:skystone/brick/small/all", + "side": "appliedenergistics2:skystone/brick/small/all" + } +} diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stair/skystone/brick/small/inner.json b/src/main/resources/assets/appliedenergistics2/models/block/stair/skystone/brick/small/inner.json new file mode 100644 index 000000000..74bbea8c5 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/stair/skystone/brick/small/inner.json @@ -0,0 +1,8 @@ +{ + "parent": "block/inner_stairs", + "textures": { + "bottom": "appliedenergistics2:skystone/brick/small/all", + "top": "appliedenergistics2:skystone/brick/small/all", + "side": "appliedenergistics2:skystone/brick/small/all" + } +} diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stair/skystone/brick/small/outer.json b/src/main/resources/assets/appliedenergistics2/models/block/stair/skystone/brick/small/outer.json new file mode 100644 index 000000000..03b84e0ef --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/stair/skystone/brick/small/outer.json @@ -0,0 +1,8 @@ +{ + "parent": "block/outer_stairs", + "textures": { + "bottom": "appliedenergistics2:skystone/brick/small/all", + "top": "appliedenergistics2:skystone/brick/small/all", + "side": "appliedenergistics2:skystone/brick/small/all" + } +} diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stair/skystone/stone/block.json b/src/main/resources/assets/appliedenergistics2/models/block/stair/skystone/stone/block.json new file mode 100644 index 000000000..eb1a6d032 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/stair/skystone/stone/block.json @@ -0,0 +1,8 @@ +{ + "parent": "block/stairs", + "textures": { + "bottom": "appliedenergistics2:skystone/stone/all", + "top": "appliedenergistics2:skystone/stone/all", + "side": "appliedenergistics2:skystone/stone/all" + } +} diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stair/skystone/stone/inner.json b/src/main/resources/assets/appliedenergistics2/models/block/stair/skystone/stone/inner.json new file mode 100644 index 000000000..5e54ee20e --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/stair/skystone/stone/inner.json @@ -0,0 +1,8 @@ +{ + "parent": "block/inner_stairs", + "textures": { + "bottom": "appliedenergistics2:skystone/stone/all", + "top": "appliedenergistics2:skystone/stone/all", + "side": "appliedenergistics2:skystone/stone/all" + } +} diff --git a/src/main/resources/assets/appliedenergistics2/models/block/stair/skystone/stone/outer.json b/src/main/resources/assets/appliedenergistics2/models/block/stair/skystone/stone/outer.json new file mode 100644 index 000000000..eb17c913a --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/stair/skystone/stone/outer.json @@ -0,0 +1,8 @@ +{ + "parent": "block/outer_stairs", + "textures": { + "bottom": "appliedenergistics2:skystone/stone/all", + "top": "appliedenergistics2:skystone/stone/all", + "side": "appliedenergistics2:skystone/stone/all" + } +} diff --git a/src/main/resources/assets/appliedenergistics2/models/item/fluix.json b/src/main/resources/assets/appliedenergistics2/models/item/fluix.json index 04062f5e9..ab652d74b 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/fluix.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/fluix.json @@ -1,5 +1,5 @@ { - "parent": "appliedenergistics2:block/fluix", + "parent": "appliedenergistics2:fluix/block", "display": { "thirdperson": { "rotation": [ 10, -45, 170 ], diff --git a/src/main/resources/assets/appliedenergistics2/models/item/stair.fluix.json b/src/main/resources/assets/appliedenergistics2/models/item/stair.fluix.json index 9340ea6d3..762647b3e 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/stair.fluix.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/stair.fluix.json @@ -1,5 +1,5 @@ { - "parent": "appliedenergistics2:block/stair.fluix", + "parent": "appliedenergistics2:block/stair/fluix/block", "display": { "thirdperson": { "rotation": [ 10, -45, 170 ], diff --git a/src/main/resources/assets/appliedenergistics2/models/item/stair.quartz.certus.chiseled.json b/src/main/resources/assets/appliedenergistics2/models/item/stair.quartz.certus.chiseled.json index b49365543..de74f62f2 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/stair.quartz.certus.chiseled.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/stair.quartz.certus.chiseled.json @@ -1,5 +1,5 @@ { - "parent": "block/stair.quartz.certus.chiseled", + "parent": "appliedenergistics2:block/stair/quartz/certus/chiseled/block", "display": { "thirdperson": { "rotation": [ 10, -45, 170 ], diff --git a/src/main/resources/assets/appliedenergistics2/models/item/stair.quartz.certus.json b/src/main/resources/assets/appliedenergistics2/models/item/stair.quartz.certus.json index 67ca3f16b..9eaeeb5e3 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/stair.quartz.certus.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/stair.quartz.certus.json @@ -1,5 +1,5 @@ { - "parent": "block/stair.quartz.certus", + "parent": "appliedenergistics2:block/stair/quartz/certus/block", "display": { "thirdperson": { "rotation": [ 10, -45, 170 ], diff --git a/src/main/resources/assets/appliedenergistics2/models/item/stair.quartz.certus.pillar.json b/src/main/resources/assets/appliedenergistics2/models/item/stair.quartz.certus.pillar.json index 219b2fbe0..44632e0ff 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/stair.quartz.certus.pillar.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/stair.quartz.certus.pillar.json @@ -1,5 +1,5 @@ { - "parent": "block/stair.quartz.certus.pillar", + "parent": "appliedenergistics2:block/stair/quartz/certus/pillar/block", "display": { "thirdperson": { "rotation": [ 10, -45, 170 ], diff --git a/src/main/resources/assets/appliedenergistics2/models/item/stair.skystone.block.json b/src/main/resources/assets/appliedenergistics2/models/item/stair.skystone.block.json index 6b13ac7db..d964a18cd 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/stair.skystone.block.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/stair.skystone.block.json @@ -1,5 +1,5 @@ { - "parent": "block/stair.skystone.block", + "parent": "appliedenergistics2:block/stair/skystone/block/block", "display": { "thirdperson": { "rotation": [ 10, -45, 170 ], diff --git a/src/main/resources/assets/appliedenergistics2/models/item/stair.skystone.brick.json b/src/main/resources/assets/appliedenergistics2/models/item/stair.skystone.brick.json index df4f2716e..736bee77f 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/stair.skystone.brick.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/stair.skystone.brick.json @@ -1,5 +1,5 @@ { - "parent": "block/stair.skystone.brick", + "parent": "appliedenergistics2:block/stair/skystone/brick/block", "display": { "thirdperson": { "rotation": [ 10, -45, 170 ], diff --git a/src/main/resources/assets/appliedenergistics2/models/item/stair.skystone.brick.small.json b/src/main/resources/assets/appliedenergistics2/models/item/stair.skystone.brick.small.json index c9bc142c7..dd139e462 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/stair.skystone.brick.small.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/stair.skystone.brick.small.json @@ -1,5 +1,5 @@ { - "parent": "block/stair.skystone.brick.small", + "parent": "appliedenergistics2:block/stair/skystone/brick/small/block", "display": { "thirdperson": { "rotation": [ 10, -45, 170 ], diff --git a/src/main/resources/assets/appliedenergistics2/models/item/stair.skystone.json b/src/main/resources/assets/appliedenergistics2/models/item/stair.skystone.stone.json similarity index 76% rename from src/main/resources/assets/appliedenergistics2/models/item/stair.skystone.json rename to src/main/resources/assets/appliedenergistics2/models/item/stair.skystone.stone.json index 8e307abf7..4821dc017 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/stair.skystone.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/stair.skystone.stone.json @@ -1,5 +1,5 @@ { - "parent": "block/stair.skystone", + "parent": "appliedenergistics2:block/stair/skystone/stone/block", "display": { "thirdperson": { "rotation": [ 10, -45, 170 ], diff --git a/src/main/resources/assets/appliedenergistics2/recipes/index.recipe b/src/main/resources/assets/appliedenergistics2/recipes/index.recipe index facef180d..83c9eecb6 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/index.recipe +++ b/src/main/resources/assets/appliedenergistics2/recipes/index.recipe @@ -18,8 +18,8 @@ ore=mc:stained_hardened_clay:* -> blockStainedHardenedClay ore=ae2:ItemMaterial.NetherQuartzDust -> dustNetherQuartz ore=ae2:ItemMaterial.CertusQuartzDust -> dustCertusQuartz ore=ae2:ItemMaterial.FluixDust -> dustFluix -ore=ae2:tile.OreQuartz -> oreCertusQuartz -ore=ae2:tile.OreQuartzCharged -> oreCertusQuartz +ore=ae2:OreQuartz -> oreCertusQuartz +ore=ae2:OreQuartzCharged -> oreCertusQuartz group= mc:iron_ingot oredictionary:ingotCopper oredictionary:ingotTin oredictionary:ingotSilver oredictionary:ingotLead oredictionary:ingotBronze oredictionary:ingotBrass oredictionary:ingotNickel oredictionary:ingotInvar oredictionary:ingotAluminium -> metalIngots group= oredictionary:dustEnder oredictionary:dustEnderPearl -> dustEnder diff --git a/src/main/resources/assets/appliedenergistics2/textures/quartz/certus/all.png b/src/main/resources/assets/appliedenergistics2/textures/quartz/certus/all.png new file mode 100644 index 0000000000000000000000000000000000000000..32e3c73d640e1c05c641c688525e9773919ab215 GIT binary patch literal 774 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s77>k44ofy`glX=O&z`&C3 z=B_Xl^J(0mXw#4-rXhp{p*^7vLJ)~ZT8luGQUZQXYah~CMS5!TJ>_X zP?7Myzg6CO>gxX&_jw0jl9?hDxKq7MYne!j_SeZv)fif*Ew`K{Cpt}U-m^?#08i5~o~_nVfy^99P1p7m7*e z`ggef6`Fc;b;~@)DJ_ku1}Afj0u9g1I{lMz;rCs&jz>6K18dv#f`86*I6JGykul=5 zKti_0En$NjORh$l@BJyNF#F&l%atvQ)(VCHE~|2Ua#_10_A!f?o%T)L(#KQf_VBx~ zC>-}Ny~4FZGFHAYr=HnU>hgL? zYDuigm-al2V%Yufl#9y>O)C@eoT|*J@6@#`?`*vLyPm)2Cm%zvue!sVXYXVsjue|P z9GIni=-{bFLyb4Du6?qswaH)J?r(F?sinC6W90T)2DNV!R&}%86i|RvT?-soKxYu79bESFVZ@vi4 zyTbeL)o}r3+vC}H8%vBMUfsLkm;e70;+CBf_sYH_&Z3f}CfKAP)Wn&hteDUt5q9wS zynWXzUsz4ObLX91tsmc+mvV^7@6Uh82=)m3tuvPDpK zOKVVHQZnCEvGrFq*%tSP@ZV^&zqimW)zEGBDY59HCYfo!Ib%~EsD}8Jb!6zy$XOcO zy?FP!<&&0#oDaD4+^C;B*GomHHLAn9_S549IZsy1-l-C}!z8Jajpyw16D&57`wLEr zwFu9j{GviT?SSovo6F7bZEjV4^CDWUHbUw_i?zZty|M=`y#+DdD`XN6==50zF}_SN zxar+=``4tzy2XcCUtV_H_^h~ud(OtFf9g8l?mnLPWzp6>cZ#0b^HtqpynO%RifzuV zyX%gNwfv2a%dyntI%;?8n~%`lf~nkDhw4=xHR;|kfU{D{Ue4d`@;)`4n2^+A*b`f=WE~W$DRT$PiYS^Io@@(N;m zKPuaOdH80g=Iz=YK1Rmh?-ZZgyV&QN>7O?mhht+u7~DxX^S)YpV)fa$uFNRM*X!-y z`%V^`?AjU_<8<*CD?j%Oo~^sno^(uSH{s#;|Chgo)8wq*1GJs#?w=a{x;kHrK>R(t!ys*}YcJsGC1;MH~Z_WvmM z?&3z{6-(Z+RM!L-+k7+HGqJ2$bgN_Iz0YD&k}p%1{BS8-to-aF7IDGGOpF;GR6?-q9y|7?T zLf|18u?>~i>TfP|Rbz7LywTdXw{`NIC5KP`YGVDqYmdeOo*>?nS_wK4I=@4eBj+aY zUSqlIJoDqGtoI)hHffogzT)zXH|XF@3+!VM;}rAV%w}2gYw`C<{0#={X9gTTt>>}A z-{Yg0y984M&zZ)E^P75&Hx*3k*W>g|$`eUGaq6&c&Z|xHxFk$Yae8mLDXZxCda`5H z#Q$sW&6;>x;&}DD%Px!$(oHula`UPcoICg92IpCiZZC;cyx!5~tEswR&%e{tiXG0g zG@P6#)hv6Zt~0V~s^9%Axmi_BobI6|%T8MEe9p6D$=!wGNhjiNhH*Yv`{Ljxx7&J# z>IcgEHhHtf?U}4*88i0&~LxucXY32*?BQdXhG)F`HGWFcOQuFRd0-xE$js)a|TaW KKbLh*2~7Y?xoQ{y literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/appliedenergistics2/textures/quartz/certus/chiseled/top.png b/src/main/resources/assets/appliedenergistics2/textures/quartz/certus/chiseled/top.png new file mode 100644 index 0000000000000000000000000000000000000000..9e8be6eb0be6ceadf7084dc72a6b3ea7f8215313 GIT binary patch literal 834 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7SkfJR9T^xl_H+M9WMyDr z;4JWnEM{QfTL!|6?RQq@GcYhnmAFQf1m~xflqVLYG6W=M=9TFAxrQi|8S9zq85+8O zb~0yRVA|*D;uvD#uN!km;e70;+CBf_sYH_&Z3f}CfKAP)Wn&hteDUt5q9wS zynWXzUsz4ObLX91tsmc+mvV^7@6Uh82=)m3tuvPDpK zOKVVHQZnCEvGrFq*%tSP@ZV^&zqimW)zEGBDY59HCYfo!Ib%~EsD}8Jb!6zy$XOcO zy?FP!<&&0#oDaD4+^C;B*GomHHLAn9_S549IZsy1-l-C}!z8Jajpyw16D&57`wLEr zwFu9j{GviT?SSovo6F7bZEjV4^CDWUHbUw_i?zZty|M=`y#+DdD`XN6==50zF}_SN zxar+=``4tzy2XcCUtV_H_^h~ud(OtFf9g8l?mnLPWzp6>cZ#0b^HtqpynO%RifzuV zyX%gNwfv2a%dyntI%;?8n~%`lf~nkDhw4=xHR;|kfU{D{Ue4d`@;)`4n2^+A*b`f=WE~W$DRTWn%Yr70?c5q5+H}JyiRWH70-#u>K^WD$S#C-pCc+#CO3XiI5V=gg$_fPcw8>o2xb;|l{`sV|k-S$j>K5uqe z(28EKU4H`|EP0Qu?6ChAzWs6frDN6?ZF1_En@arKwyR&xKj|-3#ieC*r|VjsvtOBt zzV!vGyoW4#pB6KO6 z*zt{P!{KRbI*Ok!IbXKKUvXcZhqQRd%*oTsMRNWzw9H=2u*M_uO|qiixla>YE8MP3 zYP67(d3kw~(3+*UjWZAPZ0x(j{lRJez6p}0t1inoaC~C?IPtoB9>3Ir*D*4=Ry#Bq z)`qe$vfL2uO=1w=*enovQ?c23jiJIBhGyxvdO?Ew{IwY^UUn)yNp299Px&suWyJcC zA+@2?!$y_uLqv7mIwh42Vuz%deR}#n8z1p~s1W!!;Q$wV$596Jmm&-7S83>;XG&bv z8vNowTEoPRH9NJ~->BS8;u3G@lQI7;dh?}r;fb+hx8YZ_x#AyOduk ztE)bwhCO7CaNEeMs}zyKuGqg$O*q{6hw63Jb0>xVAB|_ww&zTEw}0X96Fl8_GTC(Q z$m-6KwcTaUn((;g6I;KdbG-U_t)|9G;|KM-cAj7VNH+3*fzf(~I>YbxTx!nyZZRys swlsl>ee;5S>-3%f1ZceD_pV|W=FVdQ&MBb@09kz_2mk;8 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/BlockSkyStone.Block.png b/src/main/resources/assets/appliedenergistics2/textures/skystone/block/all.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/blocks/BlockSkyStone.Block.png rename to src/main/resources/assets/appliedenergistics2/textures/skystone/block/all.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/BlockSkyStone.Brick.png b/src/main/resources/assets/appliedenergistics2/textures/skystone/brick/all.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/blocks/BlockSkyStone.Brick.png rename to src/main/resources/assets/appliedenergistics2/textures/skystone/brick/all.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/BlockSkyStone.SmallBrick.png b/src/main/resources/assets/appliedenergistics2/textures/skystone/brick/small/all.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/blocks/BlockSkyStone.SmallBrick.png rename to src/main/resources/assets/appliedenergistics2/textures/skystone/brick/small/all.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/BlockSkyStone.Stone.png b/src/main/resources/assets/appliedenergistics2/textures/skystone/stone/all.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/blocks/BlockSkyStone.Stone.png rename to src/main/resources/assets/appliedenergistics2/textures/skystone/stone/all.png