From 5a3850c2642e535656d090d1473054d5fa8d3331 Mon Sep 17 00:00:00 2001 From: Nedelosk Date: Fri, 22 Jan 2016 19:33:35 +0100 Subject: [PATCH] First 1.8.9 Version --- gradle.properties | 2 +- src/main/java/forestry/Forestry.java | 32 +- .../forestry/apiculture/HasFlowersCache.java | 20 +- .../apiculture/InventoryBeeHousing.java | 4 +- .../apiculture/VillageHandlerApiculture.java | 35 +- .../apiculture/blocks/BlockAlveary.java | 294 ++-- .../apiculture/blocks/BlockApiculture.java | 2 +- .../blocks/BlockApicultureChestType.java | 51 + .../blocks/BlockApicultureType.java | 5 + .../apiculture/blocks/BlockBeehives.java | 139 +- .../apiculture/blocks/BlockCandle.java | 144 +- .../blocks/BlockRegistryApiculture.java | 2 +- .../apiculture/blocks/BlockStump.java | 35 +- .../apiculture/commands/CommandBeeGive.java | 13 +- .../apiculture/entities/AIAvoidPlayers.java | 2 +- .../apiculture/entities/EntityBee.java | 6 +- .../apiculture/entities/EntityFXBee.java | 17 +- .../entities/EntityMinecartApiary.java | 13 +- .../EntityMinecartBeeHousingBase.java | 17 +- .../entities/EntityMinecartBeehouse.java | 13 +- .../forestry/apiculture/flowers/Flower.java | 1 + .../apiculture/flowers/FlowerProvider.java | 16 +- .../apiculture/flowers/FlowerRegistry.java | 55 +- .../flowers/GrowthRuleDirtGrass.java | 28 +- .../flowers/GrowthRuleFertilize.java | 22 +- .../flowers/GrowthRuleFlowerPot.java | 24 +- .../flowers/GrowthRuleMycelium.java | 28 +- .../apiculture/flowers/GrowthRuleNone.java | 10 +- .../apiculture/flowers/GrowthRuleSnow.java | 28 +- .../forestry/apiculture/genetics/Bee.java | 37 +- .../apiculture/genetics/BeeDefinition.java | 4 + .../apiculture/genetics/BeeGenome.java | 2 +- .../apiculture/genetics/BeeHelper.java | 3 +- .../apiculture/genetics/BeeMutation.java | 9 +- .../apiculture/genetics/BeekeepingMode.java | 3 +- .../genetics/DefaultBeeIconProvider.java | 64 - .../genetics/DefaultBeeModelProvider.java | 50 + ...va => DefaultBeeSpriteColourProvider.java} | 68 +- .../apiculture/genetics/HiveDrop.java | 9 +- .../genetics/JubilanceRequiresResource.java | 10 +- .../genetics/alleles/AlleleBeeSpecies.java | 65 +- .../genetics/alleles/AlleleEffect.java | 10 +- .../genetics/alleles/AlleleEffectCreeper.java | 12 +- .../genetics/alleles/AlleleEffectFertile.java | 20 +- .../alleles/AlleleEffectFungification.java | 44 +- .../genetics/alleles/AlleleEffectGlacial.java | 7 +- .../genetics/alleles/AlleleEffectPotion.java | 4 +- .../alleles/AlleleEffectRadioactive.java | 14 +- .../genetics/alleles/AlleleEffectSnowing.java | 23 +- .../forestry/apiculture/gui/GuiBeealyzer.java | 5 +- .../forestry/apiculture/gui/GuiImprinter.java | 3 +- .../apiculture/gui/widgets/HabitatSlot.java | 14 +- .../apiculture/inventory/InventoryApiary.java | 1 + .../inventory/ItemInventoryImprinter.java | 2 +- .../apiculture/items/HabitatLocatorLogic.java | 26 +- .../apiculture/items/ItemArmorApiarist.java | 32 +- .../forestry/apiculture/items/ItemBeeGE.java | 61 +- .../apiculture/items/ItemBlockCandle.java | 25 +- .../apiculture/items/ItemHabitatLocator.java | 25 +- .../apiculture/items/ItemHoneycomb.java | 16 +- .../items/ItemMinecartBeehouse.java | 62 +- .../items/ItemRegistryApiculture.java | 2 + .../multiblock/AlvearyController.java | 67 +- .../multiblock/FakeAlvearyController.java | 4 +- .../multiblock/MultiblockLogicAlveary.java | 1 + .../apiculture/multiblock/TileAlveary.java | 19 +- .../multiblock/TileAlvearyClimatiser.java | 30 +- .../apiculture/multiblock/TileAlvearyFan.java | 12 - .../multiblock/TileAlvearyHeater.java | 12 - .../multiblock/TileAlvearyHygroregulator.java | 21 +- .../multiblock/TileAlvearyPlain.java | 21 +- .../multiblock/TileAlvearySieve.java | 8 - .../multiblock/TileAlvearyStabiliser.java | 11 - .../multiblock/TileAlvearySwarmer.java | 18 +- .../packets/PacketHabitatBiomePointer.java | 7 +- .../apiculture/proxy/ProxyApiculture.java | 4 +- .../proxy/ProxyApicultureClient.java | 17 +- .../apiculture/render/ModelAnalyzer.java | 7 +- .../forestry/apiculture/render/ModelBee.java | 2 + .../apiculture/render/ParticleRenderer.java | 38 +- .../apiculture/render/RenderBeeEntity.java | 10 +- .../apiculture/render/RenderBeeItem.java | 35 +- .../apiculture/render/RenderCandleBlock.java | 146 -- .../render/TextureHabitatLocator.java | 12 +- .../apiculture/tiles/TileApiaristChest.java | 9 +- .../forestry/apiculture/tiles/TileApiary.java | 9 +- .../apiculture/tiles/TileBeeHousingBase.java | 14 +- .../forestry/apiculture/tiles/TileCandle.java | 6 - .../forestry/apiculture/tiles/TileSwarm.java | 14 +- .../trigger/TriggerMissingDrone.java | 6 +- .../trigger/TriggerMissingQueen.java | 6 +- .../apiculture/trigger/TriggerNoFrames.java | 6 +- .../worldgen/ComponentVillageBeeHouse.java | 153 +-- .../forestry/apiculture/worldgen/Hive.java | 13 +- .../apiculture/worldgen/HiveDecorator.java | 29 +- .../apiculture/worldgen/HiveDescription.java | 9 +- .../worldgen/HiveDescriptionSwarmer.java | 5 +- .../forestry/apiculture/worldgen/HiveGen.java | 6 +- .../apiculture/worldgen/HiveGenGround.java | 10 +- .../apiculture/worldgen/HiveGenTree.java | 15 +- .../arboriculture/FruitProviderNone.java | 34 +- .../arboriculture/FruitProviderPod.java | 43 +- .../arboriculture/FruitProviderRandom.java | 7 +- .../arboriculture/FruitProviderRipening.java | 7 +- .../arboriculture/LeafDecayHelper.java | 24 +- .../VillageHandlerArboriculture.java | 28 +- .../arboriculture/blocks/BlockArbFence.java | 141 +- .../arboriculture/blocks/BlockArbStairs.java | 114 +- .../blocks/BlockArboriculture.java | 2 +- .../blocks/BlockArboricultureType.java | 12 +- .../blocks/BlockForestryLeaves.java | 217 ++- .../arboriculture/blocks/BlockFruitPod.java | 167 +-- .../arboriculture/blocks/BlockLog.java | 123 +- .../arboriculture/blocks/BlockPlanks.java | 26 - .../blocks/BlockRegistryArboriculture.java | 12 +- .../arboriculture/blocks/BlockSapling.java | 163 ++- .../arboriculture/blocks/BlockSlab.java | 178 ++- .../arboriculture/blocks/BlockSlabDouble.java | 14 + .../blocks/BlockTreeContainer.java | 17 +- .../arboriculture/blocks/BlockWood.java | 118 +- .../blocks/property/PropertyFruit.java | 55 + .../blocks/property/PropertyTree.java | 53 + .../commands/CommandTreeSpawn.java | 10 +- .../arboriculture/commands/ForestSpawner.java | 11 +- .../arboriculture/commands/ITreeSpawner.java | 4 +- .../arboriculture/commands/TreeGenHelper.java | 13 +- .../arboriculture/commands/TreeSpawner.java | 10 +- .../genetics/GrowthProvider.java | 52 +- .../genetics/GrowthProviderTropical.java | 13 +- .../forestry/arboriculture/genetics/Tree.java | 93 +- .../genetics/TreeDefinition.java | 60 +- .../arboriculture/genetics/TreeFactory.java | 14 +- .../arboriculture/genetics/TreeHelper.java | 32 +- .../arboriculture/genetics/TreeMutation.java | 5 +- .../genetics/alleles/AlleleFruit.java | 15 + .../genetics/alleles/AlleleLeafEffect.java | 5 +- .../genetics/alleles/AlleleTreeSpecies.java | 83 +- .../arboriculture/gui/GuiTreealyzer.java | 9 +- .../arboriculture/items/ItemBlockLeaves.java | 9 +- .../arboriculture/items/ItemBlockWood.java | 87 +- .../items/ItemBlockWoodSlab.java | 219 ++- .../arboriculture/items/ItemGermlingGE.java | 87 +- .../arboriculture/items/ItemGrafter.java | 8 +- .../proxy/ProxyArboriculture.java | 2 +- .../proxy/ProxyArboricultureClient.java | 54 +- .../render/IconProviderGermling.java | 47 - .../render/IconProviderGermlingVanilla.java | 47 - .../render/IconProviderWood.java | 81 -- .../arboriculture/render/ModelLeaves.java | 146 ++ .../render/ModelProviderGermling.java | 46 + .../render/ModelProviderGermlingVanilla.java | 61 + .../arboriculture/render/RenderFenceItem.java | 130 -- .../render/RenderFruitPodBlock.java | 196 --- .../render/RenderLeavesBlock.java | 100 -- .../render/RenderLeavesItem.java | 181 --- .../arboriculture/render/RenderLogItem.java | 127 -- .../arboriculture/render/RenderPlankItem.java | 126 -- .../render/RenderSaplingBlock.java | 122 -- .../arboriculture/render/RenderSlabItem.java | 116 -- .../arboriculture/render/RenderStairItem.java | 114 -- ...rLeaves.java => SpriteProviderLeaves.java} | 106 +- .../render/StateMapperFluidPod.java | 52 + .../render/StateMapperSapling.java | 36 + .../arboriculture/render/TextureLeaves.java | 28 +- .../arboriculture/tiles/TileFruitPod.java | 31 +- .../arboriculture/tiles/TileLeaves.java | 83 +- .../arboriculture/tiles/TileSapling.java | 12 +- .../tiles/TileTreeContainer.java | 21 +- .../arboriculture/tiles/TileWood.java | 24 +- .../arboriculture/worldgen/BlockTypeLog.java | 9 +- .../worldgen/BlockTypeVanillaStairs.java | 6 +- .../arboriculture/worldgen/BlockTypeWood.java | 15 +- .../worldgen/BlockTypeWoodStairs.java | 5 +- .../worldgen/ITreeBlockType.java | 8 +- .../arboriculture/worldgen/TreeBlockType.java | 10 +- .../worldgen/TreeBlockTypeLeaf.java | 10 +- .../worldgen/TreeBlockTypeLog.java | 12 +- .../worldgen/WorldGenAcacia.java | 24 +- .../worldgen/WorldGenArboriculture.java | 163 +-- .../arboriculture/worldgen/WorldGenBalsa.java | 3 +- .../worldgen/WorldGenBaobab.java | 8 +- .../worldgen/WorldGenCherry.java | 8 +- .../worldgen/WorldGenChestnut.java | 8 +- .../worldgen/WorldGenCocobolo.java | 8 +- .../arboriculture/worldgen/WorldGenEbony.java | 5 +- .../arboriculture/worldgen/WorldGenIpe.java | 8 +- .../worldgen/WorldGenJungle.java | 8 +- .../arboriculture/worldgen/WorldGenKapok.java | 8 +- .../arboriculture/worldgen/WorldGenMahoe.java | 8 +- .../worldgen/WorldGenMahogany.java | 8 +- .../arboriculture/worldgen/WorldGenMaple.java | 8 +- .../worldgen/WorldGenPadauk.java | 16 +- .../worldgen/WorldGenPapaya.java | 8 +- .../arboriculture/worldgen/WorldGenPine.java | 8 +- .../worldgen/WorldGenSequoia.java | 8 +- .../worldgen/WorldGenSilverLime.java | 8 +- .../worldgen/WorldGenSpruce.java | 8 +- .../arboriculture/worldgen/WorldGenTeak.java | 8 +- .../arboriculture/worldgen/WorldGenTree.java | 30 +- .../worldgen/WorldGenWalnut.java | 8 +- .../arboriculture/worldgen/WorldGenWenge.java | 8 +- .../worldgen/WorldGenZebrawood.java | 8 +- .../forestry/core/CreativeTabForestry.java | 4 +- .../java/forestry/core/EventHandlerCore.java | 18 +- .../forestry/core/TickHandlerCoreClient.java | 8 +- .../forestry/core/TickHandlerCoreServer.java | 12 +- .../forestry/core/access/AccessHandler.java | 6 +- .../java/forestry/core/access/EnumAccess.java | 11 +- .../java/forestry/core/blocks/BlockBase.java | 210 +-- .../java/forestry/core/blocks/BlockCore.java | 2 +- .../forestry/core/blocks/BlockCoreType.java | 13 +- .../forestry/core/blocks/BlockForestry.java | 28 +- .../forestry/core/blocks/BlockRegistry.java | 6 +- .../core/blocks/BlockRegistryCore.java | 4 +- .../core/blocks/BlockResourceOre.java | 100 +- .../core/blocks/BlockResourceStorage.java | 69 +- .../java/forestry/core/blocks/BlockSoil.java | 149 +- .../forestry/core/blocks/BlockStructure.java | 51 +- .../core/blocks/IMachineProperties.java | 3 +- .../core/blocks/IMachinePropertiesTESR.java | 8 +- .../core/blocks/propertys/PropertyAllele.java | 52 + .../blocks/propertys/UnlistedBlockAccess.java | 38 + .../propertys/UnlistedBlockPos.java} | 34 +- .../core/circuits/GuiSolderingIron.java | 3 +- .../core/circuits/ItemCircuitBoard.java | 17 +- .../core/commands/CommandHelpers.java | 15 +- .../core/commands/CommandModeInfo.java | 3 +- .../core/commands/CommandModeSet.java | 6 +- .../core/commands/CommandPlugins.java | 7 +- .../core/commands/CommandSaveStats.java | 8 +- .../forestry/core/commands/RootCommand.java | 8 +- .../forestry/core/commands/SubCommand.java | 20 +- .../core/config/ForestryGuiConfig.java | 5 +- .../core/config/ForestryGuiConfigFactory.java | 3 +- .../core/config/LocalizedConfiguration.java | 1 + .../java/forestry/core/config/Version.java | 6 +- .../entities/EntityFXColoredDropParticle.java | 12 +- .../core/entities/EntityFXIgnition.java | 25 +- .../forestry/core/entities/EntityFXSnow.java | 29 +- .../EntityMinecartContainerForestry.java | 65 +- .../core/entities/EntityMinecartForestry.java | 26 +- .../core/entities/EntitySelector.java | 16 +- .../forestry/core/errors/EnumErrorCode.java | 29 +- .../java/forestry/core/errors/ErrorLogic.java | 2 + .../core/errors/ErrorStateRegistry.java | 11 +- .../core/fluids/BlockForestryFluid.java | 146 +- .../forestry/core/fluids/FakeTankManager.java | 18 +- .../forestry/core/fluids/FluidHelper.java | 13 +- .../java/forestry/core/fluids/Fluids.java | 29 +- .../forestry/core/fluids/ITankManager.java | 5 +- .../forestry/core/fluids/TankManager.java | 30 +- .../core/fluids/tanks/FilteredTank.java | 2 +- .../core/fluids/tanks/StandardTank.java | 2 +- .../core/genetics/IndividualLiving.java | 1 + .../java/forestry/core/genetics/ItemGE.java | 17 +- .../core/genetics/ItemResearchNote.java | 21 +- .../core/genetics/alleles/AlleleArea.java | 1 + .../core/genetics/alleles/AlleleBoolean.java | 1 + .../genetics/alleles/AllelePlantType.java | 1 + .../core/genetics/alleles/AlleleSpecies.java | 9 +- .../genetics/alleles/AlleleTolerance.java | 1 + .../core/genetics/mutations/Mutation.java | 5 +- .../mutations/MutationConditionBiome.java | 5 +- .../mutations/MutationConditionDaytime.java | 3 +- .../mutations/MutationConditionHumidity.java | 5 +- .../MutationConditionRequiresResource.java | 9 +- ...ationConditionRequiresResourceOreDict.java | 13 +- .../MutationConditionTemperature.java | 7 +- .../MutationConditionTimeLimited.java | 3 +- .../core/gui/ContainerLiquidTanks.java | 9 +- .../gui/ContainerLiquidTanksSocketed.java | 9 +- .../gui/ContainerNaturalistInventory.java | 7 +- .../java/forestry/core/gui/GuiForestry.java | 33 +- .../java/forestry/core/gui/GuiHandler.java | 16 +- .../core/gui/GuiNaturalistInventory.java | 3 +- .../java/forestry/core/gui/GuiTextBox.java | 4 +- src/main/java/forestry/core/gui/GuiUtil.java | 4 +- .../core/gui/buttons/GuiBetterButton.java | 9 +- .../core/gui/ledgers/ClimateLedger.java | 2 +- .../core/gui/ledgers/ErrorLedger.java | 4 +- .../forestry/core/gui/ledgers/HintLedger.java | 4 +- .../forestry/core/gui/ledgers/Ledger.java | 22 +- .../core/gui/ledgers/OwnerLedger.java | 9 +- .../core/gui/ledgers/PowerLedger.java | 2 +- .../forestry/core/gui/slots/SlotCrafter.java | 113 +- .../forestry/core/gui/slots/SlotFiltered.java | 10 +- .../forestry/core/gui/slots/SlotOutput.java | 9 +- .../core/gui/tooltips/ToolTipLine.java | 1 + .../core/gui/widgets/GameTokenWidget.java | 11 +- .../core/gui/widgets/SocketWidget.java | 2 +- .../forestry/core/gui/widgets/TankWidget.java | 12 +- .../inventory/AdjacentInventoryCache.java | 8 +- .../core/inventory/FakeInventoryAdapter.java | 56 +- .../core/inventory/InventoryAdapter.java | 59 +- .../inventory/InventoryAdapterRestricted.java | 12 +- .../core/inventory/InventoryAdapterTile.java | 4 +- .../core/inventory/InventoryAnalyzer.java | 4 +- .../core/inventory/InventoryEscritoire.java | 4 +- .../inventory/InventoryNaturalistChest.java | 4 +- .../core/inventory/InventoryPlain.java | 44 +- .../core/inventory/ItemInventory.java | 45 +- .../core/inventory/wrappers/ChestWrapper.java | 46 +- .../inventory/wrappers/InventoryCopy.java | 45 +- .../inventory/wrappers/InventoryMapper.java | 61 +- .../wrappers/SidedInventoryIterator.java | 7 +- .../wrappers/SidedInventoryMapper.java | 73 +- .../core/items/ItemArmorNaturalist.java | 32 +- .../core/items/ItemBlockForestry.java | 29 +- .../core/items/ItemCraftingMaterial.java | 31 +- .../java/forestry/core/items/ItemCrated.java | 25 +- .../forestry/core/items/ItemForestry.java | 18 +- .../core/items/ItemForestryBonemeal.java | 10 +- .../forestry/core/items/ItemForestryFood.java | 22 +- .../core/items/ItemForestryMultiPass.java | 50 - .../forestry/core/items/ItemForestryTool.java | 28 +- .../java/forestry/core/items/ItemFruit.java | 33 +- .../core/items/ItemLiquidContainer.java | 113 +- .../java/forestry/core/items/ItemOverlay.java | 47 +- .../java/forestry/core/items/ItemPipette.java | 48 +- .../forestry/core/items/ItemRegistry.java | 4 +- .../java/forestry/core/items/ItemWrench.java | 19 +- .../multiblock/FakeMultiblockController.java | 4 +- .../IMultiblockControllerInternal.java | 4 +- .../MultiblockClientTickHandler.java | 5 +- .../multiblock/MultiblockControllerBase.java | 187 +-- .../MultiblockControllerForestry.java | 63 +- .../multiblock/MultiblockEventHandler.java | 5 +- .../core/multiblock/MultiblockLogic.java | 6 +- .../MultiblockServerTickHandler.java | 4 +- .../MultiblockTileEntityForestry.java | 64 +- .../core/multiblock/MultiblockUtil.java | 23 +- .../multiblock/MultiblockWorldRegistry.java | 18 +- .../RectangularMultiblockControllerBase.java | 41 +- .../core/network/DataInputStreamForestry.java | 30 +- .../network/DataOutputStreamForestry.java | 14 +- .../forestry/core/network/ForestryPacket.java | 14 +- .../core/network/IForestryPacket.java | 2 +- .../forestry/core/network/ILocatedPacket.java | 8 +- .../forestry/core/network/PacketHandler.java | 14 +- .../network/packets/PacketCoordinates.java | 51 +- .../core/network/packets/PacketDummy.java | 3 +- .../network/packets/PacketEntityUpdate.java | 15 +- .../core/network/packets/PacketFXSignal.java | 42 +- .../java/forestry/core/proxy/Proxies.java | 2 +- .../java/forestry/core/proxy/ProxyCommon.java | 36 +- .../core/proxy/ProxyCommonClient.java | 43 +- .../forestry/core/proxy/ProxyNetwork.java | 4 +- .../java/forestry/core/proxy/ProxyRender.java | 53 +- .../core/proxy/ProxyRenderClient.java | 137 +- .../forestry/core/recipes/RecipeUtil.java | 7 +- .../core/recipes/ShapedRecipeCustom.java | 3 +- .../recipes/jei/ForestryRecipeCategory.java | 49 + .../jei/ForestryRecipeCategoryUid.java | 18 + .../recipes/jei/ForestryRecipeWrapper.java | 68 + .../recipes/jei/ForestryTooltipCallback.java | 58 + .../recipes/jei/JEIIntegrationPlugin.java | 99 ++ .../{nei/NEIUtils.java => jei/JEIUtils.java} | 6 +- .../recipes/nei/CustomOverlayHandler.java | 79 -- .../core/recipes/nei/IRecipeHandlerBase.java | 18 - .../core/recipes/nei/ItemFilterForestry.java | 57 - .../core/recipes/nei/ItemFilterGenetic.java | 54 - .../recipes/nei/NEIIntegrationConfig.java | 85 -- .../core/recipes/nei/PositionedFluidTank.java | 157 --- .../core/recipes/nei/PositionedStackAdv.java | 74 - .../core/recipes/nei/RecipeHandlerBase.java | 229 ---- .../recipes/nei/SetRecipeCommandHandler.java | 60 - .../forestry/core/render/IBlockRenderer.java | 15 - .../forestry/core/render/ParticleHelper.java | 86 +- .../forestry/core/render/RenderAnalyzer.java | 47 +- .../forestry/core/render/RenderBlock.java | 54 - .../forestry/core/render/RenderCrateItem.java | 350 ----- .../core/render/RenderEscritoire.java | 45 +- .../forestry/core/render/RenderMachine.java | 29 +- .../java/forestry/core/render/RenderMill.java | 31 +- .../core/render/RenderNaturalistChest.java | 27 +- .../core/render/RenderOverlayBlock.java | 119 -- .../core/render/StateMapperForestry.java | 41 + .../core/render/StateMapperMachine.java | 52 + .../forestry/core/render/TextureManager.java | 69 +- .../core/render/TileRendererIndex.java | 2 + .../core/render/model/BlockModelIndex.java | 31 + .../core/render/model/ModelBaker.java | 279 ++++ .../core/render/model/ModelBakerFace.java | 43 + .../core/render/model/ModelBakerModel.java | 108 ++ .../core/render/model/ModelBlockOverlay.java | 173 +++ .../core/render/model/ModelCrate.java | 202 +++ .../render/{ => model}/ModelEscritoire.java | 2 +- .../ModelIndex.java} | 23 +- .../core/render/model/ModelManager.java | 165 +++ .../core/render/model/RenderHandler.java | 36 + .../core/tiles/AdjacentTileCache.java | 27 +- .../core/tiles/EscritoireGameToken.java | 2 +- .../forestry/core/tiles/IActivatable.java | 4 +- .../java/forestry/core/tiles/ILocatable.java | 4 +- .../forestry/core/tiles/IRenderableTile.java | 5 +- .../core/tiles/MachineDefinition.java | 87 +- .../forestry/core/tiles/TileAnalyzer.java | 17 +- .../java/forestry/core/tiles/TileEngine.java | 20 +- .../forestry/core/tiles/TileForestry.java | 117 +- .../core/tiles/TileNaturalistChest.java | 8 +- .../java/forestry/core/tiles/TilePowered.java | 19 +- .../java/forestry/core/tiles/TileUtil.java | 20 +- .../java/forestry/core/triggers/Trigger.java | 26 +- .../java/forestry/core/utils/BlockUtil.java | 122 +- .../java/forestry/core/utils/ClimateUtil.java | 7 + .../core/utils/DamageSourceForestry.java | 6 +- .../java/forestry/core/utils/EntityUtil.java | 10 +- .../utils/ForestryModEnvWarningCallable.java | 11 +- .../forestry/core/utils/GeneticsUtil.java | 31 +- .../forestry/core/utils/InventoryUtil.java | 53 +- .../forestry/core/utils/ItemStackUtil.java | 115 +- .../java/forestry/core/utils/ModUtil.java | 14 +- .../java/forestry/core/utils/NBTUtil.java | 5 +- src/main/java/forestry/core/utils/Stack.java | 7 +- .../java/forestry/core/utils/StringUtil.java | 2 +- .../java/forestry/core/utils/vect/IVect.java | 42 +- .../forestry/core/utils/vect/MutableVect.java | 53 +- .../java/forestry/core/utils/vect/Vect.java | 87 +- .../forestry/core/utils/vect/VectUtil.java | 15 +- .../forestry/core/worldgen/BlockType.java | 10 +- .../core/worldgen/BlockTypeTileForestry.java | 18 +- .../forestry/core/worldgen/BlockTypeVoid.java | 5 +- .../forestry/core/worldgen/IBlockType.java | 8 +- .../forestry/core/worldgen/WorldGenBase.java | 30 +- .../core/worldgen/WorldGenMinableMeta.java | 20 +- .../core/worldgen/WorldGenerator.java | 13 +- .../java/forestry/energy/EnergyManager.java | 20 +- .../forestry/energy/blocks/BlockEngine.java | 67 +- .../energy/blocks/BlockEngineType.java | 13 +- .../java/forestry/energy/gui/GuiEngine.java | 2 +- .../energy/inventory/InventoryEnginePeat.java | 4 +- .../forestry/energy/proxy/ProxyEnergy.java | 5 +- .../energy/proxy/ProxyEnergyClient.java | 6 +- .../forestry/energy/render/RenderEngine.java | 46 +- .../energy/tiles/EngineDefinition.java | 8 +- .../energy/tiles/TileEngineBiogas.java | 15 +- .../energy/tiles/TileEngineElectric.java | 3 +- .../forestry/energy/tiles/TileEnginePeat.java | 15 +- .../forestry/energy/tiles/TileGenerator.java | 18 +- .../factory/blocks/BlockFactoryPlain.java | 2 +- .../factory/blocks/BlockFactoryPlainType.java | 5 + .../factory/blocks/BlockFactoryTESR.java | 2 +- .../factory/blocks/BlockFactoryTesrType.java | 11 +- .../gui/widgets/MemorizedRecipeSlot.java | 11 +- .../factory/inventory/InventoryBottler.java | 4 +- .../factory/inventory/InventoryCarpenter.java | 4 +- .../inventory/InventoryCentrifuge.java | 4 +- .../inventory/InventoryFabricator.java | 4 +- .../factory/inventory/InventoryFermenter.java | 4 +- .../factory/inventory/InventoryMoistener.java | 4 +- .../factory/inventory/InventoryRaintank.java | 4 +- .../factory/inventory/InventorySqueezer.java | 4 +- .../factory/inventory/InventoryStill.java | 4 +- .../network/PacketRegistryFactory.java | 2 - .../packets/PacketWorktableNEISelect.java | 45 - .../factory/recipes/CarpenterRecipe.java | 1 + .../factory/recipes/FabricatorRecipe.java | 23 - .../recipes/FabricatorSmeltingRecipe.java | 3 + .../factory/recipes/MoistenerRecipe.java | 3 + .../jei/bottler/BottlerRecipeCategory.java | 69 + .../jei/bottler/BottlerRecipeHandler.java | 41 + .../jei/bottler/BottlerRecipeMaker.java | 26 + .../jei/bottler/BottlerRecipeWrapper.java | 31 + .../carpenter/CarpenterRecipeCategory.java | 94 ++ .../jei/carpenter/CarpenterRecipeHandler.java | 45 + .../jei/carpenter/CarpenterRecipeMaker.java | 21 + .../jei/carpenter/CarpenterRecipeWrapper.java | 39 + .../centrifuge/CentrifugeRecipeCategory.java | 101 ++ .../centrifuge/CentrifugeRecipeHandler.java | 46 + .../jei/centrifuge/CentrifugeRecipeMaker.java | 21 + .../centrifuge/CentrifugeRecipeWrapper.java | 26 + .../fabricator/FabricatorRecipeCategory.java | 116 ++ .../fabricator/FabricatorRecipeHandler.java | 51 + .../jei/fabricator/FabricatorRecipeMaker.java | 21 + .../fabricator/FabricatorRecipeWrapper.java | 38 + .../fermenter/FermenterRecipeCategory.java | 91 ++ .../jei/fermenter/FermenterRecipeHandler.java | 47 + .../jei/fermenter/FermenterRecipeMaker.java | 30 + .../jei/fermenter/FermenterRecipeWrapper.java | 44 + .../moistener/MoistenerRecipeCategory.java | 86 ++ .../jei/moistener/MoistenerRecipeHandler.java | 44 + .../jei/moistener/MoistenerRecipeMaker.java | 26 + .../jei/moistener/MoistenerRecipeWrapper.java | 45 + .../SqueezerContainerRecipeWrapper.java | 41 + .../jei/squeezer/SqueezerRecipeCategory.java | 104 ++ .../jei/squeezer/SqueezerRecipeHandler.java | 60 + .../jei/squeezer/SqueezerRecipeMaker.java | 37 + .../jei/squeezer/SqueezerRecipeWrapper.java | 39 + .../jei/still/StillRecipeCategory.java | 56 + .../recipes/jei/still/StillRecipeHandler.java | 40 + .../recipes/jei/still/StillRecipeMaker.java | 21 + .../recipes/jei/still/StillRecipeWrapper.java | 27 + .../recipes/nei/NEIHandlerBottler.java | 155 --- .../recipes/nei/NEIHandlerCarpenter.java | 195 --- .../recipes/nei/NEIHandlerCentrifuge.java | 160 --- .../recipes/nei/NEIHandlerFabricator.java | 231 ---- .../recipes/nei/NEIHandlerFermenter.java | 204 --- .../recipes/nei/NEIHandlerMoistener.java | 159 --- .../recipes/nei/NEIHandlerSqueezer.java | 258 ---- .../factory/recipes/nei/NEIHandlerStill.java | 122 -- .../forestry/factory/tiles/TileBottler.java | 20 +- .../forestry/factory/tiles/TileCarpenter.java | 15 +- .../factory/tiles/TileCentrifuge.java | 9 +- .../factory/tiles/TileFabricator.java | 15 +- .../forestry/factory/tiles/TileFermenter.java | 20 +- .../factory/tiles/TileMillRainmaker.java | 8 +- .../forestry/factory/tiles/TileMoistener.java | 17 +- .../forestry/factory/tiles/TileRaintank.java | 18 +- .../forestry/factory/tiles/TileSqueezer.java | 15 +- .../forestry/factory/tiles/TileStill.java | 16 +- .../factory/triggers/TriggerLowFuel.java | 6 +- .../factory/triggers/TriggerLowResource.java | 6 +- .../java/forestry/farming/FarmHelper.java | 7 +- .../forestry/farming/blocks/BlockFarm.java | 190 +-- .../farming/blocks/BlockFarmType.java | 22 - .../farming/blocks/BlockMushroom.java | 116 +- .../farming/blocks/EnumBlockFarmType.java | 21 + .../java/forestry/farming/gui/FarmLedger.java | 9 +- .../farming/gui/widgets/FarmLogicSlot.java | 17 +- .../java/forestry/farming/logic/Crop.java | 12 +- .../farming/logic/CropBasicAgriCraft.java | 8 +- .../farming/logic/CropBasicFruit.java | 6 +- .../farming/logic/CropBasicGrowthCraft.java | 12 +- .../forestry/farming/logic/CropBlock.java | 6 +- .../forestry/farming/logic/CropFruit.java | 8 +- .../java/forestry/farming/logic/CropPeat.java | 2 +- .../forestry/farming/logic/CropRubber.java | 4 +- .../forestry/farming/logic/FarmLogic.java | 44 +- .../farming/logic/FarmLogicArboreal.java | 46 +- .../farming/logic/FarmLogicCereal.java | 12 +- .../farming/logic/FarmLogicCocoa.java | 53 +- .../farming/logic/FarmLogicCrops.java | 15 +- .../farming/logic/FarmLogicEnder.java | 27 +- .../farming/logic/FarmLogicGourd.java | 21 +- .../farming/logic/FarmLogicHomogeneous.java | 13 +- .../farming/logic/FarmLogicInfernal.java | 27 +- .../farming/logic/FarmLogicOrchard.java | 40 +- .../forestry/farming/logic/FarmLogicPeat.java | 19 +- .../farming/logic/FarmLogicReeds.java | 21 +- .../farming/logic/FarmLogicRubber.java | 25 +- .../farming/logic/FarmLogicShroom.java | 12 +- .../farming/logic/FarmLogicSucculent.java | 27 +- .../farming/logic/FarmLogicVegetable.java | 12 +- .../farming/logic/FarmLogicWatered.java | 19 +- .../farming/logic/FarmableBasicAgricraft.java | 18 +- .../farming/logic/FarmableBasicFruit.java | 18 +- .../logic/FarmableBasicGrowthCraft.java | 18 +- .../farming/logic/FarmableBasicIC2Crop.java | 13 +- .../forestry/farming/logic/FarmableCocoa.java | 19 +- .../forestry/farming/logic/FarmableGE.java | 21 +- .../farming/logic/FarmableGenericCrop.java | 19 +- .../farming/logic/FarmableGenericSapling.java | 23 +- .../forestry/farming/logic/FarmableGourd.java | 22 +- .../farming/logic/FarmableStacked.java | 16 +- .../logic/FarmableVanillaMushroom.java | 14 +- .../farming/logic/FarmableVanillaSapling.java | 8 +- .../multiblock/FakeFarmController.java | 3 +- .../farming/multiblock/FarmController.java | 47 +- .../farming/multiblock/InventoryFarm.java | 9 +- .../multiblock/MultiblockLogicFarm.java | 1 + .../forestry/farming/proxy/ProxyFarming.java | 2 +- .../farming/proxy/ProxyFarmingClient.java | 21 +- .../farming/render/EnumFarmBlockTexture.java | 108 +- .../farming/render/ModelFarmBlock.java | 117 ++ .../farming/render/RenderFarmBlock.java | 62 - .../farming/render/RenderFarmItem.java | 123 -- .../java/forestry/farming/tiles/TileFarm.java | 11 +- .../farming/tiles/TileFarmControl.java | 13 +- .../farming/tiles/TileFarmGearbox.java | 14 +- .../forestry/farming/tiles/TileFarmHatch.java | 13 +- .../forestry/farming/tiles/TileFarmPlain.java | 13 +- .../forestry/farming/tiles/TileFarmValve.java | 14 +- .../triggers/TriggerLowFertilizer.java | 6 +- .../farming/triggers/TriggerLowGermlings.java | 6 +- .../farming/triggers/TriggerLowLiquid.java | 5 +- .../farming/triggers/TriggerLowSoil.java | 6 +- .../java/forestry/food/BeverageEffect.java | 1 + .../forestry/food/InfuserMixtureManager.java | 1 + .../food/inventory/ItemInventoryInfuser.java | 2 +- .../forestry/food/items/EnumBeverage.java | 32 +- .../forestry/food/items/ItemAmbrosia.java | 2 +- .../forestry/food/items/ItemBeverage.java | 59 +- .../lepidopterology/ButterflySpawner.java | 27 +- .../blocks/BlockLepidopterology.java | 2 +- .../blocks/BlockLepidopterologyType.java | 11 +- .../commands/CommandButterfly.java | 3 +- .../entities/AIButterflyBase.java | 10 +- .../entities/AIButterflyInteract.java | 8 +- .../entities/AIButterflyMate.java | 4 +- .../entities/AIButterflyMovement.java | 2 +- .../entities/AIButterflyPollinate.java | 6 +- .../entities/AIButterflyRest.java | 20 +- .../entities/AIButterflyRise.java | 2 +- .../entities/EntityButterfly.java | 53 +- .../entities/EnumButterflyState.java | 28 +- .../genetics/AlleleButterflySpecies.java | 47 +- .../lepidopterology/genetics/Butterfly.java | 7 +- .../lepidopterology/gui/GuiFlutterlyzer.java | 9 +- .../items/ItemButterflyGE.java | 80 +- .../proxy/ProxyLepidopterologyClient.java | 13 +- .../lepidopterology/recipes/MatingRecipe.java | 12 + .../render/ModelButterflyItem.java | 134 ++ .../render/RenderButterflyEntity.java | 10 +- .../render/RenderButterflyItem.java | 224 ---- .../render/TextureAtlasButterfly.java | 65 + .../forestry/mail/EventHandlerMailAlert.java | 10 +- src/main/java/forestry/mail/Letter.java | 48 +- .../java/forestry/mail/LetterProperties.java | 55 +- src/main/java/forestry/mail/MailAddress.java | 4 +- src/main/java/forestry/mail/POBox.java | 41 +- .../java/forestry/mail/PostalCarrier.java | 12 +- src/main/java/forestry/mail/TradeStation.java | 56 +- .../java/forestry/mail/blocks/BlockMail.java | 2 +- .../forestry/mail/blocks/BlockMailType.java | 5 + .../forestry/mail/commands/CommandMail.java | 3 +- .../forestry/mail/gui/ContainerLetter.java | 2 +- .../java/forestry/mail/gui/GuiLetter.java | 9 +- .../forestry/mail/gui/GuiMailboxInfo.java | 4 +- .../java/forestry/mail/gui/GuiTradeName.java | 8 +- .../mail/gui/widgets/AddresseeSlot.java | 6 +- .../mail/inventory/InventoryTradeStation.java | 9 +- .../mail/inventory/ItemInventoryLetter.java | 10 +- .../java/forestry/mail/items/ItemLetter.java | 21 +- .../java/forestry/mail/tiles/TileMailbox.java | 8 +- .../java/forestry/mail/tiles/TileTrader.java | 9 +- .../forestry/mail/triggers/TriggerBuffer.java | 6 +- .../mail/triggers/TriggerHasMail.java | 6 +- .../mail/triggers/TriggerLowInput.java | 6 +- .../mail/triggers/TriggerLowPaper.java | 6 +- .../mail/triggers/TriggerLowStamps.java | 6 +- .../java/forestry/plugins/ForestryPlugin.java | 6 +- .../forestry/plugins/PluginApiculture.java | 71 +- .../forestry/plugins/PluginArboriculture.java | 75 +- .../java/forestry/plugins/PluginCore.java | 25 +- .../java/forestry/plugins/PluginEnergy.java | 4 +- .../java/forestry/plugins/PluginFarming.java | 45 +- .../java/forestry/plugins/PluginFluids.java | 48 +- .../plugins/PluginLepidopterology.java | 18 +- .../java/forestry/plugins/PluginMail.java | 4 +- .../java/forestry/plugins/PluginManager.java | 30 +- .../java/forestry/plugins/PluginStorage.java | 13 +- .../plugins/compat/PluginAgriCraft.java | 100 -- .../plugins/compat/PluginBiomesOPlenty.java | 10 +- .../plugins/compat/PluginBuildCraftFuels.java | 3 +- .../compat/PluginBuildCraftRecipes.java | 3 +- .../compat/PluginBuildCraftStatements.java | 9 +- .../compat/PluginBuildCraftTransport.java | 4 +- .../forestry/plugins/compat/PluginChisel.java | 3 +- .../plugins/compat/PluginEnderIO.java | 72 - .../forestry/plugins/compat/PluginErebus.java | 59 - .../plugins/compat/PluginExtraUtilities.java | 73 - .../plugins/compat/PluginGrowthCraft.java | 142 -- .../plugins/compat/PluginHarvestCraft.java | 365 ----- .../forestry/plugins/compat/PluginIC2.java | 53 +- .../compat/PluginImmersiveEngineering.java | 56 - .../plugins/compat/PluginMagicalCrops.java | 282 ---- .../forestry/plugins/compat/PluginNatura.java | 37 +- .../plugins/compat/PluginPlantMegaPack.java | 459 ------- .../plugins/compat/PluginRotaryCraft.java | 59 - .../plugins/compat/PluginWitchery.java | 112 -- .../forestry/storage/BackpackDefinition.java | 12 +- .../java/forestry/storage/CrateRegistry.java | 4 +- .../forestry/storage/ResupplyHandler.java | 4 +- .../forestry/storage/items/ItemBackpack.java | 107 +- .../forestry/storage/proxy/ProxyStorage.java | 4 +- .../storage/proxy/ProxyStorageClient.java | 12 +- .../minecraftforge/debug/DynBucketTest.java | 177 +++ .../debug/EnumPlantTypeTest.java | 49 + .../debug/ForgeBlockStatesLoaderDebug.java | 132 ++ .../debug/ItemLayerModelDebug.java | 57 + .../minecraftforge/debug/ItemTileDebug.java | 144 ++ .../debug/LayerBreakingTest.java | 226 ++++ .../debug/ModelAnimationDebug.java | 295 ++++ .../debug/ModelBakeEventDebug.java | 348 +++++ .../minecraftforge/debug/ModelFluidDebug.java | 194 +++ .../debug/ModelLoaderRegistryDebug.java | 830 ++++++++++++ .../debug/MultiLayerModelDebug.java | 67 + .../debug/NoPotionEffectRenderTest.java | 29 + .../debug/PotionRegistryDebug.java | 82 ++ .../CraftGuide/api/LiquidFilter.java | 1 - .../CraftGuide/api/LiquidSlot.java | 1 - .../assets/forestry/blockstates/alveary.json | 30 + .../apiculture/alveary_entrance.json | 5 + .../blockstates/apiculture/alveary_fan.json | 6 + .../apiculture/alveary_heater.json | 6 + .../blockstates/apiculture/alveary_hygro.json | 5 + .../blockstates/apiculture/alveary_plain.json | 7 + .../blockstates/apiculture/alveary_sieve.json | 5 + .../apiculture/alveary_stabiliser.json | 5 + .../apiculture/alveary_swarmer.json | 6 + .../blockstates/apiculture_apiary.json | 8 + .../blockstates/apiculture_beehouse.json | 8 + .../assets/forestry/blockstates/beehives.json | 11 + .../blockstates/blockforestryfluid.json | 46 + .../forestry/blockstates/butterflyGE.json | 15 + .../assets/forestry/blockstates/candle.json | 14 + .../forestry/blockstates/crafting_table.json | 5 + .../assets/forestry/blockstates/crates.json | 43 + .../blockstates/crates/cratedGlass.json | 20 + .../blockstates/crates/cratedPeat.json | 20 + .../blockstates/crates/cratedStone.json | 20 + .../blockstates/crates/cratedWood.json | 20 + .../blockstates/factory2_fabricator.json | 8 + .../blockstates/factory2_raintank.json | 8 + .../blockstates/factory2_worktable.json | 8 + .../assets/forestry/blockstates/fences.json | 497 +++++++ .../forestry/blockstates/fencesFireproof.json | 497 +++++++ .../forestry/blockstates/germlings.json | 39 + .../assets/forestry/blockstates/logs.json | 120 ++ .../forestry/blockstates/logsFireproof.json | 120 ++ .../forestry/blockstates/mail_mailbox.json | 8 + .../blockstates/mail_philatelist.json | 8 + .../blockstates/mail_tradestation.json | 8 + .../assets/forestry/blockstates/planks.json | 33 + .../forestry/blockstates/planksFireproof.json | 33 + .../forestry/blockstates/pods/cocoa.json | 16 + .../forestry/blockstates/pods/dates.json | 16 + .../forestry/blockstates/pods/papaya.json | 16 + .../forestry/blockstates/resourceStorage.json | 8 + .../forestry/blockstates/resources.json | 7 + .../assets/forestry/blockstates/slabs.json | 91 ++ .../forestry/blockstates/slabsDouble.json | 33 + .../blockstates/slabsDoubleFireproof.json | 33 + .../forestry/blockstates/slabsFireproof.json | 91 ++ .../assets/forestry/blockstates/soil.json | 7 + .../assets/forestry/blockstates/stairs.json | 1193 +++++++++++++++++ .../forestry/blockstates/stairsFireproof.json | 1193 +++++++++++++++++ .../block/apiculture/alveary_entrance.json | 10 + .../block/apiculture/alveary_fan_off.json | 12 + .../block/apiculture/alveary_fan_on.json | 12 + .../block/apiculture/alveary_heater_off.json | 12 + .../block/apiculture/alveary_heater_on.json | 12 + .../block/apiculture/alveary_hygro.json | 12 + .../block/apiculture/alveary_plain_down.json | 12 + .../apiculture/alveary_plain_middle.json | 12 + .../block/apiculture/alveary_plain_up.json | 12 + .../block/apiculture/alveary_sieve.json | 12 + .../block/apiculture/alveary_stabiliser.json | 12 + .../block/apiculture/alveary_swarmer_off.json | 12 + .../block/apiculture/alveary_swarmer_on.json | 12 + .../models/block/apiculture_apiary.json | 12 + .../models/block/apiculture_beehouse.json | 12 + .../fences/acacia_inventory.json | 6 + .../block/arboriculture/fences/acacia_n.json | 6 + .../block/arboriculture/fences/acacia_ne.json | 6 + .../block/arboriculture/fences/acacia_ns.json | 6 + .../arboriculture/fences/acacia_nse.json | 6 + .../arboriculture/fences/acacia_nsew.json | 6 + .../arboriculture/fences/acacia_post.json | 6 + .../arboriculture/fences/balsa_inventory.json | 6 + .../block/arboriculture/fences/balsa_n.json | 6 + .../block/arboriculture/fences/balsa_ne.json | 6 + .../block/arboriculture/fences/balsa_ns.json | 6 + .../block/arboriculture/fences/balsa_nse.json | 6 + .../arboriculture/fences/balsa_nsew.json | 6 + .../arboriculture/fences/balsa_post.json | 6 + .../fences/baobab_inventory.json | 6 + .../block/arboriculture/fences/baobab_n.json | 6 + .../block/arboriculture/fences/baobab_ne.json | 6 + .../block/arboriculture/fences/baobab_ns.json | 6 + .../arboriculture/fences/baobab_nse.json | 6 + .../arboriculture/fences/baobab_nsew.json | 6 + .../arboriculture/fences/baobab_post.json | 6 + .../fences/cherry_inventory.json | 6 + .../block/arboriculture/fences/cherry_n.json | 6 + .../block/arboriculture/fences/cherry_ne.json | 6 + .../block/arboriculture/fences/cherry_ns.json | 6 + .../arboriculture/fences/cherry_nse.json | 6 + .../arboriculture/fences/cherry_nsew.json | 6 + .../arboriculture/fences/cherry_post.json | 6 + .../fences/chestnut_inventory.json | 6 + .../arboriculture/fences/chestnut_n.json | 6 + .../arboriculture/fences/chestnut_ne.json | 6 + .../arboriculture/fences/chestnut_ns.json | 6 + .../arboriculture/fences/chestnut_nse.json | 6 + .../arboriculture/fences/chestnut_nsew.json | 6 + .../arboriculture/fences/chestnut_post.json | 6 + .../fences/citrus_inventory.json | 6 + .../block/arboriculture/fences/citrus_n.json | 6 + .../block/arboriculture/fences/citrus_ne.json | 6 + .../block/arboriculture/fences/citrus_ns.json | 6 + .../arboriculture/fences/citrus_nse.json | 6 + .../arboriculture/fences/citrus_nsew.json | 6 + .../arboriculture/fences/citrus_post.json | 6 + .../fences/cocobolo_inventory.json | 6 + .../arboriculture/fences/cocobolo_n.json | 6 + .../arboriculture/fences/cocobolo_ne.json | 6 + .../arboriculture/fences/cocobolo_ns.json | 6 + .../arboriculture/fences/cocobolo_nse.json | 6 + .../arboriculture/fences/cocobolo_nsew.json | 6 + .../arboriculture/fences/cocobolo_post.json | 6 + .../arboriculture/fences/ebony_inventory.json | 6 + .../block/arboriculture/fences/ebony_n.json | 6 + .../block/arboriculture/fences/ebony_ne.json | 6 + .../block/arboriculture/fences/ebony_ns.json | 6 + .../block/arboriculture/fences/ebony_nse.json | 6 + .../arboriculture/fences/ebony_nsew.json | 6 + .../arboriculture/fences/ebony_post.json | 6 + .../fences/giganteum_inventory.json | 6 + .../arboriculture/fences/giganteum_n.json | 6 + .../arboriculture/fences/giganteum_ne.json | 6 + .../arboriculture/fences/giganteum_ns.json | 6 + .../arboriculture/fences/giganteum_nse.json | 6 + .../arboriculture/fences/giganteum_nsew.json | 6 + .../arboriculture/fences/giganteum_post.json | 6 + .../fences/greenheart_inventory.json | 6 + .../arboriculture/fences/greenheart_n.json | 6 + .../arboriculture/fences/greenheart_ne.json | 6 + .../arboriculture/fences/greenheart_ns.json | 6 + .../arboriculture/fences/greenheart_nse.json | 6 + .../arboriculture/fences/greenheart_nsew.json | 6 + .../arboriculture/fences/greenheart_post.json | 6 + .../arboriculture/fences/ipe_inventory.json | 6 + .../block/arboriculture/fences/ipe_n.json | 6 + .../block/arboriculture/fences/ipe_ne.json | 6 + .../block/arboriculture/fences/ipe_ns.json | 6 + .../block/arboriculture/fences/ipe_nse.json | 6 + .../block/arboriculture/fences/ipe_nsew.json | 6 + .../block/arboriculture/fences/ipe_post.json | 6 + .../arboriculture/fences/kapok_inventory.json | 6 + .../block/arboriculture/fences/kapok_n.json | 6 + .../block/arboriculture/fences/kapok_ne.json | 6 + .../block/arboriculture/fences/kapok_ns.json | 6 + .../block/arboriculture/fences/kapok_nse.json | 6 + .../arboriculture/fences/kapok_nsew.json | 6 + .../arboriculture/fences/kapok_post.json | 6 + .../arboriculture/fences/larch_inventory.json | 6 + .../block/arboriculture/fences/larch_n.json | 6 + .../block/arboriculture/fences/larch_ne.json | 6 + .../block/arboriculture/fences/larch_ns.json | 6 + .../block/arboriculture/fences/larch_nse.json | 6 + .../arboriculture/fences/larch_nsew.json | 6 + .../arboriculture/fences/larch_post.json | 6 + .../arboriculture/fences/lime_inventory.json | 6 + .../block/arboriculture/fences/lime_n.json | 6 + .../block/arboriculture/fences/lime_ne.json | 6 + .../block/arboriculture/fences/lime_ns.json | 6 + .../block/arboriculture/fences/lime_nse.json | 6 + .../block/arboriculture/fences/lime_nsew.json | 6 + .../block/arboriculture/fences/lime_post.json | 6 + .../arboriculture/fences/mahoe_inventory.json | 6 + .../block/arboriculture/fences/mahoe_n.json | 6 + .../block/arboriculture/fences/mahoe_ne.json | 6 + .../block/arboriculture/fences/mahoe_ns.json | 6 + .../block/arboriculture/fences/mahoe_nse.json | 6 + .../arboriculture/fences/mahoe_nsew.json | 6 + .../arboriculture/fences/mahoe_post.json | 6 + .../fences/mahogany_inventory.json | 6 + .../arboriculture/fences/mahogany_n.json | 6 + .../arboriculture/fences/mahogany_ne.json | 6 + .../arboriculture/fences/mahogany_ns.json | 6 + .../arboriculture/fences/mahogany_nse.json | 6 + .../arboriculture/fences/mahogany_nsew.json | 6 + .../arboriculture/fences/mahogany_post.json | 6 + .../arboriculture/fences/maple_inventory.json | 6 + .../block/arboriculture/fences/maple_n.json | 6 + .../block/arboriculture/fences/maple_ne.json | 6 + .../block/arboriculture/fences/maple_ns.json | 6 + .../block/arboriculture/fences/maple_nse.json | 6 + .../arboriculture/fences/maple_nsew.json | 6 + .../arboriculture/fences/maple_post.json | 6 + .../fences/padauk_inventory.json | 6 + .../block/arboriculture/fences/padauk_n.json | 6 + .../block/arboriculture/fences/padauk_ne.json | 6 + .../block/arboriculture/fences/padauk_ns.json | 6 + .../arboriculture/fences/padauk_nse.json | 6 + .../arboriculture/fences/padauk_nsew.json | 6 + .../arboriculture/fences/padauk_post.json | 6 + .../arboriculture/fences/palm_inventory.json | 6 + .../block/arboriculture/fences/palm_n.json | 6 + .../block/arboriculture/fences/palm_ne.json | 6 + .../block/arboriculture/fences/palm_ns.json | 6 + .../block/arboriculture/fences/palm_nse.json | 6 + .../block/arboriculture/fences/palm_nsew.json | 6 + .../block/arboriculture/fences/palm_post.json | 6 + .../fences/papaya_inventory.json | 6 + .../block/arboriculture/fences/papaya_n.json | 6 + .../block/arboriculture/fences/papaya_ne.json | 6 + .../block/arboriculture/fences/papaya_ns.json | 6 + .../arboriculture/fences/papaya_nse.json | 6 + .../arboriculture/fences/papaya_nsew.json | 6 + .../arboriculture/fences/papaya_post.json | 6 + .../arboriculture/fences/pine_inventory.json | 6 + .../block/arboriculture/fences/pine_n.json | 6 + .../block/arboriculture/fences/pine_ne.json | 6 + .../block/arboriculture/fences/pine_ns.json | 6 + .../block/arboriculture/fences/pine_nse.json | 6 + .../block/arboriculture/fences/pine_nsew.json | 6 + .../block/arboriculture/fences/pine_post.json | 6 + .../arboriculture/fences/plum_inventory.json | 6 + .../block/arboriculture/fences/plum_n.json | 6 + .../block/arboriculture/fences/plum_ne.json | 6 + .../block/arboriculture/fences/plum_ns.json | 6 + .../block/arboriculture/fences/plum_nse.json | 6 + .../block/arboriculture/fences/plum_nsew.json | 6 + .../block/arboriculture/fences/plum_post.json | 6 + .../fences/poplar_inventory.json | 6 + .../block/arboriculture/fences/poplar_n.json | 6 + .../block/arboriculture/fences/poplar_ne.json | 6 + .../block/arboriculture/fences/poplar_ns.json | 6 + .../arboriculture/fences/poplar_nse.json | 6 + .../arboriculture/fences/poplar_nsew.json | 6 + .../arboriculture/fences/poplar_post.json | 6 + .../fences/sequoia_inventory.json | 6 + .../block/arboriculture/fences/sequoia_n.json | 6 + .../arboriculture/fences/sequoia_ne.json | 6 + .../arboriculture/fences/sequoia_ns.json | 6 + .../arboriculture/fences/sequoia_nse.json | 6 + .../arboriculture/fences/sequoia_nsew.json | 6 + .../arboriculture/fences/sequoia_post.json | 6 + .../arboriculture/fences/teak_inventory.json | 6 + .../block/arboriculture/fences/teak_n.json | 6 + .../block/arboriculture/fences/teak_ne.json | 6 + .../block/arboriculture/fences/teak_ns.json | 6 + .../block/arboriculture/fences/teak_nse.json | 6 + .../block/arboriculture/fences/teak_nsew.json | 6 + .../block/arboriculture/fences/teak_post.json | 6 + .../fences/walnut_inventory.json | 6 + .../block/arboriculture/fences/walnut_n.json | 6 + .../block/arboriculture/fences/walnut_ne.json | 6 + .../block/arboriculture/fences/walnut_ns.json | 6 + .../arboriculture/fences/walnut_nse.json | 6 + .../arboriculture/fences/walnut_nsew.json | 6 + .../arboriculture/fences/walnut_post.json | 6 + .../arboriculture/fences/wenge_inventory.json | 6 + .../block/arboriculture/fences/wenge_n.json | 6 + .../block/arboriculture/fences/wenge_ne.json | 6 + .../block/arboriculture/fences/wenge_ns.json | 6 + .../block/arboriculture/fences/wenge_nse.json | 6 + .../arboriculture/fences/wenge_nsew.json | 6 + .../arboriculture/fences/wenge_post.json | 6 + .../fences/willow_inventory.json | 6 + .../block/arboriculture/fences/willow_n.json | 6 + .../block/arboriculture/fences/willow_ne.json | 6 + .../block/arboriculture/fences/willow_ns.json | 6 + .../arboriculture/fences/willow_nse.json | 6 + .../arboriculture/fences/willow_nsew.json | 6 + .../arboriculture/fences/willow_post.json | 6 + .../fences/zebrawood_inventory.json | 6 + .../arboriculture/fences/zebrawood_n.json | 6 + .../arboriculture/fences/zebrawood_ne.json | 6 + .../arboriculture/fences/zebrawood_ns.json | 6 + .../arboriculture/fences/zebrawood_nse.json | 6 + .../arboriculture/fences/zebrawood_nsew.json | 6 + .../arboriculture/fences/zebrawood_post.json | 6 + .../block/arboriculture/logs/acacia.json | 7 + .../block/arboriculture/logs/acacia_side.json | 7 + .../block/arboriculture/logs/balsa.json | 7 + .../block/arboriculture/logs/balsa_side.json | 7 + .../block/arboriculture/logs/baobab.json | 7 + .../block/arboriculture/logs/baobab_side.json | 7 + .../block/arboriculture/logs/cherry.json | 7 + .../block/arboriculture/logs/cherry_side.json | 7 + .../block/arboriculture/logs/chestnut.json | 7 + .../arboriculture/logs/chestnut_side.json | 7 + .../block/arboriculture/logs/citrus.json | 7 + .../block/arboriculture/logs/citrus_side.json | 7 + .../block/arboriculture/logs/cocobolo.json | 7 + .../arboriculture/logs/cocobolo_side.json | 7 + .../block/arboriculture/logs/ebony.json | 7 + .../block/arboriculture/logs/ebony_side.json | 7 + .../block/arboriculture/logs/giganteum.json | 7 + .../arboriculture/logs/giganteum_side.json | 7 + .../block/arboriculture/logs/greenheart.json | 7 + .../arboriculture/logs/greenheart_side.json | 7 + .../models/block/arboriculture/logs/ipe.json | 7 + .../block/arboriculture/logs/ipe_side.json | 7 + .../block/arboriculture/logs/kapok.json | 7 + .../block/arboriculture/logs/kapok_side.json | 7 + .../block/arboriculture/logs/larch.json | 7 + .../block/arboriculture/logs/larch_side.json | 7 + .../models/block/arboriculture/logs/lime.json | 7 + .../block/arboriculture/logs/lime_side.json | 7 + .../block/arboriculture/logs/mahoe.json | 7 + .../block/arboriculture/logs/mahoe_side.json | 7 + .../block/arboriculture/logs/mahogany.json | 7 + .../arboriculture/logs/mahogany_side.json | 7 + .../block/arboriculture/logs/maple.json | 7 + .../block/arboriculture/logs/maple_side.json | 7 + .../block/arboriculture/logs/padauk.json | 7 + .../block/arboriculture/logs/padauk_side.json | 7 + .../models/block/arboriculture/logs/palm.json | 7 + .../block/arboriculture/logs/palm_side.json | 7 + .../block/arboriculture/logs/papaya.json | 7 + .../block/arboriculture/logs/papaya_side.json | 7 + .../models/block/arboriculture/logs/pine.json | 7 + .../block/arboriculture/logs/pine_side.json | 7 + .../models/block/arboriculture/logs/plum.json | 7 + .../block/arboriculture/logs/plum_side.json | 7 + .../block/arboriculture/logs/poplar.json | 7 + .../block/arboriculture/logs/poplar_side.json | 7 + .../block/arboriculture/logs/sequoia.json | 7 + .../arboriculture/logs/sequoia_side.json | 7 + .../models/block/arboriculture/logs/teak.json | 7 + .../block/arboriculture/logs/teak_side.json | 7 + .../block/arboriculture/logs/walnut.json | 7 + .../block/arboriculture/logs/walnut_side.json | 7 + .../block/arboriculture/logs/wenge.json | 7 + .../block/arboriculture/logs/wenge_side.json | 7 + .../block/arboriculture/logs/willow.json | 7 + .../block/arboriculture/logs/willow_side.json | 7 + .../block/arboriculture/logs/zebrawood.json | 7 + .../arboriculture/logs/zebrawood_side.json | 7 + .../block/arboriculture/planks/acacia.json | 6 + .../block/arboriculture/planks/balsa.json | 6 + .../block/arboriculture/planks/baobab.json | 6 + .../block/arboriculture/planks/cherry.json | 6 + .../block/arboriculture/planks/chestnut.json | 6 + .../block/arboriculture/planks/citrus.json | 6 + .../block/arboriculture/planks/cocobolo.json | 6 + .../block/arboriculture/planks/ebony.json | 6 + .../block/arboriculture/planks/giganteum.json | 6 + .../arboriculture/planks/greenheart.json | 6 + .../block/arboriculture/planks/ipe.json | 6 + .../block/arboriculture/planks/kapok.json | 6 + .../block/arboriculture/planks/larch.json | 6 + .../block/arboriculture/planks/lime.json | 6 + .../block/arboriculture/planks/mahoe.json | 6 + .../block/arboriculture/planks/mahogany.json | 6 + .../block/arboriculture/planks/maple.json | 6 + .../block/arboriculture/planks/padauk.json | 6 + .../block/arboriculture/planks/palm.json | 6 + .../block/arboriculture/planks/papaya.json | 6 + .../block/arboriculture/planks/pine.json | 6 + .../block/arboriculture/planks/plum.json | 6 + .../block/arboriculture/planks/poplar.json | 6 + .../block/arboriculture/planks/sequoia.json | 6 + .../block/arboriculture/planks/teak.json | 6 + .../block/arboriculture/planks/walnut.json | 6 + .../block/arboriculture/planks/wenge.json | 6 + .../block/arboriculture/planks/willow.json | 6 + .../block/arboriculture/planks/zebrawood.json | 6 + .../arboriculture/slab/acacia_double.json | 8 + .../block/arboriculture/slab/acacia_half.json | 8 + .../arboriculture/slab/acacia_upper.json | 8 + .../arboriculture/slab/balsa_double.json | 8 + .../block/arboriculture/slab/balsa_half.json | 8 + .../block/arboriculture/slab/balsa_upper.json | 8 + .../arboriculture/slab/baobab_double.json | 8 + .../block/arboriculture/slab/baobab_half.json | 8 + .../arboriculture/slab/baobab_upper.json | 8 + .../arboriculture/slab/cherry_double.json | 8 + .../block/arboriculture/slab/cherry_half.json | 8 + .../arboriculture/slab/cherry_upper.json | 8 + .../arboriculture/slab/chestnut_double.json | 8 + .../arboriculture/slab/chestnut_half.json | 8 + .../arboriculture/slab/chestnut_upper.json | 8 + .../arboriculture/slab/citrus_double.json | 8 + .../block/arboriculture/slab/citrus_half.json | 8 + .../arboriculture/slab/citrus_upper.json | 8 + .../arboriculture/slab/cocobolo_double.json | 8 + .../arboriculture/slab/cocobolo_half.json | 8 + .../arboriculture/slab/cocobolo_upper.json | 8 + .../arboriculture/slab/ebony_double.json | 8 + .../block/arboriculture/slab/ebony_half.json | 8 + .../block/arboriculture/slab/ebony_upper.json | 8 + .../arboriculture/slab/giganteum_double.json | 8 + .../arboriculture/slab/giganteum_half.json | 8 + .../arboriculture/slab/giganteum_upper.json | 8 + .../arboriculture/slab/greenheart_double.json | 8 + .../arboriculture/slab/greenheart_half.json | 8 + .../arboriculture/slab/greenheart_upper.json | 8 + .../block/arboriculture/slab/ipe_double.json | 8 + .../block/arboriculture/slab/ipe_half.json | 8 + .../block/arboriculture/slab/ipe_upper.json | 8 + .../arboriculture/slab/kapok_double.json | 8 + .../block/arboriculture/slab/kapok_half.json | 8 + .../block/arboriculture/slab/kapok_upper.json | 8 + .../arboriculture/slab/larch_double.json | 8 + .../block/arboriculture/slab/larch_half.json | 8 + .../block/arboriculture/slab/larch_upper.json | 8 + .../block/arboriculture/slab/lime_double.json | 8 + .../block/arboriculture/slab/lime_half.json | 8 + .../block/arboriculture/slab/lime_upper.json | 8 + .../arboriculture/slab/mahoe_double.json | 8 + .../block/arboriculture/slab/mahoe_half.json | 8 + .../block/arboriculture/slab/mahoe_upper.json | 8 + .../arboriculture/slab/mahogany_double.json | 8 + .../arboriculture/slab/mahogany_half.json | 8 + .../arboriculture/slab/mahogany_upper.json | 8 + .../arboriculture/slab/maple_double.json | 8 + .../block/arboriculture/slab/maple_half.json | 8 + .../block/arboriculture/slab/maple_upper.json | 8 + .../arboriculture/slab/padauk_double.json | 8 + .../block/arboriculture/slab/padauk_half.json | 8 + .../arboriculture/slab/padauk_upper.json | 8 + .../block/arboriculture/slab/palm_double.json | 8 + .../block/arboriculture/slab/palm_half.json | 8 + .../block/arboriculture/slab/palm_upper.json | 8 + .../arboriculture/slab/papaya_double.json | 8 + .../block/arboriculture/slab/papaya_half.json | 8 + .../arboriculture/slab/papaya_upper.json | 8 + .../block/arboriculture/slab/pine_double.json | 8 + .../block/arboriculture/slab/pine_half.json | 8 + .../block/arboriculture/slab/pine_upper.json | 8 + .../block/arboriculture/slab/plum_double.json | 8 + .../block/arboriculture/slab/plum_half.json | 8 + .../block/arboriculture/slab/plum_upper.json | 8 + .../arboriculture/slab/poplar_double.json | 8 + .../block/arboriculture/slab/poplar_half.json | 8 + .../arboriculture/slab/poplar_upper.json | 8 + .../arboriculture/slab/sequoia_double.json | 8 + .../arboriculture/slab/sequoia_half.json | 8 + .../arboriculture/slab/sequoia_upper.json | 8 + .../block/arboriculture/slab/teak_double.json | 8 + .../block/arboriculture/slab/teak_half.json | 8 + .../block/arboriculture/slab/teak_upper.json | 8 + .../arboriculture/slab/walnut_double.json | 8 + .../block/arboriculture/slab/walnut_half.json | 8 + .../arboriculture/slab/walnut_upper.json | 8 + .../arboriculture/slab/wenge_double.json | 8 + .../block/arboriculture/slab/wenge_half.json | 8 + .../block/arboriculture/slab/wenge_upper.json | 8 + .../arboriculture/slab/willow_double.json | 8 + .../block/arboriculture/slab/willow_half.json | 8 + .../arboriculture/slab/willow_upper.json | 8 + .../arboriculture/slab/zebrawood_double.json | 8 + .../arboriculture/slab/zebrawood_half.json | 8 + .../arboriculture/slab/zebrawood_upper.json | 8 + .../block/arboriculture/stairs/acacia.json | 8 + .../arboriculture/stairs/acacia_inner.json | 8 + .../arboriculture/stairs/acacia_outer.json | 8 + .../block/arboriculture/stairs/balsa.json | 8 + .../arboriculture/stairs/balsa_inner.json | 8 + .../arboriculture/stairs/balsa_outer.json | 8 + .../block/arboriculture/stairs/baobab.json | 8 + .../arboriculture/stairs/baobab_inner.json | 8 + .../arboriculture/stairs/baobab_outer.json | 8 + .../block/arboriculture/stairs/cherry.json | 8 + .../arboriculture/stairs/cherry_inner.json | 8 + .../arboriculture/stairs/cherry_outer.json | 8 + .../block/arboriculture/stairs/chestnut.json | 8 + .../arboriculture/stairs/chestnut_inner.json | 8 + .../arboriculture/stairs/chestnut_outer.json | 8 + .../block/arboriculture/stairs/citrus.json | 8 + .../arboriculture/stairs/citrus_inner.json | 8 + .../arboriculture/stairs/citrus_outer.json | 8 + .../block/arboriculture/stairs/cocobolo.json | 8 + .../arboriculture/stairs/cocobolo_inner.json | 8 + .../arboriculture/stairs/cocobolo_outer.json | 8 + .../block/arboriculture/stairs/ebony.json | 8 + .../arboriculture/stairs/ebony_inner.json | 8 + .../arboriculture/stairs/ebony_outer.json | 8 + .../block/arboriculture/stairs/giganteum.json | 8 + .../arboriculture/stairs/giganteum_inner.json | 8 + .../arboriculture/stairs/giganteum_outer.json | 8 + .../arboriculture/stairs/greenheart.json | 8 + .../stairs/greenheart_inner.json | 8 + .../stairs/greenheart_outer.json | 8 + .../block/arboriculture/stairs/ipe.json | 8 + .../block/arboriculture/stairs/ipe_inner.json | 8 + .../block/arboriculture/stairs/ipe_outer.json | 8 + .../block/arboriculture/stairs/kapok.json | 8 + .../arboriculture/stairs/kapok_inner.json | 8 + .../arboriculture/stairs/kapok_outer.json | 8 + .../block/arboriculture/stairs/larch.json | 8 + .../arboriculture/stairs/larch_inner.json | 8 + .../arboriculture/stairs/larch_outer.json | 8 + .../block/arboriculture/stairs/lime.json | 8 + .../arboriculture/stairs/lime_inner.json | 8 + .../arboriculture/stairs/lime_outer.json | 8 + .../block/arboriculture/stairs/mahoe.json | 8 + .../arboriculture/stairs/mahoe_inner.json | 8 + .../arboriculture/stairs/mahoe_outer.json | 8 + .../block/arboriculture/stairs/mahogany.json | 8 + .../arboriculture/stairs/mahogany_inner.json | 8 + .../arboriculture/stairs/mahogany_outer.json | 8 + .../block/arboriculture/stairs/maple.json | 8 + .../arboriculture/stairs/maple_inner.json | 8 + .../arboriculture/stairs/maple_outer.json | 8 + .../block/arboriculture/stairs/padauk.json | 8 + .../arboriculture/stairs/padauk_inner.json | 8 + .../arboriculture/stairs/padauk_outer.json | 8 + .../block/arboriculture/stairs/palm.json | 8 + .../arboriculture/stairs/palm_inner.json | 8 + .../arboriculture/stairs/palm_outer.json | 8 + .../block/arboriculture/stairs/papaya.json | 8 + .../arboriculture/stairs/papaya_inner.json | 8 + .../arboriculture/stairs/papaya_outer.json | 8 + .../block/arboriculture/stairs/pine.json | 8 + .../arboriculture/stairs/pine_inner.json | 8 + .../arboriculture/stairs/pine_outer.json | 8 + .../block/arboriculture/stairs/plum.json | 8 + .../arboriculture/stairs/plum_inner.json | 8 + .../arboriculture/stairs/plum_outer.json | 8 + .../block/arboriculture/stairs/poplar.json | 8 + .../arboriculture/stairs/poplar_inner.json | 8 + .../arboriculture/stairs/poplar_outer.json | 8 + .../block/arboriculture/stairs/sequoia.json | 8 + .../arboriculture/stairs/sequoia_inner.json | 8 + .../arboriculture/stairs/sequoia_outer.json | 8 + .../block/arboriculture/stairs/teak.json | 8 + .../arboriculture/stairs/teak_inner.json | 8 + .../arboriculture/stairs/teak_outer.json | 8 + .../block/arboriculture/stairs/walnut.json | 8 + .../arboriculture/stairs/walnut_inner.json | 8 + .../arboriculture/stairs/walnut_outer.json | 8 + .../block/arboriculture/stairs/wenge.json | 8 + .../arboriculture/stairs/wenge_inner.json | 8 + .../arboriculture/stairs/wenge_outer.json | 8 + .../block/arboriculture/stairs/willow.json | 8 + .../arboriculture/stairs/willow_inner.json | 8 + .../arboriculture/stairs/willow_outer.json | 8 + .../block/arboriculture/stairs/zebrawood.json | 8 + .../arboriculture/stairs/zebrawood_inner.json | 8 + .../arboriculture/stairs/zebrawood_outer.json | 8 + .../models/block/beehives/desert.json | 12 + .../forestry/models/block/beehives/end.json | 12 + .../models/block/beehives/forest.json | 12 + .../models/block/beehives/jungle.json | 12 + .../models/block/beehives/meadows.json | 12 + .../forestry/models/block/beehives/snow.json | 12 + .../forestry/models/block/beehives/swamp.json | 12 + .../assets/forestry/models/block/candle.json | 130 ++ .../forestry/models/block/candle_off.json | 7 + .../forestry/models/block/candle_on.json | 7 + .../forestry/models/block/candle_up.json | 98 ++ .../forestry/models/block/candle_up_off.json | 7 + .../forestry/models/block/candle_up_on.json | 7 + .../forestry/models/block/crate-filled.json | 6 + .../models/block/factory2_fabricator.json | 12 + .../models/block/factory2_raintank.json | 12 + .../models/block/factory2_worktable.json | 12 + .../assets/forestry/models/block/ffarm.json | 6 + .../block/germlings/sapling.treeAcacia.json | 6 + .../germlings/sapling.treeAcaciaVanilla.json | 6 + .../block/germlings/sapling.treeBalsa.json | 6 + .../block/germlings/sapling.treeBaobab.json | 6 + .../block/germlings/sapling.treeBirch.json | 6 + .../block/germlings/sapling.treeCherry.json | 6 + .../block/germlings/sapling.treeChestnut.json | 6 + .../block/germlings/sapling.treeCocobolo.json | 6 + .../block/germlings/sapling.treeDarkOak.json | 6 + .../block/germlings/sapling.treeDate.json | 6 + .../block/germlings/sapling.treeEbony.json | 6 + .../block/germlings/sapling.treeGigant.json | 6 + .../block/germlings/sapling.treeIpe.json | 6 + .../block/germlings/sapling.treeJungle.json | 6 + .../block/germlings/sapling.treeKapok.json | 6 + .../block/germlings/sapling.treeLarch.json | 6 + .../block/germlings/sapling.treeLemon.json | 6 + .../block/germlings/sapling.treeLime.json | 6 + .../block/germlings/sapling.treeMahoe.json | 6 + .../block/germlings/sapling.treeMahogony.json | 6 + .../block/germlings/sapling.treeMaple.json | 6 + .../block/germlings/sapling.treeOak.json | 6 + .../block/germlings/sapling.treePadauk.json | 6 + .../block/germlings/sapling.treePapaya.json | 6 + .../block/germlings/sapling.treePine.json | 6 + .../block/germlings/sapling.treePlum.json | 6 + .../block/germlings/sapling.treePoplar.json | 6 + .../block/germlings/sapling.treeSequioa.json | 6 + .../block/germlings/sapling.treeSipiri.json | 6 + .../block/germlings/sapling.treeSpruce.json | 6 + .../block/germlings/sapling.treeTeak.json | 6 + .../block/germlings/sapling.treeWalnut.json | 6 + .../block/germlings/sapling.treeWenge.json | 6 + .../block/germlings/sapling.treeWillow.json | 6 + .../germlings/sapling.treeZebrawood.json | 6 + .../assets/forestry/models/block/leaves.json | 6 + .../assets/forestry/models/block/machine.json | 56 + .../forestry/models/block/mail_mailbox.json | 12 + .../models/block/mail_philatelist.json | 12 + .../models/block/mail_tradestation.json | 12 + .../forestry/models/block/ores/apatite.json | 6 + .../forestry/models/block/ores/copper.json | 6 + .../forestry/models/block/ores/tin.json | 6 + .../forestry/models/block/pods/dates_0.json | 7 + .../forestry/models/block/pods/dates_1.json | 7 + .../forestry/models/block/pods/dates_2.json | 7 + .../forestry/models/block/pods/papaya_0.json | 7 + .../forestry/models/block/pods/papaya_1.json | 7 + .../forestry/models/block/pods/papaya_2.json | 7 + .../forestry/models/block/soil/bog.json | 6 + .../forestry/models/block/soil/humus.json | 6 + .../forestry/models/block/soil/peat.json | 6 + .../models/block/storage/apatite.json | 6 + .../forestry/models/block/storage/bronze.json | 6 + .../forestry/models/block/storage/copper.json | 6 + .../forestry/models/block/storage/tin.json | 6 + .../assets/forestry/models/item/ambrosia.json | 18 + .../assets/forestry/models/item/apatite.json | 18 + .../forestry/models/item/apiaristBoots.json | 18 + .../forestry/models/item/apiaristChest.json | 18 + .../forestry/models/item/apiaristHelmet.json | 18 + .../forestry/models/item/apiaristLegs.json | 18 + .../item/apiculture/alveary.entrance.json | 10 + .../models/item/apiculture/alveary.fan.json | 10 + .../item/apiculture/alveary.heater.json | 10 + .../models/item/apiculture/alveary.hygro.json | 10 + .../models/item/apiculture/alveary.plain.json | 10 + .../models/item/apiculture/alveary.sieve.json | 10 + .../item/apiculture/alveary.stabiliser.json | 10 + .../item/apiculture/alveary.swarmer.json | 10 + .../item/apicultureChest_apiarist_chest.json | 3 + .../models/item/apiculture_apiary.json | 10 + .../models/item/apiculture_beehouse.json | 10 + .../models/item/arboriculture_arbchest.json | 3 + .../assets/forestry/models/item/ash.json | 18 + .../models/item/backpacks/t1_locked.json | 20 + .../models/item/backpacks/t1_neutral.json | 19 + .../models/item/backpacks/t1_receive.json | 20 + .../models/item/backpacks/t1_resupply.json | 20 + .../models/item/backpacks/t2_locked.json | 20 + .../models/item/backpacks/t2_neutral.json | 19 + .../models/item/backpacks/t2_receive.json | 20 + .../models/item/backpacks/t2_resupply.json | 20 + .../assets/forestry/models/item/beeCombs.json | 19 + .../forestry/models/item/beealyzer.json | 18 + .../forestry/models/item/beecombs/cocoa.json | 3 + .../models/item/beecombs/darkened.json | 3 + .../models/item/beecombs/dripping.json | 3 + .../forestry/models/item/beecombs/frozen.json | 3 + .../forestry/models/item/beecombs/honey.json | 3 + .../models/item/beecombs/irradiated.json | 3 + .../forestry/models/item/beecombs/mellow.json | 3 + .../forestry/models/item/beecombs/mossy.json | 3 + .../models/item/beecombs/mysterious.json | 3 + .../forestry/models/item/beecombs/omega.json | 3 + .../models/item/beecombs/parched.json | 3 + .../models/item/beecombs/powdery.json | 3 + .../models/item/beecombs/reddened.json | 3 + .../forestry/models/item/beecombs/silky.json | 3 + .../models/item/beecombs/simmering.json | 3 + .../models/item/beecombs/stringy.json | 3 + .../models/item/beecombs/wheaten.json | 3 + .../forestry/models/item/beehives/desert.json | 10 + .../forestry/models/item/beehives/end.json | 10 + .../forestry/models/item/beehives/forest.json | 10 + .../forestry/models/item/beehives/jungle.json | 10 + .../models/item/beehives/meadows.json | 10 + .../forestry/models/item/beehives/snow.json | 10 + .../forestry/models/item/beehives/swamp.json | 10 + .../models/item/bees/default/drone.json | 20 + .../models/item/bees/default/larvae.json | 20 + .../models/item/bees/default/princess.json | 20 + .../models/item/bees/default/queen.json | 20 + .../assets/forestry/models/item/beeswax.json | 18 + .../forestry/models/item/bituminousPeat.json | 18 + .../models/item/brokenBronzePickaxe.json | 18 + .../models/item/brokenBronzeShovel.json | 18 + .../forestry/models/item/bronzePickaxe.json | 18 + .../forestry/models/item/bronzeShovel.json | 18 + .../forestry/models/item/bucketBiofuel.json | 18 + .../forestry/models/item/bucketBiomass.json | 18 + .../assets/forestry/models/item/candle.json | 18 + .../forestry/models/item/cart.apiary.json | 18 + .../forestry/models/item/cart.beehouse.json | 18 + .../assets/forestry/models/item/carton.json | 18 + .../forestry/models/item/catalogue.json | 18 + .../forestry/models/item/caterpillar.json | 19 + .../assets/forestry/models/item/chipsets.json | 19 + .../forestry/models/item/core_analyzer.json | 3 + .../forestry/models/item/core_escritoire.json | 3 + .../craftingMaterial/dissipationCharge.json | 18 + .../fertilizerCompound - Kopie (11).json | 18 + .../item/craftingMaterial/iceShard.json | 18 + .../item/craftingMaterial/pulsatingDust.json | 18 + .../item/craftingMaterial/pulsatingMesh.json | 18 + .../craftingMaterial/scentedPaneling.json | 18 + .../item/craftingMaterial/silkWisp.json | 18 + .../item/craftingMaterial/wovenSilk.json | 18 + .../assets/forestry/models/item/crate.json | 18 + .../forestry/models/item/decayingWheat.json | 18 + .../models/item/dissipationCharge.json | 13 + .../forestry/models/item/engine_biogas.json | 3 + .../models/item/engine_clockwork.json | 3 + .../models/item/engine_generator.json | 3 + .../forestry/models/item/engine_peat.json | 3 + .../models/item/factory2_fabricator.json | 10 + .../models/item/factory2_raintank.json | 10 + .../models/item/factory2_worktable.json | 10 + .../forestry/models/item/factory_bottler.json | 3 + .../models/item/factory_carpenter.json | 3 + .../models/item/factory_centrifuge.json | 3 + .../models/item/factory_fermenter.json | 3 + .../models/item/factory_moistener.json | 3 + .../models/item/factory_rainmaker.json | 3 + .../models/item/factory_squeezer.json | 3 + .../forestry/models/item/factory_still.json | 3 + .../forestry/models/item/fences/acacia.json | 13 + .../forestry/models/item/fences/balsa.json | 13 + .../forestry/models/item/fences/baobab.json | 13 + .../forestry/models/item/fences/cherry.json | 13 + .../forestry/models/item/fences/chestnut.json | 13 + .../forestry/models/item/fences/citrus.json | 13 + .../forestry/models/item/fences/cocobolo.json | 13 + .../forestry/models/item/fences/ebony.json | 13 + .../models/item/fences/giganteum.json | 13 + .../models/item/fences/greenheart.json | 13 + .../forestry/models/item/fences/ipe.json | 13 + .../forestry/models/item/fences/kapok.json | 13 + .../forestry/models/item/fences/larch.json | 13 + .../forestry/models/item/fences/lime.json | 13 + .../forestry/models/item/fences/mahoe.json | 13 + .../forestry/models/item/fences/mahogany.json | 13 + .../forestry/models/item/fences/maple.json | 13 + .../forestry/models/item/fences/padauk.json | 13 + .../forestry/models/item/fences/palm.json | 13 + .../forestry/models/item/fences/papaya.json | 13 + .../forestry/models/item/fences/pine.json | 13 + .../forestry/models/item/fences/plum.json | 13 + .../forestry/models/item/fences/poplar.json | 13 + .../forestry/models/item/fences/sequoia.json | 13 + .../forestry/models/item/fences/teak.json | 13 + .../forestry/models/item/fences/walnut.json | 13 + .../forestry/models/item/fences/wenge.json | 13 + .../forestry/models/item/fences/willow.json | 13 + .../models/item/fences/zebrawood.json | 13 + .../forestry/models/item/fertilizerBio.json | 18 + .../models/item/fertilizerCompound.json | 18 + .../assets/forestry/models/item/ffarm.json | 10 + .../forestry/models/item/flutterlyzer.json | 18 + .../models/item/frameImpregnated.json | 13 + .../forestry/models/item/frameProven.json | 13 + .../forestry/models/item/frameUntreated.json | 18 + .../forestry/models/item/fruits/cherry.json | 18 + .../forestry/models/item/fruits/chestnut.json | 18 + .../forestry/models/item/fruits/dates.json | 18 + .../forestry/models/item/fruits/lemon.json | 18 + .../forestry/models/item/fruits/papaya.json | 18 + .../forestry/models/item/fruits/plum.json | 18 + .../forestry/models/item/fruits/walnut.json | 18 + .../forestry/models/item/gearBronze.json | 18 + .../forestry/models/item/gearCopper.json | 18 + .../assets/forestry/models/item/gearTin.json | 18 + .../item/germlings/sapling.treeAcacia.json | 6 + .../item/germlings/sapling.treeBalsa.json | 6 + .../item/germlings/sapling.treeBaobab.json | 6 + .../item/germlings/sapling.treeCherry.json | 6 + .../item/germlings/sapling.treeChestnut.json | 6 + .../item/germlings/sapling.treeCocobolo.json | 6 + .../item/germlings/sapling.treeDate.json | 6 + .../item/germlings/sapling.treeEbony.json | 6 + .../item/germlings/sapling.treeGigant.json | 6 + .../item/germlings/sapling.treeIpe.json | 6 + .../item/germlings/sapling.treeKapok.json | 6 + .../item/germlings/sapling.treeLarch.json | 6 + .../item/germlings/sapling.treeLemon.json | 6 + .../item/germlings/sapling.treeLime.json | 6 + .../item/germlings/sapling.treeMahoe.json | 6 + .../item/germlings/sapling.treeMahogony.json | 6 + .../item/germlings/sapling.treeMaple.json | 6 + .../item/germlings/sapling.treePadauk.json | 6 + .../item/germlings/sapling.treePapaya.json | 6 + .../item/germlings/sapling.treePine.json | 6 + .../item/germlings/sapling.treePlum.json | 6 + .../item/germlings/sapling.treePoplar.json | 6 + .../item/germlings/sapling.treeSequioa.json | 6 + .../item/germlings/sapling.treeSipiri.json | 6 + .../item/germlings/sapling.treeTeak.json | 6 + .../item/germlings/sapling.treeWalnut.json | 6 + .../item/germlings/sapling.treeWenge.json | 6 + .../item/germlings/sapling.treeWillow.json | 6 + .../item/germlings/sapling.treeZebrawood.json | 6 + .../assets/forestry/models/item/grafter.json | 18 + .../forestry/models/item/grafterProven.json | 18 + .../forestry/models/item/habitatLocator.json | 13 + .../forestry/models/item/hardenedMachine.json | 18 + .../forestry/models/item/honeyDrop.json | 19 + .../assets/forestry/models/item/honeyPot.json | 18 + .../assets/forestry/models/item/honeydew.json | 13 + .../forestry/models/item/honeyedSlice.json | 18 + .../assets/forestry/models/item/iceShard.json | 13 + .../models/item/impregnatedCasing.json | 18 + .../forestry/models/item/imprinter.json | 18 + .../assets/forestry/models/item/infuser.json | 18 + .../forestry/models/item/ingotBronze.json | 18 + .../forestry/models/item/ingotCopper.json | 18 + .../assets/forestry/models/item/ingotTin.json | 18 + .../forestry/models/item/iodineCapsule.json | 18 + .../forestry/models/item/kitPickaxe.json | 18 + .../forestry/models/item/kitShovel.json | 18 + .../assets/forestry/models/item/leaves.json | 10 + .../item/lepidopterology_lepichest.json | 3 + .../forestry/models/item/liquids/bucket.json | 19 + .../forestry/models/item/liquids/can.json | 19 + .../forestry/models/item/liquids/capsule.json | 19 + .../forestry/models/item/liquids/glass.json | 19 + .../forestry/models/item/liquids/jar.json | 19 + .../models/item/liquids/refractory.json | 19 + .../forestry/models/item/log/acacia.json | 10 + .../forestry/models/item/log/balsa.json | 10 + .../forestry/models/item/log/baobab.json | 10 + .../forestry/models/item/log/cherry.json | 10 + .../forestry/models/item/log/chestnut.json | 10 + .../forestry/models/item/log/citrus.json | 10 + .../forestry/models/item/log/cocobolo.json | 10 + .../forestry/models/item/log/ebony.json | 10 + .../forestry/models/item/log/giganteum.json | 10 + .../forestry/models/item/log/greenheart.json | 10 + .../assets/forestry/models/item/log/ipe.json | 10 + .../forestry/models/item/log/kapok.json | 10 + .../forestry/models/item/log/larch.json | 10 + .../assets/forestry/models/item/log/lime.json | 10 + .../forestry/models/item/log/mahoe.json | 10 + .../forestry/models/item/log/mahogany.json | 10 + .../forestry/models/item/log/maple.json | 10 + .../forestry/models/item/log/padauk.json | 10 + .../assets/forestry/models/item/log/palm.json | 10 + .../forestry/models/item/log/papaya.json | 10 + .../assets/forestry/models/item/log/pine.json | 10 + .../assets/forestry/models/item/log/plum.json | 10 + .../forestry/models/item/log/poplar.json | 10 + .../forestry/models/item/log/sequoia.json | 10 + .../assets/forestry/models/item/log/teak.json | 10 + .../forestry/models/item/log/walnut.json | 10 + .../forestry/models/item/log/wenge.json | 10 + .../forestry/models/item/log/willow.json | 10 + .../forestry/models/item/log/zebrawood.json | 10 + .../models/item/mail/letter.0.emptied.json | 18 + .../models/item/mail/letter.0.fresh.json | 18 + .../models/item/mail/letter.0.opened.json | 18 + .../models/item/mail/letter.0.stamped.json | 18 + .../models/item/mail/letter.1.emptied.json | 18 + .../models/item/mail/letter.1.fresh.json | 18 + .../models/item/mail/letter.1.opened.json | 18 + .../models/item/mail/letter.1.stamped.json | 18 + .../models/item/mail/letter.2.emptied.json | 18 + .../models/item/mail/letter.2.fresh.json | 18 + .../models/item/mail/letter.2.opened.json | 18 + .../models/item/mail/letter.2.stamped.json | 18 + .../forestry/models/item/mail_mailbox.json | 10 + .../models/item/mail_philatelist.json | 10 + .../models/item/mail_tradestation.json | 10 + .../forestry/models/item/mouldyWheat.json | 18 + .../assets/forestry/models/item/mulch.json | 18 + .../models/item/naturalistHelmet.json | 18 + .../assets/forestry/models/item/oakStick.json | 18 + .../forestry/models/item/ores/apatite.json | 10 + .../forestry/models/item/ores/copper.json | 10 + .../assets/forestry/models/item/ores/tin.json | 10 + .../assets/forestry/models/item/peat.json | 18 + .../assets/forestry/models/item/phosphor.json | 18 + .../forestry/models/item/pipette.0.json | 18 + .../forestry/models/item/pipette.1.json | 18 + .../assets/forestry/models/item/planks.json | 13 + .../forestry/models/item/planks/acacia.json | 10 + .../forestry/models/item/planks/balsa.json | 10 + .../forestry/models/item/planks/baobab.json | 10 + .../forestry/models/item/planks/cherry.json | 10 + .../forestry/models/item/planks/chestnut.json | 10 + .../forestry/models/item/planks/citrus.json | 10 + .../forestry/models/item/planks/cocobolo.json | 10 + .../forestry/models/item/planks/ebony.json | 10 + .../models/item/planks/giganteum.json | 10 + .../models/item/planks/greenheart.json | 10 + .../forestry/models/item/planks/ipe.json | 10 + .../forestry/models/item/planks/kapok.json | 10 + .../forestry/models/item/planks/larch.json | 10 + .../forestry/models/item/planks/lime.json | 10 + .../forestry/models/item/planks/mahoe.json | 10 + .../forestry/models/item/planks/mahogany.json | 10 + .../forestry/models/item/planks/maple.json | 10 + .../forestry/models/item/planks/padauk.json | 10 + .../forestry/models/item/planks/palm.json | 10 + .../forestry/models/item/planks/papaya.json | 10 + .../forestry/models/item/planks/pine.json | 10 + .../forestry/models/item/planks/plum.json | 10 + .../forestry/models/item/planks/poplar.json | 10 + .../forestry/models/item/planks/sequoia.json | 10 + .../forestry/models/item/planks/teak.json | 10 + .../forestry/models/item/planks/walnut.json | 10 + .../forestry/models/item/planks/wenge.json | 10 + .../forestry/models/item/planks/willow.json | 10 + .../models/item/planks/zebrawood.json | 10 + .../assets/forestry/models/item/pollen.json | 19 + .../assets/forestry/models/item/propolis.json | 13 + .../forestry/models/item/pulsatingDust.json | 18 + .../forestry/models/item/pulsatingMesh.json | 18 + .../forestry/models/item/refractoryWax.json | 18 + .../forestry/models/item/researchNote.json | 3 + .../models/item/resources_copper.json | 10 + .../forestry/models/item/royalJelly.json | 13 + .../forestry/models/item/scentedPaneling.json | 13 + .../assets/forestry/models/item/scoop.json | 13 + .../assets/forestry/models/item/silkWisp.json | 13 + .../forestry/models/item/slab/acacia.json | 10 + .../forestry/models/item/slab/balsa.json | 10 + .../forestry/models/item/slab/baobab.json | 10 + .../forestry/models/item/slab/cherry.json | 10 + .../forestry/models/item/slab/chestnut.json | 10 + .../forestry/models/item/slab/citrus.json | 10 + .../forestry/models/item/slab/cocobolo.json | 10 + .../forestry/models/item/slab/ebony.json | 10 + .../forestry/models/item/slab/giganteum.json | 10 + .../forestry/models/item/slab/greenheart.json | 10 + .../assets/forestry/models/item/slab/ipe.json | 10 + .../forestry/models/item/slab/kapok.json | 10 + .../forestry/models/item/slab/larch.json | 10 + .../forestry/models/item/slab/lime.json | 10 + .../forestry/models/item/slab/mahoe.json | 10 + .../forestry/models/item/slab/mahogany.json | 10 + .../forestry/models/item/slab/maple.json | 10 + .../forestry/models/item/slab/padauk.json | 10 + .../forestry/models/item/slab/palm.json | 10 + .../forestry/models/item/slab/papaya.json | 10 + .../forestry/models/item/slab/pine.json | 10 + .../forestry/models/item/slab/plum.json | 10 + .../forestry/models/item/slab/poplar.json | 10 + .../forestry/models/item/slab/sequoia.json | 10 + .../forestry/models/item/slab/teak.json | 10 + .../forestry/models/item/slab/walnut.json | 10 + .../forestry/models/item/slab/wenge.json | 10 + .../forestry/models/item/slab/willow.json | 10 + .../forestry/models/item/slab/zebrawood.json | 10 + .../assets/forestry/models/item/slabs.json | 13 + .../assets/forestry/models/item/soil/bog.json | 10 + .../forestry/models/item/soil/humus.json | 10 + .../forestry/models/item/soil/peat.json | 10 + .../forestry/models/item/solderingIron.json | 18 + .../assets/forestry/models/item/stairs.json | 13 + .../forestry/models/item/stairs/acacia.json | 13 + .../forestry/models/item/stairs/balsa.json | 13 + .../forestry/models/item/stairs/baobab.json | 13 + .../forestry/models/item/stairs/cherry.json | 13 + .../forestry/models/item/stairs/chestnut.json | 13 + .../forestry/models/item/stairs/citrus.json | 13 + .../forestry/models/item/stairs/cocobolo.json | 13 + .../forestry/models/item/stairs/ebony.json | 13 + .../models/item/stairs/giganteum.json | 13 + .../models/item/stairs/greenheart.json | 13 + .../forestry/models/item/stairs/ipe.json | 13 + .../forestry/models/item/stairs/kapok.json | 13 + .../forestry/models/item/stairs/larch.json | 13 + .../forestry/models/item/stairs/lime.json | 13 + .../forestry/models/item/stairs/mahoe.json | 13 + .../forestry/models/item/stairs/mahogany.json | 13 + .../forestry/models/item/stairs/maple.json | 13 + .../forestry/models/item/stairs/padauk.json | 13 + .../forestry/models/item/stairs/palm.json | 13 + .../forestry/models/item/stairs/papaya.json | 13 + .../forestry/models/item/stairs/pine.json | 13 + .../forestry/models/item/stairs/plum.json | 13 + .../forestry/models/item/stairs/poplar.json | 13 + .../forestry/models/item/stairs/sequoia.json | 13 + .../forestry/models/item/stairs/teak.json | 13 + .../forestry/models/item/stairs/walnut.json | 13 + .../forestry/models/item/stairs/wenge.json | 13 + .../forestry/models/item/stairs/willow.json | 13 + .../models/item/stairs/zebrawood.json | 13 + .../forestry/models/item/stairsFireproof.json | 13 + .../assets/forestry/models/item/stamps.json | 19 + .../assets/forestry/models/item/stick.json | 18 + .../forestry/models/item/storage/apatite.json | 10 + .../forestry/models/item/storage/bronze.json | 10 + .../forestry/models/item/storage/copper.json | 10 + .../forestry/models/item/storage/tin.json | 10 + .../assets/forestry/models/item/stump.json | 18 + .../forestry/models/item/sturdyMachine.json | 18 + .../forestry/models/item/thermionicTubes.json | 19 + .../forestry/models/item/treealyzer.json | 18 + .../assets/forestry/models/item/waxCast.json | 13 + .../assets/forestry/models/item/woodPulp.json | 18 + .../forestry/models/item/wovenSilk.json | 13 + .../assets/forestry/models/item/wrench.json | 18 + .../blockstates/test_layer_block.json | 23 + 1657 files changed, 26844 insertions(+), 13269 deletions(-) create mode 100644 src/main/java/forestry/apiculture/blocks/BlockApicultureChestType.java delete mode 100644 src/main/java/forestry/apiculture/genetics/DefaultBeeIconProvider.java create mode 100644 src/main/java/forestry/apiculture/genetics/DefaultBeeModelProvider.java rename src/main/java/forestry/apiculture/genetics/{DefaultBeeIconColourProvider.java => DefaultBeeSpriteColourProvider.java} (76%) delete mode 100644 src/main/java/forestry/apiculture/render/RenderCandleBlock.java create mode 100644 src/main/java/forestry/arboriculture/blocks/BlockSlabDouble.java create mode 100644 src/main/java/forestry/arboriculture/blocks/property/PropertyFruit.java create mode 100644 src/main/java/forestry/arboriculture/blocks/property/PropertyTree.java delete mode 100644 src/main/java/forestry/arboriculture/render/IconProviderGermling.java delete mode 100644 src/main/java/forestry/arboriculture/render/IconProviderGermlingVanilla.java delete mode 100644 src/main/java/forestry/arboriculture/render/IconProviderWood.java create mode 100644 src/main/java/forestry/arboriculture/render/ModelLeaves.java create mode 100644 src/main/java/forestry/arboriculture/render/ModelProviderGermling.java create mode 100644 src/main/java/forestry/arboriculture/render/ModelProviderGermlingVanilla.java delete mode 100644 src/main/java/forestry/arboriculture/render/RenderFenceItem.java delete mode 100644 src/main/java/forestry/arboriculture/render/RenderFruitPodBlock.java delete mode 100644 src/main/java/forestry/arboriculture/render/RenderLeavesBlock.java delete mode 100644 src/main/java/forestry/arboriculture/render/RenderLeavesItem.java delete mode 100644 src/main/java/forestry/arboriculture/render/RenderLogItem.java delete mode 100644 src/main/java/forestry/arboriculture/render/RenderPlankItem.java delete mode 100644 src/main/java/forestry/arboriculture/render/RenderSaplingBlock.java delete mode 100644 src/main/java/forestry/arboriculture/render/RenderSlabItem.java delete mode 100644 src/main/java/forestry/arboriculture/render/RenderStairItem.java rename src/main/java/forestry/arboriculture/render/{IconProviderLeaves.java => SpriteProviderLeaves.java} (78%) create mode 100644 src/main/java/forestry/arboriculture/render/StateMapperFluidPod.java create mode 100644 src/main/java/forestry/arboriculture/render/StateMapperSapling.java create mode 100644 src/main/java/forestry/core/blocks/propertys/PropertyAllele.java create mode 100644 src/main/java/forestry/core/blocks/propertys/UnlistedBlockAccess.java rename src/main/java/forestry/core/{recipes/nei/ItemFilterOther.java => blocks/propertys/UnlistedBlockPos.java} (52%) delete mode 100644 src/main/java/forestry/core/items/ItemForestryMultiPass.java create mode 100644 src/main/java/forestry/core/recipes/jei/ForestryRecipeCategory.java create mode 100644 src/main/java/forestry/core/recipes/jei/ForestryRecipeCategoryUid.java create mode 100644 src/main/java/forestry/core/recipes/jei/ForestryRecipeWrapper.java create mode 100644 src/main/java/forestry/core/recipes/jei/ForestryTooltipCallback.java create mode 100644 src/main/java/forestry/core/recipes/jei/JEIIntegrationPlugin.java rename src/main/java/forestry/core/recipes/{nei/NEIUtils.java => jei/JEIUtils.java} (94%) delete mode 100644 src/main/java/forestry/core/recipes/nei/CustomOverlayHandler.java delete mode 100644 src/main/java/forestry/core/recipes/nei/IRecipeHandlerBase.java delete mode 100644 src/main/java/forestry/core/recipes/nei/ItemFilterForestry.java delete mode 100644 src/main/java/forestry/core/recipes/nei/ItemFilterGenetic.java delete mode 100644 src/main/java/forestry/core/recipes/nei/NEIIntegrationConfig.java delete mode 100644 src/main/java/forestry/core/recipes/nei/PositionedFluidTank.java delete mode 100644 src/main/java/forestry/core/recipes/nei/PositionedStackAdv.java delete mode 100644 src/main/java/forestry/core/recipes/nei/RecipeHandlerBase.java delete mode 100644 src/main/java/forestry/core/recipes/nei/SetRecipeCommandHandler.java delete mode 100644 src/main/java/forestry/core/render/IBlockRenderer.java delete mode 100644 src/main/java/forestry/core/render/RenderBlock.java delete mode 100644 src/main/java/forestry/core/render/RenderCrateItem.java delete mode 100644 src/main/java/forestry/core/render/RenderOverlayBlock.java create mode 100644 src/main/java/forestry/core/render/StateMapperForestry.java create mode 100644 src/main/java/forestry/core/render/StateMapperMachine.java create mode 100644 src/main/java/forestry/core/render/model/BlockModelIndex.java create mode 100644 src/main/java/forestry/core/render/model/ModelBaker.java create mode 100644 src/main/java/forestry/core/render/model/ModelBakerFace.java create mode 100644 src/main/java/forestry/core/render/model/ModelBakerModel.java create mode 100644 src/main/java/forestry/core/render/model/ModelBlockOverlay.java create mode 100644 src/main/java/forestry/core/render/model/ModelCrate.java rename src/main/java/forestry/core/render/{ => model}/ModelEscritoire.java (99%) mode change 100755 => 100644 rename src/main/java/forestry/core/render/{SpriteSheet.java => model/ModelIndex.java} (60%) mode change 100755 => 100644 create mode 100644 src/main/java/forestry/core/render/model/ModelManager.java create mode 100644 src/main/java/forestry/core/render/model/RenderHandler.java delete mode 100644 src/main/java/forestry/factory/network/packets/PacketWorktableNEISelect.java create mode 100644 src/main/java/forestry/factory/recipes/jei/bottler/BottlerRecipeCategory.java create mode 100644 src/main/java/forestry/factory/recipes/jei/bottler/BottlerRecipeHandler.java create mode 100644 src/main/java/forestry/factory/recipes/jei/bottler/BottlerRecipeMaker.java create mode 100644 src/main/java/forestry/factory/recipes/jei/bottler/BottlerRecipeWrapper.java create mode 100644 src/main/java/forestry/factory/recipes/jei/carpenter/CarpenterRecipeCategory.java create mode 100644 src/main/java/forestry/factory/recipes/jei/carpenter/CarpenterRecipeHandler.java create mode 100644 src/main/java/forestry/factory/recipes/jei/carpenter/CarpenterRecipeMaker.java create mode 100644 src/main/java/forestry/factory/recipes/jei/carpenter/CarpenterRecipeWrapper.java create mode 100644 src/main/java/forestry/factory/recipes/jei/centrifuge/CentrifugeRecipeCategory.java create mode 100644 src/main/java/forestry/factory/recipes/jei/centrifuge/CentrifugeRecipeHandler.java create mode 100644 src/main/java/forestry/factory/recipes/jei/centrifuge/CentrifugeRecipeMaker.java create mode 100644 src/main/java/forestry/factory/recipes/jei/centrifuge/CentrifugeRecipeWrapper.java create mode 100644 src/main/java/forestry/factory/recipes/jei/fabricator/FabricatorRecipeCategory.java create mode 100644 src/main/java/forestry/factory/recipes/jei/fabricator/FabricatorRecipeHandler.java create mode 100644 src/main/java/forestry/factory/recipes/jei/fabricator/FabricatorRecipeMaker.java create mode 100644 src/main/java/forestry/factory/recipes/jei/fabricator/FabricatorRecipeWrapper.java create mode 100644 src/main/java/forestry/factory/recipes/jei/fermenter/FermenterRecipeCategory.java create mode 100644 src/main/java/forestry/factory/recipes/jei/fermenter/FermenterRecipeHandler.java create mode 100644 src/main/java/forestry/factory/recipes/jei/fermenter/FermenterRecipeMaker.java create mode 100644 src/main/java/forestry/factory/recipes/jei/fermenter/FermenterRecipeWrapper.java create mode 100644 src/main/java/forestry/factory/recipes/jei/moistener/MoistenerRecipeCategory.java create mode 100644 src/main/java/forestry/factory/recipes/jei/moistener/MoistenerRecipeHandler.java create mode 100644 src/main/java/forestry/factory/recipes/jei/moistener/MoistenerRecipeMaker.java create mode 100644 src/main/java/forestry/factory/recipes/jei/moistener/MoistenerRecipeWrapper.java create mode 100644 src/main/java/forestry/factory/recipes/jei/squeezer/SqueezerContainerRecipeWrapper.java create mode 100644 src/main/java/forestry/factory/recipes/jei/squeezer/SqueezerRecipeCategory.java create mode 100644 src/main/java/forestry/factory/recipes/jei/squeezer/SqueezerRecipeHandler.java create mode 100644 src/main/java/forestry/factory/recipes/jei/squeezer/SqueezerRecipeMaker.java create mode 100644 src/main/java/forestry/factory/recipes/jei/squeezer/SqueezerRecipeWrapper.java create mode 100644 src/main/java/forestry/factory/recipes/jei/still/StillRecipeCategory.java create mode 100644 src/main/java/forestry/factory/recipes/jei/still/StillRecipeHandler.java create mode 100644 src/main/java/forestry/factory/recipes/jei/still/StillRecipeMaker.java create mode 100644 src/main/java/forestry/factory/recipes/jei/still/StillRecipeWrapper.java delete mode 100644 src/main/java/forestry/factory/recipes/nei/NEIHandlerBottler.java delete mode 100644 src/main/java/forestry/factory/recipes/nei/NEIHandlerCarpenter.java delete mode 100644 src/main/java/forestry/factory/recipes/nei/NEIHandlerCentrifuge.java delete mode 100644 src/main/java/forestry/factory/recipes/nei/NEIHandlerFabricator.java delete mode 100644 src/main/java/forestry/factory/recipes/nei/NEIHandlerFermenter.java delete mode 100644 src/main/java/forestry/factory/recipes/nei/NEIHandlerMoistener.java delete mode 100644 src/main/java/forestry/factory/recipes/nei/NEIHandlerSqueezer.java delete mode 100644 src/main/java/forestry/factory/recipes/nei/NEIHandlerStill.java delete mode 100644 src/main/java/forestry/farming/blocks/BlockFarmType.java create mode 100644 src/main/java/forestry/farming/blocks/EnumBlockFarmType.java create mode 100644 src/main/java/forestry/farming/render/ModelFarmBlock.java delete mode 100644 src/main/java/forestry/farming/render/RenderFarmBlock.java delete mode 100644 src/main/java/forestry/farming/render/RenderFarmItem.java create mode 100644 src/main/java/forestry/lepidopterology/render/ModelButterflyItem.java delete mode 100644 src/main/java/forestry/lepidopterology/render/RenderButterflyItem.java create mode 100644 src/main/java/forestry/lepidopterology/render/TextureAtlasButterfly.java delete mode 100644 src/main/java/forestry/plugins/compat/PluginAgriCraft.java delete mode 100644 src/main/java/forestry/plugins/compat/PluginEnderIO.java delete mode 100644 src/main/java/forestry/plugins/compat/PluginErebus.java delete mode 100644 src/main/java/forestry/plugins/compat/PluginExtraUtilities.java delete mode 100644 src/main/java/forestry/plugins/compat/PluginGrowthCraft.java delete mode 100644 src/main/java/forestry/plugins/compat/PluginHarvestCraft.java delete mode 100644 src/main/java/forestry/plugins/compat/PluginImmersiveEngineering.java delete mode 100644 src/main/java/forestry/plugins/compat/PluginMagicalCrops.java delete mode 100644 src/main/java/forestry/plugins/compat/PluginPlantMegaPack.java delete mode 100644 src/main/java/forestry/plugins/compat/PluginRotaryCraft.java delete mode 100644 src/main/java/forestry/plugins/compat/PluginWitchery.java create mode 100644 src/main/java/net/minecraftforge/debug/DynBucketTest.java create mode 100644 src/main/java/net/minecraftforge/debug/EnumPlantTypeTest.java create mode 100644 src/main/java/net/minecraftforge/debug/ForgeBlockStatesLoaderDebug.java create mode 100644 src/main/java/net/minecraftforge/debug/ItemLayerModelDebug.java create mode 100644 src/main/java/net/minecraftforge/debug/ItemTileDebug.java create mode 100644 src/main/java/net/minecraftforge/debug/LayerBreakingTest.java create mode 100644 src/main/java/net/minecraftforge/debug/ModelAnimationDebug.java create mode 100644 src/main/java/net/minecraftforge/debug/ModelBakeEventDebug.java create mode 100644 src/main/java/net/minecraftforge/debug/ModelFluidDebug.java create mode 100644 src/main/java/net/minecraftforge/debug/ModelLoaderRegistryDebug.java create mode 100644 src/main/java/net/minecraftforge/debug/MultiLayerModelDebug.java create mode 100644 src/main/java/net/minecraftforge/debug/NoPotionEffectRenderTest.java create mode 100644 src/main/java/net/minecraftforge/debug/PotionRegistryDebug.java create mode 100644 src/main/resources/assets/forestry/blockstates/alveary.json create mode 100644 src/main/resources/assets/forestry/blockstates/apiculture/alveary_entrance.json create mode 100644 src/main/resources/assets/forestry/blockstates/apiculture/alveary_fan.json create mode 100644 src/main/resources/assets/forestry/blockstates/apiculture/alveary_heater.json create mode 100644 src/main/resources/assets/forestry/blockstates/apiculture/alveary_hygro.json create mode 100644 src/main/resources/assets/forestry/blockstates/apiculture/alveary_plain.json create mode 100644 src/main/resources/assets/forestry/blockstates/apiculture/alveary_sieve.json create mode 100644 src/main/resources/assets/forestry/blockstates/apiculture/alveary_stabiliser.json create mode 100644 src/main/resources/assets/forestry/blockstates/apiculture/alveary_swarmer.json create mode 100644 src/main/resources/assets/forestry/blockstates/apiculture_apiary.json create mode 100644 src/main/resources/assets/forestry/blockstates/apiculture_beehouse.json create mode 100644 src/main/resources/assets/forestry/blockstates/beehives.json create mode 100644 src/main/resources/assets/forestry/blockstates/blockforestryfluid.json create mode 100644 src/main/resources/assets/forestry/blockstates/butterflyGE.json create mode 100644 src/main/resources/assets/forestry/blockstates/candle.json create mode 100644 src/main/resources/assets/forestry/blockstates/crafting_table.json create mode 100644 src/main/resources/assets/forestry/blockstates/crates.json create mode 100644 src/main/resources/assets/forestry/blockstates/crates/cratedGlass.json create mode 100644 src/main/resources/assets/forestry/blockstates/crates/cratedPeat.json create mode 100644 src/main/resources/assets/forestry/blockstates/crates/cratedStone.json create mode 100644 src/main/resources/assets/forestry/blockstates/crates/cratedWood.json create mode 100644 src/main/resources/assets/forestry/blockstates/factory2_fabricator.json create mode 100644 src/main/resources/assets/forestry/blockstates/factory2_raintank.json create mode 100644 src/main/resources/assets/forestry/blockstates/factory2_worktable.json create mode 100644 src/main/resources/assets/forestry/blockstates/fences.json create mode 100644 src/main/resources/assets/forestry/blockstates/fencesFireproof.json create mode 100644 src/main/resources/assets/forestry/blockstates/germlings.json create mode 100644 src/main/resources/assets/forestry/blockstates/logs.json create mode 100644 src/main/resources/assets/forestry/blockstates/logsFireproof.json create mode 100644 src/main/resources/assets/forestry/blockstates/mail_mailbox.json create mode 100644 src/main/resources/assets/forestry/blockstates/mail_philatelist.json create mode 100644 src/main/resources/assets/forestry/blockstates/mail_tradestation.json create mode 100644 src/main/resources/assets/forestry/blockstates/planks.json create mode 100644 src/main/resources/assets/forestry/blockstates/planksFireproof.json create mode 100644 src/main/resources/assets/forestry/blockstates/pods/cocoa.json create mode 100644 src/main/resources/assets/forestry/blockstates/pods/dates.json create mode 100644 src/main/resources/assets/forestry/blockstates/pods/papaya.json create mode 100644 src/main/resources/assets/forestry/blockstates/resourceStorage.json create mode 100644 src/main/resources/assets/forestry/blockstates/resources.json create mode 100644 src/main/resources/assets/forestry/blockstates/slabs.json create mode 100644 src/main/resources/assets/forestry/blockstates/slabsDouble.json create mode 100644 src/main/resources/assets/forestry/blockstates/slabsDoubleFireproof.json create mode 100644 src/main/resources/assets/forestry/blockstates/slabsFireproof.json create mode 100644 src/main/resources/assets/forestry/blockstates/soil.json create mode 100644 src/main/resources/assets/forestry/blockstates/stairs.json create mode 100644 src/main/resources/assets/forestry/blockstates/stairsFireproof.json create mode 100644 src/main/resources/assets/forestry/models/block/apiculture/alveary_entrance.json create mode 100644 src/main/resources/assets/forestry/models/block/apiculture/alveary_fan_off.json create mode 100644 src/main/resources/assets/forestry/models/block/apiculture/alveary_fan_on.json create mode 100644 src/main/resources/assets/forestry/models/block/apiculture/alveary_heater_off.json create mode 100644 src/main/resources/assets/forestry/models/block/apiculture/alveary_heater_on.json create mode 100644 src/main/resources/assets/forestry/models/block/apiculture/alveary_hygro.json create mode 100644 src/main/resources/assets/forestry/models/block/apiculture/alveary_plain_down.json create mode 100644 src/main/resources/assets/forestry/models/block/apiculture/alveary_plain_middle.json create mode 100644 src/main/resources/assets/forestry/models/block/apiculture/alveary_plain_up.json create mode 100644 src/main/resources/assets/forestry/models/block/apiculture/alveary_sieve.json create mode 100644 src/main/resources/assets/forestry/models/block/apiculture/alveary_stabiliser.json create mode 100644 src/main/resources/assets/forestry/models/block/apiculture/alveary_swarmer_off.json create mode 100644 src/main/resources/assets/forestry/models/block/apiculture/alveary_swarmer_on.json create mode 100644 src/main/resources/assets/forestry/models/block/apiculture_apiary.json create mode 100644 src/main/resources/assets/forestry/models/block/apiculture_beehouse.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/acacia_inventory.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/acacia_n.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/acacia_ne.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/acacia_ns.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/acacia_nse.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/acacia_nsew.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/acacia_post.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/balsa_inventory.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/balsa_n.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/balsa_ne.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/balsa_ns.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/balsa_nse.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/balsa_nsew.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/balsa_post.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/baobab_inventory.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/baobab_n.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/baobab_ne.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/baobab_ns.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/baobab_nse.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/baobab_nsew.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/baobab_post.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/cherry_inventory.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/cherry_n.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/cherry_ne.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/cherry_ns.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/cherry_nse.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/cherry_nsew.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/cherry_post.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/chestnut_inventory.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/chestnut_n.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/chestnut_ne.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/chestnut_ns.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/chestnut_nse.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/chestnut_nsew.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/chestnut_post.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/citrus_inventory.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/citrus_n.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/citrus_ne.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/citrus_ns.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/citrus_nse.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/citrus_nsew.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/citrus_post.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/cocobolo_inventory.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/cocobolo_n.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/cocobolo_ne.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/cocobolo_ns.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/cocobolo_nse.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/cocobolo_nsew.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/cocobolo_post.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/ebony_inventory.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/ebony_n.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/ebony_ne.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/ebony_ns.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/ebony_nse.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/ebony_nsew.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/ebony_post.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/giganteum_inventory.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/giganteum_n.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/giganteum_ne.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/giganteum_ns.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/giganteum_nse.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/giganteum_nsew.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/giganteum_post.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/greenheart_inventory.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/greenheart_n.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/greenheart_ne.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/greenheart_ns.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/greenheart_nse.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/greenheart_nsew.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/greenheart_post.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/ipe_inventory.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/ipe_n.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/ipe_ne.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/ipe_ns.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/ipe_nse.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/ipe_nsew.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/ipe_post.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/kapok_inventory.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/kapok_n.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/kapok_ne.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/kapok_ns.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/kapok_nse.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/kapok_nsew.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/kapok_post.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/larch_inventory.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/larch_n.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/larch_ne.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/larch_ns.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/larch_nse.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/larch_nsew.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/larch_post.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/lime_inventory.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/lime_n.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/lime_ne.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/lime_ns.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/lime_nse.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/lime_nsew.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/lime_post.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/mahoe_inventory.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/mahoe_n.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/mahoe_ne.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/mahoe_ns.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/mahoe_nse.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/mahoe_nsew.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/mahoe_post.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/mahogany_inventory.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/mahogany_n.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/mahogany_ne.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/mahogany_ns.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/mahogany_nse.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/mahogany_nsew.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/mahogany_post.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/maple_inventory.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/maple_n.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/maple_ne.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/maple_ns.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/maple_nse.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/maple_nsew.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/maple_post.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/padauk_inventory.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/padauk_n.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/padauk_ne.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/padauk_ns.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/padauk_nse.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/padauk_nsew.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/padauk_post.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/palm_inventory.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/palm_n.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/palm_ne.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/palm_ns.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/palm_nse.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/palm_nsew.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/palm_post.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/papaya_inventory.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/papaya_n.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/papaya_ne.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/papaya_ns.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/papaya_nse.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/papaya_nsew.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/papaya_post.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/pine_inventory.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/pine_n.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/pine_ne.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/pine_ns.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/pine_nse.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/pine_nsew.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/pine_post.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/plum_inventory.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/plum_n.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/plum_ne.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/plum_ns.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/plum_nse.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/plum_nsew.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/plum_post.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/poplar_inventory.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/poplar_n.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/poplar_ne.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/poplar_ns.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/poplar_nse.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/poplar_nsew.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/poplar_post.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/sequoia_inventory.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/sequoia_n.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/sequoia_ne.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/sequoia_ns.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/sequoia_nse.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/sequoia_nsew.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/sequoia_post.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/teak_inventory.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/teak_n.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/teak_ne.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/teak_ns.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/teak_nse.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/teak_nsew.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/teak_post.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/walnut_inventory.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/walnut_n.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/walnut_ne.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/walnut_ns.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/walnut_nse.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/walnut_nsew.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/walnut_post.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/wenge_inventory.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/wenge_n.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/wenge_ne.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/wenge_ns.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/wenge_nse.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/wenge_nsew.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/wenge_post.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/willow_inventory.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/willow_n.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/willow_ne.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/willow_ns.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/willow_nse.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/willow_nsew.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/willow_post.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/zebrawood_inventory.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/zebrawood_n.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/zebrawood_ne.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/zebrawood_ns.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/zebrawood_nse.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/zebrawood_nsew.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/zebrawood_post.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/logs/acacia.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/logs/acacia_side.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/logs/balsa.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/logs/balsa_side.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/logs/baobab.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/logs/baobab_side.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/logs/cherry.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/logs/cherry_side.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/logs/chestnut.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/logs/chestnut_side.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/logs/citrus.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/logs/citrus_side.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/logs/cocobolo.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/logs/cocobolo_side.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/logs/ebony.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/logs/ebony_side.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/logs/giganteum.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/logs/giganteum_side.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/logs/greenheart.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/logs/greenheart_side.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/logs/ipe.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/logs/ipe_side.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/logs/kapok.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/logs/kapok_side.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/logs/larch.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/logs/larch_side.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/logs/lime.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/logs/lime_side.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/logs/mahoe.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/logs/mahoe_side.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/logs/mahogany.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/logs/mahogany_side.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/logs/maple.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/logs/maple_side.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/logs/padauk.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/logs/padauk_side.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/logs/palm.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/logs/palm_side.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/logs/papaya.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/logs/papaya_side.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/logs/pine.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/logs/pine_side.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/logs/plum.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/logs/plum_side.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/logs/poplar.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/logs/poplar_side.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/logs/sequoia.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/logs/sequoia_side.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/logs/teak.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/logs/teak_side.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/logs/walnut.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/logs/walnut_side.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/logs/wenge.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/logs/wenge_side.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/logs/willow.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/logs/willow_side.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/logs/zebrawood.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/logs/zebrawood_side.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/planks/acacia.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/planks/balsa.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/planks/baobab.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/planks/cherry.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/planks/chestnut.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/planks/citrus.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/planks/cocobolo.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/planks/ebony.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/planks/giganteum.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/planks/greenheart.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/planks/ipe.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/planks/kapok.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/planks/larch.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/planks/lime.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/planks/mahoe.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/planks/mahogany.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/planks/maple.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/planks/padauk.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/planks/palm.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/planks/papaya.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/planks/pine.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/planks/plum.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/planks/poplar.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/planks/sequoia.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/planks/teak.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/planks/walnut.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/planks/wenge.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/planks/willow.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/planks/zebrawood.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/acacia_double.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/acacia_half.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/acacia_upper.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/balsa_double.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/balsa_half.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/balsa_upper.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/baobab_double.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/baobab_half.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/baobab_upper.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/cherry_double.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/cherry_half.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/cherry_upper.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/chestnut_double.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/chestnut_half.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/chestnut_upper.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/citrus_double.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/citrus_half.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/citrus_upper.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/cocobolo_double.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/cocobolo_half.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/cocobolo_upper.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/ebony_double.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/ebony_half.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/ebony_upper.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/giganteum_double.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/giganteum_half.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/giganteum_upper.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/greenheart_double.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/greenheart_half.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/greenheart_upper.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/ipe_double.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/ipe_half.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/ipe_upper.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/kapok_double.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/kapok_half.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/kapok_upper.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/larch_double.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/larch_half.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/larch_upper.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/lime_double.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/lime_half.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/lime_upper.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/mahoe_double.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/mahoe_half.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/mahoe_upper.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/mahogany_double.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/mahogany_half.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/mahogany_upper.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/maple_double.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/maple_half.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/maple_upper.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/padauk_double.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/padauk_half.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/padauk_upper.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/palm_double.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/palm_half.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/palm_upper.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/papaya_double.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/papaya_half.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/papaya_upper.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/pine_double.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/pine_half.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/pine_upper.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/plum_double.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/plum_half.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/plum_upper.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/poplar_double.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/poplar_half.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/poplar_upper.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/sequoia_double.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/sequoia_half.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/sequoia_upper.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/teak_double.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/teak_half.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/teak_upper.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/walnut_double.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/walnut_half.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/walnut_upper.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/wenge_double.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/wenge_half.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/wenge_upper.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/willow_double.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/willow_half.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/willow_upper.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/zebrawood_double.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/zebrawood_half.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/zebrawood_upper.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/acacia.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/acacia_inner.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/acacia_outer.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/balsa.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/balsa_inner.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/balsa_outer.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/baobab.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/baobab_inner.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/baobab_outer.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/cherry.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/cherry_inner.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/cherry_outer.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/chestnut.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/chestnut_inner.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/chestnut_outer.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/citrus.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/citrus_inner.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/citrus_outer.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/cocobolo.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/cocobolo_inner.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/cocobolo_outer.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/ebony.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/ebony_inner.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/ebony_outer.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/giganteum.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/giganteum_inner.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/giganteum_outer.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/greenheart.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/greenheart_inner.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/greenheart_outer.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/ipe.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/ipe_inner.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/ipe_outer.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/kapok.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/kapok_inner.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/kapok_outer.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/larch.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/larch_inner.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/larch_outer.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/lime.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/lime_inner.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/lime_outer.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/mahoe.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/mahoe_inner.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/mahoe_outer.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/mahogany.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/mahogany_inner.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/mahogany_outer.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/maple.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/maple_inner.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/maple_outer.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/padauk.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/padauk_inner.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/padauk_outer.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/palm.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/palm_inner.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/palm_outer.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/papaya.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/papaya_inner.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/papaya_outer.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/pine.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/pine_inner.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/pine_outer.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/plum.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/plum_inner.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/plum_outer.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/poplar.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/poplar_inner.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/poplar_outer.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/sequoia.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/sequoia_inner.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/sequoia_outer.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/teak.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/teak_inner.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/teak_outer.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/walnut.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/walnut_inner.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/walnut_outer.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/wenge.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/wenge_inner.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/wenge_outer.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/willow.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/willow_inner.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/willow_outer.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/zebrawood.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/zebrawood_inner.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/zebrawood_outer.json create mode 100644 src/main/resources/assets/forestry/models/block/beehives/desert.json create mode 100644 src/main/resources/assets/forestry/models/block/beehives/end.json create mode 100644 src/main/resources/assets/forestry/models/block/beehives/forest.json create mode 100644 src/main/resources/assets/forestry/models/block/beehives/jungle.json create mode 100644 src/main/resources/assets/forestry/models/block/beehives/meadows.json create mode 100644 src/main/resources/assets/forestry/models/block/beehives/snow.json create mode 100644 src/main/resources/assets/forestry/models/block/beehives/swamp.json create mode 100644 src/main/resources/assets/forestry/models/block/candle.json create mode 100644 src/main/resources/assets/forestry/models/block/candle_off.json create mode 100644 src/main/resources/assets/forestry/models/block/candle_on.json create mode 100644 src/main/resources/assets/forestry/models/block/candle_up.json create mode 100644 src/main/resources/assets/forestry/models/block/candle_up_off.json create mode 100644 src/main/resources/assets/forestry/models/block/candle_up_on.json create mode 100644 src/main/resources/assets/forestry/models/block/crate-filled.json create mode 100644 src/main/resources/assets/forestry/models/block/factory2_fabricator.json create mode 100644 src/main/resources/assets/forestry/models/block/factory2_raintank.json create mode 100644 src/main/resources/assets/forestry/models/block/factory2_worktable.json create mode 100644 src/main/resources/assets/forestry/models/block/ffarm.json create mode 100644 src/main/resources/assets/forestry/models/block/germlings/sapling.treeAcacia.json create mode 100644 src/main/resources/assets/forestry/models/block/germlings/sapling.treeAcaciaVanilla.json create mode 100644 src/main/resources/assets/forestry/models/block/germlings/sapling.treeBalsa.json create mode 100644 src/main/resources/assets/forestry/models/block/germlings/sapling.treeBaobab.json create mode 100644 src/main/resources/assets/forestry/models/block/germlings/sapling.treeBirch.json create mode 100644 src/main/resources/assets/forestry/models/block/germlings/sapling.treeCherry.json create mode 100644 src/main/resources/assets/forestry/models/block/germlings/sapling.treeChestnut.json create mode 100644 src/main/resources/assets/forestry/models/block/germlings/sapling.treeCocobolo.json create mode 100644 src/main/resources/assets/forestry/models/block/germlings/sapling.treeDarkOak.json create mode 100644 src/main/resources/assets/forestry/models/block/germlings/sapling.treeDate.json create mode 100644 src/main/resources/assets/forestry/models/block/germlings/sapling.treeEbony.json create mode 100644 src/main/resources/assets/forestry/models/block/germlings/sapling.treeGigant.json create mode 100644 src/main/resources/assets/forestry/models/block/germlings/sapling.treeIpe.json create mode 100644 src/main/resources/assets/forestry/models/block/germlings/sapling.treeJungle.json create mode 100644 src/main/resources/assets/forestry/models/block/germlings/sapling.treeKapok.json create mode 100644 src/main/resources/assets/forestry/models/block/germlings/sapling.treeLarch.json create mode 100644 src/main/resources/assets/forestry/models/block/germlings/sapling.treeLemon.json create mode 100644 src/main/resources/assets/forestry/models/block/germlings/sapling.treeLime.json create mode 100644 src/main/resources/assets/forestry/models/block/germlings/sapling.treeMahoe.json create mode 100644 src/main/resources/assets/forestry/models/block/germlings/sapling.treeMahogony.json create mode 100644 src/main/resources/assets/forestry/models/block/germlings/sapling.treeMaple.json create mode 100644 src/main/resources/assets/forestry/models/block/germlings/sapling.treeOak.json create mode 100644 src/main/resources/assets/forestry/models/block/germlings/sapling.treePadauk.json create mode 100644 src/main/resources/assets/forestry/models/block/germlings/sapling.treePapaya.json create mode 100644 src/main/resources/assets/forestry/models/block/germlings/sapling.treePine.json create mode 100644 src/main/resources/assets/forestry/models/block/germlings/sapling.treePlum.json create mode 100644 src/main/resources/assets/forestry/models/block/germlings/sapling.treePoplar.json create mode 100644 src/main/resources/assets/forestry/models/block/germlings/sapling.treeSequioa.json create mode 100644 src/main/resources/assets/forestry/models/block/germlings/sapling.treeSipiri.json create mode 100644 src/main/resources/assets/forestry/models/block/germlings/sapling.treeSpruce.json create mode 100644 src/main/resources/assets/forestry/models/block/germlings/sapling.treeTeak.json create mode 100644 src/main/resources/assets/forestry/models/block/germlings/sapling.treeWalnut.json create mode 100644 src/main/resources/assets/forestry/models/block/germlings/sapling.treeWenge.json create mode 100644 src/main/resources/assets/forestry/models/block/germlings/sapling.treeWillow.json create mode 100644 src/main/resources/assets/forestry/models/block/germlings/sapling.treeZebrawood.json create mode 100644 src/main/resources/assets/forestry/models/block/leaves.json create mode 100644 src/main/resources/assets/forestry/models/block/machine.json create mode 100644 src/main/resources/assets/forestry/models/block/mail_mailbox.json create mode 100644 src/main/resources/assets/forestry/models/block/mail_philatelist.json create mode 100644 src/main/resources/assets/forestry/models/block/mail_tradestation.json create mode 100644 src/main/resources/assets/forestry/models/block/ores/apatite.json create mode 100644 src/main/resources/assets/forestry/models/block/ores/copper.json create mode 100644 src/main/resources/assets/forestry/models/block/ores/tin.json create mode 100644 src/main/resources/assets/forestry/models/block/pods/dates_0.json create mode 100644 src/main/resources/assets/forestry/models/block/pods/dates_1.json create mode 100644 src/main/resources/assets/forestry/models/block/pods/dates_2.json create mode 100644 src/main/resources/assets/forestry/models/block/pods/papaya_0.json create mode 100644 src/main/resources/assets/forestry/models/block/pods/papaya_1.json create mode 100644 src/main/resources/assets/forestry/models/block/pods/papaya_2.json create mode 100644 src/main/resources/assets/forestry/models/block/soil/bog.json create mode 100644 src/main/resources/assets/forestry/models/block/soil/humus.json create mode 100644 src/main/resources/assets/forestry/models/block/soil/peat.json create mode 100644 src/main/resources/assets/forestry/models/block/storage/apatite.json create mode 100644 src/main/resources/assets/forestry/models/block/storage/bronze.json create mode 100644 src/main/resources/assets/forestry/models/block/storage/copper.json create mode 100644 src/main/resources/assets/forestry/models/block/storage/tin.json create mode 100644 src/main/resources/assets/forestry/models/item/ambrosia.json create mode 100644 src/main/resources/assets/forestry/models/item/apatite.json create mode 100644 src/main/resources/assets/forestry/models/item/apiaristBoots.json create mode 100644 src/main/resources/assets/forestry/models/item/apiaristChest.json create mode 100644 src/main/resources/assets/forestry/models/item/apiaristHelmet.json create mode 100644 src/main/resources/assets/forestry/models/item/apiaristLegs.json create mode 100644 src/main/resources/assets/forestry/models/item/apiculture/alveary.entrance.json create mode 100644 src/main/resources/assets/forestry/models/item/apiculture/alveary.fan.json create mode 100644 src/main/resources/assets/forestry/models/item/apiculture/alveary.heater.json create mode 100644 src/main/resources/assets/forestry/models/item/apiculture/alveary.hygro.json create mode 100644 src/main/resources/assets/forestry/models/item/apiculture/alveary.plain.json create mode 100644 src/main/resources/assets/forestry/models/item/apiculture/alveary.sieve.json create mode 100644 src/main/resources/assets/forestry/models/item/apiculture/alveary.stabiliser.json create mode 100644 src/main/resources/assets/forestry/models/item/apiculture/alveary.swarmer.json create mode 100644 src/main/resources/assets/forestry/models/item/apicultureChest_apiarist_chest.json create mode 100644 src/main/resources/assets/forestry/models/item/apiculture_apiary.json create mode 100644 src/main/resources/assets/forestry/models/item/apiculture_beehouse.json create mode 100644 src/main/resources/assets/forestry/models/item/arboriculture_arbchest.json create mode 100644 src/main/resources/assets/forestry/models/item/ash.json create mode 100644 src/main/resources/assets/forestry/models/item/backpacks/t1_locked.json create mode 100644 src/main/resources/assets/forestry/models/item/backpacks/t1_neutral.json create mode 100644 src/main/resources/assets/forestry/models/item/backpacks/t1_receive.json create mode 100644 src/main/resources/assets/forestry/models/item/backpacks/t1_resupply.json create mode 100644 src/main/resources/assets/forestry/models/item/backpacks/t2_locked.json create mode 100644 src/main/resources/assets/forestry/models/item/backpacks/t2_neutral.json create mode 100644 src/main/resources/assets/forestry/models/item/backpacks/t2_receive.json create mode 100644 src/main/resources/assets/forestry/models/item/backpacks/t2_resupply.json create mode 100644 src/main/resources/assets/forestry/models/item/beeCombs.json create mode 100644 src/main/resources/assets/forestry/models/item/beealyzer.json create mode 100644 src/main/resources/assets/forestry/models/item/beecombs/cocoa.json create mode 100644 src/main/resources/assets/forestry/models/item/beecombs/darkened.json create mode 100644 src/main/resources/assets/forestry/models/item/beecombs/dripping.json create mode 100644 src/main/resources/assets/forestry/models/item/beecombs/frozen.json create mode 100644 src/main/resources/assets/forestry/models/item/beecombs/honey.json create mode 100644 src/main/resources/assets/forestry/models/item/beecombs/irradiated.json create mode 100644 src/main/resources/assets/forestry/models/item/beecombs/mellow.json create mode 100644 src/main/resources/assets/forestry/models/item/beecombs/mossy.json create mode 100644 src/main/resources/assets/forestry/models/item/beecombs/mysterious.json create mode 100644 src/main/resources/assets/forestry/models/item/beecombs/omega.json create mode 100644 src/main/resources/assets/forestry/models/item/beecombs/parched.json create mode 100644 src/main/resources/assets/forestry/models/item/beecombs/powdery.json create mode 100644 src/main/resources/assets/forestry/models/item/beecombs/reddened.json create mode 100644 src/main/resources/assets/forestry/models/item/beecombs/silky.json create mode 100644 src/main/resources/assets/forestry/models/item/beecombs/simmering.json create mode 100644 src/main/resources/assets/forestry/models/item/beecombs/stringy.json create mode 100644 src/main/resources/assets/forestry/models/item/beecombs/wheaten.json create mode 100644 src/main/resources/assets/forestry/models/item/beehives/desert.json create mode 100644 src/main/resources/assets/forestry/models/item/beehives/end.json create mode 100644 src/main/resources/assets/forestry/models/item/beehives/forest.json create mode 100644 src/main/resources/assets/forestry/models/item/beehives/jungle.json create mode 100644 src/main/resources/assets/forestry/models/item/beehives/meadows.json create mode 100644 src/main/resources/assets/forestry/models/item/beehives/snow.json create mode 100644 src/main/resources/assets/forestry/models/item/beehives/swamp.json create mode 100644 src/main/resources/assets/forestry/models/item/bees/default/drone.json create mode 100644 src/main/resources/assets/forestry/models/item/bees/default/larvae.json create mode 100644 src/main/resources/assets/forestry/models/item/bees/default/princess.json create mode 100644 src/main/resources/assets/forestry/models/item/bees/default/queen.json create mode 100644 src/main/resources/assets/forestry/models/item/beeswax.json create mode 100644 src/main/resources/assets/forestry/models/item/bituminousPeat.json create mode 100644 src/main/resources/assets/forestry/models/item/brokenBronzePickaxe.json create mode 100644 src/main/resources/assets/forestry/models/item/brokenBronzeShovel.json create mode 100644 src/main/resources/assets/forestry/models/item/bronzePickaxe.json create mode 100644 src/main/resources/assets/forestry/models/item/bronzeShovel.json create mode 100644 src/main/resources/assets/forestry/models/item/bucketBiofuel.json create mode 100644 src/main/resources/assets/forestry/models/item/bucketBiomass.json create mode 100644 src/main/resources/assets/forestry/models/item/candle.json create mode 100644 src/main/resources/assets/forestry/models/item/cart.apiary.json create mode 100644 src/main/resources/assets/forestry/models/item/cart.beehouse.json create mode 100644 src/main/resources/assets/forestry/models/item/carton.json create mode 100644 src/main/resources/assets/forestry/models/item/catalogue.json create mode 100644 src/main/resources/assets/forestry/models/item/caterpillar.json create mode 100644 src/main/resources/assets/forestry/models/item/chipsets.json create mode 100644 src/main/resources/assets/forestry/models/item/core_analyzer.json create mode 100644 src/main/resources/assets/forestry/models/item/core_escritoire.json create mode 100644 src/main/resources/assets/forestry/models/item/craftingMaterial/dissipationCharge.json create mode 100644 src/main/resources/assets/forestry/models/item/craftingMaterial/fertilizerCompound - Kopie (11).json create mode 100644 src/main/resources/assets/forestry/models/item/craftingMaterial/iceShard.json create mode 100644 src/main/resources/assets/forestry/models/item/craftingMaterial/pulsatingDust.json create mode 100644 src/main/resources/assets/forestry/models/item/craftingMaterial/pulsatingMesh.json create mode 100644 src/main/resources/assets/forestry/models/item/craftingMaterial/scentedPaneling.json create mode 100644 src/main/resources/assets/forestry/models/item/craftingMaterial/silkWisp.json create mode 100644 src/main/resources/assets/forestry/models/item/craftingMaterial/wovenSilk.json create mode 100644 src/main/resources/assets/forestry/models/item/crate.json create mode 100644 src/main/resources/assets/forestry/models/item/decayingWheat.json create mode 100644 src/main/resources/assets/forestry/models/item/dissipationCharge.json create mode 100644 src/main/resources/assets/forestry/models/item/engine_biogas.json create mode 100644 src/main/resources/assets/forestry/models/item/engine_clockwork.json create mode 100644 src/main/resources/assets/forestry/models/item/engine_generator.json create mode 100644 src/main/resources/assets/forestry/models/item/engine_peat.json create mode 100644 src/main/resources/assets/forestry/models/item/factory2_fabricator.json create mode 100644 src/main/resources/assets/forestry/models/item/factory2_raintank.json create mode 100644 src/main/resources/assets/forestry/models/item/factory2_worktable.json create mode 100644 src/main/resources/assets/forestry/models/item/factory_bottler.json create mode 100644 src/main/resources/assets/forestry/models/item/factory_carpenter.json create mode 100644 src/main/resources/assets/forestry/models/item/factory_centrifuge.json create mode 100644 src/main/resources/assets/forestry/models/item/factory_fermenter.json create mode 100644 src/main/resources/assets/forestry/models/item/factory_moistener.json create mode 100644 src/main/resources/assets/forestry/models/item/factory_rainmaker.json create mode 100644 src/main/resources/assets/forestry/models/item/factory_squeezer.json create mode 100644 src/main/resources/assets/forestry/models/item/factory_still.json create mode 100644 src/main/resources/assets/forestry/models/item/fences/acacia.json create mode 100644 src/main/resources/assets/forestry/models/item/fences/balsa.json create mode 100644 src/main/resources/assets/forestry/models/item/fences/baobab.json create mode 100644 src/main/resources/assets/forestry/models/item/fences/cherry.json create mode 100644 src/main/resources/assets/forestry/models/item/fences/chestnut.json create mode 100644 src/main/resources/assets/forestry/models/item/fences/citrus.json create mode 100644 src/main/resources/assets/forestry/models/item/fences/cocobolo.json create mode 100644 src/main/resources/assets/forestry/models/item/fences/ebony.json create mode 100644 src/main/resources/assets/forestry/models/item/fences/giganteum.json create mode 100644 src/main/resources/assets/forestry/models/item/fences/greenheart.json create mode 100644 src/main/resources/assets/forestry/models/item/fences/ipe.json create mode 100644 src/main/resources/assets/forestry/models/item/fences/kapok.json create mode 100644 src/main/resources/assets/forestry/models/item/fences/larch.json create mode 100644 src/main/resources/assets/forestry/models/item/fences/lime.json create mode 100644 src/main/resources/assets/forestry/models/item/fences/mahoe.json create mode 100644 src/main/resources/assets/forestry/models/item/fences/mahogany.json create mode 100644 src/main/resources/assets/forestry/models/item/fences/maple.json create mode 100644 src/main/resources/assets/forestry/models/item/fences/padauk.json create mode 100644 src/main/resources/assets/forestry/models/item/fences/palm.json create mode 100644 src/main/resources/assets/forestry/models/item/fences/papaya.json create mode 100644 src/main/resources/assets/forestry/models/item/fences/pine.json create mode 100644 src/main/resources/assets/forestry/models/item/fences/plum.json create mode 100644 src/main/resources/assets/forestry/models/item/fences/poplar.json create mode 100644 src/main/resources/assets/forestry/models/item/fences/sequoia.json create mode 100644 src/main/resources/assets/forestry/models/item/fences/teak.json create mode 100644 src/main/resources/assets/forestry/models/item/fences/walnut.json create mode 100644 src/main/resources/assets/forestry/models/item/fences/wenge.json create mode 100644 src/main/resources/assets/forestry/models/item/fences/willow.json create mode 100644 src/main/resources/assets/forestry/models/item/fences/zebrawood.json create mode 100644 src/main/resources/assets/forestry/models/item/fertilizerBio.json create mode 100644 src/main/resources/assets/forestry/models/item/fertilizerCompound.json create mode 100644 src/main/resources/assets/forestry/models/item/ffarm.json create mode 100644 src/main/resources/assets/forestry/models/item/flutterlyzer.json create mode 100644 src/main/resources/assets/forestry/models/item/frameImpregnated.json create mode 100644 src/main/resources/assets/forestry/models/item/frameProven.json create mode 100644 src/main/resources/assets/forestry/models/item/frameUntreated.json create mode 100644 src/main/resources/assets/forestry/models/item/fruits/cherry.json create mode 100644 src/main/resources/assets/forestry/models/item/fruits/chestnut.json create mode 100644 src/main/resources/assets/forestry/models/item/fruits/dates.json create mode 100644 src/main/resources/assets/forestry/models/item/fruits/lemon.json create mode 100644 src/main/resources/assets/forestry/models/item/fruits/papaya.json create mode 100644 src/main/resources/assets/forestry/models/item/fruits/plum.json create mode 100644 src/main/resources/assets/forestry/models/item/fruits/walnut.json create mode 100644 src/main/resources/assets/forestry/models/item/gearBronze.json create mode 100644 src/main/resources/assets/forestry/models/item/gearCopper.json create mode 100644 src/main/resources/assets/forestry/models/item/gearTin.json create mode 100644 src/main/resources/assets/forestry/models/item/germlings/sapling.treeAcacia.json create mode 100644 src/main/resources/assets/forestry/models/item/germlings/sapling.treeBalsa.json create mode 100644 src/main/resources/assets/forestry/models/item/germlings/sapling.treeBaobab.json create mode 100644 src/main/resources/assets/forestry/models/item/germlings/sapling.treeCherry.json create mode 100644 src/main/resources/assets/forestry/models/item/germlings/sapling.treeChestnut.json create mode 100644 src/main/resources/assets/forestry/models/item/germlings/sapling.treeCocobolo.json create mode 100644 src/main/resources/assets/forestry/models/item/germlings/sapling.treeDate.json create mode 100644 src/main/resources/assets/forestry/models/item/germlings/sapling.treeEbony.json create mode 100644 src/main/resources/assets/forestry/models/item/germlings/sapling.treeGigant.json create mode 100644 src/main/resources/assets/forestry/models/item/germlings/sapling.treeIpe.json create mode 100644 src/main/resources/assets/forestry/models/item/germlings/sapling.treeKapok.json create mode 100644 src/main/resources/assets/forestry/models/item/germlings/sapling.treeLarch.json create mode 100644 src/main/resources/assets/forestry/models/item/germlings/sapling.treeLemon.json create mode 100644 src/main/resources/assets/forestry/models/item/germlings/sapling.treeLime.json create mode 100644 src/main/resources/assets/forestry/models/item/germlings/sapling.treeMahoe.json create mode 100644 src/main/resources/assets/forestry/models/item/germlings/sapling.treeMahogony.json create mode 100644 src/main/resources/assets/forestry/models/item/germlings/sapling.treeMaple.json create mode 100644 src/main/resources/assets/forestry/models/item/germlings/sapling.treePadauk.json create mode 100644 src/main/resources/assets/forestry/models/item/germlings/sapling.treePapaya.json create mode 100644 src/main/resources/assets/forestry/models/item/germlings/sapling.treePine.json create mode 100644 src/main/resources/assets/forestry/models/item/germlings/sapling.treePlum.json create mode 100644 src/main/resources/assets/forestry/models/item/germlings/sapling.treePoplar.json create mode 100644 src/main/resources/assets/forestry/models/item/germlings/sapling.treeSequioa.json create mode 100644 src/main/resources/assets/forestry/models/item/germlings/sapling.treeSipiri.json create mode 100644 src/main/resources/assets/forestry/models/item/germlings/sapling.treeTeak.json create mode 100644 src/main/resources/assets/forestry/models/item/germlings/sapling.treeWalnut.json create mode 100644 src/main/resources/assets/forestry/models/item/germlings/sapling.treeWenge.json create mode 100644 src/main/resources/assets/forestry/models/item/germlings/sapling.treeWillow.json create mode 100644 src/main/resources/assets/forestry/models/item/germlings/sapling.treeZebrawood.json create mode 100644 src/main/resources/assets/forestry/models/item/grafter.json create mode 100644 src/main/resources/assets/forestry/models/item/grafterProven.json create mode 100644 src/main/resources/assets/forestry/models/item/habitatLocator.json create mode 100644 src/main/resources/assets/forestry/models/item/hardenedMachine.json create mode 100644 src/main/resources/assets/forestry/models/item/honeyDrop.json create mode 100644 src/main/resources/assets/forestry/models/item/honeyPot.json create mode 100644 src/main/resources/assets/forestry/models/item/honeydew.json create mode 100644 src/main/resources/assets/forestry/models/item/honeyedSlice.json create mode 100644 src/main/resources/assets/forestry/models/item/iceShard.json create mode 100644 src/main/resources/assets/forestry/models/item/impregnatedCasing.json create mode 100644 src/main/resources/assets/forestry/models/item/imprinter.json create mode 100644 src/main/resources/assets/forestry/models/item/infuser.json create mode 100644 src/main/resources/assets/forestry/models/item/ingotBronze.json create mode 100644 src/main/resources/assets/forestry/models/item/ingotCopper.json create mode 100644 src/main/resources/assets/forestry/models/item/ingotTin.json create mode 100644 src/main/resources/assets/forestry/models/item/iodineCapsule.json create mode 100644 src/main/resources/assets/forestry/models/item/kitPickaxe.json create mode 100644 src/main/resources/assets/forestry/models/item/kitShovel.json create mode 100644 src/main/resources/assets/forestry/models/item/leaves.json create mode 100644 src/main/resources/assets/forestry/models/item/lepidopterology_lepichest.json create mode 100644 src/main/resources/assets/forestry/models/item/liquids/bucket.json create mode 100644 src/main/resources/assets/forestry/models/item/liquids/can.json create mode 100644 src/main/resources/assets/forestry/models/item/liquids/capsule.json create mode 100644 src/main/resources/assets/forestry/models/item/liquids/glass.json create mode 100644 src/main/resources/assets/forestry/models/item/liquids/jar.json create mode 100644 src/main/resources/assets/forestry/models/item/liquids/refractory.json create mode 100644 src/main/resources/assets/forestry/models/item/log/acacia.json create mode 100644 src/main/resources/assets/forestry/models/item/log/balsa.json create mode 100644 src/main/resources/assets/forestry/models/item/log/baobab.json create mode 100644 src/main/resources/assets/forestry/models/item/log/cherry.json create mode 100644 src/main/resources/assets/forestry/models/item/log/chestnut.json create mode 100644 src/main/resources/assets/forestry/models/item/log/citrus.json create mode 100644 src/main/resources/assets/forestry/models/item/log/cocobolo.json create mode 100644 src/main/resources/assets/forestry/models/item/log/ebony.json create mode 100644 src/main/resources/assets/forestry/models/item/log/giganteum.json create mode 100644 src/main/resources/assets/forestry/models/item/log/greenheart.json create mode 100644 src/main/resources/assets/forestry/models/item/log/ipe.json create mode 100644 src/main/resources/assets/forestry/models/item/log/kapok.json create mode 100644 src/main/resources/assets/forestry/models/item/log/larch.json create mode 100644 src/main/resources/assets/forestry/models/item/log/lime.json create mode 100644 src/main/resources/assets/forestry/models/item/log/mahoe.json create mode 100644 src/main/resources/assets/forestry/models/item/log/mahogany.json create mode 100644 src/main/resources/assets/forestry/models/item/log/maple.json create mode 100644 src/main/resources/assets/forestry/models/item/log/padauk.json create mode 100644 src/main/resources/assets/forestry/models/item/log/palm.json create mode 100644 src/main/resources/assets/forestry/models/item/log/papaya.json create mode 100644 src/main/resources/assets/forestry/models/item/log/pine.json create mode 100644 src/main/resources/assets/forestry/models/item/log/plum.json create mode 100644 src/main/resources/assets/forestry/models/item/log/poplar.json create mode 100644 src/main/resources/assets/forestry/models/item/log/sequoia.json create mode 100644 src/main/resources/assets/forestry/models/item/log/teak.json create mode 100644 src/main/resources/assets/forestry/models/item/log/walnut.json create mode 100644 src/main/resources/assets/forestry/models/item/log/wenge.json create mode 100644 src/main/resources/assets/forestry/models/item/log/willow.json create mode 100644 src/main/resources/assets/forestry/models/item/log/zebrawood.json create mode 100644 src/main/resources/assets/forestry/models/item/mail/letter.0.emptied.json create mode 100644 src/main/resources/assets/forestry/models/item/mail/letter.0.fresh.json create mode 100644 src/main/resources/assets/forestry/models/item/mail/letter.0.opened.json create mode 100644 src/main/resources/assets/forestry/models/item/mail/letter.0.stamped.json create mode 100644 src/main/resources/assets/forestry/models/item/mail/letter.1.emptied.json create mode 100644 src/main/resources/assets/forestry/models/item/mail/letter.1.fresh.json create mode 100644 src/main/resources/assets/forestry/models/item/mail/letter.1.opened.json create mode 100644 src/main/resources/assets/forestry/models/item/mail/letter.1.stamped.json create mode 100644 src/main/resources/assets/forestry/models/item/mail/letter.2.emptied.json create mode 100644 src/main/resources/assets/forestry/models/item/mail/letter.2.fresh.json create mode 100644 src/main/resources/assets/forestry/models/item/mail/letter.2.opened.json create mode 100644 src/main/resources/assets/forestry/models/item/mail/letter.2.stamped.json create mode 100644 src/main/resources/assets/forestry/models/item/mail_mailbox.json create mode 100644 src/main/resources/assets/forestry/models/item/mail_philatelist.json create mode 100644 src/main/resources/assets/forestry/models/item/mail_tradestation.json create mode 100644 src/main/resources/assets/forestry/models/item/mouldyWheat.json create mode 100644 src/main/resources/assets/forestry/models/item/mulch.json create mode 100644 src/main/resources/assets/forestry/models/item/naturalistHelmet.json create mode 100644 src/main/resources/assets/forestry/models/item/oakStick.json create mode 100644 src/main/resources/assets/forestry/models/item/ores/apatite.json create mode 100644 src/main/resources/assets/forestry/models/item/ores/copper.json create mode 100644 src/main/resources/assets/forestry/models/item/ores/tin.json create mode 100644 src/main/resources/assets/forestry/models/item/peat.json create mode 100644 src/main/resources/assets/forestry/models/item/phosphor.json create mode 100644 src/main/resources/assets/forestry/models/item/pipette.0.json create mode 100644 src/main/resources/assets/forestry/models/item/pipette.1.json create mode 100644 src/main/resources/assets/forestry/models/item/planks.json create mode 100644 src/main/resources/assets/forestry/models/item/planks/acacia.json create mode 100644 src/main/resources/assets/forestry/models/item/planks/balsa.json create mode 100644 src/main/resources/assets/forestry/models/item/planks/baobab.json create mode 100644 src/main/resources/assets/forestry/models/item/planks/cherry.json create mode 100644 src/main/resources/assets/forestry/models/item/planks/chestnut.json create mode 100644 src/main/resources/assets/forestry/models/item/planks/citrus.json create mode 100644 src/main/resources/assets/forestry/models/item/planks/cocobolo.json create mode 100644 src/main/resources/assets/forestry/models/item/planks/ebony.json create mode 100644 src/main/resources/assets/forestry/models/item/planks/giganteum.json create mode 100644 src/main/resources/assets/forestry/models/item/planks/greenheart.json create mode 100644 src/main/resources/assets/forestry/models/item/planks/ipe.json create mode 100644 src/main/resources/assets/forestry/models/item/planks/kapok.json create mode 100644 src/main/resources/assets/forestry/models/item/planks/larch.json create mode 100644 src/main/resources/assets/forestry/models/item/planks/lime.json create mode 100644 src/main/resources/assets/forestry/models/item/planks/mahoe.json create mode 100644 src/main/resources/assets/forestry/models/item/planks/mahogany.json create mode 100644 src/main/resources/assets/forestry/models/item/planks/maple.json create mode 100644 src/main/resources/assets/forestry/models/item/planks/padauk.json create mode 100644 src/main/resources/assets/forestry/models/item/planks/palm.json create mode 100644 src/main/resources/assets/forestry/models/item/planks/papaya.json create mode 100644 src/main/resources/assets/forestry/models/item/planks/pine.json create mode 100644 src/main/resources/assets/forestry/models/item/planks/plum.json create mode 100644 src/main/resources/assets/forestry/models/item/planks/poplar.json create mode 100644 src/main/resources/assets/forestry/models/item/planks/sequoia.json create mode 100644 src/main/resources/assets/forestry/models/item/planks/teak.json create mode 100644 src/main/resources/assets/forestry/models/item/planks/walnut.json create mode 100644 src/main/resources/assets/forestry/models/item/planks/wenge.json create mode 100644 src/main/resources/assets/forestry/models/item/planks/willow.json create mode 100644 src/main/resources/assets/forestry/models/item/planks/zebrawood.json create mode 100644 src/main/resources/assets/forestry/models/item/pollen.json create mode 100644 src/main/resources/assets/forestry/models/item/propolis.json create mode 100644 src/main/resources/assets/forestry/models/item/pulsatingDust.json create mode 100644 src/main/resources/assets/forestry/models/item/pulsatingMesh.json create mode 100644 src/main/resources/assets/forestry/models/item/refractoryWax.json create mode 100644 src/main/resources/assets/forestry/models/item/researchNote.json create mode 100644 src/main/resources/assets/forestry/models/item/resources_copper.json create mode 100644 src/main/resources/assets/forestry/models/item/royalJelly.json create mode 100644 src/main/resources/assets/forestry/models/item/scentedPaneling.json create mode 100644 src/main/resources/assets/forestry/models/item/scoop.json create mode 100644 src/main/resources/assets/forestry/models/item/silkWisp.json create mode 100644 src/main/resources/assets/forestry/models/item/slab/acacia.json create mode 100644 src/main/resources/assets/forestry/models/item/slab/balsa.json create mode 100644 src/main/resources/assets/forestry/models/item/slab/baobab.json create mode 100644 src/main/resources/assets/forestry/models/item/slab/cherry.json create mode 100644 src/main/resources/assets/forestry/models/item/slab/chestnut.json create mode 100644 src/main/resources/assets/forestry/models/item/slab/citrus.json create mode 100644 src/main/resources/assets/forestry/models/item/slab/cocobolo.json create mode 100644 src/main/resources/assets/forestry/models/item/slab/ebony.json create mode 100644 src/main/resources/assets/forestry/models/item/slab/giganteum.json create mode 100644 src/main/resources/assets/forestry/models/item/slab/greenheart.json create mode 100644 src/main/resources/assets/forestry/models/item/slab/ipe.json create mode 100644 src/main/resources/assets/forestry/models/item/slab/kapok.json create mode 100644 src/main/resources/assets/forestry/models/item/slab/larch.json create mode 100644 src/main/resources/assets/forestry/models/item/slab/lime.json create mode 100644 src/main/resources/assets/forestry/models/item/slab/mahoe.json create mode 100644 src/main/resources/assets/forestry/models/item/slab/mahogany.json create mode 100644 src/main/resources/assets/forestry/models/item/slab/maple.json create mode 100644 src/main/resources/assets/forestry/models/item/slab/padauk.json create mode 100644 src/main/resources/assets/forestry/models/item/slab/palm.json create mode 100644 src/main/resources/assets/forestry/models/item/slab/papaya.json create mode 100644 src/main/resources/assets/forestry/models/item/slab/pine.json create mode 100644 src/main/resources/assets/forestry/models/item/slab/plum.json create mode 100644 src/main/resources/assets/forestry/models/item/slab/poplar.json create mode 100644 src/main/resources/assets/forestry/models/item/slab/sequoia.json create mode 100644 src/main/resources/assets/forestry/models/item/slab/teak.json create mode 100644 src/main/resources/assets/forestry/models/item/slab/walnut.json create mode 100644 src/main/resources/assets/forestry/models/item/slab/wenge.json create mode 100644 src/main/resources/assets/forestry/models/item/slab/willow.json create mode 100644 src/main/resources/assets/forestry/models/item/slab/zebrawood.json create mode 100644 src/main/resources/assets/forestry/models/item/slabs.json create mode 100644 src/main/resources/assets/forestry/models/item/soil/bog.json create mode 100644 src/main/resources/assets/forestry/models/item/soil/humus.json create mode 100644 src/main/resources/assets/forestry/models/item/soil/peat.json create mode 100644 src/main/resources/assets/forestry/models/item/solderingIron.json create mode 100644 src/main/resources/assets/forestry/models/item/stairs.json create mode 100644 src/main/resources/assets/forestry/models/item/stairs/acacia.json create mode 100644 src/main/resources/assets/forestry/models/item/stairs/balsa.json create mode 100644 src/main/resources/assets/forestry/models/item/stairs/baobab.json create mode 100644 src/main/resources/assets/forestry/models/item/stairs/cherry.json create mode 100644 src/main/resources/assets/forestry/models/item/stairs/chestnut.json create mode 100644 src/main/resources/assets/forestry/models/item/stairs/citrus.json create mode 100644 src/main/resources/assets/forestry/models/item/stairs/cocobolo.json create mode 100644 src/main/resources/assets/forestry/models/item/stairs/ebony.json create mode 100644 src/main/resources/assets/forestry/models/item/stairs/giganteum.json create mode 100644 src/main/resources/assets/forestry/models/item/stairs/greenheart.json create mode 100644 src/main/resources/assets/forestry/models/item/stairs/ipe.json create mode 100644 src/main/resources/assets/forestry/models/item/stairs/kapok.json create mode 100644 src/main/resources/assets/forestry/models/item/stairs/larch.json create mode 100644 src/main/resources/assets/forestry/models/item/stairs/lime.json create mode 100644 src/main/resources/assets/forestry/models/item/stairs/mahoe.json create mode 100644 src/main/resources/assets/forestry/models/item/stairs/mahogany.json create mode 100644 src/main/resources/assets/forestry/models/item/stairs/maple.json create mode 100644 src/main/resources/assets/forestry/models/item/stairs/padauk.json create mode 100644 src/main/resources/assets/forestry/models/item/stairs/palm.json create mode 100644 src/main/resources/assets/forestry/models/item/stairs/papaya.json create mode 100644 src/main/resources/assets/forestry/models/item/stairs/pine.json create mode 100644 src/main/resources/assets/forestry/models/item/stairs/plum.json create mode 100644 src/main/resources/assets/forestry/models/item/stairs/poplar.json create mode 100644 src/main/resources/assets/forestry/models/item/stairs/sequoia.json create mode 100644 src/main/resources/assets/forestry/models/item/stairs/teak.json create mode 100644 src/main/resources/assets/forestry/models/item/stairs/walnut.json create mode 100644 src/main/resources/assets/forestry/models/item/stairs/wenge.json create mode 100644 src/main/resources/assets/forestry/models/item/stairs/willow.json create mode 100644 src/main/resources/assets/forestry/models/item/stairs/zebrawood.json create mode 100644 src/main/resources/assets/forestry/models/item/stairsFireproof.json create mode 100644 src/main/resources/assets/forestry/models/item/stamps.json create mode 100644 src/main/resources/assets/forestry/models/item/stick.json create mode 100644 src/main/resources/assets/forestry/models/item/storage/apatite.json create mode 100644 src/main/resources/assets/forestry/models/item/storage/bronze.json create mode 100644 src/main/resources/assets/forestry/models/item/storage/copper.json create mode 100644 src/main/resources/assets/forestry/models/item/storage/tin.json create mode 100644 src/main/resources/assets/forestry/models/item/stump.json create mode 100644 src/main/resources/assets/forestry/models/item/sturdyMachine.json create mode 100644 src/main/resources/assets/forestry/models/item/thermionicTubes.json create mode 100644 src/main/resources/assets/forestry/models/item/treealyzer.json create mode 100644 src/main/resources/assets/forestry/models/item/waxCast.json create mode 100644 src/main/resources/assets/forestry/models/item/woodPulp.json create mode 100644 src/main/resources/assets/forestry/models/item/wovenSilk.json create mode 100644 src/main/resources/assets/forestry/models/item/wrench.json create mode 100644 src/main/resources/assets/forgedebugmultilayermodel/blockstates/test_layer_block.json diff --git a/gradle.properties b/gradle.properties index de9f660a3..871f3031a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ mcversion=1.8.9 -forgeversion=11.15.0.1696 +forgeversion=11.15.0.1708 version_major=4 version_minor=3 version_patch=0 diff --git a/src/main/java/forestry/Forestry.java b/src/main/java/forestry/Forestry.java index 5183081a1..c44ea34ea 100644 --- a/src/main/java/forestry/Forestry.java +++ b/src/main/java/forestry/Forestry.java @@ -16,22 +16,20 @@ import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraftforge.common.MinecraftForge; - -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.Mod; -import cpw.mods.fml.common.Mod.EventHandler; -import cpw.mods.fml.common.event.FMLInitializationEvent; -import cpw.mods.fml.common.event.FMLInterModComms; -import cpw.mods.fml.common.event.FMLInterModComms.IMCEvent; -import cpw.mods.fml.common.event.FMLMissingMappingsEvent; -import cpw.mods.fml.common.event.FMLMissingMappingsEvent.MissingMapping; -import cpw.mods.fml.common.event.FMLPostInitializationEvent; -import cpw.mods.fml.common.event.FMLPreInitializationEvent; -import cpw.mods.fml.common.event.FMLServerStartingEvent; -import cpw.mods.fml.common.network.NetworkRegistry; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.common.registry.GameRegistry.Type; - +import net.minecraftforge.fml.common.FMLCommonHandler; +import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.fml.common.Mod.EventHandler; +import net.minecraftforge.fml.common.event.FMLInitializationEvent; +import net.minecraftforge.fml.common.event.FMLInterModComms; +import net.minecraftforge.fml.common.event.FMLInterModComms.IMCEvent; +import net.minecraftforge.fml.common.event.FMLMissingMappingsEvent; +import net.minecraftforge.fml.common.event.FMLMissingMappingsEvent.MissingMapping; +import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; +import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; +import net.minecraftforge.fml.common.event.FMLServerStartingEvent; +import net.minecraftforge.fml.common.network.NetworkRegistry; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.common.registry.GameRegistry.Type; import forestry.api.core.ForestryAPI; import forestry.core.EventHandlerCore; import forestry.core.config.Config; @@ -99,6 +97,8 @@ public class Forestry { ForestryAPI.activeMode = new GameMode(Config.gameMode); PluginManager.runPreInit(); + + Proxies.render.registerModels(); } @EventHandler diff --git a/src/main/java/forestry/apiculture/HasFlowersCache.java b/src/main/java/forestry/apiculture/HasFlowersCache.java index 6b4a1ae44..92fba244b 100644 --- a/src/main/java/forestry/apiculture/HasFlowersCache.java +++ b/src/main/java/forestry/apiculture/HasFlowersCache.java @@ -13,7 +13,7 @@ package forestry.apiculture; import java.util.Random; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import forestry.api.apiculture.BeeManager; @@ -32,7 +32,7 @@ public class HasFlowersCache implements INBTTagable { private static final int flowerCheckInterval = 128; private final int flowerCheckTime = random.nextInt(flowerCheckInterval); - private ChunkCoordinates flowerCoords = null; + private BlockPos flowerCoords = null; private int cooldown = 0; public boolean hasFlowers(IBee queen, IBeeHousing beeHousing) { @@ -46,7 +46,7 @@ public class HasFlowersCache implements INBTTagable { } IBeeModifier beeModifier = BeeManager.beeRoot.createBeeHousingModifier(beeHousing); - ChunkCoordinates housingCoords = beeHousing.getCoordinates(); + BlockPos housingCoords = beeHousing.getCoordinates(); int[] genomeTerritory = queen.getGenome().getTerritory(); float housingModifier = beeModifier.getTerritoryModifier(queen.getGenome(), 1f); @@ -76,11 +76,11 @@ public class HasFlowersCache implements INBTTagable { if (!isFlowerCoordInRange(flowerCoords, min, max)) { return false; } - return FlowerManager.flowerRegistry.isAcceptedFlower(flowerType, world, flowerCoords.posX, flowerCoords.posY, flowerCoords.posZ); + return FlowerManager.flowerRegistry.isAcceptedFlower(flowerType, world, flowerCoords); } - private static boolean isFlowerCoordInRange(ChunkCoordinates flowerCoords, Vect min, Vect max) { - return flowerCoords.posX >= min.x && flowerCoords.posX <= max.x && flowerCoords.posY >= min.y && flowerCoords.posY <= max.y && flowerCoords.posZ >= min.z && flowerCoords.posZ <= max.z; + private static boolean isFlowerCoordInRange(BlockPos flowerCoords, Vect min, Vect max) { + return flowerCoords.getX() >= min.getX() && flowerCoords.getX() <= max.getX() && flowerCoords.getY() >= min.getY() && flowerCoords.getY() <= max.getY() && flowerCoords.getZ() >= min.getZ() && flowerCoords.getZ() <= max.getZ(); } @Override @@ -94,7 +94,7 @@ public class HasFlowersCache implements INBTTagable { int x = hasFlowerCacheNBT.getInteger("flowerX"); int y = hasFlowerCacheNBT.getInteger("flowerY"); int z = hasFlowerCacheNBT.getInteger("flowerZ"); - flowerCoords = new ChunkCoordinates(x, y, z); + flowerCoords = new BlockPos(x, y, z); } cooldown = hasFlowerCacheNBT.getInteger("cooldown"); @@ -104,9 +104,9 @@ public class HasFlowersCache implements INBTTagable { public void writeToNBT(NBTTagCompound nbttagcompound) { NBTTagCompound hasFlowerCacheNBT = new NBTTagCompound(); if (flowerCoords != null) { - hasFlowerCacheNBT.setInteger("flowerX", flowerCoords.posX); - hasFlowerCacheNBT.setInteger("flowerY", flowerCoords.posY); - hasFlowerCacheNBT.setInteger("flowerZ", flowerCoords.posZ); + hasFlowerCacheNBT.setInteger("flowerX", flowerCoords.getX()); + hasFlowerCacheNBT.setInteger("flowerY", flowerCoords.getY()); + hasFlowerCacheNBT.setInteger("flowerZ", flowerCoords.getZ()); } hasFlowerCacheNBT.setInteger("cooldown", cooldown); diff --git a/src/main/java/forestry/apiculture/InventoryBeeHousing.java b/src/main/java/forestry/apiculture/InventoryBeeHousing.java index b4230a34b..621247b89 100644 --- a/src/main/java/forestry/apiculture/InventoryBeeHousing.java +++ b/src/main/java/forestry/apiculture/InventoryBeeHousing.java @@ -11,7 +11,7 @@ package forestry.apiculture; import net.minecraft.item.ItemStack; - +import net.minecraft.util.EnumFacing; import forestry.api.apiculture.BeeManager; import forestry.api.apiculture.EnumBeeType; import forestry.api.apiculture.IBeeHousingInventory; @@ -43,7 +43,7 @@ public class InventoryBeeHousing extends InventoryAdapterRestricted implements I } @Override - public boolean canExtractItem(int slotIndex, ItemStack itemstack, int side) { + public boolean canExtractItem(int slotIndex, ItemStack itemstack, EnumFacing side) { if (!super.canExtractItem(slotIndex, itemstack, side)) { return false; } diff --git a/src/main/java/forestry/apiculture/VillageHandlerApiculture.java b/src/main/java/forestry/apiculture/VillageHandlerApiculture.java index c955ba5d2..cf7f49b79 100755 --- a/src/main/java/forestry/apiculture/VillageHandlerApiculture.java +++ b/src/main/java/forestry/apiculture/VillageHandlerApiculture.java @@ -10,34 +10,15 @@ ******************************************************************************/ package forestry.apiculture; -import java.util.List; -import java.util.Random; +import net.minecraftforge.fml.common.registry.VillagerRegistry; +import net.minecraftforge.fml.common.registry.VillagerRegistry.VillagerProfession; -import net.minecraft.entity.passive.EntityVillager; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraft.util.MathHelper; -import net.minecraft.village.MerchantRecipe; -import net.minecraft.village.MerchantRecipeList; -import net.minecraft.world.gen.structure.MapGenStructureIO; -import net.minecraft.world.gen.structure.StructureVillagePieces; +/** + * TODO: Make it to a {@link VillagerProfession} when Forge has Fixed the {@link VillagerRegistry} + */ +public class VillageHandlerApiculture /*implements IVillageCreationHandler, IVillageTradeHandler*/ { -import net.minecraftforge.oredict.OreDictionary; - -import cpw.mods.fml.common.registry.VillagerRegistry.IVillageCreationHandler; -import cpw.mods.fml.common.registry.VillagerRegistry.IVillageTradeHandler; - -import forestry.api.apiculture.EnumBeeType; -import forestry.apiculture.blocks.BlockApicultureType; -import forestry.apiculture.genetics.BeeDefinition; -import forestry.apiculture.worldgen.ComponentVillageBeeHouse; -import forestry.core.utils.Log; -import forestry.plugins.PluginApiculture; - -public class VillageHandlerApiculture implements IVillageCreationHandler, IVillageTradeHandler { - - public static void registerVillageComponents() { + /*public static void registerVillageComponents() { try { MapGenStructureIO.func_143031_a(ComponentVillageBeeHouse.class, "Forestry:BeeHouse"); } catch (Throwable e) { @@ -79,5 +60,5 @@ public class VillageHandlerApiculture implements IVillageCreationHandler, IVilla public Object buildComponent(StructureVillagePieces.PieceWeight villagePiece, StructureVillagePieces.Start startPiece, List pieces, Random random, int p1, int p2, int p3, int p4, int p5) { return ComponentVillageBeeHouse.buildComponent(startPiece, pieces, random, p1, p2, p3, p4, p5); - } + }*/ } diff --git a/src/main/java/forestry/apiculture/blocks/BlockAlveary.java b/src/main/java/forestry/apiculture/blocks/BlockAlveary.java index d37777cc0..8ede96e59 100644 --- a/src/main/java/forestry/apiculture/blocks/BlockAlveary.java +++ b/src/main/java/forestry/apiculture/blocks/BlockAlveary.java @@ -11,24 +11,34 @@ package forestry.apiculture.blocks; import java.util.ArrayList; +import java.util.LinkedHashMap; import java.util.List; +import com.google.common.collect.Maps; + import net.minecraft.block.Block; -import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.block.properties.IProperty; +import net.minecraft.block.properties.PropertyEnum; +import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.block.statemap.StateMapperBase; +import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; +import net.minecraft.util.BlockPos; +import net.minecraft.util.IStringSerializable; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +import forestry.api.core.IModelManager; +import forestry.api.core.IStateMapperRegister; import forestry.api.core.Tabs; import forestry.apiculture.MaterialBeehive; import forestry.apiculture.multiblock.TileAlveary; +import forestry.apiculture.multiblock.TileAlvearyClimatiser; import forestry.apiculture.multiblock.TileAlvearyFan; import forestry.apiculture.multiblock.TileAlvearyHeater; import forestry.apiculture.multiblock.TileAlvearyHygroregulator; @@ -37,20 +47,47 @@ import forestry.apiculture.multiblock.TileAlvearySieve; import forestry.apiculture.multiblock.TileAlvearyStabiliser; import forestry.apiculture.multiblock.TileAlvearySwarmer; import forestry.core.blocks.BlockStructure; -import forestry.core.render.TextureManager; +import forestry.core.proxy.Proxies; -public class BlockAlveary extends BlockStructure { - public enum Type { +public class BlockAlveary extends BlockStructure implements IStateMapperRegister { + private static final PropertyEnum TYPE = PropertyEnum.create("alveary", Type.class); + private static final PropertyEnum STATE = PropertyEnum.create("state", State.class); + private static final PropertyEnum LEVEL = PropertyEnum.create("type", Level.class); + + private enum State implements IStringSerializable { + ON, OFF; + + @Override + public String getName() { + return name().toLowerCase(); + } + } + + private enum Level implements IStringSerializable { + BOTTOM, LEFT, RIGHT; + + @Override + public String getName() { + return name().toLowerCase(); + } + } + + public enum Type implements IStringSerializable { PLAIN, ENTRANCE, SWARMER, FAN, HEATER, HYGRO, - STABILIZER, + STABILISER, SIEVE; public static final Type[] VALUES = values(); + + @Override + public String getName() { + return name().toLowerCase(); + } } public BlockAlveary() { @@ -58,6 +95,7 @@ public class BlockAlveary extends BlockStructure { setHardness(1.0f); setCreativeTab(Tabs.tabApiculture); setHarvestLevel("axe", 0); + setDefaultState(this.blockState.getBaseState().withProperty(TYPE, Type.PLAIN).withProperty(STATE, State.OFF).withProperty(LEVEL, Level.BOTTOM)); } @SuppressWarnings({"rawtypes", "unchecked"}) @@ -74,30 +112,31 @@ public class BlockAlveary extends BlockStructure { @Override public int getRenderType() { - return 0; + return 3; } - + @Override - public boolean renderAsNormalBlock() { + public boolean isNormalCube() { + return true; + } + + @Override + public boolean isFullCube() { return true; } @Override - public ArrayList getDrops(World world, int x, int y, int z, int metadata, int fortune) { + public List getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { + int metadata = getMetaFromState(state); ArrayList drop = new ArrayList<>(); drop.add(new ItemStack(this, 1, metadata != 1 ? metadata : 0)); return drop; } - @Override - public int getDamageValue(World world, int x, int y, int z) { - int meta = world.getBlockMetadata(x, y, z); - return meta != 1 ? meta : 0; - } - /* TILE ENTITY CREATION */ @Override - public TileEntity createTileEntity(World world, int metadata) { + public TileEntity createTileEntity(World world, IBlockState state) { + int metadata = getMetaFromState(state); if (metadata < 0 || metadata > Type.VALUES.length) { return null; } @@ -112,7 +151,7 @@ public class BlockAlveary extends BlockStructure { return new TileAlvearyHeater(); case HYGRO: return new TileAlvearyHygroregulator(); - case STABILIZER: + case STABILISER: return new TileAlvearyStabiliser(); case SIEVE: return new TileAlvearySieve(); @@ -124,159 +163,146 @@ public class BlockAlveary extends BlockStructure { @Override public TileEntity createNewTileEntity(World world, int meta) { - return createTileEntity(world, meta); + return createTileEntity(world, getStateFromMeta(meta)); } - /* ICONS */ - public static final int PLAIN = 0; - public static final int ENTRANCE = 1; - public static final int BOTTOM = 2; - public static final int LEFT = 3; - public static final int RIGHT = 4; - public static final int ALVEARY_SWARMER_OFF = 5; - public static final int ALVEARY_SWARMER_ON = 6; - public static final int ALVEARY_HEATER_OFF = 7; - public static final int ALVEARY_HEATER_ON = 8; - public static final int ALVEARY_FAN_OFF = 9; - public static final int ALVEARY_FAN_ON = 10; - public static final int ALVEARY_HYGRO = 11; - public static final int STABILISER = 12; - public static final int SIEVE = 13; - - @SideOnly(Side.CLIENT) - private IIcon[] icons; - + /* ITEM MODELS */ @SideOnly(Side.CLIENT) @Override - public void registerBlockIcons(IIconRegister register) { - icons = new IIcon[14]; - icons[0] = TextureManager.registerTex(register, "apiculture/alveary.plain"); - icons[1] = TextureManager.registerTex(register, "apiculture/alveary.entrance"); - icons[2] = TextureManager.registerTex(register, "apiculture/alveary.bottom"); - icons[3] = TextureManager.registerTex(register, "apiculture/alveary.left"); - icons[4] = TextureManager.registerTex(register, "apiculture/alveary.right"); - icons[5] = TextureManager.registerTex(register, "apiculture/alveary.swarmer.off"); - icons[6] = TextureManager.registerTex(register, "apiculture/alveary.swarmer.on"); - icons[7] = TextureManager.registerTex(register, "apiculture/alveary.heater.off"); - icons[8] = TextureManager.registerTex(register, "apiculture/alveary.heater.on"); - icons[9] = TextureManager.registerTex(register, "apiculture/alveary.fan.off"); - icons[10] = TextureManager.registerTex(register, "apiculture/alveary.fan.on"); - icons[11] = TextureManager.registerTex(register, "apiculture/alveary.valve"); - icons[12] = TextureManager.registerTex(register, "apiculture/alveary.stabiliser"); - icons[13] = TextureManager.registerTex(register, "apiculture/alveary.sieve"); + public void registerModel(Item item, IModelManager manager) { + manager.registerItemModel(item, 0, "apiculture/alveary.plain"); + manager.registerItemModel(item, 1, "apiculture/alveary.entrance"); + manager.registerItemModel(item, 2, "apiculture/alveary.swarmer"); + manager.registerItemModel(item, 3, "apiculture/alveary.fan"); + manager.registerItemModel(item, 4, "apiculture/alveary.heater"); + manager.registerItemModel(item, 5, "apiculture/alveary.hygro"); + manager.registerItemModel(item, 6, "apiculture/alveary.stabiliser"); + manager.registerItemModel(item, 7, "apiculture/alveary.sieve"); + } + + /* STATES */ + @Override + public IBlockState getStateFromMeta(int meta) { + return getDefaultState().withProperty(TYPE, Type.values()[meta]); } - @SideOnly(Side.CLIENT) @Override - public IIcon getIcon(int side, int metadata) { - if ((metadata <= 1 - || metadata == Type.SIEVE.ordinal() || metadata == Type.SWARMER.ordinal() || metadata == Type.STABILIZER.ordinal()) - && (side == 1 || side == 0)) { - return icons[BOTTOM]; - } - - Type type = Type.VALUES[metadata]; - - switch (type) { - case PLAIN: - return icons[PLAIN]; - case ENTRANCE: - return icons[ENTRANCE]; - case SWARMER: - return icons[ALVEARY_SWARMER_OFF]; - case FAN: - return icons[ALVEARY_FAN_OFF]; - case HEATER: - return icons[ALVEARY_HEATER_OFF]; - case HYGRO: - return icons[ALVEARY_HYGRO]; - case STABILIZER: - return icons[STABILISER]; - case SIEVE: - return icons[SIEVE]; - default: - return null; - } - + public int getMetaFromState(IBlockState state) { + return ((Type) state.getValue(TYPE)).ordinal(); } - @SideOnly(Side.CLIENT) @Override - public IIcon getIcon(IBlockAccess world, int x, int y, int z, int side) { - int meta = world.getBlockMetadata(x, y, z); - - if (meta == 1) { - return this.getIcon(side, meta); - } else if (meta > 1) { - return getBlockTextureFromSideAndTile(world, x, y, z, side); + protected BlockState createBlockState() { + return new BlockState(this, new IProperty[] { TYPE, STATE, LEVEL }); + } + + @Override + public IBlockState getActualState(IBlockState state, IBlockAccess world, BlockPos pos) { + TileEntity tile = world.getTileEntity(pos); + if (tile instanceof TileAlveary) { + if (tile instanceof TileAlvearyClimatiser) { + TileAlvearyClimatiser alveary = (TileAlvearyClimatiser) tile; + if (alveary.isActive()) { + state = state.withProperty(STATE, State.ON); + } else { + state = state.withProperty(STATE, State.OFF); + } + } else if (tile instanceof TileAlvearySwarmer) { + TileAlvearySwarmer alveary = (TileAlvearySwarmer) tile; + if (alveary.isActive()) { + state = state.withProperty(STATE, State.ON); + } else { + state = state.withProperty(STATE, State.OFF); + } + } } - Block blockXP = world.getBlock(x + 1, y, z); - Block blockXM = world.getBlock(x - 1, y, z); + int meta = ((Type) state.getValue(TYPE)).ordinal(); + + Block blockXP = world.getBlockState(new BlockPos(pos.getX() + 1, pos.getY(), pos.getZ())).getBlock(); + Block blockXM = world.getBlockState(new BlockPos(pos.getX() - 1, pos.getY(), pos.getZ())).getBlock(); + + state = state.withProperty(LEVEL, Level.BOTTOM); if (blockXP == this && blockXM != this) { - if (world.getBlockMetadata(x + 1, y, z) == 1) { + IBlockState stateNeighbor = world.getBlockState(new BlockPos(pos.getX() + 1, pos.getY(), pos.getZ())); + if (stateNeighbor.getBlock().getMetaFromState(stateNeighbor) == 1) { - if (world.getBlock(x, y, z + 1) != this) { - return switchForSide(42, side); + if (world.getBlockState(new BlockPos(pos.getX(), pos.getY(), pos.getZ() + 1)).getBlock() != this) { + switchForSide(state, world, pos); } else { - return switchForSide(41, side); + switchForSide(state, world, pos); } - } else { - return this.getIcon(side, meta); } - } else if (blockXP != this && blockXM == this) { - if (world.getBlockMetadata(x - 1, y, z) == 1) { + IBlockState stateNeighbor = world.getBlockState(new BlockPos(pos.getX() - 1, pos.getY(), pos.getZ())); + if (stateNeighbor.getBlock().getMetaFromState(stateNeighbor) == 1) { - if (world.getBlock(x, y, z + 1) != this) { - return switchForSide(41, side); + if (world.getBlockState(new BlockPos(pos.getX(), pos.getY(), pos.getZ() + 1)).getBlock() != this) { + switchForSide(state, world, pos); } else { - return switchForSide(42, side); + switchForSide(state, world, pos); } - } else { - return this.getIcon(side, meta); } } - return this.getIcon(side, meta); + return super.getActualState(state, world, pos); } + + private void switchForSide(IBlockState state, IBlockAccess world, BlockPos pos) { - @SideOnly(Side.CLIENT) - private IIcon getBlockTextureFromSideAndTile(IBlockAccess world, int x, int y, int z, int side) { - TileEntity tile = world.getTileEntity(x, y, z); - if (!(tile instanceof TileAlveary)) { - return getIcon(side, 0); + Block blockX = world.getBlockState(new BlockPos(pos.getX() + 1, pos.getY(), pos.getZ())).getBlock(); + Block blockY = world.getBlockState(new BlockPos(pos.getX(), pos.getY() + 1, pos.getZ())).getBlock(); + if (blockX != this && blockY == this) { + state = state.withProperty(LEVEL, Level.LEFT); + } else if (blockX == this && blockY == this) { + state = state.withProperty(LEVEL, Level.RIGHT); + } else if (blockX == this && blockY != this) { + state = state.withProperty(LEVEL, Level.LEFT); + } else if (blockX != this && blockY != this) { + state = state.withProperty(LEVEL, Level.RIGHT); } - return icons[((TileAlveary) tile).getIcon(side)]; } - + + @Override + public void registerStateMapper() { + Proxies.render.registerStateMapper(this, new AlvearyStateMapper()); + } + @SideOnly(Side.CLIENT) - private IIcon switchForSide(int textureId, int side) { + private static class AlvearyStateMapper extends StateMapperBase { - if (side == 4 || side == 5) { - if (textureId == 41) { - return icons[LEFT]; - } else { - return icons[RIGHT]; + @Override + protected ModelResourceLocation getModelResourceLocation(IBlockState state) { + LinkedHashMap linkedhashmap = Maps.newLinkedHashMap(state.getProperties()); + if (linkedhashmap.get(TYPE) != Type.PLAIN) { + linkedhashmap.remove(LEVEL); } - } else if (textureId == 41) { - return icons[RIGHT]; - } else { - return icons[LEFT]; + if (linkedhashmap.get(TYPE) == Type.SIEVE + || linkedhashmap.get(TYPE) == Type.ENTRANCE + || linkedhashmap.get(TYPE) == Type.STABILISER + || linkedhashmap.get(TYPE) == Type.HYGRO + || linkedhashmap.get(TYPE) == Type.PLAIN) { + linkedhashmap.remove(STATE); + } + String s = String.format("%s:%s", + Block.blockRegistry.getNameForObject(state.getBlock()).getResourceDomain(), + "apiculture/alveary_" + TYPE.getName((Enum) linkedhashmap.remove(TYPE))); + ; + return new ModelResourceLocation(s, this.getPropertyString(linkedhashmap)); } } @Override - public void onNeighborBlockChange(World world, int x, int y, int z, Block block) { - super.onNeighborBlockChange(world, x, y, z, block); - - TileEntity tileEntity = world.getTileEntity(x, y, z); + public void onNeighborBlockChange(World world, BlockPos pos, IBlockState state, Block neighborBlock) { + super.onNeighborBlockChange(world, pos, state, neighborBlock); + + TileEntity tileEntity = world.getTileEntity(pos); if (tileEntity instanceof TileAlveary) { TileAlveary tileAlveary = (TileAlveary) tileEntity; diff --git a/src/main/java/forestry/apiculture/blocks/BlockApiculture.java b/src/main/java/forestry/apiculture/blocks/BlockApiculture.java index c77ed4c77..9f1c5d4b4 100644 --- a/src/main/java/forestry/apiculture/blocks/BlockApiculture.java +++ b/src/main/java/forestry/apiculture/blocks/BlockApiculture.java @@ -15,7 +15,7 @@ import forestry.core.blocks.BlockBase; public class BlockApiculture extends BlockBase { public BlockApiculture() { - super(); + super(BlockApicultureType.class); setCreativeTab(Tabs.tabApiculture); setHarvestLevel("axe", 0); } diff --git a/src/main/java/forestry/apiculture/blocks/BlockApicultureChestType.java b/src/main/java/forestry/apiculture/blocks/BlockApicultureChestType.java new file mode 100644 index 000000000..66061b2d8 --- /dev/null +++ b/src/main/java/forestry/apiculture/blocks/BlockApicultureChestType.java @@ -0,0 +1,51 @@ +/******************************************************************************* + * Copyright (c) 2011-2014 SirSengir. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser Public License v3 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl-3.0.txt + * + * Various Contributors including, but not limited to: + * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges + ******************************************************************************/ +package forestry.apiculture.blocks; + +import java.util.Locale; + +import forestry.apiculture.tiles.TileApiaristChest; +import forestry.core.blocks.IMachineProperties; +import forestry.core.tiles.TileForestry; + +public enum BlockApicultureChestType implements IMachineProperties { + APIARIST_CHEST(TileApiaristChest.class, "ApiaristChest"); + + public static final BlockApicultureChestType[] VALUES = values(); + + private final String teIdent; + private final Class teClass; + + BlockApicultureChestType(Class teClass, String name) { + this.teIdent = "forestry." + name; + this.teClass = teClass; + } + + @Override + public int getMeta() { + return ordinal(); + } + + @Override + public String getTeIdent() { + return teIdent; + } + + @Override + public Class getTeClass() { + return teClass; + } + + @Override + public String getName() { + return name().toLowerCase(Locale.ENGLISH); + } +} diff --git a/src/main/java/forestry/apiculture/blocks/BlockApicultureType.java b/src/main/java/forestry/apiculture/blocks/BlockApicultureType.java index 69de30b0a..1cb2d834c 100644 --- a/src/main/java/forestry/apiculture/blocks/BlockApicultureType.java +++ b/src/main/java/forestry/apiculture/blocks/BlockApicultureType.java @@ -55,4 +55,9 @@ public enum BlockApicultureType implements IMachineProperties { public Class getTeClass() { return teClass; } + + @Override + public String getName() { + return name().toLowerCase(Locale.ENGLISH); + } } diff --git a/src/main/java/forestry/apiculture/blocks/BlockBeehives.java b/src/main/java/forestry/apiculture/blocks/BlockBeehives.java index 4b6f3f676..a39cc4c27 100644 --- a/src/main/java/forestry/apiculture/blocks/BlockBeehives.java +++ b/src/main/java/forestry/apiculture/blocks/BlockBeehives.java @@ -15,44 +15,57 @@ import java.util.Collections; import java.util.List; import net.minecraft.block.BlockContainer; -import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.block.properties.IProperty; +import net.minecraft.block.properties.PropertyEnum; +import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; +import net.minecraft.util.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - import forestry.api.apiculture.IHiveDrop; +import forestry.api.apiculture.hives.IHiveRegistry.HiveType; +import forestry.api.core.IModelManager; +import forestry.api.core.IItemModelRegister; import forestry.api.core.Tabs; import forestry.apiculture.MaterialBeehive; import forestry.apiculture.tiles.TileSwarm; -import forestry.apiculture.worldgen.HiveRegistry; import forestry.core.config.Config; -import forestry.core.render.TextureManager; import forestry.core.utils.InventoryUtil; import forestry.core.utils.ItemStackUtil; import forestry.plugins.PluginApiculture; -public class BlockBeehives extends BlockContainer { - public enum Type { - LEGACY, - FOREST, - MEADOWS; - } - +public class BlockBeehives extends BlockContainer implements IItemModelRegister { + private static final PropertyEnum HIVETYPES = PropertyEnum.create("hive", HiveType.class); + public BlockBeehives() { super(new MaterialBeehive(true)); setLightLevel(0.8f); setHardness(1.0f); setCreativeTab(Tabs.tabApiculture); setHarvestLevel("scoop", 0); + setDefaultState(this.blockState.getBaseState().withProperty(HIVETYPES, HiveType.FOREST)); + } + + @Override + protected BlockState createBlockState() { + return new BlockState(this, new IProperty[] { HIVETYPES }); + } + + @Override + public int getMetaFromState(IBlockState state) { + return ((HiveType) state.getValue(HIVETYPES)).ordinal() + 1; + } + + @Override + public IBlockState getStateFromMeta(int meta) { + return getDefaultState().withProperty(HIVETYPES, HiveType.values()[meta - 1]); } @Override @@ -61,42 +74,36 @@ public class BlockBeehives extends BlockContainer { } @Override - public boolean canEntityDestroy(IBlockAccess world, int x, int y, int z, Entity entity) { + public boolean canEntityDestroy(IBlockAccess world, BlockPos pos, Entity entity) { return false; } @Override - public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z) { - if (canHarvestBlock(player, world.getBlockMetadata(x, y, z))) { + public boolean removedByPlayer(World world, BlockPos pos, EntityPlayer player, boolean willHarvest) { + if (canHarvestBlock(world, pos, player)) { // Handle TE'd beehives - TileEntity tile = world.getTileEntity(x, y, z); + TileEntity tile = world.getTileEntity(pos); if (tile instanceof TileSwarm) { TileSwarm swarm = (TileSwarm) tile; if (swarm.containsBees()) { for (ItemStack beeStack : InventoryUtil.getStacks(swarm.contained)) { if (beeStack != null) { - ItemStackUtil.dropItemStackAsEntity(beeStack, world, x, y, z); + ItemStackUtil.dropItemStackAsEntity(beeStack, world, pos); } } } } } - return world.setBlockToAir(x, y, z); + return world.setBlockToAir(pos); } @Override - public ArrayList getDrops(World world, int x, int y, int z, int metadata, int fortune) { + public List getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { ArrayList ret = new ArrayList<>(); - // Handle legacy block - if (metadata == 0) { - ret.add(new ItemStack(this)); - return ret; - } - - List dropList = getDropsForHive(metadata); + List dropList = getDropsForHive(getMetaFromState(state)); Collections.shuffle(dropList); // Grab a princess @@ -106,8 +113,8 @@ public class BlockBeehives extends BlockContainer { tries++; for (IHiveDrop drop : dropList) { - if (world.rand.nextInt(100) < drop.getChance(world, x, y, z)) { - ret.add(drop.getPrincess(world, x, y, z, fortune)); + if (RANDOM.nextInt(100) < drop.getChance((World) world, pos)) { + ret.add(drop.getPrincess((World) world, pos, fortune)); hasPrincess = true; break; } @@ -116,15 +123,15 @@ public class BlockBeehives extends BlockContainer { // Grab drones for (IHiveDrop drop : dropList) { - if (world.rand.nextInt(100) < drop.getChance(world, x, y, z)) { - ret.addAll(drop.getDrones(world, x, y, z, fortune)); + if (RANDOM.nextInt(100) < drop.getChance((World) world, pos)) { + ret.addAll(drop.getDrones((World) world, pos, fortune)); break; } } // Grab anything else on offer for (IHiveDrop drop : dropList) { - if (world.rand.nextInt(100) < drop.getChance(world, x, y, z)) { - ret.addAll(drop.getAdditional(world, x, y, z, fortune)); + if (RANDOM.nextInt(100) < drop.getChance((World) world, pos)) { + ret.addAll(drop.getAdditional((World) world, pos, fortune)); break; } } @@ -134,8 +141,8 @@ public class BlockBeehives extends BlockContainer { // / CREATIVE INVENTORY @Override - public int damageDropped(int meta) { - return meta; + public int damageDropped(IBlockState state) { + return getMetaFromState(state); } private static List getDropsForHive(int meta) { @@ -149,19 +156,19 @@ public class BlockBeehives extends BlockContainer { private static String getHiveNameForMeta(int meta) { switch (meta) { case 1: - return HiveRegistry.forest; + return HiveType.FOREST.getHiveName(); case 2: - return HiveRegistry.meadows; + return HiveType.MEADOWS.getHiveName(); case 3: - return HiveRegistry.desert; + return HiveType.DESERT.getHiveName(); case 4: - return HiveRegistry.jungle; + return HiveType.JUNGLE.getHiveName(); case 5: - return HiveRegistry.end; + return HiveType.END.getHiveName(); case 6: - return HiveRegistry.snow; + return HiveType.SNOW.getHiveName(); case 7: - return HiveRegistry.swamp; + return HiveType.SWAMP.getHiveName(); } return null; } @@ -181,38 +188,22 @@ public class BlockBeehives extends BlockContainer { // Swarm hive not added } - /* ICONS */ - @SideOnly(Side.CLIENT) - private IIcon[] icons; - + /* IETM MODELS */ @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister register) { - icons = new IIcon[18]; - for (int i = 1; i < 9; i++) { - icons[i * 2] = TextureManager.registerTex(register, "beehives/beehive." + i + ".top"); - icons[(i * 2) + 1] = TextureManager.registerTex(register, "beehives/beehive." + i + ".side"); - } - } - - @Override - @SideOnly(Side.CLIENT) - public IIcon getIcon(int i, int j) { - if (j == 0 || j > 8) { - return null; - } - - if (i == 0 || i == 1) { - if (j * 2 < icons.length && icons[j * 2] != null) { - return icons[j * 2]; - } else { - return icons[2]; - } - } else if (j * 2 + 1 < icons.length && icons[j * 2 + 1] != null) { - return icons[j * 2 + 1]; - } else { - return icons[3]; - } + public void registerModel(Item item, IModelManager manager) { + manager.registerItemModel(item, 1, "beehives/" + HiveType.FOREST.getName()); + manager.registerItemModel(item, 2, "beehives/" + HiveType.MEADOWS.getName()); + manager.registerItemModel(item, 3, "beehives/" + HiveType.DESERT.getName()); + manager.registerItemModel(item, 4, "beehives/" + HiveType.JUNGLE.getName()); + manager.registerItemModel(item, 5, "beehives/" + HiveType.END.getName()); + manager.registerItemModel(item, 6, "beehives/" + HiveType.SNOW.getName()); + manager.registerItemModel(item, 7, "beehives/" + HiveType.SWAMP.getName()); } + + @Override + public int getRenderType() + { + return 3; + } } diff --git a/src/main/java/forestry/apiculture/blocks/BlockCandle.java b/src/main/java/forestry/apiculture/blocks/BlockCandle.java index 5d8cf0317..74e109e8f 100644 --- a/src/main/java/forestry/apiculture/blocks/BlockCandle.java +++ b/src/main/java/forestry/apiculture/blocks/BlockCandle.java @@ -22,7 +22,10 @@ import java.util.Random; import java.util.Set; import net.minecraft.block.BlockTorch; -import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.block.properties.IProperty; +import net.minecraft.block.properties.PropertyEnum; +import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -32,29 +35,38 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.IStringSerializable; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; - +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.oredict.OreDictionary; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - +import forestry.api.core.IModelManager; +import forestry.api.core.IItemModelRegister; import forestry.api.core.Tabs; import forestry.apiculture.tiles.TileCandle; -import forestry.core.proxy.Proxies; -import forestry.core.render.TextureManager; import forestry.core.utils.ItemStackUtil; -import forestry.core.utils.StringUtil; -public class BlockCandle extends BlockTorch { +public class BlockCandle extends BlockTorch implements IItemModelRegister { private static final ImmutableMap colours; private static final Set lightingItems; public static final String colourTagName = "colour"; + + private static final PropertyEnum STATE = PropertyEnum.create("state", State.class); + private enum State implements IStringSerializable { + ON, OFF; + + @Override + public String getName() { + return name(); + } + } + static { colours = ImmutableMap.builder() .put("dyeWhite", new Color(255, 255, 255).getRGB()) @@ -82,74 +94,57 @@ public class BlockCandle extends BlockTorch { )); } - @SideOnly(Side.CLIENT) - private IIcon litStump; - @SideOnly(Side.CLIENT) - private IIcon litTip; - @SideOnly(Side.CLIENT) - private IIcon unlitStump; - @SideOnly(Side.CLIENT) - private IIcon unlitTip; - public BlockCandle() { super(); this.setHardness(0.0F); this.setStepSound(soundTypeWood); setCreativeTab(Tabs.tabApiculture); + setDefaultState(this.blockState.getBaseState().withProperty(FACING, EnumFacing.UP).withProperty(STATE, State.OFF)); + } + + @Override + protected BlockState createBlockState() { + return new BlockState(this, new IProperty[] { FACING, STATE }); + } + + @Override + public IBlockState getActualState(IBlockState state, IBlockAccess world, BlockPos pos) { + if(((TileCandle)world.getTileEntity(pos)).isLit()) + state = state.withProperty(STATE, State.ON); + return super.getActualState(state, world, pos); } @Override - public boolean hasTileEntity(int metadata) { + public boolean hasTileEntity(IBlockState state) { return true; } @Override - public TileEntity createTileEntity(World world, int metadata) { + public TileEntity createTileEntity(World world, IBlockState state) { return new TileCandle(); } - @Override - public int getRenderType() { - return Proxies.render.getCandleRenderId(); - } - @SideOnly(Side.CLIENT) @Override - public void registerBlockIcons(IIconRegister register) { - String fileBase = StringUtil.cleanBlockName(this); - this.blockIcon = TextureManager.registerTex(register, "stump"); - this.litStump = TextureManager.registerTex(register, fileBase + "StumpLit"); - this.litTip = TextureManager.registerTex(register, fileBase + "TipLit"); - this.unlitStump = TextureManager.registerTex(register, fileBase + "StumpUnlit"); - this.unlitTip = TextureManager.registerTex(register, fileBase + "TipUnlit"); + public void registerModel(Item item, IModelManager manager) { + manager.registerItemModel(item, 0, "candle"); } @Override - public int getLightValue(IBlockAccess world, int x, int y, int z) { - TileEntity tileEntity = world.getTileEntity(x, y, z); + public int getLightValue(IBlockAccess world, BlockPos pos) { + TileEntity tileEntity = world.getTileEntity(pos); if (tileEntity instanceof TileCandle && ((TileCandle) tileEntity).isLit()) { return 14; } return 0; } - - @SideOnly(Side.CLIENT) - public IIcon getTextureFromPassAndLit(int pass, boolean isLit) { - IIcon i; - if (pass == 0) { - if (isLit) { - i = this.litTip; - } else { - i = this.unlitTip; - } - } else { - if (isLit) { - i = this.litStump; - } else { - i = this.unlitStump; - } + + @Override + public int colorMultiplier(IBlockAccess worldIn, BlockPos pos, int renderPass) { + if(renderPass < 3){ + return ((TileCandle)worldIn.getTileEntity(pos)).getColour(); } - return i; + return 16777215; } @SuppressWarnings({"rawtypes", "unchecked"}) @@ -159,8 +154,8 @@ public class BlockCandle extends BlockTorch { } @Override - public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int facing, float facingX, float facingY, float facingZ) { - TileEntity tileEntity = world.getTileEntity(x, y, z); + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumFacing side, float hitX, float hitY, float hitZ) { + TileEntity tileEntity = world.getTileEntity(pos); if (!(tileEntity instanceof TileCandle)) { return false; } @@ -197,7 +192,7 @@ public class BlockCandle extends BlockTorch { } else { boolean dyed = tryDye(heldItem, isLit, tileCandle); if (dyed) { - world.markBlockForUpdate(x, y, z); + world.markBlockForUpdate(pos); toggleLitState = false; flag = true; } @@ -206,7 +201,10 @@ public class BlockCandle extends BlockTorch { if (toggleLitState) { tileCandle.setLit(!isLit); - world.markBlockForUpdate(x, y, z); + world.markBlockForUpdate(pos); + world.theProfiler.startSection("checkLight"); + world.checkLight(pos); + world.theProfiler.endSection(); flag = true; } return flag; @@ -236,21 +234,21 @@ public class BlockCandle extends BlockTorch { private final ThreadLocal drop = new ThreadLocal<>(); @Override - public void onBlockHarvested(World world, int x, int y, int z, int metadata, EntityPlayer player) { + public void onBlockHarvested(World world, BlockPos pos, IBlockState state, EntityPlayer player) { if (!world.isRemote) { - ItemStack itemStack = getCandleDrop(world, x, y, z); + ItemStack itemStack = getCandleDrop(world, pos); drop.set(itemStack); } } - + @Override - public ArrayList getDrops(World world, int x, int y, int z, int metadata, int fortune) { + public List getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { ItemStack dropStack = drop.get(); drop.remove(); // not harvested, get drops normally if (dropStack == null) { - dropStack = getCandleDrop(world, x, y, z); + dropStack = getCandleDrop(world, pos); } ArrayList drops = new ArrayList<>(1); @@ -260,12 +258,12 @@ public class BlockCandle extends BlockTorch { } @Override - public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z) { - return getCandleDrop(world, x, y, z); + public ItemStack getPickBlock(MovingObjectPosition target, World world, BlockPos pos, EntityPlayer player) { + return getCandleDrop(world, pos); } - private ItemStack getCandleDrop(World world, int x, int y, int z) { - TileEntity tileEntity = world.getTileEntity(x, y, z); + private ItemStack getCandleDrop(IBlockAccess world, BlockPos pos) { + TileEntity tileEntity = world.getTileEntity(pos); if (!(tileEntity instanceof TileCandle)) { return null; } @@ -284,20 +282,20 @@ public class BlockCandle extends BlockTorch { } @Override - public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack itemStack) { - TileCandle tileCandle = (TileCandle) (world.getTileEntity(x, y, z)); - int colour = getColourValueFromItemStack(itemStack); - boolean isLit = isLit(itemStack); + public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, EntityLivingBase placer, ItemStack stack) { + TileCandle tileCandle = (TileCandle) (world.getTileEntity(pos)); + int colour = getColourValueFromItemStack(stack); + boolean isLit = isLit(stack); tileCandle.setColour(colour); tileCandle.setLit(isLit); } @Override @SideOnly(Side.CLIENT) - public void randomDisplayTick(World world, int x, int y, int z, Random random) { - TileEntity tileEntity = world.getTileEntity(x, y, z); + public void randomDisplayTick(World world, BlockPos pos, IBlockState state, Random rand) { + TileEntity tileEntity = world.getTileEntity(pos); if (tileEntity instanceof TileCandle && ((TileCandle) tileEntity).isLit()) { - super.randomDisplayTick(world, x, y, z, random); + super.randomDisplayTick(world, pos, state, rand); } } diff --git a/src/main/java/forestry/apiculture/blocks/BlockRegistryApiculture.java b/src/main/java/forestry/apiculture/blocks/BlockRegistryApiculture.java index bfac863c9..2a6a86a58 100644 --- a/src/main/java/forestry/apiculture/blocks/BlockRegistryApiculture.java +++ b/src/main/java/forestry/apiculture/blocks/BlockRegistryApiculture.java @@ -27,7 +27,7 @@ public class BlockRegistryApiculture extends BlockRegistry { public BlockRegistryApiculture() { apiculture = registerBlock(new BlockApiculture(), ItemBlockForestry.class, "apiculture"); - apicultureChest = registerBlock(new BlockBase(true), ItemBlockForestry.class, "apicultureChest"); + apicultureChest = registerBlock(new BlockBase(true, BlockApicultureChestType.class), ItemBlockForestry.class, "apicultureChest"); apicultureChest.setCreativeTab(Tabs.tabApiculture); apicultureChest.setHarvestLevel("axe", 0); diff --git a/src/main/java/forestry/apiculture/blocks/BlockStump.java b/src/main/java/forestry/apiculture/blocks/BlockStump.java index c552f3617..59bc41a9f 100644 --- a/src/main/java/forestry/apiculture/blocks/BlockStump.java +++ b/src/main/java/forestry/apiculture/blocks/BlockStump.java @@ -14,27 +14,28 @@ import java.util.List; import java.util.Random; import net.minecraft.block.BlockTorch; -import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.world.World; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +import forestry.api.core.IModelManager; +import forestry.api.core.IItemModelRegister; import forestry.api.core.Tabs; import forestry.apiculture.tiles.TileCandle; import forestry.core.config.Constants; -import forestry.core.render.TextureManager; +import forestry.core.utils.BlockUtil; import forestry.core.utils.ItemStackUtil; -import forestry.core.utils.StringUtil; import forestry.plugins.PluginApiculture; -public class BlockStump extends BlockTorch { +public class BlockStump extends BlockTorch implements IItemModelRegister { public BlockStump() { super(); @@ -45,8 +46,8 @@ public class BlockStump extends BlockTorch { @SideOnly(Side.CLIENT) @Override - public void registerBlockIcons(IIconRegister register) { - this.blockIcon = TextureManager.registerTex(register, StringUtil.cleanBlockName(this)); + public void registerModel(Item item, IModelManager manager) { + manager.registerItemModel(item, 0, "stump"); } @SuppressWarnings({"rawtypes", "unchecked"}) @@ -56,17 +57,17 @@ public class BlockStump extends BlockTorch { } @Override - public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int facing, float facingX, float facingY, float facingZ) { - + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumFacing side, float hitX, float hitY, float hitZ) { + ItemStack held = player.getCurrentEquippedItem(); if (held != null && (held.getItem() == Items.flint_and_steel || held.getItem() == Items.flint || ItemStackUtil.equals(Blocks.torch, held))) { - world.setBlock(x, y, z, PluginApiculture.blocks.candle, world.getBlockMetadata(x, y, z) | 0x08, Constants.FLAG_BLOCK_SYNCH); + world.setBlockState(pos, PluginApiculture.blocks.candle.getStateFromMeta(BlockUtil.getBlockMetadata(world, pos) | 0x08), Constants.FLAG_BLOCK_SYNCH); TileCandle tc = new TileCandle(); tc.setColour(0); // default to white - world.setTileEntity(x, y, z, tc); + world.setTileEntity(pos, tc); return true; } @@ -75,11 +76,11 @@ public class BlockStump extends BlockTorch { @Override @SideOnly(Side.CLIENT) - public int getRenderColor(int par1) { + public int getRenderColor(IBlockState state) { return 0xee0000; } - + @Override - public void randomDisplayTick(World par1World, int par2, int par3, int par4, Random par5Random) { + public void randomDisplayTick(World worldIn, BlockPos pos, IBlockState state, Random rand) { } } diff --git a/src/main/java/forestry/apiculture/commands/CommandBeeGive.java b/src/main/java/forestry/apiculture/commands/CommandBeeGive.java index 0e113dca2..f74fbd6b2 100644 --- a/src/main/java/forestry/apiculture/commands/CommandBeeGive.java +++ b/src/main/java/forestry/apiculture/commands/CommandBeeGive.java @@ -15,9 +15,10 @@ import java.util.Iterator; import java.util.List; import net.minecraft.command.ICommandSender; +import net.minecraft.command.PlayerNotFoundException; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; - +import net.minecraft.util.BlockPos; import forestry.api.apiculture.BeeManager; import forestry.api.apiculture.EnumBeeType; import forestry.api.apiculture.IAlleleBeeSpecies; @@ -63,7 +64,7 @@ public class CommandBeeGive extends SubCommand { } @Override - public void processSubCommand(ICommandSender sender, String[] arguments) { + public void processSubCommand(ICommandSender sender, String[] arguments) throws SpeciesNotFoundException, TemplateNotFoundException, PlayerNotFoundException { if (arguments.length < 2) { printHelp(sender); return; @@ -80,7 +81,7 @@ public class CommandBeeGive extends SubCommand { if (arguments.length == 3) { player = CommandHelpers.getPlayer(sender, arguments[2]); } else { - player = CommandHelpers.getPlayer(sender, sender.getCommandSenderName()); + player = CommandHelpers.getPlayer(sender, sender.getName()); } if (player == null) { printHelp(sender); @@ -96,10 +97,10 @@ public class CommandBeeGive extends SubCommand { ItemStack beeStack = BeeManager.beeRoot.getMemberStack(bee, beeType.ordinal()); player.dropPlayerItemWithRandomChoice(beeStack, true); - CommandHelpers.sendLocalizedChatMessage(sender, "for.chat.command.forestry.bee.give.given", player.getCommandSenderName(), bee.getGenome().getPrimary().getName(), beeType.getName()); + CommandHelpers.sendLocalizedChatMessage(sender, "for.chat.command.forestry.bee.give.given", player.getName(), bee.getGenome().getPrimary().getName(), beeType.getName()); } - private static IBeeGenome getBeeGenome(String speciesName) { + private static IBeeGenome getBeeGenome(String speciesName) throws SpeciesNotFoundException, TemplateNotFoundException { IAlleleBeeSpecies species = null; for (String uid : AlleleManager.alleleRegistry.getRegisteredAlleles().keySet()) { @@ -137,7 +138,7 @@ public class CommandBeeGive extends SubCommand { } @Override - public List addTabCompletionOptions(ICommandSender sender, String[] parameters) { + public List addTabCompletionOptions(ICommandSender sender, String[] parameters, BlockPos pos) { if (parameters.length == 1) { List tabCompletion = CommandHelpers.getListOfStringsMatchingLastWord(parameters, getSpecies()); tabCompletion.add("help"); diff --git a/src/main/java/forestry/apiculture/entities/AIAvoidPlayers.java b/src/main/java/forestry/apiculture/entities/AIAvoidPlayers.java index 4b4472546..66ec3a4b9 100644 --- a/src/main/java/forestry/apiculture/entities/AIAvoidPlayers.java +++ b/src/main/java/forestry/apiculture/entities/AIAvoidPlayers.java @@ -55,7 +55,7 @@ public class AIAvoidPlayers extends EntityAIBase { } Vec3 randomTarget = RandomPositionGenerator.findRandomTargetBlockAwayFrom(mob, 16, 7, - Vec3.createVectorHelper(player.posX, player.posY, player.posZ)); + new Vec3(player.posX, player.posY, player.posZ)); if (randomTarget == null) { return false; diff --git a/src/main/java/forestry/apiculture/entities/EntityBee.java b/src/main/java/forestry/apiculture/entities/EntityBee.java index 2dd72a915..d36e723cb 100755 --- a/src/main/java/forestry/apiculture/entities/EntityBee.java +++ b/src/main/java/forestry/apiculture/entities/EntityBee.java @@ -14,10 +14,8 @@ import net.minecraft.entity.EntityCreature; import net.minecraft.entity.passive.IAnimals; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import forestry.api.apiculture.BeeManager; import forestry.api.apiculture.EnumBeeType; import forestry.api.apiculture.IAlleleBeeSpecies; diff --git a/src/main/java/forestry/apiculture/entities/EntityFXBee.java b/src/main/java/forestry/apiculture/entities/EntityFXBee.java index 5f6ef45ef..b7e564018 100644 --- a/src/main/java/forestry/apiculture/entities/EntityFXBee.java +++ b/src/main/java/forestry/apiculture/entities/EntityFXBee.java @@ -11,7 +11,8 @@ package forestry.apiculture.entities; import net.minecraft.client.particle.EntityFX; -import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.WorldRenderer; +import net.minecraft.entity.Entity; import net.minecraft.world.World; public class EntityFXBee extends EntityFX { @@ -51,7 +52,7 @@ public class EntityFXBee extends EntityFX { } @Override - public void renderParticle(Tessellator tessellator, float f, float f1, float f2, float f3, float f4, float f5) { + public void renderParticle(WorldRenderer wR, Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { float minU = 0; float maxU = 1; float minV = 0; @@ -69,11 +70,13 @@ public class EntityFXBee extends EntityFX { float f12 = (float) ((prevPosY + (posY - prevPosY) * f) - interpPosY); float f13 = (float) ((prevPosZ + (posZ - prevPosZ) * f) - interpPosZ); - tessellator.setColorRGBA_F(particleRed, particleGreen, particleBlue, 1.0F); - tessellator.addVertexWithUV(f11 - f1 * f10 - f4 * f10, f12 - f2 * f10, f13 - f3 * f10 - f5 * f10, maxU, maxV); - tessellator.addVertexWithUV((f11 - f1 * f10) + f4 * f10, f12 + f2 * f10, (f13 - f3 * f10) + f5 * f10, maxU, minV); - tessellator.addVertexWithUV(f11 + f1 * f10 + f4 * f10, f12 + f2 * f10, f13 + f3 * f10 + f5 * f10, minU, minV); - tessellator.addVertexWithUV((f11 + f1 * f10) - f4 * f10, f12 - f2 * f10, (f13 + f3 * f10) - f5 * f10, minU, maxV); + int i = this.getBrightnessForRender(f); + int j = i >> 16 & 65535; + int k = i & 65535; + wR.pos(f11 - f1 * f10 - f4 * f10, f12 - f2 * f10, f13 - f3 * f10 - f5 * f10).tex(maxU, maxV).color(particleRed, particleGreen, particleBlue, 1.0F).lightmap(j, k).endVertex(); + wR.pos((f11 - f1 * f10) + f4 * f10, f12 + f2 * f10, (f13 - f3 * f10) + f5 * f10).tex(maxU, minV).color(particleRed, particleGreen, particleBlue, 1.0F).lightmap(j, k).endVertex(); + wR.pos(f11 + f1 * f10 + f4 * f10, f12 + f2 * f10, f13 + f3 * f10 + f5 * f10).tex(minU, minV).color(particleRed, particleGreen, particleBlue, 1.0F).lightmap(j, k).endVertex(); + wR.pos((f11 + f1 * f10) - f4 * f10, f12 - f2 * f10, (f13 + f3 * f10) - f5 * f10).tex(minU, maxV).color(particleRed, particleGreen, particleBlue, 1.0F).lightmap(j, k).endVertex(); } @Override diff --git a/src/main/java/forestry/apiculture/entities/EntityMinecartApiary.java b/src/main/java/forestry/apiculture/entities/EntityMinecartApiary.java index 1a831b7c7..7df68a6f5 100644 --- a/src/main/java/forestry/apiculture/entities/EntityMinecartApiary.java +++ b/src/main/java/forestry/apiculture/entities/EntityMinecartApiary.java @@ -15,7 +15,7 @@ import java.util.Collection; import java.util.Collections; import java.util.List; -import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; @@ -69,15 +69,10 @@ public class EntityMinecartApiary extends EntityMinecartBeeHousingBase implement public IBeeHousingInventory getBeeInventory() { return inventory; } - + @Override - public Block func_145820_n() { - return PluginApiculture.blocks.apiculture; - } - - @Override - public int getDisplayTileData() { - return BlockApicultureType.APIARY.ordinal(); + public IBlockState getDisplayTile() { + return PluginApiculture.blocks.apiculture.getStateFromMeta(BlockApicultureType.APIARY.ordinal()); } @Override diff --git a/src/main/java/forestry/apiculture/entities/EntityMinecartBeeHousingBase.java b/src/main/java/forestry/apiculture/entities/EntityMinecartBeeHousingBase.java index ee1da4304..3760bb29a 100644 --- a/src/main/java/forestry/apiculture/entities/EntityMinecartBeeHousingBase.java +++ b/src/main/java/forestry/apiculture/entities/EntityMinecartBeeHousingBase.java @@ -14,13 +14,12 @@ import java.io.IOException; import java.util.Random; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; import net.minecraft.util.Vec3; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; import com.mojang.authlib.GameProfile; - import forestry.api.apiculture.BeeManager; import forestry.api.apiculture.IBeeHousing; import forestry.api.apiculture.IBeekeepingLogic; @@ -71,7 +70,7 @@ public abstract class EntityMinecartBeeHousingBase extends EntityMinecartContain @Override public EnumTemperature getTemperature() { - return EnumTemperature.getFromBiome(getBiome(), (int) posX, (int) posY, (int) posZ); + return EnumTemperature.getFromBiome(getBiome(), getPosition()); } @Override @@ -91,12 +90,12 @@ public abstract class EntityMinecartBeeHousingBase extends EntityMinecartContain @Override public int getBlockLightValue() { - return worldObj.getBlockLightValue((int) posX, (int) posY + 1, (int) posZ); + return worldObj.getLightFromNeighbors(getPosition().add(0, +1, 0)); } @Override public boolean canBlockSeeTheSky() { - return worldObj.canBlockSeeTheSky((int) posX, (int) posY + 1, (int) posZ); + return worldObj.canBlockSeeSky(getPosition().add(0, +1, 0)); } @Override @@ -106,7 +105,7 @@ public abstract class EntityMinecartBeeHousingBase extends EntityMinecartContain @Override public BiomeGenBase getBiome() { - return worldObj.getBiomeGenForCoords((int) posX, (int) posZ); + return worldObj.getBiomeGenForCoords(getPosition()); } @Override @@ -120,13 +119,13 @@ public abstract class EntityMinecartBeeHousingBase extends EntityMinecartContain } @Override - public ChunkCoordinates getCoordinates() { - return new ChunkCoordinates((int) posX, (int) posY, (int) posZ); + public BlockPos getCoordinates() { + return getPosition(); } @Override public Vec3 getBeeFXCoordinates() { - return Vec3.createVectorHelper(posX, posY + 0.25, posZ); + return new Vec3(posX, posY + 0.25, posZ); } @Override diff --git a/src/main/java/forestry/apiculture/entities/EntityMinecartBeehouse.java b/src/main/java/forestry/apiculture/entities/EntityMinecartBeehouse.java index 813e2fb2e..192a16e2a 100644 --- a/src/main/java/forestry/apiculture/entities/EntityMinecartBeehouse.java +++ b/src/main/java/forestry/apiculture/entities/EntityMinecartBeehouse.java @@ -13,7 +13,7 @@ package forestry.apiculture.entities; import java.util.Collections; import java.util.List; -import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; @@ -51,15 +51,10 @@ public class EntityMinecartBeehouse extends EntityMinecartBeeHousingBase { public List getHints() { return Config.hints.get("bee.house"); } - + @Override - public Block func_145820_n() { - return PluginApiculture.blocks.apiculture; - } - - @Override - public int getDisplayTileData() { - return BlockApicultureType.BEEHOUSE.ordinal(); + public IBlockState getDisplayTile() { + return PluginApiculture.blocks.apiculture.getStateFromMeta(BlockApicultureType.BEEHOUSE.ordinal()); } @Override diff --git a/src/main/java/forestry/apiculture/flowers/Flower.java b/src/main/java/forestry/apiculture/flowers/Flower.java index e93e39689..ea5065f9d 100644 --- a/src/main/java/forestry/apiculture/flowers/Flower.java +++ b/src/main/java/forestry/apiculture/flowers/Flower.java @@ -32,6 +32,7 @@ final class Flower implements IFlower { this.weight = weight; } + @Override public boolean isPlantable() { return this.weight != 0.0; } diff --git a/src/main/java/forestry/apiculture/flowers/FlowerProvider.java b/src/main/java/forestry/apiculture/flowers/FlowerProvider.java index b89505274..bde5b6f74 100644 --- a/src/main/java/forestry/apiculture/flowers/FlowerProvider.java +++ b/src/main/java/forestry/apiculture/flowers/FlowerProvider.java @@ -11,15 +11,13 @@ package forestry.apiculture.flowers; import java.util.EnumSet; -import java.util.Set; - import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import net.minecraftforge.common.EnumPlantType; import forestry.api.apiculture.FlowerManager; -import forestry.api.genetics.IFlower; import forestry.api.genetics.IFlowerProvider; import forestry.api.genetics.IIndividual; import forestry.api.genetics.IPollinatable; @@ -55,24 +53,14 @@ public class FlowerProvider implements IFlowerProvider { } } - @Override - public boolean growFlower(World world, IIndividual individual, int x, int y, int z) { - return FlowerManager.flowerRegistry.growFlower(this.flowerType, world, individual, x, y, z); - } - @Override public String getDescription() { return StringUtil.localize(this.description); } @Override - public ItemStack[] affectProducts(World world, IIndividual individual, int x, int y, int z, ItemStack[] products) { + public ItemStack[] affectProducts(World world, IIndividual individual, BlockPos pos, ItemStack[] products) { return products; } - @Override - public Set getFlowers() { - return FlowerManager.flowerRegistry.getAcceptableFlowers(this.flowerType); - } - } diff --git a/src/main/java/forestry/apiculture/flowers/FlowerRegistry.java b/src/main/java/forestry/apiculture/flowers/FlowerRegistry.java index 8de528579..ead2fa3b5 100644 --- a/src/main/java/forestry/apiculture/flowers/FlowerRegistry.java +++ b/src/main/java/forestry/apiculture/flowers/FlowerRegistry.java @@ -26,19 +26,14 @@ import java.util.TreeMap; import net.minecraft.block.Block; import net.minecraft.block.BlockFlowerPot; import net.minecraft.init.Blocks; -import net.minecraft.init.Items; import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityFlowerPot; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; -import net.minecraftforge.common.IPlantable; import net.minecraftforge.oredict.OreDictionary; -import cpw.mods.fml.common.registry.GameRegistry; - import forestry.api.apiculture.BeeManager; import forestry.api.apiculture.FlowerManager; import forestry.api.apiculture.IBee; @@ -52,10 +47,10 @@ import forestry.api.genetics.IFlowerGrowthRule; import forestry.api.genetics.IFlowerRegistry; import forestry.api.genetics.IIndividual; import forestry.core.config.Constants; +import forestry.core.utils.BlockUtil; import forestry.core.utils.Log; import forestry.core.utils.vect.MutableVect; import forestry.core.utils.vect.Vect; -import forestry.plugins.PluginManager; public final class FlowerRegistry implements IFlowerRegistry, IFlowerGrowthHelper { @@ -151,7 +146,7 @@ public final class FlowerRegistry implements IFlowerRegistry, IFlowerGrowthHelpe } @Override - public ChunkCoordinates getAcceptedFlowerCoordinates(IBeeHousing beeHousing, IBee bee, String flowerType) { + public BlockPos getAcceptedFlowerCoordinates(IBeeHousing beeHousing, IBee bee, String flowerType) { if (!this.registeredFlowers.containsKey(flowerType)) { return null; } @@ -164,7 +159,7 @@ public final class FlowerRegistry implements IFlowerRegistry, IFlowerGrowthHelpe IBeeModifier beeModifier = BeeManager.beeRoot.createBeeHousingModifier(beeHousing); Vect area = getArea(bee.getGenome(), beeModifier); - Vect housingPos = new Vect(beeHousing.getCoordinates()).add(-area.x / 2, -area.y / 2, -area.z / 2); + Vect housingPos = new Vect(beeHousing.getCoordinates()).add(-area.getX() / 2, -area.getY() / 2, -area.getZ() / 2); MutableVect posCurrent = new MutableVect(0, 0, 0); while (posCurrent.advancePositionInArea(area)) { @@ -172,13 +167,13 @@ public final class FlowerRegistry implements IFlowerRegistry, IFlowerGrowthHelpe Vect posBlock = Vect.add(housingPos, posCurrent); for (IFlowerAcceptableRule acceptableRule : acceptableRules) { - if (acceptableRule.isAcceptableFlower(flowerType, world, posBlock.x, posBlock.y, posBlock.z)) { - return new ChunkCoordinates(posBlock.x, posBlock.y, posBlock.z); + if (acceptableRule.isAcceptableFlower(flowerType, world, posBlock)) { + return posBlock; } } - if (isAcceptedFlower(flowerType, acceptedBlocks, acceptedFlowers, world, posBlock.x, posBlock.y, posBlock.z)) { - return new ChunkCoordinates(posBlock.x, posBlock.y, posBlock.z); + if (isAcceptedFlower(flowerType, acceptedBlocks, acceptedFlowers, world, posBlock)) { + return posBlock; } } @@ -186,14 +181,14 @@ public final class FlowerRegistry implements IFlowerRegistry, IFlowerGrowthHelpe } @Override - public boolean isAcceptedFlower(String flowerType, World world, int x, int y, int z) { + public boolean isAcceptedFlower(String flowerType, World world, BlockPos pos) { if (!this.registeredFlowers.containsKey(flowerType)) { return false; } Set acceptedCustom = this.registeredRules.get(flowerType); for (IFlowerAcceptableRule acceptableFlower : acceptedCustom) { - if (acceptableFlower.isAcceptableFlower(flowerType, world, x, y, z)) { + if (acceptableFlower.isAcceptableFlower(flowerType, world, pos)) { return true; } } @@ -201,16 +196,16 @@ public final class FlowerRegistry implements IFlowerRegistry, IFlowerGrowthHelpe Set acceptedBlocks = this.registeredBlocks.get(flowerType); Set acceptedFlowers = this.registeredFlowers.get(flowerType); - return isAcceptedFlower(flowerType, acceptedBlocks, acceptedFlowers, world, x, y, z); + return isAcceptedFlower(flowerType, acceptedBlocks, acceptedFlowers, world, pos); } - private static boolean isAcceptedFlower(String flowerType, Set acceptedBlocks, Set acceptedFlowers, World world, int x, int y, int z) { - Block block = world.getBlock(x, y, z); + private static boolean isAcceptedFlower(String flowerType, Set acceptedBlocks, Set acceptedFlowers, World world, BlockPos pos) { + Block block = BlockUtil.getBlock(world, pos); final int meta; if (block instanceof BlockFlowerPot) { - TileEntity tile = world.getTileEntity(x, y, z); + TileEntity tile = world.getTileEntity(pos); TileEntityFlowerPot tileFlowerPot = (TileEntityFlowerPot) tile; Item item = tileFlowerPot.getFlowerPotItem(); block = Block.getBlockFromItem(item); @@ -219,10 +214,10 @@ public final class FlowerRegistry implements IFlowerRegistry, IFlowerGrowthHelpe if (!acceptedBlocks.contains(block)) { return false; } - meta = world.getBlockMetadata(x, y, z); + meta = block.getMetaFromState(world.getBlockState(pos)); } - if (PluginManager.Module.AGRICRAFT.isEnabled()) { + /*if (PluginManager.Module.AGRICRAFT.isEnabled()) { Block cropBlock = GameRegistry.findBlock("AgriCraft", "crops"); if (block == cropBlock) { if (block instanceof IPlantable) { @@ -239,28 +234,20 @@ public final class FlowerRegistry implements IFlowerRegistry, IFlowerGrowthHelpe } } } - } + }*/ Flower flower = new Flower(block, meta, 0); return acceptedFlowers.contains(flower); } @Override - public boolean growFlower(String flowerType, World world, IIndividual individual, int x, int y, int z) { + public boolean growFlower(String flowerType, World world, IIndividual individual, BlockPos pos) { if (!this.growthRules.containsKey(flowerType)) { return false; } for (IFlowerGrowthRule rule : this.growthRules.get(flowerType)) { - boolean success; - try { - success = rule.growFlower(this, flowerType, world, x, y, z); - } catch (Throwable ignored) { - // legacy method - success = rule.growFlower(this, flowerType, world, individual, x, y, z); - } - - if (success) { + if (rule.growFlower(this, flowerType, world, pos)) { return true; } } @@ -323,8 +310,8 @@ public final class FlowerRegistry implements IFlowerRegistry, IFlowerGrowthHelpe } @Override - public boolean plantRandomFlower(String flowerType, World world, int x, int y, int z) { + public boolean plantRandomFlower(String flowerType, World world, BlockPos pos) { IFlower flower = getRandomPlantableFlower(flowerType, world.rand); - return world.setBlock(x, y, z, flower.getBlock(), flower.getMeta(), Constants.FLAG_BLOCK_SYNCH); + return world.setBlockState(pos, flower.getBlock().getStateFromMeta(flower.getMeta()), Constants.FLAG_BLOCK_SYNCH); } } diff --git a/src/main/java/forestry/apiculture/flowers/GrowthRuleDirtGrass.java b/src/main/java/forestry/apiculture/flowers/GrowthRuleDirtGrass.java index 079a9c6af..e00a084d6 100644 --- a/src/main/java/forestry/apiculture/flowers/GrowthRuleDirtGrass.java +++ b/src/main/java/forestry/apiculture/flowers/GrowthRuleDirtGrass.java @@ -12,44 +12,26 @@ package forestry.apiculture.flowers; import net.minecraft.block.Block; import net.minecraft.init.Blocks; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; -import forestry.api.genetics.IFlower; import forestry.api.genetics.IFlowerGrowthHelper; import forestry.api.genetics.IFlowerGrowthRule; -import forestry.api.genetics.IFlowerRegistry; -import forestry.api.genetics.IIndividual; -import forestry.core.config.Constants; public class GrowthRuleDirtGrass implements IFlowerGrowthRule { @Override - public boolean growFlower(IFlowerRegistry flowerRegistry, String flowerType, World world, IIndividual individual, int x, int y, int z) { - if (!world.isAirBlock(x, y, z)) { + public boolean growFlower(IFlowerGrowthHelper helper, String flowerType, World world, BlockPos pos) { + if (!world.isAirBlock(pos)) { return false; } - Block ground = world.getBlock(x, y - 1, z); + Block ground = world.getBlockState(new BlockPos(pos.getX(), pos.getY() - 1, pos.getZ())).getBlock(); if (ground != Blocks.dirt && ground != Blocks.grass) { return false; } - IFlower flower = flowerRegistry.getRandomPlantableFlower(flowerType, world.rand); - return world.setBlock(x, y, z, flower.getBlock(), flower.getMeta(), Constants.FLAG_BLOCK_SYNCH); - } - - @Override - public boolean growFlower(IFlowerGrowthHelper helper, String flowerType, World world, int x, int y, int z) { - if (!world.isAirBlock(x, y, z)) { - return false; - } - - Block ground = world.getBlock(x, y - 1, z); - if (ground != Blocks.dirt && ground != Blocks.grass) { - return false; - } - - return helper.plantRandomFlower(flowerType, world, x, y, z); + return helper.plantRandomFlower(flowerType, world, pos); } } diff --git a/src/main/java/forestry/apiculture/flowers/GrowthRuleFertilize.java b/src/main/java/forestry/apiculture/flowers/GrowthRuleFertilize.java index 9df48fab8..edcf34ddc 100644 --- a/src/main/java/forestry/apiculture/flowers/GrowthRuleFertilize.java +++ b/src/main/java/forestry/apiculture/flowers/GrowthRuleFertilize.java @@ -14,12 +14,12 @@ import java.util.Arrays; import java.util.List; import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import forestry.api.genetics.IFlowerGrowthHelper; import forestry.api.genetics.IFlowerGrowthRule; -import forestry.api.genetics.IFlowerRegistry; -import forestry.api.genetics.IIndividual; public class GrowthRuleFertilize implements IFlowerGrowthRule { @@ -30,21 +30,17 @@ public class GrowthRuleFertilize implements IFlowerGrowthRule { } @Override - public boolean growFlower(IFlowerRegistry fr, String flowerType, World world, IIndividual individual, int x, int y, int z) { - return growFlower(world, x, y, z); + public boolean growFlower(IFlowerGrowthHelper helper, String flowerType, World world, BlockPos pos) { + return growFlower(world, pos); } - @Override - public boolean growFlower(IFlowerGrowthHelper helper, String flowerType, World world, int x, int y, int z) { - return growFlower(world, x, y, z); - } - - private boolean growFlower(World world, int x, int y, int z) { - Block ground = world.getBlock(x, y, z); + private boolean growFlower(World world, BlockPos pos) { + IBlockState state = world.getBlockState(pos); + Block ground = state.getBlock(); int groundMeta; for (Block b : this.allowedItems) { if (b == ground) { - groundMeta = world.getBlockMetadata(x, y, z); + groundMeta = ground.getMetaFromState(state); if (groundMeta > 6) { return false; } @@ -54,7 +50,7 @@ public class GrowthRuleFertilize implements IFlowerGrowthRule { groundMeta = 7; } - return world.setBlockMetadataWithNotify(x, y, z, groundMeta, 2); + return world.setBlockState(pos, ground.getStateFromMeta(groundMeta), 2); } } diff --git a/src/main/java/forestry/apiculture/flowers/GrowthRuleFlowerPot.java b/src/main/java/forestry/apiculture/flowers/GrowthRuleFlowerPot.java index 5344a2ae7..92f03dde3 100644 --- a/src/main/java/forestry/apiculture/flowers/GrowthRuleFlowerPot.java +++ b/src/main/java/forestry/apiculture/flowers/GrowthRuleFlowerPot.java @@ -14,28 +14,22 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockFlowerPot; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityFlowerPot; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import forestry.api.apiculture.FlowerManager; import forestry.api.genetics.IFlowerGrowthHelper; import forestry.api.genetics.IFlowerGrowthRule; -import forestry.api.genetics.IFlowerRegistry; -import forestry.api.genetics.IIndividual; public class GrowthRuleFlowerPot implements IFlowerGrowthRule { @Override - public boolean growFlower(IFlowerRegistry fr, String flowerType, World world, IIndividual individual, int x, int y, int z) { - return growFlower(flowerType, world, x, y, z); + public boolean growFlower(IFlowerGrowthHelper helper, String flowerType, World world, BlockPos pos) { + return growFlower(flowerType, world, pos); } - @Override - public boolean growFlower(IFlowerGrowthHelper helper, String flowerType, World world, int x, int y, int z) { - return growFlower(flowerType, world, x, y, z); - } - - private static boolean growFlower(String flowerType, World world, int x, int y, int z) { - TileEntity tile = world.getTileEntity(x, y, z); + private static boolean growFlower(String flowerType, World world, BlockPos pos) { + TileEntity tile = world.getTileEntity(pos); if (!(tile instanceof TileEntityFlowerPot)) { return false; } @@ -45,7 +39,7 @@ public class GrowthRuleFlowerPot implements IFlowerGrowthRule { return false; } - Block block = world.getBlock(x, y, z); + Block block = world.getBlockState(pos).getBlock(); if (!(block instanceof BlockFlowerPot)) { return false; } @@ -73,11 +67,11 @@ public class GrowthRuleFlowerPot implements IFlowerGrowthRule { TileEntityFlowerPot newTile = (TileEntityFlowerPot) flowerPot.createNewTileEntity(world, flower); - flowerPotTile.func_145964_a(newTile.getFlowerPotItem(), newTile.getFlowerPotData()); + flowerPotTile.setFlowerPotData(newTile.getFlowerPotItem(), newTile.getFlowerPotData()); flowerPotTile.markDirty(); - if (!world.setBlockMetadataWithNotify(x, y, z, 1, 2)) { - world.markBlockForUpdate(x, y, z); + if (!world.setBlockState(pos, world.getBlockState(pos).getBlock().getStateFromMeta(1), 2)) { + world.markBlockForUpdate(pos); } return true; diff --git a/src/main/java/forestry/apiculture/flowers/GrowthRuleMycelium.java b/src/main/java/forestry/apiculture/flowers/GrowthRuleMycelium.java index 31e5466a5..a8fd8b68b 100644 --- a/src/main/java/forestry/apiculture/flowers/GrowthRuleMycelium.java +++ b/src/main/java/forestry/apiculture/flowers/GrowthRuleMycelium.java @@ -12,44 +12,26 @@ package forestry.apiculture.flowers; import net.minecraft.block.Block; import net.minecraft.init.Blocks; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; -import forestry.api.genetics.IFlower; import forestry.api.genetics.IFlowerGrowthHelper; import forestry.api.genetics.IFlowerGrowthRule; -import forestry.api.genetics.IFlowerRegistry; -import forestry.api.genetics.IIndividual; -import forestry.core.config.Constants; public class GrowthRuleMycelium implements IFlowerGrowthRule { @Override - public boolean growFlower(IFlowerRegistry fr, String flowerType, World world, IIndividual individual, int x, int y, int z) { - if (!world.isAirBlock(x, y, z)) { + public boolean growFlower(IFlowerGrowthHelper helper, String flowerType, World world, BlockPos pos) { + if (!world.isAirBlock(pos)) { return false; } - Block ground = world.getBlock(x, y - 1, z); + Block ground = world.getBlockState(new BlockPos(pos.getX(), pos.getY() - 1, pos.getZ())).getBlock(); if (ground != Blocks.mycelium) { return false; } - IFlower flower = fr.getRandomPlantableFlower(flowerType, world.rand); - return world.setBlock(x, y, z, flower.getBlock(), flower.getMeta(), Constants.FLAG_BLOCK_SYNCH); - } - - @Override - public boolean growFlower(IFlowerGrowthHelper helper, String flowerType, World world, int x, int y, int z) { - if (!world.isAirBlock(x, y, z)) { - return false; - } - - Block ground = world.getBlock(x, y - 1, z); - if (ground != Blocks.mycelium) { - return false; - } - - return helper.plantRandomFlower(flowerType, world, x, y, z); + return helper.plantRandomFlower(flowerType, world, pos); } } diff --git a/src/main/java/forestry/apiculture/flowers/GrowthRuleNone.java b/src/main/java/forestry/apiculture/flowers/GrowthRuleNone.java index e04297cbe..e929ea911 100644 --- a/src/main/java/forestry/apiculture/flowers/GrowthRuleNone.java +++ b/src/main/java/forestry/apiculture/flowers/GrowthRuleNone.java @@ -10,22 +10,16 @@ ******************************************************************************/ package forestry.apiculture.flowers; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import forestry.api.genetics.IFlowerGrowthHelper; import forestry.api.genetics.IFlowerGrowthRule; -import forestry.api.genetics.IFlowerRegistry; -import forestry.api.genetics.IIndividual; public class GrowthRuleNone implements IFlowerGrowthRule { @Override - public boolean growFlower(IFlowerRegistry fr, String flowerType, World world, IIndividual individual, int x, int y, int z) { - return true; - } - - @Override - public boolean growFlower(IFlowerGrowthHelper helper, String flowerType, World world, int x, int y, int z) { + public boolean growFlower(IFlowerGrowthHelper helper, String flowerType, World world, BlockPos pos) { return true; } diff --git a/src/main/java/forestry/apiculture/flowers/GrowthRuleSnow.java b/src/main/java/forestry/apiculture/flowers/GrowthRuleSnow.java index b35e973e9..fb5d1c7d8 100644 --- a/src/main/java/forestry/apiculture/flowers/GrowthRuleSnow.java +++ b/src/main/java/forestry/apiculture/flowers/GrowthRuleSnow.java @@ -12,44 +12,26 @@ package forestry.apiculture.flowers; import net.minecraft.block.Block; import net.minecraft.init.Blocks; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; -import forestry.api.genetics.IFlower; import forestry.api.genetics.IFlowerGrowthHelper; import forestry.api.genetics.IFlowerGrowthRule; -import forestry.api.genetics.IFlowerRegistry; -import forestry.api.genetics.IIndividual; -import forestry.core.config.Constants; public class GrowthRuleSnow implements IFlowerGrowthRule { @Override - public boolean growFlower(IFlowerRegistry fr, String flowerType, World world, IIndividual individual, int x, int y, int z) { - if (world.getBlock(x, y, z) != Blocks.snow) { + public boolean growFlower(IFlowerGrowthHelper helper, String flowerType, World world, BlockPos pos) { + if (world.getBlockState(pos).getBlock() != Blocks.snow) { return false; } - Block ground = world.getBlock(x, y - 1, z); + Block ground = world.getBlockState(new BlockPos(pos.getX(), pos.getY() - 1, pos.getZ())).getBlock(); if (ground != Blocks.dirt && ground != Blocks.grass) { return false; } - IFlower flower = fr.getRandomPlantableFlower(flowerType, world.rand); - return world.setBlock(x, y, z, flower.getBlock(), flower.getMeta(), Constants.FLAG_BLOCK_SYNCH); - } - - @Override - public boolean growFlower(IFlowerGrowthHelper helper, String flowerType, World world, int x, int y, int z) { - if (world.getBlock(x, y, z) != Blocks.snow) { - return false; - } - - Block ground = world.getBlock(x, y - 1, z); - if (ground != Blocks.dirt && ground != Blocks.grass) { - return false; - } - - return helper.plantRandomFlower(flowerType, world, x, y, z); + return helper.plantRandomFlower(flowerType, world, pos); } } diff --git a/src/main/java/forestry/apiculture/genetics/Bee.java b/src/main/java/forestry/apiculture/genetics/Bee.java index f463ab338..b72ece46d 100644 --- a/src/main/java/forestry/apiculture/genetics/Bee.java +++ b/src/main/java/forestry/apiculture/genetics/Bee.java @@ -21,7 +21,7 @@ import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; import net.minecraft.util.EnumChatFormatting; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; @@ -141,14 +141,17 @@ public class Bee extends IndividualLiving implements IBee { } } + @Override public void setIsNatural(boolean flag) { this.isNatural = flag; } + @Override public boolean isNatural() { return this.isNatural; } + @Override public int getGeneration() { return generation; } @@ -385,13 +388,13 @@ public class Bee extends IndividualLiving implements IBee { if (generation > 0) { EnumRarity rarity; if (generation >= 1000) { - rarity = EnumRarity.epic; + rarity = EnumRarity.EPIC; } else if (generation >= 100) { - rarity = EnumRarity.rare; + rarity = EnumRarity.RARE; } else if (generation >= 10) { - rarity = EnumRarity.uncommon; + rarity = EnumRarity.UNCOMMON; } else { - rarity = EnumRarity.common; + rarity = EnumRarity.COMMON; } String generationString = rarity.rarityColor + StringUtil.localizeAndFormat("gui.beealyzer.generations", generation); @@ -527,8 +530,8 @@ public class Bee extends IndividualLiving implements IBee { } ItemStack[] productsArray = products.toArray(new ItemStack[products.size()]); - ChunkCoordinates housingCoordinates = housing.getCoordinates(); - return genome.getFlowerProvider().affectProducts(housing.getWorld(), this, housingCoordinates.posX, housingCoordinates.posY, housingCoordinates.posZ, productsArray); + BlockPos housingCoordinates = housing.getCoordinates(); + return genome.getFlowerProvider().affectProducts(housing.getWorld(), this, housingCoordinates, productsArray); } /* REPRODUCTION */ @@ -560,8 +563,8 @@ public class Bee extends IndividualLiving implements IBee { List bees = new ArrayList<>(); - ChunkCoordinates housingCoordinates = housing.getCoordinates(); - int toCreate = BeeManager.beeRoot.getBeekeepingMode(world).getFinalFertility(this, world, housingCoordinates.posX, housingCoordinates.posY, housingCoordinates.posZ); + BlockPos housingPos = housing.getCoordinates(); + int toCreate = BeeManager.beeRoot.getBeekeepingMode(world).getFinalFertility(this, world, housingPos); if (toCreate <= 0) { toCreate = 1; @@ -683,7 +686,7 @@ public class Bee extends IndividualLiving implements IBee { } Vect area = getArea(genome, beeModifier); - Vect offset = new Vect(-area.x / 2, -area.y / 4, -area.z / 2); + Vect offset = new Vect(-area.getX()/ 2, -area.getY() / 4, -area.getZ() / 2); Vect housingPos = new Vect(housing.getCoordinates()); IIndividual pollen = null; @@ -691,7 +694,7 @@ public class Bee extends IndividualLiving implements IBee { for (int i = 0; i < 20; i++) { Vect randomPos = Vect.getRandomPositionInArea(random, area); Vect blockPos = Vect.add(housingPos, randomPos, offset); - TileEntity tile = world.getTileEntity(blockPos.x, blockPos.y, blockPos.z); + TileEntity tile = world.getTileEntity(blockPos); if (tile instanceof IPollinatable) { IPollinatable pitcher = (IPollinatable) tile; @@ -699,7 +702,7 @@ public class Bee extends IndividualLiving implements IBee { pollen = pitcher.getPollen(); } } else { - pollen = GeneticsUtil.getErsatzPollen(world, blockPos.x, blockPos.y, blockPos.z); + pollen = GeneticsUtil.getErsatzPollen(world, blockPos); } if (pollen != null) { @@ -726,7 +729,7 @@ public class Bee extends IndividualLiving implements IBee { } Vect area = getArea(genome, beeModifier); - Vect offset = new Vect(-area.x / 2, -area.y / 4, -area.z / 2); + Vect offset = new Vect(-area.getX() / 2, -area.getY() / 4, -area.getZ() / 2); Vect housingPos = new Vect(housing.getCoordinates()); for (int i = 0; i < 30; i++) { @@ -734,7 +737,7 @@ public class Bee extends IndividualLiving implements IBee { Vect randomPos = Vect.getRandomPositionInArea(random, area); Vect posBlock = Vect.add(housingPos, randomPos, offset); - ICheckPollinatable checkPollinatable = GeneticsUtil.getCheckPollinatable(world, posBlock.x, posBlock.y, posBlock.z); + ICheckPollinatable checkPollinatable = GeneticsUtil.getCheckPollinatable(world, posBlock); if (checkPollinatable == null) { continue; } @@ -746,7 +749,7 @@ public class Bee extends IndividualLiving implements IBee { continue; } - IPollinatable realPollinatable = GeneticsUtil.getOrCreatePollinatable(housing.getOwner(), world, posBlock.x, posBlock.y, posBlock.z); + IPollinatable realPollinatable = GeneticsUtil.getOrCreatePollinatable(housing.getOwner(), world, posBlock); if (realPollinatable != null) { realPollinatable.mateWith(pollen); @@ -775,14 +778,14 @@ public class Bee extends IndividualLiving implements IBee { // Gather required info IFlowerProvider provider = genome.getFlowerProvider(); Vect area = getArea(genome, beeModifier); - Vect offset = new Vect(-area.x / 2, -area.y / 4, -area.z / 2); + Vect offset = new Vect(-area.getX() / 2, -area.getY() / 4, -area.getZ() / 2); Vect housingPos = new Vect(housing.getCoordinates()); for (int i = 0; i < 10; i++) { Vect randomPos = Vect.getRandomPositionInArea(random, area); Vect posBlock = Vect.add(housingPos, randomPos, offset); - if (FlowerManager.flowerRegistry.growFlower(provider.getFlowerType(), world, this, posBlock.x, posBlock.y, posBlock.z)) { + if (FlowerManager.flowerRegistry.growFlower(provider.getFlowerType(), world, this, posBlock)) { break; } } diff --git a/src/main/java/forestry/apiculture/genetics/BeeDefinition.java b/src/main/java/forestry/apiculture/genetics/BeeDefinition.java index b009395b6..3ba4fe9ac 100644 --- a/src/main/java/forestry/apiculture/genetics/BeeDefinition.java +++ b/src/main/java/forestry/apiculture/genetics/BeeDefinition.java @@ -989,6 +989,10 @@ public enum BeeDefinition implements IBeeDefinition { bee.registerMutations(); } } + + public static void preInit(){ + + } private void init() { if (!overworldHiveBees.contains(this)) { diff --git a/src/main/java/forestry/apiculture/genetics/BeeGenome.java b/src/main/java/forestry/apiculture/genetics/BeeGenome.java index feb6c0dc2..1b9d81750 100755 --- a/src/main/java/forestry/apiculture/genetics/BeeGenome.java +++ b/src/main/java/forestry/apiculture/genetics/BeeGenome.java @@ -162,7 +162,7 @@ public class BeeGenome extends Genome implements IBeeGenome { @Override public int[] getTerritory() { Vect area = ((AlleleArea) getActiveAllele(EnumBeeChromosome.TERRITORY)).getArea(); - return new int[]{area.x, area.y, area.z}; + return area.toArray(); } @Override diff --git a/src/main/java/forestry/apiculture/genetics/BeeHelper.java b/src/main/java/forestry/apiculture/genetics/BeeHelper.java index 2e887acfb..144011b6b 100755 --- a/src/main/java/forestry/apiculture/genetics/BeeHelper.java +++ b/src/main/java/forestry/apiculture/genetics/BeeHelper.java @@ -20,11 +20,10 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; +import net.minecraftforge.fml.common.FMLCommonHandler; import com.mojang.authlib.GameProfile; -import cpw.mods.fml.common.FMLCommonHandler; - import forestry.api.apiculture.BeeManager; import forestry.api.apiculture.EnumBeeChromosome; import forestry.api.apiculture.EnumBeeType; diff --git a/src/main/java/forestry/apiculture/genetics/BeeMutation.java b/src/main/java/forestry/apiculture/genetics/BeeMutation.java index 786ca58b2..f2b43ff92 100644 --- a/src/main/java/forestry/apiculture/genetics/BeeMutation.java +++ b/src/main/java/forestry/apiculture/genetics/BeeMutation.java @@ -10,7 +10,7 @@ ******************************************************************************/ package forestry.apiculture.genetics; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import forestry.api.apiculture.BeeManager; @@ -37,12 +37,9 @@ public class BeeMutation extends Mutation implements IBeeMutationCustom { @Override public float getChance(IBeeHousing housing, IAlleleBeeSpecies allele0, IAlleleBeeSpecies allele1, IBeeGenome genome0, IBeeGenome genome1) { World world = housing.getWorld(); - ChunkCoordinates housingCoordinates = housing.getCoordinates(); - int x = housingCoordinates.posX; - int y = housingCoordinates.posY; - int z = housingCoordinates.posZ; + BlockPos housingPos = housing.getCoordinates(); - float processedChance = super.getChance(world, x, y, z, allele0, allele1, genome0, genome1); + float processedChance = super.getChance(world, housingPos, allele0, allele1, genome0, genome1); if (processedChance <= 0) { return 0; } diff --git a/src/main/java/forestry/apiculture/genetics/BeekeepingMode.java b/src/main/java/forestry/apiculture/genetics/BeekeepingMode.java index 0fedf7ca7..ae61c1da9 100755 --- a/src/main/java/forestry/apiculture/genetics/BeekeepingMode.java +++ b/src/main/java/forestry/apiculture/genetics/BeekeepingMode.java @@ -14,6 +14,7 @@ import java.util.ArrayList; import java.util.Locale; import java.util.Random; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import forestry.api.apiculture.BeeManager; @@ -64,7 +65,7 @@ public class BeekeepingMode implements IBeekeepingMode { } @Override - public int getFinalFertility(IBee queen, World world, int x, int y, int z) { + public int getFinalFertility(IBee queen, World world, BlockPos pos) { int toCreate = queen.getGenome().getFertility(); if (reducesFertility) { diff --git a/src/main/java/forestry/apiculture/genetics/DefaultBeeIconProvider.java b/src/main/java/forestry/apiculture/genetics/DefaultBeeIconProvider.java deleted file mode 100644 index 37ea41367..000000000 --- a/src/main/java/forestry/apiculture/genetics/DefaultBeeIconProvider.java +++ /dev/null @@ -1,64 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v3 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: - * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges - ******************************************************************************/ -package forestry.apiculture.genetics; - -import java.util.Locale; - -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.util.IIcon; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -import forestry.api.apiculture.EnumBeeType; -import forestry.api.apiculture.IBeeIconProvider; -import forestry.core.render.TextureManager; - -public class DefaultBeeIconProvider implements IBeeIconProvider { - - public static final DefaultBeeIconProvider instance = new DefaultBeeIconProvider(); - - private DefaultBeeIconProvider() { - - } - - private static final IIcon[][] icons = new IIcon[EnumBeeType.values().length][3]; - - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister register) { - String beeIconDir = "bees/default/"; - IIcon body1 = TextureManager.registerTex(register, beeIconDir + "body1"); - - for (int i = 0; i < EnumBeeType.values().length; i++) { - EnumBeeType beeType = EnumBeeType.values()[i]; - if (beeType == EnumBeeType.NONE) { - continue; - } - - String beeTypeNameBase = beeIconDir + beeType.toString().toLowerCase(Locale.ENGLISH); - - icons[i][0] = TextureManager.registerTex(register, beeTypeNameBase + ".outline"); - if (beeType == EnumBeeType.LARVAE) { - icons[i][1] = TextureManager.registerTex(register, beeTypeNameBase + ".body"); - } else { - icons[i][1] = body1; - } - icons[i][2] = TextureManager.registerTex(register, beeTypeNameBase + ".body2"); - } - } - - @Override - @SideOnly(Side.CLIENT) - public IIcon getIcon(EnumBeeType type, int renderPass) { - return icons[type.ordinal()][renderPass]; - } -} diff --git a/src/main/java/forestry/apiculture/genetics/DefaultBeeModelProvider.java b/src/main/java/forestry/apiculture/genetics/DefaultBeeModelProvider.java new file mode 100644 index 000000000..8f26e445e --- /dev/null +++ b/src/main/java/forestry/apiculture/genetics/DefaultBeeModelProvider.java @@ -0,0 +1,50 @@ +/******************************************************************************* + * Copyright (c) 2011-2014 SirSengir. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser Public License v3 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl-3.0.txt + * + * Various Contributors including, but not limited to: + * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges + ******************************************************************************/ +package forestry.apiculture.genetics; + +import java.util.Locale; + +import net.minecraft.client.resources.model.ModelResourceLocation; +import net.minecraft.item.Item; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import forestry.api.apiculture.EnumBeeType; +import forestry.api.apiculture.IBeeModelProvider; +import forestry.api.core.IModelManager; +import forestry.apiculture.items.ItemBeeGE; + +@SideOnly(Side.CLIENT) +public class DefaultBeeModelProvider implements IBeeModelProvider { + + public static final DefaultBeeModelProvider instance = new DefaultBeeModelProvider(); + + private DefaultBeeModelProvider() { + + } + + private static final ModelResourceLocation[] models = new ModelResourceLocation[EnumBeeType.values().length]; + + @Override + public void registerModels(Item item, IModelManager manager) { + String beeIconDir = "bees/default/"; + EnumBeeType beeType = ((ItemBeeGE)item).getType(); + String beeTypeNameBase = beeIconDir + beeType.toString().toLowerCase(Locale.ENGLISH); + + models[beeType.ordinal()] = manager.getModelLocation(beeTypeNameBase); + manager.registerVariant(item, new ResourceLocation("forestry:" + beeTypeNameBase)); + } + + @Override + public ModelResourceLocation getModel(EnumBeeType type) { + return models[type.ordinal()]; + } +} diff --git a/src/main/java/forestry/apiculture/genetics/DefaultBeeIconColourProvider.java b/src/main/java/forestry/apiculture/genetics/DefaultBeeSpriteColourProvider.java similarity index 76% rename from src/main/java/forestry/apiculture/genetics/DefaultBeeIconColourProvider.java rename to src/main/java/forestry/apiculture/genetics/DefaultBeeSpriteColourProvider.java index 10cb49322..3756927a0 100644 --- a/src/main/java/forestry/apiculture/genetics/DefaultBeeIconColourProvider.java +++ b/src/main/java/forestry/apiculture/genetics/DefaultBeeSpriteColourProvider.java @@ -1,34 +1,34 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v3 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: - * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges - ******************************************************************************/ -package forestry.apiculture.genetics; - -import forestry.api.apiculture.IBeeIconColourProvider; - -public class DefaultBeeIconColourProvider implements IBeeIconColourProvider { - private final int primaryColour; - private final int secondaryColour; - - public DefaultBeeIconColourProvider(int primaryColour, int secondaryColour) { - this.primaryColour = primaryColour; - this.secondaryColour = secondaryColour; - } - - @Override - public int getIconColour(int renderPass) { - if (renderPass == 0) { - return primaryColour; - } - if (renderPass == 1) { - return secondaryColour; - } - return 0xffffff; - } -} +/******************************************************************************* + * Copyright (c) 2011-2014 SirSengir. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser Public License v3 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl-3.0.txt + * + * Various Contributors including, but not limited to: + * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges + ******************************************************************************/ +package forestry.apiculture.genetics; + +import forestry.api.apiculture.IBeeSpriteColourProvider; + +public class DefaultBeeSpriteColourProvider implements IBeeSpriteColourProvider { + private final int primaryColour; + private final int secondaryColour; + + public DefaultBeeSpriteColourProvider(int primaryColour, int secondaryColour) { + this.primaryColour = primaryColour; + this.secondaryColour = secondaryColour; + } + + @Override + public int getSpriteColour(int renderPass) { + if (renderPass == 0) { + return primaryColour; + } + if (renderPass == 1) { + return secondaryColour; + } + return 0xffffff; + } +} diff --git a/src/main/java/forestry/apiculture/genetics/HiveDrop.java b/src/main/java/forestry/apiculture/genetics/HiveDrop.java index eee87976c..19a5460d2 100755 --- a/src/main/java/forestry/apiculture/genetics/HiveDrop.java +++ b/src/main/java/forestry/apiculture/genetics/HiveDrop.java @@ -15,6 +15,7 @@ import java.util.Collections; import java.util.List; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import forestry.api.apiculture.BeeManager; @@ -42,7 +43,7 @@ public class HiveDrop implements IHiveDrop { } @Override - public ItemStack getPrincess(World world, int x, int y, int z, int fortune) { + public ItemStack getPrincess(World world, BlockPos pos, int fortune) { IBee bee = beeTemplate.getIndividual(); if (world.rand.nextFloat() < ignobleShare) { bee.setIsNatural(false); @@ -52,13 +53,13 @@ public class HiveDrop implements IHiveDrop { } @Override - public List getDrones(World world, int x, int y, int z, int fortune) { + public List getDrones(World world, BlockPos pos, int fortune) { ItemStack drone = beeTemplate.getMemberStack(EnumBeeType.DRONE); return Collections.singletonList(drone); } @Override - public ArrayList getAdditional(World world, int x, int y, int z, int fortune) { + public ArrayList getAdditional(World world, BlockPos pos, int fortune) { ArrayList ret = new ArrayList<>(); for (ItemStack stack : additional) { ret.add(stack.copy()); @@ -68,7 +69,7 @@ public class HiveDrop implements IHiveDrop { } @Override - public int getChance(World world, int x, int y, int z) { + public int getChance(World world, BlockPos pos) { return chance; } diff --git a/src/main/java/forestry/apiculture/genetics/JubilanceRequiresResource.java b/src/main/java/forestry/apiculture/genetics/JubilanceRequiresResource.java index 4060abb69..e5a3a7789 100644 --- a/src/main/java/forestry/apiculture/genetics/JubilanceRequiresResource.java +++ b/src/main/java/forestry/apiculture/genetics/JubilanceRequiresResource.java @@ -11,8 +11,9 @@ package forestry.apiculture.genetics; import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; import net.minecraft.item.ItemStack; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import forestry.api.apiculture.IAlleleBeeSpecies; @@ -32,11 +33,10 @@ public class JubilanceRequiresResource implements IJubilanceProvider { @Override public boolean isJubilant(IAlleleBeeSpecies species, IBeeGenome genome, IBeeHousing housing) { World world = housing.getWorld(); - ChunkCoordinates housingCoords = housing.getCoordinates(); + BlockPos housingCoords = housing.getCoordinates(); - Block block = world.getBlock(housingCoords.posX, housingCoords.posY - 1, housingCoords.posZ); - int meta = world.getBlockMetadata(housingCoords.posX, housingCoords.posY - 1, housingCoords.posZ); - return ItemStackUtil.equals(block, meta, blockRequired); + IBlockState state = world.getBlockState(housingCoords.add(0, -1, 0)); + return ItemStackUtil.equals(state, blockRequired); } } diff --git a/src/main/java/forestry/apiculture/genetics/alleles/AlleleBeeSpecies.java b/src/main/java/forestry/apiculture/genetics/alleles/AlleleBeeSpecies.java index 4234ee7d9..94b95b618 100644 --- a/src/main/java/forestry/apiculture/genetics/alleles/AlleleBeeSpecies.java +++ b/src/main/java/forestry/apiculture/genetics/alleles/AlleleBeeSpecies.java @@ -15,30 +15,30 @@ import java.util.Collections; import java.util.HashMap; import java.util.Map; -import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.client.resources.model.ModelResourceLocation; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import com.mojang.authlib.GameProfile; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - import forestry.api.apiculture.BeeManager; import forestry.api.apiculture.EnumBeeType; import forestry.api.apiculture.IAlleleBeeSpeciesCustom; import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeHousing; -import forestry.api.apiculture.IBeeIconColourProvider; -import forestry.api.apiculture.IBeeIconProvider; +import forestry.api.apiculture.IBeeSpriteColourProvider; +import forestry.api.apiculture.IBeeModelProvider; import forestry.api.apiculture.IBeeRoot; import forestry.api.apiculture.IJubilanceProvider; -import forestry.api.core.IIconProvider; +import forestry.api.core.IModelManager; +import forestry.api.core.IModelProvider; import forestry.api.genetics.IClassification; import forestry.api.genetics.IIndividual; -import forestry.apiculture.genetics.DefaultBeeIconColourProvider; -import forestry.apiculture.genetics.DefaultBeeIconProvider; +import forestry.apiculture.genetics.DefaultBeeSpriteColourProvider; +import forestry.apiculture.genetics.DefaultBeeModelProvider; import forestry.apiculture.genetics.JubilanceDefault; import forestry.core.genetics.alleles.AlleleSpecies; import forestry.core.utils.ItemStackUtil; @@ -47,16 +47,16 @@ public class AlleleBeeSpecies extends AlleleSpecies implements IAlleleBeeSpecies private final Map productChances = new HashMap<>(); private final Map specialtyChances = new HashMap<>(); - private IBeeIconProvider beeIconProvider; - private IBeeIconColourProvider beeIconColourProvider; + private IBeeModelProvider beeModelProvider; + private IBeeSpriteColourProvider beeSpriteColourProvider; private IJubilanceProvider jubilanceProvider; private boolean nocturnal = false; public AlleleBeeSpecies(String uid, String unlocalizedName, String authority, String unlocalizedDescription, boolean dominant, IClassification branch, String binomial, int primaryColor, int secondaryColor) { super(uid, unlocalizedName, authority, unlocalizedDescription, dominant, branch, binomial); - beeIconProvider = DefaultBeeIconProvider.instance; - beeIconColourProvider = new DefaultBeeIconColourProvider(primaryColor, secondaryColor); + beeModelProvider = DefaultBeeModelProvider.instance; + beeSpriteColourProvider = new DefaultBeeSpriteColourProvider(primaryColor, secondaryColor); jubilanceProvider = JubilanceDefault.instance; } @@ -100,16 +100,16 @@ public class AlleleBeeSpecies extends AlleleSpecies implements IAlleleBeeSpecies nocturnal = true; return this; } - + @Override - public IAlleleBeeSpeciesCustom setCustomBeeIconProvider(IBeeIconProvider beeIconProvider) { - this.beeIconProvider = beeIconProvider; + public IAlleleBeeSpeciesCustom setCustomBeeModelProvider(IBeeModelProvider beeIconProvider) { + this.beeModelProvider = beeIconProvider; return this; } @Override - public IAlleleBeeSpeciesCustom setCustomBeeIconColourProvider(IBeeIconColourProvider beeIconColourProvider) { - this.beeIconColourProvider = beeIconColourProvider; + public IAlleleBeeSpeciesCustom setCustomBeeSpriteColourProvider(IBeeSpriteColourProvider beeIconColourProvider) { + this.beeSpriteColourProvider = beeIconColourProvider; return this; } @@ -173,18 +173,18 @@ public class AlleleBeeSpecies extends AlleleSpecies implements IAlleleBeeSpecies @Override @SideOnly(Side.CLIENT) - public IIconProvider getIconProvider() { - return new BeeIconProviderWrapper(beeIconProvider); + public IModelProvider getModelProvider() { + return new BeeModelProviderWrapper(beeModelProvider); } @Override - public IIcon getIcon(EnumBeeType type, int renderPass) { - return beeIconProvider.getIcon(type, renderPass); + public ModelResourceLocation getModel(EnumBeeType type) { + return beeModelProvider.getModel(type); } @Override - public int getIconColour(int renderPass) { - return beeIconColourProvider.getIconColour(renderPass); + public int getSpriteColour(int renderPass) { + return beeSpriteColourProvider.getSpriteColour(renderPass); } @Override @@ -192,22 +192,23 @@ public class AlleleBeeSpecies extends AlleleSpecies implements IAlleleBeeSpecies return null; } - private static class BeeIconProviderWrapper implements IIconProvider { + @SideOnly(Side.CLIENT) + private static class BeeModelProviderWrapper implements IModelProvider { - private final IBeeIconProvider beeIconProvider; + private final IBeeModelProvider beeModelProvider; - public BeeIconProviderWrapper(IBeeIconProvider beeIconProvider) { - this.beeIconProvider = beeIconProvider; + public BeeModelProviderWrapper(IBeeModelProvider beeModelProvider) { + this.beeModelProvider = beeModelProvider; } @Override - public IIcon getIcon(short texUID) { + public ModelResourceLocation getModel() { return null; } @Override - public void registerIcons(IIconRegister register) { - beeIconProvider.registerIcons(register); + public void registerModels(Item item, IModelManager manager) { + beeModelProvider.registerModels(item, manager); } } } diff --git a/src/main/java/forestry/apiculture/genetics/alleles/AlleleEffect.java b/src/main/java/forestry/apiculture/genetics/alleles/AlleleEffect.java index c95047651..970cefae2 100644 --- a/src/main/java/forestry/apiculture/genetics/alleles/AlleleEffect.java +++ b/src/main/java/forestry/apiculture/genetics/alleles/AlleleEffect.java @@ -16,7 +16,7 @@ import java.util.List; import net.minecraft.entity.Entity; import net.minecraft.potion.Potion; import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; import net.minecraft.util.Vec3; import forestry.api.apiculture.BeeManager; @@ -105,7 +105,7 @@ public abstract class AlleleEffect extends AlleleCategorized implements IAlleleB @Override public IEffectData doFX(IBeeGenome genome, IEffectData storedData, IBeeHousing housing) { Vec3 beeFXCoordinates = getFXCoordinates(housing); - Proxies.render.addBeeHiveFX("particles/swarm_bee", housing.getWorld(), beeFXCoordinates.xCoord, beeFXCoordinates.yCoord, beeFXCoordinates.zCoord, genome.getPrimary().getIconColour(0)); + Proxies.render.addBeeHiveFX("particles/swarm_bee", housing.getWorld(), beeFXCoordinates.xCoord, beeFXCoordinates.yCoord, beeFXCoordinates.zCoord, genome.getPrimary().getSpriteColour(0)); return storedData; } @@ -114,8 +114,8 @@ public abstract class AlleleEffect extends AlleleCategorized implements IAlleleB return housing.getBeeFXCoordinates(); } catch (Throwable error) { // getBeeFXCoordinates() is only newly added to the API, fall back on getCoordinates() - ChunkCoordinates coordinates = housing.getCoordinates(); - return Vec3.createVectorHelper(coordinates.posX + 0.5D, coordinates.posY + 0.5D, coordinates.posZ + 0.5D); + BlockPos coordinates = housing.getCoordinates(); + return new Vec3(coordinates.getX() + 0.5D, coordinates.getY() + 0.5D, coordinates.getZ() + 0.5D); } } @@ -150,7 +150,7 @@ public abstract class AlleleEffect extends AlleleCategorized implements IAlleleB Vect min = new Vect(housing.getCoordinates()).add(offset); Vect max = min.add(area); - return AxisAlignedBB.getBoundingBox(min.x, min.y, min.z, max.x, max.y, max.z); + return AxisAlignedBB.fromBounds(min.getX(), min.getY(), min.getZ(), max.getX(), max.getY(), max.getX()); } public static List getEntitiesInRange(IBeeGenome genome, IBeeHousing housing, Class entityClass) { diff --git a/src/main/java/forestry/apiculture/genetics/alleles/AlleleEffectCreeper.java b/src/main/java/forestry/apiculture/genetics/alleles/AlleleEffectCreeper.java index 26b426318..9b4afe61a 100644 --- a/src/main/java/forestry/apiculture/genetics/alleles/AlleleEffectCreeper.java +++ b/src/main/java/forestry/apiculture/genetics/alleles/AlleleEffectCreeper.java @@ -13,7 +13,7 @@ package forestry.apiculture.genetics.alleles; import java.util.List; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import forestry.api.apiculture.BeeManager; @@ -50,11 +50,11 @@ public class AlleleEffectCreeper extends AlleleEffectThrottled { public IEffectData doEffectThrottled(IBeeGenome genome, IEffectData storedData, IBeeHousing housing) { World world = housing.getWorld(); - ChunkCoordinates housingCoords = housing.getCoordinates(); + BlockPos housingCoords = housing.getCoordinates(); // If we are already triggered, we continue the explosion sequence. if (storedData.getInteger(indexExplosionTimer) > 0) { - progressExplosion(storedData, world, housingCoords.posX, housingCoords.posY, housingCoords.posZ); + progressExplosion(storedData, world, housingCoords); return storedData; } @@ -82,7 +82,7 @@ public class AlleleEffectCreeper extends AlleleEffectThrottled { continue; } - world.playSoundEffect(housingCoords.posX, housingCoords.posY, housingCoords.posZ, "mob.creeper", 4F, + world.playSoundEffect(housingCoords.getX(), housingCoords.getY(), housingCoords.getZ(), "mob.creeper", 4F, (1.0F + (world.rand.nextFloat() - world.rand.nextFloat()) * 0.2F) * 0.7F); storedData.setInteger(indexExplosionTimer, 2); // Set explosion timer } @@ -90,7 +90,7 @@ public class AlleleEffectCreeper extends AlleleEffectThrottled { return storedData; } - private static void progressExplosion(IEffectData storedData, World world, int x, int y, int z) { + private static void progressExplosion(IEffectData storedData, World world, BlockPos pos) { int explosionTimer = storedData.getInteger(indexExplosionTimer); explosionTimer--; @@ -100,7 +100,7 @@ public class AlleleEffectCreeper extends AlleleEffectThrottled { return; } - world.createExplosion(null, x, y, z, storedData.getInteger(indexExplosionForce), false); + world.createExplosion(null, pos.getX(), pos.getY(), pos.getZ(), storedData.getInteger(indexExplosionForce), false); } } diff --git a/src/main/java/forestry/apiculture/genetics/alleles/AlleleEffectFertile.java b/src/main/java/forestry/apiculture/genetics/alleles/AlleleEffectFertile.java index efcba3f62..b3b0431e9 100644 --- a/src/main/java/forestry/apiculture/genetics/alleles/AlleleEffectFertile.java +++ b/src/main/java/forestry/apiculture/genetics/alleles/AlleleEffectFertile.java @@ -14,7 +14,7 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.block.IGrowable; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import net.minecraftforge.common.IPlantable; @@ -36,20 +36,20 @@ public class AlleleEffectFertile extends AlleleEffectThrottled { public IEffectData doEffectThrottled(IBeeGenome genome, IEffectData storedData, IBeeHousing housing) { World world = housing.getWorld(); - ChunkCoordinates housingCoordinates = housing.getCoordinates(); + BlockPos housingCoordinates = housing.getCoordinates(); IVect area = getModifiedArea(genome, housing); - int blockX = getRandomOffset(world.rand, housingCoordinates.posX, area.getX()); - int blockZ = getRandomOffset(world.rand, housingCoordinates.posZ, area.getZ()); - int blockMaxY = housingCoordinates.posY + (area.getY() / 2) + 1; - int blockMinY = housingCoordinates.posY - (area.getY() / 2) - 1; + int blockX = getRandomOffset(world.rand, housingCoordinates.getX(), area.getX()); + int blockZ = getRandomOffset(world.rand, housingCoordinates.getZ(), area.getZ()); + int blockMaxY = housingCoordinates.getY() + (area.getY() / 2) + 1; + int blockMinY = housingCoordinates.getY() - (area.getY() / 2) - 1; for (int attempt = 0; attempt < MAX_BLOCK_FIND_TRIES; ++attempt) { if (tryTickColumn(world, blockX, blockZ, blockMaxY, blockMinY)) { break; } - blockX = getRandomOffset(world.rand, housingCoordinates.posX, area.getX()); - blockZ = getRandomOffset(world.rand, housingCoordinates.posZ, area.getZ()); + blockX = getRandomOffset(world.rand, housingCoordinates.getX(), area.getX()); + blockZ = getRandomOffset(world.rand, housingCoordinates.getZ(), area.getZ()); } return storedData; @@ -61,9 +61,9 @@ public class AlleleEffectFertile extends AlleleEffectThrottled { private static boolean tryTickColumn(World world, int x, int z, int maxY, int minY) { for (int y = maxY; y >= minY; --y) { - Block block = world.getBlock(x, y, z); + Block block = world.getBlockState(new BlockPos(x, y, z)).getBlock(); if (block.getTickRandomly() && (block instanceof IGrowable || block instanceof IPlantable)) { - world.scheduleBlockUpdate(x, y, z, block, 5); + world.scheduleUpdate(new BlockPos(x, y, z), block, 5); return true; } } diff --git a/src/main/java/forestry/apiculture/genetics/alleles/AlleleEffectFungification.java b/src/main/java/forestry/apiculture/genetics/alleles/AlleleEffectFungification.java index aa3fa0518..e1239f97c 100644 --- a/src/main/java/forestry/apiculture/genetics/alleles/AlleleEffectFungification.java +++ b/src/main/java/forestry/apiculture/genetics/alleles/AlleleEffectFungification.java @@ -7,7 +7,8 @@ import net.minecraft.block.Block; import net.minecraft.entity.passive.EntityCow; import net.minecraft.entity.passive.EntityMooshroom; import net.minecraft.init.Blocks; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumParticleTypes; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenBigMushroom; @@ -54,25 +55,26 @@ public class AlleleEffectFungification extends AlleleEffectThrottled { private void doBlockEffect(IBeeGenome genome, IBeeHousing housing) { World world = housing.getWorld(); - ChunkCoordinates housingCoordinates = housing.getCoordinates(); + BlockPos housingCoordinates = housing.getCoordinates(); IVect area = getModifiedArea(genome, housing); - int blockX = getRandomOffset(world.rand, housingCoordinates.posX, area.getX()); - int blockY = getRandomOffset(world.rand, housingCoordinates.posY, area.getY()); - int blockZ = getRandomOffset(world.rand, housingCoordinates.posZ, area.getZ()); + int blockX = getRandomOffset(world.rand, housingCoordinates.getX(), area.getX()); + int blockY = getRandomOffset(world.rand, housingCoordinates.getY(), area.getY()); + int blockZ = getRandomOffset(world.rand, housingCoordinates.getZ(), area.getZ()); for (int attempt = 0; attempt < MAX_BLOCK_FIND_TRIES; ++attempt) { - Block block = world.getBlock(blockX, blockY, blockZ); - if (isSuitableForMycelium(world, block, blockX, blockY, blockZ)) { - world.setBlock(blockX, blockY, blockZ, Blocks.mycelium); + BlockPos pos = new BlockPos(blockX, blockY, blockZ); + Block block = world.getBlockState(pos).getBlock(); + if (isSuitableForMycelium(world, block, pos)) { + world.setBlockState(pos, Blocks.mycelium.getStateFromMeta(0)); break; } else if (isSuitableForGrowth(block)) { - doMushroomGrowth(block, world, blockX, blockY, blockZ); + doMushroomGrowth(block, world, pos); break; } - blockX = getRandomOffset(world.rand, housingCoordinates.posX, area.getX()); - blockY = getRandomOffset(world.rand, housingCoordinates.posY, area.getY()); - blockZ = getRandomOffset(world.rand, housingCoordinates.posZ, area.getZ()); + blockX = getRandomOffset(world.rand, housingCoordinates.getX(), area.getX()); + blockY = getRandomOffset(world.rand, housingCoordinates.getY(), area.getY()); + blockZ = getRandomOffset(world.rand, housingCoordinates.getZ(), area.getZ()); } } @@ -88,8 +90,8 @@ public class AlleleEffectFungification extends AlleleEffectThrottled { return centrePos + random.nextInt(offset) - (offset / 2); } - private static boolean isSuitableForMycelium(World world, Block block, int blockX, int blockY, int blockZ) { - return block == Blocks.grass || (block == Blocks.dirt && world.canBlockSeeTheSky(blockX, blockY, blockZ)); + private static boolean isSuitableForMycelium(World world, Block block, BlockPos pos) { + return block == Blocks.grass || (block == Blocks.dirt && world.canBlockSeeSky(pos)); } private static boolean isSuitableForGrowth(Block block) { @@ -107,19 +109,15 @@ public class AlleleEffectFungification extends AlleleEffectThrottled { mooshroom.setHealth(cow.getHealth()); mooshroom.renderYawOffset = cow.renderYawOffset; worldObj.spawnEntityInWorld(mooshroom); - worldObj.spawnParticle("largeexplode", cow.posX, cow.posY + (double) (cow.height / 2.0F), cow.posZ, 0.0D, 0.0D, 0.0D); + worldObj.spawnParticle(EnumParticleTypes.EXPLOSION_LARGE, cow.posX, cow.posY + cow.height / 2.0F, cow.posZ, 0.0D, 0.0D, 0.0D); } - private static void doMushroomGrowth(Block block, World world, int blockX, int blockY, int blockZ) { + private static void doMushroomGrowth(Block block, World world, BlockPos pos) { WorldGenBigMushroom giantMushroomGenerator; - if (block == Blocks.brown_mushroom) { - giantMushroomGenerator = new WorldGenBigMushroom(0); - } else { - giantMushroomGenerator = new WorldGenBigMushroom(1); - } + giantMushroomGenerator = new WorldGenBigMushroom(block); - world.setBlockToAir(blockX, blockY, blockZ); - giantMushroomGenerator.generate(world, world.rand, blockX, blockY, blockZ); + world.setBlockToAir(pos); + giantMushroomGenerator.generate(world, world.rand, pos); } } diff --git a/src/main/java/forestry/apiculture/genetics/alleles/AlleleEffectGlacial.java b/src/main/java/forestry/apiculture/genetics/alleles/AlleleEffectGlacial.java index dda24b591..f279bd1bf 100644 --- a/src/main/java/forestry/apiculture/genetics/alleles/AlleleEffectGlacial.java +++ b/src/main/java/forestry/apiculture/genetics/alleles/AlleleEffectGlacial.java @@ -12,6 +12,7 @@ package forestry.apiculture.genetics.alleles; import net.minecraft.block.Block; import net.minecraft.init.Blocks; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import forestry.api.apiculture.IBeeGenome; @@ -52,16 +53,16 @@ public class AlleleEffectGlacial extends AlleleEffectThrottled { Vect posBlock = Vect.add(randomPos, housingCoords, offset); // Freeze water - Block block = world.getBlock(posBlock.x, posBlock.y, posBlock.z); + Block block = world.getBlockState(posBlock).getBlock(); if (block != Blocks.water) { continue; } - if (!world.isAirBlock(posBlock.x, posBlock.y + 1, posBlock.z)) { + if (!world.isAirBlock(new BlockPos(posBlock.getX(), posBlock.getY() + 1, posBlock.getZ()))) { continue; } - world.setBlock(posBlock.x, posBlock.y, posBlock.z, Blocks.ice, 0, Constants.FLAG_BLOCK_SYNCH_AND_UPDATE); + world.setBlockState(posBlock, Blocks.ice.getStateFromMeta(0), Constants.FLAG_BLOCK_SYNCH_AND_UPDATE); } return storedData; diff --git a/src/main/java/forestry/apiculture/genetics/alleles/AlleleEffectPotion.java b/src/main/java/forestry/apiculture/genetics/alleles/AlleleEffectPotion.java index 5f42aa59a..d81831bf1 100644 --- a/src/main/java/forestry/apiculture/genetics/alleles/AlleleEffectPotion.java +++ b/src/main/java/forestry/apiculture/genetics/alleles/AlleleEffectPotion.java @@ -21,9 +21,7 @@ import net.minecraft.potion.PotionEffect; import net.minecraft.potion.PotionHelper; import net.minecraft.util.Vec3; import net.minecraft.world.World; - -import cpw.mods.fml.relauncher.ReflectionHelper; - +import net.minecraftforge.fml.relauncher.ReflectionHelper; import forestry.api.apiculture.BeeManager; import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeHousing; diff --git a/src/main/java/forestry/apiculture/genetics/alleles/AlleleEffectRadioactive.java b/src/main/java/forestry/apiculture/genetics/alleles/AlleleEffectRadioactive.java index 45b7980c4..a81a77374 100644 --- a/src/main/java/forestry/apiculture/genetics/alleles/AlleleEffectRadioactive.java +++ b/src/main/java/forestry/apiculture/genetics/alleles/AlleleEffectRadioactive.java @@ -72,35 +72,35 @@ public class AlleleEffectRadioactive extends AlleleEffectThrottled { Vect posBlock = randomPos.add(posHousing); posBlock = posBlock.add(offset); - if (posBlock.y <= 1 || posBlock.y >= housing.getWorld().getActualHeight()) { + if (posBlock.getY() <= 1 || posBlock.getY() >= housing.getWorld().getActualHeight()) { continue; } // Don't destroy ourselves or blocks below us. - if (posBlock.x == posHousing.x && posBlock.z == posHousing.z && posBlock.y <= posHousing.y) { + if (posBlock.getX() == posHousing.getX() && posBlock.getZ() == posHousing.getZ() && posBlock.getY() <= posHousing.getY()) { continue; } - if (world.isAirBlock(posBlock.x, posBlock.y, posBlock.z)) { + if (world.isAirBlock(posBlock)) { continue; } - Block block = world.getBlock(posBlock.x, posBlock.y, posBlock.z); + Block block = world.getBlockState(posBlock).getBlock(); if (block instanceof BlockAlveary) { continue; } - TileEntity tile = world.getTileEntity(posBlock.x, posBlock.y, posBlock.z); + TileEntity tile = world.getTileEntity(posBlock); if (tile instanceof IBeeHousing) { continue; } - if (block.getBlockHardness(world, posBlock.x, posBlock.y, posBlock.z) < 0) { + if (block.getBlockHardness(world, posBlock) < 0) { continue; } - world.setBlockToAir(posBlock.x, posBlock.y, posBlock.z); + world.setBlockToAir(posBlock); break; } diff --git a/src/main/java/forestry/apiculture/genetics/alleles/AlleleEffectSnowing.java b/src/main/java/forestry/apiculture/genetics/alleles/AlleleEffectSnowing.java index 5c1b37381..c1198df36 100644 --- a/src/main/java/forestry/apiculture/genetics/alleles/AlleleEffectSnowing.java +++ b/src/main/java/forestry/apiculture/genetics/alleles/AlleleEffectSnowing.java @@ -11,12 +11,12 @@ package forestry.apiculture.genetics.alleles; import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; - import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeHousing; import forestry.api.core.EnumTemperature; @@ -57,19 +57,20 @@ public class AlleleEffectSnowing extends AlleleEffectThrottled { posBlock = posBlock.add(offset); // Put snow on the ground - if (!world.isSideSolid(posBlock.x, posBlock.y - 1, posBlock.z, ForgeDirection.UP, false)) { + if (!world.isSideSolid(new BlockPos(posBlock.getX(), posBlock.getY() - 1, posBlock.getZ()), EnumFacing.UP, false)) { continue; } - Block block = world.getBlock(posBlock.x, posBlock.y, posBlock.z); + IBlockState state = world.getBlockState(posBlock); + Block block = state.getBlock(); if (block == Blocks.snow_layer) { - int meta = world.getBlockMetadata(posBlock.x, posBlock.y, posBlock.z); + int meta = block.getMetaFromState(state); if (meta < 7) { - world.setBlockMetadataWithNotify(posBlock.x, posBlock.y, posBlock.z, meta + 1, Constants.FLAG_BLOCK_SYNCH_AND_UPDATE); + world.setBlockState(posBlock, block.getStateFromMeta(meta + 1), Constants.FLAG_BLOCK_SYNCH_AND_UPDATE); } - } else if (block.isReplaceable(world, posBlock.x, posBlock.y, posBlock.z)) { - world.setBlock(posBlock.x, posBlock.y, posBlock.z, Blocks.snow_layer, 0, Constants.FLAG_BLOCK_SYNCH_AND_UPDATE); + } else if (block.isReplaceable(world, posBlock)) { + world.setBlockState(posBlock, Blocks.snow_layer.getStateFromMeta(0), Constants.FLAG_BLOCK_SYNCH_AND_UPDATE); } } @@ -82,11 +83,11 @@ public class AlleleEffectSnowing extends AlleleEffectThrottled { Vect area = getModifiedArea(genome, housing); Vect offset = area.multiply(-0.5F); - ChunkCoordinates coordinates = housing.getCoordinates(); + BlockPos coordinates = housing.getCoordinates(); World world = housing.getWorld(); Vect spawn = Vect.getRandomPositionInArea(world.rand, area).add(coordinates).add(offset); - Proxies.render.addEntitySnowFX(world, spawn.x, spawn.y, spawn.z); + Proxies.render.addEntitySnowFX(world, spawn.getX(), spawn.getY(), spawn.getZ()); return storedData; } else { return super.doFX(genome, storedData, housing); diff --git a/src/main/java/forestry/apiculture/gui/GuiBeealyzer.java b/src/main/java/forestry/apiculture/gui/GuiBeealyzer.java index bdf93cbc7..c35de22d1 100755 --- a/src/main/java/forestry/apiculture/gui/GuiBeealyzer.java +++ b/src/main/java/forestry/apiculture/gui/GuiBeealyzer.java @@ -29,6 +29,7 @@ import forestry.core.genetics.alleles.AlleleBoolean; import forestry.core.gui.ContainerAlyzer; import forestry.core.gui.GuiAlyzer; import forestry.core.gui.widgets.ItemStackWidget; +import forestry.core.inventory.ItemInventoryAlyzer; import forestry.core.utils.StringUtil; import forestry.plugins.PluginApiculture; @@ -55,8 +56,8 @@ public class GuiBeealyzer extends GuiAlyzer { IBee bee = null; EnumBeeType beeType = EnumBeeType.DRONE; - for (int k = ItemInventoryBeealyzer.SLOT_SPECIMEN; k <= ItemInventoryBeealyzer.SLOT_ANALYZE_5; k++) { - if (k == ItemInventoryBeealyzer.SLOT_ENERGY) { + for (int k = ItemInventoryAlyzer.SLOT_SPECIMEN; k <= ItemInventoryAlyzer.SLOT_ANALYZE_5; k++) { + if (k == ItemInventoryAlyzer.SLOT_ENERGY) { continue; } diff --git a/src/main/java/forestry/apiculture/gui/GuiImprinter.java b/src/main/java/forestry/apiculture/gui/GuiImprinter.java index e068470f8..c44bc4d64 100755 --- a/src/main/java/forestry/apiculture/gui/GuiImprinter.java +++ b/src/main/java/forestry/apiculture/gui/GuiImprinter.java @@ -10,6 +10,7 @@ ******************************************************************************/ package forestry.apiculture.gui; +import java.io.IOException; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -91,7 +92,7 @@ public class GuiImprinter extends GuiForestry biomesToSearch) { + private BlockPos findNearestBiome(Entity player, Collection biomesToSearch) { Vect playerPos = new Vect(player); // If we are in a valid spot, we point to ourselves. - ChunkCoordinates coordinates = getChunkCoordinates(playerPos, player.worldObj, biomesToSearch); + BlockPos coordinates = getChunkCoordinates(playerPos, player.worldObj, biomesToSearch); if (coordinates != null) { searchAngleIteration = 0; searchRadiusIteration = 0; - return new ChunkCoordinates(playerPos.x, playerPos.y, playerPos.z); + return playerPos; } // check in a circular pattern, starting at the center and increasing radius each step @@ -151,35 +151,35 @@ public class HabitatLocatorLogic { return null; } - private static ChunkCoordinates getChunkCoordinates(Vect pos, World world, Collection biomesToSearch) { + private static BlockPos getChunkCoordinates(Vect pos, World world, Collection biomesToSearch) { BiomeGenBase biome; - biome = world.getBiomeGenForCoords(pos.x, pos.z); + biome = world.getBiomeGenForCoords(pos); if (!biomesToSearch.contains(biome)) { return null; } - biome = world.getBiomeGenForCoords(pos.x - minBiomeRadius, pos.z); + biome = world.getBiomeGenForCoords(pos.add(-minBiomeRadius, 0, 0)); if (!biomesToSearch.contains(biome)) { return null; } - biome = world.getBiomeGenForCoords(pos.x + minBiomeRadius, pos.z); + biome = world.getBiomeGenForCoords(pos.add(minBiomeRadius, 0, 0)); if (!biomesToSearch.contains(biome)) { return null; } - biome = world.getBiomeGenForCoords(pos.x, pos.z - minBiomeRadius); + biome = world.getBiomeGenForCoords(pos.add(0, 0, -minBiomeRadius)); if (!biomesToSearch.contains(biome)) { return null; } - biome = world.getBiomeGenForCoords(pos.x, pos.z + minBiomeRadius); + biome = world.getBiomeGenForCoords(pos.add(0, 0, minBiomeRadius)); if (!biomesToSearch.contains(biome)) { return null; } - return new ChunkCoordinates(pos.x, pos.y, pos.z); + return pos; } private static void removeInvalidBiomes(BiomeGenBase currentBiome, Set biomesToSearch) { diff --git a/src/main/java/forestry/apiculture/items/ItemArmorApiarist.java b/src/main/java/forestry/apiculture/items/ItemArmorApiarist.java index fc3db834d..bf01df9f8 100755 --- a/src/main/java/forestry/apiculture/items/ItemArmorApiarist.java +++ b/src/main/java/forestry/apiculture/items/ItemArmorApiarist.java @@ -10,29 +10,26 @@ ******************************************************************************/ package forestry.apiculture.items; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; import net.minecraft.item.ItemArmor; import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import forestry.api.apiculture.IArmorApiarist; import forestry.api.core.IArmorNaturalist; +import forestry.api.core.IModelManager; +import forestry.api.core.IItemModelRegister; import forestry.api.core.Tabs; import forestry.core.config.Constants; -import forestry.core.render.TextureManager; -import forestry.core.utils.StringUtil; import forestry.plugins.PluginApiculture; -public class ItemArmorApiarist extends ItemArmor implements IArmorApiarist, IArmorNaturalist { +public class ItemArmorApiarist extends ItemArmor implements IArmorApiarist, IArmorNaturalist, IItemModelRegister { public ItemArmorApiarist(int slot) { - super(ArmorMaterial.CLOTH, 0, slot); + super(ArmorMaterial.LEATHER, 0, slot); this.setMaxDamage(100); setCreativeTab(Tabs.tabApiculture); } @@ -48,19 +45,8 @@ public class ItemArmorApiarist extends ItemArmor implements IArmorApiarist, IArm @SideOnly(Side.CLIENT) @Override - public void registerIcons(IIconRegister register) { - itemIcon = TextureManager.registerTex(register, StringUtil.cleanItemName(this)); - } - - @SideOnly(Side.CLIENT) - @Override - public IIcon getIconFromDamageForRenderPass(int par1, int par2) { - return itemIcon; - } - - @Override - public boolean requiresMultipleRenderPasses() { - return false; + public void registerModel(Item item, IModelManager manager) { + manager.registerItemModel(item, 0, true); } @Override diff --git a/src/main/java/forestry/apiculture/items/ItemBeeGE.java b/src/main/java/forestry/apiculture/items/ItemBeeGE.java index 7c09a84af..9d6b3b6eb 100755 --- a/src/main/java/forestry/apiculture/items/ItemBeeGE.java +++ b/src/main/java/forestry/apiculture/items/ItemBeeGE.java @@ -12,22 +12,21 @@ package forestry.apiculture.items; import java.util.List; -import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.client.renderer.ItemMeshDefinition; +import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.IIcon; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import forestry.api.apiculture.BeeManager; import forestry.api.apiculture.EnumBeeChromosome; import forestry.api.apiculture.EnumBeeType; import forestry.api.apiculture.IAlleleBeeSpecies; import forestry.api.apiculture.IBee; +import forestry.api.core.IModelManager; import forestry.api.core.Tabs; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllele; @@ -141,52 +140,40 @@ public class ItemBeeGE extends ItemGE { public int getColourFromSpecies(IAlleleSpecies species, int renderPass) { if (species instanceof IAlleleBeeSpecies) { - return species.getIconColour(renderPass); + return species.getSpriteColour(renderPass); } else { return 0xffffff; } } - @Override - public boolean requiresMultipleRenderPasses() { - return true; - } - - @Override - public int getRenderPasses(int metadata) { - return 3; - } - - /* ICONS */ - @Override + /* MODELS */ @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister register) { + @Override + public void registerModel(Item item, IModelManager manager) { for (IAllele allele : AlleleManager.alleleRegistry.getRegisteredAlleles().values()) { if (allele instanceof IAlleleBeeSpecies) { - ((IAlleleBeeSpecies) allele).getIconProvider().registerIcons(register); + ((IAlleleBeeSpecies) allele).getModelProvider().registerModels(item, manager); } } + manager.registerItemModel(item, new BeeMeshDefinition()); } - @Override - @SideOnly(Side.CLIENT) - public IIcon getIcon(ItemStack itemstack, int renderPass) { - return getIconFromSpecies(BeeGenome.getSpecies(itemstack), renderPass); - } + private class BeeMeshDefinition implements ItemMeshDefinition { - @Override - @SideOnly(Side.CLIENT) - public IIcon getIconIndex(ItemStack stack) { - return getIcon(stack, 0); - } - - @SideOnly(Side.CLIENT) - public IIcon getIconFromSpecies(IAlleleBeeSpecies species, int renderPass) { - if (species == null) { - species = (IAlleleBeeSpecies) BeeManager.beeRoot.getDefaultTemplate()[EnumBeeChromosome.SPECIES.ordinal()]; + @Override + public ModelResourceLocation getModelLocation(ItemStack stack) { + IAlleleBeeSpecies species = (IAlleleBeeSpecies) getSpecies(stack); + if (species == null) { + species = (IAlleleBeeSpecies) BeeManager.beeRoot.getDefaultTemplate()[EnumBeeChromosome.SPECIES + .ordinal()]; + } + return species.getModel(type); } - return species.getIcon(type, renderPass); + } + + public final EnumBeeType getType() { + return type; } } diff --git a/src/main/java/forestry/apiculture/items/ItemBlockCandle.java b/src/main/java/forestry/apiculture/items/ItemBlockCandle.java index 35cfa591d..e210e9da6 100644 --- a/src/main/java/forestry/apiculture/items/ItemBlockCandle.java +++ b/src/main/java/forestry/apiculture/items/ItemBlockCandle.java @@ -13,11 +13,8 @@ package forestry.apiculture.items; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.IIcon; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import forestry.apiculture.blocks.BlockCandle; import forestry.core.items.ItemBlockForestry; @@ -54,22 +51,4 @@ public class ItemBlockCandle extends ItemBlockForestry { } return value; } - - @Override - @SideOnly(Side.CLIENT) - public IIcon getIconFromDamageForRenderPass(int meta, int pass) { - return this.getBlock().getIcon((meta != 0) ? 8 : 0, pass); - } - - @Override - @SideOnly(Side.CLIENT) - public boolean requiresMultipleRenderPasses() { - return true; - } - - @Override - public int getRenderPasses(int metadata) { - return 2; - } - } diff --git a/src/main/java/forestry/apiculture/items/ItemHabitatLocator.java b/src/main/java/forestry/apiculture/items/ItemHabitatLocator.java index b4b5b99de..a71ff54bb 100644 --- a/src/main/java/forestry/apiculture/items/ItemHabitatLocator.java +++ b/src/main/java/forestry/apiculture/items/ItemHabitatLocator.java @@ -12,7 +12,6 @@ package forestry.apiculture.items; import java.util.List; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.Entity; @@ -20,10 +19,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; import forestry.api.core.Tabs; @@ -59,21 +56,21 @@ public class ItemHabitatLocator extends ItemWithGui { /* TEXTURES */ @SideOnly(Side.CLIENT) - @Override - public void registerIcons(IIconRegister register) { - if (register instanceof TextureMap) { - TextureAtlasSprite texture = new TextureHabitatLocator(iconName); - ((TextureMap) register).setTextureEntry(iconName, texture); - itemIcon = texture; - } + public static TextureAtlasSprite sprite; + + @SideOnly(Side.CLIENT) + public static void registerIcon(TextureMap map) { + TextureAtlasSprite texture = new TextureHabitatLocator(iconName); + map.setTextureEntry("forestry:biomefinder", texture); + sprite = texture; } @SuppressWarnings({"rawtypes", "unchecked"}) @Override public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean flag) { - BiomeGenBase currentBiome = player.worldObj.getBiomeGenForCoords((int) player.posX, (int) player.posZ); + BiomeGenBase currentBiome = player.worldObj.getBiomeGenForCoords(player.getPosition()); - float temperatureValue = currentBiome.getFloatTemperature((int) player.posX, (int) player.posY, (int) player.posZ); + float temperatureValue = currentBiome.getFloatTemperature(player.getPosition()); EnumTemperature temperature = EnumTemperature.getFromValue(temperatureValue); EnumHumidity humidity = EnumHumidity.getFromValue(currentBiome.rainfall); diff --git a/src/main/java/forestry/apiculture/items/ItemHoneycomb.java b/src/main/java/forestry/apiculture/items/ItemHoneycomb.java index c2cd26a66..260c7252a 100755 --- a/src/main/java/forestry/apiculture/items/ItemHoneycomb.java +++ b/src/main/java/forestry/apiculture/items/ItemHoneycomb.java @@ -17,12 +17,14 @@ import java.util.Random; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; - +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +import forestry.api.core.IModelManager; import forestry.api.core.Tabs; import forestry.core.config.Config; -import forestry.core.items.ItemForestryMultiPass; +import forestry.core.items.ItemForestry; -public class ItemHoneycomb extends ItemForestryMultiPass { +public class ItemHoneycomb extends ItemForestry { public ItemHoneycomb() { super(); setMaxDamage(0); @@ -40,6 +42,14 @@ public class ItemHoneycomb extends ItemForestryMultiPass { return false; } + @SideOnly(Side.CLIENT) + @Override + public void registerModel(Item item, IModelManager manager) { + for (int i = 0; i < EnumHoneyComb.VALUES.length; i++) { + manager.registerItemModel(item, i, "beecombs/" + EnumHoneyComb.VALUES[i].name); + } + } + @Override public String getUnlocalizedName(ItemStack stack) { EnumHoneyComb honeyComb = EnumHoneyComb.VALUES[stack.getItemDamage()]; diff --git a/src/main/java/forestry/apiculture/items/ItemMinecartBeehouse.java b/src/main/java/forestry/apiculture/items/ItemMinecartBeehouse.java index fbfb482e4..f300b0863 100644 --- a/src/main/java/forestry/apiculture/items/ItemMinecartBeehouse.java +++ b/src/main/java/forestry/apiculture/items/ItemMinecartBeehouse.java @@ -14,50 +14,63 @@ import java.util.List; import net.minecraft.block.BlockDispenser; import net.minecraft.block.BlockRailBase; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.dispenser.BehaviorDefaultDispenseItem; +import net.minecraft.dispenser.IBehaviorDispenseItem; +import net.minecraft.dispenser.IBlockSource; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemMinecart; import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.world.World; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +import forestry.api.core.IModelManager; +import forestry.api.core.IItemModelRegister; import forestry.apiculture.entities.EntityMinecartApiary; import forestry.apiculture.entities.EntityMinecartBeeHousingBase; import forestry.apiculture.entities.EntityMinecartBeehouse; -import forestry.core.render.TextureManager; -public class ItemMinecartBeehouse extends ItemMinecart { +public class ItemMinecartBeehouse extends ItemMinecart implements IItemModelRegister { private final String[] definition = new String[]{"cart.beehouse", "cart.apiary"}; + private static final IBehaviorDispenseItem dispenserMinecartBehavior = new BehaviorDefaultDispenseItem() + { + private final BehaviorDefaultDispenseItem behaviourDefaultDispenseItem = new BehaviorDefaultDispenseItem(); + + @Override + public ItemStack dispenseStack(IBlockSource source, ItemStack stack) + { + return stack; + } + }; + public ItemMinecartBeehouse() { - super(0); + super(null); setMaxDamage(0); setHasSubtypes(true); - BlockDispenser.dispenseBehaviorRegistry.putObject(this, null); + BlockDispenser.dispenseBehaviorRegistry.putObject(this,new BehaviorDefaultDispenseItem()); } @Override - public boolean onItemUse(ItemStack itemStack, EntityPlayer player, World world, int x, int y, int z, int side, float facingX, float facingY, float facingZ) { - if (!BlockRailBase.func_150051_a(world.getBlock(x, y, z))) { + public boolean onItemUse(ItemStack itemStack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ) { + if (!BlockRailBase.isRailBlock(world.getBlockState(pos))) { return false; } if (!world.isRemote) { EntityMinecartBeeHousingBase entityMinecart; if (itemStack.getItemDamage() == 0) { - entityMinecart = new EntityMinecartBeehouse(world, (double) ((float) x + 0.5F), (double) ((float) y + 0.5F), (double) ((float) z + 0.5F)); + entityMinecart = new EntityMinecartBeehouse(world, pos.getX() + 0.5F, pos.getY() + 0.5F, pos.getZ() + 0.5F); } else { - entityMinecart = new EntityMinecartApiary(world, (double) ((float) x + 0.5F), (double) ((float) y + 0.5F), (double) ((float) z + 0.5F)); + entityMinecart = new EntityMinecartApiary(world, pos.getX() + 0.5F, pos.getY() + 0.5F, pos.getZ() + 0.5F); } entityMinecart.setOwner(player.getGameProfile()); if (itemStack.hasDisplayName()) { - entityMinecart.setMinecartName(itemStack.getDisplayName()); + entityMinecart.setCustomNameTag(itemStack.getDisplayName()); } world.spawnEntityInWorld(entityMinecart); @@ -76,25 +89,12 @@ public class ItemMinecartBeehouse extends ItemMinecart { } } - /* ICONS */ - @SideOnly(Side.CLIENT) - private IIcon[] icons; - + /* MODELS */ @SideOnly(Side.CLIENT) @Override - public void registerIcons(IIconRegister register) { - icons = new IIcon[definition.length]; + public void registerModel(Item item, IModelManager manager) { for (int i = 0; i < definition.length; i++) { - icons[i] = TextureManager.registerTex(register, definition[i]); - } - } - - @Override - public IIcon getIconFromDamage(int damage) { - if (damage >= definition.length || damage < 0) { - return icons[0]; - } else { - return icons[damage]; + manager.registerItemModel(item, i, definition[i]); } } diff --git a/src/main/java/forestry/apiculture/items/ItemRegistryApiculture.java b/src/main/java/forestry/apiculture/items/ItemRegistryApiculture.java index da47bf97b..612c1810e 100644 --- a/src/main/java/forestry/apiculture/items/ItemRegistryApiculture.java +++ b/src/main/java/forestry/apiculture/items/ItemRegistryApiculture.java @@ -14,6 +14,7 @@ import net.minecraftforge.oredict.OreDictionary; import forestry.api.apiculture.EnumBeeType; import forestry.api.core.Tabs; +import forestry.apiculture.genetics.BeeDefinition; import forestry.core.items.ItemForestry; import forestry.core.items.ItemOverlay; import forestry.core.items.ItemRegistry; @@ -52,6 +53,7 @@ public class ItemRegistryApiculture extends ItemRegistry { public ItemRegistryApiculture() { // / BEES + BeeDefinition.preInit(); beeQueenGE = registerItem(new ItemBeeGE(EnumBeeType.QUEEN), "beeQueenGE"); beeDroneGE = registerItem(new ItemBeeGE(EnumBeeType.DRONE), "beeDroneGE"); beePrincessGE = registerItem(new ItemBeeGE(EnumBeeType.PRINCESS), "beePrincessGE"); diff --git a/src/main/java/forestry/apiculture/multiblock/AlvearyController.java b/src/main/java/forestry/apiculture/multiblock/AlvearyController.java index 11e3ee9a7..78b54737d 100644 --- a/src/main/java/forestry/apiculture/multiblock/AlvearyController.java +++ b/src/main/java/forestry/apiculture/multiblock/AlvearyController.java @@ -15,9 +15,10 @@ import java.util.HashSet; import java.util.Set; import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; import net.minecraft.util.StatCollector; import net.minecraft.util.Vec3; import net.minecraft.world.World; @@ -162,20 +163,22 @@ public class AlvearyController extends RectangularMultiblockControllerBase imple protected void isMachineWhole() throws MultiblockValidationException { super.isMachineWhole(); - final ChunkCoordinates maximumCoord = getMaximumCoord(); - final ChunkCoordinates minimumCoord = getMinimumCoord(); + final BlockPos maximumCoord = getMaximumCoord(); + final BlockPos minimumCoord = getMinimumCoord(); // check that the top is covered in wood slabs - final int slabY = maximumCoord.posY + 1; - for (int slabX = minimumCoord.posX; slabX <= maximumCoord.posX; slabX++) { - for (int slabZ = minimumCoord.posZ; slabZ <= maximumCoord.posZ; slabZ++) { - Block block = worldObj.getBlock(slabX, slabY, slabZ); + final int slabY = maximumCoord.getY() + 1; + for (int slabX = minimumCoord.getX(); slabX <= maximumCoord.getX(); slabX++) { + for (int slabZ = minimumCoord.getZ(); slabZ <= maximumCoord.getZ(); slabZ++) { + BlockPos pos = new BlockPos(slabX, slabY, slabZ); + IBlockState state = worldObj.getBlockState(pos); + Block block = state.getBlock(); if (!BlockUtil.isWoodSlabBlock(block)) { throw new MultiblockValidationException(StatCollector.translateToLocal("for.multiblock.alveary.error.needSlabs")); } - int meta = worldObj.getBlockMetadata(slabX, slabY, slabZ); + int meta = block.getMetaFromState(state); if ((meta & 8) != 0) { throw new MultiblockValidationException(StatCollector.translateToLocal("for.multiblock.alveary.error.needSlabs")); } @@ -184,13 +187,13 @@ public class AlvearyController extends RectangularMultiblockControllerBase imple // check that there is space all around the alveary entrances - int airY = maximumCoord.posY; - for (int airX = minimumCoord.posX - 1; airX <= maximumCoord.posX + 1; airX++) { - for (int airZ = minimumCoord.posZ - 1; airZ <= maximumCoord.posZ + 1; airZ++) { + int airY = maximumCoord.getY(); + for (int airX = minimumCoord.getX() - 1; airX <= maximumCoord.getX() + 1; airX++) { + for (int airZ = minimumCoord.getZ() - 1; airZ <= maximumCoord.getZ() + 1; airZ++) { if (isCoordInMultiblock(airX, airY, airZ)) { continue; } - Block block = worldObj.getBlock(airX, airY, airZ); + Block block = BlockUtil.getBlock(worldObj, new BlockPos(airX, airY, airZ)); if (block.isOpaqueCube()) { throw new MultiblockValidationException(StatCollector.translateToLocal("for.multiblock.alveary.error.needSpace")); } @@ -265,10 +268,10 @@ public class AlvearyController extends RectangularMultiblockControllerBase imple beekeepingLogic.doBeeFX(); if (updateOnInterval(50)) { - ChunkCoordinates center = getCenterCoord(); - float fxX = center.posX + 0.5F; - float fxY = center.posY + 1.0F; - float fxZ = center.posZ + 0.5F; + BlockPos center = getCenterCoord(); + float fxX = center.getX() + 0.5F; + float fxY = center.getY() + 1.0F; + float fxZ = center.getZ() + 0.5F; float distanceFromCenter = 1.6F; float leftRightSpreadFromCenter = distanceFromCenter * (worldObj.rand.nextFloat() - 0.5F); @@ -320,15 +323,15 @@ public class AlvearyController extends RectangularMultiblockControllerBase imple /* IActivatable */ @Override - public ChunkCoordinates getCoordinates() { - ChunkCoordinates coord = getCenterCoord(); - return new ChunkCoordinates(coord.posX, coord.posY + 1, coord.posZ); + public BlockPos getCoordinates() { + BlockPos coord = getCenterCoord(); + return coord.add(0, +1, 0); } @Override public Vec3 getBeeFXCoordinates() { - ChunkCoordinates coord = getCenterCoord(); - return Vec3.createVectorHelper(coord.posX + 0.5, coord.posY + 1.5, coord.posZ + 0.5); + BlockPos coord = getCenterCoord(); + return new Vec3(coord.getX() + 0.5, coord.getY() + 1.5, coord.getZ() + 0.5); } @Override @@ -338,7 +341,7 @@ public class AlvearyController extends RectangularMultiblockControllerBase imple for (IMultiblockComponent part : connectedParts) { if (part instanceof TileEntity) { TileEntity tile = (TileEntity) part; - worldObj.notifyBlocksOfNeighborChange(tile.xCoord, tile.yCoord, tile.zCoord, tile.getBlockType()); + worldObj.notifyBlockOfStateChange(tile.getPos(), tile.getBlockType()); } } markDirty(); @@ -347,8 +350,8 @@ public class AlvearyController extends RectangularMultiblockControllerBase imple @Override public float getExactTemperature() { - ChunkCoordinates coords = getReferenceCoord(); - return getBiome().getFloatTemperature(coords.posX, coords.posY, coords.posZ) + tempChange; + BlockPos coords = getReferenceCoord(); + return getBiome().getFloatTemperature(coords) + tempChange; } @Override @@ -384,29 +387,29 @@ public class AlvearyController extends RectangularMultiblockControllerBase imple @Override public BiomeGenBase getBiome() { if (cachedBiome == null) { - ChunkCoordinates coords = getReferenceCoord(); - cachedBiome = worldObj.getBiomeGenForCoords(coords.posX, coords.posZ); + BlockPos coords = getReferenceCoord(); + cachedBiome = worldObj.getBiomeGenForCoords(coords); } return cachedBiome; } @Override public int getBlockLightValue() { - ChunkCoordinates topCenter = getTopCenterCoord(); - return worldObj.getBlockLightValue(topCenter.posX, topCenter.posY + 1, topCenter.posZ); + BlockPos topCenter = getTopCenterCoord(); + return worldObj.getLightFromNeighbors(topCenter.add(0, 1, 0)); } @Override public boolean canBlockSeeTheSky() { - ChunkCoordinates topCenter = getTopCenterCoord(); - return worldObj.canBlockSeeTheSky(topCenter.posX, topCenter.posY + 2, topCenter.posZ); + BlockPos topCenter = getTopCenterCoord(); + return worldObj.canBlockSeeSky(topCenter.add(0, 2, 0)); } @Override public void addTemperatureChange(float change, float boundaryDown, float boundaryUp) { - ChunkCoordinates coordinates = getCoordinates(); + BlockPos coordinates = getCoordinates(); - float temperature = getBiome().getFloatTemperature(coordinates.posX, coordinates.posY, coordinates.posZ); + float temperature = getBiome().getFloatTemperature(coordinates); tempChange += change; tempChange = Math.max(boundaryDown - temperature, tempChange); diff --git a/src/main/java/forestry/apiculture/multiblock/FakeAlvearyController.java b/src/main/java/forestry/apiculture/multiblock/FakeAlvearyController.java index b81792571..0fdcf74a3 100644 --- a/src/main/java/forestry/apiculture/multiblock/FakeAlvearyController.java +++ b/src/main/java/forestry/apiculture/multiblock/FakeAlvearyController.java @@ -13,7 +13,7 @@ package forestry.apiculture.multiblock; import java.util.Collections; import net.minecraft.item.ItemStack; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; import net.minecraft.util.Vec3; import net.minecraft.world.biome.BiomeGenBase; @@ -71,7 +71,7 @@ public class FakeAlvearyController extends FakeMultiblockController implements I } @Override - public ChunkCoordinates getCoordinates() { + public BlockPos getCoordinates() { return null; } diff --git a/src/main/java/forestry/apiculture/multiblock/MultiblockLogicAlveary.java b/src/main/java/forestry/apiculture/multiblock/MultiblockLogicAlveary.java index 92a209664..feb5f2b6b 100644 --- a/src/main/java/forestry/apiculture/multiblock/MultiblockLogicAlveary.java +++ b/src/main/java/forestry/apiculture/multiblock/MultiblockLogicAlveary.java @@ -29,6 +29,7 @@ public class MultiblockLogicAlveary extends MultiblockLogic 0); } - /* TEXTURES */ - @Override - public int getIcon(int side) { - if (active) { - return definition.getIconOn(); - } else { - return definition.getIconOff(); - } - } - /* LOADING & SAVING */ @Override public void readFromNBT(NBTTagCompound nbttagcompound) { @@ -126,7 +110,7 @@ public abstract class TileAlvearyClimatiser extends TileAlveary implements IEner if (worldObj != null) { if (worldObj.isRemote) { - worldObj.func_147479_m(xCoord, yCoord, zCoord); + worldObj.markBlockRangeForRenderUpdate(getPos(), getPos()); } else { Proxies.net.sendNetworkPacket(new PacketActiveUpdate(this), worldObj); } @@ -135,27 +119,27 @@ public abstract class TileAlvearyClimatiser extends TileAlveary implements IEner /* IEnergyHandler */ @Override - public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate) { + public int receiveEnergy(EnumFacing from, int maxReceive, boolean simulate) { return energyManager.receiveEnergy(from, maxReceive, simulate); } @Override - public int extractEnergy(ForgeDirection from, int maxExtract, boolean simulate) { + public int extractEnergy(EnumFacing from, int maxExtract, boolean simulate) { return energyManager.extractEnergy(from, maxExtract, simulate); } @Override - public int getEnergyStored(ForgeDirection from) { + public int getEnergyStored(EnumFacing from) { return energyManager.getEnergyStored(from); } @Override - public int getMaxEnergyStored(ForgeDirection from) { + public int getMaxEnergyStored(EnumFacing from) { return energyManager.getMaxEnergyStored(from); } @Override - public boolean canConnectEnergy(ForgeDirection from) { + public boolean canConnectEnergy(EnumFacing from) { return energyManager.canConnectEnergy(from); } diff --git a/src/main/java/forestry/apiculture/multiblock/TileAlvearyFan.java b/src/main/java/forestry/apiculture/multiblock/TileAlvearyFan.java index c66bbe88f..77e2e03bc 100644 --- a/src/main/java/forestry/apiculture/multiblock/TileAlvearyFan.java +++ b/src/main/java/forestry/apiculture/multiblock/TileAlvearyFan.java @@ -10,8 +10,6 @@ ******************************************************************************/ package forestry.apiculture.multiblock; -import forestry.apiculture.blocks.BlockAlveary; - public class TileAlvearyFan extends TileAlvearyClimatiser { private static final FanDefinition definition = new FanDefinition(); @@ -36,15 +34,5 @@ public class TileAlvearyFan extends TileAlvearyClimatiser { public float getBoundaryDown() { return 0.05f; } - - @Override - public int getIconOff() { - return BlockAlveary.ALVEARY_FAN_OFF; - } - - @Override - public int getIconOn() { - return BlockAlveary.ALVEARY_FAN_ON; - } } } diff --git a/src/main/java/forestry/apiculture/multiblock/TileAlvearyHeater.java b/src/main/java/forestry/apiculture/multiblock/TileAlvearyHeater.java index 18f8fc7ea..b33744cd3 100644 --- a/src/main/java/forestry/apiculture/multiblock/TileAlvearyHeater.java +++ b/src/main/java/forestry/apiculture/multiblock/TileAlvearyHeater.java @@ -10,8 +10,6 @@ ******************************************************************************/ package forestry.apiculture.multiblock; -import forestry.apiculture.blocks.BlockAlveary; - public class TileAlvearyHeater extends TileAlvearyClimatiser { private static final HeaterDefinition definition = new HeaterDefinition(); @@ -36,15 +34,5 @@ public class TileAlvearyHeater extends TileAlvearyClimatiser { public float getBoundaryDown() { return 0.0f; } - - @Override - public int getIconOff() { - return BlockAlveary.ALVEARY_HEATER_OFF; - } - - @Override - public int getIconOn() { - return BlockAlveary.ALVEARY_HEATER_ON; - } } } diff --git a/src/main/java/forestry/apiculture/multiblock/TileAlvearyHygroregulator.java b/src/main/java/forestry/apiculture/multiblock/TileAlvearyHygroregulator.java index 491b6c718..f3cfeead6 100644 --- a/src/main/java/forestry/apiculture/multiblock/TileAlvearyHygroregulator.java +++ b/src/main/java/forestry/apiculture/multiblock/TileAlvearyHygroregulator.java @@ -13,8 +13,7 @@ package forestry.apiculture.multiblock; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.nbt.NBTTagCompound; - -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; @@ -138,12 +137,6 @@ public class TileAlvearyHygroregulator extends TileAlveary implements IInventory } } - /* TEXTURES */ - @Override - public int getIcon(int side) { - return BlockAlveary.ALVEARY_HYGRO; - } - /* ILIQUIDTANKCONTAINER */ @Override public TankManager getTankManager() { @@ -151,32 +144,32 @@ public class TileAlvearyHygroregulator extends TileAlveary implements IInventory } @Override - public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { + public int fill(EnumFacing from, FluidStack resource, boolean doFill) { return tankManager.fill(from, resource, doFill); } @Override - public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) { + public FluidStack drain(EnumFacing from, FluidStack resource, boolean doDrain) { return tankManager.drain(from, resource, doDrain); } @Override - public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) { + public FluidStack drain(EnumFacing from, int maxDrain, boolean doDrain) { return tankManager.drain(from, maxDrain, doDrain); } @Override - public boolean canFill(ForgeDirection from, Fluid fluid) { + public boolean canFill(EnumFacing from, Fluid fluid) { return tankManager.canFill(from, fluid); } @Override - public boolean canDrain(ForgeDirection from, Fluid fluid) { + public boolean canDrain(EnumFacing from, Fluid fluid) { return tankManager.canDrain(from, fluid); } @Override - public FluidTankInfo[] getTankInfo(ForgeDirection from) { + public FluidTankInfo[] getTankInfo(EnumFacing from) { return tankManager.getTankInfo(from); } diff --git a/src/main/java/forestry/apiculture/multiblock/TileAlvearyPlain.java b/src/main/java/forestry/apiculture/multiblock/TileAlvearyPlain.java index 0337c7041..daa308b2e 100644 --- a/src/main/java/forestry/apiculture/multiblock/TileAlvearyPlain.java +++ b/src/main/java/forestry/apiculture/multiblock/TileAlvearyPlain.java @@ -14,12 +14,9 @@ import java.util.ArrayList; import java.util.Collection; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ChunkCoordinates; - -import net.minecraftforge.common.util.ForgeDirection; - -import cpw.mods.fml.common.Optional; - +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; +import net.minecraftforge.fml.common.Optional; import forestry.api.multiblock.IMultiblockController; import forestry.apiculture.blocks.BlockAlveary; import forestry.apiculture.trigger.ApicultureTriggers; @@ -33,14 +30,14 @@ import buildcraft.api.statements.ITriggerProvider; public class TileAlvearyPlain extends TileAlveary implements ITriggerProvider { @Override - public void onMachineAssembled(IMultiblockController multiblockController, ChunkCoordinates minCoord, ChunkCoordinates maxCoord) { + public void onMachineAssembled(IMultiblockController multiblockController, BlockPos minCoord, BlockPos maxCoord) { super.onMachineAssembled(multiblockController, minCoord, maxCoord); if (!worldObj.isRemote) { // set alveary entrance block meta - if (yCoord == maxCoord.posY) { - if ((xCoord > minCoord.posX && xCoord < maxCoord.posX) || (zCoord > minCoord.posZ && zCoord < maxCoord.posZ)) { - this.worldObj.setBlockMetadataWithNotify(xCoord, yCoord, zCoord, BlockAlveary.Type.ENTRANCE.ordinal(), 2); + if (getPos().getY() == maxCoord.getY()) { + if ((getPos().getX() > minCoord.getX() && getPos().getX() < maxCoord.getX()) || (getPos().getZ() > minCoord.getZ() && getPos().getZ() < maxCoord.getZ())) { + this.worldObj.setBlockState(getPos(), getBlockType().getStateFromMeta(BlockAlveary.Type.ENTRANCE.ordinal()), 2); } } } @@ -52,7 +49,7 @@ public class TileAlvearyPlain extends TileAlveary implements ITriggerProvider { if (!worldObj.isRemote) { // set alveary entrance block meta back to normal - this.worldObj.setBlockMetadataWithNotify(xCoord, yCoord, zCoord, BlockAlveary.Type.PLAIN.ordinal(), 2); + this.worldObj.setBlockState(getPos(), getBlockType().getStateFromMeta(BlockAlveary.Type.PLAIN.ordinal()), 2); } } @@ -70,7 +67,7 @@ public class TileAlvearyPlain extends TileAlveary implements ITriggerProvider { @Optional.Method(modid = "BuildCraftAPI|statements") @Override - public Collection getExternalTriggers(ForgeDirection side, TileEntity tile) { + public Collection getExternalTriggers(EnumFacing side, TileEntity tile) { Collection res = new ArrayList<>(); res.add(ApicultureTriggers.missingQueen); res.add(ApicultureTriggers.missingDrone); diff --git a/src/main/java/forestry/apiculture/multiblock/TileAlvearySieve.java b/src/main/java/forestry/apiculture/multiblock/TileAlvearySieve.java index e3ab0240a..5867b8d55 100644 --- a/src/main/java/forestry/apiculture/multiblock/TileAlvearySieve.java +++ b/src/main/java/forestry/apiculture/multiblock/TileAlvearySieve.java @@ -51,14 +51,6 @@ public class TileAlvearySieve extends TileAlveary implements IAlvearyComponent.B public IBeeListener getBeeListener() { return beeListener; } - - @Override - public int getIcon(int side) { - if (side == 0 || side == 1) { - return BlockAlveary.BOTTOM; - } - return BlockAlveary.SIEVE; - } @Override public Object getGui(EntityPlayer player, int data) { diff --git a/src/main/java/forestry/apiculture/multiblock/TileAlvearyStabiliser.java b/src/main/java/forestry/apiculture/multiblock/TileAlvearyStabiliser.java index e95c0907b..76de83aed 100644 --- a/src/main/java/forestry/apiculture/multiblock/TileAlvearyStabiliser.java +++ b/src/main/java/forestry/apiculture/multiblock/TileAlvearyStabiliser.java @@ -14,22 +14,11 @@ import forestry.api.apiculture.DefaultBeeModifier; import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeModifier; import forestry.api.multiblock.IAlvearyComponent; -import forestry.apiculture.blocks.BlockAlveary; public class TileAlvearyStabiliser extends TileAlveary implements IAlvearyComponent.BeeModifier { private static final IBeeModifier beeModifier = new AlvearyStabiliserBeeModifier(); - /* TEXTURES */ - @Override - public int getIcon(int side) { - if (side == 0 || side == 1) { - return BlockAlveary.BOTTOM; - } - - return BlockAlveary.STABILISER; - } - @Override public IBeeModifier getBeeModifier() { return beeModifier; diff --git a/src/main/java/forestry/apiculture/multiblock/TileAlvearySwarmer.java b/src/main/java/forestry/apiculture/multiblock/TileAlvearySwarmer.java index 9aae5f4df..27f7c930a 100644 --- a/src/main/java/forestry/apiculture/multiblock/TileAlvearySwarmer.java +++ b/src/main/java/forestry/apiculture/multiblock/TileAlvearySwarmer.java @@ -135,8 +135,8 @@ public class TileAlvearySwarmer extends TileAlveary implements ISidedInventory, HiveDescriptionSwarmer hiveDescription = new HiveDescriptionSwarmer(toSpawn); Hive hive = new Hive(hiveDescription); - int chunkX = (xCoord + worldObj.rand.nextInt(40 * 2) - 40) / 16; - int chunkZ = (zCoord + worldObj.rand.nextInt(40 * 2) - 40) / 16; + int chunkX = (getPos().getX() + worldObj.rand.nextInt(40 * 2) - 40) / 16; + int chunkZ = (getPos().getZ() + worldObj.rand.nextInt(40 * 2) - 40) / 16; if (HiveDecorator.genHive(worldObj, worldObj.rand, chunkX, chunkZ, hive)) { pendingSpawns.pop(); @@ -157,20 +157,6 @@ public class TileAlvearySwarmer extends TileAlveary implements ISidedInventory, setActive(packetData.getBoolean("Active")); } - /* TEXTURES */ - @Override - public int getIcon(int side) { - if (side == 0 || side == 1) { - return BlockAlveary.BOTTOM; - } - - if (active) { - return BlockAlveary.ALVEARY_SWARMER_ON; - } else { - return BlockAlveary.ALVEARY_SWARMER_OFF; - } - } - /* SAVING & LOADING */ @Override public void readFromNBT(NBTTagCompound nbttagcompound) { diff --git a/src/main/java/forestry/apiculture/network/packets/PacketHabitatBiomePointer.java b/src/main/java/forestry/apiculture/network/packets/PacketHabitatBiomePointer.java index 8393cf2e7..6273a8576 100644 --- a/src/main/java/forestry/apiculture/network/packets/PacketHabitatBiomePointer.java +++ b/src/main/java/forestry/apiculture/network/packets/PacketHabitatBiomePointer.java @@ -13,8 +13,7 @@ package forestry.apiculture.network.packets; import java.io.IOException; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.ChunkCoordinates; - +import net.minecraft.util.BlockPos; import forestry.core.network.DataInputStreamForestry; import forestry.core.network.IForestryPacketClient; import forestry.core.network.PacketIdClient; @@ -26,7 +25,7 @@ public class PacketHabitatBiomePointer extends PacketCoordinates implements IFor public PacketHabitatBiomePointer() { } - public PacketHabitatBiomePointer(ChunkCoordinates coordinates) { + public PacketHabitatBiomePointer(BlockPos coordinates) { super(coordinates); } @@ -37,6 +36,6 @@ public class PacketHabitatBiomePointer extends PacketCoordinates implements IFor @Override public void onPacketData(DataInputStreamForestry data, EntityPlayer player) throws IOException { - Proxies.render.setHabitatLocatorTexture(player, getCoordinates()); + Proxies.render.setHabitatLocatorTexture(player, getPos()); } } diff --git a/src/main/java/forestry/apiculture/proxy/ProxyApiculture.java b/src/main/java/forestry/apiculture/proxy/ProxyApiculture.java index 6b50cdc75..5f130387d 100755 --- a/src/main/java/forestry/apiculture/proxy/ProxyApiculture.java +++ b/src/main/java/forestry/apiculture/proxy/ProxyApiculture.java @@ -10,11 +10,11 @@ ******************************************************************************/ package forestry.apiculture.proxy; -import forestry.core.render.IBlockRenderer; +import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; public class ProxyApiculture { - public IBlockRenderer getRendererAnalyzer(String string) { + public TileEntitySpecialRenderer getRendererAnalyzer(String string) { return null; } diff --git a/src/main/java/forestry/apiculture/proxy/ProxyApicultureClient.java b/src/main/java/forestry/apiculture/proxy/ProxyApicultureClient.java index 15c18c8c7..0f55d8668 100644 --- a/src/main/java/forestry/apiculture/proxy/ProxyApicultureClient.java +++ b/src/main/java/forestry/apiculture/proxy/ProxyApicultureClient.java @@ -10,32 +10,25 @@ ******************************************************************************/ package forestry.apiculture.proxy; -import net.minecraftforge.client.MinecraftForgeClient; - -import cpw.mods.fml.client.registry.RenderingRegistry; - -import forestry.apiculture.entities.EntityBee; -import forestry.apiculture.render.RenderBeeEntity; -import forestry.apiculture.render.RenderBeeItem; -import forestry.core.render.IBlockRenderer; +import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import forestry.core.render.RenderAnalyzer; -import forestry.plugins.PluginApiculture; +import forestry.core.tiles.TileAnalyzer; public class ProxyApicultureClient extends ProxyApiculture { @Override public void initializeRendering() { - if (PluginApiculture.fancyRenderedBees) { + /*if (PluginApiculture.fancyRenderedBees) { RenderingRegistry.registerEntityRenderingHandler(EntityBee.class, new RenderBeeEntity()); MinecraftForgeClient.registerItemRenderer(PluginApiculture.items.beeDroneGE, new RenderBeeItem()); MinecraftForgeClient.registerItemRenderer(PluginApiculture.items.beePrincessGE, new RenderBeeItem()); MinecraftForgeClient.registerItemRenderer(PluginApiculture.items.beeQueenGE, new RenderBeeItem()); - } + }*/ } @Override - public IBlockRenderer getRendererAnalyzer(String gfxBase) { + public TileEntitySpecialRenderer getRendererAnalyzer(String gfxBase) { return new RenderAnalyzer(gfxBase); } diff --git a/src/main/java/forestry/apiculture/render/ModelAnalyzer.java b/src/main/java/forestry/apiculture/render/ModelAnalyzer.java index e56e17146..24529b9ea 100755 --- a/src/main/java/forestry/apiculture/render/ModelAnalyzer.java +++ b/src/main/java/forestry/apiculture/render/ModelAnalyzer.java @@ -12,10 +12,9 @@ package forestry.apiculture.render; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; +import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.common.util.ForgeDirection; - import org.lwjgl.opengl.GL11; import forestry.core.proxy.Proxies; @@ -56,7 +55,7 @@ public class ModelAnalyzer extends ModelBase { } - public void render(ForgeDirection orientation, float posX, float posY, float posZ) { + public void render(EnumFacing orientation, float posX, float posY, float posZ) { GL11.glPushMatrix(); @@ -64,7 +63,7 @@ public class ModelAnalyzer extends ModelBase { float[] angle = {0, 0, 0}; if (orientation == null) { - orientation = ForgeDirection.WEST; + orientation = EnumFacing.WEST; } switch (orientation) { case EAST: diff --git a/src/main/java/forestry/apiculture/render/ModelBee.java b/src/main/java/forestry/apiculture/render/ModelBee.java index 5f8a0800d..44c5a7784 100755 --- a/src/main/java/forestry/apiculture/render/ModelBee.java +++ b/src/main/java/forestry/apiculture/render/ModelBee.java @@ -122,6 +122,7 @@ public class ModelBee extends ModelBase { this.type = type; } + @Override public void render(Entity entity, float f, float f1, float swing, float f3, float f4, float f5) { super.render(entity, f, f1, swing, f3, f4, f5); //setRotationAngles(f, f1, f2, f3, f4, f5, entity); @@ -160,6 +161,7 @@ public class ModelBee extends ModelBase { model.rotateAngleZ = z; } + @Override public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5, Entity entity) { super.setRotationAngles(f, f1, f2, f3, f4, f5, entity); } diff --git a/src/main/java/forestry/apiculture/render/ParticleRenderer.java b/src/main/java/forestry/apiculture/render/ParticleRenderer.java index 3a5ff6b0f..3842eb5bc 100755 --- a/src/main/java/forestry/apiculture/render/ParticleRenderer.java +++ b/src/main/java/forestry/apiculture/render/ParticleRenderer.java @@ -18,19 +18,20 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.particle.EntityFX; import net.minecraft.client.renderer.ActiveRenderInfo; import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.WorldRenderer; import net.minecraft.client.renderer.texture.TextureMap; +import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.entity.EntityLivingBase; import net.minecraftforge.client.event.RenderWorldLastEvent; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.world.WorldEvent; - -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.gameevent.TickEvent; -import cpw.mods.fml.common.gameevent.TickEvent.Phase; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.common.FMLCommonHandler; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.gameevent.TickEvent; +import net.minecraftforge.fml.common.gameevent.TickEvent.Phase; +import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; import org.lwjgl.opengl.GL11; @@ -117,19 +118,19 @@ public class ParticleRenderer { private synchronized void render(float partialTicks) { Minecraft.getMinecraft().mcProfiler.startSection(name + "-render"); - float rotationX = ActiveRenderInfo.rotationX; - float rotationZ = ActiveRenderInfo.rotationZ; - float rotationYZ = ActiveRenderInfo.rotationYZ; - float rotationXY = ActiveRenderInfo.rotationXY; - float rotationXZ = ActiveRenderInfo.rotationXZ; + float rotationX = ActiveRenderInfo.getRotationX(); + float rotationZ = ActiveRenderInfo.getRotationZ(); + float rotationYZ = ActiveRenderInfo.getRotationYZ(); + float rotationXY = ActiveRenderInfo.getRotationXY(); + float rotationXZ = ActiveRenderInfo.getRotationXZ(); - EntityLivingBase player = Minecraft.getMinecraft().renderViewEntity; + EntityLivingBase player = (EntityLivingBase) Minecraft.getMinecraft().getRenderViewEntity(); EntityFX.interpPosX = player.lastTickPosX + (player.posX - player.lastTickPosX) * partialTicks; EntityFX.interpPosY = player.lastTickPosY + (player.posY - player.lastTickPosY) * partialTicks; EntityFX.interpPosZ = player.lastTickPosZ + (player.posZ - player.lastTickPosZ) * partialTicks; // bind the texture - Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationItemsTexture); + Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); // save the old gl state GL11.glPushAttrib(GL11.GL_COLOR_BUFFER_BIT | GL11.GL_DEPTH_BUFFER_BIT); @@ -141,13 +142,12 @@ public class ParticleRenderer { GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE); GL11.glAlphaFunc(GL11.GL_GREATER, 0.003921569F); - Tessellator tessellator = Tessellator.instance; - tessellator.startDrawingQuads(); + Tessellator tessellator = Tessellator.getInstance(); + WorldRenderer worldRenderer = tessellator.getWorldRenderer(); + worldRenderer.begin(7, DefaultVertexFormats.PARTICLE_POSITION_TEX_COLOR_LMAP); for (EntityFX particle : particles) { - tessellator.setBrightness(particle.getBrightnessForRender(partialTicks)); - - particle.renderParticle(tessellator, partialTicks, rotationX, rotationXZ, rotationZ, rotationYZ, rotationXY); + particle.renderParticle(worldRenderer, particle, partialTicks, rotationX, rotationXZ, rotationZ, rotationYZ, rotationXY); } tessellator.draw(); diff --git a/src/main/java/forestry/apiculture/render/RenderBeeEntity.java b/src/main/java/forestry/apiculture/render/RenderBeeEntity.java index 79b23e4b7..2c773fa77 100644 --- a/src/main/java/forestry/apiculture/render/RenderBeeEntity.java +++ b/src/main/java/forestry/apiculture/render/RenderBeeEntity.java @@ -12,16 +12,18 @@ package forestry.apiculture.render; import net.minecraft.client.renderer.entity.RenderLiving; import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLiving; import net.minecraft.util.ResourceLocation; import forestry.apiculture.entities.EntityBee; +import forestry.core.proxy.Proxies; public class RenderBeeEntity extends RenderLiving { private final ModelBee beeModel; public RenderBeeEntity() { - super(new ModelBee(), 0.15f); + super(Proxies.common.getClientInstance().getRenderManager(), new ModelBee(), 0.15f); beeModel = (ModelBee) mainModel; } @@ -29,10 +31,10 @@ public class RenderBeeEntity extends RenderLiving { beeModel.setType(entity.getType()); this.doRender(entity, posX, posY, posZ, par8, par9); } - + @Override - public void doRender(Entity entity, double posX, double posY, double posZ, float par8, float par9) { - renderBee((EntityBee) entity, posX, posY, posZ, par8, par9); + public void doRender(EntityLiving entity, double x, double y, double z, float entityYaw, float partialTicks) { + renderBee((EntityBee) entity, x, y, z, entityYaw, partialTicks); } @Override diff --git a/src/main/java/forestry/apiculture/render/RenderBeeItem.java b/src/main/java/forestry/apiculture/render/RenderBeeItem.java index 235e09bfb..c1d4f6d54 100644 --- a/src/main/java/forestry/apiculture/render/RenderBeeItem.java +++ b/src/main/java/forestry/apiculture/render/RenderBeeItem.java @@ -10,24 +10,9 @@ ******************************************************************************/ package forestry.apiculture.render; -import net.minecraft.client.renderer.OpenGlHelper; -import net.minecraft.client.renderer.RenderHelper; -import net.minecraft.client.renderer.entity.RenderManager; -import net.minecraft.item.ItemStack; +public class RenderBeeItem/* implements IItemRenderer*/ { -import net.minecraftforge.client.IItemRenderer; - -import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; - -import forestry.api.apiculture.BeeManager; -import forestry.api.apiculture.IBee; -import forestry.apiculture.entities.EntityBee; -import forestry.core.proxy.Proxies; - -public class RenderBeeItem implements IItemRenderer { - - private EntityBee entity; + /*private EntityBee entity; private static float getWingYaw(IBee bee) { float wingYaw = 1f; @@ -75,7 +60,7 @@ public class RenderBeeItem implements IItemRenderer { entity = new EntityBee(Proxies.common.getClientInstance().theWorld); } entity.setSpecies(bee.getGenome().getPrimary()); - entity.setType(BeeManager.beeRoot.getType(item)); + entity.setType(BeeManager.beeRoot.getType(item));*/ /* if(scaled) entity.setScale(butterfly.getSize()); @@ -83,8 +68,8 @@ public class RenderBeeItem implements IItemRenderer { entity.setScale(EntityButterfly.DEFAULT_BUTTERFLY_SIZE); */ - return bee; - } + /* return bee; + }*/ /*private void renderBeeHalo() { @@ -102,7 +87,7 @@ public class RenderBeeItem implements IItemRenderer { tessellator.draw(); }*/ - private void renderBeeItem(IBee bee, float translateX, float translateY, float translateZ) { + /*private void renderBeeItem(IBee bee, float translateX, float translateY, float translateZ) { float yaw = 1; float pitch = 1; @@ -136,7 +121,7 @@ public class RenderBeeItem implements IItemRenderer { } - private void renderBeeInInventory(IBee bee) { + private void renderBeeInInventory(IBee bee) {*/ /* GL11.glPushMatrix(); @@ -148,9 +133,9 @@ public class RenderBeeItem implements IItemRenderer { //GL11.glRotatef(-((float) Math.atan((double) (1 / 40.0F))) * 20.0F, 1.0F, 0.0F, 0.0F); renderBeeHalo(); GL11.glPopMatrix(); - */ + */ - GL11.glPushAttrib(GL11.GL_ENABLE_BIT); + /*GL11.glPushAttrib(GL11.GL_ENABLE_BIT); GL11.glEnable(GL11.GL_DEPTH_TEST); GL11.glEnable(GL11.GL_COLOR_MATERIAL); RenderHelper.enableStandardItemLighting(); @@ -219,6 +204,6 @@ public class RenderBeeItem implements IItemRenderer { break; default: } - } + }*/ } diff --git a/src/main/java/forestry/apiculture/render/RenderCandleBlock.java b/src/main/java/forestry/apiculture/render/RenderCandleBlock.java deleted file mode 100644 index ca43fd63c..000000000 --- a/src/main/java/forestry/apiculture/render/RenderCandleBlock.java +++ /dev/null @@ -1,146 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v3 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: - * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges - ******************************************************************************/ -package forestry.apiculture.render; - -import net.minecraft.block.Block; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; -import net.minecraft.world.IBlockAccess; - -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; - -import forestry.apiculture.blocks.BlockCandle; -import forestry.apiculture.tiles.TileCandle; -import forestry.core.proxy.Proxies; - -public class RenderCandleBlock implements ISimpleBlockRenderingHandler { - - @Override - public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) { - - } - - @Override - public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { - if (block.getRenderType() == Proxies.render.getCandleRenderId()) { - renderBlockCandle(world, x, y, z, (BlockCandle) block); - } - return true; - } - - @Override - public boolean shouldRender3DInInventory(int modelId) { - return false; - } - - @Override - public int getRenderId() { - return Proxies.render.getCandleRenderId(); - } - - private static boolean renderBlockCandle(IBlockAccess world, int x, int y, int z, BlockCandle block) { - int meta = world.getBlockMetadata(x, y, z); - TileEntity tileEntity = world.getTileEntity(x, y, z); - if (!(tileEntity instanceof TileCandle)) { - return false; - } - TileCandle tileCandle = (TileCandle) tileEntity; - - boolean isLit = tileCandle.isLit(); - - IIcon iconA = block.getTextureFromPassAndLit(0, isLit); - IIcon iconB = block.getTextureFromPassAndLit(1, isLit); - - int colour = tileCandle.getColour(); - Tessellator tessellator = Tessellator.instance; - tessellator.setBrightness(world.getLightBrightnessForSkyBlocks(x, y, z, block.getLightValue(world, x, y, z))); - tessellator.setColorOpaque_F(1.0F, 1.0F, 1.0F); - double d0 = 0.4000000059604645D; - double d1 = 0.5D - d0; - double d2 = 0.20000000298023224D; - - if (meta == 1) { - renderCandleAtAngle(iconA, x - d1, y + d2, z, -d0, 0.0D, 0xffffff); - renderCandleAtAngle(iconB, x - d1, y + d2, z, -d0, 0.0D, colour); - } else if (meta == 2) { - renderCandleAtAngle(iconA, x + d1, y + d2, z, d0, 0.0D, 0xffffff); - renderCandleAtAngle(iconB, x + d1, y + d2, z, d0, 0.0D, colour); - } else if (meta == 3) { - renderCandleAtAngle(iconA, x, y + d2, z - d1, 0.0D, -d0, 0xffffff); - renderCandleAtAngle(iconB, x, y + d2, z - d1, 0.0D, -d0, colour); - } else if (meta == 4) { - renderCandleAtAngle(iconA, x, y + d2, z + d1, 0.0D, d0, 0xffffff); - renderCandleAtAngle(iconB, x, y + d2, z + d1, 0.0D, d0, colour); - } else { - renderCandleAtAngle(iconA, x, y, z, 0.0D, 0.0D, 0xffffff); - renderCandleAtAngle(iconB, x, y, z, 0.0D, 0.0D, colour); - } - - return true; - } - - private static void renderCandleAtAngle(IIcon icon, double x, double y, double z, double par8, double par10, int colour) { - Tessellator tessellator = Tessellator.instance; - double minU = icon.getMinU(); - double minV = icon.getMinV(); - double maxU = icon.getMaxU(); - double maxV = icon.getMaxV(); - double textureLightTopU = icon.getInterpolatedU(7.0D); - double d10 = icon.getInterpolatedV(6.0D); - double textureLightBottomU = icon.getInterpolatedU(9.0D); - double d12 = icon.getInterpolatedV(8.0D); - //double d13 = (double)icon.getInterpolatedV(7.0D); - double d14 = icon.getInterpolatedV(13.0D); - //double textureLightBottomV = (double)icon.getInterpolatedV(8.0D); - double d16 = icon.getInterpolatedV(15.0D); - x += 0.5D; - z += 0.5D; - double d17 = x - 0.5D; - double d18 = x + 0.5D; - double d19 = z - 0.5D; - double d20 = z + 0.5D; - double d21 = 0.0625D; - double d22 = 0.625D; - tessellator.setColorOpaque_I(colour); - // top quad - tessellator.addVertexWithUV(x + par8 * (1.0D - d22) - d21, y + d22, z + par10 * (1.0D - d22) - d21, textureLightTopU, d10); - tessellator.addVertexWithUV(x + par8 * (1.0D - d22) - d21, y + d22, z + par10 * (1.0D - d22) + d21, textureLightTopU, d12); - tessellator.addVertexWithUV(x + par8 * (1.0D - d22) + d21, y + d22, z + par10 * (1.0D - d22) + d21, textureLightBottomU, d12); - tessellator.addVertexWithUV(x + par8 * (1.0D - d22) + d21, y + d22, z + par10 * (1.0D - d22) - d21, textureLightBottomU, d10); - // -x quad - tessellator.addVertexWithUV(x - d21, y + 1d, d19, minU, minV); - tessellator.addVertexWithUV(x - d21 + par8, y, d19 + par10, minU, maxV); - tessellator.addVertexWithUV(x - d21 + par8, y, d20 + par10, maxU, maxV); - tessellator.addVertexWithUV(x - d21, y + 1d, d20, maxU, minV); - // +x quad - tessellator.addVertexWithUV(x + d21, y + 1.0D, d20, minU, minV); - tessellator.addVertexWithUV(x + par8 + d21, y, d20 + par10, minU, maxV); - tessellator.addVertexWithUV(x + par8 + d21, y, d19 + par10, maxU, maxV); - tessellator.addVertexWithUV(x + d21, y + 1.0D, d19, maxU, minV); - // -z quad - tessellator.addVertexWithUV(d18, y + 1.0D, z - d21, minU, minV); - tessellator.addVertexWithUV(d18 + par8, y, z - d21 + par10, minU, maxV); - tessellator.addVertexWithUV(d17 + par8, y, z - d21 + par10, maxU, maxV); - tessellator.addVertexWithUV(d17, y + 1.0D, z - d21, maxU, minV); - // +z quad - tessellator.addVertexWithUV(d17, y + 1.0D, z + d21, minU, minV); - tessellator.addVertexWithUV(d17 + par8, y, z + d21 + par10, minU, maxV); - tessellator.addVertexWithUV(d18 + par8, y, z + d21 + par10, maxU, maxV); - tessellator.addVertexWithUV(d18, y + 1.0D, z + d21, maxU, minV); - // bottom quad - tessellator.addVertexWithUV(x + d21 + par8, y, z - d21 + par10, textureLightBottomU, d14); - tessellator.addVertexWithUV(x + d21 + par8, y, z + d21 + par10, textureLightBottomU, d16); - tessellator.addVertexWithUV(x - d21 + par8, y, z + d21 + par10, textureLightTopU, d16); - tessellator.addVertexWithUV(x - d21 + par8, y, z - d21 + par10, textureLightTopU, d14); - } -} diff --git a/src/main/java/forestry/apiculture/render/TextureHabitatLocator.java b/src/main/java/forestry/apiculture/render/TextureHabitatLocator.java index f12fdc79a..c831e09fa 100644 --- a/src/main/java/forestry/apiculture/render/TextureHabitatLocator.java +++ b/src/main/java/forestry/apiculture/render/TextureHabitatLocator.java @@ -13,7 +13,7 @@ package forestry.apiculture.render; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureUtil; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; public class TextureHabitatLocator extends TextureAtlasSprite { @@ -24,7 +24,7 @@ public class TextureHabitatLocator extends TextureAtlasSprite { return instance; } - private ChunkCoordinates targetBiome; + private BlockPos targetBiome; private boolean targetBiomeFound; private double currentAngle; @@ -35,7 +35,7 @@ public class TextureHabitatLocator extends TextureAtlasSprite { instance = this; } - public void setTargetCoordinates(ChunkCoordinates coordinates) { + public void setTargetCoordinates(BlockPos coordinates) { this.targetBiome = coordinates; this.targetBiomeFound = false; } @@ -59,8 +59,8 @@ public class TextureHabitatLocator extends TextureAtlasSprite { // No target has the locator spinning wildly. targetAngle = Math.random() * Math.PI * 2.0d; } else { - double xPart = targetBiome.posX - playerX; - double zPart = targetBiome.posZ - playerZ; + double xPart = targetBiome.getX() - playerX; + double zPart = targetBiome.getZ() - playerZ; if (Math.abs(xPart) + Math.abs(zPart) < 10 || targetBiomeFound) { // spin steadily when the biome is found @@ -100,7 +100,7 @@ public class TextureHabitatLocator extends TextureAtlasSprite { if (i != this.frameCounter) { this.frameCounter = i; - TextureUtil.uploadTextureMipmap((int[][]) this.framesTextureData.get(this.frameCounter), this.width, this.height, this.originX, this.originY, false, false); + TextureUtil.uploadTextureMipmap(this.framesTextureData.get(this.frameCounter), this.width, this.height, this.originX, this.originY, false, false); } } diff --git a/src/main/java/forestry/apiculture/tiles/TileApiaristChest.java b/src/main/java/forestry/apiculture/tiles/TileApiaristChest.java index 14c4fec50..17c060f0e 100644 --- a/src/main/java/forestry/apiculture/tiles/TileApiaristChest.java +++ b/src/main/java/forestry/apiculture/tiles/TileApiaristChest.java @@ -19,6 +19,7 @@ import forestry.core.config.Constants; import forestry.core.inventory.InventoryPlain; import forestry.core.tiles.TileNaturalistChest; import forestry.core.tiles.TileUtil; +import forestry.core.utils.BlockUtil; import forestry.plugins.PluginApiculture; public class TileApiaristChest extends TileNaturalistChest { @@ -32,7 +33,7 @@ public class TileApiaristChest extends TileNaturalistChest { @Override protected void updateServerSide() { if (worldObj != null && !checkedForLegacyBlock) { - Block block = worldObj.getBlock(xCoord, yCoord, zCoord); + Block block = BlockUtil.getBlock(worldObj, getPos()); if (PluginApiculture.blocks.apiculture == block) { migrateFromLegacyBlock(); } @@ -50,10 +51,10 @@ public class TileApiaristChest extends TileNaturalistChest { setInventorySlotContents(i, null); } - worldObj.setBlockToAir(xCoord, yCoord, zCoord); - worldObj.setBlock(xCoord, yCoord, zCoord, PluginApiculture.blocks.apicultureChest, 0, Constants.FLAG_BLOCK_SYNCH_AND_UPDATE); + worldObj.setBlockToAir(getPos()); + worldObj.setBlockState(getPos(), PluginApiculture.blocks.apicultureChest.getStateFromMeta(0), Constants.FLAG_BLOCK_SYNCH_AND_UPDATE); - TileApiaristChest tile = TileUtil.getTile(worldObj, xCoord, yCoord, zCoord, TileApiaristChest.class); + TileApiaristChest tile = TileUtil.getTile(worldObj, getPos(), TileApiaristChest.class); for (int i = 0; i < getSizeInventory(); i++) { ItemStack stack = inventoryCopy.getStackInSlot(i); tile.setInventorySlotContents(i, stack); diff --git a/src/main/java/forestry/apiculture/tiles/TileApiary.java b/src/main/java/forestry/apiculture/tiles/TileApiary.java index 2b00bfe61..a96c2792f 100644 --- a/src/main/java/forestry/apiculture/tiles/TileApiary.java +++ b/src/main/java/forestry/apiculture/tiles/TileApiary.java @@ -18,11 +18,8 @@ import java.util.List; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; - -import net.minecraftforge.common.util.ForgeDirection; - -import cpw.mods.fml.common.Optional; - +import net.minecraft.util.EnumFacing; +import net.minecraftforge.fml.common.Optional; import forestry.api.apiculture.IBeeHousingInventory; import forestry.api.apiculture.IBeeListener; import forestry.api.apiculture.IBeeModifier; @@ -79,7 +76,7 @@ public class TileApiary extends TileBeeHousingBase implements IApiary { /* ITRIGGERPROVIDER */ @Optional.Method(modid = "BuildCraftAPI|statements") @Override - public Collection getExternalTriggers(ForgeDirection side, TileEntity tile) { + public Collection getExternalTriggers(EnumFacing side, TileEntity tile) { LinkedList res = new LinkedList<>(); res.add(ApicultureTriggers.missingQueen); res.add(ApicultureTriggers.missingDrone); diff --git a/src/main/java/forestry/apiculture/tiles/TileBeeHousingBase.java b/src/main/java/forestry/apiculture/tiles/TileBeeHousingBase.java index ade271d7d..ac90849cb 100644 --- a/src/main/java/forestry/apiculture/tiles/TileBeeHousingBase.java +++ b/src/main/java/forestry/apiculture/tiles/TileBeeHousingBase.java @@ -72,7 +72,7 @@ public abstract class TileBeeHousingBase extends TileBase implements IBeeHousing /* ICLIMATISED */ @Override public EnumTemperature getTemperature() { - return EnumTemperature.getFromBiome(getBiome(), xCoord, yCoord, zCoord); + return EnumTemperature.getFromBiome(getBiome(), getPos()); } @Override @@ -82,7 +82,7 @@ public abstract class TileBeeHousingBase extends TileBase implements IBeeHousing @Override public float getExactTemperature() { - return getBiome().getFloatTemperature(xCoord, yCoord, zCoord); + return getBiome().getFloatTemperature(getPos()); } @Override @@ -97,7 +97,7 @@ public abstract class TileBeeHousingBase extends TileBase implements IBeeHousing beeLogic.doBeeFX(); if (updateOnInterval(50)) { - doPollenFX(worldObj, xCoord, yCoord, zCoord); + doPollenFX(worldObj, getPos().getX(), getPos().getY(), getPos().getZ()); } } } @@ -143,19 +143,19 @@ public abstract class TileBeeHousingBase extends TileBase implements IBeeHousing @Override public BiomeGenBase getBiome() { if (cachedBiome == null) { - cachedBiome = worldObj.getBiomeGenForCoordsBody(xCoord, zCoord); + cachedBiome = worldObj.getBiomeGenForCoordsBody(getPos()); } return cachedBiome; } @Override public int getBlockLightValue() { - return worldObj.getBlockLightValue(xCoord, yCoord + 1, zCoord); + return worldObj.getLightFromNeighbors(getPos().add(0, 1, 0)); } @Override public boolean canBlockSeeTheSky() { - return worldObj.canBlockSeeTheSky(xCoord, yCoord + 1, zCoord); + return worldObj.canBlockSeeSky(getPos().add(0, 1, 0)); } @Override @@ -170,7 +170,7 @@ public abstract class TileBeeHousingBase extends TileBase implements IBeeHousing @Override public Vec3 getBeeFXCoordinates() { - return Vec3.createVectorHelper(xCoord + 0.5, yCoord + 0.5, zCoord + 0.5); + return new Vec3(getPos().getX() + 0.5, getPos().getY() + 0.5, getPos().getZ() + 0.5); } } diff --git a/src/main/java/forestry/apiculture/tiles/TileCandle.java b/src/main/java/forestry/apiculture/tiles/TileCandle.java index fe11313df..9ed8a603a 100644 --- a/src/main/java/forestry/apiculture/tiles/TileCandle.java +++ b/src/main/java/forestry/apiculture/tiles/TileCandle.java @@ -20,12 +20,6 @@ public class TileCandle extends TileEntity { private int colour; private boolean lit; - // This is a non-ticking Tile Entity. - @Override - public boolean canUpdate() { - return false; - } - @Override public Packet getDescriptionPacket() { PacketCandleUpdate updateCandle = new PacketCandleUpdate(this); diff --git a/src/main/java/forestry/apiculture/tiles/TileSwarm.java b/src/main/java/forestry/apiculture/tiles/TileSwarm.java index 026bae37a..a5c35e42d 100644 --- a/src/main/java/forestry/apiculture/tiles/TileSwarm.java +++ b/src/main/java/forestry/apiculture/tiles/TileSwarm.java @@ -13,31 +13,25 @@ package forestry.apiculture.tiles; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.ITickable; import net.minecraft.world.EnumSkyBlock; import forestry.core.inventory.InventoryAdapter; import forestry.core.utils.InventoryUtil; -public class TileSwarm extends TileEntity { +public class TileSwarm extends TileEntity implements ITickable { public final InventoryAdapter contained = new InventoryAdapter(2, "Contained"); - @Override - public boolean canUpdate() { - return true; - } - // Hack to make sure that hives glow. // TODO: remove when Mojang fixes this bug: https://bugs.mojang.com/browse/MC-3329 // Hives should not need to tick normally. private boolean updatedLight; @Override - public void updateEntity() { - super.updateEntity(); - + public void update() { if (worldObj.isRemote && !updatedLight && worldObj.getWorldTime() % 20 == 0) { - updatedLight = worldObj.updateLightByType(EnumSkyBlock.Block, xCoord, yCoord, zCoord); + updatedLight = worldObj.checkLightFor(EnumSkyBlock.BLOCK, getPos()); } } diff --git a/src/main/java/forestry/apiculture/trigger/TriggerMissingDrone.java b/src/main/java/forestry/apiculture/trigger/TriggerMissingDrone.java index b3f93c850..cd5055622 100644 --- a/src/main/java/forestry/apiculture/trigger/TriggerMissingDrone.java +++ b/src/main/java/forestry/apiculture/trigger/TriggerMissingDrone.java @@ -11,9 +11,7 @@ package forestry.apiculture.trigger; import net.minecraft.tileentity.TileEntity; - -import net.minecraftforge.common.util.ForgeDirection; - +import net.minecraft.util.EnumFacing; import forestry.api.core.IErrorLogicSource; import forestry.core.errors.EnumErrorCode; import forestry.core.triggers.Trigger; @@ -31,7 +29,7 @@ public class TriggerMissingDrone extends Trigger { * Return true if the tile given in parameter activates the trigger, given the parameters. */ @Override - public boolean isTriggerActive(TileEntity tile, ForgeDirection side, IStatementContainer source, IStatementParameter[] parameters) { + public boolean isTriggerActive(TileEntity tile, EnumFacing side, IStatementContainer source, IStatementParameter[] parameters) { if (!(tile instanceof IErrorLogicSource)) { return false; diff --git a/src/main/java/forestry/apiculture/trigger/TriggerMissingQueen.java b/src/main/java/forestry/apiculture/trigger/TriggerMissingQueen.java index 598faf93d..a7d8b1822 100644 --- a/src/main/java/forestry/apiculture/trigger/TriggerMissingQueen.java +++ b/src/main/java/forestry/apiculture/trigger/TriggerMissingQueen.java @@ -11,9 +11,7 @@ package forestry.apiculture.trigger; import net.minecraft.tileentity.TileEntity; - -import net.minecraftforge.common.util.ForgeDirection; - +import net.minecraft.util.EnumFacing; import forestry.api.core.IErrorLogicSource; import forestry.core.errors.EnumErrorCode; import forestry.core.triggers.Trigger; @@ -31,7 +29,7 @@ public class TriggerMissingQueen extends Trigger { * Return true if the tile given in parameter activates the trigger, given the parameters. */ @Override - public boolean isTriggerActive(TileEntity tile, ForgeDirection side, IStatementContainer source, IStatementParameter[] parameters) { + public boolean isTriggerActive(TileEntity tile, EnumFacing side, IStatementContainer source, IStatementParameter[] parameters) { if (!(tile instanceof IErrorLogicSource)) { return false; diff --git a/src/main/java/forestry/apiculture/trigger/TriggerNoFrames.java b/src/main/java/forestry/apiculture/trigger/TriggerNoFrames.java index 070ec4bcf..a026a8066 100755 --- a/src/main/java/forestry/apiculture/trigger/TriggerNoFrames.java +++ b/src/main/java/forestry/apiculture/trigger/TriggerNoFrames.java @@ -11,9 +11,7 @@ package forestry.apiculture.trigger; import net.minecraft.tileentity.TileEntity; - -import net.minecraftforge.common.util.ForgeDirection; - +import net.minecraft.util.EnumFacing; import forestry.apiculture.inventory.InventoryApiary; import forestry.apiculture.tiles.TileApiary; import forestry.core.triggers.Trigger; @@ -31,7 +29,7 @@ public class TriggerNoFrames extends Trigger { * Return true if the tile given in parameter activates the trigger, given the parameters. */ @Override - public boolean isTriggerActive(TileEntity tile, ForgeDirection side, IStatementContainer source, IStatementParameter[] parameters) { + public boolean isTriggerActive(TileEntity tile, EnumFacing side, IStatementContainer source, IStatementParameter[] parameters) { if (!(tile instanceof TileApiary)) { return false; diff --git a/src/main/java/forestry/apiculture/worldgen/ComponentVillageBeeHouse.java b/src/main/java/forestry/apiculture/worldgen/ComponentVillageBeeHouse.java index 8b8ed2f86..c39268df5 100755 --- a/src/main/java/forestry/apiculture/worldgen/ComponentVillageBeeHouse.java +++ b/src/main/java/forestry/apiculture/worldgen/ComponentVillageBeeHouse.java @@ -15,8 +15,11 @@ import java.util.List; import java.util.Random; import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.gen.structure.StructureBoundingBox; @@ -24,8 +27,6 @@ import net.minecraft.world.gen.structure.StructureComponent; import net.minecraft.world.gen.structure.StructureVillagePieces; import net.minecraftforge.common.ChestGenHooks; -import net.minecraftforge.common.util.ForgeDirection; - import forestry.api.apiculture.BeeManager; import forestry.api.apiculture.EnumBeeType; import forestry.api.apiculture.FlowerManager; @@ -70,7 +71,7 @@ public class ComponentVillageBeeHouse extends StructureVillagePieces.House1 { createBuildingBlocks(random); } - public ComponentVillageBeeHouse(StructureVillagePieces.Start startPiece, int componentType, Random random, StructureBoundingBox boundingBox, int coordBaseMode) { + public ComponentVillageBeeHouse(StructureVillagePieces.Start startPiece, int componentType, Random random, StructureBoundingBox boundingBox, EnumFacing coordBaseMode) { super(startPiece, componentType, random, boundingBox, coordBaseMode); isInDesert = startPiece.inDesert; @@ -97,12 +98,12 @@ public class ComponentVillageBeeHouse extends StructureVillagePieces.House1 { logs = new BlockType(Blocks.log, random.nextInt(4)); planks = new BlockType(Blocks.planks, roofMeta); stairs = new BlockTypeVanillaStairs(roofMeta); - fence = new BlockType(Blocks.fence, 0); + fence = new BlockType(Blocks.oak_fence, 0); } } @SuppressWarnings("rawtypes") - public static ComponentVillageBeeHouse buildComponent(StructureVillagePieces.Start startPiece, List par1List, Random random, int par3, int par4, int par5, int par6, int par7) { + public static ComponentVillageBeeHouse buildComponent(StructureVillagePieces.Start startPiece, List par1List, Random random, int par3, int par4, int par5, EnumFacing par6, int par7) { StructureBoundingBox bbox = StructureBoundingBox.getComponentToAddBoundingBox(par3, par4, par5, 0, 0, 0, 10, 9, 11, par6); if (!canVillageGoDeeper(bbox) || StructureComponent.findIntersecting(par1List, bbox) != null) { return null; @@ -123,8 +124,8 @@ public class ComponentVillageBeeHouse extends StructureVillagePieces.House1 { boundingBox.offset(0, averageGroundLevel - boundingBox.maxY + 8 - 1, 0); } - fillWithBlocks(world, structBoundingBox, 1, 1, 1, 7, 4, 4, Blocks.air, Blocks.air, false); - fillWithBlocks(world, structBoundingBox, 2, 1, 6, 8, 4, 10, Blocks.air, Blocks.air, false); + fillWithBlocks(world, structBoundingBox, 1, 1, 1, 7, 4, 4, Blocks.air.getDefaultState(), Blocks.air.getDefaultState(), false); + fillWithBlocks(world, structBoundingBox, 2, 1, 6, 8, 4, 10, Blocks.air.getDefaultState(), Blocks.air.getDefaultState(), false); // Garden buildGarden(world, structBoundingBox); @@ -141,12 +142,12 @@ public class ComponentVillageBeeHouse extends StructureVillagePieces.House1 { buildApiaries(world, structBoundingBox); // Floor - fillWithBlocks(world, structBoundingBox, 1, 0, 1, 7, 0, 4, Blocks.planks, Blocks.planks, false); + fillWithBlocks(world, structBoundingBox, 1, 0, 1, 7, 0, 4, Blocks.planks.getDefaultState(), Blocks.planks.getDefaultState(), false); - fillWithBlocks(world, structBoundingBox, 0, 0, 0, 0, 3, 5, Blocks.cobblestone, Blocks.cobblestone, false); - fillWithBlocks(world, structBoundingBox, 8, 0, 0, 8, 3, 5, Blocks.cobblestone, Blocks.cobblestone, false); - fillWithBlocks(world, structBoundingBox, 1, 0, 0, 7, 1, 0, Blocks.cobblestone, Blocks.cobblestone, false); - fillWithBlocks(world, structBoundingBox, 1, 0, 5, 7, 1, 5, Blocks.cobblestone, Blocks.cobblestone, false); + fillWithBlocks(world, structBoundingBox, 0, 0, 0, 0, 3, 5, Blocks.cobblestone.getDefaultState(), Blocks.cobblestone.getDefaultState(), false); + fillWithBlocks(world, structBoundingBox, 8, 0, 0, 8, 3, 5, Blocks.cobblestone.getDefaultState(), Blocks.cobblestone.getDefaultState(), false); + fillWithBlocks(world, structBoundingBox, 1, 0, 0, 7, 1, 0, Blocks.cobblestone.getDefaultState(), Blocks.cobblestone.getDefaultState(), false); + fillWithBlocks(world, structBoundingBox, 1, 0, 5, 7, 1, 5, Blocks.cobblestone.getDefaultState(), Blocks.cobblestone.getDefaultState(), false); fillBoxWith(world, structBoundingBox, 1, 2, 0, 7, 3, 0, planks, false); fillBoxWith(world, structBoundingBox, 1, 2, 5, 7, 3, 5, planks, false); @@ -165,55 +166,55 @@ public class ComponentVillageBeeHouse extends StructureVillagePieces.House1 { placeBlockAtCurrentPosition(world, logs, 0, 2, 4, structBoundingBox); placeBlockAtCurrentPosition(world, logs, 8, 2, 1, structBoundingBox); placeBlockAtCurrentPosition(world, logs, 8, 2, 4, structBoundingBox); + + setBlockState(world, Blocks.glass_pane.getStateFromMeta(0), 0, 2, 2, structBoundingBox); + setBlockState(world, Blocks.glass_pane.getStateFromMeta(0), 0, 2, 3, structBoundingBox); - placeBlockAtCurrentPosition(world, Blocks.glass_pane, 0, 0, 2, 2, structBoundingBox); - placeBlockAtCurrentPosition(world, Blocks.glass_pane, 0, 0, 2, 3, structBoundingBox); - - placeBlockAtCurrentPosition(world, Blocks.glass_pane, 0, 8, 2, 2, structBoundingBox); - placeBlockAtCurrentPosition(world, Blocks.glass_pane, 0, 8, 2, 3, structBoundingBox); + setBlockState(world, Blocks.glass_pane.getStateFromMeta(0), 8, 2, 2, structBoundingBox); + setBlockState(world, Blocks.glass_pane.getStateFromMeta(0), 8, 2, 3, structBoundingBox); // Windows garden side - placeBlockAtCurrentPosition(world, Blocks.glass_pane, 0, 2, 2, 5, structBoundingBox); - placeBlockAtCurrentPosition(world, Blocks.glass_pane, 0, 3, 2, 5, structBoundingBox); - placeBlockAtCurrentPosition(world, Blocks.glass_pane, 0, 4, 2, 5, structBoundingBox); + setBlockState(world, Blocks.glass_pane.getStateFromMeta(0), 2, 2, 5, structBoundingBox); + setBlockState(world, Blocks.glass_pane.getStateFromMeta(0), 3, 2, 5, structBoundingBox); + setBlockState(world, Blocks.glass_pane.getStateFromMeta(0), 4, 2, 5, structBoundingBox); - placeBlockAtCurrentPosition(world, Blocks.glass_pane, 0, 5, 2, 0, structBoundingBox); - placeBlockAtCurrentPosition(world, Blocks.glass_pane, 0, 6, 2, 5, structBoundingBox); + setBlockState(world, Blocks.glass_pane.getStateFromMeta(0), 5, 2, 0, structBoundingBox); + setBlockState(world, Blocks.glass_pane.getStateFromMeta(0), 6, 2, 5, structBoundingBox); // Escritoire if (random.nextInt(2) == 0) { IBlockType escritoireBlock = new BlockTypeTileForestry(PluginCore.blocks.core, BlockCoreType.ESCRITOIRE.ordinal()); - escritoireBlock.setDirection(getRotatedDirection(ForgeDirection.EAST)); + escritoireBlock.setDirection(getRotatedDirection(EnumFacing.EAST)); placeBlockAtCurrentPosition(world, escritoireBlock, 1, 1, 3, structBoundingBox); } - placeBlockAtCurrentPosition(world, Blocks.air, 0, 2, 1, 0, structBoundingBox); - placeBlockAtCurrentPosition(world, Blocks.air, 0, 2, 2, 0, structBoundingBox); - placeDoorAtCurrentPosition(world, structBoundingBox, random, 2, 1, 0, getMetadataWithOffset(Blocks.wooden_door, 1)); + setBlockState(world, Blocks.air.getStateFromMeta(0), 2, 1, 0, structBoundingBox); + setBlockState(world, Blocks.air.getStateFromMeta(0), 2, 2, 0, structBoundingBox); + placeDoorCurrentPosition(world, structBoundingBox, random, 2, 1, 0, coordBaseMode); - if (isAirBlockAtCurrentPosition(world, 2, 0, -1, structBoundingBox) && !isAirBlockAtCurrentPosition(world, 2, -1, -1, structBoundingBox)) { - placeBlockAtCurrentPosition(world, Blocks.stone_stairs, getMetadataWithOffset(Blocks.stone_stairs, 3), 2, 0, -1, structBoundingBox); + if (isAirBlockAtCurrentPosition(world, new BlockPos(2, 0, -1), structBoundingBox) && !isAirBlockAtCurrentPosition(world, new BlockPos(2, -1, -1), structBoundingBox)) { + setBlockState(world, Blocks.stone_stairs.getStateFromMeta(getMetadataWithOffset(Blocks.stone_stairs, 3)), 2, 0, -1, structBoundingBox); } - placeBlockAtCurrentPosition(world, Blocks.air, 0, 6, 1, 5, structBoundingBox); - placeBlockAtCurrentPosition(world, Blocks.air, 0, 6, 2, 5, structBoundingBox); + setBlockState(world, Blocks.air.getStateFromMeta(0), 6, 1, 5, structBoundingBox); + setBlockState(world, Blocks.air.getStateFromMeta(0), 6, 2, 5, structBoundingBox); // Candles / Lighting - placeBlockAtCurrentPosition(world, Blocks.torch, 0, 2, 3, 4, structBoundingBox); - placeBlockAtCurrentPosition(world, Blocks.torch, 0, 6, 3, 4, structBoundingBox); - placeBlockAtCurrentPosition(world, Blocks.torch, 0, 2, 3, 1, structBoundingBox); - placeBlockAtCurrentPosition(world, Blocks.torch, 0, 6, 3, 1, structBoundingBox); + setBlockState(world, Blocks.torch.getStateFromMeta(0), 2, 3, 4, structBoundingBox); + setBlockState(world, Blocks.torch.getStateFromMeta(0), 6, 3, 4, structBoundingBox); + setBlockState(world, Blocks.torch.getStateFromMeta(0), 2, 3, 1, structBoundingBox); + setBlockState(world, Blocks.torch.getStateFromMeta(0), 6, 3, 1, structBoundingBox); - placeDoorAtCurrentPosition(world, structBoundingBox, random, 6, 1, 5, getMetadataWithOffset(Blocks.wooden_door, 1)); + placeDoorCurrentPosition(world, structBoundingBox, random, 6, 1, 5, coordBaseMode); for (int i = 0; i < 5; ++i) { for (int j = 0; j < 9; ++j) { clearCurrentPositionBlocksUpwards(world, j, 7, i, structBoundingBox); - func_151554_b(world, Blocks.cobblestone, 0, j, -1, i, structBoundingBox); + replaceAirAndLiquidDownwards(world, Blocks.cobblestone.getStateFromMeta(0), j, -1, i, structBoundingBox); } } - generateStructureChestContents(world, structBoundingBox, random, 7, 1, 4, + generateChestContents(world, structBoundingBox, random, 7, 1, 4, ChestGenHooks.getItems(Constants.CHEST_GEN_HOOK_NATURALIST_CHEST, random), random.nextInt(4) + random.nextInt(4) + 5); @@ -225,10 +226,10 @@ public class ComponentVillageBeeHouse extends StructureVillagePieces.House1 { private void buildRoof(World world, StructureBoundingBox structBoundingBox) { for (int i = -1; i <= 2; ++i) { for (int j = 0; j <= 8; ++j) { - stairs.setDirection(getRotatedDirection(ForgeDirection.NORTH)); + stairs.setDirection(getRotatedDirection(EnumFacing.NORTH)); placeBlockAtCurrentPosition(world, stairs, j, 4 + i, i, structBoundingBox); - stairs.setDirection(getRotatedDirection(ForgeDirection.SOUTH)); + stairs.setDirection(getRotatedDirection(EnumFacing.SOUTH)); placeBlockAtCurrentPosition(world, stairs, j, 4 + i, 5 - i, structBoundingBox); } } @@ -243,7 +244,7 @@ public class ComponentVillageBeeHouse extends StructureVillagePieces.House1 { for (int i = 1; i <= 8; i++) { for (int j = 6; j <= 10; j++) { - func_151554_b(world, ground, 0, i, 0, j, box); + replaceAirAndLiquidDownwards(world, ground.getStateFromMeta(0), i, 0, j, box); } } } @@ -251,7 +252,7 @@ public class ComponentVillageBeeHouse extends StructureVillagePieces.House1 { private void plantFlowerGarden(World world, StructureBoundingBox box, int minX, int minY, int minZ, int maxX, int maxY, int maxZ) { if (isInDesert) { - placeBlockAtCurrentPosition(world, Blocks.cactus, 0, 4, 1, 7, box); + setBlockState(world, Blocks.cactus.getStateFromMeta(0), 4, 1, 7, box); return; } @@ -263,12 +264,12 @@ public class ComponentVillageBeeHouse extends StructureVillagePieces.House1 { int yCoord = getYWithOffset(i); int zCoord = getZWithOffset(j, k); - if (!Blocks.red_flower.canBlockStay(world, xCoord, yCoord, zCoord)) { + if (!Blocks.red_flower.canBlockStay(world, new BlockPos(xCoord, yCoord, zCoord), world.getBlockState(new BlockPos(xCoord, yCoord, zCoord)))) { continue; } IFlower flower = FlowerManager.flowerRegistry.getRandomPlantableFlower(FlowerManager.FlowerTypeVanilla, world.rand); - placeBlockAtCurrentPosition(world, flower.getBlock(), flower.getMeta(), j, i, k, box); + setBlockState(world, flower.getBlock().getStateFromMeta(flower.getMeta()), j, i, k, box); } } } @@ -276,36 +277,37 @@ public class ComponentVillageBeeHouse extends StructureVillagePieces.House1 { } private void buildApiaries(World world, StructureBoundingBox box) { - populateApiary(world, box, 3, 1, 8); - populateApiary(world, box, 6, 1, 8); + populateApiary(world, box, new BlockPos(3, 1, 8)); + populateApiary(world, box, new BlockPos(6, 1, 8)); } - private void populateApiary(World world, StructureBoundingBox box, int x, int y, int z) { - int xCoord = getXWithOffset(x, z); - int yCoord = getYWithOffset(y); - int zCoord = getZWithOffset(x, z); + private void populateApiary(World world, StructureBoundingBox box, BlockPos pos) { + int xCoord = getXWithOffset(pos.getX(), pos.getZ()); + int yCoord = getYWithOffset(pos.getY()); + int zCoord = getZWithOffset(pos.getX(), pos.getZ()); + BlockPos posNew = new BlockPos(xCoord, yCoord, zCoord); - if (!box.isVecInside(xCoord, yCoord, zCoord)) { + if (!box.isVecInside(posNew)) { return; } - Block block = world.getBlock(xCoord, yCoord, zCoord); - if (PluginApiculture.blocks.apiculture == block || !world.blockExists(xCoord, yCoord - 1, zCoord)) { + IBlockState blockState = world.getBlockState(posNew); + if (PluginApiculture.blocks.apiculture == blockState.getBlock() || !world.isBlockLoaded(posNew.add(0, -1, 0))) { return; } - world.setBlock(xCoord, yCoord, zCoord, PluginApiculture.blocks.apiculture, BlockApicultureType.APIARY.ordinal(), Constants.FLAG_BLOCK_SYNCH); - PluginApiculture.blocks.apiculture.onBlockAdded(world, xCoord, yCoord, zCoord); + world.setBlockState(posNew, PluginApiculture.blocks.apiculture.getStateFromMeta(BlockApicultureType.APIARY.ordinal()), Constants.FLAG_BLOCK_SYNCH); + PluginApiculture.blocks.apiculture.onBlockAdded(world, posNew, PluginApiculture.blocks.apiculture.getStateFromMeta(BlockApicultureType.APIARY.ordinal())); - TileApiary apiary = TileUtil.getTile(world, xCoord, yCoord, zCoord, TileApiary.class); + TileApiary apiary = TileUtil.getTile(world, posNew, TileApiary.class); if (apiary == null) { return; } - ItemStack randomVillagePrincess = getRandomVillageBeeStack(world, xCoord, yCoord, zCoord, EnumBeeType.PRINCESS); + ItemStack randomVillagePrincess = getRandomVillageBeeStack(world, posNew, EnumBeeType.PRINCESS); apiary.getBeeInventory().setQueen(randomVillagePrincess); - ItemStack randomVillageDrone = getRandomVillageBeeStack(world, xCoord, yCoord, zCoord, EnumBeeType.DRONE); + ItemStack randomVillageDrone = getRandomVillageBeeStack(world, posNew, EnumBeeType.DRONE); apiary.getBeeInventory().setDrone(randomVillageDrone); for (int i = InventoryApiary.SLOT_FRAMES_1; i < InventoryApiary.SLOT_FRAMES_1 + InventoryApiary.SLOT_FRAMES_COUNT; i++) { @@ -327,15 +329,15 @@ public class ComponentVillageBeeHouse extends StructureVillagePieces.House1 { } } - private static ItemStack getRandomVillageBeeStack(World world, int xCoord, int yCoord, int zCoord, EnumBeeType beeType) { - IBee randomVillageBee = getRandomVillageBee(world, xCoord, yCoord, zCoord); + private static ItemStack getRandomVillageBeeStack(World world, BlockPos pos, EnumBeeType beeType) { + IBee randomVillageBee = getRandomVillageBee(world, pos); return BeeManager.beeRoot.getMemberStack(randomVillageBee, beeType.ordinal()); } - private static IBee getRandomVillageBee(World world, int xCoord, int yCoord, int zCoord) { + private static IBee getRandomVillageBee(World world, BlockPos pos) { // Get current biome - BiomeGenBase biome = world.getBiomeGenForCoords(xCoord, zCoord); + BiomeGenBase biome = world.getBiomeGenForCoords(pos); ArrayList candidates; if (BeeManager.villageBees[1] != null && BeeManager.villageBees[1].size() > 0 && world.rand.nextDouble() < 0.2) { @@ -344,7 +346,7 @@ public class ComponentVillageBeeHouse extends StructureVillagePieces.House1 { candidates = BeeManager.villageBees[0]; } - EnumTemperature biomeTemperature = EnumTemperature.getFromBiome(biome, xCoord, yCoord, zCoord); + EnumTemperature biomeTemperature = EnumTemperature.getFromBiome(biome, pos); EnumHumidity biomeHumidity = EnumHumidity.getFromValue(biome.rainfall); // Add bees that can live in this environment @@ -375,7 +377,7 @@ public class ComponentVillageBeeHouse extends StructureVillagePieces.House1 { for (int var14 = par4; var14 <= par7; ++var14) { for (int var15 = par3; var15 <= par6; ++var15) { for (int var16 = par5; var16 <= par8; ++var16) { - if (!replace || !isAirBlockAtCurrentPosition(world, var15, var14, var16, box)) { + if (!replace || !isAirBlockAtCurrentPosition(world, new BlockPos(var15, var14, var16), box)) { placeBlockAtCurrentPosition(world, block, var15, var14, var16, box); } } @@ -383,18 +385,19 @@ public class ComponentVillageBeeHouse extends StructureVillagePieces.House1 { } } - private void placeBlockAtCurrentPosition(World world, IBlockType block, int par4, int par5, int par6, StructureBoundingBox par7StructureBoundingBox) { - int x = getXWithOffset(par4, par6); - int y = getYWithOffset(par5); - int z = getZWithOffset(par4, par6); + private void placeBlockAtCurrentPosition(World world, IBlockType block, int x, int y, int z, StructureBoundingBox par7StructureBoundingBox) { + int xC = getXWithOffset(x, z); + int yC = getYWithOffset(y); + int zC = getZWithOffset(x, z); + BlockPos pos = new BlockPos(xC, yC, zC); - if (par7StructureBoundingBox.isVecInside(x, y, z)) { - block.setBlock(world, x, y, z); + if (par7StructureBoundingBox.isVecInside(pos)) { + block.setBlock(world, pos); } } - + @Override - protected int getVillagerType(int villagerCount) { + protected int func_180779_c(int villagerCount, int p_180779_2_) { if (villagerCount <= 0) { return Constants.ID_VILLAGER_BEEKEEPER; } else { @@ -402,15 +405,15 @@ public class ComponentVillageBeeHouse extends StructureVillagePieces.House1 { } } - private boolean isAirBlockAtCurrentPosition(World world, int x, int y, int z, StructureBoundingBox box) { - return getBlockAtCurrentPosition(world, x, y, z, box).isAir(world, x, y, z); + private boolean isAirBlockAtCurrentPosition(World world, BlockPos pos, StructureBoundingBox box) { + return getBlockStateFromPos(world, pos.getX(), pos.getY(), pos.getZ(), box).getBlock().isAir(world, pos); } /** rotates a direction according to the way the structure is facing **/ - private ForgeDirection getRotatedDirection(ForgeDirection direction) { + private EnumFacing getRotatedDirection(EnumFacing direction) { int stairDirection = 5 - direction.ordinal(); int meta = getMetadataWithOffset(Blocks.oak_stairs, stairDirection); - return ForgeDirection.getOrientation(5 - meta); + return EnumFacing.values()[5 - meta]; } } diff --git a/src/main/java/forestry/apiculture/worldgen/Hive.java b/src/main/java/forestry/apiculture/worldgen/Hive.java index 122d5dafa..97f87d2fc 100644 --- a/src/main/java/forestry/apiculture/worldgen/Hive.java +++ b/src/main/java/forestry/apiculture/worldgen/Hive.java @@ -14,6 +14,7 @@ import java.util.ArrayList; import java.util.List; import net.minecraft.block.Block; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; @@ -54,8 +55,8 @@ public final class Hive { return hiveDescription.getGenChance(); } - public void postGen(World world, int x, int y, int z) { - hiveDescription.postGen(world, x, y, z); + public void postGen(World world, BlockPos pos) { + hiveDescription.postGen(world, pos); } public boolean isGoodBiome(BiomeGenBase biome) { @@ -70,12 +71,12 @@ public final class Hive { return hiveDescription.isGoodTemperature(temperature); } - public boolean isValidLocation(World world, int x, int y, int z) { - return hiveDescription.getHiveGen().isValidLocation(world, x, y, z); + public boolean isValidLocation(World world, BlockPos pos) { + return hiveDescription.getHiveGen().isValidLocation(world, pos); } - public boolean canReplace(World world, int x, int y, int z) { - return hiveDescription.getHiveGen().canReplace(world, x, y, z); + public boolean canReplace(World world, BlockPos pos) { + return hiveDescription.getHiveGen().canReplace(world, pos); } public int getYForHive(World world, int x, int z) { diff --git a/src/main/java/forestry/apiculture/worldgen/HiveDecorator.java b/src/main/java/forestry/apiculture/worldgen/HiveDecorator.java index da2d7e925..44cbcc1ab 100755 --- a/src/main/java/forestry/apiculture/worldgen/HiveDecorator.java +++ b/src/main/java/forestry/apiculture/worldgen/HiveDecorator.java @@ -15,6 +15,8 @@ import java.util.List; import java.util.Random; import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.chunk.IChunkProvider; @@ -66,7 +68,7 @@ public abstract class HiveDecorator { int worldX = chunkX * 16; int worldZ = chunkZ * 16; - BiomeGenBase biome = world.getBiomeGenForCoords(worldX, worldZ); + BiomeGenBase biome = world.getBiomeGenForCoords(new BlockPos(worldX, 0, worldZ)); EnumHumidity humidity = EnumHumidity.getFromValue(biome.rainfall); if (!hive.isGoodBiome(biome) || !hive.isGoodHumidity(humidity)) { @@ -88,7 +90,7 @@ public abstract class HiveDecorator { private static void decorateHivesDebug(World world, int chunkX, int chunkZ, List hives) { int worldX = chunkX * 16; int worldZ = chunkZ * 16; - BiomeGenBase biome = world.getBiomeGenForCoords(worldX, worldZ); + BiomeGenBase biome = world.getBiomeGenForCoords(new BlockPos(chunkX, 0, chunkZ)); EnumHumidity humidity = EnumHumidity.getFromValue(biome.rainfall); for (int x = 0; x < 16; x++) { @@ -113,40 +115,41 @@ public abstract class HiveDecorator { return false; } - if (!hive.canReplace(world, x, y, z)) { + if (!hive.canReplace(world, new BlockPos(x, y, z))) { return false; } - BiomeGenBase biome = world.getBiomeGenForCoords(x, z); - EnumTemperature temperature = EnumTemperature.getFromValue(biome.getFloatTemperature(x, y, z)); + BiomeGenBase biome = world.getBiomeGenForCoords(new BlockPos(x, 0, z)); + EnumTemperature temperature = EnumTemperature.getFromValue(biome.getFloatTemperature(new BlockPos(x, 0, z))); if (!hive.isGoodTemperature(temperature)) { return false; } - if (!hive.isValidLocation(world, x, y, z)) { + if (!hive.isValidLocation(world, new BlockPos(x, y, z))) { return false; } - return setHive(world, x, y, z, hive); + return setHive(world, new BlockPos(x, y, z), hive); } - private static boolean setHive(World world, int x, int y, int z, Hive hive) { + private static boolean setHive(World world, BlockPos pos, Hive hive) { Block hiveBlock = hive.getHiveBlock(); - boolean placed = world.setBlock(x, y, z, hiveBlock, hive.getHiveMeta(), Constants.FLAG_BLOCK_SYNCH); + boolean placed = world.setBlockState(pos, hiveBlock.getStateFromMeta(hive.getHiveMeta()), Constants.FLAG_BLOCK_SYNCH); if (!placed) { return false; } - Block placedBlock = world.getBlock(x, y, z); + IBlockState state = world.getBlockState(pos); + Block placedBlock = state.getBlock(); if (!Block.isEqualTo(hiveBlock, placedBlock)) { return false; } - hiveBlock.onBlockAdded(world, x, y, z); - world.markBlockForUpdate(x, y, z); + hiveBlock.onBlockAdded(world, pos, state); + world.markBlockForUpdate(pos); if (!Config.generateBeehivesDebug) { - hive.postGen(world, x, y, z); + hive.postGen(world, pos); } return true; } diff --git a/src/main/java/forestry/apiculture/worldgen/HiveDescription.java b/src/main/java/forestry/apiculture/worldgen/HiveDescription.java index 57b9355d5..946e7db32 100644 --- a/src/main/java/forestry/apiculture/worldgen/HiveDescription.java +++ b/src/main/java/forestry/apiculture/worldgen/HiveDescription.java @@ -12,6 +12,7 @@ package forestry.apiculture.worldgen; import net.minecraft.block.Block; import net.minecraft.init.Blocks; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; @@ -43,9 +44,9 @@ public enum HiveDescription implements IHiveDescription { }, SNOW(6, 2.0f, BeeDefinition.WINTRY, HiveManager.genHelper.ground(Blocks.dirt, Blocks.grass, Blocks.snow)) { @Override - public void postGen(World world, int x, int y, int z) { - if (world.isAirBlock(x, y + 1, z)) { - world.setBlock(x, y + 1, z, Blocks.snow_layer, 0, 0); + public void postGen(World world, BlockPos pos) { + if (world.isAirBlock(pos.add(0, 1, 0))) { + world.setBlockState(pos.add(0, 1, 0), Blocks.snow_layer.getStateFromMeta(0), 0); } } }, @@ -103,7 +104,7 @@ public enum HiveDescription implements IHiveDescription { } @Override - public void postGen(World world, int x, int y, int z) { + public void postGen(World world, BlockPos pos) { } } diff --git a/src/main/java/forestry/apiculture/worldgen/HiveDescriptionSwarmer.java b/src/main/java/forestry/apiculture/worldgen/HiveDescriptionSwarmer.java index 08fc5e643..447a2df1e 100644 --- a/src/main/java/forestry/apiculture/worldgen/HiveDescriptionSwarmer.java +++ b/src/main/java/forestry/apiculture/worldgen/HiveDescriptionSwarmer.java @@ -14,6 +14,7 @@ import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; @@ -68,8 +69,8 @@ public class HiveDescriptionSwarmer implements IHiveDescription { } @Override - public void postGen(World world, int x, int y, int z) { - TileEntity tile = world.getTileEntity(x, y, z); + public void postGen(World world, BlockPos pos) { + TileEntity tile = world.getTileEntity(pos); if (tile instanceof TileSwarm) { ((TileSwarm) tile).setContained(bees); } diff --git a/src/main/java/forestry/apiculture/worldgen/HiveGen.java b/src/main/java/forestry/apiculture/worldgen/HiveGen.java index 4eadb38c9..9b7f25b98 100644 --- a/src/main/java/forestry/apiculture/worldgen/HiveGen.java +++ b/src/main/java/forestry/apiculture/worldgen/HiveGen.java @@ -12,15 +12,17 @@ package forestry.apiculture.worldgen; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import forestry.api.apiculture.hives.IHiveGen; +import forestry.core.utils.BlockUtil; public abstract class HiveGen implements IHiveGen { @Override - public boolean canReplace(World world, int x, int y, int z) { - Block block = world.getBlock(x, y, z); + public boolean canReplace(World world, BlockPos pos) { + Block block = BlockUtil.getBlock(world, pos); Material material = block.getMaterial(); return (material.isReplaceable() && !material.isLiquid()) || material == Material.air || diff --git a/src/main/java/forestry/apiculture/worldgen/HiveGenGround.java b/src/main/java/forestry/apiculture/worldgen/HiveGenGround.java index 280f25436..17c12e54c 100644 --- a/src/main/java/forestry/apiculture/worldgen/HiveGenGround.java +++ b/src/main/java/forestry/apiculture/worldgen/HiveGenGround.java @@ -13,8 +13,10 @@ package forestry.apiculture.worldgen; import java.util.HashSet; import java.util.Set; +import forestry.core.utils.BlockUtil; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; public class HiveGenGround extends HiveGen { @@ -28,17 +30,17 @@ public class HiveGenGround extends HiveGen { } @Override - public boolean isValidLocation(World world, int x, int y, int z) { - Block ground = world.getBlock(x, y - 1, z); + public boolean isValidLocation(World world, BlockPos pos) { + Block ground = BlockUtil.getBlock(world, pos.add(0, -1, 0)); return groundMaterials.contains(ground.getMaterial()); } @Override public int getYForHive(World world, int x, int z) { - int y = world.getHeightValue(x, z); + int y = world.getHeight(new BlockPos(x, 0, z)).getY(); // get to the ground - while (y >= 0 && (world.getBlock(x, y - 1, z).isLeaves(world, x, y - 1, z) || canReplace(world, x, y - 1, z))) { + while (y >= 0 && (world.getBlockState(new BlockPos(x, y - 1, z)).getBlock().isLeaves(world, new BlockPos(x, y - 1, z)) || canReplace(world, new BlockPos(x, y - 1, z)))) { y--; } diff --git a/src/main/java/forestry/apiculture/worldgen/HiveGenTree.java b/src/main/java/forestry/apiculture/worldgen/HiveGenTree.java index cf3841fd9..dd4f7c415 100644 --- a/src/main/java/forestry/apiculture/worldgen/HiveGenTree.java +++ b/src/main/java/forestry/apiculture/worldgen/HiveGenTree.java @@ -11,33 +11,34 @@ package forestry.apiculture.worldgen; import net.minecraft.block.Block; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; public class HiveGenTree extends HiveGen { @Override - public boolean isValidLocation(World world, int x, int y, int z) { - Block blockAbove = world.getBlock(x, y + 1, z); - if (!blockAbove.isLeaves(world, x, y + 1, z)) { + public boolean isValidLocation(World world, BlockPos pos) { + Block blockAbove = world.getBlockState(pos.add(0, 1, 0)).getBlock(); + if (!blockAbove.isLeaves(world, pos.add(0, 1, 0))) { return false; } // not a good location if right on top of something - return canReplace(world, x, y - 1, z); + return canReplace(world, pos.add(0, -1, 0)); } @Override public int getYForHive(World world, int x, int z) { // get top leaf block - int y = world.getHeightValue(x, z) - 1; - if (!world.getBlock(x, y, z).isLeaves(world, x, y, z)) { + int y = world.getHeight(new BlockPos(x, 0, z)).getY() - 1; + if (!world.getBlockState(new BlockPos(x, y, z)).getBlock().isLeaves(world, new BlockPos(x, y, z))) { return -1; } // get to the bottom of the leaves do { y--; - } while (world.getBlock(x, y, z).isLeaves(world, x, y, z)); + } while (world.getBlockState(new BlockPos(x, y, z)).getBlock().isLeaves(world,new BlockPos(x, y, z))); return y; } diff --git a/src/main/java/forestry/arboriculture/FruitProviderNone.java b/src/main/java/forestry/arboriculture/FruitProviderNone.java index 507e865f0..18116cb95 100755 --- a/src/main/java/forestry/arboriculture/FruitProviderNone.java +++ b/src/main/java/forestry/arboriculture/FruitProviderNone.java @@ -12,14 +12,11 @@ package forestry.arboriculture; import java.util.HashMap; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - import forestry.api.arboriculture.IFruitProvider; import forestry.api.arboriculture.ITreeGenome; import forestry.api.genetics.IFruitFamily; @@ -70,7 +67,7 @@ public class FruitProviderNone implements IFruitProvider { } @Override - public ItemStack[] getFruits(ITreeGenome genome, World world, int x, int y, int z, int ripeningTime) { + public ItemStack[] getFruits(ITreeGenome genome, World world, BlockPos pos, int ripeningTime) { return new ItemStack[0]; } @@ -80,17 +77,17 @@ public class FruitProviderNone implements IFruitProvider { } @Override - public boolean trySpawnFruitBlock(ITreeGenome genome, World world, int x, int y, int z) { + public boolean trySpawnFruitBlock(ITreeGenome genome, World world, BlockPos pos) { return false; } @Override - public int getColour(ITreeGenome genome, IBlockAccess world, int x, int y, int z, int ripeningTime) { + public int getColour(ITreeGenome genome, IBlockAccess world, BlockPos pos, int ripeningTime) { return 0xffffff; } @Override - public boolean markAsFruitLeaf(ITreeGenome genome, World world, int x, int y, int z) { + public boolean markAsFruitLeaf(ITreeGenome genome, World world, BlockPos pos) { return false; } @@ -113,21 +110,30 @@ public class FruitProviderNone implements IFruitProvider { public String getDescription() { return "fruits." + key; } - + @Override - public short getIconIndex(ITreeGenome genome, IBlockAccess world, int x, int y, int z, int ripeningTime, boolean fancy) { + public short getSpriteIndex(ITreeGenome genome, IBlockAccess world, BlockPos pos, int ripeningTime, boolean fancy) { if (overlay != null) { return overlay.texUID; } else { return -1; } } - + @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister register) { + public void registerSprites() { if (overlay != null) { - TextureManager.registerTexUID(register, overlay.texUID, "leaves/fruits." + overlay.ident); + TextureManager.registerSpriteUID(overlay.texUID, "blocks/leaves/fruits." + overlay.ident); } } + + @Override + public String getModelName() { + return null; + } + + @Override + public String getModID() { + return "forestry"; + } } diff --git a/src/main/java/forestry/arboriculture/FruitProviderPod.java b/src/main/java/forestry/arboriculture/FruitProviderPod.java index 7ec9e3de1..47369ea5c 100755 --- a/src/main/java/forestry/arboriculture/FruitProviderPod.java +++ b/src/main/java/forestry/arboriculture/FruitProviderPod.java @@ -12,21 +12,17 @@ package forestry.arboriculture; import java.util.Locale; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - import forestry.api.arboriculture.EnumTreeChromosome; import forestry.api.arboriculture.IAlleleFruit; import forestry.api.arboriculture.ITreeGenome; import forestry.api.arboriculture.TreeManager; import forestry.api.genetics.IFruitFamily; -import forestry.core.render.TextureManager; import forestry.core.utils.BlockUtil; public class FruitProviderPod extends FruitProviderNone { @@ -40,17 +36,9 @@ public class FruitProviderPod extends FruitProviderNone { EnumPodType(short stage1, short stage2, short stage3) { uids = new short[]{stage1, stage2, stage3}; } - - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister register) { - if (this == COCOA) { - return; - } - - String name = toString().toLowerCase(Locale.ENGLISH); - for (int i = 0; i < 3; i++) { - TextureManager.registerTexUID(register, uids[i], "pods/" + name + "." + i); - } + + public String getModelName(){ + return toString().toLowerCase(Locale.ENGLISH); } } @@ -71,7 +59,7 @@ public class FruitProviderPod extends FruitProviderNone { } @Override - public ItemStack[] getFruits(ITreeGenome genome, World world, int x, int y, int z, int ripeningTime) { + public ItemStack[] getFruits(ITreeGenome genome, World world, BlockPos pos, int ripeningTime) { if (drop == null || drop.length == 0) { return DUMMY; } @@ -88,29 +76,32 @@ public class FruitProviderPod extends FruitProviderNone { } @Override - public boolean trySpawnFruitBlock(ITreeGenome genome, World world, int x, int y, int z) { + public boolean trySpawnFruitBlock(ITreeGenome genome, World world, BlockPos pos) { if (world.rand.nextFloat() > genome.getSappiness()) { return false; } if (type == EnumPodType.COCOA) { - return BlockUtil.tryPlantPot(world, x, y, z, Blocks.cocoa); + return BlockUtil.tryPlantPot(world, pos, Blocks.cocoa); } else { return TreeManager.treeRoot.setFruitBlock(world, (IAlleleFruit) genome.getActiveAllele(EnumTreeChromosome.FRUITS), - genome.getSappiness(), type.uids, x, y, z); + genome.getSappiness(), type.uids, pos); } } - + @Override - public short getIconIndex(ITreeGenome genome, IBlockAccess world, int x, int y, int z, int ripeningTime, boolean fancy) { + public short getSpriteIndex(ITreeGenome genome, IBlockAccess world, BlockPos pos, int ripeningTime, boolean fancy) { return type.uids[0]; } - + @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister register) { - type.registerIcons(register); + public void registerSprites() { + } + + @Override + public String getModelName() { + return type.getModelName(); } } diff --git a/src/main/java/forestry/arboriculture/FruitProviderRandom.java b/src/main/java/forestry/arboriculture/FruitProviderRandom.java index 31291be08..01150c7a1 100755 --- a/src/main/java/forestry/arboriculture/FruitProviderRandom.java +++ b/src/main/java/forestry/arboriculture/FruitProviderRandom.java @@ -16,6 +16,7 @@ import java.util.Map; import java.util.Set; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -42,12 +43,12 @@ public class FruitProviderRandom extends FruitProviderNone { } @Override - public int getColour(ITreeGenome genome, IBlockAccess world, int x, int y, int z, int ripeningTime) { + public int getColour(ITreeGenome genome, IBlockAccess world, BlockPos pos, int ripeningTime) { return colour; } @Override - public ItemStack[] getFruits(ITreeGenome genome, World world, int x, int y, int z, int ripeningTime) { + public ItemStack[] getFruits(ITreeGenome genome, World world, BlockPos pos, int ripeningTime) { ArrayList product = new ArrayList<>(); float modeYieldMod = TreeManager.treeRoot.getTreekeepingMode(world).getYieldModifier(genome, 1f); @@ -73,7 +74,7 @@ public class FruitProviderRandom extends FruitProviderNone { } @Override - public boolean markAsFruitLeaf(ITreeGenome genome, World world, int x, int y, int z) { + public boolean markAsFruitLeaf(ITreeGenome genome, World world, BlockPos pos) { return true; } diff --git a/src/main/java/forestry/arboriculture/FruitProviderRipening.java b/src/main/java/forestry/arboriculture/FruitProviderRipening.java index fbd7fe7a7..3eab10a72 100755 --- a/src/main/java/forestry/arboriculture/FruitProviderRipening.java +++ b/src/main/java/forestry/arboriculture/FruitProviderRipening.java @@ -16,6 +16,7 @@ import java.util.Map; import java.util.Set; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -62,7 +63,7 @@ public class FruitProviderRipening extends FruitProviderNone { } @Override - public ItemStack[] getFruits(ITreeGenome genome, World world, int x, int y, int z, int ripeningTime) { + public ItemStack[] getFruits(ITreeGenome genome, World world, BlockPos pos, int ripeningTime) { ArrayList product = new ArrayList<>(); float stage = getRipeningStage(ripeningTime); @@ -93,12 +94,12 @@ public class FruitProviderRipening extends FruitProviderNone { } @Override - public boolean markAsFruitLeaf(ITreeGenome genome, World world, int x, int y, int z) { + public boolean markAsFruitLeaf(ITreeGenome genome, World world, BlockPos pos) { return true; } @Override - public int getColour(ITreeGenome genome, IBlockAccess world, int x, int y, int z, int ripeningTime) { + public int getColour(ITreeGenome genome, IBlockAccess world, BlockPos pos, int ripeningTime) { float stage = getRipeningStage(ripeningTime); int r = (colourCallow >> 16 & 255) + (int) (diffR * stage); diff --git a/src/main/java/forestry/arboriculture/LeafDecayHelper.java b/src/main/java/forestry/arboriculture/LeafDecayHelper.java index baefc5d23..51a83e795 100644 --- a/src/main/java/forestry/arboriculture/LeafDecayHelper.java +++ b/src/main/java/forestry/arboriculture/LeafDecayHelper.java @@ -1,7 +1,10 @@ package forestry.arboriculture; +import forestry.core.utils.BlockUtil; import net.minecraft.block.Block; -import net.minecraft.block.BlockLeaves; +import net.minecraft.block.BlockLeavesBase; +import net.minecraft.block.state.IBlockState; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; /** Based on vanilla leaf decay, but accepts leaves that are connected further from a trunk */ @@ -11,12 +14,13 @@ public abstract class LeafDecayHelper { private static final short IS_LEAVES = -2; private static int[] leafDecayValues; - public static void leafDecay(BlockLeaves leaves, World world, int x, int y, int z) { + public static void leafDecay(BlockLeavesBase leaves, World world, BlockPos pos) { if (world.isRemote) { return; } + IBlockState state = world.getBlockState(pos); - int leafMeta = world.getBlockMetadata(x, y, z); + int leafMeta = state.getBlock().getMetaFromState(state); if ((leafMeta & 8) != 0 && (leafMeta & 4) == 0) { byte radius = 4; @@ -29,14 +33,14 @@ public abstract class LeafDecayHelper { } int radius1 = radius + 1; - if (world.checkChunksExist(x - radius1, y - radius1, z - radius1, x + radius1, y + radius1, z + radius1)) { + if (BlockUtil.checkChunksExist(world, pos.getX() - radius1, pos.getY() - radius1, pos.getZ() - radius1, pos.getX() + radius1, pos.getY() + radius1, pos.getZ() + radius1)) { for (int xOffset = -radius; xOffset <= radius; ++xOffset) { for (int yOffset = -radius; yOffset <= radius; ++yOffset) { for (int zOffset = -radius; zOffset <= radius; ++zOffset) { - Block block = world.getBlock(x + xOffset, y + yOffset, z + zOffset); + Block block = BlockUtil.getBlock(world, pos.add(xOffset, yOffset, zOffset)); - if (!block.canSustainLeaves(world, x + xOffset, y + yOffset, z + zOffset)) { - if (block.isLeaves(world, x + xOffset, y + yOffset, z + zOffset)) { + if (!block.canSustainLeaves(world, pos.add(xOffset, yOffset, zOffset))) { + if (block.isLeaves(world, pos.add(xOffset, yOffset, zOffset))) { leafDecayValues[(xOffset + arrayOffset) * xArrayMult + (yOffset + arrayOffset) * yArrayMult + zOffset + arrayOffset] = IS_LEAVES; } else { leafDecayValues[(xOffset + arrayOffset) * xArrayMult + (yOffset + arrayOffset) * yArrayMult + zOffset + arrayOffset] = NOT_SUSTAINS_LEAVES; @@ -86,10 +90,10 @@ public abstract class LeafDecayHelper { int sustainValue = leafDecayValues[(arrayOffset * xArrayMult) + (arrayOffset * yArrayMult) + arrayOffset]; if (sustainValue >= 0) { - world.setBlockMetadataWithNotify(x, y, z, leafMeta & -9, 4); // stop trying to decay + world.setBlockState(pos, state.getBlock().getStateFromMeta(leafMeta & -9), 4); // stop trying to decay } else { - leaves.dropBlockAsItem(world, x, y, z, world.getBlockMetadata(x, y, z), 0); - world.setBlockToAir(x, y, z); + leaves.dropBlockAsItem(world, pos, state, 0); + world.setBlockToAir(pos); } } } diff --git a/src/main/java/forestry/arboriculture/VillageHandlerArboriculture.java b/src/main/java/forestry/arboriculture/VillageHandlerArboriculture.java index 2ccb69a2c..484aefb50 100755 --- a/src/main/java/forestry/arboriculture/VillageHandlerArboriculture.java +++ b/src/main/java/forestry/arboriculture/VillageHandlerArboriculture.java @@ -10,27 +10,15 @@ ******************************************************************************/ package forestry.arboriculture; -import java.util.Random; +import net.minecraftforge.fml.common.registry.VillagerRegistry; +import net.minecraftforge.fml.common.registry.VillagerRegistry.VillagerProfession; -import net.minecraft.entity.passive.EntityVillager; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraft.village.MerchantRecipe; -import net.minecraft.village.MerchantRecipeList; +/** + * TODO: Make it to a {@link VillagerProfession} when Forge has Fixed the {@link VillagerRegistry} + */ +public class VillageHandlerArboriculture /*implements IVillageTradeHandler*/ { -import cpw.mods.fml.common.registry.VillagerRegistry.IVillageTradeHandler; - -import forestry.api.arboriculture.EnumGermlingType; -import forestry.api.arboriculture.EnumWoodType; -import forestry.api.arboriculture.ITree; -import forestry.api.arboriculture.ITreeGenome; -import forestry.api.arboriculture.TreeManager; -import forestry.api.genetics.IAllele; -import forestry.plugins.PluginArboriculture; - -public class VillageHandlerArboriculture implements IVillageTradeHandler { - - @SuppressWarnings("unchecked") + /*@SuppressWarnings("unchecked") @Override public void manipulateTradesForVillager(EntityVillager villager, MerchantRecipeList recipeList, Random random) { IAllele[] randomTemplate = TreeManager.treeRoot.getRandomTemplate(random); @@ -46,6 +34,6 @@ public class VillageHandlerArboriculture implements IVillageTradeHandler { planks.stackSize = 32; recipeList.add(new MerchantRecipe(new ItemStack(Items.emerald, 1), planks)); - } + }*/ } diff --git a/src/main/java/forestry/arboriculture/blocks/BlockArbFence.java b/src/main/java/forestry/arboriculture/blocks/BlockArbFence.java index cfd3e2ac0..7f7fe05da 100644 --- a/src/main/java/forestry/arboriculture/blocks/BlockArbFence.java +++ b/src/main/java/forestry/arboriculture/blocks/BlockArbFence.java @@ -18,50 +18,79 @@ import net.minecraft.block.BlockFence; import net.minecraft.block.BlockFenceGate; import net.minecraft.block.ITileEntityProvider; import net.minecraft.block.material.Material; +import net.minecraft.block.properties.IProperty; +import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.IBlockState; import net.minecraft.client.particle.EffectRenderer; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; - -import net.minecraftforge.common.util.ForgeDirection; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import forestry.api.arboriculture.EnumWoodType; import forestry.api.arboriculture.TreeManager; +import forestry.api.core.IModelManager; +import forestry.api.core.IItemModelRegister; import forestry.api.core.Tabs; import forestry.arboriculture.IWoodTyped; -import forestry.arboriculture.render.IconProviderWood; +import forestry.arboriculture.items.ItemBlockWood; +import forestry.arboriculture.items.ItemBlockWood.WoodMeshDefinition; import forestry.arboriculture.tiles.TileWood; import forestry.core.render.ParticleHelper; import forestry.plugins.PluginArboriculture; -public class BlockArbFence extends BlockFence implements IWoodTyped, ITileEntityProvider { +public class BlockArbFence extends BlockFence implements IWoodTyped, IItemModelRegister, ITileEntityProvider { private final ParticleHelper.Callback particleCallback; private final boolean fireproof; + + protected String[] harvestTool; + protected int[] harvestLevel; public BlockArbFence(boolean fireproof) { - super("", Material.wood); + super(Material.wood); this.fireproof = fireproof; + harvestTool = new String[EnumWoodType.values().length]; + harvestLevel = new int[harvestTool.length]; + for(int i = 0;i < harvestTool.length;i++){ + harvestLevel[i] = -1; + } + setHardness(2.0F); setResistance(5.0F); setHarvestLevel("axe", 0); setStepSound(soundTypeWood); setCreativeTab(Tabs.tabArboriculture); + setDefaultState(this.blockState.getBaseState().withProperty(NORTH, Boolean.valueOf(false)) + .withProperty(EAST, Boolean.valueOf(false)).withProperty(SOUTH, Boolean.valueOf(false)) + .withProperty(WEST, Boolean.valueOf(false)).withProperty(EnumWoodType.WOODTYPE, EnumWoodType.LARCH)); this.particleCallback = new ParticleHelper.DefaultCallback(this); } + + @Override + protected BlockState createBlockState() { + return new BlockState(this, new IProperty[] { NORTH, SOUTH, WEST, EAST, EnumWoodType.WOODTYPE }); + } + + @Override + public IBlockState getActualState(IBlockState state, IBlockAccess world, BlockPos pos) { + TileEntity tile = world.getTileEntity(pos); + if (tile instanceof TileWood) { + TileWood wood = (TileWood) tile; + state = state.withProperty(EnumWoodType.WOODTYPE, wood.getWoodType()); + } + return super.getActualState(state, world, pos); + } @SuppressWarnings({"rawtypes", "unchecked"}) @Override @@ -72,46 +101,36 @@ public class BlockArbFence extends BlockFence implements IWoodTyped, ITileEntity } @Override - public boolean canPlaceTorchOnTop(World world, int x, int y, int z) { + public boolean canPlaceTorchOnTop(IBlockAccess world, BlockPos pos) { return true; } - + @Override - public boolean canConnectFenceTo(IBlockAccess world, int x, int y, int z) { - if (!isFence(world, x, y, z)) { - Block block = world.getBlock(x, y, z); + public boolean canConnectTo(IBlockAccess world, BlockPos pos) { + if (!isFence(world, pos)) { + Block block = world.getBlockState(pos).getBlock(); if (block == this || block instanceof BlockFenceGate) { return true; } - return block.getMaterial().isOpaque() && block.renderAsNormalBlock() && block.getMaterial() != Material.gourd; + return block.getMaterial().isOpaque() && block.isNormalCube() && block.getMaterial() != Material.gourd; } else { return true; } } - /* ICONS */ + /* Models */ @SideOnly(Side.CLIENT) @Override - public void registerBlockIcons(IIconRegister register) { - IconProviderWood.registerIcons(register); + public void registerModel(Item item, IModelManager manager) { + if (!fireproof) { + manager.registerVariant(item, ItemBlockWood.getVariants(this)); + } + manager.registerItemModel(item, new WoodMeshDefinition(this)); } - @SideOnly(Side.CLIENT) - @Override - public IIcon getIcon(int side, int meta) { - return IconProviderWood.getPlankIcon(EnumWoodType.LARCH); - } - - @Override - public IIcon getIcon(IBlockAccess world, int x, int y, int z, int side) { - TileWood wood = TileWood.getWoodTile(world, x, y, z); - EnumWoodType woodType = wood.getWoodType(); - return IconProviderWood.getPlankIcon(woodType); - } - - private static boolean isFence(IBlockAccess world, int x, int y, int z) { - Block block = world.getBlock(x, y, z); + private static boolean isFence(IBlockAccess world, BlockPos pos) { + Block block = world.getBlockState(pos).getBlock(); return PluginArboriculture.validFences.contains(block); } @@ -122,36 +141,36 @@ public class BlockArbFence extends BlockFence implements IWoodTyped, ITileEntity /* PROPERTIES */ @Override - public final ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z) { - return TileWood.getPickBlock(this, world, x, y, z); + public ItemStack getPickBlock(MovingObjectPosition target, World world, BlockPos pos, EntityPlayer player) { + return TileWood.getPickBlock(this, world, pos); } /* DROP HANDLING */ // Hack: When harvesting we need to get the drops in onBlockHarvested, // because Mojang destroys the block and tile before calling getDrops. private final ThreadLocal> drops = new ThreadLocal<>(); - + @Override - public void onBlockHarvested(World world, int x, int y, int z, int meta, EntityPlayer playerProfile) { - drops.set(TileWood.getDrops(this, world, x, y, z)); + public void onBlockHarvested(World world, BlockPos pos, IBlockState state, EntityPlayer player) { + drops.set(TileWood.getDrops(this, world, pos)); } - + @Override - public ArrayList getDrops(World world, int x, int y, int z, int metadata, int fortune) { + public List getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { ArrayList ret = drops.get(); drops.remove(); // not harvested, get drops normally if (ret == null) { - ret = TileWood.getDrops(this, world, x, y, z); + ret = TileWood.getDrops(this, world, pos); } return ret; } - + @Override - public final float getBlockHardness(World world, int x, int y, int z) { - TileWood wood = TileWood.getWoodTile(world, x, y, z); + public float getBlockHardness(World world, BlockPos pos) { + TileWood wood = TileWood.getWoodTile(world, pos); if (wood == null) { return EnumWoodType.DEFAULT_HARDNESS; } @@ -159,17 +178,17 @@ public class BlockArbFence extends BlockFence implements IWoodTyped, ITileEntity } @Override - public final boolean isFlammable(IBlockAccess world, int x, int y, int z, ForgeDirection face) { + public final boolean isFlammable(IBlockAccess world, BlockPos pos, EnumFacing face) { return !isFireproof(); } @Override - public int getFlammability(IBlockAccess world, int x, int y, int z, ForgeDirection face) { + public int getFlammability(IBlockAccess world, BlockPos pos, EnumFacing face) { return isFireproof() ? 0 : 20; } @Override - public int getFireSpreadSpeed(IBlockAccess world, int x, int y, int z, ForgeDirection face) { + public int getFireSpreadSpeed(IBlockAccess world, BlockPos pos, EnumFacing face) { return isFireproof() ? 0 : 5; } @@ -182,6 +201,26 @@ public class BlockArbFence extends BlockFence implements IWoodTyped, ITileEntity public boolean isFireproof() { return fireproof; } + + @Override + public void setHarvestLevel(String toolClass, int level, IBlockState state) + { + int idx = this.getMetaFromState(state); + this.harvestTool[idx] = toolClass; + this.harvestLevel[idx] = level; + } + + @Override + public String getHarvestTool(IBlockState state) + { + return harvestTool[getMetaFromState(state)]; + } + + @Override + public int getHarvestLevel(IBlockState state) + { + return harvestLevel[getMetaFromState(state)]; + } /* Particles */ @SideOnly(Side.CLIENT) @@ -192,7 +231,7 @@ public class BlockArbFence extends BlockFence implements IWoodTyped, ITileEntity @SideOnly(Side.CLIENT) @Override - public boolean addDestroyEffects(World worldObj, int x, int y, int z, int meta, EffectRenderer effectRenderer) { - return ParticleHelper.addDestroyEffects(worldObj, this, x, y, z, meta, effectRenderer, particleCallback); + public boolean addDestroyEffects(World world, BlockPos pos, EffectRenderer effectRenderer) { + return ParticleHelper.addDestroyEffects(world, this, world.getBlockState(pos), pos, effectRenderer, particleCallback); } } diff --git a/src/main/java/forestry/arboriculture/blocks/BlockArbStairs.java b/src/main/java/forestry/arboriculture/blocks/BlockArbStairs.java index 8d259872d..1305ea0a2 100644 --- a/src/main/java/forestry/arboriculture/blocks/BlockArbStairs.java +++ b/src/main/java/forestry/arboriculture/blocks/BlockArbStairs.java @@ -16,39 +16,54 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.block.BlockStairs; import net.minecraft.block.ITileEntityProvider; +import net.minecraft.block.properties.IProperty; +import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.IBlockState; import net.minecraft.client.particle.EffectRenderer; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import forestry.api.arboriculture.EnumWoodType; import forestry.api.arboriculture.TreeManager; +import forestry.api.core.IModelManager; +import forestry.api.core.IItemModelRegister; import forestry.api.core.Tabs; import forestry.arboriculture.IWoodTyped; -import forestry.arboriculture.render.IconProviderWood; +import forestry.arboriculture.items.ItemBlockWood; +import forestry.arboriculture.items.ItemBlockWood.WoodMeshDefinition; import forestry.arboriculture.tiles.TileWood; import forestry.core.render.ParticleHelper; -public class BlockArbStairs extends BlockStairs implements IWoodTyped, ITileEntityProvider { +public class BlockArbStairs extends BlockStairs implements IWoodTyped, IItemModelRegister, ITileEntityProvider { private final ParticleHelper.Callback particleCallback; private final boolean fireproof; + + protected String[] harvestTool; + protected int[] harvestLevel; public BlockArbStairs(Block par2Block, boolean fireproof) { - super(par2Block, 0); + super(par2Block.getStateFromMeta(0)); + this.setDefaultState(this.blockState.getBaseState().withProperty(EnumWoodType.WOODTYPE, EnumWoodType.LARCH).withProperty(FACING, EnumFacing.NORTH).withProperty(HALF, BlockStairs.EnumHalf.BOTTOM).withProperty(SHAPE, BlockStairs.EnumShape.STRAIGHT)); + this.fireproof = fireproof; + harvestTool = new String[EnumWoodType.values().length]; + harvestLevel = new int[harvestTool.length]; + for(int i = 0;i < harvestTool.length;i++){ + harvestLevel[i] = -1; + } + setCreativeTab(Tabs.tabArboriculture); setHardness(2.0F); setResistance(5.0F); @@ -56,6 +71,22 @@ public class BlockArbStairs extends BlockStairs implements IWoodTyped, ITileEnti this.particleCallback = new ParticleHelper.DefaultCallback(this); } + + + @Override + protected BlockState createBlockState() { + return new BlockState(this, new IProperty[] { EnumWoodType.WOODTYPE, FACING, HALF, SHAPE }); + } + + @Override + public IBlockState getActualState(IBlockState state, IBlockAccess world, BlockPos pos) { + TileEntity tile = world.getTileEntity(pos); + if (tile instanceof TileWood) { + TileWood wood = (TileWood) tile; + state = state.withProperty(EnumWoodType.WOODTYPE, wood.getWoodType()); + } + return super.getActualState(state, world, pos); + } @SuppressWarnings({"rawtypes", "unchecked"}) @Override @@ -70,49 +101,38 @@ public class BlockArbStairs extends BlockStairs implements IWoodTyped, ITileEnti // Hack: When harvesting we need to get the drops in onBlockHarvested, // because Mojang destroys the block and tile before calling getDrops. private final ThreadLocal> drops = new ThreadLocal<>(); - + @Override - public void onBlockHarvested(World world, int x, int y, int z, int meta, EntityPlayer playerProfile) { - drops.set(TileWood.getDrops(this, world, x, y, z)); + public void onBlockHarvested(World world, BlockPos pos, IBlockState state, EntityPlayer player) { + drops.set(TileWood.getDrops(this, world, pos)); } - + @Override - public ArrayList getDrops(World world, int x, int y, int z, int metadata, int fortune) { + public List getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { ArrayList ret = drops.get(); drops.remove(); // not harvested, get drops normally if (ret == null) { - ret = TileWood.getDrops(this, world, x, y, z); + ret = TileWood.getDrops(this, world, pos); } return ret; } - + @Override - public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z) { - return TileWood.getPickBlock(this, world, x, y, z); + public ItemStack getPickBlock(MovingObjectPosition target, World world, BlockPos pos, EntityPlayer player) { + return TileWood.getPickBlock(this, world, pos); } - /* ICONS */ + /* MODELS */ @SideOnly(Side.CLIENT) @Override - public void registerBlockIcons(IIconRegister register) { - IconProviderWood.registerIcons(register); - } - - /* ICONS */ - @SideOnly(Side.CLIENT) - @Override - public IIcon getIcon(int side, int meta) { - return IconProviderWood.getPlankIcon(EnumWoodType.LARCH); - } - - @Override - public IIcon getIcon(IBlockAccess world, int x, int y, int z, int side) { - TileWood wood = TileWood.getWoodTile(world, x, y, z); - EnumWoodType woodType = wood.getWoodType(); - return IconProviderWood.getPlankIcon(woodType); + public void registerModel(Item item, IModelManager manager) { + if (!fireproof) { + manager.registerVariant(item, ItemBlockWood.getVariants(this)); + } + manager.registerItemModel(item, new WoodMeshDefinition(this)); } @Override @@ -134,6 +154,26 @@ public class BlockArbStairs extends BlockStairs implements IWoodTyped, ITileEnti public TileEntity createNewTileEntity(World p_149915_1_, int p_149915_2_) { return new TileWood(); } + + @Override + public void setHarvestLevel(String toolClass, int level, IBlockState state) + { + int idx = this.getMetaFromState(state); + this.harvestTool[idx] = toolClass; + this.harvestLevel[idx] = level; + } + + @Override + public String getHarvestTool(IBlockState state) + { + return harvestTool[getMetaFromState(state)]; + } + + @Override + public int getHarvestLevel(IBlockState state) + { + return harvestLevel[getMetaFromState(state)]; + } /* Particles */ @SideOnly(Side.CLIENT) @@ -144,7 +184,7 @@ public class BlockArbStairs extends BlockStairs implements IWoodTyped, ITileEnti @SideOnly(Side.CLIENT) @Override - public boolean addDestroyEffects(World worldObj, int x, int y, int z, int meta, EffectRenderer effectRenderer) { - return ParticleHelper.addDestroyEffects(worldObj, this, x, y, z, meta, effectRenderer, particleCallback); + public boolean addDestroyEffects(World world, BlockPos pos, EffectRenderer effectRenderer) { + return ParticleHelper.addDestroyEffects(world, this, world.getBlockState(pos), pos, effectRenderer, particleCallback); } } diff --git a/src/main/java/forestry/arboriculture/blocks/BlockArboriculture.java b/src/main/java/forestry/arboriculture/blocks/BlockArboriculture.java index 7ff4af2ad..685d7f90d 100644 --- a/src/main/java/forestry/arboriculture/blocks/BlockArboriculture.java +++ b/src/main/java/forestry/arboriculture/blocks/BlockArboriculture.java @@ -15,7 +15,7 @@ import forestry.core.blocks.BlockBase; public class BlockArboriculture extends BlockBase { public BlockArboriculture() { - super(true); + super(true, BlockArboricultureType.class); setCreativeTab(Tabs.tabArboriculture); } } diff --git a/src/main/java/forestry/arboriculture/blocks/BlockArboricultureType.java b/src/main/java/forestry/arboriculture/blocks/BlockArboricultureType.java index e728b556f..348932652 100644 --- a/src/main/java/forestry/arboriculture/blocks/BlockArboricultureType.java +++ b/src/main/java/forestry/arboriculture/blocks/BlockArboricultureType.java @@ -10,16 +10,19 @@ ******************************************************************************/ package forestry.arboriculture.blocks; +import java.util.Locale; + import forestry.arboriculture.tiles.TileArboristChest; import forestry.core.blocks.IMachinePropertiesTESR; import forestry.core.proxy.Proxies; -import forestry.core.render.IBlockRenderer; import forestry.core.tiles.TileForestry; +import forestry.core.tiles.TileNaturalistChest; +import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; public enum BlockArboricultureType implements IMachinePropertiesTESR { ARBCHEST(TileArboristChest.class, "ArbChest") { @Override - public IBlockRenderer getRenderer() { + public TileEntitySpecialRenderer getRenderer() { return Proxies.render.getRenderChest("arbchest"); } }; @@ -48,4 +51,9 @@ public enum BlockArboricultureType implements IMachinePropertiesTESR { public Class getTeClass() { return teClass; } + + @Override + public String getName() { + return name().toLowerCase(Locale.ENGLISH); + } } diff --git a/src/main/java/forestry/arboriculture/blocks/BlockForestryLeaves.java b/src/main/java/forestry/arboriculture/blocks/BlockForestryLeaves.java index 86f1cef09..581968340 100644 --- a/src/main/java/forestry/arboriculture/blocks/BlockForestryLeaves.java +++ b/src/main/java/forestry/arboriculture/blocks/BlockForestryLeaves.java @@ -12,14 +12,19 @@ package forestry.arboriculture.blocks; import javax.annotation.Nullable; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collections; import java.util.List; import java.util.Random; -import net.minecraft.block.BlockNewLeaf; +import net.minecraft.block.BlockLeavesBase; import net.minecraft.block.IGrowable; import net.minecraft.block.ITileEntityProvider; -import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.block.material.Material; +import net.minecraft.block.properties.IProperty; +import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.IBlockState; +import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.Entity; @@ -29,23 +34,28 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.IIcon; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumWorldBlockLayer; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import net.minecraftforge.common.property.IExtendedBlockState; +import net.minecraftforge.common.property.IUnlistedProperty; +import net.minecraftforge.client.model.ModelLoader; +import net.minecraftforge.common.IShearable; +import net.minecraftforge.common.property.ExtendedBlockState; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import com.mojang.authlib.GameProfile; -import net.minecraftforge.common.util.ForgeDirection; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - import forestry.api.arboriculture.EnumGermlingType; -import forestry.api.arboriculture.EnumLeafType; import forestry.api.arboriculture.IToolGrafter; import forestry.api.arboriculture.ITree; import forestry.api.arboriculture.TreeManager; +import forestry.api.core.IModelManager; +import forestry.api.core.IItemModelRegister; import forestry.api.core.IToolScoop; import forestry.api.core.Tabs; import forestry.api.lepidopterology.ButterflyManager; @@ -54,17 +64,30 @@ import forestry.api.lepidopterology.IButterfly; import forestry.arboriculture.LeafDecayHelper; import forestry.arboriculture.genetics.TreeDefinition; import forestry.arboriculture.items.ItemBlockLeaves; -import forestry.arboriculture.render.TextureLeaves; import forestry.arboriculture.tiles.TileLeaves; +import forestry.core.blocks.propertys.UnlistedBlockAccess; +import forestry.core.blocks.propertys.UnlistedBlockPos; import forestry.core.proxy.Proxies; import forestry.core.utils.ItemStackUtil; import forestry.plugins.PluginArboriculture; -public class BlockForestryLeaves extends BlockNewLeaf implements ITileEntityProvider, IGrowable { +public class BlockForestryLeaves extends BlockLeavesBase implements ITileEntityProvider, IShearable, IGrowable, IItemModelRegister { public BlockForestryLeaves() { + super(Material.leaves, false); this.setCreativeTab(Tabs.tabArboriculture); } + + @Override + public IBlockState getExtendedState(IBlockState state, IBlockAccess world, BlockPos pos) { + return ((IExtendedBlockState) super.getExtendedState(state, world, pos)).withProperty(UnlistedBlockPos.POS, pos) + .withProperty(UnlistedBlockAccess.BLOCKACCESS, world); + } + + @Override + protected BlockState createBlockState() { + return new ExtendedBlockState(this, new IProperty[0], new IUnlistedProperty[] { UnlistedBlockPos.POS, UnlistedBlockAccess.BLOCKACCESS }); + } /* TILE ENTITY */ @Override @@ -72,8 +95,8 @@ public class BlockForestryLeaves extends BlockNewLeaf implements ITileEntityProv return new TileLeaves(); } - public static TileLeaves getLeafTile(IBlockAccess world, int x, int y, int z) { - TileEntity tile = world.getTileEntity(x, y, z); + public static TileLeaves getLeafTile(IBlockAccess world, BlockPos pos) { + TileEntity tile = world.getTileEntity(pos); if (tile instanceof TileLeaves) { return (TileLeaves) tile; } @@ -106,8 +129,8 @@ public class BlockForestryLeaves extends BlockNewLeaf implements ITileEntityProv private final ThreadLocal> drops = new ThreadLocal<>(); @Override - public void onBlockHarvested(World world, int x, int y, int z, int metadata, EntityPlayer player) { - TileLeaves leafTile = getLeafTile(world, x, y, z); + public void onBlockHarvested(World world, BlockPos pos, IBlockState state, EntityPlayer player) { + TileLeaves leafTile = getLeafTile(world, pos); if (leafTile == null || leafTile.isDecorative()) { return; } @@ -118,7 +141,7 @@ public class BlockForestryLeaves extends BlockNewLeaf implements ITileEntityProv if (!world.isRemote) { ItemStack held = player.inventory.getCurrentItem(); if (held != null && held.getItem() instanceof IToolGrafter) { - saplingModifier = ((IToolGrafter) held.getItem()).getSaplingModifier(held, world, player, x, y, z); + saplingModifier = ((IToolGrafter) held.getItem()).getSaplingModifier(held, world, player, pos); held.damageItem(1, player); if (held.stackSize <= 0) { player.destroyCurrentEquippedItem(); @@ -126,33 +149,33 @@ public class BlockForestryLeaves extends BlockNewLeaf implements ITileEntityProv } } GameProfile playerProfile = player.getGameProfile(); - ArrayList leafDrops = getLeafDrop(world, playerProfile, x, y, z, saplingModifier, fortune); + ArrayList leafDrops = getLeafDrop(world, playerProfile, pos, saplingModifier, fortune); drops.set(leafDrops); } - + @Override - public ArrayList getDrops(World world, int x, int y, int z, int metadata, int fortune) { + public List getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { ArrayList ret = drops.get(); drops.remove(); // leaves not harvested, get drops normally if (ret == null) { - ret = getLeafDrop(world, null, x, y, z, 1.0f, fortune); + ret = getLeafDrop(world, null, pos, 1.0f, fortune); } return ret; } - private static ArrayList getLeafDrop(World world, @Nullable GameProfile playerProfile, int x, int y, int z, float saplingModifier, int fortune) { + private static ArrayList getLeafDrop(IBlockAccess world, @Nullable GameProfile playerProfile, BlockPos pos, float saplingModifier, int fortune) { ArrayList prod = new ArrayList<>(); - TileLeaves tile = getLeafTile(world, x, y, z); + TileLeaves tile = getLeafTile(world, pos); if (tile == null || tile.getTree() == null || tile.isDecorative()) { return prod; } // Add saplings - ITree[] saplings = tile.getTree().getSaplings(world, playerProfile, x, y, z, saplingModifier); + ITree[] saplings = tile.getTree().getSaplings((World) world, playerProfile, pos, saplingModifier); for (ITree sapling : saplings) { if (sapling != null) { @@ -162,32 +185,32 @@ public class BlockForestryLeaves extends BlockNewLeaf implements ITileEntityProv // Add fruits if (tile.hasFruit()) { - Collections.addAll(prod, tile.getTree().produceStacks(world, x, y, z, tile.getRipeningTime())); + Collections.addAll(prod, tile.getTree().produceStacks((World) world, pos, tile.getRipeningTime())); } return prod; } - + @Override - public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z) { - ItemStack itemStack = super.getPickBlock(target, world, x, y, z); - TileLeaves leaves = getLeafTile(world, x, y, z); + public ItemStack getPickBlock(MovingObjectPosition target, World world, BlockPos pos, EntityPlayer player) { + ItemStack itemStack = super.getPickBlock(target, world, pos, player); + TileLeaves leaves = getLeafTile(world, pos); NBTTagCompound leavesNBT = new NBTTagCompound(); leaves.writeToNBTDecorative(leavesNBT); itemStack.setTagCompound(leavesNBT); return itemStack; } - + @Override - public boolean isShearable(ItemStack item, IBlockAccess world, int x, int y, int z) { + public boolean isShearable(ItemStack item, IBlockAccess world, BlockPos pos) { return true; } - + @Override - public ArrayList onSheared(ItemStack item, IBlockAccess world, int x, int y, int z, int fortune) { - ArrayList ret = super.onSheared(item, world, x, y, z, fortune); + public List onSheared(ItemStack item, IBlockAccess world, BlockPos pos, int fortune) { + List ret = new ArrayList(Arrays.asList(new ItemStack(this))); - TileLeaves leaves = getLeafTile(world, x, y, z); + TileLeaves leaves = getLeafTile(world, pos); NBTTagCompound shearedLeavesNBT = new NBTTagCompound(); leaves.writeToNBTDecorative(shearedLeavesNBT); @@ -199,39 +222,39 @@ public class BlockForestryLeaves extends BlockNewLeaf implements ITileEntityProv return ret; } - + @Override - public void beginLeavesDecay(World world, int x, int y, int z) { - TileLeaves tile = getLeafTile(world, x, y, z); + public void beginLeavesDecay(World world, BlockPos pos) { + TileLeaves tile = getLeafTile(world, pos); if (tile == null || tile.isDecorative()) { return; } - super.beginLeavesDecay(world, x, y, z); + super.beginLeavesDecay(world, pos); } - + @Override - public AxisAlignedBB getCollisionBoundingBoxFromPool(World world, int x, int y, int z) { - TileLeaves tileLeaves = getLeafTile(world, x, y, z); + public AxisAlignedBB getCollisionBoundingBox(World world, BlockPos pos, IBlockState state) { + TileLeaves tileLeaves = getLeafTile(world, pos); if (tileLeaves != null && TreeDefinition.Willow.getUID().equals(tileLeaves.getSpeciesUID())) { return null; } - return super.getCollisionBoundingBoxFromPool(world, x, y, z); + return super.getCollisionBoundingBox(world, pos, state); } - + @Override - public void onEntityCollidedWithBlock(World world, int x, int y, int z, Entity entity) { + public void onEntityCollidedWithBlock(World worldIn, BlockPos pos, Entity entity) { entity.motionX *= 0.4D; entity.motionZ *= 0.4D; } - + @Override - public void updateTick(World world, int x, int y, int z, Random random) { - TileLeaves tileLeaves = getLeafTile(world, x, y, z); + public void updateTick(World world, BlockPos pos, IBlockState state, Random rand) { + TileLeaves tileLeaves = getLeafTile(world, pos); if (tileLeaves == null || tileLeaves.isDecorative()) { return; } - LeafDecayHelper.leafDecay(this, world, x, y, z); + LeafDecayHelper.leafDecay(this, world, pos); // check leaves tile again because they can decay in super.updateTick if (tileLeaves.isInvalid()) { @@ -249,112 +272,84 @@ public class BlockForestryLeaves extends BlockNewLeaf implements ITileEntityProv public boolean isOpaqueCube() { return !Proxies.render.fancyGraphicsEnabled(); } - - @Override - public int getRenderType() { - return PluginArboriculture.modelIdLeaves; - } - - @Override + @SideOnly(Side.CLIENT) - public int colorMultiplier(IBlockAccess world, int x, int y, int z) { + @Override + public int colorMultiplier(IBlockAccess world, BlockPos pos, int renderPass) { - TileLeaves leaves = getLeafTile(world, x, y, z); + TileLeaves leaves = getLeafTile(world,pos); if (leaves == null) { - return super.colorMultiplier(world, x, y, z); + return super.colorMultiplier(world, pos); } int colour = leaves.getFoliageColour(Proxies.common.getClientInstance().thePlayer); if (colour == PluginArboriculture.proxy.getFoliageColorBasic()) { - colour = super.colorMultiplier(world, x, y, z); + colour = super.colorMultiplier(world, pos); } return colour; } - + @Override - public boolean shouldSideBeRendered(IBlockAccess world, int x, int y, int z, int side) { + public boolean shouldSideBeRendered(IBlockAccess worldIn, BlockPos pos, EnumFacing side) { return true; } - - /* ICONS */ - @SideOnly(Side.CLIENT) - private static IIcon defaultIcon; - - @SideOnly(Side.CLIENT) + @Override - public void registerBlockIcons(IIconRegister register) { - TextureLeaves.registerAllIcons(register); - defaultIcon = TextureLeaves.get(EnumLeafType.DECIDUOUS).getFancy(); + @SideOnly(Side.CLIENT) + public EnumWorldBlockLayer getBlockLayer() { + return EnumWorldBlockLayer.CUTOUT; } - - @SideOnly(Side.CLIENT) + + /* MODELS */ @Override - public IIcon getIcon(int side, int metadata) { - return defaultIcon; - } - - @SideOnly(Side.CLIENT) - @Override - public IIcon getIcon(IBlockAccess world, int x, int y, int z, int side) { - TileLeaves leaves = getLeafTile(world, x, y, z); - if (leaves != null) { - return leaves.getIcon(Proxies.render.fancyGraphicsEnabled()); - } - - return defaultIcon; - } - - /* LOCALIZATION */ - @Override - public String[] func_150125_e() { - return new String[0]; + public void registerModel(Item item, IModelManager manager) { + ModelLoader.setCustomModelResourceLocation(item, 0, new ModelResourceLocation("forestry:leaves", "inventory")); } /* PROPERTIES */ @Override - public int getFlammability(IBlockAccess world, int x, int y, int z, ForgeDirection face) { + public int getFlammability(IBlockAccess world, BlockPos pos, EnumFacing face) { return 60; } @Override - public boolean isFlammable(IBlockAccess world, int x, int y, int z, ForgeDirection face) { + public boolean isFlammable(IBlockAccess world, BlockPos pos, EnumFacing face) { return true; } @Override - public int getFireSpreadSpeed(IBlockAccess world, int x, int y, int z, ForgeDirection face) { - if (face == ForgeDirection.DOWN) { + public int getFireSpreadSpeed(IBlockAccess world, BlockPos pos, EnumFacing face) { + if (face == EnumFacing.DOWN) { return 20; - } else if (face != ForgeDirection.UP) { + } else if (face != EnumFacing.UP) { return 10; } else { return 5; } } - + @Override - public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int par6, float par7, float par8, float par9) { - + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumFacing side, float hitX, float hitY, float hitZ) { + ItemStack heldItem = player.getHeldItem(); - TileEntity tile = world.getTileEntity(x, y, z); + TileEntity tile = world.getTileEntity(pos); IButterfly caterpillar = tile instanceof TileLeaves ? ((TileLeaves) tile).getCaterpillar() : null; if (heldItem != null && (heldItem.getItem() instanceof IToolScoop) && caterpillar != null) { ItemStack butterfly = ButterflyManager.butterflyRoot.getMemberStack(caterpillar, EnumFlutterType.CATERPILLAR.ordinal()); - ItemStackUtil.dropItemStackAsEntity(butterfly, world, x, y, z); + ItemStackUtil.dropItemStackAsEntity(butterfly, world, pos); ((TileLeaves) tile).setCaterpillar(null); return true; } - - return super.onBlockActivated(world, x, y, z, player, par6, par7, par8, par9); + + return super.onBlockActivated(world, pos, state, player, side, hitX, hitY, hitZ); } /* IGrowable */ @Override - // canFertilize - public boolean func_149851_a(World world, int x, int y, int z, boolean isClient) { - TileLeaves leafTile = getLeafTile(world, x, y, z); + public boolean canGrow(World world, BlockPos pos, IBlockState state, boolean isClient) { + TileLeaves leafTile = getLeafTile(world, pos); if (leafTile != null) { return leafTile.hasFruit() && leafTile.getRipeness() < 1.0f; } @@ -362,15 +357,13 @@ public class BlockForestryLeaves extends BlockNewLeaf implements ITileEntityProv } @Override - // shouldFertilize - public boolean func_149852_a(World world, Random random, int x, int y, int z) { + public boolean canUseBonemeal(World worldIn, Random rand, BlockPos pos, IBlockState state) { return true; } - + @Override - // fertilize - public void func_149853_b(World world, Random random, int x, int y, int z) { - TileLeaves leafTile = getLeafTile(world, x, y, z); + public void grow(World world, Random rand, BlockPos pos, IBlockState state) { + TileLeaves leafTile = getLeafTile(world, pos); if (leafTile != null) { leafTile.addRipeness(1.0f); } diff --git a/src/main/java/forestry/arboriculture/blocks/BlockFruitPod.java b/src/main/java/forestry/arboriculture/blocks/BlockFruitPod.java index 056f0f834..938a468bf 100644 --- a/src/main/java/forestry/arboriculture/blocks/BlockFruitPod.java +++ b/src/main/java/forestry/arboriculture/blocks/BlockFruitPod.java @@ -11,158 +11,163 @@ package forestry.arboriculture.blocks; import java.util.ArrayList; +import java.util.List; import java.util.Random; - -import net.minecraft.block.Block; import net.minecraft.block.BlockCocoa; -import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.block.properties.IProperty; +import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; +import net.minecraft.util.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - +import net.minecraftforge.common.property.IExtendedBlockState; +import net.minecraftforge.common.property.IUnlistedProperty; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.common.property.ExtendedBlockState; +import forestry.api.arboriculture.IAlleleFruit; +import forestry.api.core.IStateMapperRegister; +import forestry.api.genetics.AlleleManager; +import forestry.api.genetics.IAllele; +import forestry.arboriculture.blocks.property.PropertyFruit; +import forestry.arboriculture.render.StateMapperFluidPod; import forestry.arboriculture.tiles.TileFruitPod; -import forestry.core.render.TextureManager; +import forestry.core.blocks.propertys.UnlistedBlockAccess; +import forestry.core.blocks.propertys.UnlistedBlockPos; +import forestry.core.proxy.Proxies; import forestry.core.utils.BlockUtil; import forestry.core.utils.ItemStackUtil; -import forestry.plugins.PluginArboriculture; -public class BlockFruitPod extends BlockCocoa { +public class BlockFruitPod extends BlockCocoa implements IStateMapperRegister { + public final static PropertyFruit FRUIT = new PropertyFruit("fruit"); + public BlockFruitPod() { super(); } + + @Override + public IBlockState getExtendedState(IBlockState state, IBlockAccess world, BlockPos pos) { + return ((IExtendedBlockState) super.getExtendedState(state, world, pos)).withProperty(UnlistedBlockPos.POS, pos) + .withProperty(UnlistedBlockAccess.BLOCKACCESS, world); + } - public static TileFruitPod getPodTile(IBlockAccess world, int x, int y, int z) { - TileEntity tile = world.getTileEntity(x, y, z); + @Override + protected BlockState createBlockState() { + return new ExtendedBlockState(this, new IProperty[] { FACING, AGE, FRUIT }, + new IUnlistedProperty[] { UnlistedBlockPos.POS, UnlistedBlockAccess.BLOCKACCESS }); + } + + @Override + public IBlockState getActualState(IBlockState state, IBlockAccess world, BlockPos pos) { + TileFruitPod sapling = (TileFruitPod) world.getTileEntity(pos); + IAlleleFruit fruit = sapling.getAllele(); + state = state.withProperty(FRUIT, fruit); + return super.getActualState(state, world, pos); + } + + public static TileFruitPod getPodTile(IBlockAccess world, BlockPos pos) { + TileEntity tile = world.getTileEntity(pos); if (!(tile instanceof TileFruitPod)) { return null; } return (TileFruitPod) tile; } - + @Override - public void updateTick(World world, int x, int y, int z, Random rand) { - - if (!canBlockStay(world, x, y, z)) { - dropBlockAsItem(world, x, y, z, world.getBlockMetadata(x, y, z), 0); - world.setBlockToAir(x, y, z); + public void updateTick(World world, BlockPos pos, IBlockState state, Random rand) { + if (!canBlockStay(world, pos, state)) { + dropBlockAsItem(world, pos, state, 0); + world.setBlockToAir(pos); return; } - TileFruitPod tile = getPodTile(world, x, y, z); + TileFruitPod tile = getPodTile(world, pos); if (tile == null) { return; } tile.onBlockTick(); } - + @Override - public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z) { + public boolean removedByPlayer(World world, BlockPos pos, EntityPlayer player, boolean willHarvest) { if (!world.isRemote) { - TileFruitPod tile = getPodTile(world, x, y, z); + TileFruitPod tile = getPodTile(world, pos); if (tile != null) { for (ItemStack drop : tile.getDrop()) { - ItemStackUtil.dropItemStackAsEntity(drop, world, x, y, z); + ItemStackUtil.dropItemStackAsEntity(drop, world, pos); } } } - return super.removedByPlayer(world, player, x, y, z); + return super.removedByPlayer(world, pos, player, willHarvest); } - + @Override - public ArrayList getDrops(World world, int x, int y, int z, int metadata, int fortune) { + public List getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { return new ArrayList<>(); } - + @Override - public boolean canBlockStay(World world, int x, int y, int z) { - return BlockUtil.getDirectionalMetadata(world, x, y, z) >= 0; + public boolean canBlockStay(World world, BlockPos pos, IBlockState state) { + return BlockUtil.getDirectionalMetadata(world, pos) >= 0; } - + @Override - public void breakBlock(World world, int x, int y, int z, Block block, int meta) { - world.removeTileEntity(x, y, z); - super.breakBlock(world, x, y, z, block, meta); + public void breakBlock(World world, BlockPos pos, IBlockState state) { + world.removeTileEntity(pos); + super.breakBlock(world, pos, state); } - + @Override - public boolean hasTileEntity(int meta) { + public boolean hasTileEntity(IBlockState state) { return true; } - + @Override - public TileEntity createTileEntity(World world, int meta) { + public TileEntity createTileEntity(World world, IBlockState state) { return new TileFruitPod(); } - - /* ICONS */ - @SideOnly(Side.CLIENT) - private static IIcon defaultIcon; - + @SideOnly(Side.CLIENT) @Override - public void registerBlockIcons(IIconRegister register) { - defaultIcon = TextureManager.registerTex(register, "pods/papaya.2"); - } - - @SideOnly(Side.CLIENT) - @Override - public IIcon getIcon(int par1, int par2) { - return defaultIcon; - } - - @SideOnly(Side.CLIENT) - @Override - public IIcon getIcon(IBlockAccess world, int x, int y, int z, int side) { - TileFruitPod pod = getPodTile(world, x, y, z); - if (pod != null) { - IIcon podIcon = pod.getIcon(); - if (podIcon != null) { - return podIcon; - } - } - - return defaultIcon; - } - - @Override - public int getRenderType() { - return PluginArboriculture.modelIdPods; + public void registerStateMapper() { + Proxies.render.registerStateMapper(this, new StateMapperFluidPod()); } /* IGrowable */ - @Override - // canFertilize - public boolean func_149851_a(World world, int x, int y, int z, boolean isClient) { - TileFruitPod podTile = getPodTile(world, x, y, z); + public boolean canGrow(World world, BlockPos pos, IBlockState state, boolean isClient) { + TileFruitPod podTile = getPodTile(world, pos); if (podTile != null) { return podTile.canMature(); } return false; } - + @Override - // shouldFertilize - public boolean func_149852_a(World world, Random random, int x, int y, int z) { + public boolean canUseBonemeal(World world, Random rand, BlockPos pos, IBlockState state) { return true; } - + @Override - // fertilize - public void func_149853_b(World world, Random random, int x, int y, int z) { - TileFruitPod podTile = getPodTile(world, x, y, z); + public void grow(World world, Random rand, BlockPos pos, IBlockState state) { + TileFruitPod podTile = getPodTile(world, pos); if (podTile != null) { podTile.mature(); } } + + public static void registerSprites() { + for (IAllele allele : AlleleManager.alleleRegistry.getRegisteredAlleles().values()) { + if (allele instanceof IAlleleFruit) { + ((IAlleleFruit) allele).getProvider().registerSprites(); + } + } + } } diff --git a/src/main/java/forestry/arboriculture/blocks/BlockLog.java b/src/main/java/forestry/arboriculture/blocks/BlockLog.java index 2fc3bb4fe..5e5556601 100644 --- a/src/main/java/forestry/arboriculture/blocks/BlockLog.java +++ b/src/main/java/forestry/arboriculture/blocks/BlockLog.java @@ -12,76 +12,107 @@ package forestry.arboriculture.blocks; import java.util.List; -import net.minecraft.block.Block; +import net.minecraft.block.properties.IProperty; +import net.minecraft.block.properties.PropertyEnum; +import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.init.Blocks; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.Item; -import net.minecraft.util.IIcon; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.IStringSerializable; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - import forestry.api.arboriculture.EnumWoodType; import forestry.api.arboriculture.TreeManager; -import forestry.arboriculture.render.IconProviderWood; -import forestry.arboriculture.tiles.TileWood; public class BlockLog extends BlockWood { + public static final PropertyEnum AXIS = PropertyEnum.create("axis", Axis.class); + + public static enum Axis implements IStringSerializable { + NORMAL, SIDE, SIDE_90; + + @Override + public String getName() { + return name().toLowerCase(); + } + } + public BlockLog(boolean fireproof) { super("log", fireproof); setResistance(5.0F); + + harvestTool = new String[EnumWoodType.values().length]; + harvestLevel = new int[harvestTool.length]; + for(int i = 0;i < harvestTool.length;i++){ + harvestLevel[i] = -1; + } + setHarvestLevel("axe", 0); + setDefaultState(this.blockState.getBaseState().withProperty(AXIS, Axis.NORMAL).withProperty(EnumWoodType.WOODTYPE, EnumWoodType.LARCH)); } @Override - public int getRenderType() { - return Blocks.log.getRenderType(); + public IBlockState getStateFromMeta(int meta) { + return getDefaultState().withProperty(AXIS, Axis.values()[meta]); } @Override - public void breakBlock(World world, int x, int y, int z, Block block, int meta) { - super.breakBlock(world, x, y, z, block, meta); - + public int getMetaFromState(IBlockState state) { + return ((Axis) state.getValue(AXIS)).ordinal(); + } + + @Override + protected BlockState createBlockState() { + return new BlockState(this, new IProperty[] { EnumWoodType.WOODTYPE, AXIS }); + } + + @Override + public void breakBlock(World world, BlockPos pos, IBlockState state) { + super.breakBlock(world, pos, state); + byte radius = 4; int boundary = radius + 1; + + int x = pos.getX(); + int y = pos.getY(); + int z = pos.getZ(); - if (world.checkChunksExist(x - boundary, y - boundary, z - boundary, x + boundary, y + boundary, z + boundary)) { + if (world.isAreaLoaded(new BlockPos(x - boundary, y - boundary, z - boundary), new BlockPos(x + boundary, y + boundary, z + boundary))) { for (int i = -radius; i <= radius; ++i) { for (int j = -radius; j <= radius; ++j) { for (int k = -radius; k <= radius; ++k) { - Block neighbor = world.getBlock(x + i, y + j, z + k); + IBlockState neighbor = world.getBlockState(new BlockPos(x + i, y + j, z + k)); - neighbor.beginLeavesDecay(world, x + i, y + j, z + k); + neighbor.getBlock().beginLeavesDecay(world, new BlockPos(x + i, y + j, z + k)); } } } } } - + @Override - public int onBlockPlaced(World world, int x, int y, int z, int side, float par6, float par7, float par8, int meta) { + public IBlockState onBlockPlaced(World worldIn, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer) { byte b0 = 0; - switch (side) { - case 0: - case 1: + switch (facing) { + case DOWN: + case UP: b0 = 0; break; - case 2: - case 3: - b0 = 8; + case NORTH: + case SOUTH: + b0 = 1; break; - case 4: - case 5: - b0 = 4; + case WEST: + case EAST: + b0 = 2; } - return meta | b0; + return getStateFromMeta(b0); } @SuppressWarnings({"rawtypes", "unchecked"}) @@ -92,45 +123,27 @@ public class BlockLog extends BlockWood { } } - /* ICONS */ - @Override - @SideOnly(Side.CLIENT) - public IIcon getIcon(int side, int meta) { - return IconProviderWood.getLogIcon(EnumWoodType.LARCH, meta, side); - } - - @Override - public IIcon getIcon(IBlockAccess world, int x, int y, int z, int side) { - int meta = world.getBlockMetadata(x, y, z); - TileWood wood = TileWood.getWoodTile(world, x, y, z); - EnumWoodType type = wood.getWoodType(); - if (type == null) { - return getIcon(side, meta); - } - return IconProviderWood.getLogIcon(type, meta, side); - } - /* PROPERTIES */ @Override - public int getFireSpreadSpeed(IBlockAccess world, int x, int y, int z, ForgeDirection face) { + public int getFireSpreadSpeed(IBlockAccess world, BlockPos pos, EnumFacing face) { if (isFireproof()) { return 0; - } else if (face == ForgeDirection.DOWN) { + } else if (face == EnumFacing.DOWN) { return 20; - } else if (face != ForgeDirection.UP) { + } else if (face != EnumFacing.UP) { return 10; } else { return 5; } } - + @Override - public boolean canSustainLeaves(IBlockAccess world, int x, int y, int z) { + public boolean canSustainLeaves(IBlockAccess world, BlockPos pos) { return true; } - + @Override - public boolean isWood(IBlockAccess world, int x, int y, int z) { + public boolean isWood(IBlockAccess world, BlockPos pos) { return true; } diff --git a/src/main/java/forestry/arboriculture/blocks/BlockPlanks.java b/src/main/java/forestry/arboriculture/blocks/BlockPlanks.java index c51e264bb..577082cc6 100644 --- a/src/main/java/forestry/arboriculture/blocks/BlockPlanks.java +++ b/src/main/java/forestry/arboriculture/blocks/BlockPlanks.java @@ -14,16 +14,8 @@ import java.util.List; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; -import net.minecraft.util.IIcon; -import net.minecraft.world.IBlockAccess; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - import forestry.api.arboriculture.EnumWoodType; import forestry.api.arboriculture.TreeManager; -import forestry.arboriculture.render.IconProviderWood; -import forestry.arboriculture.tiles.TileWood; public class BlockPlanks extends BlockWood { @@ -41,22 +33,4 @@ public class BlockPlanks extends BlockWood { } } - /* ICONS */ - @SideOnly(Side.CLIENT) - @Override - public IIcon getIcon(int side, int meta) { - EnumWoodType woodType = EnumWoodType.LARCH; - if (meta > 0 && meta < EnumWoodType.VALUES.length) { - woodType = EnumWoodType.VALUES[meta]; - } - return IconProviderWood.getPlankIcon(woodType); - } - - @Override - public IIcon getIcon(IBlockAccess world, int x, int y, int z, int side) { - TileWood wood = TileWood.getWoodTile(world, x, y, z); - EnumWoodType woodType = wood.getWoodType(); - return IconProviderWood.getPlankIcon(woodType); - } - } diff --git a/src/main/java/forestry/arboriculture/blocks/BlockRegistryArboriculture.java b/src/main/java/forestry/arboriculture/blocks/BlockRegistryArboriculture.java index f44eb61ff..5c78dfbcc 100644 --- a/src/main/java/forestry/arboriculture/blocks/BlockRegistryArboriculture.java +++ b/src/main/java/forestry/arboriculture/blocks/BlockRegistryArboriculture.java @@ -10,6 +10,8 @@ ******************************************************************************/ package forestry.arboriculture.blocks; +import forestry.arboriculture.genetics.TreeDefinition; +import forestry.arboriculture.genetics.alleles.AlleleFruit; import forestry.arboriculture.items.ItemBlockLeaves; import forestry.arboriculture.items.ItemBlockWood; import forestry.arboriculture.items.ItemBlockWoodSlab; @@ -44,8 +46,8 @@ public class BlockRegistryArboriculture extends BlockRegistry { planks = registerBlock(new BlockPlanks(false), ItemBlockWood.class, "planks"); registerOreDictWildcard("plankWood", planks); - BlockSlab blockSlab = new BlockSlab(false, false); - BlockSlab blockSlabDouble = new BlockSlab(true, false); + BlockSlab blockSlab = new BlockSlab(false); + BlockSlab blockSlabDouble = new BlockSlabDouble(false); slabs = registerBlock(blockSlab, ItemBlockWoodSlab.class, "slabs", blockSlabDouble, blockSlab); registerOreDictWildcard("slabWood", slabs); @@ -63,8 +65,8 @@ public class BlockRegistryArboriculture extends BlockRegistry { planksFireproof = registerBlock(new BlockPlanks(true), ItemBlockWood.class, "planksFireproof"); registerOreDictWildcard("plankWood", planksFireproof); - BlockSlab blockSlabFireproof = new BlockSlab(false, true); - BlockSlab blockSlabDoubleFireproof = new BlockSlab(true, true); + BlockSlab blockSlabFireproof = new BlockSlab(true); + BlockSlab blockSlabDoubleFireproof = new BlockSlabDouble(true); slabsFireproof = registerBlock(blockSlabFireproof, ItemBlockWoodSlab.class, "slabsFireproof", blockSlabDoubleFireproof, blockSlabFireproof); registerOreDictWildcard("slabWood", slabsFireproof); @@ -77,6 +79,7 @@ public class BlockRegistryArboriculture extends BlockRegistry { registerOreDictWildcard("stairWood", stairsFireproof); // Saplings + TreeDefinition.preInit(); saplingGE = registerBlock(new BlockSapling(), ItemBlockForestry.class, "saplingGE"); registerOreDictWildcard("treeSapling", saplingGE); @@ -85,6 +88,7 @@ public class BlockRegistryArboriculture extends BlockRegistry { registerOreDictWildcard("treeLeaves", leaves); // Pods + AlleleFruit.createAlleles(); pods = registerBlock(new BlockFruitPod(), ItemBlockForestry.class, "pods"); // Machines diff --git a/src/main/java/forestry/arboriculture/blocks/BlockSapling.java b/src/main/java/forestry/arboriculture/blocks/BlockSapling.java index e657e55e0..e699ad1e2 100644 --- a/src/main/java/forestry/arboriculture/blocks/BlockSapling.java +++ b/src/main/java/forestry/arboriculture/blocks/BlockSapling.java @@ -11,40 +11,43 @@ package forestry.arboriculture.blocks; import java.util.ArrayList; +import java.util.List; import java.util.Random; - import net.minecraft.block.Block; import net.minecraft.block.IGrowable; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.block.properties.IProperty; +import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.IIcon; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumWorldBlockLayer; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - +import net.minecraftforge.common.IPlantable; import forestry.api.arboriculture.EnumGermlingType; -import forestry.api.arboriculture.IAlleleFruit; import forestry.api.arboriculture.IAlleleTreeSpecies; import forestry.api.arboriculture.TreeManager; -import forestry.api.genetics.AlleleManager; -import forestry.api.genetics.IAllele; +import forestry.api.core.IStateMapperRegister; +import forestry.arboriculture.blocks.property.PropertyTree; +import forestry.arboriculture.render.StateMapperSapling; import forestry.arboriculture.tiles.TileSapling; -import forestry.core.render.TextureManager; +import forestry.core.proxy.Proxies; import forestry.core.tiles.TileUtil; import forestry.core.utils.ItemStackUtil; -import forestry.plugins.PluginArboriculture; -public class BlockSapling extends BlockTreeContainer implements IGrowable { - - public static TileSapling getSaplingTile(IBlockAccess world, int x, int y, int z) { - return TileUtil.getTile(world, x, y, z, TileSapling.class); +public class BlockSapling extends BlockTreeContainer implements IGrowable, IStateMapperRegister { + + /* PROPERTYS */ + public static final PropertyTree TREE = new PropertyTree("tree"); + + public static TileSapling getSaplingTile(IBlockAccess world, BlockPos pos) { + return TileUtil.getTile(world, pos, TileSapling.class); } public BlockSapling() { @@ -62,7 +65,7 @@ public class BlockSapling extends BlockTreeContainer implements IGrowable { /* COLLISION BOX */ @Override - public AxisAlignedBB getCollisionBoundingBoxFromPool(World world, int x, int y, int z) { + public AxisAlignedBB getCollisionBoundingBox(World worldIn, BlockPos pos, IBlockState state) { return null; } @@ -71,62 +74,48 @@ public class BlockSapling extends BlockTreeContainer implements IGrowable { public boolean isOpaqueCube() { return false; } - + @Override - public boolean renderAsNormalBlock() { + public boolean isBlockNormalCube() { return false; } - + @Override - public int getRenderType() { - return PluginArboriculture.modelIdSaplings; + public EnumWorldBlockLayer getBlockLayer() { + return EnumWorldBlockLayer.CUTOUT; } - - /* ICONS */ - @SideOnly(Side.CLIENT) - private static IIcon defaultIcon; - - @SideOnly(Side.CLIENT) + + /* STATES */ + @Override - public void registerBlockIcons(IIconRegister register) { - defaultIcon = TextureManager.registerTex(register, "germlings/sapling.treeBalsa"); - - for (IAllele allele : AlleleManager.alleleRegistry.getRegisteredAlleles().values()) { - if (allele instanceof IAlleleTreeSpecies) { - ((IAlleleTreeSpecies) allele).getIconProvider().registerIcons(register); - } - if (allele instanceof IAlleleFruit) { - ((IAlleleFruit) allele).getProvider().registerIcons(register); - } - } - + public int getMetaFromState(IBlockState state) { + return 0; } - - @SideOnly(Side.CLIENT) + @Override - public IIcon getIcon(int side, int metadata) { - return defaultIcon; + public IBlockState getActualState(IBlockState state, IBlockAccess world, BlockPos pos) { + if(world.getTileEntity(pos) != null && world.getTileEntity(pos) instanceof TileSapling){ + TileSapling sapling = (TileSapling) world.getTileEntity(pos); + IAlleleTreeSpecies species = sapling.getTree().getGenome().getPrimary(); + state = state.withProperty(TREE, species); + } + return super.getActualState(state, world, pos); } - - @SideOnly(Side.CLIENT) + @Override - public IIcon getIcon(IBlockAccess world, int x, int y, int z, int side) { - TileSapling sapling = getSaplingTile(world, x, y, z); - if (sapling == null) { - return defaultIcon; - } - - if (sapling.getTree() == null) { - return defaultIcon; - } - - return sapling.getTree().getGenome().getPrimary().getGermlingIcon(EnumGermlingType.SAPLING, 0); + protected BlockState createBlockState() { + return new BlockState(this, new IProperty[]{TREE}); + } + + @Override + public void registerStateMapper() { + Proxies.render.registerStateMapper(this, new StateMapperSapling()); } /* PLANTING */ @Override - public boolean canBlockStay(World world, int x, int y, int z) { - TileSapling tile = getSaplingTile(world, x, y, z); + public boolean canSustainPlant(IBlockAccess world, BlockPos pos, EnumFacing direction, IPlantable plantable) { + TileSapling tile = getSaplingTile(world, pos); if (tile == null) { return false; } @@ -134,78 +123,76 @@ public class BlockSapling extends BlockTreeContainer implements IGrowable { return false; } - return tile.getTree().canStay(world, x, y, z); + return tile.getTree().canStay(world, pos); } - + @Override - public void onNeighborBlockChange(World world, int x, int y, int z, Block neighbour) { - super.onNeighborBlockChange(world, x, y, z, neighbour); - if (!world.isRemote && !this.canBlockStay(world, x, y, z)) { - dropAsSapling(world, x, y, z); - world.setBlockToAir(x, y, z); + public void onNeighborBlockChange(World world, BlockPos pos, IBlockState state, Block neighborBlock) { + super.onNeighborBlockChange(world, pos, state, neighborBlock); + if (!world.isRemote && !this.canSustainPlant(world, pos, null, null)) { + dropAsSapling(world, pos); + world.setBlockToAir(pos); } - } /* REMOVING */ @Override - public ArrayList getDrops(World world, int x, int y, int z, int metadata, int fortune) { + public List getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { return new ArrayList<>(); } - + @Override - public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z) { - TileSapling sapling = getSaplingTile(world, x, y, z); + public ItemStack getPickBlock(MovingObjectPosition target, World world, BlockPos pos, EntityPlayer player) { + TileSapling sapling = getSaplingTile(world, pos); if (sapling == null || sapling.getTree() == null) { return null; } return TreeManager.treeRoot.getMemberStack(sapling.getTree(), EnumGermlingType.SAPLING.ordinal()); } - + @Override - public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z) { - if (!world.isRemote && canHarvestBlock(player, world.getBlockMetadata(x, y, z))) { + public boolean removedByPlayer(World world, BlockPos pos, EntityPlayer player, boolean willHarvest) { + if (!world.isRemote && canHarvestBlock(world, pos, player)) { if (!player.capabilities.isCreativeMode) { - dropAsSapling(world, x, y, z); + dropAsSapling(world, pos); } } - return world.setBlockToAir(x, y, z); + return world.setBlockToAir(pos); } - private static void dropAsSapling(World world, int x, int y, int z) { + private static void dropAsSapling(World world, BlockPos pos) { if (world.isRemote) { return; } - TileSapling sapling = getSaplingTile(world, x, y, z); + TileSapling sapling = getSaplingTile(world, pos); if (sapling != null && sapling.getTree() != null) { ItemStack saplingStack = TreeManager.treeRoot.getMemberStack(sapling.getTree(), EnumGermlingType.SAPLING.ordinal()); - ItemStackUtil.dropItemStackAsEntity(saplingStack, world, x, y, z); + ItemStackUtil.dropItemStackAsEntity(saplingStack, world, pos); } } + /* GROWNING */ + @Override - /** canFertilize */ - public boolean func_149851_a(World world, int x, int y, int z, boolean isClient) { - TileSapling saplingTile = getSaplingTile(world, x, y, z); + public boolean canUseBonemeal(World world, Random rand, BlockPos pos, IBlockState state) { + TileSapling saplingTile = getSaplingTile(world, pos); if (saplingTile != null) { return saplingTile.canAcceptBoneMeal(); } return true; } - + @Override - /** shouldFertilize */ - public boolean func_149852_a(World world, Random random, int x, int y, int z) { + public boolean canGrow(World world, BlockPos pos, IBlockState state, boolean isClient) { return world.rand.nextFloat() < 0.45F; } @Override - /** fertilize */ - public void func_149853_b(World world, Random random, int x, int y, int z) { - TileSapling saplingTile = getSaplingTile(world, x, y, z); + public void grow(World world, Random rand, BlockPos pos, IBlockState state) { + TileSapling saplingTile = getSaplingTile(world, pos); if (saplingTile != null) { saplingTile.tryGrow(true); } diff --git a/src/main/java/forestry/arboriculture/blocks/BlockSlab.java b/src/main/java/forestry/arboriculture/blocks/BlockSlab.java index b11c31f08..880d72801 100644 --- a/src/main/java/forestry/arboriculture/blocks/BlockSlab.java +++ b/src/main/java/forestry/arboriculture/blocks/BlockSlab.java @@ -15,91 +15,126 @@ import java.util.List; import net.minecraft.block.ITileEntityProvider; import net.minecraft.block.material.Material; +import net.minecraft.block.properties.IProperty; +import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.IBlockState; import net.minecraft.client.particle.EffectRenderer; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; - -import net.minecraftforge.common.util.ForgeDirection; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import forestry.api.arboriculture.EnumWoodType; import forestry.api.arboriculture.TreeManager; +import forestry.api.core.IModelManager; +import forestry.api.core.IItemModelRegister; import forestry.api.core.Tabs; import forestry.arboriculture.IWoodTyped; -import forestry.arboriculture.render.IconProviderWood; +import forestry.arboriculture.items.ItemBlockWood; +import forestry.arboriculture.items.ItemBlockWood.WoodMeshDefinition; import forestry.arboriculture.tiles.TileWood; import forestry.core.render.ParticleHelper; +import forestry.plugins.PluginArboriculture; -public class BlockSlab extends net.minecraft.block.BlockSlab implements IWoodTyped, ITileEntityProvider { +public class BlockSlab extends net.minecraft.block.BlockSlab implements IWoodTyped, IItemModelRegister, ITileEntityProvider { private final ParticleHelper.Callback particleCallback; private final boolean fireproof; + + protected String[] harvestTool; + protected int[] harvestLevel; - public BlockSlab(boolean doubleSlab, boolean fireproof) { - super(doubleSlab, Material.wood); + public BlockSlab(boolean fireproof) { + super(Material.wood); this.fireproof = fireproof; + harvestTool = new String[EnumWoodType.values().length]; + harvestLevel = new int[harvestTool.length]; + for(int i = 0;i < harvestTool.length;i++){ + harvestLevel[i] = -1; + } + setCreativeTab(Tabs.tabArboriculture); setLightOpacity(0); setHardness(2.0F); setResistance(5.0F); setStepSound(soundTypeWood); setHarvestLevel("axe", 0); + + IBlockState iblockstate = this.blockState.getBaseState(); + + if (!isDouble()) + { + iblockstate = iblockstate.withProperty(HALF, EnumBlockHalf.BOTTOM); + } + + setDefaultState(iblockstate.withProperty(EnumWoodType.WOODTYPE, EnumWoodType.LARCH)); this.particleCallback = new ParticleHelper.DefaultCallback(this); } - public boolean isDoubleSlab() { - return field_150004_a; + @Override + protected BlockState createBlockState() { + return this.isDouble() ? new BlockState(this, new IProperty[] { EnumWoodType.WOODTYPE }): new BlockState(this, new IProperty[] { HALF, EnumWoodType.WOODTYPE }); } + + @Override + public IBlockState getStateFromMeta(int meta) { + if (this == PluginArboriculture.blocks.slabsDouble || this == PluginArboriculture.blocks.slabsDoubleFireproof) + return getDefaultState(); + return getDefaultState().withProperty(HALF, EnumBlockHalf.values()[meta]); + } - /* ICONS */ + @Override + public int getMetaFromState(IBlockState state){ + if(!state.getProperties().containsKey(HALF)) { + return 0; + } + return state.getValue(HALF).ordinal(); + } + + @Override + public IBlockState getActualState(IBlockState state, IBlockAccess world, BlockPos pos) { + TileEntity tile = world.getTileEntity(pos); + if (tile instanceof TileWood) { + TileWood wood = (TileWood) tile; + state = state.withProperty(EnumWoodType.WOODTYPE, wood.getWoodType()); + } + return super.getActualState(state, world, pos); + } + @SideOnly(Side.CLIENT) @Override - public void registerBlockIcons(IIconRegister register) { - IconProviderWood.registerIcons(register); + public void registerModel(Item item, IModelManager manager) { + if (!fireproof) { + manager.registerVariant(item, ItemBlockWood.getVariants(this)); + } + manager.registerItemModel(item, new WoodMeshDefinition(this)); } - - /* ICONS */ - @SideOnly(Side.CLIENT) + @Override - public IIcon getIcon(int side, int meta) { - return IconProviderWood.getPlankIcon(EnumWoodType.LARCH); + protected ItemStack createStackedBlock(IBlockState state) { + return new ItemStack(Blocks.wooden_slab, 2, getMetaFromState(state) & 7); } @Override - public IIcon getIcon(IBlockAccess world, int x, int y, int z, int side) { - TileWood wood = TileWood.getWoodTile(world, x, y, z); - EnumWoodType woodType = wood.getWoodType(); - return IconProviderWood.getPlankIcon(woodType); - } - - @Override - protected ItemStack createStackedBlock(int meta) { - return new ItemStack(Blocks.wooden_slab, 2, meta & 7); - } - - @Override - public String func_150002_b(int var1) { + public String getUnlocalizedName(int meta) { return "SomeSlab"; } @SuppressWarnings({"rawtypes", "unchecked"}) @Override public void getSubBlocks(Item item, CreativeTabs par2CreativeTabs, List list) { - if (!isDoubleSlab()) { + if (isDouble()) { for (EnumWoodType woodType : EnumWoodType.VALUES) { list.add(TreeManager.woodItemAccess.getSlab(woodType, fireproof)); } @@ -113,36 +148,36 @@ public class BlockSlab extends net.minecraft.block.BlockSlab implements IWoodTyp /* PROPERTIES */ @Override - public final ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z) { - return TileWood.getPickBlock(this, world, x, y, z); + public ItemStack getPickBlock(MovingObjectPosition target, World world, BlockPos pos, EntityPlayer player) { + return TileWood.getPickBlock(this, world, pos); } /* DROP HANDLING */ // Hack: When harvesting we need to get the drops in onBlockHarvested, // because Mojang destroys the block and tile before calling getDrops. private final ThreadLocal> drops = new ThreadLocal<>(); - + @Override - public void onBlockHarvested(World world, int x, int y, int z, int meta, EntityPlayer playerProfile) { - drops.set(TileWood.getDrops(this, world, x, y, z)); + public void onBlockHarvested(World world, BlockPos pos, IBlockState state, EntityPlayer player) { + drops.set(TileWood.getDrops(this, world, pos)); } - + @Override - public ArrayList getDrops(World world, int x, int y, int z, int metadata, int fortune) { + public List getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { ArrayList ret = drops.get(); drops.remove(); // not harvested, get drops normally if (ret == null) { - ret = TileWood.getDrops(this, world, x, y, z); + ret = TileWood.getDrops(this, world, pos); } return ret; } - + @Override - public final float getBlockHardness(World world, int x, int y, int z) { - TileWood wood = TileWood.getWoodTile(world, x, y, z); + public float getBlockHardness(World world, BlockPos pos) { + TileWood wood = TileWood.getWoodTile(world,pos); if (wood == null) { return EnumWoodType.DEFAULT_HARDNESS; } @@ -150,17 +185,17 @@ public class BlockSlab extends net.minecraft.block.BlockSlab implements IWoodTyp } @Override - public final boolean isFlammable(IBlockAccess world, int x, int y, int z, ForgeDirection face) { + public final boolean isFlammable(IBlockAccess world, BlockPos pos, EnumFacing face) { return !isFireproof(); } @Override - public int getFlammability(IBlockAccess world, int x, int y, int z, ForgeDirection face) { + public int getFlammability(IBlockAccess world, BlockPos pos, EnumFacing face) { return isFireproof() ? 0 : 20; } @Override - public int getFireSpreadSpeed(IBlockAccess world, int x, int y, int z, ForgeDirection face) { + public int getFireSpreadSpeed(IBlockAccess world, BlockPos pos, EnumFacing face) { return isFireproof() ? 0 : 5; } @@ -182,7 +217,7 @@ public class BlockSlab extends net.minecraft.block.BlockSlab implements IWoodTyp // Minecraft's BlockSlab overrides this for their slabs, so we change it back to normal here @Override @SideOnly(Side.CLIENT) - public Item getItem(World world, int x, int y, int z) { + public Item getItem(World worldIn, BlockPos pos) { return Item.getItemFromBlock(this); } @@ -192,10 +227,45 @@ public class BlockSlab extends net.minecraft.block.BlockSlab implements IWoodTyp public boolean addHitEffects(World worldObj, MovingObjectPosition target, EffectRenderer effectRenderer) { return ParticleHelper.addHitEffects(worldObj, this, target, effectRenderer, particleCallback); } - + @SideOnly(Side.CLIENT) @Override - public boolean addDestroyEffects(World worldObj, int x, int y, int z, int meta, EffectRenderer effectRenderer) { - return ParticleHelper.addDestroyEffects(worldObj, this, x, y, z, meta, effectRenderer, particleCallback); + public boolean addDestroyEffects(World world, BlockPos pos, EffectRenderer effectRenderer) { + return ParticleHelper.addDestroyEffects(world, this, world.getBlockState(pos), pos, effectRenderer, particleCallback); } + + @Override + public IProperty getVariantProperty() { + return EnumWoodType.WOODTYPE; + } + + @Override + public boolean isDouble() { + return false; + } + + @Override + public Object getVariant(ItemStack stack) { + return ItemBlockWood.getWoodType(stack); + } + + @Override + public void setHarvestLevel(String toolClass, int level, IBlockState state) + { + int idx = this.getMetaFromState(state); + this.harvestTool[idx] = toolClass; + this.harvestLevel[idx] = level; + } + + @Override + public String getHarvestTool(IBlockState state) + { + return harvestTool[getMetaFromState(state)]; + } + + @Override + public int getHarvestLevel(IBlockState state) + { + return harvestLevel[getMetaFromState(state)]; + } } diff --git a/src/main/java/forestry/arboriculture/blocks/BlockSlabDouble.java b/src/main/java/forestry/arboriculture/blocks/BlockSlabDouble.java new file mode 100644 index 000000000..18924925b --- /dev/null +++ b/src/main/java/forestry/arboriculture/blocks/BlockSlabDouble.java @@ -0,0 +1,14 @@ +package forestry.arboriculture.blocks; + +public class BlockSlabDouble extends BlockSlab { + + public BlockSlabDouble(boolean fireproof) { + super(fireproof); + } + + @Override + public boolean isDouble() { + return true; + } + +} diff --git a/src/main/java/forestry/arboriculture/blocks/BlockTreeContainer.java b/src/main/java/forestry/arboriculture/blocks/BlockTreeContainer.java index 4c0aae430..b09ed213d 100644 --- a/src/main/java/forestry/arboriculture/blocks/BlockTreeContainer.java +++ b/src/main/java/forestry/arboriculture/blocks/BlockTreeContainer.java @@ -14,7 +14,9 @@ import java.util.Random; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; +import net.minecraft.block.state.IBlockState; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import forestry.arboriculture.tiles.TileTreeContainer; @@ -25,25 +27,30 @@ public abstract class BlockTreeContainer extends BlockContainer { super(material); setTickRandomly(true); } - + @Override - public void updateTick(World world, int x, int y, int z, Random rand) { + public void updateTick(World world, BlockPos pos, IBlockState state, Random rand) { if (world.rand.nextFloat() > 0.1) { return; } - TileEntity tile = world.getTileEntity(x, y, z); + TileEntity tile = world.getTileEntity(pos); if (!(tile instanceof TileTreeContainer)) { return; } ((TileTreeContainer) tile).onBlockTick(); } - + @Override - public boolean hasTileEntity(int metadata) { + public boolean hasTileEntity(IBlockState state) { return true; } + + @Override + public int getRenderType() { + return 3; + } } diff --git a/src/main/java/forestry/arboriculture/blocks/BlockWood.java b/src/main/java/forestry/arboriculture/blocks/BlockWood.java index baf06bb37..17330e634 100644 --- a/src/main/java/forestry/arboriculture/blocks/BlockWood.java +++ b/src/main/java/forestry/arboriculture/blocks/BlockWood.java @@ -11,53 +11,77 @@ package forestry.arboriculture.blocks; import java.util.ArrayList; +import java.util.List; import net.minecraft.block.Block; import net.minecraft.block.ITileEntityProvider; import net.minecraft.block.material.Material; +import net.minecraft.block.properties.IProperty; +import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.IBlockState; import net.minecraft.client.particle.EffectRenderer; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; - -import net.minecraftforge.common.util.ForgeDirection; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import forestry.api.arboriculture.EnumWoodType; +import forestry.api.core.IModelManager; +import forestry.api.core.IItemModelRegister; import forestry.api.core.Tabs; import forestry.arboriculture.IWoodTyped; -import forestry.arboriculture.render.IconProviderWood; +import forestry.arboriculture.items.ItemBlockWood; +import forestry.arboriculture.items.ItemBlockWood.WoodMeshDefinition; import forestry.arboriculture.tiles.TileWood; import forestry.core.render.ParticleHelper; -public abstract class BlockWood extends Block implements ITileEntityProvider, IWoodTyped { +public abstract class BlockWood extends Block implements ITileEntityProvider, IItemModelRegister, IWoodTyped { private final ParticleHelper.Callback particleCallback; private final String blockKind; private final boolean fireproof; + + protected String[] harvestTool; + protected int[] harvestLevel; protected BlockWood(String blockKind, boolean fireproof) { super(Material.wood); this.blockKind = blockKind; this.fireproof = fireproof; + + harvestTool = new String[EnumWoodType.values().length]; + harvestLevel = new int[harvestTool.length]; + for(int i = 0;i < harvestTool.length;i++){ + harvestLevel[i] = -1; + } setStepSound(soundTypeWood); setCreativeTab(Tabs.tabArboriculture); particleCallback = new ParticleHelper.DefaultCallback(this); + setDefaultState(this.blockState.getBaseState().withProperty(EnumWoodType.WOODTYPE, EnumWoodType.LARCH)); + } + + @Override + protected BlockState createBlockState() { + return new BlockState(this, new IProperty[] { EnumWoodType.WOODTYPE }); } @Override public final String getBlockKind() { return blockKind; } + + @Override + public int getMetaFromState(IBlockState state) { + return 0; + } @Override public boolean isFireproof() { @@ -66,46 +90,59 @@ public abstract class BlockWood extends Block implements ITileEntityProvider, IW @SideOnly(Side.CLIENT) @Override - public final void registerBlockIcons(IIconRegister register) { - IconProviderWood.registerIcons(register); + public void registerModel(Item item, IModelManager manager) { + if (!fireproof) { + manager.registerVariant(item, ItemBlockWood.getVariants(this)); + } + manager.registerItemModel(item, new WoodMeshDefinition(this)); } + @Override + public IBlockState getActualState(IBlockState state, IBlockAccess world, BlockPos pos) { + TileEntity tile = world.getTileEntity(pos); + if (tile instanceof TileWood) { + TileWood wood = (TileWood) tile; + state = state.withProperty(EnumWoodType.WOODTYPE, wood.getWoodType()); + } + return super.getActualState(state, world, pos); + } + @Override public final TileEntity createNewTileEntity(World world, int meta) { return new TileWood(); } - + @Override - public final ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z) { - return TileWood.getPickBlock(this, world, x, y, z); + public ItemStack getPickBlock(MovingObjectPosition target, World world, BlockPos pos, EntityPlayer player) { + return TileWood.getPickBlock(this, world, pos); } /* DROP HANDLING */ // Hack: When harvesting we need to get the drops in onBlockHarvested, // because Mojang destroys the block and tile before calling getDrops. private final ThreadLocal> drops = new ThreadLocal<>(); - + @Override - public void onBlockHarvested(World world, int x, int y, int z, int meta, EntityPlayer playerProfile) { - drops.set(TileWood.getDrops(this, world, x, y, z)); + public void onBlockHarvested(World world, BlockPos pos, IBlockState state, EntityPlayer player) { + drops.set(TileWood.getDrops(this, world, pos)); } - + @Override - public ArrayList getDrops(World world, int x, int y, int z, int metadata, int fortune) { + public List getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { ArrayList ret = drops.get(); drops.remove(); // not harvested, get drops normally if (ret == null) { - ret = TileWood.getDrops(this, world, x, y, z); + ret = TileWood.getDrops(this, world, pos); } return ret; } - + @Override - public final float getBlockHardness(World world, int x, int y, int z) { - TileWood wood = TileWood.getWoodTile(world, x, y, z); + public float getBlockHardness(World world, BlockPos pos) { + TileWood wood = TileWood.getWoodTile(world, pos); if (wood == null) { return EnumWoodType.DEFAULT_HARDNESS; } @@ -113,22 +150,39 @@ public abstract class BlockWood extends Block implements ITileEntityProvider, IW } @Override - public final boolean isFlammable(IBlockAccess world, int x, int y, int z, ForgeDirection face) { + public final boolean isFlammable(IBlockAccess world, BlockPos pos, EnumFacing face) { return !isFireproof(); } @Override - public int getFlammability(IBlockAccess world, int x, int y, int z, ForgeDirection face) { + public int getFlammability(IBlockAccess world, BlockPos pos, EnumFacing face) { return isFireproof() ? 0 : 20; } @Override - public int getFireSpreadSpeed(IBlockAccess world, int x, int y, int z, ForgeDirection face) { + public int getFireSpreadSpeed(IBlockAccess world, BlockPos pos, EnumFacing face) { return isFireproof() ? 0 : 5; } + + @Override + public void setHarvestLevel(String toolClass, int level, IBlockState state) + { + int idx = this.getMetaFromState(state); + this.harvestTool[idx] = toolClass; + this.harvestLevel[idx] = level; + } - @SideOnly(Side.CLIENT) - public abstract IIcon getIcon(IBlockAccess world, int x, int y, int z, int side); + @Override + public String getHarvestTool(IBlockState state) + { + return harvestTool[getMetaFromState(state)]; + } + + @Override + public int getHarvestLevel(IBlockState state) + { + return harvestLevel[getMetaFromState(state)]; + } /* Particles */ @SideOnly(Side.CLIENT) @@ -136,10 +190,10 @@ public abstract class BlockWood extends Block implements ITileEntityProvider, IW public boolean addHitEffects(World worldObj, MovingObjectPosition target, EffectRenderer effectRenderer) { return ParticleHelper.addHitEffects(worldObj, this, target, effectRenderer, particleCallback); } - + @SideOnly(Side.CLIENT) @Override - public boolean addDestroyEffects(World worldObj, int x, int y, int z, int meta, EffectRenderer effectRenderer) { - return ParticleHelper.addDestroyEffects(worldObj, this, x, y, z, meta, effectRenderer, particleCallback); + public boolean addDestroyEffects(World world, BlockPos pos, EffectRenderer effectRenderer) { + return ParticleHelper.addDestroyEffects(world, this, world.getBlockState(pos), pos, effectRenderer, particleCallback); } } diff --git a/src/main/java/forestry/arboriculture/blocks/property/PropertyFruit.java b/src/main/java/forestry/arboriculture/blocks/property/PropertyFruit.java new file mode 100644 index 000000000..e05629c8d --- /dev/null +++ b/src/main/java/forestry/arboriculture/blocks/property/PropertyFruit.java @@ -0,0 +1,55 @@ +package forestry.arboriculture.blocks.property; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + +import com.google.common.base.Objects; + +import forestry.api.arboriculture.IAlleleFruit; +import forestry.api.arboriculture.IAlleleTreeSpecies; +import forestry.api.genetics.AlleleManager; +import forestry.api.genetics.IAllele; +import forestry.core.blocks.propertys.PropertyAllele; + +public class PropertyFruit extends PropertyAllele { + + public PropertyFruit(String name){ + super(name); + } + + @Override + public Class getValueClass() + { + return IAlleleFruit.class; + } + + @Override + public String toString() + { + return Objects.toStringHelper(this).add("name", this.name).add("clazz", IAlleleFruit.class).add("values", this.getAllowedValues()).toString(); + } + + @Override + public int hashCode() + { + return 31 * IAlleleTreeSpecies.class.hashCode() + this.name.hashCode(); + } + + @Override + public Collection getAllowedValues() { + List trees = new ArrayList<>(); + for(IAllele allele : AlleleManager.alleleRegistry.getRegisteredAlleles().values()){ + if(allele instanceof IAlleleFruit) + if(((IAlleleFruit) allele).getModelName() != null) + trees.add((IAlleleFruit) allele); + } + return trees; + } + + @Override + public String getName(IAlleleFruit value) { + return value.getModelName(); + } + +} diff --git a/src/main/java/forestry/arboriculture/blocks/property/PropertyTree.java b/src/main/java/forestry/arboriculture/blocks/property/PropertyTree.java new file mode 100644 index 000000000..03944938b --- /dev/null +++ b/src/main/java/forestry/arboriculture/blocks/property/PropertyTree.java @@ -0,0 +1,53 @@ +package forestry.arboriculture.blocks.property; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + +import com.google.common.base.Objects; + +import forestry.api.arboriculture.IAlleleTreeSpecies; +import forestry.api.genetics.AlleleManager; +import forestry.api.genetics.IAllele; +import forestry.core.blocks.propertys.PropertyAllele; + +public class PropertyTree extends PropertyAllele { + + public PropertyTree(String name){ + super(name); + } + + @Override + public Class getValueClass() + { + return IAlleleTreeSpecies.class; + } + + @Override + public String toString() + { + return Objects.toStringHelper(this).add("name", this.name).add("clazz", IAlleleTreeSpecies.class).add("values", this.getAllowedValues()).toString(); + } + + @Override + public int hashCode() + { + return 31 * IAlleleTreeSpecies.class.hashCode() + this.name.hashCode(); + } + + @Override + public Collection getAllowedValues() { + List trees = new ArrayList<>(); + for(IAllele allele : AlleleManager.alleleRegistry.getRegisteredAlleles().values()){ + if(allele instanceof IAlleleTreeSpecies) + trees.add((IAlleleTreeSpecies) allele); + } + return trees; + } + + @Override + public String getName(IAlleleTreeSpecies value) { + return value.getModelName().replace("tree", ""); + } + +} diff --git a/src/main/java/forestry/arboriculture/commands/CommandTreeSpawn.java b/src/main/java/forestry/arboriculture/commands/CommandTreeSpawn.java index 00988755a..d5fa374fc 100644 --- a/src/main/java/forestry/arboriculture/commands/CommandTreeSpawn.java +++ b/src/main/java/forestry/arboriculture/commands/CommandTreeSpawn.java @@ -18,12 +18,14 @@ import org.apache.commons.lang3.StringUtils; import net.minecraft.command.ICommandSender; import net.minecraft.command.PlayerNotFoundException; import net.minecraft.entity.player.EntityPlayer; - +import net.minecraft.util.BlockPos; import forestry.api.arboriculture.IAlleleTreeSpecies; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllele; import forestry.core.commands.CommandHelpers; +import forestry.core.commands.SpeciesNotFoundException; import forestry.core.commands.SubCommand; +import forestry.core.commands.TemplateNotFoundException; public final class CommandTreeSpawn extends SubCommand { @@ -36,7 +38,7 @@ public final class CommandTreeSpawn extends SubCommand { } @Override - public final void processSubCommand(ICommandSender sender, String[] arguments) { + public final void processSubCommand(ICommandSender sender, String[] arguments) throws PlayerNotFoundException, SpeciesNotFoundException, TemplateNotFoundException { if (arguments.length < 1 || arguments.length > 2) { printHelp(sender); return; @@ -50,7 +52,7 @@ public final class CommandTreeSpawn extends SubCommand { System.arraycopy(arguments, 0, argumentsWithoutPlayer, 0, arguments.length - 1); treeName = StringUtils.join(argumentsWithoutPlayer, " "); } catch (PlayerNotFoundException e) { - player = CommandHelpers.getPlayer(sender, sender.getCommandSenderName()); + player = CommandHelpers.getPlayer(sender, sender.getName()); treeName = StringUtils.join(arguments, " "); } @@ -61,7 +63,7 @@ public final class CommandTreeSpawn extends SubCommand { } @Override - public List addTabCompletionOptions(ICommandSender sender, String[] parameters) { + public List addTabCompletionOptions(ICommandSender sender, String[] parameters, BlockPos pos) { if (parameters.length == 1) { List tabCompletion = CommandHelpers.getListOfStringsMatchingLastWord(parameters, getSpecies()); tabCompletion.add("help"); diff --git a/src/main/java/forestry/arboriculture/commands/ForestSpawner.java b/src/main/java/forestry/arboriculture/commands/ForestSpawner.java index c13c89e32..eedd68f60 100644 --- a/src/main/java/forestry/arboriculture/commands/ForestSpawner.java +++ b/src/main/java/forestry/arboriculture/commands/ForestSpawner.java @@ -10,14 +10,18 @@ ******************************************************************************/ package forestry.arboriculture.commands; +import forestry.core.commands.SpeciesNotFoundException; +import forestry.core.commands.TemplateNotFoundException; import net.minecraft.command.ICommandSender; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.util.BlockPos; import net.minecraft.util.Vec3; import net.minecraft.world.gen.feature.WorldGenerator; public class ForestSpawner implements ITreeSpawner { - public boolean spawn(ICommandSender sender, String treeName, EntityPlayer player) { + @Override + public boolean spawn(ICommandSender sender, String treeName, EntityPlayer player) throws SpeciesNotFoundException, TemplateNotFoundException { Vec3 look = player.getLookVec(); int x = (int) Math.round(player.posX + (16 * look.xCoord)); @@ -27,12 +31,13 @@ public class ForestSpawner implements ITreeSpawner { for (int i = 0; i < 16; i++) { int spawnX = x + player.worldObj.rand.nextInt(32) - 16; int spawnZ = z + player.worldObj.rand.nextInt(32) - 16; + BlockPos pos = new BlockPos(spawnX, y, spawnZ); - WorldGenerator gen = TreeGenHelper.getWorldGen(treeName, player, spawnX, y, spawnZ); + WorldGenerator gen = TreeGenHelper.getWorldGen(treeName, player, pos); if (gen == null) { return false; } - TreeGenHelper.generateTree(gen, player, spawnX, y, spawnZ); + TreeGenHelper.generateTree(gen, player, pos); } return true; } diff --git a/src/main/java/forestry/arboriculture/commands/ITreeSpawner.java b/src/main/java/forestry/arboriculture/commands/ITreeSpawner.java index ddeec9b99..70064277a 100644 --- a/src/main/java/forestry/arboriculture/commands/ITreeSpawner.java +++ b/src/main/java/forestry/arboriculture/commands/ITreeSpawner.java @@ -10,11 +10,13 @@ ******************************************************************************/ package forestry.arboriculture.commands; +import forestry.core.commands.SpeciesNotFoundException; +import forestry.core.commands.TemplateNotFoundException; import net.minecraft.command.ICommandSender; import net.minecraft.entity.player.EntityPlayer; public interface ITreeSpawner { - boolean spawn(ICommandSender sender, String treeName, EntityPlayer player); + boolean spawn(ICommandSender sender, String treeName, EntityPlayer player) throws SpeciesNotFoundException, TemplateNotFoundException; } diff --git a/src/main/java/forestry/arboriculture/commands/TreeGenHelper.java b/src/main/java/forestry/arboriculture/commands/TreeGenHelper.java index 0d3390739..cc2bac860 100644 --- a/src/main/java/forestry/arboriculture/commands/TreeGenHelper.java +++ b/src/main/java/forestry/arboriculture/commands/TreeGenHelper.java @@ -11,6 +11,7 @@ package forestry.arboriculture.commands; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.util.BlockPos; import net.minecraft.world.gen.feature.WorldGenerator; import forestry.api.arboriculture.IAlleleTreeSpecies; @@ -25,25 +26,25 @@ import forestry.core.worldgen.WorldGenBase; public final class TreeGenHelper { - public static WorldGenerator getWorldGen(String treeName, EntityPlayer player, int x, int y, int z) { + public static WorldGenerator getWorldGen(String treeName, EntityPlayer player, BlockPos pos) throws SpeciesNotFoundException, TemplateNotFoundException { ITreeGenome treeGenome = getTreeGenome(treeName); if (treeGenome == null) { return null; } ITree tree = TreeManager.treeRoot.getTree(player.worldObj, treeGenome); - return tree.getTreeGenerator(player.worldObj, x, y, z, true); + return tree.getTreeGenerator(player.worldObj, pos, true); } - public static void generateTree(WorldGenerator gen, EntityPlayer player, int x, int y, int z) { + public static void generateTree(WorldGenerator gen, EntityPlayer player, BlockPos pos) { if (gen instanceof WorldGenBase) { - ((WorldGenBase) gen).generate(player.worldObj, x, y, z, true); + ((WorldGenBase) gen).generate(player.worldObj, pos, true); } else { - gen.generate(player.worldObj, player.worldObj.rand, x, y, z); + gen.generate(player.worldObj, player.worldObj.rand, pos); } } - private static ITreeGenome getTreeGenome(String speciesName) { + private static ITreeGenome getTreeGenome(String speciesName) throws SpeciesNotFoundException, TemplateNotFoundException { IAlleleTreeSpecies species = null; for (String uid : AlleleManager.alleleRegistry.getRegisteredAlleles().keySet()) { diff --git a/src/main/java/forestry/arboriculture/commands/TreeSpawner.java b/src/main/java/forestry/arboriculture/commands/TreeSpawner.java index 3bf02f05d..2920c9860 100644 --- a/src/main/java/forestry/arboriculture/commands/TreeSpawner.java +++ b/src/main/java/forestry/arboriculture/commands/TreeSpawner.java @@ -10,27 +10,31 @@ ******************************************************************************/ package forestry.arboriculture.commands; +import forestry.core.commands.SpeciesNotFoundException; +import forestry.core.commands.TemplateNotFoundException; import net.minecraft.command.ICommandSender; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.util.BlockPos; import net.minecraft.util.Vec3; import net.minecraft.world.gen.feature.WorldGenerator; public class TreeSpawner implements ITreeSpawner { @Override - public boolean spawn(ICommandSender sender, String treeName, EntityPlayer player) { + public boolean spawn(ICommandSender sender, String treeName, EntityPlayer player) throws SpeciesNotFoundException, TemplateNotFoundException { Vec3 look = player.getLookVec(); int x = (int) Math.round(player.posX + (3 * look.xCoord)); int y = (int) Math.round(player.posY); int z = (int) Math.round(player.posZ + (3 * look.zCoord)); + BlockPos pos = new BlockPos(x, y, z); - WorldGenerator gen = TreeGenHelper.getWorldGen(treeName, player, x, y, z); + WorldGenerator gen = TreeGenHelper.getWorldGen(treeName, player, pos); if (gen == null) { return false; } - TreeGenHelper.generateTree(gen, player, x, y, z); + TreeGenHelper.generateTree(gen, player, pos); return true; } diff --git a/src/main/java/forestry/arboriculture/genetics/GrowthProvider.java b/src/main/java/forestry/arboriculture/genetics/GrowthProvider.java index 24de32a2e..35c49cdf0 100755 --- a/src/main/java/forestry/arboriculture/genetics/GrowthProvider.java +++ b/src/main/java/forestry/arboriculture/genetics/GrowthProvider.java @@ -11,6 +11,7 @@ package forestry.arboriculture.genetics; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; @@ -26,21 +27,21 @@ import forestry.core.utils.vect.Vect; public class GrowthProvider implements IGrowthProvider { @Override - public boolean canGrow(ITreeGenome genome, World world, int xPos, int yPos, int zPos, int expectedGirth, int expectedHeight) { - if (!hasRoom(world, xPos, yPos, zPos, expectedGirth, expectedHeight)) { + public boolean canGrow(ITreeGenome genome, World world, BlockPos pos, int expectedGirth, int expectedHeight) { + if (!hasRoom(world, pos, expectedGirth, expectedHeight)) { return false; } - if (getGrowthConditions(genome, world, xPos, yPos, zPos) == EnumGrowthConditions.HOSTILE) { + if (getGrowthConditions(genome, world, pos) == EnumGrowthConditions.HOSTILE) { return false; } - return hasSufficientSaplings(genome, world, xPos, yPos, zPos, expectedGirth); + return hasSufficientSaplings(genome, world, pos, expectedGirth); } @Override - public EnumGrowthConditions getGrowthConditions(ITreeGenome genome, World world, int xPos, int yPos, int zPos) { - return getConditionFromLight(world, xPos, yPos, zPos); + public EnumGrowthConditions getGrowthConditions(ITreeGenome genome, World world, BlockPos pos) { + return getConditionFromLight(world, pos); } @Override @@ -53,9 +54,9 @@ public class GrowthProvider implements IGrowthProvider { return new String[0]; } - protected static EnumGrowthConditions getConditionsFromRainfall(World world, int xPos, int yPos, int zPos, float min, float max) { + protected static EnumGrowthConditions getConditionsFromRainfall(World world, BlockPos pos, float min, float max) { - BiomeGenBase biome = world.getWorldChunkManager().getBiomeGenAt(xPos, zPos); + BiomeGenBase biome = world.getWorldChunkManager().getBiomeGenerator(pos); if (biome.rainfall < min || biome.rainfall > max) { return EnumGrowthConditions.HOSTILE; } @@ -63,10 +64,10 @@ public class GrowthProvider implements IGrowthProvider { return EnumGrowthConditions.EXCELLENT; } - protected static EnumGrowthConditions getConditionsFromTemperature(World world, int xPos, int yPos, int zPos, float min, float max) { + protected static EnumGrowthConditions getConditionsFromTemperature(World world, BlockPos pos, float min, float max) { - BiomeGenBase biome = world.getWorldChunkManager().getBiomeGenAt(xPos, zPos); - float biomeTemperature = biome.getFloatTemperature(xPos, yPos, zPos); + BiomeGenBase biome = world.getWorldChunkManager().getBiomeGenerator(pos); + float biomeTemperature = biome.getFloatTemperature(pos); if (biomeTemperature < min || biomeTemperature > max) { return EnumGrowthConditions.HOSTILE; } @@ -74,8 +75,8 @@ public class GrowthProvider implements IGrowthProvider { return EnumGrowthConditions.EXCELLENT; } - protected static EnumGrowthConditions getConditionFromLight(World world, int xPos, int yPos, int zPos) { - int lightvalue = world.getBlockLightValue(xPos, yPos + 1, zPos); + protected static EnumGrowthConditions getConditionFromLight(World world, BlockPos pos) { + int lightvalue = world.getLightFromNeighbors(pos.add(0, 1, 0)); if (lightvalue > 13) { return EnumGrowthConditions.EXCELLENT; @@ -90,22 +91,23 @@ public class GrowthProvider implements IGrowthProvider { } } - private static boolean hasRoom(World world, int xPos, int yPos, int zPos, int expectedGirth, int expectedHeight) { + private static boolean hasRoom(World world, BlockPos pos, int expectedGirth, int expectedHeight) { int offset = (expectedGirth - 1) / 2; // if(offset <= 0) // offset = 1; - Vect start = new Vect(xPos - offset, yPos + 1, zPos + offset); + Vect start = new Vect(pos.getX() - offset, pos.getY() + 1, pos.getZ() + offset); Vect area = new Vect(-offset + expectedGirth, expectedHeight + 1, -offset + expectedGirth); return checkArea(world, start, area); } private static boolean checkArea(World world, Vect start, Vect area) { - for (int x = start.x; x < start.x + area.x; x++) { - for (int y = start.y; y < start.y + area.y; y++) { - for (int z = start.z; z < start.z + area.z; z++) { - if (!world.isAirBlock(x, y, z) && !BlockUtil.isReplaceableBlock(world, x, y, z)) { + for (int x = start.getX(); x < start.getX() + area.getX(); x++) { + for (int y = start.getY(); y < start.getY() + area.getY(); y++) { + for (int z = start.getZ(); z < start.getZ() + area.getZ(); z++) { + BlockPos pos = new BlockPos(x, y, z); + if (!world.isAirBlock(pos) && !BlockUtil.isReplaceableBlock(world, pos)) { return false; } } @@ -114,7 +116,7 @@ public class GrowthProvider implements IGrowthProvider { return true; } - private static boolean hasSufficientSaplings(ITreeGenome genome, World world, int xPos, int yPos, int zPos, int expectedGirth) { + private static boolean hasSufficientSaplings(ITreeGenome genome, World world, BlockPos pos, int expectedGirth) { if (expectedGirth == 1) { return true; @@ -122,14 +124,16 @@ public class GrowthProvider implements IGrowthProvider { int offset = (expectedGirth - 1) / 2; - for (int x = xPos - offset; x < xPos - offset + expectedGirth; x++) { - for (int z = zPos - offset; z < zPos - offset + expectedGirth; z++) { + for (int x = pos.getX() - offset; x < pos.getX() - offset + expectedGirth; x++) { + for (int z = pos.getZ() - offset; z < pos.getZ() - offset + expectedGirth; z++) { - if (world.isAirBlock(x, yPos, z)) { + BlockPos newPos = new BlockPos(x, pos.getY(), z); + + if (world.isAirBlock(newPos)) { return false; } - TileEntity tile = world.getTileEntity(x, yPos, z); + TileEntity tile = world.getTileEntity(newPos); if (!(tile instanceof TileSapling)) { return false; } diff --git a/src/main/java/forestry/arboriculture/genetics/GrowthProviderTropical.java b/src/main/java/forestry/arboriculture/genetics/GrowthProviderTropical.java index 2e02d6c01..3c5cb5cba 100755 --- a/src/main/java/forestry/arboriculture/genetics/GrowthProviderTropical.java +++ b/src/main/java/forestry/arboriculture/genetics/GrowthProviderTropical.java @@ -12,6 +12,7 @@ package forestry.arboriculture.genetics; import java.util.EnumSet; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; @@ -22,13 +23,13 @@ import forestry.core.utils.StringUtil; public class GrowthProviderTropical extends GrowthProvider { @Override - public EnumGrowthConditions getGrowthConditions(ITreeGenome genome, World world, int xPos, int yPos, int zPos) { - EnumGrowthConditions light = getConditionFromLight(world, xPos, yPos, zPos); - EnumGrowthConditions moisture = getConditionsFromRainfall(world, xPos, yPos, zPos, BiomeGenBase.jungle.rainfall, 2.0f); + public EnumGrowthConditions getGrowthConditions(ITreeGenome genome, World world, BlockPos pos) { + EnumGrowthConditions light = getConditionFromLight(world, pos); + EnumGrowthConditions moisture = getConditionsFromRainfall(world, pos, BiomeGenBase.jungle.rainfall, 2.0f); - float jungleTemperature = BiomeGenBase.jungle.getFloatTemperature(xPos, yPos, zPos); - float desertTemperature = BiomeGenBase.desert.getFloatTemperature(xPos, yPos, zPos); - EnumGrowthConditions temperature = getConditionsFromTemperature(world, xPos, yPos, zPos, jungleTemperature, desertTemperature - 0.1f); + float jungleTemperature = BiomeGenBase.jungle.getFloatTemperature(pos); + float desertTemperature = BiomeGenBase.desert.getFloatTemperature(pos); + EnumGrowthConditions temperature = getConditionsFromTemperature(world, pos, jungleTemperature, desertTemperature - 0.1f); EnumSet conditions = EnumSet.of(light, moisture, temperature); diff --git a/src/main/java/forestry/arboriculture/genetics/Tree.java b/src/main/java/forestry/arboriculture/genetics/Tree.java index 43f874817..653a1a239 100755 --- a/src/main/java/forestry/arboriculture/genetics/Tree.java +++ b/src/main/java/forestry/arboriculture/genetics/Tree.java @@ -17,9 +17,12 @@ import java.util.EnumSet; import java.util.List; import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.BlockPos; import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.EnumFacing; import net.minecraft.util.StatCollector; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -29,8 +32,6 @@ import com.mojang.authlib.GameProfile; import net.minecraftforge.common.EnumPlantType; import net.minecraftforge.common.IPlantable; -import net.minecraftforge.common.util.ForgeDirection; - import forestry.api.arboriculture.EnumGrowthConditions; import forestry.api.arboriculture.EnumTreeChromosome; import forestry.api.arboriculture.IAlleleLeafEffect; @@ -52,6 +53,7 @@ import forestry.arboriculture.genetics.alleles.AlleleFruit; import forestry.core.config.Config; import forestry.core.genetics.Chromosome; import forestry.core.genetics.Individual; +import forestry.core.utils.BlockUtil; import forestry.core.utils.StringUtil; public class Tree extends Individual implements ITree, IPlantable { @@ -115,14 +117,14 @@ public class Tree extends Individual implements ITree, IPlantable { /* EFFECTS */ @Override - public IEffectData[] doEffect(IEffectData[] storedData, World world, int x, int y, int z) { + public IEffectData[] doEffect(IEffectData[] storedData, World world, BlockPos pos) { IAlleleLeafEffect effect = (IAlleleLeafEffect) getGenome().getActiveAllele(EnumTreeChromosome.EFFECT); if (effect == null) { return null; } - storedData[0] = doEffect(effect, storedData[0], world, x, y, z); + storedData[0] = doEffect(effect, storedData[0], world, pos); // Return here if the primary can already not be combined if (!effect.isCombinable()) { @@ -134,37 +136,37 @@ public class Tree extends Individual implements ITree, IPlantable { return storedData; } - storedData[1] = doEffect(secondary, storedData[1], world, x, y, z); + storedData[1] = doEffect(secondary, storedData[1], world, pos); return storedData; } - private IEffectData doEffect(IAlleleLeafEffect effect, IEffectData storedData, World world, int x, int y, int z) { + private IEffectData doEffect(IAlleleLeafEffect effect, IEffectData storedData, World world, BlockPos pos) { storedData = effect.validateStorage(storedData); - return effect.doEffect(getGenome(), storedData, world, x, y, z); + return effect.doEffect(getGenome(), storedData, world, pos); } @Override - public IEffectData[] doFX(IEffectData[] storedData, World world, int x, int y, int z) { + public IEffectData[] doFX(IEffectData[] storedData, World world, BlockPos pos) { return null; } /* GROWTH */ @Override - public WorldGenerator getTreeGenerator(World world, int x, int y, int z, boolean wasBonemealed) { + public WorldGenerator getTreeGenerator(World world, BlockPos pos, boolean wasBonemealed) { return genome.getPrimary().getGenerator().getWorldGenerator(this); } @Override - public boolean canStay(World world, int x, int y, int z) { - Block block = world.getBlock(x, y - 1, z); + public boolean canStay(IBlockAccess world, BlockPos pos) { + Block block = BlockUtil.getBlock(world, pos.add(0, -1, 0)); if (block == null) { return false; } for (EnumPlantType type : getPlantTypes()) { this.plantType = type; - if (block.canSustainPlant(world, x, y - 1, z, ForgeDirection.UP, this)) { + if (block.canSustainPlant(world, pos.add(0, -1, 0), EnumFacing.UP, this)) { return true; } } @@ -173,24 +175,19 @@ public class Tree extends Individual implements ITree, IPlantable { } @Override - public EnumPlantType getPlantType(IBlockAccess world, int x, int y, int z) { + public EnumPlantType getPlantType(IBlockAccess world, BlockPos pos) { return plantType; } @Override - public Block getPlant(IBlockAccess world, int x, int y, int z) { - return null; + public IBlockState getPlant(IBlockAccess world, BlockPos pos) { + return world.getBlockState(pos); } @Override - public int getPlantMetadata(IBlockAccess world, int x, int y, int z) { - return 0; - } - - @Override - public boolean canGrow(World world, int x, int y, int z, int expectedGirth, int expectedHeight) { + public boolean canGrow(World world, BlockPos pos, int expectedGirth, int expectedHeight) { IGrowthProvider growthProvider = genome.getGrowthProvider(); - return growthProvider.canGrow(genome, world, x, y, z, expectedGirth, expectedHeight); + return growthProvider.canGrow(genome, world, pos, expectedGirth, expectedHeight); } @Override @@ -199,12 +196,12 @@ public class Tree extends Individual implements ITree, IPlantable { } @Override - public EnumGrowthConditions getGrowthCondition(World world, int x, int y, int z) { - return genome.getGrowthProvider().getGrowthConditions(getGenome(), world, x, y, z); + public EnumGrowthConditions getGrowthCondition(World world, BlockPos pos) { + return genome.getGrowthProvider().getGrowthConditions(getGenome(), world, pos); } @Override - public int getGirth(World world, int x, int y, int z) { + public int getGirth(World world, BlockPos pos) { return genome.getGirth(); } @@ -220,30 +217,18 @@ public class Tree extends Individual implements ITree, IPlantable { } @Override - public void setLeaves(World world, GameProfile owner, int x, int y, int z) { - try { - genome.getPrimary().getGenerator().setLeaves(genome, world, owner, x, y, z, false); - } catch (Throwable ignored) { - genome.getPrimary().getGenerator().setLeaves(world, owner, x, y, z, false); - } + public void setLeaves(World world, GameProfile owner, BlockPos pos) { + genome.getPrimary().getGenerator().setLeaves(genome, world, owner, pos, false); } @Override - public void setLeavesDecorative(World world, GameProfile owner, int x, int y, int z) { - try { - genome.getPrimary().getGenerator().setLeaves(genome, world, owner, x, y, z, true); - } catch (Throwable ignored) { - genome.getPrimary().getGenerator().setLeaves(world, owner, x, y, z, true); - } + public void setLeavesDecorative(World world, GameProfile owner, BlockPos pos) { + genome.getPrimary().getGenerator().setLeaves(genome, world, owner, pos, true); } @Override - public void setLogBlock(World world, int x, int y, int z, ForgeDirection facing) { - try { - genome.getPrimary().getGenerator().setLogBlock(genome, world, x, y, z, facing); - } catch (Throwable ignored) { - genome.getPrimary().getGenerator().setLogBlock(world, x, y, z, facing); - } + public void setLogBlock(World world, BlockPos pos, EnumFacing facing) { + genome.getPrimary().getGenerator().setLogBlock(genome, world, pos, facing); } @Override @@ -258,14 +243,14 @@ public class Tree extends Individual implements ITree, IPlantable { } @Override - public boolean trySpawnFruitBlock(World world, int x, int y, int z) { + public boolean trySpawnFruitBlock(World world, BlockPos pos) { IFruitProvider provider = getGenome().getFruitProvider(); Collection suitable = genome.getPrimary().getSuitableFruit(); if (!suitable.contains(provider.getFamily())) { return false; } - return provider.trySpawnFruitBlock(getGenome(), world, x, y, z); + return provider.trySpawnFruitBlock(getGenome(), world, pos); } /* INFORMATION */ @@ -346,7 +331,7 @@ public class Tree extends Individual implements ITree, IPlantable { /* REPRODUCTION */ @Override - public ITree[] getSaplings(World world, GameProfile playerProfile, int x, int y, int z, float modifier) { + public ITree[] getSaplings(World world, GameProfile playerProfile, BlockPos pos, float modifier) { ArrayList prod = new ArrayList<>(); float chance = genome.getFertility() * modifier; @@ -355,14 +340,14 @@ public class Tree extends Individual implements ITree, IPlantable { if (this.getMate() == null) { prod.add(TreeManager.treeRoot.getTree(world, new TreeGenome(genome.getChromosomes()))); } else { - prod.add(createOffspring(world, playerProfile, x, y, z)); + prod.add(createOffspring(world, playerProfile, pos)); } } return prod.toArray(new ITree[prod.size()]); } - private ITree createOffspring(World world, GameProfile playerProfile, int x, int y, int z) { + private ITree createOffspring(World world, GameProfile playerProfile, BlockPos pos) { IChromosome[] chromosomes = new IChromosome[genome.getChromosomes().length]; IChromosome[] parent1 = genome.getChromosomes(); @@ -370,9 +355,9 @@ public class Tree extends Individual implements ITree, IPlantable { // Check for mutation. Replace one of the parents with the mutation // template if mutation occured. - IChromosome[] mutated = mutateSpecies(world, playerProfile, x, y, z, genome, mate); + IChromosome[] mutated = mutateSpecies(world, playerProfile, pos, genome, mate); if (mutated == null) { - mutated = mutateSpecies(world, playerProfile, x, y, z, mate, genome); + mutated = mutateSpecies(world, playerProfile, pos, mate, genome); } if (mutated != null) { @@ -388,7 +373,7 @@ public class Tree extends Individual implements ITree, IPlantable { return new Tree(new TreeGenome(chromosomes)); } - private static IChromosome[] mutateSpecies(World world, @Nullable GameProfile playerProfile, int x, int y, int z, ITreeGenome genomeOne, ITreeGenome genomeTwo) { + private static IChromosome[] mutateSpecies(World world, @Nullable GameProfile playerProfile, BlockPos pos, ITreeGenome genomeOne, ITreeGenome genomeTwo) { IChromosome[] parent1 = genomeOne.getChromosomes(); IChromosome[] parent2 = genomeTwo.getChromosomes(); @@ -425,7 +410,7 @@ public class Tree extends Individual implements ITree, IPlantable { // continue; // } - float chance = treeMutation.getChance(world, x, y, z, allele0, allele1, genome0, genome1); + float chance = treeMutation.getChance(world, pos, allele0, allele1, genome0, genome1); if (chance <= 0) { continue; } @@ -462,8 +447,8 @@ public class Tree extends Individual implements ITree, IPlantable { } @Override - public ItemStack[] produceStacks(World world, int x, int y, int z, int ripeningTime) { - return genome.getFruitProvider().getFruits(genome, world, x, y, z, ripeningTime); + public ItemStack[] produceStacks(World world, BlockPos pos, int ripeningTime) { + return genome.getFruitProvider().getFruits(genome, world, pos, ripeningTime); } } diff --git a/src/main/java/forestry/arboriculture/genetics/TreeDefinition.java b/src/main/java/forestry/arboriculture/genetics/TreeDefinition.java index 82a8d8679..7bf9ea683 100644 --- a/src/main/java/forestry/arboriculture/genetics/TreeDefinition.java +++ b/src/main/java/forestry/arboriculture/genetics/TreeDefinition.java @@ -16,21 +16,21 @@ import java.util.Arrays; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; import com.mojang.authlib.GameProfile; -import net.minecraftforge.common.util.ForgeDirection; - import forestry.api.arboriculture.EnumFruitFamily; import forestry.api.arboriculture.EnumGermlingType; import forestry.api.arboriculture.EnumLeafType; import forestry.api.arboriculture.EnumTreeChromosome; import forestry.api.arboriculture.EnumWoodType; import forestry.api.arboriculture.IAlleleTreeSpeciesCustom; -import forestry.api.arboriculture.IGermlingIconProvider; -import forestry.api.arboriculture.ILeafIconProvider; +import forestry.api.arboriculture.IGermlingModelProvider; +import forestry.api.arboriculture.ILeafSpriteProvider; import forestry.api.arboriculture.ITree; import forestry.api.arboriculture.ITreeGenerator; import forestry.api.arboriculture.ITreeGenome; @@ -43,8 +43,8 @@ import forestry.api.world.ITreeGenData; import forestry.arboriculture.blocks.BlockForestryLeaves; import forestry.arboriculture.genetics.alleles.AlleleFruit; import forestry.arboriculture.genetics.alleles.AlleleGrowth; -import forestry.arboriculture.render.IconProviderGermling; -import forestry.arboriculture.render.IconProviderGermlingVanilla; +import forestry.arboriculture.render.ModelProviderGermling; +import forestry.arboriculture.render.ModelProviderGermlingVanilla; import forestry.arboriculture.tiles.TileLeaves; import forestry.arboriculture.worldgen.BlockTypeLog; import forestry.arboriculture.worldgen.WorldGenAcacia; @@ -87,6 +87,7 @@ import forestry.core.genetics.alleles.AlleleBoolean; import forestry.core.genetics.alleles.AlleleHelper; import forestry.core.genetics.alleles.AllelePlantType; import forestry.core.genetics.alleles.EnumAllele; +import forestry.core.utils.BlockUtil; import forestry.plugins.PluginArboriculture; public enum TreeDefinition implements ITreeDefinition, ITreeGenerator { @@ -959,13 +960,14 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator { String uid = "forestry.tree" + this; String unlocalizedDescription = "for.description.tree" + this; String unlocalizedName = "for.trees.species." + speciesName; + String modelName = uid.substring("forestry.".length()); this.branch = branch; - ILeafIconProvider leafIconProvider = TreeManager.treeFactory.getLeafIconProvider(leafType, primary, secondary); - IGermlingIconProvider germlingIconProvider = new IconProviderGermlingVanilla(vanillaMeta); + ILeafSpriteProvider leafIconProvider = TreeManager.treeFactory.getLeafIconProvider(leafType, primary, secondary); + IGermlingModelProvider germlingIconProvider = new ModelProviderGermlingVanilla(vanillaMeta); - this.species = TreeManager.treeFactory.createSpecies(uid, unlocalizedName, "Sengir", unlocalizedDescription, dominant, branch.getBranch(), binomial, leafIconProvider, germlingIconProvider, this); + this.species = TreeManager.treeFactory.createSpecies(uid, unlocalizedName, "Sengir", unlocalizedDescription, dominant, branch.getBranch(), binomial, modelName, leafIconProvider, germlingIconProvider, this); this.woodType = null; this.vanillaWood = vanillaWood; } @@ -975,13 +977,14 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator { String uid = "forestry.tree" + this; String unlocalizedDescription = "for.description.tree" + this; String unlocalizedName = "for.trees.species." + speciesName; + String modelName = uid.substring("forestry.".length()); this.branch = branch; - ILeafIconProvider leafIconProvider = TreeManager.treeFactory.getLeafIconProvider(leafType, primary, secondary); - IGermlingIconProvider germlingIconProvider = new IconProviderGermling(uid); + ILeafSpriteProvider leafIconProvider = TreeManager.treeFactory.getLeafIconProvider(leafType, primary, secondary); + IGermlingModelProvider germlingIconProvider = new ModelProviderGermling(uid); - this.species = TreeManager.treeFactory.createSpecies(uid, unlocalizedName, "Sengir", unlocalizedDescription, dominant, branch.getBranch(), binomial, leafIconProvider, germlingIconProvider, this); + this.species = TreeManager.treeFactory.createSpecies(uid, unlocalizedName, "Sengir", unlocalizedDescription, dominant, branch.getBranch(), binomial, modelName, leafIconProvider, germlingIconProvider, this); this.woodType = woodType; this.vanillaWood = null; } @@ -993,7 +996,7 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator { protected abstract void registerMutations(); @Override - public void setLogBlock(ITreeGenome genome, World world, int x, int y, int z, ForgeDirection facing) { + public void setLogBlock(ITreeGenome genome, World world, BlockPos pos, EnumFacing facing) { if (woodType == null) { Block vanillaWoodBlock = Block.getBlockFromItem(vanillaWood.getItem()); int vanillaWoodMeta = vanillaWood.getItemDamage(); @@ -1008,7 +1011,7 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator { break; } - world.setBlock(x, y, z, vanillaWoodBlock, vanillaWoodMeta, Constants.FLAG_BLOCK_SYNCH); + world.setBlockState(pos, vanillaWoodBlock.getStateFromMeta(vanillaWoodMeta), Constants.FLAG_BLOCK_SYNCH); } else { AlleleBoolean fireproofAllele = (AlleleBoolean) genome.getActiveAllele(EnumTreeChromosome.FIREPROOF); boolean fireproof = fireproofAllele.getValue(); @@ -1016,31 +1019,26 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator { BlockTypeLog logBlock = new BlockTypeLog(log); logBlock.setDirection(facing); - logBlock.setBlock(world, x, y, z); + logBlock.setBlock(world, pos); } } @Override - public void setLogBlock(World world, int x, int y, int z, ForgeDirection facing) { - setLogBlock(genome, world, x, y, z, facing); - } - - @Override - public void setLeaves(ITreeGenome genome, World world, GameProfile owner, int x, int y, int z, boolean decorative) { - boolean placed = world.setBlock(x, y, z, PluginArboriculture.blocks.leaves, 0, Constants.FLAG_BLOCK_SYNCH_AND_UPDATE); + public void setLeaves(ITreeGenome genome, World world, GameProfile owner, BlockPos pos, boolean decorative) { + boolean placed = world.setBlockState(pos, PluginArboriculture.blocks.leaves.getStateFromMeta(0), Constants.FLAG_BLOCK_SYNCH_AND_UPDATE); if (!placed) { return; } - Block block = world.getBlock(x, y, z); + Block block = BlockUtil.getBlock(world, pos); if (PluginArboriculture.blocks.leaves != block) { - world.setBlockToAir(x, y, z); + world.setBlockToAir(pos); return; } - TileLeaves tileLeaves = BlockForestryLeaves.getLeafTile(world, x, y, z); + TileLeaves tileLeaves = BlockForestryLeaves.getLeafTile(world, pos); if (tileLeaves == null) { - world.setBlockToAir(x, y, z); + world.setBlockToAir(pos); return; } @@ -1050,12 +1048,7 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator { } tileLeaves.setTree(new Tree(genome)); - world.markBlockForUpdate(x, y, z); - } - - @Override - public void setLeaves(World world, GameProfile owner, int x, int y, int z, boolean decorative) { - setLeaves(genome, world, owner, x, y, z, decorative); + world.markBlockForUpdate(pos); } public static void initTrees() { @@ -1107,4 +1100,7 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator { ITree tree = getIndividual(); return TreeManager.treeRoot.getMemberStack(tree, treeType.ordinal()); } + + public static void preInit() { + } } diff --git a/src/main/java/forestry/arboriculture/genetics/TreeFactory.java b/src/main/java/forestry/arboriculture/genetics/TreeFactory.java index ad1cdba10..4d5f44733 100644 --- a/src/main/java/forestry/arboriculture/genetics/TreeFactory.java +++ b/src/main/java/forestry/arboriculture/genetics/TreeFactory.java @@ -15,25 +15,25 @@ import java.awt.Color; import forestry.api.arboriculture.EnumLeafType; import forestry.api.arboriculture.EnumTreeChromosome; import forestry.api.arboriculture.IAlleleTreeSpeciesCustom; -import forestry.api.arboriculture.IGermlingIconProvider; -import forestry.api.arboriculture.ILeafIconProvider; +import forestry.api.arboriculture.IGermlingModelProvider; +import forestry.api.arboriculture.ILeafSpriteProvider; import forestry.api.arboriculture.ITreeFactory; import forestry.api.arboriculture.ITreeGenerator; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IClassification; import forestry.arboriculture.genetics.alleles.AlleleTreeSpecies; -import forestry.arboriculture.render.IconProviderLeaves; +import forestry.arboriculture.render.SpriteProviderLeaves; public class TreeFactory implements ITreeFactory { @Override - public IAlleleTreeSpeciesCustom createSpecies(String uid, String unlocalizedName, String authority, String unlocalizedDescription, boolean dominant, IClassification branch, String binomial, ILeafIconProvider leafIconProvider, IGermlingIconProvider germlingIconProvider, ITreeGenerator generator) { - IAlleleTreeSpeciesCustom treeSpecies = new AlleleTreeSpecies(uid, unlocalizedName, authority, unlocalizedDescription, dominant, branch, binomial, leafIconProvider, germlingIconProvider, generator); + public IAlleleTreeSpeciesCustom createSpecies(String uid, String unlocalizedName, String authority, String unlocalizedDescription, boolean dominant, IClassification branch, String binomial, String modelName, ILeafSpriteProvider leafSpriteProvider, IGermlingModelProvider germlingModelProvider, ITreeGenerator generator) { + IAlleleTreeSpeciesCustom treeSpecies = new AlleleTreeSpecies(uid, unlocalizedName, authority, unlocalizedDescription, dominant, branch, binomial, modelName, leafSpriteProvider, germlingModelProvider, generator); AlleleManager.alleleRegistry.registerAllele(treeSpecies, EnumTreeChromosome.SPECIES); return treeSpecies; } @Override - public ILeafIconProvider getLeafIconProvider(EnumLeafType enumLeafType, Color color, Color colorPollinated) { - return new IconProviderLeaves(enumLeafType, color, colorPollinated); + public ILeafSpriteProvider getLeafIconProvider(EnumLeafType enumLeafType, Color color, Color colorPollinated) { + return new SpriteProviderLeaves(enumLeafType, color, colorPollinated); } } diff --git a/src/main/java/forestry/arboriculture/genetics/TreeHelper.java b/src/main/java/forestry/arboriculture/genetics/TreeHelper.java index e65af385b..58f383ad2 100755 --- a/src/main/java/forestry/arboriculture/genetics/TreeHelper.java +++ b/src/main/java/forestry/arboriculture/genetics/TreeHelper.java @@ -24,14 +24,14 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import com.mojang.authlib.GameProfile; +import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.oredict.OreDictionary; -import cpw.mods.fml.common.FMLCommonHandler; - import forestry.api.arboriculture.EnumGermlingType; import forestry.api.arboriculture.EnumTreeChromosome; import forestry.api.arboriculture.IAlleleFruit; @@ -130,8 +130,8 @@ public class TreeHelper extends SpeciesRoot implements ITreeRoot { } @Override - public ITree getTree(World world, int x, int y, int z) { - TileEntity tile = world.getTileEntity(x, y, z); + public ITree getTree(World world, BlockPos pos) { + TileEntity tile = world.getTileEntity(pos); if (!(tile instanceof TileSapling)) { return null; } @@ -190,21 +190,21 @@ public class TreeHelper extends SpeciesRoot implements ITreeRoot { } @Override - public boolean plantSapling(World world, ITree tree, GameProfile owner, int x, int y, int z) { + public boolean plantSapling(World world, ITree tree, GameProfile owner, BlockPos pos) { - boolean placed = world.setBlock(x, y, z, PluginArboriculture.blocks.saplingGE, 0, Constants.FLAG_BLOCK_SYNCH_AND_UPDATE); + boolean placed = world.setBlockState(pos, PluginArboriculture.blocks.saplingGE.getStateFromMeta(0), Constants.FLAG_BLOCK_SYNCH_AND_UPDATE); if (!placed) { return false; } - Block block = world.getBlock(x, y, z); + Block block = BlockUtil.getBlock(world, pos); if (PluginArboriculture.blocks.saplingGE != block) { return false; } - TileEntity tile = world.getTileEntity(x, y, z); + TileEntity tile = world.getTileEntity(pos); if (!(tile instanceof TileSapling)) { - world.setBlockToAir(x, y, z); + world.setBlockToAir(pos); return false; } @@ -216,30 +216,30 @@ public class TreeHelper extends SpeciesRoot implements ITreeRoot { } @Override - public boolean setFruitBlock(World world, IAlleleFruit allele, float sappiness, short[] indices, int x, int y, int z) { + public boolean setFruitBlock(World world, IAlleleFruit allele, float sappiness, short[] indices, BlockPos pos) { - int direction = BlockUtil.getDirectionalMetadata(world, x, y, z); + int direction = BlockUtil.getDirectionalMetadata(world, pos); if (direction < 0) { return false; } - boolean placed = world.setBlock(x, y, z, PluginArboriculture.blocks.pods, direction, Constants.FLAG_BLOCK_SYNCH_AND_UPDATE); + boolean placed = world.setBlockState(pos, PluginArboriculture.blocks.pods.getStateFromMeta(direction), Constants.FLAG_BLOCK_SYNCH_AND_UPDATE); if (!placed) { return false; } - Block block = world.getBlock(x, y, z); + Block block = BlockUtil.getBlock(world, pos); if (PluginArboriculture.blocks.pods != block) { return false; } - TileFruitPod pod = BlockFruitPod.getPodTile(world, x, y, z); + TileFruitPod pod = BlockFruitPod.getPodTile(world, pos); if (pod == null) { - world.setBlockToAir(x, y, z); + world.setBlockToAir(pos); return false; } pod.setFruit(allele, sappiness, indices); - world.markBlockForUpdate(x, y, z); + world.markBlockForUpdate(pos); return true; } diff --git a/src/main/java/forestry/arboriculture/genetics/TreeMutation.java b/src/main/java/forestry/arboriculture/genetics/TreeMutation.java index 4d545df48..4e52e14f4 100755 --- a/src/main/java/forestry/arboriculture/genetics/TreeMutation.java +++ b/src/main/java/forestry/arboriculture/genetics/TreeMutation.java @@ -10,6 +10,7 @@ ******************************************************************************/ package forestry.arboriculture.genetics; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import forestry.api.arboriculture.IAlleleTreeSpecies; @@ -32,8 +33,8 @@ public class TreeMutation extends Mutation implements ITreeMutationCustom { } @Override - public float getChance(World world, int x, int y, int z, IAlleleTreeSpecies allele0, IAlleleTreeSpecies allele1, ITreeGenome genome0, ITreeGenome genome1) { - float processedChance = super.getChance(world, x, y, z, allele0, allele1, genome0, genome1); + public float getChance(World world, BlockPos pos, IAlleleTreeSpecies allele0, IAlleleTreeSpecies allele1, ITreeGenome genome0, ITreeGenome genome1) { + float processedChance = super.getChance(world, pos, allele0, allele1, genome0, genome1); if (processedChance <= 0) { return 0; } diff --git a/src/main/java/forestry/arboriculture/genetics/alleles/AlleleFruit.java b/src/main/java/forestry/arboriculture/genetics/alleles/AlleleFruit.java index 1b2c6683e..0cff8536c 100644 --- a/src/main/java/forestry/arboriculture/genetics/alleles/AlleleFruit.java +++ b/src/main/java/forestry/arboriculture/genetics/alleles/AlleleFruit.java @@ -84,4 +84,19 @@ public class AlleleFruit extends AlleleCategorized implements IAlleleFruit { return getProvider().getDescription(); } + @Override + public int compareTo(IAlleleFruit arg0) { + return 0; + } + + @Override + public String getModelName() { + return getProvider().getModelName(); + } + + @Override + public String getModID() { + return getProvider().getModID(); + } + } diff --git a/src/main/java/forestry/arboriculture/genetics/alleles/AlleleLeafEffect.java b/src/main/java/forestry/arboriculture/genetics/alleles/AlleleLeafEffect.java index 79c3b0425..f09fcddb9 100644 --- a/src/main/java/forestry/arboriculture/genetics/alleles/AlleleLeafEffect.java +++ b/src/main/java/forestry/arboriculture/genetics/alleles/AlleleLeafEffect.java @@ -11,6 +11,7 @@ package forestry.arboriculture.genetics.alleles; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import forestry.api.arboriculture.EnumTreeChromosome; @@ -47,7 +48,7 @@ public class AlleleLeafEffect extends AlleleCategorized implements IAlleleLeafEf } @Override - public IEffectData doEffect(ITreeGenome genome, IEffectData storedData, World world, int x, int y, int z) { + public IEffectData doEffect(ITreeGenome genome, IEffectData storedData, World world, BlockPos pos) { return storedData; } @@ -59,6 +60,6 @@ public class AlleleLeafEffect extends AlleleCategorized implements IAlleleLeafEf Vect min = offset.add(x, y, z); Vect max = min.add(area); - return AxisAlignedBB.getBoundingBox(min.x, min.y, min.z, max.x, max.y, max.z); + return AxisAlignedBB.fromBounds(min.getX(), min.getY(), min.getZ(), max.getX(), max.getY(), max.getZ()); } } diff --git a/src/main/java/forestry/arboriculture/genetics/alleles/AlleleTreeSpecies.java b/src/main/java/forestry/arboriculture/genetics/alleles/AlleleTreeSpecies.java index 26bdeb4e2..5f8ec6076 100644 --- a/src/main/java/forestry/arboriculture/genetics/alleles/AlleleTreeSpecies.java +++ b/src/main/java/forestry/arboriculture/genetics/alleles/AlleleTreeSpecies.java @@ -13,41 +13,42 @@ package forestry.arboriculture.genetics.alleles; import java.util.ArrayList; import java.util.List; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.util.IIcon; - +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraftforge.common.EnumPlantType; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import forestry.api.arboriculture.EnumGermlingType; +import forestry.api.arboriculture.IAlleleTreeSpecies; import forestry.api.arboriculture.IAlleleTreeSpeciesCustom; -import forestry.api.arboriculture.IGermlingIconProvider; -import forestry.api.arboriculture.ILeafIconProvider; +import forestry.api.arboriculture.IGermlingModelProvider; +import forestry.api.arboriculture.ILeafSpriteProvider; import forestry.api.arboriculture.ITreeGenerator; import forestry.api.arboriculture.ITreeRoot; import forestry.api.arboriculture.TreeManager; -import forestry.api.core.IIconProvider; +import forestry.api.core.IModelManager; +import forestry.api.core.IModelProvider; import forestry.api.genetics.IClassification; import forestry.api.genetics.IFruitFamily; import forestry.core.genetics.alleles.AlleleSpecies; -import forestry.core.render.TextureManager; -public class AlleleTreeSpecies extends AlleleSpecies implements IAlleleTreeSpeciesCustom, IIconProvider { +public class AlleleTreeSpecies extends AlleleSpecies implements IAlleleTreeSpeciesCustom { private final ITreeGenerator generator; - private final IGermlingIconProvider germlingIconProvider; - private final ILeafIconProvider leafIconProvider; + private final IGermlingModelProvider germlingModelProvider; + private final ILeafSpriteProvider leafmodelProvider; private final List fruits = new ArrayList<>(); + + private final String mdoelName; private EnumPlantType nativeType = EnumPlantType.Plains; - public AlleleTreeSpecies(String uid, String unlocalizedName, String authority, String unlocalizedDescription, boolean isDominant, IClassification branch, String binomial, ILeafIconProvider leafIconProvider, IGermlingIconProvider germlingIconProvider, ITreeGenerator generator) { + public AlleleTreeSpecies(String uid, String unlocalizedName, String authority, String unlocalizedDescription, boolean isDominant, IClassification branch, String binomial, String modelName, ILeafSpriteProvider leafIconProvider, IGermlingModelProvider germlingModelProvider, ITreeGenerator generator) { super(uid, unlocalizedName, authority, unlocalizedDescription, isDominant, branch, binomial); this.generator = generator; - this.germlingIconProvider = germlingIconProvider; - this.leafIconProvider = leafIconProvider; + this.germlingModelProvider = germlingModelProvider; + this.leafmodelProvider = leafIconProvider; + this.mdoelName = modelName; } @Override @@ -84,30 +85,24 @@ public class AlleleTreeSpecies extends AlleleSpecies implements IAlleleTreeSpeci } @Override - public IIcon getLeafIcon(boolean pollinated, boolean fancy) { - return leafIconProvider.getIcon(pollinated, fancy); + public TextureAtlasSprite getLeafSprite(boolean pollinated, boolean fancy) { + return leafmodelProvider.getSprite(pollinated, fancy); } @Override public int getLeafColour(boolean pollinated) { - return leafIconProvider.getColor(pollinated); + return leafmodelProvider.getColor(pollinated); } @Override - public int getIconColour(int renderPass) { - return leafIconProvider.getColor(false); + public int getSpriteColour(int renderPass) { + return leafmodelProvider.getColor(false); } - - @Override + @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister register) { - germlingIconProvider.registerIcons(register); - } - @Override - @SideOnly(Side.CLIENT) - public IIcon getGermlingIcon(EnumGermlingType type, int renderPass) { - return germlingIconProvider.getIcon(type, renderPass); + public ModelResourceLocation getGermlingModel(EnumGermlingType type) { + return germlingModelProvider.getModel(type); } @Override @@ -118,17 +113,31 @@ public class AlleleTreeSpecies extends AlleleSpecies implements IAlleleTreeSpeci } return getLeafColour(false); } - + @Override - @SideOnly(Side.CLIENT) - public IIconProvider getIconProvider() { - return this; + public void registerModels(IModelManager manager) { + germlingModelProvider.registerModels(manager); } @Override + public String getModID() { + return "forestry"; + } + + @Override + public String getModelName() { + return mdoelName; + } + + @Override + public int compareTo(IAlleleTreeSpecies o) { + return 0; + } + @SideOnly(Side.CLIENT) - public IIcon getIcon(short texUID) { - return TextureManager.getInstance().getIcon(texUID); + @Override + public IModelProvider getModelProvider() { + return null; } } diff --git a/src/main/java/forestry/arboriculture/gui/GuiTreealyzer.java b/src/main/java/forestry/arboriculture/gui/GuiTreealyzer.java index d537c95ea..4c371f185 100755 --- a/src/main/java/forestry/arboriculture/gui/GuiTreealyzer.java +++ b/src/main/java/forestry/arboriculture/gui/GuiTreealyzer.java @@ -38,6 +38,7 @@ import forestry.core.genetics.alleles.AlleleBoolean; import forestry.core.genetics.alleles.AllelePlantType; import forestry.core.gui.ContainerAlyzer; import forestry.core.gui.GuiAlyzer; +import forestry.core.inventory.ItemInventoryAlyzer; import forestry.core.utils.StringUtil; import forestry.plugins.PluginArboriculture; @@ -63,8 +64,8 @@ public class GuiTreealyzer extends GuiAlyzer { int page = 0; ITree tree = null; EnumGermlingType treeType = EnumGermlingType.SAPLING; - for (int k = 1; k < ItemInventoryTreealyzer.SLOT_ANALYZE_5 + 1; k++) { - if (k == ItemInventoryTreealyzer.SLOT_ENERGY) { + for (int k = 1; k < ItemInventoryAlyzer.SLOT_ANALYZE_5 + 1; k++) { + if (k == ItemInventoryAlyzer.SLOT_ENERGY) { continue; } @@ -276,7 +277,7 @@ public class GuiTreealyzer extends GuiAlyzer { int x = COLUMN_0; for (ItemStack stack : tree.getProduceList()) { - itemRender.renderItemIntoGUI(fontRendererObj, mc.renderEngine, stack, guiLeft + x, guiTop + textLayout.getLineY()); + itemRender.renderItemIntoGUI(stack, guiLeft + x, guiTop + textLayout.getLineY()); x += 18; if (x > 148) { x = COLUMN_0; @@ -294,7 +295,7 @@ public class GuiTreealyzer extends GuiAlyzer { x = COLUMN_0; for (ItemStack stack : tree.getSpecialtyList()) { - itemRender.renderItemIntoGUI(fontRendererObj, mc.renderEngine, stack, guiLeft + x, guiTop + textLayout.getLineY()); + itemRender.renderItemIntoGUI(stack, guiLeft + x, guiTop + textLayout.getLineY()); x += 18; if (x > 148) { x = COLUMN_0; diff --git a/src/main/java/forestry/arboriculture/items/ItemBlockLeaves.java b/src/main/java/forestry/arboriculture/items/ItemBlockLeaves.java index d2c715c66..cf94e5d54 100644 --- a/src/main/java/forestry/arboriculture/items/ItemBlockLeaves.java +++ b/src/main/java/forestry/arboriculture/items/ItemBlockLeaves.java @@ -11,8 +11,11 @@ package forestry.arboriculture.items; import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.util.StatCollector; import net.minecraft.world.World; @@ -62,16 +65,16 @@ public class ItemBlockLeaves extends ItemBlockForestry { return tileLeaves.getFoliageColour(Proxies.common.getPlayer()); } - + @Override - public boolean placeBlockAt(ItemStack itemStack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ, int metadata) { + public boolean placeBlockAt(ItemStack itemStack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ, IBlockState newState) { if (!itemStack.hasTagCompound()) { return false; } TileLeaves tileLeaves = new TileLeaves(); tileLeaves.readFromNBT(itemStack.getTagCompound()); - tileLeaves.getTree().setLeavesDecorative(world, player.getGameProfile(), x, y, z); + tileLeaves.getTree().setLeavesDecorative(world, player.getGameProfile(), pos); return true; } diff --git a/src/main/java/forestry/arboriculture/items/ItemBlockWood.java b/src/main/java/forestry/arboriculture/items/ItemBlockWood.java index b798f562f..74048d15c 100644 --- a/src/main/java/forestry/arboriculture/items/ItemBlockWood.java +++ b/src/main/java/forestry/arboriculture/items/ItemBlockWood.java @@ -10,27 +10,33 @@ ******************************************************************************/ package forestry.arboriculture.items; +import java.util.ArrayList; +import java.util.List; + import javax.annotation.Nullable; import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.ItemMeshDefinition; +import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import forestry.api.arboriculture.EnumWoodType; import forestry.arboriculture.IWoodTyped; -import forestry.arboriculture.blocks.BlockLog; -import forestry.arboriculture.render.IconProviderWood; import forestry.arboriculture.tiles.TileWood; import forestry.core.config.Constants; import forestry.core.items.ItemBlockForestry; +import forestry.core.render.model.ModelManager; +import forestry.core.utils.BlockUtil; import forestry.core.utils.StringUtil; public class ItemBlockWood extends ItemBlockForestry { @@ -40,33 +46,31 @@ public class ItemBlockWood extends ItemBlockForestry { super(block); } - public static boolean placeWood(ItemStack stack, @Nullable EntityPlayer player, World world, int x, int y, int z, int metadata) { + public static boolean placeWood(ItemStack stack, IBlockState newState, @Nullable EntityPlayer player, World world, BlockPos pos) { EnumWoodType woodType = getWoodType(stack); - Block block = Block.getBlockFromItem(stack.getItem()); - return placeWood(stack, woodType, block, player, world, x, y, z, metadata); + return placeWood(stack, woodType, newState, player, world, pos); } - public static boolean placeWood(ItemStack stack, EnumWoodType woodType, Block block, @Nullable EntityPlayer player, World world, int x, int y, int z, int metadata) { - boolean placed = world.setBlock(x, y, z, block, metadata, Constants.FLAG_BLOCK_SYNCH_AND_UPDATE); + public static boolean placeWood(ItemStack stack, EnumWoodType woodType, IBlockState state, @Nullable EntityPlayer player, World world, BlockPos pos) { + boolean placed = world.setBlockState(pos, state, Constants.FLAG_BLOCK_SYNCH_AND_UPDATE); if (!placed) { return false; } - Block worldBlock = world.getBlock(x, y, z); - if (!Block.isEqualTo(block, worldBlock)) { + Block worldBlock = BlockUtil.getBlock(world, pos); + if (!Block.isEqualTo(state.getBlock(), worldBlock)) { return false; } - TileEntity tile = world.getTileEntity(x, y, z); + TileEntity tile = world.getTileEntity(pos); if (!(tile instanceof TileWood)) { - world.setBlockToAir(x, y, z); + world.setBlockToAir(pos); return false; } if (player != null) { - worldBlock.onBlockPlacedBy(world, x, y, z, player, stack); - worldBlock.onPostBlockPlaced(world, x, y, z, metadata); + worldBlock.onBlockPlacedBy(world, pos, state, player, stack); } ((TileWood) tile).setWoodType(woodType); @@ -121,17 +125,17 @@ public class ItemBlockWood extends ItemBlockForestry { if (ordinal >= 0 && ordinal < EnumWoodType.VALUES.length) { return EnumWoodType.VALUES[ordinal]; } - return null; + return EnumWoodType.LARCH; } @Override public int getMetadata(int i) { return 0; } - + @Override - public boolean placeBlockAt(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ, int metadata) { - return placeWood(stack, player, world, x, y, z, metadata); + public boolean placeBlockAt(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ, IBlockState newState) { + return placeWood(stack, newState, player, world, pos); } @Override @@ -166,25 +170,28 @@ public class ItemBlockWood extends ItemBlockForestry { return displayName; } - - @Override - @SideOnly(Side.CLIENT) - public IIcon getIcon(ItemStack stack, int pass) { - EnumWoodType woodType = getWoodType(stack); - if (woodType == null) { - return super.getIcon(stack, pass); - } - - if (getBlock() instanceof BlockLog) { - return IconProviderWood.getBarkIcon(woodType); - } else { - return IconProviderWood.getPlankIcon(woodType); - } + + public static ResourceLocation[] getVariants(IWoodTyped typed) { + List variants = new ArrayList(); + for (EnumWoodType type : EnumWoodType.values()) + variants.add(new ResourceLocation("forestry", typed.getBlockKind() + "/" + type.getName().toLowerCase())); + return (ResourceLocation[]) variants.toArray(new ResourceLocation[variants.size()]); } - - @Override + @SideOnly(Side.CLIENT) - public IIcon getIconIndex(ItemStack stack) { - return getIcon(stack, 0); + public static class WoodMeshDefinition implements ItemMeshDefinition { + + public String modifier; + + public WoodMeshDefinition(IWoodTyped typed) { + this.modifier = typed.getBlockKind(); + } + + @Override + public ModelResourceLocation getModelLocation(ItemStack stack) { + EnumWoodType type = getWoodType(stack); + return ModelManager.getInstance().getModelLocation(stack.getItem(), 0, modifier, type.name().toLowerCase()); + } + } } diff --git a/src/main/java/forestry/arboriculture/items/ItemBlockWoodSlab.java b/src/main/java/forestry/arboriculture/items/ItemBlockWoodSlab.java index 4d28b3c7b..bb090f52c 100644 --- a/src/main/java/forestry/arboriculture/items/ItemBlockWoodSlab.java +++ b/src/main/java/forestry/arboriculture/items/ItemBlockWoodSlab.java @@ -1,173 +1,128 @@ package forestry.arboriculture.items; import net.minecraft.block.Block; +import net.minecraft.block.BlockSlab.EnumBlockHalf; +import net.minecraft.block.state.IBlockState; 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; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import forestry.api.arboriculture.EnumWoodType; import forestry.arboriculture.blocks.BlockSlab; +import forestry.arboriculture.blocks.BlockSlabDouble; import forestry.arboriculture.tiles.TileWood; import forestry.core.tiles.TileUtil; public class ItemBlockWoodSlab extends ItemBlockWood { private final BlockSlab slab; private final BlockSlab doubleSlab; - private final boolean isDoubleSlab; - public ItemBlockWoodSlab(Block block, BlockSlab doubleSlab, BlockSlab slab) { + public ItemBlockWoodSlab(Block block, BlockSlabDouble doubleSlab, BlockSlab slab) { super(block); this.doubleSlab = doubleSlab; this.slab = slab; - this.isDoubleSlab = (block == doubleSlab); } - + @Override - public boolean onItemUse(ItemStack itemStack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) { - if (isDoubleSlab) { - return super.onItemUse(itemStack, player, world, x, y, z, side, hitX, hitY, hitZ); - } else if (itemStack.stackSize == 0) { - return false; - } else if (!player.canPlayerEdit(x, y, z, side, itemStack)) { - return false; - } else { - Block block = world.getBlock(x, y, z); - int i1 = world.getBlockMetadata(x, y, z); - boolean flag = (i1 & 8) != 0; - + public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ) + { + if (stack.stackSize == 0) + { + return false; + } + else if (!player.canPlayerEdit(pos.offset(side), side, stack)) + { + return false; + } + else + { + IBlockState iblockstate = world.getBlockState(pos); + EnumWoodType blockWoodType = null; - EnumWoodType stackWoodType = getWoodType(itemStack); - TileWood tile = TileUtil.getTile(world, x, y, z, TileWood.class); + EnumWoodType stackWoodType = getWoodType(stack); + TileWood tile = TileUtil.getTile(world, pos, TileWood.class); if (tile != null) { blockWoodType = tile.getWoodType(); } - if ((side == 1 && !flag || side == 0 && flag) && block == this.slab && blockWoodType == stackWoodType) { - if (world.checkNoEntityCollision(this.doubleSlab.getCollisionBoundingBoxFromPool(world, x, y, z))) { - if (placeWood(itemStack, stackWoodType, doubleSlab, player, world, x, y, z, 0)) { - world.playSoundEffect((double) ((float) x + 0.5F), (double) ((float) y + 0.5F), (double) ((float) z + 0.5F), this.doubleSlab.stepSound.func_150496_b(), (this.doubleSlab.stepSound.getVolume() + 1.0F) / 2.0F, this.doubleSlab.stepSound.getPitch() * 0.8F); - --itemStack.stackSize; - } - } - - return true; - } else { - if (this.func_150946_a(itemStack, player, world, x, y, z, side)) { - return true; - } else { - return super.onItemUse(itemStack, player, world, x, y, z, side, hitX, hitY, hitZ); - } - } - } - } + if (iblockstate.getBlock() == this.slab){ + EnumBlockHalf blockslab$enumblockhalf = iblockstate.getValue(net.minecraft.block.BlockSlab.HALF); + if ((side == EnumFacing.UP && blockslab$enumblockhalf == EnumBlockHalf.BOTTOM || side == EnumFacing.DOWN && blockslab$enumblockhalf == EnumBlockHalf.TOP) && blockWoodType == stackWoodType) + { + if (world.checkNoEntityCollision(this.doubleSlab.getCollisionBoundingBox(world, pos, iblockstate)) ) + { + if(placeWood(stack, stackWoodType, doubleSlab.getDefaultState(), player, world, pos)){ + world.playSoundEffect(pos.getX() + 0.5F, pos.getY() + 0.5F, pos.getZ() + 0.5F, this.doubleSlab.stepSound.getPlaceSound(), (this.doubleSlab.stepSound.getVolume() + 1.0F) / 2.0F, this.doubleSlab.stepSound.getFrequency() * 0.8F); + --stack.stackSize; + } + } + + return true; + } + } + + return this.tryPlace(stack, world, pos.offset(side), stackWoodType) ? true : super.onItemUse(stack, player, world, pos, side, hitX, hitY, hitZ); + } + } + @Override @SideOnly(Side.CLIENT) - public boolean func_150936_a(World world, int x, int y, int z, int side, EntityPlayer player, ItemStack itemStack) { - int i1 = x; - int j1 = y; - int k1 = z; - Block block = world.getBlock(x, y, z); - int l1 = world.getBlockMetadata(x, y, z); - boolean flag = (l1 & 8) != 0; - + public boolean canPlaceBlockOnSide(World world, BlockPos pos, EnumFacing side, EntityPlayer player, ItemStack itemStack) { + BlockPos blockpos = pos; + IBlockState iblockstate = world.getBlockState(pos); + EnumWoodType blockWoodType = null; EnumWoodType stackWoodType = getWoodType(itemStack); - TileWood tile = TileUtil.getTile(world, x, y, z, TileWood.class); + TileWood tile = TileUtil.getTile(world, pos, TileWood.class); if (tile != null) { blockWoodType = tile.getWoodType(); } - - if ((side == 1 && !flag || side == 0 && flag) && block == this.slab && stackWoodType == blockWoodType) { - return true; - } else { - if (side == 0) { - --y; - } - - if (side == 1) { - ++y; - } - - if (side == 2) { - --z; - } - - if (side == 3) { - ++z; - } - - if (side == 4) { - --x; - } - - if (side == 5) { - ++x; - } - - Block block1 = world.getBlock(x, y, z); - tile = TileUtil.getTile(world, x, y, z, TileWood.class); - if (tile == null) { - blockWoodType = null; - } else { - blockWoodType = tile.getWoodType(); - } - if (block1 == this.slab && stackWoodType == blockWoodType) { - return true; - } else { - return super.func_150936_a(world, i1, j1, k1, side, player, itemStack); - } - } + if (iblockstate.getBlock() == slab) + { + boolean flag = iblockstate.getValue(net.minecraft.block.BlockSlab.HALF) == EnumBlockHalf.TOP; + + if ((side == EnumFacing.UP && !flag || side == EnumFacing.DOWN && flag) && stackWoodType == blockWoodType) + { + return true; + } + } + + pos = pos.offset(side); + IBlockState iblockstate1 = world.getBlockState(pos); + return iblockstate1.getBlock() == this.slab && stackWoodType == blockWoodType ? true : super.canPlaceBlockOnSide(world, blockpos, side, player, itemStack); } - private boolean func_150946_a(ItemStack itemStack, EntityPlayer player, World world, int x, int y, int z, int side) { - if (side == 0) { - --y; - } - - if (side == 1) { - ++y; - } - - if (side == 2) { - --z; - } - - if (side == 3) { - ++z; - } - - if (side == 4) { - --x; - } - - if (side == 5) { - ++x; - } - - Block block = world.getBlock(x, y, z); + private boolean tryPlace(ItemStack itemStack, World world, BlockPos pos, Object variantInStack) + { + IBlockState iblockstate = world.getBlockState(pos); + EnumWoodType blockWoodType = null; - EnumWoodType stackWoodType = getWoodType(itemStack); - TileWood tile = TileUtil.getTile(world, x, y, z, TileWood.class); + TileWood tile = TileUtil.getTile(world, pos, TileWood.class); if (tile != null) { blockWoodType = tile.getWoodType(); } - - if (block == this.slab && blockWoodType == stackWoodType) { - if (world.checkNoEntityCollision(this.doubleSlab.getCollisionBoundingBoxFromPool(world, x, y, z))) { - if (placeWood(itemStack, stackWoodType, doubleSlab, player, world, x, y, z, 0)) { - world.playSoundEffect((double) ((float) x + 0.5F), (double) ((float) y + 0.5F), (double) ((float) z + 0.5F), this.doubleSlab.stepSound.func_150496_b(), (this.doubleSlab.stepSound.getVolume() + 1.0F) / 2.0F, this.doubleSlab.stepSound.getPitch() * 0.8F); - --itemStack.stackSize; - } - } - - return true; - } else { - return false; - } - } + + if (iblockstate.getBlock() == slab) + { + if (blockWoodType == variantInStack) + { + if (world.checkNoEntityCollision(this.doubleSlab.getCollisionBoundingBox(world, pos, doubleSlab.getDefaultState()))) + { + if(placeWood(itemStack, (EnumWoodType) variantInStack, doubleSlab.getDefaultState(), null, world, pos)){ + world.playSoundEffect(pos.getX() + 0.5F, pos.getY() + 0.5F, pos.getZ() + 0.5F, this.doubleSlab.stepSound.getPlaceSound(), (this.doubleSlab.stepSound.getVolume() + 1.0F) / 2.0F, this.doubleSlab.stepSound.getFrequency() * 0.8F); + --itemStack.stackSize; + } + } + + return true; + } + } + + return false; + } } diff --git a/src/main/java/forestry/arboriculture/items/ItemGermlingGE.java b/src/main/java/forestry/arboriculture/items/ItemGermlingGE.java index 18031fe4b..7ff39f537 100755 --- a/src/main/java/forestry/arboriculture/items/ItemGermlingGE.java +++ b/src/main/java/forestry/arboriculture/items/ItemGermlingGE.java @@ -12,21 +12,25 @@ package forestry.arboriculture.items; import java.util.List; +import net.minecraft.client.renderer.ItemMeshDefinition; +import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.world.World; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import forestry.api.arboriculture.EnumGermlingType; import forestry.api.arboriculture.IAlleleTreeSpecies; import forestry.api.arboriculture.ITree; import forestry.api.arboriculture.TreeManager; +import forestry.api.core.IModelManager; import forestry.api.core.Tabs; +import forestry.api.genetics.AlleleManager; +import forestry.api.genetics.IAllele; import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IIndividual; import forestry.api.genetics.IPollinatable; @@ -39,7 +43,6 @@ import forestry.core.config.Config; import forestry.core.genetics.ItemGE; import forestry.core.network.packets.PacketFXSignal; import forestry.core.proxy.Proxies; -import forestry.core.render.SpriteSheet; import forestry.core.utils.BlockUtil; import forestry.core.utils.GeneticsUtil; import forestry.core.utils.StringUtil; @@ -119,38 +122,33 @@ public class ItemGermlingGE extends ItemGE implements IVariableFermentable { return getSpeciesOrDefault(itemstack).getGermlingColour(type, renderPass); } - /* ICONS */ - @Override - public boolean requiresMultipleRenderPasses() { - return true; - } - - @Override - public int getRenderPasses(int metadata) { - return 2; - } - - @Override - public int getSpriteNumber() { - return SpriteSheet.BLOCKS.getSheetOrdinal(); - } - - @Override + /* MODELS */ @SideOnly(Side.CLIENT) - public IIcon getIcon(ItemStack itemstack, int renderPass) { - IAlleleTreeSpecies species = getSpeciesOrDefault(itemstack); - return species.getGermlingIcon(type, renderPass); + @Override + public void registerModel(Item item, IModelManager manager) { + manager.registerItemModel(item, new GermlingMeshDefinition()); + for (IAllele allele : AlleleManager.alleleRegistry.getRegisteredAlleles().values()) { + if (allele instanceof IAlleleTreeSpecies) { + ((IAlleleTreeSpecies) allele).registerModels(manager); + } + } } - @Override - @SideOnly(Side.CLIENT) - public IIcon getIconIndex(ItemStack stack) { - return getIcon(stack, 0); - } + private class GermlingMeshDefinition implements ItemMeshDefinition { + @Override + public ModelResourceLocation getModelLocation(ItemStack stack) { + IAlleleTreeSpecies treeSpecies = getSpecies(stack); + if (treeSpecies == null) { + treeSpecies = TreeDefinition.Oak.getGenome().getPrimary(); + } + return treeSpecies.getGermlingModel(type); + } + } + @Override - public boolean onItemUse(ItemStack itemstack, EntityPlayer player, World world, int x, int y, int z, int par7, float facingX, float facingY, float facingZ) { - ITree tree = TreeManager.treeRoot.getMember(itemstack); + public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ) { + ITree tree = TreeManager.treeRoot.getMember(stack); if (tree == null) { return false; } @@ -158,23 +156,24 @@ public class ItemGermlingGE extends ItemGE implements IVariableFermentable { if (type == EnumGermlingType.SAPLING) { // x, y, z are the coordinates of the block "hit", can thus either be the soil or tall grass, etc. int yShift; - if (!BlockUtil.isReplaceableBlock(world, x, y, z)) { - if (!world.isAirBlock(x, y + 1, z)) { + if (!BlockUtil.isReplaceableBlock(world, pos)) { + if (!world.isAirBlock(new BlockPos(pos.getX(), pos.getY() + 1, pos.getZ()))) { return false; } yShift = 1; } else { yShift = 0; } + BlockPos posS = pos.add(0, yShift, 0); - if (!tree.canStay(world, x, y + yShift, z)) { + if (!tree.canStay(world, posS)) { return false; } - if (TreeManager.treeRoot.plantSapling(world, tree, player.getGameProfile(), x, y + yShift, z)) { - Proxies.common.addBlockPlaceEffects(world, x, y, z, world.getBlock(x, y + yShift, z), 0); + if (TreeManager.treeRoot.plantSapling(world, tree, player.getGameProfile(), posS)) { + Proxies.common.addBlockPlaceEffects(world, pos, world.getBlockState(posS)); if (!player.capabilities.isCreativeMode) { - itemstack.stackSize--; + stack.stackSize--; } return true; } else { @@ -182,7 +181,7 @@ public class ItemGermlingGE extends ItemGE implements IVariableFermentable { } } else if (type == EnumGermlingType.POLLEN) { - ICheckPollinatable checkPollinatable = GeneticsUtil.getCheckPollinatable(world, x, y, z); + ICheckPollinatable checkPollinatable = GeneticsUtil.getCheckPollinatable(world, pos); if (checkPollinatable == null) { return false; @@ -192,17 +191,17 @@ public class ItemGermlingGE extends ItemGE implements IVariableFermentable { return false; } - IPollinatable pollinatable = GeneticsUtil.getOrCreatePollinatable(player.getGameProfile(), world, x, y, z); + IPollinatable pollinatable = GeneticsUtil.getOrCreatePollinatable(player.getGameProfile(), world, pos); if (!pollinatable.canMateWith(tree)) { return false; } pollinatable.mateWith(tree); - Proxies.common.sendFXSignal(PacketFXSignal.VisualFXType.BLOCK_DESTROY, PacketFXSignal.SoundFXType.LEAF, world, x, y, z, - world.getBlock(x, y, z), 0); + Proxies.common.sendFXSignal(PacketFXSignal.VisualFXType.BLOCK_DESTROY, PacketFXSignal.SoundFXType.LEAF, world, pos, + world.getBlockState(pos)); if (!player.capabilities.isCreativeMode) { - itemstack.stackSize--; + stack.stackSize--; } return true; diff --git a/src/main/java/forestry/arboriculture/items/ItemGrafter.java b/src/main/java/forestry/arboriculture/items/ItemGrafter.java index da5113a10..2d32e2ebc 100755 --- a/src/main/java/forestry/arboriculture/items/ItemGrafter.java +++ b/src/main/java/forestry/arboriculture/items/ItemGrafter.java @@ -16,6 +16,7 @@ import net.minecraft.block.material.Material; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import forestry.api.arboriculture.IToolGrafter; @@ -39,15 +40,14 @@ public class ItemGrafter extends ItemForestryTool implements IToolGrafter { } return super.canHarvestBlock(block, itemStack); } - + @Override - public boolean onBlockDestroyed(ItemStack itemstack, World world, Block block, int j, int k, int l, EntityLivingBase entityliving) { - // damage is done by the harvested leaves + public boolean onBlockDestroyed(ItemStack stack, World world, Block block, BlockPos pos, EntityLivingBase player) { return true; } @Override - public float getSaplingModifier(ItemStack stack, World world, EntityPlayer player, int x, int y, int z) { + public float getSaplingModifier(ItemStack stack, World world, EntityPlayer player, BlockPos pos) { return 100f; } } diff --git a/src/main/java/forestry/arboriculture/proxy/ProxyArboriculture.java b/src/main/java/forestry/arboriculture/proxy/ProxyArboriculture.java index e6df896af..ecf9541ce 100755 --- a/src/main/java/forestry/arboriculture/proxy/ProxyArboriculture.java +++ b/src/main/java/forestry/arboriculture/proxy/ProxyArboriculture.java @@ -12,7 +12,7 @@ package forestry.arboriculture.proxy; public class ProxyArboriculture { - public void initializeRendering() { + public void initializeModels() { } public int getFoliageColorBasic() { diff --git a/src/main/java/forestry/arboriculture/proxy/ProxyArboricultureClient.java b/src/main/java/forestry/arboriculture/proxy/ProxyArboricultureClient.java index 5f96ec7d1..6200ce297 100644 --- a/src/main/java/forestry/arboriculture/proxy/ProxyArboricultureClient.java +++ b/src/main/java/forestry/arboriculture/proxy/ProxyArboricultureClient.java @@ -10,58 +10,20 @@ ******************************************************************************/ package forestry.arboriculture.proxy; -import net.minecraft.block.Block; -import net.minecraft.item.Item; +import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.world.ColorizerFoliage; -import net.minecraftforge.client.IItemRenderer; -import net.minecraftforge.client.MinecraftForgeClient; - -import cpw.mods.fml.client.registry.RenderingRegistry; - -import forestry.arboriculture.render.RenderFenceItem; -import forestry.arboriculture.render.RenderFruitPodBlock; -import forestry.arboriculture.render.RenderLeavesBlock; -import forestry.arboriculture.render.RenderLeavesItem; -import forestry.arboriculture.render.RenderLogItem; -import forestry.arboriculture.render.RenderPlankItem; -import forestry.arboriculture.render.RenderSaplingBlock; -import forestry.arboriculture.render.RenderSlabItem; -import forestry.arboriculture.render.RenderStairItem; +import forestry.arboriculture.render.ModelLeaves; +import forestry.core.proxy.Proxies; +import forestry.core.render.model.BlockModelIndex; import forestry.plugins.PluginArboriculture; public class ProxyArboricultureClient extends ProxyArboriculture { @Override - public void initializeRendering() { - PluginArboriculture.modelIdSaplings = RenderingRegistry.getNextAvailableRenderId(); - PluginArboriculture.modelIdLeaves = RenderingRegistry.getNextAvailableRenderId(); - PluginArboriculture.modelIdPods = RenderingRegistry.getNextAvailableRenderId(); - - RenderingRegistry.registerBlockHandler(new RenderSaplingBlock()); - RenderingRegistry.registerBlockHandler(new RenderLeavesBlock()); - RenderingRegistry.registerBlockHandler(new RenderFruitPodBlock()); - - registerItemRenderer(PluginArboriculture.blocks.logs, new RenderLogItem()); - registerItemRenderer(PluginArboriculture.blocks.logsFireproof, new RenderLogItem()); - - registerItemRenderer(PluginArboriculture.blocks.stairs, new RenderStairItem()); - registerItemRenderer(PluginArboriculture.blocks.stairsFireproof, new RenderStairItem()); - - registerItemRenderer(PluginArboriculture.blocks.planks, new RenderPlankItem()); - registerItemRenderer(PluginArboriculture.blocks.planksFireproof, new RenderPlankItem()); - - registerItemRenderer(PluginArboriculture.blocks.slabs, new RenderSlabItem()); - registerItemRenderer(PluginArboriculture.blocks.slabsFireproof, new RenderSlabItem()); - - registerItemRenderer(PluginArboriculture.blocks.fences, new RenderFenceItem()); - registerItemRenderer(PluginArboriculture.blocks.fencesFireproof, new RenderFenceItem()); - - registerItemRenderer(PluginArboriculture.blocks.leaves, new RenderLeavesItem()); - } - - private static void registerItemRenderer(Block block, IItemRenderer renderer) { - Item item = Item.getItemFromBlock(block); - MinecraftForgeClient.registerItemRenderer(item, renderer); + public void initializeModels() { + Proxies.render.registerBlockModel(new BlockModelIndex(new ModelResourceLocation("forestry:leaves"), + new ModelResourceLocation("forestry:leaves", "inventory"), new ModelLeaves(), + PluginArboriculture.blocks.leaves)); } @Override diff --git a/src/main/java/forestry/arboriculture/render/IconProviderGermling.java b/src/main/java/forestry/arboriculture/render/IconProviderGermling.java deleted file mode 100644 index 0d3da9e1b..000000000 --- a/src/main/java/forestry/arboriculture/render/IconProviderGermling.java +++ /dev/null @@ -1,47 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v3 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: - * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges - ******************************************************************************/ -package forestry.arboriculture.render; - -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.util.IIcon; - -import forestry.api.arboriculture.EnumGermlingType; -import forestry.api.arboriculture.IGermlingIconProvider; -import forestry.core.render.TextureManager; - -public class IconProviderGermling implements IGermlingIconProvider { - - private final String name; - - private IIcon icon; - private IIcon[] pollenIcons; - - public IconProviderGermling(String uid) { - this.name = uid.substring("forestry.".length()); - } - - @Override - public void registerIcons(IIconRegister register) { - icon = TextureManager.registerTex(register, "germlings/sapling." + name); - pollenIcons = new IIcon[2]; - pollenIcons[0] = TextureManager.registerTex(register, "germlings/pollen.0"); - pollenIcons[1] = TextureManager.registerTex(register, "germlings/pollen.1"); - } - - @Override - public IIcon getIcon(EnumGermlingType type, int renderPass) { - if (type == EnumGermlingType.POLLEN) { - return pollenIcons[renderPass]; - } - - return icon; - } -} diff --git a/src/main/java/forestry/arboriculture/render/IconProviderGermlingVanilla.java b/src/main/java/forestry/arboriculture/render/IconProviderGermlingVanilla.java deleted file mode 100644 index 95440e410..000000000 --- a/src/main/java/forestry/arboriculture/render/IconProviderGermlingVanilla.java +++ /dev/null @@ -1,47 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v3 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: - * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges - ******************************************************************************/ -package forestry.arboriculture.render; - -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.init.Blocks; -import net.minecraft.util.IIcon; - -import forestry.api.arboriculture.EnumGermlingType; -import forestry.api.arboriculture.IGermlingIconProvider; -import forestry.core.render.TextureManager; - -public class IconProviderGermlingVanilla implements IGermlingIconProvider { - private final int vanillaMap; - - private IIcon icon; - private IIcon[] pollenIcons; - - public IconProviderGermlingVanilla(int vanillaMap) { - this.vanillaMap = vanillaMap; - } - - @Override - public void registerIcons(IIconRegister register) { - icon = Blocks.sapling.getIcon(0, vanillaMap); - pollenIcons = new IIcon[2]; - pollenIcons[0] = TextureManager.registerTex(register, "germlings/pollen.0"); - pollenIcons[1] = TextureManager.registerTex(register, "germlings/pollen.1"); - } - - @Override - public IIcon getIcon(EnumGermlingType type, int renderPass) { - if (type == EnumGermlingType.POLLEN) { - return pollenIcons[renderPass]; - } - - return icon; - } -} diff --git a/src/main/java/forestry/arboriculture/render/IconProviderWood.java b/src/main/java/forestry/arboriculture/render/IconProviderWood.java deleted file mode 100644 index 8eb48ca85..000000000 --- a/src/main/java/forestry/arboriculture/render/IconProviderWood.java +++ /dev/null @@ -1,81 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v3 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: - * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges - ******************************************************************************/ -package forestry.arboriculture.render; - -import java.util.Locale; - -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.util.IIcon; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -import forestry.api.arboriculture.EnumWoodType; -import forestry.core.render.TextureManager; - -public abstract class IconProviderWood { - @SideOnly(Side.CLIENT) - private static IIcon[][] icons; - - @SideOnly(Side.CLIENT) - public static void registerIcons(IIconRegister register) { - icons = new IIcon[3][EnumWoodType.VALUES.length]; - for (int i = 0; i < EnumWoodType.VALUES.length; i++) { - EnumWoodType woodType = EnumWoodType.VALUES[i]; - String woodName = woodType.toString().toLowerCase(Locale.ENGLISH); - - icons[0][i] = TextureManager.registerTex(register, "wood/planks." + woodName); - icons[1][i] = TextureManager.registerTex(register, "wood/bark." + woodName); - icons[2][i] = TextureManager.registerTex(register, "wood/heart." + woodName); - } - } - - @SideOnly(Side.CLIENT) - public static IIcon getPlankIcon(EnumWoodType woodType) { - return icons[0][woodType.ordinal()]; - } - - @SideOnly(Side.CLIENT) - public static IIcon getBarkIcon(EnumWoodType woodType) { - return icons[1][woodType.ordinal()]; - } - - @SideOnly(Side.CLIENT) - public static IIcon getHeartIcon(EnumWoodType woodType) { - return icons[2][woodType.ordinal()]; - } - - @SideOnly(Side.CLIENT) - public static IIcon getLogIcon(EnumWoodType woodType, int meta, int side) { - int oriented = meta & 12; - switch (oriented) { - case 4: - if (side > 3) { - return getHeartIcon(woodType); - } else { - return getBarkIcon(woodType); - } - case 8: - if (side == 2 || side == 3) { - return getHeartIcon(woodType); - } else { - return getBarkIcon(woodType); - } - case 0: - default: - if (side < 2) { - return getHeartIcon(woodType); - } else { - return getBarkIcon(woodType); - } - } - } -} diff --git a/src/main/java/forestry/arboriculture/render/ModelLeaves.java b/src/main/java/forestry/arboriculture/render/ModelLeaves.java new file mode 100644 index 000000000..1c3a76ac9 --- /dev/null +++ b/src/main/java/forestry/arboriculture/render/ModelLeaves.java @@ -0,0 +1,146 @@ +/******************************************************************************* + * Copyright (c) 2011-2014 SirSengir. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser Public License v3 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl-3.0.txt + * + * Various Contributors including, but not limited to: + * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges + ******************************************************************************/ +package forestry.arboriculture.render; + +import net.minecraft.block.Block; +import net.minecraft.client.renderer.EntityRenderer; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; +import net.minecraft.world.IBlockAccess; +import forestry.api.core.IModelBaker; +import forestry.arboriculture.blocks.BlockForestryLeaves; +import forestry.arboriculture.genetics.TreeHelper; +import forestry.arboriculture.items.ItemBlockLeaves; +import forestry.arboriculture.tiles.TileLeaves; +import forestry.core.proxy.Proxies; +import forestry.core.render.model.ModelBlockOverlay; + +public class ModelLeaves extends ModelBlockOverlay { + + @Override + public void renderInventory(Block block, ItemStack itemStack, IModelBaker renderer) { + + if (!(itemStack.getItem() instanceof ItemBlockLeaves) || block == null) { + return; + } + + TileLeaves leaves = new TileLeaves(); + if (itemStack.hasTagCompound()) { + leaves.readFromNBT(itemStack.getTagCompound()); + } else { + leaves.setTree(TreeHelper.treeTemplates.get(0)); + } + + TextureAtlasSprite leavesIcon = leaves.getSprite(Proxies.render.fancyGraphicsEnabled()); + if (leavesIcon == null) { + return; + } + int color = leaves.getFoliageColour(Proxies.common.getPlayer()); + renderer.setColor(color); + + block.setBlockBoundsForItemRender(); + renderer.setRenderBoundsFromBlock(block); + + renderer.renderFaceYNeg(null, leavesIcon); + renderer.renderFaceYPos(null, leavesIcon); + renderer.renderFaceZNeg(null, leavesIcon); + renderer.renderFaceZPos(null, leavesIcon); + renderer.renderFaceXNeg(null, leavesIcon); + renderer.renderFaceXPos(null, leavesIcon); + + // add fruit + if (!leaves.hasFruit()) { + return; + } + + TextureAtlasSprite fruitTexture = leaves.getFruitTexture(); + if (fruitTexture == null) { + return; + } + int fruitColor = leaves.getFruitColour(); + renderer.setColor(fruitColor); + + block.setBlockBoundsForItemRender(); + renderer.setRenderBoundsFromBlock(block); + + renderer.renderFaceYNeg(null, fruitTexture); + renderer.renderFaceYPos(null, fruitTexture); + renderer.renderFaceZNeg(null, fruitTexture); + renderer.renderFaceZPos(null, fruitTexture); + renderer.renderFaceXNeg(null, fruitTexture); + renderer.renderFaceXPos(null, fruitTexture); + } + + @Override + public boolean renderInWorld(Block block, IBlockAccess world, BlockPos pos, IModelBaker renderer) { + + TileLeaves tile = BlockForestryLeaves.getLeafTile(world, pos); + if (tile == null) { + return false; + } + + // Render the plain leaf block. + renderer.renderStandardBlock(block, pos, tile.getSprite(Proxies.render.fancyGraphicsEnabled())); + + // Render overlay for fruit leaves. + TextureAtlasSprite fruitIcon = tile.getFruitTexture(); + + if (fruitIcon != null) { + int fruitColor = tile.getFruitColour(); + renderFruitOverlay(world, block, pos, renderer, fruitIcon, fruitColor); + } + + return true; + } + + private static boolean renderFruitOverlay(IBlockAccess world, Block block, BlockPos pos, IModelBaker renderer, + TextureAtlasSprite texture, int multiplier) { + + float mR = (multiplier >> 16 & 255) / 255.0F; + float mG = (multiplier >> 8 & 255) / 255.0F; + float mB = (multiplier & 255) / 255.0F; + + if (EntityRenderer.anaglyphEnable) { + mR = (mR * 30.0F + mG * 59.0F + mB * 11.0F) / 100.0F; + mG = (mR * 30.0F + mG * 70.0F) / 100.0F; + mB = (mR * 30.0F + mB * 70.0F) / 100.0F; + } + + return renderFruitOverlayWithColorMultiplier(world, block, pos, mR, mG, mB, renderer, texture); + } + + private static boolean renderFruitOverlayWithColorMultiplier(IBlockAccess world, Block block, BlockPos pos, float r, + float g, float b, IModelBaker renderer, TextureAtlasSprite texture) { + + int mixedBrightness = block.getMixedBrightnessForBlock(world, pos); + + float adjR = 0.5f * r; + float adjG = 0.5f * g; + float adjB = 0.5f * b; + + // Bottom + renderBottomFace(world, block, pos, renderer, texture, mixedBrightness, adjR, adjG, adjB); + renderTopFace(world, block, pos, renderer, texture, mixedBrightness, adjR, adjG, adjB); + renderEastFace(world, block, pos, renderer, texture, mixedBrightness, adjR, adjG, adjB); + renderWestFace(world, block, pos, renderer, texture, mixedBrightness, adjR, adjG, adjB); + renderNorthFace(world, block, pos, renderer, texture, mixedBrightness, adjR, adjG, adjB); + renderSouthFace(world, block, pos, renderer, texture, mixedBrightness, adjR, adjG, adjB); + + return true; + } + + @Override + public TextureAtlasSprite getParticleTexture() { + // TODO Auto-generated method stub + return super.getParticleTexture(); + } +} diff --git a/src/main/java/forestry/arboriculture/render/ModelProviderGermling.java b/src/main/java/forestry/arboriculture/render/ModelProviderGermling.java new file mode 100644 index 000000000..f310bca54 --- /dev/null +++ b/src/main/java/forestry/arboriculture/render/ModelProviderGermling.java @@ -0,0 +1,46 @@ +/******************************************************************************* + * Copyright (c) 2011-2014 SirSengir. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser Public License v3 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl-3.0.txt + * + * Various Contributors including, but not limited to: + * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges + ******************************************************************************/ +package forestry.arboriculture.render; + +import forestry.api.arboriculture.EnumGermlingType; +import forestry.api.arboriculture.IGermlingModelProvider; +import forestry.api.core.IModelManager; +import forestry.plugins.PluginArboriculture; +import net.minecraft.client.resources.model.ModelResourceLocation; +import net.minecraft.util.ResourceLocation; + +public class ModelProviderGermling implements IGermlingModelProvider { + + private final String name; + + private ModelResourceLocation model; + private ModelResourceLocation pollenModel; + + public ModelProviderGermling(String uid) { + this.name = uid.substring("forestry.".length()); + } + + @Override + public void registerModels(IModelManager manager) { + model = manager.getModelLocation("germlings/sapling." + name); + manager.registerVariant(PluginArboriculture.items.sapling, new ResourceLocation("forestry:germlings/sapling." + name)); + pollenModel = manager.getModelLocation("pollen"); + manager.registerVariant(PluginArboriculture.items.sapling, new ResourceLocation("forestry:pollen")); + } + + @Override + public ModelResourceLocation getModel(EnumGermlingType type) { + if (type == EnumGermlingType.POLLEN) { + return pollenModel; + } + return model; + } +} diff --git a/src/main/java/forestry/arboriculture/render/ModelProviderGermlingVanilla.java b/src/main/java/forestry/arboriculture/render/ModelProviderGermlingVanilla.java new file mode 100644 index 000000000..bd1e6c365 --- /dev/null +++ b/src/main/java/forestry/arboriculture/render/ModelProviderGermlingVanilla.java @@ -0,0 +1,61 @@ +/******************************************************************************* + * Copyright (c) 2011-2014 SirSengir. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser Public License v3 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl-3.0.txt + * + * Various Contributors including, but not limited to: + * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges + ******************************************************************************/ +package forestry.arboriculture.render; + +import forestry.api.arboriculture.EnumGermlingType; +import forestry.api.arboriculture.IGermlingModelProvider; +import forestry.api.core.IModelManager; +import net.minecraft.client.resources.model.ModelResourceLocation; + +public class ModelProviderGermlingVanilla implements IGermlingModelProvider { + + private final int vanillaMap; + + private ModelResourceLocation model; + private ModelResourceLocation pollenModel; + + public ModelProviderGermlingVanilla(int vanillaMap) { + this.vanillaMap = vanillaMap; + } + + @Override + public void registerModels(IModelManager manager) { + switch (vanillaMap) { + case 0: + model = manager.getModelLocation("minecraft", "oak_sapling"); + break; + case 1: + model = manager.getModelLocation("minecraft", "spruce_sapling"); + break; + case 2: + model = manager.getModelLocation("minecraft", "birch_sapling"); + break; + case 3: + model = manager.getModelLocation("minecraft", "jungle_sapling"); + break; + case 4: + model = manager.getModelLocation("minecraft", "dark_oak_sapling"); + break; + case 5: + model = manager.getModelLocation("minecraft", "acacia_sapling"); + break; + } + pollenModel = manager.getModelLocation("pollen"); + } + + @Override + public ModelResourceLocation getModel(EnumGermlingType type) { + if (type == EnumGermlingType.POLLEN) { + return pollenModel; + } + return model; + } +} diff --git a/src/main/java/forestry/arboriculture/render/RenderFenceItem.java b/src/main/java/forestry/arboriculture/render/RenderFenceItem.java deleted file mode 100644 index 4580ba399..000000000 --- a/src/main/java/forestry/arboriculture/render/RenderFenceItem.java +++ /dev/null @@ -1,130 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v3 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: - * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges - ******************************************************************************/ -package forestry.arboriculture.render; - -import net.minecraft.block.Block; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; - -import net.minecraftforge.client.IItemRenderer; - -import org.lwjgl.opengl.GL11; - -import forestry.api.arboriculture.EnumWoodType; -import forestry.arboriculture.items.ItemBlockWood; - -public class RenderFenceItem implements IItemRenderer { - @Override - public boolean handleRenderType(ItemStack item, ItemRenderType type) { - switch (type) { - case ENTITY: - case EQUIPPED_FIRST_PERSON: - case EQUIPPED: - case INVENTORY: - return true; - default: - return false; - } - } - - @Override - public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { - return true; - } - - @Override - public void renderItem(ItemRenderType type, ItemStack item, Object... data) { - switch (type) { - case ENTITY: - renderItem((RenderBlocks) data[0], item, 0f, 0f, 0f); - break; - case EQUIPPED: - case EQUIPPED_FIRST_PERSON: - renderItem((RenderBlocks) data[0], item, 0.5f, 0.5f, 0.5f); - break; - case INVENTORY: - renderItem((RenderBlocks) data[0], item, 0f, 0f, 0f); - break; - default: - } - } - - private static void renderItem(RenderBlocks renderer, ItemStack itemStack, float x, float y, float z) { - Tessellator tess = Tessellator.instance; - - EnumWoodType woodType = ItemBlockWood.getWoodType(itemStack); - IIcon plankIcon = IconProviderWood.getPlankIcon(woodType); - Block block = Block.getBlockFromItem(itemStack.getItem()); - - for (int i = 0; i < 4; ++i) { - - float thickness = 0.125F; - - if (i == 0) { - block.setBlockBounds(0.5F - thickness, 0.0F, 0.0F, 0.5F + thickness, 1.0F, thickness * 2.0F); - } - - if (i == 1) { - block.setBlockBounds(0.5F - thickness, 0.0F, 1.0F - thickness * 2.0F, 0.5F + thickness, 1.0F, 1.0F); - } - - thickness = 0.0625F; - - if (i == 2) { - block.setBlockBounds(0.5F - thickness, 1.0F - thickness * 3.0F, -thickness * 2.0F, 0.5F + thickness, 1.0F - thickness, 1.0F + thickness * 2.0F); - } - - if (i == 3) { - block.setBlockBounds(0.5F - thickness, 0.5F - thickness * 3.0F, -thickness * 2.0F, 0.5F + thickness, 0.5F - thickness, 1.0F + thickness * 2.0F); - } - - renderer.setRenderBoundsFromBlock(block); - - GL11.glTranslatef(-0.5F, -0.5F, -0.5F); - tess.startDrawingQuads(); - tess.setNormal(0.0F, -1.0F, 0.0F); - renderer.renderFaceYNeg(block, x, y, z, plankIcon); - tess.draw(); - - tess.startDrawingQuads(); - tess.setNormal(0.0F, 1.0F, 0.0F); - renderer.renderFaceYPos(block, x, y, z, plankIcon); - tess.draw(); - - tess.startDrawingQuads(); - tess.setNormal(0.0F, 0.0F, -1.0F); - renderer.renderFaceZNeg(block, x, y, z, plankIcon); - tess.draw(); - - tess.startDrawingQuads(); - tess.setNormal(0.0F, 0.0F, 1.0F); - renderer.renderFaceZPos(block, x, y, z, plankIcon); - tess.draw(); - - tess.startDrawingQuads(); - tess.setNormal(-1.0F, 0.0F, 0.0F); - renderer.renderFaceXNeg(block, x, y, z, plankIcon); - tess.draw(); - - tess.startDrawingQuads(); - tess.setNormal(1.0F, 0.0F, 0.0F); - renderer.renderFaceXPos(block, x, y, z, plankIcon); - tess.draw(); - - GL11.glTranslatef(0.5F, 0.5F, 0.5F); - } - - block.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F); - renderer.setRenderBoundsFromBlock(block); - } -} diff --git a/src/main/java/forestry/arboriculture/render/RenderFruitPodBlock.java b/src/main/java/forestry/arboriculture/render/RenderFruitPodBlock.java deleted file mode 100644 index 63cc27c39..000000000 --- a/src/main/java/forestry/arboriculture/render/RenderFruitPodBlock.java +++ /dev/null @@ -1,196 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v3 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: - * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges - ******************************************************************************/ -package forestry.arboriculture.render; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockDirectional; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.util.IIcon; -import net.minecraft.world.IBlockAccess; - -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; - -import forestry.arboriculture.blocks.BlockFruitPod; -import forestry.arboriculture.tiles.TileFruitPod; -import forestry.plugins.PluginArboriculture; - -public class RenderFruitPodBlock implements ISimpleBlockRenderingHandler { - - @Override - public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) { - } - - @Override - public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { - - int maturity = 0; - - BlockFruitPod blockPod = (BlockFruitPod) block; - TileFruitPod pod = BlockFruitPod.getPodTile(world, x, y, z); - if (pod != null) { - maturity = pod.getMaturity(); - } - - Tessellator tessellator = Tessellator.instance; - tessellator.setBrightness(blockPod.getMixedBrightnessForBlock(world, x, y, z)); - tessellator.setColorOpaque_F(1.0f, 1.0f, 1.0f); - int metadata = world.getBlockMetadata(x, y, z); - IIcon podIcon = blockPod.getIcon(world, x, y, z, metadata); - int notchDirection = BlockDirectional.getDirection(metadata); - - int k1 = 4 + maturity * 2; - int l1 = 5 + maturity * 2; - double d0 = 15.0D - k1; - double d1 = 15.0D; - double d2 = 4.0D; - double d3 = 4.0D + l1; - double d4 = (double) podIcon.getInterpolatedU(d0); - double d5 = (double) podIcon.getInterpolatedU(d1); - double d6 = (double) podIcon.getInterpolatedV(d2); - double d7 = (double) podIcon.getInterpolatedV(d3); - double d8 = 0.0D; - double d9 = 0.0D; - - switch (notchDirection) { - case 0: - d8 = 8.0D - k1 / 2; - d9 = 15.0D - k1; - break; - case 1: - d8 = 1.0D; - d9 = 8.0D - k1 / 2; - break; - case 2: - d8 = 8.0D - k1 / 2; - d9 = 1.0D; - break; - case 3: - d8 = 15.0D - k1; - d9 = 8.0D - k1 / 2; - } - - double d10 = x + d8 / 16.0D; - double d11 = x + (d8 + k1) / 16.0D; - double d12 = y + (12.0D - l1) / 16.0D; - double d13 = y + 0.75D; - double d14 = z + d9 / 16.0D; - double d15 = z + (d9 + k1) / 16.0D; - tessellator.addVertexWithUV(d10, d12, d14, d4, d7); - tessellator.addVertexWithUV(d10, d12, d15, d5, d7); - tessellator.addVertexWithUV(d10, d13, d15, d5, d6); - tessellator.addVertexWithUV(d10, d13, d14, d4, d6); - tessellator.addVertexWithUV(d11, d12, d15, d4, d7); - tessellator.addVertexWithUV(d11, d12, d14, d5, d7); - tessellator.addVertexWithUV(d11, d13, d14, d5, d6); - tessellator.addVertexWithUV(d11, d13, d15, d4, d6); - tessellator.addVertexWithUV(d11, d12, d14, d4, d7); - tessellator.addVertexWithUV(d10, d12, d14, d5, d7); - tessellator.addVertexWithUV(d10, d13, d14, d5, d6); - tessellator.addVertexWithUV(d11, d13, d14, d4, d6); - tessellator.addVertexWithUV(d10, d12, d15, d4, d7); - tessellator.addVertexWithUV(d11, d12, d15, d5, d7); - tessellator.addVertexWithUV(d11, d13, d15, d5, d6); - tessellator.addVertexWithUV(d10, d13, d15, d4, d6); - int i2 = k1; - - if (maturity >= 2) { - i2 = k1 - 1; - } - - d4 = (double) podIcon.getMinU(); - d5 = (double) podIcon.getInterpolatedU((double) i2); - d6 = (double) podIcon.getMinV(); - d7 = (double) podIcon.getInterpolatedV((double) i2); - - tessellator.addVertexWithUV(d10, d13, d15, d4, d7); - tessellator.addVertexWithUV(d11, d13, d15, d5, d7); - tessellator.addVertexWithUV(d11, d13, d14, d5, d6); - tessellator.addVertexWithUV(d10, d13, d14, d4, d6); - tessellator.addVertexWithUV(d10, d12, d14, d4, d6); - tessellator.addVertexWithUV(d11, d12, d14, d5, d6); - tessellator.addVertexWithUV(d11, d12, d15, d5, d7); - tessellator.addVertexWithUV(d10, d12, d15, d4, d7); - d4 = (double) podIcon.getInterpolatedU(12.0D); - d5 = (double) podIcon.getMaxU(); - d6 = (double) podIcon.getMinV(); - d7 = (double) podIcon.getInterpolatedV(4.0D); - d8 = 8.0D; - d9 = 0.0D; - double d16; - - switch (notchDirection) { - case 0: - d8 = 8.0D; - d9 = 12.0D; - d16 = d4; - d4 = d5; - d5 = d16; - break; - case 1: - d8 = 0.0D; - d9 = 8.0D; - break; - case 2: - d8 = 8.0D; - d9 = 0.0D; - break; - case 3: - d8 = 12.0D; - d9 = 8.0D; - d16 = d4; - d4 = d5; - d5 = d16; - } - - d10 = x + d8 / 16.0D; - d11 = x + (d8 + 4.0D) / 16.0D; - d12 = y + 0.75D; - d13 = y + 1.0D; - d14 = z + d9 / 16.0D; - d15 = z + (d9 + 4.0D) / 16.0D; - - if (notchDirection != 2 && notchDirection != 0) { - if (notchDirection == 1 || notchDirection == 3) { - tessellator.addVertexWithUV(d11, d12, d14, d4, d7); - tessellator.addVertexWithUV(d10, d12, d14, d5, d7); - tessellator.addVertexWithUV(d10, d13, d14, d5, d6); - tessellator.addVertexWithUV(d11, d13, d14, d4, d6); - tessellator.addVertexWithUV(d10, d12, d14, d5, d7); - tessellator.addVertexWithUV(d11, d12, d14, d4, d7); - tessellator.addVertexWithUV(d11, d13, d14, d4, d6); - tessellator.addVertexWithUV(d10, d13, d14, d5, d6); - } - } else { - tessellator.addVertexWithUV(d10, d12, d14, d5, d7); - tessellator.addVertexWithUV(d10, d12, d15, d4, d7); - tessellator.addVertexWithUV(d10, d13, d15, d4, d6); - tessellator.addVertexWithUV(d10, d13, d14, d5, d6); - tessellator.addVertexWithUV(d10, d12, d15, d4, d7); - tessellator.addVertexWithUV(d10, d12, d14, d5, d7); - tessellator.addVertexWithUV(d10, d13, d14, d5, d6); - tessellator.addVertexWithUV(d10, d13, d15, d4, d6); - } - - return true; - } - - @Override - public boolean shouldRender3DInInventory(int modelId) { - return false; - } - - @Override - public int getRenderId() { - return PluginArboriculture.modelIdPods; - } - -} diff --git a/src/main/java/forestry/arboriculture/render/RenderLeavesBlock.java b/src/main/java/forestry/arboriculture/render/RenderLeavesBlock.java deleted file mode 100644 index 77d94e2c8..000000000 --- a/src/main/java/forestry/arboriculture/render/RenderLeavesBlock.java +++ /dev/null @@ -1,100 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v3 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: - * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges - ******************************************************************************/ -package forestry.arboriculture.render; - -import net.minecraft.block.Block; -import net.minecraft.client.renderer.EntityRenderer; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.util.IIcon; -import net.minecraft.world.IBlockAccess; - -import forestry.arboriculture.blocks.BlockForestryLeaves; -import forestry.arboriculture.tiles.TileLeaves; -import forestry.core.render.RenderOverlayBlock; -import forestry.plugins.PluginArboriculture; - -/** - * Ugly but serviceable renderer for leaves, taking fruits into account. - */ -public class RenderLeavesBlock extends RenderOverlayBlock { - - @Override - public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) { - // uses IItemRenderer - } - - @Override - public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { - - TileLeaves tile = BlockForestryLeaves.getLeafTile(world, x, y, z); - if (tile == null) { - return false; - } - - // Render the plain leaf block. - renderer.renderStandardBlock(block, x, y, z); - - // Render overlay for fruit leaves. - IIcon fruitIcon = tile.getFruitTexture(); - - if (fruitIcon != null) { - int fruitColor = tile.getFruitColour(); - renderFruitOverlay(world, block, x, y, z, renderer, fruitIcon, fruitColor); - } - - return true; - } - - @Override - public boolean shouldRender3DInInventory(int modelId) { - return true; - } - - @Override - public int getRenderId() { - return PluginArboriculture.modelIdLeaves; - } - - private static boolean renderFruitOverlay(IBlockAccess world, Block block, int x, int y, int z, RenderBlocks renderer, IIcon texture, int multiplier) { - - float mR = (multiplier >> 16 & 255) / 255.0F; - float mG = (multiplier >> 8 & 255) / 255.0F; - float mB = (multiplier & 255) / 255.0F; - - if (EntityRenderer.anaglyphEnable) { - mR = (mR * 30.0F + mG * 59.0F + mB * 11.0F) / 100.0F; - mG = (mR * 30.0F + mG * 70.0F) / 100.0F; - mB = (mR * 30.0F + mB * 70.0F) / 100.0F; - } - - return renderFruitOverlayWithColorMultiplier(world, block, x, y, z, mR, mG, mB, renderer, texture); - } - - private static boolean renderFruitOverlayWithColorMultiplier(IBlockAccess world, Block block, int x, int y, int z, float r, float g, float b, - RenderBlocks renderer, IIcon texture) { - - int mixedBrightness = block.getMixedBrightnessForBlock(world, x, y, z); - - float adjR = 0.5f * r; - float adjG = 0.5f * g; - float adjB = 0.5f * b; - - // Bottom - renderBottomFace(world, block, x, y, z, renderer, texture, mixedBrightness, adjR, adjG, adjB); - renderTopFace(world, block, x, y, z, renderer, texture, mixedBrightness, adjR, adjG, adjB); - renderEastFace(world, block, x, y, z, renderer, texture, mixedBrightness, adjR, adjG, adjB); - renderWestFace(world, block, x, y, z, renderer, texture, mixedBrightness, adjR, adjG, adjB); - renderNorthFace(world, block, x, y, z, renderer, texture, mixedBrightness, adjR, adjG, adjB); - renderSouthFace(world, block, x, y, z, renderer, texture, mixedBrightness, adjR, adjG, adjB); - - return true; - } -} diff --git a/src/main/java/forestry/arboriculture/render/RenderLeavesItem.java b/src/main/java/forestry/arboriculture/render/RenderLeavesItem.java deleted file mode 100644 index 2138bcbb0..000000000 --- a/src/main/java/forestry/arboriculture/render/RenderLeavesItem.java +++ /dev/null @@ -1,181 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v3 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: - * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges - ******************************************************************************/ -package forestry.arboriculture.render; - -import net.minecraft.block.Block; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; - -import net.minecraftforge.client.IItemRenderer; - -import org.lwjgl.opengl.GL11; - -import forestry.arboriculture.genetics.TreeHelper; -import forestry.arboriculture.items.ItemBlockLeaves; -import forestry.arboriculture.tiles.TileLeaves; -import forestry.core.proxy.Proxies; -import forestry.core.utils.ItemStackUtil; - -public class RenderLeavesItem implements IItemRenderer { - protected static final double OVERLAY_SHIFT = 0.001; - - @Override - public boolean handleRenderType(ItemStack item, IItemRenderer.ItemRenderType type) { - switch (type) { - case ENTITY: - case EQUIPPED_FIRST_PERSON: - case EQUIPPED: - case INVENTORY: - return true; - default: - return false; - } - } - - @Override - public boolean shouldUseRenderHelper(IItemRenderer.ItemRenderType type, ItemStack item, IItemRenderer.ItemRendererHelper helper) { - return true; - } - - @Override - public void renderItem(IItemRenderer.ItemRenderType type, ItemStack item, Object... data) { - GL11.glPushAttrib(GL11.GL_ENABLE_BIT); - GL11.glEnable(GL11.GL_DEPTH_TEST); - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - - switch (type) { - case ENTITY: - renderItem((RenderBlocks) data[0], item, 0f, 0f, 0f); - break; - case EQUIPPED: - case EQUIPPED_FIRST_PERSON: - renderItem((RenderBlocks) data[0], item, 0.5f, 0.5f, 0.5f); - break; - case INVENTORY: - renderItem((RenderBlocks) data[0], item, 0f, 0f, 0f); - break; - default: - } - - GL11.glPopAttrib(); - } - - private static void renderItem(RenderBlocks renderer, ItemStack itemStack, float x, float y, float z) { - Tessellator tessellator = Tessellator.instance; - Block block = ItemStackUtil.getBlock(itemStack); - - if (!(itemStack.getItem() instanceof ItemBlockLeaves) || block == null) { - return; - } - - TileLeaves leaves = new TileLeaves(); - if (itemStack.hasTagCompound()) { - leaves.readFromNBT(itemStack.getTagCompound()); - } else { - leaves.setTree(TreeHelper.treeTemplates.get(0)); - } - - IIcon leavesIcon = leaves.getIcon(Proxies.render.fancyGraphicsEnabled()); - if (leavesIcon == null) { - return; - } - int color = leaves.getFoliageColour(Proxies.common.getPlayer()); - - float r1 = (float) (color >> 16 & 255) / 255.0F; - float g1 = (float) (color >> 8 & 255) / 255.0F; - float b1 = (float) (color & 255) / 255.0F; - GL11.glColor4f(r1, g1, b1, 1.0F); - - GL11.glTranslatef(x, y, z); - - block.setBlockBoundsForItemRender(); - renderer.setRenderBoundsFromBlock(block); - - GL11.glRotatef(90.0F, 0.0F, 1.0F, 0.0F); - GL11.glTranslatef(-0.5F, -0.5F, -0.5F); - tessellator.startDrawingQuads(); - tessellator.setNormal(0.0F, -1.0F, 0.0F); - renderer.renderFaceYNeg(block, 0.0D, 0.0D, 0.0D, leavesIcon); - tessellator.draw(); - tessellator.startDrawingQuads(); - tessellator.setNormal(0.0F, 1.0F, 0.0F); - renderer.renderFaceYPos(block, 0.0D, 0.0D, 0.0D, leavesIcon); - tessellator.draw(); - tessellator.startDrawingQuads(); - tessellator.setNormal(0.0F, 0.0F, -1.0F); - renderer.renderFaceZNeg(block, 0.0D, 0.0D, 0.0D, leavesIcon); - tessellator.draw(); - tessellator.startDrawingQuads(); - tessellator.setNormal(0.0F, 0.0F, 1.0F); - renderer.renderFaceZPos(block, 0.0D, 0.0D, 0.0D, leavesIcon); - tessellator.draw(); - tessellator.startDrawingQuads(); - tessellator.setNormal(-1.0F, 0.0F, 0.0F); - renderer.renderFaceXNeg(block, 0.0D, 0.0D, 0.0D, leavesIcon); - tessellator.draw(); - tessellator.startDrawingQuads(); - tessellator.setNormal(1.0F, 0.0F, 0.0F); - renderer.renderFaceXPos(block, 0.0D, 0.0D, 0.0D, leavesIcon); - tessellator.draw(); - GL11.glTranslatef(0.5F, 0.5F, 0.5F); - - - // add fruit - if (!leaves.hasFruit()) { - return; - } - - IIcon fruitTexture = leaves.getFruitTexture(); - if (fruitTexture == null) { - return; - } - int fruitColor = leaves.getFruitColour(); - - float r2 = (float) (fruitColor >> 16 & 255) / 255.0F; - float g2 = (float) (fruitColor >> 8 & 255) / 255.0F; - float b2 = (float) (fruitColor & 255) / 255.0F; - GL11.glColor4f(r2, g2, b2, 1.0F); - - block.setBlockBoundsForItemRender(); - renderer.setRenderBoundsFromBlock(block); - - GL11.glRotatef(90.0F, 0.0F, 1.0F, 0.0F); - GL11.glTranslatef(-0.5F, -0.5F, -0.5F); - tessellator.startDrawingQuads(); - tessellator.setNormal(0.0F, -1.0F, 0.0F); - renderer.renderFaceYNeg(block, 0.0D, 0.0D - OVERLAY_SHIFT, 0.0D, fruitTexture); - tessellator.draw(); - tessellator.startDrawingQuads(); - tessellator.setNormal(0.0F, 1.0F, 0.0F); - renderer.renderFaceYPos(block, 0.0D, 0.0D + OVERLAY_SHIFT, 0.0D, fruitTexture); - tessellator.draw(); - tessellator.startDrawingQuads(); - tessellator.setNormal(0.0F, 0.0F, -1.0F); - renderer.renderFaceZNeg(block, 0.0D, 0.0D, 0.0D - OVERLAY_SHIFT, fruitTexture); - tessellator.draw(); - tessellator.startDrawingQuads(); - tessellator.setNormal(0.0F, 0.0F, 1.0F); - renderer.renderFaceZPos(block, 0.0D, 0.0D, 0.0D + OVERLAY_SHIFT, fruitTexture); - tessellator.draw(); - tessellator.startDrawingQuads(); - tessellator.setNormal(-1.0F, 0.0F, 0.0F); - renderer.renderFaceXNeg(block, 0.0D - OVERLAY_SHIFT, 0.0D, 0.0D, fruitTexture); - tessellator.draw(); - tessellator.startDrawingQuads(); - tessellator.setNormal(1.0F, 0.0F, 0.0F); - renderer.renderFaceXPos(block, 0.0D + OVERLAY_SHIFT, 0.0D, 0.0D, fruitTexture); - tessellator.draw(); - GL11.glTranslatef(0.5F, 0.5F, 0.5F); - } -} diff --git a/src/main/java/forestry/arboriculture/render/RenderLogItem.java b/src/main/java/forestry/arboriculture/render/RenderLogItem.java deleted file mode 100644 index fce837ab3..000000000 --- a/src/main/java/forestry/arboriculture/render/RenderLogItem.java +++ /dev/null @@ -1,127 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v3 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: - * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges - ******************************************************************************/ -package forestry.arboriculture.render; - -import net.minecraft.block.Block; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; - -import net.minecraftforge.client.IItemRenderer; - -import org.lwjgl.opengl.GL11; - -import forestry.api.arboriculture.EnumWoodType; -import forestry.arboriculture.items.ItemBlockWood; -import forestry.core.utils.ItemStackUtil; - -public class RenderLogItem implements IItemRenderer { - @Override - public boolean handleRenderType(ItemStack item, ItemRenderType type) { - switch (type) { - case ENTITY: - case EQUIPPED_FIRST_PERSON: - case EQUIPPED: - case INVENTORY: - return true; - default: - return false; - } - } - - @Override - public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { - return true; - } - - @Override - public void renderItem(ItemRenderType type, ItemStack item, Object... data) { - switch (type) { - case ENTITY: - renderItem((RenderBlocks) data[0], item, 0f, 0f, 0f, true); - break; - case EQUIPPED: - case EQUIPPED_FIRST_PERSON: - renderItem((RenderBlocks) data[0], item, 0.5f, 0.5f, 0.5f, true); - break; - case INVENTORY: - renderItem((RenderBlocks) data[0], item, 0f, 0f, 0f, false); - break; - default: - } - } - - private static void renderItem(RenderBlocks renderer, ItemStack itemStack, float x, float y, float z, boolean fullBlock) { - Tessellator tessellator = Tessellator.instance; - Block block = ItemStackUtil.getBlock(itemStack); - - if (!(itemStack.getItem() instanceof ItemBlockWood) || block == null) { - return; - } - - EnumWoodType woodType = ItemBlockWood.getWoodType(itemStack); - - IIcon barkIcon = IconProviderWood.getBarkIcon(woodType); - IIcon heartIcon = IconProviderWood.getHeartIcon(woodType); - if (barkIcon == null || heartIcon == null) { - return; - } - - GL11.glTranslatef(x, y, z); - - block.setBlockBoundsForItemRender(); - renderer.setRenderBoundsFromBlock(block); - - GL11.glRotatef(90.0F, 0.0F, 1.0F, 0.0F); - GL11.glTranslatef(-0.5F, -0.5F, -0.5F); - - // top - tessellator.startDrawingQuads(); - tessellator.setNormal(0.0F, 1.0F, 0.0F); - renderer.renderFaceYPos(block, 0.0D, 0.0D, 0.0D, heartIcon); - tessellator.draw(); - - // front right - tessellator.startDrawingQuads(); - tessellator.setNormal(0.0F, 0.0F, 1.0F); - renderer.renderFaceZPos(block, 0.0D, 0.0D, 0.0D, barkIcon); - tessellator.draw(); - - // front left - tessellator.startDrawingQuads(); - tessellator.setNormal(-1.0F, 0.0F, 0.0F); - renderer.renderFaceXNeg(block, 0.0D, 0.0D, 0.0D, barkIcon); - tessellator.draw(); - - if (fullBlock) { - // bottom - tessellator.startDrawingQuads(); - tessellator.setNormal(0.0F, -1.0F, 0.0F); - renderer.renderFaceYNeg(block, 0.0D, 0.0D, 0.0D, heartIcon); - tessellator.draw(); - - // back right - tessellator.startDrawingQuads(); - tessellator.setNormal(0.0F, 0.0F, -1.0F); - renderer.renderFaceZNeg(block, 0.0D, 0.0D, 0.0D, barkIcon); - tessellator.draw(); - - // back left - tessellator.startDrawingQuads(); - tessellator.setNormal(1.0F, 0.0F, 0.0F); - renderer.renderFaceXPos(block, 0.0D, 0.0D, 0.0D, barkIcon); - tessellator.draw(); - } - - GL11.glTranslatef(0.5F, 0.5F, 0.5F); - } -} diff --git a/src/main/java/forestry/arboriculture/render/RenderPlankItem.java b/src/main/java/forestry/arboriculture/render/RenderPlankItem.java deleted file mode 100644 index bd54dfaf2..000000000 --- a/src/main/java/forestry/arboriculture/render/RenderPlankItem.java +++ /dev/null @@ -1,126 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v3 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: - * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges - ******************************************************************************/ -package forestry.arboriculture.render; - -import net.minecraft.block.Block; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; - -import net.minecraftforge.client.IItemRenderer; - -import org.lwjgl.opengl.GL11; - -import forestry.api.arboriculture.EnumWoodType; -import forestry.arboriculture.items.ItemBlockWood; -import forestry.core.utils.ItemStackUtil; - -public class RenderPlankItem implements IItemRenderer { - @Override - public boolean handleRenderType(ItemStack item, ItemRenderType type) { - switch (type) { - case ENTITY: - case EQUIPPED_FIRST_PERSON: - case EQUIPPED: - case INVENTORY: - return true; - default: - return false; - } - } - - @Override - public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { - return true; - } - - @Override - public void renderItem(ItemRenderType type, ItemStack item, Object... data) { - switch (type) { - case ENTITY: - renderItem((RenderBlocks) data[0], item, 0f, 0f, 0f, true); - break; - case EQUIPPED: - case EQUIPPED_FIRST_PERSON: - renderItem((RenderBlocks) data[0], item, 0.5f, 0.5f, 0.5f, true); - break; - case INVENTORY: - renderItem((RenderBlocks) data[0], item, 0f, 0f, 0f, false); - break; - default: - } - } - - private static void renderItem(RenderBlocks renderer, ItemStack itemStack, float x, float y, float z, boolean fullBlock) { - Tessellator tessellator = Tessellator.instance; - Block block = ItemStackUtil.getBlock(itemStack); - - if (!(itemStack.getItem() instanceof ItemBlockWood) || block == null) { - return; - } - - EnumWoodType woodType = ItemBlockWood.getWoodType(itemStack); - - IIcon plankIcon = IconProviderWood.getPlankIcon(woodType); - if (plankIcon == null) { - return; - } - - GL11.glTranslatef(x, y, z); - - block.setBlockBoundsForItemRender(); - renderer.setRenderBoundsFromBlock(block); - - GL11.glRotatef(90.0F, 0.0F, 1.0F, 0.0F); - GL11.glTranslatef(-0.5F, -0.5F, -0.5F); - - // top - tessellator.startDrawingQuads(); - tessellator.setNormal(0.0F, 1.0F, 0.0F); - renderer.renderFaceYPos(block, 0.0D, 0.0D, 0.0D, plankIcon); - tessellator.draw(); - - // front right - tessellator.startDrawingQuads(); - tessellator.setNormal(0.0F, 0.0F, 1.0F); - renderer.renderFaceZPos(block, 0.0D, 0.0D, 0.0D, plankIcon); - tessellator.draw(); - - // front left - tessellator.startDrawingQuads(); - tessellator.setNormal(-1.0F, 0.0F, 0.0F); - renderer.renderFaceXNeg(block, 0.0D, 0.0D, 0.0D, plankIcon); - tessellator.draw(); - - if (fullBlock) { - // bottom - tessellator.startDrawingQuads(); - tessellator.setNormal(0.0F, -1.0F, 0.0F); - renderer.renderFaceYNeg(block, 0.0D, 0.0D, 0.0D, plankIcon); - tessellator.draw(); - - // back right - tessellator.startDrawingQuads(); - tessellator.setNormal(0.0F, 0.0F, -1.0F); - renderer.renderFaceZNeg(block, 0.0D, 0.0D, 0.0D, plankIcon); - tessellator.draw(); - - // back left - tessellator.startDrawingQuads(); - tessellator.setNormal(1.0F, 0.0F, 0.0F); - renderer.renderFaceXPos(block, 0.0D, 0.0D, 0.0D, plankIcon); - tessellator.draw(); - } - - GL11.glTranslatef(0.5F, 0.5F, 0.5F); - } -} diff --git a/src/main/java/forestry/arboriculture/render/RenderSaplingBlock.java b/src/main/java/forestry/arboriculture/render/RenderSaplingBlock.java deleted file mode 100644 index 433fc19b0..000000000 --- a/src/main/java/forestry/arboriculture/render/RenderSaplingBlock.java +++ /dev/null @@ -1,122 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v3 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: - * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges - ******************************************************************************/ -package forestry.arboriculture.render; - -import net.minecraft.block.Block; -import net.minecraft.client.renderer.EntityRenderer; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.util.IIcon; -import net.minecraft.world.IBlockAccess; - -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; - -import forestry.api.arboriculture.EnumGermlingType; -import forestry.api.arboriculture.IAlleleTreeSpecies; -import forestry.arboriculture.blocks.BlockSapling; -import forestry.arboriculture.tiles.TileSapling; -import forestry.plugins.PluginArboriculture; - -public class RenderSaplingBlock implements ISimpleBlockRenderingHandler { - - private static int renderLayer = 0; - - @Override - public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) { - } - - @Override - public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { - - if (modelId != this.getRenderId()) { - return false; - } - - TileSapling tile = BlockSapling.getSaplingTile(world, x, y, z); - - if (tile == null || tile.getTree() == null) { - return true; - } - - IAlleleTreeSpecies species = tile.getTree().getGenome().getPrimary(); - - renderCrossedSquares(species, world, block, x, y, z); - renderLayer = 1; - renderCrossedSquares(species, world, block, x, y, z); - renderLayer = 0; - return true; - } - - @Override - public boolean shouldRender3DInInventory(int modelId) { - return false; - } - - @Override - public int getRenderId() { - return PluginArboriculture.modelIdSaplings; - } - - private static boolean renderCrossedSquares(IAlleleTreeSpecies species, IBlockAccess world, Block block, int x, int y, int z) { - - Tessellator tess = Tessellator.instance; - - tess.setBrightness(block.getMixedBrightnessForBlock(world, x, y, z)); - int colourMultiplier = species.getGermlingColour(EnumGermlingType.SAPLING, renderLayer); - float r = (colourMultiplier >> 16 & 255) / 255.0F; - float g = (colourMultiplier >> 8 & 255) / 255.0F; - float b = (colourMultiplier & 255) / 255.0F; - - if (EntityRenderer.anaglyphEnable) { - - r = (r * 30.0F + g * 59.0F + b * 11.0F) / 100.0F; - g = (r * 30.0F + g * 70.0F) / 100.0F; - b = (r * 30.0F + b * 70.0F) / 100.0F; - } - - tess.setColorOpaque_F(r, g, b); - drawCrossedSquares(species, x, y, z, 1.0f); - return true; - } - - private static void drawCrossedSquares(IAlleleTreeSpecies species, double par3, double par5, double par7, float mod) { - - Tessellator tess = Tessellator.instance; - IIcon icon = species.getGermlingIcon(EnumGermlingType.SAPLING, renderLayer); - - double d3 = (double) icon.getMinU(); - double d4 = (double) icon.getMinV(); - double d5 = (double) icon.getMaxU(); - double d6 = (double) icon.getMaxV(); - double d7 = 0.45D * mod; - double d8 = par3 + 0.5D - d7; - double d9 = par3 + 0.5D + d7; - double d10 = par7 + 0.5D - d7; - double d11 = par7 + 0.5D + d7; - tess.addVertexWithUV(d8, par5 + mod, d10, d3, d4); - tess.addVertexWithUV(d8, par5 + 0.0D, d10, d3, d6); - tess.addVertexWithUV(d9, par5 + 0.0D, d11, d5, d6); - tess.addVertexWithUV(d9, par5 + mod, d11, d5, d4); - tess.addVertexWithUV(d9, par5 + mod, d11, d3, d4); - tess.addVertexWithUV(d9, par5 + 0.0D, d11, d3, d6); - tess.addVertexWithUV(d8, par5 + 0.0D, d10, d5, d6); - tess.addVertexWithUV(d8, par5 + mod, d10, d5, d4); - tess.addVertexWithUV(d8, par5 + mod, d11, d3, d4); - tess.addVertexWithUV(d8, par5 + 0.0D, d11, d3, d6); - tess.addVertexWithUV(d9, par5 + 0.0D, d10, d5, d6); - tess.addVertexWithUV(d9, par5 + mod, d10, d5, d4); - tess.addVertexWithUV(d9, par5 + mod, d10, d3, d4); - tess.addVertexWithUV(d9, par5 + 0.0D, d10, d3, d6); - tess.addVertexWithUV(d8, par5 + 0.0D, d11, d5, d6); - tess.addVertexWithUV(d8, par5 + mod, d11, d5, d4); - } - -} diff --git a/src/main/java/forestry/arboriculture/render/RenderSlabItem.java b/src/main/java/forestry/arboriculture/render/RenderSlabItem.java deleted file mode 100644 index 083604f59..000000000 --- a/src/main/java/forestry/arboriculture/render/RenderSlabItem.java +++ /dev/null @@ -1,116 +0,0 @@ -package forestry.arboriculture.render; - -import net.minecraft.block.Block; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; - -import net.minecraftforge.client.IItemRenderer; - -import org.lwjgl.opengl.GL11; - -import forestry.api.arboriculture.EnumWoodType; -import forestry.arboriculture.items.ItemBlockWood; -import forestry.core.utils.ItemStackUtil; - -public class RenderSlabItem implements IItemRenderer { - @Override - public boolean handleRenderType(ItemStack item, ItemRenderType type) { - switch (type) { - case ENTITY: - case EQUIPPED_FIRST_PERSON: - case EQUIPPED: - case INVENTORY: - return true; - default: - return false; - } - } - - @Override - public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { - return true; - } - - @Override - public void renderItem(ItemRenderType type, ItemStack item, Object... data) { - switch (type) { - case ENTITY: - renderItem((RenderBlocks) data[0], item, 0f, 0f, 0f, true); - break; - case EQUIPPED: - case EQUIPPED_FIRST_PERSON: - renderItem((RenderBlocks) data[0], item, 0.5f, 0.5f, 0.5f, true); - break; - case INVENTORY: - renderItem((RenderBlocks) data[0], item, 0f, 0f, 0f, false); - break; - default: - } - } - - private static void renderItem(RenderBlocks renderer, ItemStack itemStack, float x, float y, float z, boolean fullBlock) { - Tessellator tessellator = Tessellator.instance; - Block block = ItemStackUtil.getBlock(itemStack); - - if (!(itemStack.getItem() instanceof ItemBlockWood) || block == null) { - return; - } - - EnumWoodType woodType = ItemBlockWood.getWoodType(itemStack); - - IIcon plankIcon = IconProviderWood.getPlankIcon(woodType); - if (plankIcon == null) { - return; - } - - GL11.glTranslatef(x, y, z); - - block.setBlockBoundsForItemRender(); - renderer.setRenderBoundsFromBlock(block); - - GL11.glRotatef(90.0F, 0.0F, 1.0F, 0.0F); - GL11.glTranslatef(-0.5F, -0.5F, -0.5F); - - // top - tessellator.startDrawingQuads(); - tessellator.setNormal(0.0F, 1.0F, 0.0F); - renderer.renderFaceYPos(block, 0.0D, 0.0D, 0.0D, plankIcon); - tessellator.draw(); - - // front right - tessellator.startDrawingQuads(); - tessellator.setNormal(0.0F, 0.0F, 1.0F); - renderer.renderFaceZPos(block, 0.0D, 0.0D, 0.0D, plankIcon); - tessellator.draw(); - - // front left - tessellator.startDrawingQuads(); - tessellator.setNormal(-1.0F, 0.0F, 0.0F); - renderer.renderFaceXNeg(block, 0.0D, 0.0D, 0.0D, plankIcon); - tessellator.draw(); - - if (fullBlock) { - // bottom - tessellator.startDrawingQuads(); - tessellator.setNormal(0.0F, -1.0F, 0.0F); - renderer.renderFaceYNeg(block, 0.0D, 0.0D, 0.0D, plankIcon); - tessellator.draw(); - - // back right - tessellator.startDrawingQuads(); - tessellator.setNormal(0.0F, 0.0F, -1.0F); - renderer.renderFaceZNeg(block, 0.0D, 0.0D, 0.0D, plankIcon); - tessellator.draw(); - - // back left - tessellator.startDrawingQuads(); - tessellator.setNormal(1.0F, 0.0F, 0.0F); - renderer.renderFaceXPos(block, 0.0D, 0.0D, 0.0D, plankIcon); - tessellator.draw(); - } - - GL11.glTranslatef(0.5F, 0.5F, 0.5F); - } -} diff --git a/src/main/java/forestry/arboriculture/render/RenderStairItem.java b/src/main/java/forestry/arboriculture/render/RenderStairItem.java deleted file mode 100644 index fc79cd737..000000000 --- a/src/main/java/forestry/arboriculture/render/RenderStairItem.java +++ /dev/null @@ -1,114 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v3 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: - * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges - ******************************************************************************/ -package forestry.arboriculture.render; - -import net.minecraft.block.Block; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; - -import net.minecraftforge.client.IItemRenderer; - -import org.lwjgl.opengl.GL11; - -import forestry.api.arboriculture.EnumWoodType; -import forestry.arboriculture.items.ItemBlockWood; -import forestry.core.utils.ItemStackUtil; - -public class RenderStairItem implements IItemRenderer { - - @Override - public boolean handleRenderType(ItemStack item, ItemRenderType type) { - switch (type) { - case ENTITY: - case EQUIPPED_FIRST_PERSON: - case EQUIPPED: - case INVENTORY: - return true; - default: - return false; - } - } - - @Override - public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { - return true; - } - - @Override - public void renderItem(ItemRenderType type, ItemStack item, Object... data) { - switch (type) { - case ENTITY: - renderStairBlock((RenderBlocks) data[0], item, 0f, 0f, 0f); - break; - case EQUIPPED: - case EQUIPPED_FIRST_PERSON: - renderStairBlock((RenderBlocks) data[0], item, 0.5f, 0.5f, 0.5f); - break; - case INVENTORY: - renderStairBlock((RenderBlocks) data[0], item, 0f, 0f, 0f); - break; - default: - } - } - - private static void renderStairBlock(RenderBlocks renderBlocks, ItemStack itemStack, float x, float y, float z) { - - Tessellator tessellator = Tessellator.instance; - Block block = ItemStackUtil.getBlock(itemStack); - - if (!(itemStack.getItem() instanceof ItemBlockWood) || block == null) { - return; - } - - EnumWoodType woodType = ItemBlockWood.getWoodType(itemStack); - IIcon texture = IconProviderWood.getPlankIcon(woodType); - - for (int i = 0; i < 2; ++i) { - if (i == 0) { - renderBlocks.setRenderBounds(0.0D, 0.0D, 0.0D, 1.0D, 1.0D, 0.5D); - } - - if (i == 1) { - renderBlocks.setRenderBounds(0.0D, 0.0D, 0.5D, 1.0D, 0.5D, 1.0D); - } - - GL11.glTranslatef(-0.5F, -0.5F, -0.5F); - tessellator.startDrawingQuads(); - tessellator.setNormal(0.0F, -1.0F, 0.0F); - renderBlocks.renderFaceYNeg(block, x, y, z, texture); - tessellator.draw(); - tessellator.startDrawingQuads(); - tessellator.setNormal(0.0F, 1.0F, 0.0F); - renderBlocks.renderFaceYPos(block, x, y, z, texture); - tessellator.draw(); - tessellator.startDrawingQuads(); - tessellator.setNormal(0.0F, 0.0F, -1.0F); - renderBlocks.renderFaceZNeg(block, x, y, z, texture); - tessellator.draw(); - tessellator.startDrawingQuads(); - tessellator.setNormal(0.0F, 0.0F, 1.0F); - renderBlocks.renderFaceZPos(block, x, y, z, texture); - tessellator.draw(); - tessellator.startDrawingQuads(); - tessellator.setNormal(-1.0F, 0.0F, 0.0F); - renderBlocks.renderFaceXNeg(block, x, y, z, texture); - tessellator.draw(); - tessellator.startDrawingQuads(); - tessellator.setNormal(1.0F, 0.0F, 0.0F); - renderBlocks.renderFaceXPos(block, x, y, z, texture); - tessellator.draw(); - GL11.glTranslatef(0.5F, 0.5F, 0.5F); - } - } - -} diff --git a/src/main/java/forestry/arboriculture/render/IconProviderLeaves.java b/src/main/java/forestry/arboriculture/render/SpriteProviderLeaves.java similarity index 78% rename from src/main/java/forestry/arboriculture/render/IconProviderLeaves.java rename to src/main/java/forestry/arboriculture/render/SpriteProviderLeaves.java index 9b0112777..f5b1858b0 100644 --- a/src/main/java/forestry/arboriculture/render/IconProviderLeaves.java +++ b/src/main/java/forestry/arboriculture/render/SpriteProviderLeaves.java @@ -1,53 +1,53 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v3 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: - * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges - ******************************************************************************/ -package forestry.arboriculture.render; - -import java.awt.Color; - -import net.minecraft.util.IIcon; - -import forestry.api.arboriculture.EnumLeafType; -import forestry.api.arboriculture.ILeafIconProvider; - -public class IconProviderLeaves implements ILeafIconProvider { - - private final TextureLeaves leafTexture; - private final int color; - private final int colorPollinated; - - public IconProviderLeaves(EnumLeafType leafType, Color color, Color colorPollinated) { - this.leafTexture = TextureLeaves.get(leafType); - this.color = color.getRGB(); - this.colorPollinated = colorPollinated.getRGB(); - } - - @Override - public int getColor(boolean pollinated) { - if (pollinated) { - return colorPollinated; - } else { - return color; - } - } - - @Override - public IIcon getIcon(boolean pollinated, boolean fancy) { - if (pollinated) { - return leafTexture.getPollinated(); - } else if (fancy) { - return leafTexture.getFancy(); - } else { - return leafTexture.getPlain(); - } - } - -} - +/******************************************************************************* + * Copyright (c) 2011-2014 SirSengir. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser Public License v3 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl-3.0.txt + * + * Various Contributors including, but not limited to: + * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges + ******************************************************************************/ +package forestry.arboriculture.render; + +import java.awt.Color; + +import net.minecraft.client.renderer.texture.TextureAtlasSprite; + +import forestry.api.arboriculture.EnumLeafType; +import forestry.api.arboriculture.ILeafSpriteProvider; + +public class SpriteProviderLeaves implements ILeafSpriteProvider { + + private final TextureLeaves leafTexture; + private final int color; + private final int colorPollinated; + + public SpriteProviderLeaves(EnumLeafType leafType, Color color, Color colorPollinated) { + this.leafTexture = TextureLeaves.get(leafType); + this.color = color.getRGB(); + this.colorPollinated = colorPollinated.getRGB(); + } + + @Override + public int getColor(boolean pollinated) { + if (pollinated) { + return colorPollinated; + } else { + return color; + } + } + + @Override + public TextureAtlasSprite getSprite(boolean pollinated, boolean fancy) { + if (pollinated) { + return leafTexture.getPollinated(); + } else if (fancy) { + return leafTexture.getFancy(); + } else { + return leafTexture.getPlain(); + } + } + +} + diff --git a/src/main/java/forestry/arboriculture/render/StateMapperFluidPod.java b/src/main/java/forestry/arboriculture/render/StateMapperFluidPod.java new file mode 100644 index 000000000..2537a4662 --- /dev/null +++ b/src/main/java/forestry/arboriculture/render/StateMapperFluidPod.java @@ -0,0 +1,52 @@ +package forestry.arboriculture.render; + +import java.util.LinkedHashMap; +import java.util.Map; +import com.google.common.collect.Maps; + +import forestry.api.arboriculture.IAlleleFruit; +import forestry.api.genetics.AlleleManager; +import forestry.api.genetics.IAllele; +import forestry.arboriculture.blocks.BlockFruitPod; +import forestry.core.render.StateMapperForestry; +import net.minecraft.block.Block; +import net.minecraft.block.BlockCocoa; +import net.minecraft.block.BlockDirectional; +import net.minecraft.block.state.IBlockState; +import net.minecraft.client.resources.model.ModelResourceLocation; +import net.minecraft.util.EnumFacing; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +@SideOnly(Side.CLIENT) +public class StateMapperFluidPod extends StateMapperForestry{ + + protected Map mapStateModelLocations = Maps.newLinkedHashMap(); + + @Override + public Map putStateModelLocations(Block block) { + for (EnumFacing facing : EnumFacing.values()){ + if(facing != EnumFacing.UP && facing != EnumFacing.DOWN){ + for (int age = 0;age < BlockCocoa.AGE.getAllowedValues().size();age++){ + for (IAllele allele : AlleleManager.alleleRegistry.getRegisteredAlleles().values()) { + if (allele instanceof IAlleleFruit) { + if(((IAlleleFruit) allele).getModelName() != null){ + IBlockState state = block.getDefaultState().withProperty(BlockFruitPod.FRUIT, (IAlleleFruit)allele).withProperty(BlockDirectional.FACING, facing).withProperty(BlockCocoa.AGE, age); + LinkedHashMap linkedhashmap = Maps.newLinkedHashMap(state.getProperties()); + String modID = ((IAlleleFruit) allele).getModID(); + if(modID == null){ + modID = "forestry"; + } + String modelName = BlockFruitPod.FRUIT.getName((IAlleleFruit) linkedhashmap.remove(BlockFruitPod.FRUIT)); + String s = String.format("%s:%s", modID, "pods/" + modelName); + mapStateModelLocations.put(state, new ModelResourceLocation(s, getPropertyString(linkedhashmap))); + } + } + } + } + } + } + return mapStateModelLocations; + } + +} \ No newline at end of file diff --git a/src/main/java/forestry/arboriculture/render/StateMapperSapling.java b/src/main/java/forestry/arboriculture/render/StateMapperSapling.java new file mode 100644 index 000000000..bedc63261 --- /dev/null +++ b/src/main/java/forestry/arboriculture/render/StateMapperSapling.java @@ -0,0 +1,36 @@ +package forestry.arboriculture.render; + +import java.util.LinkedHashMap; +import java.util.Map; + +import com.google.common.collect.Maps; + +import forestry.api.arboriculture.IAlleleTreeSpecies; +import forestry.api.genetics.AlleleManager; +import forestry.api.genetics.IAllele; +import forestry.arboriculture.blocks.BlockSapling; +import forestry.core.render.StateMapperForestry; +import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; +import net.minecraft.client.resources.model.ModelResourceLocation; + +public class StateMapperSapling extends StateMapperForestry { + + @Override + public Map putStateModelLocations(Block block) { + for (IAllele allele : AlleleManager.alleleRegistry.getRegisteredAlleles().values()) { + if (allele instanceof IAlleleTreeSpecies) { + IBlockState state = block.getDefaultState().withProperty(BlockSapling.TREE, (IAlleleTreeSpecies)allele); + LinkedHashMap linkedhashmap = Maps.newLinkedHashMap(state.getProperties()); + String modID = ((IAlleleTreeSpecies) allele).getModID(); + if(modID == null){ + modID = "forestry"; + } + String s = String.format("%s:%s",((IAlleleTreeSpecies) allele).getModID(), "germlings"); + mapStateModelLocations.put(state, new ModelResourceLocation(s, getPropertyString(linkedhashmap))); + } + } + return mapStateModelLocations; + } + +} diff --git a/src/main/java/forestry/arboriculture/render/TextureLeaves.java b/src/main/java/forestry/arboriculture/render/TextureLeaves.java index fc8e518f4..945b80798 100644 --- a/src/main/java/forestry/arboriculture/render/TextureLeaves.java +++ b/src/main/java/forestry/arboriculture/render/TextureLeaves.java @@ -14,9 +14,7 @@ import java.util.EnumMap; import java.util.Locale; import java.util.Map; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.util.IIcon; - +import net.minecraft.client.renderer.texture.TextureAtlasSprite; import forestry.api.arboriculture.EnumLeafType; import forestry.core.render.TextureManager; @@ -33,39 +31,39 @@ public class TextureLeaves { return leafTextures.get(leafType); } - public static void registerAllIcons(IIconRegister register) { + public static void registerAllSprites() { for (TextureLeaves leafTexture : leafTextures.values()) { - leafTexture.registerIcons(register); + leafTexture.registerIcons(); } } private final EnumLeafType leafType; - private IIcon plain; - private IIcon pollinated; - private IIcon fancy; + private TextureAtlasSprite plain; + private TextureAtlasSprite pollinated; + private TextureAtlasSprite fancy; private TextureLeaves(EnumLeafType enumLeafType) { this.leafType = enumLeafType; } - private void registerIcons(IIconRegister register) { + private void registerIcons() { String ident = leafType.toString().toLowerCase(Locale.ENGLISH); - plain = TextureManager.registerTex(register, "leaves/" + ident + ".plain"); - pollinated = TextureManager.registerTex(register, "leaves/" + ident + ".changed"); - fancy = TextureManager.registerTex(register, "leaves/" + ident + ".fancy"); + plain = TextureManager.registerSprite("blocks/leaves/" + ident + ".plain"); + pollinated = TextureManager.registerSprite("blocks/leaves/" + ident + ".changed"); + fancy = TextureManager.registerSprite("blocks/leaves/" + ident + ".fancy"); } - public IIcon getPlain() { + public TextureAtlasSprite getPlain() { return plain; } - public IIcon getPollinated() { + public TextureAtlasSprite getPollinated() { return pollinated; } - public IIcon getFancy() { + public TextureAtlasSprite getFancy() { return fancy; } } \ No newline at end of file diff --git a/src/main/java/forestry/arboriculture/tiles/TileFruitPod.java b/src/main/java/forestry/arboriculture/tiles/TileFruitPod.java index 6f6a221e8..ac662764c 100644 --- a/src/main/java/forestry/arboriculture/tiles/TileFruitPod.java +++ b/src/main/java/forestry/arboriculture/tiles/TileFruitPod.java @@ -15,15 +15,13 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.Packet; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import forestry.api.arboriculture.IAlleleFruit; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllele; @@ -88,15 +86,6 @@ public class TileFruitPod extends TileEntity implements IFruitBearer, IStreamabl } /* UPDATING */ - - /** - * This doesn't use normal TE updates - */ - @Override - public boolean canUpdate() { - return false; - } - public void onBlockTick() { if (canMature() && worldObj.rand.nextFloat() <= sappiness) { mature(); @@ -113,9 +102,9 @@ public class TileFruitPod extends TileEntity implements IFruitBearer, IStreamabl } @SideOnly(Side.CLIENT) - public IIcon getIcon() { + public TextureAtlasSprite getSprite() { if (maturity < indices.length) { - return TextureManager.getInstance().getIcon((short) indices[maturity]); + return TextureManager.getInstance().getSprite((short) indices[maturity]); } else { return null; } @@ -126,7 +115,7 @@ public class TileFruitPod extends TileEntity implements IFruitBearer, IStreamabl } public ItemStack[] getDrop() { - return allele.getProvider().getFruits(null, worldObj, xCoord, yCoord, zCoord, maturity); + return allele.getProvider().getFruits(null, worldObj, getPos(), maturity); } /* NETWORK */ @@ -145,7 +134,7 @@ public class TileFruitPod extends TileEntity implements IFruitBearer, IStreamabl return; } maturity = (short) newMaturity; - worldObj.func_147479_m(xCoord, yCoord, zCoord); + worldObj.markBlockRangeForRenderUpdate(getPos(), getPos()); } /* IFRUITBEARER */ @@ -161,6 +150,10 @@ public class TileFruitPod extends TileEntity implements IFruitBearer, IStreamabl } return allele.getProvider().getFamily(); } + + public IAlleleFruit getAllele() { + return allele; + } @Override public Collection pickFruit(ItemStack tool) { @@ -203,6 +196,6 @@ public class TileFruitPod extends TileEntity implements IFruitBearer, IStreamabl indices[i] = data.readInt(); } - worldObj.func_147479_m(xCoord, yCoord, zCoord); + worldObj.markBlockRangeForRenderUpdate(getPos(), getPos()); } } diff --git a/src/main/java/forestry/arboriculture/tiles/TileLeaves.java b/src/main/java/forestry/arboriculture/tiles/TileLeaves.java index e57db6f46..617f6eb23 100644 --- a/src/main/java/forestry/arboriculture/tiles/TileLeaves.java +++ b/src/main/java/forestry/arboriculture/tiles/TileLeaves.java @@ -16,21 +16,19 @@ import java.util.Collection; import java.util.Collections; import java.util.EnumSet; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTUtil; -import net.minecraft.util.ChunkCoordinates; -import net.minecraft.util.IIcon; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import com.mojang.authlib.GameProfile; import net.minecraftforge.common.EnumPlantType; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import forestry.api.arboriculture.EnumTreeChromosome; import forestry.api.arboriculture.IAlleleTreeSpecies; import forestry.api.arboriculture.IFruitProvider; @@ -91,9 +89,10 @@ public class TileLeaves extends TileTreeContainer implements IPollinatable, IFru public void readFromNBT(NBTTagCompound nbttagcompound) { // trees from itemStacks will have no coordinates if (nbttagcompound.hasKey("x")) { - this.xCoord = nbttagcompound.getInteger("x"); - this.yCoord = nbttagcompound.getInteger("y"); - this.zCoord = nbttagcompound.getInteger("z"); + int x = nbttagcompound.getInteger("x"); + int y = nbttagcompound.getInteger("y"); + int z = nbttagcompound.getInteger("z"); + pos = new BlockPos(x, y, z); } if (nbttagcompound.hasKey("species")) { @@ -105,7 +104,7 @@ public class TileLeaves extends TileTreeContainer implements IPollinatable, IFru setTree(containedTree); } else { if (nbttagcompound.hasKey("owner")) { - setOwner(NBTUtil.func_152459_a(nbttagcompound.getCompoundTag("owner"))); + setOwner(NBTUtil.readGameProfileFromNBT(nbttagcompound.getCompoundTag("owner"))); } ripeningTime = nbttagcompound.getShort("RT"); @@ -138,9 +137,9 @@ public class TileLeaves extends TileTreeContainer implements IPollinatable, IFru @Override public void writeToNBT(NBTTagCompound nbtTagCompound) { nbtTagCompound.setString("id", "forestry.Leaves"); - nbtTagCompound.setInteger("x", this.xCoord); - nbtTagCompound.setInteger("y", this.yCoord); - nbtTagCompound.setInteger("z", this.zCoord); + nbtTagCompound.setInteger("x", getPos().getX()); + nbtTagCompound.setInteger("y", getPos().getY()); + nbtTagCompound.setInteger("z", getPos().getZ()); if (isDecorative) { writeToNBTDecorative(nbtTagCompound); @@ -155,7 +154,7 @@ public class TileLeaves extends TileTreeContainer implements IPollinatable, IFru GameProfile owner = getOwner(); if (owner != null) { NBTTagCompound nbt = new NBTTagCompound(); - NBTUtil.func_152460_a(nbt, owner); + NBTUtil.writeGameProfile(nbt, owner); nbtTagCompound.setTag("owner", nbt); } @@ -183,7 +182,7 @@ public class TileLeaves extends TileTreeContainer implements IPollinatable, IFru boolean isDestroyed = isDestroyed(tree, damage); for (ILeafTickHandler tickHandler : genome.getPrimary().getRoot().getLeafTickHandlers()) { - if (tickHandler.onRandomLeafTick(tree, worldObj, xCoord, yCoord, zCoord, isDestroyed)) { + if (tickHandler.onRandomLeafTick(tree, worldObj, getPos(), isDestroyed)) { return; } } @@ -211,7 +210,7 @@ public class TileLeaves extends TileTreeContainer implements IPollinatable, IFru matureCaterpillar(); } - effectData = tree.doEffect(effectData, worldObj, xCoord, yCoord, zCoord); + effectData = tree.doEffect(effectData, worldObj, getPos()); } @Override @@ -224,13 +223,13 @@ public class TileLeaves extends TileTreeContainer implements IPollinatable, IFru if (tree.canBearFruit()) { IFruitProvider fruitProvider = genome.getFruitProvider(); - isFruitLeaf = fruitProvider.markAsFruitLeaf(genome, worldObj, xCoord, yCoord, zCoord); + isFruitLeaf = fruitProvider.markAsFruitLeaf(genome, worldObj, getPos()); if (isFruitLeaf) { // Hardcoded because vanilla oak trees don't show fruits. if ((species == TreeDefinition.Oak.getGenome().getPrimary()) && (fruitProvider == AlleleFruit.fruitApple.getProvider())) { textureIndexFruits = -1; } else { - textureIndexFruits = fruitProvider.getIconIndex(genome, worldObj, xCoord, yCoord, zCoord, getRipeningTime(), true); + textureIndexFruits = fruitProvider.getSpriteIndex(genome, worldObj, getPos(), getRipeningTime(), true); } ripeningPeriod = (short) tree.getGenome().getFruitProvider().getRipeningPeriod(); @@ -283,21 +282,21 @@ public class TileLeaves extends TileTreeContainer implements IPollinatable, IFru ITree tree = getTree(); ITreeGenome genome = tree.getGenome(); IFruitProvider fruit = genome.getFruitProvider(); - return fruit.getColour(genome, worldObj, xCoord, yCoord, zCoord, getRipeningTime()); + return fruit.getColour(genome, worldObj, getPos(), getRipeningTime()); } @SideOnly(Side.CLIENT) - public IIcon getIcon(boolean fancy) { + public TextureAtlasSprite getSprite(boolean fancy) { if (species == null) { - return TreeDefinition.Oak.getIndividual().getGenome().getPrimary().getLeafIcon(false, fancy); + return TreeDefinition.Oak.getIndividual().getGenome().getPrimary().getLeafSprite(false, fancy); } - return species.getLeafIcon(isPollinatedState, fancy); + return species.getLeafSprite(isPollinatedState, fancy); } @SideOnly(Side.CLIENT) - public IIcon getFruitTexture() { + public TextureAtlasSprite getFruitTexture() { if (textureIndexFruits >= 0) { - return TextureManager.getInstance().getIcon(textureIndexFruits); + return TextureManager.getInstance().getSprite(textureIndexFruits); } else { return null; } @@ -347,7 +346,7 @@ public class TileLeaves extends TileTreeContainer implements IPollinatable, IFru } getTree().mate((ITree) individual); - worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); + worldObj.markBlockForUpdate(getPos()); } @Override @@ -443,7 +442,7 @@ public class TileLeaves extends TileTreeContainer implements IPollinatable, IFru setTree(tree); - worldObj.func_147479_m(xCoord, yCoord, zCoord); + worldObj.markBlockRangeForRenderUpdate(getPos(), getPos()); } } @@ -453,7 +452,7 @@ public class TileLeaves extends TileTreeContainer implements IPollinatable, IFru return; } colourFruits = newColourFruits; - worldObj.func_147479_m(xCoord, yCoord, zCoord); + worldObj.markBlockRangeForRenderUpdate(getPos(), getPos()); } /* IFRUITBEARER */ @@ -464,7 +463,7 @@ public class TileLeaves extends TileTreeContainer implements IPollinatable, IFru return Collections.emptyList(); } - ItemStack[] produceStacks = tree.produceStacks(worldObj, xCoord, yCoord, zCoord, getRipeningTime()); + ItemStack[] produceStacks = tree.produceStacks(worldObj, getPos(), getRipeningTime()); ripeningTime = 0; sendNetworkUpdateRipening(); return Arrays.asList(produceStacks); @@ -524,15 +523,15 @@ public class TileLeaves extends TileTreeContainer implements IPollinatable, IFru IButterflyGenome caterpillarGenome = caterpillar.getGenome(); int caterpillarMatureTime = Math.round((float) caterpillarGenome.getLifespan() / (caterpillarGenome.getFertility() * 2)); - if (maturationTime >= caterpillarMatureTime && caterpillar.canTakeFlight(worldObj, xCoord, yCoord, zCoord)) { - if (worldObj.isAirBlock(xCoord - 1, yCoord, zCoord)) { - attemptButterflySpawn(worldObj, caterpillar, xCoord - 1, yCoord, zCoord); - } else if (worldObj.isAirBlock(xCoord + 1, yCoord, zCoord)) { - attemptButterflySpawn(worldObj, caterpillar, xCoord + 1, yCoord, zCoord); - } else if (worldObj.isAirBlock(xCoord, yCoord, zCoord - 1)) { - attemptButterflySpawn(worldObj, caterpillar, xCoord, yCoord, zCoord - 1); - } else if (worldObj.isAirBlock(xCoord, yCoord, zCoord + 1)) { - attemptButterflySpawn(worldObj, caterpillar, xCoord, yCoord, zCoord + 1); + if (maturationTime >= caterpillarMatureTime && caterpillar.canTakeFlight(worldObj, getPos().getX(), getPos().getY(), getPos().getZ())) { + if (worldObj.isAirBlock(getPos().add(-1, 0, 0))) { + attemptButterflySpawn(worldObj, caterpillar, getPos().add(-1, 0, 0)); + } else if (worldObj.isAirBlock(getPos().add(1, 0, 0))) { + attemptButterflySpawn(worldObj, caterpillar, getPos().add(1, 0, 0)); + } else if (worldObj.isAirBlock(getPos().add(0, 0, -1))) { + attemptButterflySpawn(worldObj, caterpillar, getPos().add(0, 0, -1)); + } else if (worldObj.isAirBlock(getPos().add(0, 0, 1))) { + attemptButterflySpawn(worldObj, caterpillar, getPos().add(0, 0, 1)); } setCaterpillar(null); } else if (!wasDestroyed && isDestroyed(tree, damage)) { @@ -540,15 +539,15 @@ public class TileLeaves extends TileTreeContainer implements IPollinatable, IFru } } - private static void attemptButterflySpawn(World world, IButterfly butterfly, double x, double y, double z) { - if (ButterflyManager.butterflyRoot.spawnButterflyInWorld(world, butterfly.copy(), x, y + 0.1f, z) != null) { - Log.finest("A caterpillar '%s' hatched at %s/%s/%s.", butterfly.getDisplayName(), x, y, z); + private static void attemptButterflySpawn(World world, IButterfly butterfly, BlockPos pos) { + if (ButterflyManager.butterflyRoot.spawnButterflyInWorld(world, butterfly.copy(), pos.getX(), pos.getY() + 0.1f, pos.getZ()) != null) { + Log.finest("A caterpillar '%s' hatched at %s/%s/%s.", butterfly.getDisplayName(), pos.getX(), pos.getY(), pos.getZ()); } } @Override - public ChunkCoordinates getCoordinates() { - return new ChunkCoordinates(xCoord, yCoord, zCoord); + public BlockPos getCoordinates() { + return getPos(); } @Override diff --git a/src/main/java/forestry/arboriculture/tiles/TileSapling.java b/src/main/java/forestry/arboriculture/tiles/TileSapling.java index d32d8836c..8e358c1f7 100644 --- a/src/main/java/forestry/arboriculture/tiles/TileSapling.java +++ b/src/main/java/forestry/arboriculture/tiles/TileSapling.java @@ -65,11 +65,11 @@ public class TileSapling extends TileTreeContainer { return true; } - WorldGenerator generator = tree.getTreeGenerator(worldObj, xCoord, yCoord, zCoord, true); + WorldGenerator generator = tree.getTreeGenerator(worldObj, getPos(), true); if (generator instanceof WorldGenArboriculture) { WorldGenArboriculture arboricultureGenerator = (WorldGenArboriculture) generator; - arboricultureGenerator.preGenerate(worldObj, xCoord, yCoord, zCoord); - return arboricultureGenerator.canGrow(worldObj, xCoord, yCoord, zCoord); + arboricultureGenerator.preGenerate(worldObj, getPos()); + return arboricultureGenerator.canGrow(worldObj, getPos()); } else { return true; } @@ -91,12 +91,12 @@ public class TileSapling extends TileTreeContainer { return; } - WorldGenerator generator = tree.getTreeGenerator(worldObj, xCoord, yCoord, zCoord, bonemealed); + WorldGenerator generator = tree.getTreeGenerator(worldObj, getPos(), bonemealed); final boolean generated; if (generator instanceof WorldGenBase) { - generated = ((WorldGenBase) generator).generate(worldObj, xCoord, yCoord, zCoord, bonemealed); + generated = ((WorldGenBase) generator).generate(worldObj, getPos(), bonemealed); } else { - generated = generator.generate(worldObj, worldObj.rand, xCoord, yCoord, zCoord); + generated = generator.generate(worldObj, worldObj.rand, getPos()); } if (generated) { diff --git a/src/main/java/forestry/arboriculture/tiles/TileTreeContainer.java b/src/main/java/forestry/arboriculture/tiles/TileTreeContainer.java index 89290b647..120ed5833 100644 --- a/src/main/java/forestry/arboriculture/tiles/TileTreeContainer.java +++ b/src/main/java/forestry/arboriculture/tiles/TileTreeContainer.java @@ -13,11 +13,13 @@ package forestry.arboriculture.tiles; import java.io.IOException; import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTUtil; import net.minecraft.network.Packet; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import com.mojang.authlib.GameProfile; @@ -52,7 +54,7 @@ public abstract class TileTreeContainer extends TileEntity implements IStreamabl containedTree = new Tree(nbttagcompound.getCompoundTag("ContainedTree")); } if (nbttagcompound.hasKey("owner")) { - owner = NBTUtil.func_152459_a(nbttagcompound.getCompoundTag("owner")); + owner = NBTUtil.readGameProfileFromNBT(nbttagcompound.getCompoundTag("owner")); } } @@ -67,7 +69,7 @@ public abstract class TileTreeContainer extends TileEntity implements IStreamabl } if (this.owner != null) { NBTTagCompound nbt = new NBTTagCompound(); - NBTUtil.func_152460_a(nbt, owner); + NBTUtil.writeGameProfile(nbt, owner); nbttagcompound.setTag("owner", nbt); } } @@ -103,7 +105,7 @@ public abstract class TileTreeContainer extends TileEntity implements IStreamabl public void setTree(ITree tree) { this.containedTree = tree; if (worldObj != null && worldObj.isRemote) { - worldObj.func_147479_m(xCoord, yCoord, zCoord); + worldObj.markBlockForUpdate(getPos()); } } @@ -133,15 +135,6 @@ public abstract class TileTreeContainer extends TileEntity implements IStreamabl } /* UPDATING */ - - /** - * This doesn't use normal TE updates - */ - @Override - public boolean canUpdate() { - return false; - } - /** * Leaves and saplings will implement their logic here. */ @@ -152,8 +145,8 @@ public abstract class TileTreeContainer extends TileEntity implements IStreamabl * Use with caution as this will leave straggler TileEntities, or create conflicts with other TileEntities if not used properly. */ @Override - public boolean shouldRefresh(Block oldBlock, Block newBlock, int oldMeta, int newMeta, World world, int x, int y, int z) { - return !Block.isEqualTo(oldBlock, newBlock); + public boolean shouldRefresh(World world, BlockPos pos, IBlockState oldState, IBlockState newSate) { + return !Block.isEqualTo(oldState.getBlock(), newSate.getBlock()); } /* INETWORKEDENTITY */ diff --git a/src/main/java/forestry/arboriculture/tiles/TileWood.java b/src/main/java/forestry/arboriculture/tiles/TileWood.java index d6aacc894..6624e8277 100644 --- a/src/main/java/forestry/arboriculture/tiles/TileWood.java +++ b/src/main/java/forestry/arboriculture/tiles/TileWood.java @@ -18,9 +18,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.Packet; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; - import forestry.api.arboriculture.EnumWoodType; import forestry.arboriculture.IWoodTyped; import forestry.arboriculture.blocks.BlockSlab; @@ -48,11 +47,6 @@ public class TileWood extends TileEntity implements IStreamable { return woodType; } - @Override - public boolean canUpdate() { - return false; - } - /* NETWORK */ @Override public Packet getDescriptionPacket() { @@ -68,7 +62,7 @@ public class TileWood extends TileEntity implements IStreamable { public void readData(DataInputStreamForestry data) throws IOException { int ordinal = data.readVarInt(); woodType = EnumWoodType.VALUES[ordinal]; - worldObj.func_147479_m(xCoord, yCoord, zCoord); + worldObj.markBlockRangeForRenderUpdate(getPos(), getPos()); } @Override @@ -88,8 +82,8 @@ public class TileWood extends TileEntity implements IStreamable { } } - public static ItemStack getPickBlock(Block block, IBlockAccess world, int x, int y, int z) { - TileWood wood = getWoodTile(world, x, y, z); + public static ItemStack getPickBlock(Block block, IBlockAccess world, BlockPos pos) { + TileWood wood = getWoodTile(world, pos); if (wood == null) { return null; } @@ -98,7 +92,7 @@ public class TileWood extends TileEntity implements IStreamable { int amount = 1; if (block instanceof BlockSlab) { BlockSlab blockSlab = (BlockSlab) block; - if (blockSlab.isDoubleSlab()) { + if (blockSlab.isDouble()) { amount = 2; block = PluginArboriculture.blocks.slabs; } @@ -109,14 +103,14 @@ public class TileWood extends TileEntity implements IStreamable { return itemStack; } - public static TileWood getWoodTile(IBlockAccess world, int x, int y, int z) { - return TileUtil.getTile(world, x, y, z, TileWood.class); + public static TileWood getWoodTile(IBlockAccess world, BlockPos pos) { + return TileUtil.getTile(world, pos, TileWood.class); } - public static ArrayList getDrops(T block, World world, int x, int y, int z) { + public static ArrayList getDrops(T block, IBlockAccess world, BlockPos pos) { ArrayList drops = new ArrayList<>(); - ItemStack stack = getPickBlock(block, world, x, y, z); + ItemStack stack = getPickBlock(block, world, pos); if (stack != null) { drops.add(stack); } diff --git a/src/main/java/forestry/arboriculture/worldgen/BlockTypeLog.java b/src/main/java/forestry/arboriculture/worldgen/BlockTypeLog.java index 172512529..0ea4b7045 100644 --- a/src/main/java/forestry/arboriculture/worldgen/BlockTypeLog.java +++ b/src/main/java/forestry/arboriculture/worldgen/BlockTypeLog.java @@ -11,8 +11,7 @@ package forestry.arboriculture.worldgen; import net.minecraft.item.ItemStack; - -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; public class BlockTypeLog extends BlockTypeWood { public BlockTypeLog(ItemStack itemStack) { @@ -20,10 +19,10 @@ public class BlockTypeLog extends BlockTypeWood { } @Override - public void setDirection(ForgeDirection facing) { - if (facing.offsetX != 0) { + public void setDirection(EnumFacing facing) { + if (facing.getFrontOffsetX() != 0) { blockMeta = 4; - } else if (facing.offsetZ != 0) { + } else if (facing.getFrontOffsetZ() != 0) { blockMeta = 8; } else { blockMeta = 0; diff --git a/src/main/java/forestry/arboriculture/worldgen/BlockTypeVanillaStairs.java b/src/main/java/forestry/arboriculture/worldgen/BlockTypeVanillaStairs.java index f7b49613e..8aa3f0445 100644 --- a/src/main/java/forestry/arboriculture/worldgen/BlockTypeVanillaStairs.java +++ b/src/main/java/forestry/arboriculture/worldgen/BlockTypeVanillaStairs.java @@ -11,9 +11,7 @@ package forestry.arboriculture.worldgen; import net.minecraft.init.Blocks; - -import net.minecraftforge.common.util.ForgeDirection; - +import net.minecraft.util.EnumFacing; import forestry.core.worldgen.BlockType; public class BlockTypeVanillaStairs extends BlockType { @@ -22,7 +20,7 @@ public class BlockTypeVanillaStairs extends BlockType { } @Override - public void setDirection(ForgeDirection facing) { + public void setDirection(EnumFacing facing) { switch (facing) { case NORTH: meta = 3; diff --git a/src/main/java/forestry/arboriculture/worldgen/BlockTypeWood.java b/src/main/java/forestry/arboriculture/worldgen/BlockTypeWood.java index e3a06dca1..d07c8f6ff 100644 --- a/src/main/java/forestry/arboriculture/worldgen/BlockTypeWood.java +++ b/src/main/java/forestry/arboriculture/worldgen/BlockTypeWood.java @@ -11,12 +11,13 @@ package forestry.arboriculture.worldgen; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; - import forestry.api.world.ITreeGenData; import forestry.arboriculture.items.ItemBlockWood; +import forestry.core.utils.ItemStackUtil; import forestry.core.worldgen.IBlockType; public class BlockTypeWood implements IBlockType, ITreeBlockType { @@ -29,17 +30,17 @@ public class BlockTypeWood implements IBlockType, ITreeBlockType { } @Override - public void setBlock(World world, ITreeGenData tree, int x, int y, int z) { - setBlock(world, x, y, z); + public void setBlock(World world, ITreeGenData tree, BlockPos pos) { + setBlock(world, pos); } @Override - public void setBlock(World world, int x, int y, int z) { - ItemBlockWood.placeWood(itemStack, null, world, x, y, z, blockMeta); + public void setBlock(World world, BlockPos pos) { + ItemBlockWood.placeWood(itemStack, ItemStackUtil.getBlock(itemStack).getStateFromMeta(blockMeta), null, world, pos); } @Override - public void setDirection(ForgeDirection facing) { + public void setDirection(EnumFacing facing) { } } diff --git a/src/main/java/forestry/arboriculture/worldgen/BlockTypeWoodStairs.java b/src/main/java/forestry/arboriculture/worldgen/BlockTypeWoodStairs.java index 75881fee4..52203737b 100644 --- a/src/main/java/forestry/arboriculture/worldgen/BlockTypeWoodStairs.java +++ b/src/main/java/forestry/arboriculture/worldgen/BlockTypeWoodStairs.java @@ -11,8 +11,7 @@ package forestry.arboriculture.worldgen; import net.minecraft.item.ItemStack; - -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; public class BlockTypeWoodStairs extends BlockTypeWood { public BlockTypeWoodStairs(ItemStack itemStack) { @@ -20,7 +19,7 @@ public class BlockTypeWoodStairs extends BlockTypeWood { } @Override - public void setDirection(ForgeDirection facing) { + public void setDirection(EnumFacing facing) { switch (facing) { case NORTH: blockMeta = 3; diff --git a/src/main/java/forestry/arboriculture/worldgen/ITreeBlockType.java b/src/main/java/forestry/arboriculture/worldgen/ITreeBlockType.java index 94f1cb836..f2b571188 100644 --- a/src/main/java/forestry/arboriculture/worldgen/ITreeBlockType.java +++ b/src/main/java/forestry/arboriculture/worldgen/ITreeBlockType.java @@ -10,14 +10,14 @@ ******************************************************************************/ package forestry.arboriculture.worldgen; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; - import forestry.api.world.ITreeGenData; public interface ITreeBlockType { - void setDirection(ForgeDirection facing); + void setDirection(EnumFacing facing); - void setBlock(World world, ITreeGenData tree, int x, int y, int z); + void setBlock(World world, ITreeGenData tree, BlockPos pos); } diff --git a/src/main/java/forestry/arboriculture/worldgen/TreeBlockType.java b/src/main/java/forestry/arboriculture/worldgen/TreeBlockType.java index 1fa6c032e..fc73e6576 100644 --- a/src/main/java/forestry/arboriculture/worldgen/TreeBlockType.java +++ b/src/main/java/forestry/arboriculture/worldgen/TreeBlockType.java @@ -11,10 +11,10 @@ package forestry.arboriculture.worldgen; import net.minecraft.block.Block; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; - import forestry.api.world.ITreeGenData; import forestry.core.config.Constants; @@ -29,13 +29,13 @@ public class TreeBlockType implements ITreeBlockType { } @Override - public void setDirection(ForgeDirection facing) { + public void setDirection(EnumFacing facing) { } @Override - public void setBlock(World world, ITreeGenData tree, int x, int y, int z) { - world.setBlock(x, y, z, block, meta, Constants.FLAG_BLOCK_SYNCH); + public void setBlock(World world, ITreeGenData tree, BlockPos pos) { + world.setBlockState(pos, block.getStateFromMeta(meta), Constants.FLAG_BLOCK_SYNCH); } public int getMeta() { diff --git a/src/main/java/forestry/arboriculture/worldgen/TreeBlockTypeLeaf.java b/src/main/java/forestry/arboriculture/worldgen/TreeBlockTypeLeaf.java index c101a02a2..5c17ad952 100644 --- a/src/main/java/forestry/arboriculture/worldgen/TreeBlockTypeLeaf.java +++ b/src/main/java/forestry/arboriculture/worldgen/TreeBlockTypeLeaf.java @@ -10,12 +10,12 @@ ******************************************************************************/ package forestry.arboriculture.worldgen; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import com.mojang.authlib.GameProfile; -import net.minecraftforge.common.util.ForgeDirection; - import forestry.api.world.ITreeGenData; public class TreeBlockTypeLeaf implements ITreeBlockType { @@ -27,12 +27,12 @@ public class TreeBlockTypeLeaf implements ITreeBlockType { } @Override - public void setDirection(ForgeDirection facing) { + public void setDirection(EnumFacing facing) { } @Override - public void setBlock(World world, ITreeGenData tree, int x, int y, int z) { - tree.setLeaves(world, owner, x, y, z); + public void setBlock(World world, ITreeGenData tree, BlockPos pos) { + tree.setLeaves(world, owner, pos); } } diff --git a/src/main/java/forestry/arboriculture/worldgen/TreeBlockTypeLog.java b/src/main/java/forestry/arboriculture/worldgen/TreeBlockTypeLog.java index 0dd097979..16ec34450 100644 --- a/src/main/java/forestry/arboriculture/worldgen/TreeBlockTypeLog.java +++ b/src/main/java/forestry/arboriculture/worldgen/TreeBlockTypeLog.java @@ -10,26 +10,26 @@ ******************************************************************************/ package forestry.arboriculture.worldgen; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; - import forestry.api.world.ITreeGenData; public class TreeBlockTypeLog implements ITreeBlockType { - private ForgeDirection facing = ForgeDirection.UP; + private EnumFacing facing = EnumFacing.UP; public TreeBlockTypeLog() { } @Override - public void setDirection(ForgeDirection facing) { + public void setDirection(EnumFacing facing) { this.facing = facing; } @Override - public void setBlock(World world, ITreeGenData tree, int x, int y, int z) { - tree.setLogBlock(world, x, y, z, facing); + public void setBlock(World world, ITreeGenData tree, BlockPos pos) { + tree.setLogBlock(world, pos, facing); } } \ No newline at end of file diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenAcacia.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenAcacia.java index 33807e323..f5ee7c46a 100755 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenAcacia.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenAcacia.java @@ -13,7 +13,7 @@ package forestry.arboriculture.worldgen; import java.util.ArrayList; import java.util.List; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import forestry.api.world.ITreeGenData; @@ -29,35 +29,35 @@ public class WorldGenAcacia extends WorldGenTree { Direction leanDirection = Direction.getRandom(world.rand); float leanAmount = height / 4.0f; - List treeTops = generateTreeTrunk(world, height, girth, 0, leanDirection.forgeDirection, leanAmount); + List treeTops = generateTreeTrunk(world, height, girth, 0, leanDirection.facing, leanAmount); if (height > 5 && world.rand.nextBoolean()) { Direction branchDirection = Direction.getRandomOther(world.rand, leanDirection); - List treeTops2 = generateTreeTrunk(world, Math.round(height * 0.66f), girth, 0, branchDirection.forgeDirection, leanAmount); + List treeTops2 = generateTreeTrunk(world, Math.round(height * 0.66f), girth, 0, branchDirection.facing, leanAmount); treeTops.addAll(treeTops2); } - List branchLocations = new ArrayList<>(); + List branchLocations = new ArrayList<>(); - for (ChunkCoordinates treeTop : treeTops) { - int xOffset = treeTop.posX; - int yOffset = treeTop.posY + 1; - int zOffset = treeTop.posZ; + for (BlockPos treeTop : treeTops) { + int xOffset = treeTop.getX(); + int yOffset = treeTop.getY() + 1; + int zOffset = treeTop.getZ(); float canopyMultiplier = (1.5f * height - yOffset + 2) / 4.0f; int canopyThickness = Math.max(1, Math.round(yOffset / 10.0f)); generateAdjustedCylinder(world, yOffset--, xOffset, zOffset, canopyMultiplier, 1, leaf, EnumReplaceMode.NONE); float canopyWidth = world.rand.nextBoolean() ? 3.0f : 2.5f; - List branches = generateBranches(world, yOffset - canopyThickness, xOffset, zOffset, 0.0f, 0.1f, Math.round(canopyMultiplier * canopyWidth - 4), 2); + List branches = generateBranches(world, yOffset - canopyThickness, xOffset, zOffset, 0.0f, 0.1f, Math.round(canopyMultiplier * canopyWidth - 4), 2); branchLocations.addAll(branches); } - for (ChunkCoordinates branchLocation : branchLocations) { - int leafSpawn = branchLocation.posY; + for (BlockPos branchLocation : branchLocations) { + int leafSpawn = branchLocation.getY(); int canopyThickness = Math.max(1, Math.round(leafSpawn / 10.0f)); float canopyMultiplier = (1.5f * height - leafSpawn + 2) / 4.0f; float canopyWidth = world.rand.nextBoolean() ? 1.0f : 1.5f; - generateAdjustedCylinder(world, leafSpawn - canopyThickness + 1, branchLocation.posX, branchLocation.posZ, canopyMultiplier * canopyWidth, canopyThickness, leaf, EnumReplaceMode.NONE); + generateAdjustedCylinder(world, leafSpawn - canopyThickness + 1, branchLocation.getX(), branchLocation.getZ(), canopyMultiplier * canopyWidth, canopyThickness, leaf, EnumReplaceMode.NONE); } } diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenArboriculture.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenArboriculture.java index cfc2c624c..bc0f6d75a 100755 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenArboriculture.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenArboriculture.java @@ -16,13 +16,12 @@ import java.util.List; import java.util.Random; import net.minecraft.init.Blocks; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import com.mojang.authlib.GameProfile; -import net.minecraftforge.common.util.ForgeDirection; - import forestry.api.world.ITreeGenData; import forestry.arboriculture.tiles.TileTreeContainer; import forestry.core.tiles.TileUtil; @@ -34,15 +33,15 @@ import forestry.core.worldgen.WorldGenBase; public abstract class WorldGenArboriculture extends WorldGenBase { enum Direction { - NORTH(ForgeDirection.NORTH), - SOUTH(ForgeDirection.SOUTH), - WEST(ForgeDirection.WEST), - EAST(ForgeDirection.EAST); + NORTH(EnumFacing.NORTH), + SOUTH(EnumFacing.SOUTH), + WEST(EnumFacing.WEST), + EAST(EnumFacing.EAST); - public final ForgeDirection forgeDirection; + public final EnumFacing facing; - Direction(ForgeDirection forgeDirection) { - this.forgeDirection = forgeDirection; + Direction(EnumFacing forgeDirection) { + this.facing = forgeDirection; } public static Direction getRandom(Random random) { @@ -66,9 +65,7 @@ public abstract class WorldGenArboriculture extends WorldGenBase { private static final BlockType air = new BlockTypeVoid(); protected final ITreeGenData tree; - private int startX; - private int startY; - private int startZ; + private BlockPos startPos; protected TreeBlockTypeLeaf leaf; protected ITreeBlockType wood; @@ -80,13 +77,13 @@ public abstract class WorldGenArboriculture extends WorldGenBase { } @Override - public boolean generate(World world, int x, int y, int z, boolean forced) { + public boolean generate(World world, BlockPos pos, boolean forced) { this.spawnPods = tree.allowsFruitBlocks(); - this.leaf = getLeaf(getOwner(world, x, y, z)); + this.leaf = getLeaf(getOwner(world, pos)); this.wood = getWood(); - preGenerate(world, x, y, z); - if (forced || canGrow(world, x, y, z)) { + preGenerate(world, pos); + if (forced || canGrow(world, pos)) { generate(world); return true; } @@ -94,47 +91,53 @@ public abstract class WorldGenArboriculture extends WorldGenBase { return false; } - private static GameProfile getOwner(World world, int x, int y, int z) { - TileTreeContainer tile = TileUtil.getTile(world, x, y, z, TileTreeContainer.class); + private static GameProfile getOwner(World world, BlockPos pos) { + TileTreeContainer tile = TileUtil.getTile(world, pos, TileTreeContainer.class); if (tile == null) { return null; } return tile.getOwner(); } - public void preGenerate(World world, int startX, int startY, int startZ) { - this.startX = startX; - this.startY = startY; - this.startZ = startZ; + public void preGenerate(World world, BlockPos startPos) { + this.startPos = startPos; } protected abstract void generate(World world); - public abstract boolean canGrow(World world, int x, int y, int z); + public abstract boolean canGrow(World world, BlockPos pos); protected abstract TreeBlockTypeLeaf getLeaf(GameProfile owner); protected abstract ITreeBlockType getWood(); - protected List generateTreeTrunk(World world, int height, int girth) { + protected List generateTreeTrunk(World world, int height, int girth) { return generateTreeTrunk(world, height, girth, 0); } - protected List generateTreeTrunk(World world, int height, int girth, float vinesChance) { - return generateTreeTrunk(world, height, girth, vinesChance, ForgeDirection.UNKNOWN, 0); + protected List generateTreeTrunk(World world, int height, int girth, float vinesChance) { + return generateTreeTrunk(world, height, girth, vinesChance, null, 0); } - protected List generateTreeTrunk(World world, int height, int girth, float vinesChance, ForgeDirection leanDirection, float leanAmount) { + protected List generateTreeTrunk(World world, int height, int girth, float vinesChance, EnumFacing leanDirection, float leanAmount) { return generateTreeTrunk(world, height, girth, 0, vinesChance, leanDirection, leanAmount); } /** Returns a list of trunk top coordinates */ - protected List generateTreeTrunk(World world, int height, int girth, int yStart, float vinesChance, ForgeDirection leanDirection, float leanAmount) { - List treeTops = new ArrayList<>(); + protected List generateTreeTrunk(World world, int height, int girth, int yStart, float vinesChance, EnumFacing leanDirection, float leanAmount) { + List treeTops = new ArrayList<>(); final int leanStartY = (int) Math.floor(height * 0.33f); int prevXOffset = 0; int prevZOffset = 0; + + int offsetX = 0; + int offsetZ = 0; + + if(leanDirection != null){ + offsetX = leanDirection.getFrontOffsetX(); + offsetZ = leanDirection.getFrontOffsetZ(); + } int offset = (girth - 1) / 2; for (int x = 0; x < girth; x++) { @@ -146,24 +149,24 @@ public abstract class WorldGenArboriculture extends WorldGenBase { } else { lean = leanAmount * (y - leanStartY) / (height - leanStartY); } - int xOffset = (int) Math.floor(leanDirection.offsetX * lean - offset); - int zOffset = (int) Math.floor(leanDirection.offsetZ * lean - offset); + int xOffset = (int) Math.floor(offsetX * lean - offset); + int zOffset = (int) Math.floor(offsetZ * lean - offset); if (xOffset != prevXOffset || zOffset != prevZOffset) { prevXOffset = xOffset; prevZOffset = zOffset; if (y > 0) { wood.setDirection(leanDirection); - addWood(world, x + xOffset, y - 1, z + zOffset, EnumReplaceMode.ALL); - wood.setDirection(ForgeDirection.UP); + addWood(world, new BlockPos(x + xOffset, y - 1, z + zOffset), EnumReplaceMode.ALL); + wood.setDirection(EnumFacing.UP); } } - addWood(world, x + xOffset, y, z + zOffset, EnumReplaceMode.ALL); - addVines(world, x + xOffset, y, z + zOffset, vinesChance); + addWood(world, new BlockPos(x + xOffset, y, z + zOffset), EnumReplaceMode.ALL); + addVines(world, new BlockPos(x + xOffset, y, z + zOffset), vinesChance); if (y + 1 == height) { - treeTops.add(new ChunkCoordinates(x + xOffset, y, z + zOffset)); + treeTops.add(new BlockPos(x + xOffset, y, z + zOffset)); } } } @@ -185,21 +188,18 @@ public abstract class WorldGenArboriculture extends WorldGenBase { continue; } - trySpawnFruitBlock(world, x + 1, y, z); - trySpawnFruitBlock(world, x - 1, y, z); - trySpawnFruitBlock(world, x, y, z + 1); - trySpawnFruitBlock(world, x, y, z - 1); + trySpawnFruitBlock(world, new BlockPos(x + 1, y, z)); + trySpawnFruitBlock(world, new BlockPos(x - 1, y, z)); + trySpawnFruitBlock(world, new BlockPos(x, y, z + 1)); + trySpawnFruitBlock(world, new BlockPos(x, y, z - 1)); } } } } - private void trySpawnFruitBlock(World world, int x, int y, int z) { - x += startX; - y += startY; - z += startZ; - if (BlockUtil.isReplaceableBlock(world, x, y, z) || world.isAirBlock(x, y, z)) { - tree.trySpawnFruitBlock(world, x, y, z); + private void trySpawnFruitBlock(World world, BlockPos pos) { + if (BlockUtil.isReplaceableBlock(world, pos.add(startPos)) || world.isAirBlock(pos.add(startPos))) { + tree.trySpawnFruitBlock(world, pos.add(startPos)); } } @@ -230,26 +230,35 @@ public abstract class WorldGenArboriculture extends WorldGenBase { int stemHeight = world.rand.nextInt(Math.round(height * maxHeight)); if (world.rand.nextFloat() < chance) { for (int i = 0; i < stemHeight; i++) { - addWood(world, x, i, z, EnumReplaceMode.SOFT); + addWood(world, new BlockPos(x, i, z), EnumReplaceMode.SOFT); } } } } } - protected List generateBranches(World world, final int startY, int xOffset, int zOffset, float spreadY, float spreadXZ, int radius, int count) { + protected List generateBranches(World world, final int startY, int xOffset, int zOffset, float spreadY, float spreadXZ, int radius, int count) { return generateBranches(world, startY, xOffset, zOffset, spreadY, spreadXZ, radius, count, 1.0f); } - protected List generateBranches(World world, final int startY, final int xOffset, final int zOffset, final float spreadY, final float spreadXZ, int radius, final int count, final float chance) { - List branchEnds = new ArrayList<>(); + protected List generateBranches(World world, final int startY, final int xOffset, final int zOffset, final float spreadY, final float spreadXZ, int radius, final int count, final float chance) { + List branchEnds = new ArrayList<>(); if (radius < 1) { radius = 1; } for (Direction cardinalDirection : Direction.values()) { - ForgeDirection branchDirection = cardinalDirection.forgeDirection; + EnumFacing branchDirection = cardinalDirection.facing; wood.setDirection(branchDirection); + + int offsetX = 0; + int offsetZ = 0; + + if(branchDirection != null){ + offsetX = branchDirection.getFrontOffsetX(); + offsetZ = branchDirection.getFrontOffsetZ(); + } + for (int i = 0; i < count; i++) { if (world.rand.nextFloat() > chance) { continue; @@ -264,29 +273,29 @@ public abstract class WorldGenArboriculture extends WorldGenBase { y++; } else { if (world.rand.nextFloat() < spreadXZ) { - if (branchDirection.offsetX == 0) { + if (offsetX == 0) { if (world.rand.nextBoolean()) { x++; } else { x--; } - wood.setDirection(ForgeDirection.EAST); - } else if (branchDirection.offsetZ == 0) { + wood.setDirection(EnumFacing.EAST); + } else if (offsetZ == 0) { if (world.rand.nextBoolean()) { z++; } else { z--; } - wood.setDirection(ForgeDirection.SOUTH); + wood.setDirection(EnumFacing.SOUTH); } } else { - x += branchDirection.offsetX; - z += branchDirection.offsetZ; + x += offsetX; + z += offsetZ; wood.setDirection(branchDirection); } } - if (addWood(world, x, y, z, EnumReplaceMode.SOFT)) { - branchEnds.add(new ChunkCoordinates(x, y, z)); + if (addWood(world, new BlockPos(x, y, z), EnumReplaceMode.SOFT)) { + branchEnds.add(new BlockPos(x, y, z)); } else { break; } @@ -298,48 +307,48 @@ public abstract class WorldGenArboriculture extends WorldGenBase { } @Override - protected boolean addBlock(World world, int x, int y, int z, ITreeBlockType type, EnumReplaceMode replace) { + protected boolean addBlock(World world, BlockPos pos, ITreeBlockType type, EnumReplaceMode replace) { if (replace == EnumReplaceMode.ALL - || (replace == EnumReplaceMode.SOFT && BlockUtil.isReplaceableBlock(world, startX + x, startY + y, startZ + z)) - || world.isAirBlock(startX + x, startY + y, startZ + z)) { - type.setBlock(world, tree, startX + x, startY + y, startZ + z); + || (replace == EnumReplaceMode.SOFT && BlockUtil.isReplaceableBlock(world, startPos.add(pos))) + || world.isAirBlock(startPos.add(pos))) { + type.setBlock(world, tree, startPos.add(pos)); return true; } return false; } - protected final void clearBlock(World world, int x, int y, int z) { - air.setBlock(world, startX + x, startY + y, startZ + z); + protected final void clearBlock(World world, BlockPos pos) { + air.setBlock(world, startPos.add(pos)); } - protected final boolean addWood(World world, int x, int y, int z, EnumReplaceMode replace) { - return addBlock(world, x, y, z, wood, replace); + protected final boolean addWood(World world, BlockPos pos, EnumReplaceMode replace) { + return addBlock(world, pos, wood, replace); } - protected final boolean addLeaf(World world, int x, int y, int z, EnumReplaceMode replace) { - return addBlock(world, x, y, z, leaf, replace); + protected final boolean addLeaf(World world, BlockPos pos, EnumReplaceMode replace) { + return addBlock(world, pos, leaf, replace); } - protected final boolean addVine(World world, int x, int y, int z, ITreeBlockType vine) { - return addBlock(world, x, y, z, vine, EnumReplaceMode.NONE); + protected final boolean addVine(World world, BlockPos pos, ITreeBlockType vine) { + return addBlock(world, pos, vine, EnumReplaceMode.NONE); } - protected final void addVines(World world, int x, int y, int z, float chance) { + protected final void addVines(World world, BlockPos pos, float chance) { if (chance <= 0) { return; } if (world.rand.nextFloat() < chance) { - addVine(world, x - 1, y, z, vineWest); + addVine(world, pos.add(-1, 0, 0), vineWest); } if (world.rand.nextFloat() < chance) { - addVine(world, x + 1, y, z, vineEast); + addVine(world, pos.add(1, 0, 0), vineEast); } if (world.rand.nextFloat() < chance) { - addVine(world, x, y, z - 1, vineNorth); + addVine(world, pos.add(0, 0, -1), vineNorth); } if (world.rand.nextFloat() < chance) { - addVine(world, x, y, z + 1, vineSouth); + addVine(world, pos.add(0, 0, 1), vineSouth); } } diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenBalsa.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenBalsa.java index e3ab7398b..ce19bb1b5 100755 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenBalsa.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenBalsa.java @@ -10,6 +10,7 @@ ******************************************************************************/ package forestry.arboriculture.worldgen; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import forestry.api.world.ITreeGenData; @@ -27,7 +28,7 @@ public class WorldGenBalsa extends WorldGenTree { int leafSpawn = height; float leafRadius = (girth - 1.0f) / 2.0f; - addLeaf(world, 0, leafSpawn--, 0, EnumReplaceMode.NONE); + addLeaf(world, new BlockPos(0, leafSpawn--, 0), EnumReplaceMode.NONE); generateAdjustedCylinder(world, leafSpawn--, leafRadius, 1, leaf); if (height > 10) { diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenBaobab.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenBaobab.java index 142e9ef87..766f5d512 100755 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenBaobab.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenBaobab.java @@ -12,7 +12,7 @@ package forestry.arboriculture.worldgen; import java.util.List; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import forestry.api.world.ITreeGenData; @@ -27,9 +27,9 @@ public class WorldGenBaobab extends WorldGenTree { public void generate(World world) { generateTreeTrunk(world, height - 1, girth); - List branchCoords = generateBranches(world, height, 0, 0, 0, 0.5f, 4, 6); - for (ChunkCoordinates branchEnd : branchCoords) { - generateAdjustedCylinder(world, branchEnd.posY, branchEnd.posX, branchEnd.posZ, 0.0f, 2, leaf, EnumReplaceMode.NONE); + List branchCoords = generateBranches(world, height, 0, 0, 0, 0.5f, 4, 6); + for (BlockPos branchEnd : branchCoords) { + generateAdjustedCylinder(world, branchEnd, 0.0f, 2, leaf, EnumReplaceMode.NONE); } if (world.rand.nextFloat() < 0.3f) { diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenCherry.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenCherry.java index c6a37e3dd..5e7de7bdf 100755 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenCherry.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenCherry.java @@ -12,7 +12,7 @@ package forestry.arboriculture.worldgen; import java.util.List; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import forestry.api.world.ITreeGenData; @@ -34,9 +34,9 @@ public class WorldGenCherry extends WorldGenTree { int branchWidth = height / 2; while (leafSpawn > 2) { int leafRadius = Math.min(4, branchWidth); - List branchCoords = generateBranches(world, leafSpawn, 0, 0, 0.2f, 0.5f, branchWidth, 1); - for (ChunkCoordinates branchEnd : branchCoords) { - generateAdjustedCircle(world, branchEnd.posY, branchEnd.posX, branchEnd.posZ, leafRadius, 3, 2, leaf, 1.0f, EnumReplaceMode.NONE); + List branchCoords = generateBranches(world, leafSpawn, 0, 0, 0.2f, 0.5f, branchWidth, 1); + for (BlockPos branchEnd : branchCoords) { + generateAdjustedCircle(world, branchEnd, leafRadius, 3, 2, leaf, 1.0f, EnumReplaceMode.NONE); } leafSpawn -= 2; branchWidth++; diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenChestnut.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenChestnut.java index 30be01810..1214ba62e 100755 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenChestnut.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenChestnut.java @@ -12,7 +12,7 @@ package forestry.arboriculture.worldgen; import java.util.List; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import forestry.api.world.ITreeGenData; @@ -41,9 +41,9 @@ public class WorldGenChestnut extends WorldGenTree { int branchRadius = height / 2; - List branchCoords = generateBranches(world, leafSpawn, 0, 0, 0.5f, 0.5f, branchRadius, 2); - for (ChunkCoordinates branchEnd : branchCoords) { - generateAdjustedCylinder(world, branchEnd.posY, branchEnd.posX, branchEnd.posZ, 1.0f, 2, leaf, EnumReplaceMode.NONE); + List branchCoords = generateBranches(world, leafSpawn, 0, 0, 0.5f, 0.5f, branchRadius, 2); + for (BlockPos branchEnd : branchCoords) { + generateAdjustedCylinder(world, branchEnd, 1.0f, 2, leaf, EnumReplaceMode.NONE); } generateAdjustedCylinder(world, leafSpawn, 1.5f, 1, leaf); diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenCocobolo.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenCocobolo.java index 4665f3c54..8cab2a61b 100644 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenCocobolo.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenCocobolo.java @@ -12,7 +12,7 @@ package forestry.arboriculture.worldgen; import java.util.List; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import forestry.api.world.ITreeGenData; @@ -25,12 +25,12 @@ public class WorldGenCocobolo extends WorldGenTree { @Override public void generate(World world) { - List treeTops = generateTreeTrunk(world, height, girth); + List treeTops = generateTreeTrunk(world, height, girth); int leafSpawn = height; - for (ChunkCoordinates treeTop : treeTops) { - addLeaf(world, treeTop.posX, treeTop.posY + 1, treeTop.posZ, EnumReplaceMode.NONE); + for (BlockPos treeTop : treeTops) { + addLeaf(world, treeTop.add(0, 1, 0), EnumReplaceMode.NONE); } leafSpawn--; generateAdjustedCylinder(world, leafSpawn--, 1, 1, leaf); diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenEbony.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenEbony.java index 700a80f28..c7620f3cf 100755 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenEbony.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenEbony.java @@ -10,6 +10,7 @@ ******************************************************************************/ package forestry.arboriculture.worldgen; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import forestry.api.world.ITreeGenData; @@ -30,7 +31,7 @@ public class WorldGenEbony extends WorldGenTree { for (int z = -offset; z < -offset + girth; z++) { if (world.rand.nextFloat() < 0.6f) { for (int i = 0; i < height; i++) { - addWood(world, x, i, z, EnumReplaceMode.ALL); + addWood(world, new BlockPos(x, i, z), EnumReplaceMode.ALL); if (i > height / 2 && world.rand.nextFloat() < 0.1f * (10 / height)) { break; } @@ -38,7 +39,7 @@ public class WorldGenEbony extends WorldGenTree { trunksgenerated++; } else { for (int i = 0; i < 1; i++) { - clearBlock(world, x, i, z); + clearBlock(world, new BlockPos(x, i, z)); } } } diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenIpe.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenIpe.java index 07154b319..f05635ef5 100644 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenIpe.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenIpe.java @@ -13,7 +13,7 @@ package forestry.arboriculture.worldgen; import java.util.ArrayList; import java.util.List; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import forestry.api.world.ITreeGenData; @@ -35,15 +35,15 @@ public class WorldGenIpe extends WorldGenTree { generateAdjustedCylinder(world, leafSpawn--, 0.2f * adjustedGirth, 1, leaf); generateAdjustedCylinder(world, leafSpawn--, 0.2f * adjustedGirth, 1, leaf); - List branchCoords = new ArrayList<>(); + List branchCoords = new ArrayList<>(); while (leafSpawn > 2) { int radius = Math.round(adjustedGirth * (height - leafSpawn) / 1.5f); branchCoords.addAll(generateBranches(world, leafSpawn, 0, 0, 0.25f, 0.25f, radius, 2)); leafSpawn -= 2; } - for (ChunkCoordinates branchEnd : branchCoords) { - generateAdjustedCylinder(world, branchEnd.posY, branchEnd.posX, branchEnd.posZ, 2.0f, 2, leaf, EnumReplaceMode.NONE); + for (BlockPos branchEnd : branchCoords) { + generateAdjustedCylinder(world, branchEnd, 2.0f, 2, leaf, EnumReplaceMode.NONE); } } diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenJungle.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenJungle.java index e1339bcd8..8bb997aee 100755 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenJungle.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenJungle.java @@ -13,7 +13,7 @@ package forestry.arboriculture.worldgen; import java.util.ArrayList; import java.util.List; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import forestry.api.world.ITreeGenData; @@ -38,15 +38,15 @@ public class WorldGenJungle extends WorldGenTreeVanilla { generateTreeTrunk(world, height, girth, vinesChance); if (height > 10) { - List branchCoords = new ArrayList<>(); + List branchCoords = new ArrayList<>(); int branchSpawn = 6; while (branchSpawn < height - 2) { branchCoords.addAll(generateBranches(world, branchSpawn, 0, 0, 0.5f, 0f, 2, 1, 0.25f)); branchSpawn += world.rand.nextInt(4); } - for (ChunkCoordinates branchEnd : branchCoords) { - generateAdjustedCylinder(world, branchEnd.posY, branchEnd.posX, branchEnd.posZ, 0f, 1, leaf, EnumReplaceMode.NONE); + for (BlockPos branchEnd : branchCoords) { + generateAdjustedCylinder(world, branchEnd, 0f, 1, leaf, EnumReplaceMode.NONE); } } diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenKapok.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenKapok.java index 4955939c8..f1f89f6be 100755 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenKapok.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenKapok.java @@ -13,7 +13,7 @@ package forestry.arboriculture.worldgen; import java.util.ArrayList; import java.util.List; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import forestry.api.world.ITreeGenData; @@ -37,15 +37,15 @@ public class WorldGenKapok extends WorldGenTree { generateAdjustedCylinder(world, leafSpawn--, 1.9f, 1, leaf); - List branchCoords = new ArrayList<>(); + List branchCoords = new ArrayList<>(); while (leafSpawn > height - 4) { int radius = Math.round(girth * (height - leafSpawn) / 1.5f) + 6; branchCoords.addAll(generateBranches(world, leafSpawn, 0, 0, 0.3f, 0.25f, radius, 6)); leafSpawn -= 2; } - for (ChunkCoordinates branchEnd : branchCoords) { - generateAdjustedCylinder(world, branchEnd.posY + 1, branchEnd.posX, branchEnd.posZ, 2.0f, 2, leaf, EnumReplaceMode.NONE); + for (BlockPos branchEnd : branchCoords) { + generateAdjustedCylinder(world, branchEnd.getY() + 1, branchEnd.getX(), branchEnd.getZ(), 2.0f, 2, leaf, EnumReplaceMode.NONE); } // Add some smaller twigs below for flavour diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenMahoe.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenMahoe.java index 4c63b5848..2f2338fbd 100755 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenMahoe.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenMahoe.java @@ -13,7 +13,7 @@ package forestry.arboriculture.worldgen; import java.util.ArrayList; import java.util.List; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import forestry.api.world.ITreeGenData; @@ -28,12 +28,12 @@ public class WorldGenMahoe extends WorldGenTree { public void generate(World world) { generateTreeTrunk(world, height, girth); - List branchCoords = new ArrayList<>(); + List branchCoords = new ArrayList<>(); for (int yBranch = 2; yBranch < height - 1; yBranch++) { branchCoords.addAll(generateBranches(world, yBranch, 0, 0, 0.15f, 0.25f, Math.round((height - yBranch) * 0.75f), 1, 0.25f)); } - for (ChunkCoordinates branchEnd : branchCoords) { - generateAdjustedCylinder(world, branchEnd.posY, branchEnd.posX, branchEnd.posZ, 2, 2, leaf, EnumReplaceMode.NONE); + for (BlockPos branchEnd : branchCoords) { + generateAdjustedCylinder(world, branchEnd, 2, 2, leaf, EnumReplaceMode.NONE); } int yCenter = height - girth; diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenMahogany.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenMahogany.java index 1290be99b..e92f618c0 100755 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenMahogany.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenMahogany.java @@ -13,7 +13,7 @@ package forestry.arboriculture.worldgen; import java.util.ArrayList; import java.util.List; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import forestry.api.world.ITreeGenData; @@ -29,12 +29,12 @@ public class WorldGenMahogany extends WorldGenTree { generateTreeTrunk(world, height, girth, 0.6f); generateSupportStems(world, height, girth, 0.4f, 0.4f); - List branchCoords = new ArrayList<>(); + List branchCoords = new ArrayList<>(); for (int yBranch = height - 4; yBranch < height - 2; yBranch++) { branchCoords.addAll(generateBranches(world, yBranch, 0, 0, 0.15f, 0.25f, Math.round((height - yBranch) * 0.5f), 1, 0.25f)); } - for (ChunkCoordinates branchEnd : branchCoords) { - generateAdjustedCylinder(world, branchEnd.posY, branchEnd.posX, branchEnd.posZ, 2, 2, leaf, EnumReplaceMode.NONE); + for (BlockPos branchEnd : branchCoords) { + generateAdjustedCylinder(world, branchEnd, 2, 2, leaf, EnumReplaceMode.NONE); } int leafSpawn = height + 1; diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenMaple.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenMaple.java index 696678250..24fc419fa 100755 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenMaple.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenMaple.java @@ -13,7 +13,7 @@ package forestry.arboriculture.worldgen; import java.util.ArrayList; import java.util.List; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import forestry.api.world.ITreeGenData; @@ -28,12 +28,12 @@ public class WorldGenMaple extends WorldGenTree { public void generate(World world) { generateTreeTrunk(world, height, girth); - List branchCoords = new ArrayList<>(); + List branchCoords = new ArrayList<>(); for (int yBranch = 2; yBranch < height - 2; yBranch++) { branchCoords.addAll(generateBranches(world, yBranch, 0, 0, 0.15f, 0.25f, Math.round((height - yBranch) * 0.25f), 1, 0.25f)); } - for (ChunkCoordinates branchEnd : branchCoords) { - generateAdjustedCylinder(world, branchEnd.posY, branchEnd.posX, branchEnd.posZ, 2, 2, leaf, EnumReplaceMode.NONE); + for (BlockPos branchEnd : branchCoords) { + generateAdjustedCylinder(world, branchEnd, 2, 2, leaf, EnumReplaceMode.NONE); } int leafSpawn = height + 1; diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenPadauk.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenPadauk.java index 70032e1d2..61a463f3f 100644 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenPadauk.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenPadauk.java @@ -12,10 +12,10 @@ package forestry.arboriculture.worldgen; import java.util.Random; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; - import forestry.api.world.ITreeGenData; public class WorldGenPadauk extends WorldGenTree { @@ -50,8 +50,8 @@ public class WorldGenPadauk extends WorldGenTree { int offsetValue = (offset[new Random().nextInt(offset.length)]); int maxBranchLength = 3; int branchLength = new Random().nextInt(maxBranchLength + 1); - ForgeDirection[] direction = {ForgeDirection.NORTH, ForgeDirection.EAST}; - ForgeDirection directionValue = (direction[new Random().nextInt(direction.length)]); + EnumFacing[] direction = {EnumFacing.NORTH, EnumFacing.EAST}; + EnumFacing directionValue = (direction[new Random().nextInt(direction.length)]); int branchSpawn = leafSpawn; for (int j = 1; j < branchLength + 1; j++) { @@ -60,10 +60,10 @@ public class WorldGenPadauk extends WorldGenTree { } wood.setDirection(directionValue); - if (directionValue == ForgeDirection.NORTH) { - addWood(world, 0, branchSpawn, j * offsetValue, EnumReplaceMode.ALL); - } else if (directionValue == ForgeDirection.EAST) { - addWood(world, j * offsetValue, branchSpawn, 0, EnumReplaceMode.ALL); + if (directionValue == EnumFacing.NORTH) { + addWood(world, new BlockPos(0, branchSpawn, j * offsetValue), EnumReplaceMode.ALL); + } else if (directionValue == EnumFacing.EAST) { + addWood(world, new BlockPos(j * offsetValue, branchSpawn, 0), EnumReplaceMode.ALL); } } } diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenPapaya.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenPapaya.java index e6e6e2158..ed79a0d4b 100755 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenPapaya.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenPapaya.java @@ -12,7 +12,7 @@ package forestry.arboriculture.worldgen; import java.util.List; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import forestry.api.world.ITreeGenData; @@ -27,9 +27,9 @@ public class WorldGenPapaya extends WorldGenTree { public void generate(World world) { generateTreeTrunk(world, height, girth); - List branchCoords = generateBranches(world, height, 0, 0, 0.15f, 0.25f, height / 4, 1, 0.25f); - for (ChunkCoordinates branchEnd : branchCoords) { - generateAdjustedCylinder(world, branchEnd.posY, branchEnd.posX, branchEnd.posZ, 1, 1, leaf, EnumReplaceMode.NONE); + List branchCoords = generateBranches(world, height, 0, 0, 0.15f, 0.25f, height / 4, 1, 0.25f); + for (BlockPos branchEnd : branchCoords) { + generateAdjustedCylinder(world, branchEnd, 1, 1, leaf, EnumReplaceMode.NONE); } int yCenter = height - girth; diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenPine.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenPine.java index e6bd7608b..dc0c9f5c3 100755 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenPine.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenPine.java @@ -13,7 +13,7 @@ package forestry.arboriculture.worldgen; import java.util.ArrayList; import java.util.List; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import forestry.api.world.ITreeGenData; @@ -28,12 +28,12 @@ public class WorldGenPine extends WorldGenTree { public void generate(World world) { generateTreeTrunk(world, height, girth); - List branchCoords = new ArrayList<>(); + List branchCoords = new ArrayList<>(); for (int yBranch = 2; yBranch < height - 2; yBranch++) { branchCoords.addAll(generateBranches(world, yBranch, 0, 0, 0.05f, 0.1f, Math.round((height - yBranch) * 0.25f), 1, 0.25f)); } - for (ChunkCoordinates branchEnd : branchCoords) { - generateAdjustedCylinder(world, branchEnd.posY, branchEnd.posX, branchEnd.posZ, 2, 1, leaf, EnumReplaceMode.NONE); + for (BlockPos branchEnd : branchCoords) { + generateAdjustedCylinder(world, branchEnd, 2, 1, leaf, EnumReplaceMode.NONE); } int leafSpawn = height + 1; diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenSequoia.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenSequoia.java index d4137f9e3..88f75e90a 100755 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenSequoia.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenSequoia.java @@ -13,7 +13,7 @@ package forestry.arboriculture.worldgen; import java.util.ArrayList; import java.util.List; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import forestry.api.world.ITreeGenData; @@ -35,7 +35,7 @@ public class WorldGenSequoia extends WorldGenTree { int topHeight = (height / 3) + world.rand.nextInt(height / 6); - List branchCoords = new ArrayList<>(); + List branchCoords = new ArrayList<>(); for (int yBranch = topHeight; yBranch < height; yBranch++) { int branchLength = Math.round(height - yBranch) / 2; if (branchLength > 4) { @@ -43,8 +43,8 @@ public class WorldGenSequoia extends WorldGenTree { } branchCoords.addAll(generateBranches(world, yBranch, 0, 0, 0.05f, 0.25f, branchLength, 1, 0.5f)); } - for (ChunkCoordinates branchEnd : branchCoords) { - generateAdjustedCylinder(world, branchEnd.posY, branchEnd.posX, branchEnd.posZ, 1.0f, 1, leaf, EnumReplaceMode.NONE); + for (BlockPos branchEnd : branchCoords) { + generateAdjustedCylinder(world, branchEnd, 1.0f, 1, leaf, EnumReplaceMode.NONE); } int leafSpawn = height + 2; diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenSilverLime.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenSilverLime.java index ed4a65d20..523f2f557 100644 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenSilverLime.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenSilverLime.java @@ -12,7 +12,7 @@ package forestry.arboriculture.worldgen; import java.util.List; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import forestry.api.world.ITreeGenData; @@ -26,9 +26,9 @@ public class WorldGenSilverLime extends WorldGenTree { @Override public void generate(World world) { generateTreeTrunk(world, height, girth); - List branchCoords = generateBranches(world, 3 + world.rand.nextInt(1), 0, 0, 0.25f, 0.10f, Math.round(height * 0.25f), 2, 0.5f); - for (ChunkCoordinates branchEnd : branchCoords) { - generateAdjustedCylinder(world, branchEnd.posY, branchEnd.posX, branchEnd.posZ, 0, 1, leaf, EnumReplaceMode.NONE); + List branchCoords = generateBranches(world, 3 + world.rand.nextInt(1), 0, 0, 0.25f, 0.10f, Math.round(height * 0.25f), 2, 0.5f); + for (BlockPos branchEnd : branchCoords) { + generateAdjustedCylinder(world, branchEnd, 0, 1, leaf, EnumReplaceMode.NONE); } int leafSpawn = height + 1; diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenSpruce.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenSpruce.java index d3177e48f..17387cb77 100755 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenSpruce.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenSpruce.java @@ -12,7 +12,7 @@ package forestry.arboriculture.worldgen; import java.util.List; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import forestry.api.world.ITreeGenData; @@ -35,9 +35,9 @@ public class WorldGenSpruce extends WorldGenTree { int branchWidth = height / 4; while (leafSpawn > 2) { int leafRadius = Math.min(4, branchWidth); - List branchCoords = generateBranches(world, leafSpawn, 0, 0, 0.2f, 0.5f, branchWidth, 1); - for (ChunkCoordinates branchEnd : branchCoords) { - generateAdjustedCircle(world, branchEnd.posY, branchEnd.posX, branchEnd.posZ, leafRadius, 3, 2, leaf, 1.0f, EnumReplaceMode.SOFT); + List branchCoords = generateBranches(world, leafSpawn, 0, 0, 0.2f, 0.5f, branchWidth, 1); + for (BlockPos branchEnd : branchCoords) { + generateAdjustedCircle(world, branchEnd, leafRadius, 3, 2, leaf, 1.0f, EnumReplaceMode.SOFT); } generateAdjustedCylinder(world, leafSpawn--, 2, 1, leaf); generateAdjustedCylinder(world, leafSpawn--, 1, 1, leaf); diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenTeak.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenTeak.java index 1798c952e..42bc6d281 100755 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenTeak.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenTeak.java @@ -12,7 +12,7 @@ package forestry.arboriculture.worldgen; import java.util.List; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import forestry.api.world.ITreeGenData; @@ -32,9 +32,9 @@ public class WorldGenTeak extends WorldGenTree { leafMultiplier = 2; } int branchWidth = height / 3; - List branchCoords = generateBranches(world, height - 3, 0, 0, 0.2f, 0.5f, branchWidth, 1); - for (ChunkCoordinates branchEnd : branchCoords) { - generateAdjustedCircle(world, branchEnd.posY, branchEnd.posX, branchEnd.posZ, 2, Math.round(3 * leafMultiplier), 2, leaf, 1.0f, EnumReplaceMode.NONE); + List branchCoords = generateBranches(world, height - 3, 0, 0, 0.2f, 0.5f, branchWidth, 1); + for (BlockPos branchEnd : branchCoords) { + generateAdjustedCircle(world, branchEnd, 2, Math.round(3 * leafMultiplier), 2, leaf, 1.0f, EnumReplaceMode.NONE); } int leafSpawn = height + 1; diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenTree.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenTree.java index b1b670218..b480a0791 100755 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenTree.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenTree.java @@ -10,6 +10,7 @@ ******************************************************************************/ package forestry.arboriculture.worldgen; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import com.mojang.authlib.GameProfile; @@ -51,6 +52,11 @@ public abstract class WorldGenTree extends WorldGenArboriculture { float cent = girth % 2 == 0 ? 0.5f : 0f; return new Vector(cent + xOffset, yCenter, cent + zOffset); } + + protected Vector getCenteredAt(BlockPos centerPos) { + float cent = girth % 2 == 0 ? 0.5f : 0f; + return new Vector(cent + centerPos.getX(), centerPos.getY(), cent + centerPos.getZ()); + } protected void generateAdjustedCylinder(World world, int yCenter, float radius, int height, ITreeBlockType block) { generateAdjustedCylinder(world, yCenter, 0, 0, radius, height, block, EnumReplaceMode.SOFT); @@ -64,22 +70,32 @@ public abstract class WorldGenTree extends WorldGenArboriculture { Vector center = getCenteredAt(yCenter, xOffset, zOffset); generateCylinder(world, center, radius + girth, height, block, replace); } + + protected void generateAdjustedCylinder(World world, BlockPos centerPos, float radius, int height, ITreeBlockType block, EnumReplaceMode replace) { + Vector center = getCenteredAt(centerPos); + generateCylinder(world, center, radius + girth, height, block, replace); + } protected void generateAdjustedCircle(World world, int yCenter, int xOffset, int zOffset, float radius, int width, int height, ITreeBlockType block, float chance, EnumReplaceMode replace) { Vector center = getCenteredAt(yCenter, xOffset, zOffset); generateCircle(world, center, radius, width, height, block, chance, replace); } - - @Override - public boolean canGrow(World world, int x, int y, int z) { - return tree.canGrow(world, x, y, z, girth, height); + + protected void generateAdjustedCircle(World world, BlockPos centerPos, float radius, int width, int height, ITreeBlockType block, float chance, EnumReplaceMode replace) { + Vector center = getCenteredAt(centerPos); + generateCircle(world, center, radius, width, height, block, chance, replace); } @Override - public final void preGenerate(World world, int startX, int startY, int startZ) { - super.preGenerate(world, startX, startY, startZ); + public boolean canGrow(World world, BlockPos pos) { + return tree.canGrow(world, pos, girth, height); + } + + @Override + public final void preGenerate(World world, BlockPos startPos) { + super.preGenerate(world, startPos); height = determineHeight(world, baseHeight, heightVariation); - girth = tree.getGirth(world, startX, startY, startZ); + girth = tree.getGirth(world, startPos); } protected int modifyByHeight(World world, int val, int min, int max) { diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenWalnut.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenWalnut.java index aada614ab..96a9d9548 100755 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenWalnut.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenWalnut.java @@ -12,7 +12,7 @@ package forestry.arboriculture.worldgen; import java.util.List; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import forestry.api.world.ITreeGenData; @@ -38,9 +38,9 @@ public class WorldGenWalnut extends WorldGenTree { float branchSize = 2; while (leafSpawn >= 3) { int leafRadius = Math.min(4, (int) branchSize); - List branchCoords = generateBranches(world, leafSpawn, 0, 0, 0.2f, 0.2f, (int) branchSize, 1, 0.5f); - for (ChunkCoordinates branchEnd : branchCoords) { - generateAdjustedCircle(world, branchEnd.posY, branchEnd.posX, branchEnd.posZ, leafRadius, 2, 2, leaf, 1.0f, EnumReplaceMode.SOFT); + List branchCoords = generateBranches(world, leafSpawn, 0, 0, 0.2f, 0.2f, (int) branchSize, 1, 0.5f); + for (BlockPos branchEnd : branchCoords) { + generateAdjustedCircle(world, branchEnd, leafRadius, 2, 2, leaf, 1.0f, EnumReplaceMode.SOFT); } leafSpawn--; branchSize += 0.25f; diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenWenge.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenWenge.java index 1a1714c0d..8a0624984 100755 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenWenge.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenWenge.java @@ -12,7 +12,7 @@ package forestry.arboriculture.worldgen; import java.util.List; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import forestry.api.world.ITreeGenData; @@ -39,9 +39,9 @@ public class WorldGenWenge extends WorldGenTree { while (leafSpawn > 1) { generateAdjustedCylinder(world, leafSpawn--, 3f, 1, leaf); - List branchCoords = generateBranches(world, leafSpawn, 0, 0, 0.2f, 0.2f, (int) branchSize, 2, 0.75f); - for (ChunkCoordinates branchEnd : branchCoords) { - generateAdjustedCircle(world, branchEnd.posY, branchEnd.posX, branchEnd.posZ, 3, 3, 2, leaf, 1.0f, EnumReplaceMode.SOFT); + List branchCoords = generateBranches(world, leafSpawn, 0, 0, 0.2f, 0.2f, (int) branchSize, 2, 0.75f); + for (BlockPos branchEnd : branchCoords) { + generateAdjustedCircle(world, branchEnd, 3, 3, 2, leaf, 1.0f, EnumReplaceMode.SOFT); } leafSpawn--; branchSize += 0.5f; diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenZebrawood.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenZebrawood.java index 5e23e6439..e200fafad 100644 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenZebrawood.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenZebrawood.java @@ -12,7 +12,7 @@ package forestry.arboriculture.worldgen; import java.util.List; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import forestry.api.world.ITreeGenData; @@ -29,9 +29,9 @@ public class WorldGenZebrawood extends WorldGenTree { generateTreeTrunk(world, height, girth); generateSupportStems(world, height, girth, 0.8f, 0.3f); - List branchCoords = generateBranches(world, height - 4, 0, 0, 0, 0.25f, 3, 2, 0.75f); - for (ChunkCoordinates branchEnd : branchCoords) { - generateAdjustedCylinder(world, branchEnd.posY, branchEnd.posX, branchEnd.posZ, 1.0f, 2, leaf, EnumReplaceMode.NONE); + List branchCoords = generateBranches(world, height - 4, 0, 0, 0, 0.25f, 3, 2, 0.75f); + for (BlockPos branchEnd : branchCoords) { + generateAdjustedCylinder(world, branchEnd, 1.0f, 2, leaf, EnumReplaceMode.NONE); } int leafSpawn = height + 1; diff --git a/src/main/java/forestry/core/CreativeTabForestry.java b/src/main/java/forestry/core/CreativeTabForestry.java index 4612e780a..a9483d7b7 100755 --- a/src/main/java/forestry/core/CreativeTabForestry.java +++ b/src/main/java/forestry/core/CreativeTabForestry.java @@ -13,9 +13,7 @@ package forestry.core; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; - -import cpw.mods.fml.common.registry.GameRegistry; - +import net.minecraftforge.fml.common.registry.GameRegistry; import forestry.api.core.Tabs; import forestry.plugins.PluginCore; import forestry.plugins.PluginManager; diff --git a/src/main/java/forestry/core/EventHandlerCore.java b/src/main/java/forestry/core/EventHandlerCore.java index 84b89603e..e8d191127 100755 --- a/src/main/java/forestry/core/EventHandlerCore.java +++ b/src/main/java/forestry/core/EventHandlerCore.java @@ -17,13 +17,11 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraftforge.client.event.TextureStitchEvent; import net.minecraftforge.event.entity.player.EntityItemPickupEvent; import net.minecraftforge.event.world.WorldEvent; - -import cpw.mods.fml.common.eventhandler.Event.Result; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.gameevent.PlayerEvent; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - +import net.minecraftforge.fml.common.eventhandler.Event.Result; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.gameevent.PlayerEvent; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IBreedingTracker; import forestry.api.genetics.ISpeciesRoot; @@ -87,10 +85,8 @@ public class EventHandlerCore { @SubscribeEvent @SideOnly(Side.CLIENT) public void handleTextureRemap(TextureStitchEvent.Pre event) { - if (event.map.getTextureType() == 1) { - ErrorStateRegistry.initIcons(event.map); - TextureManager.initDefaultIcons(event.map); - } + ErrorStateRegistry.initSprites(); + TextureManager.initDefaultSprites(); } } diff --git a/src/main/java/forestry/core/TickHandlerCoreClient.java b/src/main/java/forestry/core/TickHandlerCoreClient.java index 7646361b8..884e97404 100755 --- a/src/main/java/forestry/core/TickHandlerCoreClient.java +++ b/src/main/java/forestry/core/TickHandlerCoreClient.java @@ -13,11 +13,9 @@ package forestry.core; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.RenderGlobal; import net.minecraft.entity.player.EntityPlayer; - -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.gameevent.TickEvent; -import cpw.mods.fml.common.gameevent.TickEvent.Phase; - +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.gameevent.TickEvent; +import net.minecraftforge.fml.common.gameevent.TickEvent.Phase; import forestry.core.utils.GeneticsUtil; public class TickHandlerCoreClient { diff --git a/src/main/java/forestry/core/TickHandlerCoreServer.java b/src/main/java/forestry/core/TickHandlerCoreServer.java index 036e46ab4..76c8a2ba7 100755 --- a/src/main/java/forestry/core/TickHandlerCoreServer.java +++ b/src/main/java/forestry/core/TickHandlerCoreServer.java @@ -21,11 +21,9 @@ import net.minecraft.world.World; import net.minecraft.world.chunk.Chunk; import net.minecraftforge.event.world.ChunkDataEvent; - -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.gameevent.TickEvent.Phase; -import cpw.mods.fml.common.gameevent.TickEvent.WorldTickEvent; - +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.gameevent.TickEvent.Phase; +import net.minecraftforge.fml.common.gameevent.TickEvent.WorldTickEvent; import forestry.core.config.Config; import forestry.core.config.Constants; import forestry.core.worldgen.WorldGenerator; @@ -57,7 +55,7 @@ public class TickHandlerCoreServer { if (Config.doRetrogen) { World world = event.world; - int dimensionID = world.provider.dimensionId; + int dimensionID = world.provider.getDimensionId(); List chunkList = chunkRegenList.get(dimensionID); if (chunkList.size() > 0) { @@ -103,7 +101,7 @@ public class TickHandlerCoreServer { public final int zCoord; public ChunkCoords(Chunk chunk) { - this.dimension = chunk.worldObj.provider.dimensionId; + this.dimension = chunk.getWorld().provider.getDimensionId(); this.xCoord = chunk.xPosition; this.zCoord = chunk.zPosition; } diff --git a/src/main/java/forestry/core/access/AccessHandler.java b/src/main/java/forestry/core/access/AccessHandler.java index 82c9b07f8..c6fe9baa5 100644 --- a/src/main/java/forestry/core/access/AccessHandler.java +++ b/src/main/java/forestry/core/access/AccessHandler.java @@ -50,10 +50,12 @@ public final class AccessHandler implements IAccessHandler { this.target = entity; } + @Override public void addOwnerListener(IAccessOwnerListener accessListener) { accessOwnerListeners.add(accessListener); } + @Override public void removeOwnerListener(IAccessOwnerListener accessListener) { accessOwnerListeners.remove(accessListener); } @@ -165,7 +167,7 @@ public final class AccessHandler implements IAccessHandler { access = EnumAccess.values()[data.getInteger("Access")]; if (data.hasKey("owner")) { - owner = NBTUtil.func_152459_a(data.getCompoundTag("owner")); + owner = NBTUtil.readGameProfileFromNBT(data.getCompoundTag("owner")); } } @@ -175,7 +177,7 @@ public final class AccessHandler implements IAccessHandler { if (this.owner != null) { NBTTagCompound nbt = new NBTTagCompound(); - NBTUtil.func_152460_a(nbt, owner); + NBTUtil.writeGameProfile(nbt, owner); data.setTag("owner", nbt); } } diff --git a/src/main/java/forestry/core/access/EnumAccess.java b/src/main/java/forestry/core/access/EnumAccess.java index 5f13d8894..62b4cf33b 100644 --- a/src/main/java/forestry/core/access/EnumAccess.java +++ b/src/main/java/forestry/core/access/EnumAccess.java @@ -10,18 +10,17 @@ ******************************************************************************/ package forestry.core.access; -import net.minecraft.util.IIcon; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public enum EnumAccess { SHARED("gui.rule.shared"), VIEWABLE("gui.rule.restricted"), PRIVATE("gui.rule.private"); private final String name; - + @SideOnly(Side.CLIENT) - private IIcon icon; + private TextureAtlasSprite icon; EnumAccess(String name) { this.name = name; diff --git a/src/main/java/forestry/core/blocks/BlockBase.java b/src/main/java/forestry/core/blocks/BlockBase.java index 6b22eb049..2ef5a276e 100644 --- a/src/main/java/forestry/core/blocks/BlockBase.java +++ b/src/main/java/forestry/core/blocks/BlockBase.java @@ -12,10 +12,11 @@ package forestry.core.blocks; import java.util.ArrayList; import java.util.List; - -import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.block.properties.IProperty; +import net.minecraft.block.properties.PropertyEnum; +import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; @@ -24,44 +25,65 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.BlockPos; import net.minecraft.util.ChatComponentTranslation; -import net.minecraft.util.IIcon; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.IStringSerializable; import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.Vec3; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.IFluidHandler; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +import forestry.api.core.IModelManager; +import forestry.api.core.IItemModelRegister; +import forestry.api.core.IStateMapperRegister; import forestry.core.access.IAccessHandler; import forestry.core.circuits.ISocketable; import forestry.core.fluids.FluidHelper; import forestry.core.proxy.Proxies; +import forestry.core.render.StateMapperMachine; import forestry.core.tiles.MachineDefinition; import forestry.core.tiles.TileBase; import forestry.core.tiles.TileForestry; import forestry.core.tiles.TileUtil; import forestry.core.utils.InventoryUtil; import forestry.core.utils.PlayerUtil; +import forestry.core.utils.StringUtil; -public class BlockBase extends BlockForestry { +public class BlockBase & IMachineProperties & IStringSerializable> extends BlockForestry implements IItemModelRegister, IStateMapperRegister { private final List definitions = new ArrayList<>(); private final boolean hasTESR; - - public BlockBase() { - this(false); + private final Class clazz; + + /* PROPERTYS */ + private final PropertyEnum META; + private final PropertyEnum FACE; + + protected final BlockState blockState; + + public boolean isReady = false; + + public BlockBase(Class clazz) { + this(false, clazz); } - public BlockBase(boolean hasTESR) { + public BlockBase(boolean hasTESR, Class clazz) { super(Material.iron); this.hasTESR = hasTESR; - this.opaque = this.isOpaqueCube(); this.lightOpacity = this.isOpaqueCube() ? 255 : 0; + this.clazz = clazz; + + isReady = true; + + META = PropertyEnum.create("meta", clazz); + FACE = PropertyEnum.create("face", EnumFacing.class); + + this.blockState = this.createBlockState(); + this.setDefaultState(this.blockState.getBaseState().withProperty(FACE, EnumFacing.NORTH)); } public void addDefinitions(MachineDefinition... definitions) { @@ -84,29 +106,30 @@ public class BlockBase extends BlockForestry { public boolean isOpaqueCube() { return !hasTESR; } - + @Override - public boolean renderAsNormalBlock() { + public boolean isNormalCube() { return !hasTESR; } @Override public int getRenderType() { if (hasTESR) { - return Proxies.render.getByBlockModelRenderId(); + return 2; } else { - return 0; + return 3; } } - private MachineDefinition getDefinition(IBlockAccess world, int x, int y, int z) { - if (!(world.getBlock(x, y, z) instanceof BlockBase)) { + private MachineDefinition getDefinition(IBlockAccess world, BlockPos pos) { + IBlockState state = world.getBlockState(pos); + if (!(state.getBlock() instanceof BlockBase)) { return null; } - int meta = world.getBlockMetadata(x, y, z); - return getDefinition(meta); + IMachineProperties meta = state.getValue(META); + return getDefinition(meta.getMeta()); } - + private MachineDefinition getDefinition(int metadata) { if (metadata < 0 || metadata >= definitions.size()) { return null; @@ -116,31 +139,21 @@ public class BlockBase extends BlockForestry { } @Override - public AxisAlignedBB getCollisionBoundingBoxFromPool(World world, int x, int y, int z) { - MachineDefinition definition = getDefinition(world, x, y, z); + public AxisAlignedBB getCollisionBoundingBox(World world, BlockPos pos, IBlockState state) { + MachineDefinition definition = getDefinition(world, pos); if (definition == null) { - return super.getCollisionBoundingBoxFromPool(world, x, y, z); + return super.getCollisionBoundingBox(world, pos, state); } - return definition.getBoundingBox(x, y, z); + return definition.getBoundingBox(pos, state); } - + @Override - @SideOnly(Side.CLIENT) - public AxisAlignedBB getSelectedBoundingBoxFromPool(World world, int x, int y, int z) { - MachineDefinition definition = getDefinition(world, x, y, z); + public MovingObjectPosition collisionRayTrace(World world, BlockPos pos, Vec3 start, Vec3 end) { + MachineDefinition definition = getDefinition(world, pos); if (definition == null) { - return super.getCollisionBoundingBoxFromPool(world, x, y, z); - } - return definition.getBoundingBox(x, y, z); - } - - @Override - public MovingObjectPosition collisionRayTrace(World world, int x, int y, int z, Vec3 startVec, Vec3 endVec) { - MachineDefinition definition = getDefinition(world, x, y, z); - if (definition == null) { - return super.collisionRayTrace(world, x, y, z, startVec, endVec); + return super.collisionRayTrace(world, pos, start, end); } else { - return definition.collisionRayTrace(world, x, y, z, startVec, endVec); + return definition.collisionRayTrace(world, pos, start, end); } } @@ -159,8 +172,9 @@ public class BlockBase extends BlockForestry { /* TILE ENTITY CREATION */ @Override - public TileEntity createTileEntity(World world, int metadata) { - MachineDefinition definition = getDefinition(metadata); + public TileEntity createTileEntity(World world, IBlockState state) { + IMachineProperties definitionP = state.getValue(META); + MachineDefinition definition = getDefinition(definitionP.getMeta()); if (definition == null) { return null; } @@ -169,23 +183,23 @@ public class BlockBase extends BlockForestry { @Override public TileEntity createNewTileEntity(World world, int meta) { - return createTileEntity(world, meta); // TODO: refactor to just use Block, not BlockContainer + return createTileEntity(world, getStateFromMeta(meta)); // TODO: refactor to just use Block, not BlockContainer } /* INTERACTION */ @Override - public boolean isSideSolid(IBlockAccess world, int x, int y, int z, ForgeDirection side) { - MachineDefinition definition = getDefinition(world, x, y, z); - return definition != null && definition.isSolidOnSide(world, x, y, z, side.ordinal()); + public boolean isSideSolid(IBlockAccess world, BlockPos pos, EnumFacing side) { + MachineDefinition definition = getDefinition(world, pos); + return definition != null && definition.isSolidOnSide(world, pos, side); } @Override - public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float par7, float par8, float par9) { + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumFacing side, float hitX, float hitY, float hitZ) { if (player.isSneaking()) { return false; } - TileBase tile = (TileBase) world.getTileEntity(x, y, z); + TileBase tile = (TileBase) world.getTileEntity(pos); if (!TileUtil.isUsableByPlayer(player, tile)) { return false; } @@ -194,7 +208,7 @@ public class BlockBase extends BlockForestry { ItemStack current = player.getCurrentEquippedItem(); if (current != null && current.getItem() != Items.bucket && tile instanceof IFluidHandler && access.allowsAlteration(player)) { - if (FluidHelper.handleRightClick((IFluidHandler) tile, ForgeDirection.getOrientation(side), player, true, tile.canDrainWithBucket())) { + if (FluidHelper.handleRightClick((IFluidHandler) tile, side, player, true, tile.canDrainWithBucket())) { return true; } } @@ -212,38 +226,38 @@ public class BlockBase extends BlockForestry { } @Override - public boolean rotateBlock(World world, int x, int y, int z, ForgeDirection axis) { - MachineDefinition definition = getDefinition(world, x, y, z); + public boolean rotateBlock(World world, BlockPos pos, EnumFacing axis) { + MachineDefinition definition = getDefinition(world, pos); if (definition == null) { - return super.rotateBlock(world, x, y, z, axis); + return super.rotateBlock(world, pos, axis); } - return definition.rotateBlock(world, x, y, z, axis); + return definition.rotateBlock(world, pos, axis); } @Override - public void breakBlock(World world, int x, int y, int z, Block block, int meta) { + public void breakBlock(World world, BlockPos pos, IBlockState state) { if (world.isRemote) { return; } - TileEntity tile = world.getTileEntity(x, y, z); + TileEntity tile = world.getTileEntity(pos); if (tile instanceof IInventory) { IInventory inventory = (IInventory) tile; - InventoryUtil.dropInventory(inventory, world, x, y, z); + InventoryUtil.dropInventory(inventory, world, pos); if (tile instanceof TileForestry) { ((TileForestry) tile).onRemoval(); } if (tile instanceof ISocketable) { - InventoryUtil.dropSockets((ISocketable) tile, tile.getWorldObj(), tile.xCoord, tile.yCoord, tile.zCoord); + InventoryUtil.dropSockets((ISocketable) tile, tile.getWorld(), tile.getPos()); } } - super.breakBlock(world, x, y, z, block, meta); + super.breakBlock(world, pos, state); } @Override - public int damageDropped(int metadata) { - return metadata; + public int damageDropped(IBlockState state) { + return getMetaFromState(state); } public void init() { @@ -254,43 +268,71 @@ public class BlockBase extends BlockForestry { } } - /* TEXTURES */ + /* ITEM MODELS */ @SideOnly(Side.CLIENT) @Override - public void registerBlockIcons(IIconRegister register) { + public void registerModel(Item item, IModelManager manager) { for (MachineDefinition def : definitions) { - if (def == null) { + if (def == null) continue; + C type = clazz.getEnumConstants()[def.getMeta()]; + if (type == null) + return; + manager.registerItemModel(item, def.getMeta(), StringUtil.cleanItemName(item) + "_" + type.getName()); + } + } + + /* STATES */ + @Override + public void registerStateMapper() { + Proxies.render.registerStateMapper(this, new StateMapperMachine(clazz, META, FACE)); + } + + @Override + protected BlockState createBlockState() { + if(!isReady) + return super.createBlockState(); + return new BlockState(this, new IProperty[] { META, FACE }); + } + + + @Override + public int getMetaFromState(IBlockState state) { + return ((IMachineProperties)state.getProperties().get(META)).getMeta(); + } + + @Override + public IBlockState getStateFromMeta(int meta) { + for(C c : clazz.getEnumConstants()){ + if(c.getMeta() == meta){ + return getDefaultState().withProperty(META, c); } - def.registerIcons(register); } + return getDefaultState(); } - - @SideOnly(Side.CLIENT) + @Override - public IIcon getIcon(int side, int metadata) { - if (metadata >= definitions.size() || definitions.get(metadata) == null) { - return null; + public IBlockState getActualState(IBlockState state, IBlockAccess world, BlockPos pos) { + TileEntity tile = world.getTileEntity(pos); + if (tile instanceof TileForestry) { + TileForestry tileF = (TileForestry) tile; + state = state.withProperty(FACE, tileF.getOrientation()); } - return definitions.get(metadata).getBlockTextureForSide(side); - } - - @SideOnly(Side.CLIENT) - @Override - public IIcon getIcon(IBlockAccess world, int x, int y, int z, int side) { - int metadata = world.getBlockMetadata(x, y, z); - if (metadata >= definitions.size() || definitions.get(metadata) == null) { - metadata = 0; - } - return definitions.get(metadata).getIcon(world, x, y, z, side); + return super.getActualState(state, world, pos); } + + @Override + public BlockState getBlockState() + { + return this.blockState; + } @Override public boolean getUseNeighborBrightness() { return hasTESR; } - public final ItemStack get(T type) { + public final ItemStack get(C type) { return new ItemStack(this, 1, type.getMeta()); } } diff --git a/src/main/java/forestry/core/blocks/BlockCore.java b/src/main/java/forestry/core/blocks/BlockCore.java index 61d4b23fa..a68bb2fdc 100644 --- a/src/main/java/forestry/core/blocks/BlockCore.java +++ b/src/main/java/forestry/core/blocks/BlockCore.java @@ -12,6 +12,6 @@ package forestry.core.blocks; public class BlockCore extends BlockBase { public BlockCore() { - super(true); + super(true, BlockCoreType.class); } } diff --git a/src/main/java/forestry/core/blocks/BlockCoreType.java b/src/main/java/forestry/core/blocks/BlockCoreType.java index 0aaff8751..5ac671847 100644 --- a/src/main/java/forestry/core/blocks/BlockCoreType.java +++ b/src/main/java/forestry/core/blocks/BlockCoreType.java @@ -10,28 +10,30 @@ ******************************************************************************/ package forestry.core.blocks; +import java.util.Locale; + import javax.annotation.Nullable; import forestry.core.config.Constants; import forestry.core.proxy.Proxies; -import forestry.core.render.IBlockRenderer; import forestry.core.tiles.TileAnalyzer; import forestry.core.tiles.TileEscritoire; import forestry.core.tiles.TileForestry; import forestry.plugins.PluginApiculture; +import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; public enum BlockCoreType implements IMachinePropertiesTESR { ANALYZER(TileAnalyzer.class, "Analyzer") { @Nullable @Override - public IBlockRenderer getRenderer() { + public TileEntitySpecialRenderer getRenderer() { return PluginApiculture.proxy.getRendererAnalyzer(Constants.TEXTURE_PATH_BLOCKS + "/analyzer_"); } }, ESCRITOIRE(TileEscritoire.class, "Escritoire") { @Nullable @Override - public IBlockRenderer getRenderer() { + public TileEntitySpecialRenderer getRenderer() { return Proxies.render.getRenderEscritoire(); } }; @@ -60,4 +62,9 @@ public enum BlockCoreType implements IMachinePropertiesTESR { public Class getTeClass() { return teClass; } + + @Override + public String getName() { + return name().toLowerCase(Locale.ENGLISH); + } } diff --git a/src/main/java/forestry/core/blocks/BlockForestry.java b/src/main/java/forestry/core/blocks/BlockForestry.java index 3fe80f8d1..e8af10291 100644 --- a/src/main/java/forestry/core/blocks/BlockForestry.java +++ b/src/main/java/forestry/core/blocks/BlockForestry.java @@ -15,21 +15,24 @@ import org.apache.logging.log4j.Level; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; +import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import com.mojang.authlib.GameProfile; +import forestry.api.core.IItemModelRegister; import forestry.core.CreativeTabForestry; import forestry.core.access.IOwnable; import forestry.core.access.IRestrictedAccess; import forestry.core.tiles.TileForestry; import forestry.core.utils.Log; -public abstract class BlockForestry extends BlockContainer { +public abstract class BlockForestry extends BlockContainer implements IItemModelRegister { protected BlockForestry(Material material) { super(material); @@ -38,8 +41,8 @@ public abstract class BlockForestry extends BlockContainer { } @Override - public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z) { - TileEntity tile = world.getTileEntity(x, y, z); + public boolean removedByPlayer(World world, BlockPos pos, EntityPlayer player, boolean willHarvest) { + TileEntity tile = world.getTileEntity(pos); if (tile instanceof IRestrictedAccess) { IRestrictedAccess restrictedAccessTile = (IRestrictedAccess) tile; @@ -47,19 +50,18 @@ public abstract class BlockForestry extends BlockContainer { return false; } } - - return super.removedByPlayer(world, player, x, y, z); + + return super.removedByPlayer(world, pos, player, willHarvest); } @Override - public void onBlockPlacedBy(World world, int i, int j, int k, EntityLivingBase entityLiving, ItemStack itemstack) { - + public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, EntityLivingBase placer, ItemStack stack) { if (world.isRemote) { return; } - if (entityLiving instanceof EntityPlayer) { - TileEntity tile = world.getTileEntity(i, j, k); + if (placer instanceof EntityPlayer) { + TileEntity tile = world.getTileEntity(pos); IOwnable ownable; @@ -71,18 +73,18 @@ public abstract class BlockForestry extends BlockContainer { return; } - EntityPlayer player = (EntityPlayer) entityLiving; + EntityPlayer player = (EntityPlayer) placer; GameProfile gameProfile = player.getGameProfile(); ownable.setOwner(gameProfile); } } @Override - public void onNeighborBlockChange(World world, int x, int y, int z, Block block) { + public void onNeighborBlockChange(World world, BlockPos pos, IBlockState state, Block neighborBlock) { try { - TileEntity tile = world.getTileEntity(x, y, z); + TileEntity tile = world.getTileEntity(pos); if (tile instanceof TileForestry) { - ((TileForestry) tile).onNeighborBlockChange(block); + ((TileForestry) tile).onNeighborBlockChange(state.getBlock()); } } catch (StackOverflowError error) { Log.logThrowable(Level.ERROR, "Stack Overflow Error in BlockMachine.onNeighborBlockChange()", 10, error); diff --git a/src/main/java/forestry/core/blocks/BlockRegistry.java b/src/main/java/forestry/core/blocks/BlockRegistry.java index 56d0165bd..7fd880c0b 100644 --- a/src/main/java/forestry/core/blocks/BlockRegistry.java +++ b/src/main/java/forestry/core/blocks/BlockRegistry.java @@ -13,11 +13,9 @@ package forestry.core.blocks; import net.minecraft.block.Block; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; - +import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.oredict.OreDictionary; -import cpw.mods.fml.common.registry.GameRegistry; - import forestry.core.utils.StringUtil; import forestry.plugins.PluginManager; @@ -26,7 +24,7 @@ public abstract class BlockRegistry { if (PluginManager.getStage() != PluginManager.Stage.SETUP) { throw new RuntimeException("Tried to register Block outside of Setup"); } - block.setBlockName("for." + name); + block.setUnlocalizedName("for." + name); GameRegistry.registerBlock(block, itemClass, StringUtil.cleanBlockName(block), itemCtorArgs); return block; } diff --git a/src/main/java/forestry/core/blocks/BlockRegistryCore.java b/src/main/java/forestry/core/blocks/BlockRegistryCore.java index d80ad3818..06755c2f1 100644 --- a/src/main/java/forestry/core/blocks/BlockRegistryCore.java +++ b/src/main/java/forestry/core/blocks/BlockRegistryCore.java @@ -27,8 +27,8 @@ public class BlockRegistryCore extends BlockRegistry { core = registerBlock(new BlockCore(), ItemBlockForestry.class, "core"); soil = registerBlock(new BlockSoil(), ItemBlockTyped.class, "soil"); - soil.setHarvestLevel("shovel", 0, 0); - soil.setHarvestLevel("shovel", 0, 1); + soil.setHarvestLevel("shovel", 0, soil.getStateFromMeta(0)); + soil.setHarvestLevel("shovel", 0, soil.getStateFromMeta(1)); resources = registerBlock(new BlockResourceOre(), ItemBlockForestry.class, "resources"); resources.setHarvestLevel("pickaxe", 1); diff --git a/src/main/java/forestry/core/blocks/BlockResourceOre.java b/src/main/java/forestry/core/blocks/BlockResourceOre.java index 88a39b054..13cce8144 100644 --- a/src/main/java/forestry/core/blocks/BlockResourceOre.java +++ b/src/main/java/forestry/core/blocks/BlockResourceOre.java @@ -12,34 +12,43 @@ package forestry.core.blocks; import java.util.ArrayList; import java.util.List; +import java.util.Locale; import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.block.properties.IProperty; +import net.minecraft.block.properties.PropertyEnum; +import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; +import net.minecraft.util.BlockPos; +import net.minecraft.util.IStringSerializable; import net.minecraft.util.MathHelper; +import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +import forestry.api.core.IModelManager; +import forestry.api.core.IItemModelRegister; import forestry.core.CreativeTabForestry; -import forestry.core.render.TextureManager; import forestry.plugins.PluginCore; -public class BlockResourceOre extends Block { - public enum ResourceType { +public class BlockResourceOre extends Block implements IItemModelRegister { + private static final PropertyEnum RESOURCE = PropertyEnum.create("resource", ResourceType.class); + + public enum ResourceType implements IStringSerializable { APATITE, COPPER, TIN; - + public static final ResourceType[] VALUES = values(); - @SideOnly(Side.CLIENT) - public IIcon icon; + @Override + public String getName() { + return name().toLowerCase(Locale.ENGLISH); + } } public BlockResourceOre() { @@ -47,46 +56,65 @@ public class BlockResourceOre extends Block { setHardness(3F); setResistance(5F); setCreativeTab(CreativeTabForestry.tabForestry); + setDefaultState(this.blockState.getBaseState().withProperty(RESOURCE, ResourceType.APATITE)); } @Override - public void dropBlockAsItemWithChance(World world, int x, int y, int z, int metadata, float par6, int par7) { - super.dropBlockAsItemWithChance(world, x, y, z, metadata, par6, par7); + protected BlockState createBlockState() { + return new BlockState(this, new IProperty[] { RESOURCE }); + } - if (metadata == 0) { - this.dropXpOnBlockBreak(world, x, y, z, MathHelper.getRandomIntegerInRange(world.rand, 1, 4)); + @Override + public int getMetaFromState(IBlockState state) { + return state.getValue(RESOURCE).ordinal(); + } + + @Override + public IBlockState getStateFromMeta(int meta) { + return getDefaultState().withProperty(RESOURCE, ResourceType.values()[meta]); + } + + @Override + public void dropBlockAsItemWithChance(World world, BlockPos pos, IBlockState state, float chance, int fortune) { + super.dropBlockAsItemWithChance(world, pos, state, chance, fortune); + + + if (state.getValue(RESOURCE) == ResourceType.APATITE) { + this.dropXpOnBlockBreak(world, pos, MathHelper.getRandomIntegerInRange(world.rand, 1, 4)); } } @Override - public ArrayList getDrops(World world, int x, int y, int z, int metadata, int fortune) { + public List getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { ArrayList drops = new ArrayList<>(); + + ResourceType metadata = state.getValue(RESOURCE); - if (metadata == ResourceType.APATITE.ordinal()) { - int fortuneModifier = world.rand.nextInt(fortune + 2) - 1; + if (metadata == ResourceType.APATITE) { + int fortuneModifier = RANDOM.nextInt(fortune + 2) - 1; if (fortuneModifier < 0) { fortuneModifier = 0; } - int amount = (2 + world.rand.nextInt(5)) * (fortuneModifier + 1); + int amount = (2 + RANDOM.nextInt(5)) * (fortuneModifier + 1); if (amount > 0) { drops.add(PluginCore.items.apatite.getItemStack(amount)); } } else { - drops.add(new ItemStack(this, 1, metadata)); + drops.add(new ItemStack(this, 1, metadata.ordinal())); } return drops; } @Override - public int getDamageValue(World world, int x, int y, int z) { - return world.getBlockMetadata(x, y, z); + public int getDamageValue(World world, BlockPos pos) { + return getMetaFromState(world.getBlockState(pos)); } - + @Override - public int damageDropped(int meta) { - return meta; + public int damageDropped(IBlockState state) { + return getMetaFromState(state); } // / CREATIVE INVENTORY @@ -99,23 +127,13 @@ public class BlockResourceOre extends Block { } } - /* ICONS */ - @Override + /* MODLES */ @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister register) { - ResourceType.APATITE.icon = TextureManager.registerTex(register, "ores/apatite"); - ResourceType.COPPER.icon = TextureManager.registerTex(register, "ores/copper"); - ResourceType.TIN.icon = TextureManager.registerTex(register, "ores/tin"); - } - @Override - @SideOnly(Side.CLIENT) - public IIcon getIcon(int i, int meta) { - if (meta < 0 || meta >= ResourceType.VALUES.length) { - return null; - } - - return ResourceType.VALUES[meta].icon; + public void registerModel(Item item, IModelManager manager) { + manager.registerItemModel(item, 0, "ores/apatite"); + manager.registerItemModel(item, 1, "ores/copper"); + manager.registerItemModel(item, 2, "ores/tin"); } public ItemStack get(ResourceType type, int amount) { diff --git a/src/main/java/forestry/core/blocks/BlockResourceStorage.java b/src/main/java/forestry/core/blocks/BlockResourceStorage.java index 9c138ed92..404a8bf9d 100644 --- a/src/main/java/forestry/core/blocks/BlockResourceStorage.java +++ b/src/main/java/forestry/core/blocks/BlockResourceStorage.java @@ -1,23 +1,28 @@ package forestry.core.blocks; import java.util.List; +import java.util.Locale; import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.block.properties.IProperty; +import net.minecraft.block.properties.PropertyEnum; +import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - +import net.minecraft.util.IStringSerializable; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +import forestry.api.core.IModelManager; +import forestry.api.core.IItemModelRegister; import forestry.core.CreativeTabForestry; -import forestry.core.render.TextureManager; -public class BlockResourceStorage extends Block { - public enum ResourceType { +public class BlockResourceStorage extends Block implements IItemModelRegister { + public static final PropertyEnum RESOURCE = PropertyEnum.create("resource", ResourceType.class); + + public enum ResourceType implements IStringSerializable{ APATITE, COPPER, TIN, @@ -25,8 +30,10 @@ public class BlockResourceStorage extends Block { public static final ResourceType[] VALUES = values(); - @SideOnly(Side.CLIENT) - public IIcon icon; + @Override + public String getName() { + return name().toLowerCase(Locale.ENGLISH); + } } public BlockResourceStorage() { @@ -34,6 +41,22 @@ public class BlockResourceStorage extends Block { setHardness(3F); setResistance(5F); setCreativeTab(CreativeTabForestry.tabForestry); + setDefaultState(this.blockState.getBaseState().withProperty(RESOURCE, ResourceType.APATITE)); + } + + @Override + protected BlockState createBlockState() { + return new BlockState(this, new IProperty[] { RESOURCE }); + } + + @Override + public int getMetaFromState(IBlockState state) { + return ((ResourceType) state.getValue(RESOURCE)).ordinal(); + } + + @Override + public IBlockState getStateFromMeta(int meta) { + return getDefaultState().withProperty(RESOURCE, ResourceType.values()[meta]); } @SuppressWarnings({"rawtypes", "unchecked"}) @@ -46,27 +69,17 @@ public class BlockResourceStorage extends Block { } @Override - public int damageDropped(int damage) { - return damage; + public int damageDropped(IBlockState state) { + return getMetaFromState(state); } - @Override @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister register) { - ResourceType.APATITE.icon = TextureManager.registerTex(register, "storage/apatite"); - ResourceType.COPPER.icon = TextureManager.registerTex(register, "storage/copper"); - ResourceType.TIN.icon = TextureManager.registerTex(register, "storage/tin"); - ResourceType.BRONZE.icon = TextureManager.registerTex(register, "storage/bronze"); - } - @Override - @SideOnly(Side.CLIENT) - public IIcon getIcon(int i, int meta) { - if (meta < 0 || meta >= ResourceType.VALUES.length) { - return null; - } - - return ResourceType.VALUES[meta].icon; + public void registerModel(Item item, IModelManager manager) { + manager.registerItemModel(item, 0, "storage/apatite"); + manager.registerItemModel(item, 1, "storage/copper"); + manager.registerItemModel(item, 2, "storage/tin"); + manager.registerItemModel(item, 3, "storage/bronze"); } public ItemStack get(ResourceType type) { diff --git a/src/main/java/forestry/core/blocks/BlockSoil.java b/src/main/java/forestry/core/blocks/BlockSoil.java index f8e811a73..a1c4a81d6 100644 --- a/src/main/java/forestry/core/blocks/BlockSoil.java +++ b/src/main/java/forestry/core/blocks/BlockSoil.java @@ -12,39 +12,50 @@ package forestry.core.blocks; import java.util.ArrayList; import java.util.List; +import java.util.Locale; import java.util.Random; import net.minecraft.block.Block; import net.minecraft.block.IGrowable; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.block.properties.IProperty; +import net.minecraft.block.properties.PropertyEnum; +import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.IStringSerializable; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.EnumPlantType; import net.minecraftforge.common.IPlantable; -import net.minecraftforge.common.util.ForgeDirection; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +import forestry.api.core.IModelManager; +import forestry.api.core.IItemModelRegister; import forestry.core.CreativeTabForestry; import forestry.core.config.Constants; -import forestry.core.render.TextureManager; +import forestry.core.utils.BlockUtil; import forestry.plugins.PluginCore; /** * Humus, bog earth, peat */ -public class BlockSoil extends Block implements IItemTyped { - - public enum SoilType { - HUMUS, BOG_EARTH, PEAT +public class BlockSoil extends Block implements IItemTyped, IItemModelRegister { + private static final PropertyEnum SOIL = PropertyEnum.create("soil", SoilType.class); + + public enum SoilType implements IStringSerializable { + HUMUS, BOG_EARTH, PEAT; + + @Override + public String getName() { + return name().toLowerCase(Locale.ENGLISH); + } } private static final int degradeDelimiter = 3; @@ -56,6 +67,21 @@ public class BlockSoil extends Block implements IItemTyped { setStepSound(soundTypeGrass); setCreativeTab(CreativeTabForestry.tabForestry); } + + @Override + public int getMetaFromState(IBlockState state) { + return state.getValue(SOIL).ordinal(); + } + + @Override + public IBlockState getStateFromMeta(int meta) { + return getDefaultState().withProperty(SOIL, SoilType.values()[meta]); + } + + @Override + protected BlockState createBlockState() { + return new BlockState(this, new IProperty[] { SOIL }); + } @Override public int tickRate(World world) { @@ -63,10 +89,10 @@ public class BlockSoil extends Block implements IItemTyped { } @Override - public ArrayList getDrops(World world, int x, int y, int z, int metadata, int fortune) { + public List getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { ArrayList ret = new ArrayList<>(); - SoilType type = getTypeFromMeta(metadata); + SoilType type = state.getValue(SOIL); if (type == SoilType.PEAT) { ret.add(PluginCore.items.peat.getItemStack()); @@ -81,43 +107,42 @@ public class BlockSoil extends Block implements IItemTyped { } @Override - public int getDamageValue(World world, int x, int y, int z) { - return (world.getBlockMetadata(x, y, z) & 0x03); + public int getDamageValue(World world, BlockPos pos) { + return (getMetaFromState(world.getBlockState(pos)) & 0x03); } @Override - public void updateTick(World world, int i, int j, int k, Random random) { + public void updateTick(World world, BlockPos pos, IBlockState state, Random rand) { if (world.isRemote) { return; } - int meta = world.getBlockMetadata(i, j, k); - - SoilType type = getTypeFromMeta(meta); + SoilType type = state.getValue(SOIL); if (type == SoilType.HUMUS) { - updateTickHumus(world, i, j, k); + updateTickHumus(world, pos); } else if (type == SoilType.BOG_EARTH) { - updateTickBogEarth(world, i, j, k); + updateTickBogEarth(world, pos); } } - private static void updateTickHumus(World world, int i, int j, int k) { - if (isEnrooted(world, i, j, k)) { - degradeSoil(world, i, j, k); + private static void updateTickHumus(World world, BlockPos pos) { + if (isEnrooted(world, pos)) { + degradeSoil(world, pos); } } - private static void updateTickBogEarth(World world, int i, int j, int k) { - if (isMoistened(world, i, j, k)) { - matureBog(world, i, j, k); + private static void updateTickBogEarth(World world, BlockPos pos) { + if (isMoistened(world, pos)) { + matureBog(world, pos); } } - private static boolean isEnrooted(World world, int x, int y, int z) { + private static boolean isEnrooted(World world, BlockPos pos) { for (int i = -1; i < 2; i++) { for (int j = -1; j < 2; j++) { - Block block = world.getBlock(x + i, y + 1, z + j); + IBlockState state = world.getBlockState(new BlockPos(pos.getX() + i, pos.getY() + 1, pos.getZ() + j)); + Block block = state.getBlock(); if (block == Blocks.log || block == Blocks.sapling || block instanceof IGrowable) { // We are not returning true if we are the base of a sapling. return !(i == 0 && j == 0); @@ -131,13 +156,13 @@ public class BlockSoil extends Block implements IItemTyped { /** * If a tree or sapling is in the vicinity, there is a chance, that the soil will degrade. */ - private static void degradeSoil(World world, int x, int y, int z) { + private static void degradeSoil(World world, BlockPos pos) { if (world.rand.nextInt(140) != 0) { return; } - int meta = world.getBlockMetadata(x, y, z); + int meta = BlockUtil.getBlockMetadata(world, pos); // Unpack first int type = meta & 0x03; @@ -150,18 +175,18 @@ public class BlockSoil extends Block implements IItemTyped { meta = (grade << 2 | type); if (grade >= degradeDelimiter) { - world.setBlock(x, y, z, Blocks.sand, 0, Constants.FLAG_BLOCK_SYNCH); + world.setBlockState(pos, Blocks.sand.getStateFromMeta(0), Constants.FLAG_BLOCK_SYNCH); } else { - world.setBlockMetadataWithNotify(x, y, z, meta, Constants.FLAG_BLOCK_SYNCH); + world.setBlockState(pos, BlockUtil.getBlock(world, pos).getStateFromMeta(meta), Constants.FLAG_BLOCK_SYNCH); } - world.markBlockForUpdate(x, y, z); + world.markBlockForUpdate(pos); } - private static boolean isMoistened(World world, int x, int y, int z) { + private static boolean isMoistened(World world, BlockPos pos) { for (int i = -2; i < 3; i++) { for (int j = -2; j < 3; j++) { - Block block = world.getBlock(x + i, y, z + j); + Block block = world.getBlockState(new BlockPos(pos.getX() + i, pos.getY(), pos.getZ() + j)).getBlock(); if (block == Blocks.water || block == Blocks.flowing_water) { return true; } @@ -171,13 +196,13 @@ public class BlockSoil extends Block implements IItemTyped { return false; } - private static void matureBog(World world, int i, int j, int k) { + private static void matureBog(World world, BlockPos pos) { if (world.rand.nextInt(13) != 0) { return; } - int meta = world.getBlockMetadata(i, j, k); + int meta = BlockUtil.getBlockMetadata(world, pos); // Unpack first @@ -192,19 +217,18 @@ public class BlockSoil extends Block implements IItemTyped { maturity++; meta = (maturity << 2 | type); - world.setBlockMetadataWithNotify(i, j, k, meta, Constants.FLAG_BLOCK_SYNCH); - world.markBlockForUpdate(i, j, k); + world.setBlockState(pos, BlockUtil.getBlock(world, pos).getStateFromMeta(meta), Constants.FLAG_BLOCK_SYNCH); + world.markBlockForUpdate(pos); } @Override - public boolean canSustainPlant(IBlockAccess world, int x, int y, int z, ForgeDirection direction, IPlantable plant) { - EnumPlantType plantType = plant.getPlantType(world, x, y, z); + public boolean canSustainPlant(IBlockAccess world, BlockPos pos, EnumFacing direction, IPlantable plant) { + EnumPlantType plantType = plant.getPlantType(world, pos); if (plantType != EnumPlantType.Crop && plantType != EnumPlantType.Plains) { return false; } - int meta = world.getBlockMetadata(x, y, z); - SoilType type = getTypeFromMeta(meta); + SoilType type = world.getBlockState(pos).getValue(SOIL); return type == SoilType.HUMUS; } @@ -214,6 +238,7 @@ public class BlockSoil extends Block implements IItemTyped { return false; } + @Override public SoilType getTypeFromMeta(int meta) { int type = meta & 0x03; int maturity = meta >> 2; @@ -237,37 +262,13 @@ public class BlockSoil extends Block implements IItemTyped { itemList.add(new ItemStack(this, 1, 1)); } - /* ICONS */ - @SideOnly(Side.CLIENT) - private IIcon iconHumus; - @SideOnly(Side.CLIENT) - private IIcon iconBogEarth; - @SideOnly(Side.CLIENT) - private IIcon iconPeat; - + /* MODELS */ @Override @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister register) { - iconHumus = TextureManager.registerTex(register, "soil/humus"); - iconBogEarth = TextureManager.registerTex(register, "soil/bog"); - iconPeat = TextureManager.registerTex(register, "soil/peat"); - } - - @Override - @SideOnly(Side.CLIENT) - public IIcon getIcon(int side, int meta) { - - SoilType type = getTypeFromMeta(meta); - - switch (type) { - case HUMUS: - return iconHumus; - case BOG_EARTH: - return iconBogEarth; - case PEAT: - return iconPeat; - } - return null; + public void registerModel(Item item, IModelManager manager) { + manager.registerItemModel(item, 0, "soil/humus"); + manager.registerItemModel(item, 1, "soil/bog"); + manager.registerItemModel(item, 2, "soil/peat"); } public ItemStack get(SoilType soilType, int amount) { diff --git a/src/main/java/forestry/core/blocks/BlockStructure.java b/src/main/java/forestry/core/blocks/BlockStructure.java index 7c8640840..e14d22b5c 100644 --- a/src/main/java/forestry/core/blocks/BlockStructure.java +++ b/src/main/java/forestry/core/blocks/BlockStructure.java @@ -10,14 +10,16 @@ ******************************************************************************/ package forestry.core.blocks; -import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; import net.minecraft.util.ChatComponentText; +import net.minecraft.util.EnumFacing; import net.minecraft.util.StatCollector; import net.minecraft.world.World; @@ -45,12 +47,12 @@ public abstract class BlockStructure extends BlockForestry { private long previousMessageTick = 0; @Override - public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int par6, float par7, float par8, float par9) { + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumFacing side, float hitX, float hitY, float hitZ) { if (player.isSneaking()) { return false; } - TileEntity tile = world.getTileEntity(x, y, z); + TileEntity tile = world.getTileEntity(pos); if (!(tile instanceof MultiblockTileEntityForestry)) { return false; } @@ -60,16 +62,18 @@ public abstract class BlockStructure extends BlockForestry { // If the player's hands are empty and they right-click on a multiblock, they get a // multiblock-debugging message if the machine is not assembled. - if (player.getCurrentEquippedItem() == null && !controller.isAssembled()) { + if(player.getCurrentEquippedItem() == null){ if (controller != null) { - String validationError = controller.getLastValidationError(); - if (validationError != null) { - long tick = world.getTotalWorldTime(); - if (tick > previousMessageTick + 20) { - player.addChatMessage(new ChatComponentText(validationError)); - previousMessageTick = tick; + if (!controller.isAssembled()) { + String validationError = controller.getLastValidationError(); + if (validationError != null) { + long tick = world.getTotalWorldTime(); + if (tick > previousMessageTick + 20) { + player.addChatMessage(new ChatComponentText(validationError)); + previousMessageTick = tick; + } + return true; } - return true; } } else { player.addChatMessage(new ChatComponentText(StatCollector.translateToLocal("for.multiblock.error.notConnected"))); @@ -89,16 +93,16 @@ public abstract class BlockStructure extends BlockForestry { } @Override - public void onBlockPlacedBy(World world, int i, int j, int k, EntityLivingBase entityLiving, ItemStack itemstack) { + public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, EntityLivingBase placer, ItemStack stack) { if (world.isRemote) { return; } - if (entityLiving instanceof EntityPlayer) { - TileEntity tile = world.getTileEntity(i, j, k); + if (placer instanceof EntityPlayer) { + TileEntity tile = world.getTileEntity(pos); if (tile instanceof MultiblockTileEntityForestry) { - EntityPlayer player = (EntityPlayer) entityLiving; + EntityPlayer player = (EntityPlayer) placer; GameProfile gameProfile = player.getGameProfile(); ((MultiblockTileEntityForestry) tile).setOwner(gameProfile); } @@ -106,27 +110,32 @@ public abstract class BlockStructure extends BlockForestry { } @Override - public void breakBlock(World world, int x, int y, int z, Block block, int meta) { - + public void breakBlock(World world, BlockPos pos, IBlockState state) { + if (world.isRemote) { return; } - TileEntity tile = world.getTileEntity(x, y, z); + TileEntity tile = world.getTileEntity(pos); if (tile instanceof IMultiblockComponent) { IMultiblockComponent part = (IMultiblockComponent) tile; // drop inventory if we're the last part remaining if (MultiblockUtil.getNeighboringParts(world, part).size() == 0) { if (tile instanceof IInventory) { - InventoryUtil.dropInventory((IInventory) tile, world, x, y, z); + InventoryUtil.dropInventory((IInventory) tile, world, pos); } if (tile instanceof ISocketable) { - InventoryUtil.dropSockets((ISocketable) tile, world, x, y, z); + InventoryUtil.dropSockets((ISocketable) tile, world, pos); } } } - super.breakBlock(world, x, y, z, block, meta); + super.breakBlock(world, pos, state); + } + + @Override + public int getRenderType() { + return 3; } } diff --git a/src/main/java/forestry/core/blocks/IMachineProperties.java b/src/main/java/forestry/core/blocks/IMachineProperties.java index cf433c41b..1ebd03204 100644 --- a/src/main/java/forestry/core/blocks/IMachineProperties.java +++ b/src/main/java/forestry/core/blocks/IMachineProperties.java @@ -11,8 +11,9 @@ package forestry.core.blocks; import forestry.core.tiles.TileForestry; +import net.minecraft.util.IStringSerializable; -public interface IMachineProperties { +public interface IMachineProperties extends IStringSerializable{ int getMeta(); String getTeIdent(); diff --git a/src/main/java/forestry/core/blocks/IMachinePropertiesTESR.java b/src/main/java/forestry/core/blocks/IMachinePropertiesTESR.java index 677e997ba..7e4f8698b 100644 --- a/src/main/java/forestry/core/blocks/IMachinePropertiesTESR.java +++ b/src/main/java/forestry/core/blocks/IMachinePropertiesTESR.java @@ -10,8 +10,12 @@ ******************************************************************************/ package forestry.core.blocks; -import forestry.core.render.IBlockRenderer; +import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; public interface IMachinePropertiesTESR extends IMachineProperties { - IBlockRenderer getRenderer(); + + /** + * @return The renderer from the machine + */ + TileEntitySpecialRenderer getRenderer(); } diff --git a/src/main/java/forestry/core/blocks/propertys/PropertyAllele.java b/src/main/java/forestry/core/blocks/propertys/PropertyAllele.java new file mode 100644 index 000000000..f102837b9 --- /dev/null +++ b/src/main/java/forestry/core/blocks/propertys/PropertyAllele.java @@ -0,0 +1,52 @@ +/******************************************************************************* + * Copyright (c) 2011-2014 SirSengir. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser Public License v3 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl-3.0.txt + * + * Various Contributors including, but not limited to: + * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges + ******************************************************************************/ +package forestry.core.blocks.propertys; + +import java.util.ArrayList; +import java.util.List; + +import forestry.api.genetics.IAllele; +import net.minecraft.block.properties.IProperty; + +public abstract class PropertyAllele> implements IProperty { + + protected final String name; + protected final List alleles = new ArrayList(); + + public PropertyAllele(String name){ + this.name = name; + } + + @Override + public String getName() + { + return this.name; + } + + @Override + public boolean equals(Object object) + { + if (this == object) + { + return true; + } + else if (object != null && this.getClass() == object.getClass()) + { + PropertyAllele propertyhelper = (PropertyAllele)object; + return this.name.equals(propertyhelper.name); + } + else + { + return false; + } + } + +} diff --git a/src/main/java/forestry/core/blocks/propertys/UnlistedBlockAccess.java b/src/main/java/forestry/core/blocks/propertys/UnlistedBlockAccess.java new file mode 100644 index 000000000..89aefe1b8 --- /dev/null +++ b/src/main/java/forestry/core/blocks/propertys/UnlistedBlockAccess.java @@ -0,0 +1,38 @@ +/******************************************************************************* + * Copyright (c) 2011-2014 SirSengir. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser Public License v3 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl-3.0.txt + * + * Various Contributors including, but not limited to: + * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges + ******************************************************************************/ +package forestry.core.blocks.propertys; + +import net.minecraft.world.IBlockAccess; +import net.minecraftforge.common.property.IUnlistedProperty; + +public final class UnlistedBlockAccess implements IUnlistedProperty { + public static UnlistedBlockAccess BLOCKACCESS = new UnlistedBlockAccess(); + + @Override + public String getName() { + return "ba"; + } + + @Override + public boolean isValid(final IBlockAccess value) { + return true; + } + + @Override + public Class getType() { + return IBlockAccess.class; + } + + @Override + public String valueToString(final IBlockAccess value) { + return null; + } +} \ No newline at end of file diff --git a/src/main/java/forestry/core/recipes/nei/ItemFilterOther.java b/src/main/java/forestry/core/blocks/propertys/UnlistedBlockPos.java similarity index 52% rename from src/main/java/forestry/core/recipes/nei/ItemFilterOther.java rename to src/main/java/forestry/core/blocks/propertys/UnlistedBlockPos.java index 6e93b261f..613be7c3c 100644 --- a/src/main/java/forestry/core/recipes/nei/ItemFilterOther.java +++ b/src/main/java/forestry/core/blocks/propertys/UnlistedBlockPos.java @@ -8,23 +8,31 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.core.recipes.nei; +package forestry.core.blocks.propertys; -import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; +import net.minecraftforge.common.property.IUnlistedProperty; -import forestry.api.genetics.AlleleManager; +public final class UnlistedBlockPos implements IUnlistedProperty { + public static UnlistedBlockPos POS = new UnlistedBlockPos(); -/** - * @author bdew - */ -public class ItemFilterOther extends ItemFilterForestry { - - public ItemFilterOther(Boolean items) { - super(items); + @Override + public String getName() { + return "pos"; } @Override - public boolean matches(ItemStack item) { - return super.matches(item) && !AlleleManager.alleleRegistry.isIndividual(item); + public boolean isValid(final BlockPos value) { + return true; } -} + + @Override + public Class getType() { + return BlockPos.class; + } + + @Override + public String valueToString(final BlockPos value) { + return null; + } +} \ No newline at end of file diff --git a/src/main/java/forestry/core/circuits/GuiSolderingIron.java b/src/main/java/forestry/core/circuits/GuiSolderingIron.java index a270cea63..c6d3027f5 100755 --- a/src/main/java/forestry/core/circuits/GuiSolderingIron.java +++ b/src/main/java/forestry/core/circuits/GuiSolderingIron.java @@ -10,6 +10,7 @@ ******************************************************************************/ package forestry.core.circuits; +import java.io.IOException; import java.util.Locale; import net.minecraft.client.gui.GuiButton; @@ -82,7 +83,7 @@ public class GuiSolderingIron extends GuiForestry= 1) { if (args[0].equals("help")) { command.printHelp(sender); @@ -159,13 +162,13 @@ public class CommandHelpers { return CommandBase.getListOfStringsMatchingLastWord(strings, lastWords); } - public static List addStandardTabCompletionOptions(IForestryCommand command, ICommandSender sender, String[] incomplete) { + public static List addStandardTabCompletionOptions(IForestryCommand command, ICommandSender sender, String[] incomplete, BlockPos pos) { if (incomplete.length > 1) { String commandName = incomplete[0]; for (SubCommand child : command.getChildren()) { if (CommandHelpers.matches(commandName, child)) { String[] incompleteRemaining = Arrays.copyOfRange(incomplete, 1, incomplete.length); - return child.addTabCompletionOptions(sender, incompleteRemaining); + return child.addTabCompletionOptions(sender, incompleteRemaining, pos); } } } diff --git a/src/main/java/forestry/core/commands/CommandModeInfo.java b/src/main/java/forestry/core/commands/CommandModeInfo.java index 042638445..a0f7bac35 100644 --- a/src/main/java/forestry/core/commands/CommandModeInfo.java +++ b/src/main/java/forestry/core/commands/CommandModeInfo.java @@ -15,6 +15,7 @@ import java.util.List; import org.apache.commons.lang3.StringUtils; import net.minecraft.command.ICommandSender; +import net.minecraft.util.BlockPos; import net.minecraft.util.ChatStyle; import net.minecraft.util.EnumChatFormatting; import net.minecraft.world.World; @@ -70,7 +71,7 @@ public class CommandModeInfo extends SubCommand { } @Override - public List addTabCompletionOptions(ICommandSender sender, String[] incomplete) { + public List addTabCompletionOptions(ICommandSender sender, String[] incomplete, BlockPos pos) { return CommandHelpers.getListOfStringsMatchingLastWord(incomplete, modeStringArr); } } diff --git a/src/main/java/forestry/core/commands/CommandModeSet.java b/src/main/java/forestry/core/commands/CommandModeSet.java index 42198a64c..0ebf66f7d 100644 --- a/src/main/java/forestry/core/commands/CommandModeSet.java +++ b/src/main/java/forestry/core/commands/CommandModeSet.java @@ -13,6 +13,8 @@ package forestry.core.commands; import java.util.List; import net.minecraft.command.ICommandSender; +import net.minecraft.command.WrongUsageException; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; public final class CommandModeSet extends SubCommand { @@ -29,7 +31,7 @@ public final class CommandModeSet extends SubCommand { } @Override - public void processSubCommand(ICommandSender sender, String[] args) { + public void processSubCommand(ICommandSender sender, String[] args) throws WrongUsageException { if (args.length == 0 || args.length > 2) { printHelp(sender); return; @@ -56,7 +58,7 @@ public final class CommandModeSet extends SubCommand { } @Override - public List addTabCompletionOptions(ICommandSender sender, String[] incomplete) { + public List addTabCompletionOptions(ICommandSender sender, String[] incomplete, BlockPos pos) { return CommandHelpers.getListOfStringsMatchingLastWord(incomplete, modeStringArr); } } diff --git a/src/main/java/forestry/core/commands/CommandPlugins.java b/src/main/java/forestry/core/commands/CommandPlugins.java index f46e4b943..7cb6c3d6a 100644 --- a/src/main/java/forestry/core/commands/CommandPlugins.java +++ b/src/main/java/forestry/core/commands/CommandPlugins.java @@ -12,6 +12,7 @@ package forestry.core.commands; import net.minecraft.command.CommandException; import net.minecraft.command.ICommandSender; +import net.minecraft.command.WrongUsageException; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.StatCollector; @@ -32,7 +33,7 @@ public class CommandPlugins extends SubCommand { } @Override - public void processSubCommand(ICommandSender sender, String[] args) { + public void processSubCommand(ICommandSender sender, String[] args) throws WrongUsageException { if (args.length == 0) { listPluginsForSender(sender); } else { @@ -75,7 +76,7 @@ public class CommandPlugins extends SubCommand { } @Override - public void processSubCommand(ICommandSender sender, String[] args) { + public void processSubCommand(ICommandSender sender, String[] args) throws CommandException { if (args.length == 1) { listPluginInfoForSender(sender, args[0]); } else { @@ -83,7 +84,7 @@ public class CommandPlugins extends SubCommand { } } - private static void listPluginInfoForSender(ICommandSender sender, String plugin) { + private static void listPluginInfoForSender(ICommandSender sender, String plugin) throws CommandException { ForestryPlugin found = null; for (PluginManager.Module pluginModule : PluginManager.getLoadedModules()) { Plugin info = pluginModule.instance().getClass().getAnnotation(Plugin.class); diff --git a/src/main/java/forestry/core/commands/CommandSaveStats.java b/src/main/java/forestry/core/commands/CommandSaveStats.java index e3a0810f0..ab8c32ee4 100644 --- a/src/main/java/forestry/core/commands/CommandSaveStats.java +++ b/src/main/java/forestry/core/commands/CommandSaveStats.java @@ -23,7 +23,9 @@ import java.util.List; import java.util.Locale; import net.minecraft.command.ICommandSender; +import net.minecraft.command.PlayerNotFoundException; import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.util.BlockPos; import net.minecraft.util.StatCollector; import net.minecraft.world.World; @@ -57,12 +59,12 @@ public final class CommandSaveStats extends SubCommand { } @Override - public List addTabCompletionOptions(ICommandSender sender, String[] parameters) { + public List addTabCompletionOptions(ICommandSender sender, String[] parameters, BlockPos pos) { return CommandHelpers.getListOfStringsMatchingLastWord(parameters, CommandHelpers.getPlayers()); } @Override - public void processSubCommand(ICommandSender sender, String[] args) { + public void processSubCommand(ICommandSender sender, String[] args) throws PlayerNotFoundException { if (args.length > 1) { printHelp(sender); return; @@ -75,7 +77,7 @@ public final class CommandSaveStats extends SubCommand { if (args.length > 0) { player = CommandHelpers.getPlayer(sender, args[0]); } else { - player = CommandHelpers.getPlayer(sender, sender.getCommandSenderName()); + player = CommandHelpers.getPlayer(sender, sender.getName()); } Collection statistics = new ArrayList<>(); diff --git a/src/main/java/forestry/core/commands/RootCommand.java b/src/main/java/forestry/core/commands/RootCommand.java index bc4d02fd0..f3bbafa65 100644 --- a/src/main/java/forestry/core/commands/RootCommand.java +++ b/src/main/java/forestry/core/commands/RootCommand.java @@ -17,7 +17,9 @@ import java.util.SortedSet; import java.util.TreeSet; import net.minecraft.command.CommandBase; +import net.minecraft.command.CommandException; import net.minecraft.command.ICommandSender; +import net.minecraft.util.BlockPos; /** * @author CovertJaguar @@ -53,7 +55,7 @@ public class RootCommand extends CommandBase implements IForestryCommand { } @Override - public void processCommand(ICommandSender sender, String[] args) { + public void processCommand(ICommandSender sender, String[] args) throws CommandException { if (!CommandHelpers.processStandardCommands(sender, this, args)) { CommandHelpers.throwWrongUsage(sender, this); } @@ -76,8 +78,8 @@ public class RootCommand extends CommandBase implements IForestryCommand { } @Override - public List addTabCompletionOptions(ICommandSender sender, String[] incomplete) { - return CommandHelpers.addStandardTabCompletionOptions(this, sender, incomplete); + public List addTabCompletionOptions(ICommandSender sender, String[] incomplete, BlockPos pos) { + return CommandHelpers.addStandardTabCompletionOptions(this, sender, incomplete, pos); } /* IForestryCommand */ diff --git a/src/main/java/forestry/core/commands/SubCommand.java b/src/main/java/forestry/core/commands/SubCommand.java index d16d58565..7a2a5b5f0 100644 --- a/src/main/java/forestry/core/commands/SubCommand.java +++ b/src/main/java/forestry/core/commands/SubCommand.java @@ -10,15 +10,17 @@ ******************************************************************************/ package forestry.core.commands; -import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.Comparator; import java.util.List; import java.util.SortedSet; import java.util.TreeSet; +import net.minecraft.command.CommandException; import net.minecraft.command.ICommand; import net.minecraft.command.ICommandSender; +import net.minecraft.command.WrongUsageException; +import net.minecraft.util.BlockPos; /** * @author CovertJaguar @@ -80,20 +82,20 @@ public abstract class SubCommand implements IForestryCommand { public List getCommandAliases() { return aliases; } - + @Override - public List addTabCompletionOptions(ICommandSender sender, String[] incomplete) { - return CommandHelpers.addStandardTabCompletionOptions(this, sender, incomplete); + public List addTabCompletionOptions(ICommandSender sender, String[] incomplete, BlockPos pos) { + return CommandHelpers.addStandardTabCompletionOptions(this, sender, incomplete, pos); } @Override - public final void processCommand(ICommandSender sender, String[] args) { + public final void processCommand(ICommandSender sender, String[] args) throws WrongUsageException, CommandException { if (!CommandHelpers.processStandardCommands(sender, this, args)) { processSubCommand(sender, args); } } - public void processSubCommand(ICommandSender sender, String[] args) { + public void processSubCommand(ICommandSender sender, String[] args) throws WrongUsageException, CommandException { printHelp(sender); } @@ -132,13 +134,9 @@ public abstract class SubCommand implements IForestryCommand { return parent.getFullCommandString() + " " + getCommandName(); } + @Override public int compareTo(ICommand command) { return this.getCommandName().compareTo(command.getCommandName()); } - @Override - public int compareTo(@Nonnull Object command) { - return this.compareTo((ICommand) command); - } - } diff --git a/src/main/java/forestry/core/config/ForestryGuiConfig.java b/src/main/java/forestry/core/config/ForestryGuiConfig.java index cef80c28a..e4abaaf7b 100644 --- a/src/main/java/forestry/core/config/ForestryGuiConfig.java +++ b/src/main/java/forestry/core/config/ForestryGuiConfig.java @@ -18,9 +18,8 @@ import net.minecraft.client.gui.GuiScreen; import net.minecraftforge.common.config.ConfigCategory; import net.minecraftforge.common.config.ConfigElement; - -import cpw.mods.fml.client.config.GuiConfig; -import cpw.mods.fml.client.config.IConfigElement; +import net.minecraftforge.fml.client.config.GuiConfig; +import net.minecraftforge.fml.client.config.IConfigElement; public class ForestryGuiConfig extends GuiConfig { diff --git a/src/main/java/forestry/core/config/ForestryGuiConfigFactory.java b/src/main/java/forestry/core/config/ForestryGuiConfigFactory.java index 82eeeebaf..d6f8ef336 100644 --- a/src/main/java/forestry/core/config/ForestryGuiConfigFactory.java +++ b/src/main/java/forestry/core/config/ForestryGuiConfigFactory.java @@ -14,8 +14,7 @@ import java.util.Set; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; - -import cpw.mods.fml.client.IModGuiFactory; +import net.minecraftforge.fml.client.IModGuiFactory; public class ForestryGuiConfigFactory implements IModGuiFactory { @Override diff --git a/src/main/java/forestry/core/config/LocalizedConfiguration.java b/src/main/java/forestry/core/config/LocalizedConfiguration.java index 6758aa3e5..a22d65857 100644 --- a/src/main/java/forestry/core/config/LocalizedConfiguration.java +++ b/src/main/java/forestry/core/config/LocalizedConfiguration.java @@ -29,6 +29,7 @@ public class LocalizedConfiguration extends Configuration { return super.setCategoryLanguageKey(categoryName, categoryKey); } + @Override public boolean getBoolean(String category, String name, boolean defaultValue, String comment) { Property prop = this.get(category, name, defaultValue); prop.comment = comment + " [default: " + defaultValue + "]"; diff --git a/src/main/java/forestry/core/config/Version.java b/src/main/java/forestry/core/config/Version.java index 8f9ab3d99..ba1a39fa1 100755 --- a/src/main/java/forestry/core/config/Version.java +++ b/src/main/java/forestry/core/config/Version.java @@ -19,10 +19,8 @@ import java.util.ArrayList; import net.minecraftforge.common.config.Configuration; import net.minecraftforge.common.config.Property; - -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.versioning.DefaultArtifactVersion; - +import net.minecraftforge.fml.common.FMLCommonHandler; +import net.minecraftforge.fml.common.versioning.DefaultArtifactVersion; import forestry.Forestry; import forestry.core.proxy.Proxies; import forestry.core.utils.Log; diff --git a/src/main/java/forestry/core/entities/EntityFXColoredDropParticle.java b/src/main/java/forestry/core/entities/EntityFXColoredDropParticle.java index 725377058..b6264773d 100644 --- a/src/main/java/forestry/core/entities/EntityFXColoredDropParticle.java +++ b/src/main/java/forestry/core/entities/EntityFXColoredDropParticle.java @@ -12,7 +12,9 @@ package forestry.core.entities; import net.minecraft.block.BlockLiquid; import net.minecraft.block.material.Material; +import net.minecraft.block.state.IBlockState; import net.minecraft.client.particle.EntityFX; +import net.minecraft.util.BlockPos; import net.minecraft.util.MathHelper; import net.minecraft.world.World; @@ -39,12 +41,13 @@ public class EntityFXColoredDropParticle extends EntityFX { /** * Called to update the entity's position/logic. */ + @Override public void onUpdate() { this.prevPosX = this.posX; this.prevPosY = this.posY; this.prevPosZ = this.posZ; - this.motionY -= (double) this.particleGravity; + this.motionY -= this.particleGravity; if (this.bobTimer-- > 0) { this.motionX *= 0.02D; @@ -71,10 +74,11 @@ public class EntityFXColoredDropParticle extends EntityFX { this.motionZ *= 0.699999988079071D; } - Material material = this.worldObj.getBlock(MathHelper.floor_double(this.posX), MathHelper.floor_double(this.posY), MathHelper.floor_double(this.posZ)).getMaterial(); - + IBlockState state = this.worldObj.getBlockState(new BlockPos(MathHelper.floor_double(this.posX), MathHelper.floor_double(this.posY), MathHelper.floor_double(this.posZ))); + Material material = state.getBlock().getMaterial(); + if (material.isLiquid() || material.isSolid()) { - double d0 = (double) ((float) (MathHelper.floor_double(this.posY) + 1) - BlockLiquid.getLiquidHeightPercent(this.worldObj.getBlockMetadata(MathHelper.floor_double(this.posX), MathHelper.floor_double(this.posY), MathHelper.floor_double(this.posZ)))); + double d0 = MathHelper.floor_double(this.posY) + 1 - BlockLiquid.getLiquidHeightPercent(state.getBlock().getMetaFromState(state)); if (this.posY < d0) { this.setDead(); diff --git a/src/main/java/forestry/core/entities/EntityFXIgnition.java b/src/main/java/forestry/core/entities/EntityFXIgnition.java index 61ac5d808..57d2d1107 100644 --- a/src/main/java/forestry/core/entities/EntityFXIgnition.java +++ b/src/main/java/forestry/core/entities/EntityFXIgnition.java @@ -11,11 +11,12 @@ package forestry.core.entities; import net.minecraft.client.particle.EntityFX; -import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.WorldRenderer; +import net.minecraft.entity.Entity; +import net.minecraft.util.EnumParticleTypes; import net.minecraft.world.World; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; @SideOnly(Side.CLIENT) public class EntityFXIgnition extends EntityFX { @@ -26,7 +27,7 @@ public class EntityFXIgnition extends EntityFX { this.motionX *= 0.8; this.motionY *= 0.8; this.motionZ *= 0.8; - this.motionY = (double) (this.rand.nextFloat() * 0.4F + 0.05F); + this.motionY = this.rand.nextFloat() * 0.4F + 0.05F; this.particleRed = this.particleGreen = this.particleBlue = 1.0F; this.particleScale *= (this.rand.nextFloat() / 2) + 0.3F; this.ignitionParticleScale = this.particleScale; @@ -35,6 +36,7 @@ public class EntityFXIgnition extends EntityFX { this.setParticleTextureIndex(49); } + @Override public int getBrightnessForRender(float p_70070_1_) { int i = super.getBrightnessForRender(p_70070_1_); short short1 = 240; @@ -45,19 +47,22 @@ public class EntityFXIgnition extends EntityFX { /** * Gets how bright this entity is. */ + @Override public float getBrightness(float p_70013_1_) { return 1.0F; } - - public void renderParticle(Tessellator p_70539_1_, float p_70539_2_, float p_70539_3_, float p_70539_4_, float p_70539_5_, float p_70539_6_, float p_70539_7_) { - float f6 = ((float) this.particleAge + p_70539_2_) / (float) this.particleMaxAge; + + @Override + public void renderParticle(WorldRenderer worldRendererIn, Entity entityIn, float partialTicks, float p_180434_4_, float p_180434_5_, float p_180434_6_, float p_180434_7_, float p_180434_8_) { + float f6 = (this.particleAge + partialTicks) / this.particleMaxAge; this.particleScale = this.ignitionParticleScale * (1.0F - f6 * f6); - super.renderParticle(p_70539_1_, p_70539_2_, p_70539_3_, p_70539_4_, p_70539_5_, p_70539_6_, p_70539_7_); + super.renderParticle(worldRendererIn, entityIn, partialTicks, p_180434_4_, p_180434_5_, p_180434_6_, p_180434_7_, p_180434_8_); } /** * Called to update the entity's position/logic. */ + @Override public void onUpdate() { this.prevPosX = this.posX; this.prevPosY = this.posY; @@ -70,7 +75,7 @@ public class EntityFXIgnition extends EntityFX { float f = (float) this.particleAge / (float) this.particleMaxAge; if (this.rand.nextFloat() > (f * 2)) { - this.worldObj.spawnParticle("smoke", this.posX, this.posY, this.posZ, this.motionX, this.motionY, this.motionZ); + this.worldObj.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, this.posX, this.posY, this.posZ, this.motionX, this.motionY, this.motionZ); } this.motionY -= 0.03D; diff --git a/src/main/java/forestry/core/entities/EntityFXSnow.java b/src/main/java/forestry/core/entities/EntityFXSnow.java index c46f1854e..88c14308e 100644 --- a/src/main/java/forestry/core/entities/EntityFXSnow.java +++ b/src/main/java/forestry/core/entities/EntityFXSnow.java @@ -11,18 +11,19 @@ package forestry.core.entities; import net.minecraft.client.particle.EntityFX; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.util.IIcon; +import net.minecraft.client.renderer.WorldRenderer; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.entity.Entity; import net.minecraft.world.World; public class EntityFXSnow extends EntityFX { - public static IIcon icons[]; + public static TextureAtlasSprite sprites[]; public EntityFXSnow(World world, double x, double y, double z) { super(world, x, y, z, 0.0D, 0.0D, 0.0D); - this.setParticleIcon(icons[rand.nextInt(icons.length)]); + this.setParticleIcon(sprites[rand.nextInt(sprites.length)]); this.particleScale *= 0.5F; this.particleMaxAge = (int) (40.0D / (Math.random() * 0.8D + 0.2D)); this.noClip = true; @@ -38,7 +39,7 @@ public class EntityFXSnow extends EntityFX { } @Override - public void renderParticle(Tessellator tess, float timeStep, float rotationX, float rotationXZ, float rotationZ, float rotationYZ, float rotationXY) { + public void renderParticle(WorldRenderer worldRenderer, Entity entity, float timeStep, float rotationX, float rotationXZ, float rotationZ, float rotationYZ, float rotationXY) { double x = (this.prevPosX + (this.posX - this.prevPosX) * timeStep - interpPosX); double y = (this.prevPosY + (this.posY - this.prevPosY) * timeStep - interpPosY); double z = (this.prevPosZ + (this.posZ - this.prevPosZ) * timeStep - interpPosZ); @@ -56,18 +57,18 @@ public class EntityFXSnow extends EntityFX { maxV = this.particleIcon.getMaxV(); } - tess.setColorRGBA_F(this.particleRed, this.particleGreen, this.particleBlue, this.particleAlpha); - for (int i = 0; i < 5; i++) { - renderParticle(tess, x, y, z, rotationX, rotationXZ, rotationZ, rotationYZ, rotationXY, minU, maxU, minV, maxV, scale); + renderParticle(worldRenderer, x, y, z, rotationX, rotationXZ, rotationZ, rotationYZ, rotationXY, minU, maxU, minV, maxV, scale, timeStep); } } - private static void renderParticle(Tessellator tess, double x, double y, double z, float rotationX, float rotationXZ, float rotationZ, float rotationYZ, float rotationXY, - float minU, float maxU, float minV, float maxV, float scale) { - tess.addVertexWithUV((x - rotationX * scale - rotationYZ * scale), (y - rotationXZ * scale), (z - rotationZ * scale - rotationXY * scale), maxU, maxV); - tess.addVertexWithUV((x - rotationX * scale + rotationYZ * scale), (y + rotationXZ * scale), (z - rotationZ * scale + rotationXY * scale), maxU, minV); - tess.addVertexWithUV((x + rotationX * scale + rotationYZ * scale), (y + rotationXZ * scale), (z + rotationZ * scale + rotationXY * scale), minU, minV); - tess.addVertexWithUV((x + rotationX * scale - rotationYZ * scale), (y - rotationXZ * scale), (z + rotationZ * scale - rotationXY * scale), minU, maxV); + private void renderParticle(WorldRenderer worldRenderer, double x, double y, double z, float rotationX, float rotationXZ, float rotationZ, float rotationYZ, float rotationXY, float minU, float maxU, float minV, float maxV, float scale, float timeStep) { + int i = this.getBrightnessForRender(timeStep); + int j = i >> 16 & 65535; + int k = i & 65535; + worldRenderer.pos((x - rotationX * scale - rotationYZ * scale), (y - rotationXZ * scale), (z - rotationZ * scale - rotationXY * scale)).tex(maxU, maxV).color(this.particleRed, this.particleGreen, this.particleBlue, this.particleAlpha).lightmap(j, k).endVertex(); + worldRenderer.pos((x - rotationX * scale + rotationYZ * scale), (y + rotationXZ * scale), (z - rotationZ * scale + rotationXY * scale)).tex(maxU, minV).color(this.particleRed, this.particleGreen, this.particleBlue, this.particleAlpha).lightmap(j, k).endVertex(); + worldRenderer.pos((x + rotationX * scale + rotationYZ * scale), (y + rotationXZ * scale), (z + rotationZ * scale + rotationXY * scale)).tex(minU, minV).color(this.particleRed, this.particleGreen, this.particleBlue, this.particleAlpha).lightmap(j, k).endVertex();; + worldRenderer.pos((x + rotationX * scale - rotationYZ * scale), (y - rotationXZ * scale), (z + rotationZ * scale - rotationXY * scale)).tex(minU, maxV).color(this.particleRed, this.particleGreen, this.particleBlue, this.particleAlpha).lightmap(j, k).endVertex();; } } diff --git a/src/main/java/forestry/core/entities/EntityMinecartContainerForestry.java b/src/main/java/forestry/core/entities/EntityMinecartContainerForestry.java index 6c259f9bb..0e62ab6a5 100644 --- a/src/main/java/forestry/core/entities/EntityMinecartContainerForestry.java +++ b/src/main/java/forestry/core/entities/EntityMinecartContainerForestry.java @@ -15,6 +15,8 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.IChatComponent; import net.minecraft.world.World; import forestry.core.inventory.IInventoryAdapter; @@ -60,7 +62,7 @@ public abstract class EntityMinecartContainerForestry extends EntityMinecartFore @Override protected void applyDrag() { int redstoneLevel = 15 - Container.calcRedstoneFromInventory(this); - double drag = 0.98F + (float) redstoneLevel * 0.001F; + double drag = 0.98F + redstoneLevel * 0.001F; this.motionX *= drag; this.motionY *= 0.0D; this.motionZ *= drag; @@ -92,10 +94,10 @@ public abstract class EntityMinecartContainerForestry extends EntityMinecartFore public ItemStack decrStackSize(int slotIndex, int amount) { return getInternalInventory().decrStackSize(slotIndex, amount); } - + @Override - public final ItemStack getStackInSlotOnClosing(int slotIndex) { - return getInternalInventory().getStackInSlotOnClosing(slotIndex); + public ItemStack removeStackFromSlot(int slotIndex) { + return getInternalInventory().removeStackFromSlot(slotIndex); } @Override @@ -109,23 +111,28 @@ public abstract class EntityMinecartContainerForestry extends EntityMinecartFore } @Override - public final void openInventory() { - getInternalInventory().openInventory(); + public final void openInventory(EntityPlayer player) { + getInternalInventory().openInventory(player); } @Override - public final void closeInventory() { - getInternalInventory().closeInventory(); + public final void closeInventory(EntityPlayer player) { + getInternalInventory().closeInventory(player); } - + @Override - public final String getInventoryName() { - return getInternalInventory().getInventoryName(); + public IChatComponent getDisplayName() { + return getInternalInventory().getDisplayName(); } - + @Override - public final boolean hasCustomInventoryName() { - return false; // stop RailCraft from rendering a halo text of the inventory name + public String getName() { + return getInternalInventory().getName(); + } + + @Override + public boolean hasCustomName() { + return false; } @Override @@ -142,19 +149,19 @@ public abstract class EntityMinecartContainerForestry extends EntityMinecartFore public boolean isLocked(int slotIndex) { return getInternalInventory().isLocked(slotIndex); } - + @Override - public int[] getAccessibleSlotsFromSide(int side) { - return getInternalInventory().getAccessibleSlotsFromSide(side); + public int[] getSlotsForFace(EnumFacing side) { + return getInternalInventory().getSlotsForFace(side); } @Override - public boolean canInsertItem(int slot, ItemStack stack, int side) { + public boolean canInsertItem(int slot, ItemStack stack, EnumFacing side) { return getInternalInventory().canInsertItem(slot, stack, side); } @Override - public boolean canExtractItem(int slot, ItemStack stack, int side) { + public boolean canExtractItem(int slot, ItemStack stack, EnumFacing side) { return getInternalInventory().canExtractItem(slot, stack, side); } @@ -164,4 +171,24 @@ public abstract class EntityMinecartContainerForestry extends EntityMinecartFore } protected abstract IInventoryAdapter getInternalInventory(); + + @Override + public int getField(int id) { + return getInternalInventory().getField(id); + } + + @Override + public void setField(int id, int value) { + getInternalInventory().setField(id, value); + } + + @Override + public int getFieldCount() { + return getInternalInventory().getFieldCount(); + } + + @Override + public void clear() { + getInternalInventory().clear(); + } } diff --git a/src/main/java/forestry/core/entities/EntityMinecartForestry.java b/src/main/java/forestry/core/entities/EntityMinecartForestry.java index 347cb1f09..8f39fb938 100644 --- a/src/main/java/forestry/core/entities/EntityMinecartForestry.java +++ b/src/main/java/forestry/core/entities/EntityMinecartForestry.java @@ -11,6 +11,7 @@ package forestry.core.entities; import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; import net.minecraft.entity.item.EntityMinecart; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -64,8 +65,8 @@ public abstract class EntityMinecartForestry extends EntityMinecart implements I } @Override - public int getMinecartType() { - return -1; + public EnumMinecartType getMinecartType() { + return null; } @Override @@ -85,14 +86,15 @@ public abstract class EntityMinecartForestry extends EntityMinecart implements I public boolean canBeRidden() { return false; } + + @Override + public boolean isPoweredCart() { + return false; + } // cart contents @Override - public abstract Block func_145820_n(); - - // cart contents meta - @Override - public abstract int getDisplayTileData(); + public abstract IBlockState getDisplayTile(); // cart itemStack @Override @@ -101,7 +103,8 @@ public abstract class EntityMinecartForestry extends EntityMinecart implements I @Override public void killMinecart(DamageSource damageSource) { super.killMinecart(damageSource); - entityDropItem(new ItemStack(func_145820_n(), 1, getDisplayTileData()), 0.0F); + Block block = getDisplayTile().getBlock(); + entityDropItem(new ItemStack(block, 1, block.getMetaFromState(getDisplayTile())), 0.0F); } // fix cart contents rendering as black in the End dimension @@ -111,7 +114,7 @@ public abstract class EntityMinecartForestry extends EntityMinecart implements I } @Override - public String getCommandSenderName() { + public String getName() { return StatCollector.translateToLocal(getUnlocalizedTitle()); } @@ -132,4 +135,9 @@ public abstract class EntityMinecartForestry extends EntityMinecart implements I public void onSwitchAccess(EnumAccess oldAccess, EnumAccess newAccess) { } + + @Override + public int getIdOfEntity() { + return getEntityId(); + } } diff --git a/src/main/java/forestry/core/entities/EntitySelector.java b/src/main/java/forestry/core/entities/EntitySelector.java index 47963c211..1e085ffdd 100644 --- a/src/main/java/forestry/core/entities/EntitySelector.java +++ b/src/main/java/forestry/core/entities/EntitySelector.java @@ -10,10 +10,11 @@ ******************************************************************************/ package forestry.core.entities; -import net.minecraft.command.IEntitySelector; +import com.google.common.base.Predicate; + import net.minecraft.entity.Entity; -public abstract class EntitySelector implements IEntitySelector { +public abstract class EntitySelector implements Predicate { private final Class entityClass; protected EntitySelector(Class entityClass) { @@ -23,12 +24,19 @@ public abstract class EntitySelector implements IEntitySelecto public Class getEntityClass() { return entityClass; } - + @Override - public final boolean isEntityApplicable(Entity entity) { + public boolean apply(Entity entity) { + if(entity == null) + return false; T castEntity = entityClass.cast(entity); return isEntityApplicableTyped(castEntity); } + + @Override + public boolean equals(Object obj) { + return super.equals(obj); + } protected abstract boolean isEntityApplicableTyped(T entity); } diff --git a/src/main/java/forestry/core/errors/EnumErrorCode.java b/src/main/java/forestry/core/errors/EnumErrorCode.java index 42eb0b0fd..12bbf8197 100644 --- a/src/main/java/forestry/core/errors/EnumErrorCode.java +++ b/src/main/java/forestry/core/errors/EnumErrorCode.java @@ -5,27 +5,16 @@ ******************************************************************************/ package forestry.core.errors; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.util.IIcon; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - import forestry.api.core.ForestryAPI; import forestry.api.core.IErrorState; import forestry.core.config.Constants; +import forestry.core.render.TextureManager; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public enum EnumErrorCode implements IErrorState { - @Deprecated - UNKNOWN("unknown"), // Congratulations, you found a glitch. - @Deprecated - WRONGSTACKSIZE("wrongStacksize"), // Only single items can be used here. - @Deprecated - NODISPOSAL("noDisposal"), // Insufficient space to dispose of waste products. - @Deprecated - INVALIDBIOME("invalidBiome"), // Machine or inhabitants cannot work in this biome. - // Bees TOO_HOT("tooHot"), // The bees are melting in the heat here and unable to work. Use the habitat locator to find a cooler climate. TOO_COLD("tooCold"), // The bees are huddled together to survive the freezing cold here. Use the habitat locator to find a warmer climate. @@ -96,7 +85,7 @@ public enum EnumErrorCode implements IErrorState { private final String name; private final String iconName; @SideOnly(Side.CLIENT) - private IIcon icon; + private TextureAtlasSprite texture; EnumErrorCode(String name) { this(name, name); @@ -119,14 +108,14 @@ public enum EnumErrorCode implements IErrorState { @SideOnly(Side.CLIENT) @Override - public void registerIcons(IIconRegister register) { - icon = register.registerIcon("forestry:errors/" + iconName); + public void registerSprite() { + texture = TextureManager.registerSprite("items/errors/" + iconName); } @SideOnly(Side.CLIENT) @Override - public IIcon getIcon() { - return icon; + public TextureAtlasSprite getSprite() { + return texture; } @Override diff --git a/src/main/java/forestry/core/errors/ErrorLogic.java b/src/main/java/forestry/core/errors/ErrorLogic.java index 3df6b9b3a..233ece8c0 100644 --- a/src/main/java/forestry/core/errors/ErrorLogic.java +++ b/src/main/java/forestry/core/errors/ErrorLogic.java @@ -35,10 +35,12 @@ public class ErrorLogic implements IErrorLogic { return condition; } + @Override public final boolean contains(IErrorState state) { return errorStates.contains(state); } + @Override public final boolean hasErrors() { return errorStates.size() > 0; } diff --git a/src/main/java/forestry/core/errors/ErrorStateRegistry.java b/src/main/java/forestry/core/errors/ErrorStateRegistry.java index f2abf1451..4567a628e 100644 --- a/src/main/java/forestry/core/errors/ErrorStateRegistry.java +++ b/src/main/java/forestry/core/errors/ErrorStateRegistry.java @@ -18,14 +18,11 @@ import java.util.HashMap; import java.util.Map; import java.util.Set; -import net.minecraft.client.renderer.texture.IIconRegister; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - import forestry.api.core.IErrorLogic; import forestry.api.core.IErrorState; import forestry.api.core.IErrorStateRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; /** * @@ -89,9 +86,9 @@ public class ErrorStateRegistry implements IErrorStateRegistry { } @SideOnly(Side.CLIENT) - public static void initIcons(IIconRegister register) { + public static void initSprites() { for (IErrorState code : states.values()) { - code.registerIcons(register); + code.registerSprite(); } } } diff --git a/src/main/java/forestry/core/fluids/BlockForestryFluid.java b/src/main/java/forestry/core/fluids/BlockForestryFluid.java index 29dfe769d..b481b5e50 100644 --- a/src/main/java/forestry/core/fluids/BlockForestryFluid.java +++ b/src/main/java/forestry/core/fluids/BlockForestryFluid.java @@ -11,35 +11,27 @@ package forestry.core.fluids; import java.awt.Color; -import java.util.ArrayList; -import java.util.List; import java.util.Random; import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.client.Minecraft; +import net.minecraft.block.state.IBlockState; import net.minecraft.client.particle.EntityFX; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.client.resources.IResourceManager; import net.minecraft.init.Blocks; import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.IIcon; -import net.minecraft.util.ResourceLocation; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.BlockFluidClassic; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; - -import cpw.mods.fml.client.FMLClientHandler; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -import forestry.core.config.Constants; +import net.minecraftforge.fml.client.FMLClientHandler; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import forestry.core.entities.EntityFXColoredDropParticle; -import forestry.core.render.TextureManager; +import forestry.core.utils.BlockUtil; public class BlockForestryFluid extends BlockFluidClassic { @@ -47,9 +39,6 @@ public class BlockForestryFluid extends BlockFluidClassic { private final int flammability; private final Color color; - @SideOnly(Side.CLIENT) - private List icons; - public BlockForestryFluid(Fluids forestryFluid) { this(forestryFluid, 0, false); } @@ -70,7 +59,7 @@ public class BlockForestryFluid extends BlockFluidClassic { } @Override - public boolean canDrain(World world, int x, int y, int z) { + public boolean canDrain(World world, BlockPos pos) { return true; } @@ -79,48 +68,13 @@ public class BlockForestryFluid extends BlockFluidClassic { return FluidRegistry.getFluid(fluidName); } - @Override - public IIcon getIcon(int side, int meta) { - if (side == 0 || side == 1 || this.icons.size() == 1) { - return this.icons.get(0); - } else { - return this.icons.get(1); - } - } - @Override @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister iconRegister) { - - this.icons = new ArrayList<>(2); - - String still = "liquid/" + fluidName + "_still"; - this.icons.add(TextureManager.registerTex(iconRegister, still)); - - if (flowTextureExists()) { - String flow = "liquid/" + fluidName + "_flow"; - this.icons.add(TextureManager.registerTex(iconRegister, flow)); - } - } - - @SideOnly(Side.CLIENT) - private boolean flowTextureExists() { - try { - ResourceLocation resourceLocation = new ResourceLocation(Constants.ID, "textures/blocks/liquid/" + fluidName + "_flow.png"); - IResourceManager resourceManager = Minecraft.getMinecraft().getResourceManager(); - return resourceManager.getResource(resourceLocation) != null; - } catch (java.lang.Exception e) { - return false; - } - } - - @Override - @SideOnly(Side.CLIENT) - public void randomDisplayTick(World world, int x, int y, int z, Random rand) { - if (rand.nextInt(10) == 0 && World.doesBlockHaveSolidTopSurface(world, x, y - 1, z) && !world.getBlock(x, y - 2, z).getMaterial().blocksMovement()) { - double px = (double) ((float) x + rand.nextFloat()); - double py = (double) y - 1.05D; - double pz = (double) ((float) z + rand.nextFloat()); + public void randomDisplayTick(World world, BlockPos pos, IBlockState state, Random rand) { + if (rand.nextInt(10) == 0 && World.doesBlockHaveSolidTopSurface(world, new BlockPos(pos.getX(), pos.getY() - 1, pos.getZ())) && !world.getBlockState(new BlockPos(pos.getX(), pos.getY() - 2, pos.getZ())).getBlock().getMaterial().blocksMovement()) { + double px = pos.getX() + rand.nextFloat(); + double py = pos.getY() - 1.05D; + double pz = pos.getZ() + rand.nextFloat(); EntityFX fx = new EntityFXColoredDropParticle(world, px, py, pz, color.getRed(), color.getGreen(), color.getBlue()); FMLClientHandler.instance().getClient().effectRenderer.addEffect(fx); @@ -128,42 +82,42 @@ public class BlockForestryFluid extends BlockFluidClassic { } @Override - public boolean canDisplace(IBlockAccess world, int x, int y, int z) { - if (world.getBlock(x, y, z).getMaterial().isLiquid()) { + public boolean canDisplace(IBlockAccess world, BlockPos pos) { + if (world.getBlockState(pos).getBlock().getMaterial().isLiquid()) { return false; } - return super.canDisplace(world, x, y, z); + return super.canDisplace(world, pos); + } + + @Override + public boolean displaceIfPossible(World world, BlockPos pos) { + if (world.getBlockState(pos).getBlock().getMaterial().isLiquid()) { + return false; + } + return super.displaceIfPossible(world, pos); } @Override - public boolean displaceIfPossible(World world, int x, int y, int z) { - if (world.getBlock(x, y, z).getMaterial().isLiquid()) { - return false; - } - return super.displaceIfPossible(world, x, y, z); - } - - @Override - public int getFireSpreadSpeed(IBlockAccess world, int x, int y, int z, ForgeDirection face) { + public int getFireSpreadSpeed(IBlockAccess world, BlockPos pos, EnumFacing face) { return flammable ? 30 : 0; } @Override - public int getFlammability(IBlockAccess world, int x, int y, int z, ForgeDirection face) { + public int getFlammability(IBlockAccess world, BlockPos pos, EnumFacing face) { return flammability; } - private static boolean isFlammable(IBlockAccess world, int x, int y, int z) { - return world.getBlock(x, y, z).isFlammable(world, x, y, z, ForgeDirection.UNKNOWN); + private static boolean isFlammable(IBlockAccess world, BlockPos pos) { + return BlockUtil.getBlock(world, pos).isFlammable(world, pos, null); } @Override - public boolean isFlammable(IBlockAccess world, int x, int y, int z, ForgeDirection face) { + public boolean isFlammable(IBlockAccess world, BlockPos pos, EnumFacing face) { return flammable; } @Override - public boolean isFireSource(World world, int x, int y, int z, ForgeDirection side) { + public boolean isFireSource(World world, BlockPos pos, EnumFacing side) { return flammable && flammability == 0; } @@ -183,8 +137,12 @@ public class BlockForestryFluid extends BlockFluidClassic { } @Override - public void updateTick(World world, int x, int y, int z, Random rand) { - super.updateTick(world, x, y, z, rand); + public void updateTick(World world, BlockPos pos, IBlockState state, Random rand) { + super.updateTick(world, pos, state, rand); + + int x = pos.getX(); + int y = pos.getY(); + int z = pos.getZ(); // Start fires if the fluid is lava-like if (getMaterial() == Material.lava) { @@ -194,11 +152,11 @@ public class BlockForestryFluid extends BlockFluidClassic { x += rand.nextInt(3) - 1; ++y; z += rand.nextInt(3) - 1; - Block block = world.getBlock(x, y, z); + Block block = world.getBlockState(new BlockPos(x, y, z)).getBlock(); if (block.getMaterial() == Material.air) { if (isNeighborFlammable(world, x, y, z)) { - world.setBlock(x, y, z, Blocks.fire); + world.setBlockState(new BlockPos(x, y, z), Blocks.fire.getDefaultState()); return; } } else if (block.getMaterial().blocksMovement()) { @@ -214,36 +172,36 @@ public class BlockForestryFluid extends BlockFluidClassic { x = startX + rand.nextInt(3) - 1; z = startZ + rand.nextInt(3) - 1; - if (world.isAirBlock(x, y + 1, z) && isFlammable(world, x, y, z)) { - world.setBlock(x, y + 1, z, Blocks.fire); + if (world.isAirBlock(new BlockPos(pos.getX(), y + 1, z)) && isFlammable(world, new BlockPos(x, y, z))) { + world.setBlockState(new BlockPos(pos.getX(), y + 1, z), Blocks.fire.getDefaultState()); } } } } // explode if very flammable and near fire - int flammability = getFlammability(world, x, y, z, ForgeDirection.UNKNOWN); + int flammability = getFlammability(world, pos, null); if (flammability > 0) { // Explosion size is determined by flammability, up to size 4. float explosionSize = 4F * flammability / 300F; - if (explosionSize > 1.0 && isNearFire(world, x, y, z)) { - world.setBlock(x, y, z, Blocks.fire); - world.newExplosion(null, x, y, z, explosionSize, true, true); + if (explosionSize > 1.0 && isNearFire(world, pos.getX(), pos.getY(), pos.getZ())) { + world.setBlockState(pos, Blocks.fire.getDefaultState()); + world.newExplosion(null, pos.getX(), pos.getY(), pos.getZ(), explosionSize, true, true); } } } private static boolean isNeighborFlammable(World world, int x, int y, int z) { - return isFlammable(world, x - 1, y, z) || - isFlammable(world, x + 1, y, z) || - isFlammable(world, x, y, z - 1) || - isFlammable(world, x, y, z + 1) || - isFlammable(world, x, y - 1, z) || - isFlammable(world, x, y + 1, z); + return isFlammable(world, new BlockPos(x - 1, y, z)) || + isFlammable(world, new BlockPos(x + 1, y, z)) || + isFlammable(world, new BlockPos(x, y, z - 1)) || + isFlammable(world, new BlockPos(x, y, z + 1)) || + isFlammable(world, new BlockPos(x, y - 1, z)) || + isFlammable(world, new BlockPos(x, y + 1, z)); } private static boolean isNearFire(World world, int x, int y, int z) { - AxisAlignedBB boundingBox = AxisAlignedBB.getBoundingBox(x - 1, y - 1, z - 1, x + 1, y + 1, z + 1); - return world.func_147470_e(boundingBox); + AxisAlignedBB boundingBox = AxisAlignedBB.fromBounds(x - 1, y - 1, z - 1, x + 1, y + 1, z + 1); + return world.isFlammableWithin(boundingBox); } } diff --git a/src/main/java/forestry/core/fluids/FakeTankManager.java b/src/main/java/forestry/core/fluids/FakeTankManager.java index 81914910d..bbd1ebee5 100644 --- a/src/main/java/forestry/core/fluids/FakeTankManager.java +++ b/src/main/java/forestry/core/fluids/FakeTankManager.java @@ -12,11 +12,9 @@ package forestry.core.fluids; import java.util.List; -import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.inventory.Container; import net.minecraft.inventory.ICrafting; - -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; @@ -37,7 +35,7 @@ public class FakeTankManager implements ITankManager { } @Override - public void updateGuiData(Container container, List crafters) { + public void updateGuiData(Container container, List crafters) { } @@ -57,32 +55,32 @@ public class FakeTankManager implements ITankManager { } @Override - public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { + public int fill(EnumFacing from, FluidStack resource, boolean doFill) { return FakeTank.INSTANCE.fill(resource, doFill); } @Override - public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) { + public FluidStack drain(EnumFacing from, FluidStack resource, boolean doDrain) { return FakeTank.INSTANCE.drain(resource.amount, doDrain); } @Override - public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) { + public FluidStack drain(EnumFacing from, int maxDrain, boolean doDrain) { return FakeTank.INSTANCE.drain(maxDrain, doDrain); } @Override - public boolean canFill(ForgeDirection from, Fluid fluid) { + public boolean canFill(EnumFacing from, Fluid fluid) { return false; } @Override - public boolean canDrain(ForgeDirection from, Fluid fluid) { + public boolean canDrain(EnumFacing from, Fluid fluid) { return false; } @Override - public FluidTankInfo[] getTankInfo(ForgeDirection from) { + public FluidTankInfo[] getTankInfo(EnumFacing from) { return FakeTank.INFO; } } diff --git a/src/main/java/forestry/core/fluids/FluidHelper.java b/src/main/java/forestry/core/fluids/FluidHelper.java index e06077391..00688712a 100644 --- a/src/main/java/forestry/core/fluids/FluidHelper.java +++ b/src/main/java/forestry/core/fluids/FluidHelper.java @@ -17,8 +17,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; - -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidRegistry; @@ -39,7 +38,7 @@ public final class FluidHelper { private FluidHelper() { } - public static boolean handleRightClick(IFluidHandler tank, ForgeDirection side, EntityPlayer player, boolean fill, boolean drain) { + public static boolean handleRightClick(IFluidHandler tank, EnumFacing side, EntityPlayer player, boolean fill, boolean drain) { if (player == null) { return false; } @@ -142,7 +141,7 @@ public final class FluidHelper { fillAmount = Math.min(Constants.BUCKET_VOLUME, containerCapacity); } - FluidStack canDrain = fluidHandler.drain(ForgeDirection.UNKNOWN, new FluidStack(fluidToFill, fillAmount), false); + FluidStack canDrain = fluidHandler.drain(null, new FluidStack(fluidToFill, fillAmount), false); if (canDrain == null || canDrain.amount == 0) { return FillStatus.NO_FLUID; } @@ -168,7 +167,7 @@ public final class FluidHelper { } if (doFill) { - fluidHandler.drain(ForgeDirection.UNKNOWN, canDrain, true); + fluidHandler.drain(null, canDrain, true); if (moveToOutput) { if (output == null) { inv.setInventorySlotContents(outputSlot, filled); @@ -207,7 +206,7 @@ public final class FluidHelper { } } - int used = fluidHandler.fill(ForgeDirection.UNKNOWN, fluidInContainer, false); + int used = fluidHandler.fill(null, fluidInContainer, false); ItemStack drainedItem = getDrainedContainer(input, used); if (ItemStack.areItemStacksEqual(input, drainedItem)) { @@ -226,7 +225,7 @@ public final class FluidHelper { return false; } - fluidHandler.fill(ForgeDirection.UNKNOWN, fluidInContainer, true); + fluidHandler.fill(null, fluidInContainer, true); if (drainedItem != null) { if (outputSlot == inputSlot) { diff --git a/src/main/java/forestry/core/fluids/Fluids.java b/src/main/java/forestry/core/fluids/Fluids.java index 26fbd0392..736bc502f 100644 --- a/src/main/java/forestry/core/fluids/Fluids.java +++ b/src/main/java/forestry/core/fluids/Fluids.java @@ -22,16 +22,19 @@ import java.util.Map; import org.apache.commons.lang3.text.WordUtils; import net.minecraft.block.Block; +import net.minecraft.client.resources.IResourceManager; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; - +import net.minecraft.util.ResourceLocation; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; - +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import forestry.core.config.Constants; import forestry.core.items.EnumContainerType; import forestry.core.items.ItemLiquidContainer; +import forestry.core.proxy.Proxies; public enum Fluids { @@ -275,6 +278,8 @@ public enum Fluids { private final int density, viscosity; @Nonnull private final Color color; + + private final ResourceLocation[] resources = new ResourceLocation[2]; Fluids(@Nonnull Color color) { this(null, color, 1000, 1000); @@ -293,6 +298,11 @@ public enum Fluids { this.color = color; this.density = density; this.viscosity = viscosity; + + resources[0] = new ResourceLocation(Constants.ID, "blocks/liquid/" + getTag() + "_still"); + if (flowTextureExists()) { + resources[1] = new ResourceLocation(Constants.ID, "blocks/liquid/" + getTag() + "_flow"); + } } public int getTemperature() { @@ -405,4 +415,19 @@ public enum Fluids { public void setProperties(ItemLiquidContainer liquidContainer) { } + + @SideOnly(Side.CLIENT) + public boolean flowTextureExists() { + try { + ResourceLocation resourceLocation = new ResourceLocation(Constants.ID, "blocks/liquid/" + getTag() + "_flow"); + IResourceManager resourceManager = Proxies.common.getClientInstance().getResourceManager(); + return resourceManager.getResource(resourceLocation) != null; + } catch (java.lang.Exception e) { + return false; + } + } + + public ResourceLocation[] getResources() { + return resources; + } } diff --git a/src/main/java/forestry/core/fluids/ITankManager.java b/src/main/java/forestry/core/fluids/ITankManager.java index 58b16c4d7..c5964d9d5 100644 --- a/src/main/java/forestry/core/fluids/ITankManager.java +++ b/src/main/java/forestry/core/fluids/ITankManager.java @@ -12,7 +12,6 @@ package forestry.core.fluids; import java.util.List; -import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.inventory.Container; import net.minecraft.inventory.ICrafting; @@ -21,9 +20,9 @@ import net.minecraftforge.fluids.IFluidHandler; import net.minecraftforge.fluids.IFluidTank; public interface ITankManager extends IFluidHandler { - void containerAdded(Container container, ICrafting player); + void containerAdded(Container container, ICrafting crafter); - void updateGuiData(Container container, List crafters); + void updateGuiData(Container container, List crafters); void containerRemoved(Container container); diff --git a/src/main/java/forestry/core/fluids/TankManager.java b/src/main/java/forestry/core/fluids/TankManager.java index 52762a0af..a5fb8d00f 100644 --- a/src/main/java/forestry/core/fluids/TankManager.java +++ b/src/main/java/forestry/core/fluids/TankManager.java @@ -26,8 +26,7 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.ICrafting; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; - -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; @@ -136,7 +135,7 @@ public class TankManager implements ITankManager, ITankUpdateHandler, IStreamabl return; } - List crafters = Collections.singletonList((EntityPlayerMP) player); + List crafters = Collections.singletonList(player); for (StandardTank tank : tanks) { sendTankUpdate(container, tank, crafters); @@ -151,13 +150,13 @@ public class TankManager implements ITankManager, ITankUpdateHandler, IStreamabl } @Override - public void updateGuiData(Container container, List crafters) { + public void updateGuiData(Container container, List crafters) { for (StandardTank tank : tanks) { updateGuiData(container, crafters, tank.getTankIndex()); } } - private void updateGuiData(Container container, List crafters, int tankIndex) { + private void updateGuiData(Container container, List crafters, int tankIndex) { StandardTank tank = tanks.get(tankIndex); if (tank == null) { return; @@ -172,12 +171,13 @@ public class TankManager implements ITankManager, ITankUpdateHandler, IStreamabl sendTankUpdate(container, tank, crafters); } - private void sendTankUpdate(Container container, StandardTank tank, Iterable crafters) { + private void sendTankUpdate(Container container, StandardTank tank, Iterable crafters) { int tankIndex = tank.getTankIndex(); FluidStack fluid = tank.getFluid(); IForestryPacketClient packet = new PacketTankLevelUpdate(tile, tankIndex, fluid); - for (EntityPlayerMP player : crafters) { - Proxies.net.sendToPlayer(packet, player); + for (ICrafting crafter : crafters) { + if(crafter instanceof EntityPlayerMP) + Proxies.net.sendToPlayer(packet, (EntityPlayerMP) crafter); } if (fluid == null) { @@ -202,7 +202,7 @@ public class TankManager implements ITankManager, ITankUpdateHandler, IStreamabl } @Override - public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { + public int fill(EnumFacing from, FluidStack resource, boolean doFill) { for (StandardTank tank : tanks) { if (tankAcceptsFluid(tank, resource)) { return fill(tank.getTankIndex(), resource, doFill); @@ -247,7 +247,7 @@ public class TankManager implements ITankManager, ITankUpdateHandler, IStreamabl } @Override - public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) { + public FluidStack drain(EnumFacing from, int maxDrain, boolean doDrain) { for (StandardTank tank : tanks) { if (tankCanDrain(tank)) { return drain(tank.getTankIndex(), maxDrain, doDrain); @@ -279,22 +279,22 @@ public class TankManager implements ITankManager, ITankUpdateHandler, IStreamabl } @Override - public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) { + public FluidStack drain(EnumFacing from, FluidStack resource, boolean doDrain) { return drain(resource, doDrain); } @Override - public boolean canFill(ForgeDirection from, Fluid fluid) { + public boolean canFill(EnumFacing from, Fluid fluid) { return true; } @Override - public boolean canDrain(ForgeDirection from, Fluid fluid) { + public boolean canDrain(EnumFacing from, Fluid fluid) { return true; } @Override - public FluidTankInfo[] getTankInfo(ForgeDirection direction) { + public FluidTankInfo[] getTankInfo(EnumFacing direction) { FluidTankInfo[] info = new FluidTankInfo[tanks.size()]; for (int i = 0; i < tanks.size(); i++) { info[i] = tanks.get(i).getInfo(); @@ -303,7 +303,7 @@ public class TankManager implements ITankManager, ITankUpdateHandler, IStreamabl } public FluidTankInfo[] getTankInfo() { - return getTankInfo(ForgeDirection.UNKNOWN); + return getTankInfo(null); } public FluidTankInfo getTankInfo(int tankIndex) { diff --git a/src/main/java/forestry/core/fluids/tanks/FilteredTank.java b/src/main/java/forestry/core/fluids/tanks/FilteredTank.java index c63611a9e..f5746f6b4 100644 --- a/src/main/java/forestry/core/fluids/tanks/FilteredTank.java +++ b/src/main/java/forestry/core/fluids/tanks/FilteredTank.java @@ -87,7 +87,7 @@ public class FilteredTank extends StandardTank { Fluid fluidFilter = FluidRegistry.getFluid(filterName); EnumRarity rarity = fluidFilter.getRarity(); if (rarity == null) { - rarity = EnumRarity.common; + rarity = EnumRarity.COMMON; } FluidStack filterFluidStack = FluidRegistry.getFluidStack(fluidFilter.getName(), 0); ToolTipLine name = new ToolTipLine(fluidFilter.getLocalizedName(filterFluidStack), rarity.rarityColor, 2); diff --git a/src/main/java/forestry/core/fluids/tanks/StandardTank.java b/src/main/java/forestry/core/fluids/tanks/StandardTank.java index 27be1cd0f..69eb70319 100644 --- a/src/main/java/forestry/core/fluids/tanks/StandardTank.java +++ b/src/main/java/forestry/core/fluids/tanks/StandardTank.java @@ -197,7 +197,7 @@ public class StandardTank extends FluidTank implements IStreamable { Fluid fluidType = getFluidType(); EnumRarity rarity = fluidType.getRarity(); if (rarity == null) { - rarity = EnumRarity.common; + rarity = EnumRarity.COMMON; } ToolTipLine fluidName = new ToolTipLine(fluidType.getLocalizedName(getFluid()), rarity.rarityColor, 2); toolTip.add(fluidName); diff --git a/src/main/java/forestry/core/genetics/IndividualLiving.java b/src/main/java/forestry/core/genetics/IndividualLiving.java index 9c5a647a7..b5cf80246 100755 --- a/src/main/java/forestry/core/genetics/IndividualLiving.java +++ b/src/main/java/forestry/core/genetics/IndividualLiving.java @@ -61,6 +61,7 @@ public abstract class IndividualLiving extends Individual implements IIndividual } /* GENERATION */ + @Override public abstract IGenome getMate(); @Override diff --git a/src/main/java/forestry/core/genetics/ItemGE.java b/src/main/java/forestry/core/genetics/ItemGE.java index c8408158d..da77c293b 100755 --- a/src/main/java/forestry/core/genetics/ItemGE.java +++ b/src/main/java/forestry/core/genetics/ItemGE.java @@ -12,15 +12,14 @@ package forestry.core.genetics; import java.util.List; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +import forestry.api.core.IModelManager; import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IIndividual; import forestry.core.items.ItemForestry; @@ -55,10 +54,10 @@ public abstract class ItemGE extends ItemForestry { public boolean getShareTag() { return true; } - + @Override - public boolean hasEffect(ItemStack itemstack, int pass) { - IAlleleSpecies species = getSpecies(itemstack); + public boolean hasEffect(ItemStack stack) { + IAlleleSpecies species = getSpecies(stack); return species != null && species.hasEffect(); } @@ -85,7 +84,7 @@ public abstract class ItemGE extends ItemForestry { /* ICONS */ @SideOnly(Side.CLIENT) @Override - public void registerIcons(IIconRegister par1IconRegister) { + public void registerModel(Item item, IModelManager manager) { // Need to disable normal registration. } diff --git a/src/main/java/forestry/core/genetics/ItemResearchNote.java b/src/main/java/forestry/core/genetics/ItemResearchNote.java index f1068a2a1..5f2d062ff 100755 --- a/src/main/java/forestry/core/genetics/ItemResearchNote.java +++ b/src/main/java/forestry/core/genetics/ItemResearchNote.java @@ -14,23 +14,17 @@ import java.util.ArrayList; import java.util.List; import java.util.Locale; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTUtil; import net.minecraft.util.ChatComponentTranslation; import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.IIcon; import net.minecraft.world.World; import com.mojang.authlib.GameProfile; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllele; import forestry.api.genetics.IAlleleSpecies; @@ -222,7 +216,7 @@ public class ItemResearchNote extends ItemForestry { public ResearchNote(NBTTagCompound compound) { if (compound != null) { if (compound.hasKey("res")) { - this.researcher = NBTUtil.func_152459_a(compound.getCompoundTag("res")); + this.researcher = NBTUtil.readGameProfileFromNBT(compound.getCompoundTag("res")); } else { this.researcher = null; } @@ -238,7 +232,7 @@ public class ItemResearchNote extends ItemForestry { public void writeToNBT(NBTTagCompound compound) { if (this.researcher != null) { NBTTagCompound nbt = new NBTTagCompound(); - NBTUtil.func_152460_a(nbt, researcher); + NBTUtil.writeGameProfile(nbt, researcher); compound.setTag("res", nbt); } compound.setByte("TYP", (byte) type.ordinal()); @@ -306,15 +300,4 @@ public class ItemResearchNote extends ItemForestry { public int getColorFromItemStack(ItemStack itemstack, int j) { return 0xffe8a5; } - - @SideOnly(Side.CLIENT) - @Override - public void registerIcons(IIconRegister register) { - } - - @SideOnly(Side.CLIENT) - @Override - public IIcon getIconFromDamage(int meta) { - return Items.paper.getIconFromDamage(0); - } } diff --git a/src/main/java/forestry/core/genetics/alleles/AlleleArea.java b/src/main/java/forestry/core/genetics/alleles/AlleleArea.java index d93d4114f..b82ed259f 100644 --- a/src/main/java/forestry/core/genetics/alleles/AlleleArea.java +++ b/src/main/java/forestry/core/genetics/alleles/AlleleArea.java @@ -22,6 +22,7 @@ public class AlleleArea extends AlleleCategorized implements IAlleleArea { this.area = value; } + @Override public int[] getValue() { return area; } diff --git a/src/main/java/forestry/core/genetics/alleles/AlleleBoolean.java b/src/main/java/forestry/core/genetics/alleles/AlleleBoolean.java index a981a76c2..8ea7878aa 100644 --- a/src/main/java/forestry/core/genetics/alleles/AlleleBoolean.java +++ b/src/main/java/forestry/core/genetics/alleles/AlleleBoolean.java @@ -21,6 +21,7 @@ public class AlleleBoolean extends AlleleCategorized implements IAlleleBoolean { this.value = value; } + @Override public boolean getValue() { return value; } diff --git a/src/main/java/forestry/core/genetics/alleles/AllelePlantType.java b/src/main/java/forestry/core/genetics/alleles/AllelePlantType.java index 3d669e446..56988089c 100644 --- a/src/main/java/forestry/core/genetics/alleles/AllelePlantType.java +++ b/src/main/java/forestry/core/genetics/alleles/AllelePlantType.java @@ -60,6 +60,7 @@ public class AllelePlantType extends AlleleCategorized implements IAllelePlantTy this.types = types; } + @Override public EnumSet getPlantTypes() { return types; } diff --git a/src/main/java/forestry/core/genetics/alleles/AlleleSpecies.java b/src/main/java/forestry/core/genetics/alleles/AlleleSpecies.java index 551ba2781..33812a294 100644 --- a/src/main/java/forestry/core/genetics/alleles/AlleleSpecies.java +++ b/src/main/java/forestry/core/genetics/alleles/AlleleSpecies.java @@ -17,15 +17,14 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import com.mojang.authlib.GameProfile; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; -import forestry.api.core.IIconProvider; +import forestry.api.core.IModelProvider; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAlleleSpeciesCustom; import forestry.api.genetics.IClassification; @@ -188,5 +187,5 @@ public abstract class AlleleSpecies extends Allele implements IAlleleSpeciesCust @Override @SideOnly(Side.CLIENT) - public abstract IIconProvider getIconProvider(); + public abstract IModelProvider getModelProvider(); } diff --git a/src/main/java/forestry/core/genetics/alleles/AlleleTolerance.java b/src/main/java/forestry/core/genetics/alleles/AlleleTolerance.java index 0614a48de..8e076067a 100644 --- a/src/main/java/forestry/core/genetics/alleles/AlleleTolerance.java +++ b/src/main/java/forestry/core/genetics/alleles/AlleleTolerance.java @@ -22,6 +22,7 @@ public class AlleleTolerance extends AlleleCategorized implements IAlleleToleran this.value = value; } + @Override public EnumTolerance getValue() { return value; } diff --git a/src/main/java/forestry/core/genetics/mutations/Mutation.java b/src/main/java/forestry/core/genetics/mutations/Mutation.java index 5adb68c92..f185bd006 100644 --- a/src/main/java/forestry/core/genetics/mutations/Mutation.java +++ b/src/main/java/forestry/core/genetics/mutations/Mutation.java @@ -15,6 +15,7 @@ import java.util.Collection; import java.util.List; import net.minecraft.block.Block; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import net.minecraftforge.common.BiomeDictionary; @@ -124,10 +125,10 @@ public abstract class Mutation implements IMutationCustom { return this; } - protected float getChance(World world, int x, int y, int z, IAllele allele0, IAllele allele1, IGenome genome0, IGenome genome1) { + protected float getChance(World world, BlockPos pos, IAllele allele0, IAllele allele1, IGenome genome0, IGenome genome1) { float mutationChance = chance; for (IMutationCondition mutationCondition : mutationConditions) { - mutationChance *= mutationCondition.getChance(world, x, y, z, allele0, allele1, genome0, genome1); + mutationChance *= mutationCondition.getChance(world, pos, allele0, allele1, genome0, genome1); if (mutationChance == 0) { return 0; } diff --git a/src/main/java/forestry/core/genetics/mutations/MutationConditionBiome.java b/src/main/java/forestry/core/genetics/mutations/MutationConditionBiome.java index 16e8e5d8a..03bfa94b2 100644 --- a/src/main/java/forestry/core/genetics/mutations/MutationConditionBiome.java +++ b/src/main/java/forestry/core/genetics/mutations/MutationConditionBiome.java @@ -14,6 +14,7 @@ import java.util.Arrays; import java.util.List; import java.util.Locale; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; @@ -33,8 +34,8 @@ public class MutationConditionBiome implements IMutationCondition { } @Override - public float getChance(World world, int x, int y, int z, IAllele allele0, IAllele allele1, IGenome genome0, IGenome genome1) { - BiomeGenBase biome = world.getBiomeGenForCoords(x, z); + public float getChance(World world, BlockPos pos, IAllele allele0, IAllele allele1, IGenome genome0, IGenome genome1) { + BiomeGenBase biome = world.getBiomeGenForCoords(pos); for (BiomeDictionary.Type type : validBiomeTypes) { if (BiomeDictionary.isBiomeOfType(biome, type)) { return 1; diff --git a/src/main/java/forestry/core/genetics/mutations/MutationConditionDaytime.java b/src/main/java/forestry/core/genetics/mutations/MutationConditionDaytime.java index 66615c576..39b273994 100644 --- a/src/main/java/forestry/core/genetics/mutations/MutationConditionDaytime.java +++ b/src/main/java/forestry/core/genetics/mutations/MutationConditionDaytime.java @@ -10,6 +10,7 @@ ******************************************************************************/ package forestry.core.genetics.mutations; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import forestry.api.genetics.IAllele; @@ -26,7 +27,7 @@ public class MutationConditionDaytime implements IMutationCondition { } @Override - public float getChance(World world, int x, int y, int z, IAllele allele0, IAllele allele1, IGenome genome0, IGenome genome1) { + public float getChance(World world, BlockPos pos, IAllele allele0, IAllele allele1, IGenome genome0, IGenome genome1) { if (world.isDaytime() == daytime) { return 1; } diff --git a/src/main/java/forestry/core/genetics/mutations/MutationConditionHumidity.java b/src/main/java/forestry/core/genetics/mutations/MutationConditionHumidity.java index de3136804..2757a83e1 100644 --- a/src/main/java/forestry/core/genetics/mutations/MutationConditionHumidity.java +++ b/src/main/java/forestry/core/genetics/mutations/MutationConditionHumidity.java @@ -10,6 +10,7 @@ ******************************************************************************/ package forestry.core.genetics.mutations; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; @@ -30,8 +31,8 @@ public class MutationConditionHumidity implements IMutationCondition { } @Override - public float getChance(World world, int x, int y, int z, IAllele allele0, IAllele allele1, IGenome genome0, IGenome genome1) { - BiomeGenBase biome = world.getWorldChunkManager().getBiomeGenAt(x, z); + public float getChance(World world, BlockPos pos, IAllele allele0, IAllele allele1, IGenome genome0, IGenome genome1) { + BiomeGenBase biome = world.getWorldChunkManager().getBiomeGenerator(pos); EnumHumidity biomeHumidity = EnumHumidity.getFromValue(biome.rainfall); if (biomeHumidity.ordinal() < minHumidity.ordinal() || biomeHumidity.ordinal() > maxHumidity.ordinal()) { diff --git a/src/main/java/forestry/core/genetics/mutations/MutationConditionRequiresResource.java b/src/main/java/forestry/core/genetics/mutations/MutationConditionRequiresResource.java index dfe13558c..8b7977bcb 100644 --- a/src/main/java/forestry/core/genetics/mutations/MutationConditionRequiresResource.java +++ b/src/main/java/forestry/core/genetics/mutations/MutationConditionRequiresResource.java @@ -12,12 +12,14 @@ package forestry.core.genetics.mutations; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import forestry.api.apiculture.IBeeHousing; import forestry.api.genetics.IAllele; import forestry.api.genetics.IGenome; import forestry.api.genetics.IMutationCondition; +import forestry.core.utils.BlockUtil; import forestry.core.utils.ItemStackUtil; import forestry.core.utils.StringUtil; @@ -30,13 +32,14 @@ public class MutationConditionRequiresResource implements IMutationCondition { } @Override - public float getChance(World world, int x, int y, int z, IAllele allele0, IAllele allele1, IGenome genome0, IGenome genome1) { + public float getChance(World world, BlockPos pos, IAllele allele0, IAllele allele1, IGenome genome0, IGenome genome1) { Block block; int meta; int i = 1; do { - block = world.getBlock(x, y - i, z); - meta = world.getBlockMetadata(x, y - i, z); + BlockPos blockPos = new BlockPos(pos.getX(), pos.getY() - i, pos.getY()); + block = BlockUtil.getBlock(world, blockPos); + meta = BlockUtil.getBlockMetadata(world, blockPos); i++; } while (block instanceof IBeeHousing); diff --git a/src/main/java/forestry/core/genetics/mutations/MutationConditionRequiresResourceOreDict.java b/src/main/java/forestry/core/genetics/mutations/MutationConditionRequiresResourceOreDict.java index 5e4acee57..9789d2bb1 100644 --- a/src/main/java/forestry/core/genetics/mutations/MutationConditionRequiresResourceOreDict.java +++ b/src/main/java/forestry/core/genetics/mutations/MutationConditionRequiresResourceOreDict.java @@ -10,10 +10,11 @@ ******************************************************************************/ package forestry.core.genetics.mutations; -import java.util.ArrayList; +import java.util.List; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import net.minecraftforge.oredict.OreDictionary; @@ -22,6 +23,7 @@ import forestry.api.apiculture.IBeeHousing; import forestry.api.genetics.IAllele; import forestry.api.genetics.IGenome; import forestry.api.genetics.IMutationCondition; +import forestry.core.utils.BlockUtil; import forestry.core.utils.StringUtil; public class MutationConditionRequiresResourceOreDict implements IMutationCondition { @@ -32,7 +34,7 @@ public class MutationConditionRequiresResourceOreDict implements IMutationCondit public MutationConditionRequiresResourceOreDict(String oreDictName) { this.oreDictId = OreDictionary.getOreID(oreDictName); - ArrayList ores = OreDictionary.getOres(oreDictName); + List ores = OreDictionary.getOres(oreDictName); if (ores != null && 0 < ores.size()) { this.displayName = ores.get(0).getDisplayName(); } else { @@ -41,13 +43,14 @@ public class MutationConditionRequiresResourceOreDict implements IMutationCondit } @Override - public float getChance(World world, int x, int y, int z, IAllele allele0, IAllele allele1, IGenome genome0, IGenome genome1) { + public float getChance(World world, BlockPos pos, IAllele allele0, IAllele allele1, IGenome genome0, IGenome genome1) { Block block; int meta; int i = 1; do { - block = world.getBlock(x, y - i, z); - meta = world.getBlockMetadata(x, y - i, z); + BlockPos blockPos = new BlockPos(pos.getX(), pos.getY() - i, pos.getY()); + block = BlockUtil.getBlock(world, blockPos); + meta = BlockUtil.getBlockMetadata(world, blockPos); i++; } while (block instanceof IBeeHousing); diff --git a/src/main/java/forestry/core/genetics/mutations/MutationConditionTemperature.java b/src/main/java/forestry/core/genetics/mutations/MutationConditionTemperature.java index 650787cb1..aa08c94ab 100644 --- a/src/main/java/forestry/core/genetics/mutations/MutationConditionTemperature.java +++ b/src/main/java/forestry/core/genetics/mutations/MutationConditionTemperature.java @@ -10,6 +10,7 @@ ******************************************************************************/ package forestry.core.genetics.mutations; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; @@ -31,9 +32,9 @@ public class MutationConditionTemperature implements IMutationCondition { } @Override - public float getChance(World world, int x, int y, int z, IAllele allele0, IAllele allele1, IGenome genome0, IGenome genome1) { - BiomeGenBase biome = world.getWorldChunkManager().getBiomeGenAt(x, z); - EnumTemperature biomeTemperature = EnumTemperature.getFromBiome(biome, x, y, z); + public float getChance(World world, BlockPos pos, IAllele allele0, IAllele allele1, IGenome genome0, IGenome genome1) { + BiomeGenBase biome = world.getWorldChunkManager().getBiomeGenerator(pos); + EnumTemperature biomeTemperature = EnumTemperature.getFromBiome(biome, pos); if (biomeTemperature.ordinal() < minTemperature.ordinal() || biomeTemperature.ordinal() > maxTemperature.ordinal()) { return 0; diff --git a/src/main/java/forestry/core/genetics/mutations/MutationConditionTimeLimited.java b/src/main/java/forestry/core/genetics/mutations/MutationConditionTimeLimited.java index dc6c47b85..faded25b6 100644 --- a/src/main/java/forestry/core/genetics/mutations/MutationConditionTimeLimited.java +++ b/src/main/java/forestry/core/genetics/mutations/MutationConditionTimeLimited.java @@ -12,6 +12,7 @@ package forestry.core.genetics.mutations; import java.util.Calendar; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import forestry.api.genetics.IAllele; @@ -31,7 +32,7 @@ public class MutationConditionTimeLimited implements IMutationCondition { } @Override - public float getChance(World world, int x, int y, int z, IAllele allele0, IAllele allele1, IGenome genome0, IGenome genome1) { + public float getChance(World world, BlockPos pos, IAllele allele0, IAllele allele1, IGenome genome0, IGenome genome1) { DayMonth now = new DayMonth(); // If we are equal to start day, return 1. diff --git a/src/main/java/forestry/core/gui/ContainerLiquidTanks.java b/src/main/java/forestry/core/gui/ContainerLiquidTanks.java index bea550ff7..947851586 100755 --- a/src/main/java/forestry/core/gui/ContainerLiquidTanks.java +++ b/src/main/java/forestry/core/gui/ContainerLiquidTanks.java @@ -45,11 +45,11 @@ public abstract class ContainerLiquidTanks extends GuiContainer implements INEIGuiHandler { +public abstract class GuiForestry extends GuiContainer /*implements INEIGuiHandler*/ { protected final I inventory; protected final C container; @@ -142,19 +137,19 @@ public abstract class GuiForestry ext } @Override - protected void mouseClicked(int xPos, int yPos, int mouseButton) { + protected void mouseClicked(int xPos, int yPos, int mouseButton) throws IOException { super.mouseClicked(xPos, yPos, mouseButton); // / Handle ledger clicks ledgerManager.handleMouseClicked(xPos, yPos, mouseButton); widgetManager.handleMouseClicked(xPos, yPos, mouseButton); } - + @Override - protected void mouseMovedOrUp(int mouseX, int mouseY, int eventType) { - super.mouseMovedOrUp(mouseX, mouseY, eventType); - - widgetManager.handleMouseRelease(mouseX, mouseY, eventType); + protected void mouseReleased(int mouseX, int mouseY, int state) { + super.mouseReleased(mouseX, mouseY, state); + + widgetManager.handleMouseRelease(mouseX, mouseY, state); } @Override @@ -167,7 +162,7 @@ public abstract class GuiForestry ext protected Slot getSlotAtPosition(int par1, int par2) { for (int k = 0; k < this.inventorySlots.inventorySlots.size(); ++k) { - Slot slot = (Slot) this.inventorySlots.inventorySlots.get(k); + Slot slot = this.inventorySlots.inventorySlots.get(k); if (isMouseOverSlot(slot, par1, par2)) { return slot; @@ -178,7 +173,7 @@ public abstract class GuiForestry ext } private boolean isMouseOverSlot(Slot par1Slot, int par2, int par3) { - return this.func_146978_c(par1Slot.xDisplayPosition, par1Slot.yDisplayPosition, 16, 16, par2, par3); + return isPointInRegion(par1Slot.xDisplayPosition, par1Slot.yDisplayPosition, 16, 16, par2, par3); } @Override @@ -250,7 +245,7 @@ public abstract class GuiForestry ext } public static RenderItem getItemRenderer() { - return itemRender; + return Proxies.common.getClientInstance().getRenderItem(); } public int getSizeX() { @@ -275,7 +270,7 @@ public abstract class GuiForestry ext } /* NEI */ - @Override + /*@Override @Optional.Method(modid = "NotEnoughItems") public VisiblityData modifyVisiblity(GuiContainer gui, VisiblityData currentVisibility) { return null; @@ -307,5 +302,5 @@ public abstract class GuiForestry ext } else { return false; } - } + }*/ } diff --git a/src/main/java/forestry/core/gui/GuiHandler.java b/src/main/java/forestry/core/gui/GuiHandler.java index 1ef367d6e..2bd31ed83 100644 --- a/src/main/java/forestry/core/gui/GuiHandler.java +++ b/src/main/java/forestry/core/gui/GuiHandler.java @@ -15,11 +15,9 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; - -import cpw.mods.fml.common.network.IGuiHandler; - +import net.minecraftforge.fml.common.network.IGuiHandler; import forestry.api.core.ForestryAPI; public class GuiHandler implements IGuiHandler { @@ -47,8 +45,8 @@ public class GuiHandler implements IGuiHandler { public static void openGui(EntityPlayer entityplayer, IGuiHandlerTile guiHandler, short data) { int guiData = encodeGuiData(guiHandler, data); - ChunkCoordinates coordinates = guiHandler.getCoordinates(); - entityplayer.openGui(ForestryAPI.instance, guiData, entityplayer.worldObj, coordinates.posX, coordinates.posY, coordinates.posZ); + BlockPos coordinates = guiHandler.getCoordinates(); + entityplayer.openGui(ForestryAPI.instance, guiData, entityplayer.worldObj, coordinates.getX(), coordinates.getY(), coordinates.getZ()); } private static int encodeGuiData(IGuiHandlerForestry guiHandler, short data) { @@ -72,6 +70,7 @@ public class GuiHandler implements IGuiHandler { return null; } short data = decodeGuiData(guiData); + BlockPos pos = new BlockPos(x, y, z); switch (guiId.getGuiType()) { case Item: { @@ -85,7 +84,7 @@ public class GuiHandler implements IGuiHandler { break; } case Tile: { - TileEntity tileEntity = world.getTileEntity(x, y, z); + TileEntity tileEntity = world.getTileEntity(pos); if (guiId.getGuiHandlerClass().isInstance(tileEntity)) { return ((IGuiHandlerTile) tileEntity).getGui(player, data); } @@ -109,6 +108,7 @@ public class GuiHandler implements IGuiHandler { return null; } short data = decodeGuiData(guiData); + BlockPos pos = new BlockPos(x, y, z); switch (guiId.getGuiType()) { case Item: { @@ -122,7 +122,7 @@ public class GuiHandler implements IGuiHandler { break; } case Tile: { - TileEntity tileEntity = world.getTileEntity(x, y, z); + TileEntity tileEntity = world.getTileEntity(pos); if (guiId.getGuiHandlerClass().isInstance(tileEntity)) { return ((IGuiHandlerTile) tileEntity).getContainer(player, data); } diff --git a/src/main/java/forestry/core/gui/GuiNaturalistInventory.java b/src/main/java/forestry/core/gui/GuiNaturalistInventory.java index 15a9c7471..d82da8f6c 100755 --- a/src/main/java/forestry/core/gui/GuiNaturalistInventory.java +++ b/src/main/java/forestry/core/gui/GuiNaturalistInventory.java @@ -10,6 +10,7 @@ ******************************************************************************/ package forestry.core.gui; +import java.io.IOException; import java.util.HashMap; import net.minecraft.client.gui.GuiButton; @@ -96,7 +97,7 @@ public class GuiNaturalistInventory extends GuiForestry 0) { diff --git a/src/main/java/forestry/core/gui/GuiTextBox.java b/src/main/java/forestry/core/gui/GuiTextBox.java index 6ca4e5dcd..ec265c21c 100755 --- a/src/main/java/forestry/core/gui/GuiTextBox.java +++ b/src/main/java/forestry/core/gui/GuiTextBox.java @@ -25,8 +25,8 @@ public class GuiTextBox extends GuiTextField { private int lineScroll = 0; private int maxLines = 0; - public GuiTextBox(FontRenderer fontRendererObj, int startX, int startY, int width, int height) { - super(fontRendererObj, startX, startY, width, height); + public GuiTextBox(int ID, FontRenderer fontRendererObj, int startX, int startY, int width, int height) { + super(ID, fontRendererObj, startX, startY, width, height); this.fontRendererObj = fontRendererObj; this.startX = startX; this.startY = startY; diff --git a/src/main/java/forestry/core/gui/GuiUtil.java b/src/main/java/forestry/core/gui/GuiUtil.java index 2c7970939..f354ba369 100644 --- a/src/main/java/forestry/core/gui/GuiUtil.java +++ b/src/main/java/forestry/core/gui/GuiUtil.java @@ -42,8 +42,8 @@ public class GuiUtil { if (font == null) { font = gui.getFontRenderer(); } - itemRender.renderItemAndEffectIntoGUI(font, gui.mc.getTextureManager(), stack, xPos, yPos); - itemRender.renderItemOverlayIntoGUI(font, gui.mc.getTextureManager(), stack, xPos, yPos); + itemRender.renderItemAndEffectIntoGUI(stack, xPos, yPos); + itemRender.renderItemOverlayIntoGUI(font, stack, xPos, yPos, ""); gui.setZLevel(0.0F); itemRender.zLevel = 0.0F; diff --git a/src/main/java/forestry/core/gui/buttons/GuiBetterButton.java b/src/main/java/forestry/core/gui/buttons/GuiBetterButton.java index 10e401a1f..a9b50405f 100755 --- a/src/main/java/forestry/core/gui/buttons/GuiBetterButton.java +++ b/src/main/java/forestry/core/gui/buttons/GuiBetterButton.java @@ -14,9 +14,8 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.GuiButton; import net.minecraft.util.ResourceLocation; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; import org.lwjgl.opengl.GL11; @@ -50,7 +49,7 @@ public class GuiBetterButton extends GuiButton implements IToolTipProvider { return this; } - public GuiBetterButton setWidth(int width) { + public GuiBetterButton setGuiWidth(int width) { this.width = width; useTexWidth = false; return this; @@ -92,7 +91,7 @@ public class GuiBetterButton extends GuiButton implements IToolTipProvider { if (!visible) { return; } - FontRenderer fontrenderer = minecraft.fontRenderer; + FontRenderer fontrenderer = minecraft.fontRendererObj; bindButtonTextures(minecraft); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); int xOffset = texture.getX(); diff --git a/src/main/java/forestry/core/gui/ledgers/ClimateLedger.java b/src/main/java/forestry/core/gui/ledgers/ClimateLedger.java index 3a034816f..3dd5824fe 100644 --- a/src/main/java/forestry/core/gui/ledgers/ClimateLedger.java +++ b/src/main/java/forestry/core/gui/ledgers/ClimateLedger.java @@ -37,7 +37,7 @@ public class ClimateLedger extends Ledger { drawBackground(x, y); // Draw icon - drawIcon(temperature.getIcon(), x + 3, y + 4); + drawSprite(temperature.getIcon(), x + 3, y + 4); if (!isFullyOpened()) { return; diff --git a/src/main/java/forestry/core/gui/ledgers/ErrorLedger.java b/src/main/java/forestry/core/gui/ledgers/ErrorLedger.java index ef5b94b8d..49dab677a 100644 --- a/src/main/java/forestry/core/gui/ledgers/ErrorLedger.java +++ b/src/main/java/forestry/core/gui/ledgers/ErrorLedger.java @@ -50,8 +50,8 @@ public class ErrorLedger extends Ledger { int xBody = x + 14; int xHeader = x + 24; - // Draw icon - drawIcon(state.getIcon(), xIcon, y); + // Draw sprite + drawSprite(state.getSprite(), xIcon, y); y += 4; // Write description if fully opened diff --git a/src/main/java/forestry/core/gui/ledgers/HintLedger.java b/src/main/java/forestry/core/gui/ledgers/HintLedger.java index d10978e8c..909601aee 100644 --- a/src/main/java/forestry/core/gui/ledgers/HintLedger.java +++ b/src/main/java/forestry/core/gui/ledgers/HintLedger.java @@ -36,7 +36,7 @@ public class HintLedger extends Ledger { hintTooltip = StringUtil.localize("hints." + hint + ".tag"); Minecraft minecraft = Proxies.common.getClientInstance(); - FontRenderer fontRenderer = minecraft.fontRenderer; + FontRenderer fontRenderer = minecraft.fontRendererObj; int lineCount = fontRenderer.listFormattedStringToWidth(hintString, maxTextWidth).size(); maxHeight = (lineCount + 1) * fontRenderer.FONT_HEIGHT + 20; } @@ -48,7 +48,7 @@ public class HintLedger extends Ledger { drawBackground(x, y); // Draw icon - drawIcon(TextureManager.getInstance().getDefault("misc/hint"), x + 3, y + 4); + drawSprite(TextureManager.getInstance().getDefault("misc/hint"), x + 3, y + 4); if (!isFullyOpened()) { return; diff --git a/src/main/java/forestry/core/gui/ledgers/Ledger.java b/src/main/java/forestry/core/gui/ledgers/Ledger.java index e645881db..7ba09772e 100644 --- a/src/main/java/forestry/core/gui/ledgers/Ledger.java +++ b/src/main/java/forestry/core/gui/ledgers/Ledger.java @@ -13,7 +13,8 @@ package forestry.core.gui.ledgers; import java.util.List; import net.minecraft.client.Minecraft; -import net.minecraft.util.IIcon; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; @@ -23,7 +24,6 @@ import forestry.core.config.Constants; import forestry.core.config.SessionVars; import forestry.core.proxy.Proxies; import forestry.core.render.ForestryResource; -import forestry.core.render.SpriteSheet; /** * Side ledger for guis @@ -196,11 +196,11 @@ public abstract class Ledger { GL11.glColor4f(1.0f, 1.0f, 1.0f, 1.0F); } - protected void drawIcon(IIcon icon, int x, int y) { - if (icon != null) { + protected void drawSprite(TextureAtlasSprite sprite, int x, int y) { + if (sprite != null) { GL11.glColor4f(1.0f, 1.0f, 1.0f, 1.0F); - Proxies.render.bindTexture(SpriteSheet.ITEMS); - manager.gui.drawTexturedModelRectFromIcon(x, y, icon, 16, 16); + Proxies.render.bindTexture(TextureMap.locationBlocksTexture); + manager.gui.drawTexturedModalRect(x, y, sprite, 16, 16); } } @@ -223,11 +223,11 @@ public abstract class Ledger { protected int drawSplitText(String string, int x, int y, int width, int color, boolean shadow) { int originalY = y; Minecraft minecraft = Proxies.common.getClientInstance(); - List strings = minecraft.fontRenderer.listFormattedStringToWidth(string, width); + List strings = minecraft.fontRendererObj.listFormattedStringToWidth(string, width); for (Object obj : strings) { if (obj instanceof String) { - minecraft.fontRenderer.drawString((String) obj, x, y, color, shadow); - y += minecraft.fontRenderer.FONT_HEIGHT; + minecraft.fontRendererObj.drawString((String) obj, x, y, color, shadow); + y += minecraft.fontRendererObj.FONT_HEIGHT; } } return y - originalY; @@ -235,7 +235,7 @@ public abstract class Ledger { protected int drawText(String string, int x, int y) { Minecraft minecraft = Proxies.common.getClientInstance(); - minecraft.fontRenderer.drawString(string, x, y, fontColorText); - return minecraft.fontRenderer.FONT_HEIGHT; + minecraft.fontRendererObj.drawString(string, x, y, fontColorText); + return minecraft.fontRendererObj.FONT_HEIGHT; } } diff --git a/src/main/java/forestry/core/gui/ledgers/OwnerLedger.java b/src/main/java/forestry/core/gui/ledgers/OwnerLedger.java index b2b8ba0f9..94e949122 100644 --- a/src/main/java/forestry/core/gui/ledgers/OwnerLedger.java +++ b/src/main/java/forestry/core/gui/ledgers/OwnerLedger.java @@ -13,9 +13,8 @@ package forestry.core.gui.ledgers; import java.util.Locale; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.IIcon; - import com.mojang.authlib.GameProfile; import forestry.core.access.EnumAccess; @@ -62,8 +61,8 @@ public class OwnerLedger extends Ledger implements IAccessOwnerListener { // Draw icon EnumAccess accessType = accessHandler.getAccess(); - IIcon accessIcon = TextureManager.getInstance().getDefault("misc/access." + accessType.toString().toLowerCase(Locale.ENGLISH)); - drawIcon(accessIcon, x + 3, y + 4); + TextureAtlasSprite accessIcon = TextureManager.getInstance().getDefault("misc/access." + accessType.toString().toLowerCase(Locale.ENGLISH)); + drawSprite(accessIcon, x + 3, y + 4); // Draw description if (!isFullyOpened()) { @@ -79,7 +78,7 @@ public class OwnerLedger extends Ledger implements IAccessOwnerListener { if (playerIsOwner) { drawSubheader(StringUtil.localize("gui.access") + ':', x + 22, y + 32); // Access rules - drawIcon(accessIcon, x + 20, y + 40); + drawSprite(accessIcon, x + 20, y + 40); drawText(StringUtil.localize(accessType.getName()), x + 38, y + 44); } } diff --git a/src/main/java/forestry/core/gui/ledgers/PowerLedger.java b/src/main/java/forestry/core/gui/ledgers/PowerLedger.java index b6f1a13ef..5fabb5689 100644 --- a/src/main/java/forestry/core/gui/ledgers/PowerLedger.java +++ b/src/main/java/forestry/core/gui/ledgers/PowerLedger.java @@ -31,7 +31,7 @@ public class PowerLedger extends Ledger { drawBackground(x, y); // Draw icon - drawIcon(TextureManager.getInstance().getDefault("misc/energy"), x + 3, y + 4); + drawSprite(TextureManager.getInstance().getDefault("misc/energy"), x + 3, y + 4); if (!isFullyOpened()) { return; diff --git a/src/main/java/forestry/core/gui/slots/SlotCrafter.java b/src/main/java/forestry/core/gui/slots/SlotCrafter.java index 512d42aa5..a4457ada5 100755 --- a/src/main/java/forestry/core/gui/slots/SlotCrafter.java +++ b/src/main/java/forestry/core/gui/slots/SlotCrafter.java @@ -11,24 +11,125 @@ package forestry.core.gui.slots; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.SlotCrafting; +import net.minecraft.inventory.Slot; +import net.minecraft.item.Item; +import net.minecraft.item.ItemHoe; +import net.minecraft.item.ItemPickaxe; import net.minecraft.item.ItemStack; - -import cpw.mods.fml.common.FMLCommonHandler; - +import net.minecraft.item.ItemSword; +import net.minecraft.stats.AchievementList; +import net.minecraftforge.fml.common.FMLCommonHandler; import forestry.factory.tiles.ICrafterWorktable; -public class SlotCrafter extends SlotCrafting { +public class SlotCrafter extends Slot { + /** The craft matrix inventory linked to this result slot. */ private final IInventory craftMatrix; private final ICrafterWorktable crafter; + + /** The player that is using the GUI where this slot resides. */ + private final EntityPlayer thePlayer; + /** The number of items that have been crafted so far. Gets passed to ItemStack.onCrafting before being reset. */ + private int amountCrafted; public SlotCrafter(EntityPlayer player, IInventory craftMatrix, ICrafterWorktable crafter, int slot, int xPos, int yPos) { - super(player, craftMatrix, craftMatrix, slot, xPos, yPos); + super(craftMatrix, slot, xPos, yPos); this.craftMatrix = craftMatrix; this.crafter = crafter; + this.thePlayer = player; } + + /** + * Check if the stack is a valid item for this slot. Always true beside for the armor slots. + */ + @Override + public boolean isItemValid(ItemStack stack) + { + return false; + } + + /** + * the itemStack passed in is the output - ie, iron ingots, and pickaxes, not ore and wood. Typically increases an + * internal count then calls onCrafting(item). + */ + @Override + protected void onCrafting(ItemStack stack, int amount) + { + this.amountCrafted += amount; + this.onCrafting(stack); + } + + /** + * the itemStack passed in is the output - ie, iron ingots, and pickaxes, not ore and wood. + */ + @Override + protected void onCrafting(ItemStack stack) + { + if (this.amountCrafted > 0) + { + stack.onCrafting(this.thePlayer.worldObj, this.thePlayer, this.amountCrafted); + } + + this.amountCrafted = 0; + + if (stack.getItem() == Item.getItemFromBlock(Blocks.crafting_table)) + { + this.thePlayer.triggerAchievement(AchievementList.buildWorkBench); + } + + if (stack.getItem() instanceof ItemPickaxe) + { + this.thePlayer.triggerAchievement(AchievementList.buildPickaxe); + } + + if (stack.getItem() == Item.getItemFromBlock(Blocks.furnace)) + { + this.thePlayer.triggerAchievement(AchievementList.buildFurnace); + } + + if (stack.getItem() instanceof ItemHoe) + { + this.thePlayer.triggerAchievement(AchievementList.buildHoe); + } + + if (stack.getItem() == Items.bread) + { + this.thePlayer.triggerAchievement(AchievementList.makeBread); + } + + if (stack.getItem() == Items.cake) + { + this.thePlayer.triggerAchievement(AchievementList.bakeCake); + } + + if (stack.getItem() instanceof ItemPickaxe && ((ItemPickaxe)stack.getItem()).getToolMaterial() != Item.ToolMaterial.WOOD) + { + this.thePlayer.triggerAchievement(AchievementList.buildBetterPickaxe); + } + + if (stack.getItem() instanceof ItemSword) + { + this.thePlayer.triggerAchievement(AchievementList.buildSword); + } + + if (stack.getItem() == Item.getItemFromBlock(Blocks.enchanting_table)) + { + this.thePlayer.triggerAchievement(AchievementList.enchantments); + } + + if (stack.getItem() == Item.getItemFromBlock(Blocks.bookshelf)) + { + this.thePlayer.triggerAchievement(AchievementList.bookcase); + } + + if (stack.getItem() == Items.golden_apple && stack.getMetadata() == 1) + { + this.thePlayer.triggerAchievement(AchievementList.overpowered); + } + } @Override public ItemStack decrStackSize(int amount) { diff --git a/src/main/java/forestry/core/gui/slots/SlotFiltered.java b/src/main/java/forestry/core/gui/slots/SlotFiltered.java index b400ddc16..d229faba0 100644 --- a/src/main/java/forestry/core/gui/slots/SlotFiltered.java +++ b/src/main/java/forestry/core/gui/slots/SlotFiltered.java @@ -10,13 +10,11 @@ ******************************************************************************/ package forestry.core.gui.slots; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import forestry.core.render.TextureManager; import forestry.core.tiles.IFilterSlotDelegate; @@ -51,7 +49,7 @@ public class SlotFiltered extends SlotWatched { @SideOnly(Side.CLIENT) @Override - public IIcon getBackgroundIconIndex() { + public TextureAtlasSprite getBackgroundSprite() { ItemStack stack = getStack(); if (!isItemValid(stack)) { return TextureManager.getInstance().getDefault(blockedTexture); diff --git a/src/main/java/forestry/core/gui/slots/SlotOutput.java b/src/main/java/forestry/core/gui/slots/SlotOutput.java index d01078592..ca6d59e56 100755 --- a/src/main/java/forestry/core/gui/slots/SlotOutput.java +++ b/src/main/java/forestry/core/gui/slots/SlotOutput.java @@ -10,12 +10,11 @@ ******************************************************************************/ package forestry.core.gui.slots; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; /** * @author CovertJaguar @@ -33,7 +32,7 @@ public class SlotOutput extends SlotWatched { @SideOnly(Side.CLIENT) @Override - public IIcon getBackgroundIconIndex() { + public TextureAtlasSprite getBackgroundSprite() { return null; } } diff --git a/src/main/java/forestry/core/gui/tooltips/ToolTipLine.java b/src/main/java/forestry/core/gui/tooltips/ToolTipLine.java index 2ea687d09..8c60e85c4 100755 --- a/src/main/java/forestry/core/gui/tooltips/ToolTipLine.java +++ b/src/main/java/forestry/core/gui/tooltips/ToolTipLine.java @@ -39,6 +39,7 @@ public class ToolTipLine { return spacing; } + @Override public String toString() { if (color == null) { return text; diff --git a/src/main/java/forestry/core/gui/widgets/GameTokenWidget.java b/src/main/java/forestry/core/gui/widgets/GameTokenWidget.java index c0c235301..551598184 100644 --- a/src/main/java/forestry/core/gui/widgets/GameTokenWidget.java +++ b/src/main/java/forestry/core/gui/widgets/GameTokenWidget.java @@ -11,17 +11,16 @@ package forestry.core.gui.widgets; import net.minecraft.client.renderer.RenderHelper; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; - import org.lwjgl.opengl.GL11; import forestry.core.gui.GuiUtil; import forestry.core.network.packets.PacketGuiSelectRequest; import forestry.core.proxy.Proxies; -import forestry.core.render.SpriteSheet; import forestry.core.render.TextureManager; import forestry.core.tiles.EscritoireGame; import forestry.core.tiles.EscritoireGameToken; @@ -72,9 +71,9 @@ public class GameTokenWidget extends Widget { manager.gui.setZLevel(150f); for (String ident : getToken().getOverlayIcons()) { RenderHelper.enableGUIStandardItemLighting(); - Proxies.render.bindTexture(SpriteSheet.ITEMS); - IIcon icon = TextureManager.getInstance().getDefault(ident); - manager.gui.drawTexturedModelRectFromIcon(startX + xPos + 3, startY + yPos + 3, icon, 16, 16); + Proxies.render.bindTexture(TextureMap.locationBlocksTexture); + TextureAtlasSprite icon = TextureManager.getInstance().getDefault(ident); + manager.gui.drawTexturedModalRect(startX + xPos + 3, startY + yPos + 3, icon, 16, 16); RenderHelper.disableStandardItemLighting(); } manager.gui.setZLevel(0f); diff --git a/src/main/java/forestry/core/gui/widgets/SocketWidget.java b/src/main/java/forestry/core/gui/widgets/SocketWidget.java index dede50d54..eebed35a7 100755 --- a/src/main/java/forestry/core/gui/widgets/SocketWidget.java +++ b/src/main/java/forestry/core/gui/widgets/SocketWidget.java @@ -40,7 +40,7 @@ public class SocketWidget extends Widget { public void draw(int startX, int startY) { ItemStack socketStack = tile.getSocket(slot); if (socketStack != null) { - GuiForestry.getItemRenderer().renderItemIntoGUI(manager.minecraft.fontRenderer, manager.minecraft.renderEngine, socketStack, startX + xPos, startY + yPos); + GuiForestry.getItemRenderer().renderItemIntoGUI(socketStack, startX + xPos, startY + yPos); } } diff --git a/src/main/java/forestry/core/gui/widgets/TankWidget.java b/src/main/java/forestry/core/gui/widgets/TankWidget.java index c45a39fad..85d97240f 100755 --- a/src/main/java/forestry/core/gui/widgets/TankWidget.java +++ b/src/main/java/forestry/core/gui/widgets/TankWidget.java @@ -14,8 +14,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; - import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidTank; @@ -26,7 +24,6 @@ import forestry.core.fluids.tanks.StandardTank; import forestry.core.gui.IContainerLiquidTanks; import forestry.core.gui.tooltips.ToolTip; import forestry.core.proxy.Proxies; -import forestry.core.render.SpriteSheet; import forestry.farming.gui.ContainerFarm; /** @@ -72,18 +69,17 @@ public class TankWidget extends Widget { if (contents == null || contents.amount <= 0 || contents.getFluid() == null) { return; } - - IIcon liquidIcon = contents.getFluid().getIcon(contents); - if (liquidIcon == null) { + + if (contents.getFluid().getStill() == null) { return; } + Proxies.render.bindTexture(contents.getFluid().getStill()); int scaledLiquid = (contents.amount * height) / tank.getCapacity(); if (scaledLiquid > height) { scaledLiquid = height; } - Proxies.render.bindTexture(SpriteSheet.BLOCKS); GL11.glPushAttrib(GL11.GL_ENABLE_BIT); { GL11.glDisable(GL11.GL_LIGHTING); @@ -101,7 +97,7 @@ public class TankWidget extends Widget { scaledLiquid = 0; } - manager.gui.drawTexturedModelRectFromIcon(startX + xPos, startY + yPos + height - x - start, liquidIcon, 16, x); + manager.gui.drawTexturedModalRect(startX + xPos, startY + yPos + height - x - start, 0, 0, 16, 16 - (16 - x)); start += 16; } diff --git a/src/main/java/forestry/core/inventory/AdjacentInventoryCache.java b/src/main/java/forestry/core/inventory/AdjacentInventoryCache.java index 98d49d716..092ad8a5a 100644 --- a/src/main/java/forestry/core/inventory/AdjacentInventoryCache.java +++ b/src/main/java/forestry/core/inventory/AdjacentInventoryCache.java @@ -19,9 +19,7 @@ import java.util.List; import net.minecraft.inventory.IInventory; import net.minecraft.tileentity.TileEntity; - -import net.minecraftforge.common.util.ForgeDirection; - +import net.minecraft.util.EnumFacing; import forestry.core.tiles.AdjacentTileCache; import forestry.core.tiles.TileUtil; @@ -56,7 +54,7 @@ public final class AdjacentInventoryCache implements AdjacentTileCache.ICacheLis cache.addListener(this); } - public IInventory getAdjacentInventory(ForgeDirection side) { + public IInventory getAdjacentInventory(EnumFacing side) { checkChanged(); return sides[side.ordinal()]; } @@ -82,7 +80,7 @@ public final class AdjacentInventoryCache implements AdjacentTileCache.ICacheLis if (changed) { changed = false; purge(); - for (ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) { + for (EnumFacing side : EnumFacing.values()) { TileEntity tile = cache.getTileOnSide(side); if (tile != null && (filter == null || filter.matches(tile))) { IInventory inv = TileUtil.getInventoryFromTile(tile, side.getOpposite()); diff --git a/src/main/java/forestry/core/inventory/FakeInventoryAdapter.java b/src/main/java/forestry/core/inventory/FakeInventoryAdapter.java index 842fdef40..f19af3304 100644 --- a/src/main/java/forestry/core/inventory/FakeInventoryAdapter.java +++ b/src/main/java/forestry/core/inventory/FakeInventoryAdapter.java @@ -13,7 +13,8 @@ package forestry.core.inventory; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; - +import net.minecraft.util.EnumFacing; +import net.minecraft.util.IChatComponent; import forestry.core.config.Constants; public class FakeInventoryAdapter implements IInventoryAdapter { @@ -40,19 +41,19 @@ public class FakeInventoryAdapter implements IInventoryAdapter { public boolean isLocked(int slotIndex) { return false; } - + @Override - public int[] getAccessibleSlotsFromSide(int p_94128_1_) { + public int[] getSlotsForFace(EnumFacing side) { return Constants.SLOTS_NONE; } - + @Override - public boolean canInsertItem(int p_102007_1_, ItemStack p_102007_2_, int p_102007_3_) { + public boolean canExtractItem(int index, ItemStack stack, EnumFacing direction) { return false; } - + @Override - public boolean canExtractItem(int p_102008_1_, ItemStack p_102008_2_, int p_102008_3_) { + public boolean canInsertItem(int index, ItemStack itemStackIn, EnumFacing direction) { return false; } @@ -70,9 +71,9 @@ public class FakeInventoryAdapter implements IInventoryAdapter { public ItemStack decrStackSize(int p_70298_1_, int p_70298_2_) { return null; } - + @Override - public ItemStack getStackInSlotOnClosing(int p_70304_1_) { + public ItemStack removeStackFromSlot(int index) { return null; } @@ -80,14 +81,19 @@ public class FakeInventoryAdapter implements IInventoryAdapter { public void setInventorySlotContents(int p_70299_1_, ItemStack p_70299_2_) { } - + @Override - public String getInventoryName() { + public IChatComponent getDisplayName() { return null; } - + @Override - public boolean hasCustomInventoryName() { + public String getName() { + return null; + } + + @Override + public boolean hasCustomName() { return false; } @@ -102,17 +108,17 @@ public class FakeInventoryAdapter implements IInventoryAdapter { } @Override - public boolean isUseableByPlayer(EntityPlayer p_70300_1_) { + public boolean isUseableByPlayer(EntityPlayer player) { return false; } @Override - public void openInventory() { + public void openInventory(EntityPlayer player) { } @Override - public void closeInventory() { + public void closeInventory(EntityPlayer player) { } @@ -131,4 +137,22 @@ public class FakeInventoryAdapter implements IInventoryAdapter { } + @Override + public int getField(int id) { + return 0; + } + + @Override + public void setField(int id, int value) { + } + + @Override + public int getFieldCount() { + return 0; + } + + @Override + public void clear() { + } + } diff --git a/src/main/java/forestry/core/inventory/InventoryAdapter.java b/src/main/java/forestry/core/inventory/InventoryAdapter.java index e40354391..b0b3ff7da 100755 --- a/src/main/java/forestry/core/inventory/InventoryAdapter.java +++ b/src/main/java/forestry/core/inventory/InventoryAdapter.java @@ -16,7 +16,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; - +import net.minecraft.util.EnumFacing; +import net.minecraft.util.IChatComponent; import forestry.core.config.Constants; import forestry.core.network.DataInputStreamForestry; import forestry.core.network.DataOutputStreamForestry; @@ -60,7 +61,7 @@ public class InventoryAdapter implements IInventoryAdapter, IStreamable { * @return Copy of this inventory. Stacks are copies. */ public InventoryAdapter copy() { - InventoryAdapter copy = new InventoryAdapter(inventory.getSizeInventory(), inventory.getInventoryName(), inventory.getInventoryStackLimit()); + InventoryAdapter copy = new InventoryAdapter(inventory.getSizeInventory(), inventory.getName(), inventory.getInventoryStackLimit()); for (int i = 0; i < inventory.getSizeInventory(); i++) { if (inventory.getStackInSlot(i) != null) { @@ -94,8 +95,8 @@ public class InventoryAdapter implements IInventoryAdapter, IStreamable { } @Override - public String getInventoryName() { - return inventory.getInventoryName(); + public String getName() { + return inventory.getName(); } @Override @@ -107,20 +108,25 @@ public class InventoryAdapter implements IInventoryAdapter, IStreamable { public void markDirty() { inventory.markDirty(); } - + @Override - public ItemStack getStackInSlotOnClosing(int slotIndex) { - return inventory.getStackInSlotOnClosing(slotIndex); + public ItemStack removeStackFromSlot(int slotIndex) { + return inventory.removeStackFromSlot(slotIndex); } @Override public boolean isUseableByPlayer(EntityPlayer entityplayer) { return true; } - + @Override - public boolean hasCustomInventoryName() { - return true; + public boolean hasCustomName() { + return false; + } + + @Override + public IChatComponent getDisplayName() { + return null; } @Override @@ -139,20 +145,20 @@ public class InventoryAdapter implements IInventoryAdapter, IStreamable { } @Override - public void openInventory() { + public void openInventory(EntityPlayer player) { } @Override - public void closeInventory() { + public void closeInventory(EntityPlayer player) { } /* ISIDEDINVENTORY */ private int[][] slotMap; - + @Override - public int[] getAccessibleSlotsFromSide(int side) { + public int[] getSlotsForFace(EnumFacing side) { if (allowAutomation) { - return slotMap[side]; + return slotMap[side.ordinal()]; } return Constants.SLOTS_NONE; } @@ -172,12 +178,12 @@ public class InventoryAdapter implements IInventoryAdapter, IStreamable { } @Override - public boolean canInsertItem(int slot, ItemStack stack, int side) { + public boolean canInsertItem(int slot, ItemStack stack, EnumFacing side) { return isItemValidForSlot(slot, stack); } @Override - public boolean canExtractItem(int slot, ItemStack stack, int side) { + public boolean canExtractItem(int slot, ItemStack stack, EnumFacing side) { return false; } @@ -201,4 +207,23 @@ public class InventoryAdapter implements IInventoryAdapter, IStreamable { public void readData(DataInputStreamForestry data) throws IOException { data.readInventory(inventory); } + + /* FIELDS */ + @Override + public int getField(int id) { + return 0; + } + + @Override + public int getFieldCount() { + return 0; + } + + @Override + public void setField(int id, int value) { + } + + @Override + public void clear() { + } } diff --git a/src/main/java/forestry/core/inventory/InventoryAdapterRestricted.java b/src/main/java/forestry/core/inventory/InventoryAdapterRestricted.java index 082879831..32cb06f19 100644 --- a/src/main/java/forestry/core/inventory/InventoryAdapterRestricted.java +++ b/src/main/java/forestry/core/inventory/InventoryAdapterRestricted.java @@ -12,7 +12,7 @@ package forestry.core.inventory; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; - +import net.minecraft.util.EnumFacing; import forestry.core.access.IAccessHandler; import forestry.core.config.Constants; @@ -42,17 +42,17 @@ public class InventoryAdapterRestricted extends InventoryAdapter { return canSlotAccept(slotIndex, itemStack); } - + @Override - public int[] getAccessibleSlotsFromSide(int side) { + public int[] getSlotsForFace(EnumFacing side) { if (!accessHandler.allowsPipeConnections()) { return Constants.SLOTS_NONE; } - return super.getAccessibleSlotsFromSide(side); + return super.getSlotsForFace(side); } @Override - public final boolean canInsertItem(int slotIndex, ItemStack itemStack, int side) { + public final boolean canInsertItem(int slotIndex, ItemStack itemStack, EnumFacing side) { if (itemStack == null || !accessHandler.allowsPipeConnections()) { return false; } @@ -60,7 +60,7 @@ public class InventoryAdapterRestricted extends InventoryAdapter { } @Override - public boolean canExtractItem(int slotIndex, ItemStack itemStack, int side) { + public boolean canExtractItem(int slotIndex, ItemStack itemStack, EnumFacing side) { return itemStack != null && accessHandler.allowsPipeConnections(); } } diff --git a/src/main/java/forestry/core/inventory/InventoryAdapterTile.java b/src/main/java/forestry/core/inventory/InventoryAdapterTile.java index c63a62934..999dc336e 100644 --- a/src/main/java/forestry/core/inventory/InventoryAdapterTile.java +++ b/src/main/java/forestry/core/inventory/InventoryAdapterTile.java @@ -12,7 +12,7 @@ package forestry.core.inventory; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; - +import net.minecraft.util.EnumFacing; import forestry.core.access.IRestrictedAccess; public class InventoryAdapterTile extends InventoryAdapterRestricted { @@ -35,7 +35,7 @@ public class InventoryAdapterTile exte } @Override - public boolean canExtractItem(int slotIndex, ItemStack stack, int side) { + public boolean canExtractItem(int slotIndex, ItemStack stack, EnumFacing side) { return false; } } diff --git a/src/main/java/forestry/core/inventory/InventoryAnalyzer.java b/src/main/java/forestry/core/inventory/InventoryAnalyzer.java index 44d73d33c..0834754cf 100644 --- a/src/main/java/forestry/core/inventory/InventoryAnalyzer.java +++ b/src/main/java/forestry/core/inventory/InventoryAnalyzer.java @@ -11,7 +11,7 @@ package forestry.core.inventory; import net.minecraft.item.ItemStack; - +import net.minecraft.util.EnumFacing; import net.minecraftforge.fluids.Fluid; import forestry.api.arboriculture.TreeManager; @@ -47,7 +47,7 @@ public class InventoryAnalyzer extends InventoryAdapterTile { } @Override - public boolean canExtractItem(int slotIndex, ItemStack stack, int side) { + public boolean canExtractItem(int slotIndex, ItemStack stack, EnumFacing side) { return SlotUtil.isSlotInRange(slotIndex, SLOT_OUTPUT_1, SLOT_OUTPUT_COUNT); } diff --git a/src/main/java/forestry/core/inventory/InventoryEscritoire.java b/src/main/java/forestry/core/inventory/InventoryEscritoire.java index 59357c05e..ee90d5b68 100644 --- a/src/main/java/forestry/core/inventory/InventoryEscritoire.java +++ b/src/main/java/forestry/core/inventory/InventoryEscritoire.java @@ -11,7 +11,7 @@ package forestry.core.inventory; import net.minecraft.item.ItemStack; - +import net.minecraft.util.EnumFacing; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IIndividual; import forestry.core.tiles.TileEscritoire; @@ -67,7 +67,7 @@ public class InventoryEscritoire extends InventoryAdapterTile { } @Override - public boolean canExtractItem(int slotIndex, ItemStack itemstack, int side) { + public boolean canExtractItem(int slotIndex, ItemStack itemstack, EnumFacing side) { return SlotUtil.isSlotInRange(slotIndex, SLOT_RESULTS_1, SLOTS_RESULTS_COUNT); } diff --git a/src/main/java/forestry/core/inventory/InventoryNaturalistChest.java b/src/main/java/forestry/core/inventory/InventoryNaturalistChest.java index 9f0073bb9..3c2002641 100644 --- a/src/main/java/forestry/core/inventory/InventoryNaturalistChest.java +++ b/src/main/java/forestry/core/inventory/InventoryNaturalistChest.java @@ -11,7 +11,7 @@ package forestry.core.inventory; import net.minecraft.item.ItemStack; - +import net.minecraft.util.EnumFacing; import forestry.api.genetics.ISpeciesRoot; import forestry.core.tiles.TileNaturalistChest; @@ -29,7 +29,7 @@ public class InventoryNaturalistChest extends InventoryAdapterTile @@ -74,9 +75,14 @@ public class ChestWrapper implements IInventory { * Returns the name of the inventory. */ @Override - public String getInventoryName() { + public String getName() { return ""; } + + @Override + public IChatComponent getDisplayName() { + return null; + } /** * If this returns false, the inventory name will be used as an unlocalized @@ -84,7 +90,7 @@ public class ChestWrapper implements IInventory { * used directly. */ @Override - public boolean hasCustomInventoryName() { + public boolean hasCustomName() { return false; } @@ -119,12 +125,12 @@ public class ChestWrapper implements IInventory { * GUI. */ @Override - public ItemStack getStackInSlotOnClosing(int slot) { + public ItemStack removeStackFromSlot(int slot) { checkChest(); if (slot >= upperChest.getSizeInventory() && lowerChest != null) { - return lowerChest.getStackInSlotOnClosing(slot - upperChest.getSizeInventory()); + return lowerChest.removeStackFromSlot(slot - upperChest.getSizeInventory()); } - return upperChest.getStackInSlotOnClosing(slot); + return upperChest.removeStackFromSlot(slot); } /** @@ -171,18 +177,18 @@ public class ChestWrapper implements IInventory { } @Override - public void openInventory() { - this.upperChest.openInventory(); + public void openInventory(EntityPlayer player) { + this.upperChest.openInventory(player); if (lowerChest != null) { - lowerChest.openInventory(); + lowerChest.openInventory(player); } } @Override - public void closeInventory() { - this.upperChest.closeInventory(); + public void closeInventory(EntityPlayer player) { + this.upperChest.closeInventory(player); if (lowerChest != null) { - lowerChest.closeInventory(); + lowerChest.closeInventory(player); } } @@ -195,4 +201,22 @@ public class ChestWrapper implements IInventory { return true; } + @Override + public int getField(int id) { + return 0; + } + + @Override + public void setField(int id, int value) { + } + + @Override + public int getFieldCount() { + return 0; + } + + @Override + public void clear() { + } + } diff --git a/src/main/java/forestry/core/inventory/wrappers/InventoryCopy.java b/src/main/java/forestry/core/inventory/wrappers/InventoryCopy.java index 72282766a..17ac6f583 100755 --- a/src/main/java/forestry/core/inventory/wrappers/InventoryCopy.java +++ b/src/main/java/forestry/core/inventory/wrappers/InventoryCopy.java @@ -13,7 +13,7 @@ package forestry.core.inventory.wrappers; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; - +import net.minecraft.util.IChatComponent; import forestry.core.utils.InventoryUtil; /** @@ -75,8 +75,13 @@ public class InventoryCopy implements IInventory { } @Override - public String getInventoryName() { - return orignal.getInventoryName(); + public String getName() { + return orignal.getName(); + } + + @Override + public IChatComponent getDisplayName() { + return orignal.getDisplayName(); } @Override @@ -94,25 +99,43 @@ public class InventoryCopy implements IInventory { } @Override - public void openInventory() { + public void openInventory(EntityPlayer entityplayer) { } @Override - public void closeInventory() { + public void closeInventory(EntityPlayer entityplayer) { } - + @Override - public ItemStack getStackInSlotOnClosing(int slot) { - return orignal.getStackInSlotOnClosing(slot); + public ItemStack removeStackFromSlot(int slot) { + return orignal.removeStackFromSlot(slot); } - + @Override - public boolean hasCustomInventoryName() { - return orignal.hasCustomInventoryName(); + public boolean hasCustomName() { + return orignal.hasCustomName(); } @Override public boolean isItemValidForSlot(int slot, ItemStack stack) { return orignal.isItemValidForSlot(slot, stack); } + + @Override + public int getField(int id) { + return 0; + } + + @Override + public int getFieldCount() { + return 0; + } + + @Override + public void clear() { + } + + @Override + public void setField(int id, int value) { + } } diff --git a/src/main/java/forestry/core/inventory/wrappers/InventoryMapper.java b/src/main/java/forestry/core/inventory/wrappers/InventoryMapper.java index 8956af0e8..7c657b53e 100755 --- a/src/main/java/forestry/core/inventory/wrappers/InventoryMapper.java +++ b/src/main/java/forestry/core/inventory/wrappers/InventoryMapper.java @@ -13,8 +13,8 @@ package forestry.core.inventory.wrappers; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; - -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.IChatComponent; /** * Wrapper class used to specify part of an existing inventory to be treated as @@ -31,7 +31,7 @@ public class InventoryMapper implements IInventory { private int stackSizeLimit = -1; private boolean checkItems = true; - public InventoryMapper(IInventory inv, ForgeDirection side) { + public InventoryMapper(IInventory inv, EnumFacing side) { this(inv, getInventoryStart(inv, side), getInventorySize(inv, side)); } @@ -62,11 +62,11 @@ public class InventoryMapper implements IInventory { this.checkItems = checkItems; } - protected static int getInventorySize(IInventory inv, ForgeDirection side) { + protected static int getInventorySize(IInventory inv, EnumFacing side) { return inv.getSizeInventory(); } - protected static int getInventoryStart(IInventory inv, ForgeDirection side) { + protected static int getInventoryStart(IInventory inv, EnumFacing side) { return 0; } @@ -93,10 +93,15 @@ public class InventoryMapper implements IInventory { public void setInventorySlotContents(int slot, ItemStack itemstack) { inv.setInventorySlotContents(start + slot, itemstack); } - + @Override - public String getInventoryName() { - return inv.getInventoryName(); + public String getName() { + return inv.getName(); + } + + @Override + public IChatComponent getDisplayName() { + return inv.getDisplayName(); } public void setStackSizeLimit(int limit) { @@ -119,23 +124,23 @@ public class InventoryMapper implements IInventory { } @Override - public void openInventory() { - inv.openInventory(); + public void openInventory(EntityPlayer entityplayer) { + inv.openInventory(entityplayer); } @Override - public void closeInventory() { - inv.closeInventory(); + public void closeInventory(EntityPlayer entityplayer) { + inv.closeInventory(entityplayer); } - + @Override - public ItemStack getStackInSlotOnClosing(int slot) { - return inv.getStackInSlotOnClosing(start + slot); + public ItemStack removeStackFromSlot(int slot) { + return inv.removeStackFromSlot(start + slot); } - + @Override - public boolean hasCustomInventoryName() { - return inv.hasCustomInventoryName(); + public boolean hasCustomName() { + return inv.hasCustomName(); } @Override @@ -145,5 +150,25 @@ public class InventoryMapper implements IInventory { } return true; } + + @Override + public int getField(int id) { + return inv.getField(id); + } + + @Override + public int getFieldCount() { + return inv.getFieldCount(); + } + + @Override + public void clear() { + inv.clear(); + } + + @Override + public void setField(int id, int value) { + inv.setField(id, value); + } } diff --git a/src/main/java/forestry/core/inventory/wrappers/SidedInventoryIterator.java b/src/main/java/forestry/core/inventory/wrappers/SidedInventoryIterator.java index 71ca7007a..cd8694975 100755 --- a/src/main/java/forestry/core/inventory/wrappers/SidedInventoryIterator.java +++ b/src/main/java/forestry/core/inventory/wrappers/SidedInventoryIterator.java @@ -14,6 +14,7 @@ import java.util.Iterator; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumFacing; /** * @author CovertJaguar @@ -29,7 +30,7 @@ public class SidedInventoryIterator implements Iterable { @Override public Iterator iterator() { return new Iterator() { - final int[] slots = inv.getAccessibleSlotsFromSide(0); + final int[] slots = inv.getSlotsForFace(EnumFacing.DOWN); int index = 0; @Override @@ -70,12 +71,12 @@ public class SidedInventoryIterator implements Iterable { @Override public boolean canPutStackInSlot(ItemStack stack) { - return inv.canInsertItem(slot, stack, 0); + return inv.canInsertItem(slot, stack, EnumFacing.DOWN); } @Override public boolean canTakeStackFromSlot(ItemStack stack) { - return inv.canExtractItem(slot, stack, 0); + return inv.canExtractItem(slot, stack, EnumFacing.DOWN); } @Override diff --git a/src/main/java/forestry/core/inventory/wrappers/SidedInventoryMapper.java b/src/main/java/forestry/core/inventory/wrappers/SidedInventoryMapper.java index 1f9a525c9..78c191bc3 100755 --- a/src/main/java/forestry/core/inventory/wrappers/SidedInventoryMapper.java +++ b/src/main/java/forestry/core/inventory/wrappers/SidedInventoryMapper.java @@ -14,8 +14,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; - -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.IChatComponent; /** * Wrapper class used to bake the side variable into the object itself instead @@ -26,16 +26,16 @@ import net.minecraftforge.common.util.ForgeDirection; public class SidedInventoryMapper implements ISidedInventory { private final ISidedInventory inv; - private final int side; + private final EnumFacing side; private boolean checkItems = true; - public SidedInventoryMapper(ISidedInventory inv, ForgeDirection side) { + public SidedInventoryMapper(ISidedInventory inv, EnumFacing side) { this(inv, side, true); } - public SidedInventoryMapper(ISidedInventory inv, ForgeDirection side, boolean checkItems) { + public SidedInventoryMapper(ISidedInventory inv, EnumFacing side, boolean checkItems) { this.inv = inv; - this.side = side.ordinal(); + this.side = side; this.checkItems = checkItems; } @@ -62,10 +62,15 @@ public class SidedInventoryMapper implements ISidedInventory { public void setInventorySlotContents(int slot, ItemStack itemstack) { inv.setInventorySlotContents(slot, itemstack); } - + @Override - public String getInventoryName() { - return inv.getInventoryName(); + public String getName() { + return inv.getName(); + } + + @Override + public IChatComponent getDisplayName() { + return inv.getDisplayName(); } @Override @@ -84,23 +89,23 @@ public class SidedInventoryMapper implements ISidedInventory { } @Override - public void openInventory() { - inv.openInventory(); + public void openInventory(EntityPlayer entityplayer) { + inv.openInventory(entityplayer); } @Override - public void closeInventory() { - inv.closeInventory(); + public void closeInventory(EntityPlayer entityplayer) { + inv.closeInventory(entityplayer); } - + @Override - public ItemStack getStackInSlotOnClosing(int slot) { - return inv.getStackInSlotOnClosing(slot); + public ItemStack removeStackFromSlot(int index) { + return inv.removeStackFromSlot(index); } - + @Override - public boolean hasCustomInventoryName() { - return inv.hasCustomInventoryName(); + public boolean hasCustomName() { + return inv.hasCustomName(); } @Override @@ -109,18 +114,38 @@ public class SidedInventoryMapper implements ISidedInventory { } @Override - public int[] getAccessibleSlotsFromSide(int s) { - return inv.getAccessibleSlotsFromSide(side); + public int[] getSlotsForFace(EnumFacing side) { + return inv.getSlotsForFace(side); } - + @Override - public boolean canInsertItem(int slot, ItemStack stack, int s) { + public boolean canInsertItem(int slot, ItemStack stack, EnumFacing s) { return !checkItems || inv.canInsertItem(slot, stack, side); } @Override - public boolean canExtractItem(int slot, ItemStack stack, int s) { + public boolean canExtractItem(int slot, ItemStack stack, EnumFacing s) { return !checkItems || inv.canExtractItem(slot, stack, side); } + @Override + public int getField(int id) { + return inv.getField(id); + } + + @Override + public void setField(int id, int value) { + inv.setField(id, value); + } + + @Override + public int getFieldCount() { + return inv.getFieldCount(); + } + + @Override + public void clear() { + inv.clear(); + } + } diff --git a/src/main/java/forestry/core/items/ItemArmorNaturalist.java b/src/main/java/forestry/core/items/ItemArmorNaturalist.java index d849edb5e..bbce516c9 100755 --- a/src/main/java/forestry/core/items/ItemArmorNaturalist.java +++ b/src/main/java/forestry/core/items/ItemArmorNaturalist.java @@ -10,26 +10,23 @@ ******************************************************************************/ package forestry.core.items; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; import net.minecraft.item.ItemArmor; import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import forestry.api.core.IArmorNaturalist; +import forestry.api.core.IModelManager; +import forestry.api.core.IItemModelRegister; import forestry.core.CreativeTabForestry; import forestry.core.config.Constants; -import forestry.core.render.TextureManager; -import forestry.core.utils.StringUtil; -public class ItemArmorNaturalist extends ItemArmor implements IArmorNaturalist { +public class ItemArmorNaturalist extends ItemArmor implements IArmorNaturalist, IItemModelRegister { public ItemArmorNaturalist() { - super(ArmorMaterial.CLOTH, 0, 0); + super(ArmorMaterial.LEATHER, 0, 0); this.setMaxDamage(100); setCreativeTab(CreativeTabForestry.tabForestry); } @@ -41,19 +38,8 @@ public class ItemArmorNaturalist extends ItemArmor implements IArmorNaturalist { @SideOnly(Side.CLIENT) @Override - public void registerIcons(IIconRegister register) { - itemIcon = TextureManager.registerTex(register, StringUtil.cleanItemName(this)); - } - - @SideOnly(Side.CLIENT) - @Override - public IIcon getIconFromDamageForRenderPass(int par1, int par2) { - return itemIcon; - } - - @Override - public boolean requiresMultipleRenderPasses() { - return false; + public void registerModel(Item item, IModelManager manager) { + manager.registerItemModel(item, 0, true); } @Override diff --git a/src/main/java/forestry/core/items/ItemBlockForestry.java b/src/main/java/forestry/core/items/ItemBlockForestry.java index 2940ca1de..a6264a3fe 100644 --- a/src/main/java/forestry/core/items/ItemBlockForestry.java +++ b/src/main/java/forestry/core/items/ItemBlockForestry.java @@ -11,15 +11,14 @@ package forestry.core.items; import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.world.World; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - import forestry.core.tiles.TileForestry; import forestry.core.tiles.TileUtil; @@ -36,33 +35,21 @@ public class ItemBlockForestry extends ItemBlock { return i; } - protected Block getBlock() { - return field_150939_a; - } - - @SideOnly(Side.CLIENT) - @Override - public IIcon getIconFromDamage(int meta) { - return this.getBlock().getIcon(1, meta); - } - @Override public String getUnlocalizedName(ItemStack itemstack) { return getBlock().getUnlocalizedName() + "." + itemstack.getItemDamage(); } - + @Override - public boolean placeBlockAt(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ, int metadata) { - boolean placed = super.placeBlockAt(stack, player, world, x, y, z, side, hitX, hitY, hitZ, metadata); + public boolean placeBlockAt(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ, IBlockState newState) { + boolean placed = super.placeBlockAt(stack, player, world, pos, side, hitX, hitY, hitZ, newState); - TileForestry tile = TileUtil.getTile(world, x, y, z, TileForestry.class); + TileForestry tile = TileUtil.getTile(world, pos, TileForestry.class); if (tile != null) { if (stack.getItem() instanceof ItemBlockNBT && stack.hasTagCompound()) { tile.readFromNBT(stack.getTagCompound()); - tile.xCoord = x; - tile.yCoord = y; - tile.zCoord = z; + tile.setPos(pos); } tile.rotateAfterPlacement(player, side); diff --git a/src/main/java/forestry/core/items/ItemCraftingMaterial.java b/src/main/java/forestry/core/items/ItemCraftingMaterial.java index a1cba582e..58527d88d 100644 --- a/src/main/java/forestry/core/items/ItemCraftingMaterial.java +++ b/src/main/java/forestry/core/items/ItemCraftingMaterial.java @@ -12,16 +12,12 @@ package forestry.core.items; import java.util.List; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -import forestry.core.render.TextureManager; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +import forestry.api.core.IModelManager; public class ItemCraftingMaterial extends ItemForestry { @@ -52,27 +48,12 @@ public class ItemCraftingMaterial extends ItemForestry { } } - /* ICONS */ - @SideOnly(Side.CLIENT) - private IIcon[] icons; - + /* Models */ @SideOnly(Side.CLIENT) @Override - public void registerIcons(IIconRegister register) { - - icons = new IIcon[definition.length]; + public void registerModel(Item item, IModelManager manager) { for (int i = 0; i < definition.length; i++) { - icons[i] = TextureManager.registerTex(register, definition[i]); - } - - } - - @Override - public IIcon getIconFromDamage(int damage) { - if (damage >= definition.length || damage < 0) { - return icons[0]; - } else { - return icons[damage]; + manager.registerItemModel(item, i, definition[i]); } } diff --git a/src/main/java/forestry/core/items/ItemCrated.java b/src/main/java/forestry/core/items/ItemCrated.java index 5cb3deb48..0dcbc50de 100755 --- a/src/main/java/forestry/core/items/ItemCrated.java +++ b/src/main/java/forestry/core/items/ItemCrated.java @@ -10,17 +10,18 @@ ******************************************************************************/ package forestry.core.items; -import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.client.resources.model.ModelBakery; +import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; import net.minecraft.world.World; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - +import net.minecraftforge.client.model.ModelLoader; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +import forestry.api.core.IModelManager; import forestry.core.proxy.Proxies; -import forestry.core.render.TextureManager; import forestry.core.utils.ItemStackUtil; import forestry.core.utils.StringUtil; @@ -70,9 +71,15 @@ public class ItemCrated extends ItemForestry { @SideOnly(Side.CLIENT) @Override - public void registerIcons(IIconRegister register) { - String textureName = (contained == null) ? "crate" : "crate-filled"; - itemIcon = TextureManager.registerTex(register, textureName); + public void registerModel(Item item, IModelManager manager) { + if(contained == null){ + manager.registerItemModel(item, 0, false); + }else{ + String modID = ItemStackUtil.getItemNameFromRegistry(item).getResourceDomain(); + ModelResourceLocation modelLocation = new ModelResourceLocation(modID + ":crates", StringUtil.cleanItemName(item)); + ModelLoader.setCustomModelResourceLocation(item, 0, modelLocation); + ModelBakery.registerItemVariants(item, modelLocation); + } } } diff --git a/src/main/java/forestry/core/items/ItemForestry.java b/src/main/java/forestry/core/items/ItemForestry.java index df4e3185f..3bacc3828 100755 --- a/src/main/java/forestry/core/items/ItemForestry.java +++ b/src/main/java/forestry/core/items/ItemForestry.java @@ -10,21 +10,17 @@ ******************************************************************************/ package forestry.core.items; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; - +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.oredict.OreDictionary; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - +import forestry.api.core.IModelManager; +import forestry.api.core.IItemModelRegister; import forestry.core.CreativeTabForestry; -import forestry.core.render.TextureManager; -import forestry.core.utils.StringUtil; -public class ItemForestry extends Item { +public class ItemForestry extends Item implements IItemModelRegister { public ItemForestry() { setCreativeTab(CreativeTabForestry.tabForestry); } @@ -35,8 +31,8 @@ public class ItemForestry extends Item { @SideOnly(Side.CLIENT) @Override - public void registerIcons(IIconRegister register) { - itemIcon = TextureManager.registerTex(register, StringUtil.cleanItemName(this)); + public void registerModel(Item item, IModelManager manager) { + manager.registerItemModel(item, 0, true); } public ItemStack getItemStack() { diff --git a/src/main/java/forestry/core/items/ItemForestryBonemeal.java b/src/main/java/forestry/core/items/ItemForestryBonemeal.java index 7da2cc0de..ecb79f918 100644 --- a/src/main/java/forestry/core/items/ItemForestryBonemeal.java +++ b/src/main/java/forestry/core/items/ItemForestryBonemeal.java @@ -13,18 +13,20 @@ package forestry.core.items; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemDye; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.world.World; public class ItemForestryBonemeal extends ItemForestry { @Override - public boolean onItemUse(ItemStack itemstack, EntityPlayer player, World world, int x, int y, int z, int par7, float facingX, float facingY, float facingZ) { - if (ItemDye.applyBonemeal(itemstack, world, x, y, z, player)) { + public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ) { + if (ItemDye.applyBonemeal(stack, world, pos, player)) { if (!world.isRemote) { - world.playAuxSFX(2005, x, y, z, 0); + world.playAuxSFX(2005, pos, 0); } return true; } - return super.onItemUse(itemstack, player, world, x, y, z, par7, facingX, facingY, facingZ); + return super.onItemUse(stack, player, world, pos, side, hitX, hitY, hitZ); } } diff --git a/src/main/java/forestry/core/items/ItemForestryFood.java b/src/main/java/forestry/core/items/ItemForestryFood.java index 7deb69877..221bba92d 100755 --- a/src/main/java/forestry/core/items/ItemForestryFood.java +++ b/src/main/java/forestry/core/items/ItemForestryFood.java @@ -10,19 +10,17 @@ ******************************************************************************/ package forestry.core.items; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.EnumAction; +import net.minecraft.item.Item; import net.minecraft.item.ItemFood; import net.minecraft.item.ItemStack; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +import forestry.api.core.IModelManager; +import forestry.api.core.IItemModelRegister; import forestry.core.CreativeTabForestry; -import forestry.core.render.TextureManager; -import forestry.core.utils.StringUtil; -public class ItemForestryFood extends ItemFood { +public class ItemForestryFood extends ItemFood implements IItemModelRegister{ private boolean isDrink = false; @@ -38,9 +36,9 @@ public class ItemForestryFood extends ItemFood { @Override public EnumAction getItemUseAction(ItemStack itemstack) { if (isDrink) { - return EnumAction.drink; + return EnumAction.DRINK; } else { - return EnumAction.eat; + return EnumAction.EAT; } } @@ -51,8 +49,8 @@ public class ItemForestryFood extends ItemFood { @SideOnly(Side.CLIENT) @Override - public void registerIcons(IIconRegister register) { - itemIcon = TextureManager.registerTex(register, StringUtil.cleanItemName(this)); + public void registerModel(Item item, IModelManager manager) { + manager.registerItemModel(item, 0, true); } } diff --git a/src/main/java/forestry/core/items/ItemForestryMultiPass.java b/src/main/java/forestry/core/items/ItemForestryMultiPass.java deleted file mode 100644 index 90eb18409..000000000 --- a/src/main/java/forestry/core/items/ItemForestryMultiPass.java +++ /dev/null @@ -1,50 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v3 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: - * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges - ******************************************************************************/ -package forestry.core.items; - -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.util.IIcon; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -import forestry.core.render.TextureManager; -import forestry.core.utils.StringUtil; - -public class ItemForestryMultiPass extends ItemForestry { - - /* ICONS */ - @SideOnly(Side.CLIENT) - private IIcon[] icons; - - @SideOnly(Side.CLIENT) - @Override - public void registerIcons(IIconRegister register) { - icons = new IIcon[2]; - icons[0] = TextureManager.registerTex(register, StringUtil.cleanItemName(this) + ".0"); - icons[1] = TextureManager.registerTex(register, StringUtil.cleanItemName(this) + ".1"); - } - - @SideOnly(Side.CLIENT) - @Override - public IIcon getIconFromDamageForRenderPass(int i, int pass) { - if (pass > 0) { - return icons[0]; - } else { - return icons[1]; - } - } - - @Override - public boolean requiresMultipleRenderPasses() { - return true; - } -} diff --git a/src/main/java/forestry/core/items/ItemForestryTool.java b/src/main/java/forestry/core/items/ItemForestryTool.java index 27b8bdec4..63fff8e5a 100755 --- a/src/main/java/forestry/core/items/ItemForestryTool.java +++ b/src/main/java/forestry/core/items/ItemForestryTool.java @@ -11,17 +11,16 @@ package forestry.core.items; import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; -import net.minecraftforge.common.ForgeHooks; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.PlayerDestroyItemEvent; - -import cpw.mods.fml.common.eventhandler.SubscribeEvent; - +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import forestry.core.utils.ItemStackUtil; public class ItemForestryTool extends ItemForestry { @@ -43,17 +42,12 @@ public class ItemForestryTool extends ItemForestry { } @Override - public float getDigSpeed(ItemStack itemstack, Block block, int metadata) { - if (ForgeHooks.isToolEffective(itemstack, block, metadata)) { - return efficiencyOnProperMaterial; + public float getDigSpeed(ItemStack itemstack, IBlockState state) { + for (String type : getToolClasses(itemstack)) { + if (state.getBlock().isToolEffective(type, state)) + return efficiencyOnProperMaterial; } - - return super.getDigSpeed(itemstack, block, metadata); - } - - @Override - public boolean canHarvestBlock(Block block, ItemStack stack) { - return ForgeHooks.canToolHarvestBlock(block, 0, stack); + return super.getDigSpeed(itemstack, state); } @SubscribeEvent @@ -71,9 +65,9 @@ public class ItemForestryTool extends ItemForestry { } @Override - public boolean onBlockDestroyed(ItemStack itemstack, World world, Block block, int x, int y, int z, EntityLivingBase entityliving) { - if (block.getBlockHardness(world, x, y, z) != 0) { - itemstack.damageItem(1, entityliving); + public boolean onBlockDestroyed(ItemStack stack, World world, Block block, BlockPos pos, EntityLivingBase player) { + if (block.getBlockHardness(world, pos) != 0) { + stack.damageItem(1, player); } return true; } diff --git a/src/main/java/forestry/core/items/ItemFruit.java b/src/main/java/forestry/core/items/ItemFruit.java index 9c3d15f17..06009159b 100755 --- a/src/main/java/forestry/core/items/ItemFruit.java +++ b/src/main/java/forestry/core/items/ItemFruit.java @@ -13,16 +13,12 @@ package forestry.core.items; import java.util.List; import java.util.Locale; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -import forestry.core.render.TextureManager; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +import forestry.api.core.IModelManager; import forestry.plugins.PluginCore; public class ItemFruit extends ItemForestryFood { @@ -37,19 +33,13 @@ public class ItemFruit extends ItemForestryFood { this.oreDict = oreDict; } - private static IIcon[] icons; - - public static void registerIcons(IIconRegister register) { - icons = new IIcon[VALUES.length]; + public static void registerModel(Item item, IModelManager manager) { for (int i = 0; i < VALUES.length; i++) { - icons[i] = TextureManager.registerTex(register, "fruits/" + VALUES[i].toString().toLowerCase(Locale.ENGLISH)); + EnumFruit fruit = VALUES[i]; + manager.registerItemModel(item, i, "fruits/" + fruit.name().toLowerCase(Locale.ENGLISH)); } } - public IIcon getIcon() { - return icons[ordinal()]; - } - public ItemStack getStack() { return getStack(1); } @@ -79,16 +69,11 @@ public class ItemFruit extends ItemForestryFood { return false; } + /* MODELS*/ @SideOnly(Side.CLIENT) @Override - public void registerIcons(IIconRegister register) { - EnumFruit.registerIcons(register); - } - - @SideOnly(Side.CLIENT) - @Override - public IIcon getIconFromDamage(int meta) { - return EnumFruit.values()[meta].getIcon(); + public void registerModel(Item item, IModelManager manager) { + EnumFruit.registerModel(item, manager); } @SuppressWarnings({"rawtypes", "unchecked"}) diff --git a/src/main/java/forestry/core/items/ItemLiquidContainer.java b/src/main/java/forestry/core/items/ItemLiquidContainer.java index 6b445dd08..c17e80529 100755 --- a/src/main/java/forestry/core/items/ItemLiquidContainer.java +++ b/src/main/java/forestry/core/items/ItemLiquidContainer.java @@ -18,30 +18,28 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.EnumAction; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.MovingObjectPosition.MovingObjectType; import net.minecraft.world.World; - -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.world.WorldProviderHell; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidBlock; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +import forestry.api.core.IModelManager; import forestry.core.CreativeTabForestry; import forestry.core.fluids.BlockForestryFluid; import forestry.core.fluids.FluidHelper; import forestry.core.proxy.Proxies; -import forestry.core.render.TextureManager; public class ItemLiquidContainer extends ItemForestry { private static final Map buckets = new HashMap<>(); @@ -95,20 +93,20 @@ public class ItemLiquidContainer extends ItemForestry { } @Override - public ItemStack onEaten(ItemStack itemstack, World world, EntityPlayer entityplayer) { + public ItemStack onItemUseFinish(ItemStack stack, World world, EntityPlayer player) { if (!isDrink) { - return itemstack; + return stack; } - itemstack.stackSize--; - entityplayer.getFoodStats().addStats(healAmount, saturationModifier); - world.playSoundAtEntity(entityplayer, "random.burp", 0.5F, world.rand.nextFloat() * 0.1F + 0.9F); + stack.stackSize--; + player.getFoodStats().addStats(healAmount, saturationModifier); + world.playSoundAtEntity(player, "random.burp", 0.5F, world.rand.nextFloat() * 0.1F + 0.9F); /* * if (!world.isRemote && potionId > 0 && world.rand.nextFloat() < potionEffectProbability) entityplayer.addPotionEffect(new PotionEffect(potionId, * potionDuration * 20, potionAmplifier)); */ - return itemstack; + return stack; } @Override @@ -123,9 +121,9 @@ public class ItemLiquidContainer extends ItemForestry { @Override public EnumAction getItemUseAction(ItemStack itemstack) { if (isDrink) { - return EnumAction.drink; + return EnumAction.DRINK; } else { - return EnumAction.none; + return EnumAction.NONE; } } @@ -148,15 +146,13 @@ public class ItemLiquidContainer extends ItemForestry { MovingObjectPosition movingobjectposition = this.getMovingObjectPositionFromPlayer(world, entityplayer, true); if (movingobjectposition != null && movingobjectposition.typeOfHit == MovingObjectType.BLOCK) { - int x = movingobjectposition.blockX; - int y = movingobjectposition.blockY; - int z = movingobjectposition.blockZ; - Block targetedBlock = world.getBlock(x, y, z); + BlockPos pos = movingobjectposition.getBlockPos(); + Block targetedBlock = world.getBlockState(pos).getBlock(); FluidStack fluid = null; if (targetedBlock instanceof IFluidBlock) { - fluid = ((IFluidBlock) targetedBlock).drain(world, x, y, z, false); + fluid = ((IFluidBlock) targetedBlock).drain(world, pos, false); } else { if (targetedBlock == Blocks.water || targetedBlock == Blocks.flowing_water) { fluid = new FluidStack(FluidRegistry.WATER, 1000); @@ -189,9 +185,9 @@ public class ItemLiquidContainer extends ItemForestry { // Remove consumed liquid block in world if (targetedBlock instanceof IFluidBlock) { - ((IFluidBlock) targetedBlock).drain(world, x, y, z, true); + ((IFluidBlock) targetedBlock).drain(world, pos, true); } else { - world.setBlockToAir(x, y, z); + world.setBlockToAir(pos); } // Remove consumed empty container @@ -217,75 +213,75 @@ public class ItemLiquidContainer extends ItemForestry { return new ItemStack(Items.bucket); } - int x = movingobjectposition.blockX; - int y = movingobjectposition.blockY; - int z = movingobjectposition.blockZ; + int x = movingobjectposition.getBlockPos().getX(); + int y = movingobjectposition.getBlockPos().getY(); + int z = movingobjectposition.getBlockPos().getZ(); switch (movingobjectposition.sideHit) { - case 0: + case DOWN: --y; break; - case 1: + case UP: ++y; break; - case 2: + case NORTH: --z; break; - case 3: + case SOUTH: ++z; break; - case 4: + case WEST: --x; break; - case 5: + case EAST: ++x; break; } - if (!player.canPlayerEdit(x, y, z, movingobjectposition.sideHit, itemstack)) { + if (!player.canPlayerEdit(new BlockPos(x, y, z), movingobjectposition.sideHit, itemstack)) { return itemstack; } - if (this.tryPlaceLiquidAtPosition(world, x, y, z) && !player.capabilities.isCreativeMode) { + if (this.tryPlaceLiquidAtPosition(world, new BlockPos(x, y, z)) && !player.capabilities.isCreativeMode) { return new ItemStack(Items.bucket); } return itemstack; } - private boolean tryPlaceLiquidAtPosition(World world, int x, int y, int z) { + private boolean tryPlaceLiquidAtPosition(World world, BlockPos pos) { if (this.contents == Blocks.air) { return false; } else { - Material material = world.getBlock(x, y, z).getMaterial(); + Material material = world.getBlockState(pos).getBlock().getMaterial(); boolean isLiquid = !material.isSolid(); - if (!world.isAirBlock(x, y, z) && !isLiquid) { + if (!world.isAirBlock(pos) && !isLiquid) { return false; } else { // Can't put down liquids in the nether. // Explode if it's flammable, evaporate otherwise. - if (world.provider.isHellWorld && this.contents != Blocks.flowing_lava) { - int flammability = contents.getFlammability(world, x, y, z, ForgeDirection.UNKNOWN); + if (world.provider instanceof WorldProviderHell && this.contents != Blocks.flowing_lava) { + int flammability = contents.getFlammability(world, pos, null); if (contents instanceof BlockForestryFluid && flammability > 0) { // Explosion size is determined by flammability, up to size 4. float explosionSize = 4F * flammability / 300F; - world.newExplosion(null, x, y, z, explosionSize, true, true); + world.newExplosion(null, pos.getX(), pos.getY(), pos.getZ(), explosionSize, true, true); return true; } else { Random random = world.rand; - world.playSoundEffect(x + 0.5, y + 0.5F, z + 0.5F, "random.fizz", 0.5F, 2.6F + (random.nextFloat() - random.nextFloat()) * 0.8F); + world.playSoundEffect(pos.getX() + 0.5, pos.getY() + 0.5F, pos.getZ() + 0.5F, "random.fizz", 0.5F, 2.6F + (random.nextFloat() - random.nextFloat()) * 0.8F); for (int l = 0; l < 8; ++l) { - world.spawnParticle("largesmoke", x + random.nextDouble(), y + random.nextDouble(), z + random.nextDouble(), 0.0, 0.0, 0.0); + world.spawnParticle(EnumParticleTypes.SMOKE_LARGE, pos.getX() + random.nextDouble(), pos.getY() + random.nextDouble(), pos.getZ() + random.nextDouble(), 0.0, 0.0, 0.0); } } } else { if (!world.isRemote && isLiquid && !material.isLiquid()) { - world.func_147480_a(x, y, z, true); + world.destroyBlock(pos, true); } - world.setBlock(x, y, z, this.contents, 0, 3); + world.setBlockState(pos, this.contents.getStateFromMeta(0), 3); } return true; @@ -309,32 +305,11 @@ public class ItemLiquidContainer extends ItemForestry { return this; } - /* ICONS */ - @SideOnly(Side.CLIENT) - private IIcon[] icons; - + /* Models */ @SideOnly(Side.CLIENT) @Override - public void registerIcons(IIconRegister register) { - icons = new IIcon[2]; - icons[0] = TextureManager.registerTex(register, "liquids/" + type.toString().toLowerCase(Locale.ENGLISH) + ".bottle"); - icons[1] = TextureManager.registerTex(register, "liquids/" + type.toString().toLowerCase(Locale.ENGLISH) + ".contents"); - } - - @SideOnly(Side.CLIENT) - @Override - public IIcon getIconFromDamageForRenderPass(int i, int j) { - if (j > 0 && color != null) { - return icons[1]; - } else { - return icons[0]; - } - } - - // Return true to enable color overlay - @Override - public boolean requiresMultipleRenderPasses() { - return true; + public void registerModel(Item item, IModelManager manager) { + manager.registerItemModel(item, 0, "liquids/" + type.toString().toLowerCase(Locale.ENGLISH)); } @Override diff --git a/src/main/java/forestry/core/items/ItemOverlay.java b/src/main/java/forestry/core/items/ItemOverlay.java index 6fbe74050..c4f4ce9f5 100755 --- a/src/main/java/forestry/core/items/ItemOverlay.java +++ b/src/main/java/forestry/core/items/ItemOverlay.java @@ -12,18 +12,13 @@ package forestry.core.items; import java.util.List; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +import forestry.api.core.IModelManager; import forestry.core.config.Config; -import forestry.core.render.TextureManager; -import forestry.core.utils.StringUtil; public class ItemOverlay extends ItemForestry { public interface IOverlayInfo { @@ -65,42 +60,16 @@ public class ItemOverlay extends ItemForestry { } } } - - /* ICONS */ - @SideOnly(Side.CLIENT) - private IIcon primaryIcon; - @SideOnly(Side.CLIENT) - private IIcon secondaryIcon; - + + /* Models */ @SideOnly(Side.CLIENT) @Override - public void registerIcons(IIconRegister register) { - primaryIcon = TextureManager.registerTex(register, StringUtil.cleanItemName(this) + ".0"); - if (overlays[0].getSecondaryColor() != 0) { - secondaryIcon = TextureManager.registerTex(register, StringUtil.cleanItemName(this) + ".1"); + public void registerModel(Item item, IModelManager manager) { + for (int i = 0; i < overlays.length; i++) { + manager.registerItemModel(item, i, false); } } - @Override - @SideOnly(Side.CLIENT) - public IIcon getIconFromDamageForRenderPass(int i, int j) { - if (j > 0 && overlays[i].getSecondaryColor() != 0) { - return secondaryIcon; - } else { - return primaryIcon; - } - } - - @Override - public int getRenderPasses(int metadata) { - return overlays[metadata].getSecondaryColor() != 0 ? 2 : 1; - } - - @Override - public boolean requiresMultipleRenderPasses() { - return true; - } - @Override public String getUnlocalizedName(ItemStack stack) { if (stack.getItemDamage() < 0 || stack.getItemDamage() >= overlays.length) { diff --git a/src/main/java/forestry/core/items/ItemPipette.java b/src/main/java/forestry/core/items/ItemPipette.java index 97faf869c..554871e45 100755 --- a/src/main/java/forestry/core/items/ItemPipette.java +++ b/src/main/java/forestry/core/items/ItemPipette.java @@ -12,22 +12,20 @@ package forestry.core.items; import java.util.List; -import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.client.renderer.ItemMeshDefinition; +import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.IIcon; - +import net.minecraft.util.ResourceLocation; import net.minecraftforge.fluids.FluidStack; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +import forestry.api.core.IModelManager; import forestry.api.core.IToolPipette; import forestry.core.config.Constants; import forestry.core.fluids.PipetteContents; -import forestry.core.render.TextureManager; -import forestry.core.utils.StringUtil; public class ItemPipette extends ItemForestry implements IToolPipette { @@ -103,27 +101,31 @@ public class ItemPipette extends ItemForestry implements IToolPipette { contained.addTooltip(list); } - /* ICONS */ + /* Models */ @SideOnly(Side.CLIENT) - private IIcon primaryIcon; - @SideOnly(Side.CLIENT) - private IIcon secondaryIcon; + public ModelResourceLocation[] models = new ModelResourceLocation[2]; @SideOnly(Side.CLIENT) @Override - public void registerIcons(IIconRegister register) { - primaryIcon = TextureManager.registerTex(register, StringUtil.cleanItemName(this) + ".0"); - secondaryIcon = TextureManager.registerTex(register, StringUtil.cleanItemName(this) + ".1"); + public void registerModel(Item item, IModelManager manager) { + models[0] = manager.getModelLocation("pipette.0"); + models[1] = manager.getModelLocation("pipette.1"); + manager.registerVariant(item, new ResourceLocation("forestry:pipette.0")); + manager.registerVariant(item, new ResourceLocation("forestry:pipette.1")); + manager.registerItemModel(item, new PippetMeshDefinition()); } - @SideOnly(Side.CLIENT) - @Override - public IIcon getIconFromDamage(int damage) { - if (damage <= 0) { - return primaryIcon; - } else { - return secondaryIcon; + public class PippetMeshDefinition implements ItemMeshDefinition { + + @Override + public ModelResourceLocation getModelLocation(ItemStack stack) { + if (stack.getItemDamage() <= 0) { + return models[0]; + } else { + return models[1]; + } } + } @Override diff --git a/src/main/java/forestry/core/items/ItemRegistry.java b/src/main/java/forestry/core/items/ItemRegistry.java index ac94836d4..3169e1dbf 100644 --- a/src/main/java/forestry/core/items/ItemRegistry.java +++ b/src/main/java/forestry/core/items/ItemRegistry.java @@ -11,9 +11,7 @@ package forestry.core.items; import net.minecraft.item.Item; - -import cpw.mods.fml.common.registry.GameRegistry; - +import net.minecraftforge.fml.common.registry.GameRegistry; import forestry.core.utils.StringUtil; import forestry.plugins.PluginManager; diff --git a/src/main/java/forestry/core/items/ItemWrench.java b/src/main/java/forestry/core/items/ItemWrench.java index 7e31ab177..64e69a0ee 100755 --- a/src/main/java/forestry/core/items/ItemWrench.java +++ b/src/main/java/forestry/core/items/ItemWrench.java @@ -13,11 +13,11 @@ package forestry.core.items; import net.minecraft.block.Block; 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; -import net.minecraftforge.common.util.ForgeDirection; - -import cpw.mods.fml.common.Optional; +import net.minecraftforge.fml.common.Optional; import buildcraft.api.tools.IToolWrench; @@ -28,11 +28,11 @@ public class ItemWrench extends ItemForestry implements IToolWrench { super(); setHarvestLevel("wrench", 0); } - + @Override - public boolean onItemUseFirst(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) { - Block block = world.getBlock(x, y, z); - if (block.rotateBlock(world, x, y, z, ForgeDirection.getOrientation(side))) { + public boolean onItemUseFirst(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ) { + Block block = world.getBlockState(pos).getBlock(); + if (block.rotateBlock(world, pos, side)) { player.swingItem(); return !world.isRemote; } @@ -40,12 +40,11 @@ public class ItemWrench extends ItemForestry implements IToolWrench { } @Override - public boolean canWrench(EntityPlayer player, int x, int y, int z) { + public boolean canWrench(EntityPlayer player, BlockPos pos) { return true; } @Override - public void wrenchUsed(EntityPlayer player, int x, int y, int z) { - } + public void wrenchUsed(EntityPlayer player, BlockPos pos) {} } diff --git a/src/main/java/forestry/core/multiblock/FakeMultiblockController.java b/src/main/java/forestry/core/multiblock/FakeMultiblockController.java index 515ab7a48..7191739aa 100644 --- a/src/main/java/forestry/core/multiblock/FakeMultiblockController.java +++ b/src/main/java/forestry/core/multiblock/FakeMultiblockController.java @@ -17,7 +17,7 @@ import java.util.Collections; import java.util.Set; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import forestry.api.core.EnumHumidity; @@ -68,7 +68,7 @@ public abstract class FakeMultiblockController implements IMultiblockControllerI } @Override - public ChunkCoordinates getReferenceCoord() { + public BlockPos getReferenceCoord() { return null; } diff --git a/src/main/java/forestry/core/multiblock/IMultiblockControllerInternal.java b/src/main/java/forestry/core/multiblock/IMultiblockControllerInternal.java index 540fb75ab..87a8e3953 100644 --- a/src/main/java/forestry/core/multiblock/IMultiblockControllerInternal.java +++ b/src/main/java/forestry/core/multiblock/IMultiblockControllerInternal.java @@ -14,7 +14,7 @@ import javax.annotation.Nonnull; import java.util.Set; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import forestry.api.core.IErrorLogicSource; @@ -82,7 +82,7 @@ public interface IMultiblockControllerInternal extends IMultiblockController, IN /** * @return The reference coordinate, the block with the lowest x, y, z coordinates, evaluated in that order. */ - ChunkCoordinates getReferenceCoord(); + BlockPos getReferenceCoord(); /** * Force this multiblock to recalculate its minimum and maximum coordinates diff --git a/src/main/java/forestry/core/multiblock/MultiblockClientTickHandler.java b/src/main/java/forestry/core/multiblock/MultiblockClientTickHandler.java index df3a4b6eb..cfb4de1a3 100644 --- a/src/main/java/forestry/core/multiblock/MultiblockClientTickHandler.java +++ b/src/main/java/forestry/core/multiblock/MultiblockClientTickHandler.java @@ -1,9 +1,8 @@ package forestry.core.multiblock; import net.minecraft.client.Minecraft; - -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.gameevent.TickEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.gameevent.TickEvent; public class MultiblockClientTickHandler { diff --git a/src/main/java/forestry/core/multiblock/MultiblockControllerBase.java b/src/main/java/forestry/core/multiblock/MultiblockControllerBase.java index 61d3da004..12ec2dcf1 100644 --- a/src/main/java/forestry/core/multiblock/MultiblockControllerBase.java +++ b/src/main/java/forestry/core/multiblock/MultiblockControllerBase.java @@ -12,12 +12,13 @@ import java.util.Set; import net.minecraft.block.Block; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import net.minecraft.world.chunk.Chunk; import net.minecraft.world.chunk.IChunkProvider; import forestry.api.multiblock.IMultiblockComponent; +import forestry.core.utils.BlockUtil; import forestry.core.utils.Log; import forestry.core.utils.StringUtil; @@ -50,19 +51,19 @@ public abstract class MultiblockControllerBase implements IMultiblockControllerI * i.e. If something has a lower X but higher Y/Z coordinates, it will still be the reference. * If something has the same X but a lower Y coordinate, it will be the reference. Etc. */ - private ChunkCoordinates referenceCoord; + private BlockPos referenceCoord; /** * Minimum bounding box coordinate. Blocks do not necessarily exist at this coord if your machine * is not a cube/rectangular prism. */ - private ChunkCoordinates minimumCoord; + private BlockPos minimumCoord; /** * Maximum bounding box coordinate. Blocks do not necessarily exist at this coord if your machine * is not a cube/rectangular prism. */ - private ChunkCoordinates maximumCoord; + private BlockPos maximumCoord; /** * Set to true whenever a part is removed from this controller. @@ -103,7 +104,7 @@ public abstract class MultiblockControllerBase implements IMultiblockControllerI @Override public void attachBlock(IMultiblockComponent part) { - ChunkCoordinates coord = part.getCoordinates(); + BlockPos coord = part.getCoordinates(); if (!connectedParts.add(part)) { Log.warning("[%s] Controller %s is double-adding part %d @ %s. This is unusual. " + @@ -126,7 +127,7 @@ public abstract class MultiblockControllerBase implements IMultiblockControllerI referenceCoord = coord; logic.becomeMultiblockSaveDelegate(); } else if (coord.compareTo(referenceCoord) < 0) { - TileEntity te = this.worldObj.getTileEntity(referenceCoord.posX, referenceCoord.posY, referenceCoord.posZ); + TileEntity te = this.worldObj.getTileEntity(referenceCoord); if (te instanceof IMultiblockComponent) { IMultiblockComponent tePart = (IMultiblockComponent) te; MultiblockLogic teLogic = (MultiblockLogic) tePart.getMultiblockLogic(); @@ -140,26 +141,26 @@ public abstract class MultiblockControllerBase implements IMultiblockControllerI } if (minimumCoord != null) { - if (coord.posX < minimumCoord.posX) { - minimumCoord.posX = coord.posX; + if (coord.getX() < minimumCoord.getX()) { + minimumCoord = new BlockPos(coord.getX(), minimumCoord.getY(), minimumCoord.getZ()); } - if (coord.posY < minimumCoord.posY) { - minimumCoord.posY = coord.posY; + if (coord.getY() < minimumCoord.getY()) { + minimumCoord = new BlockPos(minimumCoord.getX(), coord.getY(), minimumCoord.getZ()); } - if (coord.posZ < minimumCoord.posZ) { - minimumCoord.posZ = coord.posZ; + if (coord.getZ() < minimumCoord.getZ()) { + minimumCoord = new BlockPos(minimumCoord.getX(), minimumCoord.getY(), coord.getZ()); } } if (maximumCoord != null) { - if (coord.posX > maximumCoord.posX) { - maximumCoord.posX = coord.posX; + if (coord.getX() > maximumCoord.getX()) { + maximumCoord = new BlockPos(coord.getX(), maximumCoord.getY(), maximumCoord.getZ()); } - if (coord.posY > maximumCoord.posY) { - maximumCoord.posY = coord.posY; + if (coord.getY() > maximumCoord.getY()) { + maximumCoord = new BlockPos(maximumCoord.getX(), coord.getY(), maximumCoord.getZ()); } - if (coord.posZ > maximumCoord.posZ) { - maximumCoord.posZ = coord.posZ; + if (coord.getZ() > maximumCoord.getZ()) { + maximumCoord = new BlockPos(maximumCoord.getX(), maximumCoord.getY(), coord.getZ()); } } @@ -239,10 +240,10 @@ public abstract class MultiblockControllerBase implements IMultiblockControllerI // Strip out this part onDetachBlock(part); if (!connectedParts.remove(part)) { - ChunkCoordinates partCoords = part.getCoordinates(); + BlockPos partCoords = part.getCoordinates(); Log.warning("[%s] Double-removing part (%d) @ %d, %d, %d, this is unexpected and may cause problems. " + "If you encounter anomalies, please tear down the reactor and rebuild it.", - worldObj.isRemote ? "CLIENT" : "SERVER", part.hashCode(), partCoords.posX, partCoords.posY, partCoords.posZ); + worldObj.isRemote ? "CLIENT" : "SERVER", part.hashCode(), partCoords.getX(), partCoords.getY(), partCoords.getZ()); } if (connectedParts.isEmpty()) { @@ -307,7 +308,6 @@ public abstract class MultiblockControllerBase implements IMultiblockControllerI */ private void assembleMachine(AssemblyState oldState) { this.assemblyState = AssemblyState.Assembled; - for (IMultiblockComponent part : connectedParts) { part.onMachineAssembled(this, getMinimumCoord(), getMaximumCoord()); } @@ -337,7 +337,7 @@ public abstract class MultiblockControllerBase implements IMultiblockControllerI @Override public void assimilate(IMultiblockControllerInternal other) { - ChunkCoordinates otherReferenceCoord = other.getReferenceCoord(); + BlockPos otherReferenceCoord = other.getReferenceCoord(); if (otherReferenceCoord != null && getReferenceCoord().compareTo(otherReferenceCoord) >= 0) { throw new IllegalArgumentException("The controller with the lowest minimum-coord value must consume the one with the higher coords"); } @@ -371,8 +371,8 @@ public abstract class MultiblockControllerBase implements IMultiblockControllerI @Override public void _onAssimilated(IMultiblockControllerInternal otherController) { if (referenceCoord != null) { - if (worldObj.getChunkProvider().chunkExists(referenceCoord.posX >> 4, referenceCoord.posZ >> 4)) { - TileEntity te = this.worldObj.getTileEntity(referenceCoord.posX, referenceCoord.posY, referenceCoord.posZ); + if (worldObj.getChunkProvider().chunkExists(referenceCoord.getX() >> 4, referenceCoord.getZ() >> 4)) { + TileEntity te = this.worldObj.getTileEntity(referenceCoord); if (te instanceof IMultiblockComponent) { IMultiblockComponent part = (IMultiblockComponent) te; MultiblockLogic logic = (MultiblockLogic) part.getMultiblockLogic(); @@ -424,12 +424,11 @@ public abstract class MultiblockControllerBase implements IMultiblockControllerI // If this returns true, the server has changed its internal data. // If our chunks are loaded (they should be), we must mark our chunks as dirty. if (minimumCoord != null && maximumCoord != null && - this.worldObj.checkChunksExist(minimumCoord.posX, minimumCoord.posY, minimumCoord.posZ, - maximumCoord.posX, maximumCoord.posY, maximumCoord.posZ)) { - int minChunkX = minimumCoord.posX >> 4; - int minChunkZ = minimumCoord.posZ >> 4; - int maxChunkX = maximumCoord.posX >> 4; - int maxChunkZ = maximumCoord.posZ >> 4; + BlockUtil.checkChunksExist(worldObj, minimumCoord, maximumCoord)) { + int minChunkX = minimumCoord.getX() >> 4; + int minChunkZ = minimumCoord.getZ() >> 4; + int maxChunkX = maximumCoord.getX() >> 4; + int maxChunkZ = maximumCoord.getZ() >> 4; for (int x = minChunkX; x <= maxChunkX; x++) { for (int z = minChunkZ; z <= maxChunkZ; z++) { @@ -472,9 +471,9 @@ public abstract class MultiblockControllerBase implements IMultiblockControllerI * @param z Z coordinate of the block being tested * @throws MultiblockValidationException if the tested block is not allowed on the machine's side faces */ - protected void isBlockGoodForExteriorLevel(int level, World world, int x, int y, int z) throws MultiblockValidationException { - Block block = world.getBlock(x, y, z); - throw new MultiblockValidationException(StringUtil.localizeAndFormatRaw("for.multiblock.error.invalid.interior", x, y, z, block.getLocalizedName())); + protected void isBlockGoodForExteriorLevel(int level, World world, BlockPos pos) throws MultiblockValidationException { + Block block = BlockUtil.getBlock(world, pos); + throw new MultiblockValidationException(StringUtil.localizeAndFormatRaw("for.multiblock.error.invalid.interior", pos.getX(), pos.getY(), pos.getZ(), block.getLocalizedName())); } /** @@ -485,13 +484,13 @@ public abstract class MultiblockControllerBase implements IMultiblockControllerI * @param z Z coordinate of the block being tested * @throws MultiblockValidationException if the tested block is not allowed in the machine's interior */ - protected void isBlockGoodForInterior(World world, int x, int y, int z) throws MultiblockValidationException { - Block block = world.getBlock(x, y, z); - throw new MultiblockValidationException(StringUtil.localizeAndFormatRaw("for.multiblock.error.invalid.interior", x, y, z, block.getLocalizedName())); + protected void isBlockGoodForInterior(World world, BlockPos pos) throws MultiblockValidationException { + Block block = BlockUtil.getBlock(world, pos); + throw new MultiblockValidationException(StringUtil.localizeAndFormatRaw("for.multiblock.error.invalid.interior", pos.getX(), pos.getY(), pos.getZ(), block.getLocalizedName())); } @Override - public ChunkCoordinates getReferenceCoord() { + public BlockPos getReferenceCoord() { if (referenceCoord == null) { selectNewReferenceCoord(); } @@ -507,76 +506,84 @@ public abstract class MultiblockControllerBase implements IMultiblockControllerI @Override public void recalculateMinMaxCoords() { - minimumCoord = new ChunkCoordinates(Integer.MAX_VALUE, Integer.MAX_VALUE, Integer.MAX_VALUE); - maximumCoord = new ChunkCoordinates(Integer.MIN_VALUE, Integer.MIN_VALUE, Integer.MIN_VALUE); + minimumCoord = new BlockPos(Integer.MAX_VALUE, Integer.MAX_VALUE, Integer.MAX_VALUE); + maximumCoord = new BlockPos(Integer.MIN_VALUE, Integer.MIN_VALUE, Integer.MIN_VALUE); for (IMultiblockComponent part : connectedParts) { - ChunkCoordinates partCoords = part.getCoordinates(); - if (partCoords.posX < minimumCoord.posX) { - minimumCoord.posX = partCoords.posX; + BlockPos partCoords = part.getCoordinates(); + int minX = minimumCoord.getX(); + int minY = minimumCoord.getY(); + int minZ = minimumCoord.getZ(); + int maxX = maximumCoord.getX(); + int maxY = maximumCoord.getY(); + int maxZ = maximumCoord.getZ(); + if (partCoords.getX() < minimumCoord.getX()) { + minX = partCoords.getX(); } - if (partCoords.posX > maximumCoord.posX) { - maximumCoord.posX = partCoords.posX; + if (partCoords.getX() > maximumCoord.getX()) { + maxX = partCoords.getX(); } - if (partCoords.posY < minimumCoord.posY) { - minimumCoord.posY = partCoords.posY; + if (partCoords.getY() < minimumCoord.getY()) { + minY = partCoords.getY(); } - if (partCoords.posY > maximumCoord.posY) { - maximumCoord.posY = partCoords.posY; + if (partCoords.getY() > maximumCoord.getY()) { + maxY = partCoords.getY(); } - if (partCoords.posZ < minimumCoord.posZ) { - minimumCoord.posZ = partCoords.posZ; + if (partCoords.getZ() < minimumCoord.getZ()) { + minZ = partCoords.getZ(); } - if (partCoords.posZ > maximumCoord.posZ) { - maximumCoord.posZ = partCoords.posZ; + if (partCoords.getZ() > maximumCoord.getZ()) { + maxZ = partCoords.getZ(); } + minimumCoord = new BlockPos(minX, minY, minZ); + maximumCoord = new BlockPos(maxX, maxY, maxZ); } } /** * @return The minimum bounding-box coordinate containing this machine's blocks. */ - protected ChunkCoordinates getMinimumCoord() { + protected BlockPos getMinimumCoord() { if (minimumCoord == null) { recalculateMinMaxCoords(); } - return new ChunkCoordinates(minimumCoord); + return new BlockPos(minimumCoord); } /** * @return The maximum bounding-box coordinate containing this machine's blocks. */ - protected ChunkCoordinates getMaximumCoord() { + protected BlockPos getMaximumCoord() { if (maximumCoord == null) { recalculateMinMaxCoords(); } - return new ChunkCoordinates(maximumCoord); + return new BlockPos(maximumCoord); } - protected final ChunkCoordinates getCenterCoord() { - ChunkCoordinates minCoord = getMinimumCoord(); - ChunkCoordinates maxCoord = getMaximumCoord(); + protected final BlockPos getCenterCoord() { + BlockPos minCoord = getMinimumCoord(); + BlockPos maxCoord = getMaximumCoord(); - return new ChunkCoordinates( - (minCoord.posX + maxCoord.posX) / 2, - (minCoord.posY + maxCoord.posY) / 2, - (minCoord.posZ + maxCoord.posZ) / 2 + return new BlockPos( + (minCoord.getX() + maxCoord.getX()) / 2, + (minCoord.getY() + maxCoord.getY()) / 2, + (minCoord.getZ() + maxCoord.getZ()) / 2 ); } - protected final ChunkCoordinates getTopCenterCoord() { - ChunkCoordinates minCoord = getMinimumCoord(); - ChunkCoordinates maxCoord = getMaximumCoord(); + protected final BlockPos getTopCenterCoord() { + BlockPos minCoord = getMinimumCoord(); + BlockPos maxCoord = getMaximumCoord(); - return new ChunkCoordinates( - (minCoord.posX + maxCoord.posX) / 2, - maxCoord.posY, - (minCoord.posZ + maxCoord.posZ) / 2 + return new BlockPos( + (minCoord.getX() + maxCoord.getX()) / 2, + maxCoord.getY(), + (minCoord.getZ() + maxCoord.getZ()) / 2 ); } protected final boolean isCoordInMultiblock(int x, int y, int z) { - return (x >= minimumCoord.posX && x <= maximumCoord.posX) && (y >= minimumCoord.posY && y <= maximumCoord.posY) && (z >= minimumCoord.posZ && z <= maximumCoord.posZ); + return (x >= minimumCoord.getX() && x <= maximumCoord.getX()) && (y >= minimumCoord.getY() && y <= maximumCoord.getY()) && (z >= minimumCoord.getZ() && z <= maximumCoord.getZ()); } @Override @@ -621,8 +628,8 @@ public abstract class MultiblockControllerBase implements IMultiblockControllerI } private int _shouldConsume(IMultiblockControllerInternal otherController) { - ChunkCoordinates myCoord = getReferenceCoord(); - ChunkCoordinates theirCoord = otherController.getReferenceCoord(); + BlockPos myCoord = getReferenceCoord(); + BlockPos theirCoord = otherController.getReferenceCoord(); // Always consume other controllers if their reference coordinate is null - this means they're empty and can be assimilated on the cheap if (theirCoord == null) { @@ -640,8 +647,8 @@ public abstract class MultiblockControllerBase implements IMultiblockControllerI if (!first) { sb.append(", "); } - ChunkCoordinates partCoord = part.getCoordinates(); - sb.append(String.format("(%d: %d, %d, %d)", part.hashCode(), partCoord.posX, partCoord.posY, partCoord.posZ)); + BlockPos partCoord = part.getCoordinates(); + sb.append(String.format("(%d: %d, %d, %d)", part.hashCode(), partCoord.getX(), partCoord.getY(), partCoord.getZ())); first = false; } @@ -652,8 +659,8 @@ public abstract class MultiblockControllerBase implements IMultiblockControllerI public void auditParts() { HashSet deadParts = new HashSet<>(); for (IMultiblockComponent part : connectedParts) { - ChunkCoordinates partCoord = part.getCoordinates(); - if (isInvalid(part) || worldObj.getTileEntity(partCoord.posX, partCoord.posY, partCoord.posZ) != part) { + BlockPos partCoord = part.getCoordinates(); + if (isInvalid(part) || worldObj.getTileEntity(partCoord) != part) { onDetachBlock(part); deadParts.add(part); } @@ -682,21 +689,21 @@ public abstract class MultiblockControllerBase implements IMultiblockControllerI // Reset visitations and find the minimum coordinate Set deadParts = new HashSet<>(); - ChunkCoordinates c; + BlockPos c; IMultiblockComponent referencePart = null; int originalSize = connectedParts.size(); for (IMultiblockComponent part : connectedParts) { // This happens during chunk unload. - ChunkCoordinates partCoord = part.getCoordinates(); - if (!chunkProvider.chunkExists(partCoord.posX >> 4, partCoord.posZ >> 4) || isInvalid(part)) { + BlockPos partCoord = part.getCoordinates(); + if (!chunkProvider.chunkExists(partCoord.getX() >> 4, partCoord.getZ() >> 4) || isInvalid(part)) { deadParts.add(part); onDetachBlock(part); continue; } - if (worldObj.getTileEntity(partCoord.posX, partCoord.posY, partCoord.posZ) != part) { + if (worldObj.getTileEntity(partCoord) != part) { deadParts.add(part); onDetachBlock(part); continue; @@ -793,8 +800,8 @@ public abstract class MultiblockControllerBase implements IMultiblockControllerI IChunkProvider chunkProvider = worldObj.getChunkProvider(); for (IMultiblockComponent part : connectedParts) { - ChunkCoordinates partCoord = part.getCoordinates(); - if (chunkProvider.chunkExists(partCoord.posX >> 4, partCoord.posZ >> 4)) { + BlockPos partCoord = part.getCoordinates(); + if (chunkProvider.chunkExists(partCoord.getX() >> 4, partCoord.getZ() >> 4)) { onDetachBlock(part); } } @@ -818,8 +825,8 @@ public abstract class MultiblockControllerBase implements IMultiblockControllerI referenceCoord = null; for (IMultiblockComponent part : connectedParts) { - ChunkCoordinates partCoord = part.getCoordinates(); - if (isInvalid(part) || !chunkProvider.chunkExists(partCoord.posX >> 4, partCoord.posZ >> 4)) { + BlockPos partCoord = part.getCoordinates(); + if (isInvalid(part) || !chunkProvider.chunkExists(partCoord.getX() >> 4, partCoord.getZ() >> 4)) { // Chunk is unloading, skip this coord to prevent chunk thrashing continue; } @@ -847,9 +854,9 @@ public abstract class MultiblockControllerBase implements IMultiblockControllerI * On the client, this will mark the block for a rendering update. */ protected void markReferenceCoordForUpdate() { - ChunkCoordinates rc = getReferenceCoord(); + BlockPos rc = getReferenceCoord(); if (worldObj != null && rc != null) { - worldObj.markBlockForUpdate(rc.posX, rc.posY, rc.posZ); + worldObj.markBlockForUpdate(rc); } } @@ -868,13 +875,13 @@ public abstract class MultiblockControllerBase implements IMultiblockControllerI return; } - ChunkCoordinates referenceCoord = getReferenceCoord(); + BlockPos referenceCoord = getReferenceCoord(); if (referenceCoord == null) { return; } - TileEntity saveTe = worldObj.getTileEntity(referenceCoord.posX, referenceCoord.posY, referenceCoord.posZ); - worldObj.markTileEntityChunkModified(referenceCoord.posX, referenceCoord.posY, referenceCoord.posZ, saveTe); + TileEntity saveTe = worldObj.getTileEntity(referenceCoord); + worldObj.markChunkDirty(referenceCoord, saveTe); } private static boolean isInvalid(IMultiblockComponent part) { diff --git a/src/main/java/forestry/core/multiblock/MultiblockControllerForestry.java b/src/main/java/forestry/core/multiblock/MultiblockControllerForestry.java index 879be8d47..9f6eb82a2 100644 --- a/src/main/java/forestry/core/multiblock/MultiblockControllerForestry.java +++ b/src/main/java/forestry/core/multiblock/MultiblockControllerForestry.java @@ -17,6 +17,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.IChatComponent; import net.minecraft.world.World; import com.mojang.authlib.GameProfile; @@ -119,10 +121,10 @@ public abstract class MultiblockControllerForestry extends MultiblockControllerB public final ItemStack decrStackSize(int slotIndex, int amount) { return getInternalInventory().decrStackSize(slotIndex, amount); } - + @Override - public final ItemStack getStackInSlotOnClosing(int slotIndex) { - return getInternalInventory().getStackInSlotOnClosing(slotIndex); + public ItemStack removeStackFromSlot(int slotIndex) { + return getInternalInventory().removeStackFromSlot(slotIndex); } @Override @@ -136,47 +138,72 @@ public abstract class MultiblockControllerForestry extends MultiblockControllerB } @Override - public final void openInventory() { - getInternalInventory().openInventory(); + public final void openInventory(EntityPlayer player) { + getInternalInventory().openInventory(player); } @Override - public final void closeInventory() { - getInternalInventory().closeInventory(); + public final void closeInventory(EntityPlayer player) { + getInternalInventory().closeInventory(player); } - + @Override - public final String getInventoryName() { - return getInternalInventory().getInventoryName(); + public String getName() { + return getInternalInventory().getName(); + } + + @Override + public IChatComponent getDisplayName() { + return getInternalInventory().getDisplayName(); } @Override public final boolean isUseableByPlayer(EntityPlayer player) { return getInternalInventory().isUseableByPlayer(player); } - + @Override - public final boolean hasCustomInventoryName() { - return getInternalInventory().hasCustomInventoryName(); + public boolean hasCustomName() { + return getInternalInventory().hasCustomName(); } @Override public final boolean isItemValidForSlot(int slotIndex, ItemStack itemStack) { return getInternalInventory().isItemValidForSlot(slotIndex, itemStack); } - + @Override - public final int[] getAccessibleSlotsFromSide(int side) { - return getInternalInventory().getAccessibleSlotsFromSide(side); + public int[] getSlotsForFace(EnumFacing side) { + return getInternalInventory().getSlotsForFace(side); } @Override - public final boolean canInsertItem(int slotIndex, ItemStack itemStack, int side) { + public final boolean canInsertItem(int slotIndex, ItemStack itemStack, EnumFacing side) { return getInternalInventory().canInsertItem(slotIndex, itemStack, side); } @Override - public final boolean canExtractItem(int slotIndex, ItemStack itemStack, int side) { + public final boolean canExtractItem(int slotIndex, ItemStack itemStack, EnumFacing side) { return getInternalInventory().canExtractItem(slotIndex, itemStack, side); } + + @Override + public int getField(int id) { + return getInternalInventory().getField(id); + } + + @Override + public int getFieldCount() { + return getInternalInventory().getFieldCount(); + } + + @Override + public void setField(int id, int value) { + getInternalInventory().setField(id, value); + } + + @Override + public void clear() { + getInternalInventory().clear(); + } } diff --git a/src/main/java/forestry/core/multiblock/MultiblockEventHandler.java b/src/main/java/forestry/core/multiblock/MultiblockEventHandler.java index 0bb1e7161..9a7795606 100644 --- a/src/main/java/forestry/core/multiblock/MultiblockEventHandler.java +++ b/src/main/java/forestry/core/multiblock/MultiblockEventHandler.java @@ -5,9 +5,8 @@ import net.minecraft.world.chunk.Chunk; import net.minecraftforge.event.world.ChunkEvent; import net.minecraftforge.event.world.WorldEvent; - -import cpw.mods.fml.common.eventhandler.EventPriority; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.eventhandler.EventPriority; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; /** * In your mod, subscribe this on both the client and server sides side to handle chunk diff --git a/src/main/java/forestry/core/multiblock/MultiblockLogic.java b/src/main/java/forestry/core/multiblock/MultiblockLogic.java index 337b94c44..deda9a24d 100644 --- a/src/main/java/forestry/core/multiblock/MultiblockLogic.java +++ b/src/main/java/forestry/core/multiblock/MultiblockLogic.java @@ -11,7 +11,7 @@ package forestry.core.multiblock; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import forestry.api.multiblock.IMultiblockComponent; @@ -122,8 +122,8 @@ public abstract class MultiblockLogic i public final void assertDetached(IMultiblockComponent part) { if (this.controller != null) { - ChunkCoordinates coords = part.getCoordinates(); - Log.info("[assert] Part @ (%d, %d, %d) should be detached already, but detected that it was not. This is not a fatal error, and will be repaired, but is unusual.", coords.posX, coords.posY, coords.posZ); + BlockPos coords = part.getCoordinates(); + Log.info("[assert] Part @ (%d, %d, %d) should be detached already, but detected that it was not. This is not a fatal error, and will be repaired, but is unusual.", coords.getX(), coords.getY(), coords.getZ()); this.controller = null; } } diff --git a/src/main/java/forestry/core/multiblock/MultiblockServerTickHandler.java b/src/main/java/forestry/core/multiblock/MultiblockServerTickHandler.java index 2b63b4690..58886e556 100644 --- a/src/main/java/forestry/core/multiblock/MultiblockServerTickHandler.java +++ b/src/main/java/forestry/core/multiblock/MultiblockServerTickHandler.java @@ -1,7 +1,7 @@ package forestry.core.multiblock; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.gameevent.TickEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.gameevent.TickEvent; /** * This is a generic multiblock tick handler. If you are using this code on your own, diff --git a/src/main/java/forestry/core/multiblock/MultiblockTileEntityForestry.java b/src/main/java/forestry/core/multiblock/MultiblockTileEntityForestry.java index b6849870c..794229193 100644 --- a/src/main/java/forestry/core/multiblock/MultiblockTileEntityForestry.java +++ b/src/main/java/forestry/core/multiblock/MultiblockTileEntityForestry.java @@ -15,6 +15,8 @@ import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTUtil; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.IChatComponent; import net.minecraft.world.World; import com.mojang.authlib.GameProfile; @@ -48,7 +50,7 @@ public abstract class MultiblockTileEntityForestry e super.readFromNBT(data); if (data.hasKey("owner")) { - owner = NBTUtil.func_152459_a(data.getCompoundTag("owner")); + owner = NBTUtil.readGameProfileFromNBT(data.getCompoundTag("owner")); } getInternalInventory().readFromNBT(data); @@ -60,7 +62,7 @@ public abstract class MultiblockTileEntityForestry e if (this.owner != null) { NBTTagCompound nbt = new NBTTagCompound(); - NBTUtil.func_152460_a(nbt, owner); + NBTUtil.writeGameProfile(nbt, owner); data.setTag("owner", nbt); } @@ -90,10 +92,10 @@ public abstract class MultiblockTileEntityForestry e public final ItemStack decrStackSize(int slotIndex, int amount) { return getInternalInventory().decrStackSize(slotIndex, amount); } - + @Override - public final ItemStack getStackInSlotOnClosing(int slotIndex) { - return getInternalInventory().getStackInSlotOnClosing(slotIndex); + public ItemStack removeStackFromSlot(int slotIndex) { + return getInternalInventory().removeStackFromSlot(slotIndex); } @Override @@ -107,18 +109,23 @@ public abstract class MultiblockTileEntityForestry e } @Override - public final void openInventory() { - getInternalInventory().openInventory(); + public final void openInventory(EntityPlayer player) { + getInternalInventory().openInventory(player); } @Override - public final void closeInventory() { - getInternalInventory().closeInventory(); + public final void closeInventory(EntityPlayer player) { + getInternalInventory().closeInventory(player); } @Override - public final String getInventoryName() { - return getInternalInventory().getInventoryName(); + public final String getName() { + return getInternalInventory().getName(); + } + + @Override + public IChatComponent getDisplayName() { + return getInternalInventory().getDisplayName(); } @Override @@ -127,26 +134,26 @@ public abstract class MultiblockTileEntityForestry e } @Override - public final boolean hasCustomInventoryName() { - return getInternalInventory().hasCustomInventoryName(); + public final boolean hasCustomName() { + return getInternalInventory().hasCustomName(); } @Override public final boolean isItemValidForSlot(int slotIndex, ItemStack itemStack) { return getInternalInventory().isItemValidForSlot(slotIndex, itemStack); } - + @Override - public final int[] getAccessibleSlotsFromSide(int side) { + public int[] getSlotsForFace(EnumFacing side) { if (allowsAutomation()) { - return getInternalInventory().getAccessibleSlotsFromSide(side); + return getInternalInventory().getSlotsForFace(side); } else { return Constants.SLOTS_NONE; } } @Override - public final boolean canInsertItem(int slotIndex, ItemStack itemStack, int side) { + public final boolean canInsertItem(int slotIndex, ItemStack itemStack, EnumFacing side) { if (allowsAutomation()) { return getInternalInventory().canInsertItem(slotIndex, itemStack, side); } else { @@ -155,7 +162,7 @@ public abstract class MultiblockTileEntityForestry e } @Override - public final boolean canExtractItem(int slotIndex, ItemStack itemStack, int side) { + public final boolean canExtractItem(int slotIndex, ItemStack itemStack, EnumFacing side) { if (allowsAutomation()) { return getInternalInventory().canExtractItem(slotIndex, itemStack, side); } else { @@ -188,4 +195,25 @@ public abstract class MultiblockTileEntityForestry e public final void setOwner(GameProfile owner) { this.owner = owner; } + + /* Fields */ + @Override + public int getField(int id) { + return getInternalInventory().getField(id); + } + + @Override + public int getFieldCount() { + return getInternalInventory().getFieldCount(); + } + + @Override + public void setField(int id, int value) { + getInternalInventory().setField(id, value); + } + + @Override + public void clear() { + getInternalInventory().clear(); + } } diff --git a/src/main/java/forestry/core/multiblock/MultiblockUtil.java b/src/main/java/forestry/core/multiblock/MultiblockUtil.java index 6fc01d37a..e6b99a9f9 100644 --- a/src/main/java/forestry/core/multiblock/MultiblockUtil.java +++ b/src/main/java/forestry/core/multiblock/MultiblockUtil.java @@ -14,12 +14,11 @@ import java.util.ArrayList; import java.util.List; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import net.minecraft.world.chunk.IChunkProvider; -import net.minecraftforge.common.util.ForgeDirection; - import forestry.api.multiblock.IMultiblockComponent; public class MultiblockUtil { @@ -32,26 +31,24 @@ public class MultiblockUtil { * @return An array of references to neighboring IMultiblockComponent tile entities. */ public static List getNeighboringParts(World world, IMultiblockComponent part) { - ChunkCoordinates partCoord = part.getCoordinates(); + BlockPos partCoord = part.getCoordinates(); - List neighbors = new ArrayList<>(ForgeDirection.VALID_DIRECTIONS.length); - for (ForgeDirection forgeDirection : ForgeDirection.VALID_DIRECTIONS) { - ChunkCoordinates neighborCoord = new ChunkCoordinates(partCoord); - neighborCoord.posX += forgeDirection.offsetX; - neighborCoord.posY += forgeDirection.offsetY; - neighborCoord.posZ += forgeDirection.offsetZ; + List neighbors = new ArrayList<>(EnumFacing.values().length); + for (EnumFacing facing : EnumFacing.values()) { + BlockPos neighborCoord = new BlockPos(partCoord); + neighborCoord = neighborCoord.offset(facing); neighbors.add(neighborCoord); } List neighborParts = new ArrayList<>(); IChunkProvider chunkProvider = world.getChunkProvider(); - for (ChunkCoordinates neighbor : neighbors) { - if (!chunkProvider.chunkExists(neighbor.posX >> 4, neighbor.posZ >> 4)) { + for (BlockPos neighbor : neighbors) { + if (!chunkProvider.chunkExists(neighbor.getX() >> 4, neighbor.getZ() >> 4)) { // Chunk not loaded, skip it. continue; } - TileEntity te = world.getTileEntity(neighbor.posX, neighbor.posY, neighbor.posZ); + TileEntity te = world.getTileEntity(neighbor); if (te instanceof IMultiblockComponent) { neighborParts.add((IMultiblockComponent) te); } diff --git a/src/main/java/forestry/core/multiblock/MultiblockWorldRegistry.java b/src/main/java/forestry/core/multiblock/MultiblockWorldRegistry.java index d4e0a2985..7f16413be 100644 --- a/src/main/java/forestry/core/multiblock/MultiblockWorldRegistry.java +++ b/src/main/java/forestry/core/multiblock/MultiblockWorldRegistry.java @@ -9,7 +9,7 @@ import java.util.List; import java.util.Set; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; import net.minecraft.world.ChunkCoordIntPair; import net.minecraft.world.World; import net.minecraft.world.chunk.IChunkProvider; @@ -91,7 +91,7 @@ public class MultiblockWorldRegistry { */ public void processMultiblockChanges() { IChunkProvider chunkProvider = worldObj.getChunkProvider(); - ChunkCoordinates coord; + BlockPos coord; // Merge pools - sets of adjacent machines which should be merged later on in processing List> mergePools = null; @@ -116,7 +116,7 @@ public class MultiblockWorldRegistry { // These are blocks that exist in a valid chunk and require a controller for (IMultiblockComponent orphan : orphansToProcess) { coord = orphan.getCoordinates(); - if (!chunkProvider.chunkExists(coord.posX >> 4, coord.posZ >> 4)) { + if (!chunkProvider.chunkExists(coord.getX() >> 4, coord.getZ() >> 4)) { continue; } @@ -125,7 +125,7 @@ public class MultiblockWorldRegistry { continue; } - if (worldObj.getTileEntity(coord.posX, coord.posY, coord.posZ) != orphan) { + if (worldObj.getTileEntity(coord) != orphan) { // This block has been replaced by another. continue; } @@ -310,12 +310,12 @@ public class MultiblockWorldRegistry { * @param part The part which is being added to this world. */ public void onPartAdded(IMultiblockComponent part) { - ChunkCoordinates worldLocation = part.getCoordinates(); + BlockPos worldLocation = part.getCoordinates(); - if (!worldObj.getChunkProvider().chunkExists(worldLocation.posX >> 4, worldLocation.posZ >> 4)) { + if (!worldObj.getChunkProvider().chunkExists(worldLocation.getX() >> 4, worldLocation.getZ() >> 4)) { // Part goes into the waiting-for-chunk-load list Set partSet; - long chunkHash = ChunkCoordIntPair.chunkXZ2Int(worldLocation.posX >> 4, worldLocation.posZ >> 4); + long chunkHash = ChunkCoordIntPair.chunkXZ2Int(worldLocation.getX() >> 4, worldLocation.getZ() >> 4); synchronized (partsAwaitingChunkLoadMutex) { if (!partsAwaitingChunkLoad.containsKey(chunkHash)) { partSet = new HashSet<>(); @@ -338,9 +338,9 @@ public class MultiblockWorldRegistry { * @param part The part which is being removed. */ public void onPartRemovedFromWorld(IMultiblockComponent part) { - ChunkCoordinates coord = part.getCoordinates(); + BlockPos coord = part.getCoordinates(); if (coord != null) { - long hash = ChunkCoordIntPair.chunkXZ2Int(coord.posX >> 4, coord.posZ >> 4); + long hash = ChunkCoordIntPair.chunkXZ2Int(coord.getX() >> 4, coord.getZ() >> 4); if (partsAwaitingChunkLoad.containsKey(hash)) { synchronized (partsAwaitingChunkLoadMutex) { diff --git a/src/main/java/forestry/core/multiblock/RectangularMultiblockControllerBase.java b/src/main/java/forestry/core/multiblock/RectangularMultiblockControllerBase.java index 43213c138..dcd3f4ceb 100644 --- a/src/main/java/forestry/core/multiblock/RectangularMultiblockControllerBase.java +++ b/src/main/java/forestry/core/multiblock/RectangularMultiblockControllerBase.java @@ -1,7 +1,7 @@ package forestry.core.multiblock; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; import net.minecraft.util.StatCollector; import net.minecraft.world.World; @@ -26,13 +26,13 @@ public abstract class RectangularMultiblockControllerBase extends MultiblockCont throw new MultiblockValidationException(StatCollector.translateToLocalFormatted("for.multiblock.error.small", minX, minY, minZ)); } - ChunkCoordinates maximumCoord = getMaximumCoord(); - ChunkCoordinates minimumCoord = getMinimumCoord(); + BlockPos maximumCoord = getMaximumCoord(); + BlockPos minimumCoord = getMinimumCoord(); // Quickly check for exceeded dimensions - int deltaX = maximumCoord.posX - minimumCoord.posX + 1; - int deltaY = maximumCoord.posY - minimumCoord.posY + 1; - int deltaZ = maximumCoord.posZ - minimumCoord.posZ + 1; + int deltaX = maximumCoord.getX() - minimumCoord.getX() + 1; + int deltaY = maximumCoord.getY() - minimumCoord.getY() + 1; + int deltaZ = maximumCoord.getZ() - minimumCoord.getZ() + 1; int maxX = sizeLimits.getMaximumXSize(); int maxY = sizeLimits.getMaximumYSize(); @@ -63,12 +63,12 @@ public abstract class RectangularMultiblockControllerBase extends MultiblockCont IMultiblockComponent part; Class myClass = this.getClass(); - for (int x = minimumCoord.posX; x <= maximumCoord.posX; x++) { - for (int y = minimumCoord.posY; y <= maximumCoord.posY; y++) { - for (int z = minimumCoord.posZ; z <= maximumCoord.posZ; z++) { + for (int x = minimumCoord.getX(); x <= maximumCoord.getX(); x++) { + for (int y = minimumCoord.getY(); y <= maximumCoord.getY(); y++) { + for (int z = minimumCoord.getZ(); z <= maximumCoord.getZ(); z++) { // Okay, figure out what sort of block this should be. - - te = this.worldObj.getTileEntity(x, y, z); + BlockPos pos = new BlockPos(x, y, z); + te = this.worldObj.getTileEntity(pos); if (te instanceof IMultiblockComponent) { part = (IMultiblockComponent) te; @@ -83,39 +83,40 @@ public abstract class RectangularMultiblockControllerBase extends MultiblockCont // Validate block type against both part-level and material-level validators. int extremes = 0; - if (x == minimumCoord.posX) { + + if (x == minimumCoord.getX()) { extremes++; } - if (y == minimumCoord.posY) { + if (y == minimumCoord.getY()) { extremes++; } - if (z == minimumCoord.posZ) { + if (z == minimumCoord.getZ()) { extremes++; } - if (x == maximumCoord.posX) { + if (x == maximumCoord.getX()) { extremes++; } - if (y == maximumCoord.posY) { + if (y == maximumCoord.getY()) { extremes++; } - if (z == maximumCoord.posZ) { + if (z == maximumCoord.getZ()) { extremes++; } if (extremes >= 1) { // Side - int exteriorLevel = y - minimumCoord.posY; + int exteriorLevel = y - minimumCoord.getY(); if (part != null) { isGoodForExteriorLevel(part, exteriorLevel); } else { - isBlockGoodForExteriorLevel(exteriorLevel, this.worldObj, x, y, z); + isBlockGoodForExteriorLevel(exteriorLevel, this.worldObj, pos); } } else { if (part != null) { isGoodForInterior(part); } else { - isBlockGoodForInterior(this.worldObj, x, y, z); + isBlockGoodForInterior(this.worldObj, pos); } } } diff --git a/src/main/java/forestry/core/network/DataInputStreamForestry.java b/src/main/java/forestry/core/network/DataInputStreamForestry.java index 9dad78abb..44036c356 100644 --- a/src/main/java/forestry/core/network/DataInputStreamForestry.java +++ b/src/main/java/forestry/core/network/DataInputStreamForestry.java @@ -1,6 +1,5 @@ package forestry.core.network; -import java.io.ByteArrayInputStream; import java.io.DataInputStream; import java.io.IOException; import java.io.InputStream; @@ -8,18 +7,18 @@ import java.io.InvalidObjectException; import java.util.Collection; import java.util.List; +import forestry.core.utils.ItemStackUtil; import net.minecraft.inventory.IInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompressedStreamTools; +import net.minecraft.nbt.NBTSizeTracker; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; -import cpw.mods.fml.common.registry.GameData; - public class DataInputStreamForestry extends DataInputStream { public DataInputStreamForestry(InputStream in) { @@ -31,13 +30,13 @@ public class DataInputStreamForestry extends DataInputStream { String itemName = readUTF(); if (!itemName.isEmpty()) { - Item item = GameData.getItemRegistry().getRaw(itemName); + Item item = ItemStackUtil.getItemFromRegistry(itemName); byte stackSize = readByte(); int meta = readVarInt(); itemstack = new ItemStack(item, stackSize, meta); if (item.isDamageable() || item.getShareTag()) { - itemstack.stackTagCompound = readNBTTagCompound(); + itemstack.setTagCompound(readNBTTagCompound()); } } @@ -134,20 +133,21 @@ public class DataInputStreamForestry extends DataInputStream { if (length < 0) { return null; } else { - byte[] compressed = new byte[length]; - readFully(compressed); - return CompressedStreamTools.readCompressed(new ByteArrayInputStream(compressed)); + return CompressedStreamTools.read(this, new NBTSizeTracker(2097152L)); } } public FluidStack readFluidStack() throws IOException { - int fluidId = readVarInt(); - Fluid fluid = FluidRegistry.getFluid(fluidId); - if (fluid == null) { - return null; - } - int amount = readVarInt(); - return new FluidStack(fluid, amount); + if(amount > 0){ + String fluidName = readUTF(); + Fluid fluid = FluidRegistry.getFluid(fluidName); + if (fluid == null) { + return null; + } + + return new FluidStack(fluid, amount); + } + return null; } } diff --git a/src/main/java/forestry/core/network/DataOutputStreamForestry.java b/src/main/java/forestry/core/network/DataOutputStreamForestry.java index 9caff858d..51421fd17 100644 --- a/src/main/java/forestry/core/network/DataOutputStreamForestry.java +++ b/src/main/java/forestry/core/network/DataOutputStreamForestry.java @@ -6,6 +6,7 @@ import java.io.OutputStream; import java.util.Collection; import java.util.List; +import forestry.core.utils.ItemStackUtil; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompressedStreamTools; @@ -13,8 +14,6 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.fluids.FluidStack; -import cpw.mods.fml.common.registry.GameData; - public class DataOutputStreamForestry extends DataOutputStream { public DataOutputStreamForestry(OutputStream out) { @@ -25,12 +24,12 @@ public class DataOutputStreamForestry extends DataOutputStream { if (itemstack == null) { writeUTF(""); } else { - writeUTF(GameData.getItemRegistry().getNameForObject(itemstack.getItem())); + writeUTF(ItemStackUtil.getItemNameFromRegistryAsSting(itemstack.getItem())); writeByte(itemstack.stackSize); writeVarInt(itemstack.getItemDamage()); if (itemstack.getItem().isDamageable() || itemstack.getItem().getShareTag()) { - writeNBTTagCompound(itemstack.stackTagCompound); + writeNBTTagCompound(itemstack.getTagCompound()); } } } @@ -106,9 +105,8 @@ public class DataOutputStreamForestry extends DataOutputStream { if (nbttagcompound == null) { writeVarInt(-1); } else { - byte[] compressed = CompressedStreamTools.compress(nbttagcompound); - writeVarInt((short) compressed.length); - write(compressed); + writeVarInt(0); + CompressedStreamTools.write(nbttagcompound, this); } } @@ -116,8 +114,8 @@ public class DataOutputStreamForestry extends DataOutputStream { if (fluidStack == null) { writeVarInt(-1); } else { - writeVarInt(fluidStack.getFluidID()); writeVarInt(fluidStack.amount); + writeUTF(fluidStack.getFluid().getName()); } } } diff --git a/src/main/java/forestry/core/network/ForestryPacket.java b/src/main/java/forestry/core/network/ForestryPacket.java index 339e251ea..460b99f1f 100755 --- a/src/main/java/forestry/core/network/ForestryPacket.java +++ b/src/main/java/forestry/core/network/ForestryPacket.java @@ -10,19 +10,20 @@ ******************************************************************************/ package forestry.core.network; -import java.io.ByteArrayOutputStream; import java.io.IOException; -import cpw.mods.fml.common.network.internal.FMLProxyPacket; - +import io.netty.buffer.ByteBufOutputStream; import io.netty.buffer.Unpooled; +import net.minecraft.network.PacketBuffer; +import net.minecraftforge.fml.common.network.internal.FMLProxyPacket; public abstract class ForestryPacket implements IForestryPacket { private final IPacketId id = getPacketId(); + @Override public final FMLProxyPacket getPacket() { - ByteArrayOutputStream bytes = new ByteArrayOutputStream(); - DataOutputStreamForestry data = new DataOutputStreamForestry(bytes); + ByteBufOutputStream buf = new ByteBufOutputStream(Unpooled.buffer()); + DataOutputStreamForestry data = new DataOutputStreamForestry(buf); try { data.writeByte(id.ordinal()); @@ -31,12 +32,13 @@ public abstract class ForestryPacket implements IForestryPacket { e.printStackTrace(); } - return new FMLProxyPacket(Unpooled.wrappedBuffer(bytes.toByteArray()), PacketHandler.channelId); + return new FMLProxyPacket(new PacketBuffer(buf.buffer()), PacketHandler.channelId); } protected void writeData(DataOutputStreamForestry data) throws IOException { } + @Override public void readData(DataInputStreamForestry data) throws IOException { } } diff --git a/src/main/java/forestry/core/network/IForestryPacket.java b/src/main/java/forestry/core/network/IForestryPacket.java index e0a77b2a3..f20f0bdd7 100644 --- a/src/main/java/forestry/core/network/IForestryPacket.java +++ b/src/main/java/forestry/core/network/IForestryPacket.java @@ -12,7 +12,7 @@ package forestry.core.network; import java.io.IOException; -import cpw.mods.fml.common.network.internal.FMLProxyPacket; +import net.minecraftforge.fml.common.network.internal.FMLProxyPacket; public interface IForestryPacket { void readData(DataInputStreamForestry data) throws IOException; diff --git a/src/main/java/forestry/core/network/ILocatedPacket.java b/src/main/java/forestry/core/network/ILocatedPacket.java index 47400a405..14f409252 100755 --- a/src/main/java/forestry/core/network/ILocatedPacket.java +++ b/src/main/java/forestry/core/network/ILocatedPacket.java @@ -10,10 +10,8 @@ ******************************************************************************/ package forestry.core.network; +import net.minecraft.util.BlockPos; + public interface ILocatedPacket { - int getPosX(); - - int getPosY(); - - int getPosZ(); + BlockPos getPos(); } diff --git a/src/main/java/forestry/core/network/PacketHandler.java b/src/main/java/forestry/core/network/PacketHandler.java index a31fdb6b3..34d5ae8c8 100644 --- a/src/main/java/forestry/core/network/PacketHandler.java +++ b/src/main/java/forestry/core/network/PacketHandler.java @@ -15,14 +15,12 @@ import java.io.InputStream; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.network.NetHandlerPlayServer; - -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.network.FMLEventChannel; -import cpw.mods.fml.common.network.FMLNetworkEvent.ClientCustomPacketEvent; -import cpw.mods.fml.common.network.FMLNetworkEvent.ServerCustomPacketEvent; -import cpw.mods.fml.common.network.NetworkRegistry; -import cpw.mods.fml.common.network.internal.FMLProxyPacket; - +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.network.FMLEventChannel; +import net.minecraftforge.fml.common.network.FMLNetworkEvent.ClientCustomPacketEvent; +import net.minecraftforge.fml.common.network.FMLNetworkEvent.ServerCustomPacketEvent; +import net.minecraftforge.fml.common.network.NetworkRegistry; +import net.minecraftforge.fml.common.network.internal.FMLProxyPacket; import forestry.core.proxy.Proxies; import io.netty.buffer.ByteBufInputStream; diff --git a/src/main/java/forestry/core/network/packets/PacketCoordinates.java b/src/main/java/forestry/core/network/packets/PacketCoordinates.java index 3178628d5..105069e93 100644 --- a/src/main/java/forestry/core/network/packets/PacketCoordinates.java +++ b/src/main/java/forestry/core/network/packets/PacketCoordinates.java @@ -13,7 +13,7 @@ package forestry.core.network.packets; import java.io.IOException; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import forestry.core.network.DataInputStreamForestry; @@ -23,61 +23,44 @@ import forestry.core.network.ILocatedPacket; public abstract class PacketCoordinates extends ForestryPacket implements ILocatedPacket { - private int posX; - private int posY; - private int posZ; + private BlockPos pos; public PacketCoordinates() { } protected PacketCoordinates(TileEntity tileEntity) { - this(tileEntity.xCoord, tileEntity.yCoord, tileEntity.zCoord); + this(tileEntity.getPos()); } - protected PacketCoordinates(ChunkCoordinates coordinates) { - this(coordinates.posX, coordinates.posY, coordinates.posZ); + protected PacketCoordinates(BlockPos pos) { + this.pos = pos; } protected PacketCoordinates(int posX, int posY, int posZ) { - this.posX = posX; - this.posY = posY; - this.posZ = posZ; + this(new BlockPos(posX, posY, posX)); } @Override protected void writeData(DataOutputStreamForestry data) throws IOException { - data.writeVarInt(posX); - data.writeVarInt(posY); - data.writeVarInt(posZ); + data.writeVarInt(getPos().getX()); + data.writeVarInt(getPos().getY()); + data.writeVarInt(getPos().getZ()); } @Override public void readData(DataInputStreamForestry data) throws IOException { - posX = data.readVarInt(); - posY = data.readVarInt(); - posZ = data.readVarInt(); + int posX = data.readVarInt(); + int posY = data.readVarInt(); + int posZ = data.readVarInt(); + pos = new BlockPos(posX, posY, posZ); } - - protected final ChunkCoordinates getCoordinates() { - return new ChunkCoordinates(posX, posY, posZ); - } - + @Override - public final int getPosX() { - return posX; - } - - @Override - public final int getPosY() { - return posY; - } - - @Override - public final int getPosZ() { - return posZ; + public BlockPos getPos() { + return pos; } public final TileEntity getTarget(World world) { - return world.getTileEntity(posX, posY, posZ); + return world.getTileEntity(pos); } } diff --git a/src/main/java/forestry/core/network/packets/PacketDummy.java b/src/main/java/forestry/core/network/packets/PacketDummy.java index 11af7fee1..5397ce9f7 100644 --- a/src/main/java/forestry/core/network/packets/PacketDummy.java +++ b/src/main/java/forestry/core/network/packets/PacketDummy.java @@ -12,10 +12,9 @@ package forestry.core.network.packets; import java.io.IOException; -import cpw.mods.fml.common.network.internal.FMLProxyPacket; - import forestry.core.network.DataInputStreamForestry; import forestry.core.network.IForestryPacket; +import net.minecraftforge.fml.common.network.internal.FMLProxyPacket; public abstract class PacketDummy implements IForestryPacket { protected PacketDummy() { diff --git a/src/main/java/forestry/core/network/packets/PacketEntityUpdate.java b/src/main/java/forestry/core/network/packets/PacketEntityUpdate.java index 0f3e11c25..410730b5e 100644 --- a/src/main/java/forestry/core/network/packets/PacketEntityUpdate.java +++ b/src/main/java/forestry/core/network/packets/PacketEntityUpdate.java @@ -13,6 +13,7 @@ package forestry.core.network.packets; import java.io.IOException; import net.minecraft.entity.Entity; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import forestry.core.network.DataInputStreamForestry; @@ -50,17 +51,7 @@ public abstract class PacketEntityUpdate extends ForestryPacket implements ILoca } @Override - public int getPosX() { - return (int) entity.posX; - } - - @Override - public int getPosY() { - return (int) entity.posY; - } - - @Override - public int getPosZ() { - return (int) entity.posZ; + public BlockPos getPos() { + return entity.getPosition(); } } diff --git a/src/main/java/forestry/core/network/packets/PacketFXSignal.java b/src/main/java/forestry/core/network/packets/PacketFXSignal.java index ca7da9f7a..2b4f44577 100644 --- a/src/main/java/forestry/core/network/packets/PacketFXSignal.java +++ b/src/main/java/forestry/core/network/packets/PacketFXSignal.java @@ -12,16 +12,15 @@ package forestry.core.network.packets; import java.io.IOException; -import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; - -import cpw.mods.fml.common.registry.GameData; - +import net.minecraft.util.BlockPos; import forestry.core.network.DataInputStreamForestry; import forestry.core.network.DataOutputStreamForestry; import forestry.core.network.IForestryPacketClient; import forestry.core.network.PacketIdClient; import forestry.core.proxy.Proxies; +import forestry.core.utils.ItemStackUtil; public class PacketFXSignal extends PacketCoordinates implements IForestryPacketClient { @@ -46,26 +45,24 @@ public class PacketFXSignal extends PacketCoordinates implements IForestryPacket private VisualFXType visualFX; private SoundFXType soundFX; - private Block block; - private int meta; + private IBlockState state; public PacketFXSignal() { } - public PacketFXSignal(VisualFXType type, int xCoord, int yCoord, int zCoord, Block block, int meta) { - this(type, SoundFXType.NONE, xCoord, yCoord, zCoord, block, meta); + public PacketFXSignal(VisualFXType type, BlockPos pos, IBlockState state) { + this(type, SoundFXType.NONE, pos, state); } - public PacketFXSignal(SoundFXType type, int xCoord, int yCoord, int zCoord, Block block, int meta) { - this(VisualFXType.NONE, type, xCoord, yCoord, zCoord, block, meta); + public PacketFXSignal(SoundFXType type, BlockPos pos, IBlockState state) { + this(VisualFXType.NONE, type, pos, state); } - public PacketFXSignal(VisualFXType visualFX, SoundFXType soundFX, int xCoord, int yCoord, int zCoord, Block block, int meta) { - super(xCoord, yCoord, zCoord); + public PacketFXSignal(VisualFXType visualFX, SoundFXType soundFX, BlockPos pos, IBlockState state) { + super(pos); this.visualFX = visualFX; this.soundFX = soundFX; - this.block = block; - this.meta = meta; + this.state = state; } @Override @@ -73,8 +70,8 @@ public class PacketFXSignal extends PacketCoordinates implements IForestryPacket super.writeData(data); data.writeShort(visualFX.ordinal()); data.writeShort(soundFX.ordinal()); - data.writeUTF(GameData.getBlockRegistry().getNameForObject(block)); - data.writeInt(meta); + data.writeUTF(ItemStackUtil.getBlockNameFromRegistryAsSting(state.getBlock())); + data.writeInt(state.getBlock().getMetaFromState(state)); } @Override @@ -82,26 +79,27 @@ public class PacketFXSignal extends PacketCoordinates implements IForestryPacket super.readData(data); this.visualFX = VisualFXType.values()[data.readShort()]; this.soundFX = SoundFXType.values()[data.readShort()]; - this.block = GameData.getBlockRegistry().getRaw(data.readUTF()); - this.meta = data.readInt(); + int meta = data.readInt(); + this.state = ItemStackUtil.getBlockFromRegistry(data.readUTF()).getStateFromMeta(meta); } @Override public void onPacketData(DataInputStreamForestry data, EntityPlayer player) throws IOException { if (visualFX != VisualFXType.NONE) { - Proxies.common.addBlockDestroyEffects(Proxies.common.getRenderWorld(), getPosX(), getPosY(), getPosZ(), block, meta); + Proxies.common.addBlockDestroyEffects(Proxies.common.getRenderWorld(), getPos(), state); } if (soundFX != SoundFXType.NONE) { if (soundFX == SoundFXType.BLOCK_DESTROY) { - Proxies.common.playBlockBreakSoundFX(Proxies.common.getRenderWorld(), getPosX(), getPosY(), getPosZ(), block); + Proxies.common.playBlockBreakSoundFX(Proxies.common.getRenderWorld(), getPos(), state); } else if (soundFX == SoundFXType.BLOCK_PLACE) { - Proxies.common.playBlockPlaceSoundFX(Proxies.common.getRenderWorld(), getPosX(), getPosY(), getPosZ(), block); + Proxies.common.playBlockPlaceSoundFX(Proxies.common.getRenderWorld(), getPos(), state); } else { - Proxies.common.playSoundFX(Proxies.common.getRenderWorld(), getPosX(), getPosY(), getPosZ(), soundFX.soundFile, soundFX.volume, soundFX.pitch); + Proxies.common.playSoundFX(Proxies.common.getRenderWorld(), getPos(), soundFX.soundFile, soundFX.volume, soundFX.pitch); } } } + @Override public PacketIdClient getPacketId() { return PacketIdClient.FX_SIGNAL; diff --git a/src/main/java/forestry/core/proxy/Proxies.java b/src/main/java/forestry/core/proxy/Proxies.java index be643d819..ff46eeb79 100755 --- a/src/main/java/forestry/core/proxy/Proxies.java +++ b/src/main/java/forestry/core/proxy/Proxies.java @@ -10,7 +10,7 @@ ******************************************************************************/ package forestry.core.proxy; -import cpw.mods.fml.common.SidedProxy; +import net.minecraftforge.fml.common.SidedProxy; public class Proxies { @SidedProxy(clientSide = "forestry.core.proxy.ProxyCommonClient", serverSide = "forestry.core.proxy.ProxyCommon") diff --git a/src/main/java/forestry/core/proxy/ProxyCommon.java b/src/main/java/forestry/core/proxy/ProxyCommon.java index 8d3af60e7..ceb01fca4 100755 --- a/src/main/java/forestry/core/proxy/ProxyCommon.java +++ b/src/main/java/forestry/core/proxy/ProxyCommon.java @@ -12,19 +12,18 @@ package forestry.core.proxy; import java.io.File; -import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.server.MinecraftServer; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; - -import cpw.mods.fml.client.FMLClientHandler; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.Loader; - +import net.minecraftforge.fml.client.FMLClientHandler; +import net.minecraftforge.fml.common.FMLCommonHandler; +import net.minecraftforge.fml.common.Loader; import forestry.core.TickHandlerCoreServer; import forestry.core.multiblock.MultiblockServerTickHandler; import forestry.core.network.packets.PacketFXSignal; @@ -54,7 +53,7 @@ public class ProxyCommon { public boolean isOp(EntityPlayer player) { MinecraftServer server = FMLCommonHandler.instance().getMinecraftServerInstance(); - return server.getConfigurationManager().func_152596_g(player.getGameProfile()); + return server.getConfigurationManager().canSendCommands(player.getGameProfile()); } public double getBlockReachDistance(EntityPlayer entityplayer) { @@ -65,31 +64,30 @@ public class ProxyCommon { return false; } - public void playSoundFX(World world, int x, int y, int z, Block block) { - Proxies.net.sendNetworkPacket(new PacketFXSignal(PacketFXSignal.SoundFXType.LEAF, x, y, z, block, 0), world); + public void playSoundFX(World world, BlockPos pos, IBlockState state) { + Proxies.net.sendNetworkPacket(new PacketFXSignal(PacketFXSignal.SoundFXType.LEAF, pos, state), world); } - public void playSoundFX(World world, int x, int y, int z, String sound, float volume, float pitch) { + public void playSoundFX(World world, BlockPos pos, String sound, float volume, float pitch) { } - public void addBlockDestroyEffects(World world, int xCoord, int yCoord, int zCoord, Block block, int i) { - sendFXSignal(PacketFXSignal.VisualFXType.BLOCK_DESTROY, PacketFXSignal.SoundFXType.BLOCK_DESTROY, world, xCoord, yCoord, zCoord, block, i); + public void addBlockDestroyEffects(World world, BlockPos pos, IBlockState state) { + sendFXSignal(PacketFXSignal.VisualFXType.BLOCK_DESTROY, PacketFXSignal.SoundFXType.BLOCK_DESTROY, world, pos, state); } - public void addBlockPlaceEffects(World world, int xCoord, int yCoord, int zCoord, Block block, int i) { - sendFXSignal(PacketFXSignal.VisualFXType.NONE, PacketFXSignal.SoundFXType.BLOCK_PLACE, world, xCoord, yCoord, zCoord, block, i); + public void addBlockPlaceEffects(World world, BlockPos pos, IBlockState state) { + sendFXSignal(PacketFXSignal.VisualFXType.NONE, PacketFXSignal.SoundFXType.BLOCK_PLACE, world, pos, state); } - public void playBlockBreakSoundFX(World world, int x, int y, int z, Block block) { + public void playBlockBreakSoundFX(World world, BlockPos pos, IBlockState state) { } - public void playBlockPlaceSoundFX(World world, int x, int y, int z, Block block) { + public void playBlockPlaceSoundFX(World world, BlockPos pos, IBlockState state) { } - public void sendFXSignal(PacketFXSignal.VisualFXType visualFX, PacketFXSignal.SoundFXType soundFX, World world, int xCoord, int yCoord, int zCoord, - Block block, int i) { + public void sendFXSignal(PacketFXSignal.VisualFXType visualFX, PacketFXSignal.SoundFXType soundFX, World world, BlockPos pos, IBlockState state) { if (!world.isRemote) { - Proxies.net.sendNetworkPacket(new PacketFXSignal(visualFX, soundFX, xCoord, yCoord, zCoord, block, i), world); + Proxies.net.sendNetworkPacket(new PacketFXSignal(visualFX, soundFX, pos, state), world); } } diff --git a/src/main/java/forestry/core/proxy/ProxyCommonClient.java b/src/main/java/forestry/core/proxy/ProxyCommonClient.java index 6bee8be2f..2fbcb8d19 100644 --- a/src/main/java/forestry/core/proxy/ProxyCommonClient.java +++ b/src/main/java/forestry/core/proxy/ProxyCommonClient.java @@ -13,13 +13,14 @@ package forestry.core.proxy; import java.io.File; import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.entity.EntityPlayerSP; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; - -import cpw.mods.fml.common.FMLCommonHandler; +import net.minecraftforge.fml.common.FMLCommonHandler; import org.lwjgl.input.Keyboard; @@ -72,52 +73,58 @@ public class ProxyCommonClient extends ProxyCommon { } @Override - public void playSoundFX(World world, int x, int y, int z, Block block) { + public void playSoundFX(World world, BlockPos pos, IBlockState state) { + Block block = state.getBlock(); if (!world.isRemote) { - super.playSoundFX(world, x, y, z, block); + super.playSoundFX(world, pos, state); } else { - playSoundFX(world, x, y, z, block.stepSound.getStepResourcePath(), block.stepSound.getVolume(), block.stepSound.getPitch()); + playSoundFX(world, pos, block.stepSound.getStepSound(), block.stepSound.getVolume(), block.stepSound.getFrequency()); } } @Override - public void playBlockBreakSoundFX(World world, int x, int y, int z, Block block) { + public void playBlockBreakSoundFX(World world, BlockPos pos, IBlockState state) { + Block block = state.getBlock(); if (!world.isRemote) { - super.playSoundFX(world, x, y, z, block); + super.playSoundFX(world, pos, state); } else { - playSoundFX(world, x, y, z, block.stepSound.getBreakSound(), block.stepSound.getVolume() / 4, block.stepSound.getPitch()); + playSoundFX(world, pos, block.stepSound.getBreakSound(), block.stepSound.getVolume() / 4, block.stepSound.getFrequency()); } } @Override - public void playBlockPlaceSoundFX(World world, int x, int y, int z, Block block) { + public void playBlockPlaceSoundFX(World world, BlockPos pos, IBlockState state) { + Block block = state.getBlock(); if (!world.isRemote) { - super.playSoundFX(world, x, y, z, block); + super.playSoundFX(world, pos, state); } else { - playSoundFX(world, x, y, z, block.stepSound.getStepResourcePath(), block.stepSound.getVolume() / 4, block.stepSound.getPitch()); + playSoundFX(world, pos, block.stepSound.getStepSound(), block.stepSound.getVolume() / 4, block.stepSound.getFrequency()); } } @Override - public void playSoundFX(World world, int x, int y, int z, String sound, float volume, float pitch) { + public void playSoundFX(World world, BlockPos pos, String sound, float volume, float pitch) { + int x = pos.getX(); + int y = pos.getY(); + int z = pos.getZ(); world.playSound(x + 0.5, y + 0.5, z + 0.5, sound, volume, (1.0f + (world.rand.nextFloat() - world.rand.nextFloat()) * 0.2f) * 0.7f, false); } @Override - public void addBlockDestroyEffects(World world, int xCoord, int yCoord, int zCoord, Block block, int i) { + public void addBlockDestroyEffects(World world, BlockPos pos, IBlockState state) { if (world.isRemote) { - getClientInstance().effectRenderer.addBlockDestroyEffects(xCoord, yCoord, zCoord, block, i); + getClientInstance().effectRenderer.addBlockDestroyEffects(pos, state); } else { - super.addBlockDestroyEffects(world, xCoord, yCoord, zCoord, block, i); + super.addBlockDestroyEffects(world, pos, state); } } @Override - public void addBlockPlaceEffects(World world, int xCoord, int yCoord, int zCoord, Block block, int i) { + public void addBlockPlaceEffects(World world, BlockPos pos, IBlockState state) { if (world.isRemote) { - playBlockPlaceSoundFX(world, xCoord, yCoord, zCoord, block); + playBlockPlaceSoundFX(world, pos, state); } else { - super.addBlockPlaceEffects(world, xCoord, yCoord, zCoord, block, i); + super.addBlockPlaceEffects(world, pos, state); } } diff --git a/src/main/java/forestry/core/proxy/ProxyNetwork.java b/src/main/java/forestry/core/proxy/ProxyNetwork.java index 483e0434a..9403e5af3 100755 --- a/src/main/java/forestry/core/proxy/ProxyNetwork.java +++ b/src/main/java/forestry/core/proxy/ProxyNetwork.java @@ -33,8 +33,8 @@ public class ProxyNetwork { WorldServer worldServer = (WorldServer) world; PlayerManager playerManager = worldServer.getPlayerManager(); - int chunkX = packet.getPosX() >> 4; - int chunkZ = packet.getPosZ() >> 4; + int chunkX = packet.getPos().getX() >> 4; + int chunkZ = packet.getPos().getZ() >> 4; for (Object playerObj : world.playerEntities) { if (playerObj instanceof EntityPlayerMP) { diff --git a/src/main/java/forestry/core/proxy/ProxyRender.java b/src/main/java/forestry/core/proxy/ProxyRender.java index 8b5e005c9..054dc941c 100755 --- a/src/main/java/forestry/core/proxy/ProxyRender.java +++ b/src/main/java/forestry/core/proxy/ProxyRender.java @@ -10,29 +10,24 @@ ******************************************************************************/ package forestry.core.proxy; +import net.minecraft.block.Block; +import net.minecraft.client.renderer.block.statemap.IStateMapper; +import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.client.resources.IResourceManager; import net.minecraft.entity.Entity; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; - -import forestry.core.render.IBlockRenderer; -import forestry.core.render.SpriteSheet; +import forestry.core.fluids.Fluids; +import forestry.core.render.model.BlockModelIndex; +import forestry.core.render.model.ModelIndex; import forestry.core.tiles.MachineDefinition; +import forestry.core.tiles.TileEscritoire; +import forestry.core.tiles.TileMill; +import forestry.core.tiles.TileNaturalistChest; public class ProxyRender { - public void init() { - } - - public int getCandleRenderId() { - return 0; - } - - public int getByBlockModelRenderId() { - return 0; - } - public boolean fancyGraphicsEnabled() { return false; } @@ -44,30 +39,39 @@ public class ProxyRender { public void registerTESR(MachineDefinition definition) { } - public IBlockRenderer getRenderDefaultMachine(String gfxBase) { + public TileEntitySpecialRenderer getRenderDefaultMachine(String gfxBase) { return null; } - public IBlockRenderer getRenderMill(String gfxBase) { + public TileEntitySpecialRenderer getRenderMill(String gfxBase) { return null; } - public IBlockRenderer getRenderMill(String gfxBase, byte charges) { + public TileEntitySpecialRenderer getRenderMill(String gfxBase, byte charges) { return null; } - public IBlockRenderer getRenderEscritoire() { + public TileEntitySpecialRenderer getRenderEscritoire() { return null; } - public IBlockRenderer getRenderChest(String textureName) { + public TileEntitySpecialRenderer getRenderChest(String textureName) { return null; } - - public void registerVillagerSkin(int villagerId, String texturePath) { + + public void registerBlockModel(BlockModelIndex index) { + } + + public void registerModel(ModelIndex index) { } - public void setHabitatLocatorTexture(Entity player, ChunkCoordinates coordinates) { + public void registerStateMapper(Block block, IStateMapper mapper) { + } + + public void registerFluidStateMapper(Block block, Fluids fluid) { + } + + public void setHabitatLocatorTexture(Entity player, BlockPos pos) { } public IResourceManager getSelectedTexturePack() { @@ -76,8 +80,7 @@ public class ProxyRender { public void bindTexture(ResourceLocation location) { } - - public void bindTexture(SpriteSheet spriteSheet) { + public void registerModels() { } /* FX */ diff --git a/src/main/java/forestry/core/proxy/ProxyRenderClient.java b/src/main/java/forestry/core/proxy/ProxyRenderClient.java index 1a4028ae6..5b2738fa7 100644 --- a/src/main/java/forestry/core/proxy/ProxyRenderClient.java +++ b/src/main/java/forestry/core/proxy/ProxyRenderClient.java @@ -10,67 +10,51 @@ ******************************************************************************/ package forestry.core.proxy; +import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; -import net.minecraft.client.particle.EntityExplodeFX; import net.minecraft.client.particle.EntityFX; -import net.minecraft.client.particle.EntitySpellParticleFX; +import net.minecraft.client.renderer.ItemMeshDefinition; +import net.minecraft.client.renderer.block.statemap.IStateMapper; +import net.minecraft.client.renderer.block.statemap.StateMapperBase; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.client.resources.IResourceManager; +import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.entity.Entity; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; - -import cpw.mods.fml.client.FMLClientHandler; -import cpw.mods.fml.client.registry.ClientRegistry; -import cpw.mods.fml.client.registry.RenderingRegistry; -import cpw.mods.fml.common.registry.VillagerRegistry; - +import net.minecraftforge.client.ForgeHooksClient; +import net.minecraftforge.client.model.ModelLoader; +import net.minecraftforge.fml.client.FMLClientHandler; +import net.minecraftforge.fml.client.registry.ClientRegistry; import forestry.apiculture.entities.EntityFXBee; import forestry.apiculture.render.ParticleRenderer; -import forestry.apiculture.render.RenderCandleBlock; import forestry.apiculture.render.TextureHabitatLocator; import forestry.core.config.Config; import forestry.core.entities.EntityFXHoneydust; import forestry.core.entities.EntityFXIgnition; import forestry.core.entities.EntityFXSnow; -import forestry.core.render.ForestryResource; -import forestry.core.render.IBlockRenderer; -import forestry.core.render.RenderBlock; +import forestry.core.fluids.Fluids; import forestry.core.render.RenderEscritoire; import forestry.core.render.RenderMachine; import forestry.core.render.RenderMill; import forestry.core.render.RenderNaturalistChest; -import forestry.core.render.SpriteSheet; import forestry.core.render.TextureManager; -import forestry.core.render.TileRendererIndex; +import forestry.core.render.model.BlockModelIndex; +import forestry.core.render.model.ModelIndex; +import forestry.core.render.model.ModelManager; +import forestry.core.render.model.RenderHandler; import forestry.core.tiles.MachineDefinition; +import forestry.core.tiles.TileEscritoire; +import forestry.core.tiles.TileMill; +import forestry.core.tiles.TileNaturalistChest; public class ProxyRenderClient extends ProxyRender { - private int byBlockModelId; - private int candleRenderId; - - @Override - public void init() { - byBlockModelId = RenderingRegistry.getNextAvailableRenderId(); - candleRenderId = RenderingRegistry.getNextAvailableRenderId(); - - RenderBlock renderHandler = new RenderBlock(); - RenderingRegistry.registerBlockHandler(byBlockModelId, renderHandler); - RenderingRegistry.registerBlockHandler(candleRenderId, new RenderCandleBlock()); - } - - @Override - public int getCandleRenderId() { - return candleRenderId; - } - - @Override - public int getByBlockModelRenderId() { - return byBlockModelId; - } - @Override public boolean fancyGraphicsEnabled() { return Proxies.common.getClientInstance().gameSettings.fancyGraphics; @@ -83,12 +67,13 @@ public class ProxyRenderClient extends ProxyRender { @Override public void registerTESR(MachineDefinition definition) { - RenderBlock.byBlockRenderer.put(new TileRendererIndex(definition.getBlock(), definition.getMeta()), definition.renderer); - ClientRegistry.bindTileEntitySpecialRenderer(definition.teClass, (TileEntitySpecialRenderer) definition.renderer); + ClientRegistry.bindTileEntitySpecialRenderer(definition.teClass, definition.renderer); + ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(definition.getBlock()), definition.getMeta(), definition.teClass); + } @Override - public IBlockRenderer getRenderDefaultMachine(String gfxBase) { + public TileEntitySpecialRenderer getRenderDefaultMachine(String gfxBase) { if (gfxBase == null) { return null; } @@ -96,33 +81,28 @@ public class ProxyRenderClient extends ProxyRender { } @Override - public IBlockRenderer getRenderMill(String gfxBase) { + public TileEntitySpecialRenderer getRenderMill(String gfxBase) { return new RenderMill(gfxBase); } @Override - public IBlockRenderer getRenderMill(String gfxBase, byte charges) { + public TileEntitySpecialRenderer getRenderMill(String gfxBase, byte charges) { return new RenderMill(gfxBase, charges); } @Override - public IBlockRenderer getRenderEscritoire() { + public TileEntitySpecialRenderer getRenderEscritoire() { return new RenderEscritoire(); } @Override - public IBlockRenderer getRenderChest(String textureName) { + public TileEntitySpecialRenderer getRenderChest(String textureName) { return new RenderNaturalistChest(textureName); } @Override - public void registerVillagerSkin(int villagerId, String texturePath) { - VillagerRegistry.instance().registerVillagerSkin(villagerId, new ForestryResource(texturePath)); - } - - @Override - public void setHabitatLocatorTexture(Entity player, ChunkCoordinates coordinates) { - TextureHabitatLocator.getInstance().setTargetCoordinates(coordinates); + public void setHabitatLocatorTexture(Entity player, BlockPos pos) { + TextureHabitatLocator.getInstance().setTargetCoordinates(pos); } @Override @@ -134,10 +114,52 @@ public class ProxyRenderClient extends ProxyRender { public void bindTexture(ResourceLocation location) { Proxies.common.getClientInstance().getTextureManager().bindTexture(location); } + + @Override + public void registerBlockModel(final BlockModelIndex index) { + RenderHandler.blockModels.add(index); + StateMapperBase ignoreState = new StateMapperBase() { + @Override + protected ModelResourceLocation getModelResourceLocation(IBlockState iBlockState) { + return index.blockModelLocation; + } + }; + registerStateMapper(index.block, ignoreState); + } + + @Override + public void registerModel(final ModelIndex index) { + RenderHandler.models.add(index); + } @Override - public void bindTexture(SpriteSheet spriteSheet) { - bindTexture(spriteSheet.getLocation()); + public void registerFluidStateMapper(Block block, final Fluids forestryFluid) { + final ModelResourceLocation fluidLocation = new ModelResourceLocation("forestry:blockforestryfluid", + forestryFluid.getTag()); + StateMapperBase ignoreState = new StateMapperBase() { + @Override + protected ModelResourceLocation getModelResourceLocation(IBlockState iBlockState) { + return fluidLocation; + } + }; + registerStateMapper(block, ignoreState); + ModelLoader.setCustomMeshDefinition(Item.getItemFromBlock(block), new ItemMeshDefinition() { + @Override + public ModelResourceLocation getModelLocation(ItemStack stack) { + return fluidLocation; + } + }); + } + + @Override + public void registerStateMapper(Block block, IStateMapper mapper) { + ModelLoader.setCustomStateMapper(block, mapper); + } + + @Override + public void registerModels() { + ModelManager.registerStateMappers(); + ModelManager.registerModels(); } public static boolean shouldSpawnParticle(World world) { @@ -188,7 +210,8 @@ public class ProxyRenderClient extends ProxyRender { return; } - Proxies.common.getClientInstance().effectRenderer.addEffect(new EntityExplodeFX(world, d1, d2, d3, 0, 0, 0)); + EntityFX entityfx = Proxies.common.getClientInstance().effectRenderer.spawnEffectParticle(EnumParticleTypes.EXPLOSION_NORMAL.getParticleID(), d1, d2, d3, 0, 0, 0); + Proxies.common.getClientInstance().effectRenderer.addEffect(entityfx); } @Override @@ -218,8 +241,8 @@ public class ProxyRenderClient extends ProxyRender { float red = (color >> 16 & 255) / 255.0F; float green = (color >> 8 & 255) / 255.0F; float blue = (color & 255) / 255.0F; - - EntityFX entityfx = new EntitySpellParticleFX(world, d1, d2, d3, 0, 0, 0); + + EntityFX entityfx = Proxies.common.getClientInstance().effectRenderer.spawnEffectParticle(EnumParticleTypes.SPELL.getParticleID(), d1, d2, d3, 0, 0, 0); entityfx.setRBGColorF(red, green, blue); Proxies.common.getClientInstance().effectRenderer.addEffect(entityfx); diff --git a/src/main/java/forestry/core/recipes/RecipeUtil.java b/src/main/java/forestry/core/recipes/RecipeUtil.java index d842d639b..35be5b01c 100644 --- a/src/main/java/forestry/core/recipes/RecipeUtil.java +++ b/src/main/java/forestry/core/recipes/RecipeUtil.java @@ -23,11 +23,10 @@ import net.minecraft.item.crafting.IRecipe; import net.minecraft.world.World; import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.ShapelessOreRecipe; -import cpw.mods.fml.common.registry.GameRegistry; - import forestry.api.recipes.IDescriptiveRecipe; import forestry.api.recipes.RecipeManagers; import forestry.core.fluids.Fluids; @@ -193,8 +192,8 @@ public abstract class RecipeUtil { if (craftIngredientCount == 2 && itemstack0.getItem() == itemstack1.getItem() && itemstack0.stackSize == 1 && itemstack1.stackSize == 1 && itemstack0.getItem().isRepairable()) { Item item = itemstack0.getItem(); - int damage0 = item.getMaxDamage() - itemstack0.getItemDamageForDisplay(); - int damage1 = item.getMaxDamage() - itemstack1.getItemDamageForDisplay(); + int damage0 = item.getMaxDamage() - itemstack0.getItemDamage(); + int damage1 = item.getMaxDamage() - itemstack1.getItemDamage(); int repairAmount = damage0 + damage1 + item.getMaxDamage() * 5 / 100; int repairedDamage = item.getMaxDamage() - repairAmount; diff --git a/src/main/java/forestry/core/recipes/ShapedRecipeCustom.java b/src/main/java/forestry/core/recipes/ShapedRecipeCustom.java index 64caf1d43..b7bb2ae35 100644 --- a/src/main/java/forestry/core/recipes/ShapedRecipeCustom.java +++ b/src/main/java/forestry/core/recipes/ShapedRecipeCustom.java @@ -155,8 +155,9 @@ public class ShapedRecipeCustom extends ShapedOreRecipe implements IDescriptiveR return false; } + @Override @SuppressWarnings("unchecked") - private boolean checkMatch(InventoryCrafting inv, int startX, int startY, boolean mirror) { + public boolean checkMatch(InventoryCrafting inv, int startX, int startY, boolean mirror) { for (int x = 0; x < MAX_CRAFT_GRID_WIDTH; x++) { for (int y = 0; y < MAX_CRAFT_GRID_HEIGHT; y++) { int subX = x - startX; diff --git a/src/main/java/forestry/core/recipes/jei/ForestryRecipeCategory.java b/src/main/java/forestry/core/recipes/jei/ForestryRecipeCategory.java new file mode 100644 index 000000000..3cca6f687 --- /dev/null +++ b/src/main/java/forestry/core/recipes/jei/ForestryRecipeCategory.java @@ -0,0 +1,49 @@ +package forestry.core.recipes.jei; + +import javax.annotation.Nonnull; + +import mezz.jei.api.gui.IDrawable; +import mezz.jei.api.gui.IRecipeLayout; +import mezz.jei.api.recipe.IRecipeCategory; +import mezz.jei.api.recipe.IRecipeWrapper; +import mezz.jei.util.Translator; + +public abstract class ForestryRecipeCategory implements IRecipeCategory { + + protected ForestryTooltipCallback tooltip; + @Nonnull + protected final IDrawable background; + @Nonnull + protected final String localizedName; + + public ForestryRecipeCategory(IDrawable background, String unlocalizedName) { + this.background = background; + this.localizedName = Translator.translateToLocal(unlocalizedName); + } + + public ForestryRecipeCategory(IDrawable background, String unlocalizedName, int slots) { + this.background = background; + this.localizedName = Translator.translateToLocal(unlocalizedName); + this.tooltip = new ForestryTooltipCallback(slots); + } + + @Nonnull + @Override + public String getTitle() { + return localizedName; + } + + @Nonnull + @Override + public IDrawable getBackground() { + return background; + } + + @Override + public void setRecipe(IRecipeLayout recipeLayout, IRecipeWrapper recipeWrapper) { + if(tooltip != null){ + this.tooltip = new ForestryTooltipCallback(tooltip.getTooltip().length); + } + } + +} diff --git a/src/main/java/forestry/core/recipes/jei/ForestryRecipeCategoryUid.java b/src/main/java/forestry/core/recipes/jei/ForestryRecipeCategoryUid.java new file mode 100644 index 000000000..e2a14ab6a --- /dev/null +++ b/src/main/java/forestry/core/recipes/jei/ForestryRecipeCategoryUid.java @@ -0,0 +1,18 @@ +package forestry.core.recipes.jei; + +public class ForestryRecipeCategoryUid { + + private ForestryRecipeCategoryUid() { + } + + public static final String BOTTLER = "forestry.bottler"; + public static final String CARPENTER = "forestry.carpenter"; + public static final String CENTRIFUGE = "forestry.centrifuge"; + public static final String FABRICATOR = "forestry.fabricator"; + public static final String FERMENTER = "forestry.fermenter"; + public static final String MOISTENER = "forestry.moistener"; + public static final String SQUEEZER = "forestry.squeezer"; + public static final String SQUEEZER_CONTAINER = "forestry.squeezer.container"; + public static final String STILL = "forestry.still"; + +} diff --git a/src/main/java/forestry/core/recipes/jei/ForestryRecipeWrapper.java b/src/main/java/forestry/core/recipes/jei/ForestryRecipeWrapper.java new file mode 100644 index 000000000..814d8cd56 --- /dev/null +++ b/src/main/java/forestry/core/recipes/jei/ForestryRecipeWrapper.java @@ -0,0 +1,68 @@ +package forestry.core.recipes.jei; + +import java.util.Collections; +import java.util.List; + +import javax.annotation.Nonnull; + +import mezz.jei.api.recipe.IRecipeWrapper; +import net.minecraft.client.Minecraft; +import net.minecraftforge.fluids.FluidStack; + +public abstract class ForestryRecipeWrapper implements IRecipeWrapper { + + @Nonnull + protected final R recipe; + + public ForestryRecipeWrapper(@Nonnull R recipe) { + this.recipe = recipe; + } + + @Override + public List getInputs() { + return Collections.emptyList(); + } + + @Override + public List getOutputs() { + return Collections.emptyList(); + } + + @Override + public List getFluidInputs() { + return Collections.emptyList(); + } + + @Override + public List getFluidOutputs() { + return Collections.emptyList(); + } + + @Override + public void drawInfo(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight) { + } + + @Override + public void drawInfo(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight, int mouseX, int mouseY) { + } + + @Override + public boolean handleClick(@Nonnull Minecraft minecraft, int mouseX, int mouseY, int mouseButton) { + return false; + } + + @Override + public void drawAnimations(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight) { + } + + @Nonnull + @Override + public List getTooltipStrings(int mouseX, int mouseY) { + return Collections.emptyList(); + } + + public R getRecipe() { + return recipe; + } + +} diff --git a/src/main/java/forestry/core/recipes/jei/ForestryTooltipCallback.java b/src/main/java/forestry/core/recipes/jei/ForestryTooltipCallback.java new file mode 100644 index 000000000..a2c672de6 --- /dev/null +++ b/src/main/java/forestry/core/recipes/jei/ForestryTooltipCallback.java @@ -0,0 +1,58 @@ +package forestry.core.recipes.jei; + +import java.text.NumberFormat; +import java.util.ArrayList; +import java.util.List; + +import mezz.jei.api.gui.ITooltipCallback; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumChatFormatting; + +public class ForestryTooltipCallback implements ITooltipCallback{ + + private List[] tip; + + public ForestryTooltipCallback(int slots) { + tip = new List[slots]; + for(int i = 0;i < slots;i++){ + tip[i] = new ArrayList(); + } + } + + public void addToTooltip(int index, List tooltip) { + this.tip[index].addAll(tooltip); + } + + public void addToTooltip(int index, String tooltip) { + this.tip[index].add(tooltip); + } + + public List getTooltip(int index) { + return tip[index]; + } + + public List[] getTooltip() { + return tip; + } + + @Override + public void onTooltip(int slotIndex, boolean input, ItemStack ingredient, List tooltip) { + List tip = this.tip[slotIndex]; + if(!tip.isEmpty()){ + tooltip.addAll(tip); + } + } + + public void addChanceTooltip(int index, float chance) { + if (chance <= 0.0F) { + tip[index].add(EnumChatFormatting.GRAY + String.format(JEIUtils.translate("chance"), JEIUtils.translate("chance.never"))); + } else if (chance < 0.01F) { + tip[index].add(EnumChatFormatting.GRAY + String.format(JEIUtils.translate("chance"), JEIUtils.translate("chance.lessThan1"))); + } else if (chance != 1.0F) { + NumberFormat percentFormat = NumberFormat.getPercentInstance(); + percentFormat.setMaximumFractionDigits(2); + tip[index].add(EnumChatFormatting.GRAY + String.format(JEIUtils.translate("chance"), String.valueOf(percentFormat.format(chance)))); + } + } + +} diff --git a/src/main/java/forestry/core/recipes/jei/JEIIntegrationPlugin.java b/src/main/java/forestry/core/recipes/jei/JEIIntegrationPlugin.java new file mode 100644 index 000000000..89eee1c5d --- /dev/null +++ b/src/main/java/forestry/core/recipes/jei/JEIIntegrationPlugin.java @@ -0,0 +1,99 @@ +package forestry.core.recipes.jei; + +import forestry.factory.gui.ContainerWorktable; +import forestry.factory.recipes.jei.bottler.BottlerRecipeCategory; +import forestry.factory.recipes.jei.bottler.BottlerRecipeHandler; +import forestry.factory.recipes.jei.bottler.BottlerRecipeMaker; +import forestry.factory.recipes.jei.carpenter.CarpenterRecipeCategory; +import forestry.factory.recipes.jei.carpenter.CarpenterRecipeHandler; +import forestry.factory.recipes.jei.carpenter.CarpenterRecipeMaker; +import forestry.factory.recipes.jei.centrifuge.CentrifugeRecipeCategory; +import forestry.factory.recipes.jei.centrifuge.CentrifugeRecipeHandler; +import forestry.factory.recipes.jei.centrifuge.CentrifugeRecipeMaker; +import forestry.factory.recipes.jei.fabricator.FabricatorRecipeCategory; +import forestry.factory.recipes.jei.fabricator.FabricatorRecipeHandler; +import forestry.factory.recipes.jei.fabricator.FabricatorRecipeMaker; +import forestry.factory.recipes.jei.fermenter.FermenterRecipeCategory; +import forestry.factory.recipes.jei.fermenter.FermenterRecipeHandler; +import forestry.factory.recipes.jei.fermenter.FermenterRecipeMaker; +import forestry.factory.recipes.jei.moistener.MoistenerRecipeCategory; +import forestry.factory.recipes.jei.moistener.MoistenerRecipeHandler; +import forestry.factory.recipes.jei.moistener.MoistenerRecipeMaker; +import forestry.factory.recipes.jei.squeezer.SqueezerContainerRecipeWrapper; +import forestry.factory.recipes.jei.squeezer.SqueezerRecipeCategory; +import forestry.factory.recipes.jei.squeezer.SqueezerRecipeHandler; +import forestry.factory.recipes.jei.squeezer.SqueezerRecipeMaker; +import forestry.factory.recipes.jei.squeezer.SqueezerRecipeWrapper; +import forestry.factory.recipes.jei.still.StillRecipeCategory; +import forestry.factory.recipes.jei.still.StillRecipeHandler; +import forestry.factory.recipes.jei.still.StillRecipeMaker; +import mezz.jei.api.IGuiHelper; +import mezz.jei.api.IItemRegistry; +import mezz.jei.api.IJeiHelpers; +import mezz.jei.api.IModPlugin; +import mezz.jei.api.IModRegistry; +import mezz.jei.api.IRecipeRegistry; +import mezz.jei.api.JEIPlugin; +import mezz.jei.api.recipe.VanillaRecipeCategoryUid; +import mezz.jei.api.recipe.transfer.IRecipeTransferRegistry; + +@JEIPlugin +public class JEIIntegrationPlugin implements IModPlugin{ + + private IItemRegistry itemRegistry; + private IJeiHelpers jeiHelpers; + + @Override + public void onJeiHelpersAvailable(IJeiHelpers jeiHelpers) { + this.jeiHelpers = jeiHelpers; + } + + @Override + public void onItemRegistryAvailable(IItemRegistry itemRegistry) { + this.itemRegistry = itemRegistry; + } + + @Override + public void register(IModRegistry registry) { + IGuiHelper guiHelper = jeiHelpers.getGuiHelper(); + + registry.addRecipeCategories(new BottlerRecipeCategory(guiHelper), + new CarpenterRecipeCategory(guiHelper), + new CentrifugeRecipeCategory(guiHelper), + new FabricatorRecipeCategory(guiHelper), + new FermenterRecipeCategory(guiHelper), + new MoistenerRecipeCategory(guiHelper), + new SqueezerRecipeCategory(guiHelper, ForestryRecipeCategoryUid.SQUEEZER), + new SqueezerRecipeCategory(guiHelper, ForestryRecipeCategoryUid.SQUEEZER_CONTAINER), + new StillRecipeCategory(guiHelper)); + + registry.addRecipeHandlers(new BottlerRecipeHandler(), + new CarpenterRecipeHandler(), + new CentrifugeRecipeHandler(), + new FabricatorRecipeHandler(), + new FermenterRecipeHandler(), + new MoistenerRecipeHandler(), + new SqueezerRecipeHandler(SqueezerRecipeWrapper.class, ForestryRecipeCategoryUid.SQUEEZER), + new SqueezerRecipeHandler(SqueezerContainerRecipeWrapper.class, ForestryRecipeCategoryUid.SQUEEZER_CONTAINER), + new StillRecipeHandler()); + + registry.addRecipes(BottlerRecipeMaker.getBottlerRecipes()); + registry.addRecipes(CarpenterRecipeMaker.getCrapenterRecipes()); + registry.addRecipes(CentrifugeRecipeMaker.getCentrifugeRecipe()); + registry.addRecipes(FabricatorRecipeMaker.getFabricatorRecipes()); + registry.addRecipes(FermenterRecipeMaker.getFermenterRecipes()); + registry.addRecipes(MoistenerRecipeMaker.getMoistenerRecipes()); + registry.addRecipes(SqueezerRecipeMaker.getSqueezerRecipes()); + registry.addRecipes(SqueezerRecipeMaker.getSqueezerContainerRecipes()); + registry.addRecipes(StillRecipeMaker.getStillRecipes()); + + IRecipeTransferRegistry transferTegistry = registry.getRecipeTransferRegistry(); + transferTegistry.addRecipeTransferHandler(ContainerWorktable.class, VanillaRecipeCategoryUid.CRAFTING, 55, 9, 1, 36); + + } + + @Override + public void onRecipeRegistryAvailable(IRecipeRegistry recipeRegistry) { + } + +} diff --git a/src/main/java/forestry/core/recipes/nei/NEIUtils.java b/src/main/java/forestry/core/recipes/jei/JEIUtils.java similarity index 94% rename from src/main/java/forestry/core/recipes/nei/NEIUtils.java rename to src/main/java/forestry/core/recipes/jei/JEIUtils.java index 881f81f09..2a0550d5b 100644 --- a/src/main/java/forestry/core/recipes/nei/NEIUtils.java +++ b/src/main/java/forestry/core/recipes/jei/JEIUtils.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.core.recipes.nei; +package forestry.core.recipes.jei; import java.util.ArrayList; import java.util.Collections; @@ -25,10 +25,10 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidBlock; import net.minecraftforge.fluids.IFluidContainerItem; -public class NEIUtils { +public class JEIUtils { public static String translate(String unlocalized) { - return StatCollector.translateToLocal("neiintegration." + unlocalized); + return StatCollector.translateToLocal("forestry.jei." + unlocalized); } public static List getItemVariations(ItemStack base) { diff --git a/src/main/java/forestry/core/recipes/nei/CustomOverlayHandler.java b/src/main/java/forestry/core/recipes/nei/CustomOverlayHandler.java deleted file mode 100644 index ab3285e5b..000000000 --- a/src/main/java/forestry/core/recipes/nei/CustomOverlayHandler.java +++ /dev/null @@ -1,79 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v3 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: - * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges - ******************************************************************************/ -package forestry.core.recipes.nei; - -import java.util.List; - -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; - -import forestry.core.proxy.Proxies; -import forestry.factory.network.packets.PacketWorktableNEISelect; - -import codechicken.nei.LayoutManager; -import codechicken.nei.OffsetPositioner; -import codechicken.nei.PositionedStack; -import codechicken.nei.api.DefaultOverlayRenderer; -import codechicken.nei.api.IOverlayHandler; -import codechicken.nei.api.IStackPositioner; -import codechicken.nei.recipe.IRecipeHandler; - -/** - * @author bdew - */ -public class CustomOverlayHandler implements IOverlayHandler { - private final int xOffs; - private final int yOffs; - private final boolean forceShift; - - public CustomOverlayHandler(int xOffs, int yOffs, boolean forceShift) { - this.xOffs = xOffs; - this.yOffs = yOffs; - this.forceShift = forceShift; - } - - @Override - public void overlayRecipe(GuiContainer cont, IRecipeHandler recipe, int recipeIndex, boolean shift) { - List ingr = recipe.getIngredientStacks(recipeIndex); - - if (shift || forceShift) { - NBTTagList stacksnbt = new NBTTagList(); - - for (PositionedStack pstack : ingr) { - if (pstack != null) { - // This is back-asswards but i don't see a better way :( - int x = (pstack.relx - 25) / 18; - int y = (pstack.rely - 6) / 18; - - ItemStack stack = pstack.item; - NBTTagCompound stacknbt = stack.writeToNBT(new NBTTagCompound()); - stacknbt.setInteger("slot", y * 3 + x); - stacksnbt.appendTag(stacknbt); - } - - ItemStack stack = recipe.getResultStack(recipeIndex).items[0]; - NBTTagCompound stacknbt = stack.writeToNBT(new NBTTagCompound()); - stacknbt.setInteger("slot", 9); - stacksnbt.appendTag(stacknbt); - } - - NBTTagCompound data = new NBTTagCompound(); - data.setTag("stacks", stacksnbt); - - Proxies.net.sendToServer(new PacketWorktableNEISelect(data)); - } else { - IStackPositioner positioner = new OffsetPositioner(xOffs, yOffs); - LayoutManager.overlayRenderer = new DefaultOverlayRenderer(ingr, positioner); - } - } -} diff --git a/src/main/java/forestry/core/recipes/nei/IRecipeHandlerBase.java b/src/main/java/forestry/core/recipes/nei/IRecipeHandlerBase.java deleted file mode 100644 index be645c0c3..000000000 --- a/src/main/java/forestry/core/recipes/nei/IRecipeHandlerBase.java +++ /dev/null @@ -1,18 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v3 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: - * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges - ******************************************************************************/ -package forestry.core.recipes.nei; - -import codechicken.nei.recipe.ICraftingHandler; -import codechicken.nei.recipe.IUsageHandler; - -public interface IRecipeHandlerBase extends ICraftingHandler, IUsageHandler { - void prepare(); -} diff --git a/src/main/java/forestry/core/recipes/nei/ItemFilterForestry.java b/src/main/java/forestry/core/recipes/nei/ItemFilterForestry.java deleted file mode 100644 index 123eb0096..000000000 --- a/src/main/java/forestry/core/recipes/nei/ItemFilterForestry.java +++ /dev/null @@ -1,57 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v3 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: - * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges - ******************************************************************************/ -package forestry.core.recipes.nei; - -import net.minecraft.item.Item; -import net.minecraft.item.ItemBlock; -import net.minecraft.item.ItemStack; - -import forestry.core.config.Constants; - -import codechicken.nei.api.ItemFilter; - -/** - * @author bdew - */ -public class ItemFilterForestry implements ItemFilter { - private final boolean items; - - public ItemFilterForestry(Boolean items) { - this.items = items; - } - - @Override - public boolean matches(ItemStack item) { - if (item == null || item.getItem() == null) { - return false; - } - - if (item.getItem() instanceof ItemBlock && items) { - return false; - } - - if (!(item.getItem() instanceof ItemBlock) && !items) { - return false; - } - - String itemName = Item.itemRegistry.getNameForObject(item.getItem()); - if (itemName == null) { - return false; - } - - String[] s = itemName.split(":"); - if (s.length <= 1) { - return false; - } - - return s[0].equals(Constants.MOD); - } -} diff --git a/src/main/java/forestry/core/recipes/nei/ItemFilterGenetic.java b/src/main/java/forestry/core/recipes/nei/ItemFilterGenetic.java deleted file mode 100644 index 0d3610be2..000000000 --- a/src/main/java/forestry/core/recipes/nei/ItemFilterGenetic.java +++ /dev/null @@ -1,54 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v3 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: - * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges - ******************************************************************************/ -package forestry.core.recipes.nei; - -import net.minecraft.item.ItemStack; - -import forestry.api.genetics.IIndividual; -import forestry.api.genetics.ISpeciesRoot; - -import codechicken.nei.api.ItemFilter; - -/** - * @author bdew - */ -public class ItemFilterGenetic implements ItemFilter { - private final ISpeciesRoot root; - private final int type; - private final boolean analyzedOnly; - - public ItemFilterGenetic(ISpeciesRoot root, int type, boolean analyzedOnly) { - this.root = root; - this.type = type; - this.analyzedOnly = analyzedOnly; - } - - private boolean isMember(ItemStack item) { - if (type >= 0) { - return root.isMember(item, type); - } else { - return root.isMember(item); - } - } - - @Override - public boolean matches(ItemStack item) { - if (analyzedOnly) { - if (!isMember(item)) { - return false; - } - IIndividual individual = root.getMember(item); - return individual.isAnalyzed() || !individual.isSecret(); - } else { - return isMember(item); - } - } -} diff --git a/src/main/java/forestry/core/recipes/nei/NEIIntegrationConfig.java b/src/main/java/forestry/core/recipes/nei/NEIIntegrationConfig.java deleted file mode 100644 index 7d0bc0c03..000000000 --- a/src/main/java/forestry/core/recipes/nei/NEIIntegrationConfig.java +++ /dev/null @@ -1,85 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v3 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: - * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges - ******************************************************************************/ -package forestry.core.recipes.nei; - -import net.minecraftforge.oredict.OreDictionary; - -import forestry.api.apiculture.BeeManager; -import forestry.api.apiculture.EnumBeeType; -import forestry.api.arboriculture.EnumGermlingType; -import forestry.api.arboriculture.TreeManager; -import forestry.api.lepidopterology.ButterflyManager; -import forestry.api.lepidopterology.EnumFlutterType; -import forestry.core.utils.Log; -import forestry.factory.gui.GuiWorktable; -import forestry.factory.recipes.nei.NEIHandlerBottler; -import forestry.factory.recipes.nei.NEIHandlerCarpenter; -import forestry.factory.recipes.nei.NEIHandlerCentrifuge; -import forestry.factory.recipes.nei.NEIHandlerFabricator; -import forestry.factory.recipes.nei.NEIHandlerFermenter; -import forestry.factory.recipes.nei.NEIHandlerMoistener; -import forestry.factory.recipes.nei.NEIHandlerSqueezer; -import forestry.factory.recipes.nei.NEIHandlerStill; - -import codechicken.nei.api.API; -import codechicken.nei.api.IConfigureNEI; - -public class NEIIntegrationConfig implements IConfigureNEI { - - @Override - public void loadConfig() { - Log.info("Loading: " + getName()); - - registerHandler(new NEIHandlerBottler()); - registerHandler(new NEIHandlerCarpenter()); - registerHandler(new NEIHandlerCentrifuge()); - registerHandler(new NEIHandlerFabricator()); - registerHandler(new NEIHandlerFermenter()); - registerHandler(new NEIHandlerMoistener()); - registerHandler(new NEIHandlerSqueezer()); - registerHandler(new NEIHandlerStill()); - - CustomOverlayHandler handler = new CustomOverlayHandler(-14, 14, true); - API.registerGuiOverlayHandler(GuiWorktable.class, handler, "crafting"); - - API.addSubset("Forestry.Bees.Princesses", new ItemFilterGenetic(BeeManager.beeRoot, EnumBeeType.PRINCESS.ordinal(), true)); - API.addSubset("Forestry.Bees.Drones", new ItemFilterGenetic(BeeManager.beeRoot, EnumBeeType.DRONE.ordinal(), true)); - API.addSubset("Forestry.Bees.Larvae", new ItemFilterGenetic(BeeManager.beeRoot, EnumBeeType.LARVAE.ordinal(), true)); - - API.addSubset("Forestry.Trees.Saplings", new ItemFilterGenetic(TreeManager.treeRoot, EnumGermlingType.SAPLING.ordinal(), true)); - API.addSubset("Forestry.Trees.Pollen", new ItemFilterGenetic(TreeManager.treeRoot, EnumGermlingType.POLLEN.ordinal(), true)); - - API.addSubset("Forestry.Butterflies.Butterflies", new ItemFilterGenetic(ButterflyManager.butterflyRoot, EnumFlutterType.BUTTERFLY.ordinal(), true)); - API.addSubset("Forestry.Butterflies.Caterpillars", new ItemFilterGenetic(ButterflyManager.butterflyRoot, EnumFlutterType.CATERPILLAR.ordinal(), true)); - API.addSubset("Forestry.Butterflies.Serum", new ItemFilterGenetic(ButterflyManager.butterflyRoot, EnumFlutterType.SERUM.ordinal(), true)); - - API.addSubset("Forestry.Bees.Combs", OreDictionary.getOres("beeComb")); - API.addSubset("Forestry.Blocks", new ItemFilterOther(false)); - API.addSubset("Forestry.Items", new ItemFilterOther(true)); - } - - protected static void registerHandler(IRecipeHandlerBase handler) { - handler.prepare(); - API.registerRecipeHandler(handler); - API.registerUsageHandler(handler); - } - - @Override - public String getName() { - return "Forestry NEI Integration"; - } - - @Override - public String getVersion() { - return "1.1.0"; - } - -} diff --git a/src/main/java/forestry/core/recipes/nei/PositionedFluidTank.java b/src/main/java/forestry/core/recipes/nei/PositionedFluidTank.java deleted file mode 100644 index 1abb52746..000000000 --- a/src/main/java/forestry/core/recipes/nei/PositionedFluidTank.java +++ /dev/null @@ -1,157 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v3 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: - * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges - ******************************************************************************/ -package forestry.core.recipes.nei; - -import java.awt.Point; -import java.awt.Rectangle; -import java.util.Collection; -import java.util.Collections; -import java.util.List; - -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.texture.TextureMap; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.IIcon; - -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.FluidTank; - -import org.lwjgl.opengl.GL11; - -import codechicken.lib.gui.GuiDraw; -import codechicken.nei.recipe.GuiCraftingRecipe; -import codechicken.nei.recipe.GuiUsageRecipe; - -public class PositionedFluidTank { - - public FluidTank[] tanks; - public FluidTank tank; - public Rectangle position; - public String overlayTexture; - public Point overlayTexturePos; - public boolean flowingTexture = false; - public boolean showAmount = true; - public boolean perTick = false; - - public PositionedFluidTank(FluidTank[] tanks, Rectangle position, String overlayTexture, Point overlayTexturePos) { - this.position = position; - this.tanks = tanks; - this.tank = tanks[0]; - this.overlayTexture = overlayTexture; - this.overlayTexturePos = overlayTexturePos; - } - - public PositionedFluidTank(Collection fluids, int capacity, Rectangle position, String overlayTexture, Point overlayTexturePos) { - this(createFluidTanks(capacity, fluids), position, overlayTexture, overlayTexturePos); - } - - public PositionedFluidTank(FluidStack fluid, int capacity, Rectangle position, String overlayTexture, Point overlayTexturePos) { - this(createFluidTanks(capacity, Collections.singletonList(fluid)), position, overlayTexture, overlayTexturePos); - } - - public PositionedFluidTank(FluidStack fluid, int capacity, Rectangle position) { - this(fluid, capacity, position, null, null); - } - - private static FluidTank[] createFluidTanks(int capacity, Collection fluidStacks) { - FluidTank[] tanks = new FluidTank[fluidStacks.size()]; - int i = 0; - for (FluidStack fluidStack : fluidStacks) { - tanks[i++] = new FluidTank(fluidStacks != null ? fluidStack.copy() : null, capacity); - } - return tanks; - } - - public List handleTooltip(List currenttip) { - if (this.tank == null || this.tank.getFluid() == null || this.tank.getFluid().getFluid() == null || this.tank.getFluid().amount <= 0) { - return currenttip; - } - currenttip.add(this.tank.getFluid().getLocalizedName()); - if (this.showAmount) { - currenttip.add(EnumChatFormatting.GRAY.toString() + this.tank.getFluid().amount + (this.perTick ? " mB/t" : " mB")); - } - return currenttip; - } - - public boolean transfer(boolean usage) { - if (this.tank.getFluid() != null && this.tank.getFluid().amount > 0) { - if (usage) { - if (!GuiUsageRecipe.openRecipeGui("liquid", this.tank.getFluid())) { - return false; - } - } else { - if (!GuiCraftingRecipe.openRecipeGui("liquid", this.tank.getFluid())) { - return false; - } - } - return true; - } - return false; - } - - public void draw() { - if (this.tank == null || this.tank.getFluid() == null || this.tank.getFluid().getFluid() == null || this.tank.getFluid().amount <= 0) { - return; - } - final IIcon fluidIcon; - if (this.flowingTexture && this.tank.getFluid().getFluid().getFlowingIcon() != null) { - fluidIcon = this.tank.getFluid().getFluid().getFlowingIcon(); - } else if (this.tank.getFluid().getFluid().getStillIcon() != null) { - fluidIcon = this.tank.getFluid().getFluid().getStillIcon(); - } else { - return; - } - - GuiDraw.changeTexture(TextureMap.locationBlocksTexture); - int color = this.tank.getFluid().getFluid().getColor(this.tank.getFluid()); - GL11.glColor3ub((byte) (color >> 16 & 0xFF), (byte) (color >> 8 & 0xFF), (byte) (color & 0xFF)); - - int amount = Math.max(Math.min(this.position.height, this.tank.getFluid().amount * this.position.height / this.tank.getCapacity()), 1); - int posY = this.position.y + this.position.height - amount; - - for (int i = 0; i < this.position.width; i += 16) { - for (int j = 0; j < amount; j += 16) { - int drawWidth = Math.min(this.position.width - i, 16); - int drawHeight = Math.min(amount - j, 16); - - int drawX = this.position.x + i; - int drawY = posY + j; - - double minU = fluidIcon.getMinU(); - double maxU = fluidIcon.getMaxU(); - double minV = fluidIcon.getMinV(); - double maxV = fluidIcon.getMaxV(); - - Tessellator tessellator = Tessellator.instance; - tessellator.startDrawingQuads(); - tessellator.addVertexWithUV(drawX, drawY + drawHeight, 0, minU, minV + (maxV - minV) * drawHeight / 16F); - tessellator.addVertexWithUV(drawX + drawWidth, drawY + drawHeight, 0, minU + (maxU - minU) * drawWidth / 16F, minV + (maxV - minV) * drawHeight / 16F); - tessellator.addVertexWithUV(drawX + drawWidth, drawY, 0, minU + (maxU - minU) * drawWidth / 16F, minV); - tessellator.addVertexWithUV(drawX, drawY, 0, minU, minV); - tessellator.draw(); - } - } - - if (this.overlayTexture != null && this.overlayTexturePos != null) { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - GuiDraw.changeTexture(this.overlayTexture); - GuiDraw.drawTexturedModalRect(this.position.x, this.position.y, this.overlayTexturePos.x, this.overlayTexturePos.y, this.position.width, this.position.height); - } - } - - public void setPermutationToRender(int index) { - this.tank = this.tanks[index]; - } - - public int getPermutationCount() { - return this.tanks.length; - } -} diff --git a/src/main/java/forestry/core/recipes/nei/PositionedStackAdv.java b/src/main/java/forestry/core/recipes/nei/PositionedStackAdv.java deleted file mode 100644 index 2bd81c910..000000000 --- a/src/main/java/forestry/core/recipes/nei/PositionedStackAdv.java +++ /dev/null @@ -1,74 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v3 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: - * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges - ******************************************************************************/ -package forestry.core.recipes.nei; - -import java.awt.Rectangle; -import java.text.NumberFormat; -import java.util.ArrayList; -import java.util.List; - -import net.minecraft.util.EnumChatFormatting; - -import codechicken.nei.PositionedStack; -import codechicken.nei.recipe.GuiRecipe; - -public class PositionedStackAdv extends PositionedStack { - - private final List tooltip = new ArrayList<>(); - - public PositionedStackAdv(Object object, int x, int y) { - super(object, x, y); - } - - public PositionedStackAdv(Object object, int x, int y, List tooltip) { - super(object, x, y); - this.addToTooltip(tooltip); - } - - public Rectangle getRect() { - return new Rectangle(this.relx - 1, this.rely - 1, 18, 18); - } - - public List handleTooltip(GuiRecipe guiRecipe, List currenttip) { - if (!this.tooltip.isEmpty()) { - for (String tip : this.tooltip) { - currenttip.add(tip); - } - } - return currenttip; - } - - public PositionedStackAdv addToTooltip(List lines) { - for (String tip : lines) { - this.tooltip.add(tip); - } - return this; - } - - public PositionedStackAdv addToTooltip(String line) { - this.tooltip.add(line); - return this; - } - - public PositionedStackAdv setChance(float chance) { - if (chance <= 0.0F) { - this.tooltip.add(EnumChatFormatting.GRAY + String.format(NEIUtils.translate("chance"), NEIUtils.translate("chance.never"))); - } else if (chance < 0.01F) { - this.tooltip.add(EnumChatFormatting.GRAY + String.format(NEIUtils.translate("chance"), NEIUtils.translate("chance.lessThan1"))); - } else if (chance != 1.0F) { - NumberFormat percentFormat = NumberFormat.getPercentInstance(); - percentFormat.setMaximumFractionDigits(2); - this.tooltip.add(EnumChatFormatting.GRAY + String.format(NEIUtils.translate("chance"), String.valueOf(percentFormat.format(chance)))); - } - return this; - } - -} diff --git a/src/main/java/forestry/core/recipes/nei/RecipeHandlerBase.java b/src/main/java/forestry/core/recipes/nei/RecipeHandlerBase.java deleted file mode 100644 index 3623e44fc..000000000 --- a/src/main/java/forestry/core/recipes/nei/RecipeHandlerBase.java +++ /dev/null @@ -1,229 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v3 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: - * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges - ******************************************************************************/ -package forestry.core.recipes.nei; - -import java.awt.Point; -import java.awt.Rectangle; -import java.util.ArrayList; -import java.util.List; - -import net.minecraft.item.ItemStack; - -import net.minecraftforge.fluids.FluidStack; - -import org.lwjgl.opengl.GL11; - -import codechicken.lib.gui.GuiDraw; -import codechicken.nei.NEIClientConfig; -import codechicken.nei.PositionedStack; -import codechicken.nei.guihook.GuiContainerManager; -import codechicken.nei.recipe.GuiRecipe; -import codechicken.nei.recipe.TemplateRecipeHandler; - -public abstract class RecipeHandlerBase extends TemplateRecipeHandler implements IRecipeHandlerBase { - - @Override - public void prepare() { - } - - public abstract class CachedBaseRecipe extends CachedRecipe { - - public List getFluidTanks() { - List tanks = new ArrayList<>(); - PositionedFluidTank tank = this.getFluidTank(); - if (tank != null) { - tanks.add(tank); - } - return tanks; - } - - public PositionedFluidTank getFluidTank() { - return null; - } - - } - - public abstract String getRecipeID(); - - public void changeToGuiTexture() { - GuiDraw.changeTexture(this.getGuiTexture()); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - } - - public void addTransferRect(int x, int y, int width, int height) { - this.transferRects.add(new RecipeTransferRect(new Rectangle(x, y, width, height), this.getRecipeID())); - } - - @Override - public void drawForeground(int recipe) { - super.drawForeground(recipe); - this.drawFluidTanks(recipe); - this.changeToGuiTexture(); - } - - @Override - public void loadCraftingRecipes(String outputId, Object... results) { - if (outputId.equals("liquid") && results[0] instanceof FluidStack && ((FluidStack) results[0]).getFluid() != null) { - this.loadCraftingRecipes((FluidStack) results[0]); - } else if (outputId.equals(this.getRecipeID())) { - this.loadAllRecipes(); - } else { - super.loadCraftingRecipes(outputId, results); - } - } - - public void loadAllRecipes() { - } - - @Override - public void loadCraftingRecipes(ItemStack result) { - FluidStack fluid = NEIUtils.getFluidStack(result); - if (fluid != null && fluid.getFluid() != null) { - this.loadCraftingRecipes(fluid); - } - } - - public void loadCraftingRecipes(FluidStack result) { - } - - @Override - public void loadUsageRecipes(String inputId, Object... ingredients) { - if (inputId.equals("liquid") && ingredients[0] instanceof FluidStack && ((FluidStack) ingredients[0]).getFluid() != null) { - this.loadUsageRecipes((FluidStack) ingredients[0]); - } else { - super.loadUsageRecipes(inputId, ingredients); - } - } - - @Override - public void loadUsageRecipes(ItemStack ingred) { - FluidStack fluid = NEIUtils.getFluidStack(ingred); - if (fluid != null && fluid.getFluid() != null) { - this.loadUsageRecipes(fluid); - } - } - - public void loadUsageRecipes(FluidStack ingredient) { - } - - @Override - public List handleTooltip(GuiRecipe guiRecipe, List currenttip, int recipe) { - super.handleTooltip(guiRecipe, currenttip, recipe); - CachedBaseRecipe crecipe = (CachedBaseRecipe) this.arecipes.get(recipe); - if (GuiContainerManager.shouldShowTooltip(guiRecipe)) { - Point mouse = GuiDraw.getMousePosition(); - Point offset = guiRecipe.getRecipePosition(recipe); - Point relMouse = new Point(mouse.x - (guiRecipe.width - 176) / 2 - offset.x, mouse.y - (guiRecipe.height - 166) / 2 - offset.y); - - currenttip = this.provideTooltip(guiRecipe, currenttip, crecipe, relMouse); - } - return currenttip; - } - - @Override - public List handleItemTooltip(GuiRecipe guiRecipe, ItemStack itemStack, List currenttip, int recipe) { - super.handleItemTooltip(guiRecipe, itemStack, currenttip, recipe); - CachedBaseRecipe crecipe = (CachedBaseRecipe) this.arecipes.get(recipe); - Point mouse = GuiDraw.getMousePosition(); - Point offset = guiRecipe.getRecipePosition(recipe); - Point relMouse = new Point(mouse.x - (guiRecipe.width - 176) / 2 - offset.x, mouse.y - (guiRecipe.height - 166) / 2 - offset.y); - - currenttip = this.provideItemTooltip(guiRecipe, itemStack, currenttip, crecipe, relMouse); - return currenttip; - } - - public List provideTooltip(GuiRecipe guiRecipe, List currenttip, CachedBaseRecipe crecipe, Point relMouse) { - if (crecipe.getFluidTanks() != null) { - for (PositionedFluidTank tank : crecipe.getFluidTanks()) { - if (tank.position.contains(relMouse)) { - tank.handleTooltip(currenttip); - } - } - } - return currenttip; - } - - public List provideItemTooltip(GuiRecipe guiRecipe, ItemStack itemStack, List currenttip, CachedBaseRecipe crecipe, Point relMouse) { - for (PositionedStack stack : crecipe.getIngredients()) { - if (stack instanceof PositionedStackAdv && ((PositionedStackAdv) stack).getRect().contains(relMouse)) { - currenttip = ((PositionedStackAdv) stack).handleTooltip(guiRecipe, currenttip); - } - } - for (PositionedStack stack : crecipe.getOtherStacks()) { - if (stack instanceof PositionedStackAdv && ((PositionedStackAdv) stack).getRect().contains(relMouse)) { - currenttip = ((PositionedStackAdv) stack).handleTooltip(guiRecipe, currenttip); - } - } - PositionedStack stack = crecipe.getResult(); - if (stack instanceof PositionedStackAdv && ((PositionedStackAdv) stack).getRect().contains(relMouse)) { - currenttip = ((PositionedStackAdv) stack).handleTooltip(guiRecipe, currenttip); - } - return currenttip; - } - - @Override - public boolean keyTyped(GuiRecipe gui, char keyChar, int keyCode, int recipe) { - if (keyCode == NEIClientConfig.getKeyBinding("gui.recipe")) { - if (this.transferFluidTank(gui, recipe, false)) { - return true; - } - } else if (keyCode == NEIClientConfig.getKeyBinding("gui.usage")) { - if (this.transferFluidTank(gui, recipe, true)) { - return true; - } - } - return super.keyTyped(gui, keyChar, keyCode, recipe); - } - - @Override - public boolean mouseClicked(GuiRecipe gui, int button, int recipe) { - if (button == 0) { - if (this.transferFluidTank(gui, recipe, false)) { - return true; - } - } else if (button == 1) { - if (this.transferFluidTank(gui, recipe, true)) { - return true; - } - } - return super.mouseClicked(gui, button, recipe); - } - - protected boolean transferFluidTank(GuiRecipe guiRecipe, int recipe, boolean usage) { - CachedBaseRecipe crecipe = (CachedBaseRecipe) this.arecipes.get(recipe); - Point mousepos = GuiDraw.getMousePosition(); - Point offset = guiRecipe.getRecipePosition(recipe); - Point relMouse = new Point(mousepos.x - (guiRecipe.width - 176) / 2 - offset.x, mousepos.y - (guiRecipe.height - 166) / 2 - offset.y); - - if (crecipe.getFluidTanks() != null) { - for (PositionedFluidTank tank : crecipe.getFluidTanks()) { - if (tank.position.contains(relMouse)) { - return tank.transfer(usage); - } - } - } - - return false; - } - - public void drawFluidTanks(int recipe) { - CachedRecipe cachedRecipe = this.arecipes.get(recipe); - if (cachedRecipe instanceof CachedBaseRecipe) { - CachedBaseRecipe crecipe = (CachedBaseRecipe) cachedRecipe; - if (crecipe.getFluidTanks() != null) { - for (PositionedFluidTank fluidTank : crecipe.getFluidTanks()) { - fluidTank.draw(); - } - } - } - } - -} diff --git a/src/main/java/forestry/core/recipes/nei/SetRecipeCommandHandler.java b/src/main/java/forestry/core/recipes/nei/SetRecipeCommandHandler.java deleted file mode 100644 index f259f4e0b..000000000 --- a/src/main/java/forestry/core/recipes/nei/SetRecipeCommandHandler.java +++ /dev/null @@ -1,60 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v3 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: - * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges - ******************************************************************************/ -package forestry.core.recipes.nei; - -import java.util.HashMap; -import java.util.Map; - -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.Slot; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; - -/** - * @author bdew - */ -public class SetRecipeCommandHandler { - private final Class containerClass; - private final Class slotClass; - - public SetRecipeCommandHandler(Class containerClass, Class slotClass) { - this.containerClass = containerClass; - this.slotClass = slotClass; - } - - public void handle(NBTTagCompound data, EntityPlayerMP player) { - NBTTagList stacks = data.getTagList("stacks", 10); - Container cont = player.openContainer; - if (!containerClass.isInstance(cont)) { - return; - } - - Map stmap = new HashMap<>(); - for (int i = 0; i < stacks.tagCount(); i++) { - NBTTagCompound itemdata = stacks.getCompoundTagAt(i); - stmap.put(itemdata.getInteger("slot"), ItemStack.loadItemStackFromNBT(itemdata)); - } - for (Object slotobj : cont.inventorySlots) { - if (!slotClass.isInstance(slotobj)) { - continue; - } - - Slot slot = (Slot) slotobj; - if (stmap.containsKey(slot.getSlotIndex())) { - slot.putStack(stmap.get(slot.getSlotIndex())); - } else { - slot.putStack(null); - } - } - } -} diff --git a/src/main/java/forestry/core/render/IBlockRenderer.java b/src/main/java/forestry/core/render/IBlockRenderer.java deleted file mode 100644 index ea488f715..000000000 --- a/src/main/java/forestry/core/render/IBlockRenderer.java +++ /dev/null @@ -1,15 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v3 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: - * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges - ******************************************************************************/ -package forestry.core.render; - -public interface IBlockRenderer { - void inventoryRender(double x, double y, double z); -} diff --git a/src/main/java/forestry/core/render/ParticleHelper.java b/src/main/java/forestry/core/render/ParticleHelper.java index b9fe4dc73..325e21637 100644 --- a/src/main/java/forestry/core/render/ParticleHelper.java +++ b/src/main/java/forestry/core/render/ParticleHelper.java @@ -12,14 +12,18 @@ package forestry.core.render; import java.util.Random; +import forestry.core.proxy.Proxies; import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; import net.minecraft.client.particle.EffectRenderer; import net.minecraft.client.particle.EntityDiggingFX; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; /** * @author CovertJaguar @@ -30,40 +34,40 @@ public class ParticleHelper { @SideOnly(Side.CLIENT) public static boolean addHitEffects(World world, Block block, MovingObjectPosition target, EffectRenderer effectRenderer, Callback callback) { - int x = target.blockX; - int y = target.blockY; - int z = target.blockZ; + int x = target.getBlockPos().getX(); + int y = target.getBlockPos().getY(); + int z = target.getBlockPos().getZ(); - int sideHit = target.sideHit; + EnumFacing sideHit = target.sideHit; + + IBlockState state = world.getBlockState(target.getBlockPos()); - if (block != world.getBlock(x, y, z)) { + if (block != state.getBlock()) { return true; } - int meta = world.getBlockMetadata(x, y, z); - float b = 0.1F; double px = x + rand.nextDouble() * (block.getBlockBoundsMaxX() - block.getBlockBoundsMinX() - (b * 2.0F)) + b + block.getBlockBoundsMinX(); double py = y + rand.nextDouble() * (block.getBlockBoundsMaxY() - block.getBlockBoundsMinY() - (b * 2.0F)) + b + block.getBlockBoundsMinY(); double pz = z + rand.nextDouble() * (block.getBlockBoundsMaxZ() - block.getBlockBoundsMinZ() - (b * 2.0F)) + b + block.getBlockBoundsMinZ(); - if (sideHit == 0) { - py = (double) y + block.getBlockBoundsMinY() - (double) b; - } else if (sideHit == 1) { - py = (double) y + block.getBlockBoundsMaxY() + (double) b; - } else if (sideHit == 2) { - pz = (double) z + block.getBlockBoundsMinZ() - (double) b; - } else if (sideHit == 3) { - pz = (double) z + block.getBlockBoundsMaxZ() + (double) b; - } else if (sideHit == 4) { - px = (double) x + block.getBlockBoundsMinX() - (double) b; - } else if (sideHit == 5) { - px = (double) x + block.getBlockBoundsMaxX() + (double) b; + if (sideHit == EnumFacing.DOWN) { + py = y + block.getBlockBoundsMinY() - b; + } else if (sideHit == EnumFacing.UP) { + py = y + block.getBlockBoundsMaxY() + b; + } else if (sideHit == EnumFacing.NORTH) { + pz = z + block.getBlockBoundsMinZ() - b; + } else if (sideHit == EnumFacing.SOUTH) { + pz = z + block.getBlockBoundsMaxZ() + b; + } else if (sideHit == EnumFacing.WEST) { + px = x + block.getBlockBoundsMinX() - b; + } else if (sideHit == EnumFacing.EAST) { + px = x + block.getBlockBoundsMaxX() + b; } - EntityDiggingFX fx = new EntityDiggingFX(world, px, py, pz, 0.0D, 0.0D, 0.0D, block, sideHit, meta); - callback.addHitEffects(fx, world, x, y, z, meta, sideHit); - effectRenderer.addEffect(fx.applyColourMultiplier(x, y, z).multiplyVelocity(0.2F).multipleParticleScaleBy(0.6F)); + EntityDiggingFX fx = (EntityDiggingFX) effectRenderer.spawnEffectParticle(EnumParticleTypes.BLOCK_DUST.getParticleID(), px, py, pz, 0.0D, 0.0D, 0.0D, Block.getStateId(state)); + callback.addHitEffects(fx, target.getBlockPos(), state); + effectRenderer.addEffect(fx.func_174846_a(new BlockPos(x, y, z)).multiplyVelocity(0.2F).multipleParticleScaleBy(0.6F)); return true; } @@ -84,8 +88,8 @@ public class ParticleHelper { * @return True to prevent vanilla break particles from spawning. */ @SideOnly(Side.CLIENT) - public static boolean addDestroyEffects(World world, Block block, int x, int y, int z, int meta, EffectRenderer effectRenderer, Callback callback) { - if (block != world.getBlock(x, y, z)) { + public static boolean addDestroyEffects(World world, Block block, IBlockState state, BlockPos pos, EffectRenderer effectRenderer, Callback callback) { + if (block != state.getBlock()) { return true; } @@ -93,14 +97,14 @@ public class ParticleHelper { for (int i = 0; i < iterations; ++i) { for (int j = 0; j < iterations; ++j) { for (int k = 0; k < iterations; ++k) { - double px = x + (i + 0.5D) / (double) iterations; - double py = y + (j + 0.5D) / (double) iterations; - double pz = z + (k + 0.5D) / (double) iterations; + double px = pos.getX() + (i + 0.5D) / iterations; + double py = pos.getY() + (j + 0.5D) / iterations; + double pz = pos.getZ() + (k + 0.5D) / iterations; int random = rand.nextInt(6); - EntityDiggingFX fx = new EntityDiggingFX(world, px, py, pz, px - x - 0.5D, py - y - 0.5D, pz - z - 0.5D, block, random, meta); - callback.addDestroyEffects(fx, world, x, y, z, meta); - effectRenderer.addEffect(fx.applyColourMultiplier(x, y, z)); + EntityDiggingFX fx = (EntityDiggingFX) effectRenderer.spawnEffectParticle(EnumParticleTypes.BLOCK_DUST.getParticleID(), px, py, pz, px - pos.getX() - 0.5D, py - pos.getY() - 0.5D, pz - pos.getZ() - 0.5D, Block.getStateId(state)); + callback.addDestroyEffects(fx, pos, state); + effectRenderer.addEffect(fx.func_174846_a(pos)); } } } @@ -111,10 +115,10 @@ public class ParticleHelper { public interface Callback { @SideOnly(Side.CLIENT) - void addHitEffects(EntityDiggingFX fx, World world, int x, int y, int z, int meta, int side); + void addHitEffects(EntityDiggingFX fx, BlockPos pos, IBlockState state); @SideOnly(Side.CLIENT) - void addDestroyEffects(EntityDiggingFX fx, World world, int x, int y, int z, int meta); + void addDestroyEffects(EntityDiggingFX fx, BlockPos pos, IBlockState state); } public static class DefaultCallback implements ParticleHelper.Callback { @@ -127,19 +131,19 @@ public class ParticleHelper { @Override @SideOnly(Side.CLIENT) - public void addHitEffects(EntityDiggingFX fx, World world, int x, int y, int z, int meta, int side) { - setTexture(fx, world, x, y, z, side); + public void addHitEffects(EntityDiggingFX fx, BlockPos pos, IBlockState state) { + setTexture(fx, pos, state); } @Override @SideOnly(Side.CLIENT) - public void addDestroyEffects(EntityDiggingFX fx, World world, int x, int y, int z, int meta) { - setTexture(fx, world, x, y, z, 0); + public void addDestroyEffects(EntityDiggingFX fx, BlockPos pos, IBlockState state) { + setTexture(fx, pos, state); } @SideOnly(Side.CLIENT) - private void setTexture(EntityDiggingFX fx, World world, int x, int y, int z, int side) { - fx.setParticleIcon(block.getIcon(world, x, y, z, side)); + protected void setTexture(EntityDiggingFX fx, BlockPos pos, IBlockState state) { + fx.setParticleIcon(Proxies.common.getClientInstance().getBlockRendererDispatcher().getBlockModelShapes().getTexture(state)); } } } diff --git a/src/main/java/forestry/core/render/RenderAnalyzer.java b/src/main/java/forestry/core/render/RenderAnalyzer.java index d7b707cad..97f7c0f3e 100755 --- a/src/main/java/forestry/core/render/RenderAnalyzer.java +++ b/src/main/java/forestry/core/render/RenderAnalyzer.java @@ -10,57 +10,42 @@ ******************************************************************************/ package forestry.core.render; -import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumFacing; import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; - import org.lwjgl.opengl.GL11; import forestry.apiculture.render.ModelAnalyzer; +import forestry.core.proxy.Proxies; import forestry.core.tiles.TileAnalyzer; -public class RenderAnalyzer extends TileEntitySpecialRenderer implements IBlockRenderer { +public class RenderAnalyzer extends TileEntitySpecialRenderer { private final ModelAnalyzer model; private final EntityItem dummyEntityItem = new EntityItem(null); - private final RenderItem customRenderItem; private long lastTick; public RenderAnalyzer(String baseTexture) { - customRenderItem = new RenderItem() { - @Override - public boolean shouldBob() { - return true; - } - - @Override - public boolean shouldSpreadItems() { - return false; - } - }; - customRenderItem.setRenderManager(RenderManager.instance); this.model = new ModelAnalyzer(baseTexture); } - + + /** + * @param analyzer If it null its render the item else it render the tile entity. + */ @Override - public void inventoryRender(double x, double y, double z) { - render(null, null, ForgeDirection.WEST, x, y, z); + public void renderTileEntityAt(TileAnalyzer analyzer, double x, double y, double z, float partialTicks, int destroyStage) { + if(analyzer != null){ + render(analyzer.getIndividualOnDisplay(), analyzer.getWorld(), analyzer.getOrientation(), x, y, z); + }else{ + render(null, null, EnumFacing.WEST, x, y, z); + } } - @Override - public void renderTileEntityAt(TileEntity tile, double d, double d1, double d2, float f) { - - TileAnalyzer analyzer = (TileAnalyzer) tile; - render(analyzer.getIndividualOnDisplay(), tile.getWorldObj(), analyzer.getOrientation(), d, d1, d2); - } - - private void render(ItemStack itemstack, World world, ForgeDirection orientation, double x, double y, double z) { + private void render(ItemStack itemstack, World world, EnumFacing orientation, double x, double y, double z) { dummyEntityItem.worldObj = world; @@ -80,7 +65,9 @@ public class RenderAnalyzer extends TileEntitySpecialRenderer implements IBlockR lastTick = world.getTotalWorldTime(); dummyEntityItem.onUpdate(); } - customRenderItem.doRender(dummyEntityItem, 0, 0, 0, 0, 0); + RenderManager rendermanager = Proxies.common.getClientInstance().getRenderManager(); + + rendermanager.renderEntityWithPosYaw(dummyEntityItem, 0.0D, 0.0D, 0.0D, 0.0F, 0.0F); GL11.glPopMatrix(); } diff --git a/src/main/java/forestry/core/render/RenderBlock.java b/src/main/java/forestry/core/render/RenderBlock.java deleted file mode 100644 index c2789e360..000000000 --- a/src/main/java/forestry/core/render/RenderBlock.java +++ /dev/null @@ -1,54 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v3 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: - * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges - ******************************************************************************/ -package forestry.core.render; - -import java.util.HashMap; - -import net.minecraft.block.Block; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.world.IBlockAccess; - -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; - -import forestry.core.proxy.Proxies; - -public class RenderBlock implements ISimpleBlockRenderingHandler { - - public static final HashMap byBlockRenderer = new HashMap<>(); - - @Override - public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) { - - if (block.getRenderType() == Proxies.render.getByBlockModelRenderId()) { - TileRendererIndex index = new TileRendererIndex(block, metadata); - if (byBlockRenderer.containsKey(index)) { - byBlockRenderer.get(index).inventoryRender(-0.5, -0.5, -0.5); - } - } - - } - - @Override - public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { - return true; - } - - @Override - public boolean shouldRender3DInInventory(int modelId) { - return true; - } - - @Override - public int getRenderId() { - return Proxies.render.getByBlockModelRenderId(); - } - -} diff --git a/src/main/java/forestry/core/render/RenderCrateItem.java b/src/main/java/forestry/core/render/RenderCrateItem.java deleted file mode 100644 index 617cd89c2..000000000 --- a/src/main/java/forestry/core/render/RenderCrateItem.java +++ /dev/null @@ -1,350 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v3 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: - * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges - ******************************************************************************/ -package forestry.core.render; - -import java.util.Random; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.ItemRenderer; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.entity.RenderItem; -import net.minecraft.client.renderer.entity.RenderManager; -import net.minecraft.client.renderer.texture.TextureMap; -import net.minecraft.entity.item.EntityItem; -import net.minecraft.item.Item; -import net.minecraft.item.ItemBlock; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; -import net.minecraft.util.ResourceLocation; - -import net.minecraftforge.client.IItemRenderer; - -import org.lwjgl.opengl.GL11; - -import forestry.core.items.ItemCrated; - -/** - * Adapted from RenderTankCartItem by CovertJaguar - */ -public class RenderCrateItem implements IItemRenderer { - - private static final ResourceLocation BLOCK_TEXTURE = TextureMap.locationBlocksTexture; - private static final ResourceLocation ITEM_TEXTURE = TextureMap.locationItemsTexture; - private static final ResourceLocation GLINT_TEXTURE = new ResourceLocation("textures/misc/enchanted_item_glint.png"); - - private static final float PIXEL = 1.0f / 16.0f; - - private final RenderItem renderItem = new RenderItem(); - - @Override - public boolean handleRenderType(ItemStack stack, ItemRenderType type) { - switch (type) { - case INVENTORY: - case ENTITY: - case EQUIPPED: - case EQUIPPED_FIRST_PERSON: - return true; - default: - return false; - } - } - - @Override - public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack stack, ItemRendererHelper helper) { - return helper == ItemRendererHelper.ENTITY_BOBBING; - } - - @Override - public void renderItem(ItemRenderType type, ItemStack stack, Object... data) { - if (type == ItemRenderType.INVENTORY) { - render(ItemRenderType.INVENTORY, stack); - } else if (type == ItemRenderType.ENTITY) { - if (RenderManager.instance.options.fancyGraphics) { - renderAsEntity(stack, (EntityItem) data[1]); - } else { - renderAsEntityFlat(stack); - } - } else if (type == ItemRenderType.EQUIPPED || type == ItemRenderType.EQUIPPED_FIRST_PERSON) { - GL11.glPushMatrix(); - renderEquipped(stack); - - ItemStack contained = getContainedFromCrate(stack); - - if (contained != null) { - float scale = 0.5f; - GL11.glScalef(scale, scale, 1.1f); - GL11.glTranslatef(10f * PIXEL, 8f * PIXEL, 0.001f); - if (contained.getItem() instanceof ItemBlock) { - renderIn3D(contained); - } else { - renderEquipped(contained); - } - } - GL11.glPopMatrix(); - } - } - - private void renderEquipped(ItemStack stack) { - GL11.glPushMatrix(); - Tessellator tessellator = Tessellator.instance; - - int meta = stack.getItemDamage(); - for (int pass = 0; pass < stack.getItem().getRenderPasses(meta); ++pass) { - IIcon icon = stack.getItem().getIconFromDamageForRenderPass(meta, pass); - if (icon == null) { - continue; - } - - if (renderItem.renderWithColor) { - int color = stack.getItem().getColorFromItemStack(stack, pass); - float c1 = (float) (color >> 16 & 255) / 255.0F; - float c2 = (float) (color >> 8 & 255) / 255.0F; - float c3 = (float) (color & 255) / 255.0F; - - GL11.glColor4f(c1, c2, c3, 1.0F); - } - - float uv1 = icon.getMinU(); - float uv2 = icon.getMaxU(); - float uv3 = icon.getMinV(); - float uv4 = icon.getMaxV(); - - ItemRenderer.renderItemIn2D(tessellator, uv2, uv3, uv1, uv4, icon.getIconWidth(), icon.getIconHeight(), PIXEL); - } - - GL11.glPopMatrix(); - } - - private void renderAsEntity(ItemStack stack, EntityItem entity) { - GL11.glPushMatrix(); - byte iterations = 1; - if (stack.stackSize > 1) { - iterations = 2; - } - if (stack.stackSize > 15) { - iterations = 3; - } - if (stack.stackSize > 31) { - iterations = 4; - } - - Random rand = new Random(187L); - - float offsetZ = PIXEL + 0.021875F; - - GL11.glRotatef((((float) entity.age + 1.0F) / 20.0F + entity.hoverStart) * (180F / (float) Math.PI), 0.0F, 1.0F, 0.0F); - GL11.glTranslatef(-0.5F, -0.25F, -(offsetZ * (float) iterations / 2.0F)); - - for (int count = 0; count < iterations; ++count) { - if (count > 0) { - float offsetX = (rand.nextFloat() * 2.0F - 1.0F) * 0.3F / 0.5F; - float offsetY = (rand.nextFloat() * 2.0F - 1.0F) * 0.3F / 0.5F; - GL11.glTranslatef(offsetX, offsetY, offsetZ); - } else { - GL11.glTranslatef(0f, 0f, offsetZ); - } - - renderIn3D(stack); - - ItemStack contained = getContainedFromCrate(stack); - - if (contained != null) { - GL11.glPushMatrix(); - float scale = 0.5f; - GL11.glScalef(scale, scale, 1.1F); - GL11.glTranslatef(10.0f * PIXEL, 8.0f * PIXEL, 0.003F); - renderIn3D(contained); - GL11.glPopMatrix(); - } - } - GL11.glPopMatrix(); - } - - private void renderIn3D(ItemStack stack) { - Tessellator tessellator = Tessellator.instance; - if (RenderManager.instance.renderEngine == null) { - return; - } - - int meta = stack.getItemDamage(); - for (int pass = 0; pass < stack.getItem().getRenderPasses(meta); ++pass) { - IIcon icon = stack.getItem().getIconFromDamageForRenderPass(meta, pass); - if (icon == null) { - continue; - } - - if (renderItem.renderWithColor) { - int color = stack.getItem().getColorFromItemStack(stack, pass); - float c1 = (float) (color >> 16 & 255) / 255.0F; - float c2 = (float) (color >> 8 & 255) / 255.0F; - float c3 = (float) (color & 255) / 255.0F; - - GL11.glColor4f(c1, c2, c3, 1.0F); - } - - float minU = icon.getMinU(); - float maxU = icon.getMaxU(); - float minV = icon.getMinV(); - float maxV = icon.getMaxV(); - - if (stack.getItemSpriteNumber() == 0) { - RenderManager.instance.renderEngine.bindTexture(BLOCK_TEXTURE); - } else { - RenderManager.instance.renderEngine.bindTexture(ITEM_TEXTURE); - } - - ItemRenderer.renderItemIn2D(tessellator, maxU, minV, minU, maxV, icon.getIconWidth(), icon.getIconHeight(), PIXEL); - - if (stack.hasEffect(pass)) { - GL11.glPushAttrib(GL11.GL_ENABLE_BIT); - { - GL11.glDepthFunc(GL11.GL_EQUAL); - GL11.glDisable(GL11.GL_LIGHTING); - RenderManager.instance.renderEngine.bindTexture(GLINT_TEXTURE); - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_COLOR, GL11.GL_ONE); - - float f13 = 0.76F; - float f14 = 0.125F; - float f15 = (float) (Minecraft.getSystemTime() % 3000L) / 3000.0F * 8.0F; - GL11.glColor4f(0.5F * f13, 0.25F * f13, 0.8F * f13, 1.0F); - - GL11.glMatrixMode(GL11.GL_TEXTURE); - - GL11.glPushMatrix(); - { - GL11.glScalef(f14, f14, f14); - GL11.glTranslatef(f15, 0.0F, 0.0F); - GL11.glRotatef(-50.0F, 0.0F, 0.0F, 1.0F); - ItemRenderer.renderItemIn2D(tessellator, 0.0F, 0.0F, 1.0F, 1.0F, 255, 255, PIXEL); - } - GL11.glPopMatrix(); - - GL11.glPushMatrix(); - { - GL11.glScalef(f14, f14, f14); - f15 = (float) (Minecraft.getSystemTime() % 4873L) / 4873.0F * 8.0F; - GL11.glTranslatef(-f15, 0.0F, 0.0F); - GL11.glRotatef(10.0F, 0.0F, 0.0F, 1.0F); - ItemRenderer.renderItemIn2D(tessellator, 0.0F, 0.0F, 1.0F, 1.0F, 255, 255, PIXEL); - } - GL11.glPopMatrix(); - - GL11.glMatrixMode(GL11.GL_MODELVIEW); - } - GL11.glPopAttrib(); - } - } - } - - private void renderAsEntityFlat(ItemStack stack) { - GL11.glPushMatrix(); - byte iterations = 1; - if (stack.stackSize > 1) { - iterations = 2; - } - if (stack.stackSize > 15) { - iterations = 3; - } - if (stack.stackSize > 31) { - iterations = 4; - } - - Random rand = new Random(187L); - - for (int ii = 0; ii < iterations; ++ii) { - GL11.glPushMatrix(); - GL11.glRotatef(180.0F, 0.0F, 1.0F, 0.0F); - GL11.glRotatef(180 - RenderManager.instance.playerViewY, 0.0F, 1.0F, 0.0F); - - if (ii > 0) { - float var12 = (rand.nextFloat() * 2.0F - 1.0F) * 0.3F; - float var13 = (rand.nextFloat() * 2.0F - 1.0F) * 0.3F; - float var14 = (rand.nextFloat() * 2.0F - 1.0F) * 0.3F; - GL11.glTranslatef(var12, var13, var14); - } - - GL11.glTranslatef(0.5f, 0.8f, 0); - GL11.glRotatef(180.0F, 0.0F, 0.0F, 1.0F); - GL11.glScalef(1f / 16f, 1f / 16f, 1); - - render(ItemRenderType.ENTITY, stack); - GL11.glPopMatrix(); - } - GL11.glPopMatrix(); - } - - private void render(ItemRenderType type, ItemStack stack) { - GL11.glPushMatrix(); - GL11.glPushAttrib(GL11.GL_ENABLE_BIT); - GL11.glEnable(GL11.GL_DEPTH_TEST); - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - - IIcon crateTexture = stack.getIconIndex(); - renderItem.renderIcon(0, 0, crateTexture, 16, 16); - - ItemStack contained = getContainedFromCrate(stack); - - if (contained != null) { - - int meta = contained.getItemDamage(); - - float scale = 0.5f; - GL11.glScalef(scale, scale, 1); - GL11.glTranslatef(6f, 8f, 0); - if (type == ItemRenderType.ENTITY) { - GL11.glTranslatef(0, 0, -0.1f); - } - - if (contained.getItem() instanceof ItemBlock) { - GL11.glScalef(16f, 16f, 1f); - GL11.glTranslatef(1f, 1f, 0.1f); - GL11.glRotatef(180.0F, 0.0F, 0.0F, 1.0F); - renderIn3D(contained); - } else { - for (int pass = 0; pass < contained.getItem().getRenderPasses(meta); ++pass) { - IIcon containedTexture = contained.getItem().getIconFromDamageForRenderPass(meta, pass); - if (containedTexture == null) { - continue; - } - - if (renderItem.renderWithColor) { - int color = contained.getItem().getColorFromItemStack(contained, pass); - float c1 = (float) (color >> 16 & 255) / 255.0F; - float c2 = (float) (color >> 8 & 255) / 255.0F; - float c3 = (float) (color & 255) / 255.0F; - - GL11.glColor4f(c1, c2, c3, 1.0F); - } - - renderItem.renderIcon(0, 0, containedTexture, 16, 16); - } - } - } - - GL11.glPopAttrib(); - GL11.glPopMatrix(); - } - - private static ItemStack getContainedFromCrate(ItemStack crate) { - if (crate == null) { - return null; - } - - Item crateItem = crate.getItem(); - if (crateItem instanceof ItemCrated) { - return ((ItemCrated) crateItem).getContained(); - } - return null; - } - -} \ No newline at end of file diff --git a/src/main/java/forestry/core/render/RenderEscritoire.java b/src/main/java/forestry/core/render/RenderEscritoire.java index d78825b92..d00296336 100755 --- a/src/main/java/forestry/core/render/RenderEscritoire.java +++ b/src/main/java/forestry/core/render/RenderEscritoire.java @@ -10,23 +10,20 @@ ******************************************************************************/ package forestry.core.render; -import net.minecraft.client.renderer.entity.RenderItem; -import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.common.util.ForgeDirection; - import org.lwjgl.opengl.GL11; import forestry.core.config.Constants; import forestry.core.inventory.InventoryEscritoire; import forestry.core.proxy.Proxies; +import forestry.core.render.model.ModelEscritoire; import forestry.core.tiles.TileEscritoire; -public class RenderEscritoire extends TileEntitySpecialRenderer implements IBlockRenderer { +public class RenderEscritoire extends TileEntitySpecialRenderer { private static final ResourceLocation texture = new ForestryResource(Constants.TEXTURE_PATH_BLOCKS + "/escritoire.png"); private final ModelEscritoire modelEscritoire; @@ -34,33 +31,21 @@ public class RenderEscritoire extends TileEntitySpecialRenderer implements IBloc public RenderEscritoire() { modelEscritoire = new ModelEscritoire(); - RenderItem customRenderItem = new RenderItem() { - @Override - public boolean shouldBob() { - return false; - } - - @Override - public boolean shouldSpreadItems() { - return false; - } - }; - customRenderItem.setRenderManager(RenderManager.instance); - } - + + /** + * @param escritoire If it null its render the item else it render the tile entity. + */ @Override - public void inventoryRender(double x, double y, double z) { - render(null, ForgeDirection.EAST, x, y, z); + public void renderTileEntityAt(TileEscritoire escritoire, double x, double y, double z, float partialTicks, int destroyStage) { + if(escritoire != null){ + render(escritoire.getStackInSlot(InventoryEscritoire.SLOT_ANALYZE), escritoire.getOrientation(), x, y, z); + }else{ + render(null, EnumFacing.EAST, x, y, z); + } } - @Override - public void renderTileEntityAt(TileEntity tileentity, double x, double y, double z, float f) { - TileEscritoire tile = (TileEscritoire) tileentity; - render(tile.getStackInSlot(InventoryEscritoire.SLOT_ANALYZE), tile.getOrientation(), x, y, z); - } - - private void render(ItemStack itemstack, ForgeDirection orientation, double x, double y, double z) { + private void render(ItemStack itemstack, EnumFacing orientation, double x, double y, double z) { float factor = (float) (1.0 / 16.0); GL11.glPushMatrix(); @@ -69,7 +54,7 @@ public class RenderEscritoire extends TileEntitySpecialRenderer implements IBloc float[] angle = {(float) Math.PI, 0, 0}; if (orientation == null) { - orientation = ForgeDirection.WEST; + orientation = EnumFacing.WEST; } switch (orientation) { case EAST: diff --git a/src/main/java/forestry/core/render/RenderMachine.java b/src/main/java/forestry/core/render/RenderMachine.java index 62731c718..470122206 100755 --- a/src/main/java/forestry/core/render/RenderMachine.java +++ b/src/main/java/forestry/core/render/RenderMachine.java @@ -18,16 +18,15 @@ import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.common.util.ForgeDirection; - import org.lwjgl.opengl.GL11; import forestry.core.proxy.Proxies; import forestry.core.tiles.IRenderableTile; -public class RenderMachine extends TileEntitySpecialRenderer implements IBlockRenderer { +public class RenderMachine extends TileEntitySpecialRenderer { private final ModelRenderer basefront; private final ModelRenderer baseback; @@ -83,26 +82,28 @@ public class RenderMachine extends TileEntitySpecialRenderer implements IBlockRe texturesTankLevels.put(tankLevel, new ForestryResource("textures/blocks/machine_tank_" + tankLevelString + ".png")); } } - + + /** + * @param tile If it null its render the item else it render the tile entity. + */ @Override - public void inventoryRender(double x, double y, double z) { - render(TankRenderInfo.EMPTY, TankRenderInfo.EMPTY, ForgeDirection.SOUTH, x, y, z); + public void renderTileEntityAt(TileEntity tile, double x, double y, double z, float partialTicks, int destroyStage) { + if(tile != null){ + IRenderableTile generator = (IRenderableTile) tile; + render(generator.getResourceTankInfo(), generator.getProductTankInfo(), generator.getOrientation(), x, y, z); + }else{ + render(TankRenderInfo.EMPTY, TankRenderInfo.EMPTY, EnumFacing.SOUTH, x, y, z); + } } - @Override - public void renderTileEntityAt(TileEntity tileentity, double d, double d1, double d2, float f) { - IRenderableTile generator = (IRenderableTile) tileentity; - render(generator.getResourceTankInfo(), generator.getProductTankInfo(), generator.getOrientation(), d, d1, d2); - } - - private void render(TankRenderInfo resourceTankInfo, TankRenderInfo productTankInfo, ForgeDirection orientation, double x, double y, double z) { + private void render(TankRenderInfo resourceTankInfo, TankRenderInfo productTankInfo, EnumFacing orientation, double x, double y, double z) { GL11.glPushMatrix(); GL11.glTranslatef((float) x, (float) y, (float) z); float[] angle = {0, 0, 0}; if (orientation == null) { - orientation = ForgeDirection.WEST; + orientation = EnumFacing.WEST; } switch (orientation) { case EAST: diff --git a/src/main/java/forestry/core/render/RenderMill.java b/src/main/java/forestry/core/render/RenderMill.java index 2018f7d31..200d9d163 100755 --- a/src/main/java/forestry/core/render/RenderMill.java +++ b/src/main/java/forestry/core/render/RenderMill.java @@ -13,17 +13,15 @@ package forestry.core.render; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.common.util.ForgeDirection; - import org.lwjgl.opengl.GL11; import forestry.core.proxy.Proxies; import forestry.core.tiles.TileMill; -public class RenderMill extends TileEntitySpecialRenderer implements IBlockRenderer { +public class RenderMill extends TileEntitySpecialRenderer { private final ModelBase model = new ModelBase() { }; @@ -89,20 +87,21 @@ public class RenderMill extends TileEntitySpecialRenderer implements IBlockRende public RenderMill(String baseTexture, byte charges) { this(baseTexture); } - + + /** + * @param mill If it null its render the item else it render the tile entity. + */ @Override - public void inventoryRender(double x, double y, double z) { - byte charge = 0; - render(0.0f, charge, ForgeDirection.WEST, x, y, z); + public void renderTileEntityAt(TileMill mill, double x, double y, double z, float partialTicks, int destroyStage) { + if(mill != null){ + render(mill.progress, mill.charge, EnumFacing.WEST, x, y, z); + }else{ + byte charge = 0; + render(0.0f, charge, EnumFacing.WEST, x, y, z); + } } - @Override - public void renderTileEntityAt(TileEntity tileentity, double d, double d1, double d2, float f) { - TileMill tile = (TileMill) tileentity; - render(tile.progress, tile.charge, ForgeDirection.WEST, d, d1, d2); - } - - private void render(float progress, int charge, ForgeDirection orientation, double x, double y, double z) { + private void render(float progress, int charge, EnumFacing orientation, double x, double y, double z) { GL11.glPushMatrix(); @@ -121,7 +120,7 @@ public class RenderMill extends TileEntitySpecialRenderer implements IBlockRende float tfactor = step / 16; if (orientation == null) { - orientation = ForgeDirection.WEST; + orientation = EnumFacing.WEST; } switch (orientation) { case EAST: diff --git a/src/main/java/forestry/core/render/RenderNaturalistChest.java b/src/main/java/forestry/core/render/RenderNaturalistChest.java index 4f5d0b399..2432baa38 100644 --- a/src/main/java/forestry/core/render/RenderNaturalistChest.java +++ b/src/main/java/forestry/core/render/RenderNaturalistChest.java @@ -12,17 +12,15 @@ package forestry.core.render; import net.minecraft.client.model.ModelChest; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.common.util.ForgeDirection; - import org.lwjgl.opengl.GL11; import forestry.core.config.Constants; import forestry.core.tiles.TileNaturalistChest; -public class RenderNaturalistChest extends TileEntitySpecialRenderer implements IBlockRenderer { +public class RenderNaturalistChest extends TileEntitySpecialRenderer { private final ModelChest chestModel = new ModelChest(); private final ResourceLocation texture; @@ -30,19 +28,20 @@ public class RenderNaturalistChest extends TileEntitySpecialRenderer implements public RenderNaturalistChest(String textureName) { texture = new ForestryResource(Constants.TEXTURE_PATH_BLOCKS + "/" + textureName + ".png"); } - + + /** + * @param chest If it null its render the item else it render the tile entity. + */ @Override - public void inventoryRender(double x, double y, double z) { - render(ForgeDirection.EAST, 0, 0, x, y, z, 0); + public void renderTileEntityAt(TileNaturalistChest chest, double x, double y, double z, float partialTicks, int destroyStage) { + if(chest != null){ + render(chest.getOrientation(), chest.prevLidAngle, chest.lidAngle, x, y, z, partialTicks); + }else{ + render(EnumFacing.WEST, 0, 0, x, y, z, 0); + } } - @Override - public void renderTileEntityAt(TileEntity tileentity, double x, double y, double z, float partialTick) { - TileNaturalistChest chest = (TileNaturalistChest) tileentity; - render(chest.getOrientation(), chest.prevLidAngle, chest.lidAngle, x, y, z, partialTick); - } - - public void render(ForgeDirection orientation, float prevLidAngle, float lidAngle, double x, double y, double z, float partialTick) { + public void render(EnumFacing orientation, float prevLidAngle, float lidAngle, double x, double y, double z, float partialTick) { GL11.glPushMatrix(); bindTexture(texture); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); diff --git a/src/main/java/forestry/core/render/RenderOverlayBlock.java b/src/main/java/forestry/core/render/RenderOverlayBlock.java deleted file mode 100644 index 85fc20c76..000000000 --- a/src/main/java/forestry/core/render/RenderOverlayBlock.java +++ /dev/null @@ -1,119 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v3 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: - * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges - ******************************************************************************/ -package forestry.core.render; - -import net.minecraft.block.Block; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.util.IIcon; -import net.minecraft.world.IBlockAccess; - -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; - -public abstract class RenderOverlayBlock implements ISimpleBlockRenderingHandler { - - protected static final double OVERLAY_SHIFT = 0.001; - - private static int determineMixedBrightness(IBlockAccess world, Block block, int x, int y, int z, RenderBlocks renderer, int mixedBrightness) { - return renderer.renderMinY > 0.0D ? mixedBrightness : block.getMixedBrightnessForBlock(world, x, y, z); - } - - protected static void renderBottomFace(IBlockAccess world, Block block, int x, int y, int z, RenderBlocks renderer, IIcon textureIndex, int mixedBrightness, - float r, float g, float b) { - - if (!renderer.renderAllFaces && !block.shouldSideBeRendered(world, x, y - 1, z, 0)) { - return; - } - - Tessellator tesselator = Tessellator.instance; - - tesselator.setBrightness(determineMixedBrightness(world, block, x, y - 1, z, renderer, mixedBrightness)); - tesselator.setColorOpaque_F(r, g, b); - renderer.renderFaceYNeg(block, x, y - OVERLAY_SHIFT, z, textureIndex); - - } - - protected static void renderTopFace(IBlockAccess world, Block block, int x, int y, int z, RenderBlocks renderer, IIcon textureIndex, int mixedBrightness, float r, - float g, float b) { - - if (!renderer.renderAllFaces && !block.shouldSideBeRendered(world, x, y + 1, z, 1)) { - return; - } - - Tessellator tesselator = Tessellator.instance; - - tesselator.setBrightness(determineMixedBrightness(world, block, x, y + 1, z, renderer, mixedBrightness)); - tesselator.setColorOpaque_F(r, g, b); - renderer.renderFaceYPos(block, x, y + OVERLAY_SHIFT, z, textureIndex); - - } - - protected static void renderEastFace(IBlockAccess world, Block block, int x, int y, int z, RenderBlocks renderer, IIcon textureIndex, int mixedBrightness, float r, - float g, float b) { - - if (!renderer.renderAllFaces && !block.shouldSideBeRendered(world, x, y, z - 1, 2)) { - return; - } - - Tessellator tesselator = Tessellator.instance; - - tesselator.setBrightness(determineMixedBrightness(world, block, x, y, z - 1, renderer, mixedBrightness)); - tesselator.setColorOpaque_F(r, g, b); - renderer.renderFaceZNeg(block, x, y, z - OVERLAY_SHIFT, textureIndex); - - } - - protected static void renderWestFace(IBlockAccess world, Block block, int x, int y, int z, RenderBlocks renderer, IIcon textureIndex, int mixedBrightness, float r, - float g, float b) { - - if (!renderer.renderAllFaces && !block.shouldSideBeRendered(world, x, y, z + 1, 3)) { - return; - } - - Tessellator tesselator = Tessellator.instance; - - tesselator.setBrightness(determineMixedBrightness(world, block, x, y, z + 1, renderer, mixedBrightness)); - tesselator.setColorOpaque_F(r, g, b); - renderer.renderFaceZPos(block, x, y, z + OVERLAY_SHIFT, textureIndex); - - } - - protected static void renderNorthFace(IBlockAccess world, Block block, int x, int y, int z, RenderBlocks renderer, IIcon textureIndex, int mixedBrightness, - float r, float g, float b) { - - if (!renderer.renderAllFaces && !block.shouldSideBeRendered(world, x - 1, y, z, 4)) { - return; - } - - Tessellator tesselator = Tessellator.instance; - - tesselator.setBrightness(determineMixedBrightness(world, block, x - 1, y, z, renderer, mixedBrightness)); - tesselator.setColorOpaque_F(r, g, b); - renderer.renderFaceXNeg(block, x - OVERLAY_SHIFT, y, z, textureIndex); - - } - - protected static void renderSouthFace(IBlockAccess world, Block block, int x, int y, int z, RenderBlocks renderer, IIcon textureIndex, int mixedBrightness, - float r, float g, float b) { - - if (!renderer.renderAllFaces && !block.shouldSideBeRendered(world, x + 1, y, z, 5)) { - return; - } - - Tessellator tesselator = Tessellator.instance; - - tesselator.setBrightness(determineMixedBrightness(world, block, x + 1, y, z, renderer, mixedBrightness)); - tesselator.setColorOpaque_F(r, g, b); - renderer.renderFaceXPos(block, x + OVERLAY_SHIFT, y, z, textureIndex); - - } - -} diff --git a/src/main/java/forestry/core/render/StateMapperForestry.java b/src/main/java/forestry/core/render/StateMapperForestry.java new file mode 100644 index 000000000..fa5df91fa --- /dev/null +++ b/src/main/java/forestry/core/render/StateMapperForestry.java @@ -0,0 +1,41 @@ +package forestry.core.render; + +import java.util.Iterator; +import java.util.Map; +import java.util.Map.Entry; + +import com.google.common.collect.Maps; + +import net.minecraft.block.properties.IProperty; +import net.minecraft.client.renderer.block.statemap.IStateMapper; + +public abstract class StateMapperForestry implements IStateMapper { + + protected Map mapStateModelLocations = Maps.newLinkedHashMap(); + + public String getPropertyString(Map p_178131_1_) { + StringBuilder stringbuilder = new StringBuilder(); + Iterator iterator = p_178131_1_.entrySet().iterator(); + + while (iterator.hasNext()) { + Entry entry = (Entry) iterator.next(); + + if (stringbuilder.length() != 0) { + stringbuilder.append(","); + } + + IProperty iproperty = (IProperty) entry.getKey(); + Comparable comparable = (Comparable) entry.getValue(); + stringbuilder.append(iproperty.getName()); + stringbuilder.append("="); + stringbuilder.append(iproperty.getName(comparable)); + } + + if (stringbuilder.length() == 0) { + stringbuilder.append("normal"); + } + + return stringbuilder.toString(); + } + +} diff --git a/src/main/java/forestry/core/render/StateMapperMachine.java b/src/main/java/forestry/core/render/StateMapperMachine.java new file mode 100644 index 000000000..d98bccb0f --- /dev/null +++ b/src/main/java/forestry/core/render/StateMapperMachine.java @@ -0,0 +1,52 @@ +package forestry.core.render; + +import java.util.LinkedHashMap; +import java.util.Map; +import com.google.common.collect.Maps; + +import forestry.core.blocks.IMachineProperties; +import forestry.core.blocks.IMachinePropertiesTESR; +import net.minecraft.block.Block; +import net.minecraft.block.properties.PropertyEnum; +import net.minecraft.block.state.IBlockState; +import net.minecraft.client.resources.model.ModelResourceLocation; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.IStringSerializable; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +@SideOnly(Side.CLIENT) +public class StateMapperMachine & IMachineProperties & IStringSerializable> extends StateMapperForestry { + + public final Class clazz; + + /* PROPERTYS */ + public final PropertyEnum META; + public final PropertyEnum FACE; + + public StateMapperMachine(Class clazz, PropertyEnum META, PropertyEnum FACE) { + this.clazz = clazz; + this.META = META; + this.FACE = FACE; + } + + @Override + public Map putStateModelLocations(Block block) { + for (C definition : clazz.getEnumConstants()) { + if (definition instanceof IMachinePropertiesTESR) + continue; + for (EnumFacing facing : EnumFacing.values()) { + if (facing == EnumFacing.DOWN || facing == EnumFacing.UP) + continue; + IBlockState state = block.getDefaultState().withProperty(META, definition).withProperty(FACE, facing); + LinkedHashMap linkedhashmap = Maps.newLinkedHashMap(state.getProperties()); + ResourceLocation RL = Block.blockRegistry.getNameForObject(block); + String s = String.format("%s:%s", RL.getResourceDomain(), RL.getResourcePath() + "_" + META.getName((C) linkedhashmap.remove(META))); + mapStateModelLocations.put(state, new ModelResourceLocation(s, getPropertyString(linkedhashmap))); + } + } + return this.mapStateModelLocations; + } + +} diff --git a/src/main/java/forestry/core/render/TextureManager.java b/src/main/java/forestry/core/render/TextureManager.java index d407485a1..acb37ec2b 100755 --- a/src/main/java/forestry/core/render/TextureManager.java +++ b/src/main/java/forestry/core/render/TextureManager.java @@ -15,24 +15,24 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.util.IIcon; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - import forestry.api.core.ForestryAPI; -import forestry.api.core.IIconProvider; +import forestry.api.core.ISpriteProvider; import forestry.api.core.ITextureManager; +import forestry.core.proxy.Proxies; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.renderer.texture.TextureMap; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; @SideOnly(Side.CLIENT) public class TextureManager implements ITextureManager { private static final TextureManager instance = new TextureManager(); - private static final Map defaultIcons = new HashMap<>(); - private static final DefaultIconProvider defaultIconProvider = new DefaultIconProvider(); - private static final List iconProviders = new ArrayList<>(); + private static final Map defaultIcons = new HashMap<>(); + private static final DefaultSpriteProvider defaultIconProvider = new DefaultSpriteProvider(); + private static final List iconProviders = new ArrayList<>(); static { ForestryAPI.textureManager = instance; @@ -46,7 +46,7 @@ public class TextureManager implements ITextureManager { private TextureManager() { } - public static void initDefaultIcons(IIconRegister register) { + public static void initDefaultSprites() { String[] defaultIconNames = new String[]{"habitats/desert", "habitats/end", "habitats/forest", "habitats/hills", "habitats/jungle", "habitats/mushroom", "habitats/nether", "habitats/ocean", "habitats/plains", "habitats/snow", "habitats/swamp", "habitats/taiga", "misc/access.private", "misc/access.viewable", "misc/access.shared", "misc/energy", "misc/hint", @@ -57,39 +57,54 @@ public class TextureManager implements ITextureManager { "slots/blocked", "slots/blocked_2", "slots/liquid", "slots/container", "slots/locked", "mail/carrier.player", "mail/carrier.trader"}; for (String str : defaultIconNames) { - IIcon icon = registerTex(register, str); + TextureAtlasSprite icon = registerSprite("items/" + str); defaultIcons.put(str, icon); } } - - public static IIcon registerTex(IIconRegister register, String identifier) { - return register.registerIcon("forestry:" + identifier); + + public static TextureAtlasSprite registerSprite(String identifier) { + TextureMap map = Proxies.common.getClientInstance().getTextureMapBlocks(); + return map.registerSprite(new ResourceLocation("forestry:" + identifier)); + } + + public TextureAtlasSprite getSprite(String modID, String identifier) { + TextureMap map = Proxies.common.getClientInstance().getTextureMapBlocks(); + if (map.getAtlasSprite(new ResourceLocation(modID + ":" + identifier).toString()) == map.getMissingSprite()) + return map.registerSprite(new ResourceLocation(modID + ":" + identifier)); + return map.getAtlasSprite(new ResourceLocation(modID + ":" + identifier).toString()); + } + + public TextureAtlasSprite getSprite(String modID, String modifier, String identifier) { + TextureMap map = Proxies.common.getClientInstance().getTextureMapBlocks(); + if (map.getAtlasSprite(new ResourceLocation(modID + ":" + modifier + "/" + identifier).toString()) == map.getMissingSprite()) + return map.registerSprite(new ResourceLocation(modID + ":" + modifier + "/" + identifier)); + return map.getAtlasSprite(new ResourceLocation(modID + ":" + modifier + "/" + identifier).toString()); } - public static IIcon registerTexUID(IIconRegister register, short uid, String identifier) { - IIcon texture = registerTex(register, identifier); + public static TextureAtlasSprite registerSpriteUID(short uid, String identifier) { + TextureAtlasSprite texture = registerSprite(identifier); defaultIconProvider.addTexture(uid, texture); return texture; } @Override - public IIcon getDefault(String ident) { + public TextureAtlasSprite getDefault(String ident) { return defaultIcons.get(ident); } @Override - public void registerIconProvider(IIconProvider provider) { + public void registerIconProvider(ISpriteProvider provider) { iconProviders.add(provider); } @Override - public IIcon getIcon(short texUID) { + public TextureAtlasSprite getSprite(short texUID) { if (texUID < 0) { return null; } - for (IIconProvider provider : iconProviders) { - IIcon icon = provider.getIcon(texUID); + for (ISpriteProvider provider : iconProviders) { + TextureAtlasSprite icon = provider.getSprite(texUID); if (icon != null) { return icon; } @@ -98,20 +113,20 @@ public class TextureManager implements ITextureManager { return null; } - private static class DefaultIconProvider implements IIconProvider { - private final Map textures = new HashMap<>(); + private static class DefaultSpriteProvider implements ISpriteProvider { + private final Map textures = new HashMap<>(); - public void addTexture(short texUID, IIcon texture) { + public void addTexture(short texUID, TextureAtlasSprite texture) { textures.put(texUID, texture); } @Override - public IIcon getIcon(short texUID) { + public TextureAtlasSprite getSprite(short texUID) { return textures.get(texUID); } @Override - public void registerIcons(IIconRegister register) { + public void registerSprites() { } } diff --git a/src/main/java/forestry/core/render/TileRendererIndex.java b/src/main/java/forestry/core/render/TileRendererIndex.java index 747e0a00d..6d28001d6 100755 --- a/src/main/java/forestry/core/render/TileRendererIndex.java +++ b/src/main/java/forestry/core/render/TileRendererIndex.java @@ -21,10 +21,12 @@ public class TileRendererIndex { this.meta = meta; } + @Override public int hashCode() { return block.hashCode() + meta; } + @Override public boolean equals(Object obj) { if (!(obj instanceof TileRendererIndex)) { return false; diff --git a/src/main/java/forestry/core/render/model/BlockModelIndex.java b/src/main/java/forestry/core/render/model/BlockModelIndex.java new file mode 100644 index 000000000..dedc0c45a --- /dev/null +++ b/src/main/java/forestry/core/render/model/BlockModelIndex.java @@ -0,0 +1,31 @@ +/******************************************************************************* + * Copyright (c) 2011-2014 SirSengir. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser Public License v3 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl-3.0.txt + * + * Various Contributors including, but not limited to: + * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges + ******************************************************************************/ +package forestry.core.render.model; + +import net.minecraft.block.Block; +import net.minecraft.client.resources.model.IBakedModel; +import net.minecraft.client.resources.model.ModelResourceLocation; + +public class BlockModelIndex { + + public final ModelResourceLocation blockModelLocation; + public final ModelResourceLocation itemModelLocation; + public final IBakedModel model; + public final Block block; + + public BlockModelIndex(ModelResourceLocation blockModelLocation, ModelResourceLocation itemModelLocation, IBakedModel model, Block block) { + this.blockModelLocation = blockModelLocation; + this.itemModelLocation = itemModelLocation; + this.model = model; + this.block = block; + } + +} diff --git a/src/main/java/forestry/core/render/model/ModelBaker.java b/src/main/java/forestry/core/render/model/ModelBaker.java new file mode 100644 index 000000000..174513fb8 --- /dev/null +++ b/src/main/java/forestry/core/render/model/ModelBaker.java @@ -0,0 +1,279 @@ +/******************************************************************************* + * Copyright (c) 2011-2014 SirSengir. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser Public License v3 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl-3.0.txt + * + * Various Contributors including, but not limited to: + * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges + ******************************************************************************/ +package forestry.core.render.model; + +import java.util.ArrayList; +import java.util.EnumSet; +import java.util.List; + +import org.lwjgl.util.vector.Vector3f; + +import forestry.api.core.IModelBaker; +import net.minecraft.block.Block; +import net.minecraft.client.renderer.block.model.BakedQuad; +import net.minecraft.client.renderer.block.model.BlockFaceUV; +import net.minecraft.client.renderer.block.model.BlockPartFace; +import net.minecraft.client.renderer.block.model.FaceBakery; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.resources.model.IBakedModel; +import net.minecraft.client.resources.model.ModelRotation; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; +import net.minecraftforge.client.model.IColoredBakedQuad; + +public class ModelBaker implements IModelBaker { + + protected double renderMinX; + protected double renderMaxX; + + protected double renderMinY; + protected double renderMaxY; + + protected double renderMinZ; + protected double renderMaxZ; + + protected ModelBakerModel generatedModel = new ModelBakerModel(); + + protected final FaceBakery faceBakery = new FaceBakery(); + + protected final float[] defUVs = new float[] { 0, 0, 1, 1 }; + + @Override + public void setRenderBoundsFromBlock(Block block) { + if (block == null) + return; + + renderMinX = block.getBlockBoundsMinX(); + renderMinY = block.getBlockBoundsMinY(); + renderMinZ = block.getBlockBoundsMinZ(); + renderMaxX = block.getBlockBoundsMaxX(); + renderMaxY = block.getBlockBoundsMaxY(); + renderMaxZ = block.getBlockBoundsMaxZ(); + } + + @Override + public void setRenderBounds(double d, double e, double f, double g, double h, double i) { + renderMinX = d; + renderMinY = e; + renderMinZ = f; + renderMaxX = g; + renderMaxY = h; + renderMaxZ = i; + } + + protected int color = -1; + + @Override + public void setColor(int color) { + this.color = color; + } + + @Override + public boolean renderStandardBlock(Block block, BlockPos pos, TextureAtlasSprite[] textures) { + setRenderBoundsFromBlock(block); + + setColor(0xffffff); + + renderFaceXNeg(pos, textures[EnumFacing.WEST.ordinal()]); + renderFaceXPos(pos, textures[EnumFacing.EAST.ordinal()]); + renderFaceYNeg(pos, textures[EnumFacing.DOWN.ordinal()]); + renderFaceYPos(pos, textures[EnumFacing.UP.ordinal()]); + renderFaceZNeg(pos, textures[EnumFacing.NORTH.ordinal()]); + renderFaceZPos(pos, textures[EnumFacing.SOUTH.ordinal()]); + + return false; + } + + @Override + public boolean renderStandardBlock(Block block, BlockPos pos, TextureAtlasSprite texture) { + setRenderBoundsFromBlock(block); + + setColor(0xffffff); + + renderFaceXNeg(pos, texture); + renderFaceXPos(pos, texture); + renderFaceYNeg(pos, texture); + renderFaceYPos(pos, texture); + renderFaceZNeg(pos, texture); + renderFaceZPos(pos, texture); + + return false; + } + + private final float quadsUV[] = new float[] { 0, 0, 1, 1, 0, 0, 1, 1 }; + protected EnumSet renderFaces = EnumSet.allOf(EnumFacing.class); + private List faces = new ArrayList(); + + protected float[] getFaceUvs(final EnumFacing face, final Vector3f to_16, final Vector3f from_16) { + float from_a = 0; + float from_b = 0; + float to_a = 0; + float to_b = 0; + + switch (face) { + case UP: + from_a = from_16.x / 16.0f; + from_b = from_16.z / 16.0f; + to_a = to_16.x / 16.0f; + to_b = to_16.z / 16.0f; + break; + case DOWN: + from_a = from_16.x / 16.0f; + from_b = from_16.z / 16.0f; + to_a = to_16.x / 16.0f; + to_b = to_16.z / 16.0f; + break; + case SOUTH: + from_a = from_16.x / 16.0f; + from_b = from_16.y / 16.0f; + to_a = to_16.x / 16.0f; + to_b = to_16.y / 16.0f; + break; + case NORTH: + from_a = from_16.x / 16.0f; + from_b = from_16.y / 16.0f; + to_a = to_16.x / 16.0f; + to_b = to_16.y / 16.0f; + break; + case EAST: + from_a = from_16.y / 16.0f; + from_b = from_16.z / 16.0f; + to_a = to_16.y / 16.0f; + to_b = to_16.z / 16.0f; + break; + case WEST: + from_a = from_16.y / 16.0f; + from_b = from_16.z / 16.0f; + to_a = to_16.y / 16.0f; + to_b = to_16.z / 16.0f; + break; + default: + } + + from_a = 1.0f - from_a; + from_b = 1.0f - from_b; + to_a = 1.0f - to_a; + to_b = 1.0f - to_b; + + final float[] afloat = new float[] { // :P + 16.0f * (quadsUV[0] + quadsUV[2] * from_a + quadsUV[4] * from_b), // 0 + 16.0f * (quadsUV[1] + quadsUV[3] * from_a + quadsUV[5] * from_b), // 1 + + 16.0f * (quadsUV[0] + quadsUV[2] * to_a + quadsUV[4] * from_b), // 2 + 16.0f * (quadsUV[1] + quadsUV[3] * to_a + quadsUV[5] * from_b), // 3 + + 16.0f * (quadsUV[0] + quadsUV[2] * to_a + quadsUV[4] * to_b), // 2 + 16.0f * (quadsUV[1] + quadsUV[3] * to_a + quadsUV[5] * to_b), // 3 + + 16.0f * (quadsUV[0] + quadsUV[2] * from_a + quadsUV[4] * to_b), // 0 + 16.0f * (quadsUV[1] + quadsUV[3] * from_a + quadsUV[5] * to_b), // 1 + }; + + return afloat; + } + + @Override + public void renderFaceXNeg(BlockPos pos, TextureAtlasSprite sprite) { + boolean isEdge = renderMinX < 0.0001; + Vector3f to = new Vector3f((float) renderMinX * 16.0f, (float) renderMinY * 16.0f, (float) renderMinZ * 16.0f); + Vector3f from = new Vector3f((float) renderMinX * 16.0f, (float) renderMaxY * 16.0f, (float) renderMaxZ * 16.0f); + + final EnumFacing myFace = EnumFacing.WEST; + addFace(myFace, isEdge, to, from, defUVs, sprite); + } + + @Override + public void renderFaceYNeg(BlockPos pos, TextureAtlasSprite sprite) { + boolean isEdge = renderMinY < 0.0001; + Vector3f to = new Vector3f((float) renderMinX * 16.0f, (float) renderMinY * 16.0f, (float) renderMinZ * 16.0f); + Vector3f from = new Vector3f((float) renderMaxX * 16.0f, (float) renderMinY * 16.0f, (float) renderMaxZ * 16.0f); + + final EnumFacing myFace = EnumFacing.DOWN; + addFace(myFace, isEdge, to, from, defUVs, sprite); + } + + @Override + public void renderFaceZNeg(BlockPos pos, TextureAtlasSprite sprite) { + boolean isEdge = renderMinZ < 0.0001; + Vector3f to = new Vector3f((float) renderMinX * 16.0f, (float) renderMinY * 16.0f, (float) renderMinZ * 16.0f); + Vector3f from = new Vector3f((float) renderMaxX * 16.0f, (float) renderMaxY * 16.0f, (float) renderMinZ * 16.0f); + + final EnumFacing myFace = EnumFacing.NORTH; + addFace(myFace, isEdge, to, from, defUVs, sprite); + } + + @Override + public void renderFaceYPos(BlockPos pos, TextureAtlasSprite sprite) { + boolean isEdge = renderMaxY > 0.9999; + Vector3f to = new Vector3f((float) renderMinX * 16.0f, (float) renderMaxY * 16.0f, (float) renderMinZ * 16.0f); + Vector3f from = new Vector3f((float) renderMaxX * 16.0f, (float) renderMaxY * 16.0f, (float) renderMaxZ * 16.0f); + + final EnumFacing myFace = EnumFacing.UP; + addFace(myFace, isEdge, to, from, defUVs, sprite); + } + + @Override + public void renderFaceZPos(BlockPos pos, TextureAtlasSprite sprite) { + boolean isEdge = renderMaxZ > 0.9999; + Vector3f to = new Vector3f((float) renderMinX * 16.0f, (float) renderMinY * 16.0f, (float) renderMaxZ * 16.0f); + Vector3f from = new Vector3f((float) renderMaxX * 16.0f, (float) renderMaxY * 16.0f, (float) renderMaxZ * 16.0f); + + final EnumFacing myFace = EnumFacing.SOUTH; + addFace(myFace, isEdge, to, from, defUVs, sprite); + } + + @Override + public void renderFaceXPos(BlockPos pos, TextureAtlasSprite sprite) { + boolean isEdge = renderMaxX > 0.9999; + Vector3f to = new Vector3f((float) renderMaxX * 16.0f, (float) renderMinY * 16.0f, (float) renderMinZ * 16.0f); + Vector3f from = new Vector3f((float) renderMaxX * 16.0f, (float) renderMaxY * 16.0f, (float) renderMaxZ * 16.0f); + + final EnumFacing myFace = EnumFacing.EAST; + addFace(myFace, isEdge, to, from, defUVs, sprite); + } + + protected void addFace(EnumFacing face, boolean isEdge, Vector3f to, Vector3f from, float[] defUVs2, TextureAtlasSprite texture) { + faces.add(new ModelBakerFace(face, isEdge, color, to, from, defUVs2, texture)); + } + + @Override + public IBakedModel bakeModel(boolean flip) { + ModelRotation mr = ModelRotation.X0_Y0; + + if (flip) + mr = ModelRotation.X0_Y180; + + for (ModelBakerFace face : faces) { + final EnumFacing myFace = face.face; + final float[] uvs = getFaceUvs(myFace, face.from, face.to); + + final BlockFaceUV uv = new BlockFaceUV(uvs, 0); + final BlockPartFace bpf = new BlockPartFace(myFace, face.color, "", uv); + + BakedQuad bf = faceBakery.makeBakedQuad(face.to, face.from, bpf, face.spite, myFace, mr, null, true, true); + bf = new IColoredBakedQuad.ColoredBakedQuad(bf.getVertexData(), face.color, bf.getFace()); + + if (face.isEdge) + this.generatedModel.getFaceQuads(myFace).add(bf); + else + this.generatedModel.getGeneralQuads().add(bf); + } + return clearBaker(); + } + + protected ModelBakerModel clearBaker() { + ModelBakerModel model = generatedModel.copy(); + generatedModel = new ModelBakerModel(); + faces = new ArrayList(); + return model; + } + +} diff --git a/src/main/java/forestry/core/render/model/ModelBakerFace.java b/src/main/java/forestry/core/render/model/ModelBakerFace.java new file mode 100644 index 000000000..a62cd29fc --- /dev/null +++ b/src/main/java/forestry/core/render/model/ModelBakerFace.java @@ -0,0 +1,43 @@ +/******************************************************************************* + * Copyright (c) 2011-2014 SirSengir. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser Public License v3 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl-3.0.txt + * + * Various Contributors including, but not limited to: + * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges + ******************************************************************************/ +package forestry.core.render.model; + +import org.lwjgl.util.vector.Vector3f; + +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.util.EnumFacing; + +public class ModelBakerFace { + + public final EnumFacing face; + public final boolean isEdge; + + public final Vector3f to; + public final Vector3f from; + + public final float[] uv; + + public final TextureAtlasSprite spite; + + public final int color; + + public ModelBakerFace(EnumFacing face, boolean isEdge, int color, Vector3f to, Vector3f from, float[] defUVs2, + TextureAtlasSprite sprite) { + this.color = color; + this.face = face; + this.isEdge = isEdge; + this.to = to; + this.from = from; + this.uv = defUVs2; + this.spite = sprite; + } + +} diff --git a/src/main/java/forestry/core/render/model/ModelBakerModel.java b/src/main/java/forestry/core/render/model/ModelBakerModel.java new file mode 100644 index 000000000..5325ccaa7 --- /dev/null +++ b/src/main/java/forestry/core/render/model/ModelBakerModel.java @@ -0,0 +1,108 @@ +/******************************************************************************* + * Copyright (c) 2011-2014 SirSengir. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser Public License v3 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl-3.0.txt + * + * Various Contributors including, but not limited to: + * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges + ******************************************************************************/ +package forestry.core.render.model; + +import java.util.ArrayList; +import java.util.List; + +import org.lwjgl.util.vector.Vector3f; + +import net.minecraft.client.renderer.block.model.BakedQuad; +import net.minecraft.client.renderer.block.model.ItemCameraTransforms; +import net.minecraft.client.renderer.block.model.ItemTransformVec3f; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.resources.model.IBakedModel; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.MathHelper; + +public class ModelBakerModel implements IBakedModel { + protected List[] faces = new List[6]; + protected List general; + + public ModelBakerModel() { + general = new ArrayList(); + for (EnumFacing f : EnumFacing.VALUES) + faces[f.ordinal()] = new ArrayList(); + } + + private ModelBakerModel(List general, List[] faces) { + this.general = general; + this.faces = faces; + } + + @Override + public boolean isGui3d() { + return true; + } + + @Override + public boolean isBuiltInRenderer() { + return false; + } + + @Override + public boolean isAmbientOcclusion() { + return true; + } + + @Override + public TextureAtlasSprite getParticleTexture() { + return null; + } + + @Override + public ItemCameraTransforms getItemCameraTransforms() { + return getTransform(); + } + + public ItemCameraTransforms getTransform() { + Vector3f rotation = new Vector3f(getRotation()[0], getRotation()[1], getRotation()[2]); + Vector3f translation = new Vector3f(getTranslation()[0], getTranslation()[1], getTranslation()[2]); + translation.scale(0.0625F); + MathHelper.clamp_double(translation.x, -1.5D, 1.5D); + MathHelper.clamp_double(translation.y, -1.5D, 1.5D); + MathHelper.clamp_double(translation.z, -1.5D, 1.5D); + Vector3f scale = new Vector3f(getScale()[0], getScale()[1], getScale()[2]); + MathHelper.clamp_double(scale.x, -1.5D, 1.5D); + MathHelper.clamp_double(scale.y, -1.5D, 1.5D); + MathHelper.clamp_double(scale.z, -1.5D, 1.5D); + + new ItemTransformVec3f(rotation, translation, scale); + ItemTransformVec3f transformV = new ItemTransformVec3f(rotation, translation, scale); + return new ItemCameraTransforms(transformV, ItemCameraTransforms.DEFAULT.firstPerson, ItemCameraTransforms.DEFAULT.head, ItemCameraTransforms.DEFAULT.gui, ItemCameraTransforms.DEFAULT.ground, ItemCameraTransforms.DEFAULT.fixed); + } + + protected float[] getRotation() { + return new float[] { -80, -45, 170 }; + } + + protected float[] getTranslation() { + return new float[] { 0, 1.5F, -2.75F }; + } + + protected float[] getScale() { + return new float[] { 0.375F, 0.375F, 0.375F }; + } + + @Override + public List getGeneralQuads() { + return general; + } + + @Override + public List getFaceQuads(EnumFacing face) { + return faces[face.ordinal()]; + } + + public ModelBakerModel copy() { + return new ModelBakerModel(general, faces); + } +} diff --git a/src/main/java/forestry/core/render/model/ModelBlockOverlay.java b/src/main/java/forestry/core/render/model/ModelBlockOverlay.java new file mode 100644 index 000000000..381e14cdb --- /dev/null +++ b/src/main/java/forestry/core/render/model/ModelBlockOverlay.java @@ -0,0 +1,173 @@ +/******************************************************************************* + * Copyright (c) 2011-2014 SirSengir. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser Public License v3 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl-3.0.txt + * + * Various Contributors including, but not limited to: + * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges + ******************************************************************************/ +package forestry.core.render.model; + +import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.block.model.ItemCameraTransforms; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.resources.model.IBakedModel; +import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; +import net.minecraft.world.IBlockAccess; +import net.minecraftforge.client.model.ISmartBlockModel; +import net.minecraftforge.client.model.ISmartItemModel; +import net.minecraftforge.common.property.IExtendedBlockState; +import java.util.Collections; +import java.util.List; + +import forestry.api.core.IModelBaker; +import forestry.core.blocks.propertys.UnlistedBlockAccess; +import forestry.core.blocks.propertys.UnlistedBlockPos; + +public abstract class ModelBlockOverlay implements ISmartItemModel, ISmartBlockModel { + + protected static void renderBottomFace(IBlockAccess world, Block block, BlockPos pos, IModelBaker renderer, + TextureAtlasSprite textureIndex, int mixedBrightness, float r, float g, float b) { + + BlockPos posNEW = new BlockPos(pos.getX(), pos.getY() - 1, pos.getZ()); + + if (!block.shouldSideBeRendered(world, posNEW, EnumFacing.DOWN)) { + return; + } + + renderer.renderFaceYNeg(pos, textureIndex); + + } + + protected static void renderTopFace(IBlockAccess world, Block block, BlockPos pos, IModelBaker renderer, + TextureAtlasSprite textureIndex, int mixedBrightness, float r, float g, float b) { + + BlockPos posNEW = new BlockPos(pos.getX(), pos.getY() + 1, pos.getZ()); + + if (!block.shouldSideBeRendered(world, posNEW, EnumFacing.UP)) { + return; + } + + + renderer.renderFaceYPos(pos, textureIndex); + + } + + protected static void renderEastFace(IBlockAccess world, Block block, BlockPos pos, IModelBaker renderer, + TextureAtlasSprite textureIndex, int mixedBrightness, float r, float g, float b) { + + BlockPos posNEW = new BlockPos(pos.getX(), pos.getY(), pos.getZ() - 1); + + if (!block.shouldSideBeRendered(world, posNEW, EnumFacing.EAST)) { + return; + } + + renderer.renderFaceZNeg(pos, textureIndex); + + } + + protected static void renderWestFace(IBlockAccess world, Block block, BlockPos pos, IModelBaker renderer, + TextureAtlasSprite textureIndex, int mixedBrightness, float r, float g, float b) { + + BlockPos posNEW = new BlockPos(pos.getX(), pos.getY(), pos.getZ() + 1); + + if (!block.shouldSideBeRendered(world, posNEW, EnumFacing.WEST)) { + return; + } + + renderer.renderFaceZPos(pos, textureIndex); + + } + + protected static void renderNorthFace(IBlockAccess world, Block block, BlockPos pos, IModelBaker renderer, + TextureAtlasSprite textureIndex, int mixedBrightness, float r, float g, float b) { + + BlockPos posNEW = new BlockPos(pos.getX() - 1, pos.getY(), pos.getZ()); + + if (!block.shouldSideBeRendered(world, posNEW, EnumFacing.NORTH)) { + return; + } + + renderer.renderFaceXNeg(pos, textureIndex); + + } + + protected static void renderSouthFace(IBlockAccess world, Block block, BlockPos pos, IModelBaker renderer, + TextureAtlasSprite textureIndex, int mixedBrightness, float r, float g, float b) { + + BlockPos posNEW = new BlockPos(pos.getX() + 1, pos.getY(), pos.getZ()); + + if (!block.shouldSideBeRendered(world, posNEW, EnumFacing.SOUTH)) { + return; + } + + renderer.renderFaceXPos(pos, textureIndex); + + } + + @Override + public List getFaceQuads(EnumFacing p_177551_1_) { + return Collections.emptyList(); + } + + @Override + public List getGeneralQuads() { + return Collections.emptyList(); + } + + @Override + public boolean isAmbientOcclusion() { + return true; + } + + @Override + public boolean isGui3d() { + return true; + } + + @Override + public boolean isBuiltInRenderer() { + return false; + } + + @Override + public TextureAtlasSprite getParticleTexture() { + return null; + } + + @Override + public ItemCameraTransforms getItemCameraTransforms() { + return ItemCameraTransforms.DEFAULT; + } + + @Override + public IBakedModel handleBlockState(IBlockState state) { + IExtendedBlockState extend = (IExtendedBlockState) state; + IModelBaker renderer = ModelManager.getInstance().createNewRenderer(); + Block blk = state.getBlock(); + IBlockAccess world = extend.getValue(UnlistedBlockAccess.BLOCKACCESS); + BlockPos pos = extend.getValue(UnlistedBlockPos.POS); + renderer.setRenderBoundsFromBlock(blk); + renderInWorld(blk, world, pos, renderer); + return renderer.bakeModel(false); + } + + @Override + public IBakedModel handleItemState(ItemStack stack) { + IModelBaker renderer = ModelManager.getInstance().createNewRenderer(); + Block blk = Block.getBlockFromItem(stack.getItem()); + renderer.setRenderBoundsFromBlock(blk); + renderInventory(blk, stack, renderer); + return renderer.bakeModel(true); + } + + protected abstract void renderInventory(Block block, ItemStack item, IModelBaker renderer); + + protected abstract boolean renderInWorld(Block block, IBlockAccess world, BlockPos pos, IModelBaker renderer); + +} diff --git a/src/main/java/forestry/core/render/model/ModelCrate.java b/src/main/java/forestry/core/render/model/ModelCrate.java new file mode 100644 index 000000000..58f8e14b8 --- /dev/null +++ b/src/main/java/forestry/core/render/model/ModelCrate.java @@ -0,0 +1,202 @@ +/******************************************************************************* + * Copyright (c) 2011-2014 SirSengir. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser Public License v3 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl-3.0.txt + * + * Various Contributors including, but not limited to: + * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges + ******************************************************************************/ +package forestry.core.render.model; + +import java.io.IOException; +import java.util.Collection; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.renderer.vertex.VertexFormat; +import net.minecraft.client.resources.IResourceManager; +import net.minecraft.client.resources.model.ModelResourceLocation; +import net.minecraft.util.EnumWorldBlockLayer; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.client.model.ICustomModelLoader; +import net.minecraftforge.client.model.IFlexibleBakedModel; +import net.minecraftforge.client.model.IModel; +import net.minecraftforge.client.model.IModelCustomData; +import net.minecraftforge.client.model.IModelState; +import net.minecraftforge.client.model.IPerspectiveAwareModel; +import net.minecraftforge.client.model.ModelLoaderRegistry; +import net.minecraftforge.client.model.ModelStateComposition; +import net.minecraftforge.client.model.MultiLayerModel; +import net.minecraftforge.client.model.TRSRTransformation; + +import com.google.common.base.Function; +import com.google.common.base.Optional; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; +import com.google.gson.JsonElement; +import com.google.gson.JsonParser; + +import forestry.core.utils.Log; +public class ModelCrate implements IModelCustomData{ + public static final ModelCrate instance = new ModelCrate(new ModelResourceLocation("forestry:crates", "crate"), EnumWorldBlockLayer.CUTOUT, "cratedStone", "forestry", new ModelResourceLocation("forestry:crates", "cratedStone")); + + private final ModelResourceLocation baseLocation; + private final String containedUID; + private final String modID; + private final ResourceLocation containedLocation; + private final EnumWorldBlockLayer containedLayer; + + /** + * @param baseLocation The location of the crate model + * @param containedLayer The layer for the rendering from the contained item model + * @param UID The UID of the crate + * @param modID The modId of the creat item + * @param location The location of the model from the contained item + */ + public ModelCrate(ModelResourceLocation baseLocation, EnumWorldBlockLayer containedLayer, String UID, String modID, ResourceLocation location){ + this.baseLocation = baseLocation; + this.containedLayer = containedLayer; + this.containedUID = UID; + this.modID = modID; + this.containedLocation = location; + } + + @Override + public Collection getDependencies() { + return ImmutableList.of(baseLocation, containedLocation); + } + + @Override + public Collection getTextures(){ + return ImmutableList.of(); + } + + private static IModel getModel(ResourceLocation loc){ + IModel model; + try{ + model = ModelLoaderRegistry.getModel(loc); + } + catch (IOException e){ + Log.logThrowable("Couldn't load Crate Model dependency: %s", e, loc); + model = ModelLoaderRegistry.getMissingModel(); + } + return model; + } + + private static ImmutableMap, IFlexibleBakedModel> buildModels(IModelState state, VertexFormat format, Function bakedTextureGetter, IModel crateModel, ModelCrate modelToBake){ + ImmutableMap.Builder, IFlexibleBakedModel> builder = ImmutableMap.builder(); + + IModel base = getModel(modelToBake.baseLocation); + IFlexibleBakedModel baseBaked = base.bake(new ModelStateComposition(state, base.getDefaultState()), format, bakedTextureGetter); + builder.put(Optional.absent(), baseBaked); + builder.put(Optional.of(EnumWorldBlockLayer.SOLID), baseBaked); + + IModel content = getModel(modelToBake.containedLocation); + builder.put(Optional.of(modelToBake.containedLayer), content.bake(new ModelStateComposition(state, crateModel.getDefaultState()), format, bakedTextureGetter)); + return builder.build(); + } + + /** + * Bake the crate model and the content of the crate + */ + @Override + public IFlexibleBakedModel bake(IModelState state, VertexFormat format, Function bakedTextureGetter){ + IModel missing = ModelLoaderRegistry.getMissingModel(); + IModel creat; + try { + creat = ModelLoaderRegistry.getModel(new ModelResourceLocation(modID + ":" + "crates", containedUID)); + } catch (IOException e) { + e.printStackTrace(); + return missing.bake(state, format, bakedTextureGetter); + } + if(creat == null){ + return missing.bake(state, format, bakedTextureGetter); + } + return new MultiLayerModel.MultiLayerBakedModel( + buildModels(state, format, bakedTextureGetter, creat, this), + missing.bake(missing.getDefaultState(), format, bakedTextureGetter), + format, + IPerspectiveAwareModel.MapWrapper.getTransforms(state) + ); + } + + @Override + public IModelState getDefaultState(){ + return TRSRTransformation.identity(); + } + + @Override + public IModel process(ImmutableMap customData){ + ImmutableMap.Builder, ModelResourceLocation> builder = ImmutableMap.builder(); + ModelResourceLocation baseLocation = null; + ResourceLocation location = null; + String UID = ""; + String modID = ""; + EnumWorldBlockLayer layer = null; + for(String key : customData.keySet()){ + if("base".equals(key)){ + baseLocation = (ModelResourceLocation) getLocation(customData.get(key)); + } + else if("uid".equals(key)){ + UID = getString(customData.get(key)); + } + else if("modID".equals(key)){ + modID = getString(customData.get(key)); + } + else if("location".equals(key)){ + location = getLocation(customData.get(key)); + } + else if("layer".equals(key)){ + String layerName = getString(customData.get(key)); + for(EnumWorldBlockLayer l : EnumWorldBlockLayer.values()){ + if(l.toString().equals(layerName)){ + layer = l; + break; + } + } + } + } + if(baseLocation == null || layer == null || location == null || UID == null || modID == null) { + return instance; + } + return new ModelCrate(baseLocation, layer, UID, modID, location); + } + + private ResourceLocation getLocation(String json){ + JsonElement e = new JsonParser().parse(json); + if(e.isJsonPrimitive() && e.getAsJsonPrimitive().isString()){ + if(e.getAsString().contains("#")){ + return new ModelResourceLocation(e.getAsString()); + }else{ + return new ResourceLocation(e.getAsString()); + } + } + return new ModelResourceLocation("builtin/missing", "missing"); + } + + private String getString(String json){ + JsonElement e = new JsonParser().parse(json); + if(e.isJsonPrimitive() && e.getAsJsonPrimitive().isString()){ + return e.getAsString(); + } + return null; + } + + public static enum Loader implements ICustomModelLoader{ + instance; + + @Override + public void onResourceManagerReload(IResourceManager resourceManager) {} + + @Override + public boolean accepts(ResourceLocation modelLocation){ + return modelLocation.getResourceDomain().equals("forestry") && + modelLocation.getResourcePath().equals("models/block/crate"); + } + + @Override + public IModel loadModel(ResourceLocation modelLocation){ + return ModelCrate.instance; + } + } +} \ No newline at end of file diff --git a/src/main/java/forestry/core/render/ModelEscritoire.java b/src/main/java/forestry/core/render/model/ModelEscritoire.java old mode 100755 new mode 100644 similarity index 99% rename from src/main/java/forestry/core/render/ModelEscritoire.java rename to src/main/java/forestry/core/render/model/ModelEscritoire.java index e02067781..1aac4f384 --- a/src/main/java/forestry/core/render/ModelEscritoire.java +++ b/src/main/java/forestry/core/render/model/ModelEscritoire.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.core.render; +package forestry.core.render.model; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; diff --git a/src/main/java/forestry/core/render/SpriteSheet.java b/src/main/java/forestry/core/render/model/ModelIndex.java old mode 100755 new mode 100644 similarity index 60% rename from src/main/java/forestry/core/render/SpriteSheet.java rename to src/main/java/forestry/core/render/model/ModelIndex.java index 633535897..16c74bfa8 --- a/src/main/java/forestry/core/render/SpriteSheet.java +++ b/src/main/java/forestry/core/render/model/ModelIndex.java @@ -8,20 +8,19 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.core.render; +package forestry.core.render.model; -import net.minecraft.client.renderer.texture.TextureMap; -import net.minecraft.util.ResourceLocation; +import net.minecraft.client.resources.model.ModelResourceLocation; +import net.minecraftforge.client.model.IModel; -public enum SpriteSheet { - BLOCKS, - ITEMS; +public class ModelIndex { - public ResourceLocation getLocation() { - return ordinal() == 0 ? TextureMap.locationBlocksTexture : TextureMap.locationItemsTexture; - } - - public int getSheetOrdinal() { - return ordinal(); + public final ModelResourceLocation modelLocation; + public final IModel model; + + public ModelIndex(ModelResourceLocation modelLocation, IModel model) { + this.modelLocation = modelLocation; + this.model = model; } + } diff --git a/src/main/java/forestry/core/render/model/ModelManager.java b/src/main/java/forestry/core/render/model/ModelManager.java new file mode 100644 index 000000000..d16e75517 --- /dev/null +++ b/src/main/java/forestry/core/render/model/ModelManager.java @@ -0,0 +1,165 @@ +/******************************************************************************* + * Copyright (c) 2011-2014 SirSengir. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser Public License v3 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl-3.0.txt + * + * Various Contributors including, but not limited to: + * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges + ******************************************************************************/ +package forestry.core.render.model; + +import forestry.api.core.ForestryAPI; +import forestry.api.core.IModelManager; +import forestry.api.core.IItemModelRegister; +import forestry.api.core.IModelBaker; +import forestry.api.core.IStateMapperRegister; +import forestry.core.utils.StringUtil; +import forestry.plugins.ForestryPlugin; +import forestry.plugins.PluginManager; +import forestry.plugins.PluginManager.Module; +import net.minecraft.block.Block; +import net.minecraft.client.renderer.ItemMeshDefinition; +import net.minecraft.client.resources.model.ModelBakery; +import net.minecraft.client.resources.model.ModelResourceLocation; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.client.model.ModelLoader; +import net.minecraftforge.fml.common.registry.GameData; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +@SideOnly(Side.CLIENT) +public class ModelManager implements IModelManager { + + private static ModelManager instance; + + public static ModelManager getInstance() { + if (instance == null) { + instance = new ModelManager(); + ForestryAPI.modleManager = instance; + } + + return instance; + } + + @Override + public void registerItemModel(Item item, int meta, String identifier) { + ModelLoader.setCustomModelResourceLocation(item, meta, getModelLocation(item, identifier)); + } + + @Override + public void registerItemModel(Item item, int meta, String modID, String identifier) { + ModelLoader.setCustomModelResourceLocation(item, meta, getModelLocation(item, modID, identifier)); + } + + @Override + public void registerItemModel(Item item, int meta, boolean withMeta) { + if(withMeta){ + ModelLoader.setCustomModelResourceLocation(item, meta, getModelLocation(item, meta)); + }else{ + ModelLoader.setCustomModelResourceLocation(item, meta, getModelLocation(item)); + } + } + + @Override + public void registerItemModel(Item item, ItemMeshDefinition definition) { + ModelLoader.setCustomMeshDefinition(item, definition); + } + + @Override + public void registerVariant(Item item, ResourceLocation... resources) { + ModelBakery.registerItemVariants(item, resources); + } + + public static void registerModels() { + for(Module module : PluginManager.getLoadedModules()){ + ForestryPlugin plugin = module.instance(); + + for (Block block : GameData.getBlockRegistry()) { + if (block != null) { + if (block instanceof IItemModelRegister) { + ((IItemModelRegister) block).registerModel(Item.getItemFromBlock(block), getInstance()); + } + if (block instanceof IStateMapperRegister) { + ((IStateMapperRegister) block).registerStateMapper(); + } + } + + } + for (Item item : GameData.getItemRegistry()) { + if (item != null) { + if (item instanceof IItemModelRegister) { + ((IItemModelRegister) item).registerModel(item, getInstance()); + } + } + } + } + } + + public static void registerStateMappers(){ + for(Module module : PluginManager.getLoadedModules()){ + ForestryPlugin plugin = module.instance(); + + for (Block block : GameData.getBlockRegistry()) { + if (block != null) { + if (block instanceof IStateMapperRegister) { + ((IStateMapperRegister) block).registerStateMapper(); + } + } + + } + } + } + + @Override + public ModelResourceLocation getModelLocation(String identifier) { + return new ModelResourceLocation("forestry:" + identifier, "inventory"); + } + + @Override + public ModelResourceLocation getModelLocation(String modID, String identifier) { + return new ModelResourceLocation(modID + ":" + identifier, "inventory"); + } + + @Override + public ModelResourceLocation getModelLocation(Item item, int meta) { + return new ModelResourceLocation( + "forestry:" + StringUtil.cleanItemName(new ItemStack(item, 1, meta)), "inventory"); + } + + @Override + public ModelResourceLocation getModelLocation(Item item, int meta, String identifier) { + return new ModelResourceLocation( + "forestry:" + StringUtil.cleanTags(item.getUnlocalizedName(new ItemStack(item, 1, meta))) + identifier, + "inventory"); + } + + @Override + public ModelResourceLocation getModelLocation(Item item, int meta, String modifier, String identifier) { + return new ModelResourceLocation("forestry:" + modifier + "/" + identifier, "inventory"); + } + + @Override + public ModelResourceLocation getModelLocation(Item item) { + return new ModelResourceLocation("forestry:" + StringUtil.cleanItemName(item), "inventory"); + } + + @Override + public ModelResourceLocation getModelLocation(Item item, String identifier) { + return new ModelResourceLocation("forestry:" + identifier, "inventory"); + } + + @Override + public ModelResourceLocation getModelLocation(Item item, String modID, String identifier) { + return new ModelResourceLocation(modID + ":" + identifier, "inventory"); + } + + @Override + public IModelBaker createNewRenderer() { + return new ModelBaker(); + } + +} diff --git a/src/main/java/forestry/core/render/model/RenderHandler.java b/src/main/java/forestry/core/render/model/RenderHandler.java new file mode 100644 index 000000000..fceecbad3 --- /dev/null +++ b/src/main/java/forestry/core/render/model/RenderHandler.java @@ -0,0 +1,36 @@ +/******************************************************************************* + * Copyright (c) 2011-2014 SirSengir. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser Public License v3 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl-3.0.txt + * + * Various Contributors including, but not limited to: + * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges + ******************************************************************************/ +package forestry.core.render.model; + +import java.util.ArrayList; + +import net.minecraft.util.IRegistry; +import net.minecraftforge.client.event.ModelBakeEvent; + +public class RenderHandler { + + public static final ArrayList blockModels = new ArrayList(); + public static final ArrayList models = new ArrayList(); + + public static void registerModels(ModelBakeEvent event) { + IRegistry registry = event.modelRegistry; + for (final BlockModelIndex index : blockModels) { + Object o = registry.getObject(index.blockModelLocation); + registry.putObject(index.blockModelLocation, index.model); + registry.putObject(index.itemModelLocation, index.model); + } + + for (final ModelIndex index : models) { + registry.putObject(index.modelLocation, index.model); + } + } + +} diff --git a/src/main/java/forestry/core/tiles/AdjacentTileCache.java b/src/main/java/forestry/core/tiles/AdjacentTileCache.java index 1cc14edb3..0f081e062 100644 --- a/src/main/java/forestry/core/tiles/AdjacentTileCache.java +++ b/src/main/java/forestry/core/tiles/AdjacentTileCache.java @@ -14,12 +14,11 @@ import java.util.Arrays; import java.util.LinkedHashSet; import java.util.Set; -import net.minecraft.init.Blocks; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; - /** * @author CovertJaguar */ @@ -54,19 +53,17 @@ public final class AdjacentTileCache { listeners.add(listener); } - private TileEntity searchSide(ForgeDirection side) { - World world = source.getWorldObj(); - int sx = source.xCoord + side.offsetX; - int sy = source.yCoord + side.offsetY; - int sz = source.zCoord + side.offsetZ; - if (world.blockExists(sx, sy, sz) && world.getBlock(sx, sy, sz) != Blocks.air) { - return world.getTileEntity(sx, sy, sz); + private TileEntity searchSide(EnumFacing side) { + World world = source.getWorld(); + BlockPos pos = source.getPos().offset(side); + if (world.isBlockLoaded(pos) && world.isAirBlock(pos)) { + return world.getTileEntity(pos); } return null; } public void refresh() { - for (ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) { + for (EnumFacing side : EnumFacing.values()) { getTileOnSide(side); } } @@ -100,11 +97,11 @@ public final class AdjacentTileCache { } } - private boolean areCoordinatesOnSide(ForgeDirection side, TileEntity target) { - return source.xCoord + side.offsetX == target.xCoord && source.yCoord + side.offsetY == target.yCoord && source.zCoord + side.offsetZ == target.zCoord; + private boolean areCoordinatesOnSide(EnumFacing side, TileEntity target) { + return source.getPos().getX() + side.getFrontOffsetX() == target.getPos().getX() && source.getPos().getY() + side.getFrontOffsetY() == target.getPos().getY() && source.getPos().getZ() + side.getFrontOffsetZ() == target.getPos().getZ(); } - public TileEntity getTileOnSide(ForgeDirection side) { + public TileEntity getTileOnSide(EnumFacing side) { int s = side.ordinal(); if (cache[s] != null) { if (cache[s].isInvalid() || !areCoordinatesOnSide(side, cache[s])) { @@ -114,7 +111,7 @@ public final class AdjacentTileCache { } } - if (timer[s].hasTriggered(source.getWorldObj(), delay[s])) { + if (timer[s].hasTriggered(source.getWorld(), delay[s])) { setTile(s, searchSide(side)); if (cache[s] == null) { incrementDelay(s); diff --git a/src/main/java/forestry/core/tiles/EscritoireGameToken.java b/src/main/java/forestry/core/tiles/EscritoireGameToken.java index 4aac42827..6fe49ac9d 100644 --- a/src/main/java/forestry/core/tiles/EscritoireGameToken.java +++ b/src/main/java/forestry/core/tiles/EscritoireGameToken.java @@ -101,7 +101,7 @@ public class EscritoireGameToken implements INBTTagable, IStreamable { } IIndividual individual = AlleleManager.alleleRegistry.getIndividual(tokenStack); - int iconColor = individual.getGenome().getPrimary().getIconColour(0); + int iconColor = individual.getGenome().getPrimary().getSpriteColour(0); if (state == State.MATCHED) { return ColourUtil.multiplyRGBComponents(iconColor, 0.7f); diff --git a/src/main/java/forestry/core/tiles/IActivatable.java b/src/main/java/forestry/core/tiles/IActivatable.java index b4a7e4630..bc8bd50fc 100644 --- a/src/main/java/forestry/core/tiles/IActivatable.java +++ b/src/main/java/forestry/core/tiles/IActivatable.java @@ -10,12 +10,12 @@ ******************************************************************************/ package forestry.core.tiles; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; /* Networked tile entities that have a client side "active" flag */ public interface IActivatable { - ChunkCoordinates getCoordinates(); + BlockPos getCoordinates(); boolean isActive(); diff --git a/src/main/java/forestry/core/tiles/ILocatable.java b/src/main/java/forestry/core/tiles/ILocatable.java index fdcc6aaad..186202817 100644 --- a/src/main/java/forestry/core/tiles/ILocatable.java +++ b/src/main/java/forestry/core/tiles/ILocatable.java @@ -10,11 +10,11 @@ ******************************************************************************/ package forestry.core.tiles; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; public interface ILocatable { - ChunkCoordinates getCoordinates(); + BlockPos getCoordinates(); World getWorld(); } diff --git a/src/main/java/forestry/core/tiles/IRenderableTile.java b/src/main/java/forestry/core/tiles/IRenderableTile.java index 93eb7b7e5..1ccdd57dc 100644 --- a/src/main/java/forestry/core/tiles/IRenderableTile.java +++ b/src/main/java/forestry/core/tiles/IRenderableTile.java @@ -10,13 +10,12 @@ ******************************************************************************/ package forestry.core.tiles; -import net.minecraftforge.common.util.ForgeDirection; - import forestry.core.render.TankRenderInfo; +import net.minecraft.util.EnumFacing; public interface IRenderableTile { - ForgeDirection getOrientation(); + EnumFacing getOrientation(); TankRenderInfo getResourceTankInfo(); diff --git a/src/main/java/forestry/core/tiles/MachineDefinition.java b/src/main/java/forestry/core/tiles/MachineDefinition.java index 3a7023369..a7c033008 100644 --- a/src/main/java/forestry/core/tiles/MachineDefinition.java +++ b/src/main/java/forestry/core/tiles/MachineDefinition.java @@ -11,32 +11,24 @@ package forestry.core.tiles; import java.util.List; -import java.util.Locale; - import net.minecraft.block.Block; -import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.IIcon; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.Vec3; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; - -import net.minecraftforge.common.util.ForgeDirection; - -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - +import net.minecraftforge.fml.common.registry.GameRegistry; import forestry.core.blocks.IMachineProperties; import forestry.core.blocks.IMachinePropertiesTESR; import forestry.core.proxy.Proxies; -import forestry.core.render.IBlockRenderer; -import forestry.core.render.TextureManager; import forestry.core.utils.BlockUtil; public class MachineDefinition { @@ -48,7 +40,7 @@ public class MachineDefinition { private final int meta; private boolean legacy; - public final IBlockRenderer renderer; + public final TileEntitySpecialRenderer renderer; private float minX, minY, minZ, maxX, maxY, maxZ; @@ -60,7 +52,7 @@ public class MachineDefinition { this(properties.getMeta(), properties.getTeIdent(), properties.getTeClass(), properties.getRenderer()); } - public MachineDefinition(int meta, String teIdent, Class teClass, IBlockRenderer renderer) { + public MachineDefinition(int meta, String teIdent, Class teClass, TileEntitySpecialRenderer renderer) { this.meta = meta; this.teIdent = teIdent; this.teClass = teClass; @@ -113,12 +105,12 @@ public class MachineDefinition { } } - public AxisAlignedBB getBoundingBox(int x, int y, int z) { - return AxisAlignedBB.getBoundingBox(x + minX, y + minY, z + minZ, x + maxX, y + maxY, z + maxZ); + public AxisAlignedBB getBoundingBox(BlockPos pos, IBlockState state) { + return AxisAlignedBB.fromBounds(pos.getX() + minX, pos.getY() + minY, pos.getZ() + minZ, pos.getX() + maxX, pos.getY() + maxY, pos.getZ() + maxZ); } - public MovingObjectPosition collisionRayTrace(World world, int x, int y, int z, Vec3 startVec, Vec3 endVec) { - return BlockUtil.collisionRayTrace(world, x, y, z, startVec, endVec, minX, minY, minZ, maxX, maxY, maxZ); + public MovingObjectPosition collisionRayTrace(World world, BlockPos pos, Vec3 startVec, Vec3 endVec) { + return BlockUtil.collisionRayTrace(world, pos, startVec, endVec, minX, minY, minZ, maxX, maxY, maxZ); } /** @@ -145,12 +137,12 @@ public class MachineDefinition { } /* INTERACTION */ - public boolean isSolidOnSide(IBlockAccess world, int x, int y, int z, int side) { + public boolean isSolidOnSide(IBlockAccess world, BlockPos pos, EnumFacing side) { return true; } - public boolean rotateBlock(World world, int x, int y, int z, ForgeDirection axis) { - TileForestry tile = TileUtil.getTile(world, x, y, z, teClass); + public boolean rotateBlock(World world, BlockPos pos, EnumFacing axis) { + TileForestry tile = TileUtil.getTile(world, pos, teClass); if (tile == null) { return false; } @@ -173,55 +165,4 @@ public class MachineDefinition { return this; } - - @SideOnly(Side.CLIENT) - private IIcon[] icons; - - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister register) { - icons = new IIcon[8]; - - if (legacy) { - return; - } - - for (int i = 0; i < 8; i++) { - icons[i] = TextureManager.registerTex(register, teIdent.replace("forestry.", "").toLowerCase(Locale.ENGLISH) + "." + faceMap[i]); - } - } - - @SideOnly(Side.CLIENT) - public IIcon getBlockTextureForSide(int side) { - return icons[side]; - } - - /** - * 0 - Bottom 1 - Top 2 - Back 3 - Front 4,5 - Sides, 7 - Reversed ?, 8 - Reversed ? - */ - @SideOnly(Side.CLIENT) - public IIcon getIcon(IBlockAccess world, int x, int y, int z, int side) { - - TileEntity tile = world.getTileEntity(x, y, z); - if (!(tile instanceof TileForestry)) { - return getBlockTextureForSide(side); - } - - ForgeDirection dir = ((TileForestry) tile).getOrientation(); - switch (dir) { - case WEST: - side = side == 2 ? 4 : side == 3 ? 5 : side == 4 ? 3 : side == 5 ? 2 : side == 0 ? 6 : 7; - break; - case EAST: - side = side == 2 ? 5 : side == 3 ? 4 : side == 4 ? 2 : side == 5 ? 3 : side == 0 ? 6 : 7; - break; - case SOUTH: - break; - case NORTH: - side = side == 2 ? 3 : side == 3 ? 2 : side == 4 ? 5 : side == 5 ? 4 : side; - break; - default: - } - - return getBlockTextureForSide(side); - } } diff --git a/src/main/java/forestry/core/tiles/TileAnalyzer.java b/src/main/java/forestry/core/tiles/TileAnalyzer.java index 05a2b7d01..6b90cb4ed 100644 --- a/src/main/java/forestry/core/tiles/TileAnalyzer.java +++ b/src/main/java/forestry/core/tiles/TileAnalyzer.java @@ -17,8 +17,7 @@ import net.minecraft.inventory.IInventory; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; - -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; @@ -161,7 +160,7 @@ public class TileAnalyzer extends TilePowered implements ISidedInventory, ILiqui public void handleItemStackForDisplay(ItemStack itemStack) { if (!ItemStack.areItemStacksEqual(itemStack, individualOnDisplayClient)) { individualOnDisplayClient = itemStack; - worldObj.func_147479_m(xCoord, yCoord, zCoord); + worldObj.markBlockRangeForRenderUpdate(getPos(), getPos()); } } @@ -248,32 +247,32 @@ public class TileAnalyzer extends TilePowered implements ISidedInventory, ILiqui /* IFluidHandler */ @Override - public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { + public int fill(EnumFacing from, FluidStack resource, boolean doFill) { return tankManager.fill(from, resource, doFill); } @Override - public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) { + public FluidStack drain(EnumFacing from, FluidStack resource, boolean doDrain) { return tankManager.drain(from, resource, doDrain); } @Override - public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) { + public FluidStack drain(EnumFacing from, int maxDrain, boolean doDrain) { return tankManager.drain(from, maxDrain, doDrain); } @Override - public boolean canFill(ForgeDirection from, Fluid fluid) { + public boolean canFill(EnumFacing from, Fluid fluid) { return tankManager.canFill(from, fluid); } @Override - public boolean canDrain(ForgeDirection from, Fluid fluid) { + public boolean canDrain(EnumFacing from, Fluid fluid) { return tankManager.canDrain(from, fluid); } @Override - public FluidTankInfo[] getTankInfo(ForgeDirection from) { + public FluidTankInfo[] getTankInfo(EnumFacing from) { return tankManager.getTankInfo(from); } diff --git a/src/main/java/forestry/core/tiles/TileEngine.java b/src/main/java/forestry/core/tiles/TileEngine.java index 944f707f9..e2fe1ff6e 100644 --- a/src/main/java/forestry/core/tiles/TileEngine.java +++ b/src/main/java/forestry/core/tiles/TileEngine.java @@ -17,9 +17,7 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.ICrafting; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; - -import net.minecraftforge.common.util.ForgeDirection; - +import net.minecraft.util.EnumFacing; import forestry.api.core.IErrorLogic; import forestry.apiculture.network.packets.PacketActiveUpdate; import forestry.core.config.Config; @@ -67,8 +65,8 @@ public abstract class TileEngine extends TileBase implements IEnergyConnection, } @Override - public void rotateAfterPlacement(EntityPlayer player, int side) { - ForgeDirection orientation = ForgeDirection.getOrientation(side).getOpposite(); + public void rotateAfterPlacement(EntityPlayer player, EnumFacing side) { + EnumFacing orientation = side.getOpposite(); if (isOrientedAtEnergyReciever(orientation)) { setOrientation(orientation); } else { @@ -125,7 +123,7 @@ public abstract class TileEngine extends TileBase implements IEnergyConnection, errorLogic.setCondition(!enabledRedstone, EnumErrorCode.NO_REDSTONE); // Determine targeted tile - TileEntity tile = worldObj.getTileEntity(xCoord + getOrientation().offsetX, yCoord + getOrientation().offsetY, zCoord + getOrientation().offsetZ); + TileEntity tile = worldObj.getTileEntity(getPos().offset(getOrientation())); float newPistonSpeed = getPistonSpeed(); if (newPistonSpeed != pistonSpeedServer) { @@ -191,7 +189,7 @@ public abstract class TileEngine extends TileBase implements IEnergyConnection, /* INTERACTION */ @Override - public boolean rotate(ForgeDirection axis) { + public boolean rotate(EnumFacing axis) { rotate(); // it would be irritating if the wrench opened the engine gui when it failed to rotate, so always return true @@ -200,7 +198,7 @@ public abstract class TileEngine extends TileBase implements IEnergyConnection, private void rotate() { for (int i = getOrientation().ordinal() + 1; i <= getOrientation().ordinal() + 6; ++i) { - ForgeDirection orientation = ForgeDirection.values()[i % 6]; + EnumFacing orientation = EnumFacing.values()[i % 6]; if (isOrientedAtEnergyReciever(orientation)) { setOrientation(orientation); return; @@ -208,8 +206,8 @@ public abstract class TileEngine extends TileBase implements IEnergyConnection, } } - private boolean isOrientedAtEnergyReciever(ForgeDirection orientation) { - TileEntity tile = worldObj.getTileEntity(xCoord + orientation.offsetX, yCoord + orientation.offsetY, zCoord + orientation.offsetZ); + private boolean isOrientedAtEnergyReciever(EnumFacing orientation) { + TileEntity tile = worldObj.getTileEntity(getPos().offset(orientation)); return BlockUtil.isEnergyReceiverOrEngine(getOrientation().getOpposite(), tile); } @@ -313,7 +311,7 @@ public abstract class TileEngine extends TileBase implements IEnergyConnection, public abstract void sendGUINetworkData(Container containerEngine, ICrafting iCrafting); @Override - public boolean canConnectEnergy(ForgeDirection from) { + public boolean canConnectEnergy(EnumFacing from) { return energyManager.canConnectEnergy(from); } diff --git a/src/main/java/forestry/core/tiles/TileForestry.java b/src/main/java/forestry/core/tiles/TileForestry.java index d06c3264f..e82e3f858 100644 --- a/src/main/java/forestry/core/tiles/TileForestry.java +++ b/src/main/java/forestry/core/tiles/TileForestry.java @@ -21,13 +21,15 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.Packet; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; +import net.minecraft.util.ChatComponentText; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.IChatComponent; +import net.minecraft.util.ITickable; import net.minecraft.util.MathHelper; import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; - -import cpw.mods.fml.common.Optional; +import net.minecraftforge.fml.common.Optional; import forestry.api.core.IErrorLogic; import forestry.api.core.IErrorLogicSource; @@ -44,15 +46,15 @@ import forestry.core.network.DataOutputStreamForestry; import forestry.core.network.IStreamable; import forestry.core.network.packets.PacketTileStream; import forestry.core.proxy.Proxies; - +import forestry.core.utils.BlockUtil; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.ITriggerExternal; import buildcraft.api.statements.ITriggerInternal; import buildcraft.api.statements.ITriggerProvider; @Optional.Interface(iface = "buildcraft.api.statements.ITriggerProvider", modid = "BuildCraftAPI|statements") -public abstract class TileForestry extends TileEntity implements IStreamable, IErrorLogicSource, ITriggerProvider, ISidedInventory, IFilterSlotDelegate, IRestrictedAccess, ITitled, ILocatable, IGuiHandlerTile { - private static final ForgeDirection[] forgeDirections = ForgeDirection.values(); +public abstract class TileForestry extends TileEntity implements IStreamable, IErrorLogicSource, ITriggerProvider, ISidedInventory, IFilterSlotDelegate, IRestrictedAccess, ITitled, ILocatable, IGuiHandlerTile, ITickable { + private static final EnumFacing[] forgeDirections = EnumFacing.values(); private static final Random rand = new Random(); private final AccessHandler accessHandler = new AccessHandler(this); @@ -62,7 +64,7 @@ public abstract class TileForestry extends TileEntity implements IStreamable, IE private int tickCount = rand.nextInt(256); private boolean needsNetworkUpdate = false; - private ForgeDirection orientation = ForgeDirection.WEST; + private EnumFacing orientation = EnumFacing.WEST; protected AdjacentTileCache getTileCache() { return tileCache; @@ -84,25 +86,25 @@ public abstract class TileForestry extends TileEntity implements IStreamable, IE super.validate(); } - public void rotateAfterPlacement(EntityPlayer player, int side) { + public void rotateAfterPlacement(EntityPlayer player, EnumFacing side) { int l = MathHelper.floor_double(((player.rotationYaw * 4F) / 360F) + 0.5D) & 3; if (l == 0) { - setOrientation(ForgeDirection.NORTH); + setOrientation(EnumFacing.NORTH); } if (l == 1) { - setOrientation(ForgeDirection.EAST); + setOrientation(EnumFacing.EAST); } if (l == 2) { - setOrientation(ForgeDirection.SOUTH); + setOrientation(EnumFacing.SOUTH); } if (l == 3) { - setOrientation(ForgeDirection.WEST); + setOrientation(EnumFacing.WEST); } } - public boolean rotate(ForgeDirection axis) { - if (axis == ForgeDirection.DOWN || axis == ForgeDirection.UP) { - ForgeDirection orientation = getOrientation().getRotation(axis); + public boolean rotate(EnumFacing axis) { + if (axis == EnumFacing.DOWN || axis == EnumFacing.UP) { + EnumFacing orientation = getOrientation().rotateAround(axis.getAxis()); setOrientation(orientation); return true; } @@ -111,7 +113,7 @@ public abstract class TileForestry extends TileEntity implements IStreamable, IE // / UPDATING @Override - public final void updateEntity() { + public final void update() { tickCount++; if (!worldObj.isRemote) { @@ -145,9 +147,9 @@ public abstract class TileForestry extends TileEntity implements IStreamable, IE accessHandler.readFromNBT(data); if (data.hasKey("Orientation")) { - orientation = ForgeDirection.values()[data.getInteger("Orientation")]; + orientation = EnumFacing.values()[data.getInteger("Orientation")]; } else { - orientation = ForgeDirection.WEST; + orientation = EnumFacing.WEST; } } @@ -185,6 +187,7 @@ public abstract class TileForestry extends TileEntity implements IStreamable, IE public void onRemoval() { } + @Override public World getWorld() { return worldObj; } @@ -198,21 +201,21 @@ public abstract class TileForestry extends TileEntity implements IStreamable, IE @Optional.Method(modid = "BuildCraftAPI|statements") @Override - public Collection getExternalTriggers(ForgeDirection side, TileEntity tile) { + public Collection getExternalTriggers(EnumFacing side, TileEntity tile) { return null; } // / REDSTONE INFO protected boolean isRedstoneActivated() { - return worldObj.isBlockIndirectlyGettingPowered(xCoord, yCoord, zCoord); + return worldObj.isBlockIndirectlyGettingPowered(getPos()) > 0; } // / ORIENTATION - public ForgeDirection getOrientation() { + public EnumFacing getOrientation() { return this.orientation; } - public void setOrientation(ForgeDirection orientation) { + public void setOrientation(EnumFacing orientation) { if (orientation == null) { throw new NullPointerException("Orientation cannot be null"); } @@ -221,8 +224,8 @@ public abstract class TileForestry extends TileEntity implements IStreamable, IE } this.orientation = orientation; this.setNeedsNetworkUpdate(); - worldObj.notifyBlocksOfNeighborChange(xCoord, yCoord, zCoord, worldObj.getBlock(xCoord, yCoord, zCoord)); - worldObj.func_147479_m(xCoord, yCoord, zCoord); + worldObj.notifyBlockOfStateChange(getPos(), BlockUtil.getBlock(worldObj, getPos())); + worldObj.markBlockRangeForRenderUpdate(getPos(), getPos()); } protected final void setNeedsNetworkUpdate() { @@ -243,7 +246,7 @@ public abstract class TileForestry extends TileEntity implements IStreamable, IE public void onSwitchAccess(EnumAccess oldAccess, EnumAccess newAccess) { if (oldAccess == EnumAccess.SHARED || newAccess == EnumAccess.SHARED) { // pipes connected to this need to update - worldObj.notifyBlocksOfNeighborChange(xCoord, yCoord, zCoord, blockType); + worldObj.notifyBlockOfStateChange(getPos(), blockType); markDirty(); } } @@ -286,10 +289,10 @@ public abstract class TileForestry extends TileEntity implements IStreamable, IE public ItemStack decrStackSize(int slotIndex, int amount) { return getInternalInventory().decrStackSize(slotIndex, amount); } - + @Override - public final ItemStack getStackInSlotOnClosing(int slotIndex) { - return getInternalInventory().getStackInSlotOnClosing(slotIndex); + public ItemStack removeStackFromSlot(int slotIndex) { + return getInternalInventory().removeStackFromSlot(slotIndex); } @Override @@ -303,28 +306,33 @@ public abstract class TileForestry extends TileEntity implements IStreamable, IE } @Override - public final void openInventory() { - getInternalInventory().openInventory(); + public final void openInventory(EntityPlayer player) { + getInternalInventory().openInventory(player); } @Override - public final void closeInventory() { - getInternalInventory().closeInventory(); + public final void closeInventory(EntityPlayer player) { + getInternalInventory().closeInventory(player); } - + @Override - public final String getInventoryName() { + public String getName() { return getUnlocalizedTitle(); } + @Override + public IChatComponent getDisplayName() { + return new ChatComponentText(getName()); + } + @Override public final boolean isUseableByPlayer(EntityPlayer player) { return getInternalInventory().isUseableByPlayer(player); } - + @Override - public final boolean hasCustomInventoryName() { - return getInternalInventory().hasCustomInventoryName(); + public boolean hasCustomName() { + return getInternalInventory().hasCustomName(); } @Override @@ -341,23 +349,42 @@ public abstract class TileForestry extends TileEntity implements IStreamable, IE public boolean isLocked(int slotIndex) { return getInternalInventory().isLocked(slotIndex); } - + @Override - public final int[] getAccessibleSlotsFromSide(int side) { - return getInternalInventory().getAccessibleSlotsFromSide(side); + public int[] getSlotsForFace(EnumFacing side) { + return getInternalInventory().getSlotsForFace(side); } @Override - public final boolean canInsertItem(int slotIndex, ItemStack itemStack, int side) { + public final boolean canInsertItem(int slotIndex, ItemStack itemStack, EnumFacing side) { return getInternalInventory().canInsertItem(slotIndex, itemStack, side); } @Override - public final boolean canExtractItem(int slotIndex, ItemStack itemStack, int side) { + public final boolean canExtractItem(int slotIndex, ItemStack itemStack, EnumFacing side) { return getInternalInventory().canExtractItem(slotIndex, itemStack, side); } - public final ChunkCoordinates getCoordinates() { - return new ChunkCoordinates(xCoord, yCoord, zCoord); + @Override + public final BlockPos getCoordinates() { + return getPos(); + } + + @Override + public int getField(int id) { + return 0; + } + + @Override + public int getFieldCount() { + return 0; + } + + @Override + public void setField(int id, int value) { + } + + @Override + public void clear() { } } diff --git a/src/main/java/forestry/core/tiles/TileNaturalistChest.java b/src/main/java/forestry/core/tiles/TileNaturalistChest.java index af0cca5e6..5f086969c 100644 --- a/src/main/java/forestry/core/tiles/TileNaturalistChest.java +++ b/src/main/java/forestry/core/tiles/TileNaturalistChest.java @@ -52,15 +52,15 @@ public abstract class TileNaturalistChest extends TileBase implements IPagedInve @Override protected void updateClientSide() { - update(); + updates(); } @Override protected void updateServerSide() { - update(); + updates(); } - private void update() { + private void updates() { prevLidAngle = lidAngle; if (numPlayersUsing > 0 && lidAngle == 0.0F) { @@ -85,7 +85,7 @@ public abstract class TileNaturalistChest extends TileBase implements IPagedInve } private void playLidSound(String sound) { - worldObj.playSoundEffect(xCoord + 0.5, yCoord + 0.5, zCoord + 0.5, sound, 0.5F, worldObj.rand.nextFloat() * 0.1F + 0.9F); + worldObj.playSoundEffect(getPos().getX() + 0.5, getPos().getY() + 0.5, getPos().getZ() + 0.5, sound, 0.5F, worldObj.rand.nextFloat() * 0.1F + 0.9F); } @Override diff --git a/src/main/java/forestry/core/tiles/TilePowered.java b/src/main/java/forestry/core/tiles/TilePowered.java index 9d48bb4b0..0e69dbcff 100644 --- a/src/main/java/forestry/core/tiles/TilePowered.java +++ b/src/main/java/forestry/core/tiles/TilePowered.java @@ -13,11 +13,7 @@ package forestry.core.tiles; import java.io.IOException; import net.minecraft.nbt.NBTTagCompound; - -import net.minecraftforge.common.util.ForgeDirection; - -import cpw.mods.fml.common.Optional; - +import net.minecraft.util.EnumFacing; import forestry.api.core.IErrorLogic; import forestry.core.circuits.ISpeedUpgradable; import forestry.core.config.Config; @@ -28,6 +24,8 @@ import forestry.core.network.IStreamableGui; import forestry.core.render.TankRenderInfo; import forestry.energy.EnergyManager; +import net.minecraftforge.fml.common.Optional; + import buildcraft.api.tiles.IHasWork; @Optional.Interface(iface = "buildcraft.api.tiles.IHasWork", modid = "BuildCraftAPI|tiles") @@ -89,6 +87,7 @@ public abstract class TilePowered extends TileBase implements IRenderableTile, I return false; } + @Override public abstract boolean hasWork(); @Override @@ -198,27 +197,27 @@ public abstract class TilePowered extends TileBase implements IRenderableTile, I } @Override - public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate) { + public int receiveEnergy(EnumFacing from, int maxReceive, boolean simulate) { return energyManager.receiveEnergy(from, maxReceive, simulate); } @Override - public int extractEnergy(ForgeDirection from, int maxReceive, boolean simulate) { + public int extractEnergy(EnumFacing from, int maxReceive, boolean simulate) { return energyManager.extractEnergy(from, maxReceive, simulate); } @Override - public int getEnergyStored(ForgeDirection from) { + public int getEnergyStored(EnumFacing from) { return energyManager.getEnergyStored(from); } @Override - public int getMaxEnergyStored(ForgeDirection from) { + public int getMaxEnergyStored(EnumFacing from) { return energyManager.getMaxEnergyStored(from); } @Override - public boolean canConnectEnergy(ForgeDirection from) { + public boolean canConnectEnergy(EnumFacing from) { return energyManager.canConnectEnergy(from); } } diff --git a/src/main/java/forestry/core/tiles/TileUtil.java b/src/main/java/forestry/core/tiles/TileUtil.java index feb9469bf..680852ef4 100644 --- a/src/main/java/forestry/core/tiles/TileUtil.java +++ b/src/main/java/forestry/core/tiles/TileUtil.java @@ -14,11 +14,11 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityChest; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; - import forestry.core.inventory.wrappers.ChestWrapper; import forestry.core.utils.InventoryUtil; @@ -28,25 +28,23 @@ public abstract class TileUtil { if (tile == null) { return false; } - int x = tile.xCoord; - int y = tile.yCoord; - int z = tile.zCoord; - World world = tile.getWorldObj(); + BlockPos pos = tile.getPos(); + World world = tile.getWorld(); if (tile.isInvalid()) { return false; } - if (world.getTileEntity(x, y, z) != tile) { + if (world.getTileEntity(pos) != tile) { return false; } - return player.getDistanceSq(x + 0.5D, y + 0.5D, z + 0.5D) <= 64.0D; + return player.getDistanceSq(pos.getX() + 0.5D, pos.getY() + 0.5D, pos.getZ() + 0.5D) <= 64.0D; } - public static T getTile(IBlockAccess world, int x, int y, int z, Class tileClass) { - TileEntity tileEntity = world.getTileEntity(x, y, z); + public static T getTile(IBlockAccess world, BlockPos pos, Class tileClass) { + TileEntity tileEntity = world.getTileEntity(pos); if (tileClass.isInstance(tileEntity)) { return tileClass.cast(tileEntity); } else { @@ -54,7 +52,7 @@ public abstract class TileUtil { } } - public static IInventory getInventoryFromTile(TileEntity tile, ForgeDirection side) { + public static IInventory getInventoryFromTile(TileEntity tile, EnumFacing side) { if (!(tile instanceof IInventory)) { return null; } diff --git a/src/main/java/forestry/core/triggers/Trigger.java b/src/main/java/forestry/core/triggers/Trigger.java index 0f559496c..007974991 100755 --- a/src/main/java/forestry/core/triggers/Trigger.java +++ b/src/main/java/forestry/core/triggers/Trigger.java @@ -10,15 +10,13 @@ ******************************************************************************/ package forestry.core.triggers; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.util.IIcon; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - import forestry.core.render.TextureManager; import forestry.core.utils.StringUtil; - +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +import buildcraft.api.core.SheetIcon; import buildcraft.api.statements.IStatement; import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.ITriggerExternal; @@ -65,18 +63,18 @@ public abstract class Trigger implements ITriggerExternal { } @SideOnly(Side.CLIENT) - private IIcon icon; + private TextureAtlasSprite icon; + private ResourceLocation location; @Override - @SideOnly(Side.CLIENT) - public IIcon getIcon() { - return icon; + public SheetIcon getIcon() { + return new SheetIcon(location, icon.getOriginX(), icon.getOriginY()); } - @Override @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister register) { - icon = TextureManager.registerTex(register, "triggers/" + unlocalized.replace("trigger.", "")); + public void registerIcons() { + icon = TextureManager.registerSprite("triggers/" + unlocalized.replace("trigger.", "")); + location = new ResourceLocation("forestry", "triggers/" + unlocalized.replace("trigger.", "")); } @Override diff --git a/src/main/java/forestry/core/utils/BlockUtil.java b/src/main/java/forestry/core/utils/BlockUtil.java index ac4a85df8..5e7aea287 100644 --- a/src/main/java/forestry/core/utils/BlockUtil.java +++ b/src/main/java/forestry/core/utils/BlockUtil.java @@ -10,26 +10,28 @@ ******************************************************************************/ package forestry.core.utils; -import java.util.ArrayList; +import java.util.List; import net.minecraft.block.Block; import net.minecraft.block.BlockCocoa; -import net.minecraft.block.BlockLog; +import net.minecraft.block.BlockPlanks; +import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Direction; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.Vec3; +import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.oredict.OreDictionary; import forestry.core.config.Constants; import forestry.core.tiles.TileEngine; import forestry.core.utils.vect.Vect; - +import forestry.core.utils.vect.VectUtil; import cofh.api.energy.IEnergyConnection; import cofh.api.energy.IEnergyReceiver; @@ -37,15 +39,35 @@ public abstract class BlockUtil { private static final int slabWoodId = OreDictionary.getOreID("slabWood"); - public static ArrayList getBlockDrops(World world, Vect posBlock) { - Block block = world.getBlock(posBlock.x, posBlock.y, posBlock.z); - int meta = world.getBlockMetadata(posBlock.x, posBlock.y, posBlock.z); + public static List getBlockDrops(World world, Vect posBlock) { + IBlockState blockState = VectUtil.getBlockState(world, posBlock); - return block.getDrops(world, posBlock.x, posBlock.y, posBlock.z, meta, 0); + return blockState.getBlock().getDrops(world, posBlock, blockState, 0); } + + /** + * @return The block state from the pos + */ + public static IBlockState getBlockState(IBlockAccess world, BlockPos posBlock) { + return world.getBlockState(posBlock); + } + + /** + * @return The block from the pos + */ + public static Block getBlock(IBlockAccess world, BlockPos posBlock) { + return getBlockState(world, posBlock).getBlock(); + } + + /** + * @return The block metadata from the pos + */ + public static int getBlockMetadata(IBlockAccess world, BlockPos posBlock) { + return getBlock(world, posBlock).getMetaFromState(getBlockState(world, posBlock)); + } - public static boolean isEnergyReceiverOrEngine(ForgeDirection side, TileEntity tile) { + public static boolean isEnergyReceiverOrEngine(EnumFacing side, TileEntity tile) { if (!(tile instanceof IEnergyReceiver) && !(tile instanceof TileEngine)) { return false; } @@ -54,43 +76,45 @@ public abstract class BlockUtil { return receptor.canConnectEnergy(side); } - public static boolean tryPlantPot(World world, int x, int y, int z, Block block) { + public static boolean tryPlantPot(World world, BlockPos pos, Block block) { - int direction = getDirectionalMetadata(world, x, y, z); + int direction = getDirectionalMetadata(world, pos); if (direction < 0) { return false; } - world.setBlock(x, y, z, block, direction, Constants.FLAG_BLOCK_SYNCH_AND_UPDATE); + world.setBlockState(pos, block.getStateFromMeta(direction), Constants.FLAG_BLOCK_SYNCH_AND_UPDATE); return true; } - - public static int getDirectionalMetadata(World world, int x, int y, int z) { - for (int i = 0; i < 4; i++) { - if (!isValidPot(world, x, y, z, i)) { + + public static int getDirectionalMetadata(World world, BlockPos pos) { + for (int i = 2; i < 6; i++) { + if (!isValidPot(world, pos, EnumFacing.values()[i])) { continue; } return i; } return -1; } - - public static boolean isValidPot(World world, int x, int y, int z, int notchDirection) { - x += Direction.offsetX[notchDirection]; - z += Direction.offsetZ[notchDirection]; - Block block = world.getBlock(x, y, z); - if (block == Blocks.log) { - return BlockLog.func_150165_c(world.getBlockMetadata(x, y, z)) == 3; + + public static boolean isValidPot(World world, BlockPos pos, EnumFacing direction) { + pos = pos.offset(direction); + IBlockState state = world.getBlockState(pos); + if (state.getBlock() == Blocks.log) { + return state.getValue(BlockPlanks.VARIANT) == BlockPlanks.EnumType.JUNGLE; } else { - return block.isWood(world, x, y, z); + return state.getBlock().isWood(world, pos); } } - public static int getMaturityPod(int metadata) { - return BlockCocoa.func_149987_c(metadata); + public static int getMaturityPod(IBlockState state) { + return state.getValue(BlockCocoa.AGE).intValue(); } public static boolean isWoodSlabBlock(Block block) { + if(block == null || block == Blocks.air){ + return false; + } int[] oreIds = OreDictionary.getOreIDs(new ItemStack(block)); for (int oreId : oreIds) { if (oreId == slabWoodId) { @@ -101,8 +125,8 @@ public abstract class BlockUtil { return false; } - public static boolean isReplaceableBlock(World world, int x, int y, int z) { - Block block = world.getBlock(x, y, z); + public static boolean isReplaceableBlock(World world, BlockPos pos) { + Block block = world.getBlockState(pos).getBlock(); return isReplaceableBlock(block); } @@ -115,9 +139,9 @@ public abstract class BlockUtil { /** * Ray traces through the blocks collision from start vector to end vector returning a ray trace hit. */ - public static MovingObjectPosition collisionRayTrace(World world, int x, int y, int z, Vec3 startVec, Vec3 endVec, float minX, float minY, float minZ, float maxX, float maxY, float maxZ) { - startVec = startVec.addVector((double) (-x), (double) (-y), (double) (-z)); - endVec = endVec.addVector((double) (-x), (double) (-y), (double) (-z)); + public static MovingObjectPosition collisionRayTrace(World world, BlockPos pos, Vec3 startVec, Vec3 endVec, float minX, float minY, float minZ, float maxX, float maxY, float maxZ) { + startVec = startVec.addVector((-pos.getX()), (-pos.getY()), (-pos.getZ())); + endVec = endVec.addVector((-pos.getX()), (-pos.getY()), (-pos.getZ())); Vec3 vec32 = startVec.getIntermediateWithXValue(endVec, minX); Vec3 vec33 = startVec.getIntermediateWithXValue(endVec, maxX); Vec3 vec34 = startVec.getIntermediateWithYValue(endVec, minY); @@ -204,7 +228,7 @@ public abstract class BlockUtil { sideHit = 3; } - return new MovingObjectPosition(x, y, z, sideHit, minHit.addVector((double) x, (double) y, (double) z)); + return new MovingObjectPosition(minHit.addVector(pos.getX(), pos.getY(), pos.getZ()), EnumFacing.values()[sideHit], pos); } } @@ -228,4 +252,36 @@ public abstract class BlockUtil { private static boolean isVecInsideXYBounds(Vec3 vec, float minX, float minY, float maxX, float maxY) { return vec != null && (vec.xCoord >= minX && vec.xCoord <= maxX && vec.yCoord >= minY && vec.yCoord <= maxY); } + + /* CHUNKS */ + /** + * Checks if chunk exits. + */ + public static boolean checkChunksExist(World world, BlockPos minPos, BlockPos maxPos) { + return checkChunksExist(world, minPos.getX(), minPos.getY(), minPos.getZ(), maxPos.getX(), maxPos.getY(), maxPos.getZ()); + } + + /** + * Checks if chunk exits. + */ + public static boolean checkChunksExist(World world, int minX, int minY, int minZ, int maxX, int maxY, int maxZ) { + if (maxY >= 0 && minY < 256) { + minX >>= 4; + minZ >>= 4; + maxX >>= 4; + maxZ >>= 4; + + for (int k1 = minX; k1 <= maxX; ++k1) { + for (int l1 = minZ; l1 <= maxZ; ++l1) { + if (!world.getChunkProvider().chunkExists(k1, l1)) { + return false; + } + } + } + + return true; + } else { + return false; + } + } } diff --git a/src/main/java/forestry/core/utils/ClimateUtil.java b/src/main/java/forestry/core/utils/ClimateUtil.java index 946ea3fe7..835110d44 100644 --- a/src/main/java/forestry/core/utils/ClimateUtil.java +++ b/src/main/java/forestry/core/utils/ClimateUtil.java @@ -20,6 +20,7 @@ import forestry.api.genetics.IClimateHelper; public class ClimateUtil implements IClimateHelper { + @Override public boolean isWithinLimits(EnumTemperature temperature, EnumHumidity humidity, EnumTemperature baseTemp, EnumTolerance tolTemp, EnumHumidity baseHumid, EnumTolerance tolHumid) { @@ -30,14 +31,17 @@ public class ClimateUtil implements IClimateHelper { return getToleratedHumidity(baseHumid, tolHumid).contains(humidity); } + @Override public boolean isWithinLimits(EnumTemperature temperature, EnumTemperature baseTemp, EnumTolerance tolTemp) { return getToleratedTemperature(baseTemp, tolTemp).contains(temperature); } + @Override public boolean isWithinLimits(EnumHumidity humidity, EnumHumidity baseHumid, EnumTolerance tolHumid) { return getToleratedHumidity(baseHumid, tolHumid).contains(humidity); } + @Override public ArrayList getToleratedHumidity(EnumHumidity prefered, EnumTolerance tolerance) { ArrayList tolerated = new ArrayList<>(); @@ -96,6 +100,7 @@ public class ClimateUtil implements IClimateHelper { } + @Override public ArrayList getToleratedTemperature(EnumTemperature prefered, EnumTolerance tolerance) { ArrayList tolerated = new ArrayList<>(); @@ -189,10 +194,12 @@ public class ClimateUtil implements IClimateHelper { } } + @Override public String toDisplay(EnumTemperature temperature) { return StringUtil.localize("gui." + temperature.toString().toLowerCase(Locale.ENGLISH)); } + @Override public String toDisplay(EnumHumidity humidity) { return StringUtil.localize("gui." + humidity.toString().toLowerCase(Locale.ENGLISH)); } diff --git a/src/main/java/forestry/core/utils/DamageSourceForestry.java b/src/main/java/forestry/core/utils/DamageSourceForestry.java index d2abb1c7b..1d2113d06 100755 --- a/src/main/java/forestry/core/utils/DamageSourceForestry.java +++ b/src/main/java/forestry/core/utils/DamageSourceForestry.java @@ -23,15 +23,15 @@ public class DamageSourceForestry extends DamageSource { } @Override - public IChatComponent func_151519_b(EntityLivingBase living) { + public IChatComponent getDeathMessage(EntityLivingBase living) { EntityLivingBase other = living.func_94060_bK(); String ssp = "death." + this.damageType; String smp = ssp + ".player"; if (other != null) { - return new ChatComponentTranslation(smp, living.func_145748_c_(), other.func_145748_c_()); + return new ChatComponentTranslation(smp, living.getDisplayName(), other.getDisplayName()); } else { - return new ChatComponentTranslation(ssp, living.func_145748_c_()); + return new ChatComponentTranslation(ssp, living.getDisplayName()); } } diff --git a/src/main/java/forestry/core/utils/EntityUtil.java b/src/main/java/forestry/core/utils/EntityUtil.java index b8268a749..bd9eef39f 100644 --- a/src/main/java/forestry/core/utils/EntityUtil.java +++ b/src/main/java/forestry/core/utils/EntityUtil.java @@ -18,9 +18,7 @@ import net.minecraft.entity.EntityLiving; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.MathHelper; import net.minecraft.world.World; - -import cpw.mods.fml.common.registry.EntityRegistry; - +import net.minecraftforge.fml.common.registry.EntityRegistry; import forestry.api.core.ForestryAPI; import forestry.core.entities.EntitySelector; @@ -41,7 +39,7 @@ public abstract class EntityUtil { living.setLocationAndAngles(x, y, z, MathHelper.wrapAngleTo180_float(world.rand.nextFloat() * 360.0f), 0.0f); living.rotationYawHead = living.rotationYaw; living.renderYawOffset = living.rotationYaw; - living.onSpawnWithEgg(null); + living.onInitialSpawn(null, null); world.spawnEntityInWorld(living); living.playLivingSound(); return living; @@ -59,7 +57,7 @@ public abstract class EntityUtil { @SuppressWarnings("unchecked") public static List selectEntitiesWithinAABB(World world, EntitySelector entitySelector, AxisAlignedBB boundingBox) { - return world.selectEntitiesWithinAABB(entitySelector.getEntityClass(), boundingBox, entitySelector); + return world.getEntitiesWithinAABB(entitySelector.getEntityClass(), boundingBox, entitySelector); } private static E createEntity(World world, Class entityClass) { @@ -67,7 +65,7 @@ public abstract class EntityUtil { return null; } - String entityString = (String) EntityList.classToStringMapping.get(entityClass); + String entityString = EntityList.classToStringMapping.get(entityClass); if (entityString == null) { return null; } diff --git a/src/main/java/forestry/core/utils/ForestryModEnvWarningCallable.java b/src/main/java/forestry/core/utils/ForestryModEnvWarningCallable.java index 094ccb7d1..c55891834 100755 --- a/src/main/java/forestry/core/utils/ForestryModEnvWarningCallable.java +++ b/src/main/java/forestry/core/utils/ForestryModEnvWarningCallable.java @@ -13,14 +13,13 @@ package forestry.core.utils; import java.util.ArrayList; import java.util.List; -import cpw.mods.fml.client.FMLClientHandler; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.ICrashCallable; -import cpw.mods.fml.common.Loader; -import cpw.mods.fml.relauncher.Side; - import forestry.core.config.Constants; import forestry.plugins.PluginManager; +import net.minecraftforge.fml.client.FMLClientHandler; +import net.minecraftforge.fml.common.FMLCommonHandler; +import net.minecraftforge.fml.common.ICrashCallable; +import net.minecraftforge.fml.common.Loader; +import net.minecraftforge.fml.relauncher.Side; /** * ICrashCallable for highlighting certain mods and listing disabled modules for crash reports. diff --git a/src/main/java/forestry/core/utils/GeneticsUtil.java b/src/main/java/forestry/core/utils/GeneticsUtil.java index 1ee97754c..7eab77fb9 100644 --- a/src/main/java/forestry/core/utils/GeneticsUtil.java +++ b/src/main/java/forestry/core/utils/GeneticsUtil.java @@ -15,11 +15,13 @@ import java.util.Map; import java.util.Set; import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import com.mojang.authlib.GameProfile; @@ -82,29 +84,29 @@ public class GeneticsUtil { return armorNaturalist.canSeePollination(player, armorItemStack, true); } - public static boolean canNurse(IButterfly butterfly, World world, final int x, final int y, final int z) { - TileEntity tile = world.getTileEntity(x, y, z); + public static boolean canNurse(IButterfly butterfly, World world, final BlockPos pos) { + TileEntity tile = world.getTileEntity(pos); if (tile instanceof IButterflyNursery) { return ((IButterflyNursery) tile).canNurse(butterfly); } // vanilla leaves can always be converted and then nurse - return getErsatzPollen(world, x, y, z) != null; + return getErsatzPollen(world, pos) != null; } /** * Returns an ICheckPollinatable that can be checked but not mated. * Used to check for pollination traits without altering the world by changing vanilla leaves to forestry ones. */ - public static ICheckPollinatable getCheckPollinatable(World world, final int x, final int y, final int z) { - TileEntity tile = world.getTileEntity(x, y, z); + public static ICheckPollinatable getCheckPollinatable(World world, final BlockPos pos) { + TileEntity tile = world.getTileEntity(pos); if (tile instanceof IPollinatable) { return new CheckPollinatable((IPollinatable) tile); } - ITree pollen = getErsatzPollen(world, x, y, z); + ITree pollen = getErsatzPollen(world, pos); if (pollen != null) { return new CheckPollinatableTree(pollen); } @@ -112,31 +114,32 @@ public class GeneticsUtil { return null; } - public static IPollinatable getOrCreatePollinatable(GameProfile owner, World world, final int x, final int y, final int z) { - TileEntity tile = world.getTileEntity(x, y, z); + public static IPollinatable getOrCreatePollinatable(GameProfile owner, World world, final BlockPos pos) { + TileEntity tile = world.getTileEntity(pos); if (tile instanceof IPollinatable) { return (IPollinatable) tile; } if (Config.pollinateVanillaTrees) { - ITree pollen = getErsatzPollen(world, x, y, z); + ITree pollen = getErsatzPollen(world, pos); if (pollen != null) { - pollen.setLeaves(world, owner, x, y, z); - return (IPollinatable) world.getTileEntity(x, y, z); + pollen.setLeaves(world, owner, pos); + return (IPollinatable) world.getTileEntity(pos); } } return null; } - public static ITree getErsatzPollen(World world, final int x, final int y, final int z) { - Block block = world.getBlock(x, y, z); + public static ITree getErsatzPollen(World world, final BlockPos pos) { + IBlockState blockState = world.getBlockState(pos); + Block block = blockState.getBlock(); if (!isErsatzBlock(block)) { return null; } - int meta = world.getBlockMetadata(x, y, z); + int meta = block.getMetaFromState(blockState); if (Blocks.leaves == block || Blocks.leaves2 == block) { if ((meta & 4) != 0) { diff --git a/src/main/java/forestry/core/utils/InventoryUtil.java b/src/main/java/forestry/core/utils/InventoryUtil.java index 101a46623..842b37791 100644 --- a/src/main/java/forestry/core/utils/InventoryUtil.java +++ b/src/main/java/forestry/core/utils/InventoryUtil.java @@ -23,15 +23,15 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.world.World; +import net.minecraftforge.fml.common.Optional; import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.event.entity.player.PlayerDestroyItemEvent; import net.minecraftforge.oredict.OreDictionary; -import cpw.mods.fml.common.Optional; - import forestry.core.circuits.ISocketable; import forestry.core.inventory.filters.ArrayStackFilter; import forestry.core.inventory.filters.IStackFilter; @@ -48,7 +48,7 @@ import buildcraft.api.transport.IPipeTile; public abstract class InventoryUtil { - public static IInventory getInventory(IInventory inv, ForgeDirection side) { + public static IInventory getInventory(IInventory inv, EnumFacing side) { if (inv == null) { return null; } @@ -105,7 +105,7 @@ public abstract class InventoryUtil { if (a.getItemDamage() != b.getItemDamage()) { return false; } - if (a.stackTagCompound != null && !a.stackTagCompound.equals(b.stackTagCompound)) { + if (a.hasTagCompound() && !a.getTagCompound().equals(b.getTagCompound())) { return false; } return true; @@ -250,10 +250,10 @@ public abstract class InventoryUtil { * @return true if an item was inserted, otherwise false. */ public static boolean moveOneItemToPipe(IInventory source, AdjacentTileCache tileCache) { - return moveOneItemToPipe(source, tileCache, ForgeDirection.VALID_DIRECTIONS); + return moveOneItemToPipe(source, tileCache, EnumFacing.values()); } - public static boolean moveOneItemToPipe(IInventory source, AdjacentTileCache tileCache, ForgeDirection[] directions) { + public static boolean moveOneItemToPipe(IInventory source, AdjacentTileCache tileCache, EnumFacing[] directions) { if (PluginManager.Module.BUILDCRAFT_TRANSPORT.isEnabled()) { return internal_moveOneItemToPipe(source, tileCache, directions); } @@ -262,7 +262,7 @@ public abstract class InventoryUtil { } @Optional.Method(modid = "BuildCraftAPI|transport") - private static boolean internal_moveOneItemToPipe(IInventory source, AdjacentTileCache tileCache, ForgeDirection[] directions) { + private static boolean internal_moveOneItemToPipe(IInventory source, AdjacentTileCache tileCache, EnumFacing[] directions) { IInventory invClone = new InventoryCopy(source); ItemStack stackToMove = removeOneItem(invClone); if (stackToMove == null) { @@ -272,9 +272,9 @@ public abstract class InventoryUtil { return false; } - List> pipes = new ArrayList<>(); + List> pipes = new ArrayList<>(); boolean foundPipe = false; - for (ForgeDirection side : directions) { + for (EnumFacing side : directions) { TileEntity tile = tileCache.getTileOnSide(side); if (tile instanceof IPipeTile) { IPipeTile pipe = (IPipeTile) tile; @@ -289,8 +289,8 @@ public abstract class InventoryUtil { return false; } - int choice = tileCache.getSource().getWorldObj().rand.nextInt(pipes.size()); - Map.Entry pipe = pipes.get(choice); + int choice = tileCache.getSource().getWorld().rand.nextInt(pipes.size()); + Map.Entry pipe = pipes.get(choice); if (pipe.getValue().injectItem(stackToMove, false, pipe.getKey().getOpposite(), null) > 0) { if (removeOneItem(source, stackToMove) != null) { pipe.getValue().injectItem(stackToMove, true, pipe.getKey().getOpposite(), null); @@ -613,18 +613,9 @@ public abstract class InventoryUtil { } if (container != null) { - - if (itemstack.getItem().doesContainerItemLeaveCraftingGrid(itemstack)) { - if (!tryAddStack(stowing, container, true)) { - if (player != null && !player.inventory.addItemStackToInventory(container)) { - player.dropPlayerItemWithRandomChoice(container, true); - } - } - } else { - if (!tryAddStack(stowing, container, slotIndex, 1, true)) { - if (!tryAddStack(stowing, container, true) && player != null) { - player.dropPlayerItemWithRandomChoice(container, true); - } + if (!tryAddStack(stowing, container, slotIndex, 1, true)) { + if (!tryAddStack(stowing, container, true) && player != null) { + player.dropPlayerItemWithRandomChoice(container, true); } } } @@ -659,6 +650,10 @@ public abstract class InventoryUtil { inventory.setInventorySlotContents(slot, null); } } + + public static void dropInventory(IInventory inventory, World world, BlockPos pos) { + dropInventory(inventory, world, pos.getX(), pos.getY(), pos.getZ()); + } public static void dropSockets(ISocketable socketable, World world, double x, double y, double z) { for (int slot = 0; slot < socketable.getSocketCount(); slot++) { @@ -667,6 +662,10 @@ public abstract class InventoryUtil { socketable.setSocket(slot, null); } } + + public static void dropSockets(ISocketable socketable, World world, BlockPos pos) { + dropSockets(socketable, world, pos.getX(), pos.getY(), pos.getZ()); + } public static void dropItemStackFromInventory(ItemStack itemStack, World world, double x, double y, double z) { if (itemStack == null) { @@ -694,11 +693,11 @@ public abstract class InventoryUtil { /* NBT */ public static void readFromNBT(IInventory inventory, NBTTagCompound nbttagcompound) { - if (!nbttagcompound.hasKey(inventory.getInventoryName())) { + if (!nbttagcompound.hasKey(inventory.getName())) { return; } - NBTTagList nbttaglist = nbttagcompound.getTagList(inventory.getInventoryName(), 10); + NBTTagList nbttaglist = nbttagcompound.getTagList(inventory.getName(), 10); for (int j = 0; j < nbttaglist.tagCount(); ++j) { NBTTagCompound nbttagcompound2 = nbttaglist.getCompoundTagAt(j); @@ -717,6 +716,6 @@ public abstract class InventoryUtil { nbttaglist.appendTag(nbttagcompound2); } } - nbttagcompound.setTag(inventory.getInventoryName(), nbttaglist); + nbttagcompound.setTag(inventory.getName(), nbttaglist); } } diff --git a/src/main/java/forestry/core/utils/ItemStackUtil.java b/src/main/java/forestry/core/utils/ItemStackUtil.java index 662ba56e9..605c1c787 100644 --- a/src/main/java/forestry/core/utils/ItemStackUtil.java +++ b/src/main/java/forestry/core/utils/ItemStackUtil.java @@ -16,13 +16,17 @@ import java.util.List; import java.util.Random; import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; import net.minecraft.entity.item.EntityItem; import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.BlockPos; +import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; - +import net.minecraftforge.fml.common.registry.FMLControlledNamespacedRegistry; +import net.minecraftforge.fml.common.registry.GameData; import net.minecraftforge.oredict.OreDictionary; public abstract class ItemStackUtil { @@ -53,6 +57,94 @@ public abstract class ItemStackUtil { return ItemStack.areItemStackTagsEqual(lhs, rhs); } + + /** + * + * @return The registry name of the item as {@link ResourceLocation} + */ + public static ResourceLocation getItemNameFromRegistry(Item item){ + if(item == null){ + return null; + } + FMLControlledNamespacedRegistry itemRegistry = GameData.getItemRegistry(); + return itemRegistry.getNameForObject(item); + } + + /** + * + * @return The registry name of the item as {@link String} + */ + public static String getItemNameFromRegistryAsSting(Item item){ + return getItemNameFromRegistry(item).toString(); + } + + /** + * @return The item from the item registry + * @param itemName The registry name from the item as {@link String} + */ + public static Item getItemFromRegistry(String itemName){ + return getItemFromRegistry(new ResourceLocation(itemName)); + } + + /** + * @return The item from the item registry + * @param itemName The registry name from the item as {@link ResourceLocation} + */ + public static Item getItemFromRegistry(ResourceLocation itemName){ + if(itemName == null){ + return null; + } + FMLControlledNamespacedRegistry itemRegistry = GameData.getItemRegistry(); + int registryID = itemRegistry.getId(itemName); + if(registryID == -1){ + return null; + } + return itemRegistry.getRaw(registryID); + } + + /** + * + * @return The registry name of the block as {@link ResourceLocation} + */ + public static ResourceLocation getBlockNameFromRegistry(Block block){ + if(block == null){ + return null; + } + FMLControlledNamespacedRegistry blockRegistry = GameData.getBlockRegistry(); + return blockRegistry.getNameForObject(block); + } + + /** + * + * @return The registry name of the block as {@link String} + */ + public static String getBlockNameFromRegistryAsSting(Block block){ + return getBlockNameFromRegistry(block).toString(); + } + + /** + * @return The block from the block registry + * @param itemName The registry name from the block as {@link String} + */ + public static Block getBlockFromRegistry(String itemName){ + return getBlockFromRegistry(new ResourceLocation(itemName)); + } + + /** + * @return The block from the block registry + * @param itemName The registry name from the block as {@link ResourceLocation} + */ + public static Block getBlockFromRegistry(ResourceLocation itemName){ + if(itemName == null){ + return null; + } + FMLControlledNamespacedRegistry blockRegistry = GameData.getBlockRegistry(); + int registryID = blockRegistry.getId(itemName); + if(registryID == -1){ + return null; + } + return blockRegistry.getRaw(registryID); + } /** * Merges the giving stack into the receiving stack as far as possible @@ -209,7 +301,7 @@ public abstract class ItemStackUtil { } // When the base stackTagCompound is null or empty, treat it as a wildcard for crafting - if (base.stackTagCompound == null || base.stackTagCompound.hasNoTags()) { + if (!base.hasTagCompound() || base.getTagCompound().hasNoTags()) { return true; } else { return ItemStack.areItemStackTagsEqual(base, comparison); @@ -232,7 +324,7 @@ public abstract class ItemStackUtil { return true; } - if (base.hasTagCompound() && !base.stackTagCompound.hasNoTags()) { + if (base.hasTagCompound() && !base.getTagCompound().hasNoTags()) { if (!ItemStack.areItemStacksEqual(base, comparison)) { return false; } @@ -267,15 +359,12 @@ public abstract class ItemStackUtil { } Item baseItem = base.getItem(); - if (baseItem.doesContainerItemLeaveCraftingGrid(base)) { - return false; - } if (baseItem != comparison.getItem()) { return false; } - if (base.stackTagCompound == null || base.stackTagCompound.hasNoTags()) { + if (!base.hasTagCompound() || base.getTagCompound().hasNoTags()) { // tool uses meta for damage return true; } else { @@ -290,6 +379,10 @@ public abstract class ItemStackUtil { public static void dropItemStackAsEntity(ItemStack items, World world, double x, double y, double z) { dropItemStackAsEntity(items, world, x, y, z, 10); } + + public static void dropItemStackAsEntity(ItemStack items, World world, BlockPos pos) { + dropItemStackAsEntity(items, world, pos.getX(), pos.getY(), pos.getZ(), 10); + } public static void dropItemStackAsEntity(ItemStack items, World world, double x, double y, double z, int delayForPickup) { if (items.stackSize <= 0 || world.isRemote) { @@ -301,7 +394,7 @@ public abstract class ItemStackUtil { double d1 = (world.rand.nextFloat() * f1) + (1.0F - f1) * 0.5D; double d2 = (world.rand.nextFloat() * f1) + (1.0F - f1) * 0.5D; EntityItem entityitem = new EntityItem(world, x + d, y + d1, z + d2, items); - entityitem.delayBeforeCanPickup = delayForPickup; + entityitem.setPickupDelay(delayForPickup); world.spawnEntityInWorld(entityitem); } @@ -317,7 +410,7 @@ public abstract class ItemStackUtil { Item item = stack.getItem(); if (item instanceof ItemBlock) { - return ((ItemBlock) item).field_150939_a; + return ((ItemBlock) item).getBlock(); } else { return null; } @@ -326,6 +419,10 @@ public abstract class ItemStackUtil { public static boolean equals(Block block, ItemStack stack) { return block == getBlock(stack); } + + public static boolean equals(IBlockState state, ItemStack stack) { + return state.getBlock() == getBlock(stack) && state.getBlock().getMetaFromState(state) == stack.getItemDamage(); + } public static boolean equals(Block block, int meta, ItemStack stack) { return block == getBlock(stack) && meta == stack.getItemDamage(); diff --git a/src/main/java/forestry/core/utils/ModUtil.java b/src/main/java/forestry/core/utils/ModUtil.java index 5a8525306..ea8a536f7 100644 --- a/src/main/java/forestry/core/utils/ModUtil.java +++ b/src/main/java/forestry/core/utils/ModUtil.java @@ -10,13 +10,13 @@ ******************************************************************************/ package forestry.core.utils; -import cpw.mods.fml.common.API; -import cpw.mods.fml.common.Loader; -import cpw.mods.fml.common.ModContainer; -import cpw.mods.fml.common.versioning.ArtifactVersion; -import cpw.mods.fml.common.versioning.DefaultArtifactVersion; -import cpw.mods.fml.common.versioning.VersionParser; -import cpw.mods.fml.common.versioning.VersionRange; +import net.minecraftforge.fml.common.API; +import net.minecraftforge.fml.common.Loader; +import net.minecraftforge.fml.common.ModContainer; +import net.minecraftforge.fml.common.versioning.ArtifactVersion; +import net.minecraftforge.fml.common.versioning.DefaultArtifactVersion; +import net.minecraftforge.fml.common.versioning.VersionParser; +import net.minecraftforge.fml.common.versioning.VersionRange; public abstract class ModUtil { public static boolean isModLoaded(String modname) { diff --git a/src/main/java/forestry/core/utils/NBTUtil.java b/src/main/java/forestry/core/utils/NBTUtil.java index f5b1c267e..37e2d36b3 100644 --- a/src/main/java/forestry/core/utils/NBTUtil.java +++ b/src/main/java/forestry/core/utils/NBTUtil.java @@ -28,8 +28,7 @@ import net.minecraft.nbt.NBTTagList; import net.minecraft.nbt.NBTTagLong; import net.minecraft.nbt.NBTTagShort; import net.minecraft.nbt.NBTTagString; - -import cpw.mods.fml.common.ObfuscationReflectionHelper; +import net.minecraftforge.fml.common.ObfuscationReflectionHelper; /** * @author CovertJaguar @@ -80,7 +79,7 @@ public abstract class NBTUtil { public NBTList(NBTTagList nbtList) { this.nbtList = nbtList; - backingList = ObfuscationReflectionHelper.getPrivateValue(NBTTagList.class, nbtList, 0); + backingList = ObfuscationReflectionHelper.getPrivateValue(NBTTagList.class, nbtList, 1); } @Override diff --git a/src/main/java/forestry/core/utils/Stack.java b/src/main/java/forestry/core/utils/Stack.java index 9c92367d9..5cc41719c 100644 --- a/src/main/java/forestry/core/utils/Stack.java +++ b/src/main/java/forestry/core/utils/Stack.java @@ -17,11 +17,8 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.item.Item; - import net.minecraftforge.oredict.OreDictionary; -import cpw.mods.fml.common.registry.GameData; - public class Stack { private final String name; private final int meta; @@ -85,7 +82,7 @@ public class Stack { } public Item getItem() { - Item item = GameData.getItemRegistry().getRaw(name); + Item item = ItemStackUtil.getItemFromRegistry(name); if (item == null) { Log.warning("Failed to find item for (" + name + ") in the Forge registry."); } @@ -93,7 +90,7 @@ public class Stack { } public Block getBlock() { - Block block = GameData.getBlockRegistry().getRaw(name); + Block block = ItemStackUtil.getBlockFromRegistry(name); if (block == null) { Log.warning("Failed to find block for (" + name + ") in the Forge registry."); } diff --git a/src/main/java/forestry/core/utils/StringUtil.java b/src/main/java/forestry/core/utils/StringUtil.java index 6115ef81c..5470dcbab 100755 --- a/src/main/java/forestry/core/utils/StringUtil.java +++ b/src/main/java/forestry/core/utils/StringUtil.java @@ -107,7 +107,7 @@ public class StringUtil { public static int getLineHeight(int maxWidth, String... strings) { Minecraft minecraft = Proxies.common.getClientInstance(); - FontRenderer fontRenderer = minecraft.fontRenderer; + FontRenderer fontRenderer = minecraft.fontRendererObj; int lineCount = 0; for (String string : strings) { diff --git a/src/main/java/forestry/core/utils/vect/IVect.java b/src/main/java/forestry/core/utils/vect/IVect.java index 5cb86d085..ec2350b8f 100644 --- a/src/main/java/forestry/core/utils/vect/IVect.java +++ b/src/main/java/forestry/core/utils/vect/IVect.java @@ -10,31 +10,39 @@ ******************************************************************************/ package forestry.core.utils.vect; -import net.minecraft.util.ChunkCoordinates; - -import net.minecraftforge.common.util.ForgeDirection; - import forestry.api.farming.FarmDirection; +import net.minecraft.entity.Entity; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; /** * Represents a position or dimensions. */ -public interface IVect { - int getX(); +public abstract class IVect extends BlockPos { + + public IVect(int x, int y, int z) { + super(x, y, z); + } + + public IVect(Entity source) { + super(source); + } + + public IVect(BlockPos pos) { + super(pos); + } + + public IVect(double x, double y, double z) { + super(x, y, z); + } - int getY(); + abstract IVect add(IVect other); - int getZ(); + abstract IVect add(EnumFacing direction); - IVect add(IVect other); + abstract IVect add(FarmDirection direction); - IVect add(int x, int y, int z); + abstract IVect add(BlockPos coordinates); - IVect add(ForgeDirection direction); - - IVect add(FarmDirection direction); - - IVect add(ChunkCoordinates coordinates); - - int[] toArray(); + abstract int[] toArray(); } diff --git a/src/main/java/forestry/core/utils/vect/MutableVect.java b/src/main/java/forestry/core/utils/vect/MutableVect.java index 02f0b227a..ee3aa7713 100644 --- a/src/main/java/forestry/core/utils/vect/MutableVect.java +++ b/src/main/java/forestry/core/utils/vect/MutableVect.java @@ -10,33 +10,34 @@ ******************************************************************************/ package forestry.core.utils.vect; -import net.minecraft.util.ChunkCoordinates; - -import net.minecraftforge.common.util.ForgeDirection; - import forestry.api.farming.FarmDirection; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; /** * Represents changeable positions or dimensions. */ -public class MutableVect implements IVect { +public class MutableVect extends IVect { public int x; public int y; public int z; public MutableVect(int x, int y, int z) { + super(0, 0, 0); this.x = x; this.y = y; this.z = z; } - public MutableVect(ForgeDirection direction) { - this.x = direction.offsetX; - this.y = direction.offsetY; - this.z = direction.offsetZ; + public MutableVect(EnumFacing direction) { + super(0, 0, 0); + this.x = direction.getFrontOffsetX(); + this.y = direction.getFrontOffsetY(); + this.z = direction.getFrontOffsetZ(); } public MutableVect(int[] dim) { + super(0, 0, 0); if (dim.length != 3) { throw new RuntimeException("Cannot instantiate a vector with less or more than 3 points."); } @@ -46,18 +47,21 @@ public class MutableVect implements IVect { this.z = dim[2]; } - public MutableVect(ChunkCoordinates coordinates) { - this.x = coordinates.posX; - this.y = coordinates.posY; - this.z = coordinates.posZ; + public MutableVect(BlockPos pos) { + super(0, 0, 0); + this.x = pos.getX(); + this.y = pos.getY(); + this.z = pos.getZ(); } public MutableVect(IVect vect) { + super(0, 0, 0); this.x = vect.getX(); this.y = vect.getY(); this.z = vect.getZ(); } + @Override public MutableVect add(IVect other) { x += other.getX(); y += other.getY(); @@ -65,6 +69,7 @@ public class MutableVect implements IVect { return this; } + @Override public MutableVect add(int x, int y, int z) { this.x += x; this.y += y; @@ -73,10 +78,10 @@ public class MutableVect implements IVect { } @Override - public MutableVect add(ForgeDirection direction) { - this.x += direction.offsetX; - this.y += direction.offsetY; - this.z += direction.offsetZ; + public MutableVect add(EnumFacing direction) { + this.x += direction.getFrontOffsetX(); + this.y += direction.getFrontOffsetY(); + this.z += direction.getFrontOffsetZ(); return this; } @@ -86,10 +91,10 @@ public class MutableVect implements IVect { } @Override - public MutableVect add(ChunkCoordinates coordinates) { - this.x += coordinates.posX; - this.y += coordinates.posY; - this.z += coordinates.posZ; + public MutableVect add(BlockPos pos) { + this.x += pos.getX(); + this.y += pos.getY(); + this.z += pos.getZ(); return this; } @@ -107,17 +112,17 @@ public class MutableVect implements IVect { public boolean advancePositionInArea(Vect area) { // Increment z first until end reached - if (z < area.z - 1) { + if (z < area.getZ() - 1) { z++; } else { z = 0; - if (x < area.x - 1) { + if (x < area.getX() - 1) { x++; } else { x = 0; - if (y < area.y - 1) { + if (y < area.getY() - 1) { y++; } else { return false; diff --git a/src/main/java/forestry/core/utils/vect/Vect.java b/src/main/java/forestry/core/utils/vect/Vect.java index 323ba1c03..e005f1cc9 100644 --- a/src/main/java/forestry/core/utils/vect/Vect.java +++ b/src/main/java/forestry/core/utils/vect/Vect.java @@ -14,64 +14,44 @@ import java.util.Random; import net.minecraft.entity.Entity; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ChunkCoordinates; - -import net.minecraftforge.common.util.ForgeDirection; - +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import forestry.api.farming.FarmDirection; /** * Represents an unchangeable position or dimensions. */ -public class Vect implements IVect { - public final int x; - public final int y; - public final int z; +public class Vect extends IVect { public Vect(int[] dim) { + super(dim[0], dim[1], dim[2]); if (dim.length != 3) { throw new RuntimeException("Cannot instantiate a vector with less or more than 3 points."); } - - this.x = dim[0]; - this.y = dim[1]; - this.z = dim[2]; } public Vect(IVect vect) { - this.x = vect.getX(); - this.y = vect.getY(); - this.z = vect.getZ(); + super(vect.getX(), vect.getY(), vect.getZ()); } - public Vect(ForgeDirection direction) { - this.x = direction.offsetX; - this.y = direction.offsetY; - this.z = direction.offsetZ; + public Vect(EnumFacing direction) { + super(direction.getFrontOffsetX(), direction.getFrontOffsetY(), direction.getFrontOffsetZ()); } public Vect(int x, int y, int z) { - this.x = x; - this.y = y; - this.z = z; + super(x, y, z); } - public Vect(ChunkCoordinates coordinates) { - this.x = coordinates.posX; - this.y = coordinates.posY; - this.z = coordinates.posZ; + public Vect(BlockPos pos) { + super(pos); } public Vect(TileEntity entity) { - this.x = entity.xCoord; - this.y = entity.yCoord; - this.z = entity.zCoord; + this(entity.getPos()); } public Vect(Entity entity) { - this.x = (int) Math.round(entity.posX); - this.y = (int) Math.round(entity.posY); - this.z = (int) Math.round(entity.posZ); + super(entity); } public static Vect getRandomPositionInArea(Random random, IVect area) { @@ -95,17 +75,17 @@ public class Vect implements IVect { @Override public Vect add(IVect other) { - return new Vect(x + other.getX(), y + other.getY(), z + other.getZ()); + return new Vect(getX() + other.getX(), getY() + other.getY(), getZ() + other.getZ()); } @Override public Vect add(int x, int y, int z) { - return new Vect(this.x + x, this.y + y, this.z + z); + return new Vect(getX() + x, getY() + y, getZ() + z); } @Override - public Vect add(ForgeDirection direction) { - return add(direction.offsetX, direction.offsetY, direction.offsetZ); + public Vect add(EnumFacing direction) { + return add(direction.getFrontOffsetX(), direction.getFrontOffsetY(), direction.getFrontOffsetZ()); } @Override @@ -114,35 +94,35 @@ public class Vect implements IVect { } @Override - public Vect add(ChunkCoordinates coordinates) { - return add(coordinates.posX, coordinates.posY, coordinates.posZ); + public Vect add(BlockPos pos) { + return add(pos); } @Override public int[] toArray() { - return new int[]{x, y, z}; + return new int[]{getX(), getY(), getZ()}; } public Vect multiply(int factor) { - return new Vect(x * factor, y * factor, z * factor); + return new Vect(getX() * factor, getY() * factor, getZ() * factor); } public Vect multiply(float factor) { - return new Vect(Math.round(x * factor), Math.round(y * factor), Math.round(z * factor)); + return new Vect(Math.round(getX() * factor), Math.round(getY() * factor), Math.round(getZ() * factor)); } @Override public String toString() { - return String.format("%sx%sx%s", x, y, z); + return String.format("%sx%sx%s", getX(), getY(), getZ()); } @Override public int hashCode() { final int prime = 31; int result = 1; - result = prime * result + x; - result = prime * result + y; - result = prime * result + z; + result = prime * result + getX(); + result = prime * result + getY(); + result = prime * result + getZ(); return result; } @@ -155,21 +135,6 @@ public class Vect implements IVect { return false; } Vect other = (Vect) obj; - return (x == other.x) && (y == other.y) && (z == other.z); - } - - @Override - public int getX() { - return x; - } - - @Override - public int getY() { - return y; - } - - @Override - public int getZ() { - return z; + return (getX() == other.getX()) && (getY() == other.getY()) && (getZ() == other.getZ()); } } diff --git a/src/main/java/forestry/core/utils/vect/VectUtil.java b/src/main/java/forestry/core/utils/vect/VectUtil.java index c435dd36f..c1a7b0ac0 100644 --- a/src/main/java/forestry/core/utils/vect/VectUtil.java +++ b/src/main/java/forestry/core/utils/vect/VectUtil.java @@ -11,30 +11,35 @@ package forestry.core.utils.vect; import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; public final class VectUtil { public static boolean isAirBlock(World world, IVect position) { - return world.isAirBlock(position.getX(), position.getY(), position.getZ()); + return world.isAirBlock(position); } public static boolean isWoodBlock(World world, IVect position) { Block block = getBlock(world, position); - return block.isWood(world, position.getX(), position.getY(), position.getZ()); + return block.isWood(world, position); } public static TileEntity getTile(World world, IVect position) { - return world.getTileEntity(position.getX(), position.getY(), position.getZ()); + return world.getTileEntity(position); + } + + public static IBlockState getBlockState(World world, IVect position) { + return world.getBlockState(position); } public static Block getBlock(World world, IVect position) { - return world.getBlock(position.getX(), position.getY(), position.getZ()); + return getBlockState(world, position).getBlock(); } public static int getBlockMeta(World world, IVect position) { - return world.getBlockMetadata(position.getX(), position.getY(), position.getZ()); + return getBlock(world, position).getMetaFromState(getBlockState(world, position)); } public static ItemStack getAsItemStack(World world, IVect position) { diff --git a/src/main/java/forestry/core/worldgen/BlockType.java b/src/main/java/forestry/core/worldgen/BlockType.java index 85bb27fd0..026895a6b 100755 --- a/src/main/java/forestry/core/worldgen/BlockType.java +++ b/src/main/java/forestry/core/worldgen/BlockType.java @@ -11,10 +11,10 @@ package forestry.core.worldgen; import net.minecraft.block.Block; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; - import forestry.core.config.Constants; public class BlockType implements IBlockType { @@ -27,12 +27,12 @@ public class BlockType implements IBlockType { } @Override - public void setDirection(ForgeDirection facing) { + public void setDirection(EnumFacing facing) { } @Override - public void setBlock(World world, int x, int y, int z) { - world.setBlock(x, y, z, block, meta, Constants.FLAG_BLOCK_SYNCH_AND_UPDATE); + public void setBlock(World world, BlockPos pos) { + world.setBlockState(pos, block.getStateFromMeta(meta), Constants.FLAG_BLOCK_SYNCH_AND_UPDATE); } } diff --git a/src/main/java/forestry/core/worldgen/BlockTypeTileForestry.java b/src/main/java/forestry/core/worldgen/BlockTypeTileForestry.java index 4bb4359f0..c2d1d565c 100644 --- a/src/main/java/forestry/core/worldgen/BlockTypeTileForestry.java +++ b/src/main/java/forestry/core/worldgen/BlockTypeTileForestry.java @@ -12,17 +12,17 @@ package forestry.core.worldgen; import net.minecraft.block.Block; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; - import forestry.core.config.Constants; import forestry.core.tiles.TileForestry; public class BlockTypeTileForestry implements IBlockType { private final Block block; private final int meta; - private ForgeDirection direction; + private EnumFacing direction; public BlockTypeTileForestry(Block block, int meta) { this.block = block; @@ -30,25 +30,25 @@ public class BlockTypeTileForestry implements IBlockType { } @Override - public void setDirection(ForgeDirection facing) { + public void setDirection(EnumFacing facing) { this.direction = facing; } @Override - public void setBlock(World world, int x, int y, int z) { - boolean placed = world.setBlock(x, y, z, block, meta, Constants.FLAG_BLOCK_SYNCH_AND_UPDATE); + public void setBlock(World world, BlockPos pos) { + boolean placed = world.setBlockState(pos, block.getStateFromMeta(meta), Constants.FLAG_BLOCK_SYNCH_AND_UPDATE); if (!placed) { return; } - Block worldBlock = world.getBlock(x, y, z); + Block worldBlock = world.getBlockState(pos).getBlock(); if (!Block.isEqualTo(block, worldBlock)) { return; } - TileEntity tile = world.getTileEntity(x, y, z); + TileEntity tile = world.getTileEntity(pos); if (!(tile instanceof TileForestry)) { - world.setBlockToAir(x, y, z); + world.setBlockToAir(pos); return; } diff --git a/src/main/java/forestry/core/worldgen/BlockTypeVoid.java b/src/main/java/forestry/core/worldgen/BlockTypeVoid.java index 28a727c1b..b5ba918eb 100644 --- a/src/main/java/forestry/core/worldgen/BlockTypeVoid.java +++ b/src/main/java/forestry/core/worldgen/BlockTypeVoid.java @@ -11,6 +11,7 @@ package forestry.core.worldgen; import net.minecraft.init.Blocks; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; public class BlockTypeVoid extends BlockType { @@ -20,8 +21,8 @@ public class BlockTypeVoid extends BlockType { } @Override - public void setBlock(World world, int x, int y, int z) { - world.setBlockToAir(x, y, z); + public void setBlock(World world, BlockPos pos) { + world.setBlockToAir(pos); } } diff --git a/src/main/java/forestry/core/worldgen/IBlockType.java b/src/main/java/forestry/core/worldgen/IBlockType.java index fbb0d2666..10daab414 100644 --- a/src/main/java/forestry/core/worldgen/IBlockType.java +++ b/src/main/java/forestry/core/worldgen/IBlockType.java @@ -10,12 +10,12 @@ ******************************************************************************/ package forestry.core.worldgen; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; - public interface IBlockType { - void setDirection(ForgeDirection facing); + void setDirection(EnumFacing facing); - void setBlock(World world, int x, int y, int z); + void setBlock(World world, BlockPos pos); } diff --git a/src/main/java/forestry/core/worldgen/WorldGenBase.java b/src/main/java/forestry/core/worldgen/WorldGenBase.java index a83cca5c5..c581b474b 100755 --- a/src/main/java/forestry/core/worldgen/WorldGenBase.java +++ b/src/main/java/forestry/core/worldgen/WorldGenBase.java @@ -12,11 +12,11 @@ package forestry.core.worldgen; import java.util.Random; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; -import net.minecraftforge.common.util.ForgeDirection; - import forestry.arboriculture.worldgen.ITreeBlockType; public abstract class WorldGenBase extends WorldGenerator { @@ -42,37 +42,37 @@ public abstract class WorldGenBase extends WorldGenerator { return Math.sqrt(Math.pow(a.x - b.x, 2) + Math.pow(a.y - b.y, 2) + Math.pow(a.z - b.z, 2)); } - public static ForgeDirection direction(Vector a, Vector b) { + public static EnumFacing direction(Vector a, Vector b) { int x = (int) Math.abs(a.x - b.x); int y = (int) Math.abs(a.y - b.y); int z = (int) Math.abs(a.z - b.z); int max = Math.max(x, Math.max(y, z)); if (max == x) { - return ForgeDirection.EAST; + return EnumFacing.EAST; } else if (max == z) { - return ForgeDirection.SOUTH; + return EnumFacing.SOUTH; } else { - return ForgeDirection.UP; + return EnumFacing.UP; } } } @Override - public final boolean generate(World world, Random random, int x, int y, int z) { - return generate(world, x, y, z, false); + public final boolean generate(World world, Random random, BlockPos pos) { + return generate(world, pos, false); } - public boolean generate(World world, int x, int y, int z, boolean forced) { + public boolean generate(World world, BlockPos pos, boolean forced) { return false; } - protected abstract boolean addBlock(World world, int x, int y, int z, ITreeBlockType type, EnumReplaceMode replace); + protected abstract boolean addBlock(World world, BlockPos pos, ITreeBlockType type, EnumReplaceMode replace); protected final void generateCuboid(World world, Vector start, Vector area, ITreeBlockType block, EnumReplaceMode replace) { for (int x = (int) start.x; x < (int) start.x + area.x; x++) { for (int y = (int) start.y; y < (int) start.y + area.y; y++) { for (int z = (int) start.z; z < (int) start.z + area.z; z++) { - addBlock(world, x, y, z, block, replace); + addBlock(world, new BlockPos(x, y, z), block, replace); } } } @@ -90,9 +90,9 @@ public abstract class WorldGenBase extends WorldGenerator { Vector position = new Vector(x, y, z); Vector treeCenter = new Vector(center.x, y, center.z); if (Vector.distance(position, treeCenter) <= (radius) + 0.01) { - ForgeDirection direction = Vector.direction(position, treeCenter); + EnumFacing direction = Vector.direction(position, treeCenter); block.setDirection(direction); - addBlock(world, x, y, z, block, replace); + addBlock(world, new BlockPos(x, y, z), block, replace); } } } @@ -117,7 +117,7 @@ public abstract class WorldGenBase extends WorldGenerator { double distance = Vector.distance(new Vector(x, y, z), new Vector(center.x, y, center.z)); if ((radius - width - 0.01 < distance && distance <= (radius) + 0.01)) { - addBlock(world, x, y, z, block, replace); + addBlock(world, new BlockPos(x, y, z), block, replace); } } } @@ -131,7 +131,7 @@ public abstract class WorldGenBase extends WorldGenerator { for (int y = (int) start.y; y < (int) start.y + area.y; y++) { for (int z = (int) start.z; z < (int) start.z + area.z; z++) { if (Vector.distance(new Vector(x, y, z), new Vector(center.x, center.y, center.z)) <= (radius) + 0.01) { - addBlock(world, x, y, z, block, replace); + addBlock(world, new BlockPos(x, y, z), block, replace); } } } diff --git a/src/main/java/forestry/core/worldgen/WorldGenMinableMeta.java b/src/main/java/forestry/core/worldgen/WorldGenMinableMeta.java index 1f5d14f7f..247908df4 100755 --- a/src/main/java/forestry/core/worldgen/WorldGenMinableMeta.java +++ b/src/main/java/forestry/core/worldgen/WorldGenMinableMeta.java @@ -14,6 +14,7 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.init.Blocks; +import net.minecraft.util.BlockPos; import net.minecraft.util.MathHelper; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; @@ -33,17 +34,17 @@ public class WorldGenMinableMeta extends WorldGenerator { } @Override - public boolean generate(World world, Random random, int i, int j, int k) { + public boolean generate(World world, Random random, BlockPos pos) { boolean hasGenerated = false; float randomBase = random.nextFloat() * 3.141593F; - double d = (i + 8) + (MathHelper.sin(randomBase) * numberOfBlocks) / 8F; - double d1 = (i + 8) - (MathHelper.sin(randomBase) * numberOfBlocks) / 8F; - double d2 = (k + 8) + (MathHelper.cos(randomBase) * numberOfBlocks) / 8F; - double d3 = (k + 8) - (MathHelper.cos(randomBase) * numberOfBlocks) / 8F; - double d4 = (j + random.nextInt(3)) - 2; - double d5 = (j + random.nextInt(3)) - 2; + double d = (pos.getX() + 8) + (MathHelper.sin(randomBase) * numberOfBlocks) / 8F; + double d1 = (pos.getX() + 8) - (MathHelper.sin(randomBase) * numberOfBlocks) / 8F; + double d2 = (pos.getZ() + 8) + (MathHelper.cos(randomBase) * numberOfBlocks) / 8F; + double d3 = (pos.getZ() + 8) - (MathHelper.cos(randomBase) * numberOfBlocks) / 8F; + double d4 = (pos.getY() + random.nextInt(3)) - 2; + double d5 = (pos.getY() + random.nextInt(3)) - 2; for (int l = 0; l <= numberOfBlocks; l++) { double d6 = d + ((d1 - d) * l) / numberOfBlocks; @@ -73,8 +74,9 @@ public class WorldGenMinableMeta extends WorldGenerator { for (int targetZ = zStart; targetZ <= zEnd; targetZ++) { double d14 = ((targetZ + 0.5D) - d8) / (d10 / 2D); - if (d12 * d12 + d13 * d13 + d14 * d14 < 1.0D && world.getBlock(targetX, targetY, targetZ) == Blocks.stone) { - world.setBlock(targetX, targetY, targetZ, mineableBlock, mineableBlockMeta, Constants.FLAG_BLOCK_SYNCH); + BlockPos target = new BlockPos(targetX, targetY, targetZ); + if (d12 * d12 + d13 * d13 + d14 * d14 < 1.0D && world.getBlockState(target).getBlock() == Blocks.stone) { + world.setBlockState(target, mineableBlock.getStateFromMeta(mineableBlockMeta), Constants.FLAG_BLOCK_SYNCH); hasGenerated = true; } } diff --git a/src/main/java/forestry/core/worldgen/WorldGenerator.java b/src/main/java/forestry/core/worldgen/WorldGenerator.java index f95632995..1b49d3e60 100644 --- a/src/main/java/forestry/core/worldgen/WorldGenerator.java +++ b/src/main/java/forestry/core/worldgen/WorldGenerator.java @@ -12,15 +12,14 @@ package forestry.core.worldgen; import java.util.Random; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import net.minecraft.world.chunk.IChunkProvider; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.terraingen.PopulateChunkEvent; - -import cpw.mods.fml.common.IWorldGenerator; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; - +import net.minecraftforge.fml.common.IWorldGenerator; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import forestry.core.blocks.BlockResourceOre; import forestry.core.config.Config; import forestry.plugins.PluginCore; @@ -71,7 +70,7 @@ public class WorldGenerator implements IWorldGenerator { int randPosX = chunkX + random.nextInt(16); int randPosY = random.nextInt(world.getActualHeight() - 72) + 56; // Does not generate below y = 64 int randPosZ = chunkZ + random.nextInt(16); - apatiteGenerator.generate(world, random, randPosX, randPosY, randPosZ); + apatiteGenerator.generate(world, random, new BlockPos(randPosX, randPosY, randPosZ)); } } @@ -81,7 +80,7 @@ public class WorldGenerator implements IWorldGenerator { int randPosX = chunkX + random.nextInt(16); int randPosY = random.nextInt(76) + 32; int randPosZ = chunkZ + random.nextInt(16); - copperGenerator.generate(world, random, randPosX, randPosY, randPosZ); + copperGenerator.generate(world, random, new BlockPos(randPosX, randPosY, randPosZ)); } } @@ -91,7 +90,7 @@ public class WorldGenerator implements IWorldGenerator { int randPosX = chunkX + random.nextInt(16); int randPosY = random.nextInt(76) + 16; int randPosZ = chunkZ + random.nextInt(16); - tinGenerator.generate(world, random, randPosX, randPosY, randPosZ); + tinGenerator.generate(world, random, new BlockPos(randPosX, randPosY, randPosZ)); } } } diff --git a/src/main/java/forestry/energy/EnergyManager.java b/src/main/java/forestry/energy/EnergyManager.java index 48e433baa..3aa0994f0 100644 --- a/src/main/java/forestry/energy/EnergyManager.java +++ b/src/main/java/forestry/energy/EnergyManager.java @@ -4,9 +4,7 @@ import java.io.IOException; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; - -import net.minecraftforge.common.util.ForgeDirection; - +import net.minecraft.util.EnumFacing; import forestry.api.core.ForestryAPI; import forestry.core.network.DataInputStreamForestry; import forestry.core.network.DataOutputStreamForestry; @@ -105,7 +103,7 @@ public class EnergyManager implements IEnergyHandler, IStreamable { /* IEnergyHandler */ @Override - public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate) { + public int receiveEnergy(EnumFacing from, int maxReceive, boolean simulate) { if (!canReceive()) { return 0; } @@ -113,7 +111,7 @@ public class EnergyManager implements IEnergyHandler, IStreamable { } @Override - public int extractEnergy(ForgeDirection from, int maxExtract, boolean simulate) { + public int extractEnergy(EnumFacing from, int maxExtract, boolean simulate) { if (!canExtract()) { return 0; } @@ -121,7 +119,7 @@ public class EnergyManager implements IEnergyHandler, IStreamable { } @Override - public int getEnergyStored(ForgeDirection from) { + public int getEnergyStored(EnumFacing from) { return energyStorage.getEnergyStored(); } @@ -130,7 +128,7 @@ public class EnergyManager implements IEnergyHandler, IStreamable { } @Override - public int getMaxEnergyStored(ForgeDirection from) { + public int getMaxEnergyStored(EnumFacing from) { return energyStorage.getMaxEnergyStored(); } @@ -143,7 +141,7 @@ public class EnergyManager implements IEnergyHandler, IStreamable { } @Override - public boolean canConnectEnergy(ForgeDirection from) { + public boolean canConnectEnergy(EnumFacing from) { return true; } @@ -165,7 +163,7 @@ public class EnergyManager implements IEnergyHandler, IStreamable { /** * @return whether this can send energy to the target tile */ - public boolean canSendEnergy(ForgeDirection orientation, TileEntity tile) { + public boolean canSendEnergy(EnumFacing orientation, TileEntity tile) { return sendEnergy(orientation, tile, Integer.MAX_VALUE, true) > 0; } @@ -175,7 +173,7 @@ public class EnergyManager implements IEnergyHandler, IStreamable { * * @return amount sent */ - public int sendEnergy(ForgeDirection orientation, TileEntity tile) { + public int sendEnergy(EnumFacing orientation, TileEntity tile) { return sendEnergy(orientation, tile, Integer.MAX_VALUE, false); } @@ -185,7 +183,7 @@ public class EnergyManager implements IEnergyHandler, IStreamable { * * @return amount sent */ - public int sendEnergy(ForgeDirection orientation, TileEntity tile, int amount, boolean simulate) { + public int sendEnergy(EnumFacing orientation, TileEntity tile, int amount, boolean simulate) { int sent = 0; if (BlockUtil.isEnergyReceiverOrEngine(orientation.getOpposite(), tile)) { int extractable = energyStorage.extractEnergy(amount, true); diff --git a/src/main/java/forestry/energy/blocks/BlockEngine.java b/src/main/java/forestry/energy/blocks/BlockEngine.java index 2741cede3..68282c506 100644 --- a/src/main/java/forestry/energy/blocks/BlockEngine.java +++ b/src/main/java/forestry/energy/blocks/BlockEngine.java @@ -15,63 +15,64 @@ import com.google.common.collect.ImmutableList; import java.util.EnumMap; import java.util.List; +import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.Vec3; import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; - import forestry.core.blocks.BlockBase; import forestry.core.tiles.TileEngine; import forestry.core.tiles.TileUtil; public class BlockEngine extends BlockBase { - private static final EnumMap> boundingBoxesForDirections = new EnumMap<>(ForgeDirection.class); + private static final EnumMap> boundingBoxesForDirections = new EnumMap<>(EnumFacing.class); static { - boundingBoxesForDirections.put(ForgeDirection.DOWN, ImmutableList.of( - AxisAlignedBB.getBoundingBox(0.0, 0.5, 0.0, 1.0, 1.0, 1.0), AxisAlignedBB.getBoundingBox(0.25, 0.0, 0.25, 0.75, 0.5, 0.75) + boundingBoxesForDirections.put(EnumFacing.DOWN, ImmutableList.of( + AxisAlignedBB.fromBounds(0.0, 0.5, 0.0, 1.0, 1.0, 1.0), AxisAlignedBB.fromBounds(0.25, 0.0, 0.25, 0.75, 0.5, 0.75) )); - boundingBoxesForDirections.put(ForgeDirection.UP, ImmutableList.of( - AxisAlignedBB.getBoundingBox(0.0, 0.0, 0.0, 1.0, 0.5, 1.0), AxisAlignedBB.getBoundingBox(0.25, 0.5, 0.25, 0.75, 1.0, 0.75) + boundingBoxesForDirections.put(EnumFacing.UP, ImmutableList.of( + AxisAlignedBB.fromBounds(0.0, 0.0, 0.0, 1.0, 0.5, 1.0), AxisAlignedBB.fromBounds(0.25, 0.5, 0.25, 0.75, 1.0, 0.75) )); - boundingBoxesForDirections.put(ForgeDirection.NORTH, ImmutableList.of( - AxisAlignedBB.getBoundingBox(0.0, 0.0, 0.5, 1.0, 1.0, 1.0), AxisAlignedBB.getBoundingBox(0.25, 0.25, 0.0, 0.75, 0.75, 0.5) + boundingBoxesForDirections.put(EnumFacing.NORTH, ImmutableList.of( + AxisAlignedBB.fromBounds(0.0, 0.0, 0.5, 1.0, 1.0, 1.0), AxisAlignedBB.fromBounds(0.25, 0.25, 0.0, 0.75, 0.75, 0.5) )); - boundingBoxesForDirections.put(ForgeDirection.SOUTH, ImmutableList.of( - AxisAlignedBB.getBoundingBox(0.0, 0.0, 0.0, 1.0, 1.0, 0.5), AxisAlignedBB.getBoundingBox(0.25, 0.25, 0.5, 0.75, 0.75, 1.0) + boundingBoxesForDirections.put(EnumFacing.SOUTH, ImmutableList.of( + AxisAlignedBB.fromBounds(0.0, 0.0, 0.0, 1.0, 1.0, 0.5), AxisAlignedBB.fromBounds(0.25, 0.25, 0.5, 0.75, 0.75, 1.0) )); - boundingBoxesForDirections.put(ForgeDirection.WEST, ImmutableList.of( - AxisAlignedBB.getBoundingBox(0.5, 0.0, 0.0, 1.0, 1.0, 1.0), AxisAlignedBB.getBoundingBox(0.0, 0.25, 0.25, 0.5, 0.75, 0.75) + boundingBoxesForDirections.put(EnumFacing.WEST, ImmutableList.of( + AxisAlignedBB.fromBounds(0.5, 0.0, 0.0, 1.0, 1.0, 1.0), AxisAlignedBB.fromBounds(0.0, 0.25, 0.25, 0.5, 0.75, 0.75) )); - boundingBoxesForDirections.put(ForgeDirection.EAST, ImmutableList.of( - AxisAlignedBB.getBoundingBox(0.0, 0.0, 0.0, 0.5, 1.0, 1.0), AxisAlignedBB.getBoundingBox(0.5, 0.25, 0.25, 1.0, 0.75, 0.75) + boundingBoxesForDirections.put(EnumFacing.EAST, ImmutableList.of( + AxisAlignedBB.fromBounds(0.0, 0.0, 0.0, 0.5, 1.0, 1.0), AxisAlignedBB.fromBounds(0.5, 0.25, 0.25, 1.0, 0.75, 0.75) )); } public BlockEngine() { - super(true); + super(true, BlockEngineType.class); } @Override @SuppressWarnings("unchecked") - public void addCollisionBoxesToList(World world, int x, int y, int z, AxisAlignedBB mask, List list, Entity colliding) { - TileEngine tile = TileUtil.getTile(world, x, y, z, TileEngine.class); + public void addCollisionBoxesToList(World world, BlockPos pos, IBlockState state, AxisAlignedBB mask, List list, Entity collidingEntity) { + TileEngine tile = TileUtil.getTile(world, pos, TileEngine.class); if (tile == null) { - super.addCollisionBoxesToList(world, x, y, z, mask, list, colliding); + super.addCollisionBoxesToList(world, pos, state, mask, list, collidingEntity); return; } - ForgeDirection orientation = tile.getOrientation(); + EnumFacing orientation = tile.getOrientation(); List boundingBoxes = boundingBoxesForDirections.get(orientation); if (boundingBoxes == null) { return; } for (AxisAlignedBB boundingBoxBase : boundingBoxes) { - AxisAlignedBB boundingBox = boundingBoxBase.getOffsetBoundingBox(x, y, z); + AxisAlignedBB boundingBox = boundingBoxBase.offset(pos.getX(), pos.getY(), pos.getZ()); if (mask.intersectsWith(boundingBox)) { list.add(boundingBox); } @@ -79,33 +80,35 @@ public class BlockEngine extends BlockBase { } @Override - public MovingObjectPosition collisionRayTrace(World world, int x, int y, int z, Vec3 origin, Vec3 direction) { - TileEngine tile = TileUtil.getTile(world, x, y, z, TileEngine.class); + public MovingObjectPosition collisionRayTrace(World world, BlockPos pos, Vec3 start, Vec3 end) { + TileEngine tile = TileUtil.getTile(world, pos, TileEngine.class); if (tile == null) { - return super.collisionRayTrace(world, x, y, z, origin, direction); + return super.collisionRayTrace(world, pos, start, end); } - ForgeDirection orientation = tile.getOrientation(); + EnumFacing orientation = tile.getOrientation(); List boundingBoxes = boundingBoxesForDirections.get(orientation); if (boundingBoxes == null) { - return super.collisionRayTrace(world, x, y, z, origin, direction); + return super.collisionRayTrace(world, pos, start, end); } MovingObjectPosition nearestIntersection = null; for (AxisAlignedBB boundingBoxBase : boundingBoxes) { - AxisAlignedBB boundingBox = boundingBoxBase.getOffsetBoundingBox(x, y, z); - MovingObjectPosition intersection = boundingBox.calculateIntercept(origin, direction); + AxisAlignedBB boundingBox = boundingBoxBase.offset(pos.getX(), pos.getY(), pos.getZ()); + MovingObjectPosition intersection = boundingBox.calculateIntercept(start, end); if (intersection != null) { - if (nearestIntersection == null || (intersection.hitVec.distanceTo(origin) < nearestIntersection.hitVec.distanceTo(origin))) { + if (nearestIntersection == null || (intersection.hitVec.distanceTo(start) < nearestIntersection.hitVec.distanceTo(start))) { nearestIntersection = intersection; } } } if (nearestIntersection != null) { - nearestIntersection.blockX = x; - nearestIntersection.blockY = y; - nearestIntersection.blockZ = z; + Object hitInfo = nearestIntersection.hitInfo; + Entity entityHit = nearestIntersection.entityHit; + nearestIntersection = new MovingObjectPosition(nearestIntersection.typeOfHit, nearestIntersection.hitVec, nearestIntersection.sideHit, pos); + nearestIntersection.hitInfo = hitInfo; + nearestIntersection.entityHit = entityHit; } return nearestIntersection; diff --git a/src/main/java/forestry/energy/blocks/BlockEngineType.java b/src/main/java/forestry/energy/blocks/BlockEngineType.java index dd8506473..5c04cbc55 100644 --- a/src/main/java/forestry/energy/blocks/BlockEngineType.java +++ b/src/main/java/forestry/energy/blocks/BlockEngineType.java @@ -10,10 +10,11 @@ ******************************************************************************/ package forestry.energy.blocks; +import java.util.Locale; + import forestry.core.blocks.IMachinePropertiesTESR; import forestry.core.config.Constants; import forestry.core.proxy.Proxies; -import forestry.core.render.IBlockRenderer; import forestry.core.tiles.TileForestry; import forestry.energy.tiles.TileEngineBiogas; import forestry.energy.tiles.TileEngineClockwork; @@ -21,6 +22,7 @@ import forestry.energy.tiles.TileEngineElectric; import forestry.energy.tiles.TileEnginePeat; import forestry.energy.tiles.TileGenerator; import forestry.plugins.PluginEnergy; +import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; public enum BlockEngineType implements IMachinePropertiesTESR { ELECTRIC(TileEngineElectric.class, "EngineTin", "/engine_tin_"), @@ -28,7 +30,7 @@ public enum BlockEngineType implements IMachinePropertiesTESR { BIOGAS(TileEngineBiogas.class, "EngineBronze", "/engine_bronze_"), GENERATOR(TileGenerator.class, "Generator", "/generator_") { @Override - public IBlockRenderer getRenderer() { + public TileEntitySpecialRenderer getRenderer() { return Proxies.render.getRenderDefaultMachine(texturePath); } }, @@ -62,7 +64,12 @@ public enum BlockEngineType implements IMachinePropertiesTESR { } @Override - public IBlockRenderer getRenderer() { + public TileEntitySpecialRenderer getRenderer() { return PluginEnergy.proxy.getRenderDefaultEngine(texturePath); } + + @Override + public String getName() { + return name().toLowerCase(Locale.ENGLISH); + } } diff --git a/src/main/java/forestry/energy/gui/GuiEngine.java b/src/main/java/forestry/energy/gui/GuiEngine.java index a75ecfae3..5e6e3d335 100755 --- a/src/main/java/forestry/energy/gui/GuiEngine.java +++ b/src/main/java/forestry/energy/gui/GuiEngine.java @@ -44,7 +44,7 @@ public abstract class GuiEngine exten drawBackground(x, y); // Draw icon - drawIcon(TextureManager.getInstance().getDefault("misc/energy"), x + 3, y + 4); + drawSprite(TextureManager.getInstance().getDefault("misc/energy"), x + 3, y + 4); if (!isFullyOpened()) { return; diff --git a/src/main/java/forestry/energy/inventory/InventoryEnginePeat.java b/src/main/java/forestry/energy/inventory/InventoryEnginePeat.java index baa2c3b4e..3982755d2 100644 --- a/src/main/java/forestry/energy/inventory/InventoryEnginePeat.java +++ b/src/main/java/forestry/energy/inventory/InventoryEnginePeat.java @@ -11,7 +11,7 @@ package forestry.energy.inventory; import net.minecraft.item.ItemStack; - +import net.minecraft.util.EnumFacing; import forestry.api.fuels.FuelManager; import forestry.core.inventory.InventoryAdapterTile; import forestry.core.utils.SlotUtil; @@ -32,7 +32,7 @@ public class InventoryEnginePeat extends InventoryAdapterTile { } @Override - public boolean canExtractItem(int slotIndex, ItemStack itemstack, int side) { + public boolean canExtractItem(int slotIndex, ItemStack itemstack, EnumFacing side) { return SlotUtil.isSlotInRange(slotIndex, SLOT_WASTE_1, SLOT_WASTE_COUNT); } } diff --git a/src/main/java/forestry/energy/proxy/ProxyEnergy.java b/src/main/java/forestry/energy/proxy/ProxyEnergy.java index 23ce67da2..219bd0bfb 100755 --- a/src/main/java/forestry/energy/proxy/ProxyEnergy.java +++ b/src/main/java/forestry/energy/proxy/ProxyEnergy.java @@ -10,10 +10,11 @@ ******************************************************************************/ package forestry.energy.proxy; -import forestry.core.render.IBlockRenderer; +import forestry.core.tiles.TileEngine; +import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; public class ProxyEnergy { - public IBlockRenderer getRenderDefaultEngine(String gfxBase) { + public TileEntitySpecialRenderer getRenderDefaultEngine(String gfxBase) { return null; } } diff --git a/src/main/java/forestry/energy/proxy/ProxyEnergyClient.java b/src/main/java/forestry/energy/proxy/ProxyEnergyClient.java index 20e9fd89a..7aa25601d 100644 --- a/src/main/java/forestry/energy/proxy/ProxyEnergyClient.java +++ b/src/main/java/forestry/energy/proxy/ProxyEnergyClient.java @@ -10,12 +10,14 @@ ******************************************************************************/ package forestry.energy.proxy; -import forestry.core.render.IBlockRenderer; +import forestry.core.tiles.TileEngine; import forestry.energy.render.RenderEngine; +import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; public class ProxyEnergyClient extends ProxyEnergy { - public IBlockRenderer getRenderDefaultEngine(String gfxBase) { + @Override + public TileEntitySpecialRenderer getRenderDefaultEngine(String gfxBase) { return new RenderEngine(gfxBase); } diff --git a/src/main/java/forestry/energy/render/RenderEngine.java b/src/main/java/forestry/energy/render/RenderEngine.java index 4a9537047..c3026ffe3 100755 --- a/src/main/java/forestry/energy/render/RenderEngine.java +++ b/src/main/java/forestry/energy/render/RenderEngine.java @@ -13,22 +13,19 @@ package forestry.energy.render; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.common.util.ForgeDirection; - import org.lwjgl.opengl.GL11; import forestry.core.config.Constants; import forestry.core.proxy.Proxies; import forestry.core.render.ForestryResource; -import forestry.core.render.IBlockRenderer; import forestry.core.tiles.TemperatureState; import forestry.core.tiles.TileEngine; import forestry.core.utils.Log; -public class RenderEngine extends TileEntitySpecialRenderer implements IBlockRenderer { +public class RenderEngine extends TileEntitySpecialRenderer { private final ModelBase model = new ModelBase() { }; @@ -46,12 +43,12 @@ public class RenderEngine extends TileEntitySpecialRenderer implements IBlockRen private static final float[] angleMap = new float[6]; static { - angleMap[ForgeDirection.EAST.ordinal()] = (float) -Math.PI / 2; - angleMap[ForgeDirection.WEST.ordinal()] = (float) Math.PI / 2; - angleMap[ForgeDirection.UP.ordinal()] = 0; - angleMap[ForgeDirection.DOWN.ordinal()] = (float) Math.PI; - angleMap[ForgeDirection.SOUTH.ordinal()] = (float) Math.PI / 2; - angleMap[ForgeDirection.NORTH.ordinal()] = (float) -Math.PI / 2; + angleMap[EnumFacing.EAST.ordinal()] = (float) -Math.PI / 2; + angleMap[EnumFacing.WEST.ordinal()] = (float) Math.PI / 2; + angleMap[EnumFacing.UP.ordinal()] = 0; + angleMap[EnumFacing.DOWN.ordinal()] = (float) Math.PI; + angleMap[EnumFacing.SOUTH.ordinal()] = (float) Math.PI / 2; + angleMap[EnumFacing.NORTH.ordinal()] = (float) -Math.PI / 2; } public RenderEngine() { @@ -93,23 +90,22 @@ public class RenderEngine extends TileEntitySpecialRenderer implements IBlockRen new ForestryResource(Constants.TEXTURE_PATH_BLOCKS + "/engine_trunk_medium.png"), new ForestryResource(Constants.TEXTURE_PATH_BLOCKS + "/engine_trunk_low.png"),}; } - + @Override - public void inventoryRender(double x, double y, double z) { - render(TemperatureState.COOL, 0.25F, ForgeDirection.UP, x, y, z); - } - - @Override - public void renderTileEntityAt(TileEntity tile, double d, double d1, double d2, float f) { - if (tile instanceof TileEngine) { - TileEngine tileEngine = (TileEngine) tile; - render(tileEngine.getTemperatureState(), tileEngine.progress, tileEngine.getOrientation(), d, d1, d2); - } else { - Log.severe("Tried to render a tile entity that is not an engine: " + tile); + public void renderTileEntityAt(TileEngine engine, double x, double y, double z, float partialTicks, int destroyStage) { + if(engine != null){ + if (engine instanceof TileEngine) { + TileEngine tileEngine = engine; + render(tileEngine.getTemperatureState(), tileEngine.progress, tileEngine.getOrientation(), x, y, z); + } else { + Log.severe("Tried to render a tile entity that is not an engine: " + engine); + } + }else{ + render(TemperatureState.COOL, 0.25F, EnumFacing.UP, x, y, z); } } - private void render(TemperatureState state, float progress, ForgeDirection orientation, double x, double y, double z) { + private void render(TemperatureState state, float progress, EnumFacing orientation, double x, double y, double z) { GL11.glPushMatrix(); GL11.glPushAttrib(GL11.GL_ENABLE_BIT); @@ -131,7 +127,7 @@ public class RenderEngine extends TileEntitySpecialRenderer implements IBlockRen float tfactor = step / 16; float[] angle = {0, 0, 0}; - float[] translate = {orientation.offsetX, orientation.offsetY, orientation.offsetZ}; + float[] translate = {orientation.getFrontOffsetX(), orientation.getFrontOffsetY(), orientation.getFrontOffsetZ()}; switch (orientation) { case EAST: diff --git a/src/main/java/forestry/energy/tiles/EngineDefinition.java b/src/main/java/forestry/energy/tiles/EngineDefinition.java index 23b74d231..96af16bed 100644 --- a/src/main/java/forestry/energy/tiles/EngineDefinition.java +++ b/src/main/java/forestry/energy/tiles/EngineDefinition.java @@ -10,6 +10,8 @@ ******************************************************************************/ package forestry.energy.tiles; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; import forestry.core.blocks.IMachinePropertiesTESR; @@ -24,12 +26,12 @@ public class EngineDefinition extends MachineDefinition { } @Override - public boolean isSolidOnSide(IBlockAccess world, int x, int y, int z, int side) { - TileEngine tile = TileUtil.getTile(world, x, y, z, TileEngine.class); + public boolean isSolidOnSide(IBlockAccess world, BlockPos pos, EnumFacing side) { + TileEngine tile = TileUtil.getTile(world, pos, TileEngine.class); if (tile == null) { return false; } - return tile.getOrientation().getOpposite().ordinal() == side; + return tile.getOrientation().getOpposite() == side; } } diff --git a/src/main/java/forestry/energy/tiles/TileEngineBiogas.java b/src/main/java/forestry/energy/tiles/TileEngineBiogas.java index d986b536b..7362d87fc 100644 --- a/src/main/java/forestry/energy/tiles/TileEngineBiogas.java +++ b/src/main/java/forestry/energy/tiles/TileEngineBiogas.java @@ -17,8 +17,7 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.ICrafting; import net.minecraft.inventory.ISidedInventory; import net.minecraft.nbt.NBTTagCompound; - -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; @@ -306,32 +305,32 @@ public class TileEngineBiogas extends TileEngine implements ISidedInventory, ILi // IFluidHandler @Override - public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { + public int fill(EnumFacing from, FluidStack resource, boolean doFill) { return tankManager.fill(from, resource, doFill); } @Override - public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) { + public FluidStack drain(EnumFacing from, FluidStack resource, boolean doDrain) { return tankManager.drain(from, resource, doDrain); } @Override - public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) { + public FluidStack drain(EnumFacing from, int maxDrain, boolean doDrain) { return tankManager.drain(from, maxDrain, doDrain); } @Override - public boolean canFill(ForgeDirection from, Fluid fluid) { + public boolean canFill(EnumFacing from, Fluid fluid) { return tankManager.canFill(from, fluid); } @Override - public boolean canDrain(ForgeDirection from, Fluid fluid) { + public boolean canDrain(EnumFacing from, Fluid fluid) { return tankManager.canDrain(from, fluid); } @Override - public FluidTankInfo[] getTankInfo(ForgeDirection from) { + public FluidTankInfo[] getTankInfo(EnumFacing from) { return tankManager.getTankInfo(from); } diff --git a/src/main/java/forestry/energy/tiles/TileEngineElectric.java b/src/main/java/forestry/energy/tiles/TileEngineElectric.java index d74f10a82..fe4b672f6 100644 --- a/src/main/java/forestry/energy/tiles/TileEngineElectric.java +++ b/src/main/java/forestry/energy/tiles/TileEngineElectric.java @@ -31,7 +31,6 @@ import forestry.core.tiles.TileEngine; import forestry.energy.gui.ContainerEngineElectric; import forestry.energy.gui.GuiEngineElectric; import forestry.plugins.compat.PluginIC2; - import ic2.api.energy.prefab.BasicSink; public class TileEngineElectric extends TileEngine implements ISocketable, IInventory { @@ -157,7 +156,7 @@ public class TileEngineElectric extends TileEngine implements ISocketable, IInve return; } - ic2EnergySink.updateEntity(); + ic2EnergySink.update(); super.updateServerSide(); diff --git a/src/main/java/forestry/energy/tiles/TileEnginePeat.java b/src/main/java/forestry/energy/tiles/TileEnginePeat.java index c58bfbe3d..96cabf3a4 100644 --- a/src/main/java/forestry/energy/tiles/TileEnginePeat.java +++ b/src/main/java/forestry/energy/tiles/TileEnginePeat.java @@ -22,12 +22,8 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; - -import net.minecraftforge.common.util.ForgeDirection; - -import cpw.mods.fml.common.Optional; -import cpw.mods.fml.common.registry.GameData; - +import net.minecraft.util.EnumFacing; +import net.minecraftforge.fml.common.Optional; import forestry.api.fuels.FuelManager; import forestry.core.config.Constants; import forestry.core.errors.EnumErrorCode; @@ -37,6 +33,7 @@ import forestry.core.inventory.wrappers.InventoryMapper; import forestry.core.tiles.TemperatureState; import forestry.core.tiles.TileEngine; import forestry.core.utils.InventoryUtil; +import forestry.core.utils.ItemStackUtil; import forestry.energy.gui.ContainerEnginePeat; import forestry.energy.gui.GuiEnginePeat; import forestry.energy.inventory.InventoryEnginePeat; @@ -274,7 +271,7 @@ public class TileEnginePeat extends TileEngine implements ISidedInventory { String fuelItemName = nbttagcompound.getString("EngineFuelItem"); if (!fuelItemName.isEmpty()) { - fuelItem = GameData.getItemRegistry().getRaw(fuelItemName); + fuelItem = ItemStackUtil.getItemFromRegistry(fuelItemName); } fuelItemMeta = nbttagcompound.getInteger("EngineFuelMeta"); @@ -290,7 +287,7 @@ public class TileEnginePeat extends TileEngine implements ISidedInventory { super.writeToNBT(nbttagcompound); if (fuelItem != null) { - nbttagcompound.setString("EngineFuelItem", GameData.getItemRegistry().getNameForObject(fuelItem)); + nbttagcompound.setString("EngineFuelItem", ItemStackUtil.getItemNameFromRegistryAsSting(fuelItem)); } nbttagcompound.setInteger("EngineFuelMeta", fuelItemMeta); @@ -334,7 +331,7 @@ public class TileEnginePeat extends TileEngine implements ISidedInventory { /* ITriggerProvider */ @Optional.Method(modid = "BuildCraftAPI|statements") @Override - public Collection getExternalTriggers(ForgeDirection side, TileEntity tile) { + public Collection getExternalTriggers(EnumFacing side, TileEntity tile) { LinkedList res = new LinkedList<>(); res.add(FactoryTriggers.lowFuel25); res.add(FactoryTriggers.lowFuel10); diff --git a/src/main/java/forestry/energy/tiles/TileGenerator.java b/src/main/java/forestry/energy/tiles/TileGenerator.java index 90a7a7cad..499f4c4df 100644 --- a/src/main/java/forestry/energy/tiles/TileGenerator.java +++ b/src/main/java/forestry/energy/tiles/TileGenerator.java @@ -17,8 +17,7 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.ICrafting; import net.minecraft.inventory.ISidedInventory; import net.minecraft.nbt.NBTTagCompound; - -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; @@ -42,7 +41,6 @@ import forestry.energy.gui.ContainerGenerator; import forestry.energy.gui.GuiGenerator; import forestry.energy.inventory.InventoryGenerator; import forestry.plugins.compat.PluginIC2; - import ic2.api.energy.prefab.BasicSource; public class TileGenerator extends TileBase implements ISidedInventory, ILiquidTankTile, IFluidHandler, IRenderableTile { @@ -133,7 +131,7 @@ public class TileGenerator extends TileBase implements ISidedInventory, ILiquidT return; } - ic2EnergySource.updateEntity(); + ic2EnergySource.update(); if (resourceTank.getFluidAmount() > 0) { GeneratorFuel fuel = FuelManager.generatorFuel.get(resourceTank.getFluid().getFluid()); @@ -196,7 +194,7 @@ public class TileGenerator extends TileBase implements ISidedInventory, ILiquidT /* ILiquidTankTile */ @Override - public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { + public int fill(EnumFacing from, FluidStack resource, boolean doFill) { return tankManager.fill(from, resource, doFill); } @@ -206,27 +204,27 @@ public class TileGenerator extends TileBase implements ISidedInventory, ILiquidT } @Override - public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) { + public FluidStack drain(EnumFacing from, FluidStack resource, boolean doDrain) { return tankManager.drain(from, resource, doDrain); } @Override - public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) { + public FluidStack drain(EnumFacing from, int maxDrain, boolean doDrain) { return tankManager.drain(from, maxDrain, doDrain); } @Override - public boolean canFill(ForgeDirection from, Fluid fluid) { + public boolean canFill(EnumFacing from, Fluid fluid) { return tankManager.canFill(from, fluid); } @Override - public boolean canDrain(ForgeDirection from, Fluid fluid) { + public boolean canDrain(EnumFacing from, Fluid fluid) { return tankManager.canDrain(from, fluid); } @Override - public FluidTankInfo[] getTankInfo(ForgeDirection from) { + public FluidTankInfo[] getTankInfo(EnumFacing from) { return tankManager.getTankInfo(from); } diff --git a/src/main/java/forestry/factory/blocks/BlockFactoryPlain.java b/src/main/java/forestry/factory/blocks/BlockFactoryPlain.java index 344a60426..463309dcc 100644 --- a/src/main/java/forestry/factory/blocks/BlockFactoryPlain.java +++ b/src/main/java/forestry/factory/blocks/BlockFactoryPlain.java @@ -14,6 +14,6 @@ import forestry.core.blocks.BlockBase; public class BlockFactoryPlain extends BlockBase { public BlockFactoryPlain() { - super(); + super(BlockFactoryPlainType.class); } } diff --git a/src/main/java/forestry/factory/blocks/BlockFactoryPlainType.java b/src/main/java/forestry/factory/blocks/BlockFactoryPlainType.java index 14b52f4cd..366704037 100644 --- a/src/main/java/forestry/factory/blocks/BlockFactoryPlainType.java +++ b/src/main/java/forestry/factory/blocks/BlockFactoryPlainType.java @@ -50,4 +50,9 @@ public enum BlockFactoryPlainType implements IMachineProperties { public Class getTeClass() { return teClass; } + + @Override + public String getName() { + return name().toLowerCase(Locale.ENGLISH); + } } diff --git a/src/main/java/forestry/factory/blocks/BlockFactoryTESR.java b/src/main/java/forestry/factory/blocks/BlockFactoryTESR.java index 219166525..b142b1618 100644 --- a/src/main/java/forestry/factory/blocks/BlockFactoryTESR.java +++ b/src/main/java/forestry/factory/blocks/BlockFactoryTESR.java @@ -14,6 +14,6 @@ import forestry.core.blocks.BlockBase; public class BlockFactoryTESR extends BlockBase { public BlockFactoryTESR() { - super(true); + super(true, BlockFactoryTesrType.class); } } diff --git a/src/main/java/forestry/factory/blocks/BlockFactoryTesrType.java b/src/main/java/forestry/factory/blocks/BlockFactoryTesrType.java index f9bf618f8..705835c06 100644 --- a/src/main/java/forestry/factory/blocks/BlockFactoryTesrType.java +++ b/src/main/java/forestry/factory/blocks/BlockFactoryTesrType.java @@ -17,7 +17,6 @@ import org.apache.commons.lang3.text.WordUtils; import forestry.core.blocks.IMachinePropertiesTESR; import forestry.core.config.Constants; import forestry.core.proxy.Proxies; -import forestry.core.render.IBlockRenderer; import forestry.core.tiles.TileForestry; import forestry.factory.tiles.TileBottler; import forestry.factory.tiles.TileCarpenter; @@ -27,6 +26,7 @@ import forestry.factory.tiles.TileMillRainmaker; import forestry.factory.tiles.TileMoistener; import forestry.factory.tiles.TileSqueezer; import forestry.factory.tiles.TileStill; +import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; public enum BlockFactoryTesrType implements IMachinePropertiesTESR { BOTTLER(TileBottler.class), @@ -38,7 +38,7 @@ public enum BlockFactoryTesrType implements IMachinePropertiesTESR { STILL(TileStill.class), RAINMAKER(TileMillRainmaker.class) { @Override - public IBlockRenderer getRenderer() { + public TileEntitySpecialRenderer getRenderer() { return Proxies.render.getRenderMill(Constants.TEXTURE_PATH_BLOCKS + "/rainmaker_"); } }; @@ -72,7 +72,12 @@ public enum BlockFactoryTesrType implements IMachinePropertiesTESR { } @Override - public IBlockRenderer getRenderer() { + public TileEntitySpecialRenderer getRenderer() { return Proxies.render.getRenderDefaultMachine(Constants.TEXTURE_PATH_BLOCKS + "/" + name + "_"); } + + @Override + public String getName() { + return name().toLowerCase(Locale.ENGLISH); + } } diff --git a/src/main/java/forestry/factory/gui/widgets/MemorizedRecipeSlot.java b/src/main/java/forestry/factory/gui/widgets/MemorizedRecipeSlot.java index 98dd674a0..1b909c869 100644 --- a/src/main/java/forestry/factory/gui/widgets/MemorizedRecipeSlot.java +++ b/src/main/java/forestry/factory/gui/widgets/MemorizedRecipeSlot.java @@ -10,21 +10,20 @@ ******************************************************************************/ package forestry.factory.gui.widgets; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; - import org.lwjgl.opengl.GL11; import forestry.core.gui.widgets.ItemStackWidgetBase; import forestry.core.gui.widgets.WidgetManager; import forestry.core.proxy.Proxies; -import forestry.core.render.SpriteSheet; import forestry.core.render.TextureManager; import forestry.factory.gui.ContainerWorktable; import forestry.factory.recipes.RecipeMemory; public class MemorizedRecipeSlot extends ItemStackWidgetBase { - private static final IIcon lockIcon = TextureManager.getInstance().getDefault("slots/locked"); + private static final TextureAtlasSprite lockIcon = TextureManager.getInstance().getDefault("slots/locked"); private final RecipeMemory recipeMemory; private final int slotNumber; @@ -50,8 +49,8 @@ public class MemorizedRecipeSlot extends ItemStackWidgetBase { if (recipeMemory.isLocked(slotNumber)) { manager.gui.setZLevel(110f); - Proxies.render.bindTexture(SpriteSheet.ITEMS); - manager.gui.drawTexturedModelRectFromIcon(startX + xPos, startY + yPos, lockIcon, 16, 16); + Proxies.render.bindTexture(TextureMap.locationBlocksTexture); + manager.gui.drawTexturedModalRect(startX + xPos, startY + yPos, lockIcon, 16, 16); manager.gui.setZLevel(0f); } diff --git a/src/main/java/forestry/factory/inventory/InventoryBottler.java b/src/main/java/forestry/factory/inventory/InventoryBottler.java index 6540b0226..c0941370f 100644 --- a/src/main/java/forestry/factory/inventory/InventoryBottler.java +++ b/src/main/java/forestry/factory/inventory/InventoryBottler.java @@ -11,7 +11,7 @@ package forestry.factory.inventory; import net.minecraft.item.ItemStack; - +import net.minecraft.util.EnumFacing; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; @@ -40,7 +40,7 @@ public class InventoryBottler extends InventoryAdapterTile { } @Override - public boolean canExtractItem(int slotIndex, ItemStack itemstack, int side) { + public boolean canExtractItem(int slotIndex, ItemStack itemstack, EnumFacing side) { return slotIndex == SLOT_OUTPUT; } } diff --git a/src/main/java/forestry/factory/inventory/InventoryCarpenter.java b/src/main/java/forestry/factory/inventory/InventoryCarpenter.java index 5c4b2f5c7..35caecf60 100644 --- a/src/main/java/forestry/factory/inventory/InventoryCarpenter.java +++ b/src/main/java/forestry/factory/inventory/InventoryCarpenter.java @@ -11,7 +11,7 @@ package forestry.factory.inventory; import net.minecraft.item.ItemStack; - +import net.minecraft.util.EnumFacing; import net.minecraftforge.fluids.Fluid; import forestry.core.fluids.FluidHelper; @@ -47,7 +47,7 @@ public class InventoryCarpenter extends InventoryAdapterTile { } @Override - public boolean canExtractItem(int slotIndex, ItemStack itemstack, int side) { + public boolean canExtractItem(int slotIndex, ItemStack itemstack, EnumFacing side) { return slotIndex == SLOT_PRODUCT; } } diff --git a/src/main/java/forestry/factory/inventory/InventoryCentrifuge.java b/src/main/java/forestry/factory/inventory/InventoryCentrifuge.java index e011ecaec..ed551e742 100644 --- a/src/main/java/forestry/factory/inventory/InventoryCentrifuge.java +++ b/src/main/java/forestry/factory/inventory/InventoryCentrifuge.java @@ -11,7 +11,7 @@ package forestry.factory.inventory; import net.minecraft.item.ItemStack; - +import net.minecraft.util.EnumFacing; import forestry.core.inventory.InventoryAdapterTile; import forestry.core.utils.SlotUtil; import forestry.factory.recipes.CentrifugeRecipeManager; @@ -32,7 +32,7 @@ public class InventoryCentrifuge extends InventoryAdapterTile { } @Override - public boolean canExtractItem(int slotIndex, ItemStack itemstack, int side) { + public boolean canExtractItem(int slotIndex, ItemStack itemstack, EnumFacing side) { return SlotUtil.isSlotInRange(slotIndex, SLOT_PRODUCT_1, SLOT_PRODUCT_COUNT); } } diff --git a/src/main/java/forestry/factory/inventory/InventoryFabricator.java b/src/main/java/forestry/factory/inventory/InventoryFabricator.java index 365d9b284..fe3d987a0 100644 --- a/src/main/java/forestry/factory/inventory/InventoryFabricator.java +++ b/src/main/java/forestry/factory/inventory/InventoryFabricator.java @@ -11,7 +11,7 @@ package forestry.factory.inventory; import net.minecraft.item.ItemStack; - +import net.minecraft.util.EnumFacing; import forestry.core.inventory.InventoryAdapterTile; import forestry.core.utils.SlotUtil; import forestry.factory.recipes.FabricatorRecipeManager; @@ -51,7 +51,7 @@ public class InventoryFabricator extends InventoryAdapterTile { } @Override - public boolean canExtractItem(int slotIndex, ItemStack stack, int side) { + public boolean canExtractItem(int slotIndex, ItemStack stack, EnumFacing side) { return slotIndex == SLOT_RESULT; } } diff --git a/src/main/java/forestry/factory/inventory/InventoryFermenter.java b/src/main/java/forestry/factory/inventory/InventoryFermenter.java index 2dfeb7052..37886acf1 100644 --- a/src/main/java/forestry/factory/inventory/InventoryFermenter.java +++ b/src/main/java/forestry/factory/inventory/InventoryFermenter.java @@ -11,7 +11,7 @@ package forestry.factory.inventory; import net.minecraft.item.ItemStack; - +import net.minecraft.util.EnumFacing; import net.minecraftforge.fluids.Fluid; import forestry.api.fuels.FuelManager; @@ -47,7 +47,7 @@ public class InventoryFermenter extends InventoryAdapterTile { } @Override - public boolean canExtractItem(int slotIndex, ItemStack itemstack, int side) { + public boolean canExtractItem(int slotIndex, ItemStack itemstack, EnumFacing side) { return slotIndex == SLOT_CAN_OUTPUT; } } diff --git a/src/main/java/forestry/factory/inventory/InventoryMoistener.java b/src/main/java/forestry/factory/inventory/InventoryMoistener.java index 238665ca3..f2ae3c607 100644 --- a/src/main/java/forestry/factory/inventory/InventoryMoistener.java +++ b/src/main/java/forestry/factory/inventory/InventoryMoistener.java @@ -11,7 +11,7 @@ package forestry.factory.inventory; import net.minecraft.item.ItemStack; - +import net.minecraft.util.EnumFacing; import net.minecraftforge.fluids.Fluid; import forestry.api.fuels.FuelManager; @@ -53,7 +53,7 @@ public class InventoryMoistener extends InventoryAdapterTile { } @Override - public boolean canExtractItem(int slotIndex, ItemStack itemstack, int side) { + public boolean canExtractItem(int slotIndex, ItemStack itemstack, EnumFacing side) { if (slotIndex == SLOT_PRODUCT) { return true; } diff --git a/src/main/java/forestry/factory/inventory/InventoryRaintank.java b/src/main/java/forestry/factory/inventory/InventoryRaintank.java index 95cc99c55..4a201c872 100644 --- a/src/main/java/forestry/factory/inventory/InventoryRaintank.java +++ b/src/main/java/forestry/factory/inventory/InventoryRaintank.java @@ -11,7 +11,7 @@ package forestry.factory.inventory; import net.minecraft.item.ItemStack; - +import net.minecraft.util.EnumFacing; import forestry.core.fluids.FluidHelper; import forestry.core.fluids.Fluids; import forestry.core.inventory.InventoryAdapterTile; @@ -34,7 +34,7 @@ public class InventoryRaintank extends InventoryAdapterTile { } @Override - public boolean canExtractItem(int slotIndex, ItemStack itemstack, int side) { + public boolean canExtractItem(int slotIndex, ItemStack itemstack, EnumFacing side) { return slotIndex == SLOT_PRODUCT; } } diff --git a/src/main/java/forestry/factory/inventory/InventorySqueezer.java b/src/main/java/forestry/factory/inventory/InventorySqueezer.java index ff704745d..6be3c7949 100644 --- a/src/main/java/forestry/factory/inventory/InventorySqueezer.java +++ b/src/main/java/forestry/factory/inventory/InventorySqueezer.java @@ -13,7 +13,7 @@ package forestry.factory.inventory; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; - +import net.minecraft.util.EnumFacing; import net.minecraftforge.fluids.FluidStack; import forestry.core.fluids.FluidHelper; @@ -56,7 +56,7 @@ public class InventorySqueezer extends InventoryAdapterTile { } @Override - public boolean canExtractItem(int slotIndex, ItemStack itemstack, int side) { + public boolean canExtractItem(int slotIndex, ItemStack itemstack, EnumFacing side) { return slotIndex == SLOT_REMNANT || slotIndex == SLOT_CAN_OUTPUT; } diff --git a/src/main/java/forestry/factory/inventory/InventoryStill.java b/src/main/java/forestry/factory/inventory/InventoryStill.java index f3aecd28c..223f593b4 100644 --- a/src/main/java/forestry/factory/inventory/InventoryStill.java +++ b/src/main/java/forestry/factory/inventory/InventoryStill.java @@ -11,7 +11,7 @@ package forestry.factory.inventory; import net.minecraft.item.ItemStack; - +import net.minecraft.util.EnumFacing; import net.minecraftforge.fluids.Fluid; import forestry.core.fluids.FluidHelper; @@ -39,7 +39,7 @@ public class InventoryStill extends InventoryAdapterTile { } @Override - public boolean canExtractItem(int slotIndex, ItemStack itemstack, int side) { + public boolean canExtractItem(int slotIndex, ItemStack itemstack, EnumFacing side) { return slotIndex == SLOT_PRODUCT; } } diff --git a/src/main/java/forestry/factory/network/PacketRegistryFactory.java b/src/main/java/forestry/factory/network/PacketRegistryFactory.java index e88b97323..ec0e0e46f 100644 --- a/src/main/java/forestry/factory/network/PacketRegistryFactory.java +++ b/src/main/java/forestry/factory/network/PacketRegistryFactory.java @@ -12,13 +12,11 @@ package forestry.factory.network; import forestry.core.network.PacketRegistry; import forestry.factory.network.packets.PacketWorktableMemoryUpdate; -import forestry.factory.network.packets.PacketWorktableNEISelect; import forestry.factory.network.packets.PacketWorktableRecipeUpdate; public class PacketRegistryFactory extends PacketRegistry { @Override public void registerPackets() { - registerServerPacket(new PacketWorktableNEISelect()); registerClientPacket(new PacketWorktableMemoryUpdate()); registerClientPacket(new PacketWorktableRecipeUpdate()); diff --git a/src/main/java/forestry/factory/network/packets/PacketWorktableNEISelect.java b/src/main/java/forestry/factory/network/packets/PacketWorktableNEISelect.java deleted file mode 100644 index 653069e17..000000000 --- a/src/main/java/forestry/factory/network/packets/PacketWorktableNEISelect.java +++ /dev/null @@ -1,45 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v3 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: - * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges - ******************************************************************************/ -package forestry.factory.network.packets; - -import java.io.IOException; - -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.nbt.NBTTagCompound; - -import forestry.core.gui.slots.SlotCraftMatrix; -import forestry.core.network.DataInputStreamForestry; -import forestry.core.network.IForestryPacketServer; -import forestry.core.network.PacketIdServer; -import forestry.core.network.packets.PacketNBT; -import forestry.core.recipes.nei.SetRecipeCommandHandler; -import forestry.factory.gui.ContainerWorktable; - -public class PacketWorktableNEISelect extends PacketNBT implements IForestryPacketServer { - private static final SetRecipeCommandHandler worktableNEISelectHandler = new SetRecipeCommandHandler(ContainerWorktable.class, SlotCraftMatrix.class); - - public PacketWorktableNEISelect() { - } - - public PacketWorktableNEISelect(NBTTagCompound nbttagcompound) { - super(nbttagcompound); - } - - @Override - public void onPacketData(DataInputStreamForestry data, EntityPlayerMP player) throws IOException { - worktableNEISelectHandler.handle(getTagCompound(), player); - } - - @Override - public PacketIdServer getPacketId() { - return PacketIdServer.WORKTABLE_NEI_SELECT; - } -} diff --git a/src/main/java/forestry/factory/recipes/CarpenterRecipe.java b/src/main/java/forestry/factory/recipes/CarpenterRecipe.java index c3d443f21..939e26761 100644 --- a/src/main/java/forestry/factory/recipes/CarpenterRecipe.java +++ b/src/main/java/forestry/factory/recipes/CarpenterRecipe.java @@ -36,6 +36,7 @@ public class CarpenterRecipe implements ICarpenterRecipe { this.internal = internal; } + @Override public int getPackagingTime() { return packagingTime; } diff --git a/src/main/java/forestry/factory/recipes/FabricatorRecipe.java b/src/main/java/forestry/factory/recipes/FabricatorRecipe.java index 898938e3c..5fe7cff45 100644 --- a/src/main/java/forestry/factory/recipes/FabricatorRecipe.java +++ b/src/main/java/forestry/factory/recipes/FabricatorRecipe.java @@ -12,15 +12,12 @@ package forestry.factory.recipes; import javax.annotation.Nullable; -import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; import forestry.api.recipes.IFabricatorRecipe; -import forestry.core.recipes.RecipeUtil; import forestry.core.recipes.ShapedRecipeCustom; -import forestry.core.utils.ItemStackUtil; public class FabricatorRecipe implements IFabricatorRecipe { @@ -38,16 +35,6 @@ public class FabricatorRecipe implements IFabricatorRecipe { this.internal = internal; } - @Override - @Deprecated - public boolean matches(@Nullable ItemStack plan, ItemStack[][] resources) { - if (this.plan != null && !ItemStackUtil.isCraftingEquivalent(this.plan, plan)) { - return false; - } - - return RecipeUtil.matches(internal.getIngredients(), internal.getWidth(), internal.getHeight(), resources); - } - @Override public Object[] getIngredients() { return internal.getIngredients(); @@ -63,11 +50,6 @@ public class FabricatorRecipe implements IFabricatorRecipe { return internal.getHeight(); } - @Override - public boolean preservesNbt() { - return false; - } - @Override @Nullable public ItemStack getPlan() { @@ -79,11 +61,6 @@ public class FabricatorRecipe implements IFabricatorRecipe { return molten; } - @Override - public ItemStack getCraftingResult(IInventory craftingInventory) { - return internal.getRecipeOutput().copy(); - } - @Override public ItemStack getRecipeOutput() { return internal.getRecipeOutput(); diff --git a/src/main/java/forestry/factory/recipes/FabricatorSmeltingRecipe.java b/src/main/java/forestry/factory/recipes/FabricatorSmeltingRecipe.java index c446720c0..796c30a47 100644 --- a/src/main/java/forestry/factory/recipes/FabricatorSmeltingRecipe.java +++ b/src/main/java/forestry/factory/recipes/FabricatorSmeltingRecipe.java @@ -35,14 +35,17 @@ public class FabricatorSmeltingRecipe implements IFabricatorSmeltingRecipe { this.meltingPoint = meltingPoint; } + @Override public ItemStack getResource() { return resource; } + @Override public FluidStack getProduct() { return product; } + @Override public int getMeltingPoint() { return meltingPoint; } diff --git a/src/main/java/forestry/factory/recipes/MoistenerRecipe.java b/src/main/java/forestry/factory/recipes/MoistenerRecipe.java index 21a56c14d..81fd5c5a9 100644 --- a/src/main/java/forestry/factory/recipes/MoistenerRecipe.java +++ b/src/main/java/forestry/factory/recipes/MoistenerRecipe.java @@ -26,14 +26,17 @@ public class MoistenerRecipe implements IMoistenerRecipe { this.product = product; } + @Override public int getTimePerItem() { return timePerItem; } + @Override public ItemStack getResource() { return resource; } + @Override public ItemStack getProduct() { return product; } diff --git a/src/main/java/forestry/factory/recipes/jei/bottler/BottlerRecipeCategory.java b/src/main/java/forestry/factory/recipes/jei/bottler/BottlerRecipeCategory.java new file mode 100644 index 000000000..254579855 --- /dev/null +++ b/src/main/java/forestry/factory/recipes/jei/bottler/BottlerRecipeCategory.java @@ -0,0 +1,69 @@ +package forestry.factory.recipes.jei.bottler; + +import javax.annotation.Nonnull; + +import forestry.core.recipes.jei.ForestryRecipeCategory; +import forestry.core.recipes.jei.ForestryRecipeCategoryUid; +import mezz.jei.api.IGuiHelper; +import mezz.jei.api.gui.IDrawable; +import mezz.jei.api.gui.IDrawableAnimated; +import mezz.jei.api.gui.IDrawableStatic; +import mezz.jei.api.gui.IGuiFluidStackGroup; +import mezz.jei.api.gui.IGuiItemStackGroup; +import mezz.jei.api.gui.IRecipeLayout; +import mezz.jei.api.recipe.IRecipeWrapper; +import net.minecraft.client.Minecraft; +import net.minecraft.util.ResourceLocation; + +public class BottlerRecipeCategory extends ForestryRecipeCategory{ + + private static final int emptySlot = 0; + private static final int outputSlot = 1; + private static final int inputTank = 2; + + private final static ResourceLocation guiTexture = new ResourceLocation("forestry", "textures/gui/bottler.png"); + @Nonnull + protected final IDrawableAnimated arrow; + @Nonnull + protected final IDrawable tankOverlay; + + public BottlerRecipeCategory(IGuiHelper guiHelper) { + super(guiHelper.createDrawable(guiTexture, 48, 11, 123, 65), "tile.for.factory.0.name"); + + IDrawableStatic arrowDrawable = guiHelper.createDrawable(guiTexture, 176, 74, 24, 17); + this.arrow = guiHelper.createAnimatedDrawable(arrowDrawable, 200, IDrawableAnimated.StartDirection.LEFT, false); + this.tankOverlay = guiHelper.createDrawable(guiTexture, 176, 0, 16, 58); + } + + @Override + public String getUid() { + return ForestryRecipeCategoryUid.BOTTLER; + } + + @Override + public void drawExtras(Minecraft minecraft) { + + } + + @Override + public void drawAnimations(Minecraft minecraft) { + arrow.draw(minecraft, 32, 28); + } + + @Override + public void setRecipe(IRecipeLayout recipeLayout, IRecipeWrapper recipeWrapper) { + IGuiItemStackGroup guiItemStacks = recipeLayout.getItemStacks(); + IGuiFluidStackGroup guiFluidStacks = recipeLayout.getFluidStacks(); + + guiItemStacks.init(emptySlot, true, 67, 7); + guiItemStacks.init(outputSlot, false, 67, 43); + + guiFluidStacks.init(inputTank, true, 5, 6, 16, 58, 10000, false, tankOverlay); + + guiItemStacks.set(emptySlot, recipeWrapper.getInputs()); + guiItemStacks.set(outputSlot, recipeWrapper.getOutputs()); + + guiFluidStacks.set(inputTank, recipeWrapper.getFluidInputs()); + } + +} diff --git a/src/main/java/forestry/factory/recipes/jei/bottler/BottlerRecipeHandler.java b/src/main/java/forestry/factory/recipes/jei/bottler/BottlerRecipeHandler.java new file mode 100644 index 000000000..7a7aeadc4 --- /dev/null +++ b/src/main/java/forestry/factory/recipes/jei/bottler/BottlerRecipeHandler.java @@ -0,0 +1,41 @@ +package forestry.factory.recipes.jei.bottler; + +import javax.annotation.Nonnull; + +import forestry.core.recipes.jei.ForestryRecipeCategoryUid; +import forestry.factory.recipes.BottlerRecipe; +import mezz.jei.api.recipe.IRecipeHandler; +import mezz.jei.api.recipe.IRecipeWrapper; + +public class BottlerRecipeHandler implements IRecipeHandler { + + @Nonnull + @Override + public Class getRecipeClass() { + return BottlerRecipeWrapper.class; + } + + @Nonnull + @Override + public String getRecipeCategoryUid() { + return ForestryRecipeCategoryUid.BOTTLER; + } + + @Override + public IRecipeWrapper getRecipeWrapper(@Nonnull BottlerRecipeWrapper recipe) { + return recipe; + } + + @Override + public boolean isRecipeValid(@Nonnull BottlerRecipeWrapper wrapper) { + BottlerRecipe recipe = wrapper.getRecipe(); + if(recipe.input == null || recipe.input.amount <= 0){ + return false; + } + if(recipe.empty == null){ + return false; + } + return recipe.input != null; + } + +} diff --git a/src/main/java/forestry/factory/recipes/jei/bottler/BottlerRecipeMaker.java b/src/main/java/forestry/factory/recipes/jei/bottler/BottlerRecipeMaker.java new file mode 100644 index 000000000..203a9f434 --- /dev/null +++ b/src/main/java/forestry/factory/recipes/jei/bottler/BottlerRecipeMaker.java @@ -0,0 +1,26 @@ +package forestry.factory.recipes.jei.bottler; + +import java.util.ArrayList; +import java.util.List; + +import forestry.factory.recipes.BottlerRecipe; +import net.minecraftforge.fluids.FluidContainerRegistry; +import net.minecraftforge.fluids.FluidContainerRegistry.FluidContainerData; + +public class BottlerRecipeMaker { + + private BottlerRecipeMaker() { + } + + public static List getBottlerRecipes() { + List recipes = new ArrayList<>(); + for (FluidContainerData container : FluidContainerRegistry.getRegisteredFluidContainerData()) { + BottlerRecipe recipe = BottlerRecipe.getRecipe(container.fluid, container.emptyContainer); + if (recipe != null) { + recipes.add(new BottlerRecipeWrapper(recipe)); + } + } + return recipes; + } + +} diff --git a/src/main/java/forestry/factory/recipes/jei/bottler/BottlerRecipeWrapper.java b/src/main/java/forestry/factory/recipes/jei/bottler/BottlerRecipeWrapper.java new file mode 100644 index 000000000..d64438a2f --- /dev/null +++ b/src/main/java/forestry/factory/recipes/jei/bottler/BottlerRecipeWrapper.java @@ -0,0 +1,31 @@ +package forestry.factory.recipes.jei.bottler; + +import java.util.Collections; +import java.util.List; + +import forestry.core.recipes.jei.ForestryRecipeWrapper; +import forestry.factory.recipes.BottlerRecipe; +import net.minecraftforge.fluids.FluidStack; + +public class BottlerRecipeWrapper extends ForestryRecipeWrapper { + + public BottlerRecipeWrapper(BottlerRecipe recipe) { + super(recipe); + } + + @Override + public List getFluidInputs() { + return Collections.singletonList(recipe.input); + } + + @Override + public List getInputs() { + return Collections.singletonList(recipe.empty); + } + + @Override + public List getOutputs() { + return Collections.singletonList(recipe.filled); + } + +} diff --git a/src/main/java/forestry/factory/recipes/jei/carpenter/CarpenterRecipeCategory.java b/src/main/java/forestry/factory/recipes/jei/carpenter/CarpenterRecipeCategory.java new file mode 100644 index 000000000..277ead835 --- /dev/null +++ b/src/main/java/forestry/factory/recipes/jei/carpenter/CarpenterRecipeCategory.java @@ -0,0 +1,94 @@ +package forestry.factory.recipes.jei.carpenter; + +import java.util.ArrayList; +import java.util.List; + +import javax.annotation.Nonnull; + +import forestry.core.recipes.jei.ForestryRecipeCategory; +import forestry.core.recipes.jei.ForestryRecipeCategoryUid; +import mezz.jei.api.IGuiHelper; +import mezz.jei.api.gui.ICraftingGridHelper; +import mezz.jei.api.gui.IDrawable; +import mezz.jei.api.gui.IDrawableAnimated; +import mezz.jei.api.gui.IDrawableStatic; +import mezz.jei.api.gui.IGuiFluidStackGroup; +import mezz.jei.api.gui.IGuiItemStackGroup; +import mezz.jei.api.gui.IRecipeLayout; +import mezz.jei.api.recipe.IRecipeWrapper; +import net.minecraft.client.Minecraft; +import net.minecraft.util.ResourceLocation; + +public class CarpenterRecipeCategory extends ForestryRecipeCategory { + + private static final int boxSlot = 0; + private static final int craftOutputSlot = 1; + private static final int craftInputSlot = 2; + + private static final int inputTank = 0; + + private final static ResourceLocation guiTexture = new ResourceLocation("forestry", "textures/gui/carpenter.png"); + @Nonnull + private final ICraftingGridHelper craftingGridHelper; + @Nonnull + protected final IDrawableAnimated arrow; + @Nonnull + protected final IDrawable tankOverlay; + + public CarpenterRecipeCategory(IGuiHelper guiHelper) { + super(guiHelper.createDrawable(guiTexture, 9, 16, 158, 61), "tile.for.factory.1.name"); + + craftingGridHelper = guiHelper.createCraftingGridHelper(craftInputSlot, craftOutputSlot); + IDrawableStatic arrowDrawable = guiHelper.createDrawable(guiTexture, 176, 59, 4, 17); + this.arrow = guiHelper.createAnimatedDrawable(arrowDrawable, 200, IDrawableAnimated.StartDirection.BOTTOM, false); + this.tankOverlay = guiHelper.createDrawable(guiTexture, 176, 0, 16, 58); + } + + @Nonnull + @Override + public String getUid() { + return ForestryRecipeCategoryUid.CARPENTER; + } + + @Override + public void drawExtras(Minecraft minecraft) { + } + + @Override + public void drawAnimations(Minecraft minecraft) { + arrow.draw(minecraft, 89, 34); + } + + @Override + public void setRecipe(IRecipeLayout recipeLayout, IRecipeWrapper recipeWrapper) { + IGuiItemStackGroup guiItemStacks = recipeLayout.getItemStacks(); + IGuiFluidStackGroup guiFluidStacks = recipeLayout.getFluidStacks(); + + guiItemStacks.init(boxSlot, true, 73, 3); + + guiItemStacks.init(craftOutputSlot, false, 70, 34); + + for (int y = 0; y < 3; ++y) { + for (int x = 0; x < 3; ++x) { + int index = craftInputSlot + x + (y * 3); + guiItemStacks.init(index, true, x * 18, 3 + y * 18); + } + } + + guiFluidStacks.init(inputTank, true, 141, 1, 16, 58, 10000, false, tankOverlay); + + CarpenterRecipeWrapper wrapper = (CarpenterRecipeWrapper) recipeWrapper; + guiItemStacks.set(boxSlot, wrapper.getRecipe().getBox()); + + craftingGridHelper.setOutput(guiItemStacks, wrapper.getOutputs()); + List inputs = new ArrayList<>(); + for(Object ingredient : wrapper.getRecipe().getCraftingGridRecipe().getIngredients()){ + inputs.add(ingredient); + } + craftingGridHelper.setInput(guiItemStacks, inputs, wrapper.getRecipe().getCraftingGridRecipe().getWidth(), wrapper.getRecipe().getCraftingGridRecipe().getHeight()); + + guiFluidStacks.set(inputTank, wrapper.getFluidInputs()); + + } + +} diff --git a/src/main/java/forestry/factory/recipes/jei/carpenter/CarpenterRecipeHandler.java b/src/main/java/forestry/factory/recipes/jei/carpenter/CarpenterRecipeHandler.java new file mode 100644 index 000000000..e1e4e972b --- /dev/null +++ b/src/main/java/forestry/factory/recipes/jei/carpenter/CarpenterRecipeHandler.java @@ -0,0 +1,45 @@ +package forestry.factory.recipes.jei.carpenter; + +import javax.annotation.Nonnull; + +import forestry.api.recipes.ICarpenterRecipe; +import forestry.core.recipes.jei.ForestryRecipeCategoryUid; +import mezz.jei.api.recipe.IRecipeHandler; +import mezz.jei.api.recipe.IRecipeWrapper; + +public class CarpenterRecipeHandler implements IRecipeHandler { + + @Nonnull + @Override + public Class getRecipeClass() { + return CarpenterRecipeWrapper.class; + } + + @Nonnull + @Override + public String getRecipeCategoryUid() { + return ForestryRecipeCategoryUid.CARPENTER; + } + + @Override + public IRecipeWrapper getRecipeWrapper(CarpenterRecipeWrapper recipe) { + return recipe; + } + + @Override + public boolean isRecipeValid(CarpenterRecipeWrapper wrapper) { + ICarpenterRecipe recipe = wrapper.getRecipe(); + if(recipe.getPackagingTime() <= 0){ + return false; + } + if(recipe.getCraftingGridRecipe() == null || recipe.getCraftingGridRecipe().getIngredients() == null){ + return false; + } + int inputCount = 0; + for(Object ingredient : recipe.getCraftingGridRecipe().getIngredients()){ + inputCount++; + } + return inputCount > 0; + } + +} diff --git a/src/main/java/forestry/factory/recipes/jei/carpenter/CarpenterRecipeMaker.java b/src/main/java/forestry/factory/recipes/jei/carpenter/CarpenterRecipeMaker.java new file mode 100644 index 000000000..318c28f29 --- /dev/null +++ b/src/main/java/forestry/factory/recipes/jei/carpenter/CarpenterRecipeMaker.java @@ -0,0 +1,21 @@ +package forestry.factory.recipes.jei.carpenter; + +import java.util.ArrayList; +import java.util.List; + +import forestry.api.recipes.ICarpenterRecipe; +import forestry.api.recipes.RecipeManagers; + +public class CarpenterRecipeMaker { + + private CarpenterRecipeMaker() { + } + + public static List getCrapenterRecipes() { + List recipes = new ArrayList<>(); + for(ICarpenterRecipe recipe : RecipeManagers.carpenterManager.recipes()) + recipes.add(new CarpenterRecipeWrapper(recipe)); + return recipes; + } + +} diff --git a/src/main/java/forestry/factory/recipes/jei/carpenter/CarpenterRecipeWrapper.java b/src/main/java/forestry/factory/recipes/jei/carpenter/CarpenterRecipeWrapper.java new file mode 100644 index 000000000..310862ace --- /dev/null +++ b/src/main/java/forestry/factory/recipes/jei/carpenter/CarpenterRecipeWrapper.java @@ -0,0 +1,39 @@ +package forestry.factory.recipes.jei.carpenter; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import javax.annotation.Nonnull; + +import forestry.api.recipes.ICarpenterRecipe; +import forestry.core.recipes.jei.ForestryRecipeWrapper; +import net.minecraftforge.fluids.FluidStack; + +public class CarpenterRecipeWrapper extends ForestryRecipeWrapper{ + + public CarpenterRecipeWrapper(@Nonnull ICarpenterRecipe recipe) { + super(recipe); + } + + @Override + public List getInputs() { + List inputs = new ArrayList<>(); + for(Object ingredient : recipe.getCraftingGridRecipe().getIngredients()){ + inputs.add(ingredient); + } + inputs.add(recipe.getBox()); + return inputs; + } + + @Override + public List getFluidInputs() { + return Collections.singletonList(recipe.getFluidResource()); + } + + @Override + public List getOutputs() { + return Collections.singletonList(recipe.getCraftingGridRecipe().getRecipeOutput()); + } + +} diff --git a/src/main/java/forestry/factory/recipes/jei/centrifuge/CentrifugeRecipeCategory.java b/src/main/java/forestry/factory/recipes/jei/centrifuge/CentrifugeRecipeCategory.java new file mode 100644 index 000000000..d615468c8 --- /dev/null +++ b/src/main/java/forestry/factory/recipes/jei/centrifuge/CentrifugeRecipeCategory.java @@ -0,0 +1,101 @@ +package forestry.factory.recipes.jei.centrifuge; + +import java.util.Comparator; +import java.util.Map; +import java.util.PriorityQueue; +import java.util.Set; +import java.util.Map.Entry; + +import javax.annotation.Nonnull; + +import forestry.core.recipes.jei.ForestryRecipeCategory; +import forestry.core.recipes.jei.ForestryRecipeCategoryUid; +import mezz.jei.api.IGuiHelper; +import mezz.jei.api.gui.IDrawableAnimated; +import mezz.jei.api.gui.IDrawableStatic; +import mezz.jei.api.gui.IGuiItemStackGroup; +import mezz.jei.api.gui.IRecipeLayout; +import mezz.jei.api.recipe.IRecipeWrapper; +import mezz.jei.gui.ingredients.GuiItemStackGroup; +import net.minecraft.client.Minecraft; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; + +public class CentrifugeRecipeCategory extends ForestryRecipeCategory { + + public static final int[][] OUTPUTS = new int[][]{{0, 0}, {1, 0}, {2, 0}, {0, 1}, {1, 1}, {2, 1}, {0, 2}, {1, 2}, {2, 2}}; + + public static final Comparator> highestChanceComparator = new Comparator>() { + @Override + public int compare(Entry o1, Entry o2) { + return o2.getValue().compareTo(o1.getValue()); + } + }; + + private static final int inputSlot = 0; + private static final int outputSlot = 1; + + private final static ResourceLocation guiTexture = new ResourceLocation("forestry", "textures/gui/squeezersocket.png"); + @Nonnull + protected final IDrawableAnimated arrow; + + public CentrifugeRecipeCategory(IGuiHelper guiHelper) { + super(guiHelper.createDrawable(guiTexture, 5, 14, 166, 65), "tile.for.factory.2.name"); + + IDrawableStatic arrowDrawable = guiHelper.createDrawable(guiTexture, 176, 0, 4, 17); + this.arrow = guiHelper.createAnimatedDrawable(arrowDrawable, 200, IDrawableAnimated.StartDirection.LEFT, false); + } + + @Nonnull + @Override + public String getUid() { + return ForestryRecipeCategoryUid.CENTRIFUGE; + } + + @Override + public void drawExtras(Minecraft minecraft) { + } + + @Override + public void drawAnimations(Minecraft minecraft) { + arrow.draw(minecraft, 53, 25); + } + + @Override + public void setRecipe(IRecipeLayout recipeLayout, IRecipeWrapper recipeWrapper) { + super.setRecipe(recipeLayout, recipeWrapper); + IGuiItemStackGroup guiItemStacks = recipeLayout.getItemStacks(); + + guiItemStacks.init(inputSlot, true, 25, 26); + guiItemStacks.set(inputSlot, recipeWrapper.getInputs()); + CentrifugeRecipeWrapper centrifugeWrapper = (CentrifugeRecipeWrapper) recipeWrapper; + setResults(centrifugeWrapper.getRecipe().getAllProducts(), (GuiItemStackGroup) guiItemStacks); + guiItemStacks.addTooltipCallback(tooltip); + } + + private void setResults(Map outputs, GuiItemStackGroup guiItemStacks) { + Set> entrySet = outputs.entrySet(); + if (entrySet.size() == 0) { + return; + } + PriorityQueue> sortByChance = new PriorityQueue<>(entrySet.size(), highestChanceComparator); + sortByChance.addAll(entrySet); + + int i = 0; + float[] chances = new float[sortByChance.size()]; + while (!sortByChance.isEmpty()) { + Entry stack = sortByChance.poll(); + if (i >= OUTPUTS.length) { + return; + } + int x = 3 + OUTPUTS[i][0] * 18; + int y = 8 + OUTPUTS[i][1] * 18; + int ID = outputSlot + i; + guiItemStacks.init(ID, false, x, y); + guiItemStacks.set(ID, stack.getKey()); + tooltip.addChanceTooltip(ID, stack.getValue()); + i++; + } + } + +} diff --git a/src/main/java/forestry/factory/recipes/jei/centrifuge/CentrifugeRecipeHandler.java b/src/main/java/forestry/factory/recipes/jei/centrifuge/CentrifugeRecipeHandler.java new file mode 100644 index 000000000..b675ee749 --- /dev/null +++ b/src/main/java/forestry/factory/recipes/jei/centrifuge/CentrifugeRecipeHandler.java @@ -0,0 +1,46 @@ +package forestry.factory.recipes.jei.centrifuge; + +import javax.annotation.Nonnull; + +import forestry.api.recipes.ICentrifugeRecipe; +import forestry.core.recipes.jei.ForestryRecipeCategoryUid; +import mezz.jei.api.recipe.IRecipeHandler; +import mezz.jei.api.recipe.IRecipeWrapper; +import net.minecraft.item.ItemStack; + +public class CentrifugeRecipeHandler implements IRecipeHandler { + + @Nonnull + @Override + public Class getRecipeClass() { + return CentrifugeRecipeWrapper.class; + } + + @Nonnull + @Override + public String getRecipeCategoryUid() { + return ForestryRecipeCategoryUid.CENTRIFUGE; + } + + @Override + public IRecipeWrapper getRecipeWrapper(CentrifugeRecipeWrapper recipe) { + return recipe; + } + + @Override + public boolean isRecipeValid(CentrifugeRecipeWrapper wrapper){ + ICentrifugeRecipe recipe = wrapper.getRecipe(); + if(recipe.getProcessingTime() <= 0){ + return false; + } + if(recipe.getInput() == null){ + return false; + } + int inputCount = 0; + for(ItemStack ingredient : recipe.getAllProducts().keySet()){ + inputCount++; + } + return inputCount > 0; + } + +} diff --git a/src/main/java/forestry/factory/recipes/jei/centrifuge/CentrifugeRecipeMaker.java b/src/main/java/forestry/factory/recipes/jei/centrifuge/CentrifugeRecipeMaker.java new file mode 100644 index 000000000..ac7a27f44 --- /dev/null +++ b/src/main/java/forestry/factory/recipes/jei/centrifuge/CentrifugeRecipeMaker.java @@ -0,0 +1,21 @@ +package forestry.factory.recipes.jei.centrifuge; + +import java.util.ArrayList; +import java.util.List; + +import forestry.api.recipes.ICentrifugeRecipe; +import forestry.api.recipes.RecipeManagers; + +public class CentrifugeRecipeMaker { + + private CentrifugeRecipeMaker() { + } + + public static List getCentrifugeRecipe() { + List recipes = new ArrayList<>(); + for(ICentrifugeRecipe recipe : RecipeManagers.centrifugeManager.recipes()) + recipes.add(new CentrifugeRecipeWrapper(recipe)); + return recipes; + } + +} diff --git a/src/main/java/forestry/factory/recipes/jei/centrifuge/CentrifugeRecipeWrapper.java b/src/main/java/forestry/factory/recipes/jei/centrifuge/CentrifugeRecipeWrapper.java new file mode 100644 index 000000000..3e122b5cc --- /dev/null +++ b/src/main/java/forestry/factory/recipes/jei/centrifuge/CentrifugeRecipeWrapper.java @@ -0,0 +1,26 @@ +package forestry.factory.recipes.jei.centrifuge; + +import java.util.Collections; +import java.util.List; +import javax.annotation.Nonnull; + +import forestry.api.recipes.ICentrifugeRecipe; +import forestry.core.recipes.jei.ForestryRecipeWrapper; + +public class CentrifugeRecipeWrapper extends ForestryRecipeWrapper{ + + public CentrifugeRecipeWrapper(@Nonnull ICentrifugeRecipe recipe) { + super(recipe); + } + + @Override + public List getInputs() { + return Collections.singletonList(recipe.getInput()); + } + + @Override + public List getOutputs() { + return Collections.singletonList(recipe.getAllProducts().keySet()); + } + +} diff --git a/src/main/java/forestry/factory/recipes/jei/fabricator/FabricatorRecipeCategory.java b/src/main/java/forestry/factory/recipes/jei/fabricator/FabricatorRecipeCategory.java new file mode 100644 index 000000000..91751df0e --- /dev/null +++ b/src/main/java/forestry/factory/recipes/jei/fabricator/FabricatorRecipeCategory.java @@ -0,0 +1,116 @@ +package forestry.factory.recipes.jei.fabricator; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import javax.annotation.Nonnull; + +import forestry.api.recipes.IFabricatorSmeltingRecipe; +import forestry.core.recipes.jei.ForestryRecipeCategory; +import forestry.core.recipes.jei.ForestryRecipeCategoryUid; +import forestry.factory.recipes.FabricatorSmeltingRecipeManager; +import mezz.jei.api.IGuiHelper; +import mezz.jei.api.gui.ICraftingGridHelper; +import mezz.jei.api.gui.IDrawable; +import mezz.jei.api.gui.IGuiFluidStackGroup; +import mezz.jei.api.gui.IGuiItemStackGroup; +import mezz.jei.api.gui.IRecipeLayout; +import mezz.jei.api.recipe.IRecipeWrapper; +import net.minecraft.client.Minecraft; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fluids.Fluid; + +public class FabricatorRecipeCategory extends ForestryRecipeCategory { + + private static final int planSlot = 0; + private static final int smeltingInputSlot = 1; + private static final int craftOutputSlot = 2; + private static final int craftInputSlot = 3; + + private static final int inputTank = 0; + + private final static ResourceLocation guiTexture = new ResourceLocation("forestry", "textures/gui/fabricator.png"); + @Nonnull + private final ICraftingGridHelper craftingGridHelper; + @Nonnull + protected final IDrawable tankOverlay; + + public FabricatorRecipeCategory(IGuiHelper guiHelper) { + super(guiHelper.createDrawable(guiTexture, 0, 0, 166, 65), "tile.for.factory2.0.name"); + + craftingGridHelper = guiHelper.createCraftingGridHelper(craftInputSlot, craftOutputSlot); + this.tankOverlay = guiHelper.createDrawable(guiTexture, 176, 0, 16, 58); + } + + @Nonnull + @Override + public String getUid() { + return ForestryRecipeCategoryUid.FABRICATOR; + } + + @Override + public void drawExtras(Minecraft minecraft) { + } + + @Override + public void drawAnimations(Minecraft minecraft) { + } + + @Override + public void setRecipe(IRecipeLayout recipeLayout, IRecipeWrapper recipeWrapper) { + IGuiItemStackGroup guiItemStacks = recipeLayout.getItemStacks(); + IGuiFluidStackGroup guiFluidStacks = recipeLayout.getFluidStacks(); + + guiItemStacks.init(planSlot, true, 134, 6); + + guiItemStacks.init(smeltingInputSlot, true, 21, 10); + + guiItemStacks.init(craftOutputSlot, false, 134, 42); + + for (int y = 0; y < 3; ++y) { + for (int x = 0; x < 3; ++x) { + int index = craftInputSlot + x + (y * 3); + guiItemStacks.init(index, true, 62 + x * 18, 6 + y * 18); + } + } + + guiFluidStacks.init(inputTank, true, 21, 37, 16, 16, 10000, false, tankOverlay); + + FabricatorRecipeWrapper wrapper = (FabricatorRecipeWrapper) recipeWrapper; + guiItemStacks.set(planSlot, wrapper.getRecipe().getPlan()); + + List smeltingInput = new ArrayList<>(); + for (IFabricatorSmeltingRecipe s : getSmeltingInputs().get(wrapper.getRecipe().getLiquid().getFluid())) { + smeltingInput.add(s.getResource()); + } + if (!smeltingInput.isEmpty()) { + guiItemStacks.set(smeltingInputSlot, smeltingInput); + } + + craftingGridHelper.setOutput(guiItemStacks, wrapper.getOutputs()); + List inputs = new ArrayList<>(); + for(Object ingredient : wrapper.getRecipe().getIngredients()){ + inputs.add(ingredient); + } + craftingGridHelper.setInput(guiItemStacks, inputs, wrapper.getRecipe().getWidth(), wrapper.getRecipe().getHeight()); + + guiFluidStacks.set(inputTank, wrapper.getFluidInputs()); + + } + + private static Map> getSmeltingInputs() { + Map> smeltingInputs = new HashMap<>(); + for (IFabricatorSmeltingRecipe smelting : FabricatorSmeltingRecipeManager.recipes) { + Fluid fluid = smelting.getProduct().getFluid(); + if (!smeltingInputs.containsKey(fluid)) { + smeltingInputs.put(fluid, new ArrayList()); + } + smeltingInputs.get(fluid).add(smelting); + } + return smeltingInputs; + } + +} diff --git a/src/main/java/forestry/factory/recipes/jei/fabricator/FabricatorRecipeHandler.java b/src/main/java/forestry/factory/recipes/jei/fabricator/FabricatorRecipeHandler.java new file mode 100644 index 000000000..007d54956 --- /dev/null +++ b/src/main/java/forestry/factory/recipes/jei/fabricator/FabricatorRecipeHandler.java @@ -0,0 +1,51 @@ +package forestry.factory.recipes.jei.fabricator; + +import javax.annotation.Nonnull; + +import forestry.api.recipes.IFabricatorRecipe; +import forestry.core.recipes.jei.ForestryRecipeCategoryUid; +import mezz.jei.api.recipe.IRecipeHandler; +import mezz.jei.api.recipe.IRecipeWrapper; + +public class FabricatorRecipeHandler implements IRecipeHandler { + + @Nonnull + @Override + public Class getRecipeClass() { + return FabricatorRecipeWrapper.class; + } + + @Nonnull + @Override + public String getRecipeCategoryUid() { + return ForestryRecipeCategoryUid.FABRICATOR; + } + + @Override + public IRecipeWrapper getRecipeWrapper(FabricatorRecipeWrapper recipe) { + return recipe; + } + + @Override + public boolean isRecipeValid(FabricatorRecipeWrapper wrapper) { + IFabricatorRecipe recipe = wrapper.getRecipe(); + if(recipe.getIngredients() == null){ + return false; + } + if(recipe.getPlan() == null){ + return false; + } + if(recipe.getLiquid() == null){ + return false; + } + if(recipe.getRecipeOutput() == null){ + return false; + } + int inputCount = 0; + for(Object ingredient : recipe.getIngredients()){ + inputCount++; + } + return inputCount > 0; + } + +} diff --git a/src/main/java/forestry/factory/recipes/jei/fabricator/FabricatorRecipeMaker.java b/src/main/java/forestry/factory/recipes/jei/fabricator/FabricatorRecipeMaker.java new file mode 100644 index 000000000..6515a8b11 --- /dev/null +++ b/src/main/java/forestry/factory/recipes/jei/fabricator/FabricatorRecipeMaker.java @@ -0,0 +1,21 @@ +package forestry.factory.recipes.jei.fabricator; + +import java.util.ArrayList; +import java.util.List; + +import forestry.api.recipes.IFabricatorRecipe; +import forestry.api.recipes.RecipeManagers; + +public class FabricatorRecipeMaker { + + private FabricatorRecipeMaker() { + } + + public static List getFabricatorRecipes() { + List recipes = new ArrayList<>(); + for(IFabricatorRecipe recipe : RecipeManagers.fabricatorManager.recipes()) + recipes.add(new FabricatorRecipeWrapper(recipe)); + return recipes; + } + +} diff --git a/src/main/java/forestry/factory/recipes/jei/fabricator/FabricatorRecipeWrapper.java b/src/main/java/forestry/factory/recipes/jei/fabricator/FabricatorRecipeWrapper.java new file mode 100644 index 000000000..953fea43a --- /dev/null +++ b/src/main/java/forestry/factory/recipes/jei/fabricator/FabricatorRecipeWrapper.java @@ -0,0 +1,38 @@ +package forestry.factory.recipes.jei.fabricator; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import javax.annotation.Nonnull; + +import forestry.api.recipes.IFabricatorRecipe; +import forestry.core.recipes.jei.ForestryRecipeWrapper; +import net.minecraftforge.fluids.FluidStack; + +public class FabricatorRecipeWrapper extends ForestryRecipeWrapper{ + + public FabricatorRecipeWrapper(@Nonnull IFabricatorRecipe recipe) { + super(recipe); + } + + @Override + public List getInputs() { + List inputs = new ArrayList<>(); + for(Object ingredient : recipe.getIngredients()){ + inputs.add(ingredient); + } + inputs.add(recipe.getPlan()); + return inputs; + } + + @Override + public List getFluidInputs() { + return Collections.singletonList(recipe.getLiquid()); + } + + @Override + public List getOutputs() { + return Collections.singletonList(recipe.getRecipeOutput()); + } + +} diff --git a/src/main/java/forestry/factory/recipes/jei/fermenter/FermenterRecipeCategory.java b/src/main/java/forestry/factory/recipes/jei/fermenter/FermenterRecipeCategory.java new file mode 100644 index 000000000..af4cc136f --- /dev/null +++ b/src/main/java/forestry/factory/recipes/jei/fermenter/FermenterRecipeCategory.java @@ -0,0 +1,91 @@ +package forestry.factory.recipes.jei.fermenter; + +import java.util.ArrayList; +import java.util.List; + +import javax.annotation.Nonnull; + +import forestry.api.fuels.FermenterFuel; +import forestry.api.fuels.FuelManager; +import forestry.core.recipes.jei.ForestryRecipeCategory; +import forestry.core.recipes.jei.ForestryRecipeCategoryUid; +import mezz.jei.api.IGuiHelper; +import mezz.jei.api.gui.IDrawable; +import mezz.jei.api.gui.IDrawableAnimated; +import mezz.jei.api.gui.IDrawableStatic; +import mezz.jei.api.gui.IGuiFluidStackGroup; +import mezz.jei.api.gui.IGuiItemStackGroup; +import mezz.jei.api.gui.IRecipeLayout; +import mezz.jei.api.recipe.IRecipeWrapper; +import net.minecraft.client.Minecraft; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; + +public class FermenterRecipeCategory extends ForestryRecipeCategory { + + private static final int resourceSlot = 0; + private static final int fuelSlot = 1; + + private static final int inputTank = 0; + private static final int outputTank = 1; + + private final static ResourceLocation guiTexture = new ResourceLocation("forestry", "textures/gui/fermenter.png"); + @Nonnull + protected final IDrawableAnimated progressBar0; + @Nonnull + protected final IDrawableAnimated progressBar1; + @Nonnull + protected final IDrawable tankOverlay; + + public FermenterRecipeCategory(IGuiHelper guiHelper) { + super(guiHelper.createDrawable(guiTexture, 30, 15, 116, 65), "tile.for.factory.3.name"); + + IDrawableStatic progressBarDrawable0 = guiHelper.createDrawable(guiTexture, 176, 60, 4, 18); + this.progressBar0 = guiHelper.createAnimatedDrawable(progressBarDrawable0, 40, IDrawableAnimated.StartDirection.BOTTOM, false); + IDrawableStatic progressBarDrawable1 = guiHelper.createDrawable(guiTexture, 176, 78, 4, 18); + this.progressBar1 = guiHelper.createAnimatedDrawable(progressBarDrawable1, 80, IDrawableAnimated.StartDirection.BOTTOM, false); + this.tankOverlay = guiHelper.createDrawable(guiTexture, 176, 0, 16, 58); + } + + @Nonnull + @Override + public String getUid() { + return ForestryRecipeCategoryUid.FERMENTER; + } + + @Override + public void drawExtras(Minecraft minecraft) { + } + + @Override + public void drawAnimations(Minecraft minecraft) { + progressBar0.draw(minecraft, 65, 17); + progressBar1.draw(minecraft, 89, 31); + } + + @Override + public void setRecipe(IRecipeLayout recipeLayout, IRecipeWrapper recipeWrapper) { + IGuiItemStackGroup guiItemStacks = recipeLayout.getItemStacks(); + IGuiFluidStackGroup guiFluidStacks = recipeLayout.getFluidStacks(); + + guiItemStacks.init(resourceSlot, true, 80, 8); + guiItemStacks.init(fuelSlot, true, 70, 42); + + guiFluidStacks.init(inputTank, true, 5, 4, 16, 58, 10000, false, tankOverlay); + guiFluidStacks.init(outputTank, false, 95, 4, 16, 58, 10000, false, tankOverlay); + + guiItemStacks.set(inputTank, recipeWrapper.getInputs()); + List fuels = new ArrayList<>(); + for (FermenterFuel fuel : FuelManager.fermenterFuel.values()) { + fuels.add(fuel.item); + } + guiItemStacks.set(fuelSlot, fuels); + + FermenterRecipeWrapper wrapper = (FermenterRecipeWrapper) recipeWrapper; + + guiFluidStacks.set(inputTank, wrapper.getFluidInputs()); + guiFluidStacks.set(outputTank, wrapper.getFluidOutputs()); + + } + +} diff --git a/src/main/java/forestry/factory/recipes/jei/fermenter/FermenterRecipeHandler.java b/src/main/java/forestry/factory/recipes/jei/fermenter/FermenterRecipeHandler.java new file mode 100644 index 000000000..f3baaa653 --- /dev/null +++ b/src/main/java/forestry/factory/recipes/jei/fermenter/FermenterRecipeHandler.java @@ -0,0 +1,47 @@ +package forestry.factory.recipes.jei.fermenter; + +import javax.annotation.Nonnull; + +import forestry.api.recipes.IFermenterRecipe; +import forestry.core.recipes.jei.ForestryRecipeCategoryUid; +import mezz.jei.api.recipe.IRecipeHandler; +import mezz.jei.api.recipe.IRecipeWrapper; + +public class FermenterRecipeHandler implements IRecipeHandler { + + @Nonnull + @Override + public Class getRecipeClass() { + return FermenterRecipeWrapper.class; + } + + @Nonnull + @Override + public String getRecipeCategoryUid() { + return ForestryRecipeCategoryUid.FERMENTER; + } + + @Override + public IRecipeWrapper getRecipeWrapper(FermenterRecipeWrapper recipe) { + return recipe; + } + + @Override + public boolean isRecipeValid(FermenterRecipeWrapper wrapper) { + IFermenterRecipe recipe = wrapper.getRecipe(); + if(recipe.getFermentationValue() <= 0){ + return false; + } + if(recipe.getModifier() <= 0 ){ + return false; + } + if(recipe.getFluidResource() == null){ + return false; + } + if(recipe.getResource() == null){ + return false; + } + return recipe.getOutput() != null; + } + +} diff --git a/src/main/java/forestry/factory/recipes/jei/fermenter/FermenterRecipeMaker.java b/src/main/java/forestry/factory/recipes/jei/fermenter/FermenterRecipeMaker.java new file mode 100644 index 000000000..bdd0bc3c5 --- /dev/null +++ b/src/main/java/forestry/factory/recipes/jei/fermenter/FermenterRecipeMaker.java @@ -0,0 +1,30 @@ +package forestry.factory.recipes.jei.fermenter; + +import java.util.ArrayList; +import java.util.List; + +import forestry.api.recipes.IFermenterRecipe; +import forestry.api.recipes.IVariableFermentable; +import forestry.api.recipes.RecipeManagers; +import forestry.core.recipes.jei.JEIUtils; +import net.minecraft.item.ItemStack; + +public class FermenterRecipeMaker { + + private FermenterRecipeMaker() { + } + + public static List getFermenterRecipes() { + List recipes = new ArrayList<>(); + for(IFermenterRecipe recipe : RecipeManagers.fermenterManager.recipes()){ + if (recipe.getResource() != null && recipe.getResource().getItem() instanceof IVariableFermentable) { + for (ItemStack stack : JEIUtils.getItemVariations(recipe.getResource())) { + recipes.add(new FermenterRecipeWrapper(recipe, stack)); + } + } + recipes.add(new FermenterRecipeWrapper(recipe, recipe.getResource())); + } + return recipes; + } + +} diff --git a/src/main/java/forestry/factory/recipes/jei/fermenter/FermenterRecipeWrapper.java b/src/main/java/forestry/factory/recipes/jei/fermenter/FermenterRecipeWrapper.java new file mode 100644 index 000000000..d4da9096c --- /dev/null +++ b/src/main/java/forestry/factory/recipes/jei/fermenter/FermenterRecipeWrapper.java @@ -0,0 +1,44 @@ +package forestry.factory.recipes.jei.fermenter; + +import java.util.Collections; +import java.util.List; + +import javax.annotation.Nonnull; + +import forestry.api.recipes.IFermenterRecipe; +import forestry.api.recipes.IVariableFermentable; +import forestry.core.recipes.jei.ForestryRecipeWrapper; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; + +public class FermenterRecipeWrapper extends ForestryRecipeWrapper{ + + @Nonnull + private final ItemStack fermentable; + + public FermenterRecipeWrapper(@Nonnull IFermenterRecipe recipe, @Nonnull ItemStack fermentable) { + super(recipe); + this.fermentable = fermentable; + } + + @Override + public List getInputs() { + return Collections.singletonList(fermentable); + } + + @Override + public List getFluidInputs() { + return Collections.singletonList(recipe.getFluidResource()); + } + + @Override + public List getFluidOutputs() { + int amount = Math.round(recipe.getFermentationValue() * recipe.getModifier()); + if (fermentable.getItem() instanceof IVariableFermentable) { + amount *= ((IVariableFermentable) fermentable.getItem()).getFermentationModifier(fermentable); + } + FluidStack output = new FluidStack(recipe.getOutput(), amount); + return Collections.singletonList(output); + } + +} diff --git a/src/main/java/forestry/factory/recipes/jei/moistener/MoistenerRecipeCategory.java b/src/main/java/forestry/factory/recipes/jei/moistener/MoistenerRecipeCategory.java new file mode 100644 index 000000000..e7017b0bf --- /dev/null +++ b/src/main/java/forestry/factory/recipes/jei/moistener/MoistenerRecipeCategory.java @@ -0,0 +1,86 @@ +package forestry.factory.recipes.jei.moistener; + +import javax.annotation.Nonnull; + +import forestry.core.recipes.jei.ForestryRecipeCategory; +import forestry.core.recipes.jei.ForestryRecipeCategoryUid; +import mezz.jei.api.IGuiHelper; +import mezz.jei.api.gui.IDrawable; +import mezz.jei.api.gui.IDrawableAnimated; +import mezz.jei.api.gui.IDrawableStatic; +import mezz.jei.api.gui.IGuiFluidStackGroup; +import mezz.jei.api.gui.IGuiItemStackGroup; +import mezz.jei.api.gui.IRecipeLayout; +import mezz.jei.api.recipe.IRecipeWrapper; +import net.minecraft.client.Minecraft; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fluids.FluidRegistry; + +public class MoistenerRecipeCategory extends ForestryRecipeCategory { + + private static final int resourceSlot = 0; + private static final int productSlot = 1; + private static final int fuelItemSlot = 2; + private static final int fuelProductSlot = 3; + + private static final int inputTank = 0; + + private final static ResourceLocation guiTexture = new ResourceLocation("forestry", "textures/gui/moistener.png"); + @Nonnull + protected final IDrawableAnimated arrow; + @Nonnull + protected final IDrawableAnimated progressBar; + @Nonnull + protected final IDrawable tankOverlay; + + public MoistenerRecipeCategory(IGuiHelper guiHelper) { + super(guiHelper.createDrawable(guiTexture, 9, 16, 158, 61), "tile.for.factory.4.name"); + + IDrawableStatic arrowDrawable = guiHelper.createDrawable(guiTexture, 176, 91, 29, 55); + this.arrow = guiHelper.createAnimatedDrawable(arrowDrawable, 80, IDrawableAnimated.StartDirection.BOTTOM, false); + IDrawableStatic progressBar = guiHelper.createDrawable(guiTexture, 176, 74, 16, 15); + this.progressBar = guiHelper.createAnimatedDrawable(progressBar, 160, IDrawableAnimated.StartDirection.BOTTOM, false); + this.tankOverlay = guiHelper.createDrawable(guiTexture, 176, 0, 16, 58); + } + + @Nonnull + @Override + public String getUid() { + return ForestryRecipeCategoryUid.MOISTENER; + } + + @Override + public void drawExtras(Minecraft minecraft) { + } + + @Override + public void drawAnimations(Minecraft minecraft) { + arrow.draw(minecraft, 88, 6); + progressBar.draw(minecraft, 119, 25); + } + + @Override + public void setRecipe(IRecipeLayout recipeLayout, IRecipeWrapper recipeWrapper) { + IGuiItemStackGroup guiItemStacks = recipeLayout.getItemStacks(); + IGuiFluidStackGroup guiFluidStacks = recipeLayout.getFluidStacks(); + + guiItemStacks.init(resourceSlot, true, 138, 8); + guiItemStacks.init(fuelItemSlot, true, 34, 47); + + guiItemStacks.init(productSlot, false, 138, 44); + guiItemStacks.init(fuelProductSlot, false, 100, 26); + + guiFluidStacks.init(inputTank, true, 11, 5, 16, 58, 10000, false, tankOverlay); + + MoistenerRecipeWrapper wrapper = (MoistenerRecipeWrapper) recipeWrapper; + guiItemStacks.set(resourceSlot, wrapper.getRecipe().getResource()); + guiItemStacks.set(fuelItemSlot, wrapper.getFuel().item); + + guiItemStacks.set(productSlot, wrapper.getRecipe().getProduct()); + guiItemStacks.set(fuelProductSlot, wrapper.getFuel().product); + + guiFluidStacks.set(inputTank, FluidRegistry.getFluidStack("water", 10000)); + + } + +} diff --git a/src/main/java/forestry/factory/recipes/jei/moistener/MoistenerRecipeHandler.java b/src/main/java/forestry/factory/recipes/jei/moistener/MoistenerRecipeHandler.java new file mode 100644 index 000000000..f5ab7aeac --- /dev/null +++ b/src/main/java/forestry/factory/recipes/jei/moistener/MoistenerRecipeHandler.java @@ -0,0 +1,44 @@ +package forestry.factory.recipes.jei.moistener; + +import javax.annotation.Nonnull; + +import forestry.api.recipes.IMoistenerRecipe; +import forestry.core.recipes.jei.ForestryRecipeCategoryUid; +import mezz.jei.api.recipe.IRecipeHandler; +import mezz.jei.api.recipe.IRecipeWrapper; + +public class MoistenerRecipeHandler implements IRecipeHandler { + + @Nonnull + @Override + public Class getRecipeClass() { + return MoistenerRecipeWrapper.class; + } + + @Nonnull + @Override + public String getRecipeCategoryUid() { + return ForestryRecipeCategoryUid.MOISTENER; + } + + @Override + public IRecipeWrapper getRecipeWrapper(MoistenerRecipeWrapper recipe) { + return recipe; + } + + @Override + public boolean isRecipeValid(MoistenerRecipeWrapper wrapper) { + IMoistenerRecipe recipe = wrapper.getRecipe(); + if(recipe.getTimePerItem() <= 0){ + return false; + } + if(recipe.getResource() == null){ + return false; + } + if(recipe.getProduct() == null){ + return false; + } + return wrapper.getFuel() != null || wrapper.getFuel().item != null|| wrapper.getFuel().product != null; + } + +} diff --git a/src/main/java/forestry/factory/recipes/jei/moistener/MoistenerRecipeMaker.java b/src/main/java/forestry/factory/recipes/jei/moistener/MoistenerRecipeMaker.java new file mode 100644 index 000000000..66cf94e9a --- /dev/null +++ b/src/main/java/forestry/factory/recipes/jei/moistener/MoistenerRecipeMaker.java @@ -0,0 +1,26 @@ +package forestry.factory.recipes.jei.moistener; + +import java.util.ArrayList; +import java.util.List; + +import forestry.api.fuels.FuelManager; +import forestry.api.fuels.MoistenerFuel; +import forestry.api.recipes.IMoistenerRecipe; +import forestry.api.recipes.RecipeManagers; + +public class MoistenerRecipeMaker { + + private MoistenerRecipeMaker() { + } + + public static List getMoistenerRecipes() { + List recipes = new ArrayList<>(); + for (IMoistenerRecipe recipe : RecipeManagers.moistenerManager.recipes()) { + for (MoistenerFuel fuel : FuelManager.moistenerResource.values()) { + recipes.add(new MoistenerRecipeWrapper(recipe, fuel)); + } + } + return recipes; + } + +} diff --git a/src/main/java/forestry/factory/recipes/jei/moistener/MoistenerRecipeWrapper.java b/src/main/java/forestry/factory/recipes/jei/moistener/MoistenerRecipeWrapper.java new file mode 100644 index 000000000..499d5555c --- /dev/null +++ b/src/main/java/forestry/factory/recipes/jei/moistener/MoistenerRecipeWrapper.java @@ -0,0 +1,45 @@ +package forestry.factory.recipes.jei.moistener; + +import java.util.ArrayList; +import java.util.List; + +import javax.annotation.Nonnull; + +import forestry.api.fuels.MoistenerFuel; +import forestry.api.recipes.IMoistenerRecipe; +import forestry.core.recipes.jei.ForestryRecipeWrapper; +import net.minecraft.item.ItemStack; + +public class MoistenerRecipeWrapper extends ForestryRecipeWrapper{ + + @Nonnull + private MoistenerFuel fuel; + + public MoistenerRecipeWrapper(@Nonnull IMoistenerRecipe recipe, MoistenerFuel fuel) { + super(recipe); + this.fuel = fuel; + } + + @Override + public List getInputs() { + List inputs = new ArrayList<>(); + inputs.add(recipe.getProduct()); + if(fuel.item != null) + inputs.add(fuel.item); + return inputs; + } + + @Override + public List getOutputs() { + List outputs = new ArrayList<>(); + outputs.add(recipe.getProduct()); + if(fuel.product != null) + outputs.add(fuel.product); + return outputs; + } + + public MoistenerFuel getFuel() { + return fuel; + } + +} diff --git a/src/main/java/forestry/factory/recipes/jei/squeezer/SqueezerContainerRecipeWrapper.java b/src/main/java/forestry/factory/recipes/jei/squeezer/SqueezerContainerRecipeWrapper.java new file mode 100644 index 000000000..107d7dc16 --- /dev/null +++ b/src/main/java/forestry/factory/recipes/jei/squeezer/SqueezerContainerRecipeWrapper.java @@ -0,0 +1,41 @@ +package forestry.factory.recipes.jei.squeezer; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import javax.annotation.Nonnull; + +import forestry.core.fluids.FluidHelper; +import forestry.core.recipes.jei.ForestryRecipeWrapper; +import forestry.factory.recipes.ISqueezerContainerRecipe; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; + +public class SqueezerContainerRecipeWrapper extends ForestryRecipeWrapper{ + + public SqueezerContainerRecipeWrapper(@Nonnull ISqueezerContainerRecipe recipe) { + super(recipe); + } + + @Override + public List getInputs() { + return FluidHelper.getAllFilledContainers(recipe.getEmptyContainer()); + } + + @Override + public List getFluidOutputs() { + List fluids = new ArrayList<>(); + for (ItemStack ingredient : FluidHelper.getAllFilledContainers(recipe.getEmptyContainer())) { + FluidStack fluidStack = FluidHelper.getFluidStackInContainer(ingredient); + fluids.add(fluidStack); + } + return fluids; + } + + @Override + public List getOutputs() { + return Collections.singletonList(recipe.getRemnants()); + } + +} diff --git a/src/main/java/forestry/factory/recipes/jei/squeezer/SqueezerRecipeCategory.java b/src/main/java/forestry/factory/recipes/jei/squeezer/SqueezerRecipeCategory.java new file mode 100644 index 000000000..b8afdc0e9 --- /dev/null +++ b/src/main/java/forestry/factory/recipes/jei/squeezer/SqueezerRecipeCategory.java @@ -0,0 +1,104 @@ +package forestry.factory.recipes.jei.squeezer; + +import java.util.List; + +import javax.annotation.Nonnull; + +import forestry.api.recipes.ISqueezerRecipe; +import forestry.core.recipes.jei.ForestryRecipeCategory; +import forestry.core.recipes.jei.ForestryRecipeWrapper; +import forestry.factory.recipes.ISqueezerContainerRecipe; +import mezz.jei.api.IGuiHelper; +import mezz.jei.api.gui.ICraftingGridHelper; +import mezz.jei.api.gui.IDrawable; +import mezz.jei.api.gui.IDrawableAnimated; +import mezz.jei.api.gui.IDrawableStatic; +import mezz.jei.api.gui.IGuiFluidStackGroup; +import mezz.jei.api.gui.IGuiItemStackGroup; +import mezz.jei.api.gui.IRecipeLayout; +import mezz.jei.api.recipe.IRecipeWrapper; +import net.minecraft.client.Minecraft; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; + +public class SqueezerRecipeCategory extends ForestryRecipeCategory { + + private static final int[][] INPUTS = new int[][]{{0, 0}, {1, 0}, {2, 0}, {0, 1}, {1, 1}, {2, 1}, {0, 2}, {1, 2}, {2, 2}}; + + private static final int craftOutputSlot = 0; + private static final int craftInputSlot = 1; + + private static final int outputTank = 0; + + private final static ResourceLocation guiTexture = new ResourceLocation("forestry", "textures/gui/squeezersocket.png"); + @Nonnull + private final ICraftingGridHelper craftingGridHelper; + @Nonnull + protected final IDrawableAnimated arrow; + @Nonnull + protected final IDrawable tankOverlay; + @Nonnull + protected final String UID; + + public SqueezerRecipeCategory(IGuiHelper guiHelper, String UID) { + super(guiHelper.createDrawable(guiTexture, 9, 16, 158, 61), "tile.for.factory.5.name"); + + craftingGridHelper = guiHelper.createCraftingGridHelper(craftInputSlot, craftOutputSlot); + IDrawableStatic arrowDrawable = guiHelper.createDrawable(guiTexture, 176, 59, 4, 17); + this.arrow = guiHelper.createAnimatedDrawable(arrowDrawable, 200, IDrawableAnimated.StartDirection.BOTTOM, false); + this.tankOverlay = guiHelper.createDrawable(guiTexture, 176, 60, 43, 18); + this.UID = UID; + } + + @Nonnull + @Override + public String getUid() { + return UID; + } + + @Override + public void drawExtras(Minecraft minecraft) { + } + + @Override + public void drawAnimations(Minecraft minecraft) { + arrow.draw(minecraft, 70, 30); + } + + @Override + public void setRecipe(IRecipeLayout recipeLayout, IRecipeWrapper recipeWrapper) { + super.setRecipe(recipeLayout, recipeWrapper); + IGuiItemStackGroup guiItemStacks = recipeLayout.getItemStacks(); + IGuiFluidStackGroup guiFluidStacks = recipeLayout.getFluidStacks(); + + ForestryRecipeWrapper wrapper = (ForestryRecipeWrapper) recipeWrapper; + + float chance = 0; + if(wrapper.getRecipe() instanceof ISqueezerRecipe){ + chance = ((ISqueezerRecipe) wrapper.getRecipe()).getRemnantsChance(); + }else if(wrapper.getRecipe() instanceof ISqueezerContainerRecipe){ + chance = ((ISqueezerContainerRecipe) wrapper.getRecipe()).getRemnantsChance(); + } + + guiFluidStacks.init(outputTank, false, 117, 7, 16, 58, 10000, false, tankOverlay); + guiFluidStacks.set(outputTank, recipeWrapper.getFluidOutputs()); + + guiItemStacks.init(craftOutputSlot, false, 92, 49); + craftingGridHelper.setOutput(guiItemStacks, recipeWrapper.getOutputs()); + setIngredients(guiItemStacks, recipeWrapper.getInputs(), chance); + + guiItemStacks.addTooltipCallback(tooltip); + + } + + public void setIngredients(IGuiItemStackGroup guiItemStacks, List inputs, float chance) { + int i = 0; + for (ItemStack stack : inputs) { + guiItemStacks.init(craftInputSlot + i, true, 12 + INPUTS[i][0] * 18, 10 + INPUTS[i][1] * 18); + tooltip.addChanceTooltip(i, chance); + i++; + } + craftingGridHelper.setInput(guiItemStacks, inputs); + } + +} diff --git a/src/main/java/forestry/factory/recipes/jei/squeezer/SqueezerRecipeHandler.java b/src/main/java/forestry/factory/recipes/jei/squeezer/SqueezerRecipeHandler.java new file mode 100644 index 000000000..9df2745d3 --- /dev/null +++ b/src/main/java/forestry/factory/recipes/jei/squeezer/SqueezerRecipeHandler.java @@ -0,0 +1,60 @@ +package forestry.factory.recipes.jei.squeezer; + +import javax.annotation.Nonnull; + +import forestry.api.recipes.ISqueezerRecipe; +import forestry.core.recipes.jei.ForestryRecipeWrapper; +import forestry.factory.recipes.ISqueezerContainerRecipe; +import mezz.jei.api.recipe.IRecipeHandler; +import mezz.jei.api.recipe.IRecipeWrapper; + +public class SqueezerRecipeHandler implements IRecipeHandler { + + @Nonnull + private Class clazz; + @Nonnull + private String UID; + + public SqueezerRecipeHandler(@Nonnull Class clazz, @Nonnull String UID) { + this.clazz = clazz; + this.UID = UID; + } + + @Nonnull + @Override + public Class getRecipeClass() { + return clazz; + } + + @Nonnull + @Override + public String getRecipeCategoryUid() { + return UID; + } + + @Override + public IRecipeWrapper getRecipeWrapper(R recipe) { + return recipe; + } + + @Override + public boolean isRecipeValid(R wrapper) { + if(wrapper.getFluidOutputs() == null || wrapper.getFluidOutputs().isEmpty()){ + return false; + } + if(wrapper.getInputs() == null || wrapper.getInputs().isEmpty()){ + return false; + } + if(wrapper.getOutputs() == null || wrapper.getOutputs().isEmpty()){ + return false; + } + if(wrapper.getRecipe() instanceof ISqueezerContainerRecipe){ + ISqueezerContainerRecipe recipe = (ISqueezerContainerRecipe) wrapper.getRecipe(); + return recipe.getProcessingTime() > 0 && recipe.getRemnantsChance() > 0; + }else{ + ISqueezerRecipe recipe = (ISqueezerRecipe) wrapper.getRecipe(); + return recipe.getProcessingTime() > 0 && recipe.getRemnantsChance() > 0; + } + } + +} diff --git a/src/main/java/forestry/factory/recipes/jei/squeezer/SqueezerRecipeMaker.java b/src/main/java/forestry/factory/recipes/jei/squeezer/SqueezerRecipeMaker.java new file mode 100644 index 000000000..3ff63fae1 --- /dev/null +++ b/src/main/java/forestry/factory/recipes/jei/squeezer/SqueezerRecipeMaker.java @@ -0,0 +1,37 @@ +package forestry.factory.recipes.jei.squeezer; + +import java.util.ArrayList; +import java.util.List; + +import forestry.api.recipes.ISqueezerRecipe; +import forestry.api.recipes.RecipeManagers; +import forestry.factory.recipes.ISqueezerContainerRecipe; +import forestry.factory.recipes.SqueezerRecipeManager; +import net.minecraftforge.fluids.FluidContainerRegistry; +import net.minecraftforge.fluids.FluidContainerRegistry.FluidContainerData; + +public class SqueezerRecipeMaker { + + private SqueezerRecipeMaker() { + } + + public static List getSqueezerRecipes() { + List recipes = new ArrayList<>(); + for(ISqueezerRecipe recipe : RecipeManagers.squeezerManager.recipes()){ + recipes.add(new SqueezerRecipeWrapper(recipe)); + } + return recipes; + } + + public static List getSqueezerContainerRecipes() { + List recipes = new ArrayList<>(); + for(FluidContainerData data : FluidContainerRegistry.getRegisteredFluidContainerData()){ + ISqueezerContainerRecipe containerRecipe = SqueezerRecipeManager.findMatchingContainerRecipe(data.filledContainer); + if (containerRecipe != null) { + recipes.add(new SqueezerContainerRecipeWrapper(containerRecipe)); + } + } + return recipes; + } + +} diff --git a/src/main/java/forestry/factory/recipes/jei/squeezer/SqueezerRecipeWrapper.java b/src/main/java/forestry/factory/recipes/jei/squeezer/SqueezerRecipeWrapper.java new file mode 100644 index 000000000..8bb77bbed --- /dev/null +++ b/src/main/java/forestry/factory/recipes/jei/squeezer/SqueezerRecipeWrapper.java @@ -0,0 +1,39 @@ +package forestry.factory.recipes.jei.squeezer; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import javax.annotation.Nonnull; + +import forestry.api.recipes.ISqueezerRecipe; +import forestry.core.recipes.jei.ForestryRecipeWrapper; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; + +public class SqueezerRecipeWrapper extends ForestryRecipeWrapper{ + + public SqueezerRecipeWrapper(@Nonnull ISqueezerRecipe recipe) { + super(recipe); + } + + @Override + public List getInputs() { + List inputs = new ArrayList<>(); + for(ItemStack ingredient : recipe.getResources()){ + inputs.add(ingredient); + } + return inputs; + } + + @Override + public List getFluidOutputs() { + return Collections.singletonList(recipe.getFluidOutput()); + } + + @Override + public List getOutputs() { + return Collections.singletonList(recipe.getRemnants()); + } + +} diff --git a/src/main/java/forestry/factory/recipes/jei/still/StillRecipeCategory.java b/src/main/java/forestry/factory/recipes/jei/still/StillRecipeCategory.java new file mode 100644 index 000000000..f828d7ad5 --- /dev/null +++ b/src/main/java/forestry/factory/recipes/jei/still/StillRecipeCategory.java @@ -0,0 +1,56 @@ +package forestry.factory.recipes.jei.still; + +import javax.annotation.Nonnull; + +import forestry.core.recipes.jei.ForestryRecipeCategory; +import forestry.core.recipes.jei.ForestryRecipeCategoryUid; +import mezz.jei.api.IGuiHelper; +import mezz.jei.api.gui.IDrawable; +import mezz.jei.api.gui.IGuiFluidStackGroup; +import mezz.jei.api.gui.IRecipeLayout; +import mezz.jei.api.recipe.IRecipeWrapper; +import net.minecraft.client.Minecraft; +import net.minecraft.util.ResourceLocation; + +public class StillRecipeCategory extends ForestryRecipeCategory { + + private static final int inputTank = 0; + private static final int outputTank = 1; + + private final static ResourceLocation guiTexture = new ResourceLocation("forestry", "textures/gui/still.png"); + + @Nonnull + protected final IDrawable tankOverlay; + + public StillRecipeCategory(IGuiHelper guiHelper) { + super(guiHelper.createDrawable(guiTexture, 30, 11, 116, 65), "tile.for.factory.6.name"); + this.tankOverlay = guiHelper.createDrawable(guiTexture, 176, 0, 16, 58); + } + + @Override + public String getUid() { + return ForestryRecipeCategoryUid.STILL; + } + + @Override + public void drawExtras(Minecraft minecraft) { + } + + @Override + public void drawAnimations(Minecraft minecraft) { + } + + @Override + public void setRecipe(IRecipeLayout recipeLayout, IRecipeWrapper recipeWrapper) { + IGuiFluidStackGroup guiFluidStacks = recipeLayout.getFluidStacks(); + + + guiFluidStacks.init(inputTank, true, 30, 4, 16, 58, 10000, false, tankOverlay); + guiFluidStacks.init(outputTank, false, 120, 4, 16, 58, 10000, false, tankOverlay); + + guiFluidStacks.set(inputTank, recipeWrapper.getFluidInputs()); + guiFluidStacks.set(outputTank, recipeWrapper.getFluidOutputs()); + + } + +} diff --git a/src/main/java/forestry/factory/recipes/jei/still/StillRecipeHandler.java b/src/main/java/forestry/factory/recipes/jei/still/StillRecipeHandler.java new file mode 100644 index 000000000..11c746002 --- /dev/null +++ b/src/main/java/forestry/factory/recipes/jei/still/StillRecipeHandler.java @@ -0,0 +1,40 @@ +package forestry.factory.recipes.jei.still; + +import javax.annotation.Nonnull; + +import forestry.api.recipes.IStillRecipe; +import forestry.core.recipes.jei.ForestryRecipeCategoryUid; +import mezz.jei.api.recipe.IRecipeHandler; +import mezz.jei.api.recipe.IRecipeWrapper; + +public class StillRecipeHandler implements IRecipeHandler { + + @Nonnull + @Override + public Class getRecipeClass() { + return StillRecipeWrapper.class; + } + + @Override + public String getRecipeCategoryUid() { + return ForestryRecipeCategoryUid.STILL; + } + + @Override + public IRecipeWrapper getRecipeWrapper(StillRecipeWrapper recipe) { + return recipe; + } + + @Override + public boolean isRecipeValid(StillRecipeWrapper wrapper) { + IStillRecipe recipe = wrapper.getRecipe(); + if(recipe.getInput() == null){ + return false; + } + if(recipe.getOutput() == null){ + return false; + } + return true; + } + +} diff --git a/src/main/java/forestry/factory/recipes/jei/still/StillRecipeMaker.java b/src/main/java/forestry/factory/recipes/jei/still/StillRecipeMaker.java new file mode 100644 index 000000000..7072b0823 --- /dev/null +++ b/src/main/java/forestry/factory/recipes/jei/still/StillRecipeMaker.java @@ -0,0 +1,21 @@ +package forestry.factory.recipes.jei.still; + +import java.util.ArrayList; +import java.util.List; + +import forestry.api.recipes.IStillRecipe; +import forestry.api.recipes.RecipeManagers; + +public class StillRecipeMaker { + + private StillRecipeMaker() { + } + + public static List getStillRecipes() { + List recipes = new ArrayList<>(); + for(IStillRecipe recipe : RecipeManagers.stillManager.recipes()) + recipes.add(new StillRecipeWrapper(recipe)); + return recipes; + } + +} diff --git a/src/main/java/forestry/factory/recipes/jei/still/StillRecipeWrapper.java b/src/main/java/forestry/factory/recipes/jei/still/StillRecipeWrapper.java new file mode 100644 index 000000000..cb57340c0 --- /dev/null +++ b/src/main/java/forestry/factory/recipes/jei/still/StillRecipeWrapper.java @@ -0,0 +1,27 @@ +package forestry.factory.recipes.jei.still; + +import java.util.Collections; +import java.util.List; +import javax.annotation.Nonnull; + +import forestry.api.recipes.IStillRecipe; +import forestry.core.recipes.jei.ForestryRecipeWrapper; +import net.minecraftforge.fluids.FluidStack; + +public class StillRecipeWrapper extends ForestryRecipeWrapper{ + + public StillRecipeWrapper(@Nonnull IStillRecipe recipe) { + super(recipe); + } + + @Override + public List getFluidInputs() { + return Collections.singletonList(recipe.getInput()); + } + + @Override + public List getFluidOutputs() { + return Collections.singletonList(recipe.getOutput()); + } + +} diff --git a/src/main/java/forestry/factory/recipes/nei/NEIHandlerBottler.java b/src/main/java/forestry/factory/recipes/nei/NEIHandlerBottler.java deleted file mode 100644 index 3a2e69395..000000000 --- a/src/main/java/forestry/factory/recipes/nei/NEIHandlerBottler.java +++ /dev/null @@ -1,155 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v3 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: - * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges - ******************************************************************************/ -package forestry.factory.recipes.nei; - -import java.awt.Point; -import java.awt.Rectangle; -import java.util.ArrayList; -import java.util.List; - -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.item.ItemStack; -import net.minecraft.util.StatCollector; - -import net.minecraftforge.fluids.FluidContainerRegistry; -import net.minecraftforge.fluids.FluidContainerRegistry.FluidContainerData; -import net.minecraftforge.fluids.FluidStack; - -import forestry.core.recipes.nei.NEIUtils; -import forestry.core.recipes.nei.PositionedFluidTank; -import forestry.core.recipes.nei.RecipeHandlerBase; -import forestry.factory.gui.GuiBottler; -import forestry.factory.recipes.BottlerRecipe; - -import codechicken.lib.gui.GuiDraw; -import codechicken.nei.NEIServerUtils; -import codechicken.nei.PositionedStack; - -public class NEIHandlerBottler extends RecipeHandlerBase { - - private static final List recipes = new ArrayList<>(); - - @Override - public void prepare() { - for (FluidContainerData container : FluidContainerRegistry.getRegisteredFluidContainerData()) { - BottlerRecipe recipe = BottlerRecipe.getRecipe(container.fluid, container.emptyContainer); - if (recipe != null) { - recipes.add(recipe); - } - } - } - - public class CachedBottlerRecipe extends CachedBaseRecipe { - - public PositionedFluidTank fluid; - public PositionedStack input; - public PositionedStack output; - - public CachedBottlerRecipe(BottlerRecipe recipe) { - if (recipe.input != null) { - this.fluid = new PositionedFluidTank(recipe.input, 10000, new Rectangle(48, 6, 16, 58), NEIHandlerBottler.this.getGuiTexture(), new Point(176, 0)); - } - if (recipe.empty != null) { - this.input = new PositionedStack(recipe.empty, 111, 8); - } - if (recipe.filled != null) { - this.output = new PositionedStack(recipe.filled, 111, 44); - } - } - - @Override - public PositionedStack getIngredient() { - return this.input; - } - - @Override - public PositionedStack getResult() { - return this.output; - } - - @Override - public PositionedFluidTank getFluidTank() { - return this.fluid; - } - - } - - @Override - public String getRecipeID() { - return "forestry.bottler"; - } - - @Override - public String getRecipeName() { - return StatCollector.translateToLocal("tile.for.factory.0.name"); - } - - @Override - public String getGuiTexture() { - return "forestry:textures/gui/bottler.png"; - } - - @Override - public void loadTransferRects() { - this.addTransferRect(75, 27, 24, 17); - } - - @Override - public Class getGuiClass() { - return GuiBottler.class; - } - - @Override - public void drawBackground(int recipe) { - this.changeToGuiTexture(); - GuiDraw.drawTexturedModalRect(43, 0, 48, 11, 123, 65); - } - - @Override - public void drawExtras(int recipe) { - this.drawProgressBar(75, 27, 176, 74, 24, 17, 40, 0); - } - - @Override - public void loadAllRecipes() { - for (BottlerRecipe recipe : recipes) { - this.arecipes.add(new CachedBottlerRecipe(recipe)); - } - } - - @Override - public void loadCraftingRecipes(ItemStack result) { - for (BottlerRecipe recipe : recipes) { - if (NEIServerUtils.areStacksSameTypeCrafting(recipe.filled, result)) { - this.arecipes.add(new CachedBottlerRecipe(recipe)); - } - } - } - - @Override - public void loadUsageRecipes(ItemStack ingred) { - for (BottlerRecipe recipe : recipes) { - if (NEIServerUtils.areStacksSameTypeCrafting(recipe.empty, ingred)) { - this.arecipes.add(new CachedBottlerRecipe(recipe)); - } - } - } - - @Override - public void loadUsageRecipes(FluidStack ingred) { - for (BottlerRecipe recipe : recipes) { - if (NEIUtils.areFluidsSameType(recipe.input, ingred)) { - this.arecipes.add(new CachedBottlerRecipe(recipe)); - } - } - } - -} diff --git a/src/main/java/forestry/factory/recipes/nei/NEIHandlerCarpenter.java b/src/main/java/forestry/factory/recipes/nei/NEIHandlerCarpenter.java deleted file mode 100644 index b81cbe505..000000000 --- a/src/main/java/forestry/factory/recipes/nei/NEIHandlerCarpenter.java +++ /dev/null @@ -1,195 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v3 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: - * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges - ******************************************************************************/ -package forestry.factory.recipes.nei; - -import java.awt.Point; -import java.awt.Rectangle; -import java.util.ArrayList; -import java.util.List; - -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.item.ItemStack; -import net.minecraft.util.StatCollector; - -import net.minecraftforge.fluids.FluidStack; - -import forestry.api.recipes.ICarpenterRecipe; -import forestry.api.recipes.IDescriptiveRecipe; -import forestry.api.recipes.RecipeManagers; -import forestry.core.recipes.nei.NEIUtils; -import forestry.core.recipes.nei.PositionedFluidTank; -import forestry.core.recipes.nei.RecipeHandlerBase; -import forestry.factory.gui.GuiCarpenter; - -import codechicken.lib.gui.GuiDraw; -import codechicken.nei.NEIServerUtils; -import codechicken.nei.PositionedStack; -import codechicken.nei.api.API; - -public class NEIHandlerCarpenter extends RecipeHandlerBase { - - private static Class guiClass; - - @Override - public void prepare() { - guiClass = GuiCarpenter.class; - API.setGuiOffset(guiClass, 5, 14); - } - - public class CachedCarpenterRecipe extends CachedBaseRecipe { - - public List inputs = new ArrayList<>(); - public PositionedFluidTank tank; - public PositionedStack output; - - public CachedCarpenterRecipe(ICarpenterRecipe recipe, boolean genPerms) { - IDescriptiveRecipe irecipe = recipe.getCraftingGridRecipe(); - if (irecipe != null) { - if (irecipe.getIngredients() != null) { - this.setIngredients(irecipe.getWidth(), irecipe.getHeight(), irecipe.getIngredients()); - } - if (recipe.getBox() != null) { - this.inputs.add(new PositionedStack(recipe.getBox(), 78, 6)); - } - if (recipe.getFluidResource() != null) { - this.tank = new PositionedFluidTank(recipe.getFluidResource(), 10000, new Rectangle(145, 3, 16, 58), NEIHandlerCarpenter.this.getGuiTexture(), new Point(176, 0)); - } - if (recipe.getCraftingGridRecipe().getRecipeOutput() != null) { - this.output = new PositionedStack(recipe.getCraftingGridRecipe().getRecipeOutput(), 75, 37); - } - } - - if (genPerms) { - this.generatePermutations(); - } - } - - public CachedCarpenterRecipe(ICarpenterRecipe recipe) { - this(recipe, false); - } - - public void setIngredients(int width, int height, Object[] items) { - for (int x = 0; x < width; x++) { - for (int y = 0; y < height; y++) { - Object item = items[y * width + x]; - if (item == null) { - continue; - } else if (item instanceof ItemStack[] && ((ItemStack[]) item).length == 0) { - continue; - } else if (item instanceof List && ((List) item).size() == 0) { - continue; - } - - PositionedStack stack = new PositionedStack(item, 5 + x * 18, 6 + y * 18, false); - stack.setMaxSize(1); - this.inputs.add(stack); - } - } - } - - @Override - public List getIngredients() { - return this.getCycledIngredients(NEIHandlerCarpenter.this.cycleticks / 20, this.inputs); - } - - @Override - public PositionedFluidTank getFluidTank() { - return this.tank; - } - - @Override - public PositionedStack getResult() { - return this.output; - } - - public void generatePermutations() { - for (PositionedStack p : this.inputs) { - p.generatePermutations(); - } - } - - } - - @Override - public String getRecipeID() { - return "forestry.carpenter"; - } - - @Override - public String getRecipeName() { - return StatCollector.translateToLocal("tile.for.factory.1.name"); - } - - @Override - public String getGuiTexture() { - return "forestry:textures/gui/carpenter.png"; - } - - @Override - public void loadTransferRects() { - this.addTransferRect(93, 36, 4, 18); - } - - @Override - public Class getGuiClass() { - return guiClass; - } - - @Override - public void drawBackground(int recipe) { - this.changeToGuiTexture(); - GuiDraw.drawTexturedModalRect(0, 0, 5, 14, 166, 65); - } - - @Override - public void drawExtras(int recipe) { - this.drawProgressBar(93, 36, 176, 59, 4, 17, 80, 3); - } - - @Override - public void loadAllRecipes() { - for (ICarpenterRecipe recipe : RecipeManagers.carpenterManager.recipes()) { - this.arecipes.add(new CachedCarpenterRecipe(recipe, true)); - } - } - - @Override - public void loadCraftingRecipes(ItemStack result) { - for (ICarpenterRecipe recipe : RecipeManagers.carpenterManager.recipes()) { - if (NEIServerUtils.areStacksSameTypeCrafting(recipe.getCraftingGridRecipe().getRecipeOutput(), result)) { - this.arecipes.add(new CachedCarpenterRecipe(recipe, true)); - } - } - } - - @Override - public void loadUsageRecipes(ItemStack ingred) { - super.loadUsageRecipes(ingred); - for (ICarpenterRecipe recipe : RecipeManagers.carpenterManager.recipes()) { - CachedCarpenterRecipe crecipe = new CachedCarpenterRecipe(recipe); - if (crecipe.inputs != null && crecipe.contains(crecipe.inputs, ingred)) { - crecipe.generatePermutations(); - crecipe.setIngredientPermutation(crecipe.inputs, ingred); - this.arecipes.add(crecipe); - } - } - } - - @Override - public void loadUsageRecipes(FluidStack ingredient) { - for (ICarpenterRecipe recipe : RecipeManagers.carpenterManager.recipes()) { - if (NEIUtils.areFluidsSameType(recipe.getFluidResource(), ingredient)) { - this.arecipes.add(new CachedCarpenterRecipe(recipe, true)); - } - } - } - -} diff --git a/src/main/java/forestry/factory/recipes/nei/NEIHandlerCentrifuge.java b/src/main/java/forestry/factory/recipes/nei/NEIHandlerCentrifuge.java deleted file mode 100644 index 0701a41ff..000000000 --- a/src/main/java/forestry/factory/recipes/nei/NEIHandlerCentrifuge.java +++ /dev/null @@ -1,160 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v3 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: - * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges - ******************************************************************************/ -package forestry.factory.recipes.nei; - -import java.util.ArrayList; -import java.util.Comparator; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.PriorityQueue; -import java.util.Set; - -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.item.ItemStack; -import net.minecraft.util.StatCollector; - -import forestry.api.recipes.ICentrifugeRecipe; -import forestry.api.recipes.RecipeManagers; -import forestry.core.recipes.nei.PositionedStackAdv; -import forestry.core.recipes.nei.RecipeHandlerBase; -import forestry.factory.gui.GuiCentrifuge; - -import codechicken.nei.NEIServerUtils; -import codechicken.nei.PositionedStack; - -public class NEIHandlerCentrifuge extends RecipeHandlerBase { - - private static final int[][] OUTPUTS = new int[][]{{0, 0}, {1, 0}, {2, 0}, {0, 1}, {1, 1}, {2, 1}, {0, 2}, {1, 2}, {2, 2}}; - - private static final Comparator> highestChanceComparator = new Comparator>() { - @Override - public int compare(Entry o1, Entry o2) { - return o2.getValue().compareTo(o1.getValue()); - } - }; - - public class CachedCentrifugeRecipe extends CachedBaseRecipe { - - public PositionedStack inputs; - public List outputs = new ArrayList<>(); - - public CachedCentrifugeRecipe(ICentrifugeRecipe recipe, boolean genPerms) { - if (recipe.getInput() != null) { - this.inputs = new PositionedStack(recipe.getInput(), 25, 26); - } - if (recipe.getAllProducts() != null) { - this.setResults(recipe.getAllProducts()); - } - } - - public CachedCentrifugeRecipe(ICentrifugeRecipe recipe) { - this(recipe, false); - } - - public void setResults(Map outputs) { - Set> entrySet = outputs.entrySet(); - if (entrySet.size() == 0) { - return; - } - PriorityQueue> sortByChance = new PriorityQueue<>(entrySet.size(), highestChanceComparator); - sortByChance.addAll(entrySet); - - int i = 0; - while (!sortByChance.isEmpty()) { - Entry stack = sortByChance.poll(); - if (i >= OUTPUTS.length) { - return; - } - PositionedStackAdv output = new PositionedStackAdv(stack.getKey(), 93 + OUTPUTS[i][0] * 18, 8 + OUTPUTS[i][1] * 18); - output.setChance(stack.getValue()); - this.outputs.add(output); - i++; - } - } - - @Override - public PositionedStack getIngredient() { - this.randomRenderPermutation(this.inputs, NEIHandlerCentrifuge.this.cycleticks / 20); - return this.inputs; - } - - @Override - public List getOtherStacks() { - return this.outputs; - } - - @Override - public PositionedStack getResult() { - return null; - } - - } - - @Override - public String getRecipeID() { - return "forestry.centrifuge"; - } - - @Override - public String getRecipeName() { - return StatCollector.translateToLocal("tile.for.factory.2.name"); - } - - @Override - public String getGuiTexture() { - return "forestry:textures/gui/centrifugesocket.png"; - } - - @Override - public void loadTransferRects() { - this.addTransferRect(57 - 12, 26 - 8, 16, 24 + 6 + 6); - } - - @Override - public Class getGuiClass() { - return GuiCentrifuge.class; - } - - @Override - public void drawExtras(int recipe) { - this.drawProgressBar(57 - 4, 25, 176, 0, 4, 17, 80, 3); - } - - @Override - public void loadAllRecipes() { - for (ICentrifugeRecipe recipe : RecipeManagers.centrifugeManager.recipes()) { - this.arecipes.add(new CachedCentrifugeRecipe(recipe, true)); - } - } - - @Override - public void loadCraftingRecipes(ItemStack result) { - for (ICentrifugeRecipe recipe : RecipeManagers.centrifugeManager.recipes()) { - CachedCentrifugeRecipe crecipe = new CachedCentrifugeRecipe(recipe); - if (crecipe.outputs != null && crecipe.contains(crecipe.outputs, result)) { - crecipe.setIngredientPermutation(crecipe.outputs, result); - this.arecipes.add(crecipe); - } - } - } - - @Override - public void loadUsageRecipes(ItemStack ingred) { - super.loadCraftingRecipes(ingred); - for (ICentrifugeRecipe recipe : RecipeManagers.centrifugeManager.recipes()) { - if (NEIServerUtils.areStacksSameTypeCrafting(recipe.getInput(), ingred)) { - this.arecipes.add(new CachedCentrifugeRecipe(recipe, true)); - } - } - } - -} diff --git a/src/main/java/forestry/factory/recipes/nei/NEIHandlerFabricator.java b/src/main/java/forestry/factory/recipes/nei/NEIHandlerFabricator.java deleted file mode 100644 index 0c2e5c877..000000000 --- a/src/main/java/forestry/factory/recipes/nei/NEIHandlerFabricator.java +++ /dev/null @@ -1,231 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v3 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: - * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges - ******************************************************************************/ -package forestry.factory.recipes.nei; - -import java.awt.Point; -import java.awt.Rectangle; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.StatCollector; - -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidStack; - -import forestry.api.recipes.IFabricatorRecipe; -import forestry.api.recipes.IFabricatorSmeltingRecipe; -import forestry.api.recipes.RecipeManagers; -import forestry.core.recipes.nei.NEIUtils; -import forestry.core.recipes.nei.PositionedFluidTank; -import forestry.core.recipes.nei.RecipeHandlerBase; -import forestry.factory.gui.GuiFabricator; -import forestry.factory.recipes.FabricatorSmeltingRecipeManager; - -import codechicken.nei.NEIServerUtils; -import codechicken.nei.PositionedStack; -import codechicken.nei.recipe.GuiRecipe; - -public class NEIHandlerFabricator extends RecipeHandlerBase { - - public class CachedFabricatorRecipe extends CachedBaseRecipe { - public List smeltingInput = new ArrayList<>(); - public PositionedFluidTank tank; - public List inputs = new ArrayList<>(); - public PositionedStack output; - - public CachedFabricatorRecipe(IFabricatorRecipe recipe, boolean genPerms) { - if (recipe.getLiquid() != null) { - this.tank = new PositionedFluidTank(recipe.getLiquid(), 2000, new Rectangle(21, 37, 16, 16)); - List smeltingInput = new ArrayList<>(); - for (IFabricatorSmeltingRecipe s : getSmeltingInputs().get(recipe.getLiquid().getFluid())) { - smeltingInput.add(s.getResource()); - } - if (!smeltingInput.isEmpty()) { - this.smeltingInput.add(new PositionedStack(smeltingInput, 21, 10)); - } - } - - if (recipe != null) { - if (recipe.getIngredients() != null) { - this.setIngredients(recipe.getWidth(), recipe.getHeight(), recipe.getIngredients()); - } - if (recipe.getPlan() != null) { - this.inputs.add(new PositionedStack(recipe.getPlan(), 134, 6)); - } - - if (recipe.getRecipeOutput() != null) { - this.output = new PositionedStack(recipe.getRecipeOutput(), 134, 42); - } - } - - if (genPerms) { - this.generatePermutations(); - } - } - - public CachedFabricatorRecipe(IFabricatorRecipe recipe) { - this(recipe, false); - } - - public void setIngredients(int width, int height, Object[] items) { - for (int x = 0; x < width; x++) { - for (int y = 0; y < height; y++) { - Object item = items[y * width + x]; - if (item == null) { - continue; - } else if (item instanceof ItemStack[] && ((ItemStack[]) item).length == 0) { - continue; - } else if (item instanceof List && ((List) item).size() == 0) { - continue; - } - - PositionedStack stack = new PositionedStack(item, 62 + x * 18, 6 + y * 18, false); - stack.setMaxSize(1); - this.inputs.add(stack); - } - } - } - - @Override - public PositionedStack getResult() { - return this.output; - } - - @Override - public List getOtherStacks() { - return super.getCycledIngredients(NEIHandlerFabricator.this.cycleticks / 40, this.smeltingInput); - } - - @Override - public List getIngredients() { - return getCycledIngredients(NEIHandlerFabricator.this.cycleticks / 20, this.inputs); - } - - @Override - public PositionedFluidTank getFluidTank() { - return this.tank; - } - - public void generatePermutations() { - for (PositionedStack p : this.inputs) { - p.generatePermutations(); - } - } - - } - - @Override - public List getIngredientStacks(int recipe) { - return arecipes.get(recipe).getIngredients(); - } - - @Override - public PositionedStack getResultStack(int recipe) { - return arecipes.get(recipe).getResult(); - } - - @Override - public String getRecipeID() { - return "forestry.fabricator"; - } - - @Override - public String getRecipeName() { - return StatCollector.translateToLocal("tile.for.factory2.0.name"); - } - - @Override - public String getGuiTexture() { - return "forestry:textures/gui/fabricator.png"; - } - - @Override - public void loadTransferRects() { - this.addTransferRect(117, 44, 14, 13); - } - - @Override - public Class getGuiClass() { - return GuiFabricator.class; - } - - @Override - public void loadAllRecipes() { - for (IFabricatorRecipe recipe : RecipeManagers.fabricatorManager.recipes()) { - this.arecipes.add(new CachedFabricatorRecipe(recipe, true)); - } - } - - @Override - public void loadCraftingRecipes(ItemStack result) { - for (IFabricatorRecipe recipe : RecipeManagers.fabricatorManager.recipes()) { - if (NEIServerUtils.areStacksSameTypeCrafting(recipe.getRecipeOutput(), result)) { - CachedFabricatorRecipe crecipe = new CachedFabricatorRecipe(recipe, true); - this.arecipes.add(crecipe); - } - } - } - - @Override - public void loadUsageRecipes(ItemStack ingred) { - super.loadUsageRecipes(ingred); - for (IFabricatorRecipe recipe : RecipeManagers.fabricatorManager.recipes()) { - CachedFabricatorRecipe crecipe = new CachedFabricatorRecipe(recipe); - if (crecipe.inputs != null && crecipe.contains(crecipe.inputs, ingred) || crecipe.smeltingInput != null && crecipe.contains(crecipe.smeltingInput, ingred)) { - crecipe.generatePermutations(); - crecipe.setIngredientPermutation(crecipe.smeltingInput, ingred); - this.arecipes.add(crecipe); - } - } - } - - @Override - public void loadUsageRecipes(FluidStack ingredient) { - for (IFabricatorRecipe recipe : RecipeManagers.fabricatorManager.recipes()) { - if (NEIUtils.areFluidsSameType(recipe.getLiquid(), ingredient)) { - this.arecipes.add(new CachedFabricatorRecipe(recipe, true)); - } - } - } - - @Override - public List provideItemTooltip(GuiRecipe guiRecipe, ItemStack itemStack, List currenttip, CachedBaseRecipe crecipe, Point relMouse) { - super.provideItemTooltip(guiRecipe, itemStack, currenttip, crecipe, relMouse); - - if (new Rectangle(20, 9, 18, 18).contains(relMouse)) { - for (IFabricatorSmeltingRecipe smelting : FabricatorSmeltingRecipeManager.recipes) { - if (NEIServerUtils.areStacksSameTypeCrafting(smelting.getResource(), itemStack) && smelting.getProduct() != null) { - currenttip.add(EnumChatFormatting.GRAY + NEIUtils.translate("handler.forestry.fabricator.worth") + " " + smelting.getProduct().amount + " mB"); - } - } - } - - return currenttip; - } - - private static Map> getSmeltingInputs() { - Map> smeltingInputs = new HashMap<>(); - for (IFabricatorSmeltingRecipe smelting : FabricatorSmeltingRecipeManager.recipes) { - Fluid fluid = smelting.getProduct().getFluid(); - if (!smeltingInputs.containsKey(fluid)) { - smeltingInputs.put(fluid, new ArrayList()); - } - smeltingInputs.get(fluid).add(smelting); - } - return smeltingInputs; - } - -} diff --git a/src/main/java/forestry/factory/recipes/nei/NEIHandlerFermenter.java b/src/main/java/forestry/factory/recipes/nei/NEIHandlerFermenter.java deleted file mode 100644 index 9c93073a9..000000000 --- a/src/main/java/forestry/factory/recipes/nei/NEIHandlerFermenter.java +++ /dev/null @@ -1,204 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v3 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: - * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges - ******************************************************************************/ -package forestry.factory.recipes.nei; - -import java.awt.Point; -import java.awt.Rectangle; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.item.ItemStack; -import net.minecraft.util.StatCollector; - -import net.minecraftforge.fluids.FluidStack; - -import forestry.api.fuels.FermenterFuel; -import forestry.api.fuels.FuelManager; -import forestry.api.recipes.IFermenterRecipe; -import forestry.api.recipes.IVariableFermentable; -import forestry.api.recipes.RecipeManagers; -import forestry.core.config.Constants; -import forestry.core.recipes.nei.NEIUtils; -import forestry.core.recipes.nei.PositionedFluidTank; -import forestry.core.recipes.nei.RecipeHandlerBase; -import forestry.factory.gui.GuiFermenter; - -import codechicken.lib.gui.GuiDraw; -import codechicken.nei.NEIServerUtils; -import codechicken.nei.PositionedStack; -import codechicken.nei.api.API; - -public class NEIHandlerFermenter extends RecipeHandlerBase { - - private static Class guiClass; - - @Override - public void prepare() { - guiClass = GuiFermenter.class; - API.setGuiOffset(guiClass, 5, 15); - } - - public class CachedFermenterRecipe extends CachedBaseRecipe { - - public List tanks = new ArrayList<>(); - public PositionedStack resource; - public List inputItems = new ArrayList<>(); - - public CachedFermenterRecipe(IFermenterRecipe recipe, ItemStack fermentable, boolean genPerms) { - if (recipe.getFluidResource() != null) { - FluidStack input = recipe.getFluidResource().copy(); - input.amount = recipe.getFermentationValue(); - this.tanks.add(new PositionedFluidTank(input, 10000, new Rectangle(30, 4, 16, 58), NEIHandlerFermenter.this.getGuiTexture(), new Point(176, 0))); - } - if (recipe.getOutput() != null) { - int amount = Math.round(recipe.getFermentationValue() * recipe.getModifier()); - if (fermentable.getItem() instanceof IVariableFermentable) { - amount *= ((IVariableFermentable) fermentable.getItem()).getFermentationModifier(fermentable); - } - FluidStack output = new FluidStack(recipe.getOutput(), amount); - this.tanks.add(new PositionedFluidTank(output, 10000, new Rectangle(120, 4, 16, 58), NEIHandlerFermenter.this.getGuiTexture(), new Point(176, 0))); - } - - this.inputItems.add(new PositionedStack(fermentable, 80, 8)); - List fuels = new ArrayList<>(); - for (FermenterFuel fuel : FuelManager.fermenterFuel.values()) { - fuels.add(fuel.item); - } - this.inputItems.add(new PositionedStack(fuels, 70, 42)); - - if (genPerms) { - this.generatePermutations(); - } - } - - @Override - public List getIngredients() { - return this.getCycledIngredients(NEIHandlerFermenter.this.cycleticks / 40, this.inputItems); - } - - @Override - public PositionedStack getResult() { - return null; - } - - @Override - public List getFluidTanks() { - return this.tanks; - } - - public void generatePermutations() { - for (PositionedStack p : this.inputItems) { - p.generatePermutations(); - } - } - - } - - @Override - public String getRecipeID() { - return "forestry.fermenter"; - } - - @Override - public String getRecipeName() { - return StatCollector.translateToLocal("tile.for.factory.3.name"); - } - - @Override - public String getGuiTexture() { - return "forestry:textures/gui/fermenter.png"; - } - - @Override - public void loadTransferRects() { - this.addTransferRect(76, 27, 14, 12); - } - - @Override - public Class getGuiClass() { - return guiClass; - } - - @Override - public void drawBackground(int recipe) { - this.changeToGuiTexture(); - GuiDraw.drawTexturedModalRect(25, 0, 30, 15, 116, 65); - } - - @Override - public void drawExtras(int recipe) { - this.drawProgressBar(69, 17, 176, 60, 4, 18, 40, 11); - this.drawProgressBar(93, 31, 176, 78, 4, 18, 80, 11); - } - - private List getCachedRecipes(IFermenterRecipe recipe, boolean generatePermutations) { - if (recipe.getResource() != null && recipe.getResource().getItem() instanceof IVariableFermentable) { - List crecipes = new ArrayList<>(); - for (ItemStack stack : NEIUtils.getItemVariations(recipe.getResource())) { - crecipes.add(new CachedFermenterRecipe(recipe, stack, generatePermutations)); - } - return crecipes; - } - return Collections.singletonList(new CachedFermenterRecipe(recipe, recipe.getResource(), generatePermutations)); - } - - @Override - public void loadAllRecipes() { - for (IFermenterRecipe recipe : RecipeManagers.fermenterManager.recipes()) { - this.arecipes.addAll(this.getCachedRecipes(recipe, true)); - } - } - - @Override - public void loadCraftingRecipes(FluidStack result) { - for (IFermenterRecipe recipe : RecipeManagers.fermenterManager.recipes()) { - FluidStack output = new FluidStack(recipe.getOutput(), Constants.BUCKET_VOLUME); - if (NEIUtils.areFluidsSameType(output, result)) { - this.arecipes.addAll(this.getCachedRecipes(recipe, true)); - } - } - } - - @Override - public void loadUsageRecipes(ItemStack ingred) { - super.loadUsageRecipes(ingred); - for (IFermenterRecipe recipe : RecipeManagers.fermenterManager.recipes()) { - if (recipe.getResource() != null) { - for (ItemStack stack : NEIUtils.getItemVariations(recipe.getResource())) { - if (stack.hasTagCompound() && NEIServerUtils.areStacksSameType(stack, ingred) || !stack.hasTagCompound() && NEIServerUtils.areStacksSameTypeCrafting(stack, ingred)) { - CachedFermenterRecipe crecipe = new CachedFermenterRecipe(recipe, stack, true); - this.arecipes.add(crecipe); - } - } - } - for (FermenterFuel fuel : FuelManager.fermenterFuel.values()) { - if (NEIServerUtils.areStacksSameTypeCrafting(fuel.item, ingred)) { - for (CachedFermenterRecipe crecipe : this.getCachedRecipes(recipe, true)) { - crecipe.setIngredientPermutation(crecipe.inputItems, ingred); - this.arecipes.add(crecipe); - } - } - } - } - } - - @Override - public void loadUsageRecipes(FluidStack ingred) { - for (IFermenterRecipe recipe : RecipeManagers.fermenterManager.recipes()) { - if (NEIUtils.areFluidsSameType(recipe.getFluidResource(), ingred)) { - this.arecipes.addAll(this.getCachedRecipes(recipe, true)); - } - } - } - -} diff --git a/src/main/java/forestry/factory/recipes/nei/NEIHandlerMoistener.java b/src/main/java/forestry/factory/recipes/nei/NEIHandlerMoistener.java deleted file mode 100644 index 63fb90b52..000000000 --- a/src/main/java/forestry/factory/recipes/nei/NEIHandlerMoistener.java +++ /dev/null @@ -1,159 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v3 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: - * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges - ******************************************************************************/ -package forestry.factory.recipes.nei; - -import java.awt.Point; -import java.awt.Rectangle; -import java.util.ArrayList; -import java.util.List; - -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.item.ItemStack; -import net.minecraft.util.StatCollector; - -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; - -import forestry.api.fuels.FuelManager; -import forestry.api.fuels.MoistenerFuel; -import forestry.api.recipes.IMoistenerRecipe; -import forestry.api.recipes.RecipeManagers; -import forestry.core.recipes.nei.PositionedFluidTank; -import forestry.core.recipes.nei.RecipeHandlerBase; -import forestry.factory.gui.GuiMoistener; - -import codechicken.nei.NEIServerUtils; -import codechicken.nei.PositionedStack; - -public class NEIHandlerMoistener extends RecipeHandlerBase { - - public class CachedMoistenerRecipe extends CachedBaseRecipe { - - public PositionedFluidTank tank; - public List fuels = new ArrayList<>(); - public PositionedStack input; - public PositionedStack output; - - public CachedMoistenerRecipe(IMoistenerRecipe recipe, MoistenerFuel fuel) { - this.tank = new PositionedFluidTank(FluidRegistry.getFluidStack("water", 10000), 10000, new Rectangle(11, 5, 16, 58), NEIHandlerMoistener.this.getGuiTexture(), new Point(176, 0)); - this.tank.showAmount = false; - if (fuel.item != null) { - this.fuels.add(new PositionedStack(fuel.item, 34, 47)); - } - if (fuel.product != null) { - this.fuels.add(new PositionedStack(fuel.product, 100, 26)); - } - if (recipe.getResource() != null) { - this.input = new PositionedStack(recipe.getResource(), 138, 8); - } - if (recipe.getProduct() != null) { - this.output = new PositionedStack(recipe.getProduct(), 138, 44); - } - } - - @Override - public List getOtherStacks() { - return this.fuels; - } - - @Override - public PositionedStack getIngredient() { - return this.input; - } - - @Override - public PositionedStack getResult() { - return this.output; - } - - @Override - public PositionedFluidTank getFluidTank() { - return this.tank; - } - - } - - @Override - public String getRecipeID() { - return "forestry.moistener"; - } - - @Override - public String getRecipeName() { - return StatCollector.translateToLocal("tile.for.factory.4.name"); - } - - @Override - public String getGuiTexture() { - return "forestry:textures/gui/moistener.png"; - } - - @Override - public void loadTransferRects() { - this.addTransferRect(138, 27, 16, 14); - } - - @Override - public Class getGuiClass() { - return GuiMoistener.class; - } - - @Override - public void drawBackground(int recipe) { - super.drawBackground(recipe); - this.drawProgressBar(88, 6, 176, 91, 29, 55, 80, 3); - } - - @Override - public void drawExtras(int recipe) { - this.drawProgressBar(119, 25, 176, 74, 16, 15, 160, 0); - } - - @Override - public void loadAllRecipes() { - for (IMoistenerRecipe recipe : RecipeManagers.moistenerManager.recipes()) { - for (MoistenerFuel fuel : FuelManager.moistenerResource.values()) { - this.arecipes.add(new CachedMoistenerRecipe(recipe, fuel)); - } - } - } - - @Override - public void loadCraftingRecipes(ItemStack result) { - for (IMoistenerRecipe recipe : RecipeManagers.moistenerManager.recipes()) { - for (MoistenerFuel fuel : FuelManager.moistenerResource.values()) { - if (NEIServerUtils.areStacksSameTypeCrafting(recipe.getProduct(), result) || NEIServerUtils.areStacksSameTypeCrafting(fuel.product, result)) { - this.arecipes.add(new CachedMoistenerRecipe(recipe, fuel)); - } - } - } - } - - @Override - public void loadUsageRecipes(ItemStack ingred) { - super.loadUsageRecipes(ingred); - for (IMoistenerRecipe recipe : RecipeManagers.moistenerManager.recipes()) { - for (MoistenerFuel fuel : FuelManager.moistenerResource.values()) { - if (NEIServerUtils.areStacksSameTypeCrafting(recipe.getResource(), ingred) || NEIServerUtils.areStacksSameTypeCrafting(fuel.item, ingred)) { - this.arecipes.add(new CachedMoistenerRecipe(recipe, fuel)); - } - } - } - } - - @Override - public void loadUsageRecipes(FluidStack ingredient) { - if (ingredient.getFluid() == FluidRegistry.WATER) { - this.loadAllRecipes(); - } - } - -} diff --git a/src/main/java/forestry/factory/recipes/nei/NEIHandlerSqueezer.java b/src/main/java/forestry/factory/recipes/nei/NEIHandlerSqueezer.java deleted file mode 100644 index e832f2591..000000000 --- a/src/main/java/forestry/factory/recipes/nei/NEIHandlerSqueezer.java +++ /dev/null @@ -1,258 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v3 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: - * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges - ******************************************************************************/ -package forestry.factory.recipes.nei; - -import java.awt.Point; -import java.awt.Rectangle; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.List; -import java.util.Random; - -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.item.ItemStack; -import net.minecraft.util.StatCollector; - -import net.minecraftforge.fluids.FluidStack; - -import forestry.api.recipes.ISqueezerRecipe; -import forestry.api.recipes.RecipeManagers; -import forestry.core.fluids.FluidHelper; -import forestry.core.recipes.nei.NEIUtils; -import forestry.core.recipes.nei.PositionedFluidTank; -import forestry.core.recipes.nei.PositionedStackAdv; -import forestry.core.recipes.nei.RecipeHandlerBase; -import forestry.factory.gui.GuiSqueezer; -import forestry.factory.recipes.ISqueezerContainerRecipe; -import forestry.factory.recipes.SqueezerRecipeManager; - -import codechicken.nei.NEIServerUtils; -import codechicken.nei.PositionedStack; - -public class NEIHandlerSqueezer extends RecipeHandlerBase { - - private static final int[][] INPUTS = new int[][]{{0, 0}, {1, 0}, {2, 0}, {0, 1}, {1, 1}, {2, 1}, {0, 2}, {1, 2}, {2, 2}}; - - public class CachedSqueezerRecipe extends CachedBaseRecipe { - - public List inputs = new ArrayList<>(); - public PositionedFluidTank tank; - public PositionedStackAdv remnants = null; - public int processingTime; - public boolean containerRecipe = false; - - public CachedSqueezerRecipe(ISqueezerRecipe recipe, boolean genPerms) { - if (recipe.getResources() != null) { - this.setIngredients(recipe.getResources()); - } - if (recipe.getFluidOutput() != null) { - setTankFluid(recipe.getFluidOutput()); - } - if (recipe.getRemnants() != null) { - this.remnants = new PositionedStackAdv(recipe.getRemnants(), 92, 49).setChance(recipe.getRemnantsChance()); - } - - this.processingTime = recipe.getProcessingTime(); - - if (genPerms) { - this.generatePermutations(); - } - } - - public CachedSqueezerRecipe(ISqueezerRecipe recipe) { - this(recipe, false); - } - - public CachedSqueezerRecipe(ISqueezerContainerRecipe recipe, boolean genPerms) { - this.containerRecipe = true; - - ItemStack emptyContainer = recipe.getEmptyContainer(); - List ingredients = FluidHelper.getAllFilledContainers(emptyContainer); - setIngredients(new Object[]{ingredients}); - List fluids = new ArrayList<>(); - for (ItemStack ingredient : ingredients) { - FluidStack fluidStack = FluidHelper.getFluidStackInContainer(ingredient); - fluids.add(fluidStack); - } - setTankFluid(fluids); - - if (recipe.getRemnants() != null) { - this.remnants = new PositionedStackAdv(recipe.getRemnants(), 92, 49).setChance(recipe.getRemnantsChance()); - } - - this.processingTime = recipe.getProcessingTime(); - - if (genPerms) { - this.generatePermutations(); - } - } - - public void setIngredients(Object[] inputs) { - this.inputs.clear(); - int i = 0; - for (Object stack : inputs) { - if (i >= INPUTS.length) { - return; - } - this.inputs.add(new PositionedStack(stack, 12 + INPUTS[i][0] * 18, 10 + INPUTS[i][1] * 18, false)); - i++; - } - } - - public void setTankFluid(FluidStack... fluidStack) { - setTankFluid(Arrays.asList(fluidStack)); - } - - public void setTankFluid(Collection fluidStacks) { - this.tank = new PositionedFluidTank(fluidStacks, 10000, new Rectangle(117, 7, 16, 58), NEIHandlerSqueezer.this.getGuiTexture(), new Point(176, 0)); - } - - @Override - public List getIngredients() { - return this.getCycledIngredients(NEIHandlerSqueezer.this.cycleticks / 20, this.inputs); - } - - @Override - public List getCycledIngredients(int cycle, List ingredients) { - if (containerRecipe) { - // cycle ingredients and output together - Random random = new Random(cycle); - cycle = Math.abs(random.nextInt()); - for (PositionedStack ingredient : ingredients) { - ingredient.setPermutationToRender(cycle % ingredient.items.length); - } - tank.setPermutationToRender(cycle % tank.getPermutationCount()); - return ingredients; - } else { - return super.getCycledIngredients(cycle, ingredients); - } - } - - @Override - public PositionedFluidTank getFluidTank() { - return this.tank; - } - - @Override - public PositionedStack getResult() { - return this.remnants; - } - - public void generatePermutations() { - for (PositionedStack p : this.inputs) { - p.generatePermutations(); - } - } - - } - - @Override - public String getRecipeID() { - return "forestry.squeezer"; - } - - @Override - public String getRecipeName() { - return StatCollector.translateToLocal("tile.for.factory.5.name"); - } - - @Override - public String getGuiTexture() { - return "forestry:textures/gui/squeezersocket.png"; - } - - @Override - public void loadTransferRects() { - this.addTransferRect(98 - 16 - 6 - 4, 9 + 8 + 8 + 4, 15 + 16 + 6 + 4, 18); - } - - @Override - public void drawExtras(int recipeIndex) { - CachedRecipe recipe = arecipes.get(recipeIndex); - if (recipe instanceof CachedSqueezerRecipe) { - int processingTime = ((CachedSqueezerRecipe) recipe).processingTime; - this.drawProgressBar(70, 30, 176, 60, 43, 18, processingTime * 5, 0); - } - } - - @Override - public Class getGuiClass() { - return GuiSqueezer.class; - } - - @Override - public void loadAllRecipes() { - for (ISqueezerRecipe recipe : RecipeManagers.squeezerManager.recipes()) { - this.arecipes.add(new CachedSqueezerRecipe(recipe, true)); - } - for (ISqueezerContainerRecipe containerRecipe : SqueezerRecipeManager.containerRecipes.values()) { - this.arecipes.add(new CachedSqueezerRecipe(containerRecipe, true)); - } - } - - @Override - public void loadCraftingRecipes(ItemStack result) { - for (ISqueezerRecipe recipe : RecipeManagers.squeezerManager.recipes()) { - if (NEIServerUtils.areStacksSameTypeCrafting(recipe.getRemnants(), result)) { - this.arecipes.add(new CachedSqueezerRecipe(recipe, true)); - } - } - for (ISqueezerContainerRecipe containerRecipe : SqueezerRecipeManager.containerRecipes.values()) { - if (NEIServerUtils.areStacksSameTypeCrafting(containerRecipe.getRemnants(), result)) { - this.arecipes.add(new CachedSqueezerRecipe(containerRecipe, true)); - } - } - } - - @Override - public void loadCraftingRecipes(FluidStack result) { - for (ISqueezerRecipe recipe : RecipeManagers.squeezerManager.recipes()) { - if (NEIUtils.areFluidsSameType(recipe.getFluidOutput(), result)) { - this.arecipes.add(new CachedSqueezerRecipe(recipe, true)); - } - } - for (ISqueezerContainerRecipe containerRecipe : SqueezerRecipeManager.containerRecipes.values()) { - ItemStack emptyContainer = containerRecipe.getEmptyContainer(); - ItemStack filledContainer = FluidHelper.getFilledContainer(result, emptyContainer); - if (filledContainer != null) { - ISqueezerRecipe recipe = containerRecipe.getSqueezerRecipe(filledContainer); - if (recipe != null) { - this.arecipes.add(new CachedSqueezerRecipe(recipe, true)); - } - } - } - } - - @Override - public void loadUsageRecipes(ItemStack ingred) { - ingred.stackSize = 1; - - ISqueezerContainerRecipe containerRecipe = SqueezerRecipeManager.findMatchingContainerRecipe(ingred); - if (containerRecipe != null) { - CachedSqueezerRecipe crecipe = new CachedSqueezerRecipe(containerRecipe, true); - crecipe.setIngredients(new ItemStack[]{ingred}); - FluidStack fluidStack = FluidHelper.getFluidStackInContainer(ingred); - crecipe.setTankFluid(fluidStack); - this.arecipes.add(crecipe); - return; - } - - ISqueezerRecipe recipe = SqueezerRecipeManager.findMatchingRecipe(new ItemStack[]{ingred}); - if (recipe != null) { - CachedSqueezerRecipe crecipe = new CachedSqueezerRecipe(recipe); - // Override recipe to show the right input in case it's OD - crecipe.setIngredients(new ItemStack[]{ingred}); - this.arecipes.add(crecipe); - } - } - -} diff --git a/src/main/java/forestry/factory/recipes/nei/NEIHandlerStill.java b/src/main/java/forestry/factory/recipes/nei/NEIHandlerStill.java deleted file mode 100644 index 14b5fe310..000000000 --- a/src/main/java/forestry/factory/recipes/nei/NEIHandlerStill.java +++ /dev/null @@ -1,122 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v3 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: - * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges - ******************************************************************************/ -package forestry.factory.recipes.nei; - -import java.awt.Point; -import java.awt.Rectangle; -import java.util.ArrayList; -import java.util.List; - -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.util.StatCollector; - -import net.minecraftforge.fluids.FluidStack; - -import forestry.api.recipes.IStillRecipe; -import forestry.api.recipes.RecipeManagers; -import forestry.core.recipes.nei.NEIUtils; -import forestry.core.recipes.nei.PositionedFluidTank; -import forestry.core.recipes.nei.RecipeHandlerBase; -import forestry.factory.gui.GuiStill; - -import codechicken.lib.gui.GuiDraw; -import codechicken.nei.PositionedStack; - -public class NEIHandlerStill extends RecipeHandlerBase { - - public class CachedStillRecipe extends CachedBaseRecipe { - - public List tanks = new ArrayList<>(); - - public CachedStillRecipe(IStillRecipe recipe) { - if (recipe.getInput() != null) { - this.tanks.add(new PositionedFluidTank(recipe.getInput(), 10000, new Rectangle(30, 4, 16, 58), NEIHandlerStill.this.getGuiTexture(), new Point(176, 0))); - } - if (recipe.getOutput() != null) { - this.tanks.add(new PositionedFluidTank(recipe.getOutput(), 10000, new Rectangle(120, 4, 16, 58), NEIHandlerStill.this.getGuiTexture(), new Point(176, 0))); - } - } - - @Override - public PositionedStack getResult() { - return null; - } - - @Override - public List getFluidTanks() { - return this.tanks; - } - - } - - @Override - public String getRecipeID() { - return "forestry.still"; - } - - @Override - public String getRecipeName() { - return StatCollector.translateToLocal("tile.for.factory.6.name"); - } - - @Override - public String getGuiTexture() { - return "forestry:textures/gui/still.png"; - } - - @Override - public void loadTransferRects() { - this.addTransferRect(76, 27, 14, 12); - } - - @Override - public Class getGuiClass() { - return GuiStill.class; - } - - @Override - public void drawBackground(int recipe) { - this.changeToGuiTexture(); - GuiDraw.drawTexturedModalRect(25, 0, 30, 11, 116, 65); - } - - @Override - public void drawExtras(int recipe) { - this.drawProgressBar(79, 6, 176, 74, 4, 18, 80, 11); - GuiDraw.drawTexturedModalRect(77, 46, 176, 60, 14, 14); - } - - @Override - public void loadAllRecipes() { - for (IStillRecipe recipe : RecipeManagers.stillManager.recipes()) { - this.arecipes.add(new CachedStillRecipe(recipe)); - } - } - - @Override - public void loadCraftingRecipes(FluidStack result) { - for (IStillRecipe recipe : RecipeManagers.stillManager.recipes()) { - if (NEIUtils.areFluidsSameType(recipe.getOutput(), result)) { - this.arecipes.add(new CachedStillRecipe(recipe)); - } - } - } - - @Override - public void loadUsageRecipes(FluidStack ingred) { - for (IStillRecipe recipe : RecipeManagers.stillManager.recipes()) { - if (NEIUtils.areFluidsSameType(recipe.getInput(), ingred)) { - this.arecipes.add(new CachedStillRecipe(recipe)); - } - } - } - -} diff --git a/src/main/java/forestry/factory/tiles/TileBottler.java b/src/main/java/forestry/factory/tiles/TileBottler.java index ec36601ef..08280cf19 100644 --- a/src/main/java/forestry/factory/tiles/TileBottler.java +++ b/src/main/java/forestry/factory/tiles/TileBottler.java @@ -19,14 +19,12 @@ import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; - -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; - -import cpw.mods.fml.common.Optional; +import net.minecraftforge.fml.common.Optional; import forestry.api.core.IErrorLogic; import forestry.core.config.Constants; @@ -168,39 +166,39 @@ public class TileBottler extends TilePowered implements ISidedInventory, ILiquid } @Override - public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { + public int fill(EnumFacing from, FluidStack resource, boolean doFill) { return tankManager.fill(from, resource, doFill); } @Override - public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) { + public FluidStack drain(EnumFacing from, FluidStack resource, boolean doDrain) { return tankManager.drain(from, resource, doDrain); } @Override - public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) { + public FluidStack drain(EnumFacing from, int maxDrain, boolean doDrain) { return tankManager.drain(from, maxDrain, doDrain); } @Override - public boolean canFill(ForgeDirection from, Fluid fluid) { + public boolean canFill(EnumFacing from, Fluid fluid) { return tankManager.canFill(from, fluid); } @Override - public boolean canDrain(ForgeDirection from, Fluid fluid) { + public boolean canDrain(EnumFacing from, Fluid fluid) { return tankManager.canDrain(from, fluid); } @Override - public FluidTankInfo[] getTankInfo(ForgeDirection from) { + public FluidTankInfo[] getTankInfo(EnumFacing from) { return tankManager.getTankInfo(from); } /* ITRIGGERPROVIDER */ @Optional.Method(modid = "BuildCraftAPI|statements") @Override - public Collection getExternalTriggers(ForgeDirection side, TileEntity tile) { + public Collection getExternalTriggers(EnumFacing side, TileEntity tile) { LinkedList res = new LinkedList<>(); res.add(FactoryTriggers.lowResource25); res.add(FactoryTriggers.lowResource10); diff --git a/src/main/java/forestry/factory/tiles/TileCarpenter.java b/src/main/java/forestry/factory/tiles/TileCarpenter.java index ef2bf9b20..4f5ccf4c5 100644 --- a/src/main/java/forestry/factory/tiles/TileCarpenter.java +++ b/src/main/java/forestry/factory/tiles/TileCarpenter.java @@ -19,8 +19,7 @@ import net.minecraft.inventory.ISidedInventory; import net.minecraft.inventory.InventoryCraftResult; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; - -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; @@ -242,7 +241,7 @@ public class TileCarpenter extends TilePowered implements ISidedInventory, ILiqu // IFLUIDCONTAINER IMPLEMENTATION @Override - public int fill(ForgeDirection direction, FluidStack resource, boolean doFill) { + public int fill(EnumFacing direction, FluidStack resource, boolean doFill) { return tankManager.fill(direction, resource, doFill); } @@ -252,27 +251,27 @@ public class TileCarpenter extends TilePowered implements ISidedInventory, ILiqu } @Override - public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) { + public FluidStack drain(EnumFacing from, FluidStack resource, boolean doDrain) { return tankManager.drain(from, resource, doDrain); } @Override - public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) { + public FluidStack drain(EnumFacing from, int maxDrain, boolean doDrain) { return tankManager.drain(from, maxDrain, doDrain); } @Override - public boolean canFill(ForgeDirection from, Fluid fluid) { + public boolean canFill(EnumFacing from, Fluid fluid) { return tankManager.canFill(from, fluid); } @Override - public boolean canDrain(ForgeDirection from, Fluid fluid) { + public boolean canDrain(EnumFacing from, Fluid fluid) { return tankManager.canDrain(from, fluid); } @Override - public FluidTankInfo[] getTankInfo(ForgeDirection from) { + public FluidTankInfo[] getTankInfo(EnumFacing from) { return tankManager.getTankInfo(from); } diff --git a/src/main/java/forestry/factory/tiles/TileCentrifuge.java b/src/main/java/forestry/factory/tiles/TileCentrifuge.java index c023301cb..72d6b1117 100644 --- a/src/main/java/forestry/factory/tiles/TileCentrifuge.java +++ b/src/main/java/forestry/factory/tiles/TileCentrifuge.java @@ -21,11 +21,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; - -import net.minecraftforge.common.util.ForgeDirection; - -import cpw.mods.fml.common.Optional; - +import net.minecraft.util.EnumFacing; +import net.minecraftforge.fml.common.Optional; import forestry.api.circuits.ChipsetManager; import forestry.api.circuits.CircuitSocketType; import forestry.api.circuits.ICircuitBoard; @@ -199,7 +196,7 @@ public class TileCentrifuge extends TilePowered implements ISocketable, ISidedIn /* ITRIGGERPROVIDER */ @Optional.Method(modid = "BuildCraftAPI|statements") @Override - public Collection getExternalTriggers(ForgeDirection side, TileEntity tile) { + public Collection getExternalTriggers(EnumFacing side, TileEntity tile) { LinkedList res = new LinkedList<>(); res.add(FactoryTriggers.lowResource25); res.add(FactoryTriggers.lowResource10); diff --git a/src/main/java/forestry/factory/tiles/TileFabricator.java b/src/main/java/forestry/factory/tiles/TileFabricator.java index f03d786a3..a7fba7353 100644 --- a/src/main/java/forestry/factory/tiles/TileFabricator.java +++ b/src/main/java/forestry/factory/tiles/TileFabricator.java @@ -20,8 +20,7 @@ import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; - -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; @@ -327,32 +326,32 @@ public class TileFabricator extends TilePowered implements ISlotPickupWatcher, I } @Override - public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { + public int fill(EnumFacing from, FluidStack resource, boolean doFill) { return tankManager.fill(from, resource, doFill); } @Override - public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) { + public FluidStack drain(EnumFacing from, FluidStack resource, boolean doDrain) { return tankManager.drain(from, resource, doDrain); } @Override - public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) { + public FluidStack drain(EnumFacing from, int maxDrain, boolean doDrain) { return tankManager.drain(from, maxDrain, doDrain); } @Override - public boolean canFill(ForgeDirection from, Fluid fluid) { + public boolean canFill(EnumFacing from, Fluid fluid) { return tankManager.canFill(from, fluid); } @Override - public boolean canDrain(ForgeDirection from, Fluid fluid) { + public boolean canDrain(EnumFacing from, Fluid fluid) { return tankManager.canDrain(from, fluid); } @Override - public FluidTankInfo[] getTankInfo(ForgeDirection from) { + public FluidTankInfo[] getTankInfo(EnumFacing from) { return tankManager.getTankInfo(from); } diff --git a/src/main/java/forestry/factory/tiles/TileFermenter.java b/src/main/java/forestry/factory/tiles/TileFermenter.java index 2b6d8960e..c521bbb7f 100644 --- a/src/main/java/forestry/factory/tiles/TileFermenter.java +++ b/src/main/java/forestry/factory/tiles/TileFermenter.java @@ -21,14 +21,12 @@ import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; - -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; - -import cpw.mods.fml.common.Optional; +import net.minecraftforge.fml.common.Optional; import forestry.api.core.IErrorLogic; import forestry.api.fuels.FermenterFuel; @@ -297,27 +295,27 @@ public class TileFermenter extends TilePowered implements ISidedInventory, ILiqu /* ILiquidTankTile */ @Override - public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { + public int fill(EnumFacing from, FluidStack resource, boolean doFill) { return resourceTank.fill(resource, doFill); } @Override - public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) { + public FluidStack drain(EnumFacing from, FluidStack resource, boolean doDrain) { return tankManager.drain(from, resource, doDrain); } @Override - public FluidStack drain(ForgeDirection from, int quantityMax, boolean doEmpty) { + public FluidStack drain(EnumFacing from, int quantityMax, boolean doEmpty) { return tankManager.drain(from, quantityMax, doEmpty); } @Override - public boolean canFill(ForgeDirection from, Fluid fluid) { + public boolean canFill(EnumFacing from, Fluid fluid) { return tankManager.canFill(from, fluid); } @Override - public boolean canDrain(ForgeDirection from, Fluid fluid) { + public boolean canDrain(EnumFacing from, Fluid fluid) { return tankManager.canDrain(from, fluid); } @@ -327,14 +325,14 @@ public class TileFermenter extends TilePowered implements ISidedInventory, ILiqu } @Override - public FluidTankInfo[] getTankInfo(ForgeDirection from) { + public FluidTankInfo[] getTankInfo(EnumFacing from) { return tankManager.getTankInfo(from); } /* ITRIGGERPROVIDER */ @Optional.Method(modid = "BuildCraftAPI|statements") @Override - public Collection getExternalTriggers(ForgeDirection side, TileEntity tile) { + public Collection getExternalTriggers(EnumFacing side, TileEntity tile) { LinkedList res = new LinkedList<>(); res.add(FactoryTriggers.lowResource25); res.add(FactoryTriggers.lowResource10); diff --git a/src/main/java/forestry/factory/tiles/TileMillRainmaker.java b/src/main/java/forestry/factory/tiles/TileMillRainmaker.java index fa89768b8..221c29f58 100644 --- a/src/main/java/forestry/factory/tiles/TileMillRainmaker.java +++ b/src/main/java/forestry/factory/tiles/TileMillRainmaker.java @@ -83,12 +83,12 @@ public class TileMillRainmaker extends TileMill { @Override public void activate() { if (Proxies.render.hasRendering()) { - worldObj.playSoundEffect(xCoord, yCoord, zCoord, "ambient.weather.thunder", 4F, + worldObj.playSoundEffect(getPos().getX(), getPos().getY(), getPos().getZ(), "ambient.weather.thunder", 4F, (1.0F + (worldObj.rand.nextFloat() - worldObj.rand.nextFloat()) * 0.2F) * 0.7F); - float f = xCoord + 0.5F; - float f1 = yCoord + 0.0F + (worldObj.rand.nextFloat() * 6F) / 16F; - float f2 = zCoord + 0.5F; + float f = getPos().getX() + 0.5F; + float f1 = getPos().getY() + 0.0F + (worldObj.rand.nextFloat() * 6F) / 16F; + float f2 = getPos().getZ() + 0.5F; float f3 = 0.52F; float f4 = worldObj.rand.nextFloat() * 0.6F - 0.3F; diff --git a/src/main/java/forestry/factory/tiles/TileMoistener.java b/src/main/java/forestry/factory/tiles/TileMoistener.java index 28fae034b..d5db7a081 100644 --- a/src/main/java/forestry/factory/tiles/TileMoistener.java +++ b/src/main/java/forestry/factory/tiles/TileMoistener.java @@ -19,8 +19,7 @@ import net.minecraft.inventory.ICrafting; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; - -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; @@ -137,7 +136,7 @@ public class TileMoistener extends TileBase implements ISidedInventory, ILiquidT } // Let's get to work - int lightvalue = worldObj.getBlockLightValue(xCoord, yCoord + 1, zCoord); + int lightvalue = worldObj.getLightFromNeighbors(getPos().add(0, 1, 0)); IErrorLogic errorLogic = getErrorLogic(); @@ -479,7 +478,7 @@ public class TileMoistener extends TileBase implements ISidedInventory, ILiquidT /* ILiquidTankTile */ @Override - public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { + public int fill(EnumFacing from, FluidStack resource, boolean doFill) { return tankManager.fill(from, resource, doFill); } @@ -489,27 +488,27 @@ public class TileMoistener extends TileBase implements ISidedInventory, ILiquidT } @Override - public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) { + public FluidStack drain(EnumFacing from, FluidStack resource, boolean doDrain) { return tankManager.drain(from, resource, doDrain); } @Override - public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) { + public FluidStack drain(EnumFacing from, int maxDrain, boolean doDrain) { return tankManager.drain(from, maxDrain, doDrain); } @Override - public boolean canFill(ForgeDirection from, Fluid fluid) { + public boolean canFill(EnumFacing from, Fluid fluid) { return tankManager.canFill(from, fluid); } @Override - public boolean canDrain(ForgeDirection from, Fluid fluid) { + public boolean canDrain(EnumFacing from, Fluid fluid) { return tankManager.canDrain(from, fluid); } @Override - public FluidTankInfo[] getTankInfo(ForgeDirection from) { + public FluidTankInfo[] getTankInfo(EnumFacing from) { return tankManager.getTankInfo(from); } diff --git a/src/main/java/forestry/factory/tiles/TileRaintank.java b/src/main/java/forestry/factory/tiles/TileRaintank.java index 56df61d71..d4b045c42 100644 --- a/src/main/java/forestry/factory/tiles/TileRaintank.java +++ b/src/main/java/forestry/factory/tiles/TileRaintank.java @@ -18,9 +18,9 @@ import net.minecraft.inventory.ICrafting; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.EnumFacing; import net.minecraft.world.biome.BiomeGenBase; -import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; @@ -65,7 +65,7 @@ public class TileRaintank extends TileBase implements ISidedInventory, ILiquidTa public void validate() { // Raintanks in desert biomes are useless if (worldObj != null) { - BiomeGenBase biome = worldObj.getBiomeGenForCoordsBody(xCoord, zCoord); + BiomeGenBase biome = worldObj.getBiomeGenForCoordsBody(getPos()); isValidBiome = BiomeHelper.canRainOrSnow(biome); getErrorLogic().setCondition(!isValidBiome, EnumErrorCode.NO_RAIN_BIOME); } @@ -114,7 +114,7 @@ public class TileRaintank extends TileBase implements ISidedInventory, ILiquidTa errorLogic.setCondition(!isValidBiome, EnumErrorCode.NO_RAIN_BIOME); - boolean hasSky = worldObj.canBlockSeeTheSky(xCoord, yCoord + 1, zCoord); + boolean hasSky = worldObj.canBlockSeeSky(getPos().add(0, 1, 0)); errorLogic.setCondition(!hasSky, EnumErrorCode.NO_SKY_RAIN_TANK); errorLogic.setCondition(!worldObj.isRaining(), EnumErrorCode.NOT_RAINING); @@ -171,27 +171,27 @@ public class TileRaintank extends TileBase implements ISidedInventory, ILiquidTa // / ILIQUIDCONTAINER IMPLEMENTATION @Override - public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { + public int fill(EnumFacing from, FluidStack resource, boolean doFill) { return tankManager.fill(from, resource, doFill); } @Override - public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) { + public FluidStack drain(EnumFacing from, FluidStack resource, boolean doDrain) { return tankManager.drain(from, resource, doDrain); } @Override - public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) { + public FluidStack drain(EnumFacing from, int maxDrain, boolean doDrain) { return tankManager.drain(from, maxDrain, doDrain); } @Override - public boolean canFill(ForgeDirection from, Fluid fluid) { + public boolean canFill(EnumFacing from, Fluid fluid) { return tankManager.canFill(from, fluid); } @Override - public boolean canDrain(ForgeDirection from, Fluid fluid) { + public boolean canDrain(EnumFacing from, Fluid fluid) { return tankManager.canDrain(from, fluid); } @@ -201,7 +201,7 @@ public class TileRaintank extends TileBase implements ISidedInventory, ILiquidTa } @Override - public FluidTankInfo[] getTankInfo(ForgeDirection from) { + public FluidTankInfo[] getTankInfo(EnumFacing from) { return tankManager.getTankInfo(from); } diff --git a/src/main/java/forestry/factory/tiles/TileSqueezer.java b/src/main/java/forestry/factory/tiles/TileSqueezer.java index f978a98d3..8e362f86d 100644 --- a/src/main/java/forestry/factory/tiles/TileSqueezer.java +++ b/src/main/java/forestry/factory/tiles/TileSqueezer.java @@ -16,8 +16,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; - -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; @@ -212,32 +211,32 @@ public class TileSqueezer extends TilePowered implements ISocketable, ISidedInve } @Override - public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { + public int fill(EnumFacing from, FluidStack resource, boolean doFill) { return tankManager.fill(from, resource, doFill); } @Override - public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) { + public FluidStack drain(EnumFacing from, FluidStack resource, boolean doDrain) { return tankManager.drain(from, resource, doDrain); } @Override - public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) { + public FluidStack drain(EnumFacing from, int maxDrain, boolean doDrain) { return tankManager.drain(from, maxDrain, doDrain); } @Override - public boolean canFill(ForgeDirection from, Fluid fluid) { + public boolean canFill(EnumFacing from, Fluid fluid) { return tankManager.canFill(from, fluid); } @Override - public boolean canDrain(ForgeDirection from, Fluid fluid) { + public boolean canDrain(EnumFacing from, Fluid fluid) { return tankManager.canDrain(from, fluid); } @Override - public FluidTankInfo[] getTankInfo(ForgeDirection from) { + public FluidTankInfo[] getTankInfo(EnumFacing from) { return tankManager.getTankInfo(from); } diff --git a/src/main/java/forestry/factory/tiles/TileStill.java b/src/main/java/forestry/factory/tiles/TileStill.java index 18a4e1f30..4b186cedd 100644 --- a/src/main/java/forestry/factory/tiles/TileStill.java +++ b/src/main/java/forestry/factory/tiles/TileStill.java @@ -15,13 +15,11 @@ import java.io.IOException; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.ISidedInventory; import net.minecraft.nbt.NBTTagCompound; - -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; - import forestry.api.core.IErrorLogic; import forestry.api.recipes.IStillRecipe; import forestry.core.config.Constants; @@ -178,27 +176,27 @@ public class TileStill extends TilePowered implements ISidedInventory, ILiquidTa /* IFluidHandler */ @Override - public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { + public int fill(EnumFacing from, FluidStack resource, boolean doFill) { return tankManager.fill(from, resource, doFill); } @Override - public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) { + public FluidStack drain(EnumFacing from, FluidStack resource, boolean doDrain) { return tankManager.drain(from, resource, doDrain); } @Override - public FluidStack drain(ForgeDirection from, int quantityMax, boolean doEmpty) { + public FluidStack drain(EnumFacing from, int quantityMax, boolean doEmpty) { return tankManager.drain(from, quantityMax, doEmpty); } @Override - public boolean canFill(ForgeDirection from, Fluid fluid) { + public boolean canFill(EnumFacing from, Fluid fluid) { return tankManager.canFill(from, fluid); } @Override - public boolean canDrain(ForgeDirection from, Fluid fluid) { + public boolean canDrain(EnumFacing from, Fluid fluid) { return tankManager.canDrain(from, fluid); } @@ -208,7 +206,7 @@ public class TileStill extends TilePowered implements ISidedInventory, ILiquidTa } @Override - public FluidTankInfo[] getTankInfo(ForgeDirection from) { + public FluidTankInfo[] getTankInfo(EnumFacing from) { return tankManager.getTankInfo(from); } diff --git a/src/main/java/forestry/factory/triggers/TriggerLowFuel.java b/src/main/java/forestry/factory/triggers/TriggerLowFuel.java index 77da0a62c..f42408649 100644 --- a/src/main/java/forestry/factory/triggers/TriggerLowFuel.java +++ b/src/main/java/forestry/factory/triggers/TriggerLowFuel.java @@ -11,9 +11,7 @@ package forestry.factory.triggers; import net.minecraft.tileentity.TileEntity; - -import net.minecraftforge.common.util.ForgeDirection; - +import net.minecraft.util.EnumFacing; import forestry.core.tiles.TileEngine; import forestry.core.tiles.TilePowered; import forestry.core.triggers.Trigger; @@ -39,7 +37,7 @@ public class TriggerLowFuel extends Trigger { * Return true if the tile given in parameter activates the trigger, given the parameters. */ @Override - public boolean isTriggerActive(TileEntity tile, ForgeDirection side, IStatementContainer source, IStatementParameter[] parameters) { + public boolean isTriggerActive(TileEntity tile, EnumFacing side, IStatementContainer source, IStatementParameter[] parameters) { if (tile instanceof TilePowered) { return !((TilePowered) tile).hasFuelMin(threshold); diff --git a/src/main/java/forestry/factory/triggers/TriggerLowResource.java b/src/main/java/forestry/factory/triggers/TriggerLowResource.java index e652bfe37..9a213a8b0 100644 --- a/src/main/java/forestry/factory/triggers/TriggerLowResource.java +++ b/src/main/java/forestry/factory/triggers/TriggerLowResource.java @@ -11,9 +11,7 @@ package forestry.factory.triggers; import net.minecraft.tileentity.TileEntity; - -import net.minecraftforge.common.util.ForgeDirection; - +import net.minecraft.util.EnumFacing; import forestry.core.tiles.TilePowered; import forestry.core.triggers.Trigger; @@ -38,7 +36,7 @@ public class TriggerLowResource extends Trigger { * Return true if the tile given in parameter activates the trigger, given the parameters. */ @Override - public boolean isTriggerActive(TileEntity tile, ForgeDirection side, IStatementContainer source, IStatementParameter[] parameters) { + public boolean isTriggerActive(TileEntity tile, EnumFacing side, IStatementContainer source, IStatementParameter[] parameters) { if (!(tile instanceof TilePowered)) { return false; } diff --git a/src/main/java/forestry/farming/FarmHelper.java b/src/main/java/forestry/farming/FarmHelper.java index aad125448..66ed57ab7 100755 --- a/src/main/java/forestry/farming/FarmHelper.java +++ b/src/main/java/forestry/farming/FarmHelper.java @@ -14,10 +14,9 @@ import com.google.common.collect.ImmutableSet; import net.minecraft.block.Block; import net.minecraft.init.Blocks; +import net.minecraft.util.EnumFacing; import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; - import forestry.api.farming.FarmDirection; import forestry.api.multiblock.IFarmComponent; import forestry.core.utils.vect.MutableVect; @@ -35,8 +34,8 @@ public class FarmHelper { ); private static FarmDirection getOpposite(FarmDirection farmDirection) { - ForgeDirection forgeDirection = farmDirection.getForgeDirection(); - ForgeDirection forgeDirectionOpposite = forgeDirection.getOpposite(); + EnumFacing forgeDirection = farmDirection.getForgeDirection(); + EnumFacing forgeDirectionOpposite = forgeDirection.getOpposite(); return FarmDirection.getFarmDirection(forgeDirectionOpposite); } diff --git a/src/main/java/forestry/farming/blocks/BlockFarm.java b/src/main/java/forestry/farming/blocks/BlockFarm.java index 750a0fb6b..d351c4c81 100644 --- a/src/main/java/forestry/farming/blocks/BlockFarm.java +++ b/src/main/java/forestry/farming/blocks/BlockFarm.java @@ -15,8 +15,13 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.block.properties.IProperty; +import net.minecraft.block.properties.PropertyEnum; +import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.IBlockState; import net.minecraft.client.particle.EffectRenderer; -import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.client.particle.EntityDiggingFX; +import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -24,16 +29,25 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumWorldBlockLayer; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - +import net.minecraftforge.common.property.IExtendedBlockState; +import net.minecraftforge.common.property.IUnlistedProperty; +import net.minecraftforge.client.model.ModelLoader; +import net.minecraftforge.common.property.ExtendedBlockState; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +import forestry.api.core.IModelManager; import forestry.core.blocks.BlockStructure; +import forestry.core.blocks.propertys.UnlistedBlockAccess; +import forestry.core.blocks.propertys.UnlistedBlockPos; import forestry.core.render.ParticleHelper; +import forestry.core.render.ParticleHelper.DefaultCallback; +import forestry.core.utils.BlockUtil; import forestry.core.utils.ItemStackUtil; import forestry.farming.render.EnumFarmBlockTexture; import forestry.farming.tiles.TileFarm; @@ -42,17 +56,42 @@ import forestry.farming.tiles.TileFarmGearbox; import forestry.farming.tiles.TileFarmHatch; import forestry.farming.tiles.TileFarmPlain; import forestry.farming.tiles.TileFarmValve; -import forestry.plugins.PluginFarming; public class BlockFarm extends BlockStructure { private final ParticleHelper.Callback particleCallback; + public static final PropertyEnum META = PropertyEnum.create("meta", EnumBlockFarmType.class); + public BlockFarm() { super(Material.rock); setHardness(1.0f); setHarvestLevel("pickaxe", 0); - this.particleCallback = new ParticleHelper.DefaultCallback(this); + this.particleCallback = new FarmCallback(this); + setDefaultState(blockState.getBaseState().withProperty(META, EnumBlockFarmType.BASIC)); + } + + + @Override + public IBlockState getStateFromMeta(int meta) { + return getDefaultState().withProperty(META, EnumBlockFarmType.values()[meta]); + } + + @Override + public int getMetaFromState(IBlockState state) { + return ((EnumBlockFarmType) state.getValue(META)).ordinal(); + } + + @Override + public IBlockState getExtendedState(IBlockState state, IBlockAccess world, BlockPos pos) { + return ((IExtendedBlockState) super.getExtendedState(state, world, pos)).withProperty(UnlistedBlockPos.POS, pos) + .withProperty(UnlistedBlockAccess.BLOCKACCESS, world); + } + + @Override + protected BlockState createBlockState() { + return new ExtendedBlockState(this, new IProperty[] { META }, + new IUnlistedProperty[] { UnlistedBlockPos.POS, UnlistedBlockAccess.BLOCKACCESS }); } @Override @@ -73,44 +112,45 @@ public class BlockFarm extends BlockStructure { } } } - + @Override - public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z) { - ArrayList drops = getDrops(world, x, y, z, 0, 0); + public ItemStack getPickBlock(MovingObjectPosition target, World world, BlockPos pos, EntityPlayer player) { + List drops = getDrops(world, pos, BlockUtil.getBlockState(world, pos), 0); if (drops.isEmpty()) { - return super.getPickBlock(target, world, x, y, z); + return super.getPickBlock(target, world, pos, player); } return drops.get(0); } - + @Override - public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase entityLiving, ItemStack stack) { - super.onBlockPlacedBy(world, x, y, z, entityLiving, stack); + public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, EntityLivingBase placer, ItemStack stack) { + super.onBlockPlacedBy(world, pos, state, placer, stack); + if (!stack.hasTagCompound()) { return; } - TileFarm tile = (TileFarm) world.getTileEntity(x, y, z); + TileFarm tile = (TileFarm) world.getTileEntity(pos); tile.setFarmBlockTexture(EnumFarmBlockTexture.getFromCompound(stack.getTagCompound())); } - + @Override - public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z) { - int meta = world.getBlockMetadata(x, y, z); - if (!world.isRemote && canHarvestBlock(player, meta)) { - List drops = getDrops(world, x, y, z, 0, 0); + public boolean removedByPlayer(World world, BlockPos pos, EntityPlayer player, boolean willHarvest) { + int meta = BlockUtil.getBlockMetadata(world, pos); + if (!world.isRemote && canHarvestBlock(world, pos, player)) { + List drops = getDrops(world, pos, BlockUtil.getBlockState(world, pos), 0); for (ItemStack drop : drops) { - ItemStackUtil.dropItemStackAsEntity(drop, world, x, y, z); + ItemStackUtil.dropItemStackAsEntity(drop, world, pos); } } - return world.setBlockToAir(x, y, z); + return world.setBlockToAir(pos); } - + @Override - public ArrayList getDrops(World world, int x, int y, int z, int metadata, int fortune) { + public List getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { ArrayList drops = new ArrayList<>(); - int meta = world.getBlockMetadata(x, y, z); - TileEntity tile = world.getTileEntity(x, y, z); + int meta = getMetaFromState(state); + TileEntity tile = world.getTileEntity(pos); if (tile instanceof TileFarm) { TileFarm farm = (TileFarm) tile; @@ -124,14 +164,14 @@ public class BlockFarm extends BlockStructure { } @Override - public int getDamageValue(World world, int x, int y, int z) { - int meta = world.getBlockMetadata(x, y, z); + public int getDamageValue(World world, BlockPos pos) { + int meta = getMetaFromState(world.getBlockState(pos)); return meta != 1 ? meta : 0; } @Override - public TileEntity createTileEntity(World world, int metadata) { - switch (metadata) { + public TileEntity createTileEntity(World world, IBlockState state) { + switch (getMetaFromState(state)) { case 2: return new TileFarmGearbox(); case 3: @@ -147,59 +187,25 @@ public class BlockFarm extends BlockStructure { @Override public TileEntity createNewTileEntity(World world, int meta) { - return createTileEntity(world, meta); - } - - /* ICONS */ - @Override - public int getRenderType() { - return PluginFarming.modelIdFarmBlock; - } - - @SideOnly(Side.CLIENT) - @Override - public void registerBlockIcons(IIconRegister register) { - EnumFarmBlockTexture.registerIcons(register); - } - - @SideOnly(Side.CLIENT) - @Override - public IIcon getIcon(int side, int metadata) { - return getBlockTextureForSide(EnumFarmBlockTexture.BRICK, side); - } - - @SideOnly(Side.CLIENT) - public static IIcon getBlockTextureForSide(EnumFarmBlockTexture type, int side) { - Block block = ItemStackUtil.getBlock(type.getBase()); - if (block == null) { - return null; - } - int damage = type.getBase().getItemDamage(); - return block.getIcon(side, damage); - } - - @SideOnly(Side.CLIENT) - public static IIcon getOverlayTextureForBlock(int side, int metadata) { - BlockFarmType type = BlockFarmType.VALUES[metadata]; - return EnumFarmBlockTexture.getIcon(type, side); + return createTileEntity(world, getStateFromMeta(meta)); } + /* MODELS */ @Override @SideOnly(Side.CLIENT) - public IIcon getIcon(IBlockAccess world, int x, int y, int z, int side) { - TileEntity tile = world.getTileEntity(x, y, z); - ItemStack base = EnumFarmBlockTexture.BRICK_STONE.getBase(); - - if (tile instanceof TileFarm) { - base = ((TileFarm) tile).getFarmBlockTexture().getBase(); - } - - Block block = ItemStackUtil.getBlock(base); - if (block == null) { - return null; - } - - return block.getIcon(side, base.getItemDamage()); + public EnumWorldBlockLayer getBlockLayer() { + return EnumWorldBlockLayer.CUTOUT; + } + + @SideOnly(Side.CLIENT) + @Override + public void registerModel(Item item, IModelManager manager) { + ModelLoader.setCustomModelResourceLocation(item, 0, new ModelResourceLocation("forestry:ffarm", "inventory")); + ModelLoader.setCustomModelResourceLocation(item, 1, new ModelResourceLocation("forestry:ffarm", "inventory")); + ModelLoader.setCustomModelResourceLocation(item, 2, new ModelResourceLocation("forestry:ffarm", "inventory")); + ModelLoader.setCustomModelResourceLocation(item, 3, new ModelResourceLocation("forestry:ffarm", "inventory")); + ModelLoader.setCustomModelResourceLocation(item, 4, new ModelResourceLocation("forestry:ffarm", "inventory")); + ModelLoader.setCustomModelResourceLocation(item, 5, new ModelResourceLocation("forestry:ffarm", "inventory")); } /* Particles */ @@ -211,16 +217,30 @@ public class BlockFarm extends BlockStructure { @SideOnly(Side.CLIENT) @Override - public boolean addDestroyEffects(World worldObj, int x, int y, int z, int meta, EffectRenderer effectRenderer) { - return ParticleHelper.addDestroyEffects(worldObj, this, x, y, z, meta, effectRenderer, particleCallback); + public boolean addDestroyEffects(World world, BlockPos pos, EffectRenderer effectRenderer) { + return ParticleHelper.addDestroyEffects(world, this, world.getBlockState(pos), pos, effectRenderer, particleCallback); + } + + public class FarmCallback extends DefaultCallback{ + + public FarmCallback(Block block) { + super(block); + } + + @Override + protected void setTexture(EntityDiggingFX fx, BlockPos pos, IBlockState state) { + IExtendedBlockState extend = (IExtendedBlockState) state; + fx.setParticleIcon(EnumFarmBlockTexture.getSprite(EnumFarmBlockTexture.BRICK, 0)); + } + } @Override - public boolean canConnectRedstone(IBlockAccess world, int x, int y, int z, int side) { - return world.getBlockMetadata(x, y, z) == 5; + public boolean canConnectRedstone(IBlockAccess world, BlockPos pos, EnumFacing side) { + return getMetaFromState(world.getBlockState(pos)) == 5; } - public ItemStack get(BlockFarmType type, int amount) { + public ItemStack get(EnumBlockFarmType type, int amount) { return new ItemStack(this, amount, type.ordinal()); } } diff --git a/src/main/java/forestry/farming/blocks/BlockFarmType.java b/src/main/java/forestry/farming/blocks/BlockFarmType.java deleted file mode 100644 index 9b01f5605..000000000 --- a/src/main/java/forestry/farming/blocks/BlockFarmType.java +++ /dev/null @@ -1,22 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v3 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: - * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges - ******************************************************************************/ -package forestry.farming.blocks; - -public enum BlockFarmType { - BASIC, - BAND, - GEARBOX, - HATCH, - VALVE, - CONTROL; - - public static final BlockFarmType[] VALUES = values(); -} diff --git a/src/main/java/forestry/farming/blocks/BlockMushroom.java b/src/main/java/forestry/farming/blocks/BlockMushroom.java index c9ac110cd..9646962fb 100644 --- a/src/main/java/forestry/farming/blocks/BlockMushroom.java +++ b/src/main/java/forestry/farming/blocks/BlockMushroom.java @@ -15,27 +15,41 @@ import java.util.List; import java.util.Random; import net.minecraft.block.Block; -import net.minecraft.block.BlockSapling; -import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.block.BlockBush; +import net.minecraft.block.IGrowable; +import net.minecraft.block.properties.IProperty; +import net.minecraft.block.properties.PropertyEnum; +import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; +import net.minecraft.util.BlockPos; +import net.minecraft.util.IStringSerializable; +import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenBigMushroom; import net.minecraft.world.gen.feature.WorldGenerator; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +import forestry.api.core.IModelManager; +import forestry.api.core.IItemModelRegister; import forestry.core.blocks.IItemTyped; import forestry.core.config.Constants; +import forestry.core.utils.BlockUtil; -public class BlockMushroom extends BlockSapling implements IItemTyped { +public class BlockMushroom extends BlockBush implements IItemTyped, IItemModelRegister, IGrowable { - public enum MushroomType { - BROWN, RED + public static final PropertyEnum MUSHROOM = PropertyEnum.create("mushroom", MushroomType.class); + + public enum MushroomType implements IStringSerializable { + BROWN, RED; + + @Override + public String getName() { + return name().toLowerCase(); + } } private final WorldGenerator[] generators; @@ -44,11 +58,27 @@ public class BlockMushroom extends BlockSapling implements IItemTyped { public BlockMushroom() { super(); setHardness(0.0f); - this.generators = new WorldGenerator[]{new WorldGenBigMushroom(MushroomType.BROWN.ordinal()), new WorldGenBigMushroom(MushroomType.RED.ordinal())}; + this.generators = new WorldGenerator[]{new WorldGenBigMushroom(Blocks.brown_mushroom_block), new WorldGenBigMushroom(Blocks.red_mushroom_block)}; this.drops = new ItemStack[]{new ItemStack(Blocks.brown_mushroom), new ItemStack(Blocks.red_mushroom)}; setCreativeTab(null); + setDefaultState(this.blockState.getBaseState().withProperty(MUSHROOM, MushroomType.BROWN)); setTickRandomly(true); } + + @Override + protected BlockState createBlockState() { + return new BlockState(this, new IProperty[] { MUSHROOM }); + } + + @Override + public int getMetaFromState(IBlockState state) { + return ((MushroomType) state.getValue(MUSHROOM)).ordinal(); + } + + @Override + public IBlockState getStateFromMeta(int meta) { + return getDefaultState().withProperty(MUSHROOM, MushroomType.values()[meta]); + } @Override public boolean getTickRandomly() { @@ -57,10 +87,10 @@ public class BlockMushroom extends BlockSapling implements IItemTyped { // / DROPS @Override - public ArrayList getDrops(World world, int X, int Y, int Z, int metadata, int fortune) { + public List getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { ArrayList ret = new ArrayList<>(); - MushroomType type = getTypeFromMeta(metadata); + MushroomType type = getTypeFromMeta(state.getBlock().getMetaFromState(state)); ret.add(drops[type.ordinal()]); @@ -71,24 +101,23 @@ public class BlockMushroom extends BlockSapling implements IItemTyped { protected boolean canPlaceBlockOn(Block block) { return block == Blocks.mycelium; } - + @Override - public void updateTick(World world, int i, int j, int k, Random random) { - + public void updateTick(World world, BlockPos pos, IBlockState state, Random rand) { if (world.isRemote) { return; } - int meta = world.getBlockMetadata(i, j, k); + int meta = BlockUtil.getBlockMetadata(world, pos); MushroomType type = getTypeFromMeta(meta); int maturity = meta >> 2; - tickGermling(world, i, j, k, random, type, maturity); + tickGermling(world, pos.getX(), pos.getY(), pos.getZ(), rand, type, maturity); } private void tickGermling(World world, int i, int j, int k, Random random, MushroomType type, int maturity) { - int lightvalue = world.getBlockLightValue(i, j + 1, k); + int lightvalue = world.getLight(new BlockPos(i, j + 1, k)); if (random.nextInt(2) != 0) { return; @@ -98,21 +127,24 @@ public class BlockMushroom extends BlockSapling implements IItemTyped { maturity = 3; int matX = maturity << 2; int meta = (matX | type.ordinal()); - world.setBlockMetadataWithNotify(i, j, k, meta, Constants.FLAG_BLOCK_SYNCH); + world.setBlockState(new BlockPos(i, j, k), world.getBlockState(new BlockPos(i, j, k)).getBlock().getStateFromMeta(meta), Constants.FLAG_BLOCK_SYNCH); } else if (lightvalue <= 7) { - func_149878_d(world, i, j, k, random); + generateTree(world, new BlockPos(i, j, k), world.getBlockState(new BlockPos(i, j, k)), random); } } + + public void generateTree(World world, BlockPos pos, IBlockState state, Random rand) { + MushroomType type = getTypeFromMeta(BlockUtil.getBlockMetadata(world, pos)); - @Override - public void func_149878_d(World world, int i, int j, int k, Random random) { - MushroomType type = getTypeFromMeta(world.getBlockMetadata(i, j, k)); - - world.setBlockToAir(i, j, k); - if (!generators[type.ordinal()].generate(world, random, i, j, k)) { - world.setBlock(i, j, k, this, type.ordinal(), 0); + world.setBlockToAir(pos); + if (!generators[type.ordinal()].generate(world, rand, pos)) { + world.setBlockState(pos, getStateFromMeta(type.ordinal()), 0); } } + + public void grow(World worldIn, BlockPos pos, IBlockState state, Random rand) { + this.generateTree(worldIn, pos, state, rand); + } @Override public MushroomType getTypeFromMeta(int meta) { @@ -129,24 +161,26 @@ public class BlockMushroom extends BlockSapling implements IItemTyped { list.add(new ItemStack(item, 1, 1)); } - @SideOnly(Side.CLIENT) @Override - public void registerBlockIcons(IIconRegister register) { + @SideOnly(Side.CLIENT) + public void registerModel(Item item, IModelManager manager) { + manager.registerItemModel(item, 0, "minecraft", "red_mushroom"); + manager.registerItemModel(item, 0, "minecraft", "brown_mushroom"); + } + + @Override + public boolean canGrow(World worldIn, BlockPos pos, IBlockState state, boolean isClient) { + return true; } - @SideOnly(Side.CLIENT) @Override - public IIcon getIcon(int side, int meta) { - MushroomType type = getTypeFromMeta(meta); + public boolean canUseBonemeal(World worldIn, Random rand, BlockPos pos, IBlockState state) { + return worldIn.rand.nextFloat() < 0.45D; + } - switch (type) { - case BROWN: - return Blocks.brown_mushroom.getIcon(side, meta); - case RED: - return Blocks.red_mushroom.getIcon(side, meta); - default: - return null; - } + @Override + public void grow(World worldIn, Random rand, BlockPos pos, IBlockState state) { + this.grow(worldIn, pos, state, rand); } } diff --git a/src/main/java/forestry/farming/blocks/EnumBlockFarmType.java b/src/main/java/forestry/farming/blocks/EnumBlockFarmType.java new file mode 100644 index 000000000..d43a57587 --- /dev/null +++ b/src/main/java/forestry/farming/blocks/EnumBlockFarmType.java @@ -0,0 +1,21 @@ +package forestry.farming.blocks; + +import java.util.Locale; + +import net.minecraft.util.IStringSerializable; + +public enum EnumBlockFarmType implements IStringSerializable { + BASIC, + BAND, + GEARBOX, + HATCH, + VALVE, + CONTROL; + + public static final EnumBlockFarmType[] VALUES = values(); + + @Override + public String getName() { + return name().toLowerCase(Locale.ENGLISH); + } +} diff --git a/src/main/java/forestry/farming/gui/FarmLedger.java b/src/main/java/forestry/farming/gui/FarmLedger.java index 2724674d6..cf1489985 100644 --- a/src/main/java/forestry/farming/gui/FarmLedger.java +++ b/src/main/java/forestry/farming/gui/FarmLedger.java @@ -10,10 +10,13 @@ ******************************************************************************/ package forestry.farming.gui; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.resources.model.IBakedModel; import net.minecraft.init.Items; - +import net.minecraft.item.ItemStack; import forestry.core.gui.ledgers.Ledger; import forestry.core.gui.ledgers.LedgerManager; +import forestry.core.proxy.Proxies; import forestry.core.utils.StringUtil; public class FarmLedger extends Ledger { @@ -39,7 +42,9 @@ public class FarmLedger extends Ledger { int xHeader = x + 22; // Draw icon - drawIcon(Items.water_bucket.getIconFromDamage(0), xIcon, y); + IBakedModel iBakedModel = Proxies.common.getClientInstance().getRenderItem().getItemModelMesher().getItemModel(new ItemStack(Items.water_bucket)); + TextureAtlasSprite textureAtlasSprite = Proxies.common.getClientInstance().getTextureMapBlocks().getAtlasSprite(iBakedModel.getParticleTexture().getIconName()); + drawSprite(textureAtlasSprite, xIcon, y); y += 4; if (!isFullyOpened()) { diff --git a/src/main/java/forestry/farming/gui/widgets/FarmLogicSlot.java b/src/main/java/forestry/farming/gui/widgets/FarmLogicSlot.java index d5dd69e8a..eb6d25ae7 100644 --- a/src/main/java/forestry/farming/gui/widgets/FarmLogicSlot.java +++ b/src/main/java/forestry/farming/gui/widgets/FarmLogicSlot.java @@ -10,8 +10,6 @@ ******************************************************************************/ package forestry.farming.gui.widgets; -import net.minecraft.util.IIcon; - import forestry.api.farming.FarmDirection; import forestry.api.farming.IFarmLogic; import forestry.core.gui.tooltips.ToolTip; @@ -19,6 +17,8 @@ import forestry.core.gui.widgets.Widget; import forestry.core.gui.widgets.WidgetManager; import forestry.core.proxy.Proxies; import forestry.farming.multiblock.IFarmControllerInternal; +import net.minecraft.client.renderer.entity.RenderItem; +import net.minecraft.item.ItemStack; public class FarmLogicSlot extends Widget { @@ -34,19 +34,20 @@ public class FarmLogicSlot extends Widget { private IFarmLogic getLogic() { return farmController.getFarmLogic(farmDirection); } - - private IIcon getIconIndex() { + + private ItemStack getStackIndex() { if (getLogic() == null) { return null; } - return getLogic().getIcon(); + return getLogic().getStack(); } @Override public void draw(int startX, int startY) { - if (getIconIndex() != null) { - Proxies.render.bindTexture(getLogic().getSpriteSheet()); - manager.gui.drawTexturedModelRectFromIcon(startX + xPos, startY + yPos, getIconIndex(), 16, 16); + if (getStackIndex() != null) { + Proxies.render.bindTexture(getLogic().getTextureMap()); + RenderItem renderItem = Proxies.common.getClientInstance().getRenderItem(); + renderItem.renderItemIntoGUI(getStackIndex(), startX + xPos, startY + yPos); } } diff --git a/src/main/java/forestry/farming/logic/Crop.java b/src/main/java/forestry/farming/logic/Crop.java index 235956619..45df393b0 100755 --- a/src/main/java/forestry/farming/logic/Crop.java +++ b/src/main/java/forestry/farming/logic/Crop.java @@ -13,11 +13,13 @@ package forestry.farming.logic; import java.util.Collection; import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; import net.minecraft.item.ItemStack; import net.minecraft.world.World; import forestry.api.farming.ICrop; import forestry.core.config.Constants; +import forestry.core.utils.BlockUtil; import forestry.core.utils.vect.Vect; public abstract class Crop implements ICrop { @@ -31,15 +33,19 @@ public abstract class Crop implements ICrop { } protected final void setBlock(Vect position, Block block, int meta) { - world.setBlock(position.x, position.y, position.z, block, meta, Constants.FLAG_BLOCK_SYNCH); + world.setBlockState(position, block.getStateFromMeta(meta), Constants.FLAG_BLOCK_SYNCH); } protected final Block getBlock(Vect position) { - return world.getBlock(position.x, position.y, position.z); + return getBlockState(position).getBlock(); + } + + protected final IBlockState getBlockState(Vect position) { + return BlockUtil.getBlockState(world, position); } protected final int getBlockMeta(Vect position) { - return world.getBlockMetadata(position.x, position.y, position.z); + return getBlock(position).getMetaFromState(getBlockState(position)); } protected abstract boolean isCrop(Vect pos); diff --git a/src/main/java/forestry/farming/logic/CropBasicAgriCraft.java b/src/main/java/forestry/farming/logic/CropBasicAgriCraft.java index 97750b269..6d1e50b2f 100644 --- a/src/main/java/forestry/farming/logic/CropBasicAgriCraft.java +++ b/src/main/java/forestry/farming/logic/CropBasicAgriCraft.java @@ -10,8 +10,8 @@ ******************************************************************************/ package forestry.farming.logic; -import java.util.ArrayList; import java.util.Collection; +import java.util.List; import net.minecraft.block.Block; import net.minecraft.init.Blocks; @@ -40,13 +40,13 @@ public class CropBasicAgriCraft extends Crop { @Override protected Collection harvestBlock(Vect pos) { - ArrayList harvest = block.getDrops(world, pos.x, pos.y, pos.z, meta, 0); + List harvest = block.getDrops(world, pos, block.getStateFromMeta(meta), 0); if (harvest.size() > 1) { harvest.remove(1); //AgriCraft returns cropsticks in 0, seeds in 1 in getDrops, removing since harvesting doesn't return them. } harvest.remove(0); - Proxies.common.addBlockDestroyEffects(world, pos.x, pos.y, pos.z, Blocks.melon_block, 0); - world.setBlockMetadataWithNotify(pos.x, pos.y, pos.z, 0, Constants.FLAG_BLOCK_SYNCH); + Proxies.common.addBlockDestroyEffects(world, pos, Blocks.melon_block.getStateFromMeta(0)); + world.setBlockState(pos, getBlock(pos).getStateFromMeta(0), Constants.FLAG_BLOCK_SYNCH); return harvest; } diff --git a/src/main/java/forestry/farming/logic/CropBasicFruit.java b/src/main/java/forestry/farming/logic/CropBasicFruit.java index 893f9410a..b5d9b5c08 100644 --- a/src/main/java/forestry/farming/logic/CropBasicFruit.java +++ b/src/main/java/forestry/farming/logic/CropBasicFruit.java @@ -38,9 +38,9 @@ public class CropBasicFruit extends Crop { @Override protected Collection harvestBlock(Vect pos) { - Collection harvested = block.getDrops(world, pos.x, pos.y, pos.z, meta, 0); - Proxies.common.addBlockDestroyEffects(world, pos.x, pos.y, pos.z, block, 0); - world.setBlock(pos.x, pos.y, pos.z, block, 0, Constants.FLAG_BLOCK_SYNCH); + Collection harvested = block.getDrops(world, pos, block.getStateFromMeta(meta), 0); + Proxies.common.addBlockDestroyEffects(world, pos, block.getStateFromMeta(0)); + world.setBlockState(pos, block.getStateFromMeta(0), Constants.FLAG_BLOCK_SYNCH); return harvested; } diff --git a/src/main/java/forestry/farming/logic/CropBasicGrowthCraft.java b/src/main/java/forestry/farming/logic/CropBasicGrowthCraft.java index 0e8813c10..6b08cc7ab 100644 --- a/src/main/java/forestry/farming/logic/CropBasicGrowthCraft.java +++ b/src/main/java/forestry/farming/logic/CropBasicGrowthCraft.java @@ -10,8 +10,8 @@ ******************************************************************************/ package forestry.farming.logic; -import java.util.ArrayList; import java.util.Collection; +import java.util.List; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; @@ -43,20 +43,20 @@ public class CropBasicGrowthCraft extends Crop { @Override protected Collection harvestBlock(Vect pos) { - ArrayList harvest = block.getDrops(world, pos.x, pos.y, pos.z, meta, 0); + List harvest = block.getDrops(world, pos, block.getStateFromMeta(meta), 0); if (harvest.size() > 1) { harvest.remove(0); //Hops have rope as first drop. } - Proxies.common.addBlockDestroyEffects(world, pos.x, pos.y, pos.z, block, 0); + Proxies.common.addBlockDestroyEffects(world, pos, block.getStateFromMeta(0)); if (isGrape) { - world.setBlockToAir(pos.x, pos.y, pos.z); + world.setBlockToAir(pos); } else { - world.setBlockMetadataWithNotify(pos.x, pos.y, pos.z, 0, Constants.FLAG_BLOCK_SYNCH); + world.setBlockState(pos, block.getStateFromMeta(0), Constants.FLAG_BLOCK_SYNCH); } if (isRice) { - world.setBlockMetadataWithNotify(pos.x, pos.y - 1, pos.z, 7, Constants.FLAG_BLOCK_SYNCH); + world.setBlockState(pos.add(0, -1, 0), block.getStateFromMeta(7), Constants.FLAG_BLOCK_SYNCH); } return harvest; diff --git a/src/main/java/forestry/farming/logic/CropBlock.java b/src/main/java/forestry/farming/logic/CropBlock.java index 8044744cf..c89951c74 100755 --- a/src/main/java/forestry/farming/logic/CropBlock.java +++ b/src/main/java/forestry/farming/logic/CropBlock.java @@ -37,10 +37,10 @@ public class CropBlock extends Crop { @Override protected Collection harvestBlock(Vect pos) { - Collection harvested = block.getDrops(world, pos.x, pos.y, pos.z, meta, 0); - Proxies.common.addBlockDestroyEffects(world, pos.x, pos.y, pos.z, block, 0); + Collection harvested = block.getDrops(world, pos, block.getStateFromMeta(meta), 0); + Proxies.common.addBlockDestroyEffects(world, pos, block.getStateFromMeta(0)); // Block.breakBlock() is called by vanilla itself, removing TEs. - world.setBlockToAir(pos.x, pos.y, pos.z); + world.setBlockToAir(pos); return harvested; } diff --git a/src/main/java/forestry/farming/logic/CropFruit.java b/src/main/java/forestry/farming/logic/CropFruit.java index d878eb7e5..ed56e01ec 100755 --- a/src/main/java/forestry/farming/logic/CropFruit.java +++ b/src/main/java/forestry/farming/logic/CropFruit.java @@ -30,7 +30,7 @@ public class CropFruit extends Crop { @Override protected boolean isCrop(Vect pos) { - TileEntity tile = world.getTileEntity(pos.x, pos.y, pos.z); + TileEntity tile = world.getTileEntity(pos); if (!(tile instanceof IFruitBearer)) { return false; } @@ -47,13 +47,13 @@ public class CropFruit extends Crop { @Override protected Collection harvestBlock(Vect pos) { - TileEntity tile = world.getTileEntity(pos.x, pos.y, pos.z); + TileEntity tile = world.getTileEntity(pos); if (!(tile instanceof IFruitBearer)) { return new ArrayList<>(); } - Proxies.common.sendFXSignal(PacketFXSignal.VisualFXType.BLOCK_DESTROY, PacketFXSignal.SoundFXType.LEAF, world, pos.x, pos.y, pos.z, - world.getBlock(pos.x, pos.y, pos.z), 0); + Proxies.common.sendFXSignal(PacketFXSignal.VisualFXType.BLOCK_DESTROY, PacketFXSignal.SoundFXType.LEAF, world, pos, + getBlock(pos).getStateFromMeta(0)); return ((IFruitBearer) tile).pickFruit(null); } diff --git a/src/main/java/forestry/farming/logic/CropPeat.java b/src/main/java/forestry/farming/logic/CropPeat.java index e59341e4a..f417a963e 100755 --- a/src/main/java/forestry/farming/logic/CropPeat.java +++ b/src/main/java/forestry/farming/logic/CropPeat.java @@ -47,7 +47,7 @@ public class CropPeat extends Crop { List drops = new ArrayList<>(); drops.add(PluginCore.items.peat.getItemStack()); - Proxies.common.addBlockDestroyEffects(world, pos.x, pos.y, pos.z, world.getBlock(pos.x, pos.y, pos.z), 0); + Proxies.common.addBlockDestroyEffects(world, pos, getBlock(pos).getStateFromMeta(0)); setBlock(pos, Blocks.dirt, 0); return drops; } diff --git a/src/main/java/forestry/farming/logic/CropRubber.java b/src/main/java/forestry/farming/logic/CropRubber.java index 6565da333..345ae1078 100755 --- a/src/main/java/forestry/farming/logic/CropRubber.java +++ b/src/main/java/forestry/farming/logic/CropRubber.java @@ -32,8 +32,8 @@ public class CropRubber extends CropBlock { protected Collection harvestBlock(Vect pos) { Collection harvested = new ArrayList<>(); harvested.add(PluginIC2.resin.copy()); - Proxies.common.addBlockDestroyEffects(world, pos.x, pos.y, pos.z, block, 0); - world.setBlock(pos.x, pos.y, pos.z, block, meta + 6, Constants.FLAG_BLOCK_SYNCH); + Proxies.common.addBlockDestroyEffects(world, pos, block.getStateFromMeta(0)); + world.setBlockState(pos, block.getStateFromMeta(meta + 6), Constants.FLAG_BLOCK_SYNCH); return harvested; } diff --git a/src/main/java/forestry/farming/logic/FarmLogic.java b/src/main/java/forestry/farming/logic/FarmLogic.java index f62ae0a9d..4a779cdd2 100755 --- a/src/main/java/forestry/farming/logic/FarmLogic.java +++ b/src/main/java/forestry/farming/logic/FarmLogic.java @@ -15,19 +15,23 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.item.EntityItem; import net.minecraft.init.Blocks; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.BlockPos; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; - +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import forestry.api.farming.FarmDirection; import forestry.api.farming.IFarmHousing; import forestry.api.farming.IFarmLogic; import forestry.core.config.Constants; import forestry.core.entities.EntitySelector; -import forestry.core.render.SpriteSheet; +import forestry.core.utils.BlockUtil; import forestry.core.utils.EntityUtil; import forestry.core.utils.vect.Vect; @@ -40,6 +44,7 @@ public abstract class FarmLogic implements IFarmLogic { this.housing = housing; } + @Override public FarmLogic setManual(boolean flag) { isManual = flag; return this; @@ -48,10 +53,25 @@ public abstract class FarmLogic implements IFarmLogic { protected World getWorld() { return housing.getWorld(); } - + + @SideOnly(Side.CLIENT) @Override - public ResourceLocation getSpriteSheet() { - return SpriteSheet.ITEMS.getLocation(); + public ResourceLocation getTextureMap() { + return TextureMap.locationBlocksTexture; + } + + @Override + @SideOnly(Side.CLIENT) + public ItemStack getStack() { + return new ItemStack(getItem(), 1, getMetadata()); + } + + @SideOnly(Side.CLIENT) + public abstract Item getItem(); + + @SideOnly(Side.CLIENT) + public int getMetadata() { + return 0; } public abstract boolean isAcceptedWindfall(ItemStack stack); @@ -61,16 +81,20 @@ public abstract class FarmLogic implements IFarmLogic { } protected final boolean isWaterSourceBlock(World world, Vect position) { - return world.getBlock(position.x, position.y, position.z) == Blocks.water && - world.getBlockMetadata(position.x, position.y, position.z) == 0; + return BlockUtil.getBlock(world, position) == Blocks.water && + BlockUtil.getBlockMetadata(world, position) == 0; } protected final Vect translateWithOffset(int x, int y, int z, FarmDirection farmDirection, int step) { return new Vect(farmDirection.getForgeDirection()).multiply(step).add(x, y, z); } + + protected final Vect translateWithOffset(BlockPos pos, FarmDirection farmDirection, int step) { + return new Vect(farmDirection.getForgeDirection()).multiply(step).add(pos); + } protected final void setBlock(Vect position, Block block, int meta) { - getWorld().setBlock(position.x, position.y, position.z, block, meta, Constants.FLAG_BLOCK_SYNCH_AND_UPDATE); + getWorld().setBlockState(position, block.getStateFromMeta(meta), Constants.FLAG_BLOCK_SYNCH_AND_UPDATE); } private AxisAlignedBB getHarvestBox(IFarmHousing farmHousing, boolean toWorldHeight) { @@ -81,12 +105,12 @@ public abstract class FarmLogic implements IFarmLogic { Vect min = coords.add(offset); Vect max = min.add(area); - int maxY = max.y; + int maxY = max.getY(); if (toWorldHeight) { maxY = getWorld().getHeight(); } - return AxisAlignedBB.getBoundingBox(min.x, min.y, min.z, max.x, maxY, max.z); + return AxisAlignedBB.fromBounds(min.getX(), min.getY(), min.getZ(), max.getX(), maxY, max.getZ()); } protected List collectEntityItems(boolean toWorldHeight) { diff --git a/src/main/java/forestry/farming/logic/FarmLogicArboreal.java b/src/main/java/forestry/farming/logic/FarmLogicArboreal.java index d7f47c7a2..e7587b864 100755 --- a/src/main/java/forestry/farming/logic/FarmLogicArboreal.java +++ b/src/main/java/forestry/farming/logic/FarmLogicArboreal.java @@ -20,21 +20,18 @@ import java.util.Stack; import net.minecraft.block.Block; import net.minecraft.init.Blocks; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; -import net.minecraft.util.ResourceLocation; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import forestry.api.farming.FarmDirection; import forestry.api.farming.Farmables; import forestry.api.farming.ICrop; import forestry.api.farming.IFarmHousing; import forestry.api.farming.IFarmable; import forestry.core.blocks.BlockSoil; -import forestry.core.render.SpriteSheet; import forestry.core.utils.vect.Vect; import forestry.core.utils.vect.VectUtil; import forestry.plugins.PluginCore; @@ -56,7 +53,7 @@ public class FarmLogicArboreal extends FarmLogicHomogeneous { return true; } - Block block = BlockSoil.getBlockFromItem(soil.getItem()); + Block block = Block.getBlockFromItem(soil.getItem()); if (!(block instanceof BlockSoil)) { return false; } @@ -68,16 +65,11 @@ public class FarmLogicArboreal extends FarmLogicHomogeneous { public String getName() { return "Managed Arboretum"; } - - @Override + @SideOnly(Side.CLIENT) - public IIcon getIcon() { - return Blocks.sapling.getBlockTextureFromSide(0); - } - @Override - public ResourceLocation getSpriteSheet() { - return SpriteSheet.BLOCKS.getLocation(); + public Item getItem() { + return Item.getItemFromBlock(Blocks.sapling); } @Override @@ -100,9 +92,9 @@ public class FarmLogicArboreal extends FarmLogicHomogeneous { private final HashMap lastExtentsHarvest = new HashMap<>(); @Override - public Collection harvest(int x, int y, int z, FarmDirection direction, int extent) { + public Collection harvest(BlockPos pos, FarmDirection direction, int extent) { - Vect start = new Vect(x, y, z); + Vect start = new Vect(pos); if (!lastExtentsHarvest.containsKey(start)) { lastExtentsHarvest.put(start, 0); } @@ -112,7 +104,7 @@ public class FarmLogicArboreal extends FarmLogicHomogeneous { lastExtent = 0; } - Vect position = translateWithOffset(x, y + 1, z, direction, lastExtent); + Vect position = translateWithOffset(pos.add(0, 1, 0), direction, lastExtent); Collection crops = getHarvestBlocks(position); lastExtent++; lastExtentsHarvest.put(start, lastExtent); @@ -130,7 +122,7 @@ public class FarmLogicArboreal extends FarmLogicHomogeneous { // Determine what type we want to harvest. IFarmable germling = null; for (IFarmable germl : germlings) { - ICrop crop = germl.getCropAt(world, position.x, position.y, position.z); + ICrop crop = germl.getCropAt(world, position); if (crop == null) { continue; } @@ -173,10 +165,10 @@ public class FarmLogicArboreal extends FarmLogicHomogeneous { if (candidate.equals(position)) { continue; } - if (Math.abs(candidate.x - start.x) > BRANCH_RANGE) { + if (Math.abs(candidate.getX() - start.getX()) > BRANCH_RANGE) { continue; } - if (Math.abs(candidate.z - start.z) > BRANCH_RANGE) { + if (Math.abs(candidate.getZ() - start.getZ()) > BRANCH_RANGE) { continue; } @@ -185,7 +177,7 @@ public class FarmLogicArboreal extends FarmLogicHomogeneous { continue; } - ICrop crop = germling.getCropAt(world, candidate.x, candidate.y, candidate.z); + ICrop crop = germling.getCropAt(world, candidate); if (crop != null) { crops.push(crop); candidates.add(candidate); @@ -199,15 +191,15 @@ public class FarmLogicArboreal extends FarmLogicHomogeneous { } @Override - protected boolean maintainGermlings(int x, int ySaplings, int z, FarmDirection direction, int extent) { + protected boolean maintainGermlings(BlockPos pos, FarmDirection direction, int extent) { World world = getWorld(); for (int i = 0; i < extent; i++) { - Vect position = translateWithOffset(x, ySaplings, z, direction, i); + Vect position = translateWithOffset(pos, direction, i); if (VectUtil.isAirBlock(world, position)) { - Vect soilBelowPosition = new Vect(position.x, position.y - 1, position.z); + Vect soilBelowPosition = new Vect(position.getX(), position.getY() - 1, position.getZ()); ItemStack soilBelow = VectUtil.getAsItemStack(world, soilBelowPosition); if (isAcceptedSoil(soilBelow)) { return plantSapling(position); @@ -221,7 +213,7 @@ public class FarmLogicArboreal extends FarmLogicHomogeneous { World world = getWorld(); Collections.shuffle(germlings); for (IFarmable candidate : germlings) { - if (housing.plantGermling(candidate, world, position.x, position.y, position.z)) { + if (housing.plantGermling(candidate, world, position)) { return true; } } diff --git a/src/main/java/forestry/farming/logic/FarmLogicCereal.java b/src/main/java/forestry/farming/logic/FarmLogicCereal.java index 14926aabb..aa862e31a 100755 --- a/src/main/java/forestry/farming/logic/FarmLogicCereal.java +++ b/src/main/java/forestry/farming/logic/FarmLogicCereal.java @@ -11,11 +11,9 @@ package forestry.farming.logic; import net.minecraft.init.Items; -import net.minecraft.util.IIcon; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - +import net.minecraft.item.Item; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import forestry.api.farming.Farmables; import forestry.api.farming.IFarmHousing; @@ -36,8 +34,8 @@ public class FarmLogicCereal extends FarmLogicCrops { @Override @SideOnly(Side.CLIENT) - public IIcon getIcon() { - return Items.wheat.getIconFromDamage(0); + public Item getItem() { + return Items.wheat; } } diff --git a/src/main/java/forestry/farming/logic/FarmLogicCocoa.java b/src/main/java/forestry/farming/logic/FarmLogicCocoa.java index 7e3ac8f99..bb27664ae 100755 --- a/src/main/java/forestry/farming/logic/FarmLogicCocoa.java +++ b/src/main/java/forestry/farming/logic/FarmLogicCocoa.java @@ -18,21 +18,20 @@ import java.util.Set; import java.util.Stack; import net.minecraft.block.Block; -import net.minecraft.block.BlockLog; +import net.minecraft.block.BlockPlanks; import net.minecraft.init.Items; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.world.World; - -import net.minecraftforge.common.util.ForgeDirection; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import forestry.api.farming.FarmDirection; import forestry.api.farming.ICrop; import forestry.api.farming.IFarmHousing; import forestry.api.farming.IFarmable; +import forestry.core.utils.BlockUtil; import forestry.core.utils.vect.MutableVect; import forestry.core.utils.vect.Vect; import forestry.core.utils.vect.VectUtil; @@ -47,8 +46,8 @@ public class FarmLogicCocoa extends FarmLogic { @Override @SideOnly(Side.CLIENT) - public IIcon getIcon() { - return Items.dye.getIconFromDamage(3); + public Item getItem() { + return Items.dye; } @Override @@ -89,9 +88,9 @@ public class FarmLogicCocoa extends FarmLogic { private final HashMap lastExtentsCultivation = new HashMap<>(); @Override - public boolean cultivate(int x, int y, int z, FarmDirection direction, int extent) { + public boolean cultivate(BlockPos pos, FarmDirection direction, int extent) { - Vect start = new Vect(x, y, z); + Vect start = new Vect(pos); if (!lastExtentsCultivation.containsKey(start)) { lastExtentsCultivation.put(start, 0); } @@ -101,7 +100,7 @@ public class FarmLogicCocoa extends FarmLogic { lastExtent = 0; } - Vect position = translateWithOffset(x, y + 1, z, direction, lastExtent); + Vect position = translateWithOffset(pos.add(0, 1, 0), direction, lastExtent); boolean result = tryPlantingCocoa(position); lastExtent++; @@ -113,9 +112,9 @@ public class FarmLogicCocoa extends FarmLogic { private final HashMap lastExtentsHarvest = new HashMap<>(); @Override - public Collection harvest(int x, int y, int z, FarmDirection direction, int extent) { + public Collection harvest(BlockPos pos, FarmDirection direction, int extent) { - Vect start = new Vect(x, y, z); + Vect start = new Vect(pos); if (!lastExtentsHarvest.containsKey(start)) { lastExtentsHarvest.put(start, 0); } @@ -125,7 +124,7 @@ public class FarmLogicCocoa extends FarmLogic { lastExtent = 0; } - Vect position = translateWithOffset(x, y + 1, z, direction, lastExtent); + Vect position = translateWithOffset(pos.add(0, 1, 0), direction, lastExtent); Collection crops = getHarvestBlocks(position); lastExtent++; lastExtentsHarvest.put(start, lastExtent); @@ -138,21 +137,21 @@ public class FarmLogicCocoa extends FarmLogic { World world = getWorld(); MutableVect current = new MutableVect(position); - while (VectUtil.isWoodBlock(world, current) && BlockLog.func_150165_c(VectUtil.getBlockMeta(world, current)) == 3) { + while (VectUtil.isWoodBlock(world, current) && BlockUtil.getBlockState(world, current).getValue(BlockPlanks.VARIANT) == BlockPlanks.EnumType.JUNGLE) { - for (ForgeDirection direction : ForgeDirection.VALID_DIRECTIONS) { - if (direction == ForgeDirection.UP || direction == ForgeDirection.DOWN) { + for (EnumFacing direction : EnumFacing.values()) { + if (direction == EnumFacing.UP || direction == EnumFacing.DOWN) { continue; } - Vect candidate = new Vect(current.x + direction.offsetX, current.y, current.z + direction.offsetZ); + Vect candidate = new Vect(current.x + direction.getFrontOffsetX(), current.y, current.z + direction.getFrontOffsetZ()); if (VectUtil.isAirBlock(world, candidate)) { - return housing.plantGermling(cocoa, world, candidate.x, candidate.y, candidate.z); + return housing.plantGermling(cocoa, world, candidate); } } current.y++; - if (current.y - position.y > 1) { + if (current.getY() - position.getY() > 1) { break; } } @@ -169,8 +168,8 @@ public class FarmLogicCocoa extends FarmLogic { Block block = VectUtil.getBlock(getWorld(), position); ICrop crop = null; - if (!block.isWood(getWorld(), position.x, position.y, position.z)) { - crop = cocoa.getCropAt(getWorld(), position.x, position.y, position.z); + if (!block.isWood(getWorld(), position)) { + crop = cocoa.getCropAt(getWorld(), position); if (crop == null) { return crops; } @@ -209,10 +208,10 @@ public class FarmLogicCocoa extends FarmLogic { if (candidate.equals(position)) { continue; } - if (Math.abs(candidate.x - start.x) > 5) { + if (Math.abs(candidate.getX() - start.getX()) > 5) { continue; } - if (Math.abs(candidate.z - start.z) > 5) { + if (Math.abs(candidate.getZ() - start.getZ()) > 5) { continue; } @@ -221,7 +220,7 @@ public class FarmLogicCocoa extends FarmLogic { continue; } - ICrop crop = cocoa.getCropAt(world, candidate.x, candidate.y, candidate.z); + ICrop crop = cocoa.getCropAt(world, candidate); if (crop != null) { crops.push(crop); candidates.add(candidate); diff --git a/src/main/java/forestry/farming/logic/FarmLogicCrops.java b/src/main/java/forestry/farming/logic/FarmLogicCrops.java index b7f709095..67c2facd6 100755 --- a/src/main/java/forestry/farming/logic/FarmLogicCrops.java +++ b/src/main/java/forestry/farming/logic/FarmLogicCrops.java @@ -15,6 +15,7 @@ import java.util.Stack; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import net.minecraftforge.oredict.OreDictionary; @@ -72,13 +73,13 @@ public abstract class FarmLogicCrops extends FarmLogicWatered { } @Override - protected boolean maintainCrops(int x, int y, int z, FarmDirection direction, int extent) { + protected boolean maintainCrops(BlockPos pos, FarmDirection direction, int extent) { World world = getWorld(); for (int i = 0; i < extent; i++) { - Vect position = translateWithOffset(x, y, z, direction, i); - if (!VectUtil.isAirBlock(world, position) && !BlockUtil.isReplaceableBlock(getWorld(), position.x, position.y, position.z)) { + Vect position = translateWithOffset(pos, direction, i); + if (!VectUtil.isAirBlock(world, position) && !BlockUtil.isReplaceableBlock(getWorld(), position)) { continue; } @@ -100,7 +101,7 @@ public abstract class FarmLogicCrops extends FarmLogicWatered { World world = getWorld(); for (IFarmable candidate : seeds) { - if (housing.plantGermling(candidate, world, position.getX(), position.getY(), position.getZ())) { + if (housing.plantGermling(candidate, world, position)) { return true; } } @@ -109,14 +110,14 @@ public abstract class FarmLogicCrops extends FarmLogicWatered { } @Override - public Collection harvest(int x, int y, int z, FarmDirection direction, int extent) { + public Collection harvest(BlockPos pos, FarmDirection direction, int extent) { World world = getWorld(); Stack crops = new Stack<>(); for (int i = 0; i < extent; i++) { - Vect position = translateWithOffset(x, y + 1, z, direction, i); + Vect position = translateWithOffset(pos.add(0, 1, 0), direction, i); for (IFarmable seed : seeds) { - ICrop crop = seed.getCropAt(world, position.x, position.y, position.z); + ICrop crop = seed.getCropAt(world, position); if (crop != null) { crops.push(crop); } diff --git a/src/main/java/forestry/farming/logic/FarmLogicEnder.java b/src/main/java/forestry/farming/logic/FarmLogicEnder.java index 9f5b7ac90..bff10dd5d 100644 --- a/src/main/java/forestry/farming/logic/FarmLogicEnder.java +++ b/src/main/java/forestry/farming/logic/FarmLogicEnder.java @@ -15,13 +15,12 @@ import java.util.Stack; import net.minecraft.init.Blocks; import net.minecraft.init.Items; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import forestry.api.farming.FarmDirection; import forestry.api.farming.Farmables; import forestry.api.farming.ICrop; @@ -44,8 +43,8 @@ public class FarmLogicEnder extends FarmLogicHomogeneous { @Override @SideOnly(Side.CLIENT) - public IIcon getIcon() { - return Items.ender_eye.getIconFromDamage(0); + public Item getItem() { + return Items.ender_eye; } @Override @@ -64,14 +63,14 @@ public class FarmLogicEnder extends FarmLogicHomogeneous { } @Override - public Collection harvest(int x, int y, int z, FarmDirection direction, int extent) { + public Collection harvest(BlockPos pos, FarmDirection direction, int extent) { World world = getWorld(); Stack crops = new Stack<>(); for (int i = 0; i < extent; i++) { - Vect position = translateWithOffset(x, y + 1, z, direction, i); + Vect position = translateWithOffset(pos.add(0, 1, 0), direction, i); for (IFarmable farmable : germlings) { - ICrop crop = farmable.getCropAt(world, position.x, position.y, position.z); + ICrop crop = farmable.getCropAt(world, position); if (crop != null) { crops.push(crop); } @@ -83,12 +82,12 @@ public class FarmLogicEnder extends FarmLogicHomogeneous { } @Override - protected boolean maintainGermlings(int x, int y, int z, FarmDirection direction, int extent) { + protected boolean maintainGermlings(BlockPos pos, FarmDirection direction, int extent) { World world = getWorld(); for (int i = 0; i < extent; i++) { - Vect position = translateWithOffset(x, y, z, direction, i); - if (!VectUtil.isAirBlock(world, position) && !BlockUtil.isReplaceableBlock(world, position.x, position.y, position.z)) { + Vect position = translateWithOffset(pos, direction, i); + if (!VectUtil.isAirBlock(world, position) && !BlockUtil.isReplaceableBlock(world, position)) { continue; } @@ -107,7 +106,7 @@ public class FarmLogicEnder extends FarmLogicHomogeneous { World world = getWorld(); for (IFarmable candidate : germlings) { - if (housing.plantGermling(candidate, world, position.x, position.y, position.z)) { + if (housing.plantGermling(candidate, world, position)) { return true; } } diff --git a/src/main/java/forestry/farming/logic/FarmLogicGourd.java b/src/main/java/forestry/farming/logic/FarmLogicGourd.java index 0ef1004a0..edbf55e43 100755 --- a/src/main/java/forestry/farming/logic/FarmLogicGourd.java +++ b/src/main/java/forestry/farming/logic/FarmLogicGourd.java @@ -14,13 +14,12 @@ import java.util.Collection; import java.util.Stack; import net.minecraft.init.Items; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import forestry.api.farming.FarmDirection; import forestry.api.farming.Farmables; import forestry.api.farming.ICrop; @@ -40,8 +39,8 @@ public class FarmLogicGourd extends FarmLogic { @Override @SideOnly(Side.CLIENT) - public IIcon getIcon() { - return Items.melon.getIconFromDamage(0); + public Item getItem() { + return Items.melon; } @Override @@ -80,19 +79,19 @@ public class FarmLogicGourd extends FarmLogic { } @Override - public boolean cultivate(int x, int y, int z, FarmDirection direction, int extent) { + public boolean cultivate(BlockPos pos, FarmDirection direction, int extent) { return false; } @Override - public Collection harvest(int x, int y, int z, FarmDirection direction, int extent) { + public Collection harvest(BlockPos pos, FarmDirection direction, int extent) { World world = getWorld(); Stack crops = new Stack<>(); for (int i = 0; i < extent; i++) { - Vect position = translateWithOffset(x, y + 1, z, direction, i); + Vect position = translateWithOffset(pos.add(0, 1, 0), direction, i); for (IFarmable seed : seeds) { - ICrop crop = seed.getCropAt(world, position.x, position.y, position.z); + ICrop crop = seed.getCropAt(world, position); if (crop != null) { crops.push(crop); } diff --git a/src/main/java/forestry/farming/logic/FarmLogicHomogeneous.java b/src/main/java/forestry/farming/logic/FarmLogicHomogeneous.java index a5c4ac2bd..d36ef63c6 100644 --- a/src/main/java/forestry/farming/logic/FarmLogicHomogeneous.java +++ b/src/main/java/forestry/farming/logic/FarmLogicHomogeneous.java @@ -15,6 +15,7 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import forestry.api.farming.FarmDirection; @@ -74,16 +75,16 @@ public abstract class FarmLogicHomogeneous extends FarmLogic { } @Override - public boolean cultivate(int x, int y, int z, FarmDirection direction, int extent) { + public boolean cultivate(BlockPos pos, FarmDirection direction, int extent) { - if (maintainSoil(x, y, z, direction, extent)) { + if (maintainSoil(pos, direction, extent)) { return true; } - return maintainGermlings(x, y + 1, z, direction, extent); + return maintainGermlings(pos.add(0, 1, 0), direction, extent); } - private boolean maintainSoil(int x, int yGround, int z, FarmDirection direction, int extent) { + private boolean maintainSoil(BlockPos pos, FarmDirection direction, int extent) { ItemStack[] resources = new ItemStack[]{resource}; if (!housing.getFarmInventory().hasResources(resources)) { return false; @@ -92,7 +93,7 @@ public abstract class FarmLogicHomogeneous extends FarmLogic { World world = getWorld(); for (int i = 0; i < extent; i++) { - Vect position = translateWithOffset(x, yGround, z, direction, i); + Vect position = translateWithOffset(pos, direction, i); Block soil = VectUtil.getBlock(world, position); if (FarmHelper.bricks.contains(soil)) { @@ -121,5 +122,5 @@ public abstract class FarmLogicHomogeneous extends FarmLogic { return false; } - protected abstract boolean maintainGermlings(int x, int ySaplings, int z, FarmDirection direction, int extent); + protected abstract boolean maintainGermlings(BlockPos pos, FarmDirection direction, int extent); } diff --git a/src/main/java/forestry/farming/logic/FarmLogicInfernal.java b/src/main/java/forestry/farming/logic/FarmLogicInfernal.java index 34cc75760..970e1d7ba 100755 --- a/src/main/java/forestry/farming/logic/FarmLogicInfernal.java +++ b/src/main/java/forestry/farming/logic/FarmLogicInfernal.java @@ -15,13 +15,12 @@ import java.util.Stack; import net.minecraft.init.Blocks; import net.minecraft.init.Items; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import forestry.api.farming.FarmDirection; import forestry.api.farming.Farmables; import forestry.api.farming.ICrop; @@ -44,8 +43,8 @@ public class FarmLogicInfernal extends FarmLogicHomogeneous { @Override @SideOnly(Side.CLIENT) - public IIcon getIcon() { - return Items.nether_wart.getIconFromDamage(0); + public Item getItem() { + return Items.nether_wart; } @Override @@ -64,14 +63,14 @@ public class FarmLogicInfernal extends FarmLogicHomogeneous { } @Override - public Collection harvest(int x, int y, int z, FarmDirection direction, int extent) { + public Collection harvest(BlockPos pos, FarmDirection direction, int extent) { World world = getWorld(); Stack crops = new Stack<>(); for (int i = 0; i < extent; i++) { - Vect position = translateWithOffset(x, y + 1, z, direction, i); + Vect position = translateWithOffset(pos.add(0, 1, 0), direction, i); for (IFarmable farmable : germlings) { - ICrop crop = farmable.getCropAt(world, position.x, position.y, position.z); + ICrop crop = farmable.getCropAt(world, position); if (crop != null) { crops.push(crop); } @@ -83,12 +82,12 @@ public class FarmLogicInfernal extends FarmLogicHomogeneous { } @Override - protected boolean maintainGermlings(int x, int y, int z, FarmDirection direction, int extent) { + protected boolean maintainGermlings(BlockPos pos, FarmDirection direction, int extent) { World world = getWorld(); for (int i = 0; i < extent; i++) { - Vect position = translateWithOffset(x, y, z, direction, i); - if (!VectUtil.isAirBlock(world, position) && !BlockUtil.isReplaceableBlock(world, position.x, position.y, position.z)) { + Vect position = translateWithOffset(pos, direction, i); + if (!VectUtil.isAirBlock(world, position) && !BlockUtil.isReplaceableBlock(world, position)) { continue; } @@ -107,7 +106,7 @@ public class FarmLogicInfernal extends FarmLogicHomogeneous { World world = getWorld(); for (IFarmable candidate : germlings) { - if (housing.plantGermling(candidate, world, position.x, position.y, position.z)) { + if (housing.plantGermling(candidate, world, position)) { return true; } } diff --git a/src/main/java/forestry/farming/logic/FarmLogicOrchard.java b/src/main/java/forestry/farming/logic/FarmLogicOrchard.java index edd440ffe..31a1859e1 100755 --- a/src/main/java/forestry/farming/logic/FarmLogicOrchard.java +++ b/src/main/java/forestry/farming/logic/FarmLogicOrchard.java @@ -21,16 +21,13 @@ import java.util.Set; import java.util.Stack; import net.minecraft.block.Block; -import net.minecraft.init.Blocks; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; - -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import forestry.api.farming.FarmDirection; import forestry.api.farming.Farmables; import forestry.api.farming.ICrop; @@ -40,7 +37,6 @@ import forestry.api.genetics.IFruitBearer; import forestry.core.utils.vect.Vect; import forestry.core.utils.vect.VectUtil; import forestry.plugins.PluginCore; -import forestry.plugins.PluginManager; public class FarmLogicOrchard extends FarmLogic { @@ -52,7 +48,7 @@ public class FarmLogicOrchard extends FarmLogic { super(housing); this.farmables = Farmables.farmables.get("farmOrchard"); ImmutableList.Builder traversalBlocksBuilder = ImmutableList.builder(); - if (PluginManager.Module.AGRICRAFT.isEnabled()) { + /*if (PluginManager.Module.AGRICRAFT.isEnabled()) { traversalBlocksBuilder.add(Blocks.farmland); } if (PluginManager.Module.GROWTHCRAFT.isEnabled()) { @@ -63,7 +59,7 @@ public class FarmLogicOrchard extends FarmLogic { } if (PluginManager.Module.PLANTMEGAPACK.isEnabled()) { traversalBlocksBuilder.add(Blocks.water); - } + }*/ traversalBlocksBuilder.build(); this.traversalBlocks = traversalBlocksBuilder.build(); } @@ -99,14 +95,14 @@ public class FarmLogicOrchard extends FarmLogic { } @Override - public boolean cultivate(int x, int y, int z, FarmDirection direction, int extent) { + public boolean cultivate(BlockPos pos, FarmDirection direction, int extent) { return false; } @Override - public Collection harvest(int x, int y, int z, FarmDirection direction, int extent) { + public Collection harvest(BlockPos pos, FarmDirection direction, int extent) { - Vect start = new Vect(x, y, z); + Vect start = new Vect(pos); if (!lastExtents.containsKey(start)) { lastExtents.put(start, 0); } @@ -116,7 +112,7 @@ public class FarmLogicOrchard extends FarmLogic { lastExtent = 0; } - Vect position = translateWithOffset(x, y + 1, z, direction, lastExtent); + Vect position = translateWithOffset(pos.add(0, 1, 0), direction, lastExtent); Collection crops = getHarvestBlocks(position); lastExtent++; lastExtents.put(start, lastExtent); @@ -126,8 +122,8 @@ public class FarmLogicOrchard extends FarmLogic { @Override @SideOnly(Side.CLIENT) - public IIcon getIcon() { - return PluginCore.items.fruits.getIconFromDamage(0); + public Item getItem() { + return PluginCore.items.fruits; } @Override @@ -171,10 +167,10 @@ public class FarmLogicOrchard extends FarmLogic { for (int j = 0; j < 2; j++) { for (int k = -1; k < 2; k++) { Vect candidate = position.add(i, j, k); - if (Math.abs(candidate.x - start.x) > 5) { + if (Math.abs(candidate.getX() - start.getX()) > 5) { continue; } - if (Math.abs(candidate.z - start.z) > 5) { + if (Math.abs(candidate.getZ() - start.getZ()) > 5) { continue; } @@ -206,13 +202,13 @@ public class FarmLogicOrchard extends FarmLogic { private boolean isFruitBearer(World world, Vect position) { - TileEntity tile = world.getTileEntity(position.x, position.y, position.z); + TileEntity tile = world.getTileEntity(position); if (tile instanceof IFruitBearer) { return true; } for (IFarmable farmable : farmables) { - if (farmable.isSaplingAt(world, position.x, position.y, position.z)) { + if (farmable.isSaplingAt(world, position)) { return true; } } @@ -233,7 +229,7 @@ public class FarmLogicOrchard extends FarmLogic { private ICrop getCrop(World world, Vect position) { - TileEntity tile = world.getTileEntity(position.x, position.y, position.z); + TileEntity tile = world.getTileEntity(position); if (tile instanceof IFruitBearer) { IFruitBearer fruitBearer = (IFruitBearer) tile; @@ -242,7 +238,7 @@ public class FarmLogicOrchard extends FarmLogic { } } else { for (IFarmable seed : farmables) { - ICrop crop = seed.getCropAt(world, position.x, position.y, position.z); + ICrop crop = seed.getCropAt(world, position); if (crop != null) { return crop; } diff --git a/src/main/java/forestry/farming/logic/FarmLogicPeat.java b/src/main/java/forestry/farming/logic/FarmLogicPeat.java index c877b7eff..2f37cece1 100755 --- a/src/main/java/forestry/farming/logic/FarmLogicPeat.java +++ b/src/main/java/forestry/farming/logic/FarmLogicPeat.java @@ -14,13 +14,12 @@ import java.util.Collection; import java.util.Stack; import net.minecraft.block.Block; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import forestry.api.farming.FarmDirection; import forestry.api.farming.ICrop; import forestry.api.farming.IFarmHousing; @@ -42,7 +41,7 @@ public class FarmLogicPeat extends FarmLogicWatered { return true; } - Block block = BlockSoil.getBlockFromItem(itemStack.getItem()); + Block block = Block.getBlockFromItem(itemStack.getItem()); if (!(block instanceof BlockSoil)) { return false; } @@ -76,12 +75,12 @@ public class FarmLogicPeat extends FarmLogicWatered { } @Override - public Collection harvest(int x, int y, int z, FarmDirection direction, int extent) { + public Collection harvest(BlockPos pos, FarmDirection direction, int extent) { World world = getWorld(); Stack crops = new Stack<>(); for (int i = 0; i < extent; i++) { - Vect position = translateWithOffset(x, y, z, direction, i); + Vect position = translateWithOffset(pos, direction, i); ItemStack occupant = VectUtil.getAsItemStack(world, position); if (occupant.getItem() == null) { @@ -105,8 +104,8 @@ public class FarmLogicPeat extends FarmLogicWatered { @Override @SideOnly(Side.CLIENT) - public IIcon getIcon() { - return PluginCore.items.peat.getIconFromDamage(0); + public Item getItem() { + return PluginCore.items.peat; } } diff --git a/src/main/java/forestry/farming/logic/FarmLogicReeds.java b/src/main/java/forestry/farming/logic/FarmLogicReeds.java index 300fb4e29..fc49dbdd8 100644 --- a/src/main/java/forestry/farming/logic/FarmLogicReeds.java +++ b/src/main/java/forestry/farming/logic/FarmLogicReeds.java @@ -15,13 +15,12 @@ import java.util.Stack; import net.minecraft.init.Blocks; import net.minecraft.init.Items; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import forestry.api.farming.FarmDirection; import forestry.api.farming.Farmables; import forestry.api.farming.ICrop; @@ -42,8 +41,8 @@ public class FarmLogicReeds extends FarmLogic { @Override @SideOnly(Side.CLIENT) - public IIcon getIcon() { - return Items.reeds.getIconFromDamage(0); + public Item getItem() { + return Items.reeds; } @Override @@ -94,19 +93,19 @@ public class FarmLogicReeds extends FarmLogic { } @Override - public boolean cultivate(int x, int y, int z, FarmDirection direction, int extent) { + public boolean cultivate(BlockPos pos, FarmDirection direction, int extent) { return false; } @Override - public Collection harvest(int x, int y, int z, FarmDirection direction, int extent) { + public Collection harvest(BlockPos pos, FarmDirection direction, int extent) { World world = getWorld(); Stack crops = new Stack<>(); for (int i = 0; i < extent; i++) { - Vect position = translateWithOffset(x, y + 1, z, direction, i); + Vect position = translateWithOffset(pos.add(0, 1, 0), direction, i); for (IFarmable seed : germlings) { - ICrop crop = seed.getCropAt(world, position.x, position.y, position.z); + ICrop crop = seed.getCropAt(world, position); if (crop != null) { crops.push(crop); } diff --git a/src/main/java/forestry/farming/logic/FarmLogicRubber.java b/src/main/java/forestry/farming/logic/FarmLogicRubber.java index bfdf229d1..960b5aec1 100755 --- a/src/main/java/forestry/farming/logic/FarmLogicRubber.java +++ b/src/main/java/forestry/farming/logic/FarmLogicRubber.java @@ -19,13 +19,12 @@ import java.util.Stack; import net.minecraft.block.Block; import net.minecraft.init.Items; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import forestry.api.farming.FarmDirection; import forestry.api.farming.ICrop; import forestry.api.farming.IFarmHousing; @@ -49,11 +48,11 @@ public class FarmLogicRubber extends FarmLogic { @Override @SideOnly(Side.CLIENT) - public IIcon getIcon() { + public Item getItem() { if (!inActive) { - return PluginIC2.resin.getIconIndex(); + return PluginIC2.resin.getItem(); } else { - return Items.gunpowder.getIconFromDamage(0); + return Items.gunpowder; } } @@ -93,19 +92,19 @@ public class FarmLogicRubber extends FarmLogic { } @Override - public boolean cultivate(int x, int y, int z, FarmDirection direction, int extent) { + public boolean cultivate(BlockPos pos, FarmDirection direction, int extent) { return false; } private final HashMap lastExtents = new HashMap<>(); @Override - public Collection harvest(int x, int y, int z, FarmDirection direction, int extent) { + public Collection harvest(BlockPos pos, FarmDirection direction, int extent) { if (inActive) { return null; } - Vect start = new Vect(x, y, z); + Vect start = new Vect(pos); if (!lastExtents.containsKey(start)) { lastExtents.put(start, 0); } @@ -115,7 +114,7 @@ public class FarmLogicRubber extends FarmLogic { lastExtent = 0; } - Vect position = translateWithOffset(x, y + 1, z, direction, lastExtent); + Vect position = translateWithOffset(pos.add(0, 1, 0), direction, lastExtent); Collection crops = getHarvestBlocks(position); lastExtent++; lastExtents.put(start, lastExtent); @@ -162,7 +161,7 @@ public class FarmLogicRubber extends FarmLogic { // Get additional candidates to return for (int j = 0; j < 2; j++) { - Vect candidate = new Vect(position.x, position.y + j, position.z); + Vect candidate = new Vect(position.getX(), position.getY() + j, position.getZ()); if (candidate.equals(position)) { continue; } diff --git a/src/main/java/forestry/farming/logic/FarmLogicShroom.java b/src/main/java/forestry/farming/logic/FarmLogicShroom.java index 47ba31628..c02c46508 100755 --- a/src/main/java/forestry/farming/logic/FarmLogicShroom.java +++ b/src/main/java/forestry/farming/logic/FarmLogicShroom.java @@ -14,12 +14,10 @@ import java.util.ArrayList; import java.util.Collection; import net.minecraft.init.Blocks; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import forestry.api.farming.Farmables; import forestry.api.farming.IFarmHousing; @@ -40,8 +38,8 @@ public class FarmLogicShroom extends FarmLogicArboreal { @Override @SideOnly(Side.CLIENT) - public IIcon getIcon() { - return Blocks.red_mushroom.getBlockTextureFromSide(0); + public Item getItem() { + return Item.getItemFromBlock(Blocks.red_mushroom); } @Override diff --git a/src/main/java/forestry/farming/logic/FarmLogicSucculent.java b/src/main/java/forestry/farming/logic/FarmLogicSucculent.java index 3bea79756..b3328562a 100755 --- a/src/main/java/forestry/farming/logic/FarmLogicSucculent.java +++ b/src/main/java/forestry/farming/logic/FarmLogicSucculent.java @@ -15,13 +15,12 @@ import java.util.Stack; import net.minecraft.init.Blocks; import net.minecraft.init.Items; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import forestry.api.farming.FarmDirection; import forestry.api.farming.Farmables; import forestry.api.farming.ICrop; @@ -42,8 +41,14 @@ public class FarmLogicSucculent extends FarmLogic { @Override @SideOnly(Side.CLIENT) - public IIcon getIcon() { - return Items.dye.getIconFromDamage(2); + public Item getItem() { + return Items.dye; + } + + @Override + @SideOnly(Side.CLIENT) + public int getMetadata() { + return 2; } @Override @@ -94,19 +99,19 @@ public class FarmLogicSucculent extends FarmLogic { } @Override - public boolean cultivate(int x, int y, int z, FarmDirection direction, int extent) { + public boolean cultivate(BlockPos pos, FarmDirection direction, int extent) { return false; } @Override - public Collection harvest(int x, int y, int z, FarmDirection direction, int extent) { + public Collection harvest(BlockPos pos, FarmDirection direction, int extent) { World world = getWorld(); Stack crops = new Stack<>(); for (int i = 0; i < extent; i++) { - Vect position = translateWithOffset(x, y + 1, z, direction, i); + Vect position = translateWithOffset(pos.add(0, 1, 0), direction, i); for (IFarmable seed : germlings) { - ICrop crop = seed.getCropAt(world, position.x, position.y, position.z); + ICrop crop = seed.getCropAt(world, position); if (crop != null) { crops.push(crop); } diff --git a/src/main/java/forestry/farming/logic/FarmLogicVegetable.java b/src/main/java/forestry/farming/logic/FarmLogicVegetable.java index ad0da217e..ad4a3fd7b 100755 --- a/src/main/java/forestry/farming/logic/FarmLogicVegetable.java +++ b/src/main/java/forestry/farming/logic/FarmLogicVegetable.java @@ -11,11 +11,9 @@ package forestry.farming.logic; import net.minecraft.init.Items; -import net.minecraft.util.IIcon; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - +import net.minecraft.item.Item; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import forestry.api.farming.Farmables; import forestry.api.farming.IFarmHousing; @@ -27,8 +25,8 @@ public class FarmLogicVegetable extends FarmLogicCrops { @Override @SideOnly(Side.CLIENT) - public IIcon getIcon() { - return Items.carrot.getIconFromDamage(0); + public Item getItem() { + return Items.carrot; } @Override diff --git a/src/main/java/forestry/farming/logic/FarmLogicWatered.java b/src/main/java/forestry/farming/logic/FarmLogicWatered.java index f07030da6..7dceb4341 100755 --- a/src/main/java/forestry/farming/logic/FarmLogicWatered.java +++ b/src/main/java/forestry/farming/logic/FarmLogicWatered.java @@ -17,6 +17,7 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fluids.FluidStack; @@ -72,30 +73,30 @@ public abstract class FarmLogicWatered extends FarmLogic { } @Override - public boolean cultivate(int x, int y, int z, FarmDirection direction, int extent) { + public boolean cultivate(BlockPos pos, FarmDirection direction, int extent) { - if (maintainSoil(x, y, z, direction, extent)) { + if (maintainSoil(pos, direction, extent)) { return true; } - if (!isManual && maintainWater(x, y, z, direction, extent)) { + if (!isManual && maintainWater(pos, direction, extent)) { return true; } - if (maintainCrops(x, y + 1, z, direction, extent)) { + if (maintainCrops(pos.add(0, 1, 0), direction, extent)) { return true; } return false; } - private boolean maintainSoil(int x, int y, int z, FarmDirection direction, int extent) { + private boolean maintainSoil(BlockPos pos, FarmDirection direction, int extent) { World world = getWorld(); ItemStack[] resources = new ItemStack[]{resource}; for (int i = 0; i < extent; i++) { - Vect position = translateWithOffset(x, y, z, direction, i); + Vect position = translateWithOffset(pos, direction, i); Block soil = VectUtil.getBlock(world, position); ItemStack soilStack = VectUtil.getAsItemStack(world, position); @@ -129,11 +130,11 @@ public abstract class FarmLogicWatered extends FarmLogic { return false; } - private boolean maintainWater(int x, int y, int z, FarmDirection direction, int extent) { + private boolean maintainWater(BlockPos pos, FarmDirection direction, int extent) { // Still not done, check water then World world = getWorld(); for (int i = 0; i < extent; i++) { - Vect position = translateWithOffset(x, y, z, direction, i); + Vect position = translateWithOffset(pos, direction, i); Vect platformPosition = position.add(0, -1, 0); Block platformBlock = VectUtil.getBlock(world, platformPosition); @@ -149,7 +150,7 @@ public abstract class FarmLogicWatered extends FarmLogic { return false; } - protected boolean maintainCrops(int x, int y, int z, FarmDirection direction, int extent) { + protected boolean maintainCrops(BlockPos pos, FarmDirection direction, int extent) { return false; } diff --git a/src/main/java/forestry/farming/logic/FarmableBasicAgricraft.java b/src/main/java/forestry/farming/logic/FarmableBasicAgricraft.java index 77effa370..2d3e37f1a 100644 --- a/src/main/java/forestry/farming/logic/FarmableBasicAgricraft.java +++ b/src/main/java/forestry/farming/logic/FarmableBasicAgricraft.java @@ -13,11 +13,13 @@ package forestry.farming.logic; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import forestry.api.farming.ICrop; import forestry.api.farming.IFarmable; import forestry.core.config.Constants; +import forestry.core.utils.BlockUtil; import forestry.core.utils.ItemStackUtil; import forestry.core.utils.vect.Vect; @@ -32,19 +34,19 @@ public class FarmableBasicAgricraft implements IFarmable { } @Override - public boolean isSaplingAt(World world, int x, int y, int z) { - return world.getBlock(x, y, z) == block; + public boolean isSaplingAt(World world, BlockPos pos) { + return BlockUtil.getBlock(world, pos) == block; } @Override - public ICrop getCropAt(World world, int x, int y, int z) { - if (world.getBlock(x, y, z) != block) { + public ICrop getCropAt(World world, BlockPos pos) { + if (BlockUtil.getBlock(world, pos) != block) { return null; } - if (world.getBlockMetadata(x, y, z) != matureMeta) { + if (BlockUtil.getBlockMetadata(world, pos) != matureMeta) { return null; } - return new CropBasicAgriCraft(world, block, matureMeta, new Vect(x, y, z)); + return new CropBasicAgriCraft(world, block, matureMeta, new Vect(pos)); } @Override @@ -58,8 +60,8 @@ public class FarmableBasicAgricraft implements IFarmable { } @Override - public boolean plantSaplingAt(EntityPlayer player, ItemStack germling, World world, int x, int y, int z) { - return world.setBlock(x, y, z, block, 0, Constants.FLAG_BLOCK_SYNCH); + public boolean plantSaplingAt(EntityPlayer player, ItemStack germling, World world, BlockPos pos) { + return world.setBlockState(pos, block.getStateFromMeta(0), Constants.FLAG_BLOCK_SYNCH); } } diff --git a/src/main/java/forestry/farming/logic/FarmableBasicFruit.java b/src/main/java/forestry/farming/logic/FarmableBasicFruit.java index 63ffbf84f..5fb814382 100644 --- a/src/main/java/forestry/farming/logic/FarmableBasicFruit.java +++ b/src/main/java/forestry/farming/logic/FarmableBasicFruit.java @@ -13,11 +13,13 @@ package forestry.farming.logic; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import forestry.api.farming.ICrop; import forestry.api.farming.IFarmable; import forestry.core.config.Constants; +import forestry.core.utils.BlockUtil; import forestry.core.utils.ItemStackUtil; import forestry.core.utils.vect.Vect; @@ -32,19 +34,19 @@ public class FarmableBasicFruit implements IFarmable { } @Override - public boolean isSaplingAt(World world, int x, int y, int z) { - return world.getBlock(x, y, z) == block; + public boolean isSaplingAt(World world, BlockPos pos) { + return BlockUtil.getBlock(world, pos) == block; } @Override - public ICrop getCropAt(World world, int x, int y, int z) { - if (world.getBlock(x, y, z) != block) { + public ICrop getCropAt(World world, BlockPos pos) { + if (BlockUtil.getBlock(world, pos) != block) { return null; } - if (world.getBlockMetadata(x, y, z) != matureMeta) { + if (BlockUtil.getBlockMetadata(world, pos) != matureMeta) { return null; } - return new CropBasicFruit(world, block, matureMeta, new Vect(x, y, z)); + return new CropBasicFruit(world, block, matureMeta, new Vect(pos)); } @Override @@ -53,8 +55,8 @@ public class FarmableBasicFruit implements IFarmable { } @Override - public boolean plantSaplingAt(EntityPlayer player, ItemStack germling, World world, int x, int y, int z) { - return world.setBlock(x, y, z, block, 0, Constants.FLAG_BLOCK_SYNCH); + public boolean plantSaplingAt(EntityPlayer player, ItemStack germling, World world, BlockPos pos) { + return world.setBlockState(pos, block.getStateFromMeta(0), Constants.FLAG_BLOCK_SYNCH); } @Override diff --git a/src/main/java/forestry/farming/logic/FarmableBasicGrowthCraft.java b/src/main/java/forestry/farming/logic/FarmableBasicGrowthCraft.java index e92cff5ba..664d4019f 100644 --- a/src/main/java/forestry/farming/logic/FarmableBasicGrowthCraft.java +++ b/src/main/java/forestry/farming/logic/FarmableBasicGrowthCraft.java @@ -13,11 +13,13 @@ package forestry.farming.logic; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import forestry.api.farming.ICrop; import forestry.api.farming.IFarmable; import forestry.core.config.Constants; +import forestry.core.utils.BlockUtil; import forestry.core.utils.ItemStackUtil; import forestry.core.utils.vect.Vect; @@ -36,19 +38,19 @@ public class FarmableBasicGrowthCraft implements IFarmable { } @Override - public boolean isSaplingAt(World world, int x, int y, int z) { - return world.getBlock(x, y, z) == block; + public boolean isSaplingAt(World world, BlockPos pos) { + return BlockUtil.getBlock(world, pos) == block; } @Override - public ICrop getCropAt(World world, int x, int y, int z) { - if (world.getBlock(x, y, z) != block) { + public ICrop getCropAt(World world, BlockPos pos) { + if (BlockUtil.getBlock(world, pos) != block) { return null; } - if (world.getBlockMetadata(x, y, z) != matureMeta) { + if (BlockUtil.getBlockMetadata(world, pos) != matureMeta) { return null; } - return new CropBasicGrowthCraft(world, block, matureMeta, new Vect(x, y, z), isRice, isGrape); + return new CropBasicGrowthCraft(world, block, matureMeta, new Vect(pos), isRice, isGrape); } @Override @@ -57,8 +59,8 @@ public class FarmableBasicGrowthCraft implements IFarmable { } @Override - public boolean plantSaplingAt(EntityPlayer player, ItemStack germling, World world, int x, int y, int z) { - return world.setBlock(x, y, z, block, 0, Constants.FLAG_BLOCK_SYNCH); + public boolean plantSaplingAt(EntityPlayer player, ItemStack germling, World world, BlockPos pos) { + return world.setBlockState(pos, block.getStateFromMeta(0), Constants.FLAG_BLOCK_SYNCH); } @Override diff --git a/src/main/java/forestry/farming/logic/FarmableBasicIC2Crop.java b/src/main/java/forestry/farming/logic/FarmableBasicIC2Crop.java index 7f867df9f..d7688c6c0 100644 --- a/src/main/java/forestry/farming/logic/FarmableBasicIC2Crop.java +++ b/src/main/java/forestry/farming/logic/FarmableBasicIC2Crop.java @@ -7,12 +7,13 @@ import forestry.plugins.compat.PluginIC2; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; public class FarmableBasicIC2Crop implements IFarmable { @Override - public boolean isSaplingAt(World world, int x, int y, int z) { - TileEntity crop = world.getTileEntity(x, y, z); + public boolean isSaplingAt(World world, BlockPos pos) { + TileEntity crop = world.getTileEntity(pos); if(PluginIC2.instance.isIC2Crop(crop)) { PluginIC2.instance.babysitCrop(crop); return true; @@ -21,8 +22,8 @@ public class FarmableBasicIC2Crop implements IFarmable { } @Override - public ICrop getCropAt(World world, int x, int y, int z) { - TileEntity crop = world.getTileEntity(x, y, z); + public ICrop getCropAt(World world, BlockPos pos) { + TileEntity crop = world.getTileEntity(pos); if (crop == null) { return null; } @@ -32,7 +33,7 @@ public class FarmableBasicIC2Crop implements IFarmable { if (!PluginIC2.instance.canHarvestCrop(crop)) { return null; } - return new CropBasicIC2Crop(world, crop, new Vect(x, y, z)); + return new CropBasicIC2Crop(world, crop, new Vect(pos)); } @Override @@ -46,7 +47,7 @@ public class FarmableBasicIC2Crop implements IFarmable { } @Override - public boolean plantSaplingAt(EntityPlayer player, ItemStack germling, World world, int x, int y, int z) { + public boolean plantSaplingAt(EntityPlayer player, ItemStack germling, World world, BlockPos pos) { return false; } } diff --git a/src/main/java/forestry/farming/logic/FarmableCocoa.java b/src/main/java/forestry/farming/logic/FarmableCocoa.java index 794798c0f..86fea81dd 100755 --- a/src/main/java/forestry/farming/logic/FarmableCocoa.java +++ b/src/main/java/forestry/farming/logic/FarmableCocoa.java @@ -16,6 +16,7 @@ import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import forestry.api.farming.ICrop; @@ -30,22 +31,22 @@ public class FarmableCocoa implements IFarmable { public static final int COCOA_META = 3; @Override - public boolean isSaplingAt(World world, int x, int y, int z) { - return world.getBlock(x, y, z) == COCOA_PLANT; + public boolean isSaplingAt(World world, BlockPos pos) { + return BlockUtil.getBlock(world, pos) == COCOA_PLANT; } @Override - public ICrop getCropAt(World world, int x, int y, int z) { - Block block = world.getBlock(x, y, z); + public ICrop getCropAt(World world, BlockPos pos) { + Block block = BlockUtil.getBlock(world, pos); if (block != COCOA_PLANT) { return null; } - int meta = world.getBlockMetadata(x, y, z); - if (BlockUtil.getMaturityPod(meta) < 2) { + int meta = BlockUtil.getBlockMetadata(world, pos); + if (BlockUtil.getMaturityPod(BlockUtil.getBlockState(world, pos)) < 2) { return null; } - return new CropBlock(world, block, meta, new Vect(x, y, z)); + return new CropBlock(world, block, meta, new Vect(pos)); } @Override @@ -59,8 +60,8 @@ public class FarmableCocoa implements IFarmable { } @Override - public boolean plantSaplingAt(EntityPlayer player, ItemStack germling, World world, int x, int y, int z) { - return BlockUtil.tryPlantPot(world, x, y, z, COCOA_PLANT); + public boolean plantSaplingAt(EntityPlayer player, ItemStack germling, World world, BlockPos pos) { + return BlockUtil.tryPlantPot(world, pos, COCOA_PLANT); } } diff --git a/src/main/java/forestry/farming/logic/FarmableGE.java b/src/main/java/forestry/farming/logic/FarmableGE.java index 634eb3984..3d28b7374 100755 --- a/src/main/java/forestry/farming/logic/FarmableGE.java +++ b/src/main/java/forestry/farming/logic/FarmableGE.java @@ -13,42 +13,45 @@ package forestry.farming.logic; import net.minecraft.block.Block; 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; import forestry.api.arboriculture.IAlleleTreeSpecies; import forestry.api.farming.ICrop; import forestry.api.farming.IFarmable; import forestry.arboriculture.genetics.TreeGenome; +import forestry.core.utils.BlockUtil; import forestry.core.utils.vect.Vect; import forestry.plugins.PluginArboriculture; public class FarmableGE implements IFarmable { @Override - public boolean isSaplingAt(World world, int x, int y, int z) { + public boolean isSaplingAt(World world, BlockPos pos) { - if (world.isAirBlock(x, y, z)) { + if (world.isAirBlock(pos)) { return false; } - Block block = world.getBlock(x, y, z); + Block block = BlockUtil.getBlock(world, pos); return PluginArboriculture.blocks.saplingGE == block; } @Override - public ICrop getCropAt(World world, int x, int y, int z) { - Block block = world.getBlock(x, y, z); + public ICrop getCropAt(World world, BlockPos pos) { + Block block = BlockUtil.getBlock(world, pos); - if (!block.isWood(world, x, y, z)) { + if (!block.isWood(world, pos)) { return null; } - return new CropBlock(world, block, world.getBlockMetadata(x, y, z), new Vect(x, y, z)); + return new CropBlock(world, block, BlockUtil.getBlockMetadata(world, pos), new Vect(pos)); } @Override - public boolean plantSaplingAt(EntityPlayer player, ItemStack germling, World world, int x, int y, int z) { - return germling.copy().tryPlaceItemIntoWorld(player, world, x, y - 1, z, 1, 0, 0, 0); + public boolean plantSaplingAt(EntityPlayer player, ItemStack germling, World world, BlockPos pos) { + return germling.copy().onItemUse(player, world, pos.add(0, -1, 0), EnumFacing.UP, 0, 0, 0); } @Override diff --git a/src/main/java/forestry/farming/logic/FarmableGenericCrop.java b/src/main/java/forestry/farming/logic/FarmableGenericCrop.java index b81d7fdb1..8a8e4ffa0 100755 --- a/src/main/java/forestry/farming/logic/FarmableGenericCrop.java +++ b/src/main/java/forestry/farming/logic/FarmableGenericCrop.java @@ -13,10 +13,13 @@ package forestry.farming.logic; import net.minecraft.block.Block; 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; import forestry.api.farming.ICrop; import forestry.api.farming.IFarmable; +import forestry.core.utils.BlockUtil; import forestry.core.utils.vect.Vect; public class FarmableGenericCrop implements IFarmable { @@ -34,20 +37,20 @@ public class FarmableGenericCrop implements IFarmable { } @Override - public boolean isSaplingAt(World world, int x, int y, int z) { - return world.getBlock(x, y, z) == block; + public boolean isSaplingAt(World world, BlockPos pos) { + return BlockUtil.getBlock(world, pos) == block; } @Override - public ICrop getCropAt(World world, int x, int y, int z) { - if (world.getBlock(x, y, z) != block) { + public ICrop getCropAt(World world, BlockPos pos) { + if (BlockUtil.getBlock(world, pos) != block) { return null; } - if (world.getBlockMetadata(x, y, z) != mature) { + if (BlockUtil.getBlockMetadata(world, pos) != mature) { return null; } - return new CropBlock(world, block, mature, new Vect(x, y, z)); + return new CropBlock(world, block, mature, new Vect(pos)); } @Override @@ -64,8 +67,8 @@ public class FarmableGenericCrop implements IFarmable { } @Override - public boolean plantSaplingAt(EntityPlayer player, ItemStack germling, World world, int x, int y, int z) { - return germling.copy().tryPlaceItemIntoWorld(player, world, x, y - 1, z, 1, 0, 0, 0); + public boolean plantSaplingAt(EntityPlayer player, ItemStack germling, World world, BlockPos pos) { + return germling.copy().onItemUse(player, world, pos.add(0, -1, 0), EnumFacing.UP, 0, 0, 0); } @Override diff --git a/src/main/java/forestry/farming/logic/FarmableGenericSapling.java b/src/main/java/forestry/farming/logic/FarmableGenericSapling.java index 3afaa20e0..095b467b5 100755 --- a/src/main/java/forestry/farming/logic/FarmableGenericSapling.java +++ b/src/main/java/forestry/farming/logic/FarmableGenericSapling.java @@ -13,10 +13,13 @@ package forestry.farming.logic; import net.minecraft.block.Block; 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; import forestry.api.farming.ICrop; import forestry.api.farming.IFarmable; +import forestry.core.utils.BlockUtil; import forestry.core.utils.ItemStackUtil; import forestry.core.utils.vect.Vect; @@ -33,18 +36,18 @@ public class FarmableGenericSapling implements IFarmable { } @Override - public boolean isSaplingAt(World world, int x, int y, int z) { + public boolean isSaplingAt(World world, BlockPos pos) { - if (world.isAirBlock(x, y, z)) { + if (world.isAirBlock(pos)) { return false; } - if (world.getBlock(x, y, z) == sapling) { + if (BlockUtil.getBlock(world, pos) == sapling) { return true; } if (saplingMeta >= 0) { - return world.getBlockMetadata(x, y, z) == saplingMeta; + return BlockUtil.getBlockMetadata(world, pos) == saplingMeta; } else { return true; } @@ -52,13 +55,13 @@ public class FarmableGenericSapling implements IFarmable { } @Override - public ICrop getCropAt(World world, int x, int y, int z) { - Block block = world.getBlock(x, y, z); - if (!block.isWood(world, x, y, z)) { + public ICrop getCropAt(World world, BlockPos pos) { + Block block = BlockUtil.getBlock(world, pos); + if (!block.isWood(world,pos)) { return null; } - return new CropBlock(world, block, world.getBlockMetadata(x, y, z), new Vect(x, y, z)); + return new CropBlock(world, block, BlockUtil.getBlockMetadata(world, pos), new Vect(pos)); } @Override @@ -86,8 +89,8 @@ public class FarmableGenericSapling implements IFarmable { } @Override - public boolean plantSaplingAt(EntityPlayer player, ItemStack germling, World world, int x, int y, int z) { - return germling.copy().tryPlaceItemIntoWorld(player, world, x, y - 1, z, 1, 0, 0, 0); + public boolean plantSaplingAt(EntityPlayer player, ItemStack germling, World world, BlockPos pos) { + return germling.copy().onItemUse(player, world, pos.add(0, -1, 0), EnumFacing.UP, 0, 0, 0); } } diff --git a/src/main/java/forestry/farming/logic/FarmableGourd.java b/src/main/java/forestry/farming/logic/FarmableGourd.java index e11dcfd3d..16798a9e2 100755 --- a/src/main/java/forestry/farming/logic/FarmableGourd.java +++ b/src/main/java/forestry/farming/logic/FarmableGourd.java @@ -12,11 +12,13 @@ package forestry.farming.logic; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import forestry.api.farming.ICrop; import forestry.api.farming.IFarmable; import forestry.core.config.Constants; +import forestry.core.utils.BlockUtil; import forestry.core.utils.ItemStackUtil; import forestry.core.utils.vect.Vect; @@ -33,29 +35,29 @@ public class FarmableGourd implements IFarmable { } @Override - public boolean isSaplingAt(World world, int x, int y, int z) { - if (world.isAirBlock(x, y, z)) { + public boolean isSaplingAt(World world, BlockPos pos) { + if (world.isAirBlock(pos)) { return false; } - return ItemStackUtil.equals(world.getBlock(x, y, z), stem); + return ItemStackUtil.equals(BlockUtil.getBlock(world, pos), stem); } @Override - public ICrop getCropAt(World world, int x, int y, int z) { - if (world.isAirBlock(x, y, z)) { + public ICrop getCropAt(World world, BlockPos pos) { + if (world.isAirBlock(pos)) { return null; } - if (!ItemStackUtil.equals(world.getBlock(x, y, z), fruit)) { + if (!ItemStackUtil.equals(BlockUtil.getBlock(world, pos), fruit)) { return null; } - if (world.getBlockMetadata(x, y, z) != fruit.getItemDamage()) { + if (BlockUtil.getBlockMetadata(world, pos) != fruit.getItemDamage()) { return null; } - return new CropBlock(world, ItemStackUtil.getBlock(fruit), fruit.getItemDamage(), new Vect(x, y, z)); + return new CropBlock(world, ItemStackUtil.getBlock(fruit), fruit.getItemDamage(), new Vect(pos)); } @Override @@ -69,8 +71,8 @@ public class FarmableGourd implements IFarmable { } @Override - public boolean plantSaplingAt(EntityPlayer player, ItemStack germling, World world, int x, int y, int z) { - return world.setBlock(x, y, z, ItemStackUtil.getBlock(stem), 0, Constants.FLAG_BLOCK_SYNCH); + public boolean plantSaplingAt(EntityPlayer player, ItemStack germling, World world, BlockPos pos) { + return world.setBlockState(pos, ItemStackUtil.getBlock(stem).getStateFromMeta(0), Constants.FLAG_BLOCK_SYNCH); } } diff --git a/src/main/java/forestry/farming/logic/FarmableStacked.java b/src/main/java/forestry/farming/logic/FarmableStacked.java index aea4af2a3..93f005362 100755 --- a/src/main/java/forestry/farming/logic/FarmableStacked.java +++ b/src/main/java/forestry/farming/logic/FarmableStacked.java @@ -13,11 +13,13 @@ package forestry.farming.logic; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import forestry.api.farming.ICrop; import forestry.api.farming.IFarmable; import forestry.core.config.Constants; +import forestry.core.utils.BlockUtil; import forestry.core.utils.ItemStackUtil; import forestry.core.utils.vect.Vect; @@ -34,16 +36,16 @@ public class FarmableStacked implements IFarmable { } @Override - public boolean isSaplingAt(World world, int x, int y, int z) { - return world.getBlock(x, y, z) == block; + public boolean isSaplingAt(World world, BlockPos pos) { + return BlockUtil.getBlock(world, pos) == block; } @Override - public ICrop getCropAt(World world, int x, int y, int z) { - if (world.getBlock(x, y + (matureHeight - 1), z) != block) { + public ICrop getCropAt(World world, BlockPos pos) { + if (BlockUtil.getBlock(world, new BlockPos(pos.getX(), pos.getY() + (matureHeight - 1), pos.getZ())) != block) { return null; } - return new CropBlock(world, block, matureMeta, new Vect(x, y + (matureHeight - 1), z)); + return new CropBlock(world, block, matureMeta, new Vect(pos.getX(), pos.getY() + (matureHeight - 1), pos.getZ())); } @Override @@ -52,8 +54,8 @@ public class FarmableStacked implements IFarmable { } @Override - public boolean plantSaplingAt(EntityPlayer player, ItemStack germling, World world, int x, int y, int z) { - return world.setBlock(x, y, z, block, 0, Constants.FLAG_BLOCK_SYNCH); + public boolean plantSaplingAt(EntityPlayer player, ItemStack germling, World world, BlockPos pos) { + return world.setBlockState(pos, block.getStateFromMeta(0), Constants.FLAG_BLOCK_SYNCH); } @Override diff --git a/src/main/java/forestry/farming/logic/FarmableVanillaMushroom.java b/src/main/java/forestry/farming/logic/FarmableVanillaMushroom.java index 605b90d23..18c5b4cab 100644 --- a/src/main/java/forestry/farming/logic/FarmableVanillaMushroom.java +++ b/src/main/java/forestry/farming/logic/FarmableVanillaMushroom.java @@ -14,11 +14,13 @@ import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import forestry.api.farming.ICrop; import forestry.core.config.Constants; import forestry.core.proxy.Proxies; +import forestry.core.utils.BlockUtil; import forestry.core.utils.ItemStackUtil; import forestry.core.utils.vect.Vect; import forestry.plugins.PluginFarming; @@ -30,14 +32,14 @@ public class FarmableVanillaMushroom extends FarmableGenericSapling { } @Override - public ICrop getCropAt(World world, int x, int y, int z) { - Block block = world.getBlock(x, y, z); + public ICrop getCropAt(World world, BlockPos pos) { + Block block = BlockUtil.getBlock(world, pos); if (block != Blocks.brown_mushroom_block && block != Blocks.red_mushroom_block) { return null; } - return new CropBlock(world, block, world.getBlockMetadata(x, y, z), new Vect(x, y, z)); + return new CropBlock(world, block, BlockUtil.getBlockMetadata(world, pos), new Vect(pos)); } @Override @@ -46,13 +48,13 @@ public class FarmableVanillaMushroom extends FarmableGenericSapling { } @Override - public boolean plantSaplingAt(EntityPlayer player, ItemStack germling, World world, int x, int y, int z) { + public boolean plantSaplingAt(EntityPlayer player, ItemStack germling, World world, BlockPos pos) { int meta = 0; if (ItemStackUtil.equals(Blocks.red_mushroom, germling)) { meta = 1; } - Proxies.common.addBlockPlaceEffects(world, x, y, z, Blocks.brown_mushroom, 0); - return world.setBlock(x, y, z, PluginFarming.blocks.mushroom, meta, Constants.FLAG_BLOCK_SYNCH_AND_UPDATE); + Proxies.common.addBlockPlaceEffects(world, pos, Blocks.brown_mushroom.getStateFromMeta(0)); + return world.setBlockState(pos, PluginFarming.blocks.mushroom.getStateFromMeta(meta), Constants.FLAG_BLOCK_SYNCH_AND_UPDATE); } } diff --git a/src/main/java/forestry/farming/logic/FarmableVanillaSapling.java b/src/main/java/forestry/farming/logic/FarmableVanillaSapling.java index 0e9e12f75..51b959e61 100755 --- a/src/main/java/forestry/farming/logic/FarmableVanillaSapling.java +++ b/src/main/java/forestry/farming/logic/FarmableVanillaSapling.java @@ -14,6 +14,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import forestry.api.arboriculture.ITree; @@ -29,16 +31,16 @@ public class FarmableVanillaSapling extends FarmableGenericSapling { } @Override - public boolean plantSaplingAt(EntityPlayer player, ItemStack germling, World world, int x, int y, int z) { + public boolean plantSaplingAt(EntityPlayer player, ItemStack germling, World world, BlockPos pos) { if (PluginManager.Module.ARBORICULTURE.isEnabled()) { IIndividual tree = GeneticsUtil.getGeneticEquivalent(germling); if (!(tree instanceof ITree)) { return false; } - return TreeManager.treeRoot.plantSapling(world, (ITree) tree, player.getGameProfile(), x, y, z); + return TreeManager.treeRoot.plantSapling(world, (ITree) tree, player.getGameProfile(), pos); } else { - return germling.copy().tryPlaceItemIntoWorld(player, world, x, y - 1, z, 1, 0, 0, 0); + return germling.copy().onItemUse(player, world, pos.add(0, -1, 0), EnumFacing.UP, 0, 0, 0); } } diff --git a/src/main/java/forestry/farming/multiblock/FakeFarmController.java b/src/main/java/forestry/farming/multiblock/FakeFarmController.java index 3c786ab73..8539a48a6 100644 --- a/src/main/java/forestry/farming/multiblock/FakeFarmController.java +++ b/src/main/java/forestry/farming/multiblock/FakeFarmController.java @@ -12,6 +12,7 @@ package forestry.farming.multiblock; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fluids.FluidStack; @@ -69,7 +70,7 @@ public class FakeFarmController extends FakeMultiblockController implements IFar } @Override - public boolean plantGermling(IFarmable farmable, World world, int x, int y, int z) { + public boolean plantGermling(IFarmable farmable, World world, BlockPos pos) { return false; } diff --git a/src/main/java/forestry/farming/multiblock/FarmController.java b/src/main/java/forestry/farming/multiblock/FarmController.java index a4bbb7baa..06fb2d0f1 100644 --- a/src/main/java/forestry/farming/multiblock/FarmController.java +++ b/src/main/java/forestry/farming/multiblock/FarmController.java @@ -27,7 +27,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; import net.minecraft.util.StatCollector; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; @@ -171,8 +171,8 @@ public class FarmController extends RectangularMultiblockControllerBase implemen private BiomeGenBase getBiome() { if (cachedBiome == null) { - ChunkCoordinates coords = getReferenceCoord(); - cachedBiome = worldObj.getBiomeGenForCoords(coords.posX, coords.posZ); + BlockPos coords = getReferenceCoord(); + cachedBiome = worldObj.getBiomeGenForCoords(coords); } return cachedBiome; } @@ -337,9 +337,9 @@ public class FarmController extends RectangularMultiblockControllerBase implemen } @Override - public ChunkCoordinates getCoordinates() { - ChunkCoordinates coord = getReferenceCoord(); - return new ChunkCoordinates(coord); + public BlockPos getCoordinates() { + BlockPos coord = getReferenceCoord(); + return new BlockPos(coord); } @Override @@ -349,7 +349,7 @@ public class FarmController extends RectangularMultiblockControllerBase implemen for (IMultiblockComponent part : connectedParts) { if (part instanceof TileEntity) { TileEntity tile = (TileEntity) part; - tile.getWorldObj().notifyBlocksOfNeighborChange(tile.xCoord, tile.yCoord, tile.zCoord, tile.getBlockType()); + tile.getWorld().notifyBlockOfStateChange(tile.getPos(), tile.getBlockType()); } } markDirty(); @@ -387,8 +387,8 @@ public class FarmController extends RectangularMultiblockControllerBase implemen @Override public EnumTemperature getTemperature() { - ChunkCoordinates coords = getReferenceCoord(); - return EnumTemperature.getFromBiome(getBiome(), coords.posX, coords.posY, coords.posZ); + BlockPos coords = getReferenceCoord(); + return EnumTemperature.getFromBiome(getBiome(), coords); } @Override @@ -398,8 +398,8 @@ public class FarmController extends RectangularMultiblockControllerBase implemen @Override public float getExactTemperature() { - ChunkCoordinates coords = getReferenceCoord(); - return getBiome().getFloatTemperature(coords.posX, coords.posY, coords.posZ); + BlockPos coords = getReferenceCoord(); + return getBiome().getFloatTemperature(coords); } @Override @@ -414,8 +414,8 @@ public class FarmController extends RectangularMultiblockControllerBase implemen @Override public int[] getCoords() { if (coords == null) { - ChunkCoordinates centerCoord = getCenterCoord(); - coords = new int[]{centerCoord.posX, centerCoord.posY, centerCoord.posZ}; + BlockPos centerCoord = getCenterCoord(); + coords = new int[]{centerCoord.getX(), centerCoord.getY(), centerCoord.getZ()}; } return coords; } @@ -524,11 +524,11 @@ public class FarmController extends RectangularMultiblockControllerBase implemen private void setUpFarmlandTargets() { Vect targetStart = new Vect(getCoords()); - ChunkCoordinates max = getMaximumCoord(); - ChunkCoordinates min = getMinimumCoord(); + BlockPos max = getMaximumCoord(); + BlockPos min = getMinimumCoord(); - int sizeNorthSouth = Math.abs(max.posZ - min.posZ) + 1; - int sizeEastWest = Math.abs(max.posX - min.posX) + 1; + int sizeNorthSouth = Math.abs(max.getZ() - min.getZ()) + 1; + int sizeEastWest = Math.abs(max.getX() - min.getX()) + 1; // Set the maximum allowed extent. allowedExtent = Math.max(sizeNorthSouth, sizeEastWest) * Config.farmSize + 1; @@ -665,9 +665,9 @@ public class FarmController extends RectangularMultiblockControllerBase implemen private static boolean cultivateTarget(FarmTarget target, IFarmLogic logic, Iterable farmListeners) { Vect targetPosition = target.getStart().add(0, target.getYOffset(), 0); - if (logic.cultivate(targetPosition.x, targetPosition.y, targetPosition.z, target.getDirection(), target.getExtent())) { + if (logic.cultivate(targetPosition, target.getDirection(), target.getExtent())) { for (IFarmListener listener : farmListeners) { - listener.hasCultivated(logic, targetPosition.x, targetPosition.y, targetPosition.z, target.getDirection(), target.getExtent()); + listener.hasCultivated(logic, targetPosition, target.getDirection(), target.getExtent()); } return true; } @@ -689,14 +689,15 @@ public class FarmController extends RectangularMultiblockControllerBase implemen } private static Collection harvestTarget(FarmTarget target, IFarmLogic logic, Iterable farmListeners) { - Collection harvested = logic.harvest(target.getStart().x, target.getStart().y + target.getYOffset(), target.getStart().z, target.getDirection(), target.getExtent()); + BlockPos pos = new BlockPos(target.getStart().getX(), target.getStart().getX() + target.getYOffset(), target.getStart().getZ()); + Collection harvested = logic.harvest(pos, target.getDirection(), target.getExtent()); if (harvested == null || harvested.size() == 0) { return Collections.emptyList(); } // Let event handlers know. for (IFarmListener listener : farmListeners) { - listener.hasScheduledHarvest(harvested, logic, target.getStart().x, target.getStart().y + target.getYOffset(), target.getStart().z, target.getDirection(), target.getExtent()); + listener.hasScheduledHarvest(harvested, logic, pos, target.getDirection(), target.getExtent()); } return harvested; @@ -787,9 +788,9 @@ public class FarmController extends RectangularMultiblockControllerBase implemen } @Override - public boolean plantGermling(IFarmable germling, World world, int x, int y, int z) { + public boolean plantGermling(IFarmable germling, World world, BlockPos pos) { EntityPlayer player = PlayerUtil.getPlayer(world, getAccessHandler().getOwner()); - return inventory.plantGermling(germling, player, x, y, z); + return inventory.plantGermling(germling, player, pos); } @Override diff --git a/src/main/java/forestry/farming/multiblock/InventoryFarm.java b/src/main/java/forestry/farming/multiblock/InventoryFarm.java index cfc5d4675..1ed6895e0 100644 --- a/src/main/java/forestry/farming/multiblock/InventoryFarm.java +++ b/src/main/java/forestry/farming/multiblock/InventoryFarm.java @@ -16,7 +16,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; - +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraftforge.fluids.Fluid; import forestry.api.farming.FarmDirection; @@ -80,7 +81,7 @@ public class InventoryFarm extends InventoryAdapterRestricted implements IFarmIn } @Override - public boolean canExtractItem(int slotIndex, ItemStack stack, int side) { + public boolean canExtractItem(int slotIndex, ItemStack stack, EnumFacing side) { return SlotUtil.isSlotInRange(slotIndex, SLOT_PRODUCTION_1, SLOT_PRODUCTION_COUNT); } @@ -161,14 +162,14 @@ public class InventoryFarm extends InventoryAdapterRestricted implements IFarmIn FluidHelper.drainContainers(tankManager, this, SLOT_CAN); } - public boolean plantGermling(IFarmable germling, EntityPlayer player, int x, int y, int z) { + public boolean plantGermling(IFarmable germling, EntityPlayer player, BlockPos pos) { for (int i = 0; i < germlingsInventory.getSizeInventory(); i++) { ItemStack germlingStack = germlingsInventory.getStackInSlot(i); if (germlingStack == null || !germling.isGermling(germlingStack)) { continue; } - if (germling.plantSaplingAt(player, germlingStack, player.worldObj, x, y, z)) { + if (germling.plantSaplingAt(player, germlingStack, player.worldObj, pos)) { germlingsInventory.decrStackSize(i, 1); return true; } diff --git a/src/main/java/forestry/farming/multiblock/MultiblockLogicFarm.java b/src/main/java/forestry/farming/multiblock/MultiblockLogicFarm.java index 67075e14c..4a535bd95 100644 --- a/src/main/java/forestry/farming/multiblock/MultiblockLogicFarm.java +++ b/src/main/java/forestry/farming/multiblock/MultiblockLogicFarm.java @@ -29,6 +29,7 @@ public class MultiblockLogicFarm extends MultiblockLogic icons; + private static List sprites; @SideOnly(Side.CLIENT) - public static void registerIcons(IIconRegister register) { - icons = Arrays.asList( - TextureManager.registerTex(register, "farm/plain"), - TextureManager.registerTex(register, "farm/reverse"), - TextureManager.registerTex(register, "farm/top"), - TextureManager.registerTex(register, "farm/band"), - TextureManager.registerTex(register, "farm/gears"), - TextureManager.registerTex(register, "farm/hatch"), - TextureManager.registerTex(register, "farm/valve"), - TextureManager.registerTex(register, "farm/control") + public static void registerSprites() { + sprites = Arrays.asList( + TextureManager.registerSprite("blocks/farm/plain"), + TextureManager.registerSprite("blocks/farm/reverse"), + TextureManager.registerSprite("blocks/farm/top"), + TextureManager.registerSprite("blocks/farm/band"), + TextureManager.registerSprite("blocks/farm/gears"), + TextureManager.registerSprite("blocks/farm/hatch"), + TextureManager.registerSprite("blocks/farm/valve"), + TextureManager.registerSprite("blocks/farm/control") ); } @@ -69,31 +66,84 @@ public enum EnumFarmBlockTexture { EnumFarmBlockTexture(ItemStack base) { this.base = base; } - + + /** + * @return The texture sprite from the type of the farm block + */ @SideOnly(Side.CLIENT) - public static IIcon getIcon(BlockFarmType type, int side) { + public static TextureAtlasSprite getSprite(EnumBlockFarmType type, int side) { switch (type) { case BASIC: { if (side == 2) { - return icons.get(TYPE_REVERSE); + return sprites.get(TYPE_REVERSE); } else if (side == 0 || side == 1) { - return icons.get(TYPE_TOP); + return sprites.get(TYPE_TOP); } else { - return icons.get(TYPE_PLAIN); + return sprites.get(TYPE_PLAIN); } } case BAND: - return icons.get(TYPE_BAND); + return sprites.get(TYPE_BAND); case GEARBOX: - return icons.get(TYPE_GEARS); + return sprites.get(TYPE_GEARS); case HATCH: - return icons.get(TYPE_HATCH); + return sprites.get(TYPE_HATCH); case VALVE: - return icons.get(TYPE_VALVE); + return sprites.get(TYPE_VALVE); case CONTROL: - return icons.get(TYPE_CONTROL); + return sprites.get(TYPE_CONTROL); default: - return icons.get(TYPE_PLAIN); + return sprites.get(TYPE_PLAIN); + } + } + + /** + * @return The texture sprite from the material of the farm block + */ + @SideOnly(Side.CLIENT) + public static TextureAtlasSprite getSprite(EnumFarmBlockTexture texture, int side) { + TextureManager manager = TextureManager.getInstance(); + switch (texture) { + case BRICK: + return manager.getSprite("minecraft", "blocks/brick"); + case BRICK_STONE: + return manager.getSprite("minecraft", "blocks/stonebrick"); + case BRICK_CHISELED: + return manager.getSprite("minecraft", "blocks/stonebrick_carved"); + case BRICK_CRACKED: + return manager.getSprite("minecraft", "blocks/stonebrick_cracked"); + case BRICK_MOSSY: + return manager.getSprite("minecraft", "blocks/stonebrick_mossy"); + case BRICK_NETHER: + return manager.getSprite("minecraft", "blocks/nether_brick"); + case SANDSTONE_CHISELED: + if (side == 0) + return manager.getSprite("minecraft", "blocks/sandstone_bottom"); + else if (side == 1) + return manager.getSprite("minecraft", "blocks/sandstone_top"); + return manager.getSprite("minecraft", "blocks/sandstone_carved"); + case SANDSTONE_SMOOTH: + if (side == 0) + return manager.getSprite("minecraft", "blocks/sandstone_bottom"); + else if (side == 1) + return manager.getSprite("minecraft", "blocks/sandstone_top"); + return manager.getSprite("minecraft", "blocks/sandstone_smooth"); + case QUARTZ: + if (side == 0) + return manager.getSprite("minecraft", "blocks/quartz_block_bottom"); + else if (side == 1) + return manager.getSprite("minecraft", "blocks/quartz_block_top"); + return manager.getSprite("minecraft", "blocks/quartz_block_side"); + case QUARTZ_CHISELED: + if (side == 0 || side == 1) + return manager.getSprite("minecraft", "blocks/quartz_block_chiseled_top"); + return manager.getSprite("minecraft", "blocks/quartz_block_chiseled"); + case QUARTZ_LINES: + if (side == 0 || side == 1) + return manager.getSprite("minecraft", "blocks/quartz_block_lines_top"); + return manager.getSprite("minecraft", "blocks/quartz_block_lines"); + default: + return null; } } diff --git a/src/main/java/forestry/farming/render/ModelFarmBlock.java b/src/main/java/forestry/farming/render/ModelFarmBlock.java new file mode 100644 index 000000000..5d02d23ea --- /dev/null +++ b/src/main/java/forestry/farming/render/ModelFarmBlock.java @@ -0,0 +1,117 @@ +package forestry.farming.render; + +import forestry.api.core.IModelBaker; +import forestry.core.render.model.ModelBlockOverlay; +import forestry.farming.blocks.BlockFarm; +import forestry.farming.blocks.EnumBlockFarmType; +import forestry.farming.tiles.TileFarm; +import forestry.plugins.PluginFarming; +import net.minecraft.block.Block; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; +import net.minecraft.world.IBlockAccess; + +public class ModelFarmBlock extends ModelBlockOverlay { + + @Override + public void renderInventory(Block block, ItemStack item, IModelBaker renderer) { + if (block == null) { + return; + } + + EnumFarmBlockTexture type = EnumFarmBlockTexture.getFromCompound(item.getTagCompound()); + + TextureAtlasSprite[] textures = getSprites(type); + TextureAtlasSprite[] texturesOverlay = getOverlaySprites(EnumBlockFarmType.VALUES[item.getItemDamage()]); + + block.setBlockBoundsForItemRender(); + renderer.setRenderBoundsFromBlock(block); + + // GL11.glTranslatef(translateX, translateY, translateZ); + renderer.renderFaceYNeg(null, textures[0]); + renderer.renderFaceYNeg(null, texturesOverlay[0]); + + renderer.renderFaceYPos(null, textures[1]); + renderer.renderFaceYPos(null, texturesOverlay[1]); + + renderer.renderFaceZNeg(null, textures[2]); + renderer.renderFaceZNeg(null, texturesOverlay[2]); + + renderer.renderFaceZPos(null, textures[3]); + renderer.renderFaceZPos(null, texturesOverlay[3]); + + renderer.renderFaceXNeg(null, textures[4]); + renderer.renderFaceXNeg(null, texturesOverlay[4]); + + renderer.renderFaceXPos(null, textures[5]); + renderer.renderFaceXPos(null, texturesOverlay[5]); + + // GL11.glTranslatef(0.5F, 0.5F, 0.5F); + + block.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F); + } + + @Override + public boolean renderInWorld(Block block, IBlockAccess world, BlockPos pos, IModelBaker renderer) { + + TileFarm farm = (TileFarm) world.getTileEntity(pos); + + TextureAtlasSprite[] textures = getSprites(farm.getFarmBlockTexture()); + TextureAtlasSprite[] texturesOverlay = getOverlaySprites(EnumBlockFarmType.VALUES[farm.getBlockMetadata()]); + + // Render the plain block. + renderer.renderStandardBlock(block, pos, textures); + renderFarmOverlay(world, PluginFarming.blocks.farm, pos, renderer, texturesOverlay); + + return true; + } + + private static void renderFarmOverlay(IBlockAccess world, BlockFarm block, BlockPos pos, IModelBaker renderer, + TextureAtlasSprite[] texturesOverlay) { + int mixedBrightness = block.getMixedBrightnessForBlock(world, pos); + + float adjR = 0.5f; + float adjG = 0.5f; + float adjB = 0.5f; + + renderBottomFace(world, block, pos, renderer, texturesOverlay[0], mixedBrightness, adjR, adjG, adjB); + renderTopFace(world, block, pos, renderer, texturesOverlay[1], mixedBrightness, adjR, adjG, adjB); + renderEastFace(world, block, pos, renderer, texturesOverlay[2], mixedBrightness, adjR, adjG, adjB); + renderWestFace(world, block, pos, renderer, texturesOverlay[3], mixedBrightness, adjR, adjG, adjB); + renderNorthFace(world, block, pos, renderer, texturesOverlay[4], mixedBrightness, adjR, adjG, adjB); + renderSouthFace(world, block, pos, renderer, texturesOverlay[5], mixedBrightness, adjR, adjG, adjB); + } + + private static TextureAtlasSprite[] getSprites(EnumFarmBlockTexture texture) { + TextureAtlasSprite[] textures = new TextureAtlasSprite[6]; + textures[0] = EnumFarmBlockTexture.getSprite(texture, 0); + textures[1] = EnumFarmBlockTexture.getSprite(texture, 1); + textures[2] = EnumFarmBlockTexture.getSprite(texture, 2); + textures[3] = EnumFarmBlockTexture.getSprite(texture, 3); + textures[4] = EnumFarmBlockTexture.getSprite(texture, 4); + textures[5] = EnumFarmBlockTexture.getSprite(texture, 5); + return textures; + } + + private static TextureAtlasSprite[] getOverlaySprites(EnumBlockFarmType type) { + TextureAtlasSprite[] textures = new TextureAtlasSprite[6]; + textures[0] = getOverlaySprite(type, 0); + textures[1] = getOverlaySprite(type, 1); + textures[2] = getOverlaySprite(type, 2); + textures[3] = getOverlaySprite(type, 3); + textures[4] = getOverlaySprite(type, 4); + textures[5] = getOverlaySprite(type, 5); + return textures; + } + + private static TextureAtlasSprite getOverlaySprite(EnumBlockFarmType texture, int side) { + return EnumFarmBlockTexture.getSprite(texture, side); + } + + @Override + public TextureAtlasSprite getParticleTexture() { + return getSprites(EnumFarmBlockTexture.BRICK)[0]; + } + +} diff --git a/src/main/java/forestry/farming/render/RenderFarmBlock.java b/src/main/java/forestry/farming/render/RenderFarmBlock.java deleted file mode 100644 index 67c65732f..000000000 --- a/src/main/java/forestry/farming/render/RenderFarmBlock.java +++ /dev/null @@ -1,62 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v3 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: - * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges - ******************************************************************************/ -package forestry.farming.render; - -import net.minecraft.block.Block; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.world.IBlockAccess; - -import forestry.core.render.RenderOverlayBlock; -import forestry.farming.blocks.BlockFarm; -import forestry.plugins.PluginFarming; - -public class RenderFarmBlock extends RenderOverlayBlock { - - @Override - public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) { - } - - @Override - public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { - - // Render the plain block. - renderer.renderStandardBlock(block, x, y, z); - renderFarmOverlay(world, PluginFarming.blocks.farm, x, y, z, renderer); - - return true; - } - - private static void renderFarmOverlay(IBlockAccess world, BlockFarm block, int x, int y, int z, RenderBlocks renderer) { - int mixedBrightness = block.getMixedBrightnessForBlock(world, x, y, z); - int metadata = world.getBlockMetadata(x, y, z); - - float adjR = 0.5f; - float adjG = 0.5f; - float adjB = 0.5f; - - renderBottomFace(world, block, x, y, z, renderer, BlockFarm.getOverlayTextureForBlock(0, metadata), mixedBrightness, adjR, adjG, adjB); - renderTopFace(world, block, x, y, z, renderer, BlockFarm.getOverlayTextureForBlock(1, metadata), mixedBrightness, adjR, adjG, adjB); - renderEastFace(world, block, x, y, z, renderer, BlockFarm.getOverlayTextureForBlock(2, metadata), mixedBrightness, adjR, adjG, adjB); - renderWestFace(world, block, x, y, z, renderer, BlockFarm.getOverlayTextureForBlock(3, metadata), mixedBrightness, adjR, adjG, adjB); - renderNorthFace(world, block, x, y, z, renderer, BlockFarm.getOverlayTextureForBlock(4, metadata), mixedBrightness, adjR, adjG, adjB); - renderSouthFace(world, block, x, y, z, renderer, BlockFarm.getOverlayTextureForBlock(5, metadata), mixedBrightness, adjR, adjG, adjB); - } - - @Override - public boolean shouldRender3DInInventory(int modelId) { - return true; - } - - @Override - public int getRenderId() { - return PluginFarming.modelIdFarmBlock; - } -} diff --git a/src/main/java/forestry/farming/render/RenderFarmItem.java b/src/main/java/forestry/farming/render/RenderFarmItem.java deleted file mode 100644 index 00de22e99..000000000 --- a/src/main/java/forestry/farming/render/RenderFarmItem.java +++ /dev/null @@ -1,123 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v3 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: - * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges - ******************************************************************************/ -package forestry.farming.render; - -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.item.ItemStack; - -import net.minecraftforge.client.IItemRenderer; - -import org.lwjgl.opengl.GL11; - -import forestry.core.utils.ItemStackUtil; -import forestry.farming.blocks.BlockFarm; - -public class RenderFarmItem implements IItemRenderer { - - private static void renderFarmBlock(RenderBlocks render, ItemStack item, float translateX, float translateY, float translateZ) { - Tessellator tessellator = Tessellator.instance; - BlockFarm block = (BlockFarm) ItemStackUtil.getBlock(item); - if (block == null) { - return; - } - - block.setBlockBoundsForItemRender(); - render.setRenderBoundsFromBlock(block); - - EnumFarmBlockTexture type = EnumFarmBlockTexture.getFromCompound(item.getTagCompound()); - - GL11.glTranslatef(translateX, translateY, translateZ); - - tessellator.startDrawingQuads(); - tessellator.setNormal(0.0F, -1F, 0.0F); - render.renderFaceYNeg(block, 0.0D, 0.0D, 0.0D, BlockFarm.getBlockTextureForSide(type, 0)); - render.renderFaceYNeg(block, 0.0D, 0.0D, 0.0D, BlockFarm.getOverlayTextureForBlock(0, item.getItemDamage())); - tessellator.draw(); - - tessellator.startDrawingQuads(); - tessellator.setNormal(0.0F, 1.0F, 0.0F); - render.renderFaceYPos(block, 0.0D, 0.0D, 0.0D, BlockFarm.getBlockTextureForSide(type, 1)); - render.renderFaceYPos(block, 0.0D, 0.0D, 0.0D, BlockFarm.getOverlayTextureForBlock(1, item.getItemDamage())); - tessellator.draw(); - - tessellator.startDrawingQuads(); - tessellator.setNormal(0.0F, 0.0F, -1F); - render.renderFaceZNeg(block, 0.0D, 0.0D, 0.0D, BlockFarm.getBlockTextureForSide(type, 2)); - render.renderFaceZNeg(block, 0.0D, 0.0D, 0.0D, BlockFarm.getOverlayTextureForBlock(2, item.getItemDamage())); - tessellator.draw(); - - tessellator.startDrawingQuads(); - tessellator.setNormal(0.0F, 0.0F, 1.0F); - render.renderFaceZPos(block, 0.0D, 0.0D, 0.0D, BlockFarm.getBlockTextureForSide(type, 3)); - render.renderFaceZPos(block, 0.0D, 0.0D, 0.0D, BlockFarm.getOverlayTextureForBlock(3, item.getItemDamage())); - tessellator.draw(); - - tessellator.startDrawingQuads(); - tessellator.setNormal(-1F, 0.0F, 0.0F); - render.renderFaceXNeg(block, 0.0D, 0.0D, 0.0D, BlockFarm.getBlockTextureForSide(type, 4)); - render.renderFaceXNeg(block, 0.0D, 0.0D, 0.0D, BlockFarm.getOverlayTextureForBlock(4, item.getItemDamage())); - tessellator.draw(); - - tessellator.startDrawingQuads(); - tessellator.setNormal(1.0F, 0.0F, 0.0F); - render.renderFaceXPos(block, 0.0D, 0.0D, 0.0D, BlockFarm.getBlockTextureForSide(type, 5)); - render.renderFaceXPos(block, 0.0D, 0.0D, 0.0D, BlockFarm.getOverlayTextureForBlock(5, item.getItemDamage())); - tessellator.draw(); - - GL11.glTranslatef(0.5F, 0.5F, 0.5F); - - block.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F); - } - - @Override - public boolean handleRenderType(ItemStack item, ItemRenderType type) { - switch (type) { - case ENTITY: - case EQUIPPED_FIRST_PERSON: - case EQUIPPED: - case INVENTORY: - return true; - default: - return false; - } - } - - @Override - public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { - return true; - } - - @Override - public void renderItem(ItemRenderType type, ItemStack item, Object... data) { - GL11.glPushAttrib(GL11.GL_ENABLE_BIT); - GL11.glEnable(GL11.GL_DEPTH_TEST); - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - - switch (type) { - case ENTITY: - renderFarmBlock((RenderBlocks) data[0], item, -0.5f, -0.5f, -0.5f); - break; - case EQUIPPED: - case EQUIPPED_FIRST_PERSON: - renderFarmBlock((RenderBlocks) data[0], item, 0f, 0f, 0f); - break; - case INVENTORY: - renderFarmBlock((RenderBlocks) data[0], item, -0.5f, -0.5f, -0.5f); - break; - default: - } - - GL11.glPopAttrib(); - } - -} diff --git a/src/main/java/forestry/farming/tiles/TileFarm.java b/src/main/java/forestry/farming/tiles/TileFarm.java index 39fdde0a3..0b4f82aab 100644 --- a/src/main/java/forestry/farming/tiles/TileFarm.java +++ b/src/main/java/forestry/farming/tiles/TileFarm.java @@ -16,8 +16,7 @@ import java.util.List; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.ChunkCoordinates; - +import net.minecraft.util.BlockPos; import forestry.api.circuits.ICircuitSocketType; import forestry.api.core.IErrorLogic; import forestry.api.core.IErrorLogicSource; @@ -49,14 +48,14 @@ public abstract class TileFarm extends MultiblockTileEntityForestry 0 || world.isBlockProvidingPowerTo(side.x, side.y, side.z, dir) > 0; + return world.getRedstonePower(side, dir) > 0 || world.getStrongPower(side,dir) > 0; } } diff --git a/src/main/java/forestry/farming/tiles/TileFarmGearbox.java b/src/main/java/forestry/farming/tiles/TileFarmGearbox.java index 3f40ac3de..96d1eeab8 100644 --- a/src/main/java/forestry/farming/tiles/TileFarmGearbox.java +++ b/src/main/java/forestry/farming/tiles/TileFarmGearbox.java @@ -11,9 +11,7 @@ package forestry.farming.tiles; import net.minecraft.nbt.NBTTagCompound; - -import net.minecraftforge.common.util.ForgeDirection; - +import net.minecraft.util.EnumFacing; import forestry.api.multiblock.IFarmComponent; import forestry.api.multiblock.IFarmController; import forestry.core.tiles.IPowerHandler; @@ -94,27 +92,27 @@ public class TileFarmGearbox extends TileFarm implements IPowerHandler, IFarmCom } @Override - public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate) { + public int receiveEnergy(EnumFacing from, int maxReceive, boolean simulate) { return energyManager.receiveEnergy(from, maxReceive, simulate); } @Override - public int extractEnergy(ForgeDirection from, int maxExtract, boolean simulate) { + public int extractEnergy(EnumFacing from, int maxExtract, boolean simulate) { return energyManager.extractEnergy(from, maxExtract, simulate); } @Override - public int getEnergyStored(ForgeDirection from) { + public int getEnergyStored(EnumFacing from) { return energyManager.getEnergyStored(from); } @Override - public int getMaxEnergyStored(ForgeDirection from) { + public int getMaxEnergyStored(EnumFacing from) { return energyManager.getMaxEnergyStored(from); } @Override - public boolean canConnectEnergy(ForgeDirection from) { + public boolean canConnectEnergy(EnumFacing from) { return energyManager.canConnectEnergy(from); } diff --git a/src/main/java/forestry/farming/tiles/TileFarmHatch.java b/src/main/java/forestry/farming/tiles/TileFarmHatch.java index 68b5b4bec..02c31c2d4 100644 --- a/src/main/java/forestry/farming/tiles/TileFarmHatch.java +++ b/src/main/java/forestry/farming/tiles/TileFarmHatch.java @@ -16,11 +16,8 @@ import java.util.Collections; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.ISidedInventory; import net.minecraft.tileentity.TileEntity; - -import net.minecraftforge.common.util.ForgeDirection; - -import cpw.mods.fml.common.Optional; - +import net.minecraft.util.EnumFacing; +import net.minecraftforge.fml.common.Optional; import forestry.api.multiblock.IFarmComponent; import forestry.core.inventory.AdjacentInventoryCache; import forestry.core.tiles.AdjacentTileCache; @@ -35,7 +32,7 @@ import buildcraft.api.statements.ITriggerProvider; @Optional.Interface(iface = "buildcraft.api.statements.ITriggerProvider", modid = "BuildCraftAPI|statements") public class TileFarmHatch extends TileFarm implements ISidedInventory, IFarmComponent.Active, ITriggerProvider { - private static final ForgeDirection[] dumpDirections = new ForgeDirection[]{ForgeDirection.DOWN}; + private static final EnumFacing[] dumpDirections = new EnumFacing[]{EnumFacing.DOWN}; private final AdjacentTileCache tileCache; private final AdjacentInventoryCache inventoryCache; @@ -45,7 +42,7 @@ public class TileFarmHatch extends TileFarm implements ISidedInventory, IFarmCom this.inventoryCache = new AdjacentInventoryCache(this, tileCache, new AdjacentInventoryCache.ITileFilter() { @Override public boolean matches(TileEntity tile) { - return !(tile instanceof TileFarm) && tile.yCoord < yCoord; + return !(tile instanceof TileFarm) && tile.getPos().getY() < getPos().getY(); } }); } @@ -80,7 +77,7 @@ public class TileFarmHatch extends TileFarm implements ISidedInventory, IFarmCom /* ITRIGGERPROVIDER */ @Optional.Method(modid = "BuildCraftAPI|statements") @Override - public Collection getExternalTriggers(ForgeDirection side, TileEntity tile) { + public Collection getExternalTriggers(EnumFacing side, TileEntity tile) { if (!getMultiblockLogic().isConnected()) { return Collections.emptyList(); } diff --git a/src/main/java/forestry/farming/tiles/TileFarmPlain.java b/src/main/java/forestry/farming/tiles/TileFarmPlain.java index 458cba95d..b9a7e2962 100644 --- a/src/main/java/forestry/farming/tiles/TileFarmPlain.java +++ b/src/main/java/forestry/farming/tiles/TileFarmPlain.java @@ -10,19 +10,18 @@ ******************************************************************************/ package forestry.farming.tiles; -import net.minecraft.util.ChunkCoordinates; - import forestry.api.multiblock.IMultiblockController; +import net.minecraft.util.BlockPos; public class TileFarmPlain extends TileFarm { @Override - public void onMachineAssembled(IMultiblockController multiblockController, ChunkCoordinates minCoord, ChunkCoordinates maxCoord) { + public void onMachineAssembled(IMultiblockController multiblockController, BlockPos minCoord, BlockPos maxCoord) { super.onMachineAssembled(multiblockController, minCoord, maxCoord); // set band block meta - int bandY = maxCoord.posY - 1; - if (yCoord == bandY) { - this.worldObj.setBlockMetadataWithNotify(xCoord, yCoord, zCoord, 1, 2); + int bandY = maxCoord.getY() - 1; + if (getPos().getY() == bandY) { + this.worldObj.setBlockState(getPos(), getBlockType().getStateFromMeta(1), 2); } } @@ -31,6 +30,6 @@ public class TileFarmPlain extends TileFarm { super.onMachineBroken(); // set band block meta back to normal - this.worldObj.setBlockMetadataWithNotify(xCoord, yCoord, zCoord, 0, 2); + this.worldObj.setBlockState(getPos(), getBlockType().getStateFromMeta(0), 2); } } diff --git a/src/main/java/forestry/farming/tiles/TileFarmValve.java b/src/main/java/forestry/farming/tiles/TileFarmValve.java index 8ea631a90..ced1c1a44 100644 --- a/src/main/java/forestry/farming/tiles/TileFarmValve.java +++ b/src/main/java/forestry/farming/tiles/TileFarmValve.java @@ -10,7 +10,7 @@ ******************************************************************************/ package forestry.farming.tiles; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; @@ -23,32 +23,32 @@ public class TileFarmValve extends TileFarm implements ILiquidTankTile, IFluidHa /* ILIQUIDTANKCONTAINER */ @Override - public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { + public int fill(EnumFacing from, FluidStack resource, boolean doFill) { return getTankManager().fill(from, resource, doFill); } @Override - public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) { + public FluidStack drain(EnumFacing from, FluidStack resource, boolean doDrain) { return getTankManager().drain(from, resource, doDrain); } @Override - public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) { + public FluidStack drain(EnumFacing from, int maxDrain, boolean doDrain) { return getTankManager().drain(from, maxDrain, doDrain); } @Override - public boolean canFill(ForgeDirection from, Fluid fluid) { + public boolean canFill(EnumFacing from, Fluid fluid) { return getTankManager().canFill(from, fluid); } @Override - public boolean canDrain(ForgeDirection from, Fluid fluid) { + public boolean canDrain(EnumFacing from, Fluid fluid) { return getTankManager().canDrain(from, fluid); } @Override - public FluidTankInfo[] getTankInfo(ForgeDirection from) { + public FluidTankInfo[] getTankInfo(EnumFacing from) { return getTankManager().getTankInfo(from); } diff --git a/src/main/java/forestry/farming/triggers/TriggerLowFertilizer.java b/src/main/java/forestry/farming/triggers/TriggerLowFertilizer.java index 09ae52748..6a44a3973 100755 --- a/src/main/java/forestry/farming/triggers/TriggerLowFertilizer.java +++ b/src/main/java/forestry/farming/triggers/TriggerLowFertilizer.java @@ -12,9 +12,7 @@ package forestry.farming.triggers; import net.minecraft.inventory.IInventory; import net.minecraft.tileentity.TileEntity; - -import net.minecraftforge.common.util.ForgeDirection; - +import net.minecraft.util.EnumFacing; import forestry.core.triggers.Trigger; import forestry.core.utils.InventoryUtil; import forestry.farming.tiles.TileFarmHatch; @@ -37,7 +35,7 @@ public class TriggerLowFertilizer extends Trigger { } @Override - public boolean isTriggerActive(TileEntity tile, ForgeDirection side, IStatementContainer source, IStatementParameter[] parameters) { + public boolean isTriggerActive(TileEntity tile, EnumFacing side, IStatementContainer source, IStatementParameter[] parameters) { if (!(tile instanceof TileFarmHatch)) { return false; } diff --git a/src/main/java/forestry/farming/triggers/TriggerLowGermlings.java b/src/main/java/forestry/farming/triggers/TriggerLowGermlings.java index 4759ff32e..3dd406802 100644 --- a/src/main/java/forestry/farming/triggers/TriggerLowGermlings.java +++ b/src/main/java/forestry/farming/triggers/TriggerLowGermlings.java @@ -12,9 +12,7 @@ package forestry.farming.triggers; import net.minecraft.inventory.IInventory; import net.minecraft.tileentity.TileEntity; - -import net.minecraftforge.common.util.ForgeDirection; - +import net.minecraft.util.EnumFacing; import forestry.core.triggers.Trigger; import forestry.core.utils.InventoryUtil; import forestry.farming.tiles.TileFarmHatch; @@ -40,7 +38,7 @@ public class TriggerLowGermlings extends Trigger { * Return true if the tile given in parameter activates the trigger, given the parameters. */ @Override - public boolean isTriggerActive(TileEntity tile, ForgeDirection side, IStatementContainer source, IStatementParameter[] parameters) { + public boolean isTriggerActive(TileEntity tile, EnumFacing side, IStatementContainer source, IStatementParameter[] parameters) { if (!(tile instanceof TileFarmHatch)) { return false; } diff --git a/src/main/java/forestry/farming/triggers/TriggerLowLiquid.java b/src/main/java/forestry/farming/triggers/TriggerLowLiquid.java index 9d077ca8f..0d3e48df8 100755 --- a/src/main/java/forestry/farming/triggers/TriggerLowLiquid.java +++ b/src/main/java/forestry/farming/triggers/TriggerLowLiquid.java @@ -11,8 +11,7 @@ package forestry.farming.triggers; import net.minecraft.tileentity.TileEntity; - -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; import net.minecraftforge.fluids.IFluidTank; import forestry.core.fluids.ITankManager; @@ -41,7 +40,7 @@ public class TriggerLowLiquid extends Trigger { * the parameters. */ @Override - public boolean isTriggerActive(TileEntity tile, ForgeDirection side, IStatementContainer source, IStatementParameter[] parameters) { + public boolean isTriggerActive(TileEntity tile, EnumFacing side, IStatementContainer source, IStatementParameter[] parameters) { if (!(tile instanceof TileFarmHatch)) { return false; } diff --git a/src/main/java/forestry/farming/triggers/TriggerLowSoil.java b/src/main/java/forestry/farming/triggers/TriggerLowSoil.java index 5b7d3e366..18699eb53 100755 --- a/src/main/java/forestry/farming/triggers/TriggerLowSoil.java +++ b/src/main/java/forestry/farming/triggers/TriggerLowSoil.java @@ -13,9 +13,7 @@ package forestry.farming.triggers; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; - -import net.minecraftforge.common.util.ForgeDirection; - +import net.minecraft.util.EnumFacing; import forestry.api.farming.IFarmInventory; import forestry.api.multiblock.IFarmController; import forestry.core.triggers.Trigger; @@ -54,7 +52,7 @@ public class TriggerLowSoil extends Trigger { * the parameters. */ @Override - public boolean isTriggerActive(TileEntity tile, ForgeDirection side, IStatementContainer source, IStatementParameter[] parameters) { + public boolean isTriggerActive(TileEntity tile, EnumFacing side, IStatementContainer source, IStatementParameter[] parameters) { IStatementParameter parameter = null; if (parameters.length > 0) { parameter = parameters[0]; diff --git a/src/main/java/forestry/food/BeverageEffect.java b/src/main/java/forestry/food/BeverageEffect.java index 2c11208b9..74e831da5 100755 --- a/src/main/java/forestry/food/BeverageEffect.java +++ b/src/main/java/forestry/food/BeverageEffect.java @@ -42,6 +42,7 @@ public abstract class BeverageEffect implements IBeverageEffect { } } + @Override public int getId() { return this.id; } diff --git a/src/main/java/forestry/food/InfuserMixtureManager.java b/src/main/java/forestry/food/InfuserMixtureManager.java index b9d95b344..9c2ca5f50 100644 --- a/src/main/java/forestry/food/InfuserMixtureManager.java +++ b/src/main/java/forestry/food/InfuserMixtureManager.java @@ -36,6 +36,7 @@ public class InfuserMixtureManager implements IInfuserManager { this.mixtures.add(new InfuserMixture(meta, ingredients, effect)); } + @Override public boolean isIngredient(ItemStack itemstack) { for (InfuserMixture ingredient : mixtures) { if (ingredient.isIngredient(itemstack)) { diff --git a/src/main/java/forestry/food/inventory/ItemInventoryInfuser.java b/src/main/java/forestry/food/inventory/ItemInventoryInfuser.java index d51310136..6f4d66186 100644 --- a/src/main/java/forestry/food/inventory/ItemInventoryInfuser.java +++ b/src/main/java/forestry/food/inventory/ItemInventoryInfuser.java @@ -88,7 +88,7 @@ public class ItemInventoryInfuser extends ItemInventory { } @Override - public String getInventoryName() { + public String getName() { return "Infuser"; } diff --git a/src/main/java/forestry/food/items/EnumBeverage.java b/src/main/java/forestry/food/items/EnumBeverage.java index 7f0c08751..214134bf7 100644 --- a/src/main/java/forestry/food/items/EnumBeverage.java +++ b/src/main/java/forestry/food/items/EnumBeverage.java @@ -12,13 +12,10 @@ package forestry.food.items; import java.awt.Color; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.util.IIcon; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -import forestry.core.render.TextureManager; +import forestry.api.core.IModelManager; +import net.minecraft.item.Item; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public enum EnumBeverage implements ItemBeverage.IBeverageInfo { MEAD_SHORT("meadShort", "glass", new Color(0xec9a19), new Color(0xffffff), 1, 0.2f, true), @@ -31,11 +28,6 @@ public enum EnumBeverage implements ItemBeverage.IBeverageInfo { private final int primaryColor; private final int secondaryColor; - @SideOnly(Side.CLIENT) - private IIcon iconBottle; - @SideOnly(Side.CLIENT) - private IIcon iconContents; - private final int heal; private final float saturation; private final boolean isAlwaysEdible; @@ -51,9 +43,9 @@ public enum EnumBeverage implements ItemBeverage.IBeverageInfo { } @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister register) { - iconBottle = TextureManager.registerTex(register, "liquids/" + iconType + ".bottle"); - iconContents = TextureManager.registerTex(register, "liquids/" + iconType + ".contents"); + @Override + public void registerModels(Item item, IModelManager manager) { + manager.registerItemModel(item, ordinal(), "liquids/" + iconType); } @Override @@ -90,14 +82,4 @@ public enum EnumBeverage implements ItemBeverage.IBeverageInfo { public boolean isSecret() { return false; } - - @Override - public IIcon getIconBottle() { - return iconBottle; - } - - @Override - public IIcon getIconContents() { - return iconContents; - } } diff --git a/src/main/java/forestry/food/items/ItemAmbrosia.java b/src/main/java/forestry/food/items/ItemAmbrosia.java index 0bbaed4ba..3c416f5f7 100755 --- a/src/main/java/forestry/food/items/ItemAmbrosia.java +++ b/src/main/java/forestry/food/items/ItemAmbrosia.java @@ -25,7 +25,7 @@ public class ItemAmbrosia extends ItemForestryFood { } @Override - public boolean hasEffect(ItemStack itemstack, int pass) { + public boolean hasEffect(ItemStack itemstack) { return true; } diff --git a/src/main/java/forestry/food/items/ItemBeverage.java b/src/main/java/forestry/food/items/ItemBeverage.java index a8d7d67b9..c87c8d696 100755 --- a/src/main/java/forestry/food/items/ItemBeverage.java +++ b/src/main/java/forestry/food/items/ItemBeverage.java @@ -12,18 +12,15 @@ package forestry.food.items; import java.util.List; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumAction; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; import net.minecraft.world.World; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +import forestry.api.core.IModelManager; import forestry.api.food.IBeverageEffect; import forestry.core.config.Config; import forestry.core.items.ItemForestryFood; @@ -38,11 +35,7 @@ public class ItemBeverage extends ItemForestryFood { boolean isAlwaysEdible(); - void registerIcons(IIconRegister register); - - IIcon getIconBottle(); - - IIcon getIconContents(); + void registerModels(Item item, IModelManager manager); } public final IBeverageInfo[] beverages; @@ -62,33 +55,33 @@ public class ItemBeverage extends ItemForestryFood { } @Override - public ItemStack onEaten(ItemStack itemstack, World world, EntityPlayer entityplayer) { - List effects = BeverageEffect.loadEffects(itemstack); + public ItemStack onItemUseFinish(ItemStack stack, World world, EntityPlayer player) { + List effects = BeverageEffect.loadEffects(stack); - itemstack.stackSize--; - entityplayer.getFoodStats().func_151686_a(this, itemstack); - world.playSoundAtEntity(entityplayer, "random.burp", 0.5F, world.rand.nextFloat() * 0.1F + 0.9F); + stack.stackSize--; + player.getFoodStats().addStats(this, stack); + world.playSoundAtEntity(player, "random.burp", 0.5F, world.rand.nextFloat() * 0.1F + 0.9F); if (world.isRemote) { - return itemstack; + return stack; } for (IBeverageEffect effect : effects) { - effect.doEffect(world, entityplayer); + effect.doEffect(world, player); } - return itemstack; + return stack; } @Override - public int func_150905_g(ItemStack itemstack) { + public int getHealAmount(ItemStack itemstack) { int meta = itemstack.getItemDamage(); IBeverageInfo beverage = beverages[meta]; return beverage.getHeal(); } @Override - public float func_150906_h(ItemStack itemstack) { + public float getSaturationModifier(ItemStack itemstack) { int meta = itemstack.getItemDamage(); IBeverageInfo beverage = beverages[meta]; return beverage.getSaturation(); @@ -101,7 +94,7 @@ public class ItemBeverage extends ItemForestryFood { @Override public EnumAction getItemUseAction(ItemStack itemstack) { - return EnumAction.drink; + return EnumAction.DRINK; } @Override @@ -143,31 +136,15 @@ public class ItemBeverage extends ItemForestryFood { return super.getUnlocalizedName(stack) + "." + beverages[stack.getItemDamage()].getName(); } - /* ICONS */ + /* MODELS */ @SideOnly(Side.CLIENT) @Override - public void registerIcons(IIconRegister register) { + public void registerModel(Item item, IModelManager manager) { for (IBeverageInfo info : beverages) { - info.registerIcons(register); + info.registerModels(item, manager); } } - @SideOnly(Side.CLIENT) - @Override - public IIcon getIconFromDamageForRenderPass(int i, int j) { - if (j > 0 && beverages[i].getSecondaryColor() != 0) { - return beverages[i].getIconBottle(); - } else { - return beverages[i].getIconContents(); - } - } - - // Return true to enable color overlay - @Override - public boolean requiresMultipleRenderPasses() { - return true; - } - @Override public int getColorFromItemStack(ItemStack itemstack, int j) { diff --git a/src/main/java/forestry/lepidopterology/ButterflySpawner.java b/src/main/java/forestry/lepidopterology/ButterflySpawner.java index c08291e04..64d2c59b1 100755 --- a/src/main/java/forestry/lepidopterology/ButterflySpawner.java +++ b/src/main/java/forestry/lepidopterology/ButterflySpawner.java @@ -10,6 +10,7 @@ ******************************************************************************/ package forestry.lepidopterology; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import forestry.api.arboriculture.ILeafTickHandler; @@ -23,7 +24,7 @@ import forestry.plugins.PluginLepidopterology; public class ButterflySpawner implements ILeafTickHandler { @Override - public boolean onRandomLeafTick(ITree tree, World world, int x, int y, int z, boolean isDestroyed) { + public boolean onRandomLeafTick(ITree tree, World world, BlockPos pos, boolean isDestroyed) { if (world.rand.nextFloat() >= tree.getGenome().getSappiness() * tree.getGenome().getYield()) { return false; @@ -38,26 +39,26 @@ public class ButterflySpawner implements ILeafTickHandler { return false; } - if (!spawn.canSpawn(world, x, y, z)) { + if (!spawn.canSpawn(world, pos.getX(), pos.getY(), pos.getZ())) { return false; } - if (world.isAirBlock(x - 1, y, z)) { - attemptButterflySpawn(world, spawn, x - 1, y, z); - } else if (world.isAirBlock(x + 1, y, z)) { - attemptButterflySpawn(world, spawn, x + 1, y, z); - } else if (world.isAirBlock(x, y, z - 1)) { - attemptButterflySpawn(world, spawn, x, y, z - 1); - } else if (world.isAirBlock(x, y, z + 1)) { - attemptButterflySpawn(world, spawn, x, y, z + 1); + if (world.isAirBlock(pos.add(-1, 0, 0))) { + attemptButterflySpawn(world, spawn, pos.add(-1, 0, 0)); + } else if (world.isAirBlock(pos.add(1, 0, 0))) { + attemptButterflySpawn(world, spawn, pos.add(1, 0, 0)); + } else if (world.isAirBlock(pos.add(0, 0, -1))) { + attemptButterflySpawn(world, spawn, pos.add(0, 0, -1)); + } else if (world.isAirBlock(pos.add(0, 0, 1))) { + attemptButterflySpawn(world, spawn, pos.add(0, 0, 1)); } return false; } - private static void attemptButterflySpawn(World world, IButterfly butterfly, double x, double y, double z) { - if (ButterflyManager.butterflyRoot.spawnButterflyInWorld(world, butterfly.copy(), x, y + 0.1f, z) != null) { - Log.finest("Spawned a butterfly '%s' at %s/%s/%s.", butterfly.getDisplayName(), x, y, z); + private static void attemptButterflySpawn(World world, IButterfly butterfly, BlockPos pos) { + if (ButterflyManager.butterflyRoot.spawnButterflyInWorld(world, butterfly.copy(), pos.getX(), pos.getY() + 0.1f, pos.getZ()) != null) { + Log.finest("Spawned a butterfly '%s' at %s/%s/%s.", butterfly.getDisplayName(), pos.getX(), pos.getY(), pos.getZ()); } } diff --git a/src/main/java/forestry/lepidopterology/blocks/BlockLepidopterology.java b/src/main/java/forestry/lepidopterology/blocks/BlockLepidopterology.java index f7fc83c9b..9264e9db6 100644 --- a/src/main/java/forestry/lepidopterology/blocks/BlockLepidopterology.java +++ b/src/main/java/forestry/lepidopterology/blocks/BlockLepidopterology.java @@ -15,7 +15,7 @@ import forestry.core.blocks.BlockBase; public class BlockLepidopterology extends BlockBase { public BlockLepidopterology() { - super(true); + super(true, BlockLepidopterologyType.class); setCreativeTab(Tabs.tabLepidopterology); } } diff --git a/src/main/java/forestry/lepidopterology/blocks/BlockLepidopterologyType.java b/src/main/java/forestry/lepidopterology/blocks/BlockLepidopterologyType.java index ba06df2bb..259c80ded 100644 --- a/src/main/java/forestry/lepidopterology/blocks/BlockLepidopterologyType.java +++ b/src/main/java/forestry/lepidopterology/blocks/BlockLepidopterologyType.java @@ -10,16 +10,18 @@ ******************************************************************************/ package forestry.lepidopterology.blocks; +import java.util.Locale; + import forestry.core.blocks.IMachinePropertiesTESR; import forestry.core.proxy.Proxies; -import forestry.core.render.IBlockRenderer; import forestry.core.tiles.TileForestry; import forestry.lepidopterology.tiles.TileLepidopteristChest; +import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; public enum BlockLepidopterologyType implements IMachinePropertiesTESR { LEPICHEST(TileLepidopteristChest.class, "LepiChest") { @Override - public IBlockRenderer getRenderer() { + public TileEntitySpecialRenderer getRenderer() { return Proxies.render.getRenderChest("lepichest"); } }; @@ -48,4 +50,9 @@ public enum BlockLepidopterologyType implements IMachinePropertiesTESR { public Class getTeClass() { return teClass; } + + @Override + public String getName() { + return name().toLowerCase(Locale.ENGLISH); + } } diff --git a/src/main/java/forestry/lepidopterology/commands/CommandButterfly.java b/src/main/java/forestry/lepidopterology/commands/CommandButterfly.java index 58559e863..7e6cf8b30 100644 --- a/src/main/java/forestry/lepidopterology/commands/CommandButterfly.java +++ b/src/main/java/forestry/lepidopterology/commands/CommandButterfly.java @@ -11,6 +11,7 @@ package forestry.lepidopterology.commands; import net.minecraft.command.ICommandSender; +import net.minecraft.command.WrongUsageException; import net.minecraft.world.World; import forestry.core.commands.CommandHelpers; @@ -37,7 +38,7 @@ public class CommandButterfly extends SubCommand { } @Override - public void processSubCommand(ICommandSender sender, String[] args) { + public void processSubCommand(ICommandSender sender, String[] args) throws WrongUsageException { if (args.length > 1) { CommandHelpers.throwWrongUsage(sender, this); } diff --git a/src/main/java/forestry/lepidopterology/entities/AIButterflyBase.java b/src/main/java/forestry/lepidopterology/entities/AIButterflyBase.java index 1c8e3ddc6..990938793 100755 --- a/src/main/java/forestry/lepidopterology/entities/AIButterflyBase.java +++ b/src/main/java/forestry/lepidopterology/entities/AIButterflyBase.java @@ -13,6 +13,7 @@ package forestry.lepidopterology.entities; import net.minecraft.block.Block; import net.minecraft.entity.ai.EntityAIBase; import net.minecraft.entity.ai.RandomPositionGenerator; +import net.minecraft.util.BlockPos; import net.minecraft.util.Vec3; public abstract class AIButterflyBase extends EntityAIBase { @@ -29,7 +30,7 @@ public abstract class AIButterflyBase extends EntityAIBase { } Vec3 randomTarget = RandomPositionGenerator.findRandomTargetBlockAwayFrom(entity, 16, 7, - Vec3.createVectorHelper(entity.posX, entity.posY, entity.posZ)); + new Vec3(entity.posX, entity.posY, entity.posZ)); if (randomTarget == null) { return null; @@ -43,7 +44,7 @@ public abstract class AIButterflyBase extends EntityAIBase { } protected Vec3 getRandomDestinationUpwards() { - Vec3 destination = Vec3.createVectorHelper(entity.posX, entity.posY + entity.getRNG().nextInt(10) + 2, entity.posZ); + Vec3 destination = new Vec3(entity.posX, entity.posY + entity.getRNG().nextInt(10) + 2, entity.posZ); if (validateDestination(destination, true)) { return destination; } else { @@ -55,12 +56,11 @@ public abstract class AIButterflyBase extends EntityAIBase { if (dest.yCoord < 1) { return false; } - Block block = entity.worldObj.getBlock((int) dest.xCoord, (int) dest.yCoord, (int) dest.zCoord); + Block block = entity.worldObj.getBlockState(new BlockPos(dest)).getBlock(); if (!allowFluids && block.getMaterial().isLiquid()) { return false; } - // getBlocksMovement is a bad name, getAllowsMovement would be a better name. - if (!block.getBlocksMovement(entity.worldObj, (int) dest.xCoord, (int) dest.yCoord, (int) dest.zCoord)) { + if (!block.isPassable(entity.worldObj, new BlockPos(dest))) { return false; } return entity.getButterfly().isAcceptedEnvironment(entity.worldObj, dest.xCoord, dest.yCoord, dest.zCoord); diff --git a/src/main/java/forestry/lepidopterology/entities/AIButterflyInteract.java b/src/main/java/forestry/lepidopterology/entities/AIButterflyInteract.java index a1d1ba225..30ed01259 100755 --- a/src/main/java/forestry/lepidopterology/entities/AIButterflyInteract.java +++ b/src/main/java/forestry/lepidopterology/entities/AIButterflyInteract.java @@ -10,11 +10,11 @@ ******************************************************************************/ package forestry.lepidopterology.entities; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; public abstract class AIButterflyInteract extends AIButterflyBase { - protected ChunkCoordinates rest; + protected BlockPos rest; private boolean canInteract = false; private boolean hasInteracted = false; @@ -30,8 +30,8 @@ public abstract class AIButterflyInteract extends AIButterflyBase { return false; } - rest = new ChunkCoordinates((int) entity.posX, ((int) Math.floor(entity.posY)) - 1, (int) entity.posZ); - if (entity.worldObj.isAirBlock(rest.posX, rest.posY, rest.posZ)) { + rest = new BlockPos((int) entity.posX, ((int) Math.floor(entity.posY)) - 1, (int) entity.posZ); + if (entity.worldObj.isAirBlock(rest)) { return false; } diff --git a/src/main/java/forestry/lepidopterology/entities/AIButterflyMate.java b/src/main/java/forestry/lepidopterology/entities/AIButterflyMate.java index 0d9f362f1..8bfa2cf8e 100644 --- a/src/main/java/forestry/lepidopterology/entities/AIButterflyMate.java +++ b/src/main/java/forestry/lepidopterology/entities/AIButterflyMate.java @@ -38,13 +38,13 @@ public class AIButterflyMate extends AIButterflyInteract { return false; } - return GeneticsUtil.canNurse(entity.getButterfly(), entity.worldObj, rest.posX, rest.posY, rest.posZ); + return GeneticsUtil.canNurse(entity.getButterfly(), entity.worldObj, rest); } @Override public void updateTask() { if (continueExecuting()) { - IPollinatable tile = GeneticsUtil.getOrCreatePollinatable(null, entity.worldObj, rest.posX, rest.posY, rest.posZ); + IPollinatable tile = GeneticsUtil.getOrCreatePollinatable(null, entity.worldObj, rest); if (tile instanceof IButterflyNursery) { IButterflyNursery nursery = (IButterflyNursery) tile; if (nursery.canNurse(entity.getButterfly())) { diff --git a/src/main/java/forestry/lepidopterology/entities/AIButterflyMovement.java b/src/main/java/forestry/lepidopterology/entities/AIButterflyMovement.java index 3c69e7bc8..99ce1ed9c 100644 --- a/src/main/java/forestry/lepidopterology/entities/AIButterflyMovement.java +++ b/src/main/java/forestry/lepidopterology/entities/AIButterflyMovement.java @@ -37,7 +37,7 @@ public abstract class AIButterflyMovement extends AIButterflyBase { } // Continue if we have not yet reached the destination. - if (entity.getDestination().squareDistanceTo(entity.posX, entity.posY, entity.posZ) > 2.0f) { + if (entity.getDestination().squareDistanceTo(entity.getPositionVector()) > 2.0f) { return true; } diff --git a/src/main/java/forestry/lepidopterology/entities/AIButterflyPollinate.java b/src/main/java/forestry/lepidopterology/entities/AIButterflyPollinate.java index a94acdc2d..334400f28 100644 --- a/src/main/java/forestry/lepidopterology/entities/AIButterflyPollinate.java +++ b/src/main/java/forestry/lepidopterology/entities/AIButterflyPollinate.java @@ -31,7 +31,7 @@ public class AIButterflyPollinate extends AIButterflyInteract { return false; } - ICheckPollinatable checkPollinatable = GeneticsUtil.getCheckPollinatable(entity.worldObj, rest.posX, rest.posY, rest.posZ); + ICheckPollinatable checkPollinatable = GeneticsUtil.getCheckPollinatable(entity.worldObj, rest); if (checkPollinatable == null) { return false; } @@ -46,13 +46,13 @@ public class AIButterflyPollinate extends AIButterflyInteract { @Override public void updateTask() { if (continueExecuting()) { - ICheckPollinatable checkPollinatable = GeneticsUtil.getCheckPollinatable(entity.worldObj, rest.posX, rest.posY, rest.posZ); + ICheckPollinatable checkPollinatable = GeneticsUtil.getCheckPollinatable(entity.worldObj, rest); if (checkPollinatable != null) { if (entity.getPollen() == null) { entity.setPollen(checkPollinatable.getPollen()); // Log.finest("A butterfly '%s' grabbed a pollen '%s' at %s/%s/%s.", entity.getButterfly().getIdent(), entity.getPollen().getIdent(), rest.posX, rest.posY, rest.posZ); } else if (checkPollinatable.canMateWith(entity.getPollen())) { - IPollinatable realPollinatable = GeneticsUtil.getOrCreatePollinatable(null, entity.worldObj, rest.posX, rest.posY, rest.posZ); + IPollinatable realPollinatable = GeneticsUtil.getOrCreatePollinatable(null, entity.worldObj, rest); if (realPollinatable != null) { realPollinatable.mateWith(entity.getPollen()); // Log.finest("A butterfly '%s' unloaded pollen '%s' at %s/%s/%s.", entity.getButterfly().getIdent(), entity.getPollen().getIdent(), rest.posX, rest.posY, rest.posZ); diff --git a/src/main/java/forestry/lepidopterology/entities/AIButterflyRest.java b/src/main/java/forestry/lepidopterology/entities/AIButterflyRest.java index 7e7beaa66..41cc0d180 100755 --- a/src/main/java/forestry/lepidopterology/entities/AIButterflyRest.java +++ b/src/main/java/forestry/lepidopterology/entities/AIButterflyRest.java @@ -16,7 +16,7 @@ import net.minecraft.block.BlockFlower; import net.minecraft.block.BlockWall; import net.minecraft.block.IGrowable; import net.minecraft.block.material.Material; - +import net.minecraft.util.BlockPos; import net.minecraftforge.common.IPlantable; public class AIButterflyRest extends AIButterflyBase { @@ -37,16 +37,17 @@ public class AIButterflyRest extends AIButterflyBase { int x = (int) entity.posX; int y = ((int) Math.floor(entity.posY)); int z = (int) entity.posZ; + BlockPos pos = new BlockPos(x, y, z); - if (!canLand(x, y, z)) { + if (!canLand(pos)) { return false; } y--; - if (entity.worldObj.isAirBlock(x, y, z)) { + if (entity.worldObj.isAirBlock(pos)) { return false; } - if (entity.worldObj.getBlock(x, y, z).getMaterial().isLiquid()) { + if (entity.worldObj.getBlockState(pos).getBlock().getMaterial().isLiquid()) { return false; } if (!entity.getButterfly().isAcceptedEnvironment(entity.worldObj, x, y, z)) { @@ -79,17 +80,16 @@ public class AIButterflyRest extends AIButterflyBase { entity.changeExhaustion(-1); } - private boolean canLand(int x, int y, int z) { - Block block = entity.worldObj.getBlock(x, y, z); - // getBlocksMovement is a bad name, allowsMovement would be a better name. - if (!block.getBlocksMovement(entity.worldObj, x, y, z)) { + private boolean canLand(BlockPos pos) { + Block block = entity.worldObj.getBlockState(pos).getBlock(); + if (!block.isPassable(entity.worldObj, pos)) { return false; } if (isPlant(block)) { return true; } - block = entity.worldObj.getBlock(x, y - 1, z); - return isRest(block) || block.isLeaves(entity.worldObj, x, y - 1, z); + block = entity.worldObj.getBlockState(pos.add(0, -1, 0)).getBlock(); + return isRest(block) || block.isLeaves(entity.worldObj, pos.add(0, -1, 0)); } private static boolean isRest(Block block) { diff --git a/src/main/java/forestry/lepidopterology/entities/AIButterflyRise.java b/src/main/java/forestry/lepidopterology/entities/AIButterflyRise.java index 2294d947a..a1ce723c3 100644 --- a/src/main/java/forestry/lepidopterology/entities/AIButterflyRise.java +++ b/src/main/java/forestry/lepidopterology/entities/AIButterflyRise.java @@ -54,7 +54,7 @@ public class AIButterflyRise extends AIButterflyMovement { } // Continue if we have not yet reached the destination. - if (entity.getDestination().squareDistanceTo(entity.posX, entity.posY, entity.posZ) > 2.0f) { + if (entity.getDestination().squareDistanceTo(entity.getPositionVector()) > 2.0f) { return true; } diff --git a/src/main/java/forestry/lepidopterology/entities/EntityButterfly.java b/src/main/java/forestry/lepidopterology/entities/EntityButterfly.java index b05e31431..e71eb43cf 100755 --- a/src/main/java/forestry/lepidopterology/entities/EntityButterfly.java +++ b/src/main/java/forestry/lepidopterology/entities/EntityButterfly.java @@ -23,19 +23,19 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.BlockPos; import net.minecraft.util.DamageSource; import net.minecraft.util.MathHelper; import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.ResourceLocation; import net.minecraft.util.Vec3; +import net.minecraft.world.DifficultyInstance; import net.minecraft.world.World; import net.minecraft.world.chunk.Chunk; import net.minecraftforge.common.IPlantable; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import forestry.api.arboriculture.EnumGermlingType; import forestry.api.arboriculture.TreeManager; import forestry.api.core.IToolScoop; @@ -51,6 +51,7 @@ import forestry.api.lepidopterology.IButterflyGenome; import forestry.api.lepidopterology.IButterflyRoot; import forestry.api.lepidopterology.IEntityButterfly; import forestry.api.lepidopterology.ILepidopteristTracker; +import forestry.core.utils.BlockUtil; import forestry.core.utils.ItemStackUtil; import forestry.lepidopterology.genetics.Butterfly; @@ -192,22 +193,22 @@ public class EntityButterfly extends EntityCreature implements IEntityButterfly } @Override - public float getBlockPathWeight(int x, int y, int z) { + public float getBlockPathWeight(BlockPos pos) { float weight = 0.0f; - if (!getButterfly().isAcceptedEnvironment(worldObj, x, y, z)) { + if (!getButterfly().isAcceptedEnvironment(worldObj, pos.getX(), pos.getY(), pos.getZ())) { weight -= 15.0f; } - if (!worldObj.getEntitiesWithinAABB(EntityButterfly.class, AxisAlignedBB.getBoundingBox(x, y, z, x + 1, y + 1, z + 1)).isEmpty()) { + if (!worldObj.getEntitiesWithinAABB(EntityButterfly.class, AxisAlignedBB.fromBounds(pos.getX(), pos.getY(), pos.getZ(), pos.getX() + 1, pos.getY() + 1, pos.getZ() + 1)).isEmpty()) { weight -= 1.0f; } - int depth = getFluidDepth(x, z); + int depth = getFluidDepth(pos); if (depth > 0) { weight -= 0.1f * depth; } else { - Block block = worldObj.getBlock(x, y, z); + Block block = BlockUtil.getBlock(worldObj, pos); if (block instanceof BlockFlower) { weight += 2.0f; } else if (block instanceof IPlantable) { @@ -218,8 +219,8 @@ public class EntityButterfly extends EntityCreature implements IEntityButterfly weight += 1.0f; } - block = worldObj.getBlock(x, y - 1, z); - if (block.isLeaves(worldObj, x, y - 1, z)) { + block = BlockUtil.getBlock(worldObj, pos.add(0, -1, 0)); + if (block.isLeaves(worldObj, pos.add(0, -1, 0))) { weight += 2.5f; } else if (block instanceof BlockFence) { weight += 1.0f; @@ -228,20 +229,20 @@ public class EntityButterfly extends EntityCreature implements IEntityButterfly } } - weight += worldObj.getLightBrightness(x, y, z); + weight += worldObj.getLightBrightness(pos); return weight; } - private int getFluidDepth(int x, int z) { - Chunk chunk = worldObj.getChunkFromBlockCoords(x, z); - int xx = x & 15; - int zz = z & 15; + private int getFluidDepth(BlockPos pos) { + Chunk chunk = worldObj.getChunkFromBlockCoords(pos); + int xx = pos.getX() & 15; + int zz = pos.getZ() & 15; int depth = 0; for (int y = chunk.getTopFilledSegment() + 15; y > 0; --y) { Block block = chunk.getBlock(xx, y, zz); if (block.getMaterial().isLiquid()) { depth++; - } else if (!block.isAir(worldObj, x, y, z)) { + } else if (!block.isAir(worldObj, pos)) { break; } } @@ -305,9 +306,9 @@ public class EntityButterfly extends EntityCreature implements IEntityButterfly public IButterfly getButterfly() { return contained; } - + @Override - public IEntityLivingData onSpawnWithEgg(IEntityLivingData data) { + public IEntityLivingData onInitialSpawn(DifficultyInstance difficulty, IEntityLivingData data) { if (!worldObj.isRemote) { setIndividual(contained); } @@ -315,9 +316,9 @@ public class EntityButterfly extends EntityCreature implements IEntityButterfly } @Override - public String getCommandSenderName() { + public String getName() { if (species == null) { - return super.getCommandSenderName(); + return super.getName(); } return species.getName(); } @@ -350,8 +351,8 @@ public class EntityButterfly extends EntityCreature implements IEntityButterfly } @Override - protected boolean isAIEnabled() { - return true; + public boolean isAIDisabled() { + return false; } @Override @@ -474,11 +475,11 @@ public class EntityButterfly extends EntityCreature implements IEntityButterfly } @Override - protected void fall(float par1) { + public void fall(float distance, float damageMultiplier) { } - + @Override - protected void updateFallState(double par1, boolean par3) { + protected void updateFallState(double y, boolean onGroundIn, Block blockIn, BlockPos pos) { } @Override diff --git a/src/main/java/forestry/lepidopterology/entities/EnumButterflyState.java b/src/main/java/forestry/lepidopterology/entities/EnumButterflyState.java index b5c272954..30986d45c 100644 --- a/src/main/java/forestry/lepidopterology/entities/EnumButterflyState.java +++ b/src/main/java/forestry/lepidopterology/entities/EnumButterflyState.java @@ -10,8 +10,6 @@ ******************************************************************************/ package forestry.lepidopterology.entities; -import forestry.lepidopterology.render.RenderButterflyItem; - public enum EnumButterflyState { FLYING(true), GLIDING(true), RISING(true), RESTING(false), HOVER(false); @@ -30,9 +28,33 @@ public enum EnumButterflyState { long flapping = systemTime + offset; float flap = (float) (flapping % 1000) / 1000; // 0 to 1 - return RenderButterflyItem.getIrregularWingYaw(flapping, flap); + return getIrregularWingYaw(flapping, flap); } else { return entity.ticksExisted + partialTicktime; } } + + public static float getIrregularWingYaw(long flapping, float flap) { + long irregular = flapping / 1024; + float wingYaw; + + if (irregular % 11 == 0) { + wingYaw = 0.75f; + } else { + if (irregular % 7 == 0) { + flap *= 4; + flap = flap % 1; + } else if (irregular % 19 == 0) { + flap *= 6; + flap = flap % 1; + } + wingYaw = getRegularWingYaw(flap); + } + + return wingYaw; + } + + private static float getRegularWingYaw(float flap) { + return flap < 0.5 ? 0.75f + flap : 1.75f - flap; + } } diff --git a/src/main/java/forestry/lepidopterology/genetics/AlleleButterflySpecies.java b/src/main/java/forestry/lepidopterology/genetics/AlleleButterflySpecies.java index fd5444778..d7ffffb44 100755 --- a/src/main/java/forestry/lepidopterology/genetics/AlleleButterflySpecies.java +++ b/src/main/java/forestry/lepidopterology/genetics/AlleleButterflySpecies.java @@ -15,6 +15,8 @@ import java.util.EnumSet; import java.util.HashMap; import java.util.Map; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.world.World; @@ -22,11 +24,8 @@ import net.minecraft.world.World; import com.mojang.authlib.GameProfile; import net.minecraftforge.common.BiomeDictionary; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -import forestry.api.core.IIconProvider; +import forestry.api.core.IModelProvider; +import forestry.api.core.ISpriteProvider; import forestry.api.genetics.IClassification; import forestry.api.genetics.IIndividual; import forestry.api.lepidopterology.ButterflyManager; @@ -34,8 +33,9 @@ import forestry.api.lepidopterology.EnumFlutterType; import forestry.api.lepidopterology.IAlleleButterflySpeciesCustom; import forestry.api.lepidopterology.IButterflyRoot; import forestry.core.genetics.alleles.AlleleSpecies; +import forestry.lepidopterology.render.TextureAtlasButterfly; -public class AlleleButterflySpecies extends AlleleSpecies implements IAlleleButterflySpeciesCustom { +public class AlleleButterflySpecies extends AlleleSpecies implements IAlleleButterflySpeciesCustom, ISpriteProvider { private final String texture; private final Color serumColour; private float rarity = 0.1f; @@ -58,16 +58,19 @@ public class AlleleButterflySpecies extends AlleleSpecies implements IAlleleButt return ButterflyManager.butterflyRoot; } + @Override public AlleleButterflySpecies setRarity(float rarity) { this.rarity = rarity; return this; } + @Override public AlleleButterflySpecies setFlightDistance(float flightDistance) { this.flightDistance = flightDistance; return this; } + @Override public AlleleButterflySpecies setNocturnal() { this.isActualNocturnal = true; return this; @@ -83,12 +86,6 @@ public class AlleleButterflySpecies extends AlleleSpecies implements IAlleleButt return this; } - @Override - @SideOnly(Side.CLIENT) - public IIconProvider getIconProvider() { - return null; - } - @Override public String getEntityTexture() { return texture; @@ -171,10 +168,30 @@ public class AlleleButterflySpecies extends AlleleSpecies implements IAlleleButt } @Override - public int getIconColour(int renderPass) { + public int getSpriteColour(int renderPass) { if (renderPass > 0) { - return 0xffffff; + return serumColour.getRGB() & 0xffffff; } - return serumColour.getRGB() & 0xffffff; + return 0xffffff; + } + + @Override + public IModelProvider getModelProvider() { + return null; + } + + @Override + public ISpriteProvider getSpriteProvider() { + return this; + } + + @Override + public void registerSprites() { + Minecraft.getMinecraft().getTextureMapBlocks().setTextureEntry(texture.replace(".png", "").replace("textures/", ""), new TextureAtlasButterfly(texture.replace(".png", "").replace("textures/", ""))); + } + + @Override + public TextureAtlasSprite getSprite(short texUID) { + return null; } } diff --git a/src/main/java/forestry/lepidopterology/genetics/Butterfly.java b/src/main/java/forestry/lepidopterology/genetics/Butterfly.java index 555415f7d..4f8ec3266 100755 --- a/src/main/java/forestry/lepidopterology/genetics/Butterfly.java +++ b/src/main/java/forestry/lepidopterology/genetics/Butterfly.java @@ -19,6 +19,7 @@ import java.util.Random; import net.minecraft.entity.EntityCreature; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.BlockPos; import net.minecraft.util.EnumChatFormatting; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; @@ -137,7 +138,7 @@ public class Butterfly extends IndividualLiving implements IButterfly { return false; } - BiomeGenBase biome = world.getBiomeGenForCoordsBody((int) x, (int) z); + BiomeGenBase biome = world.getBiomeGenForCoordsBody(new BlockPos(x, 0, z)); if (getGenome().getPrimary().getSpawnBiomes().size() > 0) { boolean noneMatched = true; @@ -184,8 +185,8 @@ public class Butterfly extends IndividualLiving implements IButterfly { } private boolean isAcceptedEnvironment(World world, int x, int y, int z) { - BiomeGenBase biome = world.getBiomeGenForCoords(x, z); - EnumTemperature biomeTemperature = EnumTemperature.getFromBiome(biome, x, y, z); + BiomeGenBase biome = world.getBiomeGenForCoords(new BlockPos(x, y, z)); + EnumTemperature biomeTemperature = EnumTemperature.getFromBiome(biome, new BlockPos(x, y, z)); EnumHumidity biomeHumidity = EnumHumidity.getFromValue(biome.rainfall); return AlleleManager.climateHelper.isWithinLimits(biomeTemperature, biomeHumidity, getGenome().getPrimary().getTemperature(), getGenome().getToleranceTemp(), diff --git a/src/main/java/forestry/lepidopterology/gui/GuiFlutterlyzer.java b/src/main/java/forestry/lepidopterology/gui/GuiFlutterlyzer.java index 3a769a0e4..7583f287a 100755 --- a/src/main/java/forestry/lepidopterology/gui/GuiFlutterlyzer.java +++ b/src/main/java/forestry/lepidopterology/gui/GuiFlutterlyzer.java @@ -27,6 +27,7 @@ import forestry.core.genetics.GenericRatings; import forestry.core.genetics.alleles.AlleleBoolean; import forestry.core.gui.ContainerAlyzer; import forestry.core.gui.GuiAlyzer; +import forestry.core.inventory.ItemInventoryAlyzer; import forestry.core.utils.StringUtil; import forestry.lepidopterology.genetics.ButterflyGenome; import forestry.lepidopterology.inventory.ItemInventoryFlutterlyzer; @@ -53,8 +54,8 @@ public class GuiFlutterlyzer extends GuiAlyzer { int page = 0; IButterfly butterfly = null; - for (int k = 1; k < ItemInventoryFlutterlyzer.SLOT_ANALYZE_5 + 1; k++) { - if (k == ItemInventoryFlutterlyzer.SLOT_ENERGY) { + for (int k = 1; k < ItemInventoryAlyzer.SLOT_ANALYZE_5 + 1; k++) { + if (k == ItemInventoryAlyzer.SLOT_ENERGY) { continue; } @@ -229,7 +230,7 @@ public class GuiFlutterlyzer extends GuiAlyzer { int x = COLUMN_0; for (ItemStack stack : butterfly.getGenome().getPrimary().getButterflyLoot().keySet()) { - itemRender.renderItemIntoGUI(fontRendererObj, mc.renderEngine, stack, guiLeft + x, guiTop + textLayout.getLineY()); + itemRender.renderItemIntoGUI(stack, guiLeft + x, guiTop + textLayout.getLineY()); x += 18; if (x > 148) { x = COLUMN_0; @@ -245,7 +246,7 @@ public class GuiFlutterlyzer extends GuiAlyzer { x = COLUMN_0; for (ItemStack stack : butterfly.getGenome().getPrimary().getCaterpillarLoot().keySet()) { - itemRender.renderItemIntoGUI(fontRendererObj, mc.renderEngine, stack, guiLeft + x, guiTop + textLayout.getLineY()); + itemRender.renderItemIntoGUI(stack, guiLeft + x, guiTop + textLayout.getLineY()); x += 18; if (x > 148) { x = COLUMN_0; diff --git a/src/main/java/forestry/lepidopterology/items/ItemButterflyGE.java b/src/main/java/forestry/lepidopterology/items/ItemButterflyGE.java index 3699c75d3..35f40b59d 100755 --- a/src/main/java/forestry/lepidopterology/items/ItemButterflyGE.java +++ b/src/main/java/forestry/lepidopterology/items/ItemButterflyGE.java @@ -13,32 +13,32 @@ package forestry.lepidopterology.items; import java.util.List; import java.util.Random; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.world.World; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +import forestry.api.core.IModelManager; import forestry.api.core.Tabs; import forestry.api.genetics.AlleleManager; +import forestry.api.genetics.IAllele; import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IIndividual; import forestry.api.lepidopterology.ButterflyManager; import forestry.api.lepidopterology.EnumFlutterType; +import forestry.api.lepidopterology.IAlleleButterflySpecies; import forestry.api.lepidopterology.IButterfly; import forestry.api.lepidopterology.IButterflyNursery; import forestry.core.config.Config; import forestry.core.genetics.ItemGE; import forestry.core.network.packets.PacketFXSignal; import forestry.core.proxy.Proxies; -import forestry.core.render.TextureManager; import forestry.core.utils.EntityUtil; import forestry.lepidopterology.entities.EntityButterfly; import forestry.lepidopterology.genetics.ButterflyGenome; @@ -158,67 +158,43 @@ public class ItemButterflyGE extends ItemGE { @Override public int getColourFromSpecies(IAlleleSpecies species, int renderPass) { if (species != null) { - return species.getIconColour(renderPass); + return species.getSpriteColour(renderPass); } else { return 0xffffff; } } + /* MODELS */ @Override - public boolean requiresMultipleRenderPasses() { - return true; - } - - @Override - public int getRenderPasses(int metadata) { - return 2; - } - - /* ICONS */ - @SideOnly(Side.CLIENT) - private IIcon[] icons; - - @SideOnly(Side.CLIENT) - @Override - public void registerIcons(IIconRegister register) { - icons = new IIcon[2]; + public void registerModel(Item item, IModelManager manager) { switch (this.type) { - case CATERPILLAR: - icons[0] = TextureManager.registerTex(register, "caterpillar.body"); - icons[1] = TextureManager.registerTex(register, "caterpillar.body2"); - break; - default: - icons[0] = TextureManager.registerTex(register, "liquids/jar.contents"); - icons[1] = TextureManager.registerTex(register, "liquids/jar.bottle"); - } - } - - @SideOnly(Side.CLIENT) - @Override - public IIcon getIconFromDamageForRenderPass(int i, int j) { - if (j > 0) { - return icons[1]; - } else { - return icons[0]; + case CATERPILLAR: + manager.registerItemModel(item, 0, "caterpillar"); + break; + case BUTTERFLY: + manager.registerItemModel(item, 0, "butterflyGE"); + break; + default: + manager.registerItemModel(item, 0, "liquids/jar"); } } @Override - public boolean onItemUse(ItemStack itemstack, EntityPlayer player, World world, int x, int y, int z, int par7, float facingX, float facingY, float facingZ) { + public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ) { if (world.isRemote) { return false; } - IButterfly flutter = ButterflyManager.butterflyRoot.getMember(itemstack); + IButterfly flutter = ButterflyManager.butterflyRoot.getMember(stack); if (flutter == null) { return false; } if (type == EnumFlutterType.CATERPILLAR) { - TileEntity target = world.getTileEntity(x, y, z); + TileEntity target = world.getTileEntity(pos); if (!(target instanceof IButterflyNursery)) { return false; } @@ -229,10 +205,10 @@ public class ItemButterflyGE extends ItemGE { } pollinatable.setCaterpillar(flutter); - Proxies.common.sendFXSignal(PacketFXSignal.VisualFXType.BLOCK_DESTROY, PacketFXSignal.SoundFXType.LEAF, world, x, y, z, - world.getBlock(x, y, z), 0); + Proxies.common.sendFXSignal(PacketFXSignal.VisualFXType.BLOCK_DESTROY, PacketFXSignal.SoundFXType.LEAF, world, pos, + world.getBlockState(pos)); if (!player.capabilities.isCreativeMode) { - itemstack.stackSize--; + stack.stackSize--; } return true; @@ -241,5 +217,13 @@ public class ItemButterflyGE extends ItemGE { } } + @SideOnly(Side.CLIENT) + public static void registerSprites() { + for (IAllele allele : AlleleManager.alleleRegistry.getRegisteredAlleles().values()) { + if (allele instanceof IAlleleButterflySpecies) { + ((IAlleleButterflySpecies) allele).getSpriteProvider().registerSprites(); + } + } + } } diff --git a/src/main/java/forestry/lepidopterology/proxy/ProxyLepidopterologyClient.java b/src/main/java/forestry/lepidopterology/proxy/ProxyLepidopterologyClient.java index d294508f4..b728dbe9d 100644 --- a/src/main/java/forestry/lepidopterology/proxy/ProxyLepidopterologyClient.java +++ b/src/main/java/forestry/lepidopterology/proxy/ProxyLepidopterologyClient.java @@ -10,20 +10,11 @@ ******************************************************************************/ package forestry.lepidopterology.proxy; -import net.minecraftforge.client.MinecraftForgeClient; - -import cpw.mods.fml.client.registry.RenderingRegistry; - -import forestry.lepidopterology.entities.EntityButterfly; -import forestry.lepidopterology.render.RenderButterflyEntity; -import forestry.lepidopterology.render.RenderButterflyItem; -import forestry.plugins.PluginLepidopterology; - public class ProxyLepidopterologyClient extends ProxyLepidopterology { @Override public void initializeRendering() { - RenderingRegistry.registerEntityRenderingHandler(EntityButterfly.class, new RenderButterflyEntity()); - MinecraftForgeClient.registerItemRenderer(PluginLepidopterology.items.butterflyGE, new RenderButterflyItem()); + /*RenderingRegistry.registerEntityRenderingHandler(EntityButterfly.class, new RenderButterflyEntity()); + MinecraftForgeClient.registerItemRenderer(PluginLepidopterology.items.butterflyGE, new RenderButterflyItem());*/ } } diff --git a/src/main/java/forestry/lepidopterology/recipes/MatingRecipe.java b/src/main/java/forestry/lepidopterology/recipes/MatingRecipe.java index e6bb545d9..e5552790d 100644 --- a/src/main/java/forestry/lepidopterology/recipes/MatingRecipe.java +++ b/src/main/java/forestry/lepidopterology/recipes/MatingRecipe.java @@ -81,5 +81,17 @@ public class MatingRecipe implements IRecipe { public int getRecipeSize() { return 2; } + + @Override + public ItemStack[] getRemainingItems(InventoryCrafting inv) { + ItemStack[] aitemstack = new ItemStack[inv.getSizeInventory()]; + + for (int i = 0; i < aitemstack.length; ++i) + { + ItemStack itemstack = inv.getStackInSlot(i); + aitemstack[i] = net.minecraftforge.common.ForgeHooks.getContainerItem(itemstack); + } + return aitemstack; + } } diff --git a/src/main/java/forestry/lepidopterology/render/ModelButterflyItem.java b/src/main/java/forestry/lepidopterology/render/ModelButterflyItem.java new file mode 100644 index 000000000..6b1a83150 --- /dev/null +++ b/src/main/java/forestry/lepidopterology/render/ModelButterflyItem.java @@ -0,0 +1,134 @@ +/******************************************************************************* + * Copyright (c) 2011-2014 SirSengir. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser Public License v3 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl-3.0.txt + * + * Various Contributors including, but not limited to: + * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges + ******************************************************************************/ +package forestry.lepidopterology.render; + +import java.io.IOException; +import java.util.List; + +import com.google.common.base.Function; +import com.google.common.collect.ImmutableMap; + +import forestry.api.lepidopterology.ButterflyManager; +import forestry.api.lepidopterology.IButterfly; +import forestry.core.utils.Log; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.block.model.ItemCameraTransforms; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.renderer.vertex.DefaultVertexFormats; +import net.minecraft.client.resources.model.IBakedModel; +import net.minecraft.client.resources.model.ModelRotation; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.client.model.IRetexturableModel; +import net.minecraftforge.client.model.ISmartItemModel; +import net.minecraftforge.client.model.ModelLoaderRegistry; + +public class ModelButterflyItem implements ISmartItemModel { + + public IRetexturableModel modelButterfly; + public ResourceLocation location; + + public ModelButterflyItem(ResourceLocation location) { + this.location = location; + } + + @Override + public List getFaceQuads(EnumFacing p_177551_1_) { + return null; + } + + @Override + public List getGeneralQuads() { + return null; + } + + @Override + public boolean isAmbientOcclusion() { + return true; + } + + @Override + public boolean isGui3d() { + return true; + } + + @Override + public boolean isBuiltInRenderer() { + return false; + } + + @Override + public TextureAtlasSprite getParticleTexture() { + return null; + } + + @Override + public ItemCameraTransforms getItemCameraTransforms() { + return null; + } + + @Override + public IBakedModel handleItemState(ItemStack item) { + try { + modelButterfly = (IRetexturableModel) ModelLoaderRegistry.getModel(location); + } catch (IOException e) { + Log.warning( + "Failed to find Butterfly Model for (" + location.toString() + ") in the Forestry registry."); + } + IButterfly butterfly = ButterflyManager.butterflyRoot.getMember(item); + if (modelButterfly == null) { + return null; + } + if (butterfly == null) { + butterfly = ButterflyManager.butterflyRoot.templateAsIndividual(ButterflyManager.butterflyRoot.getDefaultTemplate()); + } + return bakeModel(butterfly); + } + + public IBakedModel bakeModel(IButterfly butterfly) { + Function textureGetter = new Function() { + @Override + public TextureAtlasSprite apply(ResourceLocation location) { + return Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite(location.toString()); + } + }; + ImmutableMap.Builder textures = ImmutableMap.builder(); + textures.put("#ButterflyGE", butterfly.getGenome().getSecondary().getEntityTexture().toString().replace(".png", "").replace("textures/", "")); + modelButterfly = (IRetexturableModel) modelButterfly.retexture(textures.build()); + return modelButterfly.bake(ModelRotation.X270_Y90, DefaultVertexFormats.ITEM, textureGetter); + } + + public static float getIrregularWingYaw(long flapping, float flap) { + long irregular = flapping / 1024; + float wingYaw; + + if (irregular % 11 == 0) { + wingYaw = 0.75f; + } else { + if (irregular % 7 == 0) { + flap *= 4; + flap = flap % 1; + } else if (irregular % 19 == 0) { + flap *= 6; + flap = flap % 1; + } + wingYaw = getRegularWingYaw(flap); + } + + return wingYaw; + } + + private static float getRegularWingYaw(float flap) { + return flap < 0.5 ? 0.75f + flap : 1.75f - flap; + } + +} diff --git a/src/main/java/forestry/lepidopterology/render/RenderButterflyEntity.java b/src/main/java/forestry/lepidopterology/render/RenderButterflyEntity.java index 22e505af1..087c75fc6 100644 --- a/src/main/java/forestry/lepidopterology/render/RenderButterflyEntity.java +++ b/src/main/java/forestry/lepidopterology/render/RenderButterflyEntity.java @@ -10,8 +10,10 @@ ******************************************************************************/ package forestry.lepidopterology.render; +import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.entity.RenderLiving; import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EntityLivingBase; import net.minecraft.util.ResourceLocation; @@ -22,7 +24,7 @@ public class RenderButterflyEntity extends RenderLiving { private final ModelButterfly butterflyModel; public RenderButterflyEntity() { - super(new ModelButterfly(), 0.25f); + super(Minecraft.getMinecraft().getRenderManager(), new ModelButterfly(), 0.25f); butterflyModel = (ModelButterfly) mainModel; } @@ -34,10 +36,10 @@ public class RenderButterflyEntity extends RenderLiving { butterflyModel.setScale(entity.getSize()); super.doRender(entity, x, y, z, light, partialTickTime); } - + @Override - public void doRender(Entity entity, double x, double y, double z, float light, float partialTickTime) { - this.renderButterfly((EntityButterfly) entity, x, y, z, light, partialTickTime); + public void doRender(EntityLiving entity, double x, double y, double z, float entityYaw, float partialTickTime) { + this.renderButterfly((EntityButterfly) entity, x, y, z, entityYaw, partialTickTime); } @Override diff --git a/src/main/java/forestry/lepidopterology/render/RenderButterflyItem.java b/src/main/java/forestry/lepidopterology/render/RenderButterflyItem.java deleted file mode 100644 index 270909ca5..000000000 --- a/src/main/java/forestry/lepidopterology/render/RenderButterflyItem.java +++ /dev/null @@ -1,224 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v3 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: - * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges - ******************************************************************************/ -package forestry.lepidopterology.render; - -import net.minecraft.client.renderer.OpenGlHelper; -import net.minecraft.client.renderer.RenderHelper; -import net.minecraft.client.renderer.entity.RenderItem; -import net.minecraft.client.renderer.entity.RenderManager; -import net.minecraft.item.ItemStack; - -import net.minecraftforge.client.IItemRenderer; - -import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; - -import forestry.api.lepidopterology.ButterflyManager; -import forestry.api.lepidopterology.IButterfly; -import forestry.core.proxy.Proxies; -import forestry.lepidopterology.entities.EntityButterfly; - -public class RenderButterflyItem implements IItemRenderer { - - private final ModelButterfly model; - private EntityButterfly entity; - - public RenderButterflyItem() { - model = new ModelButterfly(); - } - - private static float getWingYaw(IButterfly butterfly) { - float wingYaw = 1f; - - if (butterfly.isAlive()) { - long systemTime = System.currentTimeMillis(); - long flapping = systemTime + butterfly.getIdent().hashCode(); - float flap = (float) (flapping % 1024) / 1024; // 0 to 1 - - wingYaw = getIrregularWingYaw(flapping, flap); - - } - - return wingYaw; - } - - public static float getIrregularWingYaw(long flapping, float flap) { - long irregular = flapping / 1024; - float wingYaw; - - if (irregular % 11 == 0) { - wingYaw = 0.75f; - } else { - if (irregular % 7 == 0) { - flap *= 4; - flap = flap % 1; - } else if (irregular % 19 == 0) { - flap *= 6; - flap = flap % 1; - } - wingYaw = getRegularWingYaw(flap); - } - - return wingYaw; - } - - private static float getRegularWingYaw(float flap) { - return flap < 0.5 ? 0.75f + flap : 1.75f - flap; - } - - private IButterfly initButterfly(ItemStack item) { - IButterfly butterfly = ButterflyManager.butterflyRoot.getMember(item); - if (butterfly == null) { - butterfly = ButterflyManager.butterflyRoot.templateAsIndividual(ButterflyManager.butterflyRoot.getDefaultTemplate()); - } - - if (entity == null) { - entity = new EntityButterfly(Proxies.common.getRenderWorld(), butterfly); - } else { - entity.setIndividual(butterfly); - } - - return butterfly; - } - - private void renderButterflyItem(IButterfly butterfly, float translateX, float translateY, float translateZ) { - float yaw = 1; - float pitch = 1; - - GL11.glPushAttrib(GL11.GL_ENABLE_BIT); - GL11.glEnable(GL11.GL_LIGHTING); - GL11.glEnable(GL11.GL_DEPTH_TEST); - GL11.glEnable(GL11.GL_COLOR_MATERIAL); - - GL11.glPushMatrix(); - - if (RenderItem.renderInFrame) { - //GL11.glScalef(-2.0f, 2.0f, 2.0f); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - GL11.glRotatef(-90.0F, 0.0F, 1.0F, 0.0F); - GL11.glRotatef(-90.0F, 1.0F, 0.0F, 0.0F); - GL11.glScalef(1.1f, 1f, 1f); - - GL11.glTranslatef(0, -0.7f, 0.2f); - - entity.renderYawOffset = 0; - entity.rotationYaw = 0; - entity.rotationPitch = 0; - entity.rotationYawHead = entity.rotationYaw; - - RenderManager.instance.renderEntityWithPosYaw(entity, 0.0D, 0.0D, 0.0D, 0.0F, 1.0f); - - } else { - GL11.glTranslatef(translateX, translateY, translateZ); - - GL11.glScalef(-2.0f, 2.0f, 2.0f); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - GL11.glRotatef(-135.0F, 0.0F, 1.0F, 0.0F); - GL11.glRotatef(-((float) Math.atan((double) (pitch / 40.0F))) * 20.0F, 1.0F, 0.0F, 0.0F); - - entity.renderYawOffset = (float) Math.atan((double) (yaw / 40.0F)) * 20.0F; - entity.rotationYaw = (float) Math.atan((double) (yaw / 40.0F)) * 40.0F; - entity.rotationPitch = -((float) Math.atan((double) (pitch / 40.0F))) * 20.0F; - entity.rotationYawHead = entity.rotationYaw; - - RenderManager.instance.renderEntityWithPosYaw(entity, 0.0D, 0.0D, 0.0D, 0.0F, getWingYaw(butterfly)); - - } - - GL11.glPopMatrix(); - - RenderHelper.disableStandardItemLighting(); - GL11.glDisable(GL12.GL_RESCALE_NORMAL); - OpenGlHelper.setActiveTexture(OpenGlHelper.lightmapTexUnit); - GL11.glDisable(GL11.GL_TEXTURE_2D); - OpenGlHelper.setActiveTexture(OpenGlHelper.defaultTexUnit); - GL11.glPopAttrib(); - - } - - private void renderButterflyInInventory(IButterfly butterfly) { - - GL11.glPushAttrib(GL11.GL_ENABLE_BIT); - GL11.glEnable(GL11.GL_LIGHTING); - GL11.glEnable(GL11.GL_DEPTH_TEST); - GL11.glEnable(GL11.GL_COLOR_MATERIAL); - RenderHelper.enableStandardItemLighting(); - GL11.glPushMatrix(); - - GL11.glTranslatef(0f, -0.25f, 0f); - GL11.glScalef(-2.0f, 2.0f, 2.0f); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - GL11.glRotatef(135.0F, 0.0F, 1.0F, 0.0F); - GL11.glRotatef(-35.0F, 1.0F, 0.0F, 0.0F); - GL11.glScalef(1.1f, 1f, 1f); - - entity.renderYawOffset = 0; - entity.rotationYaw = 0; - entity.rotationPitch = 0; - entity.rotationYawHead = entity.rotationYaw; - - RenderManager.instance.renderEntityWithPosYaw(entity, 0.0D, 0.0D, 0.0D, 0.0F, getWingYaw(butterfly)); - - GL11.glPopMatrix(); - RenderHelper.disableStandardItemLighting(); - GL11.glDisable(GL12.GL_RESCALE_NORMAL); - OpenGlHelper.setActiveTexture(OpenGlHelper.lightmapTexUnit); - GL11.glDisable(GL11.GL_TEXTURE_2D); - OpenGlHelper.setActiveTexture(OpenGlHelper.defaultTexUnit); - GL11.glPopAttrib(); - - } - - @Override - public boolean handleRenderType(ItemStack item, ItemRenderType type) { - switch (type) { - case ENTITY: - case EQUIPPED: - case EQUIPPED_FIRST_PERSON: - case INVENTORY: - return true; - default: - return false; - } - } - - @Override - public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { - switch (helper) { - case ENTITY_BOBBING: - case ENTITY_ROTATION: - return false; - default: - return true; - } - } - - @Override - public void renderItem(ItemRenderType type, ItemStack item, Object... data) { - - switch (type) { - case ENTITY: - renderButterflyItem(initButterfly(item), 0f, -0.5f, 0f); - break; - case EQUIPPED: - renderButterflyItem(initButterfly(item), 0.5f, -0.9f, 1.0f); - break; - case EQUIPPED_FIRST_PERSON: - renderButterflyItem(initButterfly(item), 0.5f, -0.9f, 1.0f); - break; - case INVENTORY: - renderButterflyInInventory(initButterfly(item)); - break; - default: - } - } - -} diff --git a/src/main/java/forestry/lepidopterology/render/TextureAtlasButterfly.java b/src/main/java/forestry/lepidopterology/render/TextureAtlasButterfly.java new file mode 100644 index 000000000..9d07e9907 --- /dev/null +++ b/src/main/java/forestry/lepidopterology/render/TextureAtlasButterfly.java @@ -0,0 +1,65 @@ +/******************************************************************************* + * Copyright (c) 2011-2014 SirSengir. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser Public License v3 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl-3.0.txt + * + * Various Contributors including, but not limited to: + * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges + ******************************************************************************/ +package forestry.lepidopterology.render; + +import java.awt.image.BufferedImage; +import java.io.IOException; +import com.google.common.collect.Lists; + +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.resources.data.AnimationMetadataSection; + +public class TextureAtlasButterfly extends TextureAtlasSprite{ + + public TextureAtlasButterfly(String spriteName) { + super(spriteName); + } + + @Override + public void loadSprite(BufferedImage[] images, AnimationMetadataSection meta) throws IOException { + this.resetSprite(); + int i = images[0].getWidth(); + int j = images[0].getHeight(); + this.width = i; + this.height = j; + int[][] aint = new int[images.length][]; + + for (int k = 0; k < images.length; ++k) + { + BufferedImage bufferedimage = images[k]; + + if (bufferedimage != null) + { + if (k > 0 && (bufferedimage.getWidth() != i >> k || bufferedimage.getHeight() != j >> k)) + { + throw new RuntimeException(String.format("Unable to load miplevel: %d, image is size: %dx%d, expected %dx%d", new Object[] {Integer.valueOf(k), Integer.valueOf(bufferedimage.getWidth()), Integer.valueOf(bufferedimage.getHeight()), Integer.valueOf(i >> k), Integer.valueOf(j >> k)})); + } + + aint[k] = new int[bufferedimage.getWidth() * bufferedimage.getHeight()]; + bufferedimage.getRGB(0, 0, bufferedimage.getWidth(), bufferedimage.getHeight(), aint[k], 0, bufferedimage.getWidth()); + } + } + this.framesTextureData.add(aint); + } + + private void resetSprite() + { + this.setFramesTextureData(Lists.newArrayList()); + this.frameCounter = 0; + this.tickCounter = 0; + } + + @Override + public boolean hasAnimationMetadata() { + return false; + } + +} diff --git a/src/main/java/forestry/mail/EventHandlerMailAlert.java b/src/main/java/forestry/mail/EventHandlerMailAlert.java index d03c6b168..80d74c480 100644 --- a/src/main/java/forestry/mail/EventHandlerMailAlert.java +++ b/src/main/java/forestry/mail/EventHandlerMailAlert.java @@ -12,12 +12,10 @@ package forestry.mail; import net.minecraft.client.Minecraft; import net.minecraft.entity.player.EntityPlayer; - -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.gameevent.PlayerEvent; -import cpw.mods.fml.common.gameevent.TickEvent; -import cpw.mods.fml.common.gameevent.TickEvent.Phase; - +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.gameevent.PlayerEvent; +import net.minecraftforge.fml.common.gameevent.TickEvent; +import net.minecraftforge.fml.common.gameevent.TickEvent.Phase; import forestry.core.proxy.Proxies; import forestry.mail.gui.GuiMailboxInfo; import forestry.mail.network.packets.PacketPOBoxInfoUpdate; diff --git a/src/main/java/forestry/mail/Letter.java b/src/main/java/forestry/mail/Letter.java index 9b6863d51..232655487 100755 --- a/src/main/java/forestry/mail/Letter.java +++ b/src/main/java/forestry/mail/Letter.java @@ -17,7 +17,7 @@ import org.apache.commons.lang3.StringUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; - +import net.minecraft.util.IChatComponent; import forestry.api.mail.ILetter; import forestry.api.mail.IMailAddress; import forestry.api.mail.IStamps; @@ -269,10 +269,10 @@ public class Letter implements ILetter { public ItemStack decrStackSize(int var1, int var2) { return inventory.decrStackSize(var1, var2); } - + @Override - public ItemStack getStackInSlotOnClosing(int var1) { - return inventory.getStackInSlotOnClosing(var1); + public ItemStack removeStackFromSlot(int index) { + return inventory.removeStackFromSlot(index); } @Override @@ -281,8 +281,8 @@ public class Letter implements ILetter { } @Override - public String getInventoryName() { - return inventory.getInventoryName(); + public String getName() { + return inventory.getName(); } @Override @@ -301,22 +301,46 @@ public class Letter implements ILetter { } @Override - public void openInventory() { - inventory.openInventory(); + public void openInventory(EntityPlayer var1) { + inventory.openInventory(var1); } @Override - public void closeInventory() { - inventory.closeInventory(); + public void closeInventory(EntityPlayer var1) { + inventory.closeInventory(var1); } @Override - public boolean hasCustomInventoryName() { - return inventory.hasCustomInventoryName(); + public boolean hasCustomName() { + return inventory.hasCustomName(); } @Override public boolean isItemValidForSlot(int i, ItemStack itemstack) { return inventory.isItemValidForSlot(i, itemstack); } + + /* FIELDS */ + @Override + public int getField(int id) { + return 0; + } + + @Override + public void setField(int id, int value) { + } + + @Override + public int getFieldCount() { + return 0; + } + + @Override + public void clear() { + } + + @Override + public IChatComponent getDisplayName() { + return inventory.getDisplayName(); + } } diff --git a/src/main/java/forestry/mail/LetterProperties.java b/src/main/java/forestry/mail/LetterProperties.java index 54fe96ef9..b197a0536 100644 --- a/src/main/java/forestry/mail/LetterProperties.java +++ b/src/main/java/forestry/mail/LetterProperties.java @@ -12,17 +12,16 @@ package forestry.mail; import java.util.List; -import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.client.renderer.ItemMeshDefinition; +import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +import forestry.api.core.IModelManager; import forestry.api.mail.ILetter; -import forestry.core.render.TextureManager; import forestry.plugins.PluginMail; public class LetterProperties { @@ -78,21 +77,37 @@ public class LetterProperties { } } - /* ICONS */ + /* MODELS */ @SideOnly(Side.CLIENT) - private static IIcon[][] icons; + private static ModelResourceLocation[][] models; @SideOnly(Side.CLIENT) - public static void registerIcons(IIconRegister register) { - icons = new IIcon[3][4]; - for (int i = 0; i < 3; i++) { - icons[i][0] = TextureManager.registerTex(register, "mail/letter." + i + ".fresh"); - icons[i][1] = TextureManager.registerTex(register, "mail/letter." + i + ".stamped"); - icons[i][2] = TextureManager.registerTex(register, "mail/letter." + i + ".opened"); - icons[i][3] = TextureManager.registerTex(register, "mail/letter." + i + ".emptied"); + private static class LetterMeshDefinition implements ItemMeshDefinition { + @Override + public ModelResourceLocation getModelLocation(ItemStack stack) { + int damage = stack.getItemDamage(); + State state = getState(damage); + Size size = getSize(damage); + return models[size.ordinal()][state.ordinal()]; } } + @SideOnly(Side.CLIENT) + public static void registerModel(Item item, IModelManager manager) { + models = new ModelResourceLocation[3][4]; + for (int i = 0; i < 3; i++) { + models[i][0] = new ModelResourceLocation("forestry:mail/letter." + i + ".fresh", "inventory"); + manager.registerVariant(item, new ResourceLocation("forestry:mail/letter." + i + ".fresh")); + models[i][1] = new ModelResourceLocation("forestry:mail/letter." + i + ".stamped", "inventory"); + manager.registerVariant(item, new ResourceLocation("forestry:mail/letter." + i + ".stamped")); + models[i][2] = new ModelResourceLocation("forestry:mail/letter." + i + ".opened", "inventory"); + manager.registerVariant(item, new ResourceLocation("forestry:mail/letter." + i + ".opened")); + models[i][3] = new ModelResourceLocation("forestry:mail/letter." + i + ".emptied", "inventory"); + manager.registerVariant(item, new ResourceLocation("forestry:mail/letter." + i + ".emptied")); + } + manager.registerItemModel(item, new LetterMeshDefinition()); + } + @SuppressWarnings("unchecked") public static void getSubItems(Item item, CreativeTabs tab, List list) { for (State state : State.values()) { @@ -104,14 +119,6 @@ public class LetterProperties { } } - @SideOnly(Side.CLIENT) - public static IIcon getIconFromDamage(int damage) { - State state = getState(damage); - Size size = getSize(damage); - - return icons[size.ordinal()][state.ordinal()]; - } - private static State getState(int meta) { int ordinal = meta & 0x0f; State[] values = State.values(); diff --git a/src/main/java/forestry/mail/MailAddress.java b/src/main/java/forestry/mail/MailAddress.java index e4873e3c3..e27af10ae 100644 --- a/src/main/java/forestry/mail/MailAddress.java +++ b/src/main/java/forestry/mail/MailAddress.java @@ -140,7 +140,7 @@ public class MailAddress implements INBTTagable, IMailAddress { gameProfile = invalidGameProfile; } else if (nbttagcompound.hasKey("profile")) { NBTTagCompound profileTag = nbttagcompound.getCompoundTag("profile"); - gameProfile = NBTUtil.func_152459_a(profileTag); + gameProfile = NBTUtil.readGameProfileFromNBT(profileTag); } } @@ -150,7 +150,7 @@ public class MailAddress implements INBTTagable, IMailAddress { if (gameProfile != null) { NBTTagCompound profileNbt = new NBTTagCompound(); - NBTUtil.func_152460_a(profileNbt, gameProfile); + NBTUtil.writeGameProfile(profileNbt, gameProfile); nbttagcompound.setTag("profile", profileNbt); } } diff --git a/src/main/java/forestry/mail/POBox.java b/src/main/java/forestry/mail/POBox.java index aa63809ec..8394b829e 100755 --- a/src/main/java/forestry/mail/POBox.java +++ b/src/main/java/forestry/mail/POBox.java @@ -14,6 +14,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.IChatComponent; import net.minecraft.world.WorldSavedData; import forestry.api.mail.ILetter; @@ -120,15 +121,15 @@ public class POBox extends WorldSavedData implements IInventory { public ItemStack decrStackSize(int var1, int var2) { return letters.decrStackSize(var1, var2); } - + @Override - public ItemStack getStackInSlotOnClosing(int var1) { - return letters.getStackInSlotOnClosing(var1); + public ItemStack removeStackFromSlot(int index) { + return letters.removeStackFromSlot(index); } @Override - public String getInventoryName() { - return letters.getInventoryName(); + public String getName() { + return letters.getName(); } @Override @@ -142,15 +143,15 @@ public class POBox extends WorldSavedData implements IInventory { } @Override - public void openInventory() { + public void openInventory(EntityPlayer var1) { } @Override - public void closeInventory() { + public void closeInventory(EntityPlayer var1) { } @Override - public boolean hasCustomInventoryName() { + public boolean hasCustomName() { return true; } @@ -159,4 +160,28 @@ public class POBox extends WorldSavedData implements IInventory { return letters.isItemValidForSlot(i, itemstack); } + @Override + public IChatComponent getDisplayName() { + return letters.getDisplayName(); + } + + /* FIELDS */ + @Override + public int getField(int id) { + return 0; + } + + @Override + public void setField(int id, int value) { + } + + @Override + public int getFieldCount() { + return 0; + } + + @Override + public void clear() { + } + } diff --git a/src/main/java/forestry/mail/PostalCarrier.java b/src/main/java/forestry/mail/PostalCarrier.java index d66955314..fdb48374b 100755 --- a/src/main/java/forestry/mail/PostalCarrier.java +++ b/src/main/java/forestry/mail/PostalCarrier.java @@ -10,15 +10,13 @@ ******************************************************************************/ package forestry.mail; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; import net.minecraft.world.World; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import forestry.api.mail.EnumAddressee; import forestry.api.mail.IMailAddress; import forestry.api.mail.IPostOffice; @@ -54,7 +52,7 @@ public class PostalCarrier implements IPostalCarrier { @Override @SideOnly(Side.CLIENT) - public IIcon getIcon() { + public TextureAtlasSprite getSprite() { return TextureManager.getInstance().getDefault(iconID); } @@ -88,7 +86,7 @@ public class PostalCarrier implements IPostalCarrier { } else { EntityPlayer player = PlayerUtil.getPlayer(world, recipient.getPlayerProfile()); if (player instanceof EntityPlayerMP) { - Proxies.net.sendToPlayer(new PacketPOBoxInfoUpdate(pobox.getPOBoxInfo()), (EntityPlayerMP) player); + Proxies.net.sendToPlayer(new PacketPOBoxInfoUpdate(pobox.getPOBoxInfo()), player); } } diff --git a/src/main/java/forestry/mail/TradeStation.java b/src/main/java/forestry/mail/TradeStation.java index b2528e480..a78eb1588 100755 --- a/src/main/java/forestry/mail/TradeStation.java +++ b/src/main/java/forestry/mail/TradeStation.java @@ -17,6 +17,8 @@ import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTUtil; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.IChatComponent; import net.minecraft.world.World; import net.minecraft.world.WorldSavedData; @@ -84,7 +86,7 @@ public class TradeStation extends WorldSavedData implements ITradeStation, IInve @Override public void readFromNBT(NBTTagCompound nbttagcompound) { if (nbttagcompound.hasKey("owner")) { - owner = NBTUtil.func_152459_a(nbttagcompound.getCompoundTag("owner")); + owner = NBTUtil.readGameProfileFromNBT(nbttagcompound.getCompoundTag("owner")); } if (nbttagcompound.hasKey("address")) { @@ -100,7 +102,7 @@ public class TradeStation extends WorldSavedData implements ITradeStation, IInve public void writeToNBT(NBTTagCompound nbttagcompound) { if (owner != null) { NBTTagCompound nbt = new NBTTagCompound(); - NBTUtil.func_152460_a(nbt, owner); + NBTUtil.writeGameProfile(nbt, owner); nbttagcompound.setTag("owner", nbt); } @@ -571,15 +573,15 @@ public class TradeStation extends WorldSavedData implements ITradeStation, IInve public ItemStack decrStackSize(int var1, int var2) { return inventory.decrStackSize(var1, var2); } - + @Override - public ItemStack getStackInSlotOnClosing(int var1) { - return inventory.getStackInSlotOnClosing(var1); + public ItemStack removeStackFromSlot(int index) { + return inventory.removeStackFromSlot(index); } @Override - public String getInventoryName() { - return inventory.getInventoryName(); + public String getName() { + return inventory.getName(); } @Override @@ -593,11 +595,11 @@ public class TradeStation extends WorldSavedData implements ITradeStation, IInve } @Override - public void openInventory() { + public void openInventory(EntityPlayer player) { } @Override - public void closeInventory() { + public void closeInventory(EntityPlayer player) { } @Override @@ -606,22 +608,27 @@ public class TradeStation extends WorldSavedData implements ITradeStation, IInve } @Override - public boolean hasCustomInventoryName() { + public boolean hasCustomName() { return true; } - + @Override - public int[] getAccessibleSlotsFromSide(int side) { - return inventory.getAccessibleSlotsFromSide(side); + public IChatComponent getDisplayName() { + return inventory.getDisplayName(); + } + + @Override + public int[] getSlotsForFace(EnumFacing side) { + return inventory.getSlotsForFace(side); } @Override - public boolean canInsertItem(int slot, ItemStack itemStack, int side) { + public boolean canInsertItem(int slot, ItemStack itemStack, EnumFacing side) { return inventory.canInsertItem(slot, itemStack, side); } @Override - public boolean canExtractItem(int slot, ItemStack itemStack, int side) { + public boolean canExtractItem(int slot, ItemStack itemStack, EnumFacing side) { return inventory.canExtractItem(slot, itemStack, side); } @@ -635,4 +642,23 @@ public class TradeStation extends WorldSavedData implements ITradeStation, IInve return inventory.isLocked(slotIndex); } + /* FIELDS */ + @Override + public int getField(int id) { + return 0; + } + + @Override + public void setField(int id, int value) { + } + + @Override + public int getFieldCount() { + return 0; + } + + @Override + public void clear() { + } + } diff --git a/src/main/java/forestry/mail/blocks/BlockMail.java b/src/main/java/forestry/mail/blocks/BlockMail.java index 412a048e7..aacaab51b 100644 --- a/src/main/java/forestry/mail/blocks/BlockMail.java +++ b/src/main/java/forestry/mail/blocks/BlockMail.java @@ -14,6 +14,6 @@ import forestry.core.blocks.BlockBase; public class BlockMail extends BlockBase { public BlockMail() { - super(); + super(BlockMailType.class); } } diff --git a/src/main/java/forestry/mail/blocks/BlockMailType.java b/src/main/java/forestry/mail/blocks/BlockMailType.java index d7c92d342..b89e2016d 100644 --- a/src/main/java/forestry/mail/blocks/BlockMailType.java +++ b/src/main/java/forestry/mail/blocks/BlockMailType.java @@ -50,4 +50,9 @@ public enum BlockMailType implements IMachineProperties { public Class getTeClass() { return teClass; } + + @Override + public String getName() { + return name().toLowerCase(Locale.ENGLISH); + } } diff --git a/src/main/java/forestry/mail/commands/CommandMail.java b/src/main/java/forestry/mail/commands/CommandMail.java index 7cc1bd2f9..0dae70cdc 100644 --- a/src/main/java/forestry/mail/commands/CommandMail.java +++ b/src/main/java/forestry/mail/commands/CommandMail.java @@ -13,6 +13,7 @@ package forestry.mail.commands; import net.minecraft.command.ICommandSender; +import net.minecraft.command.WrongUsageException; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.ChatStyle; @@ -84,7 +85,7 @@ public class CommandMail extends SubCommand { } @Override - public void processSubCommand(ICommandSender sender, String[] args) { + public void processSubCommand(ICommandSender sender, String[] args) throws WrongUsageException { if (args.length != 1) { CommandHelpers.throwWrongUsage(sender, this); } diff --git a/src/main/java/forestry/mail/gui/ContainerLetter.java b/src/main/java/forestry/mail/gui/ContainerLetter.java index 24a0c1380..16a59aba9 100755 --- a/src/main/java/forestry/mail/gui/ContainerLetter.java +++ b/src/main/java/forestry/mail/gui/ContainerLetter.java @@ -137,7 +137,7 @@ public class ContainerLetter extends ContainerItemInventory private static IMailAddress getRecipient(String recipientName, EnumAddressee type) { switch (type) { case PLAYER: { - GameProfile gameProfile = MinecraftServer.getServer().func_152358_ax().func_152655_a(recipientName); + GameProfile gameProfile = MinecraftServer.getServer().getPlayerProfileCache().getGameProfileForUsername(recipientName); if (gameProfile == null) { gameProfile = new GameProfile(new UUID(0, 0), recipientName); } diff --git a/src/main/java/forestry/mail/gui/GuiLetter.java b/src/main/java/forestry/mail/gui/GuiLetter.java index 48628e44c..4f5864e8f 100755 --- a/src/main/java/forestry/mail/gui/GuiLetter.java +++ b/src/main/java/forestry/mail/gui/GuiLetter.java @@ -10,6 +10,7 @@ ******************************************************************************/ package forestry.mail.gui; +import java.io.IOException; import java.util.ArrayList; import org.apache.commons.lang3.StringUtils; @@ -62,13 +63,13 @@ public class GuiLetter extends GuiForestry Keyboard.enableRepeatEvents(true); - address = new GuiTextField(this.fontRendererObj, guiLeft + 46, guiTop + 13, 93, 13); + address = new GuiTextField(0, this.fontRendererObj, guiLeft + 46, guiTop + 13, 93, 13); IMailAddress recipient = container.getRecipient(); if (recipient != null) { address.setText(recipient.getName()); } - text = new GuiTextBox(this.fontRendererObj, guiLeft + 17, guiTop + 31, 122, 57); + text = new GuiTextBox(1, this.fontRendererObj, guiLeft + 17, guiTop + 31, 122, 57); text.setMaxStringLength(128); if (!container.getText().isEmpty()) { text.setText(container.getText()); @@ -76,7 +77,7 @@ public class GuiLetter extends GuiForestry } @Override - protected void keyTyped(char eventCharacter, int eventKey) { + protected void keyTyped(char eventCharacter, int eventKey) throws IOException { // Set focus or enter text into address if (this.address.isFocused()) { @@ -109,7 +110,7 @@ public class GuiLetter extends GuiForestry } @Override - protected void mouseClicked(int par1, int par2, int mouseButton) { + protected void mouseClicked(int par1, int par2, int mouseButton) throws IOException { super.mouseClicked(par1, par2, mouseButton); this.address.mouseClicked(par1, par2, mouseButton); diff --git a/src/main/java/forestry/mail/gui/GuiMailboxInfo.java b/src/main/java/forestry/mail/gui/GuiMailboxInfo.java index 9959032a7..1c65dc68a 100755 --- a/src/main/java/forestry/mail/gui/GuiMailboxInfo.java +++ b/src/main/java/forestry/mail/gui/GuiMailboxInfo.java @@ -43,7 +43,7 @@ public class GuiMailboxInfo extends Gui { private final ResourceLocation textureAlert = new ForestryResource(Constants.TEXTURE_PATH_GUI + "/mailalert.png"); private GuiMailboxInfo() { - fontRendererObj = Proxies.common.getClientInstance().fontRenderer; + fontRendererObj = Proxies.common.getClientInstance().fontRendererObj; } public void render() { @@ -55,7 +55,7 @@ public class GuiMailboxInfo extends Gui { int y = 0; Minecraft minecraft = Minecraft.getMinecraft(); - ScaledResolution scaledresolution = new ScaledResolution(minecraft, minecraft.displayWidth, minecraft.displayHeight); + ScaledResolution scaledresolution = new ScaledResolution(minecraft); if (Config.mailAlertXPosition == XPosition.RIGHT) { x = scaledresolution.getScaledWidth() - WIDTH; } diff --git a/src/main/java/forestry/mail/gui/GuiTradeName.java b/src/main/java/forestry/mail/gui/GuiTradeName.java index 1cd501bc5..97cbcd756 100755 --- a/src/main/java/forestry/mail/gui/GuiTradeName.java +++ b/src/main/java/forestry/mail/gui/GuiTradeName.java @@ -10,6 +10,8 @@ ******************************************************************************/ package forestry.mail.gui; +import java.io.IOException; + import org.apache.commons.lang3.StringUtils; import net.minecraft.client.gui.GuiTextField; @@ -37,7 +39,7 @@ public class GuiTradeName extends GuiForestry { public void initGui() { super.initGui(); - addressNameField = new GuiTextField(this.fontRendererObj, guiLeft + 44, guiTop + 39, 90, 14); + addressNameField = new GuiTextField(0, this.fontRendererObj, guiLeft + 44, guiTop + 39, 90, 14); if (container.getAddress() != null) { addressNameField.setText(container.getAddress().getName()); } @@ -45,7 +47,7 @@ public class GuiTradeName extends GuiForestry { } @Override - protected void keyTyped(char eventCharacter, int eventKey) { + protected void keyTyped(char eventCharacter, int eventKey) throws IOException { // Set focus or enter text into address if (addressNameField.isFocused()) { @@ -61,7 +63,7 @@ public class GuiTradeName extends GuiForestry { } @Override - protected void mouseClicked(int par1, int par2, int mouseButton) { + protected void mouseClicked(int par1, int par2, int mouseButton) throws IOException { super.mouseClicked(par1, par2, mouseButton); addressNameField.mouseClicked(par1, par2, mouseButton); } diff --git a/src/main/java/forestry/mail/gui/widgets/AddresseeSlot.java b/src/main/java/forestry/mail/gui/widgets/AddresseeSlot.java index 2f9448664..b5dfcac3f 100644 --- a/src/main/java/forestry/mail/gui/widgets/AddresseeSlot.java +++ b/src/main/java/forestry/mail/gui/widgets/AddresseeSlot.java @@ -10,6 +10,7 @@ ******************************************************************************/ package forestry.mail.gui.widgets; +import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.player.EntityPlayer; import org.lwjgl.opengl.GL11; @@ -19,7 +20,6 @@ import forestry.api.mail.PostManager; import forestry.core.gui.widgets.Widget; import forestry.core.gui.widgets.WidgetManager; import forestry.core.proxy.Proxies; -import forestry.core.render.SpriteSheet; import forestry.core.utils.StringUtil; import forestry.mail.gui.ContainerLetter; @@ -39,8 +39,8 @@ public class AddresseeSlot extends Widget { IPostalCarrier carrier = PostManager.postRegistry.getCarrier(containerLetter.getCarrierType()); if (carrier != null) { GL11.glColor4f(1.0f, 1.0f, 1.0f, 1.0F); - Proxies.render.bindTexture(SpriteSheet.ITEMS); - manager.gui.drawTexturedModelRectFromIcon(startX + xPos, startY + yPos - 5, carrier.getIcon(), 26, 26); + Proxies.render.bindTexture(TextureMap.locationBlocksTexture); + manager.gui.drawTexturedModalRect(startX + xPos, startY + yPos - 5, carrier.getSprite(), 26, 26); } } diff --git a/src/main/java/forestry/mail/inventory/InventoryTradeStation.java b/src/main/java/forestry/mail/inventory/InventoryTradeStation.java index efc6fb33a..95c0eb8dc 100644 --- a/src/main/java/forestry/mail/inventory/InventoryTradeStation.java +++ b/src/main/java/forestry/mail/inventory/InventoryTradeStation.java @@ -15,7 +15,7 @@ import java.util.ArrayList; import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; - +import net.minecraft.util.EnumFacing; import forestry.api.mail.IStamps; import forestry.core.inventory.InventoryAdapter; import forestry.core.utils.ItemStackUtil; @@ -27,10 +27,9 @@ public class InventoryTradeStation extends InventoryAdapter { public InventoryTradeStation() { super(TradeStation.SLOT_SIZE, "INV"); } - + @Override - public int[] getAccessibleSlotsFromSide(int side) { - + public int[] getSlotsForFace(EnumFacing side) { ArrayList slots = new ArrayList<>(); for (int i = TradeStation.SLOT_LETTERS_1; i < TradeStation.SLOT_LETTERS_1 + TradeStation.SLOT_LETTERS_COUNT; i++) { @@ -55,7 +54,7 @@ public class InventoryTradeStation extends InventoryAdapter { } @Override - public boolean canExtractItem(int slot, ItemStack itemStack, int side) { + public boolean canExtractItem(int slot, ItemStack itemStack, EnumFacing side) { return SlotUtil.isSlotInRange(slot, TradeStation.SLOT_RECEIVE_BUFFER, TradeStation.SLOT_RECEIVE_BUFFER_COUNT); } diff --git a/src/main/java/forestry/mail/inventory/ItemInventoryLetter.java b/src/main/java/forestry/mail/inventory/ItemInventoryLetter.java index aea500d04..34e1d32b2 100644 --- a/src/main/java/forestry/mail/inventory/ItemInventoryLetter.java +++ b/src/main/java/forestry/mail/inventory/ItemInventoryLetter.java @@ -94,8 +94,8 @@ public class ItemInventoryLetter extends ItemInventory implements IErrorSource, } @Override - public String getInventoryName() { - return letter.getInventoryName(); + public String getName() { + return letter.getName(); } @Override @@ -107,10 +107,10 @@ public class ItemInventoryLetter extends ItemInventory implements IErrorSource, public boolean isUseableByPlayer(EntityPlayer entityplayer) { return letter.isUseableByPlayer(entityplayer); } - + @Override - public ItemStack getStackInSlotOnClosing(int slot) { - return letter.getStackInSlotOnClosing(slot); + public ItemStack removeStackFromSlot(int slot) { + return letter.removeStackFromSlot(slot); } @Override diff --git a/src/main/java/forestry/mail/items/ItemLetter.java b/src/main/java/forestry/mail/items/ItemLetter.java index c2f564da6..7faedf798 100755 --- a/src/main/java/forestry/mail/items/ItemLetter.java +++ b/src/main/java/forestry/mail/items/ItemLetter.java @@ -12,19 +12,16 @@ package forestry.mail.items; import java.util.List; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ChatComponentTranslation; -import net.minecraft.util.IIcon; import net.minecraft.world.World; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +import forestry.api.core.IModelManager; import forestry.api.mail.ILetter; import forestry.core.items.ItemWithGui; import forestry.core.utils.StringUtil; @@ -57,17 +54,11 @@ public class ItemLetter extends ItemWithGui { return true; } - /* ICONS */ + /* MODELS */ @SideOnly(Side.CLIENT) @Override - public void registerIcons(IIconRegister register) { - LetterProperties.registerIcons(register); - } - - @SideOnly(Side.CLIENT) - @Override - public IIcon getIconFromDamage(int damage) { - return LetterProperties.getIconFromDamage(damage); + public void registerModel(Item item, IModelManager manager) { + LetterProperties.registerModel(item, manager); } @SuppressWarnings({"unchecked", "rawtypes"}) diff --git a/src/main/java/forestry/mail/tiles/TileMailbox.java b/src/main/java/forestry/mail/tiles/TileMailbox.java index 30ed38f3f..9b2df5060 100644 --- a/src/main/java/forestry/mail/tiles/TileMailbox.java +++ b/src/main/java/forestry/mail/tiles/TileMailbox.java @@ -18,14 +18,12 @@ import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ChatComponentTranslation; +import net.minecraft.util.EnumFacing; import net.minecraft.world.World; +import net.minecraftforge.fml.common.Optional; import com.mojang.authlib.GameProfile; -import net.minecraftforge.common.util.ForgeDirection; - -import cpw.mods.fml.common.Optional; - import forestry.api.mail.ILetter; import forestry.api.mail.IMailAddress; import forestry.api.mail.IPostalState; @@ -121,7 +119,7 @@ public class TileMailbox extends TileBase implements IMailContainer { /* ITRIGGERPROVIDER */ @Optional.Method(modid = "BuildCraftAPI|statements") @Override - public Collection getExternalTriggers(ForgeDirection side, TileEntity tile) { + public Collection getExternalTriggers(EnumFacing side, TileEntity tile) { LinkedList res = new LinkedList<>(); res.add(MailTriggers.triggerHasMail); return res; diff --git a/src/main/java/forestry/mail/tiles/TileTrader.java b/src/main/java/forestry/mail/tiles/TileTrader.java index 1dc852f74..77baa8ef5 100644 --- a/src/main/java/forestry/mail/tiles/TileTrader.java +++ b/src/main/java/forestry/mail/tiles/TileTrader.java @@ -20,11 +20,8 @@ import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; - -import net.minecraftforge.common.util.ForgeDirection; - -import cpw.mods.fml.common.Optional; - +import net.minecraft.util.EnumFacing; +import net.minecraftforge.fml.common.Optional; import forestry.api.core.IErrorLogic; import forestry.api.mail.IMailAddress; import forestry.api.mail.IStamps; @@ -316,7 +313,7 @@ public class TileTrader extends TileBase { /* ITRIGGERPROVIDER */ @Optional.Method(modid = "BuildCraftAPI|statements") @Override - public Collection getExternalTriggers(ForgeDirection side, TileEntity tile) { + public Collection getExternalTriggers(EnumFacing side, TileEntity tile) { LinkedList res = new LinkedList<>(); res.add(MailTriggers.lowPaper64); res.add(MailTriggers.lowPaper32); diff --git a/src/main/java/forestry/mail/triggers/TriggerBuffer.java b/src/main/java/forestry/mail/triggers/TriggerBuffer.java index 3f29dba7e..59d336bfd 100755 --- a/src/main/java/forestry/mail/triggers/TriggerBuffer.java +++ b/src/main/java/forestry/mail/triggers/TriggerBuffer.java @@ -11,9 +11,7 @@ package forestry.mail.triggers; import net.minecraft.tileentity.TileEntity; - -import net.minecraftforge.common.util.ForgeDirection; - +import net.minecraft.util.EnumFacing; import forestry.core.triggers.Trigger; import forestry.mail.tiles.TileTrader; @@ -35,7 +33,7 @@ public class TriggerBuffer extends Trigger { } @Override - public boolean isTriggerActive(TileEntity tile, ForgeDirection side, IStatementContainer source, IStatementParameter[] parameters) { + public boolean isTriggerActive(TileEntity tile, EnumFacing side, IStatementContainer source, IStatementParameter[] parameters) { if (!(tile instanceof TileTrader)) { return false; diff --git a/src/main/java/forestry/mail/triggers/TriggerHasMail.java b/src/main/java/forestry/mail/triggers/TriggerHasMail.java index 6125749fd..f4b794874 100755 --- a/src/main/java/forestry/mail/triggers/TriggerHasMail.java +++ b/src/main/java/forestry/mail/triggers/TriggerHasMail.java @@ -11,9 +11,7 @@ package forestry.mail.triggers; import net.minecraft.tileentity.TileEntity; - -import net.minecraftforge.common.util.ForgeDirection; - +import net.minecraft.util.EnumFacing; import forestry.core.triggers.Trigger; import forestry.mail.tiles.IMailContainer; @@ -27,7 +25,7 @@ public class TriggerHasMail extends Trigger { } @Override - public boolean isTriggerActive(TileEntity tile, ForgeDirection side, IStatementContainer source, IStatementParameter[] parameters) { + public boolean isTriggerActive(TileEntity tile, EnumFacing side, IStatementContainer source, IStatementParameter[] parameters) { if (!(tile instanceof IMailContainer)) { return false; diff --git a/src/main/java/forestry/mail/triggers/TriggerLowInput.java b/src/main/java/forestry/mail/triggers/TriggerLowInput.java index 889ea245f..4f7a0290a 100755 --- a/src/main/java/forestry/mail/triggers/TriggerLowInput.java +++ b/src/main/java/forestry/mail/triggers/TriggerLowInput.java @@ -11,9 +11,7 @@ package forestry.mail.triggers; import net.minecraft.tileentity.TileEntity; - -import net.minecraftforge.common.util.ForgeDirection; - +import net.minecraft.util.EnumFacing; import forestry.core.triggers.Trigger; import forestry.mail.tiles.TileTrader; @@ -35,7 +33,7 @@ public class TriggerLowInput extends Trigger { } @Override - public boolean isTriggerActive(TileEntity tile, ForgeDirection side, IStatementContainer source, IStatementParameter[] parameters) { + public boolean isTriggerActive(TileEntity tile, EnumFacing side, IStatementContainer source, IStatementParameter[] parameters) { if (!(tile instanceof TileTrader)) { return false; diff --git a/src/main/java/forestry/mail/triggers/TriggerLowPaper.java b/src/main/java/forestry/mail/triggers/TriggerLowPaper.java index 88c885cd8..43e662496 100755 --- a/src/main/java/forestry/mail/triggers/TriggerLowPaper.java +++ b/src/main/java/forestry/mail/triggers/TriggerLowPaper.java @@ -11,9 +11,7 @@ package forestry.mail.triggers; import net.minecraft.tileentity.TileEntity; - -import net.minecraftforge.common.util.ForgeDirection; - +import net.minecraft.util.EnumFacing; import forestry.core.triggers.Trigger; import forestry.mail.tiles.TileTrader; @@ -35,7 +33,7 @@ public class TriggerLowPaper extends Trigger { } @Override - public boolean isTriggerActive(TileEntity tile, ForgeDirection side, IStatementContainer source, IStatementParameter[] parameters) { + public boolean isTriggerActive(TileEntity tile, EnumFacing side, IStatementContainer source, IStatementParameter[] parameters) { if (!(tile instanceof TileTrader)) { return false; diff --git a/src/main/java/forestry/mail/triggers/TriggerLowStamps.java b/src/main/java/forestry/mail/triggers/TriggerLowStamps.java index fccf07cf1..e59e9eca3 100755 --- a/src/main/java/forestry/mail/triggers/TriggerLowStamps.java +++ b/src/main/java/forestry/mail/triggers/TriggerLowStamps.java @@ -11,9 +11,7 @@ package forestry.mail.triggers; import net.minecraft.tileentity.TileEntity; - -import net.minecraftforge.common.util.ForgeDirection; - +import net.minecraft.util.EnumFacing; import forestry.core.triggers.Trigger; import forestry.mail.tiles.TileTrader; @@ -35,7 +33,7 @@ public class TriggerLowStamps extends Trigger { } @Override - public boolean isTriggerActive(TileEntity tile, ForgeDirection side, IStatementContainer source, IStatementParameter[] parameters) { + public boolean isTriggerActive(TileEntity tile, EnumFacing side, IStatementContainer source, IStatementParameter[] parameters) { if (!(tile instanceof TileTrader)) { return false; diff --git a/src/main/java/forestry/plugins/ForestryPlugin.java b/src/main/java/forestry/plugins/ForestryPlugin.java index b4e90523f..773be3ef1 100755 --- a/src/main/java/forestry/plugins/ForestryPlugin.java +++ b/src/main/java/forestry/plugins/ForestryPlugin.java @@ -16,10 +16,8 @@ import java.util.Random; import net.minecraft.command.ICommand; import net.minecraft.world.World; import net.minecraft.world.chunk.IChunkProvider; - -import cpw.mods.fml.common.IFuelHandler; -import cpw.mods.fml.common.event.FMLInterModComms.IMCMessage; - +import net.minecraftforge.fml.common.IFuelHandler; +import net.minecraftforge.fml.common.event.FMLInterModComms.IMCMessage; import forestry.core.IPickupHandler; import forestry.core.IResupplyHandler; import forestry.core.ISaveEventHandler; diff --git a/src/main/java/forestry/plugins/PluginApiculture.java b/src/main/java/forestry/plugins/PluginApiculture.java index 2af8c21cc..f311b4540 100644 --- a/src/main/java/forestry/plugins/PluginApiculture.java +++ b/src/main/java/forestry/plugins/PluginApiculture.java @@ -21,11 +21,12 @@ import java.util.Random; import java.util.Set; import net.minecraft.block.Block; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.IIcon; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.WeightedRandomChestContent; import net.minecraft.world.World; import net.minecraft.world.chunk.IChunkProvider; @@ -35,24 +36,22 @@ import net.minecraftforge.common.ChestGenHooks; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.config.Property; import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fml.common.FMLCommonHandler; +import net.minecraftforge.fml.common.SidedProxy; +import net.minecraftforge.fml.common.event.FMLInterModComms.IMCMessage; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.oredict.OreDictionary; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.SidedProxy; -import cpw.mods.fml.common.event.FMLInterModComms.IMCMessage; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.registry.GameData; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.common.registry.VillagerRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - import forestry.Forestry; import forestry.api.apiculture.BeeManager; import forestry.api.apiculture.EnumBeeType; import forestry.api.apiculture.FlowerManager; import forestry.api.apiculture.IBeekeepingMode; import forestry.api.apiculture.hives.HiveManager; +import forestry.api.apiculture.hives.IHiveRegistry.HiveType; import forestry.api.core.ForestryAPI; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IClassification; @@ -64,7 +63,6 @@ import forestry.api.storage.ICrateRegistry; import forestry.api.storage.StorageManager; import forestry.apiculture.ArmorApiaristHelper; import forestry.apiculture.SaveEventHandlerApiculture; -import forestry.apiculture.VillageHandlerApiculture; import forestry.apiculture.blocks.BlockAlveary; import forestry.apiculture.blocks.BlockApicultureType; import forestry.apiculture.blocks.BlockCandle; @@ -116,6 +114,7 @@ import forestry.core.proxy.Proxies; import forestry.core.recipes.RecipeUtil; import forestry.core.tiles.MachineDefinition; import forestry.core.utils.EntityUtil; +import forestry.core.utils.ItemStackUtil; import forestry.core.utils.Log; import forestry.core.utils.Stack; import forestry.core.utils.StringUtil; @@ -196,10 +195,10 @@ public class PluginApiculture extends ForestryPlugin { ApicultureTriggers.initialize(); } - if (Config.enableVillagers) { + /*if (Config.enableVillagers) { // Register village components with the Structure registry. VillageHandlerApiculture.registerVillageComponents(); - } + }*/ // Commands PluginCore.rootCommand.addChildCommand(new CommandBee()); @@ -300,14 +299,14 @@ public class PluginApiculture extends ForestryPlugin { BeeManager.villageBees[1].add(BeeDefinition.COMMON.getGenome()); BeeManager.villageBees[1].add(BeeDefinition.VALIANT.getGenome()); - if (Config.enableVillagers) { + /*if (Config.enableVillagers) { // Register villager stuff VillageHandlerApiculture villageHandler = new VillageHandlerApiculture(); VillagerRegistry.instance().registerVillageCreationHandler(villageHandler); VillagerRegistry.instance().registerVillagerId(Constants.ID_VILLAGER_BEEKEEPER); Proxies.render.registerVillagerSkin(Constants.ID_VILLAGER_BEEKEEPER, Constants.TEXTURE_SKIN_BEEKPEEPER); VillagerRegistry.instance().registerVillageTradeHandler(Constants.ID_VILLAGER_BEEKEEPER, villageHandler); - } + }*/ proxy.initializeRendering(); @@ -356,7 +355,7 @@ public class PluginApiculture extends ForestryPlugin { List plantableFlowerNames = new ArrayList<>(); if (flowers != null) { for (IFlower flower : flowers) { - String name = GameData.getBlockRegistry().getNameForObject(flower.getBlock()); + String name = ItemStackUtil.getBlockNameFromRegistryAsSting(flower.getBlock()); if (name == null) { Log.severe("Could not find name for flower: " + flower + " with type: " + flowerType); continue; @@ -560,7 +559,7 @@ public class PluginApiculture extends ForestryPlugin { 'I', "ingotIron", 'G', "blockGlass"); // STABILISER - RecipeUtil.addRecipe(blocks.alveary.get(BlockAlveary.Type.STABILIZER), + RecipeUtil.addRecipe(blocks.alveary.get(BlockAlveary.Type.STABILISER), "G G", "GXG", "G G", @@ -747,42 +746,42 @@ public class PluginApiculture extends ForestryPlugin { private static void registerBeehiveDrops() { ItemStack honeyComb = items.beeComb.get(EnumHoneyComb.HONEY, 1); - hiveRegistry.addDrops(HiveRegistry.forest, + hiveRegistry.addDrops(HiveType.FOREST.getHiveName(), new HiveDrop(80, BeeDefinition.FOREST, honeyComb).setIgnobleShare(0.7f), new HiveDrop(8, BeeDefinition.FOREST.getRainResist(), honeyComb), new HiveDrop(3, BeeDefinition.VALIANT, honeyComb) ); - hiveRegistry.addDrops(HiveRegistry.meadows, + hiveRegistry.addDrops(HiveType.MEADOWS.getHiveName(), new HiveDrop(80, BeeDefinition.MEADOWS, honeyComb).setIgnobleShare(0.7f), new HiveDrop(3, BeeDefinition.VALIANT, honeyComb) ); ItemStack parchedComb = items.beeComb.get(EnumHoneyComb.PARCHED, 1); - hiveRegistry.addDrops(HiveRegistry.desert, + hiveRegistry.addDrops(HiveType.DESERT.getHiveName(), new HiveDrop(80, BeeDefinition.MODEST, parchedComb).setIgnobleShare(0.7f), new HiveDrop(3, BeeDefinition.VALIANT, parchedComb) ); ItemStack silkyComb = items.beeComb.get(EnumHoneyComb.SILKY, 1); - hiveRegistry.addDrops(HiveRegistry.jungle, + hiveRegistry.addDrops(HiveType.JUNGLE.getHiveName(), new HiveDrop(80, BeeDefinition.TROPICAL, silkyComb).setIgnobleShare(0.7f), new HiveDrop(3, BeeDefinition.VALIANT, silkyComb) ); ItemStack mysteriousComb = items.beeComb.get(EnumHoneyComb.MYSTERIOUS, 1); - hiveRegistry.addDrops(HiveRegistry.end, + hiveRegistry.addDrops(HiveType.END.getHiveName(), new HiveDrop(90, BeeDefinition.ENDED, mysteriousComb) ); ItemStack frozenComb = items.beeComb.get(EnumHoneyComb.FROZEN, 1); - hiveRegistry.addDrops(HiveRegistry.snow, + hiveRegistry.addDrops(HiveType.SNOW.getHiveName(), new HiveDrop(80, BeeDefinition.WINTRY, frozenComb).setIgnobleShare(0.5f), new HiveDrop(3, BeeDefinition.VALIANT, frozenComb) ); ItemStack mossyComb = items.beeComb.get(EnumHoneyComb.MOSSY, 1); - hiveRegistry.addDrops(HiveRegistry.swamp, + hiveRegistry.addDrops(HiveType.SWAMP.getHiveName(), new HiveDrop(80, BeeDefinition.MARSHY, mossyComb).setIgnobleShare(0.4f), new HiveDrop(3, BeeDefinition.VALIANT, mossyComb) ); @@ -816,13 +815,13 @@ public class PluginApiculture extends ForestryPlugin { } private static void createHives() { - hiveRegistry.registerHive(HiveRegistry.forest, HiveDescription.FOREST); - hiveRegistry.registerHive(HiveRegistry.meadows, HiveDescription.MEADOWS); - hiveRegistry.registerHive(HiveRegistry.desert, HiveDescription.DESERT); - hiveRegistry.registerHive(HiveRegistry.jungle, HiveDescription.JUNGLE); - hiveRegistry.registerHive(HiveRegistry.end, HiveDescription.END); - hiveRegistry.registerHive(HiveRegistry.snow, HiveDescription.SNOW); - hiveRegistry.registerHive(HiveRegistry.swamp, HiveDescription.SWAMP); + hiveRegistry.registerHive(HiveType.FOREST.getHiveName(), HiveDescription.FOREST); + hiveRegistry.registerHive(HiveType.MEADOWS.getHiveName(), HiveDescription.MEADOWS); + hiveRegistry.registerHive(HiveType.DESERT.getHiveName(), HiveDescription.DESERT); + hiveRegistry.registerHive(HiveType.JUNGLE.getHiveName(), HiveDescription.JUNGLE); + hiveRegistry.registerHive(HiveType.END.getHiveName(), HiveDescription.END); + hiveRegistry.registerHive(HiveType.SNOW.getHiveName(), HiveDescription.SNOW); + hiveRegistry.registerHive(HiveType.SWAMP.getHiveName(), HiveDescription.SWAMP); } private static void createAlleles() { @@ -926,11 +925,9 @@ public class PluginApiculture extends ForestryPlugin { @SubscribeEvent @SideOnly(Side.CLIENT) public void textureHook(TextureStitchEvent.Pre event) { - if (event.map.getTextureType() == 1) { - EntityFXSnow.icons = new IIcon[3]; - for (int i = 0; i < EntityFXSnow.icons.length; i++) { - EntityFXSnow.icons[i] = event.map.registerIcon("forestry:particles/snow." + (i + 1)); - } + EntityFXSnow.sprites = new TextureAtlasSprite[3]; + for (int i = 0; i < EntityFXSnow.sprites.length; i++) { + EntityFXSnow.sprites[i] = event.map.registerSprite(new ResourceLocation("forestry:items/particles/snow." + (i + 1))); } } } diff --git a/src/main/java/forestry/plugins/PluginArboriculture.java b/src/main/java/forestry/plugins/PluginArboriculture.java index 3e1cff402..833bbf43a 100644 --- a/src/main/java/forestry/plugins/PluginArboriculture.java +++ b/src/main/java/forestry/plugins/PluginArboriculture.java @@ -19,21 +19,18 @@ import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.WeightedRandomChestContent; - +import net.minecraftforge.client.event.TextureStitchEvent; import net.minecraftforge.common.ChestGenHooks; import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.event.FuelBurnTimeEvent; +import net.minecraftforge.fml.common.IFuelHandler; +import net.minecraftforge.fml.common.SidedProxy; +import net.minecraftforge.fml.common.event.FMLInterModComms.IMCMessage; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.oredict.OreDictionary; -import cpw.mods.fml.common.IFuelHandler; -import cpw.mods.fml.common.SidedProxy; -import cpw.mods.fml.common.event.FMLInterModComms.IMCMessage; -import cpw.mods.fml.common.eventhandler.Event; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.registry.GameData; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.common.registry.VillagerRegistry; - import forestry.api.arboriculture.EnumGermlingType; import forestry.api.arboriculture.EnumWoodType; import forestry.api.arboriculture.TreeManager; @@ -43,9 +40,9 @@ import forestry.api.recipes.RecipeManagers; import forestry.api.storage.ICrateRegistry; import forestry.api.storage.StorageManager; import forestry.arboriculture.IWoodTyped; -import forestry.arboriculture.VillageHandlerArboriculture; import forestry.arboriculture.WoodItemAccess; import forestry.arboriculture.blocks.BlockArboricultureType; +import forestry.arboriculture.blocks.BlockFruitPod; import forestry.arboriculture.blocks.BlockRegistryArboriculture; import forestry.arboriculture.commands.CommandTree; import forestry.arboriculture.genetics.TreeBranchDefinition; @@ -54,19 +51,18 @@ import forestry.arboriculture.genetics.TreeFactory; import forestry.arboriculture.genetics.TreeHelper; import forestry.arboriculture.genetics.TreeMutationFactory; import forestry.arboriculture.genetics.TreekeepingMode; -import forestry.arboriculture.genetics.alleles.AlleleFruit; import forestry.arboriculture.genetics.alleles.AlleleGrowth; import forestry.arboriculture.genetics.alleles.AlleleLeafEffect; import forestry.arboriculture.items.ItemRegistryArboriculture; import forestry.arboriculture.network.PacketRegistryArboriculture; import forestry.arboriculture.proxy.ProxyArboriculture; +import forestry.arboriculture.render.TextureLeaves; import forestry.arboriculture.tiles.TileArboristChest; import forestry.arboriculture.tiles.TileFruitPod; import forestry.arboriculture.tiles.TileLeaves; import forestry.arboriculture.tiles.TileSapling; import forestry.arboriculture.tiles.TileWood; import forestry.core.blocks.BlockCoreType; -import forestry.core.config.Config; import forestry.core.config.Constants; import forestry.core.fluids.Fluids; import forestry.core.genetics.alleles.AllelePlantType; @@ -75,6 +71,7 @@ import forestry.core.network.IPacketRegistry; import forestry.core.proxy.Proxies; import forestry.core.recipes.RecipeUtil; import forestry.core.tiles.MachineDefinition; +import forestry.core.utils.ItemStackUtil; import forestry.factory.recipes.FabricatorRecipe; @Plugin(pluginID = "Arboriculture", name = "Arboriculture", author = "Binnie & SirSengir", url = Constants.URL, unlocalizedDescription = "for.plugin.arboriculture.description") @@ -84,10 +81,6 @@ public class PluginArboriculture extends ForestryPlugin { public static ProxyArboriculture proxy; public static String treekeepingMode = "NORMAL"; - public static int modelIdSaplings; - public static int modelIdLeaves; - public static int modelIdPods; - public static final List validFences = new ArrayList<>(); public static ItemRegistryArboriculture items; @@ -124,7 +117,6 @@ public class PluginArboriculture extends ForestryPlugin { public void preInit() { super.preInit(); - // register for FuelBurnTimeEvent MinecraftForge.EVENT_BUS.register(this); for (EnumWoodType woodType : EnumWoodType.VALUES) { @@ -147,13 +139,23 @@ public class PluginArboriculture extends ForestryPlugin { blocks.arboriculture.addDefinition(definitionChest); // Init rendering - proxy.initializeRendering(); + proxy.initializeModels(); // Register vanilla and forestry fence ids validFences.add(blocks.fences); validFences.add(blocks.fencesFireproof); - validFences.add(Blocks.fence); - validFences.add(Blocks.fence_gate); + validFences.add(Blocks.oak_fence); + validFences.add(Blocks.spruce_fence); + validFences.add(Blocks.birch_fence); + validFences.add(Blocks.jungle_fence); + validFences.add(Blocks.dark_oak_fence); + validFences.add(Blocks.acacia_fence); + validFences.add(Blocks.oak_fence_gate); + validFences.add(Blocks.spruce_fence_gate); + validFences.add(Blocks.birch_fence_gate); + validFences.add(Blocks.jungle_fence_gate); + validFences.add(Blocks.dark_oak_fence_gate); + validFences.add(Blocks.acacia_fence_gate); validFences.add(Blocks.nether_brick_fence); // Commands @@ -176,11 +178,11 @@ public class PluginArboriculture extends ForestryPlugin { blocks.arboriculture.init(); - if (Config.enableVillagers) { + /*if (Config.enableVillagers) { VillagerRegistry.instance().registerVillagerId(Constants.ID_VILLAGER_LUMBERJACK); Proxies.render.registerVillagerSkin(Constants.ID_VILLAGER_LUMBERJACK, Constants.TEXTURE_SKIN_LUMBERJACK); VillagerRegistry.instance().registerVillageTradeHandler(Constants.ID_VILLAGER_LUMBERJACK, new VillageHandlerArboriculture()); - } + }*/ } @Override @@ -345,7 +347,6 @@ public class PluginArboriculture extends ForestryPlugin { TreeBranchDefinition.createAlleles(); - AlleleFruit.createAlleles(); AlleleGrowth.createAlleles(); AlleleLeafEffect.createAlleles(); AllelePlantType.createAlleles(); @@ -380,7 +381,7 @@ public class PluginArboriculture extends ForestryPlugin { @Override public boolean processIMCMessage(IMCMessage message) { if (message.key.equals("add-fence-block") && message.isStringMessage()) { - Block block = GameData.getBlockRegistry().getRaw(message.getStringValue()); + Block block = ItemStackUtil.getBlockFromRegistry(message.getStringValue()); if (block != null && block != Blocks.air) { validFences.add(block); @@ -418,12 +419,30 @@ public class PluginArboriculture extends ForestryPlugin { if (items.sapling == item) { return 100; } + + Block block = Block.getBlockFromItem(item); + + if (block instanceof IWoodTyped) { + IWoodTyped woodTypedBlock = (IWoodTyped) block; + if (woodTypedBlock.isFireproof()) { + return 0; + } else if (blocks.slabs == block) { + return 150; + } + } return 0; } } - + @SubscribeEvent + @SideOnly(Side.CLIENT) + public void textureHook(TextureStitchEvent.Pre event) { + TextureLeaves.registerAllSprites(); + BlockFruitPod.registerSprites(); + } + + /*@SubscribeEvent public void fuelBurnTimeEvent(FuelBurnTimeEvent fuelBurnTimeEvent) { Item item = fuelBurnTimeEvent.fuel.getItem(); Block block = Block.getBlockFromItem(item); @@ -438,5 +457,5 @@ public class PluginArboriculture extends ForestryPlugin { fuelBurnTimeEvent.setResult(Event.Result.DENY); } } - } + }*/ } diff --git a/src/main/java/forestry/plugins/PluginCore.java b/src/main/java/forestry/plugins/PluginCore.java index 79c17a9a4..36a30f172 100644 --- a/src/main/java/forestry/plugins/PluginCore.java +++ b/src/main/java/forestry/plugins/PluginCore.java @@ -10,17 +10,20 @@ ******************************************************************************/ package forestry.plugins; -import java.util.ArrayList; +import java.util.List; import net.minecraft.command.ICommand; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; - +import net.minecraftforge.client.event.ModelBakeEvent; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.fml.common.IFuelHandler; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.oredict.OreDictionary; -import cpw.mods.fml.common.IFuelHandler; - import forestry.api.circuits.ChipsetManager; import forestry.api.core.ForestryAPI; import forestry.api.genetics.AlleleManager; @@ -52,8 +55,8 @@ import forestry.core.items.ItemRegistryCore; import forestry.core.multiblock.MultiblockLogicFactory; import forestry.core.network.IPacketRegistry; import forestry.core.network.PacketRegistryCore; -import forestry.core.proxy.Proxies; import forestry.core.recipes.RecipeUtil; +import forestry.core.render.model.RenderHandler; import forestry.core.tiles.MachineDefinition; import forestry.core.utils.ClimateUtil; import forestry.core.utils.ForestryModEnvWarningCallable; @@ -92,6 +95,8 @@ public class PluginCore extends ForestryPlugin { @Override public void preInit() { super.preInit(); + + MinecraftForge.EVENT_BUS.register(this); rootCommand.addChildCommand(new CommandVersion()); rootCommand.addChildCommand(new CommandPlugins()); @@ -106,8 +111,6 @@ public class PluginCore extends ForestryPlugin { public void doInit() { super.doInit(); - Proxies.render.init(); - blocks.core.init(); ForestryModEnvWarningCallable.register(); @@ -211,7 +214,7 @@ public class PluginCore extends ForestryPlugin { RecipeUtil.addRecipe(ForestryAPI.activeMode.getStackSetting("recipe.output.can"), " # ", "# #", '#', "ingotTin"); // / GEARS - ArrayList stoneGear = OreDictionary.getOres("gearStone"); + List stoneGear = OreDictionary.getOres("gearStone"); Object gearCenter; if (!stoneGear.isEmpty()) { gearCenter = "gearStone"; @@ -324,4 +327,10 @@ public class PluginCore extends ForestryPlugin { return 0; } } + + @SubscribeEvent + @SideOnly(Side.CLIENT) + public void onBakeModel(ModelBakeEvent event) { + RenderHandler.registerModels(event); + } } diff --git a/src/main/java/forestry/plugins/PluginEnergy.java b/src/main/java/forestry/plugins/PluginEnergy.java index 60e88b9bb..134210a16 100755 --- a/src/main/java/forestry/plugins/PluginEnergy.java +++ b/src/main/java/forestry/plugins/PluginEnergy.java @@ -12,9 +12,7 @@ package forestry.plugins; import net.minecraft.init.Blocks; import net.minecraft.init.Items; - -import cpw.mods.fml.common.SidedProxy; - +import net.minecraftforge.fml.common.SidedProxy; import forestry.api.core.ForestryAPI; import forestry.core.config.Constants; import forestry.core.recipes.RecipeUtil; diff --git a/src/main/java/forestry/plugins/PluginFarming.java b/src/main/java/forestry/plugins/PluginFarming.java index 086ab7ae3..327c24bea 100644 --- a/src/main/java/forestry/plugins/PluginFarming.java +++ b/src/main/java/forestry/plugins/PluginFarming.java @@ -22,12 +22,14 @@ import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; - -import cpw.mods.fml.common.SidedProxy; -import cpw.mods.fml.common.event.FMLInterModComms.IMCMessage; -import cpw.mods.fml.common.registry.GameData; -import cpw.mods.fml.common.registry.GameRegistry; - +import net.minecraftforge.client.event.TextureStitchEvent; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.fml.common.SidedProxy; +import net.minecraftforge.fml.common.event.FMLInterModComms.IMCMessage; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import forestry.api.circuits.ChipsetManager; import forestry.api.circuits.CircuitSocketType; import forestry.api.circuits.ICircuitLayout; @@ -38,9 +40,10 @@ import forestry.core.circuits.CircuitLayout; import forestry.core.config.Constants; import forestry.core.items.EnumElectronTube; import forestry.core.recipes.RecipeUtil; +import forestry.core.utils.ItemStackUtil; import forestry.core.utils.Log; -import forestry.farming.blocks.BlockFarmType; import forestry.farming.blocks.BlockRegistryFarming; +import forestry.farming.blocks.EnumBlockFarmType; import forestry.farming.circuits.CircuitFarmLogic; import forestry.farming.logic.FarmLogicArboreal; import forestry.farming.logic.FarmLogicCereal; @@ -87,6 +90,8 @@ public class PluginFarming extends ForestryPlugin { @Override public void preInit() { super.preInit(); + + MinecraftForge.EVENT_BUS.register(this); Farmables.farmables.put("farmArboreal", new ArrayList()); Farmables.farmables.get("farmArboreal").add(new FarmableVanillaSapling()); @@ -124,7 +129,7 @@ public class PluginFarming extends ForestryPlugin { Farmables.farmables.get("farmVegetables").add(new FarmableGenericCrop(new ItemStack(Items.potato), Blocks.potatoes, 7)); Farmables.farmables.get("farmVegetables").add(new FarmableGenericCrop(new ItemStack(Items.carrot), Blocks.carrots, 7)); - proxy.initializeRendering(); + proxy.initializeModels(); // Layouts ICircuitLayout layoutManaged = new CircuitLayout("farms.managed", CircuitSocketType.FARM); @@ -200,7 +205,7 @@ public class PluginFarming extends ForestryPlugin { String windfallMetaString = matchResult.group(4); try { - Block sapling = GameData.getBlockRegistry().getRaw(saplingString); + Block sapling = ItemStackUtil.getBlockFromRegistry(saplingString); if (sapling == null || sapling == Blocks.air) { throw new RuntimeException("can't find block for " + saplingString); } @@ -209,7 +214,7 @@ public class PluginFarming extends ForestryPlugin { if (windfallString == null) { farmables.add(new FarmableGenericSapling(sapling, saplingMeta)); } else { - Item windfall = GameData.getItemRegistry().getRaw(windfallString); + Item windfall = ItemStackUtil.getItemFromRegistry(windfallString); if (windfall == null) { throw new RuntimeException("can't find item for " + windfallString); } @@ -244,11 +249,11 @@ public class PluginFarming extends ForestryPlugin { } try { - Item seed = GameData.getItemRegistry().getRaw(items[0]); + Item seed = ItemStackUtil.getItemFromRegistry(items[0]); if (seed == null) { throw new RuntimeException("can't find item for " + items[0]); } - Block crop = GameData.getBlockRegistry().getRaw(items[2]); + Block crop = ItemStackUtil.getBlockFromRegistry(items[2]); if (crop == null || crop == Blocks.air) { throw new RuntimeException("can't find block for " + items[2]); } @@ -270,11 +275,11 @@ public class PluginFarming extends ForestryPlugin { @Override protected void registerRecipes() { - ItemStack basic = blocks.farm.get(BlockFarmType.BASIC, 1); - ItemStack gearbox = blocks.farm.get(BlockFarmType.GEARBOX, 1); - ItemStack hatch = blocks.farm.get(BlockFarmType.HATCH, 1); - ItemStack valve = blocks.farm.get(BlockFarmType.VALVE, 1); - ItemStack control = blocks.farm.get(BlockFarmType.CONTROL, 1); + ItemStack basic = blocks.farm.get(EnumBlockFarmType.BASIC, 1); + ItemStack gearbox = blocks.farm.get(EnumBlockFarmType.GEARBOX, 1); + ItemStack hatch = blocks.farm.get(EnumBlockFarmType.HATCH, 1); + ItemStack valve = blocks.farm.get(EnumBlockFarmType.VALVE, 1); + ItemStack control = blocks.farm.get(EnumBlockFarmType.CONTROL, 1); for (EnumFarmBlockTexture block : EnumFarmBlockTexture.values()) { NBTTagCompound compound = new NBTTagCompound(); @@ -343,4 +348,10 @@ public class PluginFarming extends ForestryPlugin { ChipsetManager.solderManager.addRecipe(layoutManual, PluginCore.items.tubes.get(EnumElectronTube.APATITE, 1), Circuit.farmShroomManual); ChipsetManager.solderManager.addRecipe(layoutManual, PluginCore.items.tubes.get(EnumElectronTube.LAPIS, 1), Circuit.farmCocoaManual); } + + @SubscribeEvent + @SideOnly(Side.CLIENT) + public void handleTextureRemap(TextureStitchEvent.Pre event) { + EnumFarmBlockTexture.registerSprites(); + } } diff --git a/src/main/java/forestry/plugins/PluginFluids.java b/src/main/java/forestry/plugins/PluginFluids.java index 1955d0c9f..48d742c95 100644 --- a/src/main/java/forestry/plugins/PluginFluids.java +++ b/src/main/java/forestry/plugins/PluginFluids.java @@ -19,19 +19,14 @@ import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.util.MovingObjectPosition; -import net.minecraftforge.client.event.TextureStitchEvent; +import net.minecraftforge.fml.common.eventhandler.Event; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.FillBucketEvent; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; - -import cpw.mods.fml.common.eventhandler.Event; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.registry.GameRegistry; import forestry.api.core.ForestryAPI; import forestry.api.fuels.FuelManager; import forestry.api.fuels.GeneratorFuel; @@ -44,6 +39,8 @@ import forestry.core.fluids.LiquidRegistryHelper; import forestry.core.items.EnumContainerType; import forestry.core.items.ItemLiquidContainer; import forestry.core.items.ItemRegistryFluids; +import forestry.core.proxy.Proxies; +import forestry.core.utils.BlockUtil; import forestry.core.utils.Log; import forestry.core.utils.StringUtil; @@ -58,7 +55,9 @@ public class PluginFluids extends ForestryPlugin { if (forestryFluid.getFluid() == null && Config.isFluidEnabled(forestryFluid)) { String fluidName = forestryFluid.getTag(); if (!FluidRegistry.isFluidRegistered(fluidName)) { - Fluid fluid = new Fluid(fluidName).setDensity(forestryFluid.getDensity()).setViscosity(forestryFluid.getViscosity()).setTemperature(forestryFluid.getTemperature()); + Fluid fluid = new Fluid(fluidName, + forestryFluid.getResources()[0], forestryFluid.flowTextureExists() ? forestryFluid.getResources()[1] + : forestryFluid.getResources()[0]).setDensity(forestryFluid.getDensity()).setViscosity(forestryFluid.getViscosity()).setTemperature(forestryFluid.getTemperature()); FluidRegistry.registerFluid(fluid); createBlock(forestryFluid); } @@ -73,9 +72,10 @@ public class PluginFluids extends ForestryPlugin { if (fluidBlock == null) { fluidBlock = forestryFluid.makeBlock(); if (fluidBlock != null) { - fluidBlock.setBlockName("forestry.fluid." + forestryFluid.getTag()); + fluidBlock.setUnlocalizedName("forestry.fluid." + forestryFluid.getTag()); GameRegistry.registerBlock(fluidBlock, ItemBlock.class, StringUtil.cleanBlockName(fluidBlock)); forestryFluidsWithBlocks.add(forestryFluid); + Proxies.render.registerFluidStateMapper(fluidBlock, forestryFluid); } } else { GameRegistry.UniqueIdentifier blockID = GameRegistry.findUniqueIdentifierFor(fluidBlock); @@ -97,7 +97,6 @@ public class PluginFluids extends ForestryPlugin { @Override public void preInit() { - MinecraftForge.EVENT_BUS.register(getTextureHook()); MinecraftForge.EVENT_BUS.register(getFillBucketHook()); } @@ -152,41 +151,18 @@ public class PluginFluids extends ForestryPlugin { } } - public static class TextureHook { - @SubscribeEvent - @SideOnly(Side.CLIENT) - public void textureHook(TextureStitchEvent.Post event) { - if (event.map.getTextureType() == 0) { - for (Fluids fluidType : forestryFluidsWithBlocks) { - Fluid fluid = fluidType.getFluid(); - Block fluidBlock = fluidType.getBlock(); - if (fluid != null && fluidBlock != null) { - fluid.setIcons(fluidBlock.getBlockTextureFromSide(1), fluidBlock.getBlockTextureFromSide(2)); - } - } - } - } - } - - private static Object getTextureHook() { - return new TextureHook(); - } - public static class FillBucketHook { @SubscribeEvent public void fillBucket(FillBucketEvent event) { MovingObjectPosition movingObjectPosition = event.target; - int x = movingObjectPosition.blockX; - int y = movingObjectPosition.blockY; - int z = movingObjectPosition.blockZ; - Block targetedBlock = event.world.getBlock(x, y, z); + Block targetedBlock = BlockUtil.getBlock(event.world, event.target.getBlockPos()); if (targetedBlock instanceof BlockForestryFluid) { Item filledBucket = ItemLiquidContainer.getExistingBucket(targetedBlock); if (filledBucket != null) { event.result = new ItemStack(filledBucket); event.setResult(Event.Result.ALLOW); if (!event.world.isRemote) { - event.world.setBlockToAir(x, y, z); + event.world.setBlockToAir(event.target.getBlockPos()); } } } diff --git a/src/main/java/forestry/plugins/PluginLepidopterology.java b/src/main/java/forestry/plugins/PluginLepidopterology.java index cdb258ecc..322683684 100755 --- a/src/main/java/forestry/plugins/PluginLepidopterology.java +++ b/src/main/java/forestry/plugins/PluginLepidopterology.java @@ -15,12 +15,15 @@ import java.util.EnumSet; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; - +import net.minecraftforge.client.event.TextureStitchEvent; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.fml.common.SidedProxy; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.RecipeSorter; -import cpw.mods.fml.common.SidedProxy; - import forestry.Forestry; import forestry.api.arboriculture.TreeManager; import forestry.api.genetics.AlleleManager; @@ -43,6 +46,7 @@ import forestry.lepidopterology.genetics.ButterflyDefinition; import forestry.lepidopterology.genetics.ButterflyFactory; import forestry.lepidopterology.genetics.ButterflyHelper; import forestry.lepidopterology.genetics.MothDefinition; +import forestry.lepidopterology.items.ItemButterflyGE; import forestry.lepidopterology.items.ItemRegistryLepidopterology; import forestry.lepidopterology.proxy.ProxyLepidopterology; import forestry.lepidopterology.recipes.MatingRecipe; @@ -78,6 +82,8 @@ public class PluginLepidopterology extends ForestryPlugin { @Override public void preInit() { + MinecraftForge.EVENT_BUS.register(this); + ButterflyBranchDefinition.createAlleles(); AlleleButterflyEffect.createAlleles(); @@ -144,4 +150,10 @@ public class PluginLepidopterology extends ForestryPlugin { public static boolean isPollinationAllowed() { return allowPollination; } + + @SubscribeEvent + @SideOnly(Side.CLIENT) + public void textureHook(TextureStitchEvent.Pre event) { + ItemButterflyGE.registerSprites(); + } } diff --git a/src/main/java/forestry/plugins/PluginMail.java b/src/main/java/forestry/plugins/PluginMail.java index b4d3d9b4f..44dc83f61 100755 --- a/src/main/java/forestry/plugins/PluginMail.java +++ b/src/main/java/forestry/plugins/PluginMail.java @@ -12,9 +12,7 @@ package forestry.plugins; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; - -import cpw.mods.fml.common.FMLCommonHandler; - +import net.minecraftforge.fml.common.FMLCommonHandler; import forestry.api.mail.EnumAddressee; import forestry.api.mail.PostManager; import forestry.api.recipes.RecipeManagers; diff --git a/src/main/java/forestry/plugins/PluginManager.java b/src/main/java/forestry/plugins/PluginManager.java index 4561527f1..686398abb 100644 --- a/src/main/java/forestry/plugins/PluginManager.java +++ b/src/main/java/forestry/plugins/PluginManager.java @@ -31,36 +31,22 @@ import net.minecraft.world.chunk.IChunkProvider; import net.minecraftforge.common.config.Configuration; import net.minecraftforge.common.config.Property; - -import cpw.mods.fml.common.IFuelHandler; -import cpw.mods.fml.common.event.FMLInterModComms; -import cpw.mods.fml.common.registry.GameRegistry; - +import net.minecraftforge.fml.common.IFuelHandler; +import net.minecraftforge.fml.common.event.FMLInterModComms; +import net.minecraftforge.fml.common.registry.GameRegistry; import forestry.Forestry; import forestry.api.core.ForestryAPI; import forestry.core.IPickupHandler; import forestry.core.IResupplyHandler; import forestry.core.ISaveEventHandler; import forestry.core.utils.Log; -import forestry.plugins.compat.PluginAgriCraft; import forestry.plugins.compat.PluginBiomesOPlenty; import forestry.plugins.compat.PluginBuildCraftFuels; import forestry.plugins.compat.PluginBuildCraftRecipes; import forestry.plugins.compat.PluginBuildCraftStatements; import forestry.plugins.compat.PluginBuildCraftTransport; import forestry.plugins.compat.PluginChisel; -import forestry.plugins.compat.PluginEnderIO; -import forestry.plugins.compat.PluginErebus; -import forestry.plugins.compat.PluginExtraUtilities; -import forestry.plugins.compat.PluginGrowthCraft; -import forestry.plugins.compat.PluginHarvestCraft; -import forestry.plugins.compat.PluginIC2; -import forestry.plugins.compat.PluginImmersiveEngineering; -import forestry.plugins.compat.PluginMagicalCrops; import forestry.plugins.compat.PluginNatura; -import forestry.plugins.compat.PluginPlantMegaPack; -import forestry.plugins.compat.PluginRotaryCraft; -import forestry.plugins.compat.PluginWitchery; public class PluginManager { @@ -104,21 +90,21 @@ public class PluginManager { BUILDCRAFT_STATEMENTS(new PluginBuildCraftStatements()), BUILDCRAFT_TRANSPORT(new PluginBuildCraftTransport()), - AGRICRAFT(new PluginAgriCraft()), + //AGRICRAFT(new PluginAgriCraft()), BIOMESOPLENTY(new PluginBiomesOPlenty()), CHISEL(new PluginChisel()), - ENDERIO(new PluginEnderIO()), + /*ENDERIO(new PluginEnderIO()), EREBUS(new PluginErebus()), EXTRAUTILITIES(new PluginExtraUtilities()), GROWTHCRAFT(new PluginGrowthCraft()), HARVESTCRAFT(new PluginHarvestCraft()), IMMERSIVEENGINEERING(new PluginImmersiveEngineering()), INDUSTRIALCRAFT(new PluginIC2()), - MAGICALCROPS(new PluginMagicalCrops()), + MAGICALCROPS(new PluginMagicalCrops()),*/ NATURA(new PluginNatura()), - PLANTMEGAPACK(new PluginPlantMegaPack()), + /*PLANTMEGAPACK(new PluginPlantMegaPack()), ROTARYCRAFT(new PluginRotaryCraft()), - WITCHERY(new PluginWitchery()); + WITCHERY(new PluginWitchery())*/; static { ForestryAPI.enabledPlugins = new HashSet<>(); diff --git a/src/main/java/forestry/plugins/PluginStorage.java b/src/main/java/forestry/plugins/PluginStorage.java index 96b24d4ed..d9091cc69 100755 --- a/src/main/java/forestry/plugins/PluginStorage.java +++ b/src/main/java/forestry/plugins/PluginStorage.java @@ -40,16 +40,14 @@ import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemDoor; import net.minecraft.item.ItemStack; - import net.minecraftforge.common.IPlantable; import net.minecraftforge.common.IShearable; import net.minecraftforge.common.config.Property; import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fml.common.SidedProxy; +import net.minecraftforge.fml.common.event.FMLInterModComms.IMCMessage; import net.minecraftforge.oredict.OreDictionary; -import cpw.mods.fml.common.SidedProxy; -import cpw.mods.fml.common.event.FMLInterModComms.IMCMessage; - import forestry.Forestry; import forestry.api.recipes.RecipeManagers; import forestry.api.storage.BackpackManager; @@ -83,7 +81,7 @@ public class PluginStorage extends ForestryPlugin { private static final List crates = new ArrayList<>(); private static final String CONFIG_CATEGORY = "backpacks"; - + @SidedProxy(clientSide = "forestry.storage.proxy.ProxyStorageClient", serverSide = "forestry.storage.proxy.ProxyStorage") public static ProxyStorage proxy; private final ArrayList minerItems = new ArrayList<>(); @@ -142,6 +140,8 @@ public class PluginStorage extends ForestryPlugin { definition = new BackpackDefinition("builder", new Color(0xdd3a3a).getRGB()); BackpackManager.definitions.put(definition.getKey(), definition); + + proxy.registerCrateModelLoader(); } @Override @@ -347,7 +347,7 @@ public class PluginStorage extends ForestryPlugin { new ItemStack(Items.magma_cream), new ItemStack(Items.speckled_melon), new ItemStack(Items.fish), - new ItemStack(Items.cooked_fished), + new ItemStack(Items.cooked_fish), new ItemStack(Items.lead), new ItemStack(Items.fishing_rod), new ItemStack(Items.name_tag), @@ -435,7 +435,6 @@ public class PluginStorage extends ForestryPlugin { } public static void registerCrate(ItemCrated crate) { - proxy.registerCrateForRendering(crate); crates.add(crate); } diff --git a/src/main/java/forestry/plugins/compat/PluginAgriCraft.java b/src/main/java/forestry/plugins/compat/PluginAgriCraft.java deleted file mode 100644 index 718597748..000000000 --- a/src/main/java/forestry/plugins/compat/PluginAgriCraft.java +++ /dev/null @@ -1,100 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v3 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: - * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges - ******************************************************************************/ -package forestry.plugins.compat; - -import com.google.common.collect.ImmutableList; - -import net.minecraft.block.Block; -import net.minecraft.item.ItemStack; - -import cpw.mods.fml.common.registry.GameRegistry; - -import forestry.api.core.ForestryAPI; -import forestry.api.farming.Farmables; -import forestry.api.recipes.RecipeManagers; -import forestry.core.config.Constants; -import forestry.core.fluids.Fluids; -import forestry.core.utils.ModUtil; -import forestry.farming.logic.FarmableBasicAgricraft; -import forestry.plugins.ForestryPlugin; -import forestry.plugins.Plugin; -import forestry.plugins.PluginManager; - -@Plugin(pluginID = "AgriCraft", name = "AgriCraft", author = "Nirek", url = Constants.URL, unlocalizedDescription = "for.plugin.agricraft.description") -public class PluginAgriCraft extends ForestryPlugin { - - private static final String AgriCraft = "AgriCraft"; - - @Override - public boolean isAvailable() { - return ModUtil.isModLoaded(AgriCraft); - } - - @Override - public String getFailMessage() { - return "AgriCraft not found"; - } - - @Override - protected void registerRecipes() { - - ImmutableList seeds = ImmutableList.of( - "Allium", //Vanilla - "Dandelion", - "Daisy", - "TulipRed", - "TulipPink", - "TulipOrange", - "TulipWhite", - "Sugarcane", - "Cactus", - "Carrot", - "Potato", - "Poppy", - "Orchid", - "ShroomRed", - "ShroomBrown", - - "BotaniaCyan", //Botania - "BotaniaLime", - "BotaniaRed", - "BotaniaLightGray", - "BotaniaOrange", - "BotaniaBlack", - "BotaniaLightBlue", - "BotaniaPink", - "BotaniaWhite", - "BotaniaGreen", - "BotaniaYellow", - "BotaniaMagenta", - "BotaniaBrown", - "BotaniaPurple", - "BotaniaBlue", - "BotaniaGray" - - - ); - int seedamount = ForestryAPI.activeMode.getIntegerSetting("squeezer.liquid.seed"); - for (String seedName : seeds) { - ItemStack seed = GameRegistry.findItemStack(AgriCraft, "seed" + seedName, 1); - if (seed != null) { - RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{seed}, Fluids.SEEDOIL.getFluid(seedamount)); - } - } - - Block cropBlock = GameRegistry.findBlock(AgriCraft, "crops"); - if (cropBlock != null && PluginManager.Module.FARMING.isEnabled()) { - Farmables.farmables.get("farmOrchard").add(new FarmableBasicAgricraft(cropBlock, 7)); - } - } - -} - diff --git a/src/main/java/forestry/plugins/compat/PluginBiomesOPlenty.java b/src/main/java/forestry/plugins/compat/PluginBiomesOPlenty.java index e0fc2b4bc..d1287af8d 100644 --- a/src/main/java/forestry/plugins/compat/PluginBiomesOPlenty.java +++ b/src/main/java/forestry/plugins/compat/PluginBiomesOPlenty.java @@ -16,13 +16,10 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; - +import net.minecraftforge.fml.common.event.FMLInterModComms; +import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.oredict.OreDictionary; -import cpw.mods.fml.common.event.FMLInterModComms; -import cpw.mods.fml.common.registry.GameData; -import cpw.mods.fml.common.registry.GameRegistry; - import forestry.api.apiculture.FlowerManager; import forestry.api.core.ForestryAPI; import forestry.api.farming.Farmables; @@ -31,6 +28,7 @@ import forestry.api.storage.BackpackManager; import forestry.core.config.Constants; import forestry.core.fluids.Fluids; import forestry.core.recipes.RecipeUtil; +import forestry.core.utils.ItemStackUtil; import forestry.core.utils.Log; import forestry.core.utils.ModUtil; import forestry.farming.logic.FarmableBasicFruit; @@ -95,7 +93,7 @@ public class PluginBiomesOPlenty extends ForestryPlugin { for (String key : saplingItemKeys) { Item saplingItem = GameRegistry.findItem(BoP, key); - String saplingName = GameData.getItemRegistry().getNameForObject(saplingItem); + String saplingName = ItemStackUtil.getItemNameFromRegistryAsSting(saplingItem); FMLInterModComms.sendMessage(Constants.MOD, "add-farmable-sapling", String.format("farmArboreal@%s.-1", saplingName)); } diff --git a/src/main/java/forestry/plugins/compat/PluginBuildCraftFuels.java b/src/main/java/forestry/plugins/compat/PluginBuildCraftFuels.java index 53e173d28..b81b41353 100644 --- a/src/main/java/forestry/plugins/compat/PluginBuildCraftFuels.java +++ b/src/main/java/forestry/plugins/compat/PluginBuildCraftFuels.java @@ -12,13 +12,12 @@ package forestry.plugins.compat; import net.minecraftforge.fluids.Fluid; -import cpw.mods.fml.common.Optional; - import forestry.api.core.ForestryAPI; import forestry.core.config.Constants; import forestry.core.fluids.Fluids; import forestry.core.utils.ModUtil; import forestry.plugins.ForestryPlugin; +import net.minecraftforge.fml.common.Optional; import forestry.plugins.Plugin; import buildcraft.api.fuels.BuildcraftFuelRegistry; diff --git a/src/main/java/forestry/plugins/compat/PluginBuildCraftRecipes.java b/src/main/java/forestry/plugins/compat/PluginBuildCraftRecipes.java index cb4986e85..82f55e1ad 100644 --- a/src/main/java/forestry/plugins/compat/PluginBuildCraftRecipes.java +++ b/src/main/java/forestry/plugins/compat/PluginBuildCraftRecipes.java @@ -10,13 +10,12 @@ ******************************************************************************/ package forestry.plugins.compat; -import cpw.mods.fml.common.Optional; - import forestry.core.config.Constants; import forestry.core.fluids.Fluids; import forestry.core.utils.ModUtil; import forestry.plugins.ForestryPlugin; import forestry.plugins.Plugin; +import net.minecraftforge.fml.common.Optional; import buildcraft.api.recipes.BuildcraftRecipeRegistry; diff --git a/src/main/java/forestry/plugins/compat/PluginBuildCraftStatements.java b/src/main/java/forestry/plugins/compat/PluginBuildCraftStatements.java index 86c440d0d..18f3d7e74 100644 --- a/src/main/java/forestry/plugins/compat/PluginBuildCraftStatements.java +++ b/src/main/java/forestry/plugins/compat/PluginBuildCraftStatements.java @@ -13,11 +13,8 @@ package forestry.plugins.compat; import java.util.Collection; import net.minecraft.tileentity.TileEntity; - -import net.minecraftforge.common.util.ForgeDirection; - -import cpw.mods.fml.common.Optional; - +import net.minecraft.util.EnumFacing; +import net.minecraftforge.fml.common.Optional; import forestry.core.config.Constants; import forestry.core.utils.ModUtil; import forestry.plugins.ForestryPlugin; @@ -65,7 +62,7 @@ public class PluginBuildCraftStatements extends ForestryPlugin implements ITrigg @Optional.Method(modid = "BuildCraftAPI|statements") @Override - public Collection getExternalTriggers(ForgeDirection side, TileEntity tile) { + public Collection getExternalTriggers(EnumFacing side, TileEntity tile) { if (tile instanceof ITriggerProvider) { return ((ITriggerProvider) tile).getExternalTriggers(side, tile); } diff --git a/src/main/java/forestry/plugins/compat/PluginBuildCraftTransport.java b/src/main/java/forestry/plugins/compat/PluginBuildCraftTransport.java index 9e2acd049..cae30fb4b 100644 --- a/src/main/java/forestry/plugins/compat/PluginBuildCraftTransport.java +++ b/src/main/java/forestry/plugins/compat/PluginBuildCraftTransport.java @@ -12,9 +12,7 @@ package forestry.plugins.compat; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; - -import cpw.mods.fml.common.registry.GameRegistry; - +import net.minecraftforge.fml.common.registry.GameRegistry; import forestry.core.config.Constants; import forestry.core.recipes.RecipeUtil; import forestry.core.utils.Log; diff --git a/src/main/java/forestry/plugins/compat/PluginChisel.java b/src/main/java/forestry/plugins/compat/PluginChisel.java index 6370d7de1..0574a5c2d 100644 --- a/src/main/java/forestry/plugins/compat/PluginChisel.java +++ b/src/main/java/forestry/plugins/compat/PluginChisel.java @@ -12,12 +12,11 @@ package forestry.plugins.compat; import com.google.common.collect.ImmutableList; -import cpw.mods.fml.common.event.FMLInterModComms; - import forestry.core.config.Constants; import forestry.core.utils.ModUtil; import forestry.plugins.ForestryPlugin; import forestry.plugins.Plugin; +import net.minecraftforge.fml.common.event.FMLInterModComms; @Plugin(pluginID = "Chisel", name = "Chisel", author = "Nirek", url = Constants.URL, unlocalizedDescription = "for.plugin.chisel.description") public class PluginChisel extends ForestryPlugin { diff --git a/src/main/java/forestry/plugins/compat/PluginEnderIO.java b/src/main/java/forestry/plugins/compat/PluginEnderIO.java deleted file mode 100644 index 23e8a6515..000000000 --- a/src/main/java/forestry/plugins/compat/PluginEnderIO.java +++ /dev/null @@ -1,72 +0,0 @@ -package forestry.plugins.compat; - -import net.minecraft.nbt.NBTTagCompound; - -import net.minecraftforge.fluids.Fluid; - -import cpw.mods.fml.common.event.FMLInterModComms; - -import forestry.api.core.ForestryAPI; -import forestry.core.config.Constants; -import forestry.core.fluids.Fluids; -import forestry.core.utils.ModUtil; -import forestry.plugins.ForestryPlugin; -import forestry.plugins.Plugin; - -@Plugin(pluginID = "EnderIO", name = "EnderIO", author = "mezz", url = Constants.URL, unlocalizedDescription = "for.plugin.enderIO.description") -public class PluginEnderIO extends ForestryPlugin { - - private static final String EnderIO = "EnderIO"; - - private static final String FLUID_FUEL_ADD = "fluidFuel:add"; - private static final String FLUID_COOLANT_ADD = "fluidCoolant:add"; - - private static final String KEY_FLUID_NAME = "fluidName"; - private static final String KEY_POWER_PER_CYCLE = "powerPerCycle"; - private static final String KEY_TOTAL_BURN_TIME = "totalBurnTime"; - private static final String KEY_COOLING_PER_MB = "coolingPerMb"; - - private static final float WATER_COOLING_PER_MB = 0.0023f; - - @Override - public boolean isAvailable() { - return ModUtil.isModLoaded(EnderIO); - } - - @Override - public String getFailMessage() { - return "EnderIO not found"; - } - - @Override - public void doInit() { - Fluid ethanol = Fluids.ETHANOL.getFluid(); - if (ethanol != null) { - int ethanolBurnTime = Math.round(Constants.ENGINE_CYCLE_DURATION_ETHANOL * ForestryAPI.activeMode.getFloatSetting("fuel.ethanol.combustion")); - addFuel(ethanol, 40, ethanolBurnTime); - } - - Fluid crushedIce = Fluids.ICE.getFluid(); - if (crushedIce != null) { - addCoolant(crushedIce, Constants.ICE_COOLING_MULTIPLIER); - } - } - - private static void addFuel(Fluid fluid, int powerPerCycle, int totalBurnTime) { - NBTTagCompound fuelTag = new NBTTagCompound(); - fuelTag.setString(KEY_FLUID_NAME, fluid.getName()); - fuelTag.setInteger(KEY_POWER_PER_CYCLE, powerPerCycle); - fuelTag.setInteger(KEY_TOTAL_BURN_TIME, totalBurnTime); - - FMLInterModComms.sendMessage(EnderIO, FLUID_FUEL_ADD, fuelTag); - } - - private static void addCoolant(Fluid fluid, float coolingMultiplier) { - float coolingPerMb = coolingMultiplier * WATER_COOLING_PER_MB; - NBTTagCompound coolantTag = new NBTTagCompound(); - coolantTag.setString(KEY_FLUID_NAME, fluid.getName()); - coolantTag.setFloat(KEY_COOLING_PER_MB, coolingPerMb); - - FMLInterModComms.sendMessage(EnderIO, FLUID_COOLANT_ADD, coolantTag); - } -} diff --git a/src/main/java/forestry/plugins/compat/PluginErebus.java b/src/main/java/forestry/plugins/compat/PluginErebus.java deleted file mode 100644 index aca378563..000000000 --- a/src/main/java/forestry/plugins/compat/PluginErebus.java +++ /dev/null @@ -1,59 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v3 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: - * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges - ******************************************************************************/ -package forestry.plugins.compat; - -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; - -import net.minecraftforge.fluids.FluidStack; - -import cpw.mods.fml.common.registry.GameRegistry; - -import forestry.api.recipes.RecipeManagers; -import forestry.apiculture.items.EnumPropolis; -import forestry.core.config.Constants; -import forestry.core.fluids.Fluids; -import forestry.core.utils.ModUtil; -import forestry.plugins.ForestryPlugin; -import forestry.plugins.Plugin; -import forestry.plugins.PluginApiculture; -import forestry.plugins.PluginManager; - -@Plugin(pluginID = "Erebus", name = "Erebus", author = "Nirek", url = Constants.URL, unlocalizedDescription = "for.plugin.erebus.description") -public class PluginErebus extends ForestryPlugin { - - private static final String EREBUS = "erebus"; - - @Override - public boolean isAvailable() { - return ModUtil.isModLoaded(EREBUS); - } - - @Override - public String getFailMessage() { - return "Erebus not found"; - } - - @Override - protected void registerRecipes() { - super.registerRecipes(); - Item materials = GameRegistry.findItem(EREBUS, "materials"); - ItemStack honeyDrip = new ItemStack(materials, 1, 21); - FluidStack honeyOutput = Fluids.HONEY.getFluid(Constants.FLUID_PER_HONEY_DROP); - if (PluginManager.Module.FACTORY.isEnabled()) { - ItemStack remnants = null; - if (PluginManager.Module.APICULTURE.isEnabled()) { - remnants = PluginApiculture.items.propolis.get(EnumPropolis.NORMAL, 1); - } - RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{honeyDrip}, honeyOutput, remnants, 5); - } - } -} diff --git a/src/main/java/forestry/plugins/compat/PluginExtraUtilities.java b/src/main/java/forestry/plugins/compat/PluginExtraUtilities.java deleted file mode 100644 index ec8cff7a1..000000000 --- a/src/main/java/forestry/plugins/compat/PluginExtraUtilities.java +++ /dev/null @@ -1,73 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v3 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: - * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges - ******************************************************************************/ -package forestry.plugins.compat; - -import java.util.ArrayList; - -import net.minecraft.block.Block; -import net.minecraft.item.ItemStack; - -import cpw.mods.fml.common.registry.GameRegistry; - -import forestry.api.circuits.ChipsetManager; -import forestry.api.circuits.ICircuitLayout; -import forestry.api.farming.Farmables; -import forestry.api.farming.IFarmable; -import forestry.core.circuits.Circuit; -import forestry.core.config.Config; -import forestry.core.config.Constants; -import forestry.core.items.EnumElectronTube; -import forestry.core.utils.ModUtil; -import forestry.farming.circuits.CircuitFarmLogic; -import forestry.farming.logic.FarmLogicEnder; -import forestry.farming.logic.FarmableGenericCrop; -import forestry.plugins.ForestryPlugin; -import forestry.plugins.Plugin; -import forestry.plugins.PluginCore; -import forestry.plugins.PluginManager; - -@Plugin(pluginID = "ExtraUtilities", name = "ExtraUtilities", author = "Nirek", url = Constants.URL, unlocalizedDescription = "for.plugin.extrautilities.description") -public class PluginExtraUtilities extends ForestryPlugin { - - private static final String ExU = "ExtraUtilities"; - - @Override - public boolean isAvailable() { - return ModUtil.isModLoaded(ExU); - } - - @Override - public String getFailMessage() { - return "ExtraUtilities not found"; - } - - @Override - public void doInit() { - super.doInit(); - - Block exUEnderLilly = GameRegistry.findBlock(ExU, "plant/ender_lilly"); - Farmables.farmables.put("farmEnder", new ArrayList()); - if (Config.isExUtilEnderLilyEnabled()) { - Circuit.farmEnderManaged = new CircuitFarmLogic("managedEnder", FarmLogicEnder.class); - Farmables.farmables.get("farmEnder").add(new FarmableGenericCrop(new ItemStack(exUEnderLilly, 1, 0), exUEnderLilly, 7)); - } - } - - @Override - protected void registerRecipes() { - super.registerRecipes(); - - if (PluginManager.Module.FARMING.isEnabled() && Config.isExUtilEnderLilyEnabled()) { - ICircuitLayout layoutManaged = ChipsetManager.circuitRegistry.getLayout("forestry.farms.managed"); - ChipsetManager.solderManager.addRecipe(layoutManaged, PluginCore.items.tubes.get(EnumElectronTube.ENDER, 1), Circuit.farmEnderManaged); - } - } -} diff --git a/src/main/java/forestry/plugins/compat/PluginGrowthCraft.java b/src/main/java/forestry/plugins/compat/PluginGrowthCraft.java deleted file mode 100644 index 012a1477b..000000000 --- a/src/main/java/forestry/plugins/compat/PluginGrowthCraft.java +++ /dev/null @@ -1,142 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v3 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: - * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges - ******************************************************************************/ -package forestry.plugins.compat; - -import com.google.common.collect.ImmutableMap; - -import net.minecraft.block.Block; -import net.minecraft.item.ItemStack; - -import cpw.mods.fml.common.registry.GameRegistry; - -import forestry.api.core.ForestryAPI; -import forestry.api.farming.Farmables; -import forestry.api.recipes.RecipeManagers; -import forestry.api.storage.BackpackManager; -import forestry.core.config.Constants; -import forestry.core.fluids.Fluids; -import forestry.core.recipes.RecipeUtil; -import forestry.core.utils.ModUtil; -import forestry.farming.logic.FarmableBasicGrowthCraft; -import forestry.plugins.ForestryPlugin; -import forestry.plugins.Plugin; -import forestry.plugins.PluginApiculture; -import forestry.plugins.PluginCore; -import forestry.plugins.PluginManager; - -@Plugin(pluginID = "Growthcraft", name = "Growthcraft", author = "Nirek", url = Constants.URL, unlocalizedDescription = "for.plugin.growthcraft.description") -public class PluginGrowthCraft extends ForestryPlugin { - - private static final String GC = "Growthcraft"; - - @Override - public boolean isAvailable() { - return ModUtil.isModLoaded(GC); - } - - @Override - public String getFailMessage() { - return "GrowthCraft not found"; - } - - @Override - protected void registerRecipes() { - - int saplingYield = ForestryAPI.activeMode.getIntegerSetting("fermenter.yield.sapling"); - int juiceAmount = ForestryAPI.activeMode.getIntegerSetting("squeezer.liquid.apple"); - int seedamount = ForestryAPI.activeMode.getIntegerSetting("squeezer.liquid.seed"); - - ItemStack appleSeed = GameRegistry.findItemStack("Growthcraft|Apples", "grc.appleSeeds", 1); - ItemStack grapeSeed = GameRegistry.findItemStack("Growthcraft|Grapes", "grc.grapeSeeds", 1); - ItemStack hopSeed = GameRegistry.findItemStack("Growthcraft|Hops", "grc.hopSeeds", 1); - ItemStack riceSeed = GameRegistry.findItemStack("Growthcraft|Rice", "grc.rice", 1); - - if (appleSeed != null) { - RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{appleSeed}, Fluids.SEEDOIL.getFluid(seedamount)); - BackpackManager.backpackItems[2].add(appleSeed); - } - if (grapeSeed != null) { - RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{grapeSeed}, Fluids.SEEDOIL.getFluid(seedamount)); - BackpackManager.backpackItems[2].add(grapeSeed); - } - if (hopSeed != null) { - RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{hopSeed}, Fluids.SEEDOIL.getFluid(seedamount)); - BackpackManager.backpackItems[2].add(hopSeed); - } - if (riceSeed != null) { - RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{riceSeed}, Fluids.SEEDOIL.getFluid(seedamount)); - BackpackManager.backpackItems[2].add(riceSeed); - } - - ItemStack hops = GameRegistry.findItemStack("Growthcraft|Hops", "grc.hops", 1); - - if (hops != null) { - RecipeUtil.addFermenterRecipes(hops, saplingYield, Fluids.BIOMASS); - BackpackManager.backpackItems[2].add(hops); - - } - Block hopVine = GameRegistry.findBlock("Growthcraft|Hops", "grc.hopVine"); - if (hopVine != null) { - Farmables.farmables.get("farmOrchard").add(new FarmableBasicGrowthCraft(hopVine, 3, false, false)); // need custom fruit to weed out rope - } - Block riceBlock = GameRegistry.findBlock("Growthcraft|Rice", "grc.riceBlock"); - if (riceBlock != null) { - Farmables.farmables.get("farmOrchard").add(new FarmableBasicGrowthCraft(riceBlock, 7, true, false)); //need to set paddyfield to 7 - } - - ItemStack emptyComb = new ItemStack(GameRegistry.findItem("Growthcraft|Bees", "grc.honeyComb"), 1, 0); - RecipeManagers.centrifugeManager.addRecipe(20, emptyComb, ImmutableMap.of( - PluginCore.items.beeswax.getItemStack(), 1.0f) - ); - - if (PluginManager.Module.APICULTURE.isEnabled()) { - ItemStack fullComb = new ItemStack(GameRegistry.findItem("Growthcraft|Bees", "grc.honeyComb"), 1, 1); - RecipeManagers.centrifugeManager.addRecipe(20, fullComb, ImmutableMap.of( - PluginCore.items.beeswax.getItemStack(), 1.0f, - PluginApiculture.items.honeyDrop.getItemStack(), 0.9f, - PluginApiculture.items.honeydew.getItemStack(), 0.1f) - ); - } - - ItemStack bamboo = GameRegistry.findItemStack("Growthcraft|Bamboo", "grc.bamboo", 1); - ItemStack bambooShoot = GameRegistry.findItemStack("Growthcraft|Bamboo", "grc.bambooShoot", 1); - ItemStack bambooShootFood = GameRegistry.findItemStack("Growthcraft|Bamboo", "grc.bambooShootFood", 1); - if (bamboo != null) { - RecipeUtil.addFermenterRecipes(bamboo, saplingYield, Fluids.BIOMASS); - BackpackManager.backpackItems[2].add(bamboo); - } - if (bambooShoot != null) { - RecipeUtil.addFermenterRecipes(bambooShoot, saplingYield, Fluids.BIOMASS); - BackpackManager.backpackItems[2].add(bambooShoot); - } - if (bambooShootFood != null) { - RecipeUtil.addFermenterRecipes(bambooShootFood, saplingYield, Fluids.BIOMASS); - BackpackManager.backpackItems[2].add(bambooShootFood); - } - - ItemStack grapes = GameRegistry.findItemStack("Growthcraft|Grapes", "grc.grapes", 1); //squeeze - - if (grapes != null) { - RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{grapes}, Fluids.JUICE.getFluid(juiceAmount)); - BackpackManager.backpackItems[2].add(grapes); - } - Block grapeBlock = GameRegistry.findBlock("Growthcraft|Grapes", "grc.grapeBlock"); - if (grapeBlock != null) { - Farmables.farmables.get("farmOrchard").add(new FarmableBasicGrowthCraft(grapeBlock, 0, false, true)); - } - - ItemStack bambooLeaves = GameRegistry.findItemStack("Growthcraft|Bamboo", "grc.bambooLeaves", 1); - if (bambooLeaves != null) { - BackpackManager.backpackItems[2].add(bambooLeaves); - } - - } -} diff --git a/src/main/java/forestry/plugins/compat/PluginHarvestCraft.java b/src/main/java/forestry/plugins/compat/PluginHarvestCraft.java deleted file mode 100644 index 5cf44a59a..000000000 --- a/src/main/java/forestry/plugins/compat/PluginHarvestCraft.java +++ /dev/null @@ -1,365 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v3 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: - * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges - ******************************************************************************/ -package forestry.plugins.compat; - -import com.google.common.collect.ImmutableList; - -import net.minecraft.block.Block; -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; - -import cpw.mods.fml.common.registry.GameRegistry; - -import forestry.api.core.ForestryAPI; -import forestry.api.farming.Farmables; -import forestry.api.fuels.FuelManager; -import forestry.api.fuels.MoistenerFuel; -import forestry.api.recipes.RecipeManagers; -import forestry.core.config.Constants; -import forestry.core.fluids.Fluids; -import forestry.core.recipes.RecipeUtil; -import forestry.core.utils.ModUtil; -import forestry.farming.logic.FarmableBasicFruit; -import forestry.farming.logic.FarmableGenericCrop; -import forestry.plugins.ForestryPlugin; -import forestry.plugins.Plugin; -import forestry.plugins.PluginCore; - -@Plugin(pluginID = "HarvestCraft", name = "HarvestCraft", author = "Nirek", url = Constants.URL, unlocalizedDescription = "for.plugin.harvestcraft.description") -public class PluginHarvestCraft extends ForestryPlugin { - - private static final String HC = "harvestcraft"; - - @Override - public boolean isAvailable() { - return ModUtil.isModLoaded(HC); - } - - @Override - public String getFailMessage() { - return "HarvestCraft not found"; - } - - @Override - protected void registerRecipes() { - - ImmutableList berries = ImmutableList.of( - "cranberry", - "blackberry", - "blueberry", - "raspberry", - "strawberry" - ); - - ImmutableList fruits = ImmutableList.of( - "pineapple", - "cactusfruit", - "cantaloupe", - "grape", - "kiwi", - "chilipepper" - ); - - ImmutableList treeFruits = ImmutableList.of( - "banana", - "dragonfruit", - "lemon", - "lime", - "mango", - "orange", - "papaya", - "peach", - "pear", - "plum", - "pomegranate", - "starfruit", - "apricot", - "date", - "fig", - "grapefruit", - "persimmon", - "avocado", - "coconut", - "durian" - ); - - ImmutableList trees = ImmutableList.of( - "nutmeg", - "olive", - "peppercorn" - ); - - ImmutableList treesSpecial = ImmutableList.of( - "cinnamon", - "maple", - "paperbark", - "vanillabean", - "apple" // to prevent apples from getting double registered - ); - - ImmutableList herbs = ImmutableList.of( - "garlic" - ); - - ImmutableList spices = ImmutableList.of( - "ginger", - "spiceleaf" - //"mustardseed" Mustard is inconsistent and annoying. - ); - - ImmutableList vegetables = ImmutableList.of( - "asparagus", - "bean", - "beet", - "broccoli", - "cauliflower", - "celery", - "leek", - "lettuce", - "onion", - "parsnip", - "radish", - "rutabaga", - "scallion", - "soybean", - "sweetpotato", - "turnip", - "whitemushroom", - "artichoke", - "bellpepper", - "brusselsprout", - "cabbage", - "corn", - "cucumber", - "eggplant", - "okra", - "peas", - "rhubarb", - "seaweed", - "tomato", - "wintersquash", - "zucchini", - "bambooshoot", - "spinach" - ); - - ImmutableList grains = ImmutableList.of( - "barley", - "oats", - "rye" - ); - - ImmutableList cropNuts = ImmutableList.of( - "peanut" - ); - - ImmutableList nuts = ImmutableList.of( - "walnut", - "almond", - "cashew", - "chestnut", - "pecan", - "pistachio", - "cherry" //Cherries in forestry make seed oil - ); - - ImmutableList.Builder genericCropsBuilder = ImmutableList.builder(); - genericCropsBuilder.add( - "cotton", - "rice", - "tea", - "coffee", - "candleberry" - ); - genericCropsBuilder.addAll(herbs); - genericCropsBuilder.addAll(spices); - - ImmutableList genericCrops = genericCropsBuilder.build(); - - ImmutableList.Builder plants = ImmutableList.builder(); - - int juiceAmount = ForestryAPI.activeMode.getIntegerSetting("squeezer.liquid.apple") / 25; - int seedamount = ForestryAPI.activeMode.getIntegerSetting("squeezer.liquid.seed"); - ItemStack wheatamount = ForestryAPI.activeMode.getStackSetting("recipe.output.compost.wheat"); - - juiceAmount = Math.max(juiceAmount, 1); // Produce at least 1 mb of juice. - for (String berryName : berries) { - ItemStack berry = GameRegistry.findItemStack(HC, berryName + "Item", 1); - ItemStack berrySeed = GameRegistry.findItemStack(HC, berryName + "seedItem", 1); - Block berryBlock = GameRegistry.findBlock(HC, "pam" + berryName + "Crop"); - if (berry != null) { - RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{berry}, Fluids.JUICE.getFluid(juiceAmount)); - } - if (berrySeed != null) { - RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{berrySeed}, Fluids.SEEDOIL.getFluid(seedamount)); - } - if (berrySeed != null && berryBlock != null) { - Farmables.farmables.get("farmWheat").add(new FarmableGenericCrop(berrySeed, berryBlock, 7)); - Farmables.farmables.get("farmOrchard").add(new FarmableBasicFruit(berryBlock, 7)); - } - plants.add(berryName); - } - - juiceAmount = ForestryAPI.activeMode.getIntegerSetting("squeezer.liquid.apple"); - for (String fruitName : fruits) { - ItemStack fruit = GameRegistry.findItemStack(HC, fruitName + "Item", 1); - ItemStack fruitSeed = GameRegistry.findItemStack(HC, fruitName + "seedItem", 1); - Block fruitBlock = GameRegistry.findBlock(HC, "pam" + fruitName + "Crop"); - if (fruit != null) { - RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{fruit}, Fluids.JUICE.getFluid(juiceAmount)); - } - if (fruitSeed != null) { - RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{fruitSeed}, Fluids.SEEDOIL.getFluid(seedamount)); - } - if (fruitSeed != null && fruitBlock != null) { - Farmables.farmables.get("farmWheat").add(new FarmableGenericCrop(fruitSeed, fruitBlock, 7)); - Farmables.farmables.get("farmOrchard").add(new FarmableBasicFruit(fruitBlock, 7)); - } - plants.add(fruitName); - } - - juiceAmount = ForestryAPI.activeMode.getIntegerSetting("squeezer.liquid.apple") / 2; // vegetables produce less juice - juiceAmount = Math.max(juiceAmount, 1); // Produce at least 1 mb of juice. - for (String vegetableName : vegetables) { - ItemStack vegetable = GameRegistry.findItemStack(HC, vegetableName + "Item", 1); - ItemStack vegetableSeed = GameRegistry.findItemStack(HC, vegetableName + "seedItem", 1); - Block vegetableBlock = GameRegistry.findBlock(HC, "pam" + vegetableName + "Crop"); - if (vegetable != null) { - RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{vegetable}, Fluids.JUICE.getFluid(juiceAmount)); - } - if (vegetableSeed != null) { - RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{vegetableSeed}, Fluids.SEEDOIL.getFluid(seedamount)); - } - if (vegetableSeed != null && vegetableBlock != null) { - Farmables.farmables.get("farmVegetables").add(new FarmableGenericCrop(vegetableSeed, vegetableBlock, 7)); - Farmables.farmables.get("farmOrchard").add(new FarmableBasicFruit(vegetableBlock, 7)); - } - plants.add(vegetableName); - } - - for (String grainName : grains) { - ItemStack grain = GameRegistry.findItemStack(HC, grainName + "Item", 1); - ItemStack grainSeed = GameRegistry.findItemStack(HC, grainName + "seedItem", 1); - Block grainBlock = GameRegistry.findBlock(HC, "pam" + grainName + "Crop"); - if (grain != null && wheatamount.stackSize > 0) { - RecipeUtil.addRecipe(wheatamount, " X ", "X#X", " X ", '#', Blocks.dirt, 'X', grain); - FuelManager.moistenerResource.put(grain, new MoistenerFuel(grain, PluginCore.items.mouldyWheat.getItemStack(), 0, 300)); - } - if (grainSeed != null) { - RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{grainSeed}, Fluids.SEEDOIL.getFluid(seedamount)); - RecipeManagers.moistenerManager.addRecipe(grainSeed, new ItemStack(Blocks.mycelium), 5000); - } - if (grainSeed != null && grainBlock != null) { - Farmables.farmables.get("farmWheat").add(new FarmableGenericCrop(grainSeed, grainBlock, 7)); - Farmables.farmables.get("farmOrchard").add(new FarmableBasicFruit(grainBlock, 7)); - } - plants.add(grainName); - } - - for (String treeFruitName : treeFruits) { - ItemStack treeFruit = GameRegistry.findItemStack(HC, treeFruitName + "Item", 1); - Block treeFruitBlock = GameRegistry.findBlock(HC, "pam" + (Character.toUpperCase(treeFruitName.charAt(0)) + treeFruitName.substring(1))); - if (treeFruitBlock != null) { - Farmables.farmables.get("farmOrchard").add(new FarmableBasicFruit(treeFruitBlock, 2)); - } - if (treeFruit != null) { - RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{treeFruit}, Fluids.JUICE.getFluid(juiceAmount)); - } - plants.add(treeFruitName); - } - - for (String treeName : trees) { - Block fruitBlock = GameRegistry.findBlock(HC, "pam" + (Character.toUpperCase(treeName.charAt(0)) + treeName.substring(1))); - if (fruitBlock != null) { - Farmables.farmables.get("farmOrchard").add(new FarmableBasicFruit(fruitBlock, 2)); - } - plants.add(treeName); - } - - for (String treeName : treesSpecial) { - Block fruitBlock = GameRegistry.findBlock(HC, "pam" + (Character.toUpperCase(treeName.charAt(0)) + treeName.substring(1))); - if (fruitBlock != null) { - Farmables.farmables.get("farmOrchard").add(new FarmableBasicFruit(fruitBlock, 2)); - } - } - - for (String cropName : genericCrops) { - ItemStack genericCropSeed = GameRegistry.findItemStack(HC, cropName + "seedItem", 1); - Block genericCropBlock = GameRegistry.findBlock(HC, "pam" + cropName + "Crop"); - if (genericCropSeed != null) { - RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{genericCropSeed}, Fluids.SEEDOIL.getFluid(seedamount)); - } - if (genericCropSeed != null && genericCropBlock != null) { - Farmables.farmables.get("farmWheat").add(new FarmableGenericCrop(genericCropSeed, genericCropBlock, 7)); - Farmables.farmables.get("farmOrchard").add(new FarmableBasicFruit(genericCropBlock, 7)); - } - plants.add(cropName); - } - ItemStack mustardCropSeed = GameRegistry.findItemStack(HC, "mustard" + "seedItem", 1); - Block mustardCropBlock = GameRegistry.findBlock(HC, "pam" + "mustardseeds" + "Crop"); - ItemStack mustardFruit = GameRegistry.findItemStack(HC, "mustard" + "seedsItem", 1); - if (mustardCropSeed != null) { - RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{mustardCropSeed}, Fluids.SEEDOIL.getFluid(seedamount)); - } - if (mustardCropSeed != null && mustardCropBlock != null) { - Farmables.farmables.get("farmWheat").add(new FarmableGenericCrop(mustardCropSeed, mustardCropBlock, 7)); - Farmables.farmables.get("farmOrchard").add(new FarmableBasicFruit(mustardCropBlock, 7)); - } - if (mustardFruit != null) { - RecipeUtil.addFermenterRecipes(mustardFruit, ForestryAPI.activeMode.getIntegerSetting("fermenter.yield.wheat"), Fluids.BIOMASS); - } - - for (String plantName : plants.build()) { - ItemStack plant = GameRegistry.findItemStack(HC, plantName + "Item", 1); - if (plant != null) { - RecipeUtil.addFermenterRecipes(plant, ForestryAPI.activeMode.getIntegerSetting("fermenter.yield.wheat"), Fluids.BIOMASS); - } - } - - for (String cropnutName : cropNuts) { - ItemStack cropnut = GameRegistry.findItemStack(HC, cropnutName + "Item", 1); - ItemStack cropnutSeed = GameRegistry.findItemStack(HC, cropnutName + "seedItem", 1); - Block cropnutBlock = GameRegistry.findBlock(HC, "pam" + cropnutName + "Crop"); - if (cropnutSeed != null) { - RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{cropnutSeed}, Fluids.SEEDOIL.getFluid(seedamount)); - } - if (cropnutSeed != null && cropnutBlock != null) { - Farmables.farmables.get("farmWheat").add(new FarmableGenericCrop(cropnutSeed, cropnutBlock, 7)); - Farmables.farmables.get("farmOrchard").add(new FarmableBasicFruit(cropnutBlock, 7)); - } - if (cropnut != null) { - RecipeManagers.squeezerManager.addRecipe(20, new ItemStack[]{cropnut}, Fluids.SEEDOIL.getFluid(3 * seedamount)); - } - } - - for (String nutName : nuts) { - ItemStack nut = GameRegistry.findItemStack(HC, nutName + "Item", 1); - Block nutBlock = GameRegistry.findBlock(HC, "pam" + (Character.toUpperCase(nutName.charAt(0)) + nutName.substring(1))); - if (nutBlock != null) { - Farmables.farmables.get("farmOrchard").add(new FarmableBasicFruit(nutBlock, 2)); - } - if (nut != null) { - RecipeManagers.squeezerManager.addRecipe(20, new ItemStack[]{nut}, Fluids.SEEDOIL.getFluid(3 * seedamount)); - } - } - - ItemStack hcHoneyItem = GameRegistry.findItemStack(HC, "honeyItem", 1); - if (hcHoneyItem != null) { - RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{hcHoneyItem}, Fluids.HONEY.getFluid(Constants.FLUID_PER_HONEY_DROP)); - } - - ItemStack hcBeeswaxItem = GameRegistry.findItemStack(HC, "beeswaxItem", 1); - if (hcBeeswaxItem != null) { - RecipeUtil.addRecipe(ForestryAPI.activeMode.getStackSetting("recipe.output.capsule"), "XXX ", 'X', hcBeeswaxItem); - } - } - -} diff --git a/src/main/java/forestry/plugins/compat/PluginIC2.java b/src/main/java/forestry/plugins/compat/PluginIC2.java index a9f6f89da..81db5ddb9 100644 --- a/src/main/java/forestry/plugins/compat/PluginIC2.java +++ b/src/main/java/forestry/plugins/compat/PluginIC2.java @@ -13,25 +13,19 @@ package forestry.plugins.compat; import com.google.common.collect.ImmutableMap; import java.util.ArrayList; -import java.util.Arrays; import java.util.EnumSet; -import cpw.mods.fml.common.registry.GameRegistry; import forestry.api.farming.Farmables; import forestry.farming.logic.FarmableBasicIC2Crop; -import ic2.api.crops.ICropTile; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; - import net.minecraft.tileentity.TileEntity; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; - -import cpw.mods.fml.common.Optional; -import cpw.mods.fml.common.event.FMLInterModComms; -import cpw.mods.fml.common.registry.GameData; - +import net.minecraftforge.fml.common.Optional; +import net.minecraftforge.fml.common.event.FMLInterModComms; +import net.minecraftforge.fml.common.registry.GameRegistry; import forestry.api.circuits.ChipsetManager; import forestry.api.circuits.CircuitSocketType; import forestry.api.circuits.ICircuitLayout; @@ -68,7 +62,6 @@ import forestry.plugins.PluginApiculture; import forestry.plugins.PluginCore; import forestry.plugins.PluginEnergy; import forestry.plugins.PluginManager; - import ic2.api.item.IC2Items; import ic2.api.recipe.RecipeInputItemStack; import ic2.api.recipe.Recipes; @@ -240,6 +233,7 @@ public class PluginIC2 extends ForestryPlugin { } } + @Override @Optional.Method(modid = "IC2") protected void registerRecipes() { @@ -273,8 +267,8 @@ public class PluginIC2 extends ForestryPlugin { } if (rubbersapling != null && resin != null) { - String saplingName = GameData.getBlockRegistry().getNameForObject(ItemStackUtil.getBlock(rubbersapling)); - String resinName = GameData.getItemRegistry().getNameForObject(resin.getItem()); + String saplingName = ItemStackUtil.getBlockNameFromRegistryAsSting(ItemStackUtil.getBlock(rubbersapling)); + String resinName = ItemStackUtil.getItemNameFromRegistryAsSting(resin.getItem()); String imc = String.format("farmArboreal@%s.%s.%s.%s", saplingName, rubbersapling.getItemDamage(), resinName, resin.getItemDamage()); @@ -339,20 +333,20 @@ public class PluginIC2 extends ForestryPlugin { * @param tileEntity tile entity to be checked. * @return true if there is an IC2 crop and false otherwise. */ - @Optional.Method(modid = "IC2") + /*@Optional.Method(modid = "IC2") public boolean isIC2Crop(TileEntity tileEntity) { if (tileEntity != null && tileEntity instanceof ICropTile) { return true; } return false; - } + }*/ /** * Check if an IC2 crop is ready to be harvested. * @param tileEntity tile entity to be checked. * @return true if crop size is optimal for harvest and false otherwise. */ - @Optional.Method(modid = "IC2") + /*@Optional.Method(modid = "IC2") public boolean canHarvestCrop(TileEntity tileEntity) { if (isIC2Crop(tileEntity)) { ICropTile crop = (ICropTile)tileEntity; @@ -364,13 +358,13 @@ public class PluginIC2 extends ForestryPlugin { } } return false; - } + }*/ /** * Perform some of the actions of the crop-matron. * @param tileEntity */ - @Optional.Method(modid = "IC2") + /*@Optional.Method(modid = "IC2") public void babysitCrop(TileEntity tileEntity) { if (isIC2Crop(tileEntity)) { ICropTile crop = (ICropTile)tileEntity; @@ -381,14 +375,14 @@ public class PluginIC2 extends ForestryPlugin { crop.reset(); } }*/ - if (crop.getHydrationStorage() <= 200) { + /*if (crop.getHydrationStorage() <= 200) { crop.setHydrationStorage(200); } if (crop.getNutrientStorage() <= 100) { crop.setNutrientStorage(crop.getNutrientStorage() + 100); } } - } + }*/ /** * This function takes care of everything related to the harvesting of the @@ -396,7 +390,7 @@ public class PluginIC2 extends ForestryPlugin { * @param tileEntity tile entity to be checked. * @return arraylist containing the drops. */ - @Optional.Method(modid = "IC2") + /*@Optional.Method(modid = "IC2") public ArrayList getCropDrops(TileEntity tileEntity) { if (isIC2Crop(tileEntity)) { ICropTile crop = (ICropTile)tileEntity; @@ -406,5 +400,24 @@ public class PluginIC2 extends ForestryPlugin { } } return null; + }*/ + + @Optional.Method(modid = "IC2") + public boolean isIC2Crop(TileEntity tileEntity) { + return false; + } + + @Optional.Method(modid = "IC2") + public boolean canHarvestCrop(TileEntity tileEntity) { + return false; + } + + @Optional.Method(modid = "IC2") + public void babysitCrop(TileEntity tileEntity) { + } + + @Optional.Method(modid = "IC2") + public ArrayList getCropDrops(TileEntity tileEntity) { + return null; } } diff --git a/src/main/java/forestry/plugins/compat/PluginImmersiveEngineering.java b/src/main/java/forestry/plugins/compat/PluginImmersiveEngineering.java deleted file mode 100644 index f06dbf356..000000000 --- a/src/main/java/forestry/plugins/compat/PluginImmersiveEngineering.java +++ /dev/null @@ -1,56 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v3 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: - * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges - ******************************************************************************/ -package forestry.plugins.compat; - -import net.minecraft.block.Block; -import net.minecraft.item.ItemStack; - -import cpw.mods.fml.common.registry.GameRegistry; - -import forestry.api.core.ForestryAPI; -import forestry.api.farming.Farmables; -import forestry.api.recipes.RecipeManagers; -import forestry.core.config.Constants; -import forestry.core.fluids.Fluids; -import forestry.core.utils.ModUtil; -import forestry.farming.logic.FarmableGenericCrop; -import forestry.plugins.ForestryPlugin; -import forestry.plugins.Plugin; - -@Plugin(pluginID = "ImmersiveEngineering", name = "ImmersiveEngineering", author = "Nirek", url = Constants.URL, unlocalizedDescription = "for.plugin.immersiveengineering.description") -public class PluginImmersiveEngineering extends ForestryPlugin { - - private static final String ImEng = "ImmersiveEngineering"; - - @Override - public boolean isAvailable() { - return ModUtil.isModLoaded(ImEng); - } - - @Override - public String getFailMessage() { - return "Immersive Engineering not found"; - } - - @Override - protected void postInit() { - - ItemStack hempSeed = GameRegistry.findItemStack(ImEng, "seed", 1); - Block hempCrop = GameRegistry.findBlock(ImEng, "hemp"); - ItemStack hempFiber = new ItemStack(GameRegistry.findItem(ImEng, "material"), 1, 3); - int seedAmount = ForestryAPI.activeMode.getIntegerSetting("squeezer.liquid.seed"); - if (hempSeed != null && hempCrop != null) { - RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{hempSeed}, Fluids.SEEDOIL.getFluid(seedAmount)); - Farmables.farmables.get("farmWheat").add(new FarmableGenericCrop(hempSeed, hempCrop, 4, hempFiber)); - } - } - -} diff --git a/src/main/java/forestry/plugins/compat/PluginMagicalCrops.java b/src/main/java/forestry/plugins/compat/PluginMagicalCrops.java deleted file mode 100644 index fe33e52e9..000000000 --- a/src/main/java/forestry/plugins/compat/PluginMagicalCrops.java +++ /dev/null @@ -1,282 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v3 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: - * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges - ******************************************************************************/ -package forestry.plugins.compat; - -import com.google.common.collect.ImmutableList; - -import net.minecraft.block.Block; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; - -import net.minecraftforge.oredict.OreDictionary; - -import cpw.mods.fml.common.registry.GameRegistry; - -import forestry.api.core.ForestryAPI; -import forestry.api.farming.Farmables; -import forestry.api.recipes.RecipeManagers; -import forestry.core.config.Config; -import forestry.core.config.Constants; -import forestry.core.fluids.Fluids; -import forestry.core.recipes.RecipeUtil; -import forestry.core.utils.ModUtil; -import forestry.farming.logic.FarmableGenericCrop; -import forestry.plugins.ForestryPlugin; -import forestry.plugins.Plugin; - -@Plugin(pluginID = "MagicalCrops", name = "MagicalCrops", author = "Nirek", url = Constants.URL, unlocalizedDescription = "for.plugin.magicalcrops.description") -public class PluginMagicalCrops extends ForestryPlugin { - - private static final String MagCrop = "magicalcrops"; - - @Override - public boolean isAvailable() { - return ModUtil.isModLoaded(MagCrop); - } - - @Override - public String getFailMessage() { - return "Magical Crops not found"; - } - - @Override - protected void postInit() { - - ImmutableList magicSeeds = ImmutableList.of( - "Essence", - "Coal", - "Dye", - "Redstone", - "Glowstone", - "Obsidian", - "Iron", - "Gold", - "Lapis", - "Ender", - "Nether", - "Experience", - "Blaze", - "Diamond", - "Emerald" - ); - - ImmutableList elementSeeds = ImmutableList.of( - "Air", - "Water", - "Earth", - "Fire" - ); - - ImmutableList modMagicSeeds = ImmutableList.of( - "Copper", - "Tin", - "Silver", - "Lead", - "Quartz", - "Sapphire", - "Ruby", - "Peridot", - "Aluminium", - "Force", - "Cobalt", - "Ardite", - "Nickel", - "Platinum", - "ThaumcraftShard", - "Uranium", - "Oil", - "Rubber", - "Vinteum", - "BlueTopaz", - "Chimerite", - "Moonstone", - "Sunstone", - "Iridium", - "Yellorite", - "Osmium", - "Manganese", - "Sulfur", - "Darkiron" - ); - - ImmutableList soulSeeds = ImmutableList.of( - "Cow", - "Creeper", - "Magma", - "Skeleton", - "Slime", - "Spider", - "Ghast", - "Wither" - ); - - ImmutableList potionSeeds = ImmutableList.of( - "Fire", - "Water", - "Strength", - "Regen", - "Night", - "Speed" - ); - - ImmutableList seeds = ImmutableList.of( - "Blackberry", - "Blueberry", - "Chili", - "Cucumber", - "Grape", - "Raspberry", - "Strawberry", - "Sweetcorn", - "Tomato", - "SugarCane" - ); - - ImmutableList betaSeeds = ImmutableList.of( - "Air", - "Airshard", - "Aluminium", - "Alumite", - "Amber", - "Ardite", - "Blaze", - "Blizz", - "Bronze", - "CertusQuartz", - "Chicken", - "Coal", - "Cobalt", - "ConductiveIron", - "Copper", - "Cow", - "Creeper", - "DarkSteel", - "Diamond", - "Draconium", - "Dye", - "Earth", - "Earthshard", - "ElectricalSteel", - "Electrum", - "Emerald", - "Enderium", - "Enderman", - "EnergeticAlloy", - "Experience", - "Fire", - "Fireshard", - "Fluix", - "Ghast", - "Glowstone", - "Gold", - "Invar", - "Iron", - "Lapis", - "Lead", - "Lumium", - "Manasteel", - "Manyullyn", - "Minicio", - "Nature", - "Nether", - "Nickel", - "Obsidian", - "Ordershard", - "Osmium", - "Peridot", - "Pig", - "Platinum", - "PulsatingIron", - "Quartz", - "Quicksilver", - "RedstoneAlloy", - "Redstone", - "Rubber", - "Ruby", - "Saltpeter", - "Sapphire", - "Sheep", - "Signalum", - "Silver", - "Skeleton", - "Slime", - "Soularium", - "Spider", - "Steel", - "Sulfur", - "Terrasteel", - "Thaumium", - "Tin", - "VibrantAlloy", - "Water", - "Watershard", - "Wither", - "Yellorite" - ); - - int seedAmount = ForestryAPI.activeMode.getIntegerSetting("squeezer.liquid.seed"); - - for (String magicSeedName : magicSeeds) { - addRecipes("_MagicSeeds", "_MagicCrop", magicSeedName, seedAmount); - } - - for (String elementSeedName : elementSeeds) { - addRecipes("_ElementSeeds", "_ElementCrop", elementSeedName, seedAmount); - } - - for (String modMagicSeedName : modMagicSeeds) { - addRecipes("_ModMagicSeeds", "_ModMagicCrop", modMagicSeedName, seedAmount); - } - - for (String soulSeedName : soulSeeds) { - addRecipes("_SoulSeeds", "_SoulCrop", soulSeedName, seedAmount); - } - - for (String potionSeedName : potionSeeds) { - addRecipes("_PotionSeeds", "_PotionCrop", potionSeedName, seedAmount); - } - - for (String seedName : seeds) { - addRecipes("_Seeds", "_Crop", seedName, seedAmount); - } - for (String seedName : betaSeeds) { - addBetaRecipes("Seeds", "Crop", seedName, ""); - addBetaRecipes("Seeds", "Crop", seedName, "magicalcrops_"); - } - - Item cropProduce = GameRegistry.findItem(MagCrop, MagCrop + "_CropProduce"); - if (cropProduce != null) { - int juiceAmount = ForestryAPI.activeMode.getIntegerSetting("squeezer.liquid.apple"); - ItemStack produce = new ItemStack(GameRegistry.findItem(MagCrop, MagCrop + "_CropProduce"), 1, OreDictionary.WILDCARD_VALUE); - RecipeUtil.addFermenterRecipes(produce, ForestryAPI.activeMode.getIntegerSetting("fermenter.yield.wheat"), Fluids.BIOMASS); - RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{produce}, Fluids.JUICE.getFluid(juiceAmount)); - } - } - - private static void addRecipes(String seedPrefix, String cropPrefix, String name, int fluidAmount) { - ItemStack seed = GameRegistry.findItemStack(MagCrop, MagCrop + seedPrefix + name, 1); - Block crop = GameRegistry.findBlock(MagCrop, MagCrop + cropPrefix + name); - if (seed != null) { - RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{seed}, Fluids.SEEDOIL.getFluid(fluidAmount)); - } - if (seed != null && crop != null && Config.isMagicalCropsSupportEnabled()) { - Farmables.farmables.get("farmWheat").add(new FarmableGenericCrop(seed, crop, 7)); - } - } - - private static void addBetaRecipes(String seedSuffix, String cropSuffix, String name, String middlefix) { - ItemStack seed = GameRegistry.findItemStack(MagCrop, middlefix + name + seedSuffix, 1); - Block crop = GameRegistry.findBlock(MagCrop, middlefix + name + cropSuffix); - if (seed != null && crop != null && Config.isMagicalCropsSupportEnabled()) { - Farmables.farmables.get("farmWheat").add(new FarmableGenericCrop(seed, crop, 7)); - } - } -} diff --git a/src/main/java/forestry/plugins/compat/PluginNatura.java b/src/main/java/forestry/plugins/compat/PluginNatura.java index 79c1ffac9..c9cc605ec 100644 --- a/src/main/java/forestry/plugins/compat/PluginNatura.java +++ b/src/main/java/forestry/plugins/compat/PluginNatura.java @@ -17,13 +17,10 @@ import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; - +import net.minecraftforge.fml.common.event.FMLInterModComms; +import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.oredict.OreDictionary; -import cpw.mods.fml.common.event.FMLInterModComms; -import cpw.mods.fml.common.registry.GameData; -import cpw.mods.fml.common.registry.GameRegistry; - import forestry.api.core.ForestryAPI; import forestry.api.farming.Farmables; import forestry.api.fuels.FuelManager; @@ -34,6 +31,7 @@ import forestry.api.storage.StorageManager; import forestry.core.config.Constants; import forestry.core.fluids.Fluids; import forestry.core.recipes.RecipeUtil; +import forestry.core.utils.ItemStackUtil; import forestry.core.utils.ModUtil; import forestry.farming.logic.FarmableGenericCrop; import forestry.plugins.ForestryPlugin; @@ -96,19 +94,23 @@ public class PluginNatura extends ForestryPlugin { ItemStack saplingWild = new ItemStack(saplingItem, 1, OreDictionary.WILDCARD_VALUE); RecipeUtil.addFermenterRecipes(saplingWild, ForestryAPI.activeMode.getIntegerSetting("fermenter.yield.sapling"), Fluids.BIOMASS); - String saplingName = GameData.getItemRegistry().getNameForObject(saplingItem); + String saplingName = ItemStackUtil.getItemNameFromRegistryAsSting(saplingItem); FMLInterModComms.sendMessage(Constants.MOD, "add-farmable-sapling", String.format("farmArboreal@%s.-1", saplingName)); } - berryBlight = GameRegistry.findItemStack(NATURA, "berryBlight", 1); - berryDusk = GameRegistry.findItemStack(NATURA, "berryDusk", 1); - berrySky = GameRegistry.findItemStack(NATURA, "berrySky", 1); - berrySting = GameRegistry.findItemStack(NATURA, "berrySting", 1); - berryRasp = GameRegistry.findItemStack(NATURA, "berryRasp", 1); - berryBlue = GameRegistry.findItemStack(NATURA, "berryBlue", 1); - berryBlack = GameRegistry.findItemStack(NATURA, "berryBlack", 1); - berryMalo = GameRegistry.findItemStack(NATURA, "berryMalo", 1); - itemBarley = GameRegistry.findItemStack(NATURA, "barleyFood", 1); + Item netherBerry = GameRegistry.findItem(NATURA, "berry.nether"); + Item berry = GameRegistry.findItem(NATURA, "berry"); + Item barley = GameRegistry.findItem(NATURA, "barleyFood"); + + berryBlight = new ItemStack(netherBerry, 1, 0); + berryDusk = new ItemStack(netherBerry, 1, 1); + berrySky = new ItemStack(netherBerry, 1, 2); + berrySting = new ItemStack(netherBerry, 1, 3); + berryRasp = new ItemStack(berry, 1, 0); + berryBlue = new ItemStack(berry, 1, 1); + berryBlack = new ItemStack(berry, 1, 2); + berryMalo = new ItemStack(berry, 1, 3); + itemBarley = new ItemStack(barley); } @Override @@ -200,8 +202,9 @@ public class PluginNatura extends ForestryPlugin { @Override protected void registerRecipes() { - ItemStack seedBarley = GameRegistry.findItemStack(NATURA, "seedBarley", 1); - ItemStack seedCotton = GameRegistry.findItemStack(NATURA, "seedCotton", 1); + Item seed = GameRegistry.findItem(NATURA, "barley.seed"); + ItemStack seedBarley = new ItemStack(seed, 1, 0); + ItemStack seedCotton = new ItemStack(seed, 1, 1); ArrayList seedList = new ArrayList<>(); if (seedBarley != null) { diff --git a/src/main/java/forestry/plugins/compat/PluginPlantMegaPack.java b/src/main/java/forestry/plugins/compat/PluginPlantMegaPack.java deleted file mode 100644 index ec6848656..000000000 --- a/src/main/java/forestry/plugins/compat/PluginPlantMegaPack.java +++ /dev/null @@ -1,459 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v3 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: - * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges - ******************************************************************************/ -package forestry.plugins.compat; - -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; - -import java.util.Map; - -import net.minecraft.block.Block; -import net.minecraft.item.ItemStack; - -import cpw.mods.fml.common.registry.GameRegistry; - -import forestry.api.apiculture.FlowerManager; -import forestry.api.core.ForestryAPI; -import forestry.api.farming.Farmables; -import forestry.api.recipes.RecipeManagers; -import forestry.core.config.Constants; -import forestry.core.fluids.Fluids; -import forestry.core.recipes.RecipeUtil; -import forestry.core.utils.ModUtil; -import forestry.farming.logic.FarmableBasicFruit; -import forestry.farming.logic.FarmableGenericCrop; -import forestry.farming.logic.FarmableStacked; -import forestry.plugins.ForestryPlugin; -import forestry.plugins.Plugin; - -@Plugin(pluginID = "PlantMegaPack", name = "PlantMegaPack", author = "Nirek", url = Constants.URL, unlocalizedDescription = "for.plugin.plantmegapack.description") -public class PluginPlantMegaPack extends ForestryPlugin { - - private static final String PlantMP = "plantmegapack"; - - @Override - public boolean isAvailable() { - return ModUtil.isModLoaded(PlantMP); - } - - @Override - public String getFailMessage() { - return "Plant Mega Pack not found"; - } - - @Override - protected void registerRecipes() { - - ImmutableList reedLikePlant = ImmutableList.of( - "bambooAsper", - "bambooFargesiaRobusta", - "bambooGiantTimber", - "bambooGolden", - "bambooMoso", - "bambooShortTassled", - "bambooTimorBlack", - "bambooTropicalBlue", - "bambooWetForest" - ); - - ImmutableList landCropPlant = ImmutableList.of( - "Beet", - "BellPepperYellow", - "Celery", - "Corn", - "Cucumber", - "Lettuce", - "Onion", - "Spinach", - "Tomato" - ); - - ImmutableMap desertPlant = ImmutableMap.builder() - .put("cactusArmatocereusMatucanensis", 6) - .put("cactusBaseballBat", 6) - .put("cactusEchinocereusMetornii", 2) - .put("cactusGoldenCereus", 3) - .put("cactusGoldenSaguaro", 6) - .put("cactusMatucanaAureiflora", 1) - .put("cactusPricklyPear", 5) - .put("cactusSnowPole", 6) - .put("cactusToothpick", 6) - - .put("desertApachePlume", 4) - .put("desertBrittlebush", 4) - .put("desertBroadLeafGilia", 4) - .put("desertBroomSnakeweed", 4) - .put("desertKangarooPaw", 4) - .put("desertOcotillo", 4) - .put("desertPeninsulaOnion", 4) - .put("desertSeepwood", 4) - .put("desertWhiteSage", 4) - .build(); - - ImmutableMap nonGrowingFlowers = ImmutableMap.builder() - .put("flowerAchillea", 9) // number of flowers in the block, usually meta+1 - .put("flowerAlpineThistle", 1) - .put("flowerAzalea", 13) - .put("flowerBegonia", 9) - .put("flowerBell", 10) - .put("flowerBirdofParadise", 1) - .put("flowerBlueStar", 1) - .put("flowerBurningLove", 1) - .put("flowerCandelabraAloe", 1) - .put("flowerCarnation", 7) - .put("flowerCelosia", 7) - //.put("flowerColumbine", 5) //poisonous - .put("flowerDahlia", 8) - .put("flowerDaisy", 8) - .put("flowerDelphinium", 4) - .put("flowerDottedBlazingstar", 1) - .put("flowerElephantEars", 1) - .put("flowerFoamFlower", 1) - .put("flowerFuchsia", 1) - .put("flowerGeranium", 5) - .put("flowerGladiolus", 9) - .put("flowerHawkweed", 4) - .put("flowerHydrangea", 6) - .put("flowerJacobsLadder", 1) - .put("flowerLily", 5) - .put("flowerLionsTail", 1) - .put("flowerLupine", 10) - .put("flowerMarigold", 2) - .put("flowerMediterraneanSeaHolly", 1) - //.put("flowerMezereon", 1) //poisonous - .put("flowerNemesia", 12) - .put("flowerNewGuineaImpatiens", 1) - .put("flowerParrotsBeak", 1) - .put("flowerPeruvianLily", 1) - .put("flowerPurpleConeflower", 1) - .put("flowerRose", 13) - .put("flowerRoseCampion", 1) - .put("flowerStreamsideBluebells", 1) - .put("flowerTorchLily", 1) - .put("flowerTulip", 7) - .put("flowerViolet", 1) - .put("flowerWildCarrot", 1) //is not actually a carrot - .put("flowerWildDaffodil", 1) - .put("flowerWoodlandPinkroot", 1) - .put("flowerYellowToadflax", 1) - .put("floatingWaterHyacinth", 1) - .put("floatingWaterLily", 13) - .build(); - - ImmutableMap floatingWaterPlant = ImmutableMap.builder() - .put("cropSacredLotus", 4) - .put("cropWatercress", 4) - .put("cropTaro", 4) - .put("cropWasabi", 4) - .put("cropLaksaLeaf", 4) - .put("cropCentella", 4) - .put("cropRice", 4) - .put("cropWaterSpinach", 4) - .put("cropWildRice", 4) - - .put("immersedArrowArum", 4) - .put("immersedCommonReed", 4) - .put("immersedDuckPotato", 4) - .put("immersedEuropeanBurReed", 4) - .put("immersedGreySedge", 4) - .put("immersedSimplestemBurReed", 4) - .put("immersedSoftstemBulrush", 4) - .put("immersedWaterMannagrass", 4) - .put("immersedYellowFlag", 4) - .build(); - - ImmutableMap fungusPlant = ImmutableMap.builder() - .put("fungusBlackPowderpuff", 1) - .put("fungusChanterelle", 1) - //.put("fungusDeathCap", 1) poisonous - .put("fungusGiantClub", 1) - .put("fungusParasol", 2) - .put("fungusStinkhorn", 1) - .put("fungusWeepingMilkCap", 1) - .put("fungusWoodBlewit", 1) - //.put("fungusWoollyGomphus", 2) poisonous - .build(); - - ImmutableMap junglePlant = ImmutableMap.builder() - .put("jungleConeHeadedGuzmania", 2) - .put("jungleDevilsTongue", 6) - .put("jungleHoneySpurge", 1) - .put("jungleJungleLantern", 6) - .put("jungleLazarusBell", 2) - .put("jungleLobsterClaws", 6) - .put("jungleLollipopPlant", 2) - .put("jungleMadagascarPalm", 6) - .put("junglePalmLily", 6) - .put("junglePanamaQueen", 2) - .put("junglePorteaAlatisepala", 2) - .put("jungleRacinaeaFraseri", 6) - .put("jungleRicheaDracophylla", 2) - //.put("jungleShellflower", 4) 2 tall needs specialcase - .put("jungleSilverVase", 2) - .put("jungleStaghornClubmoss", 2) - .put("jungleTorchGinger", 2) - .put("jungleVoodooLily", 6) - .put("leafyEmeraldPhilodendron", 2) //jungle plant - .build(); - - ImmutableMap vanillaPlant = ImmutableMap.builder() - .put("beachHighTideBush", 6) - .put("beachSeaLavender", 4) - .put("beachSeaSandwort", 4) - .put("leafyDustyMiller", 1) //beach plant - - .put("fernCretanBrake", 1) - //.put("fernDwarfPalmetto", 0) doesn't grow - .put("fernHayScented", 2) - .put("fernKangaroo", 2) - .put("fernMaidenhairSpleenwort", 3) - .put("fernOstrich", 6) - .put("fernScalyTree", 6) - .put("fernSword", 6) - .put("fernWoodsia", 2) - - .put("forestArcticGentian", 1) - .put("forestAustralianBugle", 2) - .put("forestBroadleafMeadowsweet", 2) - .put("forestDeadnettle", 2) - .put("forestDeceivingTrillium", 2) - .put("forestFairySlipper", 2) - .put("forestHorseweed", 2) - .put("forestKneelingAngelica", 2) - //.put("forestLilyoftheValley", //poisonous - .put("forestNorthernPitcherPlant", 2) - .put("forestPinesap", 2) - .put("forestRedHelleborine", 2) - .put("forestSalal", 2) - .put("forestVanillaLeaf", 1) - .put("forestWesternWallflower", 2) - .put("forestWildColumbine", 2) - .put("forestWildMint", 2) - .put("forestWolfsFootClubmoss", 1) - .put("leafyColeus", 1) //forest plant - .put("leafyStonecrop", 1) //forest plant - - .put("grassBlueWheatgrass", 1) - .put("grassCord", 6) - .put("grassFountain", 2) - .put("grassMeadow", 2) - .put("grassMeadowFoxtail", 1) - .put("grassPrairie", 1) - .put("grassSilverMoor", 2) - .put("grassSwitch", 6) - - .put("mountainAlpineArmeria", 2) - .put("mountainAlpineBellflower", 2) - .put("mountainBistort", 2) - .put("mountainEdelweiss", 2) - .put("mountainHouseleek", 2) - .put("mountainIris", 1) - .put("mountainNorthernWillowherb", 2) - .put("mountainScarletTrumpet", 2) - .put("mountainYellowBellflower", 1) - .put("leafyKrisPlant", 2) // mountain plaint - - .put("plainsPrairieBrome", 6) //skips some metas - .put("plainsPrairieSage", 4) - .put("plainsReedCanaryGrass", 6) //skips some metas - .put("plainsShortrayFleabane", 4) - .put("plainsSmallPasqueFlower", 4) - .put("plainsSmoothAster", 4) - .put("plainsThreeFloweredAvens", 4) - .put("leafyPricklyLettuce", 1) //plains plant - //.put("leafyStingingNettle", 2) plains plant, poisonous - - .put("savannaButterflyWeed", 2) - .put("savannaHoaryVervain", 2) - .put("savannaLeadplant", 2) - .put("savannaMarcela", 2) - .put("savannaNorthernBedstraw", 1) - .put("savannaPiersonsMilkVetch", 2) - .put("savannaPropellerPlant", 2) - .put("savannaShonaCabbage", 2) - .put("savannaTexasTickseed", 2) - .put("leafyPaleYucca", 2) //savanna Plant - .put("leafyDevilsShoestring", 2) - - .put("shrubAlpineCurrant", 2) - .put("shrubBarberry", 2) - .put("shrubBoxwood", 2) - .put("shrubButterfly", 2) - .put("shrubCanyonCreekAbelia", 2) - .put("shrubCapeJasmine", 2) - .put("shrubCedarCylinder", 6) - .put("shrubCedarGlobe", 2) - .put("shrubCedarPyramid", 6) - .put("shrubCypressGreen", 1) - .put("shrubCypressYellow", 1) - .put("shrubDaphne", 2) - //.put("shrubDwarfElder", 4) poisonous, also grows 2 tall at meta 4 - .put("shrubHolly", 2) - .put("shrubHummingbirdBush", 2) - .put("shrubJuniperSavin", 2) - .put("shrubKerria", 2) - .put("shrubLavender", 2) - .put("shrubLindera", 3) - .put("shrubMeadowsweet", 2) - .put("shrubMottlecah", 2) - .put("shrubNinebark", 2) - .put("shrubSargentViburnum", 2) - //.put("shrubSpicebush",2) poisonous - .put("shrubWeepingForsythia", 2) - .put("shrubWinterberry", 2) - .put("shrubWolfWillow", 2) - - .put("wetlandsCattails", 6) - .put("wetlandsClubrush", 2) - .put("wetlandsCommonRush", 2) - .put("wetlandsFloweringRush", 2) - .put("wetlandsPickerelweed", 2) - .put("wetlandsReedMannagrass", 2) - .put("wetlandsSwampMilkweed", 2) - .put("wetlandsWaterHorsetail", 1) - .put("wetlandsWhiteTurtlehead", 2) - .build(); - - ImmutableMap berryBushPlant = ImmutableMap.builder() - .put("Beauty", 4) - .put("Black", 4) - .put("Blue", 4) - .put("Elder", 4) - .put("Goose", 4) - .put("Huckle", 4) - .put("Orange", 4) - .put("Snow", 4) - .put("Straw", 4) - .build(); - - ImmutableList waterPlant = ImmutableList.of( - "oceanCommonEelgrass", - "oceanCoralWeed", - "oceanMozuku", - "oceanRockweed", - "oceanSeaGrapes", - "oceanSeaLettuce", - "oceanTangle", - "riverAmazonSword", - "riverCanadianWaterweed", - "riverCoonsTail", - "riverEelgrass", - "riverWaterWisteria", - "riverWrightsWaternymph", - "waterKelpGiantGRN", - "waterKelpGiantYEL" - ); - - ImmutableMap specialCaseTwoTall = ImmutableMap.builder() - .put("grassSeaOats", FlowerManager.FlowerTypeVanilla) - .put("jungleShellflower", FlowerManager.FlowerTypeJungle) - .build(); - - int seedamount = ForestryAPI.activeMode.getIntegerSetting("squeezer.liquid.seed"); - int juiceAmount = ForestryAPI.activeMode.getIntegerSetting("squeezer.liquid.apple"); - - for (String reedLike : reedLikePlant) { - Block reedBlock = GameRegistry.findBlock(PlantMP, reedLike); - ItemStack reedStack = GameRegistry.findItemStack(PlantMP, reedLike, 1); - if (reedBlock != null && reedStack != null) { - RecipeUtil.addFermenterRecipes(reedStack, ForestryAPI.activeMode.getIntegerSetting("fermenter.yield.wheat"), Fluids.BIOMASS); - Farmables.farmables.get("farmPoales").add(new FarmableStacked(reedBlock, 14, 4)); - } - } - - for (String landCrop : landCropPlant) { - Block landCropBlock = GameRegistry.findBlock(PlantMP, "crop" + landCrop); - ItemStack seedStack = GameRegistry.findItemStack(PlantMP, "seed" + landCrop, 1); - ItemStack foodStack = GameRegistry.findItemStack(PlantMP, "food" + landCrop, 1); - if (landCropBlock != null) { - if (foodStack != null) { - RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{foodStack}, Fluids.JUICE.getFluid(juiceAmount)); - } - if (seedStack != null) { - RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{seedStack}, Fluids.SEEDOIL.getFluid(seedamount)); - } - Farmables.farmables.get("farmWheat").add(new FarmableGenericCrop(seedStack, landCropBlock, 4)); - Farmables.farmables.get("farmOrchard").add(new FarmableBasicFruit(landCropBlock, 4)); - } - } - - for (Map.Entry flower : nonGrowingFlowers.entrySet()) { - Block flowerPlantBlock = GameRegistry.findBlock(PlantMP, flower.getKey()); - if (flowerPlantBlock != null) { - for (int i = 0; i < flower.getValue(); i++) { - FlowerManager.flowerRegistry.registerPlantableFlower(flowerPlantBlock, i, 0.75, FlowerManager.FlowerTypeVanilla); - } - } - } - - for (Map.Entry wPlant : floatingWaterPlant.entrySet()) { - Block waterPlantBlock = GameRegistry.findBlock(PlantMP, wPlant.getKey()); - if (waterPlantBlock != null) { - Farmables.farmables.get("farmOrchard").add(new FarmableBasicFruit(waterPlantBlock, wPlant.getValue())); - } - } - - juiceAmount = ForestryAPI.activeMode.getIntegerSetting("squeezer.liquid.apple") / 25; - juiceAmount = Math.max(juiceAmount, 1); // Produce at least 1 mb of juice. - - for (Map.Entry berryBushCrop : berryBushPlant.entrySet()) { - Block berryBushCropBlock = GameRegistry.findBlock(PlantMP, "berrybush" + berryBushCrop.getKey()); - ItemStack berryBushStack = GameRegistry.findItemStack(PlantMP, "berrybush" + berryBushCrop.getKey(), 1); - ItemStack foodStack = GameRegistry.findItemStack(PlantMP, "berries" + berryBushCrop.getKey(), 1); - if (berryBushCropBlock != null) { - if (foodStack != null) { - RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{foodStack}, Fluids.JUICE.getFluid(juiceAmount)); - } - Farmables.farmables.get("farmWheat").add(new FarmableGenericCrop(berryBushStack, berryBushCropBlock, berryBushCrop.getValue())); - Farmables.farmables.get("farmOrchard").add(new FarmableBasicFruit(berryBushCropBlock, berryBushCrop.getValue())); - } - } - - addMetaFlower(desertPlant, FlowerManager.FlowerTypeCacti, false); - addMetaFlower(junglePlant, FlowerManager.FlowerTypeJungle, true); - addMetaFlower(vanillaPlant, FlowerManager.FlowerTypeVanilla, true); - addMetaFlower(fungusPlant, FlowerManager.FlowerTypeMushrooms, true); - - for (Map.Entry special : specialCaseTwoTall.entrySet()) { - Block plantBlock = GameRegistry.findBlock(PlantMP, special.getKey()); - ItemStack specialStack = GameRegistry.findItemStack(PlantMP, special.getKey(), 1); - if (plantBlock != null && plantBlock != null) { - FlowerManager.flowerRegistry.registerAcceptableFlower(plantBlock, special.getValue()); - FlowerManager.flowerRegistry.registerPlantableFlower(plantBlock, 0, 0.75, special.getValue()); - Farmables.farmables.get("farmWheat").add(new FarmableGenericCrop(specialStack, plantBlock, 4)); - } - } - - for (String wPlant : waterPlant) { - ItemStack waterPlantStack = GameRegistry.findItemStack(PlantMP, wPlant, 1); - if (waterPlantStack != null) { - RecipeUtil.addFermenterRecipes(waterPlantStack, ForestryAPI.activeMode.getIntegerSetting("fermenter.yield.wheat"), Fluids.BIOMASS); - } - } - } - - private static void addMetaFlower(ImmutableMap flowerMap, String flowertype, boolean plantable) { - for (Map.Entry flower : flowerMap.entrySet()) { - Block flowerBlock = GameRegistry.findBlock(PlantMP, flower.getKey()); - ItemStack flowerStack = GameRegistry.findItemStack(PlantMP, flower.getKey(), 1); - FlowerManager.flowerRegistry.registerAcceptableFlower(flowerBlock, flowertype); - if (plantable && flowerBlock != null) { - FlowerManager.flowerRegistry.registerPlantableFlower(flowerBlock, 0, 0.75, flowertype); - } - if (flowerStack != null && flowerBlock != null) { - Farmables.farmables.get("farmWheat").add(new FarmableGenericCrop(flowerStack, flowerBlock, flower.getValue())); - if (flower.getValue() < 5) { - Farmables.farmables.get("farmOrchard").add(new FarmableBasicFruit(flowerBlock, flower.getValue())); - } - } - } - } -} diff --git a/src/main/java/forestry/plugins/compat/PluginRotaryCraft.java b/src/main/java/forestry/plugins/compat/PluginRotaryCraft.java deleted file mode 100644 index f5828253a..000000000 --- a/src/main/java/forestry/plugins/compat/PluginRotaryCraft.java +++ /dev/null @@ -1,59 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v3 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: - * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges - ******************************************************************************/ -package forestry.plugins.compat; - -import net.minecraft.block.Block; -import net.minecraft.item.ItemStack; - -import cpw.mods.fml.common.registry.GameRegistry; - -import forestry.api.core.ForestryAPI; -import forestry.api.farming.Farmables; -import forestry.api.recipes.RecipeManagers; -import forestry.core.config.Constants; -import forestry.core.fluids.Fluids; -import forestry.core.utils.ModUtil; -import forestry.farming.logic.FarmableBasicFruit; -import forestry.farming.logic.FarmableGenericCrop; -import forestry.plugins.ForestryPlugin; -import forestry.plugins.Plugin; - -@Plugin(pluginID = "RotaryCraft", name = "RotaryCraft", author = "Nirek", url = Constants.URL, unlocalizedDescription = "for.plugin.rotarycraft.description") -public class PluginRotaryCraft extends ForestryPlugin { - - private static final String RC = "RotaryCraft"; - - @Override - public boolean isAvailable() { - return ModUtil.isModLoaded(RC); - } - - @Override - public String getFailMessage() { - return "RotaryCraft not found"; - } - - @Override - protected void registerRecipes() { - - ItemStack canolaSeed = GameRegistry.findItemStack(RC, "rotarycraft_item_canola", 1); - Block canolaCrop = GameRegistry.findBlock(RC, "rotarycraft_block_canola"); - - int seedAmount = (ForestryAPI.activeMode.getIntegerSetting("squeezer.liquid.seed") / 16); - seedAmount = Math.max(seedAmount, 1); // Produce at least 1 mb. - if (canolaSeed != null && canolaCrop != null) { - RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{canolaSeed}, Fluids.SEEDOIL.getFluid(seedAmount)); - Farmables.farmables.get("farmWheat").add(new FarmableGenericCrop(canolaSeed, canolaCrop, 9)); - Farmables.farmables.get("farmOrchard").add(new FarmableBasicFruit(canolaCrop, 9)); - } - } - -} diff --git a/src/main/java/forestry/plugins/compat/PluginWitchery.java b/src/main/java/forestry/plugins/compat/PluginWitchery.java deleted file mode 100644 index 0a815078e..000000000 --- a/src/main/java/forestry/plugins/compat/PluginWitchery.java +++ /dev/null @@ -1,112 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v3 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: - * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges - ******************************************************************************/ -package forestry.plugins.compat; - -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; - -import java.util.Map; - -import net.minecraft.block.Block; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; - -import net.minecraftforge.oredict.OreDictionary; - -import cpw.mods.fml.common.event.FMLInterModComms; -import cpw.mods.fml.common.registry.GameData; -import cpw.mods.fml.common.registry.GameRegistry; - -import forestry.api.apiculture.FlowerManager; -import forestry.api.core.ForestryAPI; -import forestry.api.farming.Farmables; -import forestry.api.recipes.RecipeManagers; -import forestry.core.config.Constants; -import forestry.core.fluids.Fluids; -import forestry.core.recipes.RecipeUtil; -import forestry.core.utils.ModUtil; -import forestry.farming.logic.FarmableBasicFruit; -import forestry.farming.logic.FarmableGenericCrop; -import forestry.plugins.ForestryPlugin; -import forestry.plugins.Plugin; - -@Plugin(pluginID = "Witchery", name = "Witchery", author = "Nirek", url = Constants.URL, unlocalizedDescription = "for.plugin.witchery.description") -public class PluginWitchery extends ForestryPlugin { - - private static final String Witch = "witchery"; - - @Override - public boolean isAvailable() { - return ModUtil.isModLoaded(Witch); - } - - @Override - public String getFailMessage() { - return "Witchery not found"; - } - - @Override - protected void registerRecipes() { - - ImmutableList flowersAccept = ImmutableList.of( - "bloodrose", - "plantmine", - "glintweed" - ); - - ImmutableMap cropSeed = ImmutableMap.builder() - .put("belladonna", 4) - .put("mandrake", 4) - .put("mindrake", 4) - .put("snowbell", 4) - .put("wolfsbane", 7) - .put("wormwood", 4) - .build(); - ImmutableList cropDirect = ImmutableList.of( - "garlic" //meta 5 - ); - int seedamount = ForestryAPI.activeMode.getIntegerSetting("squeezer.liquid.seed"); - - Item saplingItem = GameRegistry.findItem(Witch, "witchsapling"); - ItemStack saplingStack = new ItemStack(saplingItem, 1, OreDictionary.WILDCARD_VALUE); - RecipeUtil.addFermenterRecipes(saplingStack, ForestryAPI.activeMode.getIntegerSetting("fermenter.yield.wheat"), Fluids.BIOMASS); - String saplingName = GameData.getItemRegistry().getNameForObject(saplingItem); - FMLInterModComms.sendMessage(Constants.MOD, "add-farmable-sapling", String.format("farmArboreal@%s.-1", saplingName)); - - for (String flowerAcceptName : flowersAccept) { - Block flowerBlock = GameRegistry.findBlock(Witch, flowerAcceptName); - if (flowerBlock != null) { - FlowerManager.flowerRegistry.registerAcceptableFlower(flowerBlock, FlowerManager.FlowerTypeVanilla); - } - } - for (String cropDirectName : cropDirect) { - Block cropDirectBlock = GameRegistry.findBlock(Witch, cropDirectName + "plant"); - ItemStack cropDirectStack = GameRegistry.findItemStack(Witch, cropDirectName, 1); - if (cropDirectStack != null && cropDirectBlock != null) { - Farmables.farmables.get("farmWheat").add(new FarmableGenericCrop(cropDirectStack, cropDirectBlock, 5)); - Farmables.farmables.get("farmOrchard").add(new FarmableBasicFruit(cropDirectBlock, 5)); - } - } - for (Map.Entry cropSeedName : cropSeed.entrySet()) { - Block cropSeedBlock = GameRegistry.findBlock(Witch, cropSeedName.getKey()); - ItemStack cropSeedStack = GameRegistry.findItemStack(Witch, "seeds" + cropSeedName.getKey(), 1); - if (cropSeedStack != null && cropSeedBlock != null) { - RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{cropSeedStack}, Fluids.SEEDOIL.getFluid(seedamount)); - Farmables.farmables.get("farmWheat").add(new FarmableGenericCrop(cropSeedStack, cropSeedBlock, cropSeedName.getValue())); - Farmables.farmables.get("farmOrchard").add(new FarmableBasicFruit(cropSeedBlock, cropSeedName.getValue())); - } - - } - Block artichokeBlock = GameRegistry.findBlock(Witch, "artichoke"); - Farmables.farmables.get("farmOrchard").add(new FarmableBasicFruit(artichokeBlock, 4)); - - } -} diff --git a/src/main/java/forestry/storage/BackpackDefinition.java b/src/main/java/forestry/storage/BackpackDefinition.java index e5a7fe6b8..64dea70d8 100755 --- a/src/main/java/forestry/storage/BackpackDefinition.java +++ b/src/main/java/forestry/storage/BackpackDefinition.java @@ -19,14 +19,12 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.StatCollector; - import net.minecraftforge.oredict.OreDictionary; -import cpw.mods.fml.common.registry.GameData; - import forestry.api.apiculture.BeeManager; import forestry.api.lepidopterology.ButterflyManager; import forestry.api.storage.IBackpackDefinition; +import forestry.core.utils.ItemStackUtil; public class BackpackDefinition implements IBackpackDefinition { @@ -60,8 +58,8 @@ public class BackpackDefinition implements IBackpackDefinition { Item item = backpack.getItem(); String display = ("" + StatCollector.translateToLocal(item.getUnlocalizedNameInefficiently(backpack) + ".name")).trim(); - if (backpack.stackTagCompound != null && backpack.stackTagCompound.hasKey("display", 10)) { - NBTTagCompound nbt = backpack.stackTagCompound.getCompoundTag("display"); + if (backpack.hasTagCompound() && backpack.getTagCompound().hasKey("display", 10)) { + NBTTagCompound nbt = backpack.getTagCompound().getCompoundTag("display"); if (nbt.hasKey("Name", 8)) { display = nbt.getString("Name"); @@ -92,7 +90,7 @@ public class BackpackDefinition implements IBackpackDefinition { return; } - String itemStackString = GameData.getItemRegistry().getNameForObject(item); + String itemStackString = ItemStackUtil.getItemNameFromRegistryAsSting(item); int meta = validItem.getItemDamage(); if (meta != OreDictionary.WILDCARD_VALUE) { @@ -178,7 +176,7 @@ public class BackpackDefinition implements IBackpackDefinition { return false; } - String itemStackStringWild = GameData.getItemRegistry().getNameForObject(item); + String itemStackStringWild = ItemStackUtil.getItemNameFromRegistryAsSting(item); if (validItemStacks.contains(itemStackStringWild)) { return true; } diff --git a/src/main/java/forestry/storage/CrateRegistry.java b/src/main/java/forestry/storage/CrateRegistry.java index ba3bdf43d..f98c3bcf0 100644 --- a/src/main/java/forestry/storage/CrateRegistry.java +++ b/src/main/java/forestry/storage/CrateRegistry.java @@ -13,9 +13,7 @@ package forestry.storage; import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; - -import cpw.mods.fml.common.registry.GameRegistry; - +import net.minecraftforge.fml.common.registry.GameRegistry; import forestry.api.storage.ICrateRegistry; import forestry.core.items.ItemCrated; import forestry.core.utils.Log; diff --git a/src/main/java/forestry/storage/ResupplyHandler.java b/src/main/java/forestry/storage/ResupplyHandler.java index 70988e6b4..da842d46f 100755 --- a/src/main/java/forestry/storage/ResupplyHandler.java +++ b/src/main/java/forestry/storage/ResupplyHandler.java @@ -19,9 +19,7 @@ import net.minecraft.inventory.ContainerPlayer; import net.minecraft.item.ItemStack; import net.minecraftforge.common.MinecraftForge; - -import cpw.mods.fml.common.eventhandler.Event; - +import net.minecraftforge.fml.common.eventhandler.Event; import forestry.api.storage.BackpackResupplyEvent; import forestry.core.IResupplyHandler; import forestry.core.inventory.ItemInventory; diff --git a/src/main/java/forestry/storage/items/ItemBackpack.java b/src/main/java/forestry/storage/items/ItemBackpack.java index 9bdcea510..2288e2285 100755 --- a/src/main/java/forestry/storage/items/ItemBackpack.java +++ b/src/main/java/forestry/storage/items/ItemBackpack.java @@ -13,21 +13,23 @@ package forestry.storage.items; import java.util.List; import java.util.Locale; -import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.client.renderer.ItemMeshDefinition; +import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.common.util.ForgeDirection; - -import cpw.mods.fml.common.eventhandler.Event; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - +import net.minecraftforge.fml.common.eventhandler.Event; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +import forestry.api.core.IModelManager; import forestry.api.storage.BackpackStowEvent; import forestry.api.storage.EnumBackpackType; import forestry.api.storage.IBackpackDefinition; @@ -38,7 +40,6 @@ import forestry.core.inventory.ItemInventory; import forestry.core.inventory.wrappers.IInvSlot; import forestry.core.inventory.wrappers.InventoryIterator; import forestry.core.items.ItemWithGui; -import forestry.core.render.TextureManager; import forestry.core.tiles.TileUtil; import forestry.core.utils.InventoryUtil; import forestry.core.utils.StringUtil; @@ -85,13 +86,13 @@ public class ItemBackpack extends ItemWithGui { } @Override - public boolean onItemUse(ItemStack itemstack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) { - return getInventoryHit(world, x, y, z, side) != null; + public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ) { + return getInventoryHit(world, pos, side) != null; } @Override - public boolean onItemUseFirst(ItemStack itemstack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) { - + public boolean onItemUseFirst(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ) { + if (world.isRemote) { return false; } @@ -101,7 +102,7 @@ public class ItemBackpack extends ItemWithGui { return false; } - return evaluateTileHit(itemstack, player, world, x, y, z, side); + return evaluateTileHit(stack, player, world, pos, side); } public static ItemStack tryStowing(EntityPlayer player, ItemStack backpackStack, ItemStack stack) { @@ -137,16 +138,16 @@ public class ItemBackpack extends ItemWithGui { itemstack.setItemDamage(nextMode); } - private static IInventory getInventoryHit(World world, int x, int y, int z, int side) { - TileEntity targeted = world.getTileEntity(x, y, z); - return TileUtil.getInventoryFromTile(targeted, ForgeDirection.getOrientation(side)); + private static IInventory getInventoryHit(World world, BlockPos pos, EnumFacing side) { + TileEntity targeted = world.getTileEntity(pos); + return TileUtil.getInventoryFromTile(targeted, side); } - private boolean evaluateTileHit(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side) { + private boolean evaluateTileHit(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side) { // Shift right-clicking on an inventory tile will attempt to transfer // items contained in the backpack - IInventory inventory = getInventoryHit(world, x, y, z, side); + IInventory inventory = getInventoryHit(world, pos, side); // Process only inventories if (inventory != null) { @@ -227,35 +228,42 @@ public class ItemBackpack extends ItemWithGui { return definition.getName(itemstack); } - /* ICONS */ + /* MODELS */ @SideOnly(Side.CLIENT) - private IIcon[] icons; + private ModelResourceLocation[] models; + + @SideOnly(Side.CLIENT) + public static int i = 0; @SideOnly(Side.CLIENT) @Override - public void registerIcons(IIconRegister register) { - icons = new IIcon[6]; - + public void registerModel(Item item, IModelManager manager) { EnumBackpackType t = type == EnumBackpackType.APIARIST ? EnumBackpackType.T1 : type; String typeTag = "backpacks/" + t.toString().toLowerCase(Locale.ENGLISH); - - icons[0] = TextureManager.registerTex(register, typeTag + ".cloth"); - icons[1] = TextureManager.registerTex(register, typeTag + ".outline"); - icons[2] = TextureManager.registerTex(register, "backpacks/neutral"); - icons[3] = TextureManager.registerTex(register, "backpacks/locked"); - icons[4] = TextureManager.registerTex(register, "backpacks/receive"); - icons[5] = TextureManager.registerTex(register, "backpacks/resupply"); + models = new ModelResourceLocation[4]; + models[0] = new ModelResourceLocation("forestry:" + typeTag + "_neutral", "inventory"); + models[1] = new ModelResourceLocation("forestry:" + typeTag + "_locked", "inventory"); + models[2] = new ModelResourceLocation("forestry:" + typeTag + "_receive", "inventory"); + models[3] = new ModelResourceLocation("forestry:" + typeTag + "_resupply", "inventory"); + if (i == 0 && (type == EnumBackpackType.T1 || type == EnumBackpackType.APIARIST) || i == 1 && type == EnumBackpackType.T2) { + manager.registerVariant(item, new ResourceLocation("forestry:" + typeTag + "_neutral")); + manager.registerVariant(item, new ResourceLocation("forestry:" + typeTag + "_locked")); + manager.registerVariant(item, new ResourceLocation("forestry:" + typeTag + "_receive")); + manager.registerVariant(item, new ResourceLocation("forestry:" + typeTag + "_resupply")); + i++; + } + manager.registerItemModel(item, new BackpackMeshDefinition()); } - // Return true to enable color overlay - client side only - @Override - public boolean requiresMultipleRenderPasses() { - return true; - } + @SideOnly(Side.CLIENT) + private class BackpackMeshDefinition implements ItemMeshDefinition { + + @Override + public ModelResourceLocation getModelLocation(ItemStack stack) { + EnumBackpackType t = type == EnumBackpackType.APIARIST ? EnumBackpackType.T1 : type; + return models[stack.getItemDamage()]; + } - @Override - public int getRenderPasses(int metadata) { - return 3; } @Override @@ -270,27 +278,6 @@ public class ItemBackpack extends ItemWithGui { } } - @SideOnly(Side.CLIENT) - @Override - public IIcon getIconFromDamageForRenderPass(int i, int j) { - if (j == 0) { - return icons[0]; - } - if (j == 1) { - return icons[1]; - } - - if (i > 2) { - return icons[5]; - } else if (i > 1) { - return icons[4]; - } else if (i > 0) { - return icons[3]; - } else { - return icons[2]; - } - } - private static int getSlotsForType(EnumBackpackType type) { switch (type) { case APIARIST: diff --git a/src/main/java/forestry/storage/proxy/ProxyStorage.java b/src/main/java/forestry/storage/proxy/ProxyStorage.java index 80d89f497..80bd2621e 100644 --- a/src/main/java/forestry/storage/proxy/ProxyStorage.java +++ b/src/main/java/forestry/storage/proxy/ProxyStorage.java @@ -10,11 +10,9 @@ ******************************************************************************/ package forestry.storage.proxy; -import forestry.core.items.ItemCrated; - public class ProxyStorage { - public void registerCrateForRendering(ItemCrated crate) { + public void registerCrateModelLoader() { } } diff --git a/src/main/java/forestry/storage/proxy/ProxyStorageClient.java b/src/main/java/forestry/storage/proxy/ProxyStorageClient.java index 53c45eeb4..2c40150fa 100644 --- a/src/main/java/forestry/storage/proxy/ProxyStorageClient.java +++ b/src/main/java/forestry/storage/proxy/ProxyStorageClient.java @@ -10,17 +10,13 @@ ******************************************************************************/ package forestry.storage.proxy; -import net.minecraftforge.client.MinecraftForgeClient; - -import forestry.core.items.ItemCrated; -import forestry.core.render.RenderCrateItem; +import net.minecraftforge.client.model.ModelLoaderRegistry; +import forestry.core.render.model.ModelCrate; public class ProxyStorageClient extends ProxyStorage { - private static final RenderCrateItem crateRenderer = new RenderCrateItem(); - @Override - public void registerCrateForRendering(ItemCrated crate) { - MinecraftForgeClient.registerItemRenderer(crate, crateRenderer); + public void registerCrateModelLoader() { + ModelLoaderRegistry.registerLoader(ModelCrate.Loader.instance); } } diff --git a/src/main/java/net/minecraftforge/debug/DynBucketTest.java b/src/main/java/net/minecraftforge/debug/DynBucketTest.java new file mode 100644 index 000000000..cfa812818 --- /dev/null +++ b/src/main/java/net/minecraftforge/debug/DynBucketTest.java @@ -0,0 +1,177 @@ +package net.minecraftforge.debug; + +import java.util.List; + +import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.ItemMeshDefinition; +import net.minecraft.client.resources.model.ModelBakery; +import net.minecraft.client.resources.model.ModelResourceLocation; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.init.Items; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.client.model.ModelLoader; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.debug.ModelFluidDebug.TestFluid; +import net.minecraftforge.debug.ModelFluidDebug.TestGas; +import net.minecraftforge.event.entity.player.FillBucketEvent; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidContainerRegistry; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.IFluidBlock; +import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.fml.common.Mod.EventHandler; +import net.minecraftforge.fml.common.SidedProxy; +import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; +import net.minecraftforge.fml.common.eventhandler.Event.Result; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.registry.GameRegistry; + +@Mod(modid = "DynBucketTest", version = "0.1", dependencies = "after:" + ModelFluidDebug.MODID) +public class DynBucketTest +{ + public static final Item dynBucket = new DynBucket(); + public static final Item dynBottle = new DynBottle(); + + @SidedProxy + public static CommonProxy proxy; + + public static class CommonProxy + { + void setupModels() + { + } + } + + public static class ServerProxy extends CommonProxy {} + + public static class ClientProxy extends CommonProxy + { + @Override + void setupModels() + { + ModelLoader.setBucketModelDefinition(dynBucket); + + final ModelResourceLocation bottle = new ModelResourceLocation(new ResourceLocation("forge", "dynbottle"), "inventory"); + ModelLoader.setCustomMeshDefinition(dynBottle, new ItemMeshDefinition() + { + @Override + public ModelResourceLocation getModelLocation(ItemStack stack) + { + return bottle; + } + }); + ModelBakery.registerItemVariants(dynBottle, bottle); + } + } + + @EventHandler + public void preInit(FMLPreInitializationEvent event) + { + GameRegistry.registerItem(dynBucket, "dynbucket"); + GameRegistry.registerItem(dynBottle, "dynbottle"); + + // register fluid containers + int i = 0; + //registerFluidContainer(FluidRegistry.WATER, i++); + //registerFluidContainer(FluidRegistry.LAVA, i++); + registerFluidContainer(FluidRegistry.getFluid(TestFluid.name), i++); + registerFluidContainer(FluidRegistry.getFluid(TestGas.name), i++); + + i = 0; + registerFluidContainer2(FluidRegistry.WATER, i++); + registerFluidContainer2(FluidRegistry.LAVA, i++); + registerFluidContainer2(FluidRegistry.getFluid(TestFluid.name), i++); + registerFluidContainer2(FluidRegistry.getFluid(TestGas.name), i++); + + // Set TestFluidBlocks blockstate to use milk instead of testfluid for the texture to be loaded + FluidContainerRegistry.registerFluidContainer(FluidRegistry.getFluid("milk"), new ItemStack(Items.milk_bucket), FluidContainerRegistry.EMPTY_BUCKET); + + proxy.setupModels(); + MinecraftForge.EVENT_BUS.register(this); + } + + private void registerFluidContainer(Fluid fluid, int meta) + { + if (fluid == null) + return; + + FluidStack fs = new FluidStack(fluid, FluidContainerRegistry.BUCKET_VOLUME); + ItemStack stack = new ItemStack(dynBucket, 1, meta); + FluidContainerRegistry.registerFluidContainer(fs, stack, new ItemStack(Items.bucket)); + } + + private void registerFluidContainer2(Fluid fluid, int meta) + { + if (fluid == null) + return; + + FluidStack fs = new FluidStack(fluid, 250); + ItemStack stack = new ItemStack(dynBottle, 1, meta); + FluidContainerRegistry.registerFluidContainer(fs, stack, new ItemStack(Items.glass_bottle)); + } + + @SubscribeEvent + public void onBucketFill(FillBucketEvent event) + { + IBlockState state = event.world.getBlockState(event.target.getBlockPos()); + if (state.getBlock() instanceof IFluidBlock) + { + Fluid fluid = ((IFluidBlock) state.getBlock()).getFluid(); + FluidStack fs = new FluidStack(fluid, FluidContainerRegistry.BUCKET_VOLUME); + + ItemStack filled = FluidContainerRegistry.fillFluidContainer(fs, event.current); + if (filled != null) + { + event.result = filled; + event.setResult(Result.ALLOW); + } + } + } + + public static class DynBucket extends Item + { + public DynBucket() + { + setUnlocalizedName("dynbucket"); + setMaxStackSize(1); + setHasSubtypes(true); + setCreativeTab(CreativeTabs.tabMisc); + } + + @Override + public void getSubItems(Item itemIn, CreativeTabs tab, List subItems) + { + for (int i = 0; i < 4; i++) + { + ItemStack bucket = new ItemStack(this, 1, i); + if (FluidContainerRegistry.isFilledContainer(bucket)) + subItems.add(bucket); + } + } + } + + public static class DynBottle extends Item + { + public DynBottle() + { + setUnlocalizedName("dynbottle"); + setMaxStackSize(1); + setHasSubtypes(true); + setCreativeTab(CreativeTabs.tabMisc); + } + + @Override + public void getSubItems(Item itemIn, CreativeTabs tab, List subItems) + { + for (int i = 0; i < 4; i++) + { + ItemStack bucket = new ItemStack(this, 1, i); + if (FluidContainerRegistry.isFilledContainer(bucket)) + subItems.add(bucket); + } + } + } +} diff --git a/src/main/java/net/minecraftforge/debug/EnumPlantTypeTest.java b/src/main/java/net/minecraftforge/debug/EnumPlantTypeTest.java new file mode 100644 index 000000000..2f7e7aa86 --- /dev/null +++ b/src/main/java/net/minecraftforge/debug/EnumPlantTypeTest.java @@ -0,0 +1,49 @@ +package net.minecraftforge.debug; + +import net.minecraftforge.common.BiomeManager.BiomeType; +import net.minecraftforge.common.EnumPlantType; +import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.fml.common.event.FMLInitializationEvent; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; + +@Mod(modid = "enumplanttypetest") +public class EnumPlantTypeTest +{ + private static Logger LOGGER = LogManager.getLogger(); + + @Mod.EventHandler + public void onInit(FMLInitializationEvent event) + { + BiomeType biomeType = null; + try + { + biomeType = BiomeType.getType("FAKE"); + } + catch (NullPointerException npe) + { + LOGGER.warn("EnumHelper in BiomeType is working incorrectly!", npe); + } + finally + { + if (biomeType == null || !biomeType.name().equals("FAKE")) + LOGGER.warn("EnumHelper in BiomeType is working incorrectly!"); + } + EnumPlantType plantType = null; + if (plantType == null || !plantType.name().equals("FAKE")) + ; + try + { + plantType = EnumPlantType.getPlantType("FAKE"); + } + catch (NullPointerException npe) + { + LOGGER.warn("EnumHelper in EnumPlantType is working incorrectly!", npe); + } + finally + { + if (plantType == null || !plantType.name().equals("FAKE")) + LOGGER.warn("EnumHelper in EnumPlantType is working incorrectly!"); + } + } +} diff --git a/src/main/java/net/minecraftforge/debug/ForgeBlockStatesLoaderDebug.java b/src/main/java/net/minecraftforge/debug/ForgeBlockStatesLoaderDebug.java new file mode 100644 index 000000000..271b392af --- /dev/null +++ b/src/main/java/net/minecraftforge/debug/ForgeBlockStatesLoaderDebug.java @@ -0,0 +1,132 @@ +package net.minecraftforge.debug; + +import java.util.Map; +import java.util.Map.Entry; + +import net.minecraft.block.Block; +import net.minecraft.block.BlockWall; +import net.minecraft.block.material.Material; +import net.minecraft.block.properties.PropertyEnum; +import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.block.statemap.IStateMapper; +import net.minecraft.client.renderer.block.statemap.StateMap; +import net.minecraft.client.resources.model.ModelResourceLocation; +import net.minecraft.init.Blocks; +import net.minecraft.item.Item; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemMultiTexture; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IStringSerializable; +import net.minecraftforge.client.model.ModelLoader; +import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.fml.common.Mod.EventHandler; +import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; +import net.minecraftforge.fml.common.registry.GameData; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import com.google.common.base.Function; +import com.google.common.collect.Maps; + +@Mod(modid = ForgeBlockStatesLoaderDebug.MODID) +public class ForgeBlockStatesLoaderDebug { + public static final String MODID = "ForgeBlockStatesLoader"; + public static final String ASSETS = "forgeblockstatesloader:"; + + public static final Block blockCustom = new CustomMappedBlock(); + public static final String nameCustomWall = "custom_wall"; + public static final BlockWall blockCustomWall = new BlockWall(Blocks.cobblestone); + public static final ItemMultiTexture itemCustomWall = (ItemMultiTexture)new ItemMultiTexture(blockCustomWall, blockCustomWall, new Function() + { + @Override + public String apply(ItemStack stack) + { + return BlockWall.EnumType.byMetadata(stack.getMetadata()).getUnlocalizedName(); + } + }).setRegistryName(nameCustomWall); + + @EventHandler + public void preInit(FMLPreInitializationEvent event) + { + blockCustom.setUnlocalizedName(MODID + ".customBlock").setRegistryName("customBlock"); + GameRegistry.registerBlock(blockCustom); + + blockCustomWall.setUnlocalizedName(MODID + ".customWall").setRegistryName(nameCustomWall); + GameRegistry.registerBlock(blockCustomWall, (Class)null); + GameRegistry.registerItem(itemCustomWall); + GameData.getBlockItemMap().put(blockCustomWall, itemCustomWall); + + if (event.getSide() == Side.CLIENT) + preInitClient(event); + } + + @SideOnly(Side.CLIENT) + public void preInitClient(FMLPreInitializationEvent event) + { + ModelLoader.setCustomStateMapper(blockCustom, new StateMap.Builder().withName(CustomMappedBlock.VARIANT).build()); + + ModelLoader.setCustomStateMapper(blockCustomWall, new IStateMapper() + { + StateMap stateMap = new StateMap.Builder().withName(BlockWall.VARIANT).withSuffix("_wall").build(); + @Override + public Map putStateModelLocations(Block block) + { + Map map = stateMap.putStateModelLocations(block); + Map newMap = Maps.newHashMap(); + + for (Entry e : map.entrySet()) + { + ModelResourceLocation loc = e.getValue(); + newMap.put(e.getKey(), new ModelResourceLocation(ASSETS + loc.getResourcePath(), loc.getVariant())); + } + + return newMap; + } + }); + Item customWallItem = Item.getItemFromBlock(blockCustomWall); + ModelLoader.setCustomModelResourceLocation(customWallItem, 0, new ModelResourceLocation(ASSETS + "cobblestone_wall", "inventory")); + ModelLoader.setCustomModelResourceLocation(customWallItem, 1, new ModelResourceLocation(ASSETS + "mossy_cobblestone_wall", "inventory")); + } + + // this block is never actually used, it's only needed for the error message on load to see the variant it maps to + public static class CustomMappedBlock extends Block + { + public static final PropertyEnum VARIANT = PropertyEnum.create("type", CustomVariant.class); + + protected CustomMappedBlock() { + super(Material.rock); + + this.setUnlocalizedName(MODID + ".customMappedBlock"); + } + + @Override + protected BlockState createBlockState() { + return new BlockState(this, VARIANT); + } + + @Override + public int getMetaFromState(IBlockState state) + { + return state.getValue(VARIANT).ordinal(); + } + + @Override + public IBlockState getStateFromMeta(int meta) + { + if(meta > CustomVariant.values().length || meta < 0) + meta = 0; + + return this.getDefaultState().withProperty(VARIANT, CustomVariant.values()[meta]); + } + + public static enum CustomVariant implements IStringSerializable { + TypeA, + TypeB; + + @Override + public String getName() { return this.toString(); }; + } + } +} diff --git a/src/main/java/net/minecraftforge/debug/ItemLayerModelDebug.java b/src/main/java/net/minecraftforge/debug/ItemLayerModelDebug.java new file mode 100644 index 000000000..da52b7f66 --- /dev/null +++ b/src/main/java/net/minecraftforge/debug/ItemLayerModelDebug.java @@ -0,0 +1,57 @@ +package net.minecraftforge.debug; + +import net.minecraft.client.resources.model.ModelResourceLocation; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; +import net.minecraftforge.client.model.ModelLoader; +import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.fml.common.Mod.EventHandler; +import net.minecraftforge.fml.common.SidedProxy; +import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; +import net.minecraftforge.fml.common.registry.GameRegistry; + +@Mod(modid = ItemLayerModelDebug.MODID, version = ItemLayerModelDebug.VERSION) +public class ItemLayerModelDebug +{ + public static final String MODID = "ForgeDebugItemLayerModel"; + public static final String VERSION = "1.0"; + + @SidedProxy + public static CommonProxy proxy; + + @EventHandler + public void preInit(FMLPreInitializationEvent event) { proxy.preInit(event); } + + public static class CommonProxy + { + public void preInit(FMLPreInitializationEvent event) + { + GameRegistry.registerItem(TestItem.instance, TestItem.name); + } + } + + public static class ServerProxy extends CommonProxy {} + + public static class ClientProxy extends CommonProxy + { + private static ModelResourceLocation modelLocation = new ModelResourceLocation(MODID.toLowerCase() + ":" + TestItem.name, "inventory"); + @Override + public void preInit(FMLPreInitializationEvent event) + { + super.preInit(event); + ModelLoader.setCustomModelResourceLocation(TestItem.instance, 0, modelLocation); + } + } + + public static final class TestItem extends Item + { + public static final TestItem instance = new TestItem(); + public static final String name = "TestItem"; + + private TestItem() + { + setCreativeTab(CreativeTabs.tabBlock); + setUnlocalizedName(MODID + ":" + name); + } + } +} diff --git a/src/main/java/net/minecraftforge/debug/ItemTileDebug.java b/src/main/java/net/minecraftforge/debug/ItemTileDebug.java new file mode 100644 index 000000000..6a21bba96 --- /dev/null +++ b/src/main/java/net/minecraftforge/debug/ItemTileDebug.java @@ -0,0 +1,144 @@ +package net.minecraftforge.debug; + +import net.minecraft.block.BlockContainer; +import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; +import net.minecraft.client.resources.model.ModelResourceLocation; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; +import net.minecraftforge.client.ForgeHooksClient; +import net.minecraftforge.client.event.ModelBakeEvent; +import net.minecraftforge.client.model.ModelLoader; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.fml.client.registry.ClientRegistry; +import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.fml.common.Mod.EventHandler; +import net.minecraftforge.fml.common.SidedProxy; +import net.minecraftforge.fml.common.event.FMLInitializationEvent; +import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.registry.GameRegistry; +import static org.lwjgl.opengl.GL11.*; + +@Mod(modid = ItemTileDebug.MODID) +public class ItemTileDebug +{ + public static final String MODID = "ForgeDebugItemTile"; + + private static String blockName = MODID.toLowerCase() + ":" + TestBlock.name; + + @SidedProxy + public static CommonProxy proxy; + + @EventHandler + public void preInit(FMLPreInitializationEvent event) { proxy.preInit(event); } + + @EventHandler + public void init(FMLInitializationEvent event) { proxy.init(event); } + + public static class CommonProxy + { + public void preInit(FMLPreInitializationEvent event) + { + GameRegistry.registerBlock(TestBlock.instance, TestBlock.name); + GameRegistry.registerTileEntity(CustomTileEntity.class, MODID.toLowerCase() + ":custom_tile_entity"); + } + + public void init(FMLInitializationEvent event) {} + } + + public static class ServerProxy extends CommonProxy {} + + public static class ClientProxy extends CommonProxy + { + private static ModelResourceLocation itemLocation = new ModelResourceLocation(blockName, "inventory"); + + @SuppressWarnings("deprecation") + @Override + public void preInit(FMLPreInitializationEvent event) + { + super.preInit(event); + Item item = Item.getItemFromBlock(TestBlock.instance); + ForgeHooksClient.registerTESRItemStack(item, 0, CustomTileEntity.class); + ModelLoader.setCustomModelResourceLocation(item, 0, itemLocation); + MinecraftForge.EVENT_BUS.register(BakeEventHandler.instance); + } + + @Override + public void init(FMLInitializationEvent event) { + ClientRegistry.bindTileEntitySpecialRenderer(CustomTileEntity.class, TestTESR.instance); + } + } + + public static class BakeEventHandler + { + public static final BakeEventHandler instance = new BakeEventHandler(); + + private BakeEventHandler() {}; + + @SubscribeEvent + public void onModelBakeEvent(ModelBakeEvent event) + { + event.modelManager.getBlockModelShapes().registerBuiltInBlocks(TestBlock.instance); + } + } + + public static class TestTESR extends TileEntitySpecialRenderer + { + private static final TestTESR instance = new TestTESR(); + + private TestTESR() {} + + @Override + public void renderTileEntityAt(CustomTileEntity p_180535_1_, double x, double y, double z, float p_180535_8_, int p_180535_9_) + { + glPushMatrix(); + glTranslated(x, y, z); + GlStateManager.disableTexture2D(); + GlStateManager.disableLighting(); + glColor4f(.2f, 1, .1f, 1); + glBegin(GL_QUADS); + glVertex3f(0, .5f, 0); + glVertex3f(0, .5f, 1); + glVertex3f(1, .5f, 1); + glVertex3f(1, .5f, 0); + glEnd(); + glPopMatrix(); + GlStateManager.enableTexture2D(); + GlStateManager.enableLighting(); + } + } + + public static class TestBlock extends BlockContainer + { + public static final TestBlock instance = new TestBlock(); + public static final String name = "custom_model_block"; + + private TestBlock() + { + super(Material.iron); + setCreativeTab(CreativeTabs.tabBlock); + setUnlocalizedName(MODID + ":" + name); + } + + @Override + public boolean isOpaqueCube() { return false; } + + @Override + public boolean isFullCube() { return false; } + + @Override + public boolean isVisuallyOpaque() { return false; } + + @Override + public TileEntity createNewTileEntity(World world, int meta) + { + return new CustomTileEntity(); + } + } + + public static class CustomTileEntity extends TileEntity {} +} diff --git a/src/main/java/net/minecraftforge/debug/LayerBreakingTest.java b/src/main/java/net/minecraftforge/debug/LayerBreakingTest.java new file mode 100644 index 000000000..05cdf8a24 --- /dev/null +++ b/src/main/java/net/minecraftforge/debug/LayerBreakingTest.java @@ -0,0 +1,226 @@ + +package net.minecraftforge.debug; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.block.state.IBlockState; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.BlockModelShapes; +import net.minecraft.client.renderer.block.model.BakedQuad; +import net.minecraft.client.renderer.block.model.ItemCameraTransforms; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.renderer.vertex.VertexFormat; +import net.minecraft.client.resources.model.IBakedModel; +import net.minecraft.client.resources.model.ModelResourceLocation; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.init.Blocks; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumWorldBlockLayer; +import net.minecraftforge.client.event.ModelBakeEvent; +import net.minecraftforge.client.model.IFlexibleBakedModel; +import net.minecraftforge.client.model.ISmartBlockModel; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.fml.common.Mod.EventHandler; +import net.minecraftforge.fml.common.event.FMLInitializationEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; + +import com.google.common.primitives.Ints; + +@SuppressWarnings( "deprecation" ) +@Mod( modid = "LayerBreakingTest", name = "LayerBreakingTest", version = "0.0.0" ) +public class LayerBreakingTest +{ + public static final boolean ENABLE = true; + public static TestBlock testBlock; + + class TestBakedModel implements IFlexibleBakedModel + { + TextureAtlasSprite texture; + List list = new ArrayList(); + + private int[] vertexToInts(float x, float y, float z, int color, TextureAtlasSprite texture, int u, int v) + { + return new int[] { Float.floatToRawIntBits(x), Float.floatToRawIntBits(y), Float.floatToRawIntBits(z), color, Float.floatToRawIntBits(texture.getInterpolatedU(u)), Float.floatToRawIntBits(texture.getInterpolatedV(v)), 0 }; + } + + public TestBakedModel(TextureAtlasSprite sprite, boolean top) + { + texture = sprite; + if (top) + { + list.add(new BakedQuad(Ints.concat(vertexToInts(0.5f, 1.0f, 0, -1, texture, 8, 0), vertexToInts(0.5f, 1.0f, 1, -1, texture, 8, 16), vertexToInts(1, 1.0f, 1, -1, texture, 16, 16), vertexToInts(1, 1.0f, 0, -1, texture, 16, 0)), -1, EnumFacing.UP)); + } + else + { + list.add(new BakedQuad(Ints.concat(vertexToInts(0, 1.0f, 0, -1, texture, 0, 0), vertexToInts(0, 1.0f, 1, -1, texture, 0, 16), vertexToInts(0.5f, 1.0f, 1, -1, texture, 8, 16), vertexToInts(0.5f, 1.0f, 0, -1, texture, 8, 0)), -1, EnumFacing.DOWN)); + } + } + + @Override + public boolean isAmbientOcclusion() + { + return true; + } + + @Override + public boolean isGui3d() + { + return true; + } + + @Override + public boolean isBuiltInRenderer() + { + return false; + } + + @Override + public TextureAtlasSprite getParticleTexture() + { + return texture; + } + + @Override + public ItemCameraTransforms getItemCameraTransforms() + { + return ItemCameraTransforms.DEFAULT; + } + + @Override + public List getFaceQuads(EnumFacing side) + { + return Collections.emptyList(); + } + + @Override + public List getGeneralQuads() + { + return list; + } + + @Override + public VertexFormat getFormat() + { + return null; + } + }; + + class TestBlock extends Block + { + protected TestBlock() + { + super(Material.glass); + setHardness(7); + setCreativeTab(CreativeTabs.tabBlock); + } + + @Override + public boolean isOpaqueCube() + { + return false; + } + + @Override + public boolean isFullCube() + { + return false; + } + + @Override + public boolean canRenderInLayer(EnumWorldBlockLayer layer) + { + return layer == EnumWorldBlockLayer.SOLID || layer == EnumWorldBlockLayer.TRANSLUCENT; + } + }; + + class SmartModel implements IBakedModel, ISmartBlockModel + { + IFlexibleBakedModel solid; + IFlexibleBakedModel translucent; + + @Override + public List getFaceQuads(EnumFacing p_177551_1_) + { + return Collections.emptyList(); + } + + @Override + public List getGeneralQuads() + { + return Collections.emptyList(); + } + + @Override + public boolean isAmbientOcclusion() + { + return true; + } + + @Override + public boolean isGui3d() + { + return true; + } + + @Override + public boolean isBuiltInRenderer() + { + return false; + } + + @Override + public TextureAtlasSprite getParticleTexture() + { + return null; + } + + @Override + public ItemCameraTransforms getItemCameraTransforms() + { + return ItemCameraTransforms.DEFAULT; + } + + @Override + public IBakedModel handleBlockState(IBlockState state) + { + if (solid == null) + { + BlockModelShapes models = Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes(); + translucent = new TestBakedModel(models.getModelForState(Blocks.stained_glass.getStateFromMeta(3)).getParticleTexture(), true); + solid = new TestBakedModel(models.getModelForState(Blocks.cobblestone.getDefaultState()).getParticleTexture(), false); + } + + if (net.minecraftforge.client.MinecraftForgeClient.getRenderLayer() == EnumWorldBlockLayer.SOLID) + { + return solid; + } + else + { + return translucent; + } + } + }; + + @SubscribeEvent + public void onModelBakeEvent(ModelBakeEvent event) + { + event.modelRegistry.putObject(new ModelResourceLocation("layerbreakingtest:layer_breaking_test"), new SmartModel()); + } + + @EventHandler + public void init(FMLInitializationEvent event) + { + if (ENABLE && event.getSide() == Side.CLIENT) + { + MinecraftForge.EVENT_BUS.register(this); + GameRegistry.registerBlock(testBlock = new TestBlock(), "layer_breaking_test"); + } + } +} diff --git a/src/main/java/net/minecraftforge/debug/ModelAnimationDebug.java b/src/main/java/net/minecraftforge/debug/ModelAnimationDebug.java new file mode 100644 index 000000000..4ba5d9f46 --- /dev/null +++ b/src/main/java/net/minecraftforge/debug/ModelAnimationDebug.java @@ -0,0 +1,295 @@ +package net.minecraftforge.debug; + +import net.minecraft.block.Block; +import net.minecraft.block.BlockPistonBase; +import net.minecraft.block.material.Material; +import net.minecraft.block.properties.IProperty; +import net.minecraft.block.properties.PropertyBool; +import net.minecraft.block.properties.PropertyDirection; +import net.minecraft.block.state.IBlockState; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.BlockRendererDispatcher; +import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.renderer.RenderHelper; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.WorldRenderer; +import net.minecraft.client.renderer.texture.TextureMap; +import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; +import net.minecraft.client.renderer.vertex.DefaultVertexFormats; +import net.minecraft.client.resources.model.IBakedModel; +import net.minecraft.client.resources.model.ModelResourceLocation; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.ITickable; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; +import net.minecraftforge.client.model.ISmartBlockModel; +import net.minecraftforge.client.model.ModelLoader; +import net.minecraftforge.client.model.b3d.B3DLoader; +import net.minecraftforge.client.model.b3d.B3DLoader.B3DFrameProperty; +import net.minecraftforge.client.model.b3d.B3DLoader.B3DState; +import net.minecraftforge.common.property.ExtendedBlockState; +import net.minecraftforge.common.property.IExtendedBlockState; +import net.minecraftforge.common.property.IUnlistedProperty; +import net.minecraftforge.fml.client.registry.ClientRegistry; +import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.fml.common.Mod.EventHandler; +import net.minecraftforge.fml.common.SidedProxy; +import net.minecraftforge.fml.common.event.FMLInitializationEvent; +import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; +import net.minecraftforge.fml.common.registry.GameRegistry; + +import org.lwjgl.opengl.GL11; + +@Mod(modid = ModelAnimationDebug.MODID, version = ModelAnimationDebug.VERSION) +public class ModelAnimationDebug +{ + public static final String MODID = "forgedebugmodelanimation"; + public static final String VERSION = "0.0"; + + public static String blockName = "test_animation_block"; + public static final PropertyDirection FACING = PropertyDirection.create("facing"); + public static final PropertyBool STATIC = PropertyBool.create("static");; + + @SidedProxy + public static CommonProxy proxy; + + public static class CommonProxy + { + public void preInit(FMLPreInitializationEvent event) + { + GameRegistry.registerBlock(new Block(Material.wood) + { + { + setCreativeTab(CreativeTabs.tabBlock); + setUnlocalizedName(MODID + "." + blockName); + } + + @Override + public ExtendedBlockState createBlockState() + { + return new ExtendedBlockState(this, new IProperty[]{ FACING, STATIC }, new IUnlistedProperty[]{ B3DFrameProperty.instance }); + } + + @Override + public boolean isOpaqueCube() { return false; } + + @Override + public boolean isFullCube() { return false; } + + @Override + public IBlockState onBlockPlaced(World world, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer) + { + return this.getDefaultState().withProperty(FACING, BlockPistonBase.getFacingFromEntity(world, pos, placer)); + } + + @Override + public IBlockState getStateFromMeta(int meta) { + return getDefaultState().withProperty(FACING, EnumFacing.getFront(meta)); + } + + @Override + public int getMetaFromState(IBlockState state) { + return state.getValue(FACING).getIndex(); + } + + @Override + public boolean hasTileEntity(IBlockState state) { + return true; + } + + @Override + public TileEntity createTileEntity(World world, IBlockState state) { + return new Chest(state); + } + + @Override + public IBlockState getActualState(IBlockState state, IBlockAccess world, BlockPos pos) { + return state.withProperty(STATIC, true); + } + + /*@Override + public IBlockState getExtendedState(IBlockState state, IBlockAccess world, BlockPos pos) { + TileEntity te = world.getTileEntity(pos); + if(te instanceof Chest && state instanceof IExtendedBlockState) + { + return ((Chest)te).getState((IExtendedBlockState)state); + } + return super.getExtendedState(state, world, pos); + }*/ + + @Override + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumFacing side, float hitX, float hitY, float hitZ) + { + if(world.isRemote) + { + TileEntity te = world.getTileEntity(pos); + if(te instanceof Chest) + { + ((Chest)te).click(); + } + } + return false; + } + }, blockName); + } + + public void init(FMLInitializationEvent event) {} + } + + public static class ServerProxy extends CommonProxy {} + + public static class ClientProxy extends CommonProxy + { + @Override + public void preInit(FMLPreInitializationEvent event) + { + super.preInit(event); + B3DLoader.instance.addDomain(MODID); + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(GameRegistry.findBlock(MODID, blockName)), 0, new ModelResourceLocation(MODID.toLowerCase() + ":" + blockName, "inventory")); + ClientRegistry.bindTileEntitySpecialRenderer(Chest.class, ChestRenderer.instance); + } + + @Override + public void init(FMLInitializationEvent event) + { + super.init(event); + } + } + + @EventHandler + public void preInit(FMLPreInitializationEvent event) { proxy.preInit(event); } + + @EventHandler + public void init(FMLInitializationEvent event) { proxy.init(event); } + + private static class Chest extends TileEntity implements ITickable + { + private final int minFrame = 1; + private final int maxFrame = 10; + private int tick = minFrame; + private boolean opening = false; + private boolean closing = false; + + public Chest(IBlockState state) { + } + + /*public IExtendedBlockState getState(IExtendedBlockState state) { + return state.withProperty(B3DFrameProperty.instance, curState); + }*/ + + public void click() + { + if(opening || tick == maxFrame) + { + opening = false; + closing = true; + return; + } + if(closing || tick == minFrame) + { + closing = false; + opening = true; + return; + } + opening = true; + } + + @Override + public void update() + { + if(opening) + { + tick++; + if(tick >= maxFrame) + { + tick = maxFrame; + opening = false; + } + } + if(closing) + { + tick--; + if(tick <= minFrame) + { + tick = minFrame; + closing = false; + } + } + } + + public int getCurFrame() + { + return tick; + } + + public int getNextFrame() + { + if(opening) return Math.min(tick + 1, maxFrame); + if(closing) return Math.max(tick - 1, minFrame); + return tick; + } + } + + private static class ChestRenderer extends TileEntitySpecialRenderer + { + public static ChestRenderer instance = new ChestRenderer(); + private ChestRenderer() {} + + private BlockRendererDispatcher blockRenderer; + + @Override + public void renderTileEntityAt(Chest te, double x, double y, double z, float partialTick, int breakStage) + { + if(blockRenderer == null) blockRenderer = Minecraft.getMinecraft().getBlockRendererDispatcher(); + IBlockState state = te.getWorld().getBlockState(te.getPos()); + state = state.withProperty(STATIC, false); + IBakedModel model = this.blockRenderer.getBlockModelShapes().getModelForState(state); + if(state instanceof IExtendedBlockState) + { + IExtendedBlockState exState = (IExtendedBlockState)state; + if(exState.getUnlistedNames().contains(B3DFrameProperty.instance)) + { + exState = exState.withProperty(B3DFrameProperty.instance, new B3DState(null, te.getCurFrame(), te.getNextFrame(), partialTick)); + if(model instanceof ISmartBlockModel) + { + model = ((ISmartBlockModel)model).handleBlockState(exState); + } + } + } + + Tessellator tessellator = Tessellator.getInstance(); + WorldRenderer worldrenderer = tessellator.getWorldRenderer(); + this.bindTexture(TextureMap.locationBlocksTexture); + RenderHelper.disableStandardItemLighting(); + GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GlStateManager.enableBlend(); + GlStateManager.disableCull(); + + if (Minecraft.isAmbientOcclusionEnabled()) + { + GlStateManager.shadeModel(GL11.GL_SMOOTH); + } + else + { + GlStateManager.shadeModel(GL11.GL_FLAT); + } + + worldrenderer.begin(7, DefaultVertexFormats.BLOCK); + worldrenderer.setTranslation(x - te.getPos().getX(), y - te.getPos().getY(), z - te.getPos().getZ()); + + this.blockRenderer.getBlockModelRenderer().renderModel(te.getWorld(), model, state, te.getPos(), worldrenderer, false); + + worldrenderer.setTranslation(0, 0, 0); + tessellator.draw(); + + RenderHelper.enableStandardItemLighting(); + } + } +} + diff --git a/src/main/java/net/minecraftforge/debug/ModelBakeEventDebug.java b/src/main/java/net/minecraftforge/debug/ModelBakeEventDebug.java new file mode 100644 index 000000000..515115bc3 --- /dev/null +++ b/src/main/java/net/minecraftforge/debug/ModelBakeEventDebug.java @@ -0,0 +1,348 @@ +package net.minecraftforge.debug; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import net.minecraft.block.BlockContainer; +import net.minecraft.block.material.Material; +import net.minecraft.block.properties.IProperty; +import net.minecraft.block.properties.PropertyInteger; +import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.IBlockState; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.block.model.BakedQuad; +import net.minecraft.client.renderer.block.model.ItemCameraTransforms; +import net.minecraft.client.renderer.block.statemap.StateMapperBase; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.resources.model.IBakedModel; +import net.minecraft.client.resources.model.ModelResourceLocation; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.Vec3; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; +import net.minecraftforge.client.event.ModelBakeEvent; +import net.minecraftforge.client.model.ISmartBlockModel; +import net.minecraftforge.client.model.ISmartItemModel; +import net.minecraftforge.client.model.ModelLoader; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.common.property.ExtendedBlockState; +import net.minecraftforge.common.property.IExtendedBlockState; +import net.minecraftforge.common.property.IUnlistedProperty; +import net.minecraftforge.common.property.Properties; +import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.fml.common.Mod.EventHandler; +import net.minecraftforge.fml.common.SidedProxy; +import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.registry.GameRegistry; + +import com.google.common.primitives.Ints; + +@SuppressWarnings("deprecation") +@Mod(modid = ModelBakeEventDebug.MODID, version = ModelBakeEventDebug.VERSION) +public class ModelBakeEventDebug +{ + public static final String MODID = "ForgeDebugModelBakeEvent"; + public static final String VERSION = "1.0"; + public static final int cubeSize = 3; + + private static String blockName = MODID.toLowerCase() + ":" + CustomModelBlock.name; + + @SuppressWarnings("unchecked") + public static final IUnlistedProperty[] properties = new IUnlistedProperty[6]; + + static + { + for(EnumFacing f : EnumFacing.values()) + { + properties[f.ordinal()] = Properties.toUnlisted(PropertyInteger.create(f.getName(), 0, (1 << (cubeSize * cubeSize)) - 1)); + } + } + + @SidedProxy + public static CommonProxy proxy; + + @EventHandler + public void preInit(FMLPreInitializationEvent event) { proxy.preInit(event); } + + public static class CommonProxy + { + public void preInit(FMLPreInitializationEvent event) + { + GameRegistry.registerBlock(CustomModelBlock.instance, CustomModelBlock.name); + GameRegistry.registerTileEntity(CustomTileEntity.class, MODID.toLowerCase() + ":custom_tile_entity"); + } + } + + public static class ServerProxy extends CommonProxy {} + + public static class ClientProxy extends CommonProxy + { + private static ModelResourceLocation blockLocation = new ModelResourceLocation(blockName, "normal"); + private static ModelResourceLocation itemLocation = new ModelResourceLocation(blockName, "inventory"); + + @Override + public void preInit(FMLPreInitializationEvent event) + { + super.preInit(event); + Item item = Item.getItemFromBlock(CustomModelBlock.instance); + ModelLoader.setCustomModelResourceLocation(item, 0, itemLocation); + ModelLoader.setCustomStateMapper(CustomModelBlock.instance, new StateMapperBase(){ + @Override + protected ModelResourceLocation getModelResourceLocation(IBlockState p_178132_1_) + { + return blockLocation; + } + }); + MinecraftForge.EVENT_BUS.register(BakeEventHandler.instance); + } + } + + public static class BakeEventHandler + { + public static final BakeEventHandler instance = new BakeEventHandler(); + + private BakeEventHandler() {}; + + @SubscribeEvent + public void onModelBakeEvent(ModelBakeEvent event) + { + TextureAtlasSprite base = Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite("minecraft:blocks/slime"); + TextureAtlasSprite overlay = Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite("minecraft:blocks/redstone_block"); + IBakedModel customModel = new CustomModel(base, overlay); + event.modelRegistry.putObject(ClientProxy.blockLocation, customModel); + event.modelRegistry.putObject(ClientProxy.itemLocation, customModel); + } + } + + public static class CustomModelBlock extends BlockContainer + { + public static final CustomModelBlock instance = new CustomModelBlock(); + public static final String name = "custom_model_block"; + + private CustomModelBlock() + { + super(Material.iron); + setCreativeTab(CreativeTabs.tabBlock); + setUnlocalizedName(MODID + ":" + name); + } + + @Override + public int getRenderType() { return 3; } + + @Override + public boolean isOpaqueCube() { return false; } + + @Override + public boolean isFullCube() { return false; } + + @Override + public boolean isVisuallyOpaque() { return false; } + + @Override + public TileEntity createNewTileEntity(World world, int meta) + { + return new CustomTileEntity(); + } + + @Override + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumFacing side, float hitX, float hitY, float hitZ) + { + TileEntity te = world.getTileEntity(pos); + if(te instanceof CustomTileEntity) + { + CustomTileEntity cte = (CustomTileEntity) te; + Vec3 vec = revRotate(new Vec3(hitX - .5, hitY - .5, hitZ - .5), side).addVector(.5, .5, .5); + IUnlistedProperty property = properties[side.ordinal()]; + Integer value = cte.getState().getValue(property); + if(value == null) value = 0; + value ^= (1 << ( cubeSize * ((int)(vec.xCoord * (cubeSize - .0001))) + ((int)(vec.zCoord * (cubeSize - .0001))) )); + cte.setState(cte.getState().withProperty(property, value)); + world.markBlockRangeForRenderUpdate(pos, pos); + } + return true; + } + + @Override + public IBlockState getExtendedState(IBlockState state, IBlockAccess world, BlockPos pos) + { + TileEntity te = world.getTileEntity(pos); + if(te instanceof CustomTileEntity) + { + CustomTileEntity cte = (CustomTileEntity) te; + return cte.getState(); + } + return state; + } + + @Override + protected BlockState createBlockState() + { + return new ExtendedBlockState(this, new IProperty[0], properties); + } + } + + public static class CustomTileEntity extends TileEntity + { + private IExtendedBlockState state; + public CustomTileEntity() {} + + public IExtendedBlockState getState() + { + if(state == null) + { + state = (IExtendedBlockState)getBlockType().getDefaultState(); + } + return state; + } + + public void setState(IExtendedBlockState state) + { + this.state = state; + } + } + + public static class CustomModel implements IBakedModel, ISmartBlockModel, ISmartItemModel + { + private final TextureAtlasSprite base, overlay; + //private boolean hasStateSet = false; + private final IExtendedBlockState state; + + public CustomModel(TextureAtlasSprite base, TextureAtlasSprite overlay) + { + this(base, overlay, null); + } + + public CustomModel(TextureAtlasSprite base, TextureAtlasSprite overlay, IExtendedBlockState state) + { + this.base = base; + this.overlay = overlay; + this.state = state; + } + + @Override + public List getFaceQuads(EnumFacing side) + { + return Collections.emptyList(); + } + + private int[] vertexToInts(float x, float y, float z, int color, TextureAtlasSprite texture, float u, float v) + { + return new int[] { + Float.floatToRawIntBits(x), + Float.floatToRawIntBits(y), + Float.floatToRawIntBits(z), + color, + Float.floatToRawIntBits(texture.getInterpolatedU(u)), + Float.floatToRawIntBits(texture.getInterpolatedV(v)), + 0 + }; + } + + private BakedQuad createSidedBakedQuad(float x1, float x2, float z1, float z2, float y, TextureAtlasSprite texture, EnumFacing side) + { + Vec3 v1 = rotate(new Vec3(x1 - .5, y - .5, z1 - .5), side).addVector(.5, .5, .5); + Vec3 v2 = rotate(new Vec3(x1 - .5, y - .5, z2 - .5), side).addVector(.5, .5, .5); + Vec3 v3 = rotate(new Vec3(x2 - .5, y - .5, z2 - .5), side).addVector(.5, .5, .5); + Vec3 v4 = rotate(new Vec3(x2 - .5, y - .5, z1 - .5), side).addVector(.5, .5, .5); + return new BakedQuad(Ints.concat( + vertexToInts((float)v1.xCoord, (float)v1.yCoord, (float)v1.zCoord, -1, texture, 0, 0), + vertexToInts((float)v2.xCoord, (float)v2.yCoord, (float)v2.zCoord, -1, texture, 0, 16), + vertexToInts((float)v3.xCoord, (float)v3.yCoord, (float)v3.zCoord, -1, texture, 16, 16), + vertexToInts((float)v4.xCoord, (float)v4.yCoord, (float)v4.zCoord, -1, texture, 16, 0) + ), -1, side); + } + + @Override + public List getGeneralQuads() + { + int len = cubeSize * 5 + 1; + List ret = new ArrayList(); + for(EnumFacing f : EnumFacing.values()) + { + ret.add(createSidedBakedQuad(0, 1, 0, 1, 1, base, f)); + for(int i = 0; i < cubeSize; i++) + { + for(int j = 0; j < cubeSize; j++) + { + if(state != null) + { + Integer value = state.getValue(properties[f.ordinal()]); + if(value != null && (value & (1 << (i * cubeSize + j))) != 0) + { + ret.add(createSidedBakedQuad((float)(1 + i * 5) / len, (float)(5 + i * 5) / len, (float)(1 + j * 5) / len, (float)(5 + j * 5) / len, 1.0001f, overlay, f)); + } + } + } + } + } + return ret; + } + + @Override + public boolean isGui3d() { return true; } + + @Override + public boolean isAmbientOcclusion() { return true; } + + @Override + public boolean isBuiltInRenderer() { return false; } + + @Override + public TextureAtlasSprite getParticleTexture() { return this.base; } + + @Override + public ItemCameraTransforms getItemCameraTransforms() + { + return ItemCameraTransforms.DEFAULT; + } + + @Override + public IBakedModel handleBlockState(IBlockState state) + { + return new CustomModel(base, overlay, (IExtendedBlockState)state); + } + + @Override + public IBakedModel handleItemState(ItemStack stack) + { + IExtendedBlockState itemState = ((IExtendedBlockState)CustomModelBlock.instance.getDefaultState()).withProperty(properties[1], (1 << (cubeSize * cubeSize)) - 1); + return new CustomModel(base, overlay, itemState); + } + } + + private static Vec3 rotate(Vec3 vec, EnumFacing side) + { + switch(side) + { + case DOWN: return new Vec3( vec.xCoord, -vec.yCoord, -vec.zCoord); + case UP: return new Vec3( vec.xCoord, vec.yCoord, vec.zCoord); + case NORTH: return new Vec3( vec.xCoord, vec.zCoord, -vec.yCoord); + case SOUTH: return new Vec3( vec.xCoord, -vec.zCoord, vec.yCoord); + case WEST: return new Vec3(-vec.yCoord, vec.xCoord, vec.zCoord); + case EAST: return new Vec3( vec.yCoord, -vec.xCoord, vec.zCoord); + } + return null; + } + + private static Vec3 revRotate(Vec3 vec, EnumFacing side) + { + switch(side) + { + case DOWN: return new Vec3( vec.xCoord, -vec.yCoord, -vec.zCoord); + case UP: return new Vec3( vec.xCoord, vec.yCoord, vec.zCoord); + case NORTH: return new Vec3( vec.xCoord, -vec.zCoord, vec.yCoord); + case SOUTH: return new Vec3( vec.xCoord, vec.zCoord, -vec.yCoord); + case WEST: return new Vec3( vec.yCoord, -vec.xCoord, vec.zCoord); + case EAST: return new Vec3(-vec.yCoord, vec.xCoord, vec.zCoord); + } + return null; + } +} diff --git a/src/main/java/net/minecraftforge/debug/ModelFluidDebug.java b/src/main/java/net/minecraftforge/debug/ModelFluidDebug.java new file mode 100644 index 000000000..65acdd56c --- /dev/null +++ b/src/main/java/net/minecraftforge/debug/ModelFluidDebug.java @@ -0,0 +1,194 @@ +package net.minecraftforge.debug; + +import net.minecraft.block.material.Material; +import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.ItemMeshDefinition; +import net.minecraft.client.renderer.block.statemap.StateMapperBase; +import net.minecraft.client.resources.model.ModelBakery; +import net.minecraft.client.resources.model.ModelResourceLocation; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.client.model.ModelLoader; +import net.minecraftforge.fluids.BlockFluidClassic; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.fml.common.Mod.EventHandler; +import net.minecraftforge.fml.common.SidedProxy; +import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; +import net.minecraftforge.fml.common.registry.GameRegistry; + +@Mod(modid = ModelFluidDebug.MODID, version = ModelFluidDebug.VERSION) +public class ModelFluidDebug +{ + public static final String MODID = "ForgeDebugModelFluid"; + public static final String VERSION = "1.0"; + + @SidedProxy + public static CommonProxy proxy; + + public static final Fluid milkFluid = new Fluid("milk", new ResourceLocation("forge", "blocks/milk_still"), new ResourceLocation("forge", "blocks/milk_flow")); + + @EventHandler + public void preInit(FMLPreInitializationEvent event) { proxy.preInit(event); } + + public static class CommonProxy + { + public void preInit(FMLPreInitializationEvent event) + { + FluidRegistry.registerFluid(TestFluid.instance); + FluidRegistry.registerFluid(TestGas.instance); + FluidRegistry.registerFluid(milkFluid); + GameRegistry.registerBlock(TestFluidBlock.instance, TestFluidBlock.name); + GameRegistry.registerBlock(TestGasBlock.instance, TestGasBlock.name); + GameRegistry.registerBlock(MilkFluidBlock.instance, MilkFluidBlock.name); + } + } + + public static class ServerProxy extends CommonProxy {} + + public static class ClientProxy extends CommonProxy + { + private static ModelResourceLocation fluidLocation = new ModelResourceLocation(MODID.toLowerCase() + ":" + TestFluidBlock.name, "fluid"); + private static ModelResourceLocation gasLocation = new ModelResourceLocation(MODID.toLowerCase() + ":" + TestFluidBlock.name, "gas"); + private static ModelResourceLocation milkLocation = new ModelResourceLocation(MODID.toLowerCase() + ":" + TestFluidBlock.name, "milk"); + + @Override + public void preInit(FMLPreInitializationEvent event) + { + super.preInit(event); + Item fluid = Item.getItemFromBlock(TestFluidBlock.instance); + Item gas = Item.getItemFromBlock(TestGasBlock.instance); + Item milk = Item.getItemFromBlock(MilkFluidBlock.instance); + // no need to pass the locations here, since they'll be loaded by the block model logic. + ModelBakery.registerItemVariants(fluid); + ModelBakery.registerItemVariants(gas); + ModelBakery.registerItemVariants(milk); + ModelLoader.setCustomMeshDefinition(fluid, new ItemMeshDefinition() + { + @Override + public ModelResourceLocation getModelLocation(ItemStack stack) + { + return fluidLocation; + } + }); + ModelLoader.setCustomMeshDefinition(gas, new ItemMeshDefinition() + { + @Override + public ModelResourceLocation getModelLocation(ItemStack stack) + { + return gasLocation; + } + }); + ModelLoader.setCustomMeshDefinition(milk, new ItemMeshDefinition() + { + @Override + public ModelResourceLocation getModelLocation(ItemStack stack) + { + return milkLocation; + } + }); + ModelLoader.setCustomStateMapper(TestFluidBlock.instance, new StateMapperBase() + { + @Override + protected ModelResourceLocation getModelResourceLocation(IBlockState state) + { + return fluidLocation; + } + }); + ModelLoader.setCustomStateMapper(TestGasBlock.instance, new StateMapperBase() + { + @Override + protected ModelResourceLocation getModelResourceLocation(IBlockState state) + { + return gasLocation; + } + }); + ModelLoader.setCustomStateMapper(MilkFluidBlock.instance, new StateMapperBase() + { + @Override + protected ModelResourceLocation getModelResourceLocation(IBlockState state) + { + return milkLocation; + } + }); + } + } + + public static final class TestFluid extends Fluid + { + public static final String name = "testfluid"; + public static final TestFluid instance = new TestFluid(); + + private TestFluid() + { + super(name, new ResourceLocation("blocks/water_still"), new ResourceLocation("blocks/water_flow")); + } + + @Override + public int getColor() + { + return 0xFF00FF00; + } + } + + public static final class TestGas extends Fluid + { + public static final String name = "testgas"; + public static final TestGas instance = new TestGas(); + + private TestGas() + { + super(name, new ResourceLocation("blocks/lava_still"), new ResourceLocation("blocks/lava_flow")); + density = -1000; + isGaseous = true; + } + + @Override + public int getColor() + { + return 0xFFFF0000; + } + } + + public static final class TestFluidBlock extends BlockFluidClassic + { + public static final TestFluidBlock instance = new TestFluidBlock(); + public static final String name = "TestFluidBlock"; + + private TestFluidBlock() + { + super(TestFluid.instance, Material.water); + setCreativeTab(CreativeTabs.tabBlock); + setUnlocalizedName(MODID + ":" + name); + } + } + + public static final class MilkFluidBlock extends BlockFluidClassic + { + public static final MilkFluidBlock instance = new MilkFluidBlock(); + public static final String name = "MilkFluidBlock"; + + private MilkFluidBlock() + { + super(milkFluid, Material.water); + setCreativeTab(CreativeTabs.tabBlock); + setUnlocalizedName(MODID + ":" + name); + } + } + + public static final class TestGasBlock extends BlockFluidClassic + { + public static final TestGasBlock instance = new TestGasBlock(); + public static final String name = "TestGasBlock"; + + private TestGasBlock() + { + super(TestGas.instance, Material.lava); + setCreativeTab(CreativeTabs.tabBlock); + setUnlocalizedName(MODID + ":" + name); + } + } +} diff --git a/src/main/java/net/minecraftforge/debug/ModelLoaderRegistryDebug.java b/src/main/java/net/minecraftforge/debug/ModelLoaderRegistryDebug.java new file mode 100644 index 000000000..886bb3b3b --- /dev/null +++ b/src/main/java/net/minecraftforge/debug/ModelLoaderRegistryDebug.java @@ -0,0 +1,830 @@ +package net.minecraftforge.debug; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import javax.vecmath.AxisAngle4d; +import javax.vecmath.Matrix4f; +import javax.vecmath.Quat4f; +import javax.vecmath.Vector3d; +import javax.vecmath.Vector4f; + +import net.minecraft.block.Block; +import net.minecraft.block.ITileEntityProvider; +import net.minecraft.block.material.Material; +import net.minecraft.block.properties.IProperty; +import net.minecraft.block.properties.PropertyBool; +import net.minecraft.block.properties.PropertyDirection; +import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.IBlockState; +import net.minecraft.client.Minecraft; +import net.minecraft.client.resources.model.IBakedModel; +import net.minecraft.client.resources.model.ModelResourceLocation; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; +import net.minecraft.util.ChatComponentText; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.ITickable; +import net.minecraft.util.MathHelper; +import net.minecraft.util.ResourceLocation; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; +import net.minecraftforge.client.model.IModel; +import net.minecraftforge.client.model.ModelLoader; +import net.minecraftforge.client.model.ModelLoaderRegistry; +import net.minecraftforge.client.model.TRSRTransformation; +import net.minecraftforge.client.model.b3d.B3DLoader; +import net.minecraftforge.client.model.obj.OBJLoader; +import net.minecraftforge.client.model.obj.OBJModel; +import net.minecraftforge.client.model.obj.OBJModel.OBJBakedModel; +import net.minecraftforge.common.property.ExtendedBlockState; +import net.minecraftforge.common.property.IExtendedBlockState; +import net.minecraftforge.common.property.IUnlistedProperty; +import net.minecraftforge.fml.common.FMLLog; +import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.fml.common.Mod.EventHandler; +import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Lists; + +@Mod(modid = ModelLoaderRegistryDebug.MODID, version = ModelLoaderRegistryDebug.VERSION) +public class ModelLoaderRegistryDebug +{ + public static final String MODID = "ForgeDebugModelLoaderRegistry"; + public static final String VERSION = "1.0"; + + @EventHandler + public void preInit(FMLPreInitializationEvent event) + { + GameRegistry.registerBlock(CustomModelBlock.instance, CustomModelBlock.name); + GameRegistry.registerBlock(OBJTesseractBlock.instance, OBJTesseractBlock.name); + GameRegistry.registerBlock(OBJVertexColoring1.instance, OBJVertexColoring1.name); + GameRegistry.registerBlock(OBJDirectionEye.instance, OBJDirectionEye.name); + GameRegistry.registerBlock(OBJVertexColoring2.instance, OBJVertexColoring2.name); + GameRegistry.registerBlock(OBJDirectionBlock.instance, OBJDirectionBlock.name); + GameRegistry.registerBlock(OBJCustomDataBlock.instance, OBJCustomDataBlock.name); + GameRegistry.registerBlock(OBJDynamicEye.instance, OBJDynamicEye.name); + GameRegistry.registerTileEntity(OBJTesseractTileEntity.class, OBJTesseractBlock.name); + GameRegistry.registerTileEntity(OBJVertexColoring2TileEntity.class, OBJVertexColoring2.name); + GameRegistry.registerTileEntity(OBJDynamicEyeTileEntity.class, OBJDynamicEye.name); + if (event.getSide() == Side.CLIENT) + clientPreInit(); + } + + private void clientPreInit() + { + B3DLoader.instance.addDomain(MODID.toLowerCase()); + Item item = Item.getItemFromBlock(CustomModelBlock.instance); + ModelLoader.setCustomModelResourceLocation(item, 0, new ModelResourceLocation(MODID.toLowerCase() + ":" + CustomModelBlock.name, "inventory")); + + OBJLoader.instance.addDomain(MODID.toLowerCase()); + Item item2 = Item.getItemFromBlock(OBJTesseractBlock.instance); + ModelLoader.setCustomModelResourceLocation(item2, 0, new ModelResourceLocation(MODID.toLowerCase() + ":" + OBJTesseractBlock.name, "inventory")); + + Item item3 = Item.getItemFromBlock(OBJVertexColoring1.instance); + ModelLoader.setCustomModelResourceLocation(item3, 0, new ModelResourceLocation(MODID.toLowerCase() + ":" + OBJVertexColoring1.name, "inventory")); + + Item item4 = Item.getItemFromBlock(OBJDirectionEye.instance); + ModelLoader.setCustomModelResourceLocation(item4, 0, new ModelResourceLocation(MODID.toLowerCase() + ":" + OBJDirectionEye.name, "inventory")); + + Item item5 = Item.getItemFromBlock(OBJVertexColoring2.instance); + ModelLoader.setCustomModelResourceLocation(item5, 0, new ModelResourceLocation(MODID.toLowerCase() + ":" + OBJVertexColoring2.name, "inventory")); + + Item item6 = Item.getItemFromBlock(OBJDirectionBlock.instance); + ModelLoader.setCustomModelResourceLocation(item6, 0, new ModelResourceLocation(MODID.toLowerCase() + ":" + OBJDirectionBlock.name, "inventory")); + + Item item7 = Item.getItemFromBlock(OBJCustomDataBlock.instance); + ModelLoader.setCustomModelResourceLocation(item7, 0, new ModelResourceLocation(MODID.toLowerCase() + ":" + OBJCustomDataBlock.name, "inventory")); + + Item item8 = Item.getItemFromBlock(OBJDynamicEye.instance); + ModelLoader.setCustomModelResourceLocation(item8, 0, new ModelResourceLocation(MODID.toLowerCase() + ":" + OBJDynamicEye.name, "inventory")); + } + + public static class CustomModelBlock extends Block + { + public static final PropertyDirection FACING = PropertyDirection.create("facing"); + public static final CustomModelBlock instance = new CustomModelBlock(); + public static final String name = "CustomModelBlock"; + private int counter = 1; + public ExtendedBlockState state = new ExtendedBlockState(this, new IProperty[]{FACING}, new IUnlistedProperty[]{B3DLoader.B3DFrameProperty.instance}); + + private CustomModelBlock() + { + super(Material.iron); + this.setDefaultState(this.blockState.getBaseState().withProperty(FACING, EnumFacing.NORTH)); + setCreativeTab(CreativeTabs.tabBlock); + setUnlocalizedName(MODID + ":" + name); + } + + @Override + public boolean isOpaqueCube() { return false; } + + @Override + public boolean isFullCube() { return false; } + + @Override + public boolean isVisuallyOpaque() { return false; } + + @Override + public IBlockState onBlockPlaced(World world, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer) + { + return this.getDefaultState().withProperty(FACING, getFacingFromEntity(world, pos, placer)); + } + + @Override + public IBlockState getStateFromMeta(int meta) + { + return this.getDefaultState().withProperty(FACING, EnumFacing.getFront(meta)); + } + + @Override + public int getMetaFromState(IBlockState state) + { + return state.getValue(FACING).getIndex(); + } + + @Override + public IBlockState getExtendedState(IBlockState state, IBlockAccess world, BlockPos pos) + { + //Only return an IExtendedBlockState from this method and createState(), otherwise block placement might break! + B3DLoader.B3DState newState = new B3DLoader.B3DState(null, counter); + return ((IExtendedBlockState) state).withProperty(B3DLoader.B3DFrameProperty.instance, newState); + } + + @Override + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumFacing side, float hitX, float hitY, float hitZ) + { + if(world.isRemote) + { + System.out.println("click " + counter); + if(player.isSneaking()) counter--; + else counter++; + //if(counter >= model.getNode().getKeys().size()) counter = 0; + world.markBlockRangeForRenderUpdate(pos, pos); + } + return false; + } + + @Override + public BlockState createBlockState() + { + return new ExtendedBlockState(this, new IProperty[]{FACING}, new IUnlistedProperty[]{B3DLoader.B3DFrameProperty.instance}); + } + + public static EnumFacing getFacingFromEntity(World worldIn, BlockPos clickedBlock, EntityLivingBase entityIn) + { + if (MathHelper.abs((float)entityIn.posX - clickedBlock.getX()) < 2.0F && MathHelper.abs((float)entityIn.posZ - clickedBlock.getZ()) < 2.0F) + { + double d0 = entityIn.posY + entityIn.getEyeHeight(); + + if (d0 - clickedBlock.getY() > 2.0D) + { + return EnumFacing.UP; + } + + if (clickedBlock.getY() - d0 > 0.0D) + { + return EnumFacing.DOWN; + } + } + + return entityIn.getHorizontalFacing().getOpposite(); + } + } + /** + * This block is intended to demonstrate how to change the visibility of a group(s) + * from within the block's class. + * By right clicking on this block the player increments an integer value in the tile entity + * for this block, which is then added to a list of strings and passed into the constructor + * for OBJState. NOTE: this trick only works if your groups are named '1', '2', '3', etc., + * otherwise they must be added by name. + * Holding shift decrements the value in the tile entity. + * @author shadekiller666 + * + */ + public static class OBJTesseractBlock extends Block implements ITileEntityProvider + { + public static final OBJTesseractBlock instance = new OBJTesseractBlock(); + public static final String name = "OBJTesseractBlock"; + private ExtendedBlockState state = new ExtendedBlockState(this, new IProperty[0], new IUnlistedProperty[]{OBJModel.OBJProperty.instance}); + + private OBJTesseractBlock() + { + super(Material.iron); + setCreativeTab(CreativeTabs.tabBlock); + setUnlocalizedName(MODID + ":" + name); + } + + @Override + public TileEntity createNewTileEntity(World worldIn, int meta) + { + return new OBJTesseractTileEntity(); + } + + @Override + public boolean isOpaqueCube() { return false; } + + @Override + public boolean isFullCube() { return false; } + + @Override + public boolean isVisuallyOpaque() { return false; } + + @Override + public IBlockState getExtendedState(IBlockState state, IBlockAccess world, BlockPos pos) + { + OBJTesseractTileEntity tileEntity = (OBJTesseractTileEntity) world.getTileEntity(pos); + OBJModel.OBJState retState = new OBJModel.OBJState(tileEntity == null ? Lists.newArrayList(OBJModel.Group.ALL) : tileEntity.visible, true); + return ((IExtendedBlockState) this.state.getBaseState()).withProperty(OBJModel.OBJProperty.instance, retState); + } + + @Override + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumFacing side, float hitX, float hitY, float hitZ) + { + if (world.getTileEntity(pos) == null) world.setTileEntity(pos, new OBJTesseractTileEntity()); + OBJTesseractTileEntity tileEntity = (OBJTesseractTileEntity) world.getTileEntity(pos); + IModel model = ModelLoaderRegistry.getMissingModel(); + try + { + model = ModelLoaderRegistry.getModel(new ResourceLocation(MODID.toLowerCase() + ":" + "block/tesseract.obj")); + } + catch (IOException e) + { + model = ModelLoaderRegistry.getMissingModel(); + } + + if (player.isSneaking()) + { + tileEntity.decrement(); + } + else + { + if (model != ModelLoaderRegistry.getMissingModel()) + { + tileEntity.setMax(((OBJModel) model).getMatLib().getGroups().keySet().size() - 1); + tileEntity.increment(); + } + } + + if (world.isRemote) + { + OBJBakedModel objBaked = (OBJBakedModel) Minecraft.getMinecraft().getBlockRendererDispatcher().getModelFromBlockState(state, world, pos); + objBaked.scheduleRebake(); //not necessarily needed for this specific case, but is available + } + world.markBlockRangeForRenderUpdate(pos, pos); + return false; + } + + @Override + public boolean hasTileEntity(IBlockState state) + { + return true; + } + } + + public static class OBJTesseractTileEntity extends TileEntity + { + private int counter = 1; + private int max = 2; + public List visible = new ArrayList(); + + public OBJTesseractTileEntity() + { + this.visible.add(OBJModel.Group.ALL); + } + + public void increment() + { + if (this.visible.contains(OBJModel.Group.ALL)) this.visible.remove(OBJModel.Group.ALL); + if (this.counter == max) + { + this.counter = 0; + this.visible.clear(); + } + this.counter++; + this.visible.add(Integer.toString(this.counter)); + ChatComponentText text = new ChatComponentText("" + this.counter); + if (this.worldObj.isRemote) Minecraft.getMinecraft().ingameGUI.getChatGUI().printChatMessage(text); + } + + public void decrement() + { + if (this.visible.contains(OBJModel.Group.ALL)) this.visible.remove(OBJModel.Group.ALL); + if (this.counter == 1) + { + this.counter = max + 1; + for (int i = 1; i < max; i++) this.visible.add(Integer.toString(i)); + } + this.visible.remove(Integer.toString(this.counter)); + this.counter--; + ChatComponentText text = new ChatComponentText("" + this.counter); + if (this.worldObj.isRemote) Minecraft.getMinecraft().ingameGUI.getChatGUI().printChatMessage(text); + } + + public void reset() + { + this.counter = 1; + this.max = 2; + this.visible.clear(); + this.visible.add(Integer.toString(this.counter)); + } + + public int getMax() + { + return this.max; + } + + public void setMax(int max) + { + this.max = max; + } + + public void setToMax() + { + this.counter = this.max; + } + } + + /** + * This block demonstrates how to utilize the vertex coloring feature + * of the OBJ loader. See 'vertex_coloring.obj' and 'vertex_coloring.mtl' in + * 'test/resources/assets/forgedebugmodelloaderregistry/models/block/', to properly + * utilize this feature an obj file must have 1 'usemtl' key before every vertex as shown, + * having less 'usemtl' lines than 'v' lines will result in the faces having that material's + * color instead of each vertex. + * @author shadekiller666 + * + */ + public static class OBJVertexColoring1 extends Block + { + public static final OBJVertexColoring1 instance = new OBJVertexColoring1(); + public static final String name = "OBJVertexColoring1"; + + private OBJVertexColoring1() + { + super(Material.iron); + setCreativeTab(CreativeTabs.tabBlock); + setUnlocalizedName(name); + } + + @Override + public boolean isOpaqueCube() { return false; } + + @Override + public boolean isFullCube() { return false; } + + @Override + public boolean isVisuallyOpaque() { return false; } + } + + /** + * This block demonstrates how to use IProperties and IUnlistedProperties together + * in the same ExtendedBlockState. Similar to pistons, this block will face the player + * when placed. Unlike pistons, however; this block's model is an eyeball, because + * the OBJ loader can load spheres. + * @author shadekiller666 + * + */ + public static class OBJDirectionEye extends Block + { + public static final PropertyDirection FACING = PropertyDirection.create("facing"); + public static final OBJDirectionEye instance = new OBJDirectionEye(); + public static final String name = "OBJDirectionEye"; + private ExtendedBlockState state = new ExtendedBlockState(this, new IProperty[] {FACING}, new IUnlistedProperty[]{OBJModel.OBJProperty.instance}); + + private OBJDirectionEye() + { + super(Material.iron); + setDefaultState(this.blockState.getBaseState().withProperty(FACING, EnumFacing.NORTH)); + setCreativeTab(CreativeTabs.tabBlock); + setUnlocalizedName(name); + } + + @Override + public IBlockState onBlockPlaced(World world, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer) + { + return this.getDefaultState().withProperty(FACING, getFacingFromEntity(world, pos, placer)); + } + + @Override + public IBlockState getStateFromMeta(int meta) + { + return this.getDefaultState().withProperty(FACING, EnumFacing.getFront(meta)); + } + + @Override + public int getMetaFromState(IBlockState state) + { + return state.getValue(FACING).getIndex(); + } + + @Override + @SideOnly(Side.CLIENT) + public IBlockState getStateForEntityRender(IBlockState state) + { + return this.getDefaultState().withProperty(FACING, EnumFacing.NORTH); + } + + @Override + public BlockState createBlockState() + { + return new ExtendedBlockState(this, new IProperty[] {FACING}, new IUnlistedProperty[] {OBJModel.OBJProperty.instance}); + } + + @Override + public boolean isOpaqueCube() { return false; } + + @Override + public boolean isFullCube() { return false; } + + @Override + public boolean isVisuallyOpaque() { return false; } + + @Override + public IBlockState getExtendedState(IBlockState state, IBlockAccess world, BlockPos pos) + { + EnumFacing facing = state.getValue(FACING); + TRSRTransformation transform = new TRSRTransformation(facing); + OBJModel.OBJState retState = new OBJModel.OBJState(Arrays.asList(new String[]{OBJModel.Group.ALL}), true, transform); + return ((IExtendedBlockState) state).withProperty(OBJModel.OBJProperty.instance, retState); + } + + public static EnumFacing getFacingFromEntity(World worldIn, BlockPos clickedBlock, EntityLivingBase entityIn) + { + if (MathHelper.abs((float)entityIn.posX - clickedBlock.getX()) < 2.0F && MathHelper.abs((float)entityIn.posZ - clickedBlock.getZ()) < 2.0F) + { + double d0 = entityIn.posY + entityIn.getEyeHeight(); + + if (d0 - clickedBlock.getY() > 2.0D) + { + return EnumFacing.DOWN; + } + + if (clickedBlock.getY() - d0 > 0.0D) + { + return EnumFacing.UP; + } + } + + return entityIn.getHorizontalFacing(); + } + } + + /** + * This block uses the same model as CustomModelBlock3 does, but + * this class allows the player to cycle the colors of each vertex to black + * and then back to the original color when right clicking on the block. + * @author shadekiller666 + * + */ + public static class OBJVertexColoring2 extends Block implements ITileEntityProvider + { + public static final OBJVertexColoring2 instance = new OBJVertexColoring2(); + public static final String name = "OBJVertexColoring2"; + + private OBJVertexColoring2() + { + super(Material.iron); + setCreativeTab(CreativeTabs.tabBlock); + setUnlocalizedName(name); + } + + @Override + public TileEntity createNewTileEntity(World worldIn, int meta) + { + return new OBJVertexColoring2TileEntity(); + } + + @Override + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumFacing side, float hitX, float hitY, float hitZ) + { + if (world.getTileEntity(pos) != null && world.getTileEntity(pos) instanceof OBJVertexColoring2TileEntity) + { + ((OBJVertexColoring2TileEntity) world.getTileEntity(pos)).cycleColors(); + } + return false; + } + } + + public static class OBJVertexColoring2TileEntity extends TileEntity + { + private int index = 0; + private int maxIndex = 1; + private List colorList = new ArrayList(); + private boolean hasFilledList = false; + private boolean shouldIncrement = true; + + public OBJVertexColoring2TileEntity() {} + + public void cycleColors() + { + if (this.worldObj.isRemote) + { + FMLLog.info("%b", shouldIncrement); + IBakedModel bakedModel = Minecraft.getMinecraft().getBlockRendererDispatcher().getModelFromBlockState(this.worldObj.getBlockState(this.pos), this.worldObj, this.pos); + if (bakedModel != null && bakedModel instanceof OBJBakedModel) + { + OBJBakedModel objBaked = (OBJBakedModel) bakedModel; + ImmutableList materialNames = objBaked.getModel().getMatLib().getMaterialNames(); + if (!hasFilledList) + { + for (String name : materialNames) + { + if (!name.equals(OBJModel.Material.WHITE_NAME)) + { + colorList.add(objBaked.getModel().getMatLib().getMaterial(name).getColor()); + } + } + hasFilledList = true; + } + maxIndex = materialNames.size(); + if (this.shouldIncrement && index + 1 < maxIndex) + { + FMLLog.info("incrementing"); + String name = materialNames.get(index); + objBaked.getModel().getMatLib().changeMaterialColor(name, 0xFF000000); + objBaked.scheduleRebake(); + index++; + } + else if (index - 1 >= 0) + { + index--; + this.shouldIncrement = index == 0; + int color = 0; + color |= (int) (colorList.get(index).getW() * 255) << 24; + color |= (int) (colorList.get(index).getX() * 255) << 16; + color |= (int) (colorList.get(index).getY() * 255) << 8; + color |= (int) (colorList.get(index).getZ() * 255); + String name = materialNames.get(index); + if (!name.equals(OBJModel.Material.WHITE_NAME)) + { + objBaked.getModel().getMatLib().changeMaterialColor(name, color); + objBaked.scheduleRebake(); + } + } + this.worldObj.markBlockRangeForRenderUpdate(this.pos, this.pos); + } + } + } + } + + /** + * This block is a debug block that faces the player when placed, like a piston. + * @author shadekiller666 + * + */ + public static class OBJDirectionBlock extends Block + { + public static final PropertyDirection FACING = PropertyDirection.create("facing"); + public static final OBJDirectionBlock instance = new OBJDirectionBlock(); + public static final String name = "OBJDirectionBlock"; + public ExtendedBlockState state = new ExtendedBlockState(this, new IProperty[]{FACING}, new IUnlistedProperty[]{OBJModel.OBJProperty.instance}); + + private OBJDirectionBlock() + { + super(Material.iron); + this.setDefaultState(this.blockState.getBaseState().withProperty(FACING, EnumFacing.NORTH)); + setCreativeTab(CreativeTabs.tabBlock); + setUnlocalizedName(MODID + ":" + name); + } + + @Override + public boolean isOpaqueCube() { return false; } + + @Override + public boolean isFullCube() { return false; } + + @Override + public boolean isVisuallyOpaque() { return false; } + + @Override + public IBlockState onBlockPlaced(World world, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer) + { + return this.getDefaultState().withProperty(FACING, getFacingFromEntity(world, pos, placer)); + } + + @Override + public IBlockState getStateFromMeta(int meta) + { + return this.getDefaultState().withProperty(FACING, EnumFacing.getFront(meta)); + } + + @Override + public int getMetaFromState(IBlockState state) + { + return state.getValue(FACING).getIndex(); + } + + @Override + public IBlockState getExtendedState(IBlockState state, IBlockAccess world, BlockPos pos) + { + //Only return an IExtendedBlockState from this method and createState(), otherwise block placement will break! + EnumFacing facing = state.getValue(FACING); + TRSRTransformation transform = new TRSRTransformation(facing); + OBJModel.OBJState newState = new OBJModel.OBJState(Lists.newArrayList(OBJModel.Group.ALL), true, transform); + return ((IExtendedBlockState) state).withProperty(OBJModel.OBJProperty.instance, newState); + } + + @Override + public BlockState createBlockState() + { + return new ExtendedBlockState(this, new IProperty[]{FACING}, new IUnlistedProperty[]{OBJModel.OBJProperty.instance}); + } + + public static EnumFacing getFacingFromEntity(World worldIn, BlockPos clickedBlock, EntityLivingBase entityIn) + { + if (MathHelper.abs((float)entityIn.posX - clickedBlock.getX()) < 2.0F && MathHelper.abs((float)entityIn.posZ - clickedBlock.getZ()) < 2.0F) + { + double d0 = entityIn.posY + entityIn.getEyeHeight(); + + if (d0 - clickedBlock.getY() > 2.0D) + { + return EnumFacing.UP; + } + + if (clickedBlock.getY() - d0 > 0.0D) + { + return EnumFacing.DOWN; + } + } + + return entityIn.getHorizontalFacing().getOpposite(); + } + } + + /** + * This block is a testing block that will be used to test the use + * of "custom" data defined in a forge blockstate json. WIP, ignore for now. + * @author shadekiller666 + * + */ + public static class OBJCustomDataBlock extends Block + { + public static final PropertyBool NORTH = PropertyBool.create("north"); + public static final PropertyBool SOUTH = PropertyBool.create("south"); + public static final PropertyBool WEST = PropertyBool.create("west"); + public static final PropertyBool EAST = PropertyBool.create("east"); + public static final OBJCustomDataBlock instance = new OBJCustomDataBlock(); + public static final String name = "OBJCustomDataBlock"; + + private OBJCustomDataBlock() + { + super(Material.iron); + this.setDefaultState(this.blockState.getBaseState().withProperty(NORTH, false).withProperty(SOUTH, false).withProperty(WEST, false).withProperty(EAST, false)); + setCreativeTab(CreativeTabs.tabBlock); + setUnlocalizedName(MODID + ":" + name); + } + + @Override + public boolean isOpaqueCube() + { + return false; + } + + @Override + public boolean isFullCube() + { + return false; + } + + @Override + public int getMetaFromState(IBlockState state) + { + return 0; + } + + public boolean canConnectTo(IBlockAccess world, BlockPos pos) + { + Block block = world.getBlockState(pos).getBlock(); + return block instanceof OBJCustomDataBlock; + } + + @Override + public IBlockState getActualState(IBlockState state, IBlockAccess world, BlockPos pos) + { + return state.withProperty(NORTH, this.canConnectTo(world, pos.north())).withProperty(SOUTH, this.canConnectTo(world, pos.south())).withProperty(WEST, this.canConnectTo(world, pos.west())).withProperty(EAST, this.canConnectTo(world, pos.east())); + } + + @Override + public BlockState createBlockState() + { + return new BlockState(this, new IProperty[]{NORTH, SOUTH, WEST, EAST}); + } + } + + /** + * This block uses the same model as CustomModelBlock4, but instead of facing the + * player when placed, this one ALWAYS faces the player. I know, creepy right? + * @author shadekiller666 + * + */ + public static class OBJDynamicEye extends Block implements ITileEntityProvider + { + public static final OBJDynamicEye instance = new OBJDynamicEye(); + public static final String name = "OBJDynamicEye"; + public ExtendedBlockState state = new ExtendedBlockState(this, new IProperty[0], new IUnlistedProperty[] {OBJModel.OBJProperty.instance}); + private OBJDynamicEye() + { + super(Material.iron); + setCreativeTab(CreativeTabs.tabBlock); + setUnlocalizedName(MODID + ":" + name); + } + + @Override + public TileEntity createNewTileEntity(World worldIn, int meta) + { + return new OBJDynamicEyeTileEntity(); + } + + @Override + public boolean isOpaqueCube() + { + return false; + } + + @Override + public boolean isFullCube() + { + return false; + } + + @Override + public boolean hasTileEntity(IBlockState state) + { + return true; + } + + @Override + public IBlockState getExtendedState(IBlockState state, IBlockAccess world, BlockPos pos) + { + if (world.getTileEntity(pos) != null && world.getTileEntity(pos) instanceof OBJDynamicEyeTileEntity) + { + OBJDynamicEyeTileEntity te = (OBJDynamicEyeTileEntity) world.getTileEntity(pos); + if (te.state != null) + { + return ((IExtendedBlockState) this.state.getBaseState()).withProperty(OBJModel.OBJProperty.instance, te.state); + } + } + return state; + } + + @Override + public BlockState createBlockState() + { + return new ExtendedBlockState(this, new IProperty[0], new IUnlistedProperty[] {OBJModel.OBJProperty.instance}); + } + } + + public static class OBJDynamicEyeTileEntity extends TileEntity implements ITickable + { + public OBJModel.OBJState state; + + public OBJDynamicEyeTileEntity() + { + this.state = new OBJModel.OBJState(Lists.newArrayList(OBJModel.Group.ALL), true); + } + + @Override + public void update() + { + if (this.worldObj.isRemote) + { + Vector3d teLoc = new Vector3d(this.getPos().getX(), this.getPos().getY(), this.getPos().getZ()); + EntityPlayer player = Minecraft.getMinecraft().thePlayer; + Vector3d playerLoc = new Vector3d(); + playerLoc.setX(player.posX); + playerLoc.setY(player.posY + player.getEyeHeight()); + playerLoc.setZ(player.posZ); + Vector3d lookVec = new Vector3d(playerLoc.getX() - teLoc.getX(), playerLoc.getY() - teLoc.getY(), playerLoc.getZ() - teLoc.getZ()); + double angleYaw = Math.atan2(lookVec.getZ(), lookVec.getX()) - Math.PI/2d; + double anglePitch = Math.atan2(lookVec.getY(), Math.sqrt(lookVec.getX() * lookVec.getX() + lookVec.getZ() * lookVec.getZ())); + AxisAngle4d yaw = new AxisAngle4d(0, 1, 0, -angleYaw); + AxisAngle4d pitch = new AxisAngle4d(1, 0, 0, -anglePitch); + Quat4f rot = new Quat4f(0, 0, 0, 1); + Quat4f yawQuat = new Quat4f(); + Quat4f pitchQuat = new Quat4f(); + yawQuat.set(yaw); + rot.mul(yawQuat); + pitchQuat.set(pitch); + rot.mul(pitchQuat); + Matrix4f matrix = new Matrix4f(); + matrix.setIdentity(); + matrix.setRotation(rot); + TRSRTransformation transform = new TRSRTransformation(matrix); + transform = TRSRTransformation.blockCenterToCorner(transform); + this.state = new OBJModel.OBJState(Lists.newArrayList(OBJModel.Group.ALL), true, transform); + this.worldObj.markBlockRangeForRenderUpdate(this.pos, this.pos); + } + } + } +} diff --git a/src/main/java/net/minecraftforge/debug/MultiLayerModelDebug.java b/src/main/java/net/minecraftforge/debug/MultiLayerModelDebug.java new file mode 100644 index 000000000..061f884bc --- /dev/null +++ b/src/main/java/net/minecraftforge/debug/MultiLayerModelDebug.java @@ -0,0 +1,67 @@ +package net.minecraftforge.debug; + +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.client.resources.model.ModelResourceLocation; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; +import net.minecraft.util.EnumWorldBlockLayer; +import net.minecraftforge.client.model.ModelLoader; +import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.fml.common.Mod.EventHandler; +import net.minecraftforge.fml.common.SidedProxy; +import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; +import net.minecraftforge.fml.common.registry.GameRegistry; + +@Mod(modid = MultiLayerModelDebug.MODID, version = MultiLayerModelDebug.VERSION) +public class MultiLayerModelDebug +{ + public static final String MODID = "forgedebugmultilayermodel"; + public static final String VERSION = "0.0"; + + public static String blockName = "test_layer_block"; + + @SidedProxy + public static CommonProxy proxy; + + public static class CommonProxy + { + public void preInit(FMLPreInitializationEvent event) + { + GameRegistry.registerBlock(new Block(Material.wood) + { + { + setCreativeTab(CreativeTabs.tabBlock); + setUnlocalizedName(MODID + "." + blockName); + } + + @Override + public boolean isOpaqueCube() { return false; } + + @Override + public boolean isFullCube() { return false; } + + @Override + public boolean canRenderInLayer(EnumWorldBlockLayer layer) + { + return layer == EnumWorldBlockLayer.SOLID || layer == EnumWorldBlockLayer.TRANSLUCENT; + } + }, blockName); + } + } + + public static class ServerProxy extends CommonProxy {} + + public static class ClientProxy extends CommonProxy + { + @Override + public void preInit(FMLPreInitializationEvent event) + { + super.preInit(event); + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(GameRegistry.findBlock(MODID, blockName)), 0, new ModelResourceLocation(MODID.toLowerCase() + ":" + blockName, "inventory")); + } + } + + @EventHandler + public void preInit(FMLPreInitializationEvent event) { proxy.preInit(event); } +} diff --git a/src/main/java/net/minecraftforge/debug/NoPotionEffectRenderTest.java b/src/main/java/net/minecraftforge/debug/NoPotionEffectRenderTest.java new file mode 100644 index 000000000..f8d779140 --- /dev/null +++ b/src/main/java/net/minecraftforge/debug/NoPotionEffectRenderTest.java @@ -0,0 +1,29 @@ +package net.minecraftforge.debug; + +import net.minecraft.potion.Potion; +import net.minecraft.potion.PotionEffect; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; + +@Mod( modid = NoPotionEffectRenderTest.modID, name = "No Potion Effect Render Test", version = "0.0.0" ) +public class NoPotionEffectRenderTest { + public static final String modID = "nopotioneffect"; + + @Mod.EventHandler + public void preInit(FMLPreInitializationEvent event) { + TestPotion INSTANCE = new TestPotion(30, new ResourceLocation(modID, "test_potion"), false, 0xff00ff); + } + + public static class TestPotion extends Potion { + + public TestPotion(int potionID, ResourceLocation location, boolean badEffect, int potionColor) { + super(potionID, location, badEffect, potionColor); + } + + @Override + public boolean shouldRender(PotionEffect effect) { + return false; + } + } +} diff --git a/src/main/java/net/minecraftforge/debug/PotionRegistryDebug.java b/src/main/java/net/minecraftforge/debug/PotionRegistryDebug.java new file mode 100644 index 000000000..5a60a0260 --- /dev/null +++ b/src/main/java/net/minecraftforge/debug/PotionRegistryDebug.java @@ -0,0 +1,82 @@ +package net.minecraftforge.debug; + +import gnu.trove.set.TIntSet; +import gnu.trove.set.hash.TIntHashSet; + +import java.util.Random; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.renderer.texture.TextureMap; +import net.minecraft.potion.Potion; +import net.minecraft.potion.PotionEffect; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; + +@Mod(modid=PotionRegistryDebug.MODID) +public class PotionRegistryDebug { + public static final String MODID = "ForgePotionRegistry"; + + @Mod.EventHandler + public void preInit(FMLPreInitializationEvent event) { + new PotionForge(new ResourceLocation("forge", "forge"), false, 0xff00ff); // test automatic id distribution + new PotionForge(200, new ResourceLocation("forge", "forgy"), true, 0x00ff00); // test that ids above 127 work + + Random rand = new Random(); + TIntSet taken = new TIntHashSet(100); + int ra = rand.nextInt(100) + 100; + taken.add(ra); + + // a new potion with a random id so that forge has to remap it + new PotionForge(ra, new ResourceLocation("forge", "realRandomPotion"), false, 0x0000ff); + + for(int i = 0; i < 20; i++) { + int r = rand.nextInt(200) + 35; + while(taken.contains(r)) + r = rand.nextInt(200) + 35; + //r = 32+i; + taken.add(r); + // this potions will most likely not have the same IDs between server and client. + // The forge handshake on connect should fix this. + new PotionForge(r, new ResourceLocation("forge", "randomPotion" + r), false, 0xff00ff); + } + } + + protected class PotionForge extends Potion { + + public PotionForge(int potionID, ResourceLocation location, boolean badEffect, int potionColor) { + super(potionID, location, badEffect, potionColor); + setPotionName("potion." + location.getResourcePath()); + } + + protected PotionForge(ResourceLocation location, boolean badEffect, int potionColor) { + super(location, badEffect, potionColor); + setPotionName("potion." + location.getResourcePath()); + } + + @Override + public void renderInventoryEffect(int x, int y, PotionEffect effect, Minecraft mc) { + Potion potion = Potion.potionTypes[effect.getPotionID()]; + + mc.getTextureManager().bindTexture(TextureMap.locationBlocksTexture); + TextureAtlasSprite sprite = mc.getTextureMapBlocks().getAtlasSprite("minecraft:blocks/fire_layer_0"); + + x += 6; + y += 7; + + int width = 18; + int height = width; +/* + Tessellator tessellator = Tessellator.getInstance(); + WorldRenderer worldrenderer = tessellator.getWorldRenderer(); + worldrenderer.startDrawingQuads(); + worldrenderer.setColorOpaque_I(potion.getLiquidColor()); + worldrenderer.addVertexWithUV((double) x, (double) (y + height), 0.0D, sprite.getMinU(), sprite.getMaxV()); + worldrenderer.addVertexWithUV((double)(x + width), (double)(y + height), 0.0D, sprite.getMaxU(), sprite.getMaxV()); + worldrenderer.addVertexWithUV((double)(x + width), (double)y, 0.0D, sprite.getMaxU(), sprite.getMinV()); + worldrenderer.addVertexWithUV((double)x, (double)y, 0.0D, sprite.getMinU(), sprite.getMinV()); + tessellator.draw();*/ + } + } +} diff --git a/src/main/java/uristqwerty/CraftGuide/api/LiquidFilter.java b/src/main/java/uristqwerty/CraftGuide/api/LiquidFilter.java index 01050ae14..d63d542ed 100644 --- a/src/main/java/uristqwerty/CraftGuide/api/LiquidFilter.java +++ b/src/main/java/uristqwerty/CraftGuide/api/LiquidFilter.java @@ -8,7 +8,6 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; diff --git a/src/main/java/uristqwerty/CraftGuide/api/LiquidSlot.java b/src/main/java/uristqwerty/CraftGuide/api/LiquidSlot.java index 26c153724..03cb08af8 100644 --- a/src/main/java/uristqwerty/CraftGuide/api/LiquidSlot.java +++ b/src/main/java/uristqwerty/CraftGuide/api/LiquidSlot.java @@ -6,7 +6,6 @@ import java.util.List; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.client.renderer.texture.TextureMap; -import net.minecraft.util.IIcon; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidContainerRegistry.FluidContainerData; diff --git a/src/main/resources/assets/forestry/blockstates/alveary.json b/src/main/resources/assets/forestry/blockstates/alveary.json new file mode 100644 index 000000000..f80b0d0a1 --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/alveary.json @@ -0,0 +1,30 @@ +{ + "variants": { + "meta=analyzer": { "model": "forestry:analyzer" }, + "meta=escritoire": { "model": "forestry:escritoire" }, + "meta=bottler": { "model": "forestry:bottler" }, + "meta=carpenter": { "model": "forestry:carpenter" }, + "meta=centrifuge": { "model": "forestry:centrifuge" }, + "meta=fermenter": { "model": "forestry:fermenter" }, + "meta=moistener": { "model": "forestry:moistener" }, + "meta=squeezer": { "model": "forestry:squeezer" }, + "meta=still": { "model": "forestry:still" }, + "meta=rainmaker": { "model": "forestry:rainmaker" }, + "meta=fabricator": { "model": "forestry:fabricator" }, + "meta=raintank": { "model": "forestry:raintank" }, + "meta=worktable": { "model": "forestry:worktable" }, + "meta=mailbox": { "model": "forestry:mailbox" }, + "meta=tradestation": { "model": "forestry:tradestation" }, + "meta=philatelist": { "model": "forestry:philatelist" }, + "meta=chest_lepidopterology": { "model": "forestry:chest_lepidopterology" }, + "meta=engine_copper": { "model": "forestry:engine_copper" }, + "meta=engine_tin": { "model": "forestry:engine_tin" }, + "meta=engine_bronze": { "model": "forestry:engine_bronze" }, + "meta=engine_clockwork": { "model": "forestry:engine_clockwork" }, + "meta=generator": { "model": "forestry:generator" }, + "meta=apairy": { "model": "forestry:apairy" }, + "meta=chest_apiculture": { "model": "forestry:chest_apiculture" }, + "meta=beehouse": { "model": "forestry:beehouse" }, + "meta=chest_arboriculture": { "model": "forestry:chest_arboriculture" } + } +} diff --git a/src/main/resources/assets/forestry/blockstates/apiculture/alveary_entrance.json b/src/main/resources/assets/forestry/blockstates/apiculture/alveary_entrance.json new file mode 100644 index 000000000..5bbcd8961 --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/apiculture/alveary_entrance.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "forestry:apiculture/alveary_entrance" } + } +} diff --git a/src/main/resources/assets/forestry/blockstates/apiculture/alveary_fan.json b/src/main/resources/assets/forestry/blockstates/apiculture/alveary_fan.json new file mode 100644 index 000000000..b7e0a1ccd --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/apiculture/alveary_fan.json @@ -0,0 +1,6 @@ +{ + "variants": { + "state=on": { "model": "forestry:apiculture/alveary_fan_on" }, + "state=off": { "model": "forestry:apiculture/alveary_fan_off" } + } +} diff --git a/src/main/resources/assets/forestry/blockstates/apiculture/alveary_heater.json b/src/main/resources/assets/forestry/blockstates/apiculture/alveary_heater.json new file mode 100644 index 000000000..9d9a621fe --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/apiculture/alveary_heater.json @@ -0,0 +1,6 @@ +{ + "variants": { + "state=on": { "model": "forestry:apiculture/alveary_heater_on" }, + "state=off": { "model": "forestry:apiculture/alveary_heater_off" } + } +} diff --git a/src/main/resources/assets/forestry/blockstates/apiculture/alveary_hygro.json b/src/main/resources/assets/forestry/blockstates/apiculture/alveary_hygro.json new file mode 100644 index 000000000..0b0bf4ddb --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/apiculture/alveary_hygro.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "forestry:apiculture/alveary_hygro" } + } +} diff --git a/src/main/resources/assets/forestry/blockstates/apiculture/alveary_plain.json b/src/main/resources/assets/forestry/blockstates/apiculture/alveary_plain.json new file mode 100644 index 000000000..da3797243 --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/apiculture/alveary_plain.json @@ -0,0 +1,7 @@ +{ + "variants": { + "type=right": { "model": "forestry:apiculture/alveary_plain_down" }, + "type=bottom": { "model": "forestry:apiculture/alveary_plain_middle" }, + "type=left": { "model": "forestry:apiculture/alveary_plain_up" } + } +} diff --git a/src/main/resources/assets/forestry/blockstates/apiculture/alveary_sieve.json b/src/main/resources/assets/forestry/blockstates/apiculture/alveary_sieve.json new file mode 100644 index 000000000..4e9cbd3d0 --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/apiculture/alveary_sieve.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "forestry:apiculture/alveary_sieve" } + } +} diff --git a/src/main/resources/assets/forestry/blockstates/apiculture/alveary_stabiliser.json b/src/main/resources/assets/forestry/blockstates/apiculture/alveary_stabiliser.json new file mode 100644 index 000000000..a3910345b --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/apiculture/alveary_stabiliser.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "forestry:apiculture/alveary_stabiliser" } + } +} diff --git a/src/main/resources/assets/forestry/blockstates/apiculture/alveary_swarmer.json b/src/main/resources/assets/forestry/blockstates/apiculture/alveary_swarmer.json new file mode 100644 index 000000000..432306951 --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/apiculture/alveary_swarmer.json @@ -0,0 +1,6 @@ +{ + "variants": { + "state=on": { "model": "forestry:apiculture/alveary_swarmer_on" }, + "state=off": { "model": "forestry:apiculture/alveary_swarmer_off" } + } +} diff --git a/src/main/resources/assets/forestry/blockstates/apiculture_apiary.json b/src/main/resources/assets/forestry/blockstates/apiculture_apiary.json new file mode 100644 index 000000000..58a3beb28 --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/apiculture_apiary.json @@ -0,0 +1,8 @@ +{ + "variants": { + "face=north": { "model": "forestry:apiculture_apiary" }, + "face=east": { "model": "forestry:apiculture_apiary", "y": 90 }, + "face=south": { "model": "forestry:apiculture_apiary", "y": 180 }, + "face=west": { "model": "forestry:apiculture_apiary", "y": -90 } + } +} diff --git a/src/main/resources/assets/forestry/blockstates/apiculture_beehouse.json b/src/main/resources/assets/forestry/blockstates/apiculture_beehouse.json new file mode 100644 index 000000000..0cd61e93a --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/apiculture_beehouse.json @@ -0,0 +1,8 @@ +{ + "variants": { + "face=north": { "model": "forestry:apiculture_beehouse" }, + "face=east": { "model": "forestry:apiculture_beehouse", "y": 90 }, + "face=south": { "model": "forestry:apiculture_beehouse", "y": 180 }, + "face=west": { "model": "forestry:apiculture_beehouse", "y": -90 } + } +} diff --git a/src/main/resources/assets/forestry/blockstates/beehives.json b/src/main/resources/assets/forestry/blockstates/beehives.json new file mode 100644 index 000000000..54a507217 --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/beehives.json @@ -0,0 +1,11 @@ +{ + "variants": { + "hive=forest": { "model": "forestry:beehives/forest" }, + "hive=meadows": { "model": "forestry:beehives/meadows" }, + "hive=desert": { "model": "forestry:beehives/desert" }, + "hive=jungle": { "model": "forestry:beehives/jungle" }, + "hive=end": { "model": "forestry:beehives/end" }, + "hive=snow": { "model": "forestry:beehives/snow" }, + "hive=swamp": { "model": "forestry:beehives/swamp" } + } +} diff --git a/src/main/resources/assets/forestry/blockstates/blockforestryfluid.json b/src/main/resources/assets/forestry/blockstates/blockforestryfluid.json new file mode 100644 index 000000000..35214352a --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/blockforestryfluid.json @@ -0,0 +1,46 @@ +{ + "forge_marker": 1, + "variants": { + "bioethanol": { + "model": "forge:fluid", + "custom": { "fluid": "bioethanol" } + }, + "biomass": { + "model": "forge:fluid", + "custom": { "fluid": "biomass" } + }, + "glass": { + "model": "forge:fluid", + "custom": { "fluid": "glass" } + }, + "for.honey": { + "model": "forge:fluid", + "custom": { "fluid": "for.honey" } + }, + "honey": { + "model": "forge:fluid", + "custom": { "fluid": "honey" } + }, + "ice": { + "model": "forge:fluid", + "custom": { "fluid": "ice" } + }, + "juice": { + "model": "forge:fluid", + "custom": { "fluid": "juice" } + }, + "milk": { + "model": "forge:fluid", + "custom": { "fluid": "milk" } + }, + "seedoil": { + "model": "forge:fluid", + "custom": { "fluid": "seedoil" } + }, + "short.mead": { + "model": "forge:fluid", + "custom": { "fluid": "short.mead" } + } + + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/blockstates/butterflyGE.json b/src/main/resources/assets/forestry/blockstates/butterflyGE.json new file mode 100644 index 000000000..7b8a84acd --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/butterflyGE.json @@ -0,0 +1,15 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "#Butterfly2texture": "forestry:texture" + }, + "model": "forestry:butterflyGE.b3d" + }, + "variants": { + "inventory": [{ + "translation": [ 0, 1.5, -2.75 ], + "transform": "forge:default-block" + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/blockstates/candle.json b/src/main/resources/assets/forestry/blockstates/candle.json new file mode 100644 index 000000000..e05073997 --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/candle.json @@ -0,0 +1,14 @@ +{ + "variants": { + "facing=up,state=off": { "model": "forestry:candle_up_off" }, + "facing=east,state=off": { "model": "forestry:candle_off" }, + "facing=south,state=off": { "model": "forestry:candle_off", "y": 90 }, + "facing=west,state=off": { "model": "forestry:candle_off", "y": 180 }, + "facing=north,state=off": { "model": "forestry:candle_off", "y": 270 }, + "facing=up,state=on": { "model": "forestry:candle_up_on" }, + "facing=east,state=on": { "model": "forestry:candle_on" }, + "facing=south,state=on": { "model": "forestry:candle_on", "y": 90 }, + "facing=west,state=on": { "model": "forestry:candle_on", "y": 180 }, + "facing=north,state=on": { "model": "forestry:candle_on", "y": 270 } + } +} diff --git a/src/main/resources/assets/forestry/blockstates/crafting_table.json b/src/main/resources/assets/forestry/blockstates/crafting_table.json new file mode 100644 index 000000000..ef1590adc --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/crafting_table.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "crafting_table" } + } +} diff --git a/src/main/resources/assets/forestry/blockstates/crates.json b/src/main/resources/assets/forestry/blockstates/crates.json new file mode 100644 index 000000000..a51e2c5a8 --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/crates.json @@ -0,0 +1,43 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "forestry:crate", + "custom": { + "base": "forestry:crates#crate", + "layer": "Cutout", + "modID": "forestry" + }, + "transform": "forge:default-block" + }, + "variants": { + "crate": [ + { + "model": "forestry:crate-filled" + } + ], + "cratedstone": [ + { + "custom": { + "location": "stone#normal", + "uid": "cratedstone" + }, + "transform": { + "scale": 0.5, + "translation": [ -0.0625, 0, 0 ] + } + } + ], + "cratedapples": [ + { + "custom": { + "location": "item/apple", + "uid": "cratedapples" + }, + "transform": { + "scale": 0.5, + "translation": [ -0.0625, 0, 0 ] + } + } + ] + } +} diff --git a/src/main/resources/assets/forestry/blockstates/crates/cratedGlass.json b/src/main/resources/assets/forestry/blockstates/crates/cratedGlass.json new file mode 100644 index 000000000..b96962591 --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/crates/cratedGlass.json @@ -0,0 +1,20 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "forge:multi-layer", + "custom": { + "base": "forestry:crate#crate", + "Solid": "forestry:crate#crate", + "Cutout": "forestry:crates/cratedWood#wood" + }, + "transform": "forge:default-item" + }, + "variants": { + "normal": [{}], + "inventory": [{ }], + "wood": [{ + "model": "oak_log", + "transform": { "scale": .5, "translation":[ -0.0625, 0, 0 ] } + }] + } +} diff --git a/src/main/resources/assets/forestry/blockstates/crates/cratedPeat.json b/src/main/resources/assets/forestry/blockstates/crates/cratedPeat.json new file mode 100644 index 000000000..b96962591 --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/crates/cratedPeat.json @@ -0,0 +1,20 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "forge:multi-layer", + "custom": { + "base": "forestry:crate#crate", + "Solid": "forestry:crate#crate", + "Cutout": "forestry:crates/cratedWood#wood" + }, + "transform": "forge:default-item" + }, + "variants": { + "normal": [{}], + "inventory": [{ }], + "wood": [{ + "model": "oak_log", + "transform": { "scale": .5, "translation":[ -0.0625, 0, 0 ] } + }] + } +} diff --git a/src/main/resources/assets/forestry/blockstates/crates/cratedStone.json b/src/main/resources/assets/forestry/blockstates/crates/cratedStone.json new file mode 100644 index 000000000..1e55167bd --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/crates/cratedStone.json @@ -0,0 +1,20 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "forge:multi-layer", + "custom": { + "base": "forestry:crates/cratedStone#contained", + "Solid": "forestry:crate#crate", + "Cutout": "forestry:crates/cratedStone#contained" + }, + "transform": "forge:default-block" + }, + "variants": { + "normal": [{}], + "inventory": [{ }], + "contained": [{ + "model": "stone", + "transform": { "scale": .5 } + }] + } +} diff --git a/src/main/resources/assets/forestry/blockstates/crates/cratedWood.json b/src/main/resources/assets/forestry/blockstates/crates/cratedWood.json new file mode 100644 index 000000000..829334c2b --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/crates/cratedWood.json @@ -0,0 +1,20 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "forge:multi-layer", + "custom": { + "base": "forestry:crates/cratedWood#contained", + "Solid": "forestry:crate#crate", + "TRANSLUCENT": "forestry:crates/cratedWood#contained" + }, + "transform": "forge:default-item" + }, + "variants": { + "normal": [{}], + "inventory": [{ }], + "contained": [{ + "model": "oak_log", + "transform": { "scale": .5, "translation":[ -0.0625, 0, 0 ] } + }] + } +} diff --git a/src/main/resources/assets/forestry/blockstates/factory2_fabricator.json b/src/main/resources/assets/forestry/blockstates/factory2_fabricator.json new file mode 100644 index 000000000..8ed939bce --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/factory2_fabricator.json @@ -0,0 +1,8 @@ +{ + "variants": { + "face=north": { "model": "forestry:factory2_fabricator" }, + "face=east": { "model": "forestry:factory2_fabricator", "y": 90 }, + "face=south": { "model": "forestry:factory2_fabricator", "y": 180 }, + "face=west": { "model": "forestry:factory2_fabricator", "y": -90 } + } +} diff --git a/src/main/resources/assets/forestry/blockstates/factory2_raintank.json b/src/main/resources/assets/forestry/blockstates/factory2_raintank.json new file mode 100644 index 000000000..c358171a2 --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/factory2_raintank.json @@ -0,0 +1,8 @@ +{ + "variants": { + "face=north": { "model": "forestry:factory2_raintank" }, + "face=east": { "model": "forestry:factory2_raintank", "y": 90 }, + "face=south": { "model": "forestry:factory2_raintank", "y": 180 }, + "face=west": { "model": "forestry:factory2_raintank", "y": -90 } + } +} diff --git a/src/main/resources/assets/forestry/blockstates/factory2_worktable.json b/src/main/resources/assets/forestry/blockstates/factory2_worktable.json new file mode 100644 index 000000000..1474f5998 --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/factory2_worktable.json @@ -0,0 +1,8 @@ +{ + "variants": { + "face=north": { "model": "forestry:factory2_worktable" }, + "face=east": { "model": "forestry:factory2_worktable", "y": 90 }, + "face=south": { "model": "forestry:factory2_worktable", "y": 180 }, + "face=west": { "model": "forestry:factory2_worktable", "y": -90 } + } +} diff --git a/src/main/resources/assets/forestry/blockstates/fences.json b/src/main/resources/assets/forestry/blockstates/fences.json new file mode 100644 index 000000000..d2e776ea8 --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/fences.json @@ -0,0 +1,497 @@ +{ + "variants": { + //larch + "east=false,north=false,south=false,west=false,woodtype=larch": { "model": "forestry:arboriculture/fences/larch_post" }, + "east=false,north=true,south=false,west=false,woodtype=larch": { "model": "forestry:arboriculture/fences/larch_n", "uvlock": true }, + "east=true,north=false,south=false,west=false,woodtype=larch": { "model": "forestry:arboriculture/fences/larch_n", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,west=false,woodtype=larch": { "model": "forestry:arboriculture/fences/larch_n", "y": 180, "uvlock": true }, + "east=false,north=false,south=false,west=true,woodtype=larch": { "model": "forestry:arboriculture/fences/larch_n", "y": 270, "uvlock": true }, + "east=true,north=true,south=false,west=false,woodtype=larch": { "model": "forestry:arboriculture/fences/larch_ne", "uvlock": true }, + "east=true,north=false,south=true,west=false,woodtype=larch": { "model": "forestry:arboriculture/fences/larch_ne", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,west=true,woodtype=larch": { "model": "forestry:arboriculture/fences/larch_ne", "y": 180, "uvlock": true }, + "east=false,north=true,south=false,west=true,woodtype=larch": { "model": "forestry:arboriculture/fences/larch_ne", "y": 270, "uvlock": true }, + "east=false,north=true,south=true,west=false,woodtype=larch": { "model": "forestry:arboriculture/fences/larch_ns", "uvlock": true }, + "east=true,north=false,south=false,west=true,woodtype=larch": { "model": "forestry:arboriculture/fences/larch_ns", "y": 90, "uvlock": true }, + "east=true,north=true,south=true,west=false,woodtype=larch": { "model": "forestry:arboriculture/fences/larch_nse", "uvlock": true }, + "east=true,north=false,south=true,west=true,woodtype=larch": { "model": "forestry:arboriculture/fences/larch_nse", "y": 90, "uvlock": true }, + "east=false,north=true,south=true,west=true,woodtype=larch": { "model": "forestry:arboriculture/fences/larch_nse", "y": 180, "uvlock": true }, + "east=true,north=true,south=false,west=true,woodtype=larch": { "model": "forestry:arboriculture/fences/larch_nse", "y": 270, "uvlock": true }, + "east=true,north=true,south=true,west=true,woodtype=larch": { "model": "forestry:arboriculture/fences/larch_nsew", "uvlock": true }, + //teak + "east=false,north=false,south=false,west=false,woodtype=teak": { "model": "forestry:arboriculture/fences/teak_post" }, + "east=false,north=true,south=false,west=false,woodtype=teak": { "model": "forestry:arboriculture/fences/teak_n", "uvlock": true }, + "east=true,north=false,south=false,west=false,woodtype=teak": { "model": "forestry:arboriculture/fences/teak_n", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,west=false,woodtype=teak": { "model": "forestry:arboriculture/fences/teak_n", "y": 180, "uvlock": true }, + "east=false,north=false,south=false,west=true,woodtype=teak": { "model": "forestry:arboriculture/fences/teak_n", "y": 270, "uvlock": true }, + "east=true,north=true,south=false,west=false,woodtype=teak": { "model": "forestry:arboriculture/fences/teak_ne", "uvlock": true }, + "east=true,north=false,south=true,west=false,woodtype=teak": { "model": "forestry:arboriculture/fences/teak_ne", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,west=true,woodtype=teak": { "model": "forestry:arboriculture/fences/teak_ne", "y": 180, "uvlock": true }, + "east=false,north=true,south=false,west=true,woodtype=teak": { "model": "forestry:arboriculture/fences/teak_ne", "y": 270, "uvlock": true }, + "east=false,north=true,south=true,west=false,woodtype=teak": { "model": "forestry:arboriculture/fences/teak_ns", "uvlock": true }, + "east=true,north=false,south=false,west=true,woodtype=teak": { "model": "forestry:arboriculture/fences/teak_ns", "y": 90, "uvlock": true }, + "east=true,north=true,south=true,west=false,woodtype=teak": { "model": "forestry:arboriculture/fences/teak_nse", "uvlock": true }, + "east=true,north=false,south=true,west=true,woodtype=teak": { "model": "forestry:arboriculture/fences/teak_nse", "y": 90, "uvlock": true }, + "east=false,north=true,south=true,west=true,woodtype=teak": { "model": "forestry:arboriculture/fences/teak_nse", "y": 180, "uvlock": true }, + "east=true,north=true,south=false,west=true,woodtype=teak": { "model": "forestry:arboriculture/fences/teak_nse", "y": 270, "uvlock": true }, + "east=true,north=true,south=true,west=true,woodtype=teak": { "model": "forestry:arboriculture/fences/teak_nsew", "uvlock": true }, + //acacia + "east=false,north=false,south=false,west=false,woodtype=acacia": { "model": "forestry:arboriculture/fences/acacia_post" }, + "east=false,north=true,south=false,west=false,woodtype=acacia": { "model": "forestry:arboriculture/fences/acacia_n", "uvlock": true }, + "east=true,north=false,south=false,west=false,woodtype=acacia": { "model": "forestry:arboriculture/fences/acacia_n", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,west=false,woodtype=acacia": { "model": "forestry:arboriculture/fences/acacia_n", "y": 180, "uvlock": true }, + "east=false,north=false,south=false,west=true,woodtype=acacia": { "model": "forestry:arboriculture/fences/acacia_n", "y": 270, "uvlock": true }, + "east=true,north=true,south=false,west=false,woodtype=acacia": { "model": "forestry:arboriculture/fences/acacia_ne", "uvlock": true }, + "east=true,north=false,south=true,west=false,woodtype=acacia": { "model": "forestry:arboriculture/fences/acacia_ne", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,west=true,woodtype=acacia": { "model": "forestry:arboriculture/fences/acacia_ne", "y": 180, "uvlock": true }, + "east=false,north=true,south=false,west=true,woodtype=acacia": { "model": "forestry:arboriculture/fences/acacia_ne", "y": 270, "uvlock": true }, + "east=false,north=true,south=true,west=false,woodtype=acacia": { "model": "forestry:arboriculture/fences/acacia_ns", "uvlock": true }, + "east=true,north=false,south=false,west=true,woodtype=acacia": { "model": "forestry:arboriculture/fences/acacia_ns", "y": 90, "uvlock": true }, + "east=true,north=true,south=true,west=false,woodtype=acacia": { "model": "forestry:arboriculture/fences/acacia_nse", "uvlock": true }, + "east=true,north=false,south=true,west=true,woodtype=acacia": { "model": "forestry:arboriculture/fences/acacia_nse", "y": 90, "uvlock": true }, + "east=false,north=true,south=true,west=true,woodtype=acacia": { "model": "forestry:arboriculture/fences/acacia_nse", "y": 180, "uvlock": true }, + "east=true,north=true,south=false,west=true,woodtype=acacia": { "model": "forestry:arboriculture/fences/acacia_nse", "y": 270, "uvlock": true }, + "east=true,north=true,south=true,west=true,woodtype=acacia": { "model": "forestry:arboriculture/fences/acacia_nsew", "uvlock": true }, + //lime + "east=false,north=false,south=false,west=false,woodtype=lime": { "model": "forestry:arboriculture/fences/lime_post" }, + "east=false,north=true,south=false,west=false,woodtype=lime": { "model": "forestry:arboriculture/fences/lime_n", "uvlock": true }, + "east=true,north=false,south=false,west=false,woodtype=lime": { "model": "forestry:arboriculture/fences/lime_n", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,west=false,woodtype=lime": { "model": "forestry:arboriculture/fences/lime_n", "y": 180, "uvlock": true }, + "east=false,north=false,south=false,west=true,woodtype=lime": { "model": "forestry:arboriculture/fences/lime_n", "y": 270, "uvlock": true }, + "east=true,north=true,south=false,west=false,woodtype=lime": { "model": "forestry:arboriculture/fences/lime_ne", "uvlock": true }, + "east=true,north=false,south=true,west=false,woodtype=lime": { "model": "forestry:arboriculture/fences/lime_ne", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,west=true,woodtype=lime": { "model": "forestry:arboriculture/fences/lime_ne", "y": 180, "uvlock": true }, + "east=false,north=true,south=false,west=true,woodtype=lime": { "model": "forestry:arboriculture/fences/lime_ne", "y": 270, "uvlock": true }, + "east=false,north=true,south=true,west=false,woodtype=lime": { "model": "forestry:arboriculture/fences/lime_ns", "uvlock": true }, + "east=true,north=false,south=false,west=true,woodtype=lime": { "model": "forestry:arboriculture/fences/lime_ns", "y": 90, "uvlock": true }, + "east=true,north=true,south=true,west=false,woodtype=lime": { "model": "forestry:arboriculture/fences/lime_nse", "uvlock": true }, + "east=true,north=false,south=true,west=true,woodtype=lime": { "model": "forestry:arboriculture/fences/lime_nse", "y": 90, "uvlock": true }, + "east=false,north=true,south=true,west=true,woodtype=lime": { "model": "forestry:arboriculture/fences/lime_nse", "y": 180, "uvlock": true }, + "east=true,north=true,south=false,west=true,woodtype=lime": { "model": "forestry:arboriculture/fences/lime_nse", "y": 270, "uvlock": true }, + "east=true,north=true,south=true,west=true,woodtype=lime": { "model": "forestry:arboriculture/fences/lime_nsew", "uvlock": true }, + //chestnut + "east=false,north=false,south=false,west=false,woodtype=chestnut": { "model": "forestry:arboriculture/fences/chestnut_post" }, + "east=false,north=true,south=false,west=false,woodtype=chestnut": { "model": "forestry:arboriculture/fences/chestnut_n", "uvlock": true }, + "east=true,north=false,south=false,west=false,woodtype=chestnut": { "model": "forestry:arboriculture/fences/chestnut_n", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,west=false,woodtype=chestnut": { "model": "forestry:arboriculture/fences/chestnut_n", "y": 180, "uvlock": true }, + "east=false,north=false,south=false,west=true,woodtype=chestnut": { "model": "forestry:arboriculture/fences/chestnut_n", "y": 270, "uvlock": true }, + "east=true,north=true,south=false,west=false,woodtype=chestnut": { "model": "forestry:arboriculture/fences/chestnut_ne", "uvlock": true }, + "east=true,north=false,south=true,west=false,woodtype=chestnut": { "model": "forestry:arboriculture/fences/chestnut_ne", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,west=true,woodtype=chestnut": { "model": "forestry:arboriculture/fences/chestnut_ne", "y": 180, "uvlock": true }, + "east=false,north=true,south=false,west=true,woodtype=chestnut": { "model": "forestry:arboriculture/fences/chestnut_ne", "y": 270, "uvlock": true }, + "east=false,north=true,south=true,west=false,woodtype=chestnut": { "model": "forestry:arboriculture/fences/chestnut_ns", "uvlock": true }, + "east=true,north=false,south=false,west=true,woodtype=chestnut": { "model": "forestry:arboriculture/fences/chestnut_ns", "y": 90, "uvlock": true }, + "east=true,north=true,south=true,west=false,woodtype=chestnut": { "model": "forestry:arboriculture/fences/chestnut_nse", "uvlock": true }, + "east=true,north=false,south=true,west=true,woodtype=chestnut": { "model": "forestry:arboriculture/fences/chestnut_nse", "y": 90, "uvlock": true }, + "east=false,north=true,south=true,west=true,woodtype=chestnut": { "model": "forestry:arboriculture/fences/chestnut_nse", "y": 180, "uvlock": true }, + "east=true,north=true,south=false,west=true,woodtype=chestnut": { "model": "forestry:arboriculture/fences/chestnut_nse", "y": 270, "uvlock": true }, + "east=true,north=true,south=true,west=true,woodtype=chestnut": { "model": "forestry:arboriculture/fences/chestnut_nsew", "uvlock": true }, + //wenge + "east=false,north=false,south=false,west=false,woodtype=wenge": { "model": "forestry:arboriculture/fences/wenge_post" }, + "east=false,north=true,south=false,west=false,woodtype=wenge": { "model": "forestry:arboriculture/fences/wenge_n", "uvlock": true }, + "east=true,north=false,south=false,west=false,woodtype=wenge": { "model": "forestry:arboriculture/fences/wenge_n", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,west=false,woodtype=wenge": { "model": "forestry:arboriculture/fences/wenge_n", "y": 180, "uvlock": true }, + "east=false,north=false,south=false,west=true,woodtype=wenge": { "model": "forestry:arboriculture/fences/wenge_n", "y": 270, "uvlock": true }, + "east=true,north=true,south=false,west=false,woodtype=wenge": { "model": "forestry:arboriculture/fences/wenge_ne", "uvlock": true }, + "east=true,north=false,south=true,west=false,woodtype=wenge": { "model": "forestry:arboriculture/fences/wenge_ne", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,west=true,woodtype=wenge": { "model": "forestry:arboriculture/fences/wenge_ne", "y": 180, "uvlock": true }, + "east=false,north=true,south=false,west=true,woodtype=wenge": { "model": "forestry:arboriculture/fences/wenge_ne", "y": 270, "uvlock": true }, + "east=false,north=true,south=true,west=false,woodtype=wenge": { "model": "forestry:arboriculture/fences/wenge_ns", "uvlock": true }, + "east=true,north=false,south=false,west=true,woodtype=wenge": { "model": "forestry:arboriculture/fences/wenge_ns", "y": 90, "uvlock": true }, + "east=true,north=true,south=true,west=false,woodtype=wenge": { "model": "forestry:arboriculture/fences/wenge_nse", "uvlock": true }, + "east=true,north=false,south=true,west=true,woodtype=wenge": { "model": "forestry:arboriculture/fences/wenge_nse", "y": 90, "uvlock": true }, + "east=false,north=true,south=true,west=true,woodtype=wenge": { "model": "forestry:arboriculture/fences/wenge_nse", "y": 180, "uvlock": true }, + "east=true,north=true,south=false,west=true,woodtype=wenge": { "model": "forestry:arboriculture/fences/wenge_nse", "y": 270, "uvlock": true }, + "east=true,north=true,south=true,west=true,woodtype=wenge": { "model": "forestry:arboriculture/fences/wenge_nsew", "uvlock": true }, + //baobab + "east=false,north=false,south=false,west=false,woodtype=baobab": { "model": "forestry:arboriculture/fences/baobab_post" }, + "east=false,north=true,south=false,west=false,woodtype=baobab": { "model": "forestry:arboriculture/fences/baobab_n", "uvlock": true }, + "east=true,north=false,south=false,west=false,woodtype=baobab": { "model": "forestry:arboriculture/fences/baobab_n", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,west=false,woodtype=baobab": { "model": "forestry:arboriculture/fences/baobab_n", "y": 180, "uvlock": true }, + "east=false,north=false,south=false,west=true,woodtype=baobab": { "model": "forestry:arboriculture/fences/baobab_n", "y": 270, "uvlock": true }, + "east=true,north=true,south=false,west=false,woodtype=baobab": { "model": "forestry:arboriculture/fences/baobab_ne", "uvlock": true }, + "east=true,north=false,south=true,west=false,woodtype=baobab": { "model": "forestry:arboriculture/fences/baobab_ne", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,west=true,woodtype=baobab": { "model": "forestry:arboriculture/fences/baobab_ne", "y": 180, "uvlock": true }, + "east=false,north=true,south=false,west=true,woodtype=baobab": { "model": "forestry:arboriculture/fences/baobab_ne", "y": 270, "uvlock": true }, + "east=false,north=true,south=true,west=false,woodtype=baobab": { "model": "forestry:arboriculture/fences/baobab_ns", "uvlock": true }, + "east=true,north=false,south=false,west=true,woodtype=baobab": { "model": "forestry:arboriculture/fences/baobab_ns", "y": 90, "uvlock": true }, + "east=true,north=true,south=true,west=false,woodtype=baobab": { "model": "forestry:arboriculture/fences/baobab_nse", "uvlock": true }, + "east=true,north=false,south=true,west=true,woodtype=baobab": { "model": "forestry:arboriculture/fences/baobab_nse", "y": 90, "uvlock": true }, + "east=false,north=true,south=true,west=true,woodtype=baobab": { "model": "forestry:arboriculture/fences/baobab_nse", "y": 180, "uvlock": true }, + "east=true,north=true,south=false,west=true,woodtype=baobab": { "model": "forestry:arboriculture/fences/baobab_nse", "y": 270, "uvlock": true }, + "east=true,north=true,south=true,west=true,woodtype=baobab": { "model": "forestry:arboriculture/fences/baobab_nsew", "uvlock": true }, + //sequoia + "east=false,north=false,south=false,west=false,woodtype=sequoia": { "model": "forestry:arboriculture/fences/sequoia_post" }, + "east=false,north=true,south=false,west=false,woodtype=sequoia": { "model": "forestry:arboriculture/fences/sequoia_n", "uvlock": true }, + "east=true,north=false,south=false,west=false,woodtype=sequoia": { "model": "forestry:arboriculture/fences/sequoia_n", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,west=false,woodtype=sequoia": { "model": "forestry:arboriculture/fences/sequoia_n", "y": 180, "uvlock": true }, + "east=false,north=false,south=false,west=true,woodtype=sequoia": { "model": "forestry:arboriculture/fences/sequoia_n", "y": 270, "uvlock": true }, + "east=true,north=true,south=false,west=false,woodtype=sequoia": { "model": "forestry:arboriculture/fences/sequoia_ne", "uvlock": true }, + "east=true,north=false,south=true,west=false,woodtype=sequoia": { "model": "forestry:arboriculture/fences/sequoia_ne", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,west=true,woodtype=sequoia": { "model": "forestry:arboriculture/fences/sequoia_ne", "y": 180, "uvlock": true }, + "east=false,north=true,south=false,west=true,woodtype=sequoia": { "model": "forestry:arboriculture/fences/sequoia_ne", "y": 270, "uvlock": true }, + "east=false,north=true,south=true,west=false,woodtype=sequoia": { "model": "forestry:arboriculture/fences/sequoia_ns", "uvlock": true }, + "east=true,north=false,south=false,west=true,woodtype=sequoia": { "model": "forestry:arboriculture/fences/sequoia_ns", "y": 90, "uvlock": true }, + "east=true,north=true,south=true,west=false,woodtype=sequoia": { "model": "forestry:arboriculture/fences/sequoia_nse", "uvlock": true }, + "east=true,north=false,south=true,west=true,woodtype=sequoia": { "model": "forestry:arboriculture/fences/sequoia_nse", "y": 90, "uvlock": true }, + "east=false,north=true,south=true,west=true,woodtype=sequoia": { "model": "forestry:arboriculture/fences/sequoia_nse", "y": 180, "uvlock": true }, + "east=true,north=true,south=false,west=true,woodtype=sequoia": { "model": "forestry:arboriculture/fences/sequoia_nse", "y": 270, "uvlock": true }, + "east=true,north=true,south=true,west=true,woodtype=sequoia": { "model": "forestry:arboriculture/fences/sequoia_nsew", "uvlock": true }, + //kapok + "east=false,north=false,south=false,west=false,woodtype=kapok": { "model": "forestry:arboriculture/fences/kapok_post" }, + "east=false,north=true,south=false,west=false,woodtype=kapok": { "model": "forestry:arboriculture/fences/kapok_n", "uvlock": true }, + "east=true,north=false,south=false,west=false,woodtype=kapok": { "model": "forestry:arboriculture/fences/kapok_n", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,west=false,woodtype=kapok": { "model": "forestry:arboriculture/fences/kapok_n", "y": 180, "uvlock": true }, + "east=false,north=false,south=false,west=true,woodtype=kapok": { "model": "forestry:arboriculture/fences/kapok_n", "y": 270, "uvlock": true }, + "east=true,north=true,south=false,west=false,woodtype=kapok": { "model": "forestry:arboriculture/fences/kapok_ne", "uvlock": true }, + "east=true,north=false,south=true,west=false,woodtype=kapok": { "model": "forestry:arboriculture/fences/kapok_ne", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,west=true,woodtype=kapok": { "model": "forestry:arboriculture/fences/kapok_ne", "y": 180, "uvlock": true }, + "east=false,north=true,south=false,west=true,woodtype=kapok": { "model": "forestry:arboriculture/fences/kapok_ne", "y": 270, "uvlock": true }, + "east=false,north=true,south=true,west=false,woodtype=kapok": { "model": "forestry:arboriculture/fences/kapok_ns", "uvlock": true }, + "east=true,north=false,south=false,west=true,woodtype=kapok": { "model": "forestry:arboriculture/fences/kapok_ns", "y": 90, "uvlock": true }, + "east=true,north=true,south=true,west=false,woodtype=kapok": { "model": "forestry:arboriculture/fences/kapok_nse", "uvlock": true }, + "east=true,north=false,south=true,west=true,woodtype=kapok": { "model": "forestry:arboriculture/fences/kapok_nse", "y": 90, "uvlock": true }, + "east=false,north=true,south=true,west=true,woodtype=kapok": { "model": "forestry:arboriculture/fences/kapok_nse", "y": 180, "uvlock": true }, + "east=true,north=true,south=false,west=true,woodtype=kapok": { "model": "forestry:arboriculture/fences/kapok_nse", "y": 270, "uvlock": true }, + "east=true,north=true,south=true,west=true,woodtype=kapok": { "model": "forestry:arboriculture/fences/kapok_nsew", "uvlock": true }, + //ebony + "east=false,north=false,south=false,west=false,woodtype=ebony": { "model": "forestry:arboriculture/fences/ebony_post" }, + "east=false,north=true,south=false,west=false,woodtype=ebony": { "model": "forestry:arboriculture/fences/ebony_n", "uvlock": true }, + "east=true,north=false,south=false,west=false,woodtype=ebony": { "model": "forestry:arboriculture/fences/ebony_n", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,west=false,woodtype=ebony": { "model": "forestry:arboriculture/fences/ebony_n", "y": 180, "uvlock": true }, + "east=false,north=false,south=false,west=true,woodtype=ebony": { "model": "forestry:arboriculture/fences/ebony_n", "y": 270, "uvlock": true }, + "east=true,north=true,south=false,west=false,woodtype=ebony": { "model": "forestry:arboriculture/fences/ebony_ne", "uvlock": true }, + "east=true,north=false,south=true,west=false,woodtype=ebony": { "model": "forestry:arboriculture/fences/ebony_ne", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,west=true,woodtype=ebony": { "model": "forestry:arboriculture/fences/ebony_ne", "y": 180, "uvlock": true }, + "east=false,north=true,south=false,west=true,woodtype=ebony": { "model": "forestry:arboriculture/fences/ebony_ne", "y": 270, "uvlock": true }, + "east=false,north=true,south=true,west=false,woodtype=ebony": { "model": "forestry:arboriculture/fences/ebony_ns", "uvlock": true }, + "east=true,north=false,south=false,west=true,woodtype=ebony": { "model": "forestry:arboriculture/fences/ebony_ns", "y": 90, "uvlock": true }, + "east=true,north=true,south=true,west=false,woodtype=ebony": { "model": "forestry:arboriculture/fences/ebony_nse", "uvlock": true }, + "east=true,north=false,south=true,west=true,woodtype=ebony": { "model": "forestry:arboriculture/fences/ebony_nse", "y": 90, "uvlock": true }, + "east=false,north=true,south=true,west=true,woodtype=ebony": { "model": "forestry:arboriculture/fences/ebony_nse", "y": 180, "uvlock": true }, + "east=true,north=true,south=false,west=true,woodtype=ebony": { "model": "forestry:arboriculture/fences/ebony_nse", "y": 270, "uvlock": true }, + "east=true,north=true,south=true,west=true,woodtype=ebony": { "model": "forestry:arboriculture/fences/ebony_nsew", "uvlock": true }, + //mahogany + "east=false,north=false,south=false,west=false,woodtype=mahogany": { "model": "forestry:arboriculture/fences/mahogany_post" }, + "east=false,north=true,south=false,west=false,woodtype=mahogany": { "model": "forestry:arboriculture/fences/mahogany_n", "uvlock": true }, + "east=true,north=false,south=false,west=false,woodtype=mahogany": { "model": "forestry:arboriculture/fences/mahogany_n", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,west=false,woodtype=mahogany": { "model": "forestry:arboriculture/fences/mahogany_n", "y": 180, "uvlock": true }, + "east=false,north=false,south=false,west=true,woodtype=mahogany": { "model": "forestry:arboriculture/fences/mahogany_n", "y": 270, "uvlock": true }, + "east=true,north=true,south=false,west=false,woodtype=mahogany": { "model": "forestry:arboriculture/fences/mahogany_ne", "uvlock": true }, + "east=true,north=false,south=true,west=false,woodtype=mahogany": { "model": "forestry:arboriculture/fences/mahogany_ne", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,west=true,woodtype=mahogany": { "model": "forestry:arboriculture/fences/mahogany_ne", "y": 180, "uvlock": true }, + "east=false,north=true,south=false,west=true,woodtype=mahogany": { "model": "forestry:arboriculture/fences/mahogany_ne", "y": 270, "uvlock": true }, + "east=false,north=true,south=true,west=false,woodtype=mahogany": { "model": "forestry:arboriculture/fences/mahogany_ns", "uvlock": true }, + "east=true,north=false,south=false,west=true,woodtype=mahogany": { "model": "forestry:arboriculture/fences/mahogany_ns", "y": 90, "uvlock": true }, + "east=true,north=true,south=true,west=false,woodtype=mahogany": { "model": "forestry:arboriculture/fences/mahogany_nse", "uvlock": true }, + "east=true,north=false,south=true,west=true,woodtype=mahogany": { "model": "forestry:arboriculture/fences/mahogany_nse", "y": 90, "uvlock": true }, + "east=false,north=true,south=true,west=true,woodtype=mahogany": { "model": "forestry:arboriculture/fences/mahogany_nse", "y": 180, "uvlock": true }, + "east=true,north=true,south=false,west=true,woodtype=mahogany": { "model": "forestry:arboriculture/fences/mahogany_nse", "y": 270, "uvlock": true }, + "east=true,north=true,south=true,west=true,woodtype=mahogany": { "model": "forestry:arboriculture/fences/mahogany_nsew", "uvlock": true }, + //balsa + "east=false,north=false,south=false,west=false,woodtype=balsa": { "model": "forestry:arboriculture/fences/balsa_post" }, + "east=false,north=true,south=false,west=false,woodtype=balsa": { "model": "forestry:arboriculture/fences/balsa_n", "uvlock": true }, + "east=true,north=false,south=false,west=false,woodtype=balsa": { "model": "forestry:arboriculture/fences/balsa_n", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,west=false,woodtype=balsa": { "model": "forestry:arboriculture/fences/balsa_n", "y": 180, "uvlock": true }, + "east=false,north=false,south=false,west=true,woodtype=balsa": { "model": "forestry:arboriculture/fences/balsa_n", "y": 270, "uvlock": true }, + "east=true,north=true,south=false,west=false,woodtype=balsa": { "model": "forestry:arboriculture/fences/balsa_ne", "uvlock": true }, + "east=true,north=false,south=true,west=false,woodtype=balsa": { "model": "forestry:arboriculture/fences/balsa_ne", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,west=true,woodtype=balsa": { "model": "forestry:arboriculture/fences/balsa_ne", "y": 180, "uvlock": true }, + "east=false,north=true,south=false,west=true,woodtype=balsa": { "model": "forestry:arboriculture/fences/balsa_ne", "y": 270, "uvlock": true }, + "east=false,north=true,south=true,west=false,woodtype=balsa": { "model": "forestry:arboriculture/fences/balsa_ns", "uvlock": true }, + "east=true,north=false,south=false,west=true,woodtype=balsa": { "model": "forestry:arboriculture/fences/balsa_ns", "y": 90, "uvlock": true }, + "east=true,north=true,south=true,west=false,woodtype=balsa": { "model": "forestry:arboriculture/fences/balsa_nse", "uvlock": true }, + "east=true,north=false,south=true,west=true,woodtype=balsa": { "model": "forestry:arboriculture/fences/balsa_nse", "y": 90, "uvlock": true }, + "east=false,north=true,south=true,west=true,woodtype=balsa": { "model": "forestry:arboriculture/fences/balsa_nse", "y": 180, "uvlock": true }, + "east=true,north=true,south=false,west=true,woodtype=balsa": { "model": "forestry:arboriculture/fences/balsa_nse", "y": 270, "uvlock": true }, + "east=true,north=true,south=true,west=true,woodtype=balsa": { "model": "forestry:arboriculture/fences/balsa_nsew", "uvlock": true }, + //willow + "east=false,north=false,south=false,west=false,woodtype=willow": { "model": "forestry:arboriculture/fences/willow_post" }, + "east=false,north=true,south=false,west=false,woodtype=willow": { "model": "forestry:arboriculture/fences/willow_n", "uvlock": true }, + "east=true,north=false,south=false,west=false,woodtype=willow": { "model": "forestry:arboriculture/fences/willow_n", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,west=false,woodtype=willow": { "model": "forestry:arboriculture/fences/willow_n", "y": 180, "uvlock": true }, + "east=false,north=false,south=false,west=true,woodtype=willow": { "model": "forestry:arboriculture/fences/willow_n", "y": 270, "uvlock": true }, + "east=true,north=true,south=false,west=false,woodtype=willow": { "model": "forestry:arboriculture/fences/willow_ne", "uvlock": true }, + "east=true,north=false,south=true,west=false,woodtype=willow": { "model": "forestry:arboriculture/fences/willow_ne", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,west=true,woodtype=willow": { "model": "forestry:arboriculture/fences/willow_ne", "y": 180, "uvlock": true }, + "east=false,north=true,south=false,west=true,woodtype=willow": { "model": "forestry:arboriculture/fences/willow_ne", "y": 270, "uvlock": true }, + "east=false,north=true,south=true,west=false,woodtype=willow": { "model": "forestry:arboriculture/fences/willow_ns", "uvlock": true }, + "east=true,north=false,south=false,west=true,woodtype=willow": { "model": "forestry:arboriculture/fences/willow_ns", "y": 90, "uvlock": true }, + "east=true,north=true,south=true,west=false,woodtype=willow": { "model": "forestry:arboriculture/fences/willow_nse", "uvlock": true }, + "east=true,north=false,south=true,west=true,woodtype=willow": { "model": "forestry:arboriculture/fences/willow_nse", "y": 90, "uvlock": true }, + "east=false,north=true,south=true,west=true,woodtype=willow": { "model": "forestry:arboriculture/fences/willow_nse", "y": 180, "uvlock": true }, + "east=true,north=true,south=false,west=true,woodtype=willow": { "model": "forestry:arboriculture/fences/willow_nse", "y": 270, "uvlock": true }, + "east=true,north=true,south=true,west=true,woodtype=willow": { "model": "forestry:arboriculture/fences/willow_nsew", "uvlock": true }, + //walnut + "east=false,north=false,south=false,west=false,woodtype=walnut": { "model": "forestry:arboriculture/fences/walnut_post" }, + "east=false,north=true,south=false,west=false,woodtype=walnut": { "model": "forestry:arboriculture/fences/walnut_n", "uvlock": true }, + "east=true,north=false,south=false,west=false,woodtype=walnut": { "model": "forestry:arboriculture/fences/walnut_n", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,west=false,woodtype=walnut": { "model": "forestry:arboriculture/fences/walnut_n", "y": 180, "uvlock": true }, + "east=false,north=false,south=false,west=true,woodtype=walnut": { "model": "forestry:arboriculture/fences/walnut_n", "y": 270, "uvlock": true }, + "east=true,north=true,south=false,west=false,woodtype=walnut": { "model": "forestry:arboriculture/fences/walnut_ne", "uvlock": true }, + "east=true,north=false,south=true,west=false,woodtype=walnut": { "model": "forestry:arboriculture/fences/walnut_ne", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,west=true,woodtype=walnut": { "model": "forestry:arboriculture/fences/walnut_ne", "y": 180, "uvlock": true }, + "east=false,north=true,south=false,west=true,woodtype=walnut": { "model": "forestry:arboriculture/fences/walnut_ne", "y": 270, "uvlock": true }, + "east=false,north=true,south=true,west=false,woodtype=walnut": { "model": "forestry:arboriculture/fences/walnut_ns", "uvlock": true }, + "east=true,north=false,south=false,west=true,woodtype=walnut": { "model": "forestry:arboriculture/fences/walnut_ns", "y": 90, "uvlock": true }, + "east=true,north=true,south=true,west=false,woodtype=walnut": { "model": "forestry:arboriculture/fences/walnut_nse", "uvlock": true }, + "east=true,north=false,south=true,west=true,woodtype=walnut": { "model": "forestry:arboriculture/fences/walnut_nse", "y": 90, "uvlock": true }, + "east=false,north=true,south=true,west=true,woodtype=walnut": { "model": "forestry:arboriculture/fences/walnut_nse", "y": 180, "uvlock": true }, + "east=true,north=true,south=false,west=true,woodtype=walnut": { "model": "forestry:arboriculture/fences/walnut_nse", "y": 270, "uvlock": true }, + "east=true,north=true,south=true,west=true,woodtype=walnut": { "model": "forestry:arboriculture/fences/walnut_nsew", "uvlock": true }, + //greenheart + "east=false,north=false,south=false,west=false,woodtype=greenheart": { "model": "forestry:arboriculture/fences/greenheart_post" }, + "east=false,north=true,south=false,west=false,woodtype=greenheart": { "model": "forestry:arboriculture/fences/greenheart_n", "uvlock": true }, + "east=true,north=false,south=false,west=false,woodtype=greenheart": { "model": "forestry:arboriculture/fences/greenheart_n", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,west=false,woodtype=greenheart": { "model": "forestry:arboriculture/fences/greenheart_n", "y": 180, "uvlock": true }, + "east=false,north=false,south=false,west=true,woodtype=greenheart": { "model": "forestry:arboriculture/fences/greenheart_n", "y": 270, "uvlock": true }, + "east=true,north=true,south=false,west=false,woodtype=greenheart": { "model": "forestry:arboriculture/fences/greenheart_ne", "uvlock": true }, + "east=true,north=false,south=true,west=false,woodtype=greenheart": { "model": "forestry:arboriculture/fences/greenheart_ne", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,west=true,woodtype=greenheart": { "model": "forestry:arboriculture/fences/greenheart_ne", "y": 180, "uvlock": true }, + "east=false,north=true,south=false,west=true,woodtype=greenheart": { "model": "forestry:arboriculture/fences/greenheart_ne", "y": 270, "uvlock": true }, + "east=false,north=true,south=true,west=false,woodtype=greenheart": { "model": "forestry:arboriculture/fences/greenheart_ns", "uvlock": true }, + "east=true,north=false,south=false,west=true,woodtype=greenheart": { "model": "forestry:arboriculture/fences/greenheart_ns", "y": 90, "uvlock": true }, + "east=true,north=true,south=true,west=false,woodtype=greenheart": { "model": "forestry:arboriculture/fences/greenheart_nse", "uvlock": true }, + "east=true,north=false,south=true,west=true,woodtype=greenheart": { "model": "forestry:arboriculture/fences/greenheart_nse", "y": 90, "uvlock": true }, + "east=false,north=true,south=true,west=true,woodtype=greenheart": { "model": "forestry:arboriculture/fences/greenheart_nse", "y": 180, "uvlock": true }, + "east=true,north=true,south=false,west=true,woodtype=greenheart": { "model": "forestry:arboriculture/fences/greenheart_nse", "y": 270, "uvlock": true }, + "east=true,north=true,south=true,west=true,woodtype=greenheart": { "model": "forestry:arboriculture/fences/greenheart_nsew", "uvlock": true }, + //cherry + "east=false,north=false,south=false,west=false,woodtype=cherry": { "model": "forestry:arboriculture/fences/cherry_post" }, + "east=false,north=true,south=false,west=false,woodtype=cherry": { "model": "forestry:arboriculture/fences/cherry_n", "uvlock": true }, + "east=true,north=false,south=false,west=false,woodtype=cherry": { "model": "forestry:arboriculture/fences/cherry_n", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,west=false,woodtype=cherry": { "model": "forestry:arboriculture/fences/cherry_n", "y": 180, "uvlock": true }, + "east=false,north=false,south=false,west=true,woodtype=cherry": { "model": "forestry:arboriculture/fences/cherry_n", "y": 270, "uvlock": true }, + "east=true,north=true,south=false,west=false,woodtype=cherry": { "model": "forestry:arboriculture/fences/cherry_ne", "uvlock": true }, + "east=true,north=false,south=true,west=false,woodtype=cherry": { "model": "forestry:arboriculture/fences/cherry_ne", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,west=true,woodtype=cherry": { "model": "forestry:arboriculture/fences/cherry_ne", "y": 180, "uvlock": true }, + "east=false,north=true,south=false,west=true,woodtype=cherry": { "model": "forestry:arboriculture/fences/cherry_ne", "y": 270, "uvlock": true }, + "east=false,north=true,south=true,west=false,woodtype=cherry": { "model": "forestry:arboriculture/fences/cherry_ns", "uvlock": true }, + "east=true,north=false,south=false,west=true,woodtype=cherry": { "model": "forestry:arboriculture/fences/cherry_ns", "y": 90, "uvlock": true }, + "east=true,north=true,south=true,west=false,woodtype=cherry": { "model": "forestry:arboriculture/fences/cherry_nse", "uvlock": true }, + "east=true,north=false,south=true,west=true,woodtype=cherry": { "model": "forestry:arboriculture/fences/cherry_nse", "y": 90, "uvlock": true }, + "east=false,north=true,south=true,west=true,woodtype=cherry": { "model": "forestry:arboriculture/fences/cherry_nse", "y": 180, "uvlock": true }, + "east=true,north=true,south=false,west=true,woodtype=cherry": { "model": "forestry:arboriculture/fences/cherry_nse", "y": 270, "uvlock": true }, + "east=true,north=true,south=true,west=true,woodtype=cherry": { "model": "forestry:arboriculture/fences/cherry_nsew", "uvlock": true }, + //mahoe + "east=false,north=false,south=false,west=false,woodtype=mahoe": { "model": "forestry:arboriculture/fences/mahoe_post" }, + "east=false,north=true,south=false,west=false,woodtype=mahoe": { "model": "forestry:arboriculture/fences/mahoe_n", "uvlock": true }, + "east=true,north=false,south=false,west=false,woodtype=mahoe": { "model": "forestry:arboriculture/fences/mahoe_n", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,west=false,woodtype=mahoe": { "model": "forestry:arboriculture/fences/mahoe_n", "y": 180, "uvlock": true }, + "east=false,north=false,south=false,west=true,woodtype=mahoe": { "model": "forestry:arboriculture/fences/mahoe_n", "y": 270, "uvlock": true }, + "east=true,north=true,south=false,west=false,woodtype=mahoe": { "model": "forestry:arboriculture/fences/mahoe_ne", "uvlock": true }, + "east=true,north=false,south=true,west=false,woodtype=mahoe": { "model": "forestry:arboriculture/fences/mahoe_ne", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,west=true,woodtype=mahoe": { "model": "forestry:arboriculture/fences/mahoe_ne", "y": 180, "uvlock": true }, + "east=false,north=true,south=false,west=true,woodtype=mahoe": { "model": "forestry:arboriculture/fences/mahoe_ne", "y": 270, "uvlock": true }, + "east=false,north=true,south=true,west=false,woodtype=mahoe": { "model": "forestry:arboriculture/fences/mahoe_ns", "uvlock": true }, + "east=true,north=false,south=false,west=true,woodtype=mahoe": { "model": "forestry:arboriculture/fences/mahoe_ns", "y": 90, "uvlock": true }, + "east=true,north=true,south=true,west=false,woodtype=mahoe": { "model": "forestry:arboriculture/fences/mahoe_nse", "uvlock": true }, + "east=true,north=false,south=true,west=true,woodtype=mahoe": { "model": "forestry:arboriculture/fences/mahoe_nse", "y": 90, "uvlock": true }, + "east=false,north=true,south=true,west=true,woodtype=mahoe": { "model": "forestry:arboriculture/fences/mahoe_nse", "y": 180, "uvlock": true }, + "east=true,north=true,south=false,west=true,woodtype=mahoe": { "model": "forestry:arboriculture/fences/mahoe_nse", "y": 270, "uvlock": true }, + "east=true,north=true,south=true,west=true,woodtype=mahoe": { "model": "forestry:arboriculture/fences/mahoe_nsew", "uvlock": true }, + //poplar + "east=false,north=false,south=false,west=false,woodtype=poplar": { "model": "forestry:arboriculture/fences/poplar_post" }, + "east=false,north=true,south=false,west=false,woodtype=poplar": { "model": "forestry:arboriculture/fences/poplar_n", "uvlock": true }, + "east=true,north=false,south=false,west=false,woodtype=poplar": { "model": "forestry:arboriculture/fences/poplar_n", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,west=false,woodtype=poplar": { "model": "forestry:arboriculture/fences/poplar_n", "y": 180, "uvlock": true }, + "east=false,north=false,south=false,west=true,woodtype=poplar": { "model": "forestry:arboriculture/fences/poplar_n", "y": 270, "uvlock": true }, + "east=true,north=true,south=false,west=false,woodtype=poplar": { "model": "forestry:arboriculture/fences/poplar_ne", "uvlock": true }, + "east=true,north=false,south=true,west=false,woodtype=poplar": { "model": "forestry:arboriculture/fences/poplar_ne", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,west=true,woodtype=poplar": { "model": "forestry:arboriculture/fences/poplar_ne", "y": 180, "uvlock": true }, + "east=false,north=true,south=false,west=true,woodtype=poplar": { "model": "forestry:arboriculture/fences/poplar_ne", "y": 270, "uvlock": true }, + "east=false,north=true,south=true,west=false,woodtype=poplar": { "model": "forestry:arboriculture/fences/poplar_ns", "uvlock": true }, + "east=true,north=false,south=false,west=true,woodtype=poplar": { "model": "forestry:arboriculture/fences/poplar_ns", "y": 90, "uvlock": true }, + "east=true,north=true,south=true,west=false,woodtype=poplar": { "model": "forestry:arboriculture/fences/poplar_nse", "uvlock": true }, + "east=true,north=false,south=true,west=true,woodtype=poplar": { "model": "forestry:arboriculture/fences/poplar_nse", "y": 90, "uvlock": true }, + "east=false,north=true,south=true,west=true,woodtype=poplar": { "model": "forestry:arboriculture/fences/poplar_nse", "y": 180, "uvlock": true }, + "east=true,north=true,south=false,west=true,woodtype=poplar": { "model": "forestry:arboriculture/fences/poplar_nse", "y": 270, "uvlock": true }, + "east=true,north=true,south=true,west=true,woodtype=poplar": { "model": "forestry:arboriculture/fences/poplar_nsew", "uvlock": true }, + //palm + "east=false,north=false,south=false,west=false,woodtype=palm": { "model": "forestry:arboriculture/fences/palm_post" }, + "east=false,north=true,south=false,west=false,woodtype=palm": { "model": "forestry:arboriculture/fences/palm_n", "uvlock": true }, + "east=true,north=false,south=false,west=false,woodtype=palm": { "model": "forestry:arboriculture/fences/palm_n", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,west=false,woodtype=palm": { "model": "forestry:arboriculture/fences/palm_n", "y": 180, "uvlock": true }, + "east=false,north=false,south=false,west=true,woodtype=palm": { "model": "forestry:arboriculture/fences/palm_n", "y": 270, "uvlock": true }, + "east=true,north=true,south=false,west=false,woodtype=palm": { "model": "forestry:arboriculture/fences/palm_ne", "uvlock": true }, + "east=true,north=false,south=true,west=false,woodtype=palm": { "model": "forestry:arboriculture/fences/palm_ne", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,west=true,woodtype=palm": { "model": "forestry:arboriculture/fences/palm_ne", "y": 180, "uvlock": true }, + "east=false,north=true,south=false,west=true,woodtype=palm": { "model": "forestry:arboriculture/fences/palm_ne", "y": 270, "uvlock": true }, + "east=false,north=true,south=true,west=false,woodtype=palm": { "model": "forestry:arboriculture/fences/palm_ns", "uvlock": true }, + "east=true,north=false,south=false,west=true,woodtype=palm": { "model": "forestry:arboriculture/fences/palm_ns", "y": 90, "uvlock": true }, + "east=true,north=true,south=true,west=false,woodtype=palm": { "model": "forestry:arboriculture/fences/palm_nse", "uvlock": true }, + "east=true,north=false,south=true,west=true,woodtype=palm": { "model": "forestry:arboriculture/fences/palm_nse", "y": 90, "uvlock": true }, + "east=false,north=true,south=true,west=true,woodtype=palm": { "model": "forestry:arboriculture/fences/palm_nse", "y": 180, "uvlock": true }, + "east=true,north=true,south=false,west=true,woodtype=palm": { "model": "forestry:arboriculture/fences/palm_nse", "y": 270, "uvlock": true }, + "east=true,north=true,south=true,west=true,woodtype=palm": { "model": "forestry:arboriculture/fences/palm_nsew", "uvlock": true }, + //papaya + "east=false,north=false,south=false,west=false,woodtype=papaya": { "model": "forestry:arboriculture/fences/papaya_post" }, + "east=false,north=true,south=false,west=false,woodtype=papaya": { "model": "forestry:arboriculture/fences/papaya_n", "uvlock": true }, + "east=true,north=false,south=false,west=false,woodtype=papaya": { "model": "forestry:arboriculture/fences/papaya_n", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,west=false,woodtype=papaya": { "model": "forestry:arboriculture/fences/papaya_n", "y": 180, "uvlock": true }, + "east=false,north=false,south=false,west=true,woodtype=papaya": { "model": "forestry:arboriculture/fences/papaya_n", "y": 270, "uvlock": true }, + "east=true,north=true,south=false,west=false,woodtype=papaya": { "model": "forestry:arboriculture/fences/papaya_ne", "uvlock": true }, + "east=true,north=false,south=true,west=false,woodtype=papaya": { "model": "forestry:arboriculture/fences/papaya_ne", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,west=true,woodtype=papaya": { "model": "forestry:arboriculture/fences/papaya_ne", "y": 180, "uvlock": true }, + "east=false,north=true,south=false,west=true,woodtype=papaya": { "model": "forestry:arboriculture/fences/papaya_ne", "y": 270, "uvlock": true }, + "east=false,north=true,south=true,west=false,woodtype=papaya": { "model": "forestry:arboriculture/fences/papaya_ns", "uvlock": true }, + "east=true,north=false,south=false,west=true,woodtype=papaya": { "model": "forestry:arboriculture/fences/papaya_ns", "y": 90, "uvlock": true }, + "east=true,north=true,south=true,west=false,woodtype=papaya": { "model": "forestry:arboriculture/fences/papaya_nse", "uvlock": true }, + "east=true,north=false,south=true,west=true,woodtype=papaya": { "model": "forestry:arboriculture/fences/papaya_nse", "y": 90, "uvlock": true }, + "east=false,north=true,south=true,west=true,woodtype=papaya": { "model": "forestry:arboriculture/fences/papaya_nse", "y": 180, "uvlock": true }, + "east=true,north=true,south=false,west=true,woodtype=papaya": { "model": "forestry:arboriculture/fences/papaya_nse", "y": 270, "uvlock": true }, + "east=true,north=true,south=true,west=true,woodtype=papaya": { "model": "forestry:arboriculture/fences/papaya_nsew", "uvlock": true }, + //pine + "east=false,north=false,south=false,west=false,woodtype=pine": { "model": "forestry:arboriculture/fences/pine_post" }, + "east=false,north=true,south=false,west=false,woodtype=pine": { "model": "forestry:arboriculture/fences/pine_n", "uvlock": true }, + "east=true,north=false,south=false,west=false,woodtype=pine": { "model": "forestry:arboriculture/fences/pine_n", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,west=false,woodtype=pine": { "model": "forestry:arboriculture/fences/pine_n", "y": 180, "uvlock": true }, + "east=false,north=false,south=false,west=true,woodtype=pine": { "model": "forestry:arboriculture/fences/pine_n", "y": 270, "uvlock": true }, + "east=true,north=true,south=false,west=false,woodtype=pine": { "model": "forestry:arboriculture/fences/pine_ne", "uvlock": true }, + "east=true,north=false,south=true,west=false,woodtype=pine": { "model": "forestry:arboriculture/fences/pine_ne", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,west=true,woodtype=pine": { "model": "forestry:arboriculture/fences/pine_ne", "y": 180, "uvlock": true }, + "east=false,north=true,south=false,west=true,woodtype=pine": { "model": "forestry:arboriculture/fences/pine_ne", "y": 270, "uvlock": true }, + "east=false,north=true,south=true,west=false,woodtype=pine": { "model": "forestry:arboriculture/fences/pine_ns", "uvlock": true }, + "east=true,north=false,south=false,west=true,woodtype=pine": { "model": "forestry:arboriculture/fences/pine_ns", "y": 90, "uvlock": true }, + "east=true,north=true,south=true,west=false,woodtype=pine": { "model": "forestry:arboriculture/fences/pine_nse", "uvlock": true }, + "east=true,north=false,south=true,west=true,woodtype=pine": { "model": "forestry:arboriculture/fences/pine_nse", "y": 90, "uvlock": true }, + "east=false,north=true,south=true,west=true,woodtype=pine": { "model": "forestry:arboriculture/fences/pine_nse", "y": 180, "uvlock": true }, + "east=true,north=true,south=false,west=true,woodtype=pine": { "model": "forestry:arboriculture/fences/pine_nse", "y": 270, "uvlock": true }, + "east=true,north=true,south=true,west=true,woodtype=pine": { "model": "forestry:arboriculture/fences/pine_nsew", "uvlock": true }, + //plum + "east=false,north=false,south=false,west=false,woodtype=plum": { "model": "forestry:arboriculture/fences/plum_post" }, + "east=false,north=true,south=false,west=false,woodtype=plum": { "model": "forestry:arboriculture/fences/plum_n", "uvlock": true }, + "east=true,north=false,south=false,west=false,woodtype=plum": { "model": "forestry:arboriculture/fences/plum_n", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,west=false,woodtype=plum": { "model": "forestry:arboriculture/fences/plum_n", "y": 180, "uvlock": true }, + "east=false,north=false,south=false,west=true,woodtype=plum": { "model": "forestry:arboriculture/fences/plum_n", "y": 270, "uvlock": true }, + "east=true,north=true,south=false,west=false,woodtype=plum": { "model": "forestry:arboriculture/fences/plum_ne", "uvlock": true }, + "east=true,north=false,south=true,west=false,woodtype=plum": { "model": "forestry:arboriculture/fences/plum_ne", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,west=true,woodtype=plum": { "model": "forestry:arboriculture/fences/plum_ne", "y": 180, "uvlock": true }, + "east=false,north=true,south=false,west=true,woodtype=plum": { "model": "forestry:arboriculture/fences/plum_ne", "y": 270, "uvlock": true }, + "east=false,north=true,south=true,west=false,woodtype=plum": { "model": "forestry:arboriculture/fences/plum_ns", "uvlock": true }, + "east=true,north=false,south=false,west=true,woodtype=plum": { "model": "forestry:arboriculture/fences/plum_ns", "y": 90, "uvlock": true }, + "east=true,north=true,south=true,west=false,woodtype=plum": { "model": "forestry:arboriculture/fences/plum_nse", "uvlock": true }, + "east=true,north=false,south=true,west=true,woodtype=plum": { "model": "forestry:arboriculture/fences/plum_nse", "y": 90, "uvlock": true }, + "east=false,north=true,south=true,west=true,woodtype=plum": { "model": "forestry:arboriculture/fences/plum_nse", "y": 180, "uvlock": true }, + "east=true,north=true,south=false,west=true,woodtype=plum": { "model": "forestry:arboriculture/fences/plum_nse", "y": 270, "uvlock": true }, + "east=true,north=true,south=true,west=true,woodtype=plum": { "model": "forestry:arboriculture/fences/plum_nsew", "uvlock": true }, + //maple + "east=false,north=false,south=false,west=false,woodtype=maple": { "model": "forestry:arboriculture/fences/maple_post" }, + "east=false,north=true,south=false,west=false,woodtype=maple": { "model": "forestry:arboriculture/fences/maple_n", "uvlock": true }, + "east=true,north=false,south=false,west=false,woodtype=maple": { "model": "forestry:arboriculture/fences/maple_n", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,west=false,woodtype=maple": { "model": "forestry:arboriculture/fences/maple_n", "y": 180, "uvlock": true }, + "east=false,north=false,south=false,west=true,woodtype=maple": { "model": "forestry:arboriculture/fences/maple_n", "y": 270, "uvlock": true }, + "east=true,north=true,south=false,west=false,woodtype=maple": { "model": "forestry:arboriculture/fences/maple_ne", "uvlock": true }, + "east=true,north=false,south=true,west=false,woodtype=maple": { "model": "forestry:arboriculture/fences/maple_ne", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,west=true,woodtype=maple": { "model": "forestry:arboriculture/fences/maple_ne", "y": 180, "uvlock": true }, + "east=false,north=true,south=false,west=true,woodtype=maple": { "model": "forestry:arboriculture/fences/maple_ne", "y": 270, "uvlock": true }, + "east=false,north=true,south=true,west=false,woodtype=maple": { "model": "forestry:arboriculture/fences/maple_ns", "uvlock": true }, + "east=true,north=false,south=false,west=true,woodtype=maple": { "model": "forestry:arboriculture/fences/maple_ns", "y": 90, "uvlock": true }, + "east=true,north=true,south=true,west=false,woodtype=maple": { "model": "forestry:arboriculture/fences/maple_nse", "uvlock": true }, + "east=true,north=false,south=true,west=true,woodtype=maple": { "model": "forestry:arboriculture/fences/maple_nse", "y": 90, "uvlock": true }, + "east=false,north=true,south=true,west=true,woodtype=maple": { "model": "forestry:arboriculture/fences/maple_nse", "y": 180, "uvlock": true }, + "east=true,north=true,south=false,west=true,woodtype=maple": { "model": "forestry:arboriculture/fences/maple_nse", "y": 270, "uvlock": true }, + "east=true,north=true,south=true,west=true,woodtype=maple": { "model": "forestry:arboriculture/fences/maple_nsew", "uvlock": true }, + //citrus + "east=false,north=false,south=false,west=false,woodtype=citrus": { "model": "forestry:arboriculture/fences/citrus_post" }, + "east=false,north=true,south=false,west=false,woodtype=citrus": { "model": "forestry:arboriculture/fences/citrus_n", "uvlock": true }, + "east=true,north=false,south=false,west=false,woodtype=citrus": { "model": "forestry:arboriculture/fences/citrus_n", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,west=false,woodtype=citrus": { "model": "forestry:arboriculture/fences/citrus_n", "y": 180, "uvlock": true }, + "east=false,north=false,south=false,west=true,woodtype=citrus": { "model": "forestry:arboriculture/fences/citrus_n", "y": 270, "uvlock": true }, + "east=true,north=true,south=false,west=false,woodtype=citrus": { "model": "forestry:arboriculture/fences/citrus_ne", "uvlock": true }, + "east=true,north=false,south=true,west=false,woodtype=citrus": { "model": "forestry:arboriculture/fences/citrus_ne", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,west=true,woodtype=citrus": { "model": "forestry:arboriculture/fences/citrus_ne", "y": 180, "uvlock": true }, + "east=false,north=true,south=false,west=true,woodtype=citrus": { "model": "forestry:arboriculture/fences/citrus_ne", "y": 270, "uvlock": true }, + "east=false,north=true,south=true,west=false,woodtype=citrus": { "model": "forestry:arboriculture/fences/citrus_ns", "uvlock": true }, + "east=true,north=false,south=false,west=true,woodtype=citrus": { "model": "forestry:arboriculture/fences/citrus_ns", "y": 90, "uvlock": true }, + "east=true,north=true,south=true,west=false,woodtype=citrus": { "model": "forestry:arboriculture/fences/citrus_nse", "uvlock": true }, + "east=true,north=false,south=true,west=true,woodtype=citrus": { "model": "forestry:arboriculture/fences/citrus_nse", "y": 90, "uvlock": true }, + "east=false,north=true,south=true,west=true,woodtype=citrus": { "model": "forestry:arboriculture/fences/citrus_nse", "y": 180, "uvlock": true }, + "east=true,north=true,south=false,west=true,woodtype=citrus": { "model": "forestry:arboriculture/fences/citrus_nse", "y": 270, "uvlock": true }, + "east=true,north=true,south=true,west=true,woodtype=citrus": { "model": "forestry:arboriculture/fences/citrus_nsew", "uvlock": true }, + //giganteum + "east=false,north=false,south=false,west=false,woodtype=giganteum": { "model": "forestry:arboriculture/fences/giganteum_post" }, + "east=false,north=true,south=false,west=false,woodtype=giganteum": { "model": "forestry:arboriculture/fences/giganteum_n", "uvlock": true }, + "east=true,north=false,south=false,west=false,woodtype=giganteum": { "model": "forestry:arboriculture/fences/giganteum_n", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,west=false,woodtype=giganteum": { "model": "forestry:arboriculture/fences/giganteum_n", "y": 180, "uvlock": true }, + "east=false,north=false,south=false,west=true,woodtype=giganteum": { "model": "forestry:arboriculture/fences/giganteum_n", "y": 270, "uvlock": true }, + "east=true,north=true,south=false,west=false,woodtype=giganteum": { "model": "forestry:arboriculture/fences/giganteum_ne", "uvlock": true }, + "east=true,north=false,south=true,west=false,woodtype=giganteum": { "model": "forestry:arboriculture/fences/giganteum_ne", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,west=true,woodtype=giganteum": { "model": "forestry:arboriculture/fences/giganteum_ne", "y": 180, "uvlock": true }, + "east=false,north=true,south=false,west=true,woodtype=giganteum": { "model": "forestry:arboriculture/fences/giganteum_ne", "y": 270, "uvlock": true }, + "east=false,north=true,south=true,west=false,woodtype=giganteum": { "model": "forestry:arboriculture/fences/giganteum_ns", "uvlock": true }, + "east=true,north=false,south=false,west=true,woodtype=giganteum": { "model": "forestry:arboriculture/fences/giganteum_ns", "y": 90, "uvlock": true }, + "east=true,north=true,south=true,west=false,woodtype=giganteum": { "model": "forestry:arboriculture/fences/giganteum_nse", "uvlock": true }, + "east=true,north=false,south=true,west=true,woodtype=giganteum": { "model": "forestry:arboriculture/fences/giganteum_nse", "y": 90, "uvlock": true }, + "east=false,north=true,south=true,west=true,woodtype=giganteum": { "model": "forestry:arboriculture/fences/giganteum_nse", "y": 180, "uvlock": true }, + "east=true,north=true,south=false,west=true,woodtype=giganteum": { "model": "forestry:arboriculture/fences/giganteum_nse", "y": 270, "uvlock": true }, + "east=true,north=true,south=true,west=true,woodtype=giganteum": { "model": "forestry:arboriculture/fences/giganteum_nsew", "uvlock": true }, + //ipe + "east=false,north=false,south=false,west=false,woodtype=ipe": { "model": "forestry:arboriculture/fences/ipe_post" }, + "east=false,north=true,south=false,west=false,woodtype=ipe": { "model": "forestry:arboriculture/fences/ipe_n", "uvlock": true }, + "east=true,north=false,south=false,west=false,woodtype=ipe": { "model": "forestry:arboriculture/fences/ipe_n", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,west=false,woodtype=ipe": { "model": "forestry:arboriculture/fences/ipe_n", "y": 180, "uvlock": true }, + "east=false,north=false,south=false,west=true,woodtype=ipe": { "model": "forestry:arboriculture/fences/ipe_n", "y": 270, "uvlock": true }, + "east=true,north=true,south=false,west=false,woodtype=ipe": { "model": "forestry:arboriculture/fences/ipe_ne", "uvlock": true }, + "east=true,north=false,south=true,west=false,woodtype=ipe": { "model": "forestry:arboriculture/fences/ipe_ne", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,west=true,woodtype=ipe": { "model": "forestry:arboriculture/fences/ipe_ne", "y": 180, "uvlock": true }, + "east=false,north=true,south=false,west=true,woodtype=ipe": { "model": "forestry:arboriculture/fences/ipe_ne", "y": 270, "uvlock": true }, + "east=false,north=true,south=true,west=false,woodtype=ipe": { "model": "forestry:arboriculture/fences/ipe_ns", "uvlock": true }, + "east=true,north=false,south=false,west=true,woodtype=ipe": { "model": "forestry:arboriculture/fences/ipe_ns", "y": 90, "uvlock": true }, + "east=true,north=true,south=true,west=false,woodtype=ipe": { "model": "forestry:arboriculture/fences/ipe_nse", "uvlock": true }, + "east=true,north=false,south=true,west=true,woodtype=ipe": { "model": "forestry:arboriculture/fences/ipe_nse", "y": 90, "uvlock": true }, + "east=false,north=true,south=true,west=true,woodtype=ipe": { "model": "forestry:arboriculture/fences/ipe_nse", "y": 180, "uvlock": true }, + "east=true,north=true,south=false,west=true,woodtype=ipe": { "model": "forestry:arboriculture/fences/ipe_nse", "y": 270, "uvlock": true }, + "east=true,north=true,south=true,west=true,woodtype=ipe": { "model": "forestry:arboriculture/fences/ipe_nsew", "uvlock": true }, + //padauk + "east=false,north=false,south=false,west=false,woodtype=padauk": { "model": "forestry:arboriculture/fences/padauk_post" }, + "east=false,north=true,south=false,west=false,woodtype=padauk": { "model": "forestry:arboriculture/fences/padauk_n", "uvlock": true }, + "east=true,north=false,south=false,west=false,woodtype=padauk": { "model": "forestry:arboriculture/fences/padauk_n", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,west=false,woodtype=padauk": { "model": "forestry:arboriculture/fences/padauk_n", "y": 180, "uvlock": true }, + "east=false,north=false,south=false,west=true,woodtype=padauk": { "model": "forestry:arboriculture/fences/padauk_n", "y": 270, "uvlock": true }, + "east=true,north=true,south=false,west=false,woodtype=padauk": { "model": "forestry:arboriculture/fences/padauk_ne", "uvlock": true }, + "east=true,north=false,south=true,west=false,woodtype=padauk": { "model": "forestry:arboriculture/fences/padauk_ne", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,west=true,woodtype=padauk": { "model": "forestry:arboriculture/fences/padauk_ne", "y": 180, "uvlock": true }, + "east=false,north=true,south=false,west=true,woodtype=padauk": { "model": "forestry:arboriculture/fences/padauk_ne", "y": 270, "uvlock": true }, + "east=false,north=true,south=true,west=false,woodtype=padauk": { "model": "forestry:arboriculture/fences/padauk_ns", "uvlock": true }, + "east=true,north=false,south=false,west=true,woodtype=padauk": { "model": "forestry:arboriculture/fences/padauk_ns", "y": 90, "uvlock": true }, + "east=true,north=true,south=true,west=false,woodtype=padauk": { "model": "forestry:arboriculture/fences/padauk_nse", "uvlock": true }, + "east=true,north=false,south=true,west=true,woodtype=padauk": { "model": "forestry:arboriculture/fences/padauk_nse", "y": 90, "uvlock": true }, + "east=false,north=true,south=true,west=true,woodtype=padauk": { "model": "forestry:arboriculture/fences/padauk_nse", "y": 180, "uvlock": true }, + "east=true,north=true,south=false,west=true,woodtype=padauk": { "model": "forestry:arboriculture/fences/padauk_nse", "y": 270, "uvlock": true }, + "east=true,north=true,south=true,west=true,woodtype=padauk": { "model": "forestry:arboriculture/fences/padauk_nsew", "uvlock": true }, + //cocobolo + "east=false,north=false,south=false,west=false,woodtype=cocobolo": { "model": "forestry:arboriculture/fences/cocobolo_post" }, + "east=false,north=true,south=false,west=false,woodtype=cocobolo": { "model": "forestry:arboriculture/fences/cocobolo_n", "uvlock": true }, + "east=true,north=false,south=false,west=false,woodtype=cocobolo": { "model": "forestry:arboriculture/fences/cocobolo_n", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,west=false,woodtype=cocobolo": { "model": "forestry:arboriculture/fences/cocobolo_n", "y": 180, "uvlock": true }, + "east=false,north=false,south=false,west=true,woodtype=cocobolo": { "model": "forestry:arboriculture/fences/cocobolo_n", "y": 270, "uvlock": true }, + "east=true,north=true,south=false,west=false,woodtype=cocobolo": { "model": "forestry:arboriculture/fences/cocobolo_ne", "uvlock": true }, + "east=true,north=false,south=true,west=false,woodtype=cocobolo": { "model": "forestry:arboriculture/fences/cocobolo_ne", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,west=true,woodtype=cocobolo": { "model": "forestry:arboriculture/fences/cocobolo_ne", "y": 180, "uvlock": true }, + "east=false,north=true,south=false,west=true,woodtype=cocobolo": { "model": "forestry:arboriculture/fences/cocobolo_ne", "y": 270, "uvlock": true }, + "east=false,north=true,south=true,west=false,woodtype=cocobolo": { "model": "forestry:arboriculture/fences/cocobolo_ns", "uvlock": true }, + "east=true,north=false,south=false,west=true,woodtype=cocobolo": { "model": "forestry:arboriculture/fences/cocobolo_ns", "y": 90, "uvlock": true }, + "east=true,north=true,south=true,west=false,woodtype=cocobolo": { "model": "forestry:arboriculture/fences/cocobolo_nse", "uvlock": true }, + "east=true,north=false,south=true,west=true,woodtype=cocobolo": { "model": "forestry:arboriculture/fences/cocobolo_nse", "y": 90, "uvlock": true }, + "east=false,north=true,south=true,west=true,woodtype=cocobolo": { "model": "forestry:arboriculture/fences/cocobolo_nse", "y": 180, "uvlock": true }, + "east=true,north=true,south=false,west=true,woodtype=cocobolo": { "model": "forestry:arboriculture/fences/cocobolo_nse", "y": 270, "uvlock": true }, + "east=true,north=true,south=true,west=true,woodtype=cocobolo": { "model": "forestry:arboriculture/fences/cocobolo_nsew", "uvlock": true }, + //zebrawood + "east=false,north=false,south=false,west=false,woodtype=zebrawood": { "model": "forestry:arboriculture/fences/zebrawood_post" }, + "east=false,north=true,south=false,west=false,woodtype=zebrawood": { "model": "forestry:arboriculture/fences/zebrawood_n", "uvlock": true }, + "east=true,north=false,south=false,west=false,woodtype=zebrawood": { "model": "forestry:arboriculture/fences/zebrawood_n", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,west=false,woodtype=zebrawood": { "model": "forestry:arboriculture/fences/zebrawood_n", "y": 180, "uvlock": true }, + "east=false,north=false,south=false,west=true,woodtype=zebrawood": { "model": "forestry:arboriculture/fences/zebrawood_n", "y": 270, "uvlock": true }, + "east=true,north=true,south=false,west=false,woodtype=zebrawood": { "model": "forestry:arboriculture/fences/zebrawood_ne", "uvlock": true }, + "east=true,north=false,south=true,west=false,woodtype=zebrawood": { "model": "forestry:arboriculture/fences/zebrawood_ne", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,west=true,woodtype=zebrawood": { "model": "forestry:arboriculture/fences/zebrawood_ne", "y": 180, "uvlock": true }, + "east=false,north=true,south=false,west=true,woodtype=zebrawood": { "model": "forestry:arboriculture/fences/zebrawood_ne", "y": 270, "uvlock": true }, + "east=false,north=true,south=true,west=false,woodtype=zebrawood": { "model": "forestry:arboriculture/fences/zebrawood_ns", "uvlock": true }, + "east=true,north=false,south=false,west=true,woodtype=zebrawood": { "model": "forestry:arboriculture/fences/zebrawood_ns", "y": 90, "uvlock": true }, + "east=true,north=true,south=true,west=false,woodtype=zebrawood": { "model": "forestry:arboriculture/fences/zebrawood_nse", "uvlock": true }, + "east=true,north=false,south=true,west=true,woodtype=zebrawood": { "model": "forestry:arboriculture/fences/zebrawood_nse", "y": 90, "uvlock": true }, + "east=false,north=true,south=true,west=true,woodtype=zebrawood": { "model": "forestry:arboriculture/fences/zebrawood_nse", "y": 180, "uvlock": true }, + "east=true,north=true,south=false,west=true,woodtype=zebrawood": { "model": "forestry:arboriculture/fences/zebrawood_nse", "y": 270, "uvlock": true }, + "east=true,north=true,south=true,west=true,woodtype=zebrawood": { "model": "forestry:arboriculture/fences/zebrawood_nsew", "uvlock": true } + } +} diff --git a/src/main/resources/assets/forestry/blockstates/fencesFireproof.json b/src/main/resources/assets/forestry/blockstates/fencesFireproof.json new file mode 100644 index 000000000..d2e776ea8 --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/fencesFireproof.json @@ -0,0 +1,497 @@ +{ + "variants": { + //larch + "east=false,north=false,south=false,west=false,woodtype=larch": { "model": "forestry:arboriculture/fences/larch_post" }, + "east=false,north=true,south=false,west=false,woodtype=larch": { "model": "forestry:arboriculture/fences/larch_n", "uvlock": true }, + "east=true,north=false,south=false,west=false,woodtype=larch": { "model": "forestry:arboriculture/fences/larch_n", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,west=false,woodtype=larch": { "model": "forestry:arboriculture/fences/larch_n", "y": 180, "uvlock": true }, + "east=false,north=false,south=false,west=true,woodtype=larch": { "model": "forestry:arboriculture/fences/larch_n", "y": 270, "uvlock": true }, + "east=true,north=true,south=false,west=false,woodtype=larch": { "model": "forestry:arboriculture/fences/larch_ne", "uvlock": true }, + "east=true,north=false,south=true,west=false,woodtype=larch": { "model": "forestry:arboriculture/fences/larch_ne", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,west=true,woodtype=larch": { "model": "forestry:arboriculture/fences/larch_ne", "y": 180, "uvlock": true }, + "east=false,north=true,south=false,west=true,woodtype=larch": { "model": "forestry:arboriculture/fences/larch_ne", "y": 270, "uvlock": true }, + "east=false,north=true,south=true,west=false,woodtype=larch": { "model": "forestry:arboriculture/fences/larch_ns", "uvlock": true }, + "east=true,north=false,south=false,west=true,woodtype=larch": { "model": "forestry:arboriculture/fences/larch_ns", "y": 90, "uvlock": true }, + "east=true,north=true,south=true,west=false,woodtype=larch": { "model": "forestry:arboriculture/fences/larch_nse", "uvlock": true }, + "east=true,north=false,south=true,west=true,woodtype=larch": { "model": "forestry:arboriculture/fences/larch_nse", "y": 90, "uvlock": true }, + "east=false,north=true,south=true,west=true,woodtype=larch": { "model": "forestry:arboriculture/fences/larch_nse", "y": 180, "uvlock": true }, + "east=true,north=true,south=false,west=true,woodtype=larch": { "model": "forestry:arboriculture/fences/larch_nse", "y": 270, "uvlock": true }, + "east=true,north=true,south=true,west=true,woodtype=larch": { "model": "forestry:arboriculture/fences/larch_nsew", "uvlock": true }, + //teak + "east=false,north=false,south=false,west=false,woodtype=teak": { "model": "forestry:arboriculture/fences/teak_post" }, + "east=false,north=true,south=false,west=false,woodtype=teak": { "model": "forestry:arboriculture/fences/teak_n", "uvlock": true }, + "east=true,north=false,south=false,west=false,woodtype=teak": { "model": "forestry:arboriculture/fences/teak_n", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,west=false,woodtype=teak": { "model": "forestry:arboriculture/fences/teak_n", "y": 180, "uvlock": true }, + "east=false,north=false,south=false,west=true,woodtype=teak": { "model": "forestry:arboriculture/fences/teak_n", "y": 270, "uvlock": true }, + "east=true,north=true,south=false,west=false,woodtype=teak": { "model": "forestry:arboriculture/fences/teak_ne", "uvlock": true }, + "east=true,north=false,south=true,west=false,woodtype=teak": { "model": "forestry:arboriculture/fences/teak_ne", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,west=true,woodtype=teak": { "model": "forestry:arboriculture/fences/teak_ne", "y": 180, "uvlock": true }, + "east=false,north=true,south=false,west=true,woodtype=teak": { "model": "forestry:arboriculture/fences/teak_ne", "y": 270, "uvlock": true }, + "east=false,north=true,south=true,west=false,woodtype=teak": { "model": "forestry:arboriculture/fences/teak_ns", "uvlock": true }, + "east=true,north=false,south=false,west=true,woodtype=teak": { "model": "forestry:arboriculture/fences/teak_ns", "y": 90, "uvlock": true }, + "east=true,north=true,south=true,west=false,woodtype=teak": { "model": "forestry:arboriculture/fences/teak_nse", "uvlock": true }, + "east=true,north=false,south=true,west=true,woodtype=teak": { "model": "forestry:arboriculture/fences/teak_nse", "y": 90, "uvlock": true }, + "east=false,north=true,south=true,west=true,woodtype=teak": { "model": "forestry:arboriculture/fences/teak_nse", "y": 180, "uvlock": true }, + "east=true,north=true,south=false,west=true,woodtype=teak": { "model": "forestry:arboriculture/fences/teak_nse", "y": 270, "uvlock": true }, + "east=true,north=true,south=true,west=true,woodtype=teak": { "model": "forestry:arboriculture/fences/teak_nsew", "uvlock": true }, + //acacia + "east=false,north=false,south=false,west=false,woodtype=acacia": { "model": "forestry:arboriculture/fences/acacia_post" }, + "east=false,north=true,south=false,west=false,woodtype=acacia": { "model": "forestry:arboriculture/fences/acacia_n", "uvlock": true }, + "east=true,north=false,south=false,west=false,woodtype=acacia": { "model": "forestry:arboriculture/fences/acacia_n", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,west=false,woodtype=acacia": { "model": "forestry:arboriculture/fences/acacia_n", "y": 180, "uvlock": true }, + "east=false,north=false,south=false,west=true,woodtype=acacia": { "model": "forestry:arboriculture/fences/acacia_n", "y": 270, "uvlock": true }, + "east=true,north=true,south=false,west=false,woodtype=acacia": { "model": "forestry:arboriculture/fences/acacia_ne", "uvlock": true }, + "east=true,north=false,south=true,west=false,woodtype=acacia": { "model": "forestry:arboriculture/fences/acacia_ne", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,west=true,woodtype=acacia": { "model": "forestry:arboriculture/fences/acacia_ne", "y": 180, "uvlock": true }, + "east=false,north=true,south=false,west=true,woodtype=acacia": { "model": "forestry:arboriculture/fences/acacia_ne", "y": 270, "uvlock": true }, + "east=false,north=true,south=true,west=false,woodtype=acacia": { "model": "forestry:arboriculture/fences/acacia_ns", "uvlock": true }, + "east=true,north=false,south=false,west=true,woodtype=acacia": { "model": "forestry:arboriculture/fences/acacia_ns", "y": 90, "uvlock": true }, + "east=true,north=true,south=true,west=false,woodtype=acacia": { "model": "forestry:arboriculture/fences/acacia_nse", "uvlock": true }, + "east=true,north=false,south=true,west=true,woodtype=acacia": { "model": "forestry:arboriculture/fences/acacia_nse", "y": 90, "uvlock": true }, + "east=false,north=true,south=true,west=true,woodtype=acacia": { "model": "forestry:arboriculture/fences/acacia_nse", "y": 180, "uvlock": true }, + "east=true,north=true,south=false,west=true,woodtype=acacia": { "model": "forestry:arboriculture/fences/acacia_nse", "y": 270, "uvlock": true }, + "east=true,north=true,south=true,west=true,woodtype=acacia": { "model": "forestry:arboriculture/fences/acacia_nsew", "uvlock": true }, + //lime + "east=false,north=false,south=false,west=false,woodtype=lime": { "model": "forestry:arboriculture/fences/lime_post" }, + "east=false,north=true,south=false,west=false,woodtype=lime": { "model": "forestry:arboriculture/fences/lime_n", "uvlock": true }, + "east=true,north=false,south=false,west=false,woodtype=lime": { "model": "forestry:arboriculture/fences/lime_n", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,west=false,woodtype=lime": { "model": "forestry:arboriculture/fences/lime_n", "y": 180, "uvlock": true }, + "east=false,north=false,south=false,west=true,woodtype=lime": { "model": "forestry:arboriculture/fences/lime_n", "y": 270, "uvlock": true }, + "east=true,north=true,south=false,west=false,woodtype=lime": { "model": "forestry:arboriculture/fences/lime_ne", "uvlock": true }, + "east=true,north=false,south=true,west=false,woodtype=lime": { "model": "forestry:arboriculture/fences/lime_ne", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,west=true,woodtype=lime": { "model": "forestry:arboriculture/fences/lime_ne", "y": 180, "uvlock": true }, + "east=false,north=true,south=false,west=true,woodtype=lime": { "model": "forestry:arboriculture/fences/lime_ne", "y": 270, "uvlock": true }, + "east=false,north=true,south=true,west=false,woodtype=lime": { "model": "forestry:arboriculture/fences/lime_ns", "uvlock": true }, + "east=true,north=false,south=false,west=true,woodtype=lime": { "model": "forestry:arboriculture/fences/lime_ns", "y": 90, "uvlock": true }, + "east=true,north=true,south=true,west=false,woodtype=lime": { "model": "forestry:arboriculture/fences/lime_nse", "uvlock": true }, + "east=true,north=false,south=true,west=true,woodtype=lime": { "model": "forestry:arboriculture/fences/lime_nse", "y": 90, "uvlock": true }, + "east=false,north=true,south=true,west=true,woodtype=lime": { "model": "forestry:arboriculture/fences/lime_nse", "y": 180, "uvlock": true }, + "east=true,north=true,south=false,west=true,woodtype=lime": { "model": "forestry:arboriculture/fences/lime_nse", "y": 270, "uvlock": true }, + "east=true,north=true,south=true,west=true,woodtype=lime": { "model": "forestry:arboriculture/fences/lime_nsew", "uvlock": true }, + //chestnut + "east=false,north=false,south=false,west=false,woodtype=chestnut": { "model": "forestry:arboriculture/fences/chestnut_post" }, + "east=false,north=true,south=false,west=false,woodtype=chestnut": { "model": "forestry:arboriculture/fences/chestnut_n", "uvlock": true }, + "east=true,north=false,south=false,west=false,woodtype=chestnut": { "model": "forestry:arboriculture/fences/chestnut_n", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,west=false,woodtype=chestnut": { "model": "forestry:arboriculture/fences/chestnut_n", "y": 180, "uvlock": true }, + "east=false,north=false,south=false,west=true,woodtype=chestnut": { "model": "forestry:arboriculture/fences/chestnut_n", "y": 270, "uvlock": true }, + "east=true,north=true,south=false,west=false,woodtype=chestnut": { "model": "forestry:arboriculture/fences/chestnut_ne", "uvlock": true }, + "east=true,north=false,south=true,west=false,woodtype=chestnut": { "model": "forestry:arboriculture/fences/chestnut_ne", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,west=true,woodtype=chestnut": { "model": "forestry:arboriculture/fences/chestnut_ne", "y": 180, "uvlock": true }, + "east=false,north=true,south=false,west=true,woodtype=chestnut": { "model": "forestry:arboriculture/fences/chestnut_ne", "y": 270, "uvlock": true }, + "east=false,north=true,south=true,west=false,woodtype=chestnut": { "model": "forestry:arboriculture/fences/chestnut_ns", "uvlock": true }, + "east=true,north=false,south=false,west=true,woodtype=chestnut": { "model": "forestry:arboriculture/fences/chestnut_ns", "y": 90, "uvlock": true }, + "east=true,north=true,south=true,west=false,woodtype=chestnut": { "model": "forestry:arboriculture/fences/chestnut_nse", "uvlock": true }, + "east=true,north=false,south=true,west=true,woodtype=chestnut": { "model": "forestry:arboriculture/fences/chestnut_nse", "y": 90, "uvlock": true }, + "east=false,north=true,south=true,west=true,woodtype=chestnut": { "model": "forestry:arboriculture/fences/chestnut_nse", "y": 180, "uvlock": true }, + "east=true,north=true,south=false,west=true,woodtype=chestnut": { "model": "forestry:arboriculture/fences/chestnut_nse", "y": 270, "uvlock": true }, + "east=true,north=true,south=true,west=true,woodtype=chestnut": { "model": "forestry:arboriculture/fences/chestnut_nsew", "uvlock": true }, + //wenge + "east=false,north=false,south=false,west=false,woodtype=wenge": { "model": "forestry:arboriculture/fences/wenge_post" }, + "east=false,north=true,south=false,west=false,woodtype=wenge": { "model": "forestry:arboriculture/fences/wenge_n", "uvlock": true }, + "east=true,north=false,south=false,west=false,woodtype=wenge": { "model": "forestry:arboriculture/fences/wenge_n", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,west=false,woodtype=wenge": { "model": "forestry:arboriculture/fences/wenge_n", "y": 180, "uvlock": true }, + "east=false,north=false,south=false,west=true,woodtype=wenge": { "model": "forestry:arboriculture/fences/wenge_n", "y": 270, "uvlock": true }, + "east=true,north=true,south=false,west=false,woodtype=wenge": { "model": "forestry:arboriculture/fences/wenge_ne", "uvlock": true }, + "east=true,north=false,south=true,west=false,woodtype=wenge": { "model": "forestry:arboriculture/fences/wenge_ne", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,west=true,woodtype=wenge": { "model": "forestry:arboriculture/fences/wenge_ne", "y": 180, "uvlock": true }, + "east=false,north=true,south=false,west=true,woodtype=wenge": { "model": "forestry:arboriculture/fences/wenge_ne", "y": 270, "uvlock": true }, + "east=false,north=true,south=true,west=false,woodtype=wenge": { "model": "forestry:arboriculture/fences/wenge_ns", "uvlock": true }, + "east=true,north=false,south=false,west=true,woodtype=wenge": { "model": "forestry:arboriculture/fences/wenge_ns", "y": 90, "uvlock": true }, + "east=true,north=true,south=true,west=false,woodtype=wenge": { "model": "forestry:arboriculture/fences/wenge_nse", "uvlock": true }, + "east=true,north=false,south=true,west=true,woodtype=wenge": { "model": "forestry:arboriculture/fences/wenge_nse", "y": 90, "uvlock": true }, + "east=false,north=true,south=true,west=true,woodtype=wenge": { "model": "forestry:arboriculture/fences/wenge_nse", "y": 180, "uvlock": true }, + "east=true,north=true,south=false,west=true,woodtype=wenge": { "model": "forestry:arboriculture/fences/wenge_nse", "y": 270, "uvlock": true }, + "east=true,north=true,south=true,west=true,woodtype=wenge": { "model": "forestry:arboriculture/fences/wenge_nsew", "uvlock": true }, + //baobab + "east=false,north=false,south=false,west=false,woodtype=baobab": { "model": "forestry:arboriculture/fences/baobab_post" }, + "east=false,north=true,south=false,west=false,woodtype=baobab": { "model": "forestry:arboriculture/fences/baobab_n", "uvlock": true }, + "east=true,north=false,south=false,west=false,woodtype=baobab": { "model": "forestry:arboriculture/fences/baobab_n", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,west=false,woodtype=baobab": { "model": "forestry:arboriculture/fences/baobab_n", "y": 180, "uvlock": true }, + "east=false,north=false,south=false,west=true,woodtype=baobab": { "model": "forestry:arboriculture/fences/baobab_n", "y": 270, "uvlock": true }, + "east=true,north=true,south=false,west=false,woodtype=baobab": { "model": "forestry:arboriculture/fences/baobab_ne", "uvlock": true }, + "east=true,north=false,south=true,west=false,woodtype=baobab": { "model": "forestry:arboriculture/fences/baobab_ne", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,west=true,woodtype=baobab": { "model": "forestry:arboriculture/fences/baobab_ne", "y": 180, "uvlock": true }, + "east=false,north=true,south=false,west=true,woodtype=baobab": { "model": "forestry:arboriculture/fences/baobab_ne", "y": 270, "uvlock": true }, + "east=false,north=true,south=true,west=false,woodtype=baobab": { "model": "forestry:arboriculture/fences/baobab_ns", "uvlock": true }, + "east=true,north=false,south=false,west=true,woodtype=baobab": { "model": "forestry:arboriculture/fences/baobab_ns", "y": 90, "uvlock": true }, + "east=true,north=true,south=true,west=false,woodtype=baobab": { "model": "forestry:arboriculture/fences/baobab_nse", "uvlock": true }, + "east=true,north=false,south=true,west=true,woodtype=baobab": { "model": "forestry:arboriculture/fences/baobab_nse", "y": 90, "uvlock": true }, + "east=false,north=true,south=true,west=true,woodtype=baobab": { "model": "forestry:arboriculture/fences/baobab_nse", "y": 180, "uvlock": true }, + "east=true,north=true,south=false,west=true,woodtype=baobab": { "model": "forestry:arboriculture/fences/baobab_nse", "y": 270, "uvlock": true }, + "east=true,north=true,south=true,west=true,woodtype=baobab": { "model": "forestry:arboriculture/fences/baobab_nsew", "uvlock": true }, + //sequoia + "east=false,north=false,south=false,west=false,woodtype=sequoia": { "model": "forestry:arboriculture/fences/sequoia_post" }, + "east=false,north=true,south=false,west=false,woodtype=sequoia": { "model": "forestry:arboriculture/fences/sequoia_n", "uvlock": true }, + "east=true,north=false,south=false,west=false,woodtype=sequoia": { "model": "forestry:arboriculture/fences/sequoia_n", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,west=false,woodtype=sequoia": { "model": "forestry:arboriculture/fences/sequoia_n", "y": 180, "uvlock": true }, + "east=false,north=false,south=false,west=true,woodtype=sequoia": { "model": "forestry:arboriculture/fences/sequoia_n", "y": 270, "uvlock": true }, + "east=true,north=true,south=false,west=false,woodtype=sequoia": { "model": "forestry:arboriculture/fences/sequoia_ne", "uvlock": true }, + "east=true,north=false,south=true,west=false,woodtype=sequoia": { "model": "forestry:arboriculture/fences/sequoia_ne", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,west=true,woodtype=sequoia": { "model": "forestry:arboriculture/fences/sequoia_ne", "y": 180, "uvlock": true }, + "east=false,north=true,south=false,west=true,woodtype=sequoia": { "model": "forestry:arboriculture/fences/sequoia_ne", "y": 270, "uvlock": true }, + "east=false,north=true,south=true,west=false,woodtype=sequoia": { "model": "forestry:arboriculture/fences/sequoia_ns", "uvlock": true }, + "east=true,north=false,south=false,west=true,woodtype=sequoia": { "model": "forestry:arboriculture/fences/sequoia_ns", "y": 90, "uvlock": true }, + "east=true,north=true,south=true,west=false,woodtype=sequoia": { "model": "forestry:arboriculture/fences/sequoia_nse", "uvlock": true }, + "east=true,north=false,south=true,west=true,woodtype=sequoia": { "model": "forestry:arboriculture/fences/sequoia_nse", "y": 90, "uvlock": true }, + "east=false,north=true,south=true,west=true,woodtype=sequoia": { "model": "forestry:arboriculture/fences/sequoia_nse", "y": 180, "uvlock": true }, + "east=true,north=true,south=false,west=true,woodtype=sequoia": { "model": "forestry:arboriculture/fences/sequoia_nse", "y": 270, "uvlock": true }, + "east=true,north=true,south=true,west=true,woodtype=sequoia": { "model": "forestry:arboriculture/fences/sequoia_nsew", "uvlock": true }, + //kapok + "east=false,north=false,south=false,west=false,woodtype=kapok": { "model": "forestry:arboriculture/fences/kapok_post" }, + "east=false,north=true,south=false,west=false,woodtype=kapok": { "model": "forestry:arboriculture/fences/kapok_n", "uvlock": true }, + "east=true,north=false,south=false,west=false,woodtype=kapok": { "model": "forestry:arboriculture/fences/kapok_n", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,west=false,woodtype=kapok": { "model": "forestry:arboriculture/fences/kapok_n", "y": 180, "uvlock": true }, + "east=false,north=false,south=false,west=true,woodtype=kapok": { "model": "forestry:arboriculture/fences/kapok_n", "y": 270, "uvlock": true }, + "east=true,north=true,south=false,west=false,woodtype=kapok": { "model": "forestry:arboriculture/fences/kapok_ne", "uvlock": true }, + "east=true,north=false,south=true,west=false,woodtype=kapok": { "model": "forestry:arboriculture/fences/kapok_ne", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,west=true,woodtype=kapok": { "model": "forestry:arboriculture/fences/kapok_ne", "y": 180, "uvlock": true }, + "east=false,north=true,south=false,west=true,woodtype=kapok": { "model": "forestry:arboriculture/fences/kapok_ne", "y": 270, "uvlock": true }, + "east=false,north=true,south=true,west=false,woodtype=kapok": { "model": "forestry:arboriculture/fences/kapok_ns", "uvlock": true }, + "east=true,north=false,south=false,west=true,woodtype=kapok": { "model": "forestry:arboriculture/fences/kapok_ns", "y": 90, "uvlock": true }, + "east=true,north=true,south=true,west=false,woodtype=kapok": { "model": "forestry:arboriculture/fences/kapok_nse", "uvlock": true }, + "east=true,north=false,south=true,west=true,woodtype=kapok": { "model": "forestry:arboriculture/fences/kapok_nse", "y": 90, "uvlock": true }, + "east=false,north=true,south=true,west=true,woodtype=kapok": { "model": "forestry:arboriculture/fences/kapok_nse", "y": 180, "uvlock": true }, + "east=true,north=true,south=false,west=true,woodtype=kapok": { "model": "forestry:arboriculture/fences/kapok_nse", "y": 270, "uvlock": true }, + "east=true,north=true,south=true,west=true,woodtype=kapok": { "model": "forestry:arboriculture/fences/kapok_nsew", "uvlock": true }, + //ebony + "east=false,north=false,south=false,west=false,woodtype=ebony": { "model": "forestry:arboriculture/fences/ebony_post" }, + "east=false,north=true,south=false,west=false,woodtype=ebony": { "model": "forestry:arboriculture/fences/ebony_n", "uvlock": true }, + "east=true,north=false,south=false,west=false,woodtype=ebony": { "model": "forestry:arboriculture/fences/ebony_n", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,west=false,woodtype=ebony": { "model": "forestry:arboriculture/fences/ebony_n", "y": 180, "uvlock": true }, + "east=false,north=false,south=false,west=true,woodtype=ebony": { "model": "forestry:arboriculture/fences/ebony_n", "y": 270, "uvlock": true }, + "east=true,north=true,south=false,west=false,woodtype=ebony": { "model": "forestry:arboriculture/fences/ebony_ne", "uvlock": true }, + "east=true,north=false,south=true,west=false,woodtype=ebony": { "model": "forestry:arboriculture/fences/ebony_ne", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,west=true,woodtype=ebony": { "model": "forestry:arboriculture/fences/ebony_ne", "y": 180, "uvlock": true }, + "east=false,north=true,south=false,west=true,woodtype=ebony": { "model": "forestry:arboriculture/fences/ebony_ne", "y": 270, "uvlock": true }, + "east=false,north=true,south=true,west=false,woodtype=ebony": { "model": "forestry:arboriculture/fences/ebony_ns", "uvlock": true }, + "east=true,north=false,south=false,west=true,woodtype=ebony": { "model": "forestry:arboriculture/fences/ebony_ns", "y": 90, "uvlock": true }, + "east=true,north=true,south=true,west=false,woodtype=ebony": { "model": "forestry:arboriculture/fences/ebony_nse", "uvlock": true }, + "east=true,north=false,south=true,west=true,woodtype=ebony": { "model": "forestry:arboriculture/fences/ebony_nse", "y": 90, "uvlock": true }, + "east=false,north=true,south=true,west=true,woodtype=ebony": { "model": "forestry:arboriculture/fences/ebony_nse", "y": 180, "uvlock": true }, + "east=true,north=true,south=false,west=true,woodtype=ebony": { "model": "forestry:arboriculture/fences/ebony_nse", "y": 270, "uvlock": true }, + "east=true,north=true,south=true,west=true,woodtype=ebony": { "model": "forestry:arboriculture/fences/ebony_nsew", "uvlock": true }, + //mahogany + "east=false,north=false,south=false,west=false,woodtype=mahogany": { "model": "forestry:arboriculture/fences/mahogany_post" }, + "east=false,north=true,south=false,west=false,woodtype=mahogany": { "model": "forestry:arboriculture/fences/mahogany_n", "uvlock": true }, + "east=true,north=false,south=false,west=false,woodtype=mahogany": { "model": "forestry:arboriculture/fences/mahogany_n", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,west=false,woodtype=mahogany": { "model": "forestry:arboriculture/fences/mahogany_n", "y": 180, "uvlock": true }, + "east=false,north=false,south=false,west=true,woodtype=mahogany": { "model": "forestry:arboriculture/fences/mahogany_n", "y": 270, "uvlock": true }, + "east=true,north=true,south=false,west=false,woodtype=mahogany": { "model": "forestry:arboriculture/fences/mahogany_ne", "uvlock": true }, + "east=true,north=false,south=true,west=false,woodtype=mahogany": { "model": "forestry:arboriculture/fences/mahogany_ne", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,west=true,woodtype=mahogany": { "model": "forestry:arboriculture/fences/mahogany_ne", "y": 180, "uvlock": true }, + "east=false,north=true,south=false,west=true,woodtype=mahogany": { "model": "forestry:arboriculture/fences/mahogany_ne", "y": 270, "uvlock": true }, + "east=false,north=true,south=true,west=false,woodtype=mahogany": { "model": "forestry:arboriculture/fences/mahogany_ns", "uvlock": true }, + "east=true,north=false,south=false,west=true,woodtype=mahogany": { "model": "forestry:arboriculture/fences/mahogany_ns", "y": 90, "uvlock": true }, + "east=true,north=true,south=true,west=false,woodtype=mahogany": { "model": "forestry:arboriculture/fences/mahogany_nse", "uvlock": true }, + "east=true,north=false,south=true,west=true,woodtype=mahogany": { "model": "forestry:arboriculture/fences/mahogany_nse", "y": 90, "uvlock": true }, + "east=false,north=true,south=true,west=true,woodtype=mahogany": { "model": "forestry:arboriculture/fences/mahogany_nse", "y": 180, "uvlock": true }, + "east=true,north=true,south=false,west=true,woodtype=mahogany": { "model": "forestry:arboriculture/fences/mahogany_nse", "y": 270, "uvlock": true }, + "east=true,north=true,south=true,west=true,woodtype=mahogany": { "model": "forestry:arboriculture/fences/mahogany_nsew", "uvlock": true }, + //balsa + "east=false,north=false,south=false,west=false,woodtype=balsa": { "model": "forestry:arboriculture/fences/balsa_post" }, + "east=false,north=true,south=false,west=false,woodtype=balsa": { "model": "forestry:arboriculture/fences/balsa_n", "uvlock": true }, + "east=true,north=false,south=false,west=false,woodtype=balsa": { "model": "forestry:arboriculture/fences/balsa_n", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,west=false,woodtype=balsa": { "model": "forestry:arboriculture/fences/balsa_n", "y": 180, "uvlock": true }, + "east=false,north=false,south=false,west=true,woodtype=balsa": { "model": "forestry:arboriculture/fences/balsa_n", "y": 270, "uvlock": true }, + "east=true,north=true,south=false,west=false,woodtype=balsa": { "model": "forestry:arboriculture/fences/balsa_ne", "uvlock": true }, + "east=true,north=false,south=true,west=false,woodtype=balsa": { "model": "forestry:arboriculture/fences/balsa_ne", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,west=true,woodtype=balsa": { "model": "forestry:arboriculture/fences/balsa_ne", "y": 180, "uvlock": true }, + "east=false,north=true,south=false,west=true,woodtype=balsa": { "model": "forestry:arboriculture/fences/balsa_ne", "y": 270, "uvlock": true }, + "east=false,north=true,south=true,west=false,woodtype=balsa": { "model": "forestry:arboriculture/fences/balsa_ns", "uvlock": true }, + "east=true,north=false,south=false,west=true,woodtype=balsa": { "model": "forestry:arboriculture/fences/balsa_ns", "y": 90, "uvlock": true }, + "east=true,north=true,south=true,west=false,woodtype=balsa": { "model": "forestry:arboriculture/fences/balsa_nse", "uvlock": true }, + "east=true,north=false,south=true,west=true,woodtype=balsa": { "model": "forestry:arboriculture/fences/balsa_nse", "y": 90, "uvlock": true }, + "east=false,north=true,south=true,west=true,woodtype=balsa": { "model": "forestry:arboriculture/fences/balsa_nse", "y": 180, "uvlock": true }, + "east=true,north=true,south=false,west=true,woodtype=balsa": { "model": "forestry:arboriculture/fences/balsa_nse", "y": 270, "uvlock": true }, + "east=true,north=true,south=true,west=true,woodtype=balsa": { "model": "forestry:arboriculture/fences/balsa_nsew", "uvlock": true }, + //willow + "east=false,north=false,south=false,west=false,woodtype=willow": { "model": "forestry:arboriculture/fences/willow_post" }, + "east=false,north=true,south=false,west=false,woodtype=willow": { "model": "forestry:arboriculture/fences/willow_n", "uvlock": true }, + "east=true,north=false,south=false,west=false,woodtype=willow": { "model": "forestry:arboriculture/fences/willow_n", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,west=false,woodtype=willow": { "model": "forestry:arboriculture/fences/willow_n", "y": 180, "uvlock": true }, + "east=false,north=false,south=false,west=true,woodtype=willow": { "model": "forestry:arboriculture/fences/willow_n", "y": 270, "uvlock": true }, + "east=true,north=true,south=false,west=false,woodtype=willow": { "model": "forestry:arboriculture/fences/willow_ne", "uvlock": true }, + "east=true,north=false,south=true,west=false,woodtype=willow": { "model": "forestry:arboriculture/fences/willow_ne", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,west=true,woodtype=willow": { "model": "forestry:arboriculture/fences/willow_ne", "y": 180, "uvlock": true }, + "east=false,north=true,south=false,west=true,woodtype=willow": { "model": "forestry:arboriculture/fences/willow_ne", "y": 270, "uvlock": true }, + "east=false,north=true,south=true,west=false,woodtype=willow": { "model": "forestry:arboriculture/fences/willow_ns", "uvlock": true }, + "east=true,north=false,south=false,west=true,woodtype=willow": { "model": "forestry:arboriculture/fences/willow_ns", "y": 90, "uvlock": true }, + "east=true,north=true,south=true,west=false,woodtype=willow": { "model": "forestry:arboriculture/fences/willow_nse", "uvlock": true }, + "east=true,north=false,south=true,west=true,woodtype=willow": { "model": "forestry:arboriculture/fences/willow_nse", "y": 90, "uvlock": true }, + "east=false,north=true,south=true,west=true,woodtype=willow": { "model": "forestry:arboriculture/fences/willow_nse", "y": 180, "uvlock": true }, + "east=true,north=true,south=false,west=true,woodtype=willow": { "model": "forestry:arboriculture/fences/willow_nse", "y": 270, "uvlock": true }, + "east=true,north=true,south=true,west=true,woodtype=willow": { "model": "forestry:arboriculture/fences/willow_nsew", "uvlock": true }, + //walnut + "east=false,north=false,south=false,west=false,woodtype=walnut": { "model": "forestry:arboriculture/fences/walnut_post" }, + "east=false,north=true,south=false,west=false,woodtype=walnut": { "model": "forestry:arboriculture/fences/walnut_n", "uvlock": true }, + "east=true,north=false,south=false,west=false,woodtype=walnut": { "model": "forestry:arboriculture/fences/walnut_n", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,west=false,woodtype=walnut": { "model": "forestry:arboriculture/fences/walnut_n", "y": 180, "uvlock": true }, + "east=false,north=false,south=false,west=true,woodtype=walnut": { "model": "forestry:arboriculture/fences/walnut_n", "y": 270, "uvlock": true }, + "east=true,north=true,south=false,west=false,woodtype=walnut": { "model": "forestry:arboriculture/fences/walnut_ne", "uvlock": true }, + "east=true,north=false,south=true,west=false,woodtype=walnut": { "model": "forestry:arboriculture/fences/walnut_ne", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,west=true,woodtype=walnut": { "model": "forestry:arboriculture/fences/walnut_ne", "y": 180, "uvlock": true }, + "east=false,north=true,south=false,west=true,woodtype=walnut": { "model": "forestry:arboriculture/fences/walnut_ne", "y": 270, "uvlock": true }, + "east=false,north=true,south=true,west=false,woodtype=walnut": { "model": "forestry:arboriculture/fences/walnut_ns", "uvlock": true }, + "east=true,north=false,south=false,west=true,woodtype=walnut": { "model": "forestry:arboriculture/fences/walnut_ns", "y": 90, "uvlock": true }, + "east=true,north=true,south=true,west=false,woodtype=walnut": { "model": "forestry:arboriculture/fences/walnut_nse", "uvlock": true }, + "east=true,north=false,south=true,west=true,woodtype=walnut": { "model": "forestry:arboriculture/fences/walnut_nse", "y": 90, "uvlock": true }, + "east=false,north=true,south=true,west=true,woodtype=walnut": { "model": "forestry:arboriculture/fences/walnut_nse", "y": 180, "uvlock": true }, + "east=true,north=true,south=false,west=true,woodtype=walnut": { "model": "forestry:arboriculture/fences/walnut_nse", "y": 270, "uvlock": true }, + "east=true,north=true,south=true,west=true,woodtype=walnut": { "model": "forestry:arboriculture/fences/walnut_nsew", "uvlock": true }, + //greenheart + "east=false,north=false,south=false,west=false,woodtype=greenheart": { "model": "forestry:arboriculture/fences/greenheart_post" }, + "east=false,north=true,south=false,west=false,woodtype=greenheart": { "model": "forestry:arboriculture/fences/greenheart_n", "uvlock": true }, + "east=true,north=false,south=false,west=false,woodtype=greenheart": { "model": "forestry:arboriculture/fences/greenheart_n", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,west=false,woodtype=greenheart": { "model": "forestry:arboriculture/fences/greenheart_n", "y": 180, "uvlock": true }, + "east=false,north=false,south=false,west=true,woodtype=greenheart": { "model": "forestry:arboriculture/fences/greenheart_n", "y": 270, "uvlock": true }, + "east=true,north=true,south=false,west=false,woodtype=greenheart": { "model": "forestry:arboriculture/fences/greenheart_ne", "uvlock": true }, + "east=true,north=false,south=true,west=false,woodtype=greenheart": { "model": "forestry:arboriculture/fences/greenheart_ne", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,west=true,woodtype=greenheart": { "model": "forestry:arboriculture/fences/greenheart_ne", "y": 180, "uvlock": true }, + "east=false,north=true,south=false,west=true,woodtype=greenheart": { "model": "forestry:arboriculture/fences/greenheart_ne", "y": 270, "uvlock": true }, + "east=false,north=true,south=true,west=false,woodtype=greenheart": { "model": "forestry:arboriculture/fences/greenheart_ns", "uvlock": true }, + "east=true,north=false,south=false,west=true,woodtype=greenheart": { "model": "forestry:arboriculture/fences/greenheart_ns", "y": 90, "uvlock": true }, + "east=true,north=true,south=true,west=false,woodtype=greenheart": { "model": "forestry:arboriculture/fences/greenheart_nse", "uvlock": true }, + "east=true,north=false,south=true,west=true,woodtype=greenheart": { "model": "forestry:arboriculture/fences/greenheart_nse", "y": 90, "uvlock": true }, + "east=false,north=true,south=true,west=true,woodtype=greenheart": { "model": "forestry:arboriculture/fences/greenheart_nse", "y": 180, "uvlock": true }, + "east=true,north=true,south=false,west=true,woodtype=greenheart": { "model": "forestry:arboriculture/fences/greenheart_nse", "y": 270, "uvlock": true }, + "east=true,north=true,south=true,west=true,woodtype=greenheart": { "model": "forestry:arboriculture/fences/greenheart_nsew", "uvlock": true }, + //cherry + "east=false,north=false,south=false,west=false,woodtype=cherry": { "model": "forestry:arboriculture/fences/cherry_post" }, + "east=false,north=true,south=false,west=false,woodtype=cherry": { "model": "forestry:arboriculture/fences/cherry_n", "uvlock": true }, + "east=true,north=false,south=false,west=false,woodtype=cherry": { "model": "forestry:arboriculture/fences/cherry_n", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,west=false,woodtype=cherry": { "model": "forestry:arboriculture/fences/cherry_n", "y": 180, "uvlock": true }, + "east=false,north=false,south=false,west=true,woodtype=cherry": { "model": "forestry:arboriculture/fences/cherry_n", "y": 270, "uvlock": true }, + "east=true,north=true,south=false,west=false,woodtype=cherry": { "model": "forestry:arboriculture/fences/cherry_ne", "uvlock": true }, + "east=true,north=false,south=true,west=false,woodtype=cherry": { "model": "forestry:arboriculture/fences/cherry_ne", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,west=true,woodtype=cherry": { "model": "forestry:arboriculture/fences/cherry_ne", "y": 180, "uvlock": true }, + "east=false,north=true,south=false,west=true,woodtype=cherry": { "model": "forestry:arboriculture/fences/cherry_ne", "y": 270, "uvlock": true }, + "east=false,north=true,south=true,west=false,woodtype=cherry": { "model": "forestry:arboriculture/fences/cherry_ns", "uvlock": true }, + "east=true,north=false,south=false,west=true,woodtype=cherry": { "model": "forestry:arboriculture/fences/cherry_ns", "y": 90, "uvlock": true }, + "east=true,north=true,south=true,west=false,woodtype=cherry": { "model": "forestry:arboriculture/fences/cherry_nse", "uvlock": true }, + "east=true,north=false,south=true,west=true,woodtype=cherry": { "model": "forestry:arboriculture/fences/cherry_nse", "y": 90, "uvlock": true }, + "east=false,north=true,south=true,west=true,woodtype=cherry": { "model": "forestry:arboriculture/fences/cherry_nse", "y": 180, "uvlock": true }, + "east=true,north=true,south=false,west=true,woodtype=cherry": { "model": "forestry:arboriculture/fences/cherry_nse", "y": 270, "uvlock": true }, + "east=true,north=true,south=true,west=true,woodtype=cherry": { "model": "forestry:arboriculture/fences/cherry_nsew", "uvlock": true }, + //mahoe + "east=false,north=false,south=false,west=false,woodtype=mahoe": { "model": "forestry:arboriculture/fences/mahoe_post" }, + "east=false,north=true,south=false,west=false,woodtype=mahoe": { "model": "forestry:arboriculture/fences/mahoe_n", "uvlock": true }, + "east=true,north=false,south=false,west=false,woodtype=mahoe": { "model": "forestry:arboriculture/fences/mahoe_n", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,west=false,woodtype=mahoe": { "model": "forestry:arboriculture/fences/mahoe_n", "y": 180, "uvlock": true }, + "east=false,north=false,south=false,west=true,woodtype=mahoe": { "model": "forestry:arboriculture/fences/mahoe_n", "y": 270, "uvlock": true }, + "east=true,north=true,south=false,west=false,woodtype=mahoe": { "model": "forestry:arboriculture/fences/mahoe_ne", "uvlock": true }, + "east=true,north=false,south=true,west=false,woodtype=mahoe": { "model": "forestry:arboriculture/fences/mahoe_ne", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,west=true,woodtype=mahoe": { "model": "forestry:arboriculture/fences/mahoe_ne", "y": 180, "uvlock": true }, + "east=false,north=true,south=false,west=true,woodtype=mahoe": { "model": "forestry:arboriculture/fences/mahoe_ne", "y": 270, "uvlock": true }, + "east=false,north=true,south=true,west=false,woodtype=mahoe": { "model": "forestry:arboriculture/fences/mahoe_ns", "uvlock": true }, + "east=true,north=false,south=false,west=true,woodtype=mahoe": { "model": "forestry:arboriculture/fences/mahoe_ns", "y": 90, "uvlock": true }, + "east=true,north=true,south=true,west=false,woodtype=mahoe": { "model": "forestry:arboriculture/fences/mahoe_nse", "uvlock": true }, + "east=true,north=false,south=true,west=true,woodtype=mahoe": { "model": "forestry:arboriculture/fences/mahoe_nse", "y": 90, "uvlock": true }, + "east=false,north=true,south=true,west=true,woodtype=mahoe": { "model": "forestry:arboriculture/fences/mahoe_nse", "y": 180, "uvlock": true }, + "east=true,north=true,south=false,west=true,woodtype=mahoe": { "model": "forestry:arboriculture/fences/mahoe_nse", "y": 270, "uvlock": true }, + "east=true,north=true,south=true,west=true,woodtype=mahoe": { "model": "forestry:arboriculture/fences/mahoe_nsew", "uvlock": true }, + //poplar + "east=false,north=false,south=false,west=false,woodtype=poplar": { "model": "forestry:arboriculture/fences/poplar_post" }, + "east=false,north=true,south=false,west=false,woodtype=poplar": { "model": "forestry:arboriculture/fences/poplar_n", "uvlock": true }, + "east=true,north=false,south=false,west=false,woodtype=poplar": { "model": "forestry:arboriculture/fences/poplar_n", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,west=false,woodtype=poplar": { "model": "forestry:arboriculture/fences/poplar_n", "y": 180, "uvlock": true }, + "east=false,north=false,south=false,west=true,woodtype=poplar": { "model": "forestry:arboriculture/fences/poplar_n", "y": 270, "uvlock": true }, + "east=true,north=true,south=false,west=false,woodtype=poplar": { "model": "forestry:arboriculture/fences/poplar_ne", "uvlock": true }, + "east=true,north=false,south=true,west=false,woodtype=poplar": { "model": "forestry:arboriculture/fences/poplar_ne", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,west=true,woodtype=poplar": { "model": "forestry:arboriculture/fences/poplar_ne", "y": 180, "uvlock": true }, + "east=false,north=true,south=false,west=true,woodtype=poplar": { "model": "forestry:arboriculture/fences/poplar_ne", "y": 270, "uvlock": true }, + "east=false,north=true,south=true,west=false,woodtype=poplar": { "model": "forestry:arboriculture/fences/poplar_ns", "uvlock": true }, + "east=true,north=false,south=false,west=true,woodtype=poplar": { "model": "forestry:arboriculture/fences/poplar_ns", "y": 90, "uvlock": true }, + "east=true,north=true,south=true,west=false,woodtype=poplar": { "model": "forestry:arboriculture/fences/poplar_nse", "uvlock": true }, + "east=true,north=false,south=true,west=true,woodtype=poplar": { "model": "forestry:arboriculture/fences/poplar_nse", "y": 90, "uvlock": true }, + "east=false,north=true,south=true,west=true,woodtype=poplar": { "model": "forestry:arboriculture/fences/poplar_nse", "y": 180, "uvlock": true }, + "east=true,north=true,south=false,west=true,woodtype=poplar": { "model": "forestry:arboriculture/fences/poplar_nse", "y": 270, "uvlock": true }, + "east=true,north=true,south=true,west=true,woodtype=poplar": { "model": "forestry:arboriculture/fences/poplar_nsew", "uvlock": true }, + //palm + "east=false,north=false,south=false,west=false,woodtype=palm": { "model": "forestry:arboriculture/fences/palm_post" }, + "east=false,north=true,south=false,west=false,woodtype=palm": { "model": "forestry:arboriculture/fences/palm_n", "uvlock": true }, + "east=true,north=false,south=false,west=false,woodtype=palm": { "model": "forestry:arboriculture/fences/palm_n", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,west=false,woodtype=palm": { "model": "forestry:arboriculture/fences/palm_n", "y": 180, "uvlock": true }, + "east=false,north=false,south=false,west=true,woodtype=palm": { "model": "forestry:arboriculture/fences/palm_n", "y": 270, "uvlock": true }, + "east=true,north=true,south=false,west=false,woodtype=palm": { "model": "forestry:arboriculture/fences/palm_ne", "uvlock": true }, + "east=true,north=false,south=true,west=false,woodtype=palm": { "model": "forestry:arboriculture/fences/palm_ne", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,west=true,woodtype=palm": { "model": "forestry:arboriculture/fences/palm_ne", "y": 180, "uvlock": true }, + "east=false,north=true,south=false,west=true,woodtype=palm": { "model": "forestry:arboriculture/fences/palm_ne", "y": 270, "uvlock": true }, + "east=false,north=true,south=true,west=false,woodtype=palm": { "model": "forestry:arboriculture/fences/palm_ns", "uvlock": true }, + "east=true,north=false,south=false,west=true,woodtype=palm": { "model": "forestry:arboriculture/fences/palm_ns", "y": 90, "uvlock": true }, + "east=true,north=true,south=true,west=false,woodtype=palm": { "model": "forestry:arboriculture/fences/palm_nse", "uvlock": true }, + "east=true,north=false,south=true,west=true,woodtype=palm": { "model": "forestry:arboriculture/fences/palm_nse", "y": 90, "uvlock": true }, + "east=false,north=true,south=true,west=true,woodtype=palm": { "model": "forestry:arboriculture/fences/palm_nse", "y": 180, "uvlock": true }, + "east=true,north=true,south=false,west=true,woodtype=palm": { "model": "forestry:arboriculture/fences/palm_nse", "y": 270, "uvlock": true }, + "east=true,north=true,south=true,west=true,woodtype=palm": { "model": "forestry:arboriculture/fences/palm_nsew", "uvlock": true }, + //papaya + "east=false,north=false,south=false,west=false,woodtype=papaya": { "model": "forestry:arboriculture/fences/papaya_post" }, + "east=false,north=true,south=false,west=false,woodtype=papaya": { "model": "forestry:arboriculture/fences/papaya_n", "uvlock": true }, + "east=true,north=false,south=false,west=false,woodtype=papaya": { "model": "forestry:arboriculture/fences/papaya_n", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,west=false,woodtype=papaya": { "model": "forestry:arboriculture/fences/papaya_n", "y": 180, "uvlock": true }, + "east=false,north=false,south=false,west=true,woodtype=papaya": { "model": "forestry:arboriculture/fences/papaya_n", "y": 270, "uvlock": true }, + "east=true,north=true,south=false,west=false,woodtype=papaya": { "model": "forestry:arboriculture/fences/papaya_ne", "uvlock": true }, + "east=true,north=false,south=true,west=false,woodtype=papaya": { "model": "forestry:arboriculture/fences/papaya_ne", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,west=true,woodtype=papaya": { "model": "forestry:arboriculture/fences/papaya_ne", "y": 180, "uvlock": true }, + "east=false,north=true,south=false,west=true,woodtype=papaya": { "model": "forestry:arboriculture/fences/papaya_ne", "y": 270, "uvlock": true }, + "east=false,north=true,south=true,west=false,woodtype=papaya": { "model": "forestry:arboriculture/fences/papaya_ns", "uvlock": true }, + "east=true,north=false,south=false,west=true,woodtype=papaya": { "model": "forestry:arboriculture/fences/papaya_ns", "y": 90, "uvlock": true }, + "east=true,north=true,south=true,west=false,woodtype=papaya": { "model": "forestry:arboriculture/fences/papaya_nse", "uvlock": true }, + "east=true,north=false,south=true,west=true,woodtype=papaya": { "model": "forestry:arboriculture/fences/papaya_nse", "y": 90, "uvlock": true }, + "east=false,north=true,south=true,west=true,woodtype=papaya": { "model": "forestry:arboriculture/fences/papaya_nse", "y": 180, "uvlock": true }, + "east=true,north=true,south=false,west=true,woodtype=papaya": { "model": "forestry:arboriculture/fences/papaya_nse", "y": 270, "uvlock": true }, + "east=true,north=true,south=true,west=true,woodtype=papaya": { "model": "forestry:arboriculture/fences/papaya_nsew", "uvlock": true }, + //pine + "east=false,north=false,south=false,west=false,woodtype=pine": { "model": "forestry:arboriculture/fences/pine_post" }, + "east=false,north=true,south=false,west=false,woodtype=pine": { "model": "forestry:arboriculture/fences/pine_n", "uvlock": true }, + "east=true,north=false,south=false,west=false,woodtype=pine": { "model": "forestry:arboriculture/fences/pine_n", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,west=false,woodtype=pine": { "model": "forestry:arboriculture/fences/pine_n", "y": 180, "uvlock": true }, + "east=false,north=false,south=false,west=true,woodtype=pine": { "model": "forestry:arboriculture/fences/pine_n", "y": 270, "uvlock": true }, + "east=true,north=true,south=false,west=false,woodtype=pine": { "model": "forestry:arboriculture/fences/pine_ne", "uvlock": true }, + "east=true,north=false,south=true,west=false,woodtype=pine": { "model": "forestry:arboriculture/fences/pine_ne", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,west=true,woodtype=pine": { "model": "forestry:arboriculture/fences/pine_ne", "y": 180, "uvlock": true }, + "east=false,north=true,south=false,west=true,woodtype=pine": { "model": "forestry:arboriculture/fences/pine_ne", "y": 270, "uvlock": true }, + "east=false,north=true,south=true,west=false,woodtype=pine": { "model": "forestry:arboriculture/fences/pine_ns", "uvlock": true }, + "east=true,north=false,south=false,west=true,woodtype=pine": { "model": "forestry:arboriculture/fences/pine_ns", "y": 90, "uvlock": true }, + "east=true,north=true,south=true,west=false,woodtype=pine": { "model": "forestry:arboriculture/fences/pine_nse", "uvlock": true }, + "east=true,north=false,south=true,west=true,woodtype=pine": { "model": "forestry:arboriculture/fences/pine_nse", "y": 90, "uvlock": true }, + "east=false,north=true,south=true,west=true,woodtype=pine": { "model": "forestry:arboriculture/fences/pine_nse", "y": 180, "uvlock": true }, + "east=true,north=true,south=false,west=true,woodtype=pine": { "model": "forestry:arboriculture/fences/pine_nse", "y": 270, "uvlock": true }, + "east=true,north=true,south=true,west=true,woodtype=pine": { "model": "forestry:arboriculture/fences/pine_nsew", "uvlock": true }, + //plum + "east=false,north=false,south=false,west=false,woodtype=plum": { "model": "forestry:arboriculture/fences/plum_post" }, + "east=false,north=true,south=false,west=false,woodtype=plum": { "model": "forestry:arboriculture/fences/plum_n", "uvlock": true }, + "east=true,north=false,south=false,west=false,woodtype=plum": { "model": "forestry:arboriculture/fences/plum_n", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,west=false,woodtype=plum": { "model": "forestry:arboriculture/fences/plum_n", "y": 180, "uvlock": true }, + "east=false,north=false,south=false,west=true,woodtype=plum": { "model": "forestry:arboriculture/fences/plum_n", "y": 270, "uvlock": true }, + "east=true,north=true,south=false,west=false,woodtype=plum": { "model": "forestry:arboriculture/fences/plum_ne", "uvlock": true }, + "east=true,north=false,south=true,west=false,woodtype=plum": { "model": "forestry:arboriculture/fences/plum_ne", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,west=true,woodtype=plum": { "model": "forestry:arboriculture/fences/plum_ne", "y": 180, "uvlock": true }, + "east=false,north=true,south=false,west=true,woodtype=plum": { "model": "forestry:arboriculture/fences/plum_ne", "y": 270, "uvlock": true }, + "east=false,north=true,south=true,west=false,woodtype=plum": { "model": "forestry:arboriculture/fences/plum_ns", "uvlock": true }, + "east=true,north=false,south=false,west=true,woodtype=plum": { "model": "forestry:arboriculture/fences/plum_ns", "y": 90, "uvlock": true }, + "east=true,north=true,south=true,west=false,woodtype=plum": { "model": "forestry:arboriculture/fences/plum_nse", "uvlock": true }, + "east=true,north=false,south=true,west=true,woodtype=plum": { "model": "forestry:arboriculture/fences/plum_nse", "y": 90, "uvlock": true }, + "east=false,north=true,south=true,west=true,woodtype=plum": { "model": "forestry:arboriculture/fences/plum_nse", "y": 180, "uvlock": true }, + "east=true,north=true,south=false,west=true,woodtype=plum": { "model": "forestry:arboriculture/fences/plum_nse", "y": 270, "uvlock": true }, + "east=true,north=true,south=true,west=true,woodtype=plum": { "model": "forestry:arboriculture/fences/plum_nsew", "uvlock": true }, + //maple + "east=false,north=false,south=false,west=false,woodtype=maple": { "model": "forestry:arboriculture/fences/maple_post" }, + "east=false,north=true,south=false,west=false,woodtype=maple": { "model": "forestry:arboriculture/fences/maple_n", "uvlock": true }, + "east=true,north=false,south=false,west=false,woodtype=maple": { "model": "forestry:arboriculture/fences/maple_n", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,west=false,woodtype=maple": { "model": "forestry:arboriculture/fences/maple_n", "y": 180, "uvlock": true }, + "east=false,north=false,south=false,west=true,woodtype=maple": { "model": "forestry:arboriculture/fences/maple_n", "y": 270, "uvlock": true }, + "east=true,north=true,south=false,west=false,woodtype=maple": { "model": "forestry:arboriculture/fences/maple_ne", "uvlock": true }, + "east=true,north=false,south=true,west=false,woodtype=maple": { "model": "forestry:arboriculture/fences/maple_ne", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,west=true,woodtype=maple": { "model": "forestry:arboriculture/fences/maple_ne", "y": 180, "uvlock": true }, + "east=false,north=true,south=false,west=true,woodtype=maple": { "model": "forestry:arboriculture/fences/maple_ne", "y": 270, "uvlock": true }, + "east=false,north=true,south=true,west=false,woodtype=maple": { "model": "forestry:arboriculture/fences/maple_ns", "uvlock": true }, + "east=true,north=false,south=false,west=true,woodtype=maple": { "model": "forestry:arboriculture/fences/maple_ns", "y": 90, "uvlock": true }, + "east=true,north=true,south=true,west=false,woodtype=maple": { "model": "forestry:arboriculture/fences/maple_nse", "uvlock": true }, + "east=true,north=false,south=true,west=true,woodtype=maple": { "model": "forestry:arboriculture/fences/maple_nse", "y": 90, "uvlock": true }, + "east=false,north=true,south=true,west=true,woodtype=maple": { "model": "forestry:arboriculture/fences/maple_nse", "y": 180, "uvlock": true }, + "east=true,north=true,south=false,west=true,woodtype=maple": { "model": "forestry:arboriculture/fences/maple_nse", "y": 270, "uvlock": true }, + "east=true,north=true,south=true,west=true,woodtype=maple": { "model": "forestry:arboriculture/fences/maple_nsew", "uvlock": true }, + //citrus + "east=false,north=false,south=false,west=false,woodtype=citrus": { "model": "forestry:arboriculture/fences/citrus_post" }, + "east=false,north=true,south=false,west=false,woodtype=citrus": { "model": "forestry:arboriculture/fences/citrus_n", "uvlock": true }, + "east=true,north=false,south=false,west=false,woodtype=citrus": { "model": "forestry:arboriculture/fences/citrus_n", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,west=false,woodtype=citrus": { "model": "forestry:arboriculture/fences/citrus_n", "y": 180, "uvlock": true }, + "east=false,north=false,south=false,west=true,woodtype=citrus": { "model": "forestry:arboriculture/fences/citrus_n", "y": 270, "uvlock": true }, + "east=true,north=true,south=false,west=false,woodtype=citrus": { "model": "forestry:arboriculture/fences/citrus_ne", "uvlock": true }, + "east=true,north=false,south=true,west=false,woodtype=citrus": { "model": "forestry:arboriculture/fences/citrus_ne", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,west=true,woodtype=citrus": { "model": "forestry:arboriculture/fences/citrus_ne", "y": 180, "uvlock": true }, + "east=false,north=true,south=false,west=true,woodtype=citrus": { "model": "forestry:arboriculture/fences/citrus_ne", "y": 270, "uvlock": true }, + "east=false,north=true,south=true,west=false,woodtype=citrus": { "model": "forestry:arboriculture/fences/citrus_ns", "uvlock": true }, + "east=true,north=false,south=false,west=true,woodtype=citrus": { "model": "forestry:arboriculture/fences/citrus_ns", "y": 90, "uvlock": true }, + "east=true,north=true,south=true,west=false,woodtype=citrus": { "model": "forestry:arboriculture/fences/citrus_nse", "uvlock": true }, + "east=true,north=false,south=true,west=true,woodtype=citrus": { "model": "forestry:arboriculture/fences/citrus_nse", "y": 90, "uvlock": true }, + "east=false,north=true,south=true,west=true,woodtype=citrus": { "model": "forestry:arboriculture/fences/citrus_nse", "y": 180, "uvlock": true }, + "east=true,north=true,south=false,west=true,woodtype=citrus": { "model": "forestry:arboriculture/fences/citrus_nse", "y": 270, "uvlock": true }, + "east=true,north=true,south=true,west=true,woodtype=citrus": { "model": "forestry:arboriculture/fences/citrus_nsew", "uvlock": true }, + //giganteum + "east=false,north=false,south=false,west=false,woodtype=giganteum": { "model": "forestry:arboriculture/fences/giganteum_post" }, + "east=false,north=true,south=false,west=false,woodtype=giganteum": { "model": "forestry:arboriculture/fences/giganteum_n", "uvlock": true }, + "east=true,north=false,south=false,west=false,woodtype=giganteum": { "model": "forestry:arboriculture/fences/giganteum_n", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,west=false,woodtype=giganteum": { "model": "forestry:arboriculture/fences/giganteum_n", "y": 180, "uvlock": true }, + "east=false,north=false,south=false,west=true,woodtype=giganteum": { "model": "forestry:arboriculture/fences/giganteum_n", "y": 270, "uvlock": true }, + "east=true,north=true,south=false,west=false,woodtype=giganteum": { "model": "forestry:arboriculture/fences/giganteum_ne", "uvlock": true }, + "east=true,north=false,south=true,west=false,woodtype=giganteum": { "model": "forestry:arboriculture/fences/giganteum_ne", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,west=true,woodtype=giganteum": { "model": "forestry:arboriculture/fences/giganteum_ne", "y": 180, "uvlock": true }, + "east=false,north=true,south=false,west=true,woodtype=giganteum": { "model": "forestry:arboriculture/fences/giganteum_ne", "y": 270, "uvlock": true }, + "east=false,north=true,south=true,west=false,woodtype=giganteum": { "model": "forestry:arboriculture/fences/giganteum_ns", "uvlock": true }, + "east=true,north=false,south=false,west=true,woodtype=giganteum": { "model": "forestry:arboriculture/fences/giganteum_ns", "y": 90, "uvlock": true }, + "east=true,north=true,south=true,west=false,woodtype=giganteum": { "model": "forestry:arboriculture/fences/giganteum_nse", "uvlock": true }, + "east=true,north=false,south=true,west=true,woodtype=giganteum": { "model": "forestry:arboriculture/fences/giganteum_nse", "y": 90, "uvlock": true }, + "east=false,north=true,south=true,west=true,woodtype=giganteum": { "model": "forestry:arboriculture/fences/giganteum_nse", "y": 180, "uvlock": true }, + "east=true,north=true,south=false,west=true,woodtype=giganteum": { "model": "forestry:arboriculture/fences/giganteum_nse", "y": 270, "uvlock": true }, + "east=true,north=true,south=true,west=true,woodtype=giganteum": { "model": "forestry:arboriculture/fences/giganteum_nsew", "uvlock": true }, + //ipe + "east=false,north=false,south=false,west=false,woodtype=ipe": { "model": "forestry:arboriculture/fences/ipe_post" }, + "east=false,north=true,south=false,west=false,woodtype=ipe": { "model": "forestry:arboriculture/fences/ipe_n", "uvlock": true }, + "east=true,north=false,south=false,west=false,woodtype=ipe": { "model": "forestry:arboriculture/fences/ipe_n", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,west=false,woodtype=ipe": { "model": "forestry:arboriculture/fences/ipe_n", "y": 180, "uvlock": true }, + "east=false,north=false,south=false,west=true,woodtype=ipe": { "model": "forestry:arboriculture/fences/ipe_n", "y": 270, "uvlock": true }, + "east=true,north=true,south=false,west=false,woodtype=ipe": { "model": "forestry:arboriculture/fences/ipe_ne", "uvlock": true }, + "east=true,north=false,south=true,west=false,woodtype=ipe": { "model": "forestry:arboriculture/fences/ipe_ne", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,west=true,woodtype=ipe": { "model": "forestry:arboriculture/fences/ipe_ne", "y": 180, "uvlock": true }, + "east=false,north=true,south=false,west=true,woodtype=ipe": { "model": "forestry:arboriculture/fences/ipe_ne", "y": 270, "uvlock": true }, + "east=false,north=true,south=true,west=false,woodtype=ipe": { "model": "forestry:arboriculture/fences/ipe_ns", "uvlock": true }, + "east=true,north=false,south=false,west=true,woodtype=ipe": { "model": "forestry:arboriculture/fences/ipe_ns", "y": 90, "uvlock": true }, + "east=true,north=true,south=true,west=false,woodtype=ipe": { "model": "forestry:arboriculture/fences/ipe_nse", "uvlock": true }, + "east=true,north=false,south=true,west=true,woodtype=ipe": { "model": "forestry:arboriculture/fences/ipe_nse", "y": 90, "uvlock": true }, + "east=false,north=true,south=true,west=true,woodtype=ipe": { "model": "forestry:arboriculture/fences/ipe_nse", "y": 180, "uvlock": true }, + "east=true,north=true,south=false,west=true,woodtype=ipe": { "model": "forestry:arboriculture/fences/ipe_nse", "y": 270, "uvlock": true }, + "east=true,north=true,south=true,west=true,woodtype=ipe": { "model": "forestry:arboriculture/fences/ipe_nsew", "uvlock": true }, + //padauk + "east=false,north=false,south=false,west=false,woodtype=padauk": { "model": "forestry:arboriculture/fences/padauk_post" }, + "east=false,north=true,south=false,west=false,woodtype=padauk": { "model": "forestry:arboriculture/fences/padauk_n", "uvlock": true }, + "east=true,north=false,south=false,west=false,woodtype=padauk": { "model": "forestry:arboriculture/fences/padauk_n", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,west=false,woodtype=padauk": { "model": "forestry:arboriculture/fences/padauk_n", "y": 180, "uvlock": true }, + "east=false,north=false,south=false,west=true,woodtype=padauk": { "model": "forestry:arboriculture/fences/padauk_n", "y": 270, "uvlock": true }, + "east=true,north=true,south=false,west=false,woodtype=padauk": { "model": "forestry:arboriculture/fences/padauk_ne", "uvlock": true }, + "east=true,north=false,south=true,west=false,woodtype=padauk": { "model": "forestry:arboriculture/fences/padauk_ne", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,west=true,woodtype=padauk": { "model": "forestry:arboriculture/fences/padauk_ne", "y": 180, "uvlock": true }, + "east=false,north=true,south=false,west=true,woodtype=padauk": { "model": "forestry:arboriculture/fences/padauk_ne", "y": 270, "uvlock": true }, + "east=false,north=true,south=true,west=false,woodtype=padauk": { "model": "forestry:arboriculture/fences/padauk_ns", "uvlock": true }, + "east=true,north=false,south=false,west=true,woodtype=padauk": { "model": "forestry:arboriculture/fences/padauk_ns", "y": 90, "uvlock": true }, + "east=true,north=true,south=true,west=false,woodtype=padauk": { "model": "forestry:arboriculture/fences/padauk_nse", "uvlock": true }, + "east=true,north=false,south=true,west=true,woodtype=padauk": { "model": "forestry:arboriculture/fences/padauk_nse", "y": 90, "uvlock": true }, + "east=false,north=true,south=true,west=true,woodtype=padauk": { "model": "forestry:arboriculture/fences/padauk_nse", "y": 180, "uvlock": true }, + "east=true,north=true,south=false,west=true,woodtype=padauk": { "model": "forestry:arboriculture/fences/padauk_nse", "y": 270, "uvlock": true }, + "east=true,north=true,south=true,west=true,woodtype=padauk": { "model": "forestry:arboriculture/fences/padauk_nsew", "uvlock": true }, + //cocobolo + "east=false,north=false,south=false,west=false,woodtype=cocobolo": { "model": "forestry:arboriculture/fences/cocobolo_post" }, + "east=false,north=true,south=false,west=false,woodtype=cocobolo": { "model": "forestry:arboriculture/fences/cocobolo_n", "uvlock": true }, + "east=true,north=false,south=false,west=false,woodtype=cocobolo": { "model": "forestry:arboriculture/fences/cocobolo_n", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,west=false,woodtype=cocobolo": { "model": "forestry:arboriculture/fences/cocobolo_n", "y": 180, "uvlock": true }, + "east=false,north=false,south=false,west=true,woodtype=cocobolo": { "model": "forestry:arboriculture/fences/cocobolo_n", "y": 270, "uvlock": true }, + "east=true,north=true,south=false,west=false,woodtype=cocobolo": { "model": "forestry:arboriculture/fences/cocobolo_ne", "uvlock": true }, + "east=true,north=false,south=true,west=false,woodtype=cocobolo": { "model": "forestry:arboriculture/fences/cocobolo_ne", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,west=true,woodtype=cocobolo": { "model": "forestry:arboriculture/fences/cocobolo_ne", "y": 180, "uvlock": true }, + "east=false,north=true,south=false,west=true,woodtype=cocobolo": { "model": "forestry:arboriculture/fences/cocobolo_ne", "y": 270, "uvlock": true }, + "east=false,north=true,south=true,west=false,woodtype=cocobolo": { "model": "forestry:arboriculture/fences/cocobolo_ns", "uvlock": true }, + "east=true,north=false,south=false,west=true,woodtype=cocobolo": { "model": "forestry:arboriculture/fences/cocobolo_ns", "y": 90, "uvlock": true }, + "east=true,north=true,south=true,west=false,woodtype=cocobolo": { "model": "forestry:arboriculture/fences/cocobolo_nse", "uvlock": true }, + "east=true,north=false,south=true,west=true,woodtype=cocobolo": { "model": "forestry:arboriculture/fences/cocobolo_nse", "y": 90, "uvlock": true }, + "east=false,north=true,south=true,west=true,woodtype=cocobolo": { "model": "forestry:arboriculture/fences/cocobolo_nse", "y": 180, "uvlock": true }, + "east=true,north=true,south=false,west=true,woodtype=cocobolo": { "model": "forestry:arboriculture/fences/cocobolo_nse", "y": 270, "uvlock": true }, + "east=true,north=true,south=true,west=true,woodtype=cocobolo": { "model": "forestry:arboriculture/fences/cocobolo_nsew", "uvlock": true }, + //zebrawood + "east=false,north=false,south=false,west=false,woodtype=zebrawood": { "model": "forestry:arboriculture/fences/zebrawood_post" }, + "east=false,north=true,south=false,west=false,woodtype=zebrawood": { "model": "forestry:arboriculture/fences/zebrawood_n", "uvlock": true }, + "east=true,north=false,south=false,west=false,woodtype=zebrawood": { "model": "forestry:arboriculture/fences/zebrawood_n", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,west=false,woodtype=zebrawood": { "model": "forestry:arboriculture/fences/zebrawood_n", "y": 180, "uvlock": true }, + "east=false,north=false,south=false,west=true,woodtype=zebrawood": { "model": "forestry:arboriculture/fences/zebrawood_n", "y": 270, "uvlock": true }, + "east=true,north=true,south=false,west=false,woodtype=zebrawood": { "model": "forestry:arboriculture/fences/zebrawood_ne", "uvlock": true }, + "east=true,north=false,south=true,west=false,woodtype=zebrawood": { "model": "forestry:arboriculture/fences/zebrawood_ne", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,west=true,woodtype=zebrawood": { "model": "forestry:arboriculture/fences/zebrawood_ne", "y": 180, "uvlock": true }, + "east=false,north=true,south=false,west=true,woodtype=zebrawood": { "model": "forestry:arboriculture/fences/zebrawood_ne", "y": 270, "uvlock": true }, + "east=false,north=true,south=true,west=false,woodtype=zebrawood": { "model": "forestry:arboriculture/fences/zebrawood_ns", "uvlock": true }, + "east=true,north=false,south=false,west=true,woodtype=zebrawood": { "model": "forestry:arboriculture/fences/zebrawood_ns", "y": 90, "uvlock": true }, + "east=true,north=true,south=true,west=false,woodtype=zebrawood": { "model": "forestry:arboriculture/fences/zebrawood_nse", "uvlock": true }, + "east=true,north=false,south=true,west=true,woodtype=zebrawood": { "model": "forestry:arboriculture/fences/zebrawood_nse", "y": 90, "uvlock": true }, + "east=false,north=true,south=true,west=true,woodtype=zebrawood": { "model": "forestry:arboriculture/fences/zebrawood_nse", "y": 180, "uvlock": true }, + "east=true,north=true,south=false,west=true,woodtype=zebrawood": { "model": "forestry:arboriculture/fences/zebrawood_nse", "y": 270, "uvlock": true }, + "east=true,north=true,south=true,west=true,woodtype=zebrawood": { "model": "forestry:arboriculture/fences/zebrawood_nsew", "uvlock": true } + } +} diff --git a/src/main/resources/assets/forestry/blockstates/germlings.json b/src/main/resources/assets/forestry/blockstates/germlings.json new file mode 100644 index 000000000..43b50cec1 --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/germlings.json @@ -0,0 +1,39 @@ +{ + "variants": { + "tree=oak": { "model": "forestry:germlings/sapling.treeOak" }, + "tree=darkoak": { "model": "forestry:germlings/sapling.treeDarkOak" }, + "tree=birch": { "model": "forestry:germlings/sapling.treeBirch" }, + "tree=lime": { "model": "forestry:germlings/sapling.treeLime" }, + "tree=walnut": { "model": "forestry:germlings/sapling.treeWalnut" }, + "tree=chestnut": { "model": "forestry:germlings/sapling.treeChestnut" }, + "tree=cherry": { "model": "forestry:germlings/sapling.treeCherry" }, + "tree=lemon": { "model": "forestry:germlings/sapling.treeLemon" }, + "tree=plum": { "model": "forestry:germlings/sapling.treePlum" }, + "tree=maple": { "model": "forestry:germlings/sapling.treeMaple" }, + "tree=spruce": { "model": "forestry:germlings/sapling.treeSpruce" }, + "tree=larch": { "model": "forestry:germlings/sapling.treeLarch" }, + "tree=pine": { "model": "forestry:germlings/sapling.treePine" }, + "tree=sequioa": { "model": "forestry:germlings/sapling.treeSequioa" }, + "tree=gigant": { "model": "forestry:germlings/sapling.treeGigant" }, + "tree=jungle": { "model": "forestry:germlings/sapling.treeJungle" }, + "tree=teak": { "model": "forestry:germlings/sapling.treeTeak" }, + "tree=ipe": { "model": "forestry:germlings/sapling.treeIpe" }, + "tree=kapok": { "model": "forestry:germlings/sapling.treeKapok" }, + "tree=ebony": { "model": "forestry:germlings/sapling.treeEbony" }, + "tree=zebrawood": { "model": "forestry:germlings/sapling.treeZebrawood" }, + "tree=mahogony": { "model": "forestry:germlings/sapling.treeMahogony" }, + "tree=acaciavanilla": { "model": "forestry:germlings/sapling.treeAcaciaVanilla" }, + "tree=acacia": { "model": "forestry:germlings/sapling.treeAcacia" }, + "tree=padauk": { "model": "forestry:germlings/sapling.treePadauk" }, + "tree=balsa": { "model": "forestry:germlings/sapling.treeBalsa" }, + "tree=cocobolo": { "model": "forestry:germlings/sapling.treeCocobolo" }, + "tree=wenge": { "model": "forestry:germlings/sapling.treeWenge" }, + "tree=baobab": { "model": "forestry:germlings/sapling.treeBaobab" }, + "tree=mahoe": { "model": "forestry:germlings/sapling.treeMahoe" }, + "tree=willow": { "model": "forestry:germlings/sapling.treeWillow" }, + "tree=sipiri": { "model": "forestry:germlings/sapling.treeSipiri" }, + "tree=papaya": { "model": "forestry:germlings/sapling.treePapaya" }, + "tree=date": { "model": "forestry:germlings/sapling.treeDate" }, + "tree=poplar": { "model": "forestry:germlings/sapling.treePoplar" } + } +} diff --git a/src/main/resources/assets/forestry/blockstates/logs.json b/src/main/resources/assets/forestry/blockstates/logs.json new file mode 100644 index 000000000..212bd0fa2 --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/logs.json @@ -0,0 +1,120 @@ +{ + "variants": { + //larch + "axis=normal,woodtype=larch": { "model": "forestry:arboriculture/logs/larch" }, + "axis=side,woodtype=larch": { "model": "forestry:arboriculture/logs/larch_side" }, + "axis=side_90,woodtype=larch": { "model": "forestry:arboriculture/logs/larch_side", "y": 90 }, + //teak + "axis=normal,woodtype=teak": { "model": "forestry:arboriculture/logs/teak" }, + "axis=side,woodtype=teak": { "model": "forestry:arboriculture/logs/teak_side" }, + "axis=side_90,woodtype=teak": { "model": "forestry:arboriculture/logs/teak_side", "y": 90 }, + //acacia + "axis=normal,woodtype=acacia": { "model": "forestry:arboriculture/logs/acacia" }, + "axis=side,woodtype=acacia": { "model": "forestry:arboriculture/logs/acacia_side" }, + "axis=side_90,woodtype=acacia": { "model": "forestry:arboriculture/logs/acacia_side", "y": 90 }, + //lime + "axis=normal,woodtype=lime": { "model": "forestry:arboriculture/logs/lime" }, + "axis=side,woodtype=lime": { "model": "forestry:arboriculture/logs/lime_side" }, + "axis=side_90,woodtype=lime": { "model": "forestry:arboriculture/logs/lime_side", "y": 90 }, + //chestnut + "axis=normal,woodtype=chestnut": { "model": "forestry:arboriculture/logs/chestnut" }, + "axis=side,woodtype=chestnut": { "model": "forestry:arboriculture/logs/chestnut_side" }, + "axis=side_90,woodtype=chestnut": { "model": "forestry:arboriculture/logs/chestnut_side", "y": 90 }, + //wenge + "axis=normal,woodtype=wenge": { "model": "forestry:arboriculture/logs/wenge" }, + "axis=side,woodtype=wenge": { "model": "forestry:arboriculture/logs/wenge_side" }, + "axis=side_90,woodtype=wenge": { "model": "forestry:arboriculture/logs/wenge_side", "y": 90 }, + //baobab + "axis=normal,woodtype=baobab": { "model": "forestry:arboriculture/logs/baobab" }, + "axis=side,woodtype=baobab": { "model": "forestry:arboriculture/logs/baobab_side" }, + "axis=side_90,woodtype=baobab": { "model": "forestry:arboriculture/logs/baobab_side", "y": 90 },# + //sequoia + "axis=normal,woodtype=sequoia": { "model": "forestry:arboriculture/logs/sequoia" }, + "axis=side,woodtype=sequoia": { "model": "forestry:arboriculture/logs/sequoia_side" }, + "axis=side_90,woodtype=sequoia": { "model": "forestry:arboriculture/logs/sequoia_side", "y": 90 }, + //kapok + "axis=normal,woodtype=kapok": { "model": "forestry:arboriculture/logs/kapok" }, + "axis=side,woodtype=kapok": { "model": "forestry:arboriculture/logs/kapok_side" }, + "axis=side_90,woodtype=kapok": { "model": "forestry:arboriculture/logs/kapok_side", "y": 90 }, + //ebony + "axis=normal,woodtype=ebony": { "model": "forestry:arboriculture/logs/ebony" }, + "axis=side,woodtype=ebony": { "model": "forestry:arboriculture/logs/ebony_side" }, + "axis=side_90,woodtype=ebony": { "model": "forestry:arboriculture/logs/ebony_side", "y": 90 }, + //mahogany + "axis=normal,woodtype=mahogany": { "model": "forestry:arboriculture/logs/mahogany" }, + "axis=side,woodtype=mahogany": { "model": "forestry:arboriculture/logs/mahogany_side" }, + "axis=side_90,woodtype=mahogany": { "model": "forestry:arboriculture/logs/mahogany_side", "y": 90 }, + //balsa + "axis=normal,woodtype=balsa": { "model": "forestry:arboriculture/logs/balsa" }, + "axis=side,woodtype=balsa": { "model": "forestry:arboriculture/logs/balsa_side" }, + "axis=side_90,woodtype=balsa": { "model": "forestry:arboriculture/logs/balsa_side", "y": 90 }, + //willow + "axis=normal,woodtype=willow": { "model": "forestry:arboriculture/logs/willow" }, + "axis=side,woodtype=willow": { "model": "forestry:arboriculture/logs/willow_side" }, + "axis=side_90,woodtype=willow": { "model": "forestry:arboriculture/logs/willow_side", "y": 90 }, + //walnut + "axis=normal,woodtype=walnut": { "model": "forestry:arboriculture/logs/walnut" }, + "axis=side,woodtype=walnut": { "model": "forestry:arboriculture/logs/walnut_side" }, + "axis=side_90,woodtype=walnut": { "model": "forestry:arboriculture/logs/walnut_side", "y": 90 }, + //greenheart + "axis=normal,woodtype=greenheart": { "model": "forestry:arboriculture/logs/greenheart" }, + "axis=side,woodtype=greenheart": { "model": "forestry:arboriculture/logs/greenheart_side" }, + "axis=side_90,woodtype=greenheart": { "model": "forestry:arboriculture/logs/greenheart_side", "y": 90 }, + //cherry + "axis=normal,woodtype=cherry": { "model": "forestry:arboriculture/logs/cherry" }, + "axis=side,woodtype=cherry": { "model": "forestry:arboriculture/logs/cherry_side" }, + "axis=side_90,woodtype=cherry": { "model": "forestry:arboriculture/logs/cherry_side", "y": 90 }, + //mahoe + "axis=normal,woodtype=mahoe": { "model": "forestry:arboriculture/logs/mahoe" }, + "axis=side,woodtype=mahoe": { "model": "forestry:arboriculture/logs/mahoe_side" }, + "axis=side_90,woodtype=mahoe": { "model": "forestry:arboriculture/logs/mahoe_side", "y": 90 }, + //poplar + "axis=normal,woodtype=poplar": { "model": "forestry:arboriculture/logs/poplar" }, + "axis=side,woodtype=poplar": { "model": "forestry:arboriculture/logs/poplar_side" }, + "axis=side_90,woodtype=poplar": { "model": "forestry:arboriculture/logs/poplar_side", "y": 90 }, + //palm + "axis=normal,woodtype=palm": { "model": "forestry:arboriculture/logs/palm" }, + "axis=side,woodtype=palm": { "model": "forestry:arboriculture/logs/palm_side" }, + "axis=side_90,woodtype=palm": { "model": "forestry:arboriculture/logs/palm_side", "y": 90 }, + //papaya + "axis=normal,woodtype=papaya": { "model": "forestry:arboriculture/logs/papaya" }, + "axis=side,woodtype=papaya": { "model": "forestry:arboriculture/logs/papaya_side" }, + "axis=side_90,woodtype=papaya": { "model": "forestry:arboriculture/logs/papaya_side", "y": 90 }, + //pine + "axis=normal,woodtype=pine": { "model": "forestry:arboriculture/logs/pine" }, + "axis=side,woodtype=pine": { "model": "forestry:arboriculture/logs/pine_side" }, + "axis=side_90,woodtype=pine": { "model": "forestry:arboriculture/logs/pine_side", "y": 90 }, + //plum + "axis=normal,woodtype=plum": { "model": "forestry:arboriculture/logs/plum" }, + "axis=side,woodtype=plum": { "model": "forestry:arboriculture/logs/plum_side" }, + "axis=side_90,woodtype=plum": { "model": "forestry:arboriculture/logs/plum_side", "y": 90 }, + //maple + "axis=normal,woodtype=maple": { "model": "forestry:arboriculture/logs/maple" }, + "axis=side,woodtype=maple": { "model": "forestry:arboriculture/logs/maple_side" }, + "axis=side_90,woodtype=maple": { "model": "forestry:arboriculture/logs/maple_side", "y": 90 }, + //citrus + "axis=normal,woodtype=citrus": { "model": "forestry:arboriculture/logs/citrus" }, + "axis=side,woodtype=citrus": { "model": "forestry:arboriculture/logs/citrus_side" }, + "axis=side_90,woodtype=citrus": { "model": "forestry:arboriculture/logs/citrus_side", "y": 90 }, + //giganteum + "axis=normal,woodtype=giganteum": { "model": "forestry:arboriculture/logs/giganteum" }, + "axis=side,woodtype=giganteum": { "model": "forestry:arboriculture/logs/giganteum_side" }, + "axis=side_90,woodtype=giganteum": { "model": "forestry:arboriculture/logs/giganteum_side", "y": 90 }, + //ipe + "axis=normal,woodtype=ipe": { "model": "forestry:arboriculture/logs/ipe" }, + "axis=side,woodtype=ipe": { "model": "forestry:arboriculture/logs/ipe_side" }, + "axis=side_90,woodtype=ipe": { "model": "forestry:arboriculture/logs/ipe_side", "y": 90 }, + //padauk + "axis=normal,woodtype=padauk": { "model": "forestry:arboriculture/logs/padauk" }, + "axis=side,woodtype=padauk": { "model": "forestry:arboriculture/logs/padauk_side" }, + "axis=side_90,woodtype=padauk": { "model": "forestry:arboriculture/logs/padauk_side", "y": 90 }, + //cocobolo + "axis=normal,woodtype=cocobolo": { "model": "forestry:arboriculture/logs/cocobolo" }, + "axis=side,woodtype=cocobolo": { "model": "forestry:arboriculture/logs/cocobolo_side" }, + "axis=side_90,woodtype=cocobolo": { "model": "forestry:arboriculture/logs/cocobolo_side", "y": 90 }, + //zebrawood + "axis=normal,woodtype=zebrawood": { "model": "forestry:arboriculture/logs/zebrawood" }, + "axis=side,woodtype=zebrawood": { "model": "forestry:arboriculture/logs/zebrawood_side" }, + "axis=side_90,woodtype=zebrawood": { "model": "forestry:arboriculture/logs/zebrawood_side", "y": 90 } + } +} diff --git a/src/main/resources/assets/forestry/blockstates/logsFireproof.json b/src/main/resources/assets/forestry/blockstates/logsFireproof.json new file mode 100644 index 000000000..212bd0fa2 --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/logsFireproof.json @@ -0,0 +1,120 @@ +{ + "variants": { + //larch + "axis=normal,woodtype=larch": { "model": "forestry:arboriculture/logs/larch" }, + "axis=side,woodtype=larch": { "model": "forestry:arboriculture/logs/larch_side" }, + "axis=side_90,woodtype=larch": { "model": "forestry:arboriculture/logs/larch_side", "y": 90 }, + //teak + "axis=normal,woodtype=teak": { "model": "forestry:arboriculture/logs/teak" }, + "axis=side,woodtype=teak": { "model": "forestry:arboriculture/logs/teak_side" }, + "axis=side_90,woodtype=teak": { "model": "forestry:arboriculture/logs/teak_side", "y": 90 }, + //acacia + "axis=normal,woodtype=acacia": { "model": "forestry:arboriculture/logs/acacia" }, + "axis=side,woodtype=acacia": { "model": "forestry:arboriculture/logs/acacia_side" }, + "axis=side_90,woodtype=acacia": { "model": "forestry:arboriculture/logs/acacia_side", "y": 90 }, + //lime + "axis=normal,woodtype=lime": { "model": "forestry:arboriculture/logs/lime" }, + "axis=side,woodtype=lime": { "model": "forestry:arboriculture/logs/lime_side" }, + "axis=side_90,woodtype=lime": { "model": "forestry:arboriculture/logs/lime_side", "y": 90 }, + //chestnut + "axis=normal,woodtype=chestnut": { "model": "forestry:arboriculture/logs/chestnut" }, + "axis=side,woodtype=chestnut": { "model": "forestry:arboriculture/logs/chestnut_side" }, + "axis=side_90,woodtype=chestnut": { "model": "forestry:arboriculture/logs/chestnut_side", "y": 90 }, + //wenge + "axis=normal,woodtype=wenge": { "model": "forestry:arboriculture/logs/wenge" }, + "axis=side,woodtype=wenge": { "model": "forestry:arboriculture/logs/wenge_side" }, + "axis=side_90,woodtype=wenge": { "model": "forestry:arboriculture/logs/wenge_side", "y": 90 }, + //baobab + "axis=normal,woodtype=baobab": { "model": "forestry:arboriculture/logs/baobab" }, + "axis=side,woodtype=baobab": { "model": "forestry:arboriculture/logs/baobab_side" }, + "axis=side_90,woodtype=baobab": { "model": "forestry:arboriculture/logs/baobab_side", "y": 90 },# + //sequoia + "axis=normal,woodtype=sequoia": { "model": "forestry:arboriculture/logs/sequoia" }, + "axis=side,woodtype=sequoia": { "model": "forestry:arboriculture/logs/sequoia_side" }, + "axis=side_90,woodtype=sequoia": { "model": "forestry:arboriculture/logs/sequoia_side", "y": 90 }, + //kapok + "axis=normal,woodtype=kapok": { "model": "forestry:arboriculture/logs/kapok" }, + "axis=side,woodtype=kapok": { "model": "forestry:arboriculture/logs/kapok_side" }, + "axis=side_90,woodtype=kapok": { "model": "forestry:arboriculture/logs/kapok_side", "y": 90 }, + //ebony + "axis=normal,woodtype=ebony": { "model": "forestry:arboriculture/logs/ebony" }, + "axis=side,woodtype=ebony": { "model": "forestry:arboriculture/logs/ebony_side" }, + "axis=side_90,woodtype=ebony": { "model": "forestry:arboriculture/logs/ebony_side", "y": 90 }, + //mahogany + "axis=normal,woodtype=mahogany": { "model": "forestry:arboriculture/logs/mahogany" }, + "axis=side,woodtype=mahogany": { "model": "forestry:arboriculture/logs/mahogany_side" }, + "axis=side_90,woodtype=mahogany": { "model": "forestry:arboriculture/logs/mahogany_side", "y": 90 }, + //balsa + "axis=normal,woodtype=balsa": { "model": "forestry:arboriculture/logs/balsa" }, + "axis=side,woodtype=balsa": { "model": "forestry:arboriculture/logs/balsa_side" }, + "axis=side_90,woodtype=balsa": { "model": "forestry:arboriculture/logs/balsa_side", "y": 90 }, + //willow + "axis=normal,woodtype=willow": { "model": "forestry:arboriculture/logs/willow" }, + "axis=side,woodtype=willow": { "model": "forestry:arboriculture/logs/willow_side" }, + "axis=side_90,woodtype=willow": { "model": "forestry:arboriculture/logs/willow_side", "y": 90 }, + //walnut + "axis=normal,woodtype=walnut": { "model": "forestry:arboriculture/logs/walnut" }, + "axis=side,woodtype=walnut": { "model": "forestry:arboriculture/logs/walnut_side" }, + "axis=side_90,woodtype=walnut": { "model": "forestry:arboriculture/logs/walnut_side", "y": 90 }, + //greenheart + "axis=normal,woodtype=greenheart": { "model": "forestry:arboriculture/logs/greenheart" }, + "axis=side,woodtype=greenheart": { "model": "forestry:arboriculture/logs/greenheart_side" }, + "axis=side_90,woodtype=greenheart": { "model": "forestry:arboriculture/logs/greenheart_side", "y": 90 }, + //cherry + "axis=normal,woodtype=cherry": { "model": "forestry:arboriculture/logs/cherry" }, + "axis=side,woodtype=cherry": { "model": "forestry:arboriculture/logs/cherry_side" }, + "axis=side_90,woodtype=cherry": { "model": "forestry:arboriculture/logs/cherry_side", "y": 90 }, + //mahoe + "axis=normal,woodtype=mahoe": { "model": "forestry:arboriculture/logs/mahoe" }, + "axis=side,woodtype=mahoe": { "model": "forestry:arboriculture/logs/mahoe_side" }, + "axis=side_90,woodtype=mahoe": { "model": "forestry:arboriculture/logs/mahoe_side", "y": 90 }, + //poplar + "axis=normal,woodtype=poplar": { "model": "forestry:arboriculture/logs/poplar" }, + "axis=side,woodtype=poplar": { "model": "forestry:arboriculture/logs/poplar_side" }, + "axis=side_90,woodtype=poplar": { "model": "forestry:arboriculture/logs/poplar_side", "y": 90 }, + //palm + "axis=normal,woodtype=palm": { "model": "forestry:arboriculture/logs/palm" }, + "axis=side,woodtype=palm": { "model": "forestry:arboriculture/logs/palm_side" }, + "axis=side_90,woodtype=palm": { "model": "forestry:arboriculture/logs/palm_side", "y": 90 }, + //papaya + "axis=normal,woodtype=papaya": { "model": "forestry:arboriculture/logs/papaya" }, + "axis=side,woodtype=papaya": { "model": "forestry:arboriculture/logs/papaya_side" }, + "axis=side_90,woodtype=papaya": { "model": "forestry:arboriculture/logs/papaya_side", "y": 90 }, + //pine + "axis=normal,woodtype=pine": { "model": "forestry:arboriculture/logs/pine" }, + "axis=side,woodtype=pine": { "model": "forestry:arboriculture/logs/pine_side" }, + "axis=side_90,woodtype=pine": { "model": "forestry:arboriculture/logs/pine_side", "y": 90 }, + //plum + "axis=normal,woodtype=plum": { "model": "forestry:arboriculture/logs/plum" }, + "axis=side,woodtype=plum": { "model": "forestry:arboriculture/logs/plum_side" }, + "axis=side_90,woodtype=plum": { "model": "forestry:arboriculture/logs/plum_side", "y": 90 }, + //maple + "axis=normal,woodtype=maple": { "model": "forestry:arboriculture/logs/maple" }, + "axis=side,woodtype=maple": { "model": "forestry:arboriculture/logs/maple_side" }, + "axis=side_90,woodtype=maple": { "model": "forestry:arboriculture/logs/maple_side", "y": 90 }, + //citrus + "axis=normal,woodtype=citrus": { "model": "forestry:arboriculture/logs/citrus" }, + "axis=side,woodtype=citrus": { "model": "forestry:arboriculture/logs/citrus_side" }, + "axis=side_90,woodtype=citrus": { "model": "forestry:arboriculture/logs/citrus_side", "y": 90 }, + //giganteum + "axis=normal,woodtype=giganteum": { "model": "forestry:arboriculture/logs/giganteum" }, + "axis=side,woodtype=giganteum": { "model": "forestry:arboriculture/logs/giganteum_side" }, + "axis=side_90,woodtype=giganteum": { "model": "forestry:arboriculture/logs/giganteum_side", "y": 90 }, + //ipe + "axis=normal,woodtype=ipe": { "model": "forestry:arboriculture/logs/ipe" }, + "axis=side,woodtype=ipe": { "model": "forestry:arboriculture/logs/ipe_side" }, + "axis=side_90,woodtype=ipe": { "model": "forestry:arboriculture/logs/ipe_side", "y": 90 }, + //padauk + "axis=normal,woodtype=padauk": { "model": "forestry:arboriculture/logs/padauk" }, + "axis=side,woodtype=padauk": { "model": "forestry:arboriculture/logs/padauk_side" }, + "axis=side_90,woodtype=padauk": { "model": "forestry:arboriculture/logs/padauk_side", "y": 90 }, + //cocobolo + "axis=normal,woodtype=cocobolo": { "model": "forestry:arboriculture/logs/cocobolo" }, + "axis=side,woodtype=cocobolo": { "model": "forestry:arboriculture/logs/cocobolo_side" }, + "axis=side_90,woodtype=cocobolo": { "model": "forestry:arboriculture/logs/cocobolo_side", "y": 90 }, + //zebrawood + "axis=normal,woodtype=zebrawood": { "model": "forestry:arboriculture/logs/zebrawood" }, + "axis=side,woodtype=zebrawood": { "model": "forestry:arboriculture/logs/zebrawood_side" }, + "axis=side_90,woodtype=zebrawood": { "model": "forestry:arboriculture/logs/zebrawood_side", "y": 90 } + } +} diff --git a/src/main/resources/assets/forestry/blockstates/mail_mailbox.json b/src/main/resources/assets/forestry/blockstates/mail_mailbox.json new file mode 100644 index 000000000..c8354cf9c --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/mail_mailbox.json @@ -0,0 +1,8 @@ +{ + "variants": { + "face=north": { "model": "forestry:mail_mailbox" }, + "face=east": { "model": "forestry:mail_mailbox", "y": 90 }, + "face=south": { "model": "forestry:mail_mailbox", "y": 180 }, + "face=west": { "model": "forestry:mail_mailbox", "y": -90 } + } +} diff --git a/src/main/resources/assets/forestry/blockstates/mail_philatelist.json b/src/main/resources/assets/forestry/blockstates/mail_philatelist.json new file mode 100644 index 000000000..6a8f7dc0e --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/mail_philatelist.json @@ -0,0 +1,8 @@ +{ + "variants": { + "face=north": { "model": "forestry:mail_philatelist" }, + "face=east": { "model": "forestry:mail_philatelist", "y": 90 }, + "face=south": { "model": "forestry:mail_philatelist", "y": 180 }, + "face=west": { "model": "forestry:mail_philatelist", "y": -90 } + } +} diff --git a/src/main/resources/assets/forestry/blockstates/mail_tradestation.json b/src/main/resources/assets/forestry/blockstates/mail_tradestation.json new file mode 100644 index 000000000..27fb59eca --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/mail_tradestation.json @@ -0,0 +1,8 @@ +{ + "variants": { + "face=north": { "model": "forestry:mail_tradestation" }, + "face=east": { "model": "forestry:mail_tradestation", "y": 90 }, + "face=south": { "model": "forestry:mail_tradestation", "y": 180 }, + "face=west": { "model": "forestry:mail_tradestation", "y": -90 } + } +} diff --git a/src/main/resources/assets/forestry/blockstates/planks.json b/src/main/resources/assets/forestry/blockstates/planks.json new file mode 100644 index 000000000..23058bc8f --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/planks.json @@ -0,0 +1,33 @@ +{ + "variants": { + "woodtype=larch": { "model": "forestry:arboriculture/planks/larch" }, + "woodtype=teak": { "model": "forestry:arboriculture/planks/teak" }, + "woodtype=acacia": { "model": "forestry:arboriculture/planks/acacia" }, + "woodtype=lime": { "model": "forestry:arboriculture/planks/lime" }, + "woodtype=chestnut": { "model": "forestry:arboriculture/planks/chestnut" }, + "woodtype=wenge": { "model": "forestry:arboriculture/planks/wenge" }, + "woodtype=baobab": { "model": "forestry:arboriculture/planks/baobab" }, + "woodtype=sequoia": { "model": "forestry:arboriculture/planks/sequoia" }, + "woodtype=kapok": { "model": "forestry:arboriculture/planks/kapok" }, + "woodtype=ebony": { "model": "forestry:arboriculture/planks/ebony" }, + "woodtype=mahogany": { "model": "forestry:arboriculture/planks/mahogany" }, + "woodtype=balsa": { "model": "forestry:arboriculture/planks/balsa" }, + "woodtype=willow": { "model": "forestry:arboriculture/planks/willow" }, + "woodtype=walnut": { "model": "forestry:arboriculture/planks/walnut" }, + "woodtype=greenheart": { "model": "forestry:arboriculture/planks/greenheart" }, + "woodtype=cherry": { "model": "forestry:arboriculture/planks/cherry" }, + "woodtype=mahoe": { "model": "forestry:arboriculture/planks/mahoe" }, + "woodtype=poplar": { "model": "forestry:arboriculture/planks/poplar" }, + "woodtype=palm": { "model": "forestry:arboriculture/planks/palm" }, + "woodtype=papaya": { "model": "forestry:arboriculture/planks/papaya" }, + "woodtype=pine": { "model": "forestry:arboriculture/planks/pine" }, + "woodtype=plum": { "model": "forestry:arboriculture/planks/plum" }, + "woodtype=maple": { "model": "forestry:arboriculture/planks/maple" }, + "woodtype=citrus": { "model": "forestry:arboriculture/planks/citrus" }, + "woodtype=giganteum": { "model": "forestry:arboriculture/planks/giganteum" }, + "woodtype=ipe": { "model": "forestry:arboriculture/planks/ipe" }, + "woodtype=padauk": { "model": "forestry:arboriculture/planks/padauk" }, + "woodtype=cocobolo": { "model": "forestry:arboriculture/planks/cocobolo" }, + "woodtype=zebrawood": { "model": "forestry:arboriculture/planks/zebrawood" } + } +} diff --git a/src/main/resources/assets/forestry/blockstates/planksFireproof.json b/src/main/resources/assets/forestry/blockstates/planksFireproof.json new file mode 100644 index 000000000..23058bc8f --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/planksFireproof.json @@ -0,0 +1,33 @@ +{ + "variants": { + "woodtype=larch": { "model": "forestry:arboriculture/planks/larch" }, + "woodtype=teak": { "model": "forestry:arboriculture/planks/teak" }, + "woodtype=acacia": { "model": "forestry:arboriculture/planks/acacia" }, + "woodtype=lime": { "model": "forestry:arboriculture/planks/lime" }, + "woodtype=chestnut": { "model": "forestry:arboriculture/planks/chestnut" }, + "woodtype=wenge": { "model": "forestry:arboriculture/planks/wenge" }, + "woodtype=baobab": { "model": "forestry:arboriculture/planks/baobab" }, + "woodtype=sequoia": { "model": "forestry:arboriculture/planks/sequoia" }, + "woodtype=kapok": { "model": "forestry:arboriculture/planks/kapok" }, + "woodtype=ebony": { "model": "forestry:arboriculture/planks/ebony" }, + "woodtype=mahogany": { "model": "forestry:arboriculture/planks/mahogany" }, + "woodtype=balsa": { "model": "forestry:arboriculture/planks/balsa" }, + "woodtype=willow": { "model": "forestry:arboriculture/planks/willow" }, + "woodtype=walnut": { "model": "forestry:arboriculture/planks/walnut" }, + "woodtype=greenheart": { "model": "forestry:arboriculture/planks/greenheart" }, + "woodtype=cherry": { "model": "forestry:arboriculture/planks/cherry" }, + "woodtype=mahoe": { "model": "forestry:arboriculture/planks/mahoe" }, + "woodtype=poplar": { "model": "forestry:arboriculture/planks/poplar" }, + "woodtype=palm": { "model": "forestry:arboriculture/planks/palm" }, + "woodtype=papaya": { "model": "forestry:arboriculture/planks/papaya" }, + "woodtype=pine": { "model": "forestry:arboriculture/planks/pine" }, + "woodtype=plum": { "model": "forestry:arboriculture/planks/plum" }, + "woodtype=maple": { "model": "forestry:arboriculture/planks/maple" }, + "woodtype=citrus": { "model": "forestry:arboriculture/planks/citrus" }, + "woodtype=giganteum": { "model": "forestry:arboriculture/planks/giganteum" }, + "woodtype=ipe": { "model": "forestry:arboriculture/planks/ipe" }, + "woodtype=padauk": { "model": "forestry:arboriculture/planks/padauk" }, + "woodtype=cocobolo": { "model": "forestry:arboriculture/planks/cocobolo" }, + "woodtype=zebrawood": { "model": "forestry:arboriculture/planks/zebrawood" } + } +} diff --git a/src/main/resources/assets/forestry/blockstates/pods/cocoa.json b/src/main/resources/assets/forestry/blockstates/pods/cocoa.json new file mode 100644 index 000000000..9eda2fd9c --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/pods/cocoa.json @@ -0,0 +1,16 @@ +{ + "variants": { + "age=0,facing=south": { "model": "cocoa_age0_s" }, + "age=0,facing=west": { "model": "cocoa_age0_s", "y": 90 }, + "age=0,facing=north": { "model": "cocoa_age0_s", "y": 180 }, + "age=0,facing=east": { "model": "cocoa_age0_s", "y": 270 }, + "age=1,facing=south": { "model": "cocoa_age1_s" }, + "age=1,facing=west": { "model": "cocoa_age1_s", "y": 90 }, + "age=1,facing=north": { "model": "cocoa_age1_s", "y": 180 }, + "age=1,facing=east": { "model": "cocoa_age1_s", "y": 270 }, + "age=2,facing=south": { "model": "cocoa_age2_s" }, + "age=2,facing=west": { "model": "cocoa_age2_s", "y": 90 }, + "age=2,facing=north": { "model": "cocoa_age2_s", "y": 180 }, + "age=2,facing=east": { "model": "cocoa_age2_s", "y": 270 } + } +} diff --git a/src/main/resources/assets/forestry/blockstates/pods/dates.json b/src/main/resources/assets/forestry/blockstates/pods/dates.json new file mode 100644 index 000000000..27cdad9ac --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/pods/dates.json @@ -0,0 +1,16 @@ +{ + "variants": { + "age=0,facing=south": { "model": "forestry:pods/dates_0" }, + "age=0,facing=west": { "model": "forestry:pods/dates_0", "y": 90 }, + "age=0,facing=north": { "model": "forestry:pods/dates_0", "y": 180 }, + "age=0,facing=east": { "model": "forestry:pods/dates_0", "y": 270 }, + "age=1,facing=south": { "model": "forestry:pods/dates_1" }, + "age=1,facing=west": { "model": "forestry:pods/dates_1", "y": 90 }, + "age=1,facing=north": { "model": "forestry:pods/dates_1", "y": 180 }, + "age=1,facing=east": { "model": "forestry:pods/dates_1", "y": 270 }, + "age=2,facing=south": { "model": "forestry:pods/dates_2" }, + "age=2,facing=west": { "model": "forestry:pods/dates_2", "y": 90 }, + "age=2,facing=north": { "model": "forestry:pods/dates_2", "y": 180 }, + "age=2,facing=east": { "model": "forestry:pods/dates_2", "y": 270 } + } +} diff --git a/src/main/resources/assets/forestry/blockstates/pods/papaya.json b/src/main/resources/assets/forestry/blockstates/pods/papaya.json new file mode 100644 index 000000000..b79fcc6f1 --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/pods/papaya.json @@ -0,0 +1,16 @@ +{ + "variants": { + "age=0,facing=south": { "model": "forestry:pods/papaya_0" }, + "age=0,facing=west": { "model": "forestry:pods/papaya_0", "y": 90 }, + "age=0,facing=north": { "model": "forestry:pods/papaya_0", "y": 180 }, + "age=0,facing=east": { "model": "forestry:pods/papaya_0", "y": 270 }, + "age=1,facing=south": { "model": "forestry:pods/papaya_1" }, + "age=1,facing=west": { "model": "forestry:pods/papaya_1", "y": 90 }, + "age=1,facing=north": { "model": "forestry:pods/papaya_1", "y": 180 }, + "age=1,facing=east": { "model": "forestry:pods/papaya_1", "y": 270 }, + "age=2,facing=south": { "model": "forestry:pods/papaya_2" }, + "age=2,facing=west": { "model": "forestry:pods/papaya_2", "y": 90 }, + "age=2,facing=north": { "model": "forestry:pods/papaya_2", "y": 180 }, + "age=2,facing=east": { "model": "forestry:pods/papaya_2", "y": 270 } + } +} diff --git a/src/main/resources/assets/forestry/blockstates/resourceStorage.json b/src/main/resources/assets/forestry/blockstates/resourceStorage.json new file mode 100644 index 000000000..677f1a110 --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/resourceStorage.json @@ -0,0 +1,8 @@ +{ + "variants": { + "resource=apatite": { "model": "forestry:storage/apatite" }, + "resource=copper": { "model": "forestry:storage/copper" }, + "resource=tin": { "model": "forestry:storage/tin" }, + "resource=bronze": { "model": "forestry:storage/bronze" } + } +} diff --git a/src/main/resources/assets/forestry/blockstates/resources.json b/src/main/resources/assets/forestry/blockstates/resources.json new file mode 100644 index 000000000..69813bd23 --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/resources.json @@ -0,0 +1,7 @@ +{ + "variants": { + "resource=apatite": { "model": "forestry:ores/apatite" }, + "resource=copper": { "model": "forestry:ores/copper" }, + "resource=tin": { "model": "forestry:ores/tin" } + } +} diff --git a/src/main/resources/assets/forestry/blockstates/slabs.json b/src/main/resources/assets/forestry/blockstates/slabs.json new file mode 100644 index 000000000..3e74c1b70 --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/slabs.json @@ -0,0 +1,91 @@ +{ + "variants": { + //larch + "half=bottom,woodtype=larch": { "model": "forestry:arboriculture/slab/larch_half" }, + "half=top,woodtype=larch": { "model": "forestry:arboriculture/slab/larch_upper" }, + //teak + "half=bottom,woodtype=teak": { "model": "forestry:arboriculture/slab/teak_half" }, + "half=top,woodtype=teak": { "model": "forestry:arboriculture/slab/teak_upper" }, + //acacia + "half=bottom,woodtype=acacia": { "model": "forestry:arboriculture/slab/acacia_half" }, + "half=top,woodtype=acacia": { "model": "forestry:arboriculture/slab/acacia_upper" }, + //lime + "half=bottom,woodtype=lime": { "model": "forestry:arboriculture/slab/lime_half" }, + "half=top,woodtype=lime": { "model": "forestry:arboriculture/slab/lime_upper" }, + //chestnut + "half=bottom,woodtype=chestnut": { "model": "forestry:arboriculture/slab/chestnut_half" }, + "half=top,woodtype=chestnut": { "model": "forestry:arboriculture/slab/chestnut_upper" }, + //wenge + "half=bottom,woodtype=wenge": { "model": "forestry:arboriculture/slab/wenge_half" }, + "half=top,woodtype=wenge": { "model": "forestry:arboriculture/slab/wenge_upper" }, + //baobab + "half=bottom,woodtype=baobab": { "model": "forestry:arboriculture/slab/baobab_half" }, + "half=top,woodtype=baobab": { "model": "forestry:arboriculture/slab/baobab_upper" }, + //sequoia + "half=bottom,woodtype=sequoia": { "model": "forestry:arboriculture/slab/sequoia_half" }, + "half=top,woodtype=sequoia": { "model": "forestry:arboriculture/slab/sequoia_upper" }, + //kapok + "half=bottom,woodtype=kapok": { "model": "forestry:arboriculture/slab/kapok_half" }, + "half=top,woodtype=kapok": { "model": "forestry:arboriculture/slab/kapok_upper" }, + //ebony + "half=bottom,woodtype=ebony": { "model": "forestry:arboriculture/slab/ebony_half" }, + "half=top,woodtype=ebony": { "model": "forestry:arboriculture/slab/ebony_upper" }, + //mahogany + "half=bottom,woodtype=mahogany": { "model": "forestry:arboriculture/slab/mahogany_half" }, + "half=top,woodtype=mahogany": { "model": "forestry:arboriculture/slab/mahogany_upper" }, + //balsa + "half=bottom,woodtype=balsa": { "model": "forestry:arboriculture/slab/balsa_half" }, + "half=top,woodtype=balsa": { "model": "forestry:arboriculture/slab/balsa_upper" }, + //willow + "half=bottom,woodtype=willow": { "model": "forestry:arboriculture/slab/willow_half" }, + "half=top,woodtype=willow": { "model": "forestry:arboriculture/slab/willow_upper" }, + //walnut + "half=bottom,woodtype=walnut": { "model": "forestry:arboriculture/slab/walnut_half" }, + "half=top,woodtype=walnut": { "model": "forestry:arboriculture/slab/walnut_upper" }, + //greenheart + "half=bottom,woodtype=greenheart": { "model": "forestry:arboriculture/slab/greenheart_half" }, + "half=top,woodtype=greenheart": { "model": "forestry:arboriculture/slab/greenheart_upper" }, + //cherry + "half=bottom,woodtype=cherry": { "model": "forestry:arboriculture/slab/cherry_half" }, + "half=top,woodtype=cherry": { "model": "forestry:arboriculture/slab/cherry_upper" }, + //mahoe + "half=bottom,woodtype=mahoe": { "model": "forestry:arboriculture/slab/mahoe_half" }, + "half=top,woodtype=mahoe": { "model": "forestry:arboriculture/slab/mahoe_upper" }, + //poplar + "half=bottom,woodtype=poplar": { "model": "forestry:arboriculture/slab/poplar_half" }, + "half=top,woodtype=poplar": { "model": "forestry:arboriculture/slab/poplar_upper" }, + //palm + "half=bottom,woodtype=palm": { "model": "forestry:arboriculture/slab/palm_half" }, + "half=top,woodtype=palm": { "model": "forestry:arboriculture/slab/palm_upper" }, + //papaya + "half=bottom,woodtype=papaya": { "model": "forestry:arboriculture/slab/papaya_half" }, + "half=top,woodtype=papaya": { "model": "forestry:arboriculture/slab/papaya_upper" }, + //pine + "half=bottom,woodtype=pine": { "model": "forestry:arboriculture/slab/pine_half" }, + "half=top,woodtype=pine": { "model": "forestry:arboriculture/slab/pine_upper" }, + //plum + "half=bottom,woodtype=plum": { "model": "forestry:arboriculture/slab/plum_half" }, + "half=top,woodtype=plum": { "model": "forestry:arboriculture/slab/plum_upper" }, + //maple + "half=bottom,woodtype=maple": { "model": "forestry:arboriculture/slab/maple_half" }, + "half=top,woodtype=maple": { "model": "forestry:arboriculture/slab/maple_upper" }, + //citrus + "half=bottom,woodtype=citrus": { "model": "forestry:arboriculture/slab/citrus_half" }, + "half=top,woodtype=citrus": { "model": "forestry:arboriculture/slab/citrus_upper" }, + //giganteum + "half=bottom,woodtype=giganteum": { "model": "forestry:arboriculture/slab/giganteum_half" }, + "half=top,woodtype=giganteum": { "model": "forestry:arboriculture/slab/giganteum_upper" }, + //ipe + "half=bottom,woodtype=ipe": { "model": "forestry:arboriculture/slab/ipe_half" }, + "half=top,woodtype=ipe": { "model": "forestry:arboriculture/slab/ipe_upper" }, + //padauk + "half=bottom,woodtype=padauk": { "model": "forestry:arboriculture/slab/padauk_half" }, + "half=top,woodtype=padauk": { "model": "forestry:arboriculture/slab/padauk_upper" }, + //cocobolo + "half=bottom,woodtype=cocobolo": { "model": "forestry:arboriculture/slab/cocobolo_half" }, + "half=top,woodtype=cocobolo": { "model": "forestry:arboriculture/slab/cocobolo_upper" }, + //zebrawood + "half=bottom,woodtype=zebrawood": { "model": "forestry:arboriculture/slab/zebrawood_half" }, + "half=top,woodtype=zebrawood": { "model": "forestry:arboriculture/slab/zebrawood_upper" } + } +} diff --git a/src/main/resources/assets/forestry/blockstates/slabsDouble.json b/src/main/resources/assets/forestry/blockstates/slabsDouble.json new file mode 100644 index 000000000..449b08ad8 --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/slabsDouble.json @@ -0,0 +1,33 @@ +{ + "variants": { + "woodtype=larch": { "model": "forestry:arboriculture/slab/larch_double" }, + "woodtype=teak": { "model": "forestry:arboriculture/slab/teak_double" }, + "woodtype=acacia": { "model": "forestry:arboriculture/slab/acacia_double" }, + "woodtype=lime": { "model": "forestry:arboriculture/slab/lime_double" }, + "woodtype=chestnut": { "model": "forestry:arboriculture/slab/chestnut_double" }, + "woodtype=wenge": { "model": "forestry:arboriculture/slab/wenge_double" }, + "woodtype=baobab": { "model": "forestry:arboriculture/slab/baobab_double" }, + "woodtype=sequoia": { "model": "forestry:arboriculture/slab/sequoia_double" }, + "woodtype=kapok": { "model": "forestry:arboriculture/slab/kapok_double" }, + "woodtype=ebony": { "model": "forestry:arboriculture/slab/ebony_double" }, + "woodtype=mahogany": { "model": "forestry:arboriculture/slab/mahogany_double" }, + "woodtype=balsa": { "model": "forestry:arboriculture/slab/balsa_double" }, + "woodtype=willow": { "model": "forestry:arboriculture/slab/willow_double" }, + "woodtype=walnut": { "model": "forestry:arboriculture/slab/walnut_double" }, + "woodtype=greenheart": { "model": "forestry:arboriculture/slab/greenheart_double" }, + "woodtype=cherry": { "model": "forestry:arboriculture/slab/cherry_double" }, + "woodtype=mahoe": { "model": "forestry:arboriculture/slab/mahoe_double" }, + "woodtype=poplar": { "model": "forestry:arboriculture/slab/poplar_double" }, + "woodtype=palm": { "model": "forestry:arboriculture/slab/palm_double" }, + "woodtype=papaya": { "model": "forestry:arboriculture/slab/papaya_double" }, + "woodtype=pine": { "model": "forestry:arboriculture/slab/pine_double" }, + "woodtype=plum": { "model": "forestry:arboriculture/slab/plum_double" }, + "woodtype=maple": { "model": "forestry:arboriculture/slab/maple_double" }, + "woodtype=citrus": { "model": "forestry:arboriculture/slab/citrus_double" }, + "woodtype=giganteum": { "model": "forestry:arboriculture/slab/giganteum_double" }, + "woodtype=ipe": { "model": "forestry:arboriculture/slab/ipe_double" }, + "woodtype=padauk": { "model": "forestry:arboriculture/slab/padauk_double" }, + "woodtype=cocobolo": { "model": "forestry:arboriculture/slab/cocobolo_double" }, + "woodtype=zebrawood": { "model": "forestry:arboriculture/slab/zebrawood_double" } + } +} diff --git a/src/main/resources/assets/forestry/blockstates/slabsDoubleFireproof.json b/src/main/resources/assets/forestry/blockstates/slabsDoubleFireproof.json new file mode 100644 index 000000000..449b08ad8 --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/slabsDoubleFireproof.json @@ -0,0 +1,33 @@ +{ + "variants": { + "woodtype=larch": { "model": "forestry:arboriculture/slab/larch_double" }, + "woodtype=teak": { "model": "forestry:arboriculture/slab/teak_double" }, + "woodtype=acacia": { "model": "forestry:arboriculture/slab/acacia_double" }, + "woodtype=lime": { "model": "forestry:arboriculture/slab/lime_double" }, + "woodtype=chestnut": { "model": "forestry:arboriculture/slab/chestnut_double" }, + "woodtype=wenge": { "model": "forestry:arboriculture/slab/wenge_double" }, + "woodtype=baobab": { "model": "forestry:arboriculture/slab/baobab_double" }, + "woodtype=sequoia": { "model": "forestry:arboriculture/slab/sequoia_double" }, + "woodtype=kapok": { "model": "forestry:arboriculture/slab/kapok_double" }, + "woodtype=ebony": { "model": "forestry:arboriculture/slab/ebony_double" }, + "woodtype=mahogany": { "model": "forestry:arboriculture/slab/mahogany_double" }, + "woodtype=balsa": { "model": "forestry:arboriculture/slab/balsa_double" }, + "woodtype=willow": { "model": "forestry:arboriculture/slab/willow_double" }, + "woodtype=walnut": { "model": "forestry:arboriculture/slab/walnut_double" }, + "woodtype=greenheart": { "model": "forestry:arboriculture/slab/greenheart_double" }, + "woodtype=cherry": { "model": "forestry:arboriculture/slab/cherry_double" }, + "woodtype=mahoe": { "model": "forestry:arboriculture/slab/mahoe_double" }, + "woodtype=poplar": { "model": "forestry:arboriculture/slab/poplar_double" }, + "woodtype=palm": { "model": "forestry:arboriculture/slab/palm_double" }, + "woodtype=papaya": { "model": "forestry:arboriculture/slab/papaya_double" }, + "woodtype=pine": { "model": "forestry:arboriculture/slab/pine_double" }, + "woodtype=plum": { "model": "forestry:arboriculture/slab/plum_double" }, + "woodtype=maple": { "model": "forestry:arboriculture/slab/maple_double" }, + "woodtype=citrus": { "model": "forestry:arboriculture/slab/citrus_double" }, + "woodtype=giganteum": { "model": "forestry:arboriculture/slab/giganteum_double" }, + "woodtype=ipe": { "model": "forestry:arboriculture/slab/ipe_double" }, + "woodtype=padauk": { "model": "forestry:arboriculture/slab/padauk_double" }, + "woodtype=cocobolo": { "model": "forestry:arboriculture/slab/cocobolo_double" }, + "woodtype=zebrawood": { "model": "forestry:arboriculture/slab/zebrawood_double" } + } +} diff --git a/src/main/resources/assets/forestry/blockstates/slabsFireproof.json b/src/main/resources/assets/forestry/blockstates/slabsFireproof.json new file mode 100644 index 000000000..3e74c1b70 --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/slabsFireproof.json @@ -0,0 +1,91 @@ +{ + "variants": { + //larch + "half=bottom,woodtype=larch": { "model": "forestry:arboriculture/slab/larch_half" }, + "half=top,woodtype=larch": { "model": "forestry:arboriculture/slab/larch_upper" }, + //teak + "half=bottom,woodtype=teak": { "model": "forestry:arboriculture/slab/teak_half" }, + "half=top,woodtype=teak": { "model": "forestry:arboriculture/slab/teak_upper" }, + //acacia + "half=bottom,woodtype=acacia": { "model": "forestry:arboriculture/slab/acacia_half" }, + "half=top,woodtype=acacia": { "model": "forestry:arboriculture/slab/acacia_upper" }, + //lime + "half=bottom,woodtype=lime": { "model": "forestry:arboriculture/slab/lime_half" }, + "half=top,woodtype=lime": { "model": "forestry:arboriculture/slab/lime_upper" }, + //chestnut + "half=bottom,woodtype=chestnut": { "model": "forestry:arboriculture/slab/chestnut_half" }, + "half=top,woodtype=chestnut": { "model": "forestry:arboriculture/slab/chestnut_upper" }, + //wenge + "half=bottom,woodtype=wenge": { "model": "forestry:arboriculture/slab/wenge_half" }, + "half=top,woodtype=wenge": { "model": "forestry:arboriculture/slab/wenge_upper" }, + //baobab + "half=bottom,woodtype=baobab": { "model": "forestry:arboriculture/slab/baobab_half" }, + "half=top,woodtype=baobab": { "model": "forestry:arboriculture/slab/baobab_upper" }, + //sequoia + "half=bottom,woodtype=sequoia": { "model": "forestry:arboriculture/slab/sequoia_half" }, + "half=top,woodtype=sequoia": { "model": "forestry:arboriculture/slab/sequoia_upper" }, + //kapok + "half=bottom,woodtype=kapok": { "model": "forestry:arboriculture/slab/kapok_half" }, + "half=top,woodtype=kapok": { "model": "forestry:arboriculture/slab/kapok_upper" }, + //ebony + "half=bottom,woodtype=ebony": { "model": "forestry:arboriculture/slab/ebony_half" }, + "half=top,woodtype=ebony": { "model": "forestry:arboriculture/slab/ebony_upper" }, + //mahogany + "half=bottom,woodtype=mahogany": { "model": "forestry:arboriculture/slab/mahogany_half" }, + "half=top,woodtype=mahogany": { "model": "forestry:arboriculture/slab/mahogany_upper" }, + //balsa + "half=bottom,woodtype=balsa": { "model": "forestry:arboriculture/slab/balsa_half" }, + "half=top,woodtype=balsa": { "model": "forestry:arboriculture/slab/balsa_upper" }, + //willow + "half=bottom,woodtype=willow": { "model": "forestry:arboriculture/slab/willow_half" }, + "half=top,woodtype=willow": { "model": "forestry:arboriculture/slab/willow_upper" }, + //walnut + "half=bottom,woodtype=walnut": { "model": "forestry:arboriculture/slab/walnut_half" }, + "half=top,woodtype=walnut": { "model": "forestry:arboriculture/slab/walnut_upper" }, + //greenheart + "half=bottom,woodtype=greenheart": { "model": "forestry:arboriculture/slab/greenheart_half" }, + "half=top,woodtype=greenheart": { "model": "forestry:arboriculture/slab/greenheart_upper" }, + //cherry + "half=bottom,woodtype=cherry": { "model": "forestry:arboriculture/slab/cherry_half" }, + "half=top,woodtype=cherry": { "model": "forestry:arboriculture/slab/cherry_upper" }, + //mahoe + "half=bottom,woodtype=mahoe": { "model": "forestry:arboriculture/slab/mahoe_half" }, + "half=top,woodtype=mahoe": { "model": "forestry:arboriculture/slab/mahoe_upper" }, + //poplar + "half=bottom,woodtype=poplar": { "model": "forestry:arboriculture/slab/poplar_half" }, + "half=top,woodtype=poplar": { "model": "forestry:arboriculture/slab/poplar_upper" }, + //palm + "half=bottom,woodtype=palm": { "model": "forestry:arboriculture/slab/palm_half" }, + "half=top,woodtype=palm": { "model": "forestry:arboriculture/slab/palm_upper" }, + //papaya + "half=bottom,woodtype=papaya": { "model": "forestry:arboriculture/slab/papaya_half" }, + "half=top,woodtype=papaya": { "model": "forestry:arboriculture/slab/papaya_upper" }, + //pine + "half=bottom,woodtype=pine": { "model": "forestry:arboriculture/slab/pine_half" }, + "half=top,woodtype=pine": { "model": "forestry:arboriculture/slab/pine_upper" }, + //plum + "half=bottom,woodtype=plum": { "model": "forestry:arboriculture/slab/plum_half" }, + "half=top,woodtype=plum": { "model": "forestry:arboriculture/slab/plum_upper" }, + //maple + "half=bottom,woodtype=maple": { "model": "forestry:arboriculture/slab/maple_half" }, + "half=top,woodtype=maple": { "model": "forestry:arboriculture/slab/maple_upper" }, + //citrus + "half=bottom,woodtype=citrus": { "model": "forestry:arboriculture/slab/citrus_half" }, + "half=top,woodtype=citrus": { "model": "forestry:arboriculture/slab/citrus_upper" }, + //giganteum + "half=bottom,woodtype=giganteum": { "model": "forestry:arboriculture/slab/giganteum_half" }, + "half=top,woodtype=giganteum": { "model": "forestry:arboriculture/slab/giganteum_upper" }, + //ipe + "half=bottom,woodtype=ipe": { "model": "forestry:arboriculture/slab/ipe_half" }, + "half=top,woodtype=ipe": { "model": "forestry:arboriculture/slab/ipe_upper" }, + //padauk + "half=bottom,woodtype=padauk": { "model": "forestry:arboriculture/slab/padauk_half" }, + "half=top,woodtype=padauk": { "model": "forestry:arboriculture/slab/padauk_upper" }, + //cocobolo + "half=bottom,woodtype=cocobolo": { "model": "forestry:arboriculture/slab/cocobolo_half" }, + "half=top,woodtype=cocobolo": { "model": "forestry:arboriculture/slab/cocobolo_upper" }, + //zebrawood + "half=bottom,woodtype=zebrawood": { "model": "forestry:arboriculture/slab/zebrawood_half" }, + "half=top,woodtype=zebrawood": { "model": "forestry:arboriculture/slab/zebrawood_upper" } + } +} diff --git a/src/main/resources/assets/forestry/blockstates/soil.json b/src/main/resources/assets/forestry/blockstates/soil.json new file mode 100644 index 000000000..bc5af6df6 --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/soil.json @@ -0,0 +1,7 @@ +{ + "variants": { + "soil=humus": { "model": "forestry:soil/humus" }, + "soil=bog_earth": { "model": "forestry:soil/bog" }, + "soil=peat": { "model": "forestry:soil/peat" } + } +} diff --git a/src/main/resources/assets/forestry/blockstates/stairs.json b/src/main/resources/assets/forestry/blockstates/stairs.json new file mode 100644 index 000000000..23d4f74b8 --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/stairs.json @@ -0,0 +1,1193 @@ +{ + "variants": { + //larch + "facing=east,half=bottom,shape=straight,woodtype=larch": { "model": "forestry:arboriculture/stairs/larch" }, + "facing=west,half=bottom,shape=straight,woodtype=larch": { "model": "forestry:arboriculture/stairs/larch", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight,woodtype=larch": { "model": "forestry:arboriculture/stairs/larch", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight,woodtype=larch": { "model": "forestry:arboriculture/stairs/larch", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right,woodtype=larch": { "model": "forestry:arboriculture/stairs/larch_outer" }, + "facing=west,half=bottom,shape=outer_right,woodtype=larch": { "model": "forestry:arboriculture/stairs/larch_outer", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right,woodtype=larch": { "model": "forestry:arboriculture/stairs/larch_outer", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right,woodtype=larch": { "model": "forestry:arboriculture/stairs/larch_outer", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left,woodtype=larch": { "model": "forestry:arboriculture/stairs/larch_outer", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left,woodtype=larch": { "model": "forestry:arboriculture/stairs/larch_outer", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left,woodtype=larch": { "model": "forestry:arboriculture/stairs/larch_outer" }, + "facing=north,half=bottom,shape=outer_left,woodtype=larch": { "model": "forestry:arboriculture/stairs/larch_outer", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right,woodtype=larch": { "model": "forestry:arboriculture/stairs/larch_inner" }, + "facing=west,half=bottom,shape=inner_right,woodtype=larch": { "model": "forestry:arboriculture/stairs/larch_inner", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right,woodtype=larch": { "model": "forestry:arboriculture/stairs/larch_inner", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right,woodtype=larch": { "model": "forestry:arboriculture/stairs/larch_inner", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left,woodtype=larch": { "model": "forestry:arboriculture/stairs/larch_inner", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left,woodtype=larch": { "model": "forestry:arboriculture/stairs/larch_inner", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left,woodtype=larch": { "model": "forestry:arboriculture/stairs/larch_inner" }, + "facing=north,half=bottom,shape=inner_left,woodtype=larch": { "model": "forestry:arboriculture/stairs/larch_inner", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight,woodtype=larch": { "model": "forestry:arboriculture/stairs/larch", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight,woodtype=larch": { "model": "forestry:arboriculture/stairs/larch", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight,woodtype=larch": { "model": "forestry:arboriculture/stairs/larch", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight,woodtype=larch": { "model": "forestry:arboriculture/stairs/larch", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right,woodtype=larch": { "model": "forestry:arboriculture/stairs/larch_outer", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right,woodtype=larch": { "model": "forestry:arboriculture/stairs/larch_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right,woodtype=larch": { "model": "forestry:arboriculture/stairs/larch_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right,woodtype=larch": { "model": "forestry:arboriculture/stairs/larch_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left,woodtype=larch": { "model": "forestry:arboriculture/stairs/larch_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left,woodtype=larch": { "model": "forestry:arboriculture/stairs/larch_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left,woodtype=larch": { "model": "forestry:arboriculture/stairs/larch_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left,woodtype=larch": { "model": "forestry:arboriculture/stairs/larch_outer", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right,woodtype=larch": { "model": "forestry:arboriculture/stairs/larch_inner", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right,woodtype=larch": { "model": "forestry:arboriculture/stairs/larch_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right,woodtype=larch": { "model": "forestry:arboriculture/stairs/larch_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right,woodtype=larch": { "model": "forestry:arboriculture/stairs/larch_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left,woodtype=larch": { "model": "forestry:arboriculture/stairs/larch_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left,woodtype=larch": { "model": "forestry:arboriculture/stairs/larch_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left,woodtype=larch": { "model": "forestry:arboriculture/stairs/larch_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left,woodtype=larch": { "model": "forestry:arboriculture/stairs/larch_inner", "x": 180, "uvlock": true }, + //teak + "facing=east,half=bottom,shape=straight,woodtype=teak": { "model": "forestry:arboriculture/stairs/teak" }, + "facing=west,half=bottom,shape=straight,woodtype=teak": { "model": "forestry:arboriculture/stairs/teak", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight,woodtype=teak": { "model": "forestry:arboriculture/stairs/teak", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight,woodtype=teak": { "model": "forestry:arboriculture/stairs/teak", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right,woodtype=teak": { "model": "forestry:arboriculture/stairs/teak_outer" }, + "facing=west,half=bottom,shape=outer_right,woodtype=teak": { "model": "forestry:arboriculture/stairs/teak_outer", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right,woodtype=teak": { "model": "forestry:arboriculture/stairs/teak_outer", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right,woodtype=teak": { "model": "forestry:arboriculture/stairs/teak_outer", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left,woodtype=teak": { "model": "forestry:arboriculture/stairs/teak_outer", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left,woodtype=teak": { "model": "forestry:arboriculture/stairs/teak_outer", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left,woodtype=teak": { "model": "forestry:arboriculture/stairs/teak_outer" }, + "facing=north,half=bottom,shape=outer_left,woodtype=teak": { "model": "forestry:arboriculture/stairs/teak_outer", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right,woodtype=teak": { "model": "forestry:arboriculture/stairs/teak_inner" }, + "facing=west,half=bottom,shape=inner_right,woodtype=teak": { "model": "forestry:arboriculture/stairs/teak_inner", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right,woodtype=teak": { "model": "forestry:arboriculture/stairs/teak_inner", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right,woodtype=teak": { "model": "forestry:arboriculture/stairs/teak_inner", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left,woodtype=teak": { "model": "forestry:arboriculture/stairs/teak_inner", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left,woodtype=teak": { "model": "forestry:arboriculture/stairs/teak_inner", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left,woodtype=teak": { "model": "forestry:arboriculture/stairs/teak_inner" }, + "facing=north,half=bottom,shape=inner_left,woodtype=teak": { "model": "forestry:arboriculture/stairs/teak_inner", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight,woodtype=teak": { "model": "forestry:arboriculture/stairs/teak", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight,woodtype=teak": { "model": "forestry:arboriculture/stairs/teak", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight,woodtype=teak": { "model": "forestry:arboriculture/stairs/teak", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight,woodtype=teak": { "model": "forestry:arboriculture/stairs/teak", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right,woodtype=teak": { "model": "forestry:arboriculture/stairs/teak_outer", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right,woodtype=teak": { "model": "forestry:arboriculture/stairs/teak_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right,woodtype=teak": { "model": "forestry:arboriculture/stairs/teak_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right,woodtype=teak": { "model": "forestry:arboriculture/stairs/teak_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left,woodtype=teak": { "model": "forestry:arboriculture/stairs/teak_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left,woodtype=teak": { "model": "forestry:arboriculture/stairs/teak_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left,woodtype=teak": { "model": "forestry:arboriculture/stairs/teak_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left,woodtype=teak": { "model": "forestry:arboriculture/stairs/teak_outer", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right,woodtype=teak": { "model": "forestry:arboriculture/stairs/teak_inner", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right,woodtype=teak": { "model": "forestry:arboriculture/stairs/teak_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right,woodtype=teak": { "model": "forestry:arboriculture/stairs/teak_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right,woodtype=teak": { "model": "forestry:arboriculture/stairs/teak_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left,woodtype=teak": { "model": "forestry:arboriculture/stairs/teak_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left,woodtype=teak": { "model": "forestry:arboriculture/stairs/teak_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left,woodtype=teak": { "model": "forestry:arboriculture/stairs/teak_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left,woodtype=teak": { "model": "forestry:arboriculture/stairs/teak_inner", "x": 180, "uvlock": true }, + //acacia + "facing=east,half=bottom,shape=straight,woodtype=acacia": { "model": "forestry:arboriculture/stairs/acacia" }, + "facing=west,half=bottom,shape=straight,woodtype=acacia": { "model": "forestry:arboriculture/stairs/acacia", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight,woodtype=acacia": { "model": "forestry:arboriculture/stairs/acacia", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight,woodtype=acacia": { "model": "forestry:arboriculture/stairs/acacia", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right,woodtype=acacia": { "model": "forestry:arboriculture/stairs/acacia_outer" }, + "facing=west,half=bottom,shape=outer_right,woodtype=acacia": { "model": "forestry:arboriculture/stairs/acacia_outer", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right,woodtype=acacia": { "model": "forestry:arboriculture/stairs/acacia_outer", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right,woodtype=acacia": { "model": "forestry:arboriculture/stairs/acacia_outer", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left,woodtype=acacia": { "model": "forestry:arboriculture/stairs/acacia_outer", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left,woodtype=acacia": { "model": "forestry:arboriculture/stairs/acacia_outer", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left,woodtype=acacia": { "model": "forestry:arboriculture/stairs/acacia_outer" }, + "facing=north,half=bottom,shape=outer_left,woodtype=acacia": { "model": "forestry:arboriculture/stairs/acacia_outer", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right,woodtype=acacia": { "model": "forestry:arboriculture/stairs/acacia_inner" }, + "facing=west,half=bottom,shape=inner_right,woodtype=acacia": { "model": "forestry:arboriculture/stairs/acacia_inner", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right,woodtype=acacia": { "model": "forestry:arboriculture/stairs/acacia_inner", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right,woodtype=acacia": { "model": "forestry:arboriculture/stairs/acacia_inner", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left,woodtype=acacia": { "model": "forestry:arboriculture/stairs/acacia_inner", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left,woodtype=acacia": { "model": "forestry:arboriculture/stairs/acacia_inner", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left,woodtype=acacia": { "model": "forestry:arboriculture/stairs/acacia_inner" }, + "facing=north,half=bottom,shape=inner_left,woodtype=acacia": { "model": "forestry:arboriculture/stairs/acacia_inner", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight,woodtype=acacia": { "model": "forestry:arboriculture/stairs/acacia", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight,woodtype=acacia": { "model": "forestry:arboriculture/stairs/acacia", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight,woodtype=acacia": { "model": "forestry:arboriculture/stairs/acacia", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight,woodtype=acacia": { "model": "forestry:arboriculture/stairs/acacia", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right,woodtype=acacia": { "model": "forestry:arboriculture/stairs/acacia_outer", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right,woodtype=acacia": { "model": "forestry:arboriculture/stairs/acacia_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right,woodtype=acacia": { "model": "forestry:arboriculture/stairs/acacia_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right,woodtype=acacia": { "model": "forestry:arboriculture/stairs/acacia_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left,woodtype=acacia": { "model": "forestry:arboriculture/stairs/acacia_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left,woodtype=acacia": { "model": "forestry:arboriculture/stairs/acacia_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left,woodtype=acacia": { "model": "forestry:arboriculture/stairs/acacia_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left,woodtype=acacia": { "model": "forestry:arboriculture/stairs/acacia_outer", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right,woodtype=acacia": { "model": "forestry:arboriculture/stairs/acacia_inner", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right,woodtype=acacia": { "model": "forestry:arboriculture/stairs/acacia_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right,woodtype=acacia": { "model": "forestry:arboriculture/stairs/acacia_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right,woodtype=acacia": { "model": "forestry:arboriculture/stairs/acacia_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left,woodtype=acacia": { "model": "forestry:arboriculture/stairs/acacia_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left,woodtype=acacia": { "model": "forestry:arboriculture/stairs/acacia_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left,woodtype=acacia": { "model": "forestry:arboriculture/stairs/acacia_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left,woodtype=acacia": { "model": "forestry:arboriculture/stairs/acacia_inner", "x": 180, "uvlock": true }, + //lime + "facing=east,half=bottom,shape=straight,woodtype=lime": { "model": "forestry:arboriculture/stairs/lime" }, + "facing=west,half=bottom,shape=straight,woodtype=lime": { "model": "forestry:arboriculture/stairs/lime", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight,woodtype=lime": { "model": "forestry:arboriculture/stairs/lime", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight,woodtype=lime": { "model": "forestry:arboriculture/stairs/lime", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right,woodtype=lime": { "model": "forestry:arboriculture/stairs/lime_outer" }, + "facing=west,half=bottom,shape=outer_right,woodtype=lime": { "model": "forestry:arboriculture/stairs/lime_outer", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right,woodtype=lime": { "model": "forestry:arboriculture/stairs/lime_outer", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right,woodtype=lime": { "model": "forestry:arboriculture/stairs/lime_outer", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left,woodtype=lime": { "model": "forestry:arboriculture/stairs/lime_outer", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left,woodtype=lime": { "model": "forestry:arboriculture/stairs/lime_outer", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left,woodtype=lime": { "model": "forestry:arboriculture/stairs/lime_outer" }, + "facing=north,half=bottom,shape=outer_left,woodtype=lime": { "model": "forestry:arboriculture/stairs/lime_outer", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right,woodtype=lime": { "model": "forestry:arboriculture/stairs/lime_inner" }, + "facing=west,half=bottom,shape=inner_right,woodtype=lime": { "model": "forestry:arboriculture/stairs/lime_inner", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right,woodtype=lime": { "model": "forestry:arboriculture/stairs/lime_inner", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right,woodtype=lime": { "model": "forestry:arboriculture/stairs/lime_inner", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left,woodtype=lime": { "model": "forestry:arboriculture/stairs/lime_inner", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left,woodtype=lime": { "model": "forestry:arboriculture/stairs/lime_inner", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left,woodtype=lime": { "model": "forestry:arboriculture/stairs/lime_inner" }, + "facing=north,half=bottom,shape=inner_left,woodtype=lime": { "model": "forestry:arboriculture/stairs/lime_inner", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight,woodtype=lime": { "model": "forestry:arboriculture/stairs/lime", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight,woodtype=lime": { "model": "forestry:arboriculture/stairs/lime", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight,woodtype=lime": { "model": "forestry:arboriculture/stairs/lime", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight,woodtype=lime": { "model": "forestry:arboriculture/stairs/lime", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right,woodtype=lime": { "model": "forestry:arboriculture/stairs/lime_outer", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right,woodtype=lime": { "model": "forestry:arboriculture/stairs/lime_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right,woodtype=lime": { "model": "forestry:arboriculture/stairs/lime_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right,woodtype=lime": { "model": "forestry:arboriculture/stairs/lime_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left,woodtype=lime": { "model": "forestry:arboriculture/stairs/lime_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left,woodtype=lime": { "model": "forestry:arboriculture/stairs/lime_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left,woodtype=lime": { "model": "forestry:arboriculture/stairs/lime_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left,woodtype=lime": { "model": "forestry:arboriculture/stairs/lime_outer", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right,woodtype=lime": { "model": "forestry:arboriculture/stairs/lime_inner", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right,woodtype=lime": { "model": "forestry:arboriculture/stairs/lime_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right,woodtype=lime": { "model": "forestry:arboriculture/stairs/lime_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right,woodtype=lime": { "model": "forestry:arboriculture/stairs/lime_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left,woodtype=lime": { "model": "forestry:arboriculture/stairs/lime_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left,woodtype=lime": { "model": "forestry:arboriculture/stairs/lime_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left,woodtype=lime": { "model": "forestry:arboriculture/stairs/lime_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left,woodtype=lime": { "model": "forestry:arboriculture/stairs/lime_inner", "x": 180, "uvlock": true }, + //chestnut + "facing=east,half=bottom,shape=straight,woodtype=chestnut": { "model": "forestry:arboriculture/stairs/chestnut" }, + "facing=west,half=bottom,shape=straight,woodtype=chestnut": { "model": "forestry:arboriculture/stairs/chestnut", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight,woodtype=chestnut": { "model": "forestry:arboriculture/stairs/chestnut", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight,woodtype=chestnut": { "model": "forestry:arboriculture/stairs/chestnut", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right,woodtype=chestnut": { "model": "forestry:arboriculture/stairs/chestnut_outer" }, + "facing=west,half=bottom,shape=outer_right,woodtype=chestnut": { "model": "forestry:arboriculture/stairs/chestnut_outer", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right,woodtype=chestnut": { "model": "forestry:arboriculture/stairs/chestnut_outer", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right,woodtype=chestnut": { "model": "forestry:arboriculture/stairs/chestnut_outer", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left,woodtype=chestnut": { "model": "forestry:arboriculture/stairs/chestnut_outer", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left,woodtype=chestnut": { "model": "forestry:arboriculture/stairs/chestnut_outer", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left,woodtype=chestnut": { "model": "forestry:arboriculture/stairs/chestnut_outer" }, + "facing=north,half=bottom,shape=outer_left,woodtype=chestnut": { "model": "forestry:arboriculture/stairs/chestnut_outer", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right,woodtype=chestnut": { "model": "forestry:arboriculture/stairs/chestnut_inner" }, + "facing=west,half=bottom,shape=inner_right,woodtype=chestnut": { "model": "forestry:arboriculture/stairs/chestnut_inner", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right,woodtype=chestnut": { "model": "forestry:arboriculture/stairs/chestnut_inner", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right,woodtype=chestnut": { "model": "forestry:arboriculture/stairs/chestnut_inner", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left,woodtype=chestnut": { "model": "forestry:arboriculture/stairs/chestnut_inner", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left,woodtype=chestnut": { "model": "forestry:arboriculture/stairs/chestnut_inner", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left,woodtype=chestnut": { "model": "forestry:arboriculture/stairs/chestnut_inner" }, + "facing=north,half=bottom,shape=inner_left,woodtype=chestnut": { "model": "forestry:arboriculture/stairs/chestnut_inner", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight,woodtype=chestnut": { "model": "forestry:arboriculture/stairs/chestnut", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight,woodtype=chestnut": { "model": "forestry:arboriculture/stairs/chestnut", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight,woodtype=chestnut": { "model": "forestry:arboriculture/stairs/chestnut", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight,woodtype=chestnut": { "model": "forestry:arboriculture/stairs/chestnut", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right,woodtype=chestnut": { "model": "forestry:arboriculture/stairs/chestnut_outer", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right,woodtype=chestnut": { "model": "forestry:arboriculture/stairs/chestnut_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right,woodtype=chestnut": { "model": "forestry:arboriculture/stairs/chestnut_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right,woodtype=chestnut": { "model": "forestry:arboriculture/stairs/chestnut_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left,woodtype=chestnut": { "model": "forestry:arboriculture/stairs/chestnut_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left,woodtype=chestnut": { "model": "forestry:arboriculture/stairs/chestnut_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left,woodtype=chestnut": { "model": "forestry:arboriculture/stairs/chestnut_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left,woodtype=chestnut": { "model": "forestry:arboriculture/stairs/chestnut_outer", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right,woodtype=chestnut": { "model": "forestry:arboriculture/stairs/chestnut_inner", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right,woodtype=chestnut": { "model": "forestry:arboriculture/stairs/chestnut_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right,woodtype=chestnut": { "model": "forestry:arboriculture/stairs/chestnut_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right,woodtype=chestnut": { "model": "forestry:arboriculture/stairs/chestnut_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left,woodtype=chestnut": { "model": "forestry:arboriculture/stairs/chestnut_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left,woodtype=chestnut": { "model": "forestry:arboriculture/stairs/chestnut_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left,woodtype=chestnut": { "model": "forestry:arboriculture/stairs/chestnut_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left,woodtype=chestnut": { "model": "forestry:arboriculture/stairs/chestnut_inner", "x": 180, "uvlock": true }, + //wenge + "facing=east,half=bottom,shape=straight,woodtype=wenge": { "model": "forestry:arboriculture/stairs/wenge" }, + "facing=west,half=bottom,shape=straight,woodtype=wenge": { "model": "forestry:arboriculture/stairs/wenge", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight,woodtype=wenge": { "model": "forestry:arboriculture/stairs/wenge", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight,woodtype=wenge": { "model": "forestry:arboriculture/stairs/wenge", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right,woodtype=wenge": { "model": "forestry:arboriculture/stairs/wenge_outer" }, + "facing=west,half=bottom,shape=outer_right,woodtype=wenge": { "model": "forestry:arboriculture/stairs/wenge_outer", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right,woodtype=wenge": { "model": "forestry:arboriculture/stairs/wenge_outer", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right,woodtype=wenge": { "model": "forestry:arboriculture/stairs/wenge_outer", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left,woodtype=wenge": { "model": "forestry:arboriculture/stairs/wenge_outer", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left,woodtype=wenge": { "model": "forestry:arboriculture/stairs/wenge_outer", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left,woodtype=wenge": { "model": "forestry:arboriculture/stairs/wenge_outer" }, + "facing=north,half=bottom,shape=outer_left,woodtype=wenge": { "model": "forestry:arboriculture/stairs/wenge_outer", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right,woodtype=wenge": { "model": "forestry:arboriculture/stairs/wenge_inner" }, + "facing=west,half=bottom,shape=inner_right,woodtype=wenge": { "model": "forestry:arboriculture/stairs/wenge_inner", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right,woodtype=wenge": { "model": "forestry:arboriculture/stairs/wenge_inner", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right,woodtype=wenge": { "model": "forestry:arboriculture/stairs/wenge_inner", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left,woodtype=wenge": { "model": "forestry:arboriculture/stairs/wenge_inner", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left,woodtype=wenge": { "model": "forestry:arboriculture/stairs/wenge_inner", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left,woodtype=wenge": { "model": "forestry:arboriculture/stairs/wenge_inner" }, + "facing=north,half=bottom,shape=inner_left,woodtype=wenge": { "model": "forestry:arboriculture/stairs/wenge_inner", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight,woodtype=wenge": { "model": "forestry:arboriculture/stairs/wenge", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight,woodtype=wenge": { "model": "forestry:arboriculture/stairs/wenge", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight,woodtype=wenge": { "model": "forestry:arboriculture/stairs/wenge", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight,woodtype=wenge": { "model": "forestry:arboriculture/stairs/wenge", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right,woodtype=wenge": { "model": "forestry:arboriculture/stairs/wenge_outer", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right,woodtype=wenge": { "model": "forestry:arboriculture/stairs/wenge_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right,woodtype=wenge": { "model": "forestry:arboriculture/stairs/wenge_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right,woodtype=wenge": { "model": "forestry:arboriculture/stairs/wenge_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left,woodtype=wenge": { "model": "forestry:arboriculture/stairs/wenge_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left,woodtype=wenge": { "model": "forestry:arboriculture/stairs/wenge_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left,woodtype=wenge": { "model": "forestry:arboriculture/stairs/wenge_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left,woodtype=wenge": { "model": "forestry:arboriculture/stairs/wenge_outer", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right,woodtype=wenge": { "model": "forestry:arboriculture/stairs/wenge_inner", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right,woodtype=wenge": { "model": "forestry:arboriculture/stairs/wenge_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right,woodtype=wenge": { "model": "forestry:arboriculture/stairs/wenge_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right,woodtype=wenge": { "model": "forestry:arboriculture/stairs/wenge_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left,woodtype=wenge": { "model": "forestry:arboriculture/stairs/wenge_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left,woodtype=wenge": { "model": "forestry:arboriculture/stairs/wenge_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left,woodtype=wenge": { "model": "forestry:arboriculture/stairs/wenge_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left,woodtype=wenge": { "model": "forestry:arboriculture/stairs/wenge_inner", "x": 180, "uvlock": true }, + //baobab + "facing=east,half=bottom,shape=straight,woodtype=baobab": { "model": "forestry:arboriculture/stairs/baobab" }, + "facing=west,half=bottom,shape=straight,woodtype=baobab": { "model": "forestry:arboriculture/stairs/baobab", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight,woodtype=baobab": { "model": "forestry:arboriculture/stairs/baobab", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight,woodtype=baobab": { "model": "forestry:arboriculture/stairs/baobab", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right,woodtype=baobab": { "model": "forestry:arboriculture/stairs/baobab_outer" }, + "facing=west,half=bottom,shape=outer_right,woodtype=baobab": { "model": "forestry:arboriculture/stairs/baobab_outer", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right,woodtype=baobab": { "model": "forestry:arboriculture/stairs/baobab_outer", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right,woodtype=baobab": { "model": "forestry:arboriculture/stairs/baobab_outer", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left,woodtype=baobab": { "model": "forestry:arboriculture/stairs/baobab_outer", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left,woodtype=baobab": { "model": "forestry:arboriculture/stairs/baobab_outer", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left,woodtype=baobab": { "model": "forestry:arboriculture/stairs/baobab_outer" }, + "facing=north,half=bottom,shape=outer_left,woodtype=baobab": { "model": "forestry:arboriculture/stairs/baobab_outer", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right,woodtype=baobab": { "model": "forestry:arboriculture/stairs/baobab_inner" }, + "facing=west,half=bottom,shape=inner_right,woodtype=baobab": { "model": "forestry:arboriculture/stairs/baobab_inner", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right,woodtype=baobab": { "model": "forestry:arboriculture/stairs/baobab_inner", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right,woodtype=baobab": { "model": "forestry:arboriculture/stairs/baobab_inner", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left,woodtype=baobab": { "model": "forestry:arboriculture/stairs/baobab_inner", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left,woodtype=baobab": { "model": "forestry:arboriculture/stairs/baobab_inner", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left,woodtype=baobab": { "model": "forestry:arboriculture/stairs/baobab_inner" }, + "facing=north,half=bottom,shape=inner_left,woodtype=baobab": { "model": "forestry:arboriculture/stairs/baobab_inner", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight,woodtype=baobab": { "model": "forestry:arboriculture/stairs/baobab", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight,woodtype=baobab": { "model": "forestry:arboriculture/stairs/baobab", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight,woodtype=baobab": { "model": "forestry:arboriculture/stairs/baobab", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight,woodtype=baobab": { "model": "forestry:arboriculture/stairs/baobab", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right,woodtype=baobab": { "model": "forestry:arboriculture/stairs/baobab_outer", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right,woodtype=baobab": { "model": "forestry:arboriculture/stairs/baobab_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right,woodtype=baobab": { "model": "forestry:arboriculture/stairs/baobab_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right,woodtype=baobab": { "model": "forestry:arboriculture/stairs/baobab_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left,woodtype=baobab": { "model": "forestry:arboriculture/stairs/baobab_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left,woodtype=baobab": { "model": "forestry:arboriculture/stairs/baobab_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left,woodtype=baobab": { "model": "forestry:arboriculture/stairs/baobab_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left,woodtype=baobab": { "model": "forestry:arboriculture/stairs/baobab_outer", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right,woodtype=baobab": { "model": "forestry:arboriculture/stairs/baobab_inner", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right,woodtype=baobab": { "model": "forestry:arboriculture/stairs/baobab_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right,woodtype=baobab": { "model": "forestry:arboriculture/stairs/baobab_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right,woodtype=baobab": { "model": "forestry:arboriculture/stairs/baobab_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left,woodtype=baobab": { "model": "forestry:arboriculture/stairs/baobab_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left,woodtype=baobab": { "model": "forestry:arboriculture/stairs/baobab_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left,woodtype=baobab": { "model": "forestry:arboriculture/stairs/baobab_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left,woodtype=baobab": { "model": "forestry:arboriculture/stairs/baobab_inner", "x": 180, "uvlock": true }, + //sequoia + "facing=east,half=bottom,shape=straight,woodtype=sequoia": { "model": "forestry:arboriculture/stairs/sequoia" }, + "facing=west,half=bottom,shape=straight,woodtype=sequoia": { "model": "forestry:arboriculture/stairs/sequoia", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight,woodtype=sequoia": { "model": "forestry:arboriculture/stairs/sequoia", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight,woodtype=sequoia": { "model": "forestry:arboriculture/stairs/sequoia", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right,woodtype=sequoia": { "model": "forestry:arboriculture/stairs/sequoia_outer" }, + "facing=west,half=bottom,shape=outer_right,woodtype=sequoia": { "model": "forestry:arboriculture/stairs/sequoia_outer", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right,woodtype=sequoia": { "model": "forestry:arboriculture/stairs/sequoia_outer", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right,woodtype=sequoia": { "model": "forestry:arboriculture/stairs/sequoia_outer", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left,woodtype=sequoia": { "model": "forestry:arboriculture/stairs/sequoia_outer", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left,woodtype=sequoia": { "model": "forestry:arboriculture/stairs/sequoia_outer", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left,woodtype=sequoia": { "model": "forestry:arboriculture/stairs/sequoia_outer" }, + "facing=north,half=bottom,shape=outer_left,woodtype=sequoia": { "model": "forestry:arboriculture/stairs/sequoia_outer", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right,woodtype=sequoia": { "model": "forestry:arboriculture/stairs/sequoia_inner" }, + "facing=west,half=bottom,shape=inner_right,woodtype=sequoia": { "model": "forestry:arboriculture/stairs/sequoia_inner", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right,woodtype=sequoia": { "model": "forestry:arboriculture/stairs/sequoia_inner", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right,woodtype=sequoia": { "model": "forestry:arboriculture/stairs/sequoia_inner", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left,woodtype=sequoia": { "model": "forestry:arboriculture/stairs/sequoia_inner", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left,woodtype=sequoia": { "model": "forestry:arboriculture/stairs/sequoia_inner", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left,woodtype=sequoia": { "model": "forestry:arboriculture/stairs/sequoia_inner" }, + "facing=north,half=bottom,shape=inner_left,woodtype=sequoia": { "model": "forestry:arboriculture/stairs/sequoia_inner", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight,woodtype=sequoia": { "model": "forestry:arboriculture/stairs/sequoia", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight,woodtype=sequoia": { "model": "forestry:arboriculture/stairs/sequoia", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight,woodtype=sequoia": { "model": "forestry:arboriculture/stairs/sequoia", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight,woodtype=sequoia": { "model": "forestry:arboriculture/stairs/sequoia", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right,woodtype=sequoia": { "model": "forestry:arboriculture/stairs/sequoia_outer", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right,woodtype=sequoia": { "model": "forestry:arboriculture/stairs/sequoia_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right,woodtype=sequoia": { "model": "forestry:arboriculture/stairs/sequoia_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right,woodtype=sequoia": { "model": "forestry:arboriculture/stairs/sequoia_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left,woodtype=sequoia": { "model": "forestry:arboriculture/stairs/sequoia_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left,woodtype=sequoia": { "model": "forestry:arboriculture/stairs/sequoia_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left,woodtype=sequoia": { "model": "forestry:arboriculture/stairs/sequoia_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left,woodtype=sequoia": { "model": "forestry:arboriculture/stairs/sequoia_outer", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right,woodtype=sequoia": { "model": "forestry:arboriculture/stairs/sequoia_inner", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right,woodtype=sequoia": { "model": "forestry:arboriculture/stairs/sequoia_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right,woodtype=sequoia": { "model": "forestry:arboriculture/stairs/sequoia_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right,woodtype=sequoia": { "model": "forestry:arboriculture/stairs/sequoia_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left,woodtype=sequoia": { "model": "forestry:arboriculture/stairs/sequoia_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left,woodtype=sequoia": { "model": "forestry:arboriculture/stairs/sequoia_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left,woodtype=sequoia": { "model": "forestry:arboriculture/stairs/sequoia_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left,woodtype=sequoia": { "model": "forestry:arboriculture/stairs/sequoia_inner", "x": 180, "uvlock": true }, + //kapok + "facing=east,half=bottom,shape=straight,woodtype=kapok": { "model": "forestry:arboriculture/stairs/kapok" }, + "facing=west,half=bottom,shape=straight,woodtype=kapok": { "model": "forestry:arboriculture/stairs/kapok", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight,woodtype=kapok": { "model": "forestry:arboriculture/stairs/kapok", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight,woodtype=kapok": { "model": "forestry:arboriculture/stairs/kapok", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right,woodtype=kapok": { "model": "forestry:arboriculture/stairs/kapok_outer" }, + "facing=west,half=bottom,shape=outer_right,woodtype=kapok": { "model": "forestry:arboriculture/stairs/kapok_outer", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right,woodtype=kapok": { "model": "forestry:arboriculture/stairs/kapok_outer", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right,woodtype=kapok": { "model": "forestry:arboriculture/stairs/kapok_outer", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left,woodtype=kapok": { "model": "forestry:arboriculture/stairs/kapok_outer", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left,woodtype=kapok": { "model": "forestry:arboriculture/stairs/kapok_outer", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left,woodtype=kapok": { "model": "forestry:arboriculture/stairs/kapok_outer" }, + "facing=north,half=bottom,shape=outer_left,woodtype=kapok": { "model": "forestry:arboriculture/stairs/kapok_outer", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right,woodtype=kapok": { "model": "forestry:arboriculture/stairs/kapok_inner" }, + "facing=west,half=bottom,shape=inner_right,woodtype=kapok": { "model": "forestry:arboriculture/stairs/kapok_inner", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right,woodtype=kapok": { "model": "forestry:arboriculture/stairs/kapok_inner", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right,woodtype=kapok": { "model": "forestry:arboriculture/stairs/kapok_inner", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left,woodtype=kapok": { "model": "forestry:arboriculture/stairs/kapok_inner", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left,woodtype=kapok": { "model": "forestry:arboriculture/stairs/kapok_inner", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left,woodtype=kapok": { "model": "forestry:arboriculture/stairs/kapok_inner" }, + "facing=north,half=bottom,shape=inner_left,woodtype=kapok": { "model": "forestry:arboriculture/stairs/kapok_inner", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight,woodtype=kapok": { "model": "forestry:arboriculture/stairs/kapok", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight,woodtype=kapok": { "model": "forestry:arboriculture/stairs/kapok", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight,woodtype=kapok": { "model": "forestry:arboriculture/stairs/kapok", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight,woodtype=kapok": { "model": "forestry:arboriculture/stairs/kapok", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right,woodtype=kapok": { "model": "forestry:arboriculture/stairs/kapok_outer", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right,woodtype=kapok": { "model": "forestry:arboriculture/stairs/kapok_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right,woodtype=kapok": { "model": "forestry:arboriculture/stairs/kapok_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right,woodtype=kapok": { "model": "forestry:arboriculture/stairs/kapok_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left,woodtype=kapok": { "model": "forestry:arboriculture/stairs/kapok_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left,woodtype=kapok": { "model": "forestry:arboriculture/stairs/kapok_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left,woodtype=kapok": { "model": "forestry:arboriculture/stairs/kapok_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left,woodtype=kapok": { "model": "forestry:arboriculture/stairs/kapok_outer", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right,woodtype=kapok": { "model": "forestry:arboriculture/stairs/kapok_inner", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right,woodtype=kapok": { "model": "forestry:arboriculture/stairs/kapok_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right,woodtype=kapok": { "model": "forestry:arboriculture/stairs/kapok_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right,woodtype=kapok": { "model": "forestry:arboriculture/stairs/kapok_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left,woodtype=kapok": { "model": "forestry:arboriculture/stairs/kapok_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left,woodtype=kapok": { "model": "forestry:arboriculture/stairs/kapok_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left,woodtype=kapok": { "model": "forestry:arboriculture/stairs/kapok_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left,woodtype=kapok": { "model": "forestry:arboriculture/stairs/kapok_inner", "x": 180, "uvlock": true }, + //ebony + "facing=east,half=bottom,shape=straight,woodtype=ebony": { "model": "forestry:arboriculture/stairs/ebony" }, + "facing=west,half=bottom,shape=straight,woodtype=ebony": { "model": "forestry:arboriculture/stairs/ebony", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight,woodtype=ebony": { "model": "forestry:arboriculture/stairs/ebony", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight,woodtype=ebony": { "model": "forestry:arboriculture/stairs/ebony", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right,woodtype=ebony": { "model": "forestry:arboriculture/stairs/ebony_outer" }, + "facing=west,half=bottom,shape=outer_right,woodtype=ebony": { "model": "forestry:arboriculture/stairs/ebony_outer", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right,woodtype=ebony": { "model": "forestry:arboriculture/stairs/ebony_outer", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right,woodtype=ebony": { "model": "forestry:arboriculture/stairs/ebony_outer", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left,woodtype=ebony": { "model": "forestry:arboriculture/stairs/ebony_outer", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left,woodtype=ebony": { "model": "forestry:arboriculture/stairs/ebony_outer", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left,woodtype=ebony": { "model": "forestry:arboriculture/stairs/ebony_outer" }, + "facing=north,half=bottom,shape=outer_left,woodtype=ebony": { "model": "forestry:arboriculture/stairs/ebony_outer", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right,woodtype=ebony": { "model": "forestry:arboriculture/stairs/ebony_inner" }, + "facing=west,half=bottom,shape=inner_right,woodtype=ebony": { "model": "forestry:arboriculture/stairs/ebony_inner", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right,woodtype=ebony": { "model": "forestry:arboriculture/stairs/ebony_inner", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right,woodtype=ebony": { "model": "forestry:arboriculture/stairs/ebony_inner", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left,woodtype=ebony": { "model": "forestry:arboriculture/stairs/ebony_inner", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left,woodtype=ebony": { "model": "forestry:arboriculture/stairs/ebony_inner", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left,woodtype=ebony": { "model": "forestry:arboriculture/stairs/ebony_inner" }, + "facing=north,half=bottom,shape=inner_left,woodtype=ebony": { "model": "forestry:arboriculture/stairs/ebony_inner", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight,woodtype=ebony": { "model": "forestry:arboriculture/stairs/ebony", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight,woodtype=ebony": { "model": "forestry:arboriculture/stairs/ebony", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight,woodtype=ebony": { "model": "forestry:arboriculture/stairs/ebony", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight,woodtype=ebony": { "model": "forestry:arboriculture/stairs/ebony", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right,woodtype=ebony": { "model": "forestry:arboriculture/stairs/ebony_outer", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right,woodtype=ebony": { "model": "forestry:arboriculture/stairs/ebony_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right,woodtype=ebony": { "model": "forestry:arboriculture/stairs/ebony_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right,woodtype=ebony": { "model": "forestry:arboriculture/stairs/ebony_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left,woodtype=ebony": { "model": "forestry:arboriculture/stairs/ebony_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left,woodtype=ebony": { "model": "forestry:arboriculture/stairs/ebony_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left,woodtype=ebony": { "model": "forestry:arboriculture/stairs/ebony_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left,woodtype=ebony": { "model": "forestry:arboriculture/stairs/ebony_outer", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right,woodtype=ebony": { "model": "forestry:arboriculture/stairs/ebony_inner", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right,woodtype=ebony": { "model": "forestry:arboriculture/stairs/ebony_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right,woodtype=ebony": { "model": "forestry:arboriculture/stairs/ebony_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right,woodtype=ebony": { "model": "forestry:arboriculture/stairs/ebony_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left,woodtype=ebony": { "model": "forestry:arboriculture/stairs/ebony_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left,woodtype=ebony": { "model": "forestry:arboriculture/stairs/ebony_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left,woodtype=ebony": { "model": "forestry:arboriculture/stairs/ebony_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left,woodtype=ebony": { "model": "forestry:arboriculture/stairs/ebony_inner", "x": 180, "uvlock": true }, + //mahogany + "facing=east,half=bottom,shape=straight,woodtype=mahogany": { "model": "forestry:arboriculture/stairs/mahogany" }, + "facing=west,half=bottom,shape=straight,woodtype=mahogany": { "model": "forestry:arboriculture/stairs/mahogany", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight,woodtype=mahogany": { "model": "forestry:arboriculture/stairs/mahogany", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight,woodtype=mahogany": { "model": "forestry:arboriculture/stairs/mahogany", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right,woodtype=mahogany": { "model": "forestry:arboriculture/stairs/mahogany_outer" }, + "facing=west,half=bottom,shape=outer_right,woodtype=mahogany": { "model": "forestry:arboriculture/stairs/mahogany_outer", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right,woodtype=mahogany": { "model": "forestry:arboriculture/stairs/mahogany_outer", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right,woodtype=mahogany": { "model": "forestry:arboriculture/stairs/mahogany_outer", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left,woodtype=mahogany": { "model": "forestry:arboriculture/stairs/mahogany_outer", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left,woodtype=mahogany": { "model": "forestry:arboriculture/stairs/mahogany_outer", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left,woodtype=mahogany": { "model": "forestry:arboriculture/stairs/mahogany_outer" }, + "facing=north,half=bottom,shape=outer_left,woodtype=mahogany": { "model": "forestry:arboriculture/stairs/mahogany_outer", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right,woodtype=mahogany": { "model": "forestry:arboriculture/stairs/mahogany_inner" }, + "facing=west,half=bottom,shape=inner_right,woodtype=mahogany": { "model": "forestry:arboriculture/stairs/mahogany_inner", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right,woodtype=mahogany": { "model": "forestry:arboriculture/stairs/mahogany_inner", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right,woodtype=mahogany": { "model": "forestry:arboriculture/stairs/mahogany_inner", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left,woodtype=mahogany": { "model": "forestry:arboriculture/stairs/mahogany_inner", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left,woodtype=mahogany": { "model": "forestry:arboriculture/stairs/mahogany_inner", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left,woodtype=mahogany": { "model": "forestry:arboriculture/stairs/mahogany_inner" }, + "facing=north,half=bottom,shape=inner_left,woodtype=mahogany": { "model": "forestry:arboriculture/stairs/mahogany_inner", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight,woodtype=mahogany": { "model": "forestry:arboriculture/stairs/mahogany", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight,woodtype=mahogany": { "model": "forestry:arboriculture/stairs/mahogany", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight,woodtype=mahogany": { "model": "forestry:arboriculture/stairs/mahogany", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight,woodtype=mahogany": { "model": "forestry:arboriculture/stairs/mahogany", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right,woodtype=mahogany": { "model": "forestry:arboriculture/stairs/mahogany_outer", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right,woodtype=mahogany": { "model": "forestry:arboriculture/stairs/mahogany_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right,woodtype=mahogany": { "model": "forestry:arboriculture/stairs/mahogany_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right,woodtype=mahogany": { "model": "forestry:arboriculture/stairs/mahogany_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left,woodtype=mahogany": { "model": "forestry:arboriculture/stairs/mahogany_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left,woodtype=mahogany": { "model": "forestry:arboriculture/stairs/mahogany_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left,woodtype=mahogany": { "model": "forestry:arboriculture/stairs/mahogany_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left,woodtype=mahogany": { "model": "forestry:arboriculture/stairs/mahogany_outer", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right,woodtype=mahogany": { "model": "forestry:arboriculture/stairs/mahogany_inner", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right,woodtype=mahogany": { "model": "forestry:arboriculture/stairs/mahogany_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right,woodtype=mahogany": { "model": "forestry:arboriculture/stairs/mahogany_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right,woodtype=mahogany": { "model": "forestry:arboriculture/stairs/mahogany_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left,woodtype=mahogany": { "model": "forestry:arboriculture/stairs/mahogany_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left,woodtype=mahogany": { "model": "forestry:arboriculture/stairs/mahogany_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left,woodtype=mahogany": { "model": "forestry:arboriculture/stairs/mahogany_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left,woodtype=mahogany": { "model": "forestry:arboriculture/stairs/mahogany_inner", "x": 180, "uvlock": true }, + //balsa + "facing=east,half=bottom,shape=straight,woodtype=balsa": { "model": "forestry:arboriculture/stairs/balsa" }, + "facing=west,half=bottom,shape=straight,woodtype=balsa": { "model": "forestry:arboriculture/stairs/balsa", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight,woodtype=balsa": { "model": "forestry:arboriculture/stairs/balsa", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight,woodtype=balsa": { "model": "forestry:arboriculture/stairs/balsa", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right,woodtype=balsa": { "model": "forestry:arboriculture/stairs/balsa_outer" }, + "facing=west,half=bottom,shape=outer_right,woodtype=balsa": { "model": "forestry:arboriculture/stairs/balsa_outer", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right,woodtype=balsa": { "model": "forestry:arboriculture/stairs/balsa_outer", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right,woodtype=balsa": { "model": "forestry:arboriculture/stairs/balsa_outer", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left,woodtype=balsa": { "model": "forestry:arboriculture/stairs/balsa_outer", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left,woodtype=balsa": { "model": "forestry:arboriculture/stairs/balsa_outer", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left,woodtype=balsa": { "model": "forestry:arboriculture/stairs/balsa_outer" }, + "facing=north,half=bottom,shape=outer_left,woodtype=balsa": { "model": "forestry:arboriculture/stairs/balsa_outer", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right,woodtype=balsa": { "model": "forestry:arboriculture/stairs/balsa_inner" }, + "facing=west,half=bottom,shape=inner_right,woodtype=balsa": { "model": "forestry:arboriculture/stairs/balsa_inner", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right,woodtype=balsa": { "model": "forestry:arboriculture/stairs/balsa_inner", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right,woodtype=balsa": { "model": "forestry:arboriculture/stairs/balsa_inner", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left,woodtype=balsa": { "model": "forestry:arboriculture/stairs/balsa_inner", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left,woodtype=balsa": { "model": "forestry:arboriculture/stairs/balsa_inner", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left,woodtype=balsa": { "model": "forestry:arboriculture/stairs/balsa_inner" }, + "facing=north,half=bottom,shape=inner_left,woodtype=balsa": { "model": "forestry:arboriculture/stairs/balsa_inner", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight,woodtype=balsa": { "model": "forestry:arboriculture/stairs/balsa", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight,woodtype=balsa": { "model": "forestry:arboriculture/stairs/balsa", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight,woodtype=balsa": { "model": "forestry:arboriculture/stairs/balsa", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight,woodtype=balsa": { "model": "forestry:arboriculture/stairs/balsa", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right,woodtype=balsa": { "model": "forestry:arboriculture/stairs/balsa_outer", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right,woodtype=balsa": { "model": "forestry:arboriculture/stairs/balsa_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right,woodtype=balsa": { "model": "forestry:arboriculture/stairs/balsa_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right,woodtype=balsa": { "model": "forestry:arboriculture/stairs/balsa_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left,woodtype=balsa": { "model": "forestry:arboriculture/stairs/balsa_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left,woodtype=balsa": { "model": "forestry:arboriculture/stairs/balsa_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left,woodtype=balsa": { "model": "forestry:arboriculture/stairs/balsa_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left,woodtype=balsa": { "model": "forestry:arboriculture/stairs/balsa_outer", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right,woodtype=balsa": { "model": "forestry:arboriculture/stairs/balsa_inner", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right,woodtype=balsa": { "model": "forestry:arboriculture/stairs/balsa_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right,woodtype=balsa": { "model": "forestry:arboriculture/stairs/balsa_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right,woodtype=balsa": { "model": "forestry:arboriculture/stairs/balsa_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left,woodtype=balsa": { "model": "forestry:arboriculture/stairs/balsa_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left,woodtype=balsa": { "model": "forestry:arboriculture/stairs/balsa_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left,woodtype=balsa": { "model": "forestry:arboriculture/stairs/balsa_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left,woodtype=balsa": { "model": "forestry:arboriculture/stairs/balsa_inner", "x": 180, "uvlock": true }, + //willow + "facing=east,half=bottom,shape=straight,woodtype=willow": { "model": "forestry:arboriculture/stairs/willow" }, + "facing=west,half=bottom,shape=straight,woodtype=willow": { "model": "forestry:arboriculture/stairs/willow", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight,woodtype=willow": { "model": "forestry:arboriculture/stairs/willow", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight,woodtype=willow": { "model": "forestry:arboriculture/stairs/willow", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right,woodtype=willow": { "model": "forestry:arboriculture/stairs/willow_outer" }, + "facing=west,half=bottom,shape=outer_right,woodtype=willow": { "model": "forestry:arboriculture/stairs/willow_outer", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right,woodtype=willow": { "model": "forestry:arboriculture/stairs/willow_outer", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right,woodtype=willow": { "model": "forestry:arboriculture/stairs/willow_outer", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left,woodtype=willow": { "model": "forestry:arboriculture/stairs/willow_outer", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left,woodtype=willow": { "model": "forestry:arboriculture/stairs/willow_outer", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left,woodtype=willow": { "model": "forestry:arboriculture/stairs/willow_outer" }, + "facing=north,half=bottom,shape=outer_left,woodtype=willow": { "model": "forestry:arboriculture/stairs/willow_outer", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right,woodtype=willow": { "model": "forestry:arboriculture/stairs/willow_inner" }, + "facing=west,half=bottom,shape=inner_right,woodtype=willow": { "model": "forestry:arboriculture/stairs/willow_inner", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right,woodtype=willow": { "model": "forestry:arboriculture/stairs/willow_inner", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right,woodtype=willow": { "model": "forestry:arboriculture/stairs/willow_inner", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left,woodtype=willow": { "model": "forestry:arboriculture/stairs/willow_inner", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left,woodtype=willow": { "model": "forestry:arboriculture/stairs/willow_inner", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left,woodtype=willow": { "model": "forestry:arboriculture/stairs/willow_inner" }, + "facing=north,half=bottom,shape=inner_left,woodtype=willow": { "model": "forestry:arboriculture/stairs/willow_inner", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight,woodtype=willow": { "model": "forestry:arboriculture/stairs/willow", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight,woodtype=willow": { "model": "forestry:arboriculture/stairs/willow", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight,woodtype=willow": { "model": "forestry:arboriculture/stairs/willow", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight,woodtype=willow": { "model": "forestry:arboriculture/stairs/willow", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right,woodtype=willow": { "model": "forestry:arboriculture/stairs/willow_outer", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right,woodtype=willow": { "model": "forestry:arboriculture/stairs/willow_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right,woodtype=willow": { "model": "forestry:arboriculture/stairs/willow_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right,woodtype=willow": { "model": "forestry:arboriculture/stairs/willow_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left,woodtype=willow": { "model": "forestry:arboriculture/stairs/willow_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left,woodtype=willow": { "model": "forestry:arboriculture/stairs/willow_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left,woodtype=willow": { "model": "forestry:arboriculture/stairs/willow_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left,woodtype=willow": { "model": "forestry:arboriculture/stairs/willow_outer", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right,woodtype=willow": { "model": "forestry:arboriculture/stairs/willow_inner", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right,woodtype=willow": { "model": "forestry:arboriculture/stairs/willow_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right,woodtype=willow": { "model": "forestry:arboriculture/stairs/willow_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right,woodtype=willow": { "model": "forestry:arboriculture/stairs/willow_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left,woodtype=willow": { "model": "forestry:arboriculture/stairs/willow_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left,woodtype=willow": { "model": "forestry:arboriculture/stairs/willow_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left,woodtype=willow": { "model": "forestry:arboriculture/stairs/willow_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left,woodtype=willow": { "model": "forestry:arboriculture/stairs/willow_inner", "x": 180, "uvlock": true }, + //walnut + "facing=east,half=bottom,shape=straight,woodtype=walnut": { "model": "forestry:arboriculture/stairs/walnut" }, + "facing=west,half=bottom,shape=straight,woodtype=walnut": { "model": "forestry:arboriculture/stairs/walnut", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight,woodtype=walnut": { "model": "forestry:arboriculture/stairs/walnut", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight,woodtype=walnut": { "model": "forestry:arboriculture/stairs/walnut", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right,woodtype=walnut": { "model": "forestry:arboriculture/stairs/walnut_outer" }, + "facing=west,half=bottom,shape=outer_right,woodtype=walnut": { "model": "forestry:arboriculture/stairs/walnut_outer", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right,woodtype=walnut": { "model": "forestry:arboriculture/stairs/walnut_outer", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right,woodtype=walnut": { "model": "forestry:arboriculture/stairs/walnut_outer", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left,woodtype=walnut": { "model": "forestry:arboriculture/stairs/walnut_outer", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left,woodtype=walnut": { "model": "forestry:arboriculture/stairs/walnut_outer", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left,woodtype=walnut": { "model": "forestry:arboriculture/stairs/walnut_outer" }, + "facing=north,half=bottom,shape=outer_left,woodtype=walnut": { "model": "forestry:arboriculture/stairs/walnut_outer", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right,woodtype=walnut": { "model": "forestry:arboriculture/stairs/walnut_inner" }, + "facing=west,half=bottom,shape=inner_right,woodtype=walnut": { "model": "forestry:arboriculture/stairs/walnut_inner", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right,woodtype=walnut": { "model": "forestry:arboriculture/stairs/walnut_inner", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right,woodtype=walnut": { "model": "forestry:arboriculture/stairs/walnut_inner", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left,woodtype=walnut": { "model": "forestry:arboriculture/stairs/walnut_inner", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left,woodtype=walnut": { "model": "forestry:arboriculture/stairs/walnut_inner", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left,woodtype=walnut": { "model": "forestry:arboriculture/stairs/walnut_inner" }, + "facing=north,half=bottom,shape=inner_left,woodtype=walnut": { "model": "forestry:arboriculture/stairs/walnut_inner", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight,woodtype=walnut": { "model": "forestry:arboriculture/stairs/walnut", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight,woodtype=walnut": { "model": "forestry:arboriculture/stairs/walnut", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight,woodtype=walnut": { "model": "forestry:arboriculture/stairs/walnut", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight,woodtype=walnut": { "model": "forestry:arboriculture/stairs/walnut", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right,woodtype=walnut": { "model": "forestry:arboriculture/stairs/walnut_outer", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right,woodtype=walnut": { "model": "forestry:arboriculture/stairs/walnut_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right,woodtype=walnut": { "model": "forestry:arboriculture/stairs/walnut_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right,woodtype=walnut": { "model": "forestry:arboriculture/stairs/walnut_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left,woodtype=walnut": { "model": "forestry:arboriculture/stairs/walnut_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left,woodtype=walnut": { "model": "forestry:arboriculture/stairs/walnut_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left,woodtype=walnut": { "model": "forestry:arboriculture/stairs/walnut_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left,woodtype=walnut": { "model": "forestry:arboriculture/stairs/walnut_outer", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right,woodtype=walnut": { "model": "forestry:arboriculture/stairs/walnut_inner", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right,woodtype=walnut": { "model": "forestry:arboriculture/stairs/walnut_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right,woodtype=walnut": { "model": "forestry:arboriculture/stairs/walnut_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right,woodtype=walnut": { "model": "forestry:arboriculture/stairs/walnut_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left,woodtype=walnut": { "model": "forestry:arboriculture/stairs/walnut_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left,woodtype=walnut": { "model": "forestry:arboriculture/stairs/walnut_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left,woodtype=walnut": { "model": "forestry:arboriculture/stairs/walnut_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left,woodtype=walnut": { "model": "forestry:arboriculture/stairs/walnut_inner", "x": 180, "uvlock": true }, + //greenheart + "facing=east,half=bottom,shape=straight,woodtype=greenheart": { "model": "forestry:arboriculture/stairs/greenheart" }, + "facing=west,half=bottom,shape=straight,woodtype=greenheart": { "model": "forestry:arboriculture/stairs/greenheart", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight,woodtype=greenheart": { "model": "forestry:arboriculture/stairs/greenheart", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight,woodtype=greenheart": { "model": "forestry:arboriculture/stairs/greenheart", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right,woodtype=greenheart": { "model": "forestry:arboriculture/stairs/greenheart_outer" }, + "facing=west,half=bottom,shape=outer_right,woodtype=greenheart": { "model": "forestry:arboriculture/stairs/greenheart_outer", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right,woodtype=greenheart": { "model": "forestry:arboriculture/stairs/greenheart_outer", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right,woodtype=greenheart": { "model": "forestry:arboriculture/stairs/greenheart_outer", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left,woodtype=greenheart": { "model": "forestry:arboriculture/stairs/greenheart_outer", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left,woodtype=greenheart": { "model": "forestry:arboriculture/stairs/greenheart_outer", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left,woodtype=greenheart": { "model": "forestry:arboriculture/stairs/greenheart_outer" }, + "facing=north,half=bottom,shape=outer_left,woodtype=greenheart": { "model": "forestry:arboriculture/stairs/greenheart_outer", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right,woodtype=greenheart": { "model": "forestry:arboriculture/stairs/greenheart_inner" }, + "facing=west,half=bottom,shape=inner_right,woodtype=greenheart": { "model": "forestry:arboriculture/stairs/greenheart_inner", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right,woodtype=greenheart": { "model": "forestry:arboriculture/stairs/greenheart_inner", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right,woodtype=greenheart": { "model": "forestry:arboriculture/stairs/greenheart_inner", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left,woodtype=greenheart": { "model": "forestry:arboriculture/stairs/greenheart_inner", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left,woodtype=greenheart": { "model": "forestry:arboriculture/stairs/greenheart_inner", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left,woodtype=greenheart": { "model": "forestry:arboriculture/stairs/greenheart_inner" }, + "facing=north,half=bottom,shape=inner_left,woodtype=greenheart": { "model": "forestry:arboriculture/stairs/greenheart_inner", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight,woodtype=greenheart": { "model": "forestry:arboriculture/stairs/greenheart", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight,woodtype=greenheart": { "model": "forestry:arboriculture/stairs/greenheart", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight,woodtype=greenheart": { "model": "forestry:arboriculture/stairs/greenheart", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight,woodtype=greenheart": { "model": "forestry:arboriculture/stairs/greenheart", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right,woodtype=greenheart": { "model": "forestry:arboriculture/stairs/greenheart_outer", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right,woodtype=greenheart": { "model": "forestry:arboriculture/stairs/greenheart_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right,woodtype=greenheart": { "model": "forestry:arboriculture/stairs/greenheart_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right,woodtype=greenheart": { "model": "forestry:arboriculture/stairs/greenheart_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left,woodtype=greenheart": { "model": "forestry:arboriculture/stairs/greenheart_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left,woodtype=greenheart": { "model": "forestry:arboriculture/stairs/greenheart_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left,woodtype=greenheart": { "model": "forestry:arboriculture/stairs/greenheart_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left,woodtype=greenheart": { "model": "forestry:arboriculture/stairs/greenheart_outer", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right,woodtype=greenheart": { "model": "forestry:arboriculture/stairs/greenheart_inner", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right,woodtype=greenheart": { "model": "forestry:arboriculture/stairs/greenheart_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right,woodtype=greenheart": { "model": "forestry:arboriculture/stairs/greenheart_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right,woodtype=greenheart": { "model": "forestry:arboriculture/stairs/greenheart_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left,woodtype=greenheart": { "model": "forestry:arboriculture/stairs/greenheart_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left,woodtype=greenheart": { "model": "forestry:arboriculture/stairs/greenheart_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left,woodtype=greenheart": { "model": "forestry:arboriculture/stairs/greenheart_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left,woodtype=greenheart": { "model": "forestry:arboriculture/stairs/greenheart_inner", "x": 180, "uvlock": true }, + //cherry + "facing=east,half=bottom,shape=straight,woodtype=cherry": { "model": "forestry:arboriculture/stairs/cherry" }, + "facing=west,half=bottom,shape=straight,woodtype=cherry": { "model": "forestry:arboriculture/stairs/cherry", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight,woodtype=cherry": { "model": "forestry:arboriculture/stairs/cherry", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight,woodtype=cherry": { "model": "forestry:arboriculture/stairs/cherry", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right,woodtype=cherry": { "model": "forestry:arboriculture/stairs/cherry_outer" }, + "facing=west,half=bottom,shape=outer_right,woodtype=cherry": { "model": "forestry:arboriculture/stairs/cherry_outer", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right,woodtype=cherry": { "model": "forestry:arboriculture/stairs/cherry_outer", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right,woodtype=cherry": { "model": "forestry:arboriculture/stairs/cherry_outer", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left,woodtype=cherry": { "model": "forestry:arboriculture/stairs/cherry_outer", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left,woodtype=cherry": { "model": "forestry:arboriculture/stairs/cherry_outer", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left,woodtype=cherry": { "model": "forestry:arboriculture/stairs/cherry_outer" }, + "facing=north,half=bottom,shape=outer_left,woodtype=cherry": { "model": "forestry:arboriculture/stairs/cherry_outer", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right,woodtype=cherry": { "model": "forestry:arboriculture/stairs/cherry_inner" }, + "facing=west,half=bottom,shape=inner_right,woodtype=cherry": { "model": "forestry:arboriculture/stairs/cherry_inner", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right,woodtype=cherry": { "model": "forestry:arboriculture/stairs/cherry_inner", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right,woodtype=cherry": { "model": "forestry:arboriculture/stairs/cherry_inner", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left,woodtype=cherry": { "model": "forestry:arboriculture/stairs/cherry_inner", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left,woodtype=cherry": { "model": "forestry:arboriculture/stairs/cherry_inner", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left,woodtype=cherry": { "model": "forestry:arboriculture/stairs/cherry_inner" }, + "facing=north,half=bottom,shape=inner_left,woodtype=cherry": { "model": "forestry:arboriculture/stairs/cherry_inner", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight,woodtype=cherry": { "model": "forestry:arboriculture/stairs/cherry", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight,woodtype=cherry": { "model": "forestry:arboriculture/stairs/cherry", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight,woodtype=cherry": { "model": "forestry:arboriculture/stairs/cherry", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight,woodtype=cherry": { "model": "forestry:arboriculture/stairs/cherry", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right,woodtype=cherry": { "model": "forestry:arboriculture/stairs/cherry_outer", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right,woodtype=cherry": { "model": "forestry:arboriculture/stairs/cherry_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right,woodtype=cherry": { "model": "forestry:arboriculture/stairs/cherry_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right,woodtype=cherry": { "model": "forestry:arboriculture/stairs/cherry_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left,woodtype=cherry": { "model": "forestry:arboriculture/stairs/cherry_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left,woodtype=cherry": { "model": "forestry:arboriculture/stairs/cherry_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left,woodtype=cherry": { "model": "forestry:arboriculture/stairs/cherry_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left,woodtype=cherry": { "model": "forestry:arboriculture/stairs/cherry_outer", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right,woodtype=cherry": { "model": "forestry:arboriculture/stairs/cherry_inner", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right,woodtype=cherry": { "model": "forestry:arboriculture/stairs/cherry_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right,woodtype=cherry": { "model": "forestry:arboriculture/stairs/cherry_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right,woodtype=cherry": { "model": "forestry:arboriculture/stairs/cherry_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left,woodtype=cherry": { "model": "forestry:arboriculture/stairs/cherry_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left,woodtype=cherry": { "model": "forestry:arboriculture/stairs/cherry_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left,woodtype=cherry": { "model": "forestry:arboriculture/stairs/cherry_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left,woodtype=cherry": { "model": "forestry:arboriculture/stairs/cherry_inner", "x": 180, "uvlock": true }, + //mahoe + "facing=east,half=bottom,shape=straight,woodtype=mahoe": { "model": "forestry:arboriculture/stairs/mahoe" }, + "facing=west,half=bottom,shape=straight,woodtype=mahoe": { "model": "forestry:arboriculture/stairs/mahoe", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight,woodtype=mahoe": { "model": "forestry:arboriculture/stairs/mahoe", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight,woodtype=mahoe": { "model": "forestry:arboriculture/stairs/mahoe", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right,woodtype=mahoe": { "model": "forestry:arboriculture/stairs/mahoe_outer" }, + "facing=west,half=bottom,shape=outer_right,woodtype=mahoe": { "model": "forestry:arboriculture/stairs/mahoe_outer", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right,woodtype=mahoe": { "model": "forestry:arboriculture/stairs/mahoe_outer", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right,woodtype=mahoe": { "model": "forestry:arboriculture/stairs/mahoe_outer", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left,woodtype=mahoe": { "model": "forestry:arboriculture/stairs/mahoe_outer", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left,woodtype=mahoe": { "model": "forestry:arboriculture/stairs/mahoe_outer", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left,woodtype=mahoe": { "model": "forestry:arboriculture/stairs/mahoe_outer" }, + "facing=north,half=bottom,shape=outer_left,woodtype=mahoe": { "model": "forestry:arboriculture/stairs/mahoe_outer", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right,woodtype=mahoe": { "model": "forestry:arboriculture/stairs/mahoe_inner" }, + "facing=west,half=bottom,shape=inner_right,woodtype=mahoe": { "model": "forestry:arboriculture/stairs/mahoe_inner", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right,woodtype=mahoe": { "model": "forestry:arboriculture/stairs/mahoe_inner", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right,woodtype=mahoe": { "model": "forestry:arboriculture/stairs/mahoe_inner", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left,woodtype=mahoe": { "model": "forestry:arboriculture/stairs/mahoe_inner", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left,woodtype=mahoe": { "model": "forestry:arboriculture/stairs/mahoe_inner", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left,woodtype=mahoe": { "model": "forestry:arboriculture/stairs/mahoe_inner" }, + "facing=north,half=bottom,shape=inner_left,woodtype=mahoe": { "model": "forestry:arboriculture/stairs/mahoe_inner", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight,woodtype=mahoe": { "model": "forestry:arboriculture/stairs/mahoe", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight,woodtype=mahoe": { "model": "forestry:arboriculture/stairs/mahoe", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight,woodtype=mahoe": { "model": "forestry:arboriculture/stairs/mahoe", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight,woodtype=mahoe": { "model": "forestry:arboriculture/stairs/mahoe", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right,woodtype=mahoe": { "model": "forestry:arboriculture/stairs/mahoe_outer", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right,woodtype=mahoe": { "model": "forestry:arboriculture/stairs/mahoe_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right,woodtype=mahoe": { "model": "forestry:arboriculture/stairs/mahoe_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right,woodtype=mahoe": { "model": "forestry:arboriculture/stairs/mahoe_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left,woodtype=mahoe": { "model": "forestry:arboriculture/stairs/mahoe_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left,woodtype=mahoe": { "model": "forestry:arboriculture/stairs/mahoe_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left,woodtype=mahoe": { "model": "forestry:arboriculture/stairs/mahoe_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left,woodtype=mahoe": { "model": "forestry:arboriculture/stairs/mahoe_outer", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right,woodtype=mahoe": { "model": "forestry:arboriculture/stairs/mahoe_inner", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right,woodtype=mahoe": { "model": "forestry:arboriculture/stairs/mahoe_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right,woodtype=mahoe": { "model": "forestry:arboriculture/stairs/mahoe_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right,woodtype=mahoe": { "model": "forestry:arboriculture/stairs/mahoe_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left,woodtype=mahoe": { "model": "forestry:arboriculture/stairs/mahoe_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left,woodtype=mahoe": { "model": "forestry:arboriculture/stairs/mahoe_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left,woodtype=mahoe": { "model": "forestry:arboriculture/stairs/mahoe_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left,woodtype=mahoe": { "model": "forestry:arboriculture/stairs/mahoe_inner", "x": 180, "uvlock": true }, + //poplar + "facing=east,half=bottom,shape=straight,woodtype=poplar": { "model": "forestry:arboriculture/stairs/poplar" }, + "facing=west,half=bottom,shape=straight,woodtype=poplar": { "model": "forestry:arboriculture/stairs/poplar", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight,woodtype=poplar": { "model": "forestry:arboriculture/stairs/poplar", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight,woodtype=poplar": { "model": "forestry:arboriculture/stairs/poplar", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right,woodtype=poplar": { "model": "forestry:arboriculture/stairs/poplar_outer" }, + "facing=west,half=bottom,shape=outer_right,woodtype=poplar": { "model": "forestry:arboriculture/stairs/poplar_outer", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right,woodtype=poplar": { "model": "forestry:arboriculture/stairs/poplar_outer", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right,woodtype=poplar": { "model": "forestry:arboriculture/stairs/poplar_outer", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left,woodtype=poplar": { "model": "forestry:arboriculture/stairs/poplar_outer", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left,woodtype=poplar": { "model": "forestry:arboriculture/stairs/poplar_outer", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left,woodtype=poplar": { "model": "forestry:arboriculture/stairs/poplar_outer" }, + "facing=north,half=bottom,shape=outer_left,woodtype=poplar": { "model": "forestry:arboriculture/stairs/poplar_outer", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right,woodtype=poplar": { "model": "forestry:arboriculture/stairs/poplar_inner" }, + "facing=west,half=bottom,shape=inner_right,woodtype=poplar": { "model": "forestry:arboriculture/stairs/poplar_inner", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right,woodtype=poplar": { "model": "forestry:arboriculture/stairs/poplar_inner", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right,woodtype=poplar": { "model": "forestry:arboriculture/stairs/poplar_inner", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left,woodtype=poplar": { "model": "forestry:arboriculture/stairs/poplar_inner", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left,woodtype=poplar": { "model": "forestry:arboriculture/stairs/poplar_inner", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left,woodtype=poplar": { "model": "forestry:arboriculture/stairs/poplar_inner" }, + "facing=north,half=bottom,shape=inner_left,woodtype=poplar": { "model": "forestry:arboriculture/stairs/poplar_inner", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight,woodtype=poplar": { "model": "forestry:arboriculture/stairs/poplar", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight,woodtype=poplar": { "model": "forestry:arboriculture/stairs/poplar", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight,woodtype=poplar": { "model": "forestry:arboriculture/stairs/poplar", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight,woodtype=poplar": { "model": "forestry:arboriculture/stairs/poplar", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right,woodtype=poplar": { "model": "forestry:arboriculture/stairs/poplar_outer", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right,woodtype=poplar": { "model": "forestry:arboriculture/stairs/poplar_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right,woodtype=poplar": { "model": "forestry:arboriculture/stairs/poplar_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right,woodtype=poplar": { "model": "forestry:arboriculture/stairs/poplar_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left,woodtype=poplar": { "model": "forestry:arboriculture/stairs/poplar_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left,woodtype=poplar": { "model": "forestry:arboriculture/stairs/poplar_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left,woodtype=poplar": { "model": "forestry:arboriculture/stairs/poplar_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left,woodtype=poplar": { "model": "forestry:arboriculture/stairs/poplar_outer", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right,woodtype=poplar": { "model": "forestry:arboriculture/stairs/poplar_inner", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right,woodtype=poplar": { "model": "forestry:arboriculture/stairs/poplar_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right,woodtype=poplar": { "model": "forestry:arboriculture/stairs/poplar_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right,woodtype=poplar": { "model": "forestry:arboriculture/stairs/poplar_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left,woodtype=poplar": { "model": "forestry:arboriculture/stairs/poplar_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left,woodtype=poplar": { "model": "forestry:arboriculture/stairs/poplar_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left,woodtype=poplar": { "model": "forestry:arboriculture/stairs/poplar_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left,woodtype=poplar": { "model": "forestry:arboriculture/stairs/poplar_inner", "x": 180, "uvlock": true }, + //palm + "facing=east,half=bottom,shape=straight,woodtype=palm": { "model": "forestry:arboriculture/stairs/palm" }, + "facing=west,half=bottom,shape=straight,woodtype=palm": { "model": "forestry:arboriculture/stairs/palm", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight,woodtype=palm": { "model": "forestry:arboriculture/stairs/palm", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight,woodtype=palm": { "model": "forestry:arboriculture/stairs/palm", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right,woodtype=palm": { "model": "forestry:arboriculture/stairs/palm_outer" }, + "facing=west,half=bottom,shape=outer_right,woodtype=palm": { "model": "forestry:arboriculture/stairs/palm_outer", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right,woodtype=palm": { "model": "forestry:arboriculture/stairs/palm_outer", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right,woodtype=palm": { "model": "forestry:arboriculture/stairs/palm_outer", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left,woodtype=palm": { "model": "forestry:arboriculture/stairs/palm_outer", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left,woodtype=palm": { "model": "forestry:arboriculture/stairs/palm_outer", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left,woodtype=palm": { "model": "forestry:arboriculture/stairs/palm_outer" }, + "facing=north,half=bottom,shape=outer_left,woodtype=palm": { "model": "forestry:arboriculture/stairs/palm_outer", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right,woodtype=palm": { "model": "forestry:arboriculture/stairs/palm_inner" }, + "facing=west,half=bottom,shape=inner_right,woodtype=palm": { "model": "forestry:arboriculture/stairs/palm_inner", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right,woodtype=palm": { "model": "forestry:arboriculture/stairs/palm_inner", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right,woodtype=palm": { "model": "forestry:arboriculture/stairs/palm_inner", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left,woodtype=palm": { "model": "forestry:arboriculture/stairs/palm_inner", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left,woodtype=palm": { "model": "forestry:arboriculture/stairs/palm_inner", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left,woodtype=palm": { "model": "forestry:arboriculture/stairs/palm_inner" }, + "facing=north,half=bottom,shape=inner_left,woodtype=palm": { "model": "forestry:arboriculture/stairs/palm_inner", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight,woodtype=palm": { "model": "forestry:arboriculture/stairs/palm", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight,woodtype=palm": { "model": "forestry:arboriculture/stairs/palm", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight,woodtype=palm": { "model": "forestry:arboriculture/stairs/palm", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight,woodtype=palm": { "model": "forestry:arboriculture/stairs/palm", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right,woodtype=palm": { "model": "forestry:arboriculture/stairs/palm_outer", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right,woodtype=palm": { "model": "forestry:arboriculture/stairs/palm_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right,woodtype=palm": { "model": "forestry:arboriculture/stairs/palm_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right,woodtype=palm": { "model": "forestry:arboriculture/stairs/palm_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left,woodtype=palm": { "model": "forestry:arboriculture/stairs/palm_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left,woodtype=palm": { "model": "forestry:arboriculture/stairs/palm_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left,woodtype=palm": { "model": "forestry:arboriculture/stairs/palm_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left,woodtype=palm": { "model": "forestry:arboriculture/stairs/palm_outer", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right,woodtype=palm": { "model": "forestry:arboriculture/stairs/palm_inner", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right,woodtype=palm": { "model": "forestry:arboriculture/stairs/palm_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right,woodtype=palm": { "model": "forestry:arboriculture/stairs/palm_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right,woodtype=palm": { "model": "forestry:arboriculture/stairs/palm_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left,woodtype=palm": { "model": "forestry:arboriculture/stairs/palm_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left,woodtype=palm": { "model": "forestry:arboriculture/stairs/palm_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left,woodtype=palm": { "model": "forestry:arboriculture/stairs/palm_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left,woodtype=palm": { "model": "forestry:arboriculture/stairs/palm_inner", "x": 180, "uvlock": true }, + //papaya + "facing=east,half=bottom,shape=straight,woodtype=papaya": { "model": "forestry:arboriculture/stairs/papaya" }, + "facing=west,half=bottom,shape=straight,woodtype=papaya": { "model": "forestry:arboriculture/stairs/papaya", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight,woodtype=papaya": { "model": "forestry:arboriculture/stairs/papaya", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight,woodtype=papaya": { "model": "forestry:arboriculture/stairs/papaya", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right,woodtype=papaya": { "model": "forestry:arboriculture/stairs/papaya_outer" }, + "facing=west,half=bottom,shape=outer_right,woodtype=papaya": { "model": "forestry:arboriculture/stairs/papaya_outer", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right,woodtype=papaya": { "model": "forestry:arboriculture/stairs/papaya_outer", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right,woodtype=papaya": { "model": "forestry:arboriculture/stairs/papaya_outer", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left,woodtype=papaya": { "model": "forestry:arboriculture/stairs/papaya_outer", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left,woodtype=papaya": { "model": "forestry:arboriculture/stairs/papaya_outer", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left,woodtype=papaya": { "model": "forestry:arboriculture/stairs/papaya_outer" }, + "facing=north,half=bottom,shape=outer_left,woodtype=papaya": { "model": "forestry:arboriculture/stairs/papaya_outer", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right,woodtype=papaya": { "model": "forestry:arboriculture/stairs/papaya_inner" }, + "facing=west,half=bottom,shape=inner_right,woodtype=papaya": { "model": "forestry:arboriculture/stairs/papaya_inner", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right,woodtype=papaya": { "model": "forestry:arboriculture/stairs/papaya_inner", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right,woodtype=papaya": { "model": "forestry:arboriculture/stairs/papaya_inner", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left,woodtype=papaya": { "model": "forestry:arboriculture/stairs/papaya_inner", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left,woodtype=papaya": { "model": "forestry:arboriculture/stairs/papaya_inner", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left,woodtype=papaya": { "model": "forestry:arboriculture/stairs/papaya_inner" }, + "facing=north,half=bottom,shape=inner_left,woodtype=papaya": { "model": "forestry:arboriculture/stairs/papaya_inner", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight,woodtype=papaya": { "model": "forestry:arboriculture/stairs/papaya", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight,woodtype=papaya": { "model": "forestry:arboriculture/stairs/papaya", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight,woodtype=papaya": { "model": "forestry:arboriculture/stairs/papaya", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight,woodtype=papaya": { "model": "forestry:arboriculture/stairs/papaya", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right,woodtype=papaya": { "model": "forestry:arboriculture/stairs/papaya_outer", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right,woodtype=papaya": { "model": "forestry:arboriculture/stairs/papaya_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right,woodtype=papaya": { "model": "forestry:arboriculture/stairs/papaya_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right,woodtype=papaya": { "model": "forestry:arboriculture/stairs/papaya_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left,woodtype=papaya": { "model": "forestry:arboriculture/stairs/papaya_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left,woodtype=papaya": { "model": "forestry:arboriculture/stairs/papaya_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left,woodtype=papaya": { "model": "forestry:arboriculture/stairs/papaya_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left,woodtype=papaya": { "model": "forestry:arboriculture/stairs/papaya_outer", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right,woodtype=papaya": { "model": "forestry:arboriculture/stairs/papaya_inner", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right,woodtype=papaya": { "model": "forestry:arboriculture/stairs/papaya_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right,woodtype=papaya": { "model": "forestry:arboriculture/stairs/papaya_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right,woodtype=papaya": { "model": "forestry:arboriculture/stairs/papaya_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left,woodtype=papaya": { "model": "forestry:arboriculture/stairs/papaya_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left,woodtype=papaya": { "model": "forestry:arboriculture/stairs/papaya_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left,woodtype=papaya": { "model": "forestry:arboriculture/stairs/papaya_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left,woodtype=papaya": { "model": "forestry:arboriculture/stairs/papaya_inner", "x": 180, "uvlock": true }, + //pine + "facing=east,half=bottom,shape=straight,woodtype=pine": { "model": "forestry:arboriculture/stairs/pine" }, + "facing=west,half=bottom,shape=straight,woodtype=pine": { "model": "forestry:arboriculture/stairs/pine", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight,woodtype=pine": { "model": "forestry:arboriculture/stairs/pine", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight,woodtype=pine": { "model": "forestry:arboriculture/stairs/pine", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right,woodtype=pine": { "model": "forestry:arboriculture/stairs/pine_outer" }, + "facing=west,half=bottom,shape=outer_right,woodtype=pine": { "model": "forestry:arboriculture/stairs/pine_outer", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right,woodtype=pine": { "model": "forestry:arboriculture/stairs/pine_outer", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right,woodtype=pine": { "model": "forestry:arboriculture/stairs/pine_outer", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left,woodtype=pine": { "model": "forestry:arboriculture/stairs/pine_outer", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left,woodtype=pine": { "model": "forestry:arboriculture/stairs/pine_outer", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left,woodtype=pine": { "model": "forestry:arboriculture/stairs/pine_outer" }, + "facing=north,half=bottom,shape=outer_left,woodtype=pine": { "model": "forestry:arboriculture/stairs/pine_outer", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right,woodtype=pine": { "model": "forestry:arboriculture/stairs/pine_inner" }, + "facing=west,half=bottom,shape=inner_right,woodtype=pine": { "model": "forestry:arboriculture/stairs/pine_inner", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right,woodtype=pine": { "model": "forestry:arboriculture/stairs/pine_inner", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right,woodtype=pine": { "model": "forestry:arboriculture/stairs/pine_inner", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left,woodtype=pine": { "model": "forestry:arboriculture/stairs/pine_inner", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left,woodtype=pine": { "model": "forestry:arboriculture/stairs/pine_inner", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left,woodtype=pine": { "model": "forestry:arboriculture/stairs/pine_inner" }, + "facing=north,half=bottom,shape=inner_left,woodtype=pine": { "model": "forestry:arboriculture/stairs/pine_inner", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight,woodtype=pine": { "model": "forestry:arboriculture/stairs/pine", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight,woodtype=pine": { "model": "forestry:arboriculture/stairs/pine", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight,woodtype=pine": { "model": "forestry:arboriculture/stairs/pine", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight,woodtype=pine": { "model": "forestry:arboriculture/stairs/pine", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right,woodtype=pine": { "model": "forestry:arboriculture/stairs/pine_outer", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right,woodtype=pine": { "model": "forestry:arboriculture/stairs/pine_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right,woodtype=pine": { "model": "forestry:arboriculture/stairs/pine_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right,woodtype=pine": { "model": "forestry:arboriculture/stairs/pine_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left,woodtype=pine": { "model": "forestry:arboriculture/stairs/pine_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left,woodtype=pine": { "model": "forestry:arboriculture/stairs/pine_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left,woodtype=pine": { "model": "forestry:arboriculture/stairs/pine_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left,woodtype=pine": { "model": "forestry:arboriculture/stairs/pine_outer", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right,woodtype=pine": { "model": "forestry:arboriculture/stairs/pine_inner", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right,woodtype=pine": { "model": "forestry:arboriculture/stairs/pine_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right,woodtype=pine": { "model": "forestry:arboriculture/stairs/pine_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right,woodtype=pine": { "model": "forestry:arboriculture/stairs/pine_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left,woodtype=pine": { "model": "forestry:arboriculture/stairs/pine_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left,woodtype=pine": { "model": "forestry:arboriculture/stairs/pine_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left,woodtype=pine": { "model": "forestry:arboriculture/stairs/pine_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left,woodtype=pine": { "model": "forestry:arboriculture/stairs/pine_inner", "x": 180, "uvlock": true }, + //plum + "facing=east,half=bottom,shape=straight,woodtype=plum": { "model": "forestry:arboriculture/stairs/plum" }, + "facing=west,half=bottom,shape=straight,woodtype=plum": { "model": "forestry:arboriculture/stairs/plum", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight,woodtype=plum": { "model": "forestry:arboriculture/stairs/plum", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight,woodtype=plum": { "model": "forestry:arboriculture/stairs/plum", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right,woodtype=plum": { "model": "forestry:arboriculture/stairs/plum_outer" }, + "facing=west,half=bottom,shape=outer_right,woodtype=plum": { "model": "forestry:arboriculture/stairs/plum_outer", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right,woodtype=plum": { "model": "forestry:arboriculture/stairs/plum_outer", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right,woodtype=plum": { "model": "forestry:arboriculture/stairs/plum_outer", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left,woodtype=plum": { "model": "forestry:arboriculture/stairs/plum_outer", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left,woodtype=plum": { "model": "forestry:arboriculture/stairs/plum_outer", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left,woodtype=plum": { "model": "forestry:arboriculture/stairs/plum_outer" }, + "facing=north,half=bottom,shape=outer_left,woodtype=plum": { "model": "forestry:arboriculture/stairs/plum_outer", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right,woodtype=plum": { "model": "forestry:arboriculture/stairs/plum_inner" }, + "facing=west,half=bottom,shape=inner_right,woodtype=plum": { "model": "forestry:arboriculture/stairs/plum_inner", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right,woodtype=plum": { "model": "forestry:arboriculture/stairs/plum_inner", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right,woodtype=plum": { "model": "forestry:arboriculture/stairs/plum_inner", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left,woodtype=plum": { "model": "forestry:arboriculture/stairs/plum_inner", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left,woodtype=plum": { "model": "forestry:arboriculture/stairs/plum_inner", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left,woodtype=plum": { "model": "forestry:arboriculture/stairs/plum_inner" }, + "facing=north,half=bottom,shape=inner_left,woodtype=plum": { "model": "forestry:arboriculture/stairs/plum_inner", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight,woodtype=plum": { "model": "forestry:arboriculture/stairs/plum", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight,woodtype=plum": { "model": "forestry:arboriculture/stairs/plum", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight,woodtype=plum": { "model": "forestry:arboriculture/stairs/plum", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight,woodtype=plum": { "model": "forestry:arboriculture/stairs/plum", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right,woodtype=plum": { "model": "forestry:arboriculture/stairs/plum_outer", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right,woodtype=plum": { "model": "forestry:arboriculture/stairs/plum_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right,woodtype=plum": { "model": "forestry:arboriculture/stairs/plum_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right,woodtype=plum": { "model": "forestry:arboriculture/stairs/plum_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left,woodtype=plum": { "model": "forestry:arboriculture/stairs/plum_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left,woodtype=plum": { "model": "forestry:arboriculture/stairs/plum_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left,woodtype=plum": { "model": "forestry:arboriculture/stairs/plum_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left,woodtype=plum": { "model": "forestry:arboriculture/stairs/plum_outer", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right,woodtype=plum": { "model": "forestry:arboriculture/stairs/plum_inner", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right,woodtype=plum": { "model": "forestry:arboriculture/stairs/plum_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right,woodtype=plum": { "model": "forestry:arboriculture/stairs/plum_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right,woodtype=plum": { "model": "forestry:arboriculture/stairs/plum_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left,woodtype=plum": { "model": "forestry:arboriculture/stairs/plum_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left,woodtype=plum": { "model": "forestry:arboriculture/stairs/plum_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left,woodtype=plum": { "model": "forestry:arboriculture/stairs/plum_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left,woodtype=plum": { "model": "forestry:arboriculture/stairs/plum_inner", "x": 180, "uvlock": true }, + //maple + "facing=east,half=bottom,shape=straight,woodtype=maple": { "model": "forestry:arboriculture/stairs/maple" }, + "facing=west,half=bottom,shape=straight,woodtype=maple": { "model": "forestry:arboriculture/stairs/maple", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight,woodtype=maple": { "model": "forestry:arboriculture/stairs/maple", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight,woodtype=maple": { "model": "forestry:arboriculture/stairs/maple", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right,woodtype=maple": { "model": "forestry:arboriculture/stairs/maple_outer" }, + "facing=west,half=bottom,shape=outer_right,woodtype=maple": { "model": "forestry:arboriculture/stairs/maple_outer", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right,woodtype=maple": { "model": "forestry:arboriculture/stairs/maple_outer", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right,woodtype=maple": { "model": "forestry:arboriculture/stairs/maple_outer", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left,woodtype=maple": { "model": "forestry:arboriculture/stairs/maple_outer", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left,woodtype=maple": { "model": "forestry:arboriculture/stairs/maple_outer", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left,woodtype=maple": { "model": "forestry:arboriculture/stairs/maple_outer" }, + "facing=north,half=bottom,shape=outer_left,woodtype=maple": { "model": "forestry:arboriculture/stairs/maple_outer", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right,woodtype=maple": { "model": "forestry:arboriculture/stairs/maple_inner" }, + "facing=west,half=bottom,shape=inner_right,woodtype=maple": { "model": "forestry:arboriculture/stairs/maple_inner", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right,woodtype=maple": { "model": "forestry:arboriculture/stairs/maple_inner", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right,woodtype=maple": { "model": "forestry:arboriculture/stairs/maple_inner", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left,woodtype=maple": { "model": "forestry:arboriculture/stairs/maple_inner", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left,woodtype=maple": { "model": "forestry:arboriculture/stairs/maple_inner", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left,woodtype=maple": { "model": "forestry:arboriculture/stairs/maple_inner" }, + "facing=north,half=bottom,shape=inner_left,woodtype=maple": { "model": "forestry:arboriculture/stairs/maple_inner", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight,woodtype=maple": { "model": "forestry:arboriculture/stairs/maple", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight,woodtype=maple": { "model": "forestry:arboriculture/stairs/maple", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight,woodtype=maple": { "model": "forestry:arboriculture/stairs/maple", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight,woodtype=maple": { "model": "forestry:arboriculture/stairs/maple", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right,woodtype=maple": { "model": "forestry:arboriculture/stairs/maple_outer", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right,woodtype=maple": { "model": "forestry:arboriculture/stairs/maple_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right,woodtype=maple": { "model": "forestry:arboriculture/stairs/maple_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right,woodtype=maple": { "model": "forestry:arboriculture/stairs/maple_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left,woodtype=maple": { "model": "forestry:arboriculture/stairs/maple_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left,woodtype=maple": { "model": "forestry:arboriculture/stairs/maple_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left,woodtype=maple": { "model": "forestry:arboriculture/stairs/maple_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left,woodtype=maple": { "model": "forestry:arboriculture/stairs/maple_outer", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right,woodtype=maple": { "model": "forestry:arboriculture/stairs/maple_inner", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right,woodtype=maple": { "model": "forestry:arboriculture/stairs/maple_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right,woodtype=maple": { "model": "forestry:arboriculture/stairs/maple_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right,woodtype=maple": { "model": "forestry:arboriculture/stairs/maple_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left,woodtype=maple": { "model": "forestry:arboriculture/stairs/maple_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left,woodtype=maple": { "model": "forestry:arboriculture/stairs/maple_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left,woodtype=maple": { "model": "forestry:arboriculture/stairs/maple_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left,woodtype=maple": { "model": "forestry:arboriculture/stairs/maple_inner", "x": 180, "uvlock": true }, + //citrus + "facing=east,half=bottom,shape=straight,woodtype=citrus": { "model": "forestry:arboriculture/stairs/citrus" }, + "facing=west,half=bottom,shape=straight,woodtype=citrus": { "model": "forestry:arboriculture/stairs/citrus", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight,woodtype=citrus": { "model": "forestry:arboriculture/stairs/citrus", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight,woodtype=citrus": { "model": "forestry:arboriculture/stairs/citrus", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right,woodtype=citrus": { "model": "forestry:arboriculture/stairs/citrus_outer" }, + "facing=west,half=bottom,shape=outer_right,woodtype=citrus": { "model": "forestry:arboriculture/stairs/citrus_outer", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right,woodtype=citrus": { "model": "forestry:arboriculture/stairs/citrus_outer", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right,woodtype=citrus": { "model": "forestry:arboriculture/stairs/citrus_outer", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left,woodtype=citrus": { "model": "forestry:arboriculture/stairs/citrus_outer", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left,woodtype=citrus": { "model": "forestry:arboriculture/stairs/citrus_outer", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left,woodtype=citrus": { "model": "forestry:arboriculture/stairs/citrus_outer" }, + "facing=north,half=bottom,shape=outer_left,woodtype=citrus": { "model": "forestry:arboriculture/stairs/citrus_outer", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right,woodtype=citrus": { "model": "forestry:arboriculture/stairs/citrus_inner" }, + "facing=west,half=bottom,shape=inner_right,woodtype=citrus": { "model": "forestry:arboriculture/stairs/citrus_inner", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right,woodtype=citrus": { "model": "forestry:arboriculture/stairs/citrus_inner", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right,woodtype=citrus": { "model": "forestry:arboriculture/stairs/citrus_inner", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left,woodtype=citrus": { "model": "forestry:arboriculture/stairs/citrus_inner", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left,woodtype=citrus": { "model": "forestry:arboriculture/stairs/citrus_inner", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left,woodtype=citrus": { "model": "forestry:arboriculture/stairs/citrus_inner" }, + "facing=north,half=bottom,shape=inner_left,woodtype=citrus": { "model": "forestry:arboriculture/stairs/citrus_inner", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight,woodtype=citrus": { "model": "forestry:arboriculture/stairs/citrus", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight,woodtype=citrus": { "model": "forestry:arboriculture/stairs/citrus", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight,woodtype=citrus": { "model": "forestry:arboriculture/stairs/citrus", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight,woodtype=citrus": { "model": "forestry:arboriculture/stairs/citrus", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right,woodtype=citrus": { "model": "forestry:arboriculture/stairs/citrus_outer", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right,woodtype=citrus": { "model": "forestry:arboriculture/stairs/citrus_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right,woodtype=citrus": { "model": "forestry:arboriculture/stairs/citrus_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right,woodtype=citrus": { "model": "forestry:arboriculture/stairs/citrus_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left,woodtype=citrus": { "model": "forestry:arboriculture/stairs/citrus_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left,woodtype=citrus": { "model": "forestry:arboriculture/stairs/citrus_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left,woodtype=citrus": { "model": "forestry:arboriculture/stairs/citrus_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left,woodtype=citrus": { "model": "forestry:arboriculture/stairs/citrus_outer", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right,woodtype=citrus": { "model": "forestry:arboriculture/stairs/citrus_inner", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right,woodtype=citrus": { "model": "forestry:arboriculture/stairs/citrus_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right,woodtype=citrus": { "model": "forestry:arboriculture/stairs/citrus_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right,woodtype=citrus": { "model": "forestry:arboriculture/stairs/citrus_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left,woodtype=citrus": { "model": "forestry:arboriculture/stairs/citrus_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left,woodtype=citrus": { "model": "forestry:arboriculture/stairs/citrus_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left,woodtype=citrus": { "model": "forestry:arboriculture/stairs/citrus_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left,woodtype=citrus": { "model": "forestry:arboriculture/stairs/citrus_inner", "x": 180, "uvlock": true }, + //giganteum + "facing=east,half=bottom,shape=straight,woodtype=giganteum": { "model": "forestry:arboriculture/stairs/giganteum" }, + "facing=west,half=bottom,shape=straight,woodtype=giganteum": { "model": "forestry:arboriculture/stairs/giganteum", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight,woodtype=giganteum": { "model": "forestry:arboriculture/stairs/giganteum", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight,woodtype=giganteum": { "model": "forestry:arboriculture/stairs/giganteum", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right,woodtype=giganteum": { "model": "forestry:arboriculture/stairs/giganteum_outer" }, + "facing=west,half=bottom,shape=outer_right,woodtype=giganteum": { "model": "forestry:arboriculture/stairs/giganteum_outer", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right,woodtype=giganteum": { "model": "forestry:arboriculture/stairs/giganteum_outer", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right,woodtype=giganteum": { "model": "forestry:arboriculture/stairs/giganteum_outer", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left,woodtype=giganteum": { "model": "forestry:arboriculture/stairs/giganteum_outer", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left,woodtype=giganteum": { "model": "forestry:arboriculture/stairs/giganteum_outer", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left,woodtype=giganteum": { "model": "forestry:arboriculture/stairs/giganteum_outer" }, + "facing=north,half=bottom,shape=outer_left,woodtype=giganteum": { "model": "forestry:arboriculture/stairs/giganteum_outer", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right,woodtype=giganteum": { "model": "forestry:arboriculture/stairs/giganteum_inner" }, + "facing=west,half=bottom,shape=inner_right,woodtype=giganteum": { "model": "forestry:arboriculture/stairs/giganteum_inner", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right,woodtype=giganteum": { "model": "forestry:arboriculture/stairs/giganteum_inner", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right,woodtype=giganteum": { "model": "forestry:arboriculture/stairs/giganteum_inner", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left,woodtype=giganteum": { "model": "forestry:arboriculture/stairs/giganteum_inner", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left,woodtype=giganteum": { "model": "forestry:arboriculture/stairs/giganteum_inner", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left,woodtype=giganteum": { "model": "forestry:arboriculture/stairs/giganteum_inner" }, + "facing=north,half=bottom,shape=inner_left,woodtype=giganteum": { "model": "forestry:arboriculture/stairs/giganteum_inner", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight,woodtype=giganteum": { "model": "forestry:arboriculture/stairs/giganteum", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight,woodtype=giganteum": { "model": "forestry:arboriculture/stairs/giganteum", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight,woodtype=giganteum": { "model": "forestry:arboriculture/stairs/giganteum", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight,woodtype=giganteum": { "model": "forestry:arboriculture/stairs/giganteum", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right,woodtype=giganteum": { "model": "forestry:arboriculture/stairs/giganteum_outer", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right,woodtype=giganteum": { "model": "forestry:arboriculture/stairs/giganteum_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right,woodtype=giganteum": { "model": "forestry:arboriculture/stairs/giganteum_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right,woodtype=giganteum": { "model": "forestry:arboriculture/stairs/giganteum_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left,woodtype=giganteum": { "model": "forestry:arboriculture/stairs/giganteum_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left,woodtype=giganteum": { "model": "forestry:arboriculture/stairs/giganteum_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left,woodtype=giganteum": { "model": "forestry:arboriculture/stairs/giganteum_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left,woodtype=giganteum": { "model": "forestry:arboriculture/stairs/giganteum_outer", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right,woodtype=giganteum": { "model": "forestry:arboriculture/stairs/giganteum_inner", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right,woodtype=giganteum": { "model": "forestry:arboriculture/stairs/giganteum_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right,woodtype=giganteum": { "model": "forestry:arboriculture/stairs/giganteum_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right,woodtype=giganteum": { "model": "forestry:arboriculture/stairs/giganteum_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left,woodtype=giganteum": { "model": "forestry:arboriculture/stairs/giganteum_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left,woodtype=giganteum": { "model": "forestry:arboriculture/stairs/giganteum_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left,woodtype=giganteum": { "model": "forestry:arboriculture/stairs/giganteum_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left,woodtype=giganteum": { "model": "forestry:arboriculture/stairs/giganteum_inner", "x": 180, "uvlock": true }, + //ipe + "facing=east,half=bottom,shape=straight,woodtype=ipe": { "model": "forestry:arboriculture/stairs/ipe" }, + "facing=west,half=bottom,shape=straight,woodtype=ipe": { "model": "forestry:arboriculture/stairs/ipe", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight,woodtype=ipe": { "model": "forestry:arboriculture/stairs/ipe", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight,woodtype=ipe": { "model": "forestry:arboriculture/stairs/ipe", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right,woodtype=ipe": { "model": "forestry:arboriculture/stairs/ipe_outer" }, + "facing=west,half=bottom,shape=outer_right,woodtype=ipe": { "model": "forestry:arboriculture/stairs/ipe_outer", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right,woodtype=ipe": { "model": "forestry:arboriculture/stairs/ipe_outer", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right,woodtype=ipe": { "model": "forestry:arboriculture/stairs/ipe_outer", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left,woodtype=ipe": { "model": "forestry:arboriculture/stairs/ipe_outer", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left,woodtype=ipe": { "model": "forestry:arboriculture/stairs/ipe_outer", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left,woodtype=ipe": { "model": "forestry:arboriculture/stairs/ipe_outer" }, + "facing=north,half=bottom,shape=outer_left,woodtype=ipe": { "model": "forestry:arboriculture/stairs/ipe_outer", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right,woodtype=ipe": { "model": "forestry:arboriculture/stairs/ipe_inner" }, + "facing=west,half=bottom,shape=inner_right,woodtype=ipe": { "model": "forestry:arboriculture/stairs/ipe_inner", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right,woodtype=ipe": { "model": "forestry:arboriculture/stairs/ipe_inner", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right,woodtype=ipe": { "model": "forestry:arboriculture/stairs/ipe_inner", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left,woodtype=ipe": { "model": "forestry:arboriculture/stairs/ipe_inner", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left,woodtype=ipe": { "model": "forestry:arboriculture/stairs/ipe_inner", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left,woodtype=ipe": { "model": "forestry:arboriculture/stairs/ipe_inner" }, + "facing=north,half=bottom,shape=inner_left,woodtype=ipe": { "model": "forestry:arboriculture/stairs/ipe_inner", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight,woodtype=ipe": { "model": "forestry:arboriculture/stairs/ipe", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight,woodtype=ipe": { "model": "forestry:arboriculture/stairs/ipe", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight,woodtype=ipe": { "model": "forestry:arboriculture/stairs/ipe", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight,woodtype=ipe": { "model": "forestry:arboriculture/stairs/ipe", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right,woodtype=ipe": { "model": "forestry:arboriculture/stairs/ipe_outer", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right,woodtype=ipe": { "model": "forestry:arboriculture/stairs/ipe_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right,woodtype=ipe": { "model": "forestry:arboriculture/stairs/ipe_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right,woodtype=ipe": { "model": "forestry:arboriculture/stairs/ipe_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left,woodtype=ipe": { "model": "forestry:arboriculture/stairs/ipe_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left,woodtype=ipe": { "model": "forestry:arboriculture/stairs/ipe_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left,woodtype=ipe": { "model": "forestry:arboriculture/stairs/ipe_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left,woodtype=ipe": { "model": "forestry:arboriculture/stairs/ipe_outer", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right,woodtype=ipe": { "model": "forestry:arboriculture/stairs/ipe_inner", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right,woodtype=ipe": { "model": "forestry:arboriculture/stairs/ipe_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right,woodtype=ipe": { "model": "forestry:arboriculture/stairs/ipe_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right,woodtype=ipe": { "model": "forestry:arboriculture/stairs/ipe_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left,woodtype=ipe": { "model": "forestry:arboriculture/stairs/ipe_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left,woodtype=ipe": { "model": "forestry:arboriculture/stairs/ipe_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left,woodtype=ipe": { "model": "forestry:arboriculture/stairs/ipe_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left,woodtype=ipe": { "model": "forestry:arboriculture/stairs/ipe_inner", "x": 180, "uvlock": true }, + #//padauk + "facing=east,half=bottom,shape=straight,woodtype=padauk": { "model": "forestry:arboriculture/stairs/padauk" }, + "facing=west,half=bottom,shape=straight,woodtype=padauk": { "model": "forestry:arboriculture/stairs/padauk", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight,woodtype=padauk": { "model": "forestry:arboriculture/stairs/padauk", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight,woodtype=padauk": { "model": "forestry:arboriculture/stairs/padauk", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right,woodtype=padauk": { "model": "forestry:arboriculture/stairs/padauk_outer" }, + "facing=west,half=bottom,shape=outer_right,woodtype=padauk": { "model": "forestry:arboriculture/stairs/padauk_outer", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right,woodtype=padauk": { "model": "forestry:arboriculture/stairs/padauk_outer", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right,woodtype=padauk": { "model": "forestry:arboriculture/stairs/padauk_outer", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left,woodtype=padauk": { "model": "forestry:arboriculture/stairs/padauk_outer", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left,woodtype=padauk": { "model": "forestry:arboriculture/stairs/padauk_outer", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left,woodtype=padauk": { "model": "forestry:arboriculture/stairs/padauk_outer" }, + "facing=north,half=bottom,shape=outer_left,woodtype=padauk": { "model": "forestry:arboriculture/stairs/padauk_outer", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right,woodtype=padauk": { "model": "forestry:arboriculture/stairs/padauk_inner" }, + "facing=west,half=bottom,shape=inner_right,woodtype=padauk": { "model": "forestry:arboriculture/stairs/padauk_inner", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right,woodtype=padauk": { "model": "forestry:arboriculture/stairs/padauk_inner", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right,woodtype=padauk": { "model": "forestry:arboriculture/stairs/padauk_inner", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left,woodtype=padauk": { "model": "forestry:arboriculture/stairs/padauk_inner", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left,woodtype=padauk": { "model": "forestry:arboriculture/stairs/padauk_inner", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left,woodtype=padauk": { "model": "forestry:arboriculture/stairs/padauk_inner" }, + "facing=north,half=bottom,shape=inner_left,woodtype=padauk": { "model": "forestry:arboriculture/stairs/padauk_inner", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight,woodtype=padauk": { "model": "forestry:arboriculture/stairs/padauk", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight,woodtype=padauk": { "model": "forestry:arboriculture/stairs/padauk", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight,woodtype=padauk": { "model": "forestry:arboriculture/stairs/padauk", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight,woodtype=padauk": { "model": "forestry:arboriculture/stairs/padauk", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right,woodtype=padauk": { "model": "forestry:arboriculture/stairs/padauk_outer", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right,woodtype=padauk": { "model": "forestry:arboriculture/stairs/padauk_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right,woodtype=padauk": { "model": "forestry:arboriculture/stairs/padauk_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right,woodtype=padauk": { "model": "forestry:arboriculture/stairs/padauk_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left,woodtype=padauk": { "model": "forestry:arboriculture/stairs/padauk_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left,woodtype=padauk": { "model": "forestry:arboriculture/stairs/padauk_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left,woodtype=padauk": { "model": "forestry:arboriculture/stairs/padauk_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left,woodtype=padauk": { "model": "forestry:arboriculture/stairs/padauk_outer", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right,woodtype=padauk": { "model": "forestry:arboriculture/stairs/padauk_inner", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right,woodtype=padauk": { "model": "forestry:arboriculture/stairs/padauk_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right,woodtype=padauk": { "model": "forestry:arboriculture/stairs/padauk_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right,woodtype=padauk": { "model": "forestry:arboriculture/stairs/padauk_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left,woodtype=padauk": { "model": "forestry:arboriculture/stairs/padauk_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left,woodtype=padauk": { "model": "forestry:arboriculture/stairs/padauk_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left,woodtype=padauk": { "model": "forestry:arboriculture/stairs/padauk_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left,woodtype=padauk": { "model": "forestry:arboriculture/stairs/padauk_inner", "x": 180, "uvlock": true }, + //cocobolo + "facing=east,half=bottom,shape=straight,woodtype=cocobolo": { "model": "forestry:arboriculture/stairs/cocobolo" }, + "facing=west,half=bottom,shape=straight,woodtype=cocobolo": { "model": "forestry:arboriculture/stairs/cocobolo", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight,woodtype=cocobolo": { "model": "forestry:arboriculture/stairs/cocobolo", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight,woodtype=cocobolo": { "model": "forestry:arboriculture/stairs/cocobolo", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right,woodtype=cocobolo": { "model": "forestry:arboriculture/stairs/cocobolo_outer" }, + "facing=west,half=bottom,shape=outer_right,woodtype=cocobolo": { "model": "forestry:arboriculture/stairs/cocobolo_outer", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right,woodtype=cocobolo": { "model": "forestry:arboriculture/stairs/cocobolo_outer", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right,woodtype=cocobolo": { "model": "forestry:arboriculture/stairs/cocobolo_outer", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left,woodtype=cocobolo": { "model": "forestry:arboriculture/stairs/cocobolo_outer", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left,woodtype=cocobolo": { "model": "forestry:arboriculture/stairs/cocobolo_outer", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left,woodtype=cocobolo": { "model": "forestry:arboriculture/stairs/cocobolo_outer" }, + "facing=north,half=bottom,shape=outer_left,woodtype=cocobolo": { "model": "forestry:arboriculture/stairs/cocobolo_outer", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right,woodtype=cocobolo": { "model": "forestry:arboriculture/stairs/cocobolo_inner" }, + "facing=west,half=bottom,shape=inner_right,woodtype=cocobolo": { "model": "forestry:arboriculture/stairs/cocobolo_inner", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right,woodtype=cocobolo": { "model": "forestry:arboriculture/stairs/cocobolo_inner", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right,woodtype=cocobolo": { "model": "forestry:arboriculture/stairs/cocobolo_inner", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left,woodtype=cocobolo": { "model": "forestry:arboriculture/stairs/cocobolo_inner", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left,woodtype=cocobolo": { "model": "forestry:arboriculture/stairs/cocobolo_inner", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left,woodtype=cocobolo": { "model": "forestry:arboriculture/stairs/cocobolo_inner" }, + "facing=north,half=bottom,shape=inner_left,woodtype=cocobolo": { "model": "forestry:arboriculture/stairs/cocobolo_inner", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight,woodtype=cocobolo": { "model": "forestry:arboriculture/stairs/cocobolo", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight,woodtype=cocobolo": { "model": "forestry:arboriculture/stairs/cocobolo", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight,woodtype=cocobolo": { "model": "forestry:arboriculture/stairs/cocobolo", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight,woodtype=cocobolo": { "model": "forestry:arboriculture/stairs/cocobolo", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right,woodtype=cocobolo": { "model": "forestry:arboriculture/stairs/cocobolo_outer", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right,woodtype=cocobolo": { "model": "forestry:arboriculture/stairs/cocobolo_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right,woodtype=cocobolo": { "model": "forestry:arboriculture/stairs/cocobolo_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right,woodtype=cocobolo": { "model": "forestry:arboriculture/stairs/cocobolo_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left,woodtype=cocobolo": { "model": "forestry:arboriculture/stairs/cocobolo_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left,woodtype=cocobolo": { "model": "forestry:arboriculture/stairs/cocobolo_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left,woodtype=cocobolo": { "model": "forestry:arboriculture/stairs/cocobolo_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left,woodtype=cocobolo": { "model": "forestry:arboriculture/stairs/cocobolo_outer", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right,woodtype=cocobolo": { "model": "forestry:arboriculture/stairs/cocobolo_inner", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right,woodtype=cocobolo": { "model": "forestry:arboriculture/stairs/cocobolo_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right,woodtype=cocobolo": { "model": "forestry:arboriculture/stairs/cocobolo_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right,woodtype=cocobolo": { "model": "forestry:arboriculture/stairs/cocobolo_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left,woodtype=cocobolo": { "model": "forestry:arboriculture/stairs/cocobolo_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left,woodtype=cocobolo": { "model": "forestry:arboriculture/stairs/cocobolo_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left,woodtype=cocobolo": { "model": "forestry:arboriculture/stairs/cocobolo_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left,woodtype=cocobolo": { "model": "forestry:arboriculture/stairs/cocobolo_inner", "x": 180, "uvlock": true }, + //zebrawood + "facing=east,half=bottom,shape=straight,woodtype=zebrawood": { "model": "forestry:arboriculture/stairs/zebrawood" }, + "facing=west,half=bottom,shape=straight,woodtype=zebrawood": { "model": "forestry:arboriculture/stairs/zebrawood", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight,woodtype=zebrawood": { "model": "forestry:arboriculture/stairs/zebrawood", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight,woodtype=zebrawood": { "model": "forestry:arboriculture/stairs/zebrawood", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right,woodtype=zebrawood": { "model": "forestry:arboriculture/stairs/zebrawood_outer" }, + "facing=west,half=bottom,shape=outer_right,woodtype=zebrawood": { "model": "forestry:arboriculture/stairs/zebrawood_outer", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right,woodtype=zebrawood": { "model": "forestry:arboriculture/stairs/zebrawood_outer", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right,woodtype=zebrawood": { "model": "forestry:arboriculture/stairs/zebrawood_outer", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left,woodtype=zebrawood": { "model": "forestry:arboriculture/stairs/zebrawood_outer", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left,woodtype=zebrawood": { "model": "forestry:arboriculture/stairs/zebrawood_outer", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left,woodtype=zebrawood": { "model": "forestry:arboriculture/stairs/zebrawood_outer" }, + "facing=north,half=bottom,shape=outer_left,woodtype=zebrawood": { "model": "forestry:arboriculture/stairs/zebrawood_outer", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right,woodtype=zebrawood": { "model": "forestry:arboriculture/stairs/zebrawood_inner" }, + "facing=west,half=bottom,shape=inner_right,woodtype=zebrawood": { "model": "forestry:arboriculture/stairs/zebrawood_inner", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right,woodtype=zebrawood": { "model": "forestry:arboriculture/stairs/zebrawood_inner", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right,woodtype=zebrawood": { "model": "forestry:arboriculture/stairs/zebrawood_inner", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left,woodtype=zebrawood": { "model": "forestry:arboriculture/stairs/zebrawood_inner", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left,woodtype=zebrawood": { "model": "forestry:arboriculture/stairs/zebrawood_inner", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left,woodtype=zebrawood": { "model": "forestry:arboriculture/stairs/zebrawood_inner" }, + "facing=north,half=bottom,shape=inner_left,woodtype=zebrawood": { "model": "forestry:arboriculture/stairs/zebrawood_inner", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight,woodtype=zebrawood": { "model": "forestry:arboriculture/stairs/zebrawood", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight,woodtype=zebrawood": { "model": "forestry:arboriculture/stairs/zebrawood", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight,woodtype=zebrawood": { "model": "forestry:arboriculture/stairs/zebrawood", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight,woodtype=zebrawood": { "model": "forestry:arboriculture/stairs/zebrawood", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right,woodtype=zebrawood": { "model": "forestry:arboriculture/stairs/zebrawood_outer", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right,woodtype=zebrawood": { "model": "forestry:arboriculture/stairs/zebrawood_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right,woodtype=zebrawood": { "model": "forestry:arboriculture/stairs/zebrawood_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right,woodtype=zebrawood": { "model": "forestry:arboriculture/stairs/zebrawood_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left,woodtype=zebrawood": { "model": "forestry:arboriculture/stairs/zebrawood_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left,woodtype=zebrawood": { "model": "forestry:arboriculture/stairs/zebrawood_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left,woodtype=zebrawood": { "model": "forestry:arboriculture/stairs/zebrawood_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left,woodtype=zebrawood": { "model": "forestry:arboriculture/stairs/zebrawood_outer", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right,woodtype=zebrawood": { "model": "forestry:arboriculture/stairs/zebrawood_inner", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right,woodtype=zebrawood": { "model": "forestry:arboriculture/stairs/zebrawood_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right,woodtype=zebrawood": { "model": "forestry:arboriculture/stairs/zebrawood_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right,woodtype=zebrawood": { "model": "forestry:arboriculture/stairs/zebrawood_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left,woodtype=zebrawood": { "model": "forestry:arboriculture/stairs/zebrawood_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left,woodtype=zebrawood": { "model": "forestry:arboriculture/stairs/zebrawood_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left,woodtype=zebrawood": { "model": "forestry:arboriculture/stairs/zebrawood_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left,woodtype=zebrawood": { "model": "forestry:arboriculture/stairs/zebrawood_inner", "x": 180, "uvlock": true } + } +} diff --git a/src/main/resources/assets/forestry/blockstates/stairsFireproof.json b/src/main/resources/assets/forestry/blockstates/stairsFireproof.json new file mode 100644 index 000000000..23d4f74b8 --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/stairsFireproof.json @@ -0,0 +1,1193 @@ +{ + "variants": { + //larch + "facing=east,half=bottom,shape=straight,woodtype=larch": { "model": "forestry:arboriculture/stairs/larch" }, + "facing=west,half=bottom,shape=straight,woodtype=larch": { "model": "forestry:arboriculture/stairs/larch", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight,woodtype=larch": { "model": "forestry:arboriculture/stairs/larch", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight,woodtype=larch": { "model": "forestry:arboriculture/stairs/larch", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right,woodtype=larch": { "model": "forestry:arboriculture/stairs/larch_outer" }, + "facing=west,half=bottom,shape=outer_right,woodtype=larch": { "model": "forestry:arboriculture/stairs/larch_outer", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right,woodtype=larch": { "model": "forestry:arboriculture/stairs/larch_outer", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right,woodtype=larch": { "model": "forestry:arboriculture/stairs/larch_outer", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left,woodtype=larch": { "model": "forestry:arboriculture/stairs/larch_outer", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left,woodtype=larch": { "model": "forestry:arboriculture/stairs/larch_outer", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left,woodtype=larch": { "model": "forestry:arboriculture/stairs/larch_outer" }, + "facing=north,half=bottom,shape=outer_left,woodtype=larch": { "model": "forestry:arboriculture/stairs/larch_outer", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right,woodtype=larch": { "model": "forestry:arboriculture/stairs/larch_inner" }, + "facing=west,half=bottom,shape=inner_right,woodtype=larch": { "model": "forestry:arboriculture/stairs/larch_inner", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right,woodtype=larch": { "model": "forestry:arboriculture/stairs/larch_inner", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right,woodtype=larch": { "model": "forestry:arboriculture/stairs/larch_inner", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left,woodtype=larch": { "model": "forestry:arboriculture/stairs/larch_inner", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left,woodtype=larch": { "model": "forestry:arboriculture/stairs/larch_inner", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left,woodtype=larch": { "model": "forestry:arboriculture/stairs/larch_inner" }, + "facing=north,half=bottom,shape=inner_left,woodtype=larch": { "model": "forestry:arboriculture/stairs/larch_inner", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight,woodtype=larch": { "model": "forestry:arboriculture/stairs/larch", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight,woodtype=larch": { "model": "forestry:arboriculture/stairs/larch", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight,woodtype=larch": { "model": "forestry:arboriculture/stairs/larch", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight,woodtype=larch": { "model": "forestry:arboriculture/stairs/larch", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right,woodtype=larch": { "model": "forestry:arboriculture/stairs/larch_outer", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right,woodtype=larch": { "model": "forestry:arboriculture/stairs/larch_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right,woodtype=larch": { "model": "forestry:arboriculture/stairs/larch_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right,woodtype=larch": { "model": "forestry:arboriculture/stairs/larch_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left,woodtype=larch": { "model": "forestry:arboriculture/stairs/larch_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left,woodtype=larch": { "model": "forestry:arboriculture/stairs/larch_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left,woodtype=larch": { "model": "forestry:arboriculture/stairs/larch_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left,woodtype=larch": { "model": "forestry:arboriculture/stairs/larch_outer", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right,woodtype=larch": { "model": "forestry:arboriculture/stairs/larch_inner", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right,woodtype=larch": { "model": "forestry:arboriculture/stairs/larch_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right,woodtype=larch": { "model": "forestry:arboriculture/stairs/larch_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right,woodtype=larch": { "model": "forestry:arboriculture/stairs/larch_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left,woodtype=larch": { "model": "forestry:arboriculture/stairs/larch_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left,woodtype=larch": { "model": "forestry:arboriculture/stairs/larch_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left,woodtype=larch": { "model": "forestry:arboriculture/stairs/larch_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left,woodtype=larch": { "model": "forestry:arboriculture/stairs/larch_inner", "x": 180, "uvlock": true }, + //teak + "facing=east,half=bottom,shape=straight,woodtype=teak": { "model": "forestry:arboriculture/stairs/teak" }, + "facing=west,half=bottom,shape=straight,woodtype=teak": { "model": "forestry:arboriculture/stairs/teak", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight,woodtype=teak": { "model": "forestry:arboriculture/stairs/teak", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight,woodtype=teak": { "model": "forestry:arboriculture/stairs/teak", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right,woodtype=teak": { "model": "forestry:arboriculture/stairs/teak_outer" }, + "facing=west,half=bottom,shape=outer_right,woodtype=teak": { "model": "forestry:arboriculture/stairs/teak_outer", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right,woodtype=teak": { "model": "forestry:arboriculture/stairs/teak_outer", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right,woodtype=teak": { "model": "forestry:arboriculture/stairs/teak_outer", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left,woodtype=teak": { "model": "forestry:arboriculture/stairs/teak_outer", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left,woodtype=teak": { "model": "forestry:arboriculture/stairs/teak_outer", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left,woodtype=teak": { "model": "forestry:arboriculture/stairs/teak_outer" }, + "facing=north,half=bottom,shape=outer_left,woodtype=teak": { "model": "forestry:arboriculture/stairs/teak_outer", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right,woodtype=teak": { "model": "forestry:arboriculture/stairs/teak_inner" }, + "facing=west,half=bottom,shape=inner_right,woodtype=teak": { "model": "forestry:arboriculture/stairs/teak_inner", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right,woodtype=teak": { "model": "forestry:arboriculture/stairs/teak_inner", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right,woodtype=teak": { "model": "forestry:arboriculture/stairs/teak_inner", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left,woodtype=teak": { "model": "forestry:arboriculture/stairs/teak_inner", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left,woodtype=teak": { "model": "forestry:arboriculture/stairs/teak_inner", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left,woodtype=teak": { "model": "forestry:arboriculture/stairs/teak_inner" }, + "facing=north,half=bottom,shape=inner_left,woodtype=teak": { "model": "forestry:arboriculture/stairs/teak_inner", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight,woodtype=teak": { "model": "forestry:arboriculture/stairs/teak", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight,woodtype=teak": { "model": "forestry:arboriculture/stairs/teak", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight,woodtype=teak": { "model": "forestry:arboriculture/stairs/teak", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight,woodtype=teak": { "model": "forestry:arboriculture/stairs/teak", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right,woodtype=teak": { "model": "forestry:arboriculture/stairs/teak_outer", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right,woodtype=teak": { "model": "forestry:arboriculture/stairs/teak_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right,woodtype=teak": { "model": "forestry:arboriculture/stairs/teak_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right,woodtype=teak": { "model": "forestry:arboriculture/stairs/teak_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left,woodtype=teak": { "model": "forestry:arboriculture/stairs/teak_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left,woodtype=teak": { "model": "forestry:arboriculture/stairs/teak_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left,woodtype=teak": { "model": "forestry:arboriculture/stairs/teak_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left,woodtype=teak": { "model": "forestry:arboriculture/stairs/teak_outer", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right,woodtype=teak": { "model": "forestry:arboriculture/stairs/teak_inner", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right,woodtype=teak": { "model": "forestry:arboriculture/stairs/teak_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right,woodtype=teak": { "model": "forestry:arboriculture/stairs/teak_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right,woodtype=teak": { "model": "forestry:arboriculture/stairs/teak_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left,woodtype=teak": { "model": "forestry:arboriculture/stairs/teak_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left,woodtype=teak": { "model": "forestry:arboriculture/stairs/teak_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left,woodtype=teak": { "model": "forestry:arboriculture/stairs/teak_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left,woodtype=teak": { "model": "forestry:arboriculture/stairs/teak_inner", "x": 180, "uvlock": true }, + //acacia + "facing=east,half=bottom,shape=straight,woodtype=acacia": { "model": "forestry:arboriculture/stairs/acacia" }, + "facing=west,half=bottom,shape=straight,woodtype=acacia": { "model": "forestry:arboriculture/stairs/acacia", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight,woodtype=acacia": { "model": "forestry:arboriculture/stairs/acacia", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight,woodtype=acacia": { "model": "forestry:arboriculture/stairs/acacia", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right,woodtype=acacia": { "model": "forestry:arboriculture/stairs/acacia_outer" }, + "facing=west,half=bottom,shape=outer_right,woodtype=acacia": { "model": "forestry:arboriculture/stairs/acacia_outer", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right,woodtype=acacia": { "model": "forestry:arboriculture/stairs/acacia_outer", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right,woodtype=acacia": { "model": "forestry:arboriculture/stairs/acacia_outer", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left,woodtype=acacia": { "model": "forestry:arboriculture/stairs/acacia_outer", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left,woodtype=acacia": { "model": "forestry:arboriculture/stairs/acacia_outer", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left,woodtype=acacia": { "model": "forestry:arboriculture/stairs/acacia_outer" }, + "facing=north,half=bottom,shape=outer_left,woodtype=acacia": { "model": "forestry:arboriculture/stairs/acacia_outer", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right,woodtype=acacia": { "model": "forestry:arboriculture/stairs/acacia_inner" }, + "facing=west,half=bottom,shape=inner_right,woodtype=acacia": { "model": "forestry:arboriculture/stairs/acacia_inner", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right,woodtype=acacia": { "model": "forestry:arboriculture/stairs/acacia_inner", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right,woodtype=acacia": { "model": "forestry:arboriculture/stairs/acacia_inner", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left,woodtype=acacia": { "model": "forestry:arboriculture/stairs/acacia_inner", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left,woodtype=acacia": { "model": "forestry:arboriculture/stairs/acacia_inner", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left,woodtype=acacia": { "model": "forestry:arboriculture/stairs/acacia_inner" }, + "facing=north,half=bottom,shape=inner_left,woodtype=acacia": { "model": "forestry:arboriculture/stairs/acacia_inner", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight,woodtype=acacia": { "model": "forestry:arboriculture/stairs/acacia", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight,woodtype=acacia": { "model": "forestry:arboriculture/stairs/acacia", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight,woodtype=acacia": { "model": "forestry:arboriculture/stairs/acacia", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight,woodtype=acacia": { "model": "forestry:arboriculture/stairs/acacia", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right,woodtype=acacia": { "model": "forestry:arboriculture/stairs/acacia_outer", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right,woodtype=acacia": { "model": "forestry:arboriculture/stairs/acacia_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right,woodtype=acacia": { "model": "forestry:arboriculture/stairs/acacia_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right,woodtype=acacia": { "model": "forestry:arboriculture/stairs/acacia_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left,woodtype=acacia": { "model": "forestry:arboriculture/stairs/acacia_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left,woodtype=acacia": { "model": "forestry:arboriculture/stairs/acacia_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left,woodtype=acacia": { "model": "forestry:arboriculture/stairs/acacia_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left,woodtype=acacia": { "model": "forestry:arboriculture/stairs/acacia_outer", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right,woodtype=acacia": { "model": "forestry:arboriculture/stairs/acacia_inner", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right,woodtype=acacia": { "model": "forestry:arboriculture/stairs/acacia_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right,woodtype=acacia": { "model": "forestry:arboriculture/stairs/acacia_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right,woodtype=acacia": { "model": "forestry:arboriculture/stairs/acacia_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left,woodtype=acacia": { "model": "forestry:arboriculture/stairs/acacia_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left,woodtype=acacia": { "model": "forestry:arboriculture/stairs/acacia_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left,woodtype=acacia": { "model": "forestry:arboriculture/stairs/acacia_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left,woodtype=acacia": { "model": "forestry:arboriculture/stairs/acacia_inner", "x": 180, "uvlock": true }, + //lime + "facing=east,half=bottom,shape=straight,woodtype=lime": { "model": "forestry:arboriculture/stairs/lime" }, + "facing=west,half=bottom,shape=straight,woodtype=lime": { "model": "forestry:arboriculture/stairs/lime", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight,woodtype=lime": { "model": "forestry:arboriculture/stairs/lime", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight,woodtype=lime": { "model": "forestry:arboriculture/stairs/lime", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right,woodtype=lime": { "model": "forestry:arboriculture/stairs/lime_outer" }, + "facing=west,half=bottom,shape=outer_right,woodtype=lime": { "model": "forestry:arboriculture/stairs/lime_outer", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right,woodtype=lime": { "model": "forestry:arboriculture/stairs/lime_outer", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right,woodtype=lime": { "model": "forestry:arboriculture/stairs/lime_outer", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left,woodtype=lime": { "model": "forestry:arboriculture/stairs/lime_outer", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left,woodtype=lime": { "model": "forestry:arboriculture/stairs/lime_outer", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left,woodtype=lime": { "model": "forestry:arboriculture/stairs/lime_outer" }, + "facing=north,half=bottom,shape=outer_left,woodtype=lime": { "model": "forestry:arboriculture/stairs/lime_outer", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right,woodtype=lime": { "model": "forestry:arboriculture/stairs/lime_inner" }, + "facing=west,half=bottom,shape=inner_right,woodtype=lime": { "model": "forestry:arboriculture/stairs/lime_inner", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right,woodtype=lime": { "model": "forestry:arboriculture/stairs/lime_inner", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right,woodtype=lime": { "model": "forestry:arboriculture/stairs/lime_inner", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left,woodtype=lime": { "model": "forestry:arboriculture/stairs/lime_inner", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left,woodtype=lime": { "model": "forestry:arboriculture/stairs/lime_inner", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left,woodtype=lime": { "model": "forestry:arboriculture/stairs/lime_inner" }, + "facing=north,half=bottom,shape=inner_left,woodtype=lime": { "model": "forestry:arboriculture/stairs/lime_inner", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight,woodtype=lime": { "model": "forestry:arboriculture/stairs/lime", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight,woodtype=lime": { "model": "forestry:arboriculture/stairs/lime", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight,woodtype=lime": { "model": "forestry:arboriculture/stairs/lime", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight,woodtype=lime": { "model": "forestry:arboriculture/stairs/lime", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right,woodtype=lime": { "model": "forestry:arboriculture/stairs/lime_outer", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right,woodtype=lime": { "model": "forestry:arboriculture/stairs/lime_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right,woodtype=lime": { "model": "forestry:arboriculture/stairs/lime_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right,woodtype=lime": { "model": "forestry:arboriculture/stairs/lime_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left,woodtype=lime": { "model": "forestry:arboriculture/stairs/lime_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left,woodtype=lime": { "model": "forestry:arboriculture/stairs/lime_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left,woodtype=lime": { "model": "forestry:arboriculture/stairs/lime_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left,woodtype=lime": { "model": "forestry:arboriculture/stairs/lime_outer", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right,woodtype=lime": { "model": "forestry:arboriculture/stairs/lime_inner", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right,woodtype=lime": { "model": "forestry:arboriculture/stairs/lime_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right,woodtype=lime": { "model": "forestry:arboriculture/stairs/lime_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right,woodtype=lime": { "model": "forestry:arboriculture/stairs/lime_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left,woodtype=lime": { "model": "forestry:arboriculture/stairs/lime_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left,woodtype=lime": { "model": "forestry:arboriculture/stairs/lime_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left,woodtype=lime": { "model": "forestry:arboriculture/stairs/lime_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left,woodtype=lime": { "model": "forestry:arboriculture/stairs/lime_inner", "x": 180, "uvlock": true }, + //chestnut + "facing=east,half=bottom,shape=straight,woodtype=chestnut": { "model": "forestry:arboriculture/stairs/chestnut" }, + "facing=west,half=bottom,shape=straight,woodtype=chestnut": { "model": "forestry:arboriculture/stairs/chestnut", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight,woodtype=chestnut": { "model": "forestry:arboriculture/stairs/chestnut", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight,woodtype=chestnut": { "model": "forestry:arboriculture/stairs/chestnut", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right,woodtype=chestnut": { "model": "forestry:arboriculture/stairs/chestnut_outer" }, + "facing=west,half=bottom,shape=outer_right,woodtype=chestnut": { "model": "forestry:arboriculture/stairs/chestnut_outer", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right,woodtype=chestnut": { "model": "forestry:arboriculture/stairs/chestnut_outer", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right,woodtype=chestnut": { "model": "forestry:arboriculture/stairs/chestnut_outer", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left,woodtype=chestnut": { "model": "forestry:arboriculture/stairs/chestnut_outer", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left,woodtype=chestnut": { "model": "forestry:arboriculture/stairs/chestnut_outer", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left,woodtype=chestnut": { "model": "forestry:arboriculture/stairs/chestnut_outer" }, + "facing=north,half=bottom,shape=outer_left,woodtype=chestnut": { "model": "forestry:arboriculture/stairs/chestnut_outer", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right,woodtype=chestnut": { "model": "forestry:arboriculture/stairs/chestnut_inner" }, + "facing=west,half=bottom,shape=inner_right,woodtype=chestnut": { "model": "forestry:arboriculture/stairs/chestnut_inner", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right,woodtype=chestnut": { "model": "forestry:arboriculture/stairs/chestnut_inner", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right,woodtype=chestnut": { "model": "forestry:arboriculture/stairs/chestnut_inner", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left,woodtype=chestnut": { "model": "forestry:arboriculture/stairs/chestnut_inner", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left,woodtype=chestnut": { "model": "forestry:arboriculture/stairs/chestnut_inner", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left,woodtype=chestnut": { "model": "forestry:arboriculture/stairs/chestnut_inner" }, + "facing=north,half=bottom,shape=inner_left,woodtype=chestnut": { "model": "forestry:arboriculture/stairs/chestnut_inner", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight,woodtype=chestnut": { "model": "forestry:arboriculture/stairs/chestnut", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight,woodtype=chestnut": { "model": "forestry:arboriculture/stairs/chestnut", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight,woodtype=chestnut": { "model": "forestry:arboriculture/stairs/chestnut", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight,woodtype=chestnut": { "model": "forestry:arboriculture/stairs/chestnut", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right,woodtype=chestnut": { "model": "forestry:arboriculture/stairs/chestnut_outer", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right,woodtype=chestnut": { "model": "forestry:arboriculture/stairs/chestnut_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right,woodtype=chestnut": { "model": "forestry:arboriculture/stairs/chestnut_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right,woodtype=chestnut": { "model": "forestry:arboriculture/stairs/chestnut_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left,woodtype=chestnut": { "model": "forestry:arboriculture/stairs/chestnut_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left,woodtype=chestnut": { "model": "forestry:arboriculture/stairs/chestnut_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left,woodtype=chestnut": { "model": "forestry:arboriculture/stairs/chestnut_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left,woodtype=chestnut": { "model": "forestry:arboriculture/stairs/chestnut_outer", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right,woodtype=chestnut": { "model": "forestry:arboriculture/stairs/chestnut_inner", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right,woodtype=chestnut": { "model": "forestry:arboriculture/stairs/chestnut_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right,woodtype=chestnut": { "model": "forestry:arboriculture/stairs/chestnut_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right,woodtype=chestnut": { "model": "forestry:arboriculture/stairs/chestnut_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left,woodtype=chestnut": { "model": "forestry:arboriculture/stairs/chestnut_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left,woodtype=chestnut": { "model": "forestry:arboriculture/stairs/chestnut_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left,woodtype=chestnut": { "model": "forestry:arboriculture/stairs/chestnut_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left,woodtype=chestnut": { "model": "forestry:arboriculture/stairs/chestnut_inner", "x": 180, "uvlock": true }, + //wenge + "facing=east,half=bottom,shape=straight,woodtype=wenge": { "model": "forestry:arboriculture/stairs/wenge" }, + "facing=west,half=bottom,shape=straight,woodtype=wenge": { "model": "forestry:arboriculture/stairs/wenge", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight,woodtype=wenge": { "model": "forestry:arboriculture/stairs/wenge", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight,woodtype=wenge": { "model": "forestry:arboriculture/stairs/wenge", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right,woodtype=wenge": { "model": "forestry:arboriculture/stairs/wenge_outer" }, + "facing=west,half=bottom,shape=outer_right,woodtype=wenge": { "model": "forestry:arboriculture/stairs/wenge_outer", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right,woodtype=wenge": { "model": "forestry:arboriculture/stairs/wenge_outer", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right,woodtype=wenge": { "model": "forestry:arboriculture/stairs/wenge_outer", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left,woodtype=wenge": { "model": "forestry:arboriculture/stairs/wenge_outer", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left,woodtype=wenge": { "model": "forestry:arboriculture/stairs/wenge_outer", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left,woodtype=wenge": { "model": "forestry:arboriculture/stairs/wenge_outer" }, + "facing=north,half=bottom,shape=outer_left,woodtype=wenge": { "model": "forestry:arboriculture/stairs/wenge_outer", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right,woodtype=wenge": { "model": "forestry:arboriculture/stairs/wenge_inner" }, + "facing=west,half=bottom,shape=inner_right,woodtype=wenge": { "model": "forestry:arboriculture/stairs/wenge_inner", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right,woodtype=wenge": { "model": "forestry:arboriculture/stairs/wenge_inner", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right,woodtype=wenge": { "model": "forestry:arboriculture/stairs/wenge_inner", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left,woodtype=wenge": { "model": "forestry:arboriculture/stairs/wenge_inner", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left,woodtype=wenge": { "model": "forestry:arboriculture/stairs/wenge_inner", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left,woodtype=wenge": { "model": "forestry:arboriculture/stairs/wenge_inner" }, + "facing=north,half=bottom,shape=inner_left,woodtype=wenge": { "model": "forestry:arboriculture/stairs/wenge_inner", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight,woodtype=wenge": { "model": "forestry:arboriculture/stairs/wenge", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight,woodtype=wenge": { "model": "forestry:arboriculture/stairs/wenge", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight,woodtype=wenge": { "model": "forestry:arboriculture/stairs/wenge", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight,woodtype=wenge": { "model": "forestry:arboriculture/stairs/wenge", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right,woodtype=wenge": { "model": "forestry:arboriculture/stairs/wenge_outer", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right,woodtype=wenge": { "model": "forestry:arboriculture/stairs/wenge_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right,woodtype=wenge": { "model": "forestry:arboriculture/stairs/wenge_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right,woodtype=wenge": { "model": "forestry:arboriculture/stairs/wenge_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left,woodtype=wenge": { "model": "forestry:arboriculture/stairs/wenge_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left,woodtype=wenge": { "model": "forestry:arboriculture/stairs/wenge_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left,woodtype=wenge": { "model": "forestry:arboriculture/stairs/wenge_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left,woodtype=wenge": { "model": "forestry:arboriculture/stairs/wenge_outer", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right,woodtype=wenge": { "model": "forestry:arboriculture/stairs/wenge_inner", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right,woodtype=wenge": { "model": "forestry:arboriculture/stairs/wenge_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right,woodtype=wenge": { "model": "forestry:arboriculture/stairs/wenge_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right,woodtype=wenge": { "model": "forestry:arboriculture/stairs/wenge_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left,woodtype=wenge": { "model": "forestry:arboriculture/stairs/wenge_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left,woodtype=wenge": { "model": "forestry:arboriculture/stairs/wenge_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left,woodtype=wenge": { "model": "forestry:arboriculture/stairs/wenge_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left,woodtype=wenge": { "model": "forestry:arboriculture/stairs/wenge_inner", "x": 180, "uvlock": true }, + //baobab + "facing=east,half=bottom,shape=straight,woodtype=baobab": { "model": "forestry:arboriculture/stairs/baobab" }, + "facing=west,half=bottom,shape=straight,woodtype=baobab": { "model": "forestry:arboriculture/stairs/baobab", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight,woodtype=baobab": { "model": "forestry:arboriculture/stairs/baobab", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight,woodtype=baobab": { "model": "forestry:arboriculture/stairs/baobab", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right,woodtype=baobab": { "model": "forestry:arboriculture/stairs/baobab_outer" }, + "facing=west,half=bottom,shape=outer_right,woodtype=baobab": { "model": "forestry:arboriculture/stairs/baobab_outer", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right,woodtype=baobab": { "model": "forestry:arboriculture/stairs/baobab_outer", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right,woodtype=baobab": { "model": "forestry:arboriculture/stairs/baobab_outer", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left,woodtype=baobab": { "model": "forestry:arboriculture/stairs/baobab_outer", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left,woodtype=baobab": { "model": "forestry:arboriculture/stairs/baobab_outer", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left,woodtype=baobab": { "model": "forestry:arboriculture/stairs/baobab_outer" }, + "facing=north,half=bottom,shape=outer_left,woodtype=baobab": { "model": "forestry:arboriculture/stairs/baobab_outer", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right,woodtype=baobab": { "model": "forestry:arboriculture/stairs/baobab_inner" }, + "facing=west,half=bottom,shape=inner_right,woodtype=baobab": { "model": "forestry:arboriculture/stairs/baobab_inner", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right,woodtype=baobab": { "model": "forestry:arboriculture/stairs/baobab_inner", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right,woodtype=baobab": { "model": "forestry:arboriculture/stairs/baobab_inner", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left,woodtype=baobab": { "model": "forestry:arboriculture/stairs/baobab_inner", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left,woodtype=baobab": { "model": "forestry:arboriculture/stairs/baobab_inner", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left,woodtype=baobab": { "model": "forestry:arboriculture/stairs/baobab_inner" }, + "facing=north,half=bottom,shape=inner_left,woodtype=baobab": { "model": "forestry:arboriculture/stairs/baobab_inner", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight,woodtype=baobab": { "model": "forestry:arboriculture/stairs/baobab", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight,woodtype=baobab": { "model": "forestry:arboriculture/stairs/baobab", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight,woodtype=baobab": { "model": "forestry:arboriculture/stairs/baobab", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight,woodtype=baobab": { "model": "forestry:arboriculture/stairs/baobab", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right,woodtype=baobab": { "model": "forestry:arboriculture/stairs/baobab_outer", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right,woodtype=baobab": { "model": "forestry:arboriculture/stairs/baobab_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right,woodtype=baobab": { "model": "forestry:arboriculture/stairs/baobab_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right,woodtype=baobab": { "model": "forestry:arboriculture/stairs/baobab_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left,woodtype=baobab": { "model": "forestry:arboriculture/stairs/baobab_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left,woodtype=baobab": { "model": "forestry:arboriculture/stairs/baobab_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left,woodtype=baobab": { "model": "forestry:arboriculture/stairs/baobab_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left,woodtype=baobab": { "model": "forestry:arboriculture/stairs/baobab_outer", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right,woodtype=baobab": { "model": "forestry:arboriculture/stairs/baobab_inner", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right,woodtype=baobab": { "model": "forestry:arboriculture/stairs/baobab_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right,woodtype=baobab": { "model": "forestry:arboriculture/stairs/baobab_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right,woodtype=baobab": { "model": "forestry:arboriculture/stairs/baobab_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left,woodtype=baobab": { "model": "forestry:arboriculture/stairs/baobab_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left,woodtype=baobab": { "model": "forestry:arboriculture/stairs/baobab_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left,woodtype=baobab": { "model": "forestry:arboriculture/stairs/baobab_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left,woodtype=baobab": { "model": "forestry:arboriculture/stairs/baobab_inner", "x": 180, "uvlock": true }, + //sequoia + "facing=east,half=bottom,shape=straight,woodtype=sequoia": { "model": "forestry:arboriculture/stairs/sequoia" }, + "facing=west,half=bottom,shape=straight,woodtype=sequoia": { "model": "forestry:arboriculture/stairs/sequoia", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight,woodtype=sequoia": { "model": "forestry:arboriculture/stairs/sequoia", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight,woodtype=sequoia": { "model": "forestry:arboriculture/stairs/sequoia", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right,woodtype=sequoia": { "model": "forestry:arboriculture/stairs/sequoia_outer" }, + "facing=west,half=bottom,shape=outer_right,woodtype=sequoia": { "model": "forestry:arboriculture/stairs/sequoia_outer", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right,woodtype=sequoia": { "model": "forestry:arboriculture/stairs/sequoia_outer", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right,woodtype=sequoia": { "model": "forestry:arboriculture/stairs/sequoia_outer", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left,woodtype=sequoia": { "model": "forestry:arboriculture/stairs/sequoia_outer", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left,woodtype=sequoia": { "model": "forestry:arboriculture/stairs/sequoia_outer", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left,woodtype=sequoia": { "model": "forestry:arboriculture/stairs/sequoia_outer" }, + "facing=north,half=bottom,shape=outer_left,woodtype=sequoia": { "model": "forestry:arboriculture/stairs/sequoia_outer", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right,woodtype=sequoia": { "model": "forestry:arboriculture/stairs/sequoia_inner" }, + "facing=west,half=bottom,shape=inner_right,woodtype=sequoia": { "model": "forestry:arboriculture/stairs/sequoia_inner", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right,woodtype=sequoia": { "model": "forestry:arboriculture/stairs/sequoia_inner", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right,woodtype=sequoia": { "model": "forestry:arboriculture/stairs/sequoia_inner", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left,woodtype=sequoia": { "model": "forestry:arboriculture/stairs/sequoia_inner", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left,woodtype=sequoia": { "model": "forestry:arboriculture/stairs/sequoia_inner", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left,woodtype=sequoia": { "model": "forestry:arboriculture/stairs/sequoia_inner" }, + "facing=north,half=bottom,shape=inner_left,woodtype=sequoia": { "model": "forestry:arboriculture/stairs/sequoia_inner", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight,woodtype=sequoia": { "model": "forestry:arboriculture/stairs/sequoia", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight,woodtype=sequoia": { "model": "forestry:arboriculture/stairs/sequoia", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight,woodtype=sequoia": { "model": "forestry:arboriculture/stairs/sequoia", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight,woodtype=sequoia": { "model": "forestry:arboriculture/stairs/sequoia", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right,woodtype=sequoia": { "model": "forestry:arboriculture/stairs/sequoia_outer", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right,woodtype=sequoia": { "model": "forestry:arboriculture/stairs/sequoia_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right,woodtype=sequoia": { "model": "forestry:arboriculture/stairs/sequoia_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right,woodtype=sequoia": { "model": "forestry:arboriculture/stairs/sequoia_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left,woodtype=sequoia": { "model": "forestry:arboriculture/stairs/sequoia_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left,woodtype=sequoia": { "model": "forestry:arboriculture/stairs/sequoia_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left,woodtype=sequoia": { "model": "forestry:arboriculture/stairs/sequoia_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left,woodtype=sequoia": { "model": "forestry:arboriculture/stairs/sequoia_outer", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right,woodtype=sequoia": { "model": "forestry:arboriculture/stairs/sequoia_inner", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right,woodtype=sequoia": { "model": "forestry:arboriculture/stairs/sequoia_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right,woodtype=sequoia": { "model": "forestry:arboriculture/stairs/sequoia_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right,woodtype=sequoia": { "model": "forestry:arboriculture/stairs/sequoia_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left,woodtype=sequoia": { "model": "forestry:arboriculture/stairs/sequoia_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left,woodtype=sequoia": { "model": "forestry:arboriculture/stairs/sequoia_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left,woodtype=sequoia": { "model": "forestry:arboriculture/stairs/sequoia_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left,woodtype=sequoia": { "model": "forestry:arboriculture/stairs/sequoia_inner", "x": 180, "uvlock": true }, + //kapok + "facing=east,half=bottom,shape=straight,woodtype=kapok": { "model": "forestry:arboriculture/stairs/kapok" }, + "facing=west,half=bottom,shape=straight,woodtype=kapok": { "model": "forestry:arboriculture/stairs/kapok", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight,woodtype=kapok": { "model": "forestry:arboriculture/stairs/kapok", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight,woodtype=kapok": { "model": "forestry:arboriculture/stairs/kapok", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right,woodtype=kapok": { "model": "forestry:arboriculture/stairs/kapok_outer" }, + "facing=west,half=bottom,shape=outer_right,woodtype=kapok": { "model": "forestry:arboriculture/stairs/kapok_outer", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right,woodtype=kapok": { "model": "forestry:arboriculture/stairs/kapok_outer", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right,woodtype=kapok": { "model": "forestry:arboriculture/stairs/kapok_outer", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left,woodtype=kapok": { "model": "forestry:arboriculture/stairs/kapok_outer", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left,woodtype=kapok": { "model": "forestry:arboriculture/stairs/kapok_outer", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left,woodtype=kapok": { "model": "forestry:arboriculture/stairs/kapok_outer" }, + "facing=north,half=bottom,shape=outer_left,woodtype=kapok": { "model": "forestry:arboriculture/stairs/kapok_outer", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right,woodtype=kapok": { "model": "forestry:arboriculture/stairs/kapok_inner" }, + "facing=west,half=bottom,shape=inner_right,woodtype=kapok": { "model": "forestry:arboriculture/stairs/kapok_inner", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right,woodtype=kapok": { "model": "forestry:arboriculture/stairs/kapok_inner", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right,woodtype=kapok": { "model": "forestry:arboriculture/stairs/kapok_inner", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left,woodtype=kapok": { "model": "forestry:arboriculture/stairs/kapok_inner", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left,woodtype=kapok": { "model": "forestry:arboriculture/stairs/kapok_inner", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left,woodtype=kapok": { "model": "forestry:arboriculture/stairs/kapok_inner" }, + "facing=north,half=bottom,shape=inner_left,woodtype=kapok": { "model": "forestry:arboriculture/stairs/kapok_inner", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight,woodtype=kapok": { "model": "forestry:arboriculture/stairs/kapok", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight,woodtype=kapok": { "model": "forestry:arboriculture/stairs/kapok", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight,woodtype=kapok": { "model": "forestry:arboriculture/stairs/kapok", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight,woodtype=kapok": { "model": "forestry:arboriculture/stairs/kapok", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right,woodtype=kapok": { "model": "forestry:arboriculture/stairs/kapok_outer", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right,woodtype=kapok": { "model": "forestry:arboriculture/stairs/kapok_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right,woodtype=kapok": { "model": "forestry:arboriculture/stairs/kapok_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right,woodtype=kapok": { "model": "forestry:arboriculture/stairs/kapok_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left,woodtype=kapok": { "model": "forestry:arboriculture/stairs/kapok_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left,woodtype=kapok": { "model": "forestry:arboriculture/stairs/kapok_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left,woodtype=kapok": { "model": "forestry:arboriculture/stairs/kapok_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left,woodtype=kapok": { "model": "forestry:arboriculture/stairs/kapok_outer", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right,woodtype=kapok": { "model": "forestry:arboriculture/stairs/kapok_inner", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right,woodtype=kapok": { "model": "forestry:arboriculture/stairs/kapok_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right,woodtype=kapok": { "model": "forestry:arboriculture/stairs/kapok_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right,woodtype=kapok": { "model": "forestry:arboriculture/stairs/kapok_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left,woodtype=kapok": { "model": "forestry:arboriculture/stairs/kapok_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left,woodtype=kapok": { "model": "forestry:arboriculture/stairs/kapok_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left,woodtype=kapok": { "model": "forestry:arboriculture/stairs/kapok_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left,woodtype=kapok": { "model": "forestry:arboriculture/stairs/kapok_inner", "x": 180, "uvlock": true }, + //ebony + "facing=east,half=bottom,shape=straight,woodtype=ebony": { "model": "forestry:arboriculture/stairs/ebony" }, + "facing=west,half=bottom,shape=straight,woodtype=ebony": { "model": "forestry:arboriculture/stairs/ebony", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight,woodtype=ebony": { "model": "forestry:arboriculture/stairs/ebony", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight,woodtype=ebony": { "model": "forestry:arboriculture/stairs/ebony", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right,woodtype=ebony": { "model": "forestry:arboriculture/stairs/ebony_outer" }, + "facing=west,half=bottom,shape=outer_right,woodtype=ebony": { "model": "forestry:arboriculture/stairs/ebony_outer", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right,woodtype=ebony": { "model": "forestry:arboriculture/stairs/ebony_outer", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right,woodtype=ebony": { "model": "forestry:arboriculture/stairs/ebony_outer", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left,woodtype=ebony": { "model": "forestry:arboriculture/stairs/ebony_outer", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left,woodtype=ebony": { "model": "forestry:arboriculture/stairs/ebony_outer", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left,woodtype=ebony": { "model": "forestry:arboriculture/stairs/ebony_outer" }, + "facing=north,half=bottom,shape=outer_left,woodtype=ebony": { "model": "forestry:arboriculture/stairs/ebony_outer", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right,woodtype=ebony": { "model": "forestry:arboriculture/stairs/ebony_inner" }, + "facing=west,half=bottom,shape=inner_right,woodtype=ebony": { "model": "forestry:arboriculture/stairs/ebony_inner", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right,woodtype=ebony": { "model": "forestry:arboriculture/stairs/ebony_inner", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right,woodtype=ebony": { "model": "forestry:arboriculture/stairs/ebony_inner", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left,woodtype=ebony": { "model": "forestry:arboriculture/stairs/ebony_inner", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left,woodtype=ebony": { "model": "forestry:arboriculture/stairs/ebony_inner", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left,woodtype=ebony": { "model": "forestry:arboriculture/stairs/ebony_inner" }, + "facing=north,half=bottom,shape=inner_left,woodtype=ebony": { "model": "forestry:arboriculture/stairs/ebony_inner", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight,woodtype=ebony": { "model": "forestry:arboriculture/stairs/ebony", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight,woodtype=ebony": { "model": "forestry:arboriculture/stairs/ebony", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight,woodtype=ebony": { "model": "forestry:arboriculture/stairs/ebony", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight,woodtype=ebony": { "model": "forestry:arboriculture/stairs/ebony", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right,woodtype=ebony": { "model": "forestry:arboriculture/stairs/ebony_outer", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right,woodtype=ebony": { "model": "forestry:arboriculture/stairs/ebony_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right,woodtype=ebony": { "model": "forestry:arboriculture/stairs/ebony_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right,woodtype=ebony": { "model": "forestry:arboriculture/stairs/ebony_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left,woodtype=ebony": { "model": "forestry:arboriculture/stairs/ebony_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left,woodtype=ebony": { "model": "forestry:arboriculture/stairs/ebony_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left,woodtype=ebony": { "model": "forestry:arboriculture/stairs/ebony_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left,woodtype=ebony": { "model": "forestry:arboriculture/stairs/ebony_outer", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right,woodtype=ebony": { "model": "forestry:arboriculture/stairs/ebony_inner", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right,woodtype=ebony": { "model": "forestry:arboriculture/stairs/ebony_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right,woodtype=ebony": { "model": "forestry:arboriculture/stairs/ebony_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right,woodtype=ebony": { "model": "forestry:arboriculture/stairs/ebony_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left,woodtype=ebony": { "model": "forestry:arboriculture/stairs/ebony_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left,woodtype=ebony": { "model": "forestry:arboriculture/stairs/ebony_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left,woodtype=ebony": { "model": "forestry:arboriculture/stairs/ebony_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left,woodtype=ebony": { "model": "forestry:arboriculture/stairs/ebony_inner", "x": 180, "uvlock": true }, + //mahogany + "facing=east,half=bottom,shape=straight,woodtype=mahogany": { "model": "forestry:arboriculture/stairs/mahogany" }, + "facing=west,half=bottom,shape=straight,woodtype=mahogany": { "model": "forestry:arboriculture/stairs/mahogany", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight,woodtype=mahogany": { "model": "forestry:arboriculture/stairs/mahogany", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight,woodtype=mahogany": { "model": "forestry:arboriculture/stairs/mahogany", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right,woodtype=mahogany": { "model": "forestry:arboriculture/stairs/mahogany_outer" }, + "facing=west,half=bottom,shape=outer_right,woodtype=mahogany": { "model": "forestry:arboriculture/stairs/mahogany_outer", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right,woodtype=mahogany": { "model": "forestry:arboriculture/stairs/mahogany_outer", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right,woodtype=mahogany": { "model": "forestry:arboriculture/stairs/mahogany_outer", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left,woodtype=mahogany": { "model": "forestry:arboriculture/stairs/mahogany_outer", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left,woodtype=mahogany": { "model": "forestry:arboriculture/stairs/mahogany_outer", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left,woodtype=mahogany": { "model": "forestry:arboriculture/stairs/mahogany_outer" }, + "facing=north,half=bottom,shape=outer_left,woodtype=mahogany": { "model": "forestry:arboriculture/stairs/mahogany_outer", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right,woodtype=mahogany": { "model": "forestry:arboriculture/stairs/mahogany_inner" }, + "facing=west,half=bottom,shape=inner_right,woodtype=mahogany": { "model": "forestry:arboriculture/stairs/mahogany_inner", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right,woodtype=mahogany": { "model": "forestry:arboriculture/stairs/mahogany_inner", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right,woodtype=mahogany": { "model": "forestry:arboriculture/stairs/mahogany_inner", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left,woodtype=mahogany": { "model": "forestry:arboriculture/stairs/mahogany_inner", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left,woodtype=mahogany": { "model": "forestry:arboriculture/stairs/mahogany_inner", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left,woodtype=mahogany": { "model": "forestry:arboriculture/stairs/mahogany_inner" }, + "facing=north,half=bottom,shape=inner_left,woodtype=mahogany": { "model": "forestry:arboriculture/stairs/mahogany_inner", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight,woodtype=mahogany": { "model": "forestry:arboriculture/stairs/mahogany", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight,woodtype=mahogany": { "model": "forestry:arboriculture/stairs/mahogany", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight,woodtype=mahogany": { "model": "forestry:arboriculture/stairs/mahogany", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight,woodtype=mahogany": { "model": "forestry:arboriculture/stairs/mahogany", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right,woodtype=mahogany": { "model": "forestry:arboriculture/stairs/mahogany_outer", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right,woodtype=mahogany": { "model": "forestry:arboriculture/stairs/mahogany_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right,woodtype=mahogany": { "model": "forestry:arboriculture/stairs/mahogany_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right,woodtype=mahogany": { "model": "forestry:arboriculture/stairs/mahogany_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left,woodtype=mahogany": { "model": "forestry:arboriculture/stairs/mahogany_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left,woodtype=mahogany": { "model": "forestry:arboriculture/stairs/mahogany_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left,woodtype=mahogany": { "model": "forestry:arboriculture/stairs/mahogany_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left,woodtype=mahogany": { "model": "forestry:arboriculture/stairs/mahogany_outer", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right,woodtype=mahogany": { "model": "forestry:arboriculture/stairs/mahogany_inner", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right,woodtype=mahogany": { "model": "forestry:arboriculture/stairs/mahogany_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right,woodtype=mahogany": { "model": "forestry:arboriculture/stairs/mahogany_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right,woodtype=mahogany": { "model": "forestry:arboriculture/stairs/mahogany_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left,woodtype=mahogany": { "model": "forestry:arboriculture/stairs/mahogany_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left,woodtype=mahogany": { "model": "forestry:arboriculture/stairs/mahogany_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left,woodtype=mahogany": { "model": "forestry:arboriculture/stairs/mahogany_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left,woodtype=mahogany": { "model": "forestry:arboriculture/stairs/mahogany_inner", "x": 180, "uvlock": true }, + //balsa + "facing=east,half=bottom,shape=straight,woodtype=balsa": { "model": "forestry:arboriculture/stairs/balsa" }, + "facing=west,half=bottom,shape=straight,woodtype=balsa": { "model": "forestry:arboriculture/stairs/balsa", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight,woodtype=balsa": { "model": "forestry:arboriculture/stairs/balsa", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight,woodtype=balsa": { "model": "forestry:arboriculture/stairs/balsa", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right,woodtype=balsa": { "model": "forestry:arboriculture/stairs/balsa_outer" }, + "facing=west,half=bottom,shape=outer_right,woodtype=balsa": { "model": "forestry:arboriculture/stairs/balsa_outer", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right,woodtype=balsa": { "model": "forestry:arboriculture/stairs/balsa_outer", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right,woodtype=balsa": { "model": "forestry:arboriculture/stairs/balsa_outer", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left,woodtype=balsa": { "model": "forestry:arboriculture/stairs/balsa_outer", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left,woodtype=balsa": { "model": "forestry:arboriculture/stairs/balsa_outer", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left,woodtype=balsa": { "model": "forestry:arboriculture/stairs/balsa_outer" }, + "facing=north,half=bottom,shape=outer_left,woodtype=balsa": { "model": "forestry:arboriculture/stairs/balsa_outer", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right,woodtype=balsa": { "model": "forestry:arboriculture/stairs/balsa_inner" }, + "facing=west,half=bottom,shape=inner_right,woodtype=balsa": { "model": "forestry:arboriculture/stairs/balsa_inner", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right,woodtype=balsa": { "model": "forestry:arboriculture/stairs/balsa_inner", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right,woodtype=balsa": { "model": "forestry:arboriculture/stairs/balsa_inner", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left,woodtype=balsa": { "model": "forestry:arboriculture/stairs/balsa_inner", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left,woodtype=balsa": { "model": "forestry:arboriculture/stairs/balsa_inner", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left,woodtype=balsa": { "model": "forestry:arboriculture/stairs/balsa_inner" }, + "facing=north,half=bottom,shape=inner_left,woodtype=balsa": { "model": "forestry:arboriculture/stairs/balsa_inner", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight,woodtype=balsa": { "model": "forestry:arboriculture/stairs/balsa", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight,woodtype=balsa": { "model": "forestry:arboriculture/stairs/balsa", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight,woodtype=balsa": { "model": "forestry:arboriculture/stairs/balsa", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight,woodtype=balsa": { "model": "forestry:arboriculture/stairs/balsa", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right,woodtype=balsa": { "model": "forestry:arboriculture/stairs/balsa_outer", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right,woodtype=balsa": { "model": "forestry:arboriculture/stairs/balsa_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right,woodtype=balsa": { "model": "forestry:arboriculture/stairs/balsa_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right,woodtype=balsa": { "model": "forestry:arboriculture/stairs/balsa_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left,woodtype=balsa": { "model": "forestry:arboriculture/stairs/balsa_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left,woodtype=balsa": { "model": "forestry:arboriculture/stairs/balsa_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left,woodtype=balsa": { "model": "forestry:arboriculture/stairs/balsa_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left,woodtype=balsa": { "model": "forestry:arboriculture/stairs/balsa_outer", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right,woodtype=balsa": { "model": "forestry:arboriculture/stairs/balsa_inner", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right,woodtype=balsa": { "model": "forestry:arboriculture/stairs/balsa_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right,woodtype=balsa": { "model": "forestry:arboriculture/stairs/balsa_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right,woodtype=balsa": { "model": "forestry:arboriculture/stairs/balsa_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left,woodtype=balsa": { "model": "forestry:arboriculture/stairs/balsa_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left,woodtype=balsa": { "model": "forestry:arboriculture/stairs/balsa_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left,woodtype=balsa": { "model": "forestry:arboriculture/stairs/balsa_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left,woodtype=balsa": { "model": "forestry:arboriculture/stairs/balsa_inner", "x": 180, "uvlock": true }, + //willow + "facing=east,half=bottom,shape=straight,woodtype=willow": { "model": "forestry:arboriculture/stairs/willow" }, + "facing=west,half=bottom,shape=straight,woodtype=willow": { "model": "forestry:arboriculture/stairs/willow", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight,woodtype=willow": { "model": "forestry:arboriculture/stairs/willow", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight,woodtype=willow": { "model": "forestry:arboriculture/stairs/willow", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right,woodtype=willow": { "model": "forestry:arboriculture/stairs/willow_outer" }, + "facing=west,half=bottom,shape=outer_right,woodtype=willow": { "model": "forestry:arboriculture/stairs/willow_outer", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right,woodtype=willow": { "model": "forestry:arboriculture/stairs/willow_outer", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right,woodtype=willow": { "model": "forestry:arboriculture/stairs/willow_outer", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left,woodtype=willow": { "model": "forestry:arboriculture/stairs/willow_outer", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left,woodtype=willow": { "model": "forestry:arboriculture/stairs/willow_outer", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left,woodtype=willow": { "model": "forestry:arboriculture/stairs/willow_outer" }, + "facing=north,half=bottom,shape=outer_left,woodtype=willow": { "model": "forestry:arboriculture/stairs/willow_outer", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right,woodtype=willow": { "model": "forestry:arboriculture/stairs/willow_inner" }, + "facing=west,half=bottom,shape=inner_right,woodtype=willow": { "model": "forestry:arboriculture/stairs/willow_inner", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right,woodtype=willow": { "model": "forestry:arboriculture/stairs/willow_inner", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right,woodtype=willow": { "model": "forestry:arboriculture/stairs/willow_inner", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left,woodtype=willow": { "model": "forestry:arboriculture/stairs/willow_inner", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left,woodtype=willow": { "model": "forestry:arboriculture/stairs/willow_inner", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left,woodtype=willow": { "model": "forestry:arboriculture/stairs/willow_inner" }, + "facing=north,half=bottom,shape=inner_left,woodtype=willow": { "model": "forestry:arboriculture/stairs/willow_inner", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight,woodtype=willow": { "model": "forestry:arboriculture/stairs/willow", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight,woodtype=willow": { "model": "forestry:arboriculture/stairs/willow", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight,woodtype=willow": { "model": "forestry:arboriculture/stairs/willow", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight,woodtype=willow": { "model": "forestry:arboriculture/stairs/willow", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right,woodtype=willow": { "model": "forestry:arboriculture/stairs/willow_outer", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right,woodtype=willow": { "model": "forestry:arboriculture/stairs/willow_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right,woodtype=willow": { "model": "forestry:arboriculture/stairs/willow_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right,woodtype=willow": { "model": "forestry:arboriculture/stairs/willow_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left,woodtype=willow": { "model": "forestry:arboriculture/stairs/willow_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left,woodtype=willow": { "model": "forestry:arboriculture/stairs/willow_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left,woodtype=willow": { "model": "forestry:arboriculture/stairs/willow_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left,woodtype=willow": { "model": "forestry:arboriculture/stairs/willow_outer", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right,woodtype=willow": { "model": "forestry:arboriculture/stairs/willow_inner", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right,woodtype=willow": { "model": "forestry:arboriculture/stairs/willow_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right,woodtype=willow": { "model": "forestry:arboriculture/stairs/willow_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right,woodtype=willow": { "model": "forestry:arboriculture/stairs/willow_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left,woodtype=willow": { "model": "forestry:arboriculture/stairs/willow_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left,woodtype=willow": { "model": "forestry:arboriculture/stairs/willow_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left,woodtype=willow": { "model": "forestry:arboriculture/stairs/willow_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left,woodtype=willow": { "model": "forestry:arboriculture/stairs/willow_inner", "x": 180, "uvlock": true }, + //walnut + "facing=east,half=bottom,shape=straight,woodtype=walnut": { "model": "forestry:arboriculture/stairs/walnut" }, + "facing=west,half=bottom,shape=straight,woodtype=walnut": { "model": "forestry:arboriculture/stairs/walnut", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight,woodtype=walnut": { "model": "forestry:arboriculture/stairs/walnut", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight,woodtype=walnut": { "model": "forestry:arboriculture/stairs/walnut", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right,woodtype=walnut": { "model": "forestry:arboriculture/stairs/walnut_outer" }, + "facing=west,half=bottom,shape=outer_right,woodtype=walnut": { "model": "forestry:arboriculture/stairs/walnut_outer", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right,woodtype=walnut": { "model": "forestry:arboriculture/stairs/walnut_outer", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right,woodtype=walnut": { "model": "forestry:arboriculture/stairs/walnut_outer", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left,woodtype=walnut": { "model": "forestry:arboriculture/stairs/walnut_outer", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left,woodtype=walnut": { "model": "forestry:arboriculture/stairs/walnut_outer", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left,woodtype=walnut": { "model": "forestry:arboriculture/stairs/walnut_outer" }, + "facing=north,half=bottom,shape=outer_left,woodtype=walnut": { "model": "forestry:arboriculture/stairs/walnut_outer", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right,woodtype=walnut": { "model": "forestry:arboriculture/stairs/walnut_inner" }, + "facing=west,half=bottom,shape=inner_right,woodtype=walnut": { "model": "forestry:arboriculture/stairs/walnut_inner", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right,woodtype=walnut": { "model": "forestry:arboriculture/stairs/walnut_inner", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right,woodtype=walnut": { "model": "forestry:arboriculture/stairs/walnut_inner", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left,woodtype=walnut": { "model": "forestry:arboriculture/stairs/walnut_inner", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left,woodtype=walnut": { "model": "forestry:arboriculture/stairs/walnut_inner", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left,woodtype=walnut": { "model": "forestry:arboriculture/stairs/walnut_inner" }, + "facing=north,half=bottom,shape=inner_left,woodtype=walnut": { "model": "forestry:arboriculture/stairs/walnut_inner", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight,woodtype=walnut": { "model": "forestry:arboriculture/stairs/walnut", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight,woodtype=walnut": { "model": "forestry:arboriculture/stairs/walnut", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight,woodtype=walnut": { "model": "forestry:arboriculture/stairs/walnut", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight,woodtype=walnut": { "model": "forestry:arboriculture/stairs/walnut", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right,woodtype=walnut": { "model": "forestry:arboriculture/stairs/walnut_outer", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right,woodtype=walnut": { "model": "forestry:arboriculture/stairs/walnut_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right,woodtype=walnut": { "model": "forestry:arboriculture/stairs/walnut_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right,woodtype=walnut": { "model": "forestry:arboriculture/stairs/walnut_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left,woodtype=walnut": { "model": "forestry:arboriculture/stairs/walnut_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left,woodtype=walnut": { "model": "forestry:arboriculture/stairs/walnut_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left,woodtype=walnut": { "model": "forestry:arboriculture/stairs/walnut_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left,woodtype=walnut": { "model": "forestry:arboriculture/stairs/walnut_outer", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right,woodtype=walnut": { "model": "forestry:arboriculture/stairs/walnut_inner", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right,woodtype=walnut": { "model": "forestry:arboriculture/stairs/walnut_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right,woodtype=walnut": { "model": "forestry:arboriculture/stairs/walnut_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right,woodtype=walnut": { "model": "forestry:arboriculture/stairs/walnut_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left,woodtype=walnut": { "model": "forestry:arboriculture/stairs/walnut_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left,woodtype=walnut": { "model": "forestry:arboriculture/stairs/walnut_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left,woodtype=walnut": { "model": "forestry:arboriculture/stairs/walnut_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left,woodtype=walnut": { "model": "forestry:arboriculture/stairs/walnut_inner", "x": 180, "uvlock": true }, + //greenheart + "facing=east,half=bottom,shape=straight,woodtype=greenheart": { "model": "forestry:arboriculture/stairs/greenheart" }, + "facing=west,half=bottom,shape=straight,woodtype=greenheart": { "model": "forestry:arboriculture/stairs/greenheart", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight,woodtype=greenheart": { "model": "forestry:arboriculture/stairs/greenheart", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight,woodtype=greenheart": { "model": "forestry:arboriculture/stairs/greenheart", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right,woodtype=greenheart": { "model": "forestry:arboriculture/stairs/greenheart_outer" }, + "facing=west,half=bottom,shape=outer_right,woodtype=greenheart": { "model": "forestry:arboriculture/stairs/greenheart_outer", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right,woodtype=greenheart": { "model": "forestry:arboriculture/stairs/greenheart_outer", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right,woodtype=greenheart": { "model": "forestry:arboriculture/stairs/greenheart_outer", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left,woodtype=greenheart": { "model": "forestry:arboriculture/stairs/greenheart_outer", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left,woodtype=greenheart": { "model": "forestry:arboriculture/stairs/greenheart_outer", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left,woodtype=greenheart": { "model": "forestry:arboriculture/stairs/greenheart_outer" }, + "facing=north,half=bottom,shape=outer_left,woodtype=greenheart": { "model": "forestry:arboriculture/stairs/greenheart_outer", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right,woodtype=greenheart": { "model": "forestry:arboriculture/stairs/greenheart_inner" }, + "facing=west,half=bottom,shape=inner_right,woodtype=greenheart": { "model": "forestry:arboriculture/stairs/greenheart_inner", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right,woodtype=greenheart": { "model": "forestry:arboriculture/stairs/greenheart_inner", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right,woodtype=greenheart": { "model": "forestry:arboriculture/stairs/greenheart_inner", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left,woodtype=greenheart": { "model": "forestry:arboriculture/stairs/greenheart_inner", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left,woodtype=greenheart": { "model": "forestry:arboriculture/stairs/greenheart_inner", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left,woodtype=greenheart": { "model": "forestry:arboriculture/stairs/greenheart_inner" }, + "facing=north,half=bottom,shape=inner_left,woodtype=greenheart": { "model": "forestry:arboriculture/stairs/greenheart_inner", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight,woodtype=greenheart": { "model": "forestry:arboriculture/stairs/greenheart", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight,woodtype=greenheart": { "model": "forestry:arboriculture/stairs/greenheart", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight,woodtype=greenheart": { "model": "forestry:arboriculture/stairs/greenheart", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight,woodtype=greenheart": { "model": "forestry:arboriculture/stairs/greenheart", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right,woodtype=greenheart": { "model": "forestry:arboriculture/stairs/greenheart_outer", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right,woodtype=greenheart": { "model": "forestry:arboriculture/stairs/greenheart_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right,woodtype=greenheart": { "model": "forestry:arboriculture/stairs/greenheart_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right,woodtype=greenheart": { "model": "forestry:arboriculture/stairs/greenheart_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left,woodtype=greenheart": { "model": "forestry:arboriculture/stairs/greenheart_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left,woodtype=greenheart": { "model": "forestry:arboriculture/stairs/greenheart_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left,woodtype=greenheart": { "model": "forestry:arboriculture/stairs/greenheart_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left,woodtype=greenheart": { "model": "forestry:arboriculture/stairs/greenheart_outer", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right,woodtype=greenheart": { "model": "forestry:arboriculture/stairs/greenheart_inner", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right,woodtype=greenheart": { "model": "forestry:arboriculture/stairs/greenheart_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right,woodtype=greenheart": { "model": "forestry:arboriculture/stairs/greenheart_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right,woodtype=greenheart": { "model": "forestry:arboriculture/stairs/greenheart_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left,woodtype=greenheart": { "model": "forestry:arboriculture/stairs/greenheart_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left,woodtype=greenheart": { "model": "forestry:arboriculture/stairs/greenheart_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left,woodtype=greenheart": { "model": "forestry:arboriculture/stairs/greenheart_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left,woodtype=greenheart": { "model": "forestry:arboriculture/stairs/greenheart_inner", "x": 180, "uvlock": true }, + //cherry + "facing=east,half=bottom,shape=straight,woodtype=cherry": { "model": "forestry:arboriculture/stairs/cherry" }, + "facing=west,half=bottom,shape=straight,woodtype=cherry": { "model": "forestry:arboriculture/stairs/cherry", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight,woodtype=cherry": { "model": "forestry:arboriculture/stairs/cherry", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight,woodtype=cherry": { "model": "forestry:arboriculture/stairs/cherry", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right,woodtype=cherry": { "model": "forestry:arboriculture/stairs/cherry_outer" }, + "facing=west,half=bottom,shape=outer_right,woodtype=cherry": { "model": "forestry:arboriculture/stairs/cherry_outer", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right,woodtype=cherry": { "model": "forestry:arboriculture/stairs/cherry_outer", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right,woodtype=cherry": { "model": "forestry:arboriculture/stairs/cherry_outer", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left,woodtype=cherry": { "model": "forestry:arboriculture/stairs/cherry_outer", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left,woodtype=cherry": { "model": "forestry:arboriculture/stairs/cherry_outer", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left,woodtype=cherry": { "model": "forestry:arboriculture/stairs/cherry_outer" }, + "facing=north,half=bottom,shape=outer_left,woodtype=cherry": { "model": "forestry:arboriculture/stairs/cherry_outer", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right,woodtype=cherry": { "model": "forestry:arboriculture/stairs/cherry_inner" }, + "facing=west,half=bottom,shape=inner_right,woodtype=cherry": { "model": "forestry:arboriculture/stairs/cherry_inner", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right,woodtype=cherry": { "model": "forestry:arboriculture/stairs/cherry_inner", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right,woodtype=cherry": { "model": "forestry:arboriculture/stairs/cherry_inner", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left,woodtype=cherry": { "model": "forestry:arboriculture/stairs/cherry_inner", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left,woodtype=cherry": { "model": "forestry:arboriculture/stairs/cherry_inner", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left,woodtype=cherry": { "model": "forestry:arboriculture/stairs/cherry_inner" }, + "facing=north,half=bottom,shape=inner_left,woodtype=cherry": { "model": "forestry:arboriculture/stairs/cherry_inner", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight,woodtype=cherry": { "model": "forestry:arboriculture/stairs/cherry", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight,woodtype=cherry": { "model": "forestry:arboriculture/stairs/cherry", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight,woodtype=cherry": { "model": "forestry:arboriculture/stairs/cherry", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight,woodtype=cherry": { "model": "forestry:arboriculture/stairs/cherry", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right,woodtype=cherry": { "model": "forestry:arboriculture/stairs/cherry_outer", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right,woodtype=cherry": { "model": "forestry:arboriculture/stairs/cherry_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right,woodtype=cherry": { "model": "forestry:arboriculture/stairs/cherry_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right,woodtype=cherry": { "model": "forestry:arboriculture/stairs/cherry_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left,woodtype=cherry": { "model": "forestry:arboriculture/stairs/cherry_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left,woodtype=cherry": { "model": "forestry:arboriculture/stairs/cherry_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left,woodtype=cherry": { "model": "forestry:arboriculture/stairs/cherry_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left,woodtype=cherry": { "model": "forestry:arboriculture/stairs/cherry_outer", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right,woodtype=cherry": { "model": "forestry:arboriculture/stairs/cherry_inner", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right,woodtype=cherry": { "model": "forestry:arboriculture/stairs/cherry_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right,woodtype=cherry": { "model": "forestry:arboriculture/stairs/cherry_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right,woodtype=cherry": { "model": "forestry:arboriculture/stairs/cherry_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left,woodtype=cherry": { "model": "forestry:arboriculture/stairs/cherry_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left,woodtype=cherry": { "model": "forestry:arboriculture/stairs/cherry_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left,woodtype=cherry": { "model": "forestry:arboriculture/stairs/cherry_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left,woodtype=cherry": { "model": "forestry:arboriculture/stairs/cherry_inner", "x": 180, "uvlock": true }, + //mahoe + "facing=east,half=bottom,shape=straight,woodtype=mahoe": { "model": "forestry:arboriculture/stairs/mahoe" }, + "facing=west,half=bottom,shape=straight,woodtype=mahoe": { "model": "forestry:arboriculture/stairs/mahoe", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight,woodtype=mahoe": { "model": "forestry:arboriculture/stairs/mahoe", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight,woodtype=mahoe": { "model": "forestry:arboriculture/stairs/mahoe", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right,woodtype=mahoe": { "model": "forestry:arboriculture/stairs/mahoe_outer" }, + "facing=west,half=bottom,shape=outer_right,woodtype=mahoe": { "model": "forestry:arboriculture/stairs/mahoe_outer", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right,woodtype=mahoe": { "model": "forestry:arboriculture/stairs/mahoe_outer", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right,woodtype=mahoe": { "model": "forestry:arboriculture/stairs/mahoe_outer", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left,woodtype=mahoe": { "model": "forestry:arboriculture/stairs/mahoe_outer", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left,woodtype=mahoe": { "model": "forestry:arboriculture/stairs/mahoe_outer", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left,woodtype=mahoe": { "model": "forestry:arboriculture/stairs/mahoe_outer" }, + "facing=north,half=bottom,shape=outer_left,woodtype=mahoe": { "model": "forestry:arboriculture/stairs/mahoe_outer", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right,woodtype=mahoe": { "model": "forestry:arboriculture/stairs/mahoe_inner" }, + "facing=west,half=bottom,shape=inner_right,woodtype=mahoe": { "model": "forestry:arboriculture/stairs/mahoe_inner", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right,woodtype=mahoe": { "model": "forestry:arboriculture/stairs/mahoe_inner", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right,woodtype=mahoe": { "model": "forestry:arboriculture/stairs/mahoe_inner", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left,woodtype=mahoe": { "model": "forestry:arboriculture/stairs/mahoe_inner", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left,woodtype=mahoe": { "model": "forestry:arboriculture/stairs/mahoe_inner", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left,woodtype=mahoe": { "model": "forestry:arboriculture/stairs/mahoe_inner" }, + "facing=north,half=bottom,shape=inner_left,woodtype=mahoe": { "model": "forestry:arboriculture/stairs/mahoe_inner", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight,woodtype=mahoe": { "model": "forestry:arboriculture/stairs/mahoe", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight,woodtype=mahoe": { "model": "forestry:arboriculture/stairs/mahoe", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight,woodtype=mahoe": { "model": "forestry:arboriculture/stairs/mahoe", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight,woodtype=mahoe": { "model": "forestry:arboriculture/stairs/mahoe", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right,woodtype=mahoe": { "model": "forestry:arboriculture/stairs/mahoe_outer", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right,woodtype=mahoe": { "model": "forestry:arboriculture/stairs/mahoe_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right,woodtype=mahoe": { "model": "forestry:arboriculture/stairs/mahoe_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right,woodtype=mahoe": { "model": "forestry:arboriculture/stairs/mahoe_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left,woodtype=mahoe": { "model": "forestry:arboriculture/stairs/mahoe_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left,woodtype=mahoe": { "model": "forestry:arboriculture/stairs/mahoe_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left,woodtype=mahoe": { "model": "forestry:arboriculture/stairs/mahoe_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left,woodtype=mahoe": { "model": "forestry:arboriculture/stairs/mahoe_outer", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right,woodtype=mahoe": { "model": "forestry:arboriculture/stairs/mahoe_inner", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right,woodtype=mahoe": { "model": "forestry:arboriculture/stairs/mahoe_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right,woodtype=mahoe": { "model": "forestry:arboriculture/stairs/mahoe_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right,woodtype=mahoe": { "model": "forestry:arboriculture/stairs/mahoe_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left,woodtype=mahoe": { "model": "forestry:arboriculture/stairs/mahoe_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left,woodtype=mahoe": { "model": "forestry:arboriculture/stairs/mahoe_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left,woodtype=mahoe": { "model": "forestry:arboriculture/stairs/mahoe_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left,woodtype=mahoe": { "model": "forestry:arboriculture/stairs/mahoe_inner", "x": 180, "uvlock": true }, + //poplar + "facing=east,half=bottom,shape=straight,woodtype=poplar": { "model": "forestry:arboriculture/stairs/poplar" }, + "facing=west,half=bottom,shape=straight,woodtype=poplar": { "model": "forestry:arboriculture/stairs/poplar", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight,woodtype=poplar": { "model": "forestry:arboriculture/stairs/poplar", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight,woodtype=poplar": { "model": "forestry:arboriculture/stairs/poplar", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right,woodtype=poplar": { "model": "forestry:arboriculture/stairs/poplar_outer" }, + "facing=west,half=bottom,shape=outer_right,woodtype=poplar": { "model": "forestry:arboriculture/stairs/poplar_outer", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right,woodtype=poplar": { "model": "forestry:arboriculture/stairs/poplar_outer", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right,woodtype=poplar": { "model": "forestry:arboriculture/stairs/poplar_outer", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left,woodtype=poplar": { "model": "forestry:arboriculture/stairs/poplar_outer", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left,woodtype=poplar": { "model": "forestry:arboriculture/stairs/poplar_outer", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left,woodtype=poplar": { "model": "forestry:arboriculture/stairs/poplar_outer" }, + "facing=north,half=bottom,shape=outer_left,woodtype=poplar": { "model": "forestry:arboriculture/stairs/poplar_outer", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right,woodtype=poplar": { "model": "forestry:arboriculture/stairs/poplar_inner" }, + "facing=west,half=bottom,shape=inner_right,woodtype=poplar": { "model": "forestry:arboriculture/stairs/poplar_inner", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right,woodtype=poplar": { "model": "forestry:arboriculture/stairs/poplar_inner", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right,woodtype=poplar": { "model": "forestry:arboriculture/stairs/poplar_inner", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left,woodtype=poplar": { "model": "forestry:arboriculture/stairs/poplar_inner", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left,woodtype=poplar": { "model": "forestry:arboriculture/stairs/poplar_inner", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left,woodtype=poplar": { "model": "forestry:arboriculture/stairs/poplar_inner" }, + "facing=north,half=bottom,shape=inner_left,woodtype=poplar": { "model": "forestry:arboriculture/stairs/poplar_inner", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight,woodtype=poplar": { "model": "forestry:arboriculture/stairs/poplar", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight,woodtype=poplar": { "model": "forestry:arboriculture/stairs/poplar", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight,woodtype=poplar": { "model": "forestry:arboriculture/stairs/poplar", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight,woodtype=poplar": { "model": "forestry:arboriculture/stairs/poplar", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right,woodtype=poplar": { "model": "forestry:arboriculture/stairs/poplar_outer", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right,woodtype=poplar": { "model": "forestry:arboriculture/stairs/poplar_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right,woodtype=poplar": { "model": "forestry:arboriculture/stairs/poplar_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right,woodtype=poplar": { "model": "forestry:arboriculture/stairs/poplar_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left,woodtype=poplar": { "model": "forestry:arboriculture/stairs/poplar_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left,woodtype=poplar": { "model": "forestry:arboriculture/stairs/poplar_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left,woodtype=poplar": { "model": "forestry:arboriculture/stairs/poplar_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left,woodtype=poplar": { "model": "forestry:arboriculture/stairs/poplar_outer", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right,woodtype=poplar": { "model": "forestry:arboriculture/stairs/poplar_inner", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right,woodtype=poplar": { "model": "forestry:arboriculture/stairs/poplar_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right,woodtype=poplar": { "model": "forestry:arboriculture/stairs/poplar_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right,woodtype=poplar": { "model": "forestry:arboriculture/stairs/poplar_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left,woodtype=poplar": { "model": "forestry:arboriculture/stairs/poplar_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left,woodtype=poplar": { "model": "forestry:arboriculture/stairs/poplar_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left,woodtype=poplar": { "model": "forestry:arboriculture/stairs/poplar_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left,woodtype=poplar": { "model": "forestry:arboriculture/stairs/poplar_inner", "x": 180, "uvlock": true }, + //palm + "facing=east,half=bottom,shape=straight,woodtype=palm": { "model": "forestry:arboriculture/stairs/palm" }, + "facing=west,half=bottom,shape=straight,woodtype=palm": { "model": "forestry:arboriculture/stairs/palm", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight,woodtype=palm": { "model": "forestry:arboriculture/stairs/palm", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight,woodtype=palm": { "model": "forestry:arboriculture/stairs/palm", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right,woodtype=palm": { "model": "forestry:arboriculture/stairs/palm_outer" }, + "facing=west,half=bottom,shape=outer_right,woodtype=palm": { "model": "forestry:arboriculture/stairs/palm_outer", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right,woodtype=palm": { "model": "forestry:arboriculture/stairs/palm_outer", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right,woodtype=palm": { "model": "forestry:arboriculture/stairs/palm_outer", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left,woodtype=palm": { "model": "forestry:arboriculture/stairs/palm_outer", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left,woodtype=palm": { "model": "forestry:arboriculture/stairs/palm_outer", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left,woodtype=palm": { "model": "forestry:arboriculture/stairs/palm_outer" }, + "facing=north,half=bottom,shape=outer_left,woodtype=palm": { "model": "forestry:arboriculture/stairs/palm_outer", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right,woodtype=palm": { "model": "forestry:arboriculture/stairs/palm_inner" }, + "facing=west,half=bottom,shape=inner_right,woodtype=palm": { "model": "forestry:arboriculture/stairs/palm_inner", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right,woodtype=palm": { "model": "forestry:arboriculture/stairs/palm_inner", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right,woodtype=palm": { "model": "forestry:arboriculture/stairs/palm_inner", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left,woodtype=palm": { "model": "forestry:arboriculture/stairs/palm_inner", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left,woodtype=palm": { "model": "forestry:arboriculture/stairs/palm_inner", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left,woodtype=palm": { "model": "forestry:arboriculture/stairs/palm_inner" }, + "facing=north,half=bottom,shape=inner_left,woodtype=palm": { "model": "forestry:arboriculture/stairs/palm_inner", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight,woodtype=palm": { "model": "forestry:arboriculture/stairs/palm", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight,woodtype=palm": { "model": "forestry:arboriculture/stairs/palm", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight,woodtype=palm": { "model": "forestry:arboriculture/stairs/palm", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight,woodtype=palm": { "model": "forestry:arboriculture/stairs/palm", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right,woodtype=palm": { "model": "forestry:arboriculture/stairs/palm_outer", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right,woodtype=palm": { "model": "forestry:arboriculture/stairs/palm_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right,woodtype=palm": { "model": "forestry:arboriculture/stairs/palm_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right,woodtype=palm": { "model": "forestry:arboriculture/stairs/palm_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left,woodtype=palm": { "model": "forestry:arboriculture/stairs/palm_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left,woodtype=palm": { "model": "forestry:arboriculture/stairs/palm_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left,woodtype=palm": { "model": "forestry:arboriculture/stairs/palm_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left,woodtype=palm": { "model": "forestry:arboriculture/stairs/palm_outer", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right,woodtype=palm": { "model": "forestry:arboriculture/stairs/palm_inner", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right,woodtype=palm": { "model": "forestry:arboriculture/stairs/palm_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right,woodtype=palm": { "model": "forestry:arboriculture/stairs/palm_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right,woodtype=palm": { "model": "forestry:arboriculture/stairs/palm_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left,woodtype=palm": { "model": "forestry:arboriculture/stairs/palm_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left,woodtype=palm": { "model": "forestry:arboriculture/stairs/palm_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left,woodtype=palm": { "model": "forestry:arboriculture/stairs/palm_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left,woodtype=palm": { "model": "forestry:arboriculture/stairs/palm_inner", "x": 180, "uvlock": true }, + //papaya + "facing=east,half=bottom,shape=straight,woodtype=papaya": { "model": "forestry:arboriculture/stairs/papaya" }, + "facing=west,half=bottom,shape=straight,woodtype=papaya": { "model": "forestry:arboriculture/stairs/papaya", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight,woodtype=papaya": { "model": "forestry:arboriculture/stairs/papaya", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight,woodtype=papaya": { "model": "forestry:arboriculture/stairs/papaya", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right,woodtype=papaya": { "model": "forestry:arboriculture/stairs/papaya_outer" }, + "facing=west,half=bottom,shape=outer_right,woodtype=papaya": { "model": "forestry:arboriculture/stairs/papaya_outer", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right,woodtype=papaya": { "model": "forestry:arboriculture/stairs/papaya_outer", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right,woodtype=papaya": { "model": "forestry:arboriculture/stairs/papaya_outer", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left,woodtype=papaya": { "model": "forestry:arboriculture/stairs/papaya_outer", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left,woodtype=papaya": { "model": "forestry:arboriculture/stairs/papaya_outer", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left,woodtype=papaya": { "model": "forestry:arboriculture/stairs/papaya_outer" }, + "facing=north,half=bottom,shape=outer_left,woodtype=papaya": { "model": "forestry:arboriculture/stairs/papaya_outer", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right,woodtype=papaya": { "model": "forestry:arboriculture/stairs/papaya_inner" }, + "facing=west,half=bottom,shape=inner_right,woodtype=papaya": { "model": "forestry:arboriculture/stairs/papaya_inner", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right,woodtype=papaya": { "model": "forestry:arboriculture/stairs/papaya_inner", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right,woodtype=papaya": { "model": "forestry:arboriculture/stairs/papaya_inner", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left,woodtype=papaya": { "model": "forestry:arboriculture/stairs/papaya_inner", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left,woodtype=papaya": { "model": "forestry:arboriculture/stairs/papaya_inner", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left,woodtype=papaya": { "model": "forestry:arboriculture/stairs/papaya_inner" }, + "facing=north,half=bottom,shape=inner_left,woodtype=papaya": { "model": "forestry:arboriculture/stairs/papaya_inner", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight,woodtype=papaya": { "model": "forestry:arboriculture/stairs/papaya", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight,woodtype=papaya": { "model": "forestry:arboriculture/stairs/papaya", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight,woodtype=papaya": { "model": "forestry:arboriculture/stairs/papaya", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight,woodtype=papaya": { "model": "forestry:arboriculture/stairs/papaya", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right,woodtype=papaya": { "model": "forestry:arboriculture/stairs/papaya_outer", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right,woodtype=papaya": { "model": "forestry:arboriculture/stairs/papaya_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right,woodtype=papaya": { "model": "forestry:arboriculture/stairs/papaya_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right,woodtype=papaya": { "model": "forestry:arboriculture/stairs/papaya_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left,woodtype=papaya": { "model": "forestry:arboriculture/stairs/papaya_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left,woodtype=papaya": { "model": "forestry:arboriculture/stairs/papaya_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left,woodtype=papaya": { "model": "forestry:arboriculture/stairs/papaya_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left,woodtype=papaya": { "model": "forestry:arboriculture/stairs/papaya_outer", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right,woodtype=papaya": { "model": "forestry:arboriculture/stairs/papaya_inner", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right,woodtype=papaya": { "model": "forestry:arboriculture/stairs/papaya_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right,woodtype=papaya": { "model": "forestry:arboriculture/stairs/papaya_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right,woodtype=papaya": { "model": "forestry:arboriculture/stairs/papaya_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left,woodtype=papaya": { "model": "forestry:arboriculture/stairs/papaya_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left,woodtype=papaya": { "model": "forestry:arboriculture/stairs/papaya_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left,woodtype=papaya": { "model": "forestry:arboriculture/stairs/papaya_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left,woodtype=papaya": { "model": "forestry:arboriculture/stairs/papaya_inner", "x": 180, "uvlock": true }, + //pine + "facing=east,half=bottom,shape=straight,woodtype=pine": { "model": "forestry:arboriculture/stairs/pine" }, + "facing=west,half=bottom,shape=straight,woodtype=pine": { "model": "forestry:arboriculture/stairs/pine", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight,woodtype=pine": { "model": "forestry:arboriculture/stairs/pine", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight,woodtype=pine": { "model": "forestry:arboriculture/stairs/pine", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right,woodtype=pine": { "model": "forestry:arboriculture/stairs/pine_outer" }, + "facing=west,half=bottom,shape=outer_right,woodtype=pine": { "model": "forestry:arboriculture/stairs/pine_outer", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right,woodtype=pine": { "model": "forestry:arboriculture/stairs/pine_outer", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right,woodtype=pine": { "model": "forestry:arboriculture/stairs/pine_outer", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left,woodtype=pine": { "model": "forestry:arboriculture/stairs/pine_outer", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left,woodtype=pine": { "model": "forestry:arboriculture/stairs/pine_outer", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left,woodtype=pine": { "model": "forestry:arboriculture/stairs/pine_outer" }, + "facing=north,half=bottom,shape=outer_left,woodtype=pine": { "model": "forestry:arboriculture/stairs/pine_outer", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right,woodtype=pine": { "model": "forestry:arboriculture/stairs/pine_inner" }, + "facing=west,half=bottom,shape=inner_right,woodtype=pine": { "model": "forestry:arboriculture/stairs/pine_inner", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right,woodtype=pine": { "model": "forestry:arboriculture/stairs/pine_inner", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right,woodtype=pine": { "model": "forestry:arboriculture/stairs/pine_inner", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left,woodtype=pine": { "model": "forestry:arboriculture/stairs/pine_inner", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left,woodtype=pine": { "model": "forestry:arboriculture/stairs/pine_inner", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left,woodtype=pine": { "model": "forestry:arboriculture/stairs/pine_inner" }, + "facing=north,half=bottom,shape=inner_left,woodtype=pine": { "model": "forestry:arboriculture/stairs/pine_inner", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight,woodtype=pine": { "model": "forestry:arboriculture/stairs/pine", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight,woodtype=pine": { "model": "forestry:arboriculture/stairs/pine", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight,woodtype=pine": { "model": "forestry:arboriculture/stairs/pine", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight,woodtype=pine": { "model": "forestry:arboriculture/stairs/pine", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right,woodtype=pine": { "model": "forestry:arboriculture/stairs/pine_outer", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right,woodtype=pine": { "model": "forestry:arboriculture/stairs/pine_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right,woodtype=pine": { "model": "forestry:arboriculture/stairs/pine_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right,woodtype=pine": { "model": "forestry:arboriculture/stairs/pine_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left,woodtype=pine": { "model": "forestry:arboriculture/stairs/pine_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left,woodtype=pine": { "model": "forestry:arboriculture/stairs/pine_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left,woodtype=pine": { "model": "forestry:arboriculture/stairs/pine_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left,woodtype=pine": { "model": "forestry:arboriculture/stairs/pine_outer", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right,woodtype=pine": { "model": "forestry:arboriculture/stairs/pine_inner", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right,woodtype=pine": { "model": "forestry:arboriculture/stairs/pine_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right,woodtype=pine": { "model": "forestry:arboriculture/stairs/pine_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right,woodtype=pine": { "model": "forestry:arboriculture/stairs/pine_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left,woodtype=pine": { "model": "forestry:arboriculture/stairs/pine_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left,woodtype=pine": { "model": "forestry:arboriculture/stairs/pine_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left,woodtype=pine": { "model": "forestry:arboriculture/stairs/pine_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left,woodtype=pine": { "model": "forestry:arboriculture/stairs/pine_inner", "x": 180, "uvlock": true }, + //plum + "facing=east,half=bottom,shape=straight,woodtype=plum": { "model": "forestry:arboriculture/stairs/plum" }, + "facing=west,half=bottom,shape=straight,woodtype=plum": { "model": "forestry:arboriculture/stairs/plum", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight,woodtype=plum": { "model": "forestry:arboriculture/stairs/plum", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight,woodtype=plum": { "model": "forestry:arboriculture/stairs/plum", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right,woodtype=plum": { "model": "forestry:arboriculture/stairs/plum_outer" }, + "facing=west,half=bottom,shape=outer_right,woodtype=plum": { "model": "forestry:arboriculture/stairs/plum_outer", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right,woodtype=plum": { "model": "forestry:arboriculture/stairs/plum_outer", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right,woodtype=plum": { "model": "forestry:arboriculture/stairs/plum_outer", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left,woodtype=plum": { "model": "forestry:arboriculture/stairs/plum_outer", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left,woodtype=plum": { "model": "forestry:arboriculture/stairs/plum_outer", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left,woodtype=plum": { "model": "forestry:arboriculture/stairs/plum_outer" }, + "facing=north,half=bottom,shape=outer_left,woodtype=plum": { "model": "forestry:arboriculture/stairs/plum_outer", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right,woodtype=plum": { "model": "forestry:arboriculture/stairs/plum_inner" }, + "facing=west,half=bottom,shape=inner_right,woodtype=plum": { "model": "forestry:arboriculture/stairs/plum_inner", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right,woodtype=plum": { "model": "forestry:arboriculture/stairs/plum_inner", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right,woodtype=plum": { "model": "forestry:arboriculture/stairs/plum_inner", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left,woodtype=plum": { "model": "forestry:arboriculture/stairs/plum_inner", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left,woodtype=plum": { "model": "forestry:arboriculture/stairs/plum_inner", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left,woodtype=plum": { "model": "forestry:arboriculture/stairs/plum_inner" }, + "facing=north,half=bottom,shape=inner_left,woodtype=plum": { "model": "forestry:arboriculture/stairs/plum_inner", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight,woodtype=plum": { "model": "forestry:arboriculture/stairs/plum", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight,woodtype=plum": { "model": "forestry:arboriculture/stairs/plum", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight,woodtype=plum": { "model": "forestry:arboriculture/stairs/plum", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight,woodtype=plum": { "model": "forestry:arboriculture/stairs/plum", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right,woodtype=plum": { "model": "forestry:arboriculture/stairs/plum_outer", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right,woodtype=plum": { "model": "forestry:arboriculture/stairs/plum_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right,woodtype=plum": { "model": "forestry:arboriculture/stairs/plum_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right,woodtype=plum": { "model": "forestry:arboriculture/stairs/plum_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left,woodtype=plum": { "model": "forestry:arboriculture/stairs/plum_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left,woodtype=plum": { "model": "forestry:arboriculture/stairs/plum_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left,woodtype=plum": { "model": "forestry:arboriculture/stairs/plum_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left,woodtype=plum": { "model": "forestry:arboriculture/stairs/plum_outer", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right,woodtype=plum": { "model": "forestry:arboriculture/stairs/plum_inner", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right,woodtype=plum": { "model": "forestry:arboriculture/stairs/plum_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right,woodtype=plum": { "model": "forestry:arboriculture/stairs/plum_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right,woodtype=plum": { "model": "forestry:arboriculture/stairs/plum_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left,woodtype=plum": { "model": "forestry:arboriculture/stairs/plum_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left,woodtype=plum": { "model": "forestry:arboriculture/stairs/plum_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left,woodtype=plum": { "model": "forestry:arboriculture/stairs/plum_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left,woodtype=plum": { "model": "forestry:arboriculture/stairs/plum_inner", "x": 180, "uvlock": true }, + //maple + "facing=east,half=bottom,shape=straight,woodtype=maple": { "model": "forestry:arboriculture/stairs/maple" }, + "facing=west,half=bottom,shape=straight,woodtype=maple": { "model": "forestry:arboriculture/stairs/maple", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight,woodtype=maple": { "model": "forestry:arboriculture/stairs/maple", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight,woodtype=maple": { "model": "forestry:arboriculture/stairs/maple", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right,woodtype=maple": { "model": "forestry:arboriculture/stairs/maple_outer" }, + "facing=west,half=bottom,shape=outer_right,woodtype=maple": { "model": "forestry:arboriculture/stairs/maple_outer", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right,woodtype=maple": { "model": "forestry:arboriculture/stairs/maple_outer", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right,woodtype=maple": { "model": "forestry:arboriculture/stairs/maple_outer", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left,woodtype=maple": { "model": "forestry:arboriculture/stairs/maple_outer", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left,woodtype=maple": { "model": "forestry:arboriculture/stairs/maple_outer", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left,woodtype=maple": { "model": "forestry:arboriculture/stairs/maple_outer" }, + "facing=north,half=bottom,shape=outer_left,woodtype=maple": { "model": "forestry:arboriculture/stairs/maple_outer", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right,woodtype=maple": { "model": "forestry:arboriculture/stairs/maple_inner" }, + "facing=west,half=bottom,shape=inner_right,woodtype=maple": { "model": "forestry:arboriculture/stairs/maple_inner", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right,woodtype=maple": { "model": "forestry:arboriculture/stairs/maple_inner", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right,woodtype=maple": { "model": "forestry:arboriculture/stairs/maple_inner", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left,woodtype=maple": { "model": "forestry:arboriculture/stairs/maple_inner", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left,woodtype=maple": { "model": "forestry:arboriculture/stairs/maple_inner", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left,woodtype=maple": { "model": "forestry:arboriculture/stairs/maple_inner" }, + "facing=north,half=bottom,shape=inner_left,woodtype=maple": { "model": "forestry:arboriculture/stairs/maple_inner", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight,woodtype=maple": { "model": "forestry:arboriculture/stairs/maple", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight,woodtype=maple": { "model": "forestry:arboriculture/stairs/maple", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight,woodtype=maple": { "model": "forestry:arboriculture/stairs/maple", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight,woodtype=maple": { "model": "forestry:arboriculture/stairs/maple", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right,woodtype=maple": { "model": "forestry:arboriculture/stairs/maple_outer", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right,woodtype=maple": { "model": "forestry:arboriculture/stairs/maple_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right,woodtype=maple": { "model": "forestry:arboriculture/stairs/maple_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right,woodtype=maple": { "model": "forestry:arboriculture/stairs/maple_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left,woodtype=maple": { "model": "forestry:arboriculture/stairs/maple_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left,woodtype=maple": { "model": "forestry:arboriculture/stairs/maple_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left,woodtype=maple": { "model": "forestry:arboriculture/stairs/maple_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left,woodtype=maple": { "model": "forestry:arboriculture/stairs/maple_outer", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right,woodtype=maple": { "model": "forestry:arboriculture/stairs/maple_inner", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right,woodtype=maple": { "model": "forestry:arboriculture/stairs/maple_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right,woodtype=maple": { "model": "forestry:arboriculture/stairs/maple_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right,woodtype=maple": { "model": "forestry:arboriculture/stairs/maple_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left,woodtype=maple": { "model": "forestry:arboriculture/stairs/maple_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left,woodtype=maple": { "model": "forestry:arboriculture/stairs/maple_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left,woodtype=maple": { "model": "forestry:arboriculture/stairs/maple_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left,woodtype=maple": { "model": "forestry:arboriculture/stairs/maple_inner", "x": 180, "uvlock": true }, + //citrus + "facing=east,half=bottom,shape=straight,woodtype=citrus": { "model": "forestry:arboriculture/stairs/citrus" }, + "facing=west,half=bottom,shape=straight,woodtype=citrus": { "model": "forestry:arboriculture/stairs/citrus", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight,woodtype=citrus": { "model": "forestry:arboriculture/stairs/citrus", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight,woodtype=citrus": { "model": "forestry:arboriculture/stairs/citrus", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right,woodtype=citrus": { "model": "forestry:arboriculture/stairs/citrus_outer" }, + "facing=west,half=bottom,shape=outer_right,woodtype=citrus": { "model": "forestry:arboriculture/stairs/citrus_outer", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right,woodtype=citrus": { "model": "forestry:arboriculture/stairs/citrus_outer", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right,woodtype=citrus": { "model": "forestry:arboriculture/stairs/citrus_outer", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left,woodtype=citrus": { "model": "forestry:arboriculture/stairs/citrus_outer", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left,woodtype=citrus": { "model": "forestry:arboriculture/stairs/citrus_outer", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left,woodtype=citrus": { "model": "forestry:arboriculture/stairs/citrus_outer" }, + "facing=north,half=bottom,shape=outer_left,woodtype=citrus": { "model": "forestry:arboriculture/stairs/citrus_outer", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right,woodtype=citrus": { "model": "forestry:arboriculture/stairs/citrus_inner" }, + "facing=west,half=bottom,shape=inner_right,woodtype=citrus": { "model": "forestry:arboriculture/stairs/citrus_inner", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right,woodtype=citrus": { "model": "forestry:arboriculture/stairs/citrus_inner", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right,woodtype=citrus": { "model": "forestry:arboriculture/stairs/citrus_inner", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left,woodtype=citrus": { "model": "forestry:arboriculture/stairs/citrus_inner", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left,woodtype=citrus": { "model": "forestry:arboriculture/stairs/citrus_inner", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left,woodtype=citrus": { "model": "forestry:arboriculture/stairs/citrus_inner" }, + "facing=north,half=bottom,shape=inner_left,woodtype=citrus": { "model": "forestry:arboriculture/stairs/citrus_inner", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight,woodtype=citrus": { "model": "forestry:arboriculture/stairs/citrus", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight,woodtype=citrus": { "model": "forestry:arboriculture/stairs/citrus", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight,woodtype=citrus": { "model": "forestry:arboriculture/stairs/citrus", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight,woodtype=citrus": { "model": "forestry:arboriculture/stairs/citrus", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right,woodtype=citrus": { "model": "forestry:arboriculture/stairs/citrus_outer", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right,woodtype=citrus": { "model": "forestry:arboriculture/stairs/citrus_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right,woodtype=citrus": { "model": "forestry:arboriculture/stairs/citrus_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right,woodtype=citrus": { "model": "forestry:arboriculture/stairs/citrus_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left,woodtype=citrus": { "model": "forestry:arboriculture/stairs/citrus_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left,woodtype=citrus": { "model": "forestry:arboriculture/stairs/citrus_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left,woodtype=citrus": { "model": "forestry:arboriculture/stairs/citrus_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left,woodtype=citrus": { "model": "forestry:arboriculture/stairs/citrus_outer", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right,woodtype=citrus": { "model": "forestry:arboriculture/stairs/citrus_inner", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right,woodtype=citrus": { "model": "forestry:arboriculture/stairs/citrus_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right,woodtype=citrus": { "model": "forestry:arboriculture/stairs/citrus_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right,woodtype=citrus": { "model": "forestry:arboriculture/stairs/citrus_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left,woodtype=citrus": { "model": "forestry:arboriculture/stairs/citrus_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left,woodtype=citrus": { "model": "forestry:arboriculture/stairs/citrus_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left,woodtype=citrus": { "model": "forestry:arboriculture/stairs/citrus_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left,woodtype=citrus": { "model": "forestry:arboriculture/stairs/citrus_inner", "x": 180, "uvlock": true }, + //giganteum + "facing=east,half=bottom,shape=straight,woodtype=giganteum": { "model": "forestry:arboriculture/stairs/giganteum" }, + "facing=west,half=bottom,shape=straight,woodtype=giganteum": { "model": "forestry:arboriculture/stairs/giganteum", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight,woodtype=giganteum": { "model": "forestry:arboriculture/stairs/giganteum", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight,woodtype=giganteum": { "model": "forestry:arboriculture/stairs/giganteum", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right,woodtype=giganteum": { "model": "forestry:arboriculture/stairs/giganteum_outer" }, + "facing=west,half=bottom,shape=outer_right,woodtype=giganteum": { "model": "forestry:arboriculture/stairs/giganteum_outer", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right,woodtype=giganteum": { "model": "forestry:arboriculture/stairs/giganteum_outer", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right,woodtype=giganteum": { "model": "forestry:arboriculture/stairs/giganteum_outer", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left,woodtype=giganteum": { "model": "forestry:arboriculture/stairs/giganteum_outer", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left,woodtype=giganteum": { "model": "forestry:arboriculture/stairs/giganteum_outer", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left,woodtype=giganteum": { "model": "forestry:arboriculture/stairs/giganteum_outer" }, + "facing=north,half=bottom,shape=outer_left,woodtype=giganteum": { "model": "forestry:arboriculture/stairs/giganteum_outer", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right,woodtype=giganteum": { "model": "forestry:arboriculture/stairs/giganteum_inner" }, + "facing=west,half=bottom,shape=inner_right,woodtype=giganteum": { "model": "forestry:arboriculture/stairs/giganteum_inner", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right,woodtype=giganteum": { "model": "forestry:arboriculture/stairs/giganteum_inner", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right,woodtype=giganteum": { "model": "forestry:arboriculture/stairs/giganteum_inner", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left,woodtype=giganteum": { "model": "forestry:arboriculture/stairs/giganteum_inner", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left,woodtype=giganteum": { "model": "forestry:arboriculture/stairs/giganteum_inner", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left,woodtype=giganteum": { "model": "forestry:arboriculture/stairs/giganteum_inner" }, + "facing=north,half=bottom,shape=inner_left,woodtype=giganteum": { "model": "forestry:arboriculture/stairs/giganteum_inner", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight,woodtype=giganteum": { "model": "forestry:arboriculture/stairs/giganteum", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight,woodtype=giganteum": { "model": "forestry:arboriculture/stairs/giganteum", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight,woodtype=giganteum": { "model": "forestry:arboriculture/stairs/giganteum", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight,woodtype=giganteum": { "model": "forestry:arboriculture/stairs/giganteum", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right,woodtype=giganteum": { "model": "forestry:arboriculture/stairs/giganteum_outer", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right,woodtype=giganteum": { "model": "forestry:arboriculture/stairs/giganteum_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right,woodtype=giganteum": { "model": "forestry:arboriculture/stairs/giganteum_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right,woodtype=giganteum": { "model": "forestry:arboriculture/stairs/giganteum_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left,woodtype=giganteum": { "model": "forestry:arboriculture/stairs/giganteum_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left,woodtype=giganteum": { "model": "forestry:arboriculture/stairs/giganteum_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left,woodtype=giganteum": { "model": "forestry:arboriculture/stairs/giganteum_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left,woodtype=giganteum": { "model": "forestry:arboriculture/stairs/giganteum_outer", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right,woodtype=giganteum": { "model": "forestry:arboriculture/stairs/giganteum_inner", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right,woodtype=giganteum": { "model": "forestry:arboriculture/stairs/giganteum_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right,woodtype=giganteum": { "model": "forestry:arboriculture/stairs/giganteum_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right,woodtype=giganteum": { "model": "forestry:arboriculture/stairs/giganteum_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left,woodtype=giganteum": { "model": "forestry:arboriculture/stairs/giganteum_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left,woodtype=giganteum": { "model": "forestry:arboriculture/stairs/giganteum_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left,woodtype=giganteum": { "model": "forestry:arboriculture/stairs/giganteum_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left,woodtype=giganteum": { "model": "forestry:arboriculture/stairs/giganteum_inner", "x": 180, "uvlock": true }, + //ipe + "facing=east,half=bottom,shape=straight,woodtype=ipe": { "model": "forestry:arboriculture/stairs/ipe" }, + "facing=west,half=bottom,shape=straight,woodtype=ipe": { "model": "forestry:arboriculture/stairs/ipe", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight,woodtype=ipe": { "model": "forestry:arboriculture/stairs/ipe", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight,woodtype=ipe": { "model": "forestry:arboriculture/stairs/ipe", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right,woodtype=ipe": { "model": "forestry:arboriculture/stairs/ipe_outer" }, + "facing=west,half=bottom,shape=outer_right,woodtype=ipe": { "model": "forestry:arboriculture/stairs/ipe_outer", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right,woodtype=ipe": { "model": "forestry:arboriculture/stairs/ipe_outer", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right,woodtype=ipe": { "model": "forestry:arboriculture/stairs/ipe_outer", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left,woodtype=ipe": { "model": "forestry:arboriculture/stairs/ipe_outer", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left,woodtype=ipe": { "model": "forestry:arboriculture/stairs/ipe_outer", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left,woodtype=ipe": { "model": "forestry:arboriculture/stairs/ipe_outer" }, + "facing=north,half=bottom,shape=outer_left,woodtype=ipe": { "model": "forestry:arboriculture/stairs/ipe_outer", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right,woodtype=ipe": { "model": "forestry:arboriculture/stairs/ipe_inner" }, + "facing=west,half=bottom,shape=inner_right,woodtype=ipe": { "model": "forestry:arboriculture/stairs/ipe_inner", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right,woodtype=ipe": { "model": "forestry:arboriculture/stairs/ipe_inner", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right,woodtype=ipe": { "model": "forestry:arboriculture/stairs/ipe_inner", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left,woodtype=ipe": { "model": "forestry:arboriculture/stairs/ipe_inner", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left,woodtype=ipe": { "model": "forestry:arboriculture/stairs/ipe_inner", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left,woodtype=ipe": { "model": "forestry:arboriculture/stairs/ipe_inner" }, + "facing=north,half=bottom,shape=inner_left,woodtype=ipe": { "model": "forestry:arboriculture/stairs/ipe_inner", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight,woodtype=ipe": { "model": "forestry:arboriculture/stairs/ipe", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight,woodtype=ipe": { "model": "forestry:arboriculture/stairs/ipe", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight,woodtype=ipe": { "model": "forestry:arboriculture/stairs/ipe", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight,woodtype=ipe": { "model": "forestry:arboriculture/stairs/ipe", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right,woodtype=ipe": { "model": "forestry:arboriculture/stairs/ipe_outer", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right,woodtype=ipe": { "model": "forestry:arboriculture/stairs/ipe_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right,woodtype=ipe": { "model": "forestry:arboriculture/stairs/ipe_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right,woodtype=ipe": { "model": "forestry:arboriculture/stairs/ipe_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left,woodtype=ipe": { "model": "forestry:arboriculture/stairs/ipe_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left,woodtype=ipe": { "model": "forestry:arboriculture/stairs/ipe_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left,woodtype=ipe": { "model": "forestry:arboriculture/stairs/ipe_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left,woodtype=ipe": { "model": "forestry:arboriculture/stairs/ipe_outer", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right,woodtype=ipe": { "model": "forestry:arboriculture/stairs/ipe_inner", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right,woodtype=ipe": { "model": "forestry:arboriculture/stairs/ipe_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right,woodtype=ipe": { "model": "forestry:arboriculture/stairs/ipe_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right,woodtype=ipe": { "model": "forestry:arboriculture/stairs/ipe_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left,woodtype=ipe": { "model": "forestry:arboriculture/stairs/ipe_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left,woodtype=ipe": { "model": "forestry:arboriculture/stairs/ipe_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left,woodtype=ipe": { "model": "forestry:arboriculture/stairs/ipe_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left,woodtype=ipe": { "model": "forestry:arboriculture/stairs/ipe_inner", "x": 180, "uvlock": true }, + #//padauk + "facing=east,half=bottom,shape=straight,woodtype=padauk": { "model": "forestry:arboriculture/stairs/padauk" }, + "facing=west,half=bottom,shape=straight,woodtype=padauk": { "model": "forestry:arboriculture/stairs/padauk", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight,woodtype=padauk": { "model": "forestry:arboriculture/stairs/padauk", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight,woodtype=padauk": { "model": "forestry:arboriculture/stairs/padauk", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right,woodtype=padauk": { "model": "forestry:arboriculture/stairs/padauk_outer" }, + "facing=west,half=bottom,shape=outer_right,woodtype=padauk": { "model": "forestry:arboriculture/stairs/padauk_outer", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right,woodtype=padauk": { "model": "forestry:arboriculture/stairs/padauk_outer", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right,woodtype=padauk": { "model": "forestry:arboriculture/stairs/padauk_outer", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left,woodtype=padauk": { "model": "forestry:arboriculture/stairs/padauk_outer", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left,woodtype=padauk": { "model": "forestry:arboriculture/stairs/padauk_outer", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left,woodtype=padauk": { "model": "forestry:arboriculture/stairs/padauk_outer" }, + "facing=north,half=bottom,shape=outer_left,woodtype=padauk": { "model": "forestry:arboriculture/stairs/padauk_outer", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right,woodtype=padauk": { "model": "forestry:arboriculture/stairs/padauk_inner" }, + "facing=west,half=bottom,shape=inner_right,woodtype=padauk": { "model": "forestry:arboriculture/stairs/padauk_inner", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right,woodtype=padauk": { "model": "forestry:arboriculture/stairs/padauk_inner", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right,woodtype=padauk": { "model": "forestry:arboriculture/stairs/padauk_inner", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left,woodtype=padauk": { "model": "forestry:arboriculture/stairs/padauk_inner", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left,woodtype=padauk": { "model": "forestry:arboriculture/stairs/padauk_inner", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left,woodtype=padauk": { "model": "forestry:arboriculture/stairs/padauk_inner" }, + "facing=north,half=bottom,shape=inner_left,woodtype=padauk": { "model": "forestry:arboriculture/stairs/padauk_inner", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight,woodtype=padauk": { "model": "forestry:arboriculture/stairs/padauk", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight,woodtype=padauk": { "model": "forestry:arboriculture/stairs/padauk", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight,woodtype=padauk": { "model": "forestry:arboriculture/stairs/padauk", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight,woodtype=padauk": { "model": "forestry:arboriculture/stairs/padauk", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right,woodtype=padauk": { "model": "forestry:arboriculture/stairs/padauk_outer", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right,woodtype=padauk": { "model": "forestry:arboriculture/stairs/padauk_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right,woodtype=padauk": { "model": "forestry:arboriculture/stairs/padauk_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right,woodtype=padauk": { "model": "forestry:arboriculture/stairs/padauk_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left,woodtype=padauk": { "model": "forestry:arboriculture/stairs/padauk_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left,woodtype=padauk": { "model": "forestry:arboriculture/stairs/padauk_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left,woodtype=padauk": { "model": "forestry:arboriculture/stairs/padauk_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left,woodtype=padauk": { "model": "forestry:arboriculture/stairs/padauk_outer", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right,woodtype=padauk": { "model": "forestry:arboriculture/stairs/padauk_inner", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right,woodtype=padauk": { "model": "forestry:arboriculture/stairs/padauk_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right,woodtype=padauk": { "model": "forestry:arboriculture/stairs/padauk_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right,woodtype=padauk": { "model": "forestry:arboriculture/stairs/padauk_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left,woodtype=padauk": { "model": "forestry:arboriculture/stairs/padauk_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left,woodtype=padauk": { "model": "forestry:arboriculture/stairs/padauk_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left,woodtype=padauk": { "model": "forestry:arboriculture/stairs/padauk_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left,woodtype=padauk": { "model": "forestry:arboriculture/stairs/padauk_inner", "x": 180, "uvlock": true }, + //cocobolo + "facing=east,half=bottom,shape=straight,woodtype=cocobolo": { "model": "forestry:arboriculture/stairs/cocobolo" }, + "facing=west,half=bottom,shape=straight,woodtype=cocobolo": { "model": "forestry:arboriculture/stairs/cocobolo", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight,woodtype=cocobolo": { "model": "forestry:arboriculture/stairs/cocobolo", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight,woodtype=cocobolo": { "model": "forestry:arboriculture/stairs/cocobolo", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right,woodtype=cocobolo": { "model": "forestry:arboriculture/stairs/cocobolo_outer" }, + "facing=west,half=bottom,shape=outer_right,woodtype=cocobolo": { "model": "forestry:arboriculture/stairs/cocobolo_outer", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right,woodtype=cocobolo": { "model": "forestry:arboriculture/stairs/cocobolo_outer", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right,woodtype=cocobolo": { "model": "forestry:arboriculture/stairs/cocobolo_outer", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left,woodtype=cocobolo": { "model": "forestry:arboriculture/stairs/cocobolo_outer", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left,woodtype=cocobolo": { "model": "forestry:arboriculture/stairs/cocobolo_outer", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left,woodtype=cocobolo": { "model": "forestry:arboriculture/stairs/cocobolo_outer" }, + "facing=north,half=bottom,shape=outer_left,woodtype=cocobolo": { "model": "forestry:arboriculture/stairs/cocobolo_outer", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right,woodtype=cocobolo": { "model": "forestry:arboriculture/stairs/cocobolo_inner" }, + "facing=west,half=bottom,shape=inner_right,woodtype=cocobolo": { "model": "forestry:arboriculture/stairs/cocobolo_inner", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right,woodtype=cocobolo": { "model": "forestry:arboriculture/stairs/cocobolo_inner", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right,woodtype=cocobolo": { "model": "forestry:arboriculture/stairs/cocobolo_inner", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left,woodtype=cocobolo": { "model": "forestry:arboriculture/stairs/cocobolo_inner", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left,woodtype=cocobolo": { "model": "forestry:arboriculture/stairs/cocobolo_inner", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left,woodtype=cocobolo": { "model": "forestry:arboriculture/stairs/cocobolo_inner" }, + "facing=north,half=bottom,shape=inner_left,woodtype=cocobolo": { "model": "forestry:arboriculture/stairs/cocobolo_inner", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight,woodtype=cocobolo": { "model": "forestry:arboriculture/stairs/cocobolo", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight,woodtype=cocobolo": { "model": "forestry:arboriculture/stairs/cocobolo", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight,woodtype=cocobolo": { "model": "forestry:arboriculture/stairs/cocobolo", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight,woodtype=cocobolo": { "model": "forestry:arboriculture/stairs/cocobolo", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right,woodtype=cocobolo": { "model": "forestry:arboriculture/stairs/cocobolo_outer", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right,woodtype=cocobolo": { "model": "forestry:arboriculture/stairs/cocobolo_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right,woodtype=cocobolo": { "model": "forestry:arboriculture/stairs/cocobolo_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right,woodtype=cocobolo": { "model": "forestry:arboriculture/stairs/cocobolo_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left,woodtype=cocobolo": { "model": "forestry:arboriculture/stairs/cocobolo_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left,woodtype=cocobolo": { "model": "forestry:arboriculture/stairs/cocobolo_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left,woodtype=cocobolo": { "model": "forestry:arboriculture/stairs/cocobolo_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left,woodtype=cocobolo": { "model": "forestry:arboriculture/stairs/cocobolo_outer", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right,woodtype=cocobolo": { "model": "forestry:arboriculture/stairs/cocobolo_inner", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right,woodtype=cocobolo": { "model": "forestry:arboriculture/stairs/cocobolo_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right,woodtype=cocobolo": { "model": "forestry:arboriculture/stairs/cocobolo_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right,woodtype=cocobolo": { "model": "forestry:arboriculture/stairs/cocobolo_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left,woodtype=cocobolo": { "model": "forestry:arboriculture/stairs/cocobolo_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left,woodtype=cocobolo": { "model": "forestry:arboriculture/stairs/cocobolo_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left,woodtype=cocobolo": { "model": "forestry:arboriculture/stairs/cocobolo_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left,woodtype=cocobolo": { "model": "forestry:arboriculture/stairs/cocobolo_inner", "x": 180, "uvlock": true }, + //zebrawood + "facing=east,half=bottom,shape=straight,woodtype=zebrawood": { "model": "forestry:arboriculture/stairs/zebrawood" }, + "facing=west,half=bottom,shape=straight,woodtype=zebrawood": { "model": "forestry:arboriculture/stairs/zebrawood", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight,woodtype=zebrawood": { "model": "forestry:arboriculture/stairs/zebrawood", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight,woodtype=zebrawood": { "model": "forestry:arboriculture/stairs/zebrawood", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right,woodtype=zebrawood": { "model": "forestry:arboriculture/stairs/zebrawood_outer" }, + "facing=west,half=bottom,shape=outer_right,woodtype=zebrawood": { "model": "forestry:arboriculture/stairs/zebrawood_outer", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right,woodtype=zebrawood": { "model": "forestry:arboriculture/stairs/zebrawood_outer", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right,woodtype=zebrawood": { "model": "forestry:arboriculture/stairs/zebrawood_outer", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left,woodtype=zebrawood": { "model": "forestry:arboriculture/stairs/zebrawood_outer", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left,woodtype=zebrawood": { "model": "forestry:arboriculture/stairs/zebrawood_outer", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left,woodtype=zebrawood": { "model": "forestry:arboriculture/stairs/zebrawood_outer" }, + "facing=north,half=bottom,shape=outer_left,woodtype=zebrawood": { "model": "forestry:arboriculture/stairs/zebrawood_outer", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right,woodtype=zebrawood": { "model": "forestry:arboriculture/stairs/zebrawood_inner" }, + "facing=west,half=bottom,shape=inner_right,woodtype=zebrawood": { "model": "forestry:arboriculture/stairs/zebrawood_inner", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right,woodtype=zebrawood": { "model": "forestry:arboriculture/stairs/zebrawood_inner", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right,woodtype=zebrawood": { "model": "forestry:arboriculture/stairs/zebrawood_inner", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left,woodtype=zebrawood": { "model": "forestry:arboriculture/stairs/zebrawood_inner", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left,woodtype=zebrawood": { "model": "forestry:arboriculture/stairs/zebrawood_inner", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left,woodtype=zebrawood": { "model": "forestry:arboriculture/stairs/zebrawood_inner" }, + "facing=north,half=bottom,shape=inner_left,woodtype=zebrawood": { "model": "forestry:arboriculture/stairs/zebrawood_inner", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight,woodtype=zebrawood": { "model": "forestry:arboriculture/stairs/zebrawood", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight,woodtype=zebrawood": { "model": "forestry:arboriculture/stairs/zebrawood", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight,woodtype=zebrawood": { "model": "forestry:arboriculture/stairs/zebrawood", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight,woodtype=zebrawood": { "model": "forestry:arboriculture/stairs/zebrawood", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right,woodtype=zebrawood": { "model": "forestry:arboriculture/stairs/zebrawood_outer", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right,woodtype=zebrawood": { "model": "forestry:arboriculture/stairs/zebrawood_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right,woodtype=zebrawood": { "model": "forestry:arboriculture/stairs/zebrawood_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right,woodtype=zebrawood": { "model": "forestry:arboriculture/stairs/zebrawood_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left,woodtype=zebrawood": { "model": "forestry:arboriculture/stairs/zebrawood_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left,woodtype=zebrawood": { "model": "forestry:arboriculture/stairs/zebrawood_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left,woodtype=zebrawood": { "model": "forestry:arboriculture/stairs/zebrawood_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left,woodtype=zebrawood": { "model": "forestry:arboriculture/stairs/zebrawood_outer", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right,woodtype=zebrawood": { "model": "forestry:arboriculture/stairs/zebrawood_inner", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right,woodtype=zebrawood": { "model": "forestry:arboriculture/stairs/zebrawood_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right,woodtype=zebrawood": { "model": "forestry:arboriculture/stairs/zebrawood_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right,woodtype=zebrawood": { "model": "forestry:arboriculture/stairs/zebrawood_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left,woodtype=zebrawood": { "model": "forestry:arboriculture/stairs/zebrawood_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left,woodtype=zebrawood": { "model": "forestry:arboriculture/stairs/zebrawood_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left,woodtype=zebrawood": { "model": "forestry:arboriculture/stairs/zebrawood_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left,woodtype=zebrawood": { "model": "forestry:arboriculture/stairs/zebrawood_inner", "x": 180, "uvlock": true } + } +} diff --git a/src/main/resources/assets/forestry/models/block/apiculture/alveary_entrance.json b/src/main/resources/assets/forestry/models/block/apiculture/alveary_entrance.json new file mode 100644 index 000000000..33220bb5e --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/apiculture/alveary_entrance.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/apiculture/alveary_plain_middle", + "textures": { + "particle": "forestry:blocks/apiculture/alveary.entrance", + "north": "forestry:blocks/apiculture/alveary.entrance", + "east": "forestry:blocks/apiculture/alveary.entrance", + "south": "forestry:blocks/apiculture/alveary.entrance", + "west": "forestry:blocks/apiculture/alveary.entrance" + } +} diff --git a/src/main/resources/assets/forestry/models/block/apiculture/alveary_fan_off.json b/src/main/resources/assets/forestry/models/block/apiculture/alveary_fan_off.json new file mode 100644 index 000000000..3d491ffd7 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/apiculture/alveary_fan_off.json @@ -0,0 +1,12 @@ +{ + "parent": "forestry:block/apiculture/alveary_plain_middle", + "textures": { + "particle": "forestry:blocks/apiculture/alveary.fan.off", + "down": "forestry:blocks/apiculture/alveary.fan.off", + "up": "forestry:blocks/apiculture/alveary.fan.off", + "north": "forestry:blocks/apiculture/alveary.fan.off", + "east": "forestry:blocks/apiculture/alveary.fan.off", + "south": "forestry:blocks/apiculture/alveary.fan.off", + "west": "forestry:blocks/apiculture/alveary.fan.off" + } +} diff --git a/src/main/resources/assets/forestry/models/block/apiculture/alveary_fan_on.json b/src/main/resources/assets/forestry/models/block/apiculture/alveary_fan_on.json new file mode 100644 index 000000000..e884130ed --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/apiculture/alveary_fan_on.json @@ -0,0 +1,12 @@ +{ + "parent": "forestry:block/apiculture/alveary_plain_middle", + "textures": { + "particle": "forestry:blocks/apiculture/alveary.fan.on", + "down": "forestry:blocks/apiculture/alveary.fan.on", + "up": "forestry:blocks/apiculture/alveary.fan.on", + "north": "forestry:blocks/apiculture/alveary.fan.on", + "east": "forestry:blocks/apiculture/alveary.fan.on", + "south": "forestry:blocks/apiculture/alveary.fan.on", + "west": "forestry:blocks/apiculture/alveary.fan.on" + } +} diff --git a/src/main/resources/assets/forestry/models/block/apiculture/alveary_heater_off.json b/src/main/resources/assets/forestry/models/block/apiculture/alveary_heater_off.json new file mode 100644 index 000000000..45993716e --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/apiculture/alveary_heater_off.json @@ -0,0 +1,12 @@ +{ + "parent": "forestry:block/apiculture/alveary_plain_middle", + "textures": { + "particle": "forestry:blocks/apiculture/alveary.heater.off", + "down": "forestry:blocks/apiculture/alveary.heater.off", + "up": "forestry:blocks/apiculture/alveary.heater.off", + "north": "forestry:blocks/apiculture/alveary.heater.off", + "east": "forestry:blocks/apiculture/alveary.heater.off", + "south": "forestry:blocks/apiculture/alveary.heater.off", + "west": "forestry:blocks/apiculture/alveary.heater.off" + } +} diff --git a/src/main/resources/assets/forestry/models/block/apiculture/alveary_heater_on.json b/src/main/resources/assets/forestry/models/block/apiculture/alveary_heater_on.json new file mode 100644 index 000000000..c646cb0bd --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/apiculture/alveary_heater_on.json @@ -0,0 +1,12 @@ +{ + "parent": "forestry:block/apiculture/alveary_plain_middle", + "textures": { + "particle": "forestry:blocks/apiculture/alveary.heater.on", + "down": "forestry:blocks/apiculture/alveary.heater.on", + "up": "forestry:blocks/apiculture/alveary.heater.on", + "north": "forestry:blocks/apiculture/alveary.heater.on", + "east": "forestry:blocks/apiculture/alveary.heater.on", + "south": "forestry:blocks/apiculture/alveary.heater.on", + "west": "forestry:blocks/apiculture/alveary.heater.on" + } +} diff --git a/src/main/resources/assets/forestry/models/block/apiculture/alveary_hygro.json b/src/main/resources/assets/forestry/models/block/apiculture/alveary_hygro.json new file mode 100644 index 000000000..feef0bd5d --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/apiculture/alveary_hygro.json @@ -0,0 +1,12 @@ +{ + "parent": "forestry:block/apiculture/alveary_plain_middle", + "textures": { + "particle": "forestry:blocks/apiculture/alveary.valve", + "down": "forestry:blocks/apiculture/alveary.valve", + "up": "forestry:blocks/apiculture/alveary.valve", + "north": "forestry:blocks/apiculture/alveary.valve", + "east": "forestry:blocks/apiculture/alveary.valve", + "south": "forestry:blocks/apiculture/alveary.valve", + "west": "forestry:blocks/apiculture/alveary.valve" + } +} diff --git a/src/main/resources/assets/forestry/models/block/apiculture/alveary_plain_down.json b/src/main/resources/assets/forestry/models/block/apiculture/alveary_plain_down.json new file mode 100644 index 000000000..08a49a5c8 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/apiculture/alveary_plain_down.json @@ -0,0 +1,12 @@ +{ + "parent": "block/cube", + "textures": { + "particle": "forestry:blocks/apiculture/alveary.right", + "down": "forestry:blocks/apiculture/alveary.bottom", + "up": "forestry:blocks/apiculture/alveary.bottom", + "north": "forestry:blocks/apiculture/alveary.left", + "east": "forestry:blocks/apiculture/alveary.right", + "south": "forestry:blocks/apiculture/alveary.left", + "west": "forestry:blocks/apiculture/alveary.right" + } +} diff --git a/src/main/resources/assets/forestry/models/block/apiculture/alveary_plain_middle.json b/src/main/resources/assets/forestry/models/block/apiculture/alveary_plain_middle.json new file mode 100644 index 000000000..1be50a484 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/apiculture/alveary_plain_middle.json @@ -0,0 +1,12 @@ +{ + "parent": "block/cube", + "textures": { + "particle": "forestry:blocks/apiculture/alveary.plain", + "down": "forestry:blocks/apiculture/alveary.bottom", + "up": "forestry:blocks/apiculture/alveary.bottom", + "north": "forestry:blocks/apiculture/alveary.plain", + "east": "forestry:blocks/apiculture/alveary.plain", + "south": "forestry:blocks/apiculture/alveary.plain", + "west": "forestry:blocks/apiculture/alveary.plain" + } +} diff --git a/src/main/resources/assets/forestry/models/block/apiculture/alveary_plain_up.json b/src/main/resources/assets/forestry/models/block/apiculture/alveary_plain_up.json new file mode 100644 index 000000000..65c793adc --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/apiculture/alveary_plain_up.json @@ -0,0 +1,12 @@ +{ + "parent": "block/cube", + "textures": { + "particle": "forestry:blocks/apiculture/alveary.right", + "down": "forestry:blocks/apiculture/alveary.bottom", + "up": "forestry:blocks/apiculture/alveary.bottom", + "north": "forestry:blocks/apiculture/alveary.right", + "east": "forestry:blocks/apiculture/alveary.left", + "south": "forestry:blocks/apiculture/alveary.right", + "west": "forestry:blocks/apiculture/alveary.left" + } +} diff --git a/src/main/resources/assets/forestry/models/block/apiculture/alveary_sieve.json b/src/main/resources/assets/forestry/models/block/apiculture/alveary_sieve.json new file mode 100644 index 000000000..5ae727f54 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/apiculture/alveary_sieve.json @@ -0,0 +1,12 @@ +{ + "parent": "forestry:block/apiculture/alveary_plain_middle", + "textures": { + "particle": "forestry:blocks/apiculture/alveary.sieve", + "down": "forestry:blocks/apiculture/alveary.bottom", + "up": "forestry:blocks/apiculture/alveary.bottom", + "north": "forestry:blocks/apiculture/alveary.sieve", + "east": "forestry:blocks/apiculture/alveary.sieve", + "south": "forestry:blocks/apiculture/alveary.sieve", + "west": "forestry:blocks/apiculture/alveary.sieve" + } +} diff --git a/src/main/resources/assets/forestry/models/block/apiculture/alveary_stabiliser.json b/src/main/resources/assets/forestry/models/block/apiculture/alveary_stabiliser.json new file mode 100644 index 000000000..beafa3bcd --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/apiculture/alveary_stabiliser.json @@ -0,0 +1,12 @@ +{ + "parent": "forestry:block/apiculture/alveary_plain_middle", + "textures": { + "particle": "forestry:blocks/apiculture/alveary.stabiliser", + "down": "forestry:blocks/apiculture/alveary.bottom", + "up": "forestry:blocks/apiculture/alveary.bottom", + "north": "forestry:blocks/apiculture/alveary.stabiliser", + "east": "forestry:blocks/apiculture/alveary.stabiliser", + "south": "forestry:blocks/apiculture/alveary.stabiliser", + "west": "forestry:blocks/apiculture/alveary.stabiliser" + } +} diff --git a/src/main/resources/assets/forestry/models/block/apiculture/alveary_swarmer_off.json b/src/main/resources/assets/forestry/models/block/apiculture/alveary_swarmer_off.json new file mode 100644 index 000000000..54a295e84 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/apiculture/alveary_swarmer_off.json @@ -0,0 +1,12 @@ +{ + "parent": "forestry:block/apiculture/alveary_plain_middle", + "textures": { + "particle": "forestry:blocks/apiculture/alveary.swarmer.off", + "down": "forestry:blocks/apiculture/alveary.bottom", + "up": "forestry:blocks/apiculture/alveary.bottom", + "north": "forestry:blocks/apiculture/alveary.swarmer.off", + "east": "forestry:blocks/apiculture/alveary.swarmer.off", + "south": "forestry:blocks/apiculture/alveary.swarmer.off", + "west": "forestry:blocks/apiculture/alveary.swarmer.off" + } +} diff --git a/src/main/resources/assets/forestry/models/block/apiculture/alveary_swarmer_on.json b/src/main/resources/assets/forestry/models/block/apiculture/alveary_swarmer_on.json new file mode 100644 index 000000000..786403e08 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/apiculture/alveary_swarmer_on.json @@ -0,0 +1,12 @@ +{ + "parent": "forestry:block/apiculture/alveary_plain_middle", + "textures": { + "particle": "forestry:blocks/apiculture/alveary.swarmer.on", + "down": "forestry:blocks/apiculture/alveary.bottom", + "up": "forestry:blocks/apiculture/alveary.bottom", + "north": "forestry:blocks/apiculture/alveary.swarmer.on", + "east": "forestry:blocks/apiculture/alveary.swarmer.on", + "south": "forestry:blocks/apiculture/alveary.swarmer.on", + "west": "forestry:blocks/apiculture/alveary.swarmer.on" + } +} diff --git a/src/main/resources/assets/forestry/models/block/apiculture_apiary.json b/src/main/resources/assets/forestry/models/block/apiculture_apiary.json new file mode 100644 index 000000000..10a3833bf --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/apiculture_apiary.json @@ -0,0 +1,12 @@ +{ + "parent": "block/cube", + "textures": { + "particle": "forestry:blocks/apiary.4", + "down": "forestry:blocks/apiary.0", + "up": "forestry:blocks/apiary.1", + "north": "forestry:blocks/apiary.2", + "east": "forestry:blocks/apiary.4", + "south": "forestry:blocks/apiary.4", + "west": "forestry:blocks/apiary.4" + } +} diff --git a/src/main/resources/assets/forestry/models/block/apiculture_beehouse.json b/src/main/resources/assets/forestry/models/block/apiculture_beehouse.json new file mode 100644 index 000000000..49f9ae61c --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/apiculture_beehouse.json @@ -0,0 +1,12 @@ +{ + "parent": "block/cube", + "textures": { + "particle": "forestry:blocks/beehouse.4", + "down": "forestry:blocks/beehouse.0", + "up": "forestry:blocks/beehouse.1", + "north": "forestry:blocks/beehouse.2", + "east": "forestry:blocks/beehouse.4", + "south": "forestry:blocks/beehouse.4", + "west": "forestry:blocks/beehouse.4" + } +} diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/acacia_inventory.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/acacia_inventory.json new file mode 100644 index 000000000..104686834 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/acacia_inventory.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_inventory", + "textures": { + "texture": "forestry:blocks/wood/planks.acacia" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/acacia_n.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/acacia_n.json new file mode 100644 index 000000000..becd0661d --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/acacia_n.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_n", + "textures": { + "texture": "forestry:blocks/wood/planks.acacia" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/acacia_ne.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/acacia_ne.json new file mode 100644 index 000000000..b85abbab0 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/acacia_ne.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_ne", + "textures": { + "texture": "forestry:blocks/wood/planks.acacia" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/acacia_ns.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/acacia_ns.json new file mode 100644 index 000000000..582d485e2 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/acacia_ns.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_ns", + "textures": { + "texture": "forestry:blocks/wood/planks.acacia" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/acacia_nse.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/acacia_nse.json new file mode 100644 index 000000000..cb511a238 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/acacia_nse.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_nse", + "textures": { + "texture": "forestry:blocks/wood/planks.acacia" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/acacia_nsew.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/acacia_nsew.json new file mode 100644 index 000000000..ba7700e74 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/acacia_nsew.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_nsew", + "textures": { + "texture": "forestry:blocks/wood/planks.acacia" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/acacia_post.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/acacia_post.json new file mode 100644 index 000000000..0c2ce36aa --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/acacia_post.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_post", + "textures": { + "texture": "forestry:blocks/wood/planks.acacia" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/balsa_inventory.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/balsa_inventory.json new file mode 100644 index 000000000..e7e081c4b --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/balsa_inventory.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_inventory", + "textures": { + "texture": "forestry:blocks/wood/planks.balsa" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/balsa_n.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/balsa_n.json new file mode 100644 index 000000000..ff88c71ec --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/balsa_n.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_n", + "textures": { + "texture": "forestry:blocks/wood/planks.balsa" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/balsa_ne.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/balsa_ne.json new file mode 100644 index 000000000..28a966533 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/balsa_ne.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_ne", + "textures": { + "texture": "forestry:blocks/wood/planks.balsa" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/balsa_ns.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/balsa_ns.json new file mode 100644 index 000000000..ecafb5f58 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/balsa_ns.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_ns", + "textures": { + "texture": "forestry:blocks/wood/planks.balsa" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/balsa_nse.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/balsa_nse.json new file mode 100644 index 000000000..cc77ba388 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/balsa_nse.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_nse", + "textures": { + "texture": "forestry:blocks/wood/planks.balsa" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/balsa_nsew.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/balsa_nsew.json new file mode 100644 index 000000000..6b730579c --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/balsa_nsew.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_nsew", + "textures": { + "texture": "forestry:blocks/wood/planks.balsa" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/balsa_post.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/balsa_post.json new file mode 100644 index 000000000..8a7496b43 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/balsa_post.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_post", + "textures": { + "texture": "forestry:blocks/wood/planks.balsa" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/baobab_inventory.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/baobab_inventory.json new file mode 100644 index 000000000..d272aaea5 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/baobab_inventory.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_inventory", + "textures": { + "texture": "forestry:blocks/wood/planks.baobab" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/baobab_n.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/baobab_n.json new file mode 100644 index 000000000..5624a11e5 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/baobab_n.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_n", + "textures": { + "texture": "forestry:blocks/wood/planks.baobab" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/baobab_ne.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/baobab_ne.json new file mode 100644 index 000000000..b25a659d8 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/baobab_ne.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_ne", + "textures": { + "texture": "forestry:blocks/wood/planks.baobab" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/baobab_ns.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/baobab_ns.json new file mode 100644 index 000000000..e501c1396 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/baobab_ns.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_ns", + "textures": { + "texture": "forestry:blocks/wood/planks.baobab" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/baobab_nse.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/baobab_nse.json new file mode 100644 index 000000000..0c0ed4737 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/baobab_nse.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_nse", + "textures": { + "texture": "forestry:blocks/wood/planks.baobab" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/baobab_nsew.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/baobab_nsew.json new file mode 100644 index 000000000..3564f1f27 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/baobab_nsew.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_nsew", + "textures": { + "texture": "forestry:blocks/wood/planks.baobab" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/baobab_post.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/baobab_post.json new file mode 100644 index 000000000..023ffb00b --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/baobab_post.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_post", + "textures": { + "texture": "forestry:blocks/wood/planks.baobab" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/cherry_inventory.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/cherry_inventory.json new file mode 100644 index 000000000..bfbd13110 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/cherry_inventory.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_inventory", + "textures": { + "texture": "forestry:blocks/wood/planks.cherry" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/cherry_n.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/cherry_n.json new file mode 100644 index 000000000..ac7655e30 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/cherry_n.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_n", + "textures": { + "texture": "forestry:blocks/wood/planks.cherry" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/cherry_ne.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/cherry_ne.json new file mode 100644 index 000000000..899d40db7 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/cherry_ne.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_ne", + "textures": { + "texture": "forestry:blocks/wood/planks.cherry" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/cherry_ns.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/cherry_ns.json new file mode 100644 index 000000000..ceba657b4 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/cherry_ns.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_ns", + "textures": { + "texture": "forestry:blocks/wood/planks.cherry" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/cherry_nse.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/cherry_nse.json new file mode 100644 index 000000000..ef9c4e364 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/cherry_nse.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_nse", + "textures": { + "texture": "forestry:blocks/wood/planks.cherry" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/cherry_nsew.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/cherry_nsew.json new file mode 100644 index 000000000..ad959c059 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/cherry_nsew.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_nsew", + "textures": { + "texture": "forestry:blocks/wood/planks.cherry" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/cherry_post.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/cherry_post.json new file mode 100644 index 000000000..36ca9782d --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/cherry_post.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_post", + "textures": { + "texture": "forestry:blocks/wood/planks.cherry" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/chestnut_inventory.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/chestnut_inventory.json new file mode 100644 index 000000000..02f7eaf31 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/chestnut_inventory.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_inventory", + "textures": { + "texture": "forestry:blocks/wood/planks.chestnut" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/chestnut_n.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/chestnut_n.json new file mode 100644 index 000000000..24ebd3621 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/chestnut_n.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_n", + "textures": { + "texture": "forestry:blocks/wood/planks.chestnut" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/chestnut_ne.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/chestnut_ne.json new file mode 100644 index 000000000..090c5041a --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/chestnut_ne.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_ne", + "textures": { + "texture": "forestry:blocks/wood/planks.chestnut" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/chestnut_ns.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/chestnut_ns.json new file mode 100644 index 000000000..ac313d46b --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/chestnut_ns.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_ns", + "textures": { + "texture": "forestry:blocks/wood/planks.chestnut" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/chestnut_nse.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/chestnut_nse.json new file mode 100644 index 000000000..c14bc34cf --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/chestnut_nse.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_nse", + "textures": { + "texture": "forestry:blocks/wood/planks.chestnut" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/chestnut_nsew.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/chestnut_nsew.json new file mode 100644 index 000000000..aeebbc262 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/chestnut_nsew.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_nsew", + "textures": { + "texture": "forestry:blocks/wood/planks.chestnut" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/chestnut_post.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/chestnut_post.json new file mode 100644 index 000000000..8d92feff3 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/chestnut_post.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_post", + "textures": { + "texture": "forestry:blocks/wood/planks.chestnut" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/citrus_inventory.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/citrus_inventory.json new file mode 100644 index 000000000..e0a6f8324 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/citrus_inventory.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_inventory", + "textures": { + "texture": "forestry:blocks/wood/planks.citrus" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/citrus_n.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/citrus_n.json new file mode 100644 index 000000000..5889c462d --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/citrus_n.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_n", + "textures": { + "texture": "forestry:blocks/wood/planks.citrus" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/citrus_ne.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/citrus_ne.json new file mode 100644 index 000000000..c3b9941f8 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/citrus_ne.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_ne", + "textures": { + "texture": "forestry:blocks/wood/planks.citrus" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/citrus_ns.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/citrus_ns.json new file mode 100644 index 000000000..c469c0e50 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/citrus_ns.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_ns", + "textures": { + "texture": "forestry:blocks/wood/planks.citrus" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/citrus_nse.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/citrus_nse.json new file mode 100644 index 000000000..c48e8a385 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/citrus_nse.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_nse", + "textures": { + "texture": "forestry:blocks/wood/planks.citrus" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/citrus_nsew.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/citrus_nsew.json new file mode 100644 index 000000000..b1d8ce01a --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/citrus_nsew.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_nsew", + "textures": { + "texture": "forestry:blocks/wood/planks.citrus" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/citrus_post.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/citrus_post.json new file mode 100644 index 000000000..b54abe893 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/citrus_post.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_post", + "textures": { + "texture": "forestry:blocks/wood/planks.citrus" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/cocobolo_inventory.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/cocobolo_inventory.json new file mode 100644 index 000000000..fb34997ae --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/cocobolo_inventory.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_inventory", + "textures": { + "texture": "forestry:blocks/wood/planks.cocobolo" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/cocobolo_n.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/cocobolo_n.json new file mode 100644 index 000000000..a0e430cd3 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/cocobolo_n.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_n", + "textures": { + "texture": "forestry:blocks/wood/planks.cocobolo" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/cocobolo_ne.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/cocobolo_ne.json new file mode 100644 index 000000000..3cfb3907e --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/cocobolo_ne.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_ne", + "textures": { + "texture": "forestry:blocks/wood/planks.cocobolo" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/cocobolo_ns.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/cocobolo_ns.json new file mode 100644 index 000000000..b25d099b1 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/cocobolo_ns.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_ns", + "textures": { + "texture": "forestry:blocks/wood/planks.cocobolo" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/cocobolo_nse.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/cocobolo_nse.json new file mode 100644 index 000000000..af86c277c --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/cocobolo_nse.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_nse", + "textures": { + "texture": "forestry:blocks/wood/planks.cocobolo" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/cocobolo_nsew.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/cocobolo_nsew.json new file mode 100644 index 000000000..0264b0473 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/cocobolo_nsew.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_nsew", + "textures": { + "texture": "forestry:blocks/wood/planks.cocobolo" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/cocobolo_post.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/cocobolo_post.json new file mode 100644 index 000000000..d12c32a98 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/cocobolo_post.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_post", + "textures": { + "texture": "forestry:blocks/wood/planks.cocobolo" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/ebony_inventory.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/ebony_inventory.json new file mode 100644 index 000000000..f6342e365 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/ebony_inventory.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_inventory", + "textures": { + "texture": "forestry:blocks/wood/planks.ebony" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/ebony_n.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/ebony_n.json new file mode 100644 index 000000000..117c61c74 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/ebony_n.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_n", + "textures": { + "texture": "forestry:blocks/wood/planks.ebony" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/ebony_ne.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/ebony_ne.json new file mode 100644 index 000000000..9a0fdde24 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/ebony_ne.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_ne", + "textures": { + "texture": "forestry:blocks/wood/planks.ebony" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/ebony_ns.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/ebony_ns.json new file mode 100644 index 000000000..f0961a346 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/ebony_ns.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_ns", + "textures": { + "texture": "forestry:blocks/wood/planks.ebony" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/ebony_nse.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/ebony_nse.json new file mode 100644 index 000000000..392fda1d0 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/ebony_nse.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_nse", + "textures": { + "texture": "forestry:blocks/wood/planks.ebony" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/ebony_nsew.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/ebony_nsew.json new file mode 100644 index 000000000..0edcf97fe --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/ebony_nsew.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_nsew", + "textures": { + "texture": "forestry:blocks/wood/planks.ebony" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/ebony_post.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/ebony_post.json new file mode 100644 index 000000000..d02a9159d --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/ebony_post.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_post", + "textures": { + "texture": "forestry:blocks/wood/planks.ebony" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/giganteum_inventory.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/giganteum_inventory.json new file mode 100644 index 000000000..bbe209b7d --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/giganteum_inventory.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_inventory", + "textures": { + "texture": "forestry:blocks/wood/planks.giganteum" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/giganteum_n.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/giganteum_n.json new file mode 100644 index 000000000..d07e430c8 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/giganteum_n.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_n", + "textures": { + "texture": "forestry:blocks/wood/planks.giganteum" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/giganteum_ne.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/giganteum_ne.json new file mode 100644 index 000000000..df5bfaea6 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/giganteum_ne.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_ne", + "textures": { + "texture": "forestry:blocks/wood/planks.giganteum" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/giganteum_ns.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/giganteum_ns.json new file mode 100644 index 000000000..2320b615e --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/giganteum_ns.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_ns", + "textures": { + "texture": "forestry:blocks/wood/planks.giganteum" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/giganteum_nse.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/giganteum_nse.json new file mode 100644 index 000000000..c60d46c0f --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/giganteum_nse.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_nse", + "textures": { + "texture": "forestry:blocks/wood/planks.giganteum" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/giganteum_nsew.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/giganteum_nsew.json new file mode 100644 index 000000000..74d2b6309 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/giganteum_nsew.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_nsew", + "textures": { + "texture": "forestry:blocks/wood/planks.giganteum" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/giganteum_post.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/giganteum_post.json new file mode 100644 index 000000000..ccd539e72 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/giganteum_post.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_post", + "textures": { + "texture": "forestry:blocks/wood/planks.giganteum" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/greenheart_inventory.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/greenheart_inventory.json new file mode 100644 index 000000000..279667071 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/greenheart_inventory.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_inventory", + "textures": { + "texture": "forestry:blocks/wood/planks.greenheart" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/greenheart_n.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/greenheart_n.json new file mode 100644 index 000000000..6500608fd --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/greenheart_n.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_n", + "textures": { + "texture": "forestry:blocks/wood/planks.greenheart" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/greenheart_ne.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/greenheart_ne.json new file mode 100644 index 000000000..3f56d1f4b --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/greenheart_ne.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_ne", + "textures": { + "texture": "forestry:blocks/wood/planks.greenheart" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/greenheart_ns.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/greenheart_ns.json new file mode 100644 index 000000000..ff26d1498 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/greenheart_ns.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_ns", + "textures": { + "texture": "forestry:blocks/wood/planks.greenheart" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/greenheart_nse.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/greenheart_nse.json new file mode 100644 index 000000000..0f2c41b40 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/greenheart_nse.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_nse", + "textures": { + "texture": "forestry:blocks/wood/planks.greenheart" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/greenheart_nsew.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/greenheart_nsew.json new file mode 100644 index 000000000..56840d84d --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/greenheart_nsew.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_nsew", + "textures": { + "texture": "forestry:blocks/wood/planks.greenheart" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/greenheart_post.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/greenheart_post.json new file mode 100644 index 000000000..005f85940 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/greenheart_post.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_post", + "textures": { + "texture": "forestry:blocks/wood/planks.greenheart" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/ipe_inventory.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/ipe_inventory.json new file mode 100644 index 000000000..bee48c75d --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/ipe_inventory.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_inventory", + "textures": { + "texture": "forestry:blocks/wood/planks.ipe" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/ipe_n.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/ipe_n.json new file mode 100644 index 000000000..528305290 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/ipe_n.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_n", + "textures": { + "texture": "forestry:blocks/wood/planks.ipe" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/ipe_ne.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/ipe_ne.json new file mode 100644 index 000000000..d5eada253 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/ipe_ne.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_ne", + "textures": { + "texture": "forestry:blocks/wood/planks.ipe" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/ipe_ns.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/ipe_ns.json new file mode 100644 index 000000000..305ec2b74 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/ipe_ns.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_ns", + "textures": { + "texture": "forestry:blocks/wood/planks.ipe" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/ipe_nse.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/ipe_nse.json new file mode 100644 index 000000000..0694dd24a --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/ipe_nse.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_nse", + "textures": { + "texture": "forestry:blocks/wood/planks.ipe" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/ipe_nsew.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/ipe_nsew.json new file mode 100644 index 000000000..9a29b6140 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/ipe_nsew.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_nsew", + "textures": { + "texture": "forestry:blocks/wood/planks.ipe" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/ipe_post.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/ipe_post.json new file mode 100644 index 000000000..04dc76056 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/ipe_post.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_post", + "textures": { + "texture": "forestry:blocks/wood/planks.ipe" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/kapok_inventory.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/kapok_inventory.json new file mode 100644 index 000000000..61da2ce49 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/kapok_inventory.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_inventory", + "textures": { + "texture": "forestry:blocks/wood/planks.kapok" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/kapok_n.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/kapok_n.json new file mode 100644 index 000000000..49a0949f2 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/kapok_n.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_n", + "textures": { + "texture": "forestry:blocks/wood/planks.kapok" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/kapok_ne.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/kapok_ne.json new file mode 100644 index 000000000..316d650d7 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/kapok_ne.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_ne", + "textures": { + "texture": "forestry:blocks/wood/planks.kapok" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/kapok_ns.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/kapok_ns.json new file mode 100644 index 000000000..0b3c8fc21 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/kapok_ns.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_ns", + "textures": { + "texture": "forestry:blocks/wood/planks.kapok" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/kapok_nse.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/kapok_nse.json new file mode 100644 index 000000000..1e0368f14 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/kapok_nse.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_nse", + "textures": { + "texture": "forestry:blocks/wood/planks.kapok" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/kapok_nsew.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/kapok_nsew.json new file mode 100644 index 000000000..de6ee5b1e --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/kapok_nsew.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_nsew", + "textures": { + "texture": "forestry:blocks/wood/planks.kapok" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/kapok_post.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/kapok_post.json new file mode 100644 index 000000000..87a089926 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/kapok_post.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_post", + "textures": { + "texture": "forestry:blocks/wood/planks.kapok" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/larch_inventory.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/larch_inventory.json new file mode 100644 index 000000000..7462d8efe --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/larch_inventory.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_inventory", + "textures": { + "texture": "forestry:blocks/wood/planks.larch" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/larch_n.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/larch_n.json new file mode 100644 index 000000000..9d23a7898 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/larch_n.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_n", + "textures": { + "texture": "forestry:blocks/wood/planks.larch" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/larch_ne.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/larch_ne.json new file mode 100644 index 000000000..3ed45644f --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/larch_ne.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_ne", + "textures": { + "texture": "forestry:blocks/wood/planks.larch" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/larch_ns.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/larch_ns.json new file mode 100644 index 000000000..c192c9e65 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/larch_ns.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_ns", + "textures": { + "texture": "forestry:blocks/wood/planks.larch" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/larch_nse.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/larch_nse.json new file mode 100644 index 000000000..3a8f5df80 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/larch_nse.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_nse", + "textures": { + "texture": "forestry:blocks/wood/planks.larch" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/larch_nsew.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/larch_nsew.json new file mode 100644 index 000000000..b66ddfa86 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/larch_nsew.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_nsew", + "textures": { + "texture": "forestry:blocks/wood/planks.larch" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/larch_post.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/larch_post.json new file mode 100644 index 000000000..716eec2b8 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/larch_post.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_post", + "textures": { + "texture": "forestry:blocks/wood/planks.larch" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/lime_inventory.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/lime_inventory.json new file mode 100644 index 000000000..3360ef475 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/lime_inventory.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_inventory", + "textures": { + "texture": "forestry:blocks/wood/planks.lime" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/lime_n.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/lime_n.json new file mode 100644 index 000000000..259fd772c --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/lime_n.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_n", + "textures": { + "texture": "forestry:blocks/wood/planks.lime" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/lime_ne.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/lime_ne.json new file mode 100644 index 000000000..998464a50 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/lime_ne.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_ne", + "textures": { + "texture": "forestry:blocks/wood/planks.lime" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/lime_ns.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/lime_ns.json new file mode 100644 index 000000000..763323c23 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/lime_ns.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_ns", + "textures": { + "texture": "forestry:blocks/wood/planks.lime" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/lime_nse.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/lime_nse.json new file mode 100644 index 000000000..24537a2b3 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/lime_nse.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_nse", + "textures": { + "texture": "forestry:blocks/wood/planks.lime" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/lime_nsew.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/lime_nsew.json new file mode 100644 index 000000000..5adb609d1 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/lime_nsew.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_nsew", + "textures": { + "texture": "forestry:blocks/wood/planks.lime" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/lime_post.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/lime_post.json new file mode 100644 index 000000000..9aea0e4ef --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/lime_post.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_post", + "textures": { + "texture": "forestry:blocks/wood/planks.lime" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/mahoe_inventory.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/mahoe_inventory.json new file mode 100644 index 000000000..e4c886e7d --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/mahoe_inventory.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_inventory", + "textures": { + "texture": "forestry:blocks/wood/planks.mahoe" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/mahoe_n.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/mahoe_n.json new file mode 100644 index 000000000..f84d9f9db --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/mahoe_n.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_n", + "textures": { + "texture": "forestry:blocks/wood/planks.mahoe" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/mahoe_ne.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/mahoe_ne.json new file mode 100644 index 000000000..e18ae2ba9 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/mahoe_ne.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_ne", + "textures": { + "texture": "forestry:blocks/wood/planks.mahoe" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/mahoe_ns.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/mahoe_ns.json new file mode 100644 index 000000000..a135ece4d --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/mahoe_ns.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_ns", + "textures": { + "texture": "forestry:blocks/wood/planks.mahoe" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/mahoe_nse.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/mahoe_nse.json new file mode 100644 index 000000000..d0a1ec8e4 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/mahoe_nse.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_nse", + "textures": { + "texture": "forestry:blocks/wood/planks.mahoe" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/mahoe_nsew.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/mahoe_nsew.json new file mode 100644 index 000000000..ee2b032e0 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/mahoe_nsew.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_nsew", + "textures": { + "texture": "forestry:blocks/wood/planks.mahoe" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/mahoe_post.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/mahoe_post.json new file mode 100644 index 000000000..9dacbc2fb --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/mahoe_post.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_post", + "textures": { + "texture": "forestry:blocks/wood/planks.mahoe" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/mahogany_inventory.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/mahogany_inventory.json new file mode 100644 index 000000000..c9c940a74 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/mahogany_inventory.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_inventory", + "textures": { + "texture": "forestry:blocks/wood/planks.mahogany" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/mahogany_n.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/mahogany_n.json new file mode 100644 index 000000000..9fe2620c6 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/mahogany_n.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_n", + "textures": { + "texture": "forestry:blocks/wood/planks.mahogany" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/mahogany_ne.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/mahogany_ne.json new file mode 100644 index 000000000..6ebf4084a --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/mahogany_ne.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_ne", + "textures": { + "texture": "forestry:blocks/wood/planks.mahogany" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/mahogany_ns.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/mahogany_ns.json new file mode 100644 index 000000000..5b3c93911 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/mahogany_ns.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_ns", + "textures": { + "texture": "forestry:blocks/wood/planks.mahogany" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/mahogany_nse.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/mahogany_nse.json new file mode 100644 index 000000000..2b43a6264 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/mahogany_nse.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_nse", + "textures": { + "texture": "forestry:blocks/wood/planks.mahogany" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/mahogany_nsew.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/mahogany_nsew.json new file mode 100644 index 000000000..9bda1d842 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/mahogany_nsew.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_nsew", + "textures": { + "texture": "forestry:blocks/wood/planks.mahogany" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/mahogany_post.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/mahogany_post.json new file mode 100644 index 000000000..d424cee01 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/mahogany_post.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_post", + "textures": { + "texture": "forestry:blocks/wood/planks.mahogany" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/maple_inventory.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/maple_inventory.json new file mode 100644 index 000000000..18693cbef --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/maple_inventory.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_inventory", + "textures": { + "texture": "forestry:blocks/wood/planks.maple" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/maple_n.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/maple_n.json new file mode 100644 index 000000000..01cb5ed58 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/maple_n.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_n", + "textures": { + "texture": "forestry:blocks/wood/planks.maple" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/maple_ne.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/maple_ne.json new file mode 100644 index 000000000..7ac7e80b0 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/maple_ne.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_ne", + "textures": { + "texture": "forestry:blocks/wood/planks.maple" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/maple_ns.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/maple_ns.json new file mode 100644 index 000000000..65f36de52 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/maple_ns.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_ns", + "textures": { + "texture": "forestry:blocks/wood/planks.maple" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/maple_nse.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/maple_nse.json new file mode 100644 index 000000000..e4e7ca2b8 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/maple_nse.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_nse", + "textures": { + "texture": "forestry:blocks/wood/planks.maple" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/maple_nsew.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/maple_nsew.json new file mode 100644 index 000000000..0f48ad7d8 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/maple_nsew.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_nsew", + "textures": { + "texture": "forestry:blocks/wood/planks.maple" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/maple_post.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/maple_post.json new file mode 100644 index 000000000..9ac64d4eb --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/maple_post.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_post", + "textures": { + "texture": "forestry:blocks/wood/planks.maple" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/padauk_inventory.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/padauk_inventory.json new file mode 100644 index 000000000..dfea9ce35 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/padauk_inventory.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_inventory", + "textures": { + "texture": "forestry:blocks/wood/planks.padauk" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/padauk_n.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/padauk_n.json new file mode 100644 index 000000000..b0b09fe64 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/padauk_n.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_n", + "textures": { + "texture": "forestry:blocks/wood/planks.padauk" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/padauk_ne.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/padauk_ne.json new file mode 100644 index 000000000..f3abc3c3d --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/padauk_ne.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_ne", + "textures": { + "texture": "forestry:blocks/wood/planks.padauk" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/padauk_ns.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/padauk_ns.json new file mode 100644 index 000000000..a575f9f29 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/padauk_ns.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_ns", + "textures": { + "texture": "forestry:blocks/wood/planks.padauk" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/padauk_nse.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/padauk_nse.json new file mode 100644 index 000000000..077e8eeb4 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/padauk_nse.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_nse", + "textures": { + "texture": "forestry:blocks/wood/planks.padauk" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/padauk_nsew.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/padauk_nsew.json new file mode 100644 index 000000000..053d99930 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/padauk_nsew.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_nsew", + "textures": { + "texture": "forestry:blocks/wood/planks.padauk" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/padauk_post.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/padauk_post.json new file mode 100644 index 000000000..3bdf8c48f --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/padauk_post.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_post", + "textures": { + "texture": "forestry:blocks/wood/planks.padauk" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/palm_inventory.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/palm_inventory.json new file mode 100644 index 000000000..43ea1f3f7 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/palm_inventory.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_inventory", + "textures": { + "texture": "forestry:blocks/wood/planks.palm" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/palm_n.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/palm_n.json new file mode 100644 index 000000000..679caeccd --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/palm_n.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_n", + "textures": { + "texture": "forestry:blocks/wood/planks.palm" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/palm_ne.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/palm_ne.json new file mode 100644 index 000000000..4479a1639 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/palm_ne.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_ne", + "textures": { + "texture": "forestry:blocks/wood/planks.palm" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/palm_ns.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/palm_ns.json new file mode 100644 index 000000000..0e15a9864 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/palm_ns.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_ns", + "textures": { + "texture": "forestry:blocks/wood/planks.palm" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/palm_nse.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/palm_nse.json new file mode 100644 index 000000000..88a08810d --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/palm_nse.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_nse", + "textures": { + "texture": "forestry:blocks/wood/planks.palm" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/palm_nsew.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/palm_nsew.json new file mode 100644 index 000000000..d49fb8bca --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/palm_nsew.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_nsew", + "textures": { + "texture": "forestry:blocks/wood/planks.palm" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/palm_post.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/palm_post.json new file mode 100644 index 000000000..f2bf94935 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/palm_post.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_post", + "textures": { + "texture": "forestry:blocks/wood/planks.palm" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/papaya_inventory.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/papaya_inventory.json new file mode 100644 index 000000000..5c47b59f3 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/papaya_inventory.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_inventory", + "textures": { + "texture": "forestry:blocks/wood/planks.papaya" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/papaya_n.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/papaya_n.json new file mode 100644 index 000000000..38125267b --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/papaya_n.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_n", + "textures": { + "texture": "forestry:blocks/wood/planks.papaya" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/papaya_ne.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/papaya_ne.json new file mode 100644 index 000000000..4bc9e9e0b --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/papaya_ne.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_ne", + "textures": { + "texture": "forestry:blocks/wood/planks.papaya" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/papaya_ns.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/papaya_ns.json new file mode 100644 index 000000000..a46525544 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/papaya_ns.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_ns", + "textures": { + "texture": "forestry:blocks/wood/planks.papaya" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/papaya_nse.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/papaya_nse.json new file mode 100644 index 000000000..2bf825f77 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/papaya_nse.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_nse", + "textures": { + "texture": "forestry:blocks/wood/planks.papaya" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/papaya_nsew.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/papaya_nsew.json new file mode 100644 index 000000000..5d5c20d2e --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/papaya_nsew.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_nsew", + "textures": { + "texture": "forestry:blocks/wood/planks.papaya" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/papaya_post.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/papaya_post.json new file mode 100644 index 000000000..7ed5bd795 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/papaya_post.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_post", + "textures": { + "texture": "forestry:blocks/wood/planks.papaya" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/pine_inventory.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/pine_inventory.json new file mode 100644 index 000000000..48ef0241a --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/pine_inventory.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_inventory", + "textures": { + "texture": "forestry:blocks/wood/planks.pine" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/pine_n.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/pine_n.json new file mode 100644 index 000000000..7bc8ff61a --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/pine_n.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_n", + "textures": { + "texture": "forestry:blocks/wood/planks.pine" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/pine_ne.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/pine_ne.json new file mode 100644 index 000000000..dbc05bf56 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/pine_ne.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_ne", + "textures": { + "texture": "forestry:blocks/wood/planks.pine" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/pine_ns.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/pine_ns.json new file mode 100644 index 000000000..8b1513d97 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/pine_ns.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_ns", + "textures": { + "texture": "forestry:blocks/wood/planks.pine" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/pine_nse.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/pine_nse.json new file mode 100644 index 000000000..5c2d860ad --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/pine_nse.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_nse", + "textures": { + "texture": "forestry:blocks/wood/planks.pine" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/pine_nsew.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/pine_nsew.json new file mode 100644 index 000000000..371932d7e --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/pine_nsew.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_nsew", + "textures": { + "texture": "forestry:blocks/wood/planks.pine" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/pine_post.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/pine_post.json new file mode 100644 index 000000000..b79361487 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/pine_post.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_post", + "textures": { + "texture": "forestry:blocks/wood/planks.pine" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/plum_inventory.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/plum_inventory.json new file mode 100644 index 000000000..efbfd5983 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/plum_inventory.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_inventory", + "textures": { + "texture": "forestry:blocks/wood/planks.plum" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/plum_n.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/plum_n.json new file mode 100644 index 000000000..034dfe485 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/plum_n.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_n", + "textures": { + "texture": "forestry:blocks/wood/planks.plum" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/plum_ne.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/plum_ne.json new file mode 100644 index 000000000..804fb9549 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/plum_ne.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_ne", + "textures": { + "texture": "forestry:blocks/wood/planks.plum" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/plum_ns.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/plum_ns.json new file mode 100644 index 000000000..66ec0427e --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/plum_ns.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_ns", + "textures": { + "texture": "forestry:blocks/wood/planks.plum" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/plum_nse.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/plum_nse.json new file mode 100644 index 000000000..820925117 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/plum_nse.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_nse", + "textures": { + "texture": "forestry:blocks/wood/planks.plum" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/plum_nsew.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/plum_nsew.json new file mode 100644 index 000000000..bfa8ad77d --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/plum_nsew.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_nsew", + "textures": { + "texture": "forestry:blocks/wood/planks.plum" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/plum_post.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/plum_post.json new file mode 100644 index 000000000..4ca58d092 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/plum_post.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_post", + "textures": { + "texture": "forestry:blocks/wood/planks.plum" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/poplar_inventory.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/poplar_inventory.json new file mode 100644 index 000000000..30dc989b7 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/poplar_inventory.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_inventory", + "textures": { + "texture": "forestry:blocks/wood/planks.poplar" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/poplar_n.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/poplar_n.json new file mode 100644 index 000000000..68fa6ae5d --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/poplar_n.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_n", + "textures": { + "texture": "forestry:blocks/wood/planks.poplar" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/poplar_ne.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/poplar_ne.json new file mode 100644 index 000000000..613cd3676 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/poplar_ne.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_ne", + "textures": { + "texture": "forestry:blocks/wood/planks.poplar" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/poplar_ns.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/poplar_ns.json new file mode 100644 index 000000000..1016dfa0a --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/poplar_ns.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_ns", + "textures": { + "texture": "forestry:blocks/wood/planks.poplar" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/poplar_nse.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/poplar_nse.json new file mode 100644 index 000000000..be2bbbb4c --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/poplar_nse.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_nse", + "textures": { + "texture": "forestry:blocks/wood/planks.poplar" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/poplar_nsew.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/poplar_nsew.json new file mode 100644 index 000000000..2eefa2861 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/poplar_nsew.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_nsew", + "textures": { + "texture": "forestry:blocks/wood/planks.poplar" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/poplar_post.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/poplar_post.json new file mode 100644 index 000000000..f44d163e6 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/poplar_post.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_post", + "textures": { + "texture": "forestry:blocks/wood/planks.poplar" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/sequoia_inventory.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/sequoia_inventory.json new file mode 100644 index 000000000..17cea9bf9 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/sequoia_inventory.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_inventory", + "textures": { + "texture": "forestry:blocks/wood/planks.sequoia" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/sequoia_n.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/sequoia_n.json new file mode 100644 index 000000000..f97028f3a --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/sequoia_n.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_n", + "textures": { + "texture": "forestry:blocks/wood/planks.sequoia" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/sequoia_ne.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/sequoia_ne.json new file mode 100644 index 000000000..2386ee27b --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/sequoia_ne.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_ne", + "textures": { + "texture": "forestry:blocks/wood/planks.sequoia" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/sequoia_ns.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/sequoia_ns.json new file mode 100644 index 000000000..d4b33f402 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/sequoia_ns.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_ns", + "textures": { + "texture": "forestry:blocks/wood/planks.sequoia" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/sequoia_nse.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/sequoia_nse.json new file mode 100644 index 000000000..05d4d8044 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/sequoia_nse.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_nse", + "textures": { + "texture": "forestry:blocks/wood/planks.sequoia" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/sequoia_nsew.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/sequoia_nsew.json new file mode 100644 index 000000000..5e866c1ff --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/sequoia_nsew.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_nsew", + "textures": { + "texture": "forestry:blocks/wood/planks.sequoia" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/sequoia_post.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/sequoia_post.json new file mode 100644 index 000000000..371da0009 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/sequoia_post.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_post", + "textures": { + "texture": "forestry:blocks/wood/planks.sequoia" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/teak_inventory.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/teak_inventory.json new file mode 100644 index 000000000..e8b9afa11 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/teak_inventory.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_inventory", + "textures": { + "texture": "forestry:blocks/wood/planks.teak" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/teak_n.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/teak_n.json new file mode 100644 index 000000000..dd28d6e93 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/teak_n.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_n", + "textures": { + "texture": "forestry:blocks/wood/planks.teak" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/teak_ne.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/teak_ne.json new file mode 100644 index 000000000..068e07944 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/teak_ne.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_ne", + "textures": { + "texture": "forestry:blocks/wood/planks.teak" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/teak_ns.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/teak_ns.json new file mode 100644 index 000000000..c9ddb6147 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/teak_ns.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_ns", + "textures": { + "texture": "forestry:blocks/wood/planks.teak" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/teak_nse.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/teak_nse.json new file mode 100644 index 000000000..264a0c3ad --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/teak_nse.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_nse", + "textures": { + "texture": "forestry:blocks/wood/planks.teak" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/teak_nsew.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/teak_nsew.json new file mode 100644 index 000000000..41304038d --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/teak_nsew.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_nsew", + "textures": { + "texture": "forestry:blocks/wood/planks.teak" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/teak_post.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/teak_post.json new file mode 100644 index 000000000..e82ab4dfc --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/teak_post.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_post", + "textures": { + "texture": "forestry:blocks/wood/planks.teak" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/walnut_inventory.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/walnut_inventory.json new file mode 100644 index 000000000..ca65aa012 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/walnut_inventory.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_inventory", + "textures": { + "texture": "forestry:blocks/wood/planks.walnut" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/walnut_n.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/walnut_n.json new file mode 100644 index 000000000..626d212dd --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/walnut_n.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_n", + "textures": { + "texture": "forestry:blocks/wood/planks.walnut" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/walnut_ne.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/walnut_ne.json new file mode 100644 index 000000000..e16d5b053 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/walnut_ne.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_ne", + "textures": { + "texture": "forestry:blocks/wood/planks.walnut" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/walnut_ns.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/walnut_ns.json new file mode 100644 index 000000000..c4092a41b --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/walnut_ns.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_ns", + "textures": { + "texture": "forestry:blocks/wood/planks.walnut" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/walnut_nse.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/walnut_nse.json new file mode 100644 index 000000000..124e0327b --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/walnut_nse.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_nse", + "textures": { + "texture": "forestry:blocks/wood/planks.walnut" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/walnut_nsew.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/walnut_nsew.json new file mode 100644 index 000000000..85a2f51c9 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/walnut_nsew.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_nsew", + "textures": { + "texture": "forestry:blocks/wood/planks.walnut" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/walnut_post.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/walnut_post.json new file mode 100644 index 000000000..16351556a --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/walnut_post.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_post", + "textures": { + "texture": "forestry:blocks/wood/planks.walnut" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/wenge_inventory.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/wenge_inventory.json new file mode 100644 index 000000000..5a798cdc5 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/wenge_inventory.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_inventory", + "textures": { + "texture": "forestry:blocks/wood/planks.wenge" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/wenge_n.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/wenge_n.json new file mode 100644 index 000000000..c678be2b0 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/wenge_n.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_n", + "textures": { + "texture": "forestry:blocks/wood/planks.wenge" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/wenge_ne.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/wenge_ne.json new file mode 100644 index 000000000..d8176eb8c --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/wenge_ne.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_ne", + "textures": { + "texture": "forestry:blocks/wood/planks.wenge" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/wenge_ns.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/wenge_ns.json new file mode 100644 index 000000000..1a06763eb --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/wenge_ns.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_ns", + "textures": { + "texture": "forestry:blocks/wood/planks.wenge" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/wenge_nse.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/wenge_nse.json new file mode 100644 index 000000000..050b9f902 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/wenge_nse.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_nse", + "textures": { + "texture": "forestry:blocks/wood/planks.wenge" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/wenge_nsew.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/wenge_nsew.json new file mode 100644 index 000000000..779c09272 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/wenge_nsew.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_nsew", + "textures": { + "texture": "forestry:blocks/wood/planks.wenge" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/wenge_post.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/wenge_post.json new file mode 100644 index 000000000..a34f9a0df --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/wenge_post.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_post", + "textures": { + "texture": "forestry:blocks/wood/planks.wenge" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/willow_inventory.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/willow_inventory.json new file mode 100644 index 000000000..1a8d626b9 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/willow_inventory.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_inventory", + "textures": { + "texture": "forestry:blocks/wood/planks.willow" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/willow_n.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/willow_n.json new file mode 100644 index 000000000..4474f54d5 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/willow_n.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_n", + "textures": { + "texture": "forestry:blocks/wood/planks.willow" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/willow_ne.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/willow_ne.json new file mode 100644 index 000000000..f3642b092 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/willow_ne.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_ne", + "textures": { + "texture": "forestry:blocks/wood/planks.willow" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/willow_ns.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/willow_ns.json new file mode 100644 index 000000000..a0a0710d3 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/willow_ns.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_ns", + "textures": { + "texture": "forestry:blocks/wood/planks.willow" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/willow_nse.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/willow_nse.json new file mode 100644 index 000000000..b64d9a60e --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/willow_nse.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_nse", + "textures": { + "texture": "forestry:blocks/wood/planks.willow" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/willow_nsew.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/willow_nsew.json new file mode 100644 index 000000000..fe06d7af9 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/willow_nsew.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_nsew", + "textures": { + "texture": "forestry:blocks/wood/planks.willow" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/willow_post.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/willow_post.json new file mode 100644 index 000000000..62719e689 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/willow_post.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_post", + "textures": { + "texture": "forestry:blocks/wood/planks.willow" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/zebrawood_inventory.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/zebrawood_inventory.json new file mode 100644 index 000000000..447dcfab0 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/zebrawood_inventory.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_inventory", + "textures": { + "texture": "forestry:blocks/wood/planks.zebrawood" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/zebrawood_n.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/zebrawood_n.json new file mode 100644 index 000000000..27ff56cf7 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/zebrawood_n.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_n", + "textures": { + "texture": "forestry:blocks/wood/planks.zebrawood" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/zebrawood_ne.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/zebrawood_ne.json new file mode 100644 index 000000000..83d2cd122 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/zebrawood_ne.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_ne", + "textures": { + "texture": "forestry:blocks/wood/planks.zebrawood" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/zebrawood_ns.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/zebrawood_ns.json new file mode 100644 index 000000000..91d21a4ab --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/zebrawood_ns.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_ns", + "textures": { + "texture": "forestry:blocks/wood/planks.zebrawood" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/zebrawood_nse.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/zebrawood_nse.json new file mode 100644 index 000000000..0ff7be79e --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/zebrawood_nse.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_nse", + "textures": { + "texture": "forestry:blocks/wood/planks.zebrawood" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/zebrawood_nsew.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/zebrawood_nsew.json new file mode 100644 index 000000000..d850ce181 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/zebrawood_nsew.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_nsew", + "textures": { + "texture": "forestry:blocks/wood/planks.zebrawood" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/zebrawood_post.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/zebrawood_post.json new file mode 100644 index 000000000..32ba3ea77 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/zebrawood_post.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_post", + "textures": { + "texture": "forestry:blocks/wood/planks.zebrawood" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/acacia.json b/src/main/resources/assets/forestry/models/block/arboriculture/logs/acacia.json new file mode 100644 index 000000000..4a2b5246a --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/logs/acacia.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cube_column", + "textures": { + "side": "forestry:blocks/wood/bark.acacia", + "end": "forestry:blocks/wood/heart.acacia" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/acacia_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/logs/acacia_side.json new file mode 100644 index 000000000..ddd9486b5 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/logs/acacia_side.json @@ -0,0 +1,7 @@ +{ + "parent": "block/column_side", + "textures": { + "side": "forestry:blocks/wood/bark.acacia", + "end": "forestry:blocks/wood/heart.acacia" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/balsa.json b/src/main/resources/assets/forestry/models/block/arboriculture/logs/balsa.json new file mode 100644 index 000000000..6df81c986 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/logs/balsa.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cube_column", + "textures": { + "side": "forestry:blocks/wood/bark.balsa", + "end": "forestry:blocks/wood/heart.balsa" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/balsa_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/logs/balsa_side.json new file mode 100644 index 000000000..a22f98edc --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/logs/balsa_side.json @@ -0,0 +1,7 @@ +{ + "parent": "block/column_side", + "textures": { + "side": "forestry:blocks/wood/bark.balsa", + "end": "forestry:blocks/wood/heart.balsa" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/baobab.json b/src/main/resources/assets/forestry/models/block/arboriculture/logs/baobab.json new file mode 100644 index 000000000..659c2d2a7 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/logs/baobab.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cube_column", + "textures": { + "side": "forestry:blocks/wood/bark.baobab", + "end": "forestry:blocks/wood/heart.baobab" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/baobab_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/logs/baobab_side.json new file mode 100644 index 000000000..127b17b5c --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/logs/baobab_side.json @@ -0,0 +1,7 @@ +{ + "parent": "block/column_side", + "textures": { + "side": "forestry:blocks/wood/bark.baobab", + "end": "forestry:blocks/wood/heart.baobab" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/cherry.json b/src/main/resources/assets/forestry/models/block/arboriculture/logs/cherry.json new file mode 100644 index 000000000..a46c992d9 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/logs/cherry.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cube_column", + "textures": { + "side": "forestry:blocks/wood/bark.cherry", + "end": "forestry:blocks/wood/heart.cherry" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/cherry_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/logs/cherry_side.json new file mode 100644 index 000000000..aed70492a --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/logs/cherry_side.json @@ -0,0 +1,7 @@ +{ + "parent": "block/column_side", + "textures": { + "side": "forestry:blocks/wood/bark.cherry", + "end": "forestry:blocks/wood/heart.cherry" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/chestnut.json b/src/main/resources/assets/forestry/models/block/arboriculture/logs/chestnut.json new file mode 100644 index 000000000..77924c363 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/logs/chestnut.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cube_column", + "textures": { + "side": "forestry:blocks/wood/bark.chestnut", + "end": "forestry:blocks/wood/heart.chestnut" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/chestnut_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/logs/chestnut_side.json new file mode 100644 index 000000000..147f18528 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/logs/chestnut_side.json @@ -0,0 +1,7 @@ +{ + "parent": "block/column_side", + "textures": { + "side": "forestry:blocks/wood/bark.chestnut", + "end": "forestry:blocks/wood/heart.chestnut" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/citrus.json b/src/main/resources/assets/forestry/models/block/arboriculture/logs/citrus.json new file mode 100644 index 000000000..adb7febbe --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/logs/citrus.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cube_column", + "textures": { + "side": "forestry:blocks/wood/bark.citrus", + "end": "forestry:blocks/wood/heart.citrus" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/citrus_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/logs/citrus_side.json new file mode 100644 index 000000000..7c4b89e2e --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/logs/citrus_side.json @@ -0,0 +1,7 @@ +{ + "parent": "block/column_side", + "textures": { + "side": "forestry:blocks/wood/bark.citrus", + "end": "forestry:blocks/wood/heart.citrus" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/cocobolo.json b/src/main/resources/assets/forestry/models/block/arboriculture/logs/cocobolo.json new file mode 100644 index 000000000..086a5e28b --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/logs/cocobolo.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cube_column", + "textures": { + "side": "forestry:blocks/wood/bark.cocobolo", + "end": "forestry:blocks/wood/heart.cocobolo" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/cocobolo_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/logs/cocobolo_side.json new file mode 100644 index 000000000..e3a6a9668 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/logs/cocobolo_side.json @@ -0,0 +1,7 @@ +{ + "parent": "block/column_side", + "textures": { + "side": "forestry:blocks/wood/bark.cocobolo", + "end": "forestry:blocks/wood/heart.cocobolo" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/ebony.json b/src/main/resources/assets/forestry/models/block/arboriculture/logs/ebony.json new file mode 100644 index 000000000..208c31642 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/logs/ebony.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cube_column", + "textures": { + "side": "forestry:blocks/wood/bark.ebony", + "end": "forestry:blocks/wood/heart.ebony" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/ebony_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/logs/ebony_side.json new file mode 100644 index 000000000..5dc7b1d7e --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/logs/ebony_side.json @@ -0,0 +1,7 @@ +{ + "parent": "block/column_side", + "textures": { + "side": "forestry:blocks/wood/bark.ebony", + "end": "forestry:blocks/wood/heart.ebony" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/giganteum.json b/src/main/resources/assets/forestry/models/block/arboriculture/logs/giganteum.json new file mode 100644 index 000000000..3f73517cf --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/logs/giganteum.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cube_column", + "textures": { + "side": "forestry:blocks/wood/bark.giganteum", + "end": "forestry:blocks/wood/heart.giganteum" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/giganteum_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/logs/giganteum_side.json new file mode 100644 index 000000000..1376808fe --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/logs/giganteum_side.json @@ -0,0 +1,7 @@ +{ + "parent": "block/column_side", + "textures": { + "side": "forestry:blocks/wood/bark.giganteum", + "end": "forestry:blocks/wood/heart.giganteum" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/greenheart.json b/src/main/resources/assets/forestry/models/block/arboriculture/logs/greenheart.json new file mode 100644 index 000000000..1493523d0 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/logs/greenheart.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cube_column", + "textures": { + "side": "forestry:blocks/wood/bark.greenheart", + "end": "forestry:blocks/wood/heart.greenheart" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/greenheart_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/logs/greenheart_side.json new file mode 100644 index 000000000..fff33cfb1 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/logs/greenheart_side.json @@ -0,0 +1,7 @@ +{ + "parent": "block/column_side", + "textures": { + "side": "forestry:blocks/wood/bark.greenheart", + "end": "forestry:blocks/wood/heart.greenheart" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/ipe.json b/src/main/resources/assets/forestry/models/block/arboriculture/logs/ipe.json new file mode 100644 index 000000000..f3ae498d3 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/logs/ipe.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cube_column", + "textures": { + "side": "forestry:blocks/wood/bark.ipe", + "end": "forestry:blocks/wood/heart.ipe" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/ipe_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/logs/ipe_side.json new file mode 100644 index 000000000..36d3dd7ce --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/logs/ipe_side.json @@ -0,0 +1,7 @@ +{ + "parent": "block/column_side", + "textures": { + "side": "forestry:blocks/wood/bark.ipe", + "end": "forestry:blocks/wood/heart.ipe" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/kapok.json b/src/main/resources/assets/forestry/models/block/arboriculture/logs/kapok.json new file mode 100644 index 000000000..05d23ac6d --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/logs/kapok.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cube_column", + "textures": { + "side": "forestry:blocks/wood/bark.kapok", + "end": "forestry:blocks/wood/heart.kapok" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/kapok_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/logs/kapok_side.json new file mode 100644 index 000000000..00094ffee --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/logs/kapok_side.json @@ -0,0 +1,7 @@ +{ + "parent": "block/column_side", + "textures": { + "side": "forestry:blocks/wood/bark.kapok", + "end": "forestry:blocks/wood/heart.kapok" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/larch.json b/src/main/resources/assets/forestry/models/block/arboriculture/logs/larch.json new file mode 100644 index 000000000..81e0cbefd --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/logs/larch.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cube_column", + "textures": { + "side": "forestry:blocks/wood/bark.larch", + "end": "forestry:blocks/wood/heart.larch" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/larch_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/logs/larch_side.json new file mode 100644 index 000000000..8e7725843 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/logs/larch_side.json @@ -0,0 +1,7 @@ +{ + "parent": "block/column_side", + "textures": { + "side": "forestry:blocks/wood/bark.larch", + "end": "forestry:blocks/wood/heart.larch" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/lime.json b/src/main/resources/assets/forestry/models/block/arboriculture/logs/lime.json new file mode 100644 index 000000000..b4ec843ce --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/logs/lime.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cube_column", + "textures": { + "side": "forestry:blocks/wood/bark.lime", + "end": "forestry:blocks/wood/heart.lime" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/lime_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/logs/lime_side.json new file mode 100644 index 000000000..7c634adb4 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/logs/lime_side.json @@ -0,0 +1,7 @@ +{ + "parent": "block/column_side", + "textures": { + "side": "forestry:blocks/wood/bark.lime", + "end": "forestry:blocks/wood/heart.lime" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/mahoe.json b/src/main/resources/assets/forestry/models/block/arboriculture/logs/mahoe.json new file mode 100644 index 000000000..eb8409358 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/logs/mahoe.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cube_column", + "textures": { + "side": "forestry:blocks/wood/bark.mahoe", + "end": "forestry:blocks/wood/heart.mahoe" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/mahoe_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/logs/mahoe_side.json new file mode 100644 index 000000000..8ca85847a --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/logs/mahoe_side.json @@ -0,0 +1,7 @@ +{ + "parent": "block/column_side", + "textures": { + "side": "forestry:blocks/wood/bark.mahoe", + "end": "forestry:blocks/wood/heart.mahoe" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/mahogany.json b/src/main/resources/assets/forestry/models/block/arboriculture/logs/mahogany.json new file mode 100644 index 000000000..d63f2a12a --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/logs/mahogany.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cube_column", + "textures": { + "side": "forestry:blocks/wood/bark.mahogany", + "end": "forestry:blocks/wood/heart.mahogany" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/mahogany_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/logs/mahogany_side.json new file mode 100644 index 000000000..cdb1d609e --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/logs/mahogany_side.json @@ -0,0 +1,7 @@ +{ + "parent": "block/column_side", + "textures": { + "side": "forestry:blocks/wood/bark.mahogany", + "end": "forestry:blocks/wood/heart.mahogany" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/maple.json b/src/main/resources/assets/forestry/models/block/arboriculture/logs/maple.json new file mode 100644 index 000000000..189beb922 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/logs/maple.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cube_column", + "textures": { + "side": "forestry:blocks/wood/bark.maple", + "end": "forestry:blocks/wood/heart.maple" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/maple_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/logs/maple_side.json new file mode 100644 index 000000000..1baadba28 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/logs/maple_side.json @@ -0,0 +1,7 @@ +{ + "parent": "block/column_side", + "textures": { + "side": "forestry:blocks/wood/bark.maple", + "end": "forestry:blocks/wood/heart.maple" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/padauk.json b/src/main/resources/assets/forestry/models/block/arboriculture/logs/padauk.json new file mode 100644 index 000000000..ea979af6e --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/logs/padauk.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cube_column", + "textures": { + "side": "forestry:blocks/wood/bark.padauk", + "end": "forestry:blocks/wood/heart.padauk" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/padauk_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/logs/padauk_side.json new file mode 100644 index 000000000..e9288cc09 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/logs/padauk_side.json @@ -0,0 +1,7 @@ +{ + "parent": "block/column_side", + "textures": { + "side": "forestry:blocks/wood/bark.padauk", + "end": "forestry:blocks/wood/heart.padauk" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/palm.json b/src/main/resources/assets/forestry/models/block/arboriculture/logs/palm.json new file mode 100644 index 000000000..fa4c854e0 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/logs/palm.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cube_column", + "textures": { + "side": "forestry:blocks/wood/bark.palm", + "end": "forestry:blocks/wood/heart.palm" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/palm_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/logs/palm_side.json new file mode 100644 index 000000000..52af3da41 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/logs/palm_side.json @@ -0,0 +1,7 @@ +{ + "parent": "block/column_side", + "textures": { + "side": "forestry:blocks/wood/bark.palm", + "end": "forestry:blocks/wood/heart.palm" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/papaya.json b/src/main/resources/assets/forestry/models/block/arboriculture/logs/papaya.json new file mode 100644 index 000000000..c6c9cf743 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/logs/papaya.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cube_column", + "textures": { + "side": "forestry:blocks/wood/bark.papaya", + "end": "forestry:blocks/wood/heart.papaya" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/papaya_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/logs/papaya_side.json new file mode 100644 index 000000000..cf7481917 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/logs/papaya_side.json @@ -0,0 +1,7 @@ +{ + "parent": "block/column_side", + "textures": { + "side": "forestry:blocks/wood/bark.papaya", + "end": "forestry:blocks/wood/heart.papaya" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/pine.json b/src/main/resources/assets/forestry/models/block/arboriculture/logs/pine.json new file mode 100644 index 000000000..5396ef21f --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/logs/pine.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cube_column", + "textures": { + "side": "forestry:blocks/wood/bark.pine", + "end": "forestry:blocks/wood/heart.pine" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/pine_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/logs/pine_side.json new file mode 100644 index 000000000..ddd11109c --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/logs/pine_side.json @@ -0,0 +1,7 @@ +{ + "parent": "block/column_side", + "textures": { + "side": "forestry:blocks/wood/bark.pine", + "end": "forestry:blocks/wood/heart.pine" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/plum.json b/src/main/resources/assets/forestry/models/block/arboriculture/logs/plum.json new file mode 100644 index 000000000..25a5a1825 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/logs/plum.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cube_column", + "textures": { + "side": "forestry:blocks/wood/bark.plum", + "end": "forestry:blocks/wood/heart.plum" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/plum_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/logs/plum_side.json new file mode 100644 index 000000000..228e9b2f7 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/logs/plum_side.json @@ -0,0 +1,7 @@ +{ + "parent": "block/column_side", + "textures": { + "side": "forestry:blocks/wood/bark.plum", + "end": "forestry:blocks/wood/heart.plum" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/poplar.json b/src/main/resources/assets/forestry/models/block/arboriculture/logs/poplar.json new file mode 100644 index 000000000..f897b0535 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/logs/poplar.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cube_column", + "textures": { + "side": "forestry:blocks/wood/bark.poplar", + "end": "forestry:blocks/wood/heart.poplar" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/poplar_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/logs/poplar_side.json new file mode 100644 index 000000000..25637a2d6 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/logs/poplar_side.json @@ -0,0 +1,7 @@ +{ + "parent": "block/column_side", + "textures": { + "side": "forestry:blocks/wood/bark.poplar", + "end": "forestry:blocks/wood/heart.poplar" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/sequoia.json b/src/main/resources/assets/forestry/models/block/arboriculture/logs/sequoia.json new file mode 100644 index 000000000..d96c7506b --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/logs/sequoia.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cube_column", + "textures": { + "side": "forestry:blocks/wood/bark.sequoia", + "end": "forestry:blocks/wood/heart.sequoia" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/sequoia_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/logs/sequoia_side.json new file mode 100644 index 000000000..373c9475d --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/logs/sequoia_side.json @@ -0,0 +1,7 @@ +{ + "parent": "block/column_side", + "textures": { + "side": "forestry:blocks/wood/bark.sequoia", + "end": "forestry:blocks/wood/heart.sequoia" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/teak.json b/src/main/resources/assets/forestry/models/block/arboriculture/logs/teak.json new file mode 100644 index 000000000..36ae7b947 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/logs/teak.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cube_column", + "textures": { + "side": "forestry:blocks/wood/bark.teak", + "end": "forestry:blocks/wood/heart.teak" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/teak_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/logs/teak_side.json new file mode 100644 index 000000000..8c253e4df --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/logs/teak_side.json @@ -0,0 +1,7 @@ +{ + "parent": "block/column_side", + "textures": { + "side": "forestry:blocks/wood/bark.teak", + "end": "forestry:blocks/wood/heart.teak" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/walnut.json b/src/main/resources/assets/forestry/models/block/arboriculture/logs/walnut.json new file mode 100644 index 000000000..95b25f3ee --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/logs/walnut.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cube_column", + "textures": { + "side": "forestry:blocks/wood/bark.walnut", + "end": "forestry:blocks/wood/heart.walnut" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/walnut_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/logs/walnut_side.json new file mode 100644 index 000000000..2c25ab3f1 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/logs/walnut_side.json @@ -0,0 +1,7 @@ +{ + "parent": "block/column_side", + "textures": { + "side": "forestry:blocks/wood/bark.walnut", + "end": "forestry:blocks/wood/heart.walnut" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/wenge.json b/src/main/resources/assets/forestry/models/block/arboriculture/logs/wenge.json new file mode 100644 index 000000000..0b4c1ff24 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/logs/wenge.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cube_column", + "textures": { + "side": "forestry:blocks/wood/bark.wenge", + "end": "forestry:blocks/wood/heart.wenge" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/wenge_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/logs/wenge_side.json new file mode 100644 index 000000000..8206bd501 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/logs/wenge_side.json @@ -0,0 +1,7 @@ +{ + "parent": "block/column_side", + "textures": { + "side": "forestry:blocks/wood/bark.wenge", + "end": "forestry:blocks/wood/heart.wenge" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/willow.json b/src/main/resources/assets/forestry/models/block/arboriculture/logs/willow.json new file mode 100644 index 000000000..f27f38121 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/logs/willow.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cube_column", + "textures": { + "side": "forestry:blocks/wood/bark.willow", + "end": "forestry:blocks/wood/heart.willow" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/willow_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/logs/willow_side.json new file mode 100644 index 000000000..348b8c123 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/logs/willow_side.json @@ -0,0 +1,7 @@ +{ + "parent": "block/column_side", + "textures": { + "side": "forestry:blocks/wood/bark.willow", + "end": "forestry:blocks/wood/heart.willow" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/zebrawood.json b/src/main/resources/assets/forestry/models/block/arboriculture/logs/zebrawood.json new file mode 100644 index 000000000..86dd30332 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/logs/zebrawood.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cube_column", + "textures": { + "side": "forestry:blocks/wood/bark.zebrawood", + "end": "forestry:blocks/wood/heart.zebrawood" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/zebrawood_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/logs/zebrawood_side.json new file mode 100644 index 000000000..a59565719 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/logs/zebrawood_side.json @@ -0,0 +1,7 @@ +{ + "parent": "block/column_side", + "textures": { + "side": "forestry:blocks/wood/bark.zebrawood", + "end": "forestry:blocks/wood/heart.zebrawood" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/planks/acacia.json b/src/main/resources/assets/forestry/models/block/arboriculture/planks/acacia.json new file mode 100644 index 000000000..be6d6f563 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/planks/acacia.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "forestry:blocks/wood/planks.acacia" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/planks/balsa.json b/src/main/resources/assets/forestry/models/block/arboriculture/planks/balsa.json new file mode 100644 index 000000000..ff26fde46 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/planks/balsa.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "forestry:blocks/wood/planks.balsa" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/planks/baobab.json b/src/main/resources/assets/forestry/models/block/arboriculture/planks/baobab.json new file mode 100644 index 000000000..249da64c2 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/planks/baobab.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "forestry:blocks/wood/planks.baobab" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/planks/cherry.json b/src/main/resources/assets/forestry/models/block/arboriculture/planks/cherry.json new file mode 100644 index 000000000..aa9042123 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/planks/cherry.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "forestry:blocks/wood/planks.cherry" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/planks/chestnut.json b/src/main/resources/assets/forestry/models/block/arboriculture/planks/chestnut.json new file mode 100644 index 000000000..4c31d88d5 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/planks/chestnut.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "forestry:blocks/wood/planks.chestnut" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/planks/citrus.json b/src/main/resources/assets/forestry/models/block/arboriculture/planks/citrus.json new file mode 100644 index 000000000..c9e457584 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/planks/citrus.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "forestry:blocks/wood/planks.citrus" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/planks/cocobolo.json b/src/main/resources/assets/forestry/models/block/arboriculture/planks/cocobolo.json new file mode 100644 index 000000000..180e8a8d7 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/planks/cocobolo.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "forestry:blocks/wood/planks.cocobolo" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/planks/ebony.json b/src/main/resources/assets/forestry/models/block/arboriculture/planks/ebony.json new file mode 100644 index 000000000..84e0d130b --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/planks/ebony.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "forestry:blocks/wood/planks.ebony" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/planks/giganteum.json b/src/main/resources/assets/forestry/models/block/arboriculture/planks/giganteum.json new file mode 100644 index 000000000..42de110fa --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/planks/giganteum.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "forestry:blocks/wood/planks.giganteum" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/planks/greenheart.json b/src/main/resources/assets/forestry/models/block/arboriculture/planks/greenheart.json new file mode 100644 index 000000000..039f98df2 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/planks/greenheart.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "forestry:blocks/wood/planks.greenheart" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/planks/ipe.json b/src/main/resources/assets/forestry/models/block/arboriculture/planks/ipe.json new file mode 100644 index 000000000..eb408ebcb --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/planks/ipe.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "forestry:blocks/wood/planks.ipe" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/planks/kapok.json b/src/main/resources/assets/forestry/models/block/arboriculture/planks/kapok.json new file mode 100644 index 000000000..db437f6ce --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/planks/kapok.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "forestry:blocks/wood/planks.kapok" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/planks/larch.json b/src/main/resources/assets/forestry/models/block/arboriculture/planks/larch.json new file mode 100644 index 000000000..b9795c452 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/planks/larch.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "forestry:blocks/wood/planks.larch" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/planks/lime.json b/src/main/resources/assets/forestry/models/block/arboriculture/planks/lime.json new file mode 100644 index 000000000..e8a6cebbc --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/planks/lime.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "forestry:blocks/wood/planks.lime" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/planks/mahoe.json b/src/main/resources/assets/forestry/models/block/arboriculture/planks/mahoe.json new file mode 100644 index 000000000..183434162 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/planks/mahoe.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "forestry:blocks/wood/planks.mahoe" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/planks/mahogany.json b/src/main/resources/assets/forestry/models/block/arboriculture/planks/mahogany.json new file mode 100644 index 000000000..ce613d619 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/planks/mahogany.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "forestry:blocks/wood/planks.mahogany" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/planks/maple.json b/src/main/resources/assets/forestry/models/block/arboriculture/planks/maple.json new file mode 100644 index 000000000..89cad9878 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/planks/maple.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "forestry:blocks/wood/planks.maple" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/planks/padauk.json b/src/main/resources/assets/forestry/models/block/arboriculture/planks/padauk.json new file mode 100644 index 000000000..2f865b4a2 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/planks/padauk.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "forestry:blocks/wood/planks.padauk" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/planks/palm.json b/src/main/resources/assets/forestry/models/block/arboriculture/planks/palm.json new file mode 100644 index 000000000..5603706a1 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/planks/palm.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "forestry:blocks/wood/planks.palm" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/planks/papaya.json b/src/main/resources/assets/forestry/models/block/arboriculture/planks/papaya.json new file mode 100644 index 000000000..813cb3a79 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/planks/papaya.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "forestry:blocks/wood/planks.papaya" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/planks/pine.json b/src/main/resources/assets/forestry/models/block/arboriculture/planks/pine.json new file mode 100644 index 000000000..762b24738 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/planks/pine.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "forestry:blocks/wood/planks.pine" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/planks/plum.json b/src/main/resources/assets/forestry/models/block/arboriculture/planks/plum.json new file mode 100644 index 000000000..8a66cad6d --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/planks/plum.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "forestry:blocks/wood/planks.plum" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/planks/poplar.json b/src/main/resources/assets/forestry/models/block/arboriculture/planks/poplar.json new file mode 100644 index 000000000..3efe1eca3 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/planks/poplar.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "forestry:blocks/wood/planks.poplar" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/planks/sequoia.json b/src/main/resources/assets/forestry/models/block/arboriculture/planks/sequoia.json new file mode 100644 index 000000000..db24043ce --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/planks/sequoia.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "forestry:blocks/wood/planks.sequoia" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/planks/teak.json b/src/main/resources/assets/forestry/models/block/arboriculture/planks/teak.json new file mode 100644 index 000000000..bab1890e4 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/planks/teak.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "forestry:blocks/wood/planks.teak" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/planks/walnut.json b/src/main/resources/assets/forestry/models/block/arboriculture/planks/walnut.json new file mode 100644 index 000000000..a4bdf4bd1 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/planks/walnut.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "forestry:blocks/wood/planks.walnut" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/planks/wenge.json b/src/main/resources/assets/forestry/models/block/arboriculture/planks/wenge.json new file mode 100644 index 000000000..74633cf61 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/planks/wenge.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "forestry:blocks/wood/planks.wenge" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/planks/willow.json b/src/main/resources/assets/forestry/models/block/arboriculture/planks/willow.json new file mode 100644 index 000000000..47e448d62 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/planks/willow.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "forestry:blocks/wood/planks.willow" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/planks/zebrawood.json b/src/main/resources/assets/forestry/models/block/arboriculture/planks/zebrawood.json new file mode 100644 index 000000000..1a67aacb6 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/planks/zebrawood.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "forestry:blocks/wood/planks.zebrawood" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/acacia_double.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/acacia_double.json new file mode 100644 index 000000000..63f348c7e --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/slab/acacia_double.json @@ -0,0 +1,8 @@ +{ + "parent": "forestry:block/arboriculture/planks/acacia", + "textures": { + "side": "forestry:blocks/wood/planks.acacia", + "top": "forestry:blocks/wood/planks.acacia", + "bottom": "forestry:blocks/wood/planks.acacia" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/acacia_half.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/acacia_half.json new file mode 100644 index 000000000..b0e77a684 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/slab/acacia_half.json @@ -0,0 +1,8 @@ +{ + "parent": "block/half_slab", + "textures": { + "side": "forestry:blocks/wood/planks.acacia", + "top": "forestry:blocks/wood/planks.acacia", + "bottom": "forestry:blocks/wood/planks.acacia" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/acacia_upper.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/acacia_upper.json new file mode 100644 index 000000000..608081f21 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/slab/acacia_upper.json @@ -0,0 +1,8 @@ +{ + "parent": "block/upper_slab", + "textures": { + "side": "forestry:blocks/wood/planks.acacia", + "top": "forestry:blocks/wood/planks.acacia", + "bottom": "forestry:blocks/wood/planks.acacia" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/balsa_double.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/balsa_double.json new file mode 100644 index 000000000..5bed89d23 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/slab/balsa_double.json @@ -0,0 +1,8 @@ +{ + "parent": "forestry:block/arboriculture/planks/balsa", + "textures": { + "side": "forestry:blocks/wood/planks.balsa", + "top": "forestry:blocks/wood/planks.balsa", + "bottom": "forestry:blocks/wood/planks.balsa" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/balsa_half.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/balsa_half.json new file mode 100644 index 000000000..ebca8310f --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/slab/balsa_half.json @@ -0,0 +1,8 @@ +{ + "parent": "block/half_slab", + "textures": { + "side": "forestry:blocks/wood/planks.balsa", + "top": "forestry:blocks/wood/planks.balsa", + "bottom": "forestry:blocks/wood/planks.balsa" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/balsa_upper.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/balsa_upper.json new file mode 100644 index 000000000..91e496a34 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/slab/balsa_upper.json @@ -0,0 +1,8 @@ +{ + "parent": "block/upper_slab", + "textures": { + "side": "forestry:blocks/wood/planks.balsa", + "top": "forestry:blocks/wood/planks.balsa", + "bottom": "forestry:blocks/wood/planks.balsa" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/baobab_double.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/baobab_double.json new file mode 100644 index 000000000..323edcf9e --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/slab/baobab_double.json @@ -0,0 +1,8 @@ +{ + "parent": "forestry:block/arboriculture/planks/baobab", + "textures": { + "side": "forestry:blocks/wood/planks.baobab", + "top": "forestry:blocks/wood/planks.baobab", + "bottom": "forestry:blocks/wood/planks.baobab" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/baobab_half.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/baobab_half.json new file mode 100644 index 000000000..49036b367 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/slab/baobab_half.json @@ -0,0 +1,8 @@ +{ + "parent": "block/half_slab", + "textures": { + "side": "forestry:blocks/wood/planks.baobab", + "top": "forestry:blocks/wood/planks.baobab", + "bottom": "forestry:blocks/wood/planks.baobab" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/baobab_upper.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/baobab_upper.json new file mode 100644 index 000000000..f95c722f8 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/slab/baobab_upper.json @@ -0,0 +1,8 @@ +{ + "parent": "block/upper_slab", + "textures": { + "side": "forestry:blocks/wood/planks.baobab", + "top": "forestry:blocks/wood/planks.baobab", + "bottom": "forestry:blocks/wood/planks.baobab" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/cherry_double.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/cherry_double.json new file mode 100644 index 000000000..4f342b8f2 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/slab/cherry_double.json @@ -0,0 +1,8 @@ +{ + "parent": "forestry:block/arboriculture/planks/cherry", + "textures": { + "side": "forestry:blocks/wood/planks.cherry", + "top": "forestry:blocks/wood/planks.cherry", + "bottom": "forestry:blocks/wood/planks.cherry" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/cherry_half.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/cherry_half.json new file mode 100644 index 000000000..8f66974ce --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/slab/cherry_half.json @@ -0,0 +1,8 @@ +{ + "parent": "block/half_slab", + "textures": { + "side": "forestry:blocks/wood/planks.cherry", + "top": "forestry:blocks/wood/planks.cherry", + "bottom": "forestry:blocks/wood/planks.cherry" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/cherry_upper.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/cherry_upper.json new file mode 100644 index 000000000..e14b4179a --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/slab/cherry_upper.json @@ -0,0 +1,8 @@ +{ + "parent": "block/upper_slab", + "textures": { + "side": "forestry:blocks/wood/planks.cherry", + "top": "forestry:blocks/wood/planks.cherry", + "bottom": "forestry:blocks/wood/planks.cherry" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/chestnut_double.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/chestnut_double.json new file mode 100644 index 000000000..ef1da9327 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/slab/chestnut_double.json @@ -0,0 +1,8 @@ +{ + "parent": "forestry:block/arboriculture/planks/chestnut", + "textures": { + "side": "forestry:blocks/wood/planks.chestnut", + "top": "forestry:blocks/wood/planks.chestnut", + "bottom": "forestry:blocks/wood/planks.chestnut" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/chestnut_half.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/chestnut_half.json new file mode 100644 index 000000000..67084ff58 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/slab/chestnut_half.json @@ -0,0 +1,8 @@ +{ + "parent": "block/half_slab", + "textures": { + "side": "forestry:blocks/wood/planks.chestnut", + "top": "forestry:blocks/wood/planks.chestnut", + "bottom": "forestry:blocks/wood/planks.chestnut" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/chestnut_upper.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/chestnut_upper.json new file mode 100644 index 000000000..f37b0fe6d --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/slab/chestnut_upper.json @@ -0,0 +1,8 @@ +{ + "parent": "block/upper_slab", + "textures": { + "side": "forestry:blocks/wood/planks.chestnut", + "top": "forestry:blocks/wood/planks.chestnut", + "bottom": "forestry:blocks/wood/planks.chestnut" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/citrus_double.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/citrus_double.json new file mode 100644 index 000000000..e2cae7bb9 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/slab/citrus_double.json @@ -0,0 +1,8 @@ +{ + "parent": "forestry:block/arboriculture/planks/citrus", + "textures": { + "side": "forestry:blocks/wood/planks.citrus", + "top": "forestry:blocks/wood/planks.citrus", + "bottom": "forestry:blocks/wood/planks.citrus" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/citrus_half.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/citrus_half.json new file mode 100644 index 000000000..a6f8fd320 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/slab/citrus_half.json @@ -0,0 +1,8 @@ +{ + "parent": "block/half_slab", + "textures": { + "side": "forestry:blocks/wood/planks.citrus", + "top": "forestry:blocks/wood/planks.citrus", + "bottom": "forestry:blocks/wood/planks.citrus" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/citrus_upper.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/citrus_upper.json new file mode 100644 index 000000000..ed56cc21d --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/slab/citrus_upper.json @@ -0,0 +1,8 @@ +{ + "parent": "block/upper_slab", + "textures": { + "side": "forestry:blocks/wood/planks.citrus", + "top": "forestry:blocks/wood/planks.citrus", + "bottom": "forestry:blocks/wood/planks.citrus" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/cocobolo_double.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/cocobolo_double.json new file mode 100644 index 000000000..7239216ce --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/slab/cocobolo_double.json @@ -0,0 +1,8 @@ +{ + "parent": "forestry:block/arboriculture/planks/cocobolo", + "textures": { + "side": "forestry:blocks/wood/planks.cocobolo", + "top": "forestry:blocks/wood/planks.cocobolo", + "bottom": "forestry:blocks/wood/planks.cocobolo" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/cocobolo_half.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/cocobolo_half.json new file mode 100644 index 000000000..08822ca9d --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/slab/cocobolo_half.json @@ -0,0 +1,8 @@ +{ + "parent": "block/half_slab", + "textures": { + "side": "forestry:blocks/wood/planks.cocobolo", + "top": "forestry:blocks/wood/planks.cocobolo", + "bottom": "forestry:blocks/wood/planks.cocobolo" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/cocobolo_upper.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/cocobolo_upper.json new file mode 100644 index 000000000..884f908c2 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/slab/cocobolo_upper.json @@ -0,0 +1,8 @@ +{ + "parent": "block/upper_slab", + "textures": { + "side": "forestry:blocks/wood/planks.cocobolo", + "top": "forestry:blocks/wood/planks.cocobolo", + "bottom": "forestry:blocks/wood/planks.cocobolo" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/ebony_double.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/ebony_double.json new file mode 100644 index 000000000..2644644f9 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/slab/ebony_double.json @@ -0,0 +1,8 @@ +{ + "parent": "forestry:block/arboriculture/planks/ebony", + "textures": { + "side": "forestry:blocks/wood/planks.ebony", + "top": "forestry:blocks/wood/planks.ebony", + "bottom": "forestry:blocks/wood/planks.ebony" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/ebony_half.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/ebony_half.json new file mode 100644 index 000000000..cde105619 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/slab/ebony_half.json @@ -0,0 +1,8 @@ +{ + "parent": "block/half_slab", + "textures": { + "side": "forestry:blocks/wood/planks.ebony", + "top": "forestry:blocks/wood/planks.ebony", + "bottom": "forestry:blocks/wood/planks.ebony" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/ebony_upper.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/ebony_upper.json new file mode 100644 index 000000000..860445e11 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/slab/ebony_upper.json @@ -0,0 +1,8 @@ +{ + "parent": "block/upper_slab", + "textures": { + "side": "forestry:blocks/wood/planks.ebony", + "top": "forestry:blocks/wood/planks.ebony", + "bottom": "forestry:blocks/wood/planks.ebony" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/giganteum_double.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/giganteum_double.json new file mode 100644 index 000000000..337c96164 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/slab/giganteum_double.json @@ -0,0 +1,8 @@ +{ + "parent": "forestry:block/arboriculture/planks/giganteum", + "textures": { + "side": "forestry:blocks/wood/planks.giganteum", + "top": "forestry:blocks/wood/planks.giganteum", + "bottom": "forestry:blocks/wood/planks.giganteum" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/giganteum_half.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/giganteum_half.json new file mode 100644 index 000000000..1b4748eca --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/slab/giganteum_half.json @@ -0,0 +1,8 @@ +{ + "parent": "block/half_slab", + "textures": { + "side": "forestry:blocks/wood/planks.giganteum", + "top": "forestry:blocks/wood/planks.giganteum", + "bottom": "forestry:blocks/wood/planks.giganteum" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/giganteum_upper.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/giganteum_upper.json new file mode 100644 index 000000000..1593eb882 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/slab/giganteum_upper.json @@ -0,0 +1,8 @@ +{ + "parent": "block/upper_slab", + "textures": { + "side": "forestry:blocks/wood/planks.giganteum", + "top": "forestry:blocks/wood/planks.giganteum", + "bottom": "forestry:blocks/wood/planks.giganteum" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/greenheart_double.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/greenheart_double.json new file mode 100644 index 000000000..4a1162852 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/slab/greenheart_double.json @@ -0,0 +1,8 @@ +{ + "parent": "forestry:block/arboriculture/planks/greenheart", + "textures": { + "side": "forestry:blocks/wood/planks.greenheart", + "top": "forestry:blocks/wood/planks.greenheart", + "bottom": "forestry:blocks/wood/planks.greenheart" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/greenheart_half.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/greenheart_half.json new file mode 100644 index 000000000..ccdcd2f60 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/slab/greenheart_half.json @@ -0,0 +1,8 @@ +{ + "parent": "block/half_slab", + "textures": { + "side": "forestry:blocks/wood/planks.greenheart", + "top": "forestry:blocks/wood/planks.greenheart", + "bottom": "forestry:blocks/wood/planks.greenheart" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/greenheart_upper.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/greenheart_upper.json new file mode 100644 index 000000000..9383cd364 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/slab/greenheart_upper.json @@ -0,0 +1,8 @@ +{ + "parent": "block/upper_slab", + "textures": { + "side": "forestry:blocks/wood/planks.greenheart", + "top": "forestry:blocks/wood/planks.greenheart", + "bottom": "forestry:blocks/wood/planks.greenheart" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/ipe_double.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/ipe_double.json new file mode 100644 index 000000000..c6f717d0a --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/slab/ipe_double.json @@ -0,0 +1,8 @@ +{ + "parent": "forestry:block/arboriculture/planks/ipe", + "textures": { + "side": "forestry:blocks/wood/planks.ipe", + "top": "forestry:blocks/wood/planks.ipe", + "bottom": "forestry:blocks/wood/planks.ipe" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/ipe_half.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/ipe_half.json new file mode 100644 index 000000000..cdc6fea37 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/slab/ipe_half.json @@ -0,0 +1,8 @@ +{ + "parent": "block/half_slab", + "textures": { + "side": "forestry:blocks/wood/planks.ipe", + "top": "forestry:blocks/wood/planks.ipe", + "bottom": "forestry:blocks/wood/planks.ipe" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/ipe_upper.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/ipe_upper.json new file mode 100644 index 000000000..e8ce8c1cb --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/slab/ipe_upper.json @@ -0,0 +1,8 @@ +{ + "parent": "block/upper_slab", + "textures": { + "side": "forestry:blocks/wood/planks.ipe", + "top": "forestry:blocks/wood/planks.ipe", + "bottom": "forestry:blocks/wood/planks.ipe" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/kapok_double.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/kapok_double.json new file mode 100644 index 000000000..0f8dc3a67 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/slab/kapok_double.json @@ -0,0 +1,8 @@ +{ + "parent": "forestry:block/arboriculture/planks/kapok", + "textures": { + "side": "forestry:blocks/wood/planks.kapok", + "top": "forestry:blocks/wood/planks.kapok", + "bottom": "forestry:blocks/wood/planks.kapok" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/kapok_half.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/kapok_half.json new file mode 100644 index 000000000..af1e50c85 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/slab/kapok_half.json @@ -0,0 +1,8 @@ +{ + "parent": "block/half_slab", + "textures": { + "side": "forestry:blocks/wood/planks.kapok", + "top": "forestry:blocks/wood/planks.kapok", + "bottom": "forestry:blocks/wood/planks.kapok" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/kapok_upper.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/kapok_upper.json new file mode 100644 index 000000000..f09964e19 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/slab/kapok_upper.json @@ -0,0 +1,8 @@ +{ + "parent": "block/upper_slab", + "textures": { + "side": "forestry:blocks/wood/planks.kapok", + "top": "forestry:blocks/wood/planks.kapok", + "bottom": "forestry:blocks/wood/planks.kapok" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/larch_double.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/larch_double.json new file mode 100644 index 000000000..610440937 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/slab/larch_double.json @@ -0,0 +1,8 @@ +{ + "parent": "forestry:block/arboriculture/planks/larch", + "textures": { + "side": "forestry:blocks/wood/planks.larch", + "top": "forestry:blocks/wood/planks.larch", + "bottom": "forestry:blocks/wood/planks.larch" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/larch_half.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/larch_half.json new file mode 100644 index 000000000..182698815 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/slab/larch_half.json @@ -0,0 +1,8 @@ +{ + "parent": "block/half_slab", + "textures": { + "side": "forestry:blocks/wood/planks.larch", + "top": "forestry:blocks/wood/planks.larch", + "bottom": "forestry:blocks/wood/planks.larch" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/larch_upper.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/larch_upper.json new file mode 100644 index 000000000..ab3cdfe9f --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/slab/larch_upper.json @@ -0,0 +1,8 @@ +{ + "parent": "block/upper_slab", + "textures": { + "side": "forestry:blocks/wood/planks.larch", + "top": "forestry:blocks/wood/planks.larch", + "bottom": "forestry:blocks/wood/planks.larch" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/lime_double.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/lime_double.json new file mode 100644 index 000000000..e0155c210 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/slab/lime_double.json @@ -0,0 +1,8 @@ +{ + "parent": "forestry:block/arboriculture/planks/lime", + "textures": { + "side": "forestry:blocks/wood/planks.lime", + "top": "forestry:blocks/wood/planks.lime", + "bottom": "forestry:blocks/wood/planks.lime" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/lime_half.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/lime_half.json new file mode 100644 index 000000000..a4c4fc180 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/slab/lime_half.json @@ -0,0 +1,8 @@ +{ + "parent": "block/half_slab", + "textures": { + "side": "forestry:blocks/wood/planks.lime", + "top": "forestry:blocks/wood/planks.lime", + "bottom": "forestry:blocks/wood/planks.lime" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/lime_upper.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/lime_upper.json new file mode 100644 index 000000000..85db8275c --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/slab/lime_upper.json @@ -0,0 +1,8 @@ +{ + "parent": "block/upper_slab", + "textures": { + "side": "forestry:blocks/wood/planks.lime", + "top": "forestry:blocks/wood/planks.lime", + "bottom": "forestry:blocks/wood/planks.lime" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/mahoe_double.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/mahoe_double.json new file mode 100644 index 000000000..eb5ced0d2 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/slab/mahoe_double.json @@ -0,0 +1,8 @@ +{ + "parent": "forestry:block/arboriculture/planks/mahoe", + "textures": { + "side": "forestry:blocks/wood/planks.mahoe", + "top": "forestry:blocks/wood/planks.mahoe", + "bottom": "forestry:blocks/wood/planks.mahoe" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/mahoe_half.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/mahoe_half.json new file mode 100644 index 000000000..c869578a7 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/slab/mahoe_half.json @@ -0,0 +1,8 @@ +{ + "parent": "block/half_slab", + "textures": { + "side": "forestry:blocks/wood/planks.mahoe", + "top": "forestry:blocks/wood/planks.mahoe", + "bottom": "forestry:blocks/wood/planks.mahoe" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/mahoe_upper.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/mahoe_upper.json new file mode 100644 index 000000000..3aa2f3e19 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/slab/mahoe_upper.json @@ -0,0 +1,8 @@ +{ + "parent": "block/upper_slab", + "textures": { + "side": "forestry:blocks/wood/planks.mahoe", + "top": "forestry:blocks/wood/planks.mahoe", + "bottom": "forestry:blocks/wood/planks.mahoe" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/mahogany_double.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/mahogany_double.json new file mode 100644 index 000000000..b9fea0696 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/slab/mahogany_double.json @@ -0,0 +1,8 @@ +{ + "parent": "forestry:block/arboriculture/planks/mahogany", + "textures": { + "side": "forestry:blocks/wood/planks.mahogany", + "top": "forestry:blocks/wood/planks.mahogany", + "bottom": "forestry:blocks/wood/planks.mahogany" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/mahogany_half.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/mahogany_half.json new file mode 100644 index 000000000..cbf87a5f2 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/slab/mahogany_half.json @@ -0,0 +1,8 @@ +{ + "parent": "block/half_slab", + "textures": { + "side": "forestry:blocks/wood/planks.mahogany", + "top": "forestry:blocks/wood/planks.mahogany", + "bottom": "forestry:blocks/wood/planks.mahogany" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/mahogany_upper.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/mahogany_upper.json new file mode 100644 index 000000000..bcc022bb3 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/slab/mahogany_upper.json @@ -0,0 +1,8 @@ +{ + "parent": "block/upper_slab", + "textures": { + "side": "forestry:blocks/wood/planks.mahogany", + "top": "forestry:blocks/wood/planks.mahogany", + "bottom": "forestry:blocks/wood/planks.mahogany" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/maple_double.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/maple_double.json new file mode 100644 index 000000000..2bd11ba30 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/slab/maple_double.json @@ -0,0 +1,8 @@ +{ + "parent": "forestry:block/arboriculture/planks/maple", + "textures": { + "side": "forestry:blocks/wood/planks.maple", + "top": "forestry:blocks/wood/planks.maple", + "bottom": "forestry:blocks/wood/planks.maple" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/maple_half.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/maple_half.json new file mode 100644 index 000000000..481669a8d --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/slab/maple_half.json @@ -0,0 +1,8 @@ +{ + "parent": "block/half_slab", + "textures": { + "side": "forestry:blocks/wood/planks.maple", + "top": "forestry:blocks/wood/planks.maple", + "bottom": "forestry:blocks/wood/planks.maple" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/maple_upper.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/maple_upper.json new file mode 100644 index 000000000..b6bf31681 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/slab/maple_upper.json @@ -0,0 +1,8 @@ +{ + "parent": "block/upper_slab", + "textures": { + "side": "forestry:blocks/wood/planks.maple", + "top": "forestry:blocks/wood/planks.maple", + "bottom": "forestry:blocks/wood/planks.maple" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/padauk_double.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/padauk_double.json new file mode 100644 index 000000000..127814118 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/slab/padauk_double.json @@ -0,0 +1,8 @@ +{ + "parent": "forestry:block/arboriculture/planks/padauk", + "textures": { + "side": "forestry:blocks/wood/planks.padauk", + "top": "forestry:blocks/wood/planks.padauk", + "bottom": "forestry:blocks/wood/planks.padauk" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/padauk_half.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/padauk_half.json new file mode 100644 index 000000000..fddf90366 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/slab/padauk_half.json @@ -0,0 +1,8 @@ +{ + "parent": "block/half_slab", + "textures": { + "side": "forestry:blocks/wood/planks.padauk", + "top": "forestry:blocks/wood/planks.padauk", + "bottom": "forestry:blocks/wood/planks.padauk" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/padauk_upper.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/padauk_upper.json new file mode 100644 index 000000000..810509413 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/slab/padauk_upper.json @@ -0,0 +1,8 @@ +{ + "parent": "block/upper_slab", + "textures": { + "side": "forestry:blocks/wood/planks.padauk", + "top": "forestry:blocks/wood/planks.padauk", + "bottom": "forestry:blocks/wood/planks.padauk" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/palm_double.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/palm_double.json new file mode 100644 index 000000000..12678671f --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/slab/palm_double.json @@ -0,0 +1,8 @@ +{ + "parent": "forestry:block/arboriculture/planks/palm", + "textures": { + "side": "forestry:blocks/wood/planks.palm", + "top": "forestry:blocks/wood/planks.palm", + "bottom": "forestry:blocks/wood/planks.palm" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/palm_half.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/palm_half.json new file mode 100644 index 000000000..659bfa6a4 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/slab/palm_half.json @@ -0,0 +1,8 @@ +{ + "parent": "block/half_slab", + "textures": { + "side": "forestry:blocks/wood/planks.palm", + "top": "forestry:blocks/wood/planks.palm", + "bottom": "forestry:blocks/wood/planks.palm" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/palm_upper.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/palm_upper.json new file mode 100644 index 000000000..4cef4edfd --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/slab/palm_upper.json @@ -0,0 +1,8 @@ +{ + "parent": "block/upper_slab", + "textures": { + "side": "forestry:blocks/wood/planks.palm", + "top": "forestry:blocks/wood/planks.palm", + "bottom": "forestry:blocks/wood/planks.palm" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/papaya_double.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/papaya_double.json new file mode 100644 index 000000000..4646f3c89 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/slab/papaya_double.json @@ -0,0 +1,8 @@ +{ + "parent": "forestry:block/arboriculture/planks/papaya", + "textures": { + "side": "forestry:blocks/wood/planks.papaya", + "top": "forestry:blocks/wood/planks.papaya", + "bottom": "forestry:blocks/wood/planks.papaya" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/papaya_half.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/papaya_half.json new file mode 100644 index 000000000..1f48d00ff --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/slab/papaya_half.json @@ -0,0 +1,8 @@ +{ + "parent": "block/half_slab", + "textures": { + "side": "forestry:blocks/wood/planks.papaya", + "top": "forestry:blocks/wood/planks.papaya", + "bottom": "forestry:blocks/wood/planks.papaya" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/papaya_upper.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/papaya_upper.json new file mode 100644 index 000000000..1872448f9 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/slab/papaya_upper.json @@ -0,0 +1,8 @@ +{ + "parent": "block/upper_slab", + "textures": { + "side": "forestry:blocks/wood/planks.papaya", + "top": "forestry:blocks/wood/planks.papaya", + "bottom": "forestry:blocks/wood/planks.papaya" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/pine_double.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/pine_double.json new file mode 100644 index 000000000..497bec9ee --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/slab/pine_double.json @@ -0,0 +1,8 @@ +{ + "parent": "forestry:block/arboriculture/planks/pine", + "textures": { + "side": "forestry:blocks/wood/planks.pine", + "top": "forestry:blocks/wood/planks.pine", + "bottom": "forestry:blocks/wood/planks.pine" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/pine_half.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/pine_half.json new file mode 100644 index 000000000..9449a410c --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/slab/pine_half.json @@ -0,0 +1,8 @@ +{ + "parent": "block/half_slab", + "textures": { + "side": "forestry:blocks/wood/planks.pine", + "top": "forestry:blocks/wood/planks.pine", + "bottom": "forestry:blocks/wood/planks.pine" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/pine_upper.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/pine_upper.json new file mode 100644 index 000000000..89a40e06e --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/slab/pine_upper.json @@ -0,0 +1,8 @@ +{ + "parent": "block/upper_slab", + "textures": { + "side": "forestry:blocks/wood/planks.pine", + "top": "forestry:blocks/wood/planks.pine", + "bottom": "forestry:blocks/wood/planks.pine" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/plum_double.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/plum_double.json new file mode 100644 index 000000000..ff4df5878 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/slab/plum_double.json @@ -0,0 +1,8 @@ +{ + "parent": "forestry:block/arboriculture/planks/plum", + "textures": { + "side": "forestry:blocks/wood/planks.plum", + "top": "forestry:blocks/wood/planks.plum", + "bottom": "forestry:blocks/wood/planks.plum" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/plum_half.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/plum_half.json new file mode 100644 index 000000000..30f6ef7a5 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/slab/plum_half.json @@ -0,0 +1,8 @@ +{ + "parent": "block/half_slab", + "textures": { + "side": "forestry:blocks/wood/planks.plum", + "top": "forestry:blocks/wood/planks.plum", + "bottom": "forestry:blocks/wood/planks.plum" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/plum_upper.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/plum_upper.json new file mode 100644 index 000000000..566892f18 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/slab/plum_upper.json @@ -0,0 +1,8 @@ +{ + "parent": "block/upper_slab", + "textures": { + "side": "forestry:blocks/wood/planks.plum", + "top": "forestry:blocks/wood/planks.plum", + "bottom": "forestry:blocks/wood/planks.plum" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/poplar_double.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/poplar_double.json new file mode 100644 index 000000000..fd274600b --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/slab/poplar_double.json @@ -0,0 +1,8 @@ +{ + "parent": "forestry:block/arboriculture/planks/poplar", + "textures": { + "side": "forestry:blocks/wood/planks.poplar", + "top": "forestry:blocks/wood/planks.poplar", + "bottom": "forestry:blocks/wood/planks.poplar" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/poplar_half.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/poplar_half.json new file mode 100644 index 000000000..bdb7985f9 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/slab/poplar_half.json @@ -0,0 +1,8 @@ +{ + "parent": "block/half_slab", + "textures": { + "side": "forestry:blocks/wood/planks.poplar", + "top": "forestry:blocks/wood/planks.poplar", + "bottom": "forestry:blocks/wood/planks.poplar" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/poplar_upper.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/poplar_upper.json new file mode 100644 index 000000000..7dff37a50 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/slab/poplar_upper.json @@ -0,0 +1,8 @@ +{ + "parent": "block/upper_slab", + "textures": { + "side": "forestry:blocks/wood/planks.poplar", + "top": "forestry:blocks/wood/planks.poplar", + "bottom": "forestry:blocks/wood/planks.poplar" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/sequoia_double.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/sequoia_double.json new file mode 100644 index 000000000..559ce859c --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/slab/sequoia_double.json @@ -0,0 +1,8 @@ +{ + "parent": "forestry:block/arboriculture/planks/sequoia", + "textures": { + "side": "forestry:blocks/wood/planks.sequoia", + "top": "forestry:blocks/wood/planks.sequoia", + "bottom": "forestry:blocks/wood/planks.sequoia" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/sequoia_half.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/sequoia_half.json new file mode 100644 index 000000000..d195123f6 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/slab/sequoia_half.json @@ -0,0 +1,8 @@ +{ + "parent": "block/half_slab", + "textures": { + "side": "forestry:blocks/wood/planks.sequoia", + "top": "forestry:blocks/wood/planks.sequoia", + "bottom": "forestry:blocks/wood/planks.sequoia" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/sequoia_upper.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/sequoia_upper.json new file mode 100644 index 000000000..aa45d5a10 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/slab/sequoia_upper.json @@ -0,0 +1,8 @@ +{ + "parent": "block/upper_slab", + "textures": { + "side": "forestry:blocks/wood/planks.sequoia", + "top": "forestry:blocks/wood/planks.sequoia", + "bottom": "forestry:blocks/wood/planks.sequoia" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/teak_double.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/teak_double.json new file mode 100644 index 000000000..276b8595a --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/slab/teak_double.json @@ -0,0 +1,8 @@ +{ + "parent": "forestry:block/arboriculture/planks/teak", + "textures": { + "side": "forestry:blocks/wood/planks.teak", + "top": "forestry:blocks/wood/planks.teak", + "bottom": "forestry:blocks/wood/planks.teak" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/teak_half.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/teak_half.json new file mode 100644 index 000000000..c3714e588 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/slab/teak_half.json @@ -0,0 +1,8 @@ +{ + "parent": "block/half_slab", + "textures": { + "side": "forestry:blocks/wood/planks.teak", + "top": "forestry:blocks/wood/planks.teak", + "bottom": "forestry:blocks/wood/planks.teak" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/teak_upper.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/teak_upper.json new file mode 100644 index 000000000..97a525210 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/slab/teak_upper.json @@ -0,0 +1,8 @@ +{ + "parent": "block/upper_slab", + "textures": { + "side": "forestry:blocks/wood/planks.teak", + "top": "forestry:blocks/wood/planks.teak", + "bottom": "forestry:blocks/wood/planks.teak" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/walnut_double.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/walnut_double.json new file mode 100644 index 000000000..8c31da8de --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/slab/walnut_double.json @@ -0,0 +1,8 @@ +{ + "parent": "forestry:block/arboriculture/planks/walnut", + "textures": { + "side": "forestry:blocks/wood/planks.walnut", + "top": "forestry:blocks/wood/planks.walnut", + "bottom": "forestry:blocks/wood/planks.walnut" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/walnut_half.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/walnut_half.json new file mode 100644 index 000000000..aec7ceaba --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/slab/walnut_half.json @@ -0,0 +1,8 @@ +{ + "parent": "block/half_slab", + "textures": { + "side": "forestry:blocks/wood/planks.walnut", + "top": "forestry:blocks/wood/planks.walnut", + "bottom": "forestry:blocks/wood/planks.walnut" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/walnut_upper.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/walnut_upper.json new file mode 100644 index 000000000..162ec3f83 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/slab/walnut_upper.json @@ -0,0 +1,8 @@ +{ + "parent": "block/upper_slab", + "textures": { + "side": "forestry:blocks/wood/planks.walnut", + "top": "forestry:blocks/wood/planks.walnut", + "bottom": "forestry:blocks/wood/planks.walnut" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/wenge_double.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/wenge_double.json new file mode 100644 index 000000000..2ccddd172 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/slab/wenge_double.json @@ -0,0 +1,8 @@ +{ + "parent": "forestry:block/arboriculture/planks/wenge", + "textures": { + "side": "forestry:blocks/wood/planks.wenge", + "top": "forestry:blocks/wood/planks.wenge", + "bottom": "forestry:blocks/wood/planks.wenge" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/wenge_half.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/wenge_half.json new file mode 100644 index 000000000..b0435d6e7 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/slab/wenge_half.json @@ -0,0 +1,8 @@ +{ + "parent": "block/half_slab", + "textures": { + "side": "forestry:blocks/wood/planks.wenge", + "top": "forestry:blocks/wood/planks.wenge", + "bottom": "forestry:blocks/wood/planks.wenge" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/wenge_upper.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/wenge_upper.json new file mode 100644 index 000000000..462cfb829 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/slab/wenge_upper.json @@ -0,0 +1,8 @@ +{ + "parent": "block/upper_slab", + "textures": { + "side": "forestry:blocks/wood/planks.wenge", + "top": "forestry:blocks/wood/planks.wenge", + "bottom": "forestry:blocks/wood/planks.wenge" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/willow_double.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/willow_double.json new file mode 100644 index 000000000..a5d97500d --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/slab/willow_double.json @@ -0,0 +1,8 @@ +{ + "parent": "forestry:block/arboriculture/planks/willow", + "textures": { + "side": "forestry:blocks/wood/planks.willow", + "top": "forestry:blocks/wood/planks.willow", + "bottom": "forestry:blocks/wood/planks.willow" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/willow_half.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/willow_half.json new file mode 100644 index 000000000..0b7bd1946 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/slab/willow_half.json @@ -0,0 +1,8 @@ +{ + "parent": "block/half_slab", + "textures": { + "side": "forestry:blocks/wood/planks.willow", + "top": "forestry:blocks/wood/planks.willow", + "bottom": "forestry:blocks/wood/planks.willow" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/willow_upper.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/willow_upper.json new file mode 100644 index 000000000..3c68661eb --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/slab/willow_upper.json @@ -0,0 +1,8 @@ +{ + "parent": "block/upper_slab", + "textures": { + "side": "forestry:blocks/wood/planks.willow", + "top": "forestry:blocks/wood/planks.willow", + "bottom": "forestry:blocks/wood/planks.willow" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/zebrawood_double.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/zebrawood_double.json new file mode 100644 index 000000000..5b444fc18 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/slab/zebrawood_double.json @@ -0,0 +1,8 @@ +{ + "parent": "forestry:block/arboriculture/planks/zebrawood", + "textures": { + "side": "forestry:blocks/wood/planks.zebrawood", + "top": "forestry:blocks/wood/planks.zebrawood", + "bottom": "forestry:blocks/wood/planks.zebrawood" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/zebrawood_half.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/zebrawood_half.json new file mode 100644 index 000000000..238f47a3a --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/slab/zebrawood_half.json @@ -0,0 +1,8 @@ +{ + "parent": "block/half_slab", + "textures": { + "side": "forestry:blocks/wood/planks.zebrawood", + "top": "forestry:blocks/wood/planks.zebrawood", + "bottom": "forestry:blocks/wood/planks.zebrawood" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/zebrawood_upper.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/zebrawood_upper.json new file mode 100644 index 000000000..fd48275c5 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/slab/zebrawood_upper.json @@ -0,0 +1,8 @@ +{ + "parent": "block/upper_slab", + "textures": { + "side": "forestry:blocks/wood/planks.zebrawood", + "top": "forestry:blocks/wood/planks.zebrawood", + "bottom": "forestry:blocks/wood/planks.zebrawood" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/acacia.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/acacia.json new file mode 100644 index 000000000..0164bdc26 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/acacia.json @@ -0,0 +1,8 @@ +{ + "parent": "block/stairs", + "textures": { + "side": "forestry:blocks/wood/planks.acacia", + "top": "forestry:blocks/wood/planks.acacia", + "bottom": "forestry:blocks/wood/planks.acacia" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/acacia_inner.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/acacia_inner.json new file mode 100644 index 000000000..358a15074 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/acacia_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "block/inner_stairs", + "textures": { + "side": "forestry:blocks/wood/planks.acacia", + "top": "forestry:blocks/wood/planks.acacia", + "bottom": "forestry:blocks/wood/planks.acacia" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/acacia_outer.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/acacia_outer.json new file mode 100644 index 000000000..5ea6826ef --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/acacia_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "block/outer_stairs", + "textures": { + "side": "forestry:blocks/wood/planks.acacia", + "top": "forestry:blocks/wood/planks.acacia", + "bottom": "forestry:blocks/wood/planks.acacia" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/balsa.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/balsa.json new file mode 100644 index 000000000..29fdf4615 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/balsa.json @@ -0,0 +1,8 @@ +{ + "parent": "block/stairs", + "textures": { + "side": "forestry:blocks/wood/planks.balsa", + "top": "forestry:blocks/wood/planks.balsa", + "bottom": "forestry:blocks/wood/planks.balsa" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/balsa_inner.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/balsa_inner.json new file mode 100644 index 000000000..87170b897 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/balsa_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "block/inner_stairs", + "textures": { + "side": "forestry:blocks/wood/planks.balsa", + "top": "forestry:blocks/wood/planks.balsa", + "bottom": "forestry:blocks/wood/planks.balsa" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/balsa_outer.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/balsa_outer.json new file mode 100644 index 000000000..9dc3249f4 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/balsa_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "block/outer_stairs", + "textures": { + "side": "forestry:blocks/wood/planks.balsa", + "top": "forestry:blocks/wood/planks.balsa", + "bottom": "forestry:blocks/wood/planks.balsa" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/baobab.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/baobab.json new file mode 100644 index 000000000..ab389d55e --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/baobab.json @@ -0,0 +1,8 @@ +{ + "parent": "block/stairs", + "textures": { + "side": "forestry:blocks/wood/planks.baobab", + "top": "forestry:blocks/wood/planks.baobab", + "bottom": "forestry:blocks/wood/planks.baobab" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/baobab_inner.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/baobab_inner.json new file mode 100644 index 000000000..4019e4369 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/baobab_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "block/inner_stairs", + "textures": { + "side": "forestry:blocks/wood/planks.baobab", + "top": "forestry:blocks/wood/planks.baobab", + "bottom": "forestry:blocks/wood/planks.baobab" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/baobab_outer.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/baobab_outer.json new file mode 100644 index 000000000..27dd2f0db --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/baobab_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "block/outer_stairs", + "textures": { + "side": "forestry:blocks/wood/planks.baobab", + "top": "forestry:blocks/wood/planks.baobab", + "bottom": "forestry:blocks/wood/planks.baobab" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/cherry.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/cherry.json new file mode 100644 index 000000000..cbe3dd3f2 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/cherry.json @@ -0,0 +1,8 @@ +{ + "parent": "block/stairs", + "textures": { + "side": "forestry:blocks/wood/planks.cherry", + "top": "forestry:blocks/wood/planks.cherry", + "bottom": "forestry:blocks/wood/planks.cherry" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/cherry_inner.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/cherry_inner.json new file mode 100644 index 000000000..32e49dd85 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/cherry_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "block/inner_stairs", + "textures": { + "side": "forestry:blocks/wood/planks.cherry", + "top": "forestry:blocks/wood/planks.cherry", + "bottom": "forestry:blocks/wood/planks.cherry" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/cherry_outer.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/cherry_outer.json new file mode 100644 index 000000000..9d8fac156 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/cherry_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "block/outer_stairs", + "textures": { + "side": "forestry:blocks/wood/planks.cherry", + "top": "forestry:blocks/wood/planks.cherry", + "bottom": "forestry:blocks/wood/planks.cherry" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/chestnut.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/chestnut.json new file mode 100644 index 000000000..251034b3f --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/chestnut.json @@ -0,0 +1,8 @@ +{ + "parent": "block/stairs", + "textures": { + "side": "forestry:blocks/wood/planks.chestnut", + "top": "forestry:blocks/wood/planks.chestnut", + "bottom": "forestry:blocks/wood/planks.chestnut" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/chestnut_inner.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/chestnut_inner.json new file mode 100644 index 000000000..dfa18cc7f --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/chestnut_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "block/inner_stairs", + "textures": { + "side": "forestry:blocks/wood/planks.chestnut", + "top": "forestry:blocks/wood/planks.chestnut", + "bottom": "forestry:blocks/wood/planks.chestnut" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/chestnut_outer.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/chestnut_outer.json new file mode 100644 index 000000000..46bdd8f58 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/chestnut_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "block/outer_stairs", + "textures": { + "side": "forestry:blocks/wood/planks.chestnut", + "top": "forestry:blocks/wood/planks.chestnut", + "bottom": "forestry:blocks/wood/planks.chestnut" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/citrus.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/citrus.json new file mode 100644 index 000000000..5f9a99ab3 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/citrus.json @@ -0,0 +1,8 @@ +{ + "parent": "block/stairs", + "textures": { + "side": "forestry:blocks/wood/planks.citrus", + "top": "forestry:blocks/wood/planks.citrus", + "bottom": "forestry:blocks/wood/planks.citrus" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/citrus_inner.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/citrus_inner.json new file mode 100644 index 000000000..2fcb772c3 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/citrus_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "block/inner_stairs", + "textures": { + "side": "forestry:blocks/wood/planks.citrus", + "top": "forestry:blocks/wood/planks.citrus", + "bottom": "forestry:blocks/wood/planks.citrus" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/citrus_outer.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/citrus_outer.json new file mode 100644 index 000000000..a9cce210a --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/citrus_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "block/outer_stairs", + "textures": { + "side": "forestry:blocks/wood/planks.citrus", + "top": "forestry:blocks/wood/planks.citrus", + "bottom": "forestry:blocks/wood/planks.citrus" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/cocobolo.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/cocobolo.json new file mode 100644 index 000000000..9c3dd2f27 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/cocobolo.json @@ -0,0 +1,8 @@ +{ + "parent": "block/stairs", + "textures": { + "side": "forestry:blocks/wood/planks.cocobolo", + "top": "forestry:blocks/wood/planks.cocobolo", + "bottom": "forestry:blocks/wood/planks.cocobolo" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/cocobolo_inner.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/cocobolo_inner.json new file mode 100644 index 000000000..3efb0fa4b --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/cocobolo_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "block/inner_stairs", + "textures": { + "side": "forestry:blocks/wood/planks.cocobolo", + "top": "forestry:blocks/wood/planks.cocobolo", + "bottom": "forestry:blocks/wood/planks.cocobolo" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/cocobolo_outer.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/cocobolo_outer.json new file mode 100644 index 000000000..599f2279a --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/cocobolo_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "block/outer_stairs", + "textures": { + "side": "forestry:blocks/wood/planks.cocobolo", + "top": "forestry:blocks/wood/planks.cocobolo", + "bottom": "forestry:blocks/wood/planks.cocobolo" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/ebony.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/ebony.json new file mode 100644 index 000000000..c38fd3e29 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/ebony.json @@ -0,0 +1,8 @@ +{ + "parent": "block/stairs", + "textures": { + "side": "forestry:blocks/wood/planks.ebony", + "top": "forestry:blocks/wood/planks.ebony", + "bottom": "forestry:blocks/wood/planks.ebony" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/ebony_inner.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/ebony_inner.json new file mode 100644 index 000000000..98e2d3d88 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/ebony_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "block/inner_stairs", + "textures": { + "side": "forestry:blocks/wood/planks.ebony", + "top": "forestry:blocks/wood/planks.ebony", + "bottom": "forestry:blocks/wood/planks.ebony" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/ebony_outer.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/ebony_outer.json new file mode 100644 index 000000000..668d5190e --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/ebony_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "block/outer_stairs", + "textures": { + "side": "forestry:blocks/wood/planks.ebony", + "top": "forestry:blocks/wood/planks.ebony", + "bottom": "forestry:blocks/wood/planks.ebony" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/giganteum.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/giganteum.json new file mode 100644 index 000000000..0ae569759 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/giganteum.json @@ -0,0 +1,8 @@ +{ + "parent": "block/stairs", + "textures": { + "side": "forestry:blocks/wood/planks.giganteum", + "top": "forestry:blocks/wood/planks.giganteum", + "bottom": "forestry:blocks/wood/planks.giganteum" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/giganteum_inner.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/giganteum_inner.json new file mode 100644 index 000000000..94971cdf5 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/giganteum_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "block/inner_stairs", + "textures": { + "side": "forestry:blocks/wood/planks.giganteum", + "top": "forestry:blocks/wood/planks.giganteum", + "bottom": "forestry:blocks/wood/planks.giganteum" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/giganteum_outer.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/giganteum_outer.json new file mode 100644 index 000000000..cf11e9b5c --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/giganteum_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "block/outer_stairs", + "textures": { + "side": "forestry:blocks/wood/planks.giganteum", + "top": "forestry:blocks/wood/planks.giganteum", + "bottom": "forestry:blocks/wood/planks.giganteum" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/greenheart.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/greenheart.json new file mode 100644 index 000000000..f91e68194 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/greenheart.json @@ -0,0 +1,8 @@ +{ + "parent": "block/stairs", + "textures": { + "side": "forestry:blocks/wood/planks.greenheart", + "top": "forestry:blocks/wood/planks.greenheart", + "bottom": "forestry:blocks/wood/planks.greenheart" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/greenheart_inner.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/greenheart_inner.json new file mode 100644 index 000000000..13620aa75 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/greenheart_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "block/inner_stairs", + "textures": { + "side": "forestry:blocks/wood/planks.greenheart", + "top": "forestry:blocks/wood/planks.greenheart", + "bottom": "forestry:blocks/wood/planks.greenheart" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/greenheart_outer.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/greenheart_outer.json new file mode 100644 index 000000000..355bde3bc --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/greenheart_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "block/outer_stairs", + "textures": { + "side": "forestry:blocks/wood/planks.greenheart", + "top": "forestry:blocks/wood/planks.greenheart", + "bottom": "forestry:blocks/wood/planks.greenheart" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/ipe.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/ipe.json new file mode 100644 index 000000000..c078f78b6 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/ipe.json @@ -0,0 +1,8 @@ +{ + "parent": "block/stairs", + "textures": { + "side": "forestry:blocks/wood/planks.ipe", + "top": "forestry:blocks/wood/planks.ipe", + "bottom": "forestry:blocks/wood/planks.ipe" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/ipe_inner.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/ipe_inner.json new file mode 100644 index 000000000..387b5cb28 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/ipe_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "block/inner_stairs", + "textures": { + "side": "forestry:blocks/wood/planks.ipe", + "top": "forestry:blocks/wood/planks.ipe", + "bottom": "forestry:blocks/wood/planks.ipe" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/ipe_outer.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/ipe_outer.json new file mode 100644 index 000000000..8629edbbc --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/ipe_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "block/outer_stairs", + "textures": { + "side": "forestry:blocks/wood/planks.ipe", + "top": "forestry:blocks/wood/planks.ipe", + "bottom": "forestry:blocks/wood/planks.ipe" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/kapok.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/kapok.json new file mode 100644 index 000000000..8c443915f --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/kapok.json @@ -0,0 +1,8 @@ +{ + "parent": "block/stairs", + "textures": { + "side": "forestry:blocks/wood/planks.kapok", + "top": "forestry:blocks/wood/planks.kapok", + "bottom": "forestry:blocks/wood/planks.kapok" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/kapok_inner.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/kapok_inner.json new file mode 100644 index 000000000..768f60c08 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/kapok_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "block/inner_stairs", + "textures": { + "side": "forestry:blocks/wood/planks.kapok", + "top": "forestry:blocks/wood/planks.kapok", + "bottom": "forestry:blocks/wood/planks.kapok" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/kapok_outer.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/kapok_outer.json new file mode 100644 index 000000000..4f6f1ffdc --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/kapok_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "block/outer_stairs", + "textures": { + "side": "forestry:blocks/wood/planks.kapok", + "top": "forestry:blocks/wood/planks.kapok", + "bottom": "forestry:blocks/wood/planks.kapok" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/larch.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/larch.json new file mode 100644 index 000000000..cbe17ea26 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/larch.json @@ -0,0 +1,8 @@ +{ + "parent": "block/stairs", + "textures": { + "side": "forestry:blocks/wood/planks.larch", + "top": "forestry:blocks/wood/planks.larch", + "bottom": "forestry:blocks/wood/planks.larch" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/larch_inner.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/larch_inner.json new file mode 100644 index 000000000..60184270e --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/larch_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "block/inner_stairs", + "textures": { + "side": "forestry:blocks/wood/planks.larch", + "top": "forestry:blocks/wood/planks.larch", + "bottom": "forestry:blocks/wood/planks.larch" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/larch_outer.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/larch_outer.json new file mode 100644 index 000000000..0a413e2c4 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/larch_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "block/outer_stairs", + "textures": { + "side": "forestry:blocks/wood/planks.larch", + "top": "forestry:blocks/wood/planks.larch", + "bottom": "forestry:blocks/wood/planks.larch" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/lime.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/lime.json new file mode 100644 index 000000000..aa9c497fa --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/lime.json @@ -0,0 +1,8 @@ +{ + "parent": "block/stairs", + "textures": { + "side": "forestry:blocks/wood/planks.lime", + "top": "forestry:blocks/wood/planks.lime", + "bottom": "forestry:blocks/wood/planks.lime" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/lime_inner.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/lime_inner.json new file mode 100644 index 000000000..06abc9838 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/lime_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "block/inner_stairs", + "textures": { + "side": "forestry:blocks/wood/planks.lime", + "top": "forestry:blocks/wood/planks.lime", + "bottom": "forestry:blocks/wood/planks.lime" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/lime_outer.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/lime_outer.json new file mode 100644 index 000000000..e92633623 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/lime_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "block/outer_stairs", + "textures": { + "side": "forestry:blocks/wood/planks.lime", + "top": "forestry:blocks/wood/planks.lime", + "bottom": "forestry:blocks/wood/planks.lime" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/mahoe.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/mahoe.json new file mode 100644 index 000000000..7df01c44b --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/mahoe.json @@ -0,0 +1,8 @@ +{ + "parent": "block/stairs", + "textures": { + "side": "forestry:blocks/wood/planks.mahoe", + "top": "forestry:blocks/wood/planks.mahoe", + "bottom": "forestry:blocks/wood/planks.mahoe" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/mahoe_inner.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/mahoe_inner.json new file mode 100644 index 000000000..3af77c21d --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/mahoe_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "block/inner_stairs", + "textures": { + "side": "forestry:blocks/wood/planks.mahoe", + "top": "forestry:blocks/wood/planks.mahoe", + "bottom": "forestry:blocks/wood/planks.mahoe" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/mahoe_outer.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/mahoe_outer.json new file mode 100644 index 000000000..f706d69a9 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/mahoe_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "block/outer_stairs", + "textures": { + "side": "forestry:blocks/wood/planks.mahoe", + "top": "forestry:blocks/wood/planks.mahoe", + "bottom": "forestry:blocks/wood/planks.mahoe" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/mahogany.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/mahogany.json new file mode 100644 index 000000000..a8f522e82 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/mahogany.json @@ -0,0 +1,8 @@ +{ + "parent": "block/stairs", + "textures": { + "side": "forestry:blocks/wood/planks.mahogany", + "top": "forestry:blocks/wood/planks.mahogany", + "bottom": "forestry:blocks/wood/planks.mahogany" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/mahogany_inner.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/mahogany_inner.json new file mode 100644 index 000000000..249a6ec95 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/mahogany_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "block/inner_stairs", + "textures": { + "side": "forestry:blocks/wood/planks.mahogany", + "top": "forestry:blocks/wood/planks.mahogany", + "bottom": "forestry:blocks/wood/planks.mahogany" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/mahogany_outer.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/mahogany_outer.json new file mode 100644 index 000000000..81737bce5 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/mahogany_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "block/outer_stairs", + "textures": { + "side": "forestry:blocks/wood/planks.mahogany", + "top": "forestry:blocks/wood/planks.mahogany", + "bottom": "forestry:blocks/wood/planks.mahogany" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/maple.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/maple.json new file mode 100644 index 000000000..f5fff3ff1 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/maple.json @@ -0,0 +1,8 @@ +{ + "parent": "block/stairs", + "textures": { + "side": "forestry:blocks/wood/planks.maple", + "top": "forestry:blocks/wood/planks.maple", + "bottom": "forestry:blocks/wood/planks.maple" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/maple_inner.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/maple_inner.json new file mode 100644 index 000000000..eb62d6680 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/maple_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "block/inner_stairs", + "textures": { + "side": "forestry:blocks/wood/planks.maple", + "top": "forestry:blocks/wood/planks.maple", + "bottom": "forestry:blocks/wood/planks.maple" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/maple_outer.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/maple_outer.json new file mode 100644 index 000000000..a3cd1864d --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/maple_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "block/outer_stairs", + "textures": { + "side": "forestry:blocks/wood/planks.maple", + "top": "forestry:blocks/wood/planks.maple", + "bottom": "forestry:blocks/wood/planks.maple" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/padauk.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/padauk.json new file mode 100644 index 000000000..e1022a806 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/padauk.json @@ -0,0 +1,8 @@ +{ + "parent": "block/stairs", + "textures": { + "side": "forestry:blocks/wood/planks.padauk", + "top": "forestry:blocks/wood/planks.padauk", + "bottom": "forestry:blocks/wood/planks.padauk" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/padauk_inner.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/padauk_inner.json new file mode 100644 index 000000000..83c54c11a --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/padauk_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "block/inner_stairs", + "textures": { + "side": "forestry:blocks/wood/planks.padauk", + "top": "forestry:blocks/wood/planks.padauk", + "bottom": "forestry:blocks/wood/planks.padauk" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/padauk_outer.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/padauk_outer.json new file mode 100644 index 000000000..ae4fa2ebd --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/padauk_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "block/outer_stairs", + "textures": { + "side": "forestry:blocks/wood/planks.padauk", + "top": "forestry:blocks/wood/planks.padauk", + "bottom": "forestry:blocks/wood/planks.padauk" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/palm.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/palm.json new file mode 100644 index 000000000..8ace4b634 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/palm.json @@ -0,0 +1,8 @@ +{ + "parent": "block/stairs", + "textures": { + "side": "forestry:blocks/wood/planks.palm", + "top": "forestry:blocks/wood/planks.palm", + "bottom": "forestry:blocks/wood/planks.palm" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/palm_inner.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/palm_inner.json new file mode 100644 index 000000000..3b88c2bb0 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/palm_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "block/inner_stairs", + "textures": { + "side": "forestry:blocks/wood/planks.palm", + "top": "forestry:blocks/wood/planks.palm", + "bottom": "forestry:blocks/wood/planks.palm" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/palm_outer.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/palm_outer.json new file mode 100644 index 000000000..7b5e86dee --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/palm_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "block/outer_stairs", + "textures": { + "side": "forestry:blocks/wood/planks.palm", + "top": "forestry:blocks/wood/planks.palm", + "bottom": "forestry:blocks/wood/planks.palm" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/papaya.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/papaya.json new file mode 100644 index 000000000..97cd89567 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/papaya.json @@ -0,0 +1,8 @@ +{ + "parent": "block/stairs", + "textures": { + "side": "forestry:blocks/wood/planks.papaya", + "top": "forestry:blocks/wood/planks.papaya", + "bottom": "forestry:blocks/wood/planks.papaya" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/papaya_inner.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/papaya_inner.json new file mode 100644 index 000000000..5a4dd41d3 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/papaya_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "block/inner_stairs", + "textures": { + "side": "forestry:blocks/wood/planks.papaya", + "top": "forestry:blocks/wood/planks.papaya", + "bottom": "forestry:blocks/wood/planks.papaya" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/papaya_outer.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/papaya_outer.json new file mode 100644 index 000000000..f2001c08e --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/papaya_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "block/outer_stairs", + "textures": { + "side": "forestry:blocks/wood/planks.papaya", + "top": "forestry:blocks/wood/planks.papaya", + "bottom": "forestry:blocks/wood/planks.papaya" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/pine.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/pine.json new file mode 100644 index 000000000..c06ee39f6 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/pine.json @@ -0,0 +1,8 @@ +{ + "parent": "block/stairs", + "textures": { + "side": "forestry:blocks/wood/planks.pine", + "top": "forestry:blocks/wood/planks.pine", + "bottom": "forestry:blocks/wood/planks.pine" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/pine_inner.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/pine_inner.json new file mode 100644 index 000000000..1e19ad6ec --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/pine_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "block/inner_stairs", + "textures": { + "side": "forestry:blocks/wood/planks.pine", + "top": "forestry:blocks/wood/planks.pine", + "bottom": "forestry:blocks/wood/planks.pine" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/pine_outer.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/pine_outer.json new file mode 100644 index 000000000..406ff1d90 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/pine_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "block/outer_stairs", + "textures": { + "side": "forestry:blocks/wood/planks.pine", + "top": "forestry:blocks/wood/planks.pine", + "bottom": "forestry:blocks/wood/planks.pine" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/plum.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/plum.json new file mode 100644 index 000000000..49cc48757 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/plum.json @@ -0,0 +1,8 @@ +{ + "parent": "block/stairs", + "textures": { + "side": "forestry:blocks/wood/planks.plum", + "top": "forestry:blocks/wood/planks.plum", + "bottom": "forestry:blocks/wood/planks.plum" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/plum_inner.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/plum_inner.json new file mode 100644 index 000000000..594ac9e46 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/plum_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "block/inner_stairs", + "textures": { + "side": "forestry:blocks/wood/planks.plum", + "top": "forestry:blocks/wood/planks.plum", + "bottom": "forestry:blocks/wood/planks.plum" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/plum_outer.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/plum_outer.json new file mode 100644 index 000000000..eb4f198d9 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/plum_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "block/outer_stairs", + "textures": { + "side": "forestry:blocks/wood/planks.plum", + "top": "forestry:blocks/wood/planks.plum", + "bottom": "forestry:blocks/wood/planks.plum" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/poplar.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/poplar.json new file mode 100644 index 000000000..d398f063a --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/poplar.json @@ -0,0 +1,8 @@ +{ + "parent": "block/stairs", + "textures": { + "side": "forestry:blocks/wood/planks.poplar", + "top": "forestry:blocks/wood/planks.poplar", + "bottom": "forestry:blocks/wood/planks.poplar" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/poplar_inner.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/poplar_inner.json new file mode 100644 index 000000000..c9967eef8 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/poplar_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "block/inner_stairs", + "textures": { + "side": "forestry:blocks/wood/planks.poplar", + "top": "forestry:blocks/wood/planks.poplar", + "bottom": "forestry:blocks/wood/planks.poplar" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/poplar_outer.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/poplar_outer.json new file mode 100644 index 000000000..518636def --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/poplar_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "block/outer_stairs", + "textures": { + "side": "forestry:blocks/wood/planks.poplar", + "top": "forestry:blocks/wood/planks.poplar", + "bottom": "forestry:blocks/wood/planks.poplar" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/sequoia.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/sequoia.json new file mode 100644 index 000000000..ed6f9706c --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/sequoia.json @@ -0,0 +1,8 @@ +{ + "parent": "block/stairs", + "textures": { + "side": "forestry:blocks/wood/planks.sequoia", + "top": "forestry:blocks/wood/planks.sequoia", + "bottom": "forestry:blocks/wood/planks.sequoia" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/sequoia_inner.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/sequoia_inner.json new file mode 100644 index 000000000..65b5b0a41 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/sequoia_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "block/inner_stairs", + "textures": { + "side": "forestry:blocks/wood/planks.sequoia", + "top": "forestry:blocks/wood/planks.sequoia", + "bottom": "forestry:blocks/wood/planks.sequoia" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/sequoia_outer.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/sequoia_outer.json new file mode 100644 index 000000000..b1fff730f --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/sequoia_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "block/outer_stairs", + "textures": { + "side": "forestry:blocks/wood/planks.sequoia", + "top": "forestry:blocks/wood/planks.sequoia", + "bottom": "forestry:blocks/wood/planks.sequoia" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/teak.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/teak.json new file mode 100644 index 000000000..f4606bcbb --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/teak.json @@ -0,0 +1,8 @@ +{ + "parent": "block/stairs", + "textures": { + "side": "forestry:blocks/wood/planks.teak", + "top": "forestry:blocks/wood/planks.teak", + "bottom": "forestry:blocks/wood/planks.teak" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/teak_inner.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/teak_inner.json new file mode 100644 index 000000000..0e696046c --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/teak_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "block/inner_stairs", + "textures": { + "side": "forestry:blocks/wood/planks.teak", + "top": "forestry:blocks/wood/planks.teak", + "bottom": "forestry:blocks/wood/planks.teak" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/teak_outer.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/teak_outer.json new file mode 100644 index 000000000..41fb4ddfb --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/teak_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "block/outer_stairs", + "textures": { + "side": "forestry:blocks/wood/planks.teak", + "top": "forestry:blocks/wood/planks.teak", + "bottom": "forestry:blocks/wood/planks.teak" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/walnut.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/walnut.json new file mode 100644 index 000000000..7155beed6 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/walnut.json @@ -0,0 +1,8 @@ +{ + "parent": "block/stairs", + "textures": { + "side": "forestry:blocks/wood/planks.walnut", + "top": "forestry:blocks/wood/planks.walnut", + "bottom": "forestry:blocks/wood/planks.walnut" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/walnut_inner.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/walnut_inner.json new file mode 100644 index 000000000..613521661 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/walnut_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "block/inner_stairs", + "textures": { + "side": "forestry:blocks/wood/planks.walnut", + "top": "forestry:blocks/wood/planks.walnut", + "bottom": "forestry:blocks/wood/planks.walnut" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/walnut_outer.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/walnut_outer.json new file mode 100644 index 000000000..197182c38 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/walnut_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "block/outer_stairs", + "textures": { + "side": "forestry:blocks/wood/planks.walnut", + "top": "forestry:blocks/wood/planks.walnut", + "bottom": "forestry:blocks/wood/planks.walnut" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/wenge.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/wenge.json new file mode 100644 index 000000000..98dce7d6e --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/wenge.json @@ -0,0 +1,8 @@ +{ + "parent": "block/stairs", + "textures": { + "side": "forestry:blocks/wood/planks.wenge", + "top": "forestry:blocks/wood/planks.wenge", + "bottom": "forestry:blocks/wood/planks.wenge" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/wenge_inner.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/wenge_inner.json new file mode 100644 index 000000000..d236771d9 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/wenge_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "block/inner_stairs", + "textures": { + "side": "forestry:blocks/wood/planks.wenge", + "top": "forestry:blocks/wood/planks.wenge", + "bottom": "forestry:blocks/wood/planks.wenge" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/wenge_outer.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/wenge_outer.json new file mode 100644 index 000000000..fbac9e17d --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/wenge_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "block/outer_stairs", + "textures": { + "side": "forestry:blocks/wood/planks.wenge", + "top": "forestry:blocks/wood/planks.wenge", + "bottom": "forestry:blocks/wood/planks.wenge" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/willow.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/willow.json new file mode 100644 index 000000000..1cc874c8b --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/willow.json @@ -0,0 +1,8 @@ +{ + "parent": "block/stairs", + "textures": { + "side": "forestry:blocks/wood/planks.willow", + "top": "forestry:blocks/wood/planks.willow", + "bottom": "forestry:blocks/wood/planks.willow" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/willow_inner.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/willow_inner.json new file mode 100644 index 000000000..f3d936859 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/willow_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "block/inner_stairs", + "textures": { + "side": "forestry:blocks/wood/planks.willow", + "top": "forestry:blocks/wood/planks.willow", + "bottom": "forestry:blocks/wood/planks.willow" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/willow_outer.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/willow_outer.json new file mode 100644 index 000000000..27ec353ae --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/willow_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "block/outer_stairs", + "textures": { + "side": "forestry:blocks/wood/planks.willow", + "top": "forestry:blocks/wood/planks.willow", + "bottom": "forestry:blocks/wood/planks.willow" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/zebrawood.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/zebrawood.json new file mode 100644 index 000000000..89ed7ef83 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/zebrawood.json @@ -0,0 +1,8 @@ +{ + "parent": "block/stairs", + "textures": { + "side": "forestry:blocks/wood/planks.zebrawood", + "top": "forestry:blocks/wood/planks.zebrawood", + "bottom": "forestry:blocks/wood/planks.zebrawood" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/zebrawood_inner.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/zebrawood_inner.json new file mode 100644 index 000000000..1413ca548 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/zebrawood_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "block/inner_stairs", + "textures": { + "side": "forestry:blocks/wood/planks.zebrawood", + "top": "forestry:blocks/wood/planks.zebrawood", + "bottom": "forestry:blocks/wood/planks.zebrawood" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/zebrawood_outer.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/zebrawood_outer.json new file mode 100644 index 000000000..9f39905c0 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/zebrawood_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "block/outer_stairs", + "textures": { + "side": "forestry:blocks/wood/planks.zebrawood", + "top": "forestry:blocks/wood/planks.zebrawood", + "bottom": "forestry:blocks/wood/planks.zebrawood" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/beehives/desert.json b/src/main/resources/assets/forestry/models/block/beehives/desert.json new file mode 100644 index 000000000..1ee5220b4 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/beehives/desert.json @@ -0,0 +1,12 @@ +{ + "parent": "block/cube", + "textures": { + "particle": "forestry:blocks/beehives/beehive.3.side", + "down": "forestry:blocks/beehives/beehive.3.top", + "up": "forestry:blocks/beehives/beehive.3.top", + "north": "forestry:blocks/beehives/beehive.3.side", + "east": "forestry:blocks/beehives/beehive.3.side", + "south": "forestry:blocks/beehives/beehive.3.side", + "west": "forestry:blocks/beehives/beehive.3.side" + } +} diff --git a/src/main/resources/assets/forestry/models/block/beehives/end.json b/src/main/resources/assets/forestry/models/block/beehives/end.json new file mode 100644 index 000000000..1ce011daf --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/beehives/end.json @@ -0,0 +1,12 @@ +{ + "parent": "block/cube", + "textures": { + "particle": "forestry:blocks/beehives/beehive.5.side", + "down": "forestry:blocks/beehives/beehive.5.top", + "up": "forestry:blocks/beehives/beehive.5.top", + "north": "forestry:blocks/beehives/beehive.5.side", + "east": "forestry:blocks/beehives/beehive.5.side", + "south": "forestry:blocks/beehives/beehive.5.side", + "west": "forestry:blocks/beehives/beehive.5.side" + } +} diff --git a/src/main/resources/assets/forestry/models/block/beehives/forest.json b/src/main/resources/assets/forestry/models/block/beehives/forest.json new file mode 100644 index 000000000..fde0bdcf7 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/beehives/forest.json @@ -0,0 +1,12 @@ +{ + "parent": "block/cube", + "textures": { + "particle": "forestry:blocks/beehives/beehive.1.side", + "down": "forestry:blocks/beehives/beehive.1.top", + "up": "forestry:blocks/beehives/beehive.1.top", + "north": "forestry:blocks/beehives/beehive.1.side", + "east": "forestry:blocks/beehives/beehive.1.side", + "south": "forestry:blocks/beehives/beehive.1.side", + "west": "forestry:blocks/beehives/beehive.1.side" + } +} diff --git a/src/main/resources/assets/forestry/models/block/beehives/jungle.json b/src/main/resources/assets/forestry/models/block/beehives/jungle.json new file mode 100644 index 000000000..604485725 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/beehives/jungle.json @@ -0,0 +1,12 @@ +{ + "parent": "block/cube", + "textures": { + "particle": "forestry:blocks/beehives/beehive.4.side", + "down": "forestry:blocks/beehives/beehive.4.top", + "up": "forestry:blocks/beehives/beehive.4.top", + "north": "forestry:blocks/beehives/beehive.4.side", + "east": "forestry:blocks/beehives/beehive.4.side", + "south": "forestry:blocks/beehives/beehive.4.side", + "west": "forestry:blocks/beehives/beehive.4.side" + } +} diff --git a/src/main/resources/assets/forestry/models/block/beehives/meadows.json b/src/main/resources/assets/forestry/models/block/beehives/meadows.json new file mode 100644 index 000000000..ffb5ebd73 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/beehives/meadows.json @@ -0,0 +1,12 @@ +{ + "parent": "block/cube", + "textures": { + "particle": "forestry:blocks/beehives/beehive.2.side", + "down": "forestry:blocks/beehives/beehive.2.top", + "up": "forestry:blocks/beehives/beehive.2.top", + "north": "forestry:blocks/beehives/beehive.2.side", + "east": "forestry:blocks/beehives/beehive.2.side", + "south": "forestry:blocks/beehives/beehive.2.side", + "west": "forestry:blocks/beehives/beehive.2.side" + } +} diff --git a/src/main/resources/assets/forestry/models/block/beehives/snow.json b/src/main/resources/assets/forestry/models/block/beehives/snow.json new file mode 100644 index 000000000..32e5a7e5c --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/beehives/snow.json @@ -0,0 +1,12 @@ +{ + "parent": "block/cube", + "textures": { + "particle": "forestry:blocks/beehives/beehive.6.side", + "down": "forestry:blocks/beehives/beehive.6.top", + "up": "forestry:blocks/beehives/beehive.6.top", + "north": "forestry:blocks/beehives/beehive.6.side", + "east": "forestry:blocks/beehives/beehive.6.side", + "south": "forestry:blocks/beehives/beehive.6.side", + "west": "forestry:blocks/beehives/beehive.6.side" + } +} diff --git a/src/main/resources/assets/forestry/models/block/beehives/swamp.json b/src/main/resources/assets/forestry/models/block/beehives/swamp.json new file mode 100644 index 000000000..dda2ede56 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/beehives/swamp.json @@ -0,0 +1,12 @@ +{ + "parent": "block/cube", + "textures": { + "particle": "forestry:blocks/beehives/beehive.7.side", + "down": "forestry:blocks/beehives/beehive.7.top", + "up": "forestry:blocks/beehives/beehive.7.top", + "north": "forestry:blocks/beehives/beehive.7.side", + "east": "forestry:blocks/beehives/beehive.7.side", + "south": "forestry:blocks/beehives/beehive.7.side", + "west": "forestry:blocks/beehives/beehive.7.side" + } +} diff --git a/src/main/resources/assets/forestry/models/block/candle.json b/src/main/resources/assets/forestry/models/block/candle.json new file mode 100644 index 000000000..6444ba4ea --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/candle.json @@ -0,0 +1,130 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "#candleStump" + }, + "elements": [ + { + "from": [ -1, 3.5, 7 ], + "to": [ 1, 13.5, 9 ], + "rotation": { + "origin": [ 0, 3.5, 8 ], + "axis": "z", + "angle": -22.5 + }, + "shade": false, + "faces": { + "down": { + "uv": [ 7, 13, 9, 15 ], + "texture": "#candleStump" + }, + "up": { + "uv": [ 7, 6, 9, 8 ], + "texture": "#candleStump" + } + } + }, + { + "from": [ -1, 3.5, 0 ], + "to": [ 1, 19.5, 16 ], + "rotation": { + "origin": [ 0, 3.5, 8 ], + "axis": "z", + "angle": -22.5 + }, + "shade": false, + "faces": { + "west": { + "uv": [ 0, 0, 16, 16 ], + "texture": "candleStump" + }, + "east": { + "uv": [ 0, 0, 16, 16 ], + "texture": "candleStump" + } + } + }, + { + "from": [ -8, 3.5, 7 ], + "to": [ 8, 19.5, 9 ], + "rotation": { + "origin": [ 0, 3.5, 8 ], + "axis": "z", + "angle": -22.5 + }, + "shade": false, + "faces": { + "north": { + "uv": [ 0, 0, 16, 16 ], + "texture": "#candleStump" + }, + "south": { + "uv": [ 0, 0, 16, 16 ], + "texture": "#candleStump" + } + } + }, + { + "from": [ -1, 3.5, 7 ], + "to": [ 1, 13.5, 9 ], + "rotation": { + "origin": [ 0, 3.5, 8 ], + "axis": "z", + "angle": -22.5 + }, + "shade": false, + "faces": { + "down": { + "uv": [ 7, 13, 9, 15 ], + "texture": "#candleTip" + }, + "up": { + "uv": [ 7, 6, 9, 8 ], + "texture": "#candleTip" + } + } + }, + { + "from": [ -1, 3.5, 0 ], + "to": [ 1, 19.5, 16 ], + "rotation": { + "origin": [ 0, 3.5, 8 ], + "axis": "z", + "angle": -22.5 + }, + "shade": false, + "faces": { + "west": { + "uv": [ 0, 0, 16, 16 ], + "texture": "#candleTip" + }, + "east": { + "uv": [ 0, 0, 16, 16 ], + "texture": "#candleTip" + } + } + }, + { + "from": [ -8, 3.5, 7 ], + "to": [ 8, 19.5, 9 ], + "rotation": { + "origin": [ 0, 3.5, 8 ], + "axis": "z", + "angle": -22.5 + }, + "shade": false, + "faces": { + "north": { + "uv": [ 0, 0, 16, 16 ], + "texture": "#candleTip" + }, + "south": { + "uv": [ 0, 0, 16, 16 ], + "texture": "#candleTip" + } + } + } + + + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/candle_off.json b/src/main/resources/assets/forestry/models/block/candle_off.json new file mode 100644 index 000000000..a4e7b085f --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/candle_off.json @@ -0,0 +1,7 @@ +{ + "parent": "forestry:block/candle", + "textures": { + "candleStump": "forestry:blocks/candleStumpUnlit", + "candleTip": "forestry:blocks/candleTipUnlit" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/candle_on.json b/src/main/resources/assets/forestry/models/block/candle_on.json new file mode 100644 index 000000000..3c2e9699e --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/candle_on.json @@ -0,0 +1,7 @@ +{ + "parent": "forestry:block/candle", + "textures": { + "candleStump": "forestry:blocks/candleStumpLit", + "candleTip": "forestry:blocks/candleTipLit" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/candle_up.json b/src/main/resources/assets/forestry/models/block/candle_up.json new file mode 100644 index 000000000..cc907c8a1 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/candle_up.json @@ -0,0 +1,98 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "#candleStump" + }, + "elements": [ + { + "from": [ 7, 0, 7 ], + "to": [ 9, 10, 9 ], + "shade": false, + "faces": { + "down": { + "uv": [ 7, 13, 9, 15 ], + "texture": "#candleStump" + }, + "up": { + "uv": [ 7, 6, 9, 8 ], + "texture": "#candleStump" + } + } + }, + { + "from": [ 7, 0, 0 ], + "to": [ 9, 16, 16 ], + "shade": false, + "faces": { + "west": { + "uv": [ 0, 0, 16, 16 ], + "texture": "#candleStump" + }, + "east": { + "uv": [ 0, 0, 16, 16 ], + "texture": "#candleStump" + } + } + }, + { + "from": [ 0, 0, 7 ], + "to": [ 16, 16, 9 ], + "shade": false, + "faces": { + "north": { + "uv": [ 0, 0, 16, 16 ], + "texture": "#candleStump" + }, + "south": { + "uv": [ 0, 0, 16, 16 ], + "texture": "#candleStump" + } + } + }, + { + "from": [ 7, 0, 7 ], + "to": [ 9, 10, 9 ], + "shade": false, + "faces": { + "down": { + "uv": [ 7, 13, 9, 15 ], + "texture": "#candleTip" + }, + "up": { + "uv": [ 7, 6, 9, 8 ], + "texture": "#candleTip" + } + } + }, + { + "from": [ 7, 0, 0 ], + "to": [ 9, 16, 16 ], + "shade": false, + "faces": { + "west": { + "uv": [ 0, 0, 16, 16 ], + "texture": "#candleTip" + }, + "east": { + "uv": [ 0, 0, 16, 16 ], + "texture": "#candleTip" + } + } + }, + { + "from": [ 0, 0, 7 ], + "to": [ 16, 16, 9 ], + "shade": false, + "faces": { + "north": { + "uv": [ 0, 0, 16, 16 ], + "texture": "#candleTip" + }, + "south": { + "uv": [ 0, 0, 16, 16 ], + "texture": "#candleTip" + } + } + } + ] +} diff --git a/src/main/resources/assets/forestry/models/block/candle_up_off.json b/src/main/resources/assets/forestry/models/block/candle_up_off.json new file mode 100644 index 000000000..e1ada0cda --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/candle_up_off.json @@ -0,0 +1,7 @@ +{ + "parent": "forestry:block/candle_up", + "textures": { + "candleStump": "forestry:blocks/candleStumpUnlit", + "candleTip": "forestry:blocks/candleTipUnlit" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/candle_up_on.json b/src/main/resources/assets/forestry/models/block/candle_up_on.json new file mode 100644 index 000000000..6147720e8 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/candle_up_on.json @@ -0,0 +1,7 @@ +{ + "parent": "forestry:block/candle_up", + "textures": { + "candleStump": "forestry:blocks/candleStumpLit", + "candleTip": "forestry:blocks/candleTipLit" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/crate-filled.json b/src/main/resources/assets/forestry/models/block/crate-filled.json new file mode 100644 index 000000000..8c9d6f32b --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/crate-filled.json @@ -0,0 +1,6 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/crate-filled" + } +} diff --git a/src/main/resources/assets/forestry/models/block/factory2_fabricator.json b/src/main/resources/assets/forestry/models/block/factory2_fabricator.json new file mode 100644 index 000000000..342638648 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/factory2_fabricator.json @@ -0,0 +1,12 @@ +{ + "parent": "block/cube", + "textures": { + "particle": "forestry:blocks/fabricator.4", + "down": "forestry:blocks/fabricator.0", + "up": "forestry:blocks/fabricator.1", + "north": "forestry:blocks/fabricator.3", + "east": "forestry:blocks/fabricator.4", + "south": "forestry:blocks/fabricator.2", + "west": "forestry:blocks/fabricator.4" + } +} diff --git a/src/main/resources/assets/forestry/models/block/factory2_raintank.json b/src/main/resources/assets/forestry/models/block/factory2_raintank.json new file mode 100644 index 000000000..b7d3d19d1 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/factory2_raintank.json @@ -0,0 +1,12 @@ +{ + "parent": "block/cube", + "textures": { + "particle": "forestry:blocks/raintank.0", + "down": "forestry:blocks/raintank.0", + "up": "forestry:blocks/raintank.1", + "north": "forestry:blocks/raintank.0", + "east": "forestry:blocks/raintank.0", + "south": "forestry:blocks/raintank.0", + "west": "forestry:blocks/raintank.0" + } +} diff --git a/src/main/resources/assets/forestry/models/block/factory2_worktable.json b/src/main/resources/assets/forestry/models/block/factory2_worktable.json new file mode 100644 index 000000000..2831fd981 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/factory2_worktable.json @@ -0,0 +1,12 @@ +{ + "parent": "block/cube", + "textures": { + "particle": "forestry:blocks/worktable.4", + "down": "forestry:blocks/worktable.0", + "up": "forestry:blocks/worktable.1", + "north": "forestry:blocks/worktable.3", + "east": "forestry:blocks/worktable.4", + "south": "forestry:blocks/worktable.2", + "west": "forestry:blocks/worktable.4" + } +} diff --git a/src/main/resources/assets/forestry/models/block/ffarm.json b/src/main/resources/assets/forestry/models/block/ffarm.json new file mode 100644 index 000000000..baf191d0e --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/ffarm.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "blocks/stonebrick" + } +} diff --git a/src/main/resources/assets/forestry/models/block/germlings/sapling.treeAcacia.json b/src/main/resources/assets/forestry/models/block/germlings/sapling.treeAcacia.json new file mode 100644 index 000000000..b3a4edfe5 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/germlings/sapling.treeAcacia.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "forestry:blocks/germlings/sapling.treeAcacia" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/germlings/sapling.treeAcaciaVanilla.json b/src/main/resources/assets/forestry/models/block/germlings/sapling.treeAcaciaVanilla.json new file mode 100644 index 000000000..a0f89e0a0 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/germlings/sapling.treeAcaciaVanilla.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "blocks/sapling_acacia" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/germlings/sapling.treeBalsa.json b/src/main/resources/assets/forestry/models/block/germlings/sapling.treeBalsa.json new file mode 100644 index 000000000..a3623a99d --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/germlings/sapling.treeBalsa.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "forestry:blocks/germlings/sapling.treeBalsa" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/germlings/sapling.treeBaobab.json b/src/main/resources/assets/forestry/models/block/germlings/sapling.treeBaobab.json new file mode 100644 index 000000000..1d105b78d --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/germlings/sapling.treeBaobab.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "forestry:blocks/germlings/sapling.treeBaobab" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/germlings/sapling.treeBirch.json b/src/main/resources/assets/forestry/models/block/germlings/sapling.treeBirch.json new file mode 100644 index 000000000..85ee75db5 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/germlings/sapling.treeBirch.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "blocks/sapling_birch" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/germlings/sapling.treeCherry.json b/src/main/resources/assets/forestry/models/block/germlings/sapling.treeCherry.json new file mode 100644 index 000000000..f72e4b935 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/germlings/sapling.treeCherry.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "forestry:blocks/germlings/sapling.treeCherry" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/germlings/sapling.treeChestnut.json b/src/main/resources/assets/forestry/models/block/germlings/sapling.treeChestnut.json new file mode 100644 index 000000000..86eeef903 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/germlings/sapling.treeChestnut.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "forestry:blocks/germlings/sapling.treeChestnut" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/germlings/sapling.treeCocobolo.json b/src/main/resources/assets/forestry/models/block/germlings/sapling.treeCocobolo.json new file mode 100644 index 000000000..9e3638824 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/germlings/sapling.treeCocobolo.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "forestry:blocks/germlings/sapling.treeCocobolo" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/germlings/sapling.treeDarkOak.json b/src/main/resources/assets/forestry/models/block/germlings/sapling.treeDarkOak.json new file mode 100644 index 000000000..c9b881648 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/germlings/sapling.treeDarkOak.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "blocks/sapling_roofed_oak" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/germlings/sapling.treeDate.json b/src/main/resources/assets/forestry/models/block/germlings/sapling.treeDate.json new file mode 100644 index 000000000..d2bebbc7d --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/germlings/sapling.treeDate.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "forestry:blocks/germlings/sapling.treeDate" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/germlings/sapling.treeEbony.json b/src/main/resources/assets/forestry/models/block/germlings/sapling.treeEbony.json new file mode 100644 index 000000000..8567aefd8 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/germlings/sapling.treeEbony.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "forestry:blocks/germlings/sapling.treeEbony" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/germlings/sapling.treeGigant.json b/src/main/resources/assets/forestry/models/block/germlings/sapling.treeGigant.json new file mode 100644 index 000000000..a35c52a5b --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/germlings/sapling.treeGigant.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "forestry:blocks/germlings/sapling.treeGigant" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/germlings/sapling.treeIpe.json b/src/main/resources/assets/forestry/models/block/germlings/sapling.treeIpe.json new file mode 100644 index 000000000..86dd228a7 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/germlings/sapling.treeIpe.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "forestry:blocks/germlings/sapling.treeIpe" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/germlings/sapling.treeJungle.json b/src/main/resources/assets/forestry/models/block/germlings/sapling.treeJungle.json new file mode 100644 index 000000000..bd9ea38e6 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/germlings/sapling.treeJungle.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "blocks/sapling_jungle" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/germlings/sapling.treeKapok.json b/src/main/resources/assets/forestry/models/block/germlings/sapling.treeKapok.json new file mode 100644 index 000000000..9dab02cc3 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/germlings/sapling.treeKapok.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "forestry:blocks/germlings/sapling.treeKapok" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/germlings/sapling.treeLarch.json b/src/main/resources/assets/forestry/models/block/germlings/sapling.treeLarch.json new file mode 100644 index 000000000..7f80b6026 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/germlings/sapling.treeLarch.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "forestry:blocks/germlings/sapling.treeLarch" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/germlings/sapling.treeLemon.json b/src/main/resources/assets/forestry/models/block/germlings/sapling.treeLemon.json new file mode 100644 index 000000000..e1817a43c --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/germlings/sapling.treeLemon.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "forestry:blocks/germlings/sapling.treeLemon" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/germlings/sapling.treeLime.json b/src/main/resources/assets/forestry/models/block/germlings/sapling.treeLime.json new file mode 100644 index 000000000..928819462 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/germlings/sapling.treeLime.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "forestry:blocks/germlings/sapling.treeLime" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/germlings/sapling.treeMahoe.json b/src/main/resources/assets/forestry/models/block/germlings/sapling.treeMahoe.json new file mode 100644 index 000000000..d2a268362 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/germlings/sapling.treeMahoe.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "forestry:blocks/germlings/sapling.treeMahoe" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/germlings/sapling.treeMahogony.json b/src/main/resources/assets/forestry/models/block/germlings/sapling.treeMahogony.json new file mode 100644 index 000000000..e28eda188 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/germlings/sapling.treeMahogony.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "forestry:blocks/germlings/sapling.treeMahogony" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/germlings/sapling.treeMaple.json b/src/main/resources/assets/forestry/models/block/germlings/sapling.treeMaple.json new file mode 100644 index 000000000..93b1f244b --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/germlings/sapling.treeMaple.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "forestry:blocks/germlings/sapling.treeMaple" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/germlings/sapling.treeOak.json b/src/main/resources/assets/forestry/models/block/germlings/sapling.treeOak.json new file mode 100644 index 000000000..662e63e40 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/germlings/sapling.treeOak.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "blocks/sapling_oak" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/germlings/sapling.treePadauk.json b/src/main/resources/assets/forestry/models/block/germlings/sapling.treePadauk.json new file mode 100644 index 000000000..b23bd2998 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/germlings/sapling.treePadauk.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "forestry:blocks/germlings/sapling.treePadauk" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/germlings/sapling.treePapaya.json b/src/main/resources/assets/forestry/models/block/germlings/sapling.treePapaya.json new file mode 100644 index 000000000..25c196202 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/germlings/sapling.treePapaya.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "forestry:blocks/germlings/sapling.treePapaya" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/germlings/sapling.treePine.json b/src/main/resources/assets/forestry/models/block/germlings/sapling.treePine.json new file mode 100644 index 000000000..6adad1995 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/germlings/sapling.treePine.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "forestry:blocks/germlings/sapling.treePine" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/germlings/sapling.treePlum.json b/src/main/resources/assets/forestry/models/block/germlings/sapling.treePlum.json new file mode 100644 index 000000000..454471d59 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/germlings/sapling.treePlum.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "forestry:blocks/germlings/sapling.treePlum" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/germlings/sapling.treePoplar.json b/src/main/resources/assets/forestry/models/block/germlings/sapling.treePoplar.json new file mode 100644 index 000000000..11914b2ab --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/germlings/sapling.treePoplar.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "forestry:blocks/germlings/sapling.treePoplar" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/germlings/sapling.treeSequioa.json b/src/main/resources/assets/forestry/models/block/germlings/sapling.treeSequioa.json new file mode 100644 index 000000000..e084746d8 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/germlings/sapling.treeSequioa.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "forestry:blocks/germlings/sapling.treeSequioa" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/germlings/sapling.treeSipiri.json b/src/main/resources/assets/forestry/models/block/germlings/sapling.treeSipiri.json new file mode 100644 index 000000000..71a28eff6 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/germlings/sapling.treeSipiri.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "forestry:blocks/germlings/sapling.treeSipiri" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/germlings/sapling.treeSpruce.json b/src/main/resources/assets/forestry/models/block/germlings/sapling.treeSpruce.json new file mode 100644 index 000000000..a1cac4dd1 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/germlings/sapling.treeSpruce.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "blocks/sapling_spruce" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/germlings/sapling.treeTeak.json b/src/main/resources/assets/forestry/models/block/germlings/sapling.treeTeak.json new file mode 100644 index 000000000..e889624b7 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/germlings/sapling.treeTeak.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "forestry:blocks/germlings/sapling.treeTeak" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/germlings/sapling.treeWalnut.json b/src/main/resources/assets/forestry/models/block/germlings/sapling.treeWalnut.json new file mode 100644 index 000000000..06f56b5b7 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/germlings/sapling.treeWalnut.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "forestry:blocks/germlings/sapling.treeWalnut" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/germlings/sapling.treeWenge.json b/src/main/resources/assets/forestry/models/block/germlings/sapling.treeWenge.json new file mode 100644 index 000000000..979c98b99 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/germlings/sapling.treeWenge.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "forestry:blocks/germlings/sapling.treeWenge" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/germlings/sapling.treeWillow.json b/src/main/resources/assets/forestry/models/block/germlings/sapling.treeWillow.json new file mode 100644 index 000000000..2fe061d65 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/germlings/sapling.treeWillow.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "forestry:blocks/germlings/sapling.treeWillow" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/germlings/sapling.treeZebrawood.json b/src/main/resources/assets/forestry/models/block/germlings/sapling.treeZebrawood.json new file mode 100644 index 000000000..58350e6f2 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/germlings/sapling.treeZebrawood.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "forestry:blocks/germlings/sapling.treeZebrawood" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/leaves.json b/src/main/resources/assets/forestry/models/block/leaves.json new file mode 100644 index 000000000..baf191d0e --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/leaves.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "blocks/stonebrick" + } +} diff --git a/src/main/resources/assets/forestry/models/block/machine.json b/src/main/resources/assets/forestry/models/block/machine.json new file mode 100644 index 000000000..74b48ff62 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/machine.json @@ -0,0 +1,56 @@ +{ + "elements": [ + { + "name": "tank_resource", + "from": [ 2.0, 2.0, 0.0 ], + "to": [ 8.0, 14.0, 16.0 ], + "faces": { + "north": { "texture": "#machine", "uv": [ 1.5, 10.5, 4.5, 12.0 ], "rotation": 270 }, + "east": { "texture": "#machine", "uv": [ 6.0, 12.0, 9.0, 16.0 ], "rotation": 90 }, + "south": { "texture": "#machine", "uv": [ 4.5, 10.5, 7.5, 12.0 ], "rotation": 270 }, + "west": { "texture": "#machine", "uv": [ 1.5, 12.0, 4.5, 16.0 ], "rotation": 270 }, + "up": { "texture": "#machine", "uv": [ 0.0, 12.0, 1.5, 16.0 ] }, + "down": { "texture": "#machine", "uv": [ 4.5, 12.0, 6.0, 16.0 ] } + } + }, + { + "name": "tank_product", + "from": [ 8.0, 2.0, 0.0 ], + "to": [ 14.0, 14.0, 16.0 ], + "faces": { + "north": { "texture": "#machine", "uv": [ 1.5, 5.0, 4.5, 6.5 ], "rotation": 270 }, + "east": { "texture": "#machine", "uv": [ 6.0, 6.5, 9.0, 10.5 ], "rotation": 90 }, + "south": { "texture": "#machine", "uv": [ 4.5, 5.0, 7.5, 6.5 ], "rotation": 270 }, + "west": { "texture": "#machine", "uv": [ 1.5, 6.5, 4.5, 10.5 ] }, + "up": { "texture": "#machine", "uv": [ 0.0, 6.5, 1.5, 10.5 ] }, + "down": { "texture": "#machine", "uv": [ 4.5, 6.5, 6.0, 10.5 ] } + } + }, + { + "name": "basefront", + "from": [ 0.0, 0.0, 0.0 ], + "to": [ 16.0, 16.0, 4.0 ], + "faces": { + "north": { "texture": "#machine", "uv": [ 4.0, 0.0, 8.0, 4.0 ], "rotation": 270 }, + "east": { "texture": "#machine", "uv": [ 0.0, 4.0, 4.0, 5.0 ], "rotation": 270 }, + "south": { "texture": "#machine", "uv": [ 8.0, 0.0, 12.0, 4.0 ], "rotation": 270 }, + "west": { "texture": "#machine", "uv": [ 8.0, 4.0, 12.0, 5.0 ], "rotation": 90 }, + "up": { "texture": "#machine", "uv": [ 12.0, 4.0, 16.0, 5.0 ], "rotation": 180 }, + "down": { "texture": "#machine", "uv": [ 4.0, 4.0, 8.0, 5.0 ] } + } + }, + { + "name": "baseback", + "from": [ 0.0, 0.0, 12.0 ], + "to": [ 16.0, 16.0, 16.0 ], + "faces": { + "north": { "texture": "#machine", "uv": [ 4.0, 0.0, 8.0, 4.0 ] }, + "east": { "texture": "#machine", "uv": [ 0.0, 4.0, 4.0, 5.0 ], "rotation": 270 }, + "south": { "texture": "#machine", "uv": [ 8.0, 0.0, 12.0, 4.0 ] }, + "west": { "texture": "#machine", "uv": [ 8.0, 4.0, 12.0, 5.0 ], "rotation": 90 }, + "up": { "texture": "#machine", "uv": [ 12.0, 4.0, 16.0, 5.0 ], "rotation": 180 }, + "down": { "texture": "#machine", "uv": [ 4.0, 4.0, 8.0, 5.0 ] } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/mail_mailbox.json b/src/main/resources/assets/forestry/models/block/mail_mailbox.json new file mode 100644 index 000000000..28f116e1a --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/mail_mailbox.json @@ -0,0 +1,12 @@ +{ + "parent": "block/cube", + "textures": { + "particle": "forestry:blocks/mailbox.2", + "down": "forestry:blocks/mailbox.0", + "up": "forestry:blocks/mailbox.1", + "north": "forestry:blocks/mailbox.2", + "east": "forestry:blocks/mailbox.2", + "south": "forestry:blocks/mailbox.2", + "west": "forestry:blocks/mailbox.2" + } +} diff --git a/src/main/resources/assets/forestry/models/block/mail_philatelist.json b/src/main/resources/assets/forestry/models/block/mail_philatelist.json new file mode 100644 index 000000000..5b5613154 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/mail_philatelist.json @@ -0,0 +1,12 @@ +{ + "parent": "block/cube", + "textures": { + "particle": "forestry:blocks/philatelist.2", + "down": "forestry:blocks/philatelist.0", + "up": "forestry:blocks/philatelist.1", + "north": "forestry:blocks/philatelist.3", + "east": "forestry:blocks/philatelist.2", + "south": "forestry:blocks/philatelist.2", + "west": "forestry:blocks/philatelist.2" + } +} diff --git a/src/main/resources/assets/forestry/models/block/mail_tradestation.json b/src/main/resources/assets/forestry/models/block/mail_tradestation.json new file mode 100644 index 000000000..4bdb7b05b --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/mail_tradestation.json @@ -0,0 +1,12 @@ +{ + "parent": "block/cube", + "textures": { + "particle": "forestry:blocks/tradestation.4", + "down": "forestry:blocks/tradestation.0", + "up": "forestry:blocks/tradestation.1", + "north": "forestry:blocks/tradestation.3", + "east": "forestry:blocks/tradestation.4", + "south": "forestry:blocks/tradestation.2", + "west": "forestry:blocks/tradestation.4" + } +} diff --git a/src/main/resources/assets/forestry/models/block/ores/apatite.json b/src/main/resources/assets/forestry/models/block/ores/apatite.json new file mode 100644 index 000000000..08ae7575f --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/ores/apatite.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "forestry:blocks/ores/apatite" + } +} diff --git a/src/main/resources/assets/forestry/models/block/ores/copper.json b/src/main/resources/assets/forestry/models/block/ores/copper.json new file mode 100644 index 000000000..c9ab82a4c --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/ores/copper.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "forestry:blocks/ores/copper" + } +} diff --git a/src/main/resources/assets/forestry/models/block/ores/tin.json b/src/main/resources/assets/forestry/models/block/ores/tin.json new file mode 100644 index 000000000..9b67d901d --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/ores/tin.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "forestry:blocks/ores/tin" + } +} diff --git a/src/main/resources/assets/forestry/models/block/pods/dates_0.json b/src/main/resources/assets/forestry/models/block/pods/dates_0.json new file mode 100644 index 000000000..1f2572a68 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/pods/dates_0.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cocoa_age0_s", + "textures": { + "particle": "forestry:blocks/pods/dates.0", + "cocoa": "forestry:blocks/pods/dates.0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/pods/dates_1.json b/src/main/resources/assets/forestry/models/block/pods/dates_1.json new file mode 100644 index 000000000..8ecc1247a --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/pods/dates_1.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cocoa_age1_s", + "textures": { + "particle": "forestry:blocks/pods/dates.1", + "cocoa": "forestry:blocks/pods/dates.1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/pods/dates_2.json b/src/main/resources/assets/forestry/models/block/pods/dates_2.json new file mode 100644 index 000000000..bbd4a47ea --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/pods/dates_2.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cocoa_age2_s", + "textures": { + "particle": "forestry:blocks/pods/dates.2", + "cocoa": "forestry:blocks/pods/dates.2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/pods/papaya_0.json b/src/main/resources/assets/forestry/models/block/pods/papaya_0.json new file mode 100644 index 000000000..b42f4496c --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/pods/papaya_0.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cocoa_age0_s", + "textures": { + "particle": "forestry:blocks/pods/papaya.0", + "cocoa": "forestry:blocks/pods/papaya.0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/pods/papaya_1.json b/src/main/resources/assets/forestry/models/block/pods/papaya_1.json new file mode 100644 index 000000000..b882e37ff --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/pods/papaya_1.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cocoa_age1_s", + "textures": { + "particle": "forestry:blocks/pods/papaya.1", + "cocoa": "forestry:blocks/pods/papaya.1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/pods/papaya_2.json b/src/main/resources/assets/forestry/models/block/pods/papaya_2.json new file mode 100644 index 000000000..117bb5723 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/pods/papaya_2.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cocoa_age2_s", + "textures": { + "particle": "forestry:blocks/pods/papaya.2", + "cocoa": "forestry:blocks/pods/papaya.2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/soil/bog.json b/src/main/resources/assets/forestry/models/block/soil/bog.json new file mode 100644 index 000000000..97c2b8e5b --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/soil/bog.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "forestry:blocks/soil/bog" + } +} diff --git a/src/main/resources/assets/forestry/models/block/soil/humus.json b/src/main/resources/assets/forestry/models/block/soil/humus.json new file mode 100644 index 000000000..c210ef8ff --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/soil/humus.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "forestry:blocks/soil/humus" + } +} diff --git a/src/main/resources/assets/forestry/models/block/soil/peat.json b/src/main/resources/assets/forestry/models/block/soil/peat.json new file mode 100644 index 000000000..6dca2c3c1 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/soil/peat.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "forestry:blocks/soil/peat" + } +} diff --git a/src/main/resources/assets/forestry/models/block/storage/apatite.json b/src/main/resources/assets/forestry/models/block/storage/apatite.json new file mode 100644 index 000000000..254414f7a --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/storage/apatite.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "forestry:blocks/storage/apatite" + } +} diff --git a/src/main/resources/assets/forestry/models/block/storage/bronze.json b/src/main/resources/assets/forestry/models/block/storage/bronze.json new file mode 100644 index 000000000..940cdefe5 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/storage/bronze.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "forestry:blocks/storage/bronze" + } +} diff --git a/src/main/resources/assets/forestry/models/block/storage/copper.json b/src/main/resources/assets/forestry/models/block/storage/copper.json new file mode 100644 index 000000000..c57f3a58a --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/storage/copper.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "forestry:blocks/storage/copper" + } +} diff --git a/src/main/resources/assets/forestry/models/block/storage/tin.json b/src/main/resources/assets/forestry/models/block/storage/tin.json new file mode 100644 index 000000000..eaac59ff0 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/storage/tin.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "forestry:blocks/storage/tin" + } +} diff --git a/src/main/resources/assets/forestry/models/item/ambrosia.json b/src/main/resources/assets/forestry/models/item/ambrosia.json new file mode 100644 index 000000000..f70569a4b --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/ambrosia.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/ambrosia" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/apatite.json b/src/main/resources/assets/forestry/models/item/apatite.json new file mode 100644 index 000000000..085b44bf3 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/apatite.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/apatite" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/apiaristBoots.json b/src/main/resources/assets/forestry/models/item/apiaristBoots.json new file mode 100644 index 000000000..f4f69cbc1 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/apiaristBoots.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/apiaristBoots" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -2.5 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/apiaristChest.json b/src/main/resources/assets/forestry/models/item/apiaristChest.json new file mode 100644 index 000000000..dca0c8a06 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/apiaristChest.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/apiaristChest" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/apiaristHelmet.json b/src/main/resources/assets/forestry/models/item/apiaristHelmet.json new file mode 100644 index 000000000..1a210b2b2 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/apiaristHelmet.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/apiaristHelmet" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -2.25 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/apiaristLegs.json b/src/main/resources/assets/forestry/models/item/apiaristLegs.json new file mode 100644 index 000000000..1400ae28f --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/apiaristLegs.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/apiaristLegs" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/apiculture/alveary.entrance.json b/src/main/resources/assets/forestry/models/item/apiculture/alveary.entrance.json new file mode 100644 index 000000000..555f24620 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/apiculture/alveary.entrance.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/apiculture/alveary_entrance", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/apiculture/alveary.fan.json b/src/main/resources/assets/forestry/models/item/apiculture/alveary.fan.json new file mode 100644 index 000000000..ff483a87c --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/apiculture/alveary.fan.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/apiculture/alveary_fan_off", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/apiculture/alveary.heater.json b/src/main/resources/assets/forestry/models/item/apiculture/alveary.heater.json new file mode 100644 index 000000000..3ccd323ed --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/apiculture/alveary.heater.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/apiculture/alveary_heater_off", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/apiculture/alveary.hygro.json b/src/main/resources/assets/forestry/models/item/apiculture/alveary.hygro.json new file mode 100644 index 000000000..2038315f5 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/apiculture/alveary.hygro.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/apiculture/alveary_hygro", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/apiculture/alveary.plain.json b/src/main/resources/assets/forestry/models/item/apiculture/alveary.plain.json new file mode 100644 index 000000000..02583bfb0 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/apiculture/alveary.plain.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/apiculture/alveary_plain_middle", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/apiculture/alveary.sieve.json b/src/main/resources/assets/forestry/models/item/apiculture/alveary.sieve.json new file mode 100644 index 000000000..07e57892e --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/apiculture/alveary.sieve.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/apiculture/alveary_sieve", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/apiculture/alveary.stabiliser.json b/src/main/resources/assets/forestry/models/item/apiculture/alveary.stabiliser.json new file mode 100644 index 000000000..2f712005a --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/apiculture/alveary.stabiliser.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/apiculture/alveary_stabiliser", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/apiculture/alveary.swarmer.json b/src/main/resources/assets/forestry/models/item/apiculture/alveary.swarmer.json new file mode 100644 index 000000000..784d88738 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/apiculture/alveary.swarmer.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/apiculture/alveary_swarmer_off", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/apicultureChest_apiarist_chest.json b/src/main/resources/assets/forestry/models/item/apicultureChest_apiarist_chest.json new file mode 100644 index 000000000..43a272a60 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/apicultureChest_apiarist_chest.json @@ -0,0 +1,3 @@ +{ + "parent": "builtin/entity" +} diff --git a/src/main/resources/assets/forestry/models/item/apiculture_apiary.json b/src/main/resources/assets/forestry/models/item/apiculture_apiary.json new file mode 100644 index 000000000..c665d8509 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/apiculture_apiary.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/apiculture_apiary", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/apiculture_beehouse.json b/src/main/resources/assets/forestry/models/item/apiculture_beehouse.json new file mode 100644 index 000000000..3e2a25cb6 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/apiculture_beehouse.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/apiculture_beehouse", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/arboriculture_arbchest.json b/src/main/resources/assets/forestry/models/item/arboriculture_arbchest.json new file mode 100644 index 000000000..43a272a60 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/arboriculture_arbchest.json @@ -0,0 +1,3 @@ +{ + "parent": "builtin/entity" +} diff --git a/src/main/resources/assets/forestry/models/item/ash.json b/src/main/resources/assets/forestry/models/item/ash.json new file mode 100644 index 000000000..ba43a19f1 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/ash.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/ash" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/backpacks/t1_locked.json b/src/main/resources/assets/forestry/models/item/backpacks/t1_locked.json new file mode 100644 index 000000000..d0b396f9d --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/backpacks/t1_locked.json @@ -0,0 +1,20 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/backpacks/t1.cloth", + "layer1": "forestry:items/backpacks/t1.outline", + "layer2": "forestry:items/backpacks/locked" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/backpacks/t1_neutral.json b/src/main/resources/assets/forestry/models/item/backpacks/t1_neutral.json new file mode 100644 index 000000000..59a0df49f --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/backpacks/t1_neutral.json @@ -0,0 +1,19 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/backpacks/t1.cloth", + "layer1": "forestry:items/backpacks/t1.outline" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/backpacks/t1_receive.json b/src/main/resources/assets/forestry/models/item/backpacks/t1_receive.json new file mode 100644 index 000000000..8e32cf69c --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/backpacks/t1_receive.json @@ -0,0 +1,20 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/backpacks/t1.cloth", + "layer1": "forestry:items/backpacks/t1.outline", + "layer2": "forestry:items/backpacks/receive" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/backpacks/t1_resupply.json b/src/main/resources/assets/forestry/models/item/backpacks/t1_resupply.json new file mode 100644 index 000000000..16f10381a --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/backpacks/t1_resupply.json @@ -0,0 +1,20 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/backpacks/t1.cloth", + "layer1": "forestry:items/backpacks/t1.outline", + "layer2": "forestry:items/backpacks/resupply" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/backpacks/t2_locked.json b/src/main/resources/assets/forestry/models/item/backpacks/t2_locked.json new file mode 100644 index 000000000..b0b46f7ff --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/backpacks/t2_locked.json @@ -0,0 +1,20 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/backpacks/t2.cloth", + "layer1": "forestry:items/backpacks/t2.outline", + "layer2": "forestry:items/backpacks/locked" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/backpacks/t2_neutral.json b/src/main/resources/assets/forestry/models/item/backpacks/t2_neutral.json new file mode 100644 index 000000000..4cdc615bc --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/backpacks/t2_neutral.json @@ -0,0 +1,19 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/backpacks/t2.cloth", + "layer1": "forestry:items/backpacks/t2.outline" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/backpacks/t2_receive.json b/src/main/resources/assets/forestry/models/item/backpacks/t2_receive.json new file mode 100644 index 000000000..7206f8e0a --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/backpacks/t2_receive.json @@ -0,0 +1,20 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/backpacks/t2.cloth", + "layer1": "forestry:items/backpacks/t2.outline", + "layer2": "forestry:items/backpacks/receive" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/backpacks/t2_resupply.json b/src/main/resources/assets/forestry/models/item/backpacks/t2_resupply.json new file mode 100644 index 000000000..660824374 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/backpacks/t2_resupply.json @@ -0,0 +1,20 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/backpacks/t2.cloth", + "layer1": "forestry:items/backpacks/t2.outline", + "layer2": "forestry:items/backpacks/resupply" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/beeCombs.json b/src/main/resources/assets/forestry/models/item/beeCombs.json new file mode 100644 index 000000000..4207db2ac --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/beeCombs.json @@ -0,0 +1,19 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/beeCombs.0", + "layer1": "forestry:items/beeCombs.1" + }, + "display": { + "thirdperson": { + "rotation": [ 0, 90, -35 ], + "translation": [ 0, 1.25, -3.5 ], + "scale": [ 0.85, 0.85, 0.85 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/beealyzer.json b/src/main/resources/assets/forestry/models/item/beealyzer.json new file mode 100644 index 000000000..e6e4ea409 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/beealyzer.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/beealyzer" + }, + "display": { + "thirdperson": { + "rotation": [ 0, 90, -35 ], + "translation": [ 0, 1.25, -3.5 ], + "scale": [ 0.85, 0.85, 0.85 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/beecombs/cocoa.json b/src/main/resources/assets/forestry/models/item/beecombs/cocoa.json new file mode 100644 index 000000000..ef4036335 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/beecombs/cocoa.json @@ -0,0 +1,3 @@ +{ + "parent": "forestry:item/beeCombs" +} diff --git a/src/main/resources/assets/forestry/models/item/beecombs/darkened.json b/src/main/resources/assets/forestry/models/item/beecombs/darkened.json new file mode 100644 index 000000000..ef4036335 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/beecombs/darkened.json @@ -0,0 +1,3 @@ +{ + "parent": "forestry:item/beeCombs" +} diff --git a/src/main/resources/assets/forestry/models/item/beecombs/dripping.json b/src/main/resources/assets/forestry/models/item/beecombs/dripping.json new file mode 100644 index 000000000..ef4036335 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/beecombs/dripping.json @@ -0,0 +1,3 @@ +{ + "parent": "forestry:item/beeCombs" +} diff --git a/src/main/resources/assets/forestry/models/item/beecombs/frozen.json b/src/main/resources/assets/forestry/models/item/beecombs/frozen.json new file mode 100644 index 000000000..ef4036335 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/beecombs/frozen.json @@ -0,0 +1,3 @@ +{ + "parent": "forestry:item/beeCombs" +} diff --git a/src/main/resources/assets/forestry/models/item/beecombs/honey.json b/src/main/resources/assets/forestry/models/item/beecombs/honey.json new file mode 100644 index 000000000..ef4036335 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/beecombs/honey.json @@ -0,0 +1,3 @@ +{ + "parent": "forestry:item/beeCombs" +} diff --git a/src/main/resources/assets/forestry/models/item/beecombs/irradiated.json b/src/main/resources/assets/forestry/models/item/beecombs/irradiated.json new file mode 100644 index 000000000..ef4036335 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/beecombs/irradiated.json @@ -0,0 +1,3 @@ +{ + "parent": "forestry:item/beeCombs" +} diff --git a/src/main/resources/assets/forestry/models/item/beecombs/mellow.json b/src/main/resources/assets/forestry/models/item/beecombs/mellow.json new file mode 100644 index 000000000..ef4036335 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/beecombs/mellow.json @@ -0,0 +1,3 @@ +{ + "parent": "forestry:item/beeCombs" +} diff --git a/src/main/resources/assets/forestry/models/item/beecombs/mossy.json b/src/main/resources/assets/forestry/models/item/beecombs/mossy.json new file mode 100644 index 000000000..ef4036335 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/beecombs/mossy.json @@ -0,0 +1,3 @@ +{ + "parent": "forestry:item/beeCombs" +} diff --git a/src/main/resources/assets/forestry/models/item/beecombs/mysterious.json b/src/main/resources/assets/forestry/models/item/beecombs/mysterious.json new file mode 100644 index 000000000..ef4036335 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/beecombs/mysterious.json @@ -0,0 +1,3 @@ +{ + "parent": "forestry:item/beeCombs" +} diff --git a/src/main/resources/assets/forestry/models/item/beecombs/omega.json b/src/main/resources/assets/forestry/models/item/beecombs/omega.json new file mode 100644 index 000000000..ef4036335 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/beecombs/omega.json @@ -0,0 +1,3 @@ +{ + "parent": "forestry:item/beeCombs" +} diff --git a/src/main/resources/assets/forestry/models/item/beecombs/parched.json b/src/main/resources/assets/forestry/models/item/beecombs/parched.json new file mode 100644 index 000000000..ef4036335 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/beecombs/parched.json @@ -0,0 +1,3 @@ +{ + "parent": "forestry:item/beeCombs" +} diff --git a/src/main/resources/assets/forestry/models/item/beecombs/powdery.json b/src/main/resources/assets/forestry/models/item/beecombs/powdery.json new file mode 100644 index 000000000..ef4036335 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/beecombs/powdery.json @@ -0,0 +1,3 @@ +{ + "parent": "forestry:item/beeCombs" +} diff --git a/src/main/resources/assets/forestry/models/item/beecombs/reddened.json b/src/main/resources/assets/forestry/models/item/beecombs/reddened.json new file mode 100644 index 000000000..ef4036335 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/beecombs/reddened.json @@ -0,0 +1,3 @@ +{ + "parent": "forestry:item/beeCombs" +} diff --git a/src/main/resources/assets/forestry/models/item/beecombs/silky.json b/src/main/resources/assets/forestry/models/item/beecombs/silky.json new file mode 100644 index 000000000..ef4036335 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/beecombs/silky.json @@ -0,0 +1,3 @@ +{ + "parent": "forestry:item/beeCombs" +} diff --git a/src/main/resources/assets/forestry/models/item/beecombs/simmering.json b/src/main/resources/assets/forestry/models/item/beecombs/simmering.json new file mode 100644 index 000000000..ef4036335 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/beecombs/simmering.json @@ -0,0 +1,3 @@ +{ + "parent": "forestry:item/beeCombs" +} diff --git a/src/main/resources/assets/forestry/models/item/beecombs/stringy.json b/src/main/resources/assets/forestry/models/item/beecombs/stringy.json new file mode 100644 index 000000000..ef4036335 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/beecombs/stringy.json @@ -0,0 +1,3 @@ +{ + "parent": "forestry:item/beeCombs" +} diff --git a/src/main/resources/assets/forestry/models/item/beecombs/wheaten.json b/src/main/resources/assets/forestry/models/item/beecombs/wheaten.json new file mode 100644 index 000000000..ef4036335 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/beecombs/wheaten.json @@ -0,0 +1,3 @@ +{ + "parent": "forestry:item/beeCombs" +} diff --git a/src/main/resources/assets/forestry/models/item/beehives/desert.json b/src/main/resources/assets/forestry/models/item/beehives/desert.json new file mode 100644 index 000000000..25ca81fea --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/beehives/desert.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/beehives/desert", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/beehives/end.json b/src/main/resources/assets/forestry/models/item/beehives/end.json new file mode 100644 index 000000000..498bbfddb --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/beehives/end.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/beehives/end", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/beehives/forest.json b/src/main/resources/assets/forestry/models/item/beehives/forest.json new file mode 100644 index 000000000..728859c23 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/beehives/forest.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/beehives/forest", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/beehives/jungle.json b/src/main/resources/assets/forestry/models/item/beehives/jungle.json new file mode 100644 index 000000000..2806f8df8 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/beehives/jungle.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/beehives/jungle", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/beehives/meadows.json b/src/main/resources/assets/forestry/models/item/beehives/meadows.json new file mode 100644 index 000000000..8b9c88b03 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/beehives/meadows.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/beehives/meadows", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/beehives/snow.json b/src/main/resources/assets/forestry/models/item/beehives/snow.json new file mode 100644 index 000000000..ec09798df --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/beehives/snow.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/beehives/snow", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/beehives/swamp.json b/src/main/resources/assets/forestry/models/item/beehives/swamp.json new file mode 100644 index 000000000..04b48effd --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/beehives/swamp.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/beehives/swamp", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/bees/default/drone.json b/src/main/resources/assets/forestry/models/item/bees/default/drone.json new file mode 100644 index 000000000..a04eeaa08 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/bees/default/drone.json @@ -0,0 +1,20 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/bees/default/drone.outline", + "layer1": "forestry:items/bees/default/body1", + "layer2": "forestry:items/bees/default/drone.body2" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/bees/default/larvae.json b/src/main/resources/assets/forestry/models/item/bees/default/larvae.json new file mode 100644 index 000000000..1b8aab07f --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/bees/default/larvae.json @@ -0,0 +1,20 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/bees/default/larvae.outline", + "layer1": "forestry:items/bees/default/larvae.body", + "layer2": "forestry:items/bees/default/larvae.body2" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/bees/default/princess.json b/src/main/resources/assets/forestry/models/item/bees/default/princess.json new file mode 100644 index 000000000..630835ab5 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/bees/default/princess.json @@ -0,0 +1,20 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/bees/default/princess.outline", + "layer1": "forestry:items/bees/default/body1", + "layer2": "forestry:items/bees/default/princess.body2" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/bees/default/queen.json b/src/main/resources/assets/forestry/models/item/bees/default/queen.json new file mode 100644 index 000000000..938b4b0b2 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/bees/default/queen.json @@ -0,0 +1,20 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/bees/default/queen.outline", + "layer1": "forestry:items/bees/default/body1", + "layer2": "forestry:items/bees/default/queen.body2" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/beeswax.json b/src/main/resources/assets/forestry/models/item/beeswax.json new file mode 100644 index 000000000..f9ef9782e --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/beeswax.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/beeswax" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/bituminousPeat.json b/src/main/resources/assets/forestry/models/item/bituminousPeat.json new file mode 100644 index 000000000..0dce59324 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/bituminousPeat.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/bituminousPeat" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/brokenBronzePickaxe.json b/src/main/resources/assets/forestry/models/item/brokenBronzePickaxe.json new file mode 100644 index 000000000..56b6c8e7b --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/brokenBronzePickaxe.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/brokenBronzePickaxe" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/brokenBronzeShovel.json b/src/main/resources/assets/forestry/models/item/brokenBronzeShovel.json new file mode 100644 index 000000000..c166c8de3 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/brokenBronzeShovel.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/brokenBronzeShovel" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/bronzePickaxe.json b/src/main/resources/assets/forestry/models/item/bronzePickaxe.json new file mode 100644 index 000000000..c917a399a --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/bronzePickaxe.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/bronzePickaxe" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/bronzeShovel.json b/src/main/resources/assets/forestry/models/item/bronzeShovel.json new file mode 100644 index 000000000..2c6298177 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/bronzeShovel.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/bronzeShovel" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/bucketBiofuel.json b/src/main/resources/assets/forestry/models/item/bucketBiofuel.json new file mode 100644 index 000000000..0037fb483 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/bucketBiofuel.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/bucketBiofuel" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/bucketBiomass.json b/src/main/resources/assets/forestry/models/item/bucketBiomass.json new file mode 100644 index 000000000..04e1051b9 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/bucketBiomass.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/bucketBiomass" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/candle.json b/src/main/resources/assets/forestry/models/item/candle.json new file mode 100644 index 000000000..6f7d355b1 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/candle.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:blocks/candle" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/cart.apiary.json b/src/main/resources/assets/forestry/models/item/cart.apiary.json new file mode 100644 index 000000000..d31bb1e97 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/cart.apiary.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/cart.apiary" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/cart.beehouse.json b/src/main/resources/assets/forestry/models/item/cart.beehouse.json new file mode 100644 index 000000000..5d99adb9d --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/cart.beehouse.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/cart.beehouse" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/carton.json b/src/main/resources/assets/forestry/models/item/carton.json new file mode 100644 index 000000000..ff3c7a84c --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/carton.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/carton" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/catalogue.json b/src/main/resources/assets/forestry/models/item/catalogue.json new file mode 100644 index 000000000..23fc6e4db --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/catalogue.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/catalogue" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/caterpillar.json b/src/main/resources/assets/forestry/models/item/caterpillar.json new file mode 100644 index 000000000..9b81b6c61 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/caterpillar.json @@ -0,0 +1,19 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/caterpillar.body2", + "layer1": "forestry:items/caterpillar.body" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/chipsets.json b/src/main/resources/assets/forestry/models/item/chipsets.json new file mode 100644 index 000000000..81a74b27f --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/chipsets.json @@ -0,0 +1,19 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/chipsets.1", + "layer1": "forestry:items/chipsets.0" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/core_analyzer.json b/src/main/resources/assets/forestry/models/item/core_analyzer.json new file mode 100644 index 000000000..43a272a60 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/core_analyzer.json @@ -0,0 +1,3 @@ +{ + "parent": "builtin/entity" +} diff --git a/src/main/resources/assets/forestry/models/item/core_escritoire.json b/src/main/resources/assets/forestry/models/item/core_escritoire.json new file mode 100644 index 000000000..43a272a60 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/core_escritoire.json @@ -0,0 +1,3 @@ +{ + "parent": "builtin/entity" +} diff --git a/src/main/resources/assets/forestry/models/item/craftingMaterial/dissipationCharge.json b/src/main/resources/assets/forestry/models/item/craftingMaterial/dissipationCharge.json new file mode 100644 index 000000000..459865b45 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/craftingMaterial/dissipationCharge.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/dissipationCharge" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/craftingMaterial/fertilizerCompound - Kopie (11).json b/src/main/resources/assets/forestry/models/item/craftingMaterial/fertilizerCompound - Kopie (11).json new file mode 100644 index 000000000..2f9b393f7 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/craftingMaterial/fertilizerCompound - Kopie (11).json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/pulsatingMesh" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/craftingMaterial/iceShard.json b/src/main/resources/assets/forestry/models/item/craftingMaterial/iceShard.json new file mode 100644 index 000000000..e94958e39 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/craftingMaterial/iceShard.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/iceShard" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/craftingMaterial/pulsatingDust.json b/src/main/resources/assets/forestry/models/item/craftingMaterial/pulsatingDust.json new file mode 100644 index 000000000..7f958e947 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/craftingMaterial/pulsatingDust.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/pulsatingDust" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/craftingMaterial/pulsatingMesh.json b/src/main/resources/assets/forestry/models/item/craftingMaterial/pulsatingMesh.json new file mode 100644 index 000000000..2f9b393f7 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/craftingMaterial/pulsatingMesh.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/pulsatingMesh" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/craftingMaterial/scentedPaneling.json b/src/main/resources/assets/forestry/models/item/craftingMaterial/scentedPaneling.json new file mode 100644 index 000000000..bad1f46d5 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/craftingMaterial/scentedPaneling.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/scentedPaneling" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/craftingMaterial/silkWisp.json b/src/main/resources/assets/forestry/models/item/craftingMaterial/silkWisp.json new file mode 100644 index 000000000..ed3dd727c --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/craftingMaterial/silkWisp.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/silkWisp" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/craftingMaterial/wovenSilk.json b/src/main/resources/assets/forestry/models/item/craftingMaterial/wovenSilk.json new file mode 100644 index 000000000..20877f3e4 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/craftingMaterial/wovenSilk.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/wovenSilk" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/crate.json b/src/main/resources/assets/forestry/models/item/crate.json new file mode 100644 index 000000000..ce245c463 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/crate.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/crate" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/decayingWheat.json b/src/main/resources/assets/forestry/models/item/decayingWheat.json new file mode 100644 index 000000000..f61c15dd3 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/decayingWheat.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/decayingWheat" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/dissipationCharge.json b/src/main/resources/assets/forestry/models/item/dissipationCharge.json new file mode 100644 index 000000000..990dea14c --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/dissipationCharge.json @@ -0,0 +1,13 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/dissipationCharge" + }, + "display": { + "thirdperson": { + "rotation": [ 0, 90, -35 ], + "translation": [ 0, 1.25, -3.5 ], + "scale": [ 0.85, 0.85, 0.85 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/engine_biogas.json b/src/main/resources/assets/forestry/models/item/engine_biogas.json new file mode 100644 index 000000000..43a272a60 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/engine_biogas.json @@ -0,0 +1,3 @@ +{ + "parent": "builtin/entity" +} diff --git a/src/main/resources/assets/forestry/models/item/engine_clockwork.json b/src/main/resources/assets/forestry/models/item/engine_clockwork.json new file mode 100644 index 000000000..43a272a60 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/engine_clockwork.json @@ -0,0 +1,3 @@ +{ + "parent": "builtin/entity" +} diff --git a/src/main/resources/assets/forestry/models/item/engine_generator.json b/src/main/resources/assets/forestry/models/item/engine_generator.json new file mode 100644 index 000000000..43a272a60 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/engine_generator.json @@ -0,0 +1,3 @@ +{ + "parent": "builtin/entity" +} diff --git a/src/main/resources/assets/forestry/models/item/engine_peat.json b/src/main/resources/assets/forestry/models/item/engine_peat.json new file mode 100644 index 000000000..43a272a60 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/engine_peat.json @@ -0,0 +1,3 @@ +{ + "parent": "builtin/entity" +} diff --git a/src/main/resources/assets/forestry/models/item/factory2_fabricator.json b/src/main/resources/assets/forestry/models/item/factory2_fabricator.json new file mode 100644 index 000000000..9c5c5f55a --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/factory2_fabricator.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/factory2_fabricator", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/factory2_raintank.json b/src/main/resources/assets/forestry/models/item/factory2_raintank.json new file mode 100644 index 000000000..9f740839d --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/factory2_raintank.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/factory2_raintank", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/factory2_worktable.json b/src/main/resources/assets/forestry/models/item/factory2_worktable.json new file mode 100644 index 000000000..ce0e82a5e --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/factory2_worktable.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/factory2_worktable", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/factory_bottler.json b/src/main/resources/assets/forestry/models/item/factory_bottler.json new file mode 100644 index 000000000..43a272a60 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/factory_bottler.json @@ -0,0 +1,3 @@ +{ + "parent": "builtin/entity" +} diff --git a/src/main/resources/assets/forestry/models/item/factory_carpenter.json b/src/main/resources/assets/forestry/models/item/factory_carpenter.json new file mode 100644 index 000000000..43a272a60 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/factory_carpenter.json @@ -0,0 +1,3 @@ +{ + "parent": "builtin/entity" +} diff --git a/src/main/resources/assets/forestry/models/item/factory_centrifuge.json b/src/main/resources/assets/forestry/models/item/factory_centrifuge.json new file mode 100644 index 000000000..43a272a60 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/factory_centrifuge.json @@ -0,0 +1,3 @@ +{ + "parent": "builtin/entity" +} diff --git a/src/main/resources/assets/forestry/models/item/factory_fermenter.json b/src/main/resources/assets/forestry/models/item/factory_fermenter.json new file mode 100644 index 000000000..43a272a60 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/factory_fermenter.json @@ -0,0 +1,3 @@ +{ + "parent": "builtin/entity" +} diff --git a/src/main/resources/assets/forestry/models/item/factory_moistener.json b/src/main/resources/assets/forestry/models/item/factory_moistener.json new file mode 100644 index 000000000..43a272a60 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/factory_moistener.json @@ -0,0 +1,3 @@ +{ + "parent": "builtin/entity" +} diff --git a/src/main/resources/assets/forestry/models/item/factory_rainmaker.json b/src/main/resources/assets/forestry/models/item/factory_rainmaker.json new file mode 100644 index 000000000..43a272a60 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/factory_rainmaker.json @@ -0,0 +1,3 @@ +{ + "parent": "builtin/entity" +} diff --git a/src/main/resources/assets/forestry/models/item/factory_squeezer.json b/src/main/resources/assets/forestry/models/item/factory_squeezer.json new file mode 100644 index 000000000..43a272a60 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/factory_squeezer.json @@ -0,0 +1,3 @@ +{ + "parent": "builtin/entity" +} diff --git a/src/main/resources/assets/forestry/models/item/factory_still.json b/src/main/resources/assets/forestry/models/item/factory_still.json new file mode 100644 index 000000000..43a272a60 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/factory_still.json @@ -0,0 +1,3 @@ +{ + "parent": "builtin/entity" +} diff --git a/src/main/resources/assets/forestry/models/item/fences/acacia.json b/src/main/resources/assets/forestry/models/item/fences/acacia.json new file mode 100644 index 000000000..8397ba429 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/fences/acacia.json @@ -0,0 +1,13 @@ +{ + "parent": "forestry:block/arboriculture/fences/acacia_inventory", + "display": { + "thirdperson": { + "rotation": [ 0, 0, 180 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": [ 0, 90, 0 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/fences/balsa.json b/src/main/resources/assets/forestry/models/item/fences/balsa.json new file mode 100644 index 000000000..4b099fadf --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/fences/balsa.json @@ -0,0 +1,13 @@ +{ + "parent": "forestry:block/arboriculture/fences/balsa_inventory", + "display": { + "thirdperson": { + "rotation": [ 0, 0, 180 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": [ 0, 90, 0 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/fences/baobab.json b/src/main/resources/assets/forestry/models/item/fences/baobab.json new file mode 100644 index 000000000..9055a0181 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/fences/baobab.json @@ -0,0 +1,13 @@ +{ + "parent": "forestry:block/arboriculture/fences/baobab_inventory", + "display": { + "thirdperson": { + "rotation": [ 0, 0, 180 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": [ 0, 90, 0 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/fences/cherry.json b/src/main/resources/assets/forestry/models/item/fences/cherry.json new file mode 100644 index 000000000..e0bcbb29f --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/fences/cherry.json @@ -0,0 +1,13 @@ +{ + "parent": "forestry:block/arboriculture/fences/cherry_inventory", + "display": { + "thirdperson": { + "rotation": [ 0, 0, 180 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": [ 0, 90, 0 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/fences/chestnut.json b/src/main/resources/assets/forestry/models/item/fences/chestnut.json new file mode 100644 index 000000000..0c932d1c1 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/fences/chestnut.json @@ -0,0 +1,13 @@ +{ + "parent": "forestry:block/arboriculture/fences/chestnut_inventory", + "display": { + "thirdperson": { + "rotation": [ 0, 0, 180 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": [ 0, 90, 0 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/fences/citrus.json b/src/main/resources/assets/forestry/models/item/fences/citrus.json new file mode 100644 index 000000000..17ba1e565 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/fences/citrus.json @@ -0,0 +1,13 @@ +{ + "parent": "forestry:block/arboriculture/fences/citrus_inventory", + "display": { + "thirdperson": { + "rotation": [ 0, 0, 180 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": [ 0, 90, 0 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/fences/cocobolo.json b/src/main/resources/assets/forestry/models/item/fences/cocobolo.json new file mode 100644 index 000000000..3c280bf71 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/fences/cocobolo.json @@ -0,0 +1,13 @@ +{ + "parent": "forestry:block/arboriculture/fences/cocobolo_inventory", + "display": { + "thirdperson": { + "rotation": [ 0, 0, 180 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": [ 0, 90, 0 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/fences/ebony.json b/src/main/resources/assets/forestry/models/item/fences/ebony.json new file mode 100644 index 000000000..c28c28c08 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/fences/ebony.json @@ -0,0 +1,13 @@ +{ + "parent": "forestry:block/arboriculture/fences/ebony_inventory", + "display": { + "thirdperson": { + "rotation": [ 0, 0, 180 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": [ 0, 90, 0 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/fences/giganteum.json b/src/main/resources/assets/forestry/models/item/fences/giganteum.json new file mode 100644 index 000000000..2c223e3e1 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/fences/giganteum.json @@ -0,0 +1,13 @@ +{ + "parent": "forestry:block/arboriculture/fences/giganteum_inventory", + "display": { + "thirdperson": { + "rotation": [ 0, 0, 180 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": [ 0, 90, 0 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/fences/greenheart.json b/src/main/resources/assets/forestry/models/item/fences/greenheart.json new file mode 100644 index 000000000..0a15ad730 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/fences/greenheart.json @@ -0,0 +1,13 @@ +{ + "parent": "forestry:block/arboriculture/fences/greenheart_inventory", + "display": { + "thirdperson": { + "rotation": [ 0, 0, 180 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": [ 0, 90, 0 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/fences/ipe.json b/src/main/resources/assets/forestry/models/item/fences/ipe.json new file mode 100644 index 000000000..0a31d875e --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/fences/ipe.json @@ -0,0 +1,13 @@ +{ + "parent": "forestry:block/arboriculture/fences/ipe_inventory", + "display": { + "thirdperson": { + "rotation": [ 0, 0, 180 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": [ 0, 90, 0 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/fences/kapok.json b/src/main/resources/assets/forestry/models/item/fences/kapok.json new file mode 100644 index 000000000..1f1b27147 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/fences/kapok.json @@ -0,0 +1,13 @@ +{ + "parent": "forestry:block/arboriculture/fences/kapok_inventory", + "display": { + "thirdperson": { + "rotation": [ 0, 0, 180 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": [ 0, 90, 0 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/fences/larch.json b/src/main/resources/assets/forestry/models/item/fences/larch.json new file mode 100644 index 000000000..b2485108e --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/fences/larch.json @@ -0,0 +1,13 @@ +{ + "parent": "forestry:block/arboriculture/fences/larch_inventory", + "display": { + "thirdperson": { + "rotation": [ 0, 0, 180 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": [ 0, 90, 0 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/fences/lime.json b/src/main/resources/assets/forestry/models/item/fences/lime.json new file mode 100644 index 000000000..c6d7f5d58 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/fences/lime.json @@ -0,0 +1,13 @@ +{ + "parent": "forestry:block/arboriculture/fences/lime_inventory", + "display": { + "thirdperson": { + "rotation": [ 0, 0, 180 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": [ 0, 90, 0 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/fences/mahoe.json b/src/main/resources/assets/forestry/models/item/fences/mahoe.json new file mode 100644 index 000000000..1f6dac329 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/fences/mahoe.json @@ -0,0 +1,13 @@ +{ + "parent": "forestry:block/arboriculture/fences/mahoe_inventory", + "display": { + "thirdperson": { + "rotation": [ 0, 0, 180 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": [ 0, 90, 0 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/fences/mahogany.json b/src/main/resources/assets/forestry/models/item/fences/mahogany.json new file mode 100644 index 000000000..103faa696 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/fences/mahogany.json @@ -0,0 +1,13 @@ +{ + "parent": "forestry:block/arboriculture/fences/mahogany_inventory", + "display": { + "thirdperson": { + "rotation": [ 0, 0, 180 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": [ 0, 90, 0 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/fences/maple.json b/src/main/resources/assets/forestry/models/item/fences/maple.json new file mode 100644 index 000000000..b77f59c17 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/fences/maple.json @@ -0,0 +1,13 @@ +{ + "parent": "forestry:block/arboriculture/fences/maple_inventory", + "display": { + "thirdperson": { + "rotation": [ 0, 0, 180 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": [ 0, 90, 0 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/fences/padauk.json b/src/main/resources/assets/forestry/models/item/fences/padauk.json new file mode 100644 index 000000000..ee48eef5a --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/fences/padauk.json @@ -0,0 +1,13 @@ +{ + "parent": "forestry:block/arboriculture/fences/padauk_inventory", + "display": { + "thirdperson": { + "rotation": [ 0, 0, 180 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": [ 0, 90, 0 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/fences/palm.json b/src/main/resources/assets/forestry/models/item/fences/palm.json new file mode 100644 index 000000000..f48ed0cb2 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/fences/palm.json @@ -0,0 +1,13 @@ +{ + "parent": "forestry:block/arboriculture/fences/palm_inventory", + "display": { + "thirdperson": { + "rotation": [ 0, 0, 180 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": [ 0, 90, 0 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/fences/papaya.json b/src/main/resources/assets/forestry/models/item/fences/papaya.json new file mode 100644 index 000000000..10a9be323 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/fences/papaya.json @@ -0,0 +1,13 @@ +{ + "parent": "forestry:block/arboriculture/fences/papaya_inventory", + "display": { + "thirdperson": { + "rotation": [ 0, 0, 180 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": [ 0, 90, 0 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/fences/pine.json b/src/main/resources/assets/forestry/models/item/fences/pine.json new file mode 100644 index 000000000..47cc1aa4d --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/fences/pine.json @@ -0,0 +1,13 @@ +{ + "parent": "forestry:block/arboriculture/fences/pine_inventory", + "display": { + "thirdperson": { + "rotation": [ 0, 0, 180 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": [ 0, 90, 0 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/fences/plum.json b/src/main/resources/assets/forestry/models/item/fences/plum.json new file mode 100644 index 000000000..6e906dd0e --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/fences/plum.json @@ -0,0 +1,13 @@ +{ + "parent": "forestry:block/arboriculture/fences/plum_inventory", + "display": { + "thirdperson": { + "rotation": [ 0, 0, 180 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": [ 0, 90, 0 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/fences/poplar.json b/src/main/resources/assets/forestry/models/item/fences/poplar.json new file mode 100644 index 000000000..a9217d6cc --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/fences/poplar.json @@ -0,0 +1,13 @@ +{ + "parent": "forestry:block/arboriculture/fences/poplar_inventory", + "display": { + "thirdperson": { + "rotation": [ 0, 0, 180 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": [ 0, 90, 0 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/fences/sequoia.json b/src/main/resources/assets/forestry/models/item/fences/sequoia.json new file mode 100644 index 000000000..54f94293c --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/fences/sequoia.json @@ -0,0 +1,13 @@ +{ + "parent": "forestry:block/arboriculture/fences/sequoia_inventory", + "display": { + "thirdperson": { + "rotation": [ 0, 0, 180 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": [ 0, 90, 0 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/fences/teak.json b/src/main/resources/assets/forestry/models/item/fences/teak.json new file mode 100644 index 000000000..cdb5b7b28 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/fences/teak.json @@ -0,0 +1,13 @@ +{ + "parent": "forestry:block/arboriculture/fences/teak_inventory", + "display": { + "thirdperson": { + "rotation": [ 0, 0, 180 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": [ 0, 90, 0 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/fences/walnut.json b/src/main/resources/assets/forestry/models/item/fences/walnut.json new file mode 100644 index 000000000..78383579c --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/fences/walnut.json @@ -0,0 +1,13 @@ +{ + "parent": "forestry:block/arboriculture/fences/walnut_inventory", + "display": { + "thirdperson": { + "rotation": [ 0, 0, 180 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": [ 0, 90, 0 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/fences/wenge.json b/src/main/resources/assets/forestry/models/item/fences/wenge.json new file mode 100644 index 000000000..dac0373d3 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/fences/wenge.json @@ -0,0 +1,13 @@ +{ + "parent": "forestry:block/arboriculture/fences/wenge_inventory", + "display": { + "thirdperson": { + "rotation": [ 0, 0, 180 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": [ 0, 90, 0 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/fences/willow.json b/src/main/resources/assets/forestry/models/item/fences/willow.json new file mode 100644 index 000000000..d85c6796c --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/fences/willow.json @@ -0,0 +1,13 @@ +{ + "parent": "forestry:block/arboriculture/fences/willow_inventory", + "display": { + "thirdperson": { + "rotation": [ 0, 0, 180 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": [ 0, 90, 0 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/fences/zebrawood.json b/src/main/resources/assets/forestry/models/item/fences/zebrawood.json new file mode 100644 index 000000000..316bd70f6 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/fences/zebrawood.json @@ -0,0 +1,13 @@ +{ + "parent": "forestry:block/arboriculture/fences/zebrawood_inventory", + "display": { + "thirdperson": { + "rotation": [ 0, 0, 180 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": [ 0, 90, 0 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/fertilizerBio.json b/src/main/resources/assets/forestry/models/item/fertilizerBio.json new file mode 100644 index 000000000..27360006b --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/fertilizerBio.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/fertilizerBio" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/fertilizerCompound.json b/src/main/resources/assets/forestry/models/item/fertilizerCompound.json new file mode 100644 index 000000000..115fb0f63 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/fertilizerCompound.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/fertilizerCompound" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/ffarm.json b/src/main/resources/assets/forestry/models/item/ffarm.json new file mode 100644 index 000000000..28c6cfc2b --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/ffarm.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/ffarm", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/flutterlyzer.json b/src/main/resources/assets/forestry/models/item/flutterlyzer.json new file mode 100644 index 000000000..55cf080c4 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/flutterlyzer.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/flutterlyzer" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/frameImpregnated.json b/src/main/resources/assets/forestry/models/item/frameImpregnated.json new file mode 100644 index 000000000..f3a558647 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/frameImpregnated.json @@ -0,0 +1,13 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/frameImpregnated" + }, + "display": { + "thirdperson": { + "rotation": [ 0, 90, -35 ], + "translation": [ 0, 1.25, -3.5 ], + "scale": [ 0.85, 0.85, 0.85 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/frameProven.json b/src/main/resources/assets/forestry/models/item/frameProven.json new file mode 100644 index 000000000..6b1d8f5b3 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/frameProven.json @@ -0,0 +1,13 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/frameProven" + }, + "display": { + "thirdperson": { + "rotation": [ 0, 90, -35 ], + "translation": [ 0, 1.25, -3.5 ], + "scale": [ 0.85, 0.85, 0.85 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/frameUntreated.json b/src/main/resources/assets/forestry/models/item/frameUntreated.json new file mode 100644 index 000000000..29e814b45 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/frameUntreated.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/frameUntreated" + }, + "display": { + "thirdperson": { + "rotation": [ 0, 90, -35 ], + "translation": [ 0, 1.25, -3.5 ], + "scale": [ 0.85, 0.85, 0.85 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/fruits/cherry.json b/src/main/resources/assets/forestry/models/item/fruits/cherry.json new file mode 100644 index 000000000..6e33d3fa9 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/fruits/cherry.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/fruits/cherry" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/fruits/chestnut.json b/src/main/resources/assets/forestry/models/item/fruits/chestnut.json new file mode 100644 index 000000000..3122f4bbf --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/fruits/chestnut.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/fruits/chestnut" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/fruits/dates.json b/src/main/resources/assets/forestry/models/item/fruits/dates.json new file mode 100644 index 000000000..3747992cb --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/fruits/dates.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/fruits/dates" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/fruits/lemon.json b/src/main/resources/assets/forestry/models/item/fruits/lemon.json new file mode 100644 index 000000000..d0f4ec4b0 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/fruits/lemon.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/fruits/lemon" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/fruits/papaya.json b/src/main/resources/assets/forestry/models/item/fruits/papaya.json new file mode 100644 index 000000000..b4a7e234a --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/fruits/papaya.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/fruits/papaya" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/fruits/plum.json b/src/main/resources/assets/forestry/models/item/fruits/plum.json new file mode 100644 index 000000000..0ab439134 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/fruits/plum.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/fruits/plum" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/fruits/walnut.json b/src/main/resources/assets/forestry/models/item/fruits/walnut.json new file mode 100644 index 000000000..f47edef7d --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/fruits/walnut.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/fruits/walnut" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/gearBronze.json b/src/main/resources/assets/forestry/models/item/gearBronze.json new file mode 100644 index 000000000..b730183f6 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/gearBronze.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/gearBronze" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/gearCopper.json b/src/main/resources/assets/forestry/models/item/gearCopper.json new file mode 100644 index 000000000..a64de4966 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/gearCopper.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/gearCopper" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/gearTin.json b/src/main/resources/assets/forestry/models/item/gearTin.json new file mode 100644 index 000000000..6a1c270a8 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/gearTin.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/gearTin" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeAcacia.json b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeAcacia.json new file mode 100644 index 000000000..7eac645bd --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeAcacia.json @@ -0,0 +1,6 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:blocks/germlings/sapling.treeAcacia" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeBalsa.json b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeBalsa.json new file mode 100644 index 000000000..d300b80a6 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeBalsa.json @@ -0,0 +1,6 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:blocks/germlings/sapling.treeBalsa" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeBaobab.json b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeBaobab.json new file mode 100644 index 000000000..f6bc1bf8f --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeBaobab.json @@ -0,0 +1,6 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:blocks/germlings/sapling.treeBaobab" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeCherry.json b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeCherry.json new file mode 100644 index 000000000..417ac3b0a --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeCherry.json @@ -0,0 +1,6 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:blocks/germlings/sapling.treeCherry" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeChestnut.json b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeChestnut.json new file mode 100644 index 000000000..923378526 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeChestnut.json @@ -0,0 +1,6 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:blocks/germlings/sapling.treeChestnut" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeCocobolo.json b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeCocobolo.json new file mode 100644 index 000000000..1bcdb00c4 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeCocobolo.json @@ -0,0 +1,6 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:blocks/germlings/sapling.treeCocobolo" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeDate.json b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeDate.json new file mode 100644 index 000000000..567153fcf --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeDate.json @@ -0,0 +1,6 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:blocks/germlings/sapling.treeDate" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeEbony.json b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeEbony.json new file mode 100644 index 000000000..414d35e38 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeEbony.json @@ -0,0 +1,6 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:blocks/germlings/sapling.treeEbony" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeGigant.json b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeGigant.json new file mode 100644 index 000000000..24c0e7bad --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeGigant.json @@ -0,0 +1,6 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:blocks/germlings/sapling.treeGigant" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeIpe.json b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeIpe.json new file mode 100644 index 000000000..8fa0745a5 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeIpe.json @@ -0,0 +1,6 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:blocks/germlings/sapling.treeIpe" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeKapok.json b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeKapok.json new file mode 100644 index 000000000..143e4c091 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeKapok.json @@ -0,0 +1,6 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:blocks/germlings/sapling.treeKapok" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeLarch.json b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeLarch.json new file mode 100644 index 000000000..92c01f3a5 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeLarch.json @@ -0,0 +1,6 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:blocks/germlings/sapling.treeLarch" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeLemon.json b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeLemon.json new file mode 100644 index 000000000..01df6cf22 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeLemon.json @@ -0,0 +1,6 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:blocks/germlings/sapling.treeLemon" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeLime.json b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeLime.json new file mode 100644 index 000000000..a0d83817d --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeLime.json @@ -0,0 +1,6 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:blocks/germlings/sapling.treeLime" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeMahoe.json b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeMahoe.json new file mode 100644 index 000000000..a67bec0a5 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeMahoe.json @@ -0,0 +1,6 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:blocks/germlings/sapling.treeMahoe" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeMahogony.json b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeMahogony.json new file mode 100644 index 000000000..1ca19db14 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeMahogony.json @@ -0,0 +1,6 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:blocks/germlings/sapling.treeMahogony" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeMaple.json b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeMaple.json new file mode 100644 index 000000000..cebed77de --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeMaple.json @@ -0,0 +1,6 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:blocks/germlings/sapling.treeMaple" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/item/germlings/sapling.treePadauk.json b/src/main/resources/assets/forestry/models/item/germlings/sapling.treePadauk.json new file mode 100644 index 000000000..0911c7585 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/germlings/sapling.treePadauk.json @@ -0,0 +1,6 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:blocks/germlings/sapling.treePadauk" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/item/germlings/sapling.treePapaya.json b/src/main/resources/assets/forestry/models/item/germlings/sapling.treePapaya.json new file mode 100644 index 000000000..37ca4edef --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/germlings/sapling.treePapaya.json @@ -0,0 +1,6 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:blocks/germlings/sapling.treePapaya" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/item/germlings/sapling.treePine.json b/src/main/resources/assets/forestry/models/item/germlings/sapling.treePine.json new file mode 100644 index 000000000..8593a3160 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/germlings/sapling.treePine.json @@ -0,0 +1,6 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:blocks/germlings/sapling.treePine" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/item/germlings/sapling.treePlum.json b/src/main/resources/assets/forestry/models/item/germlings/sapling.treePlum.json new file mode 100644 index 000000000..a1e7bb449 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/germlings/sapling.treePlum.json @@ -0,0 +1,6 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:blocks/germlings/sapling.treePlum" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/item/germlings/sapling.treePoplar.json b/src/main/resources/assets/forestry/models/item/germlings/sapling.treePoplar.json new file mode 100644 index 000000000..6283f71dd --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/germlings/sapling.treePoplar.json @@ -0,0 +1,6 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:blocks/germlings/sapling.treePoplar" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeSequioa.json b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeSequioa.json new file mode 100644 index 000000000..bf6b716c9 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeSequioa.json @@ -0,0 +1,6 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:blocks/germlings/sapling.treeSequioa" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeSipiri.json b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeSipiri.json new file mode 100644 index 000000000..4b5803b00 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeSipiri.json @@ -0,0 +1,6 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:blocks/germlings/sapling.treeSipiri" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeTeak.json b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeTeak.json new file mode 100644 index 000000000..3b573fc7c --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeTeak.json @@ -0,0 +1,6 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:blocks/germlings/sapling.treeTeak" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeWalnut.json b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeWalnut.json new file mode 100644 index 000000000..4075ae6e6 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeWalnut.json @@ -0,0 +1,6 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:blocks/germlings/sapling.treeWalnut" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeWenge.json b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeWenge.json new file mode 100644 index 000000000..7f35b6171 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeWenge.json @@ -0,0 +1,6 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:blocks/germlings/sapling.treeWenge" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeWillow.json b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeWillow.json new file mode 100644 index 000000000..268840813 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeWillow.json @@ -0,0 +1,6 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:blocks/germlings/sapling.treeWillow" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeZebrawood.json b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeZebrawood.json new file mode 100644 index 000000000..9d77a2b64 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeZebrawood.json @@ -0,0 +1,6 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:blocks/germlings/sapling.treeZebrawood" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/item/grafter.json b/src/main/resources/assets/forestry/models/item/grafter.json new file mode 100644 index 000000000..ded2ecc10 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/grafter.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/grafter" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/grafterProven.json b/src/main/resources/assets/forestry/models/item/grafterProven.json new file mode 100644 index 000000000..e22472550 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/grafterProven.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/grafterProven" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/habitatLocator.json b/src/main/resources/assets/forestry/models/item/habitatLocator.json new file mode 100644 index 000000000..50bd77a3f --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/habitatLocator.json @@ -0,0 +1,13 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/biomefinder" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -2.5 ], + "scale": [ 0.55, 0.55, 0.55 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/hardenedMachine.json b/src/main/resources/assets/forestry/models/item/hardenedMachine.json new file mode 100644 index 000000000..1800ebf97 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/hardenedMachine.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/hardenedMachine" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/honeyDrop.json b/src/main/resources/assets/forestry/models/item/honeyDrop.json new file mode 100644 index 000000000..615ecc148 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/honeyDrop.json @@ -0,0 +1,19 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/honeyDrop.0", + "layer1": "forestry:items/honeyDrop.1" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/honeyPot.json b/src/main/resources/assets/forestry/models/item/honeyPot.json new file mode 100644 index 000000000..9604cae76 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/honeyPot.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/honeyPot" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/honeydew.json b/src/main/resources/assets/forestry/models/item/honeydew.json new file mode 100644 index 000000000..593999242 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/honeydew.json @@ -0,0 +1,13 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/honeydew" + }, + "display": { + "thirdperson": { + "rotation": [ 0, 90, -35 ], + "translation": [ 0, 1.25, -3.5 ], + "scale": [ 0.85, 0.85, 0.85 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/honeyedSlice.json b/src/main/resources/assets/forestry/models/item/honeyedSlice.json new file mode 100644 index 000000000..7bfc798d9 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/honeyedSlice.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/honeyedSlice" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/iceShard.json b/src/main/resources/assets/forestry/models/item/iceShard.json new file mode 100644 index 000000000..6a2704473 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/iceShard.json @@ -0,0 +1,13 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/iceShard" + }, + "display": { + "thirdperson": { + "rotation": [ 0, 90, -35 ], + "translation": [ 0, 1.25, -3.5 ], + "scale": [ 0.85, 0.85, 0.85 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/impregnatedCasing.json b/src/main/resources/assets/forestry/models/item/impregnatedCasing.json new file mode 100644 index 000000000..f5c57f1f8 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/impregnatedCasing.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/impregnatedCasing" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/imprinter.json b/src/main/resources/assets/forestry/models/item/imprinter.json new file mode 100644 index 000000000..b821a50b3 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/imprinter.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/imprinter" + }, + "display": { + "thirdperson": { + "rotation": [ 0, 90, -35 ], + "translation": [ 0, 1.25, -3.5 ], + "scale": [ 0.85, 0.85, 0.85 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/infuser.json b/src/main/resources/assets/forestry/models/item/infuser.json new file mode 100644 index 000000000..aed8f92f3 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/infuser.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/infuser" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/ingotBronze.json b/src/main/resources/assets/forestry/models/item/ingotBronze.json new file mode 100644 index 000000000..3c5405b55 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/ingotBronze.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/ingotBronze" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/ingotCopper.json b/src/main/resources/assets/forestry/models/item/ingotCopper.json new file mode 100644 index 000000000..b7973100d --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/ingotCopper.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/ingotCopper" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/ingotTin.json b/src/main/resources/assets/forestry/models/item/ingotTin.json new file mode 100644 index 000000000..bca729793 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/ingotTin.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/ingotTin" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/iodineCapsule.json b/src/main/resources/assets/forestry/models/item/iodineCapsule.json new file mode 100644 index 000000000..847db8a47 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/iodineCapsule.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/iodineCapsule" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/kitPickaxe.json b/src/main/resources/assets/forestry/models/item/kitPickaxe.json new file mode 100644 index 000000000..c71be00b1 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/kitPickaxe.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/kitPickaxe" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/kitShovel.json b/src/main/resources/assets/forestry/models/item/kitShovel.json new file mode 100644 index 000000000..32e5e0554 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/kitShovel.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/kitShovel" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/leaves.json b/src/main/resources/assets/forestry/models/item/leaves.json new file mode 100644 index 000000000..a9d85a4fd --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/leaves.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/leaves", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/lepidopterology_lepichest.json b/src/main/resources/assets/forestry/models/item/lepidopterology_lepichest.json new file mode 100644 index 000000000..43a272a60 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/lepidopterology_lepichest.json @@ -0,0 +1,3 @@ +{ + "parent": "builtin/entity" +} diff --git a/src/main/resources/assets/forestry/models/item/liquids/bucket.json b/src/main/resources/assets/forestry/models/item/liquids/bucket.json new file mode 100644 index 000000000..2516a10c5 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/liquids/bucket.json @@ -0,0 +1,19 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/liquids/bucket.bottle", + "layer1": "forestry:items/liquids/bucket.contents" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/liquids/can.json b/src/main/resources/assets/forestry/models/item/liquids/can.json new file mode 100644 index 000000000..cf78f5000 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/liquids/can.json @@ -0,0 +1,19 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/liquids/can.bottle", + "layer1": "forestry:items/liquids/can.contents" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/liquids/capsule.json b/src/main/resources/assets/forestry/models/item/liquids/capsule.json new file mode 100644 index 000000000..41bef7122 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/liquids/capsule.json @@ -0,0 +1,19 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/liquids/capsule.bottle", + "layer1": "forestry:items/liquids/capsule.contents" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/liquids/glass.json b/src/main/resources/assets/forestry/models/item/liquids/glass.json new file mode 100644 index 000000000..83675a687 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/liquids/glass.json @@ -0,0 +1,19 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/liquids/glass.bottle", + "layer1": "forestry:items/liquids/glass.contents" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/liquids/jar.json b/src/main/resources/assets/forestry/models/item/liquids/jar.json new file mode 100644 index 000000000..82e8be3f7 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/liquids/jar.json @@ -0,0 +1,19 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/liquids/jar.bottle", + "layer1": "forestry:items/liquids/jar.contents" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/liquids/refractory.json b/src/main/resources/assets/forestry/models/item/liquids/refractory.json new file mode 100644 index 000000000..9644251d1 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/liquids/refractory.json @@ -0,0 +1,19 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/liquids/refractory.bottle", + "layer1": "forestry:items/liquids/refractory.contents" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/log/acacia.json b/src/main/resources/assets/forestry/models/item/log/acacia.json new file mode 100644 index 000000000..10e2b97b7 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/log/acacia.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/arboriculture/logs/acacia", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/log/balsa.json b/src/main/resources/assets/forestry/models/item/log/balsa.json new file mode 100644 index 000000000..351c83a1a --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/log/balsa.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/arboriculture/logs/balsa", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/log/baobab.json b/src/main/resources/assets/forestry/models/item/log/baobab.json new file mode 100644 index 000000000..1ed3f859e --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/log/baobab.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/arboriculture/logs/baobab", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/log/cherry.json b/src/main/resources/assets/forestry/models/item/log/cherry.json new file mode 100644 index 000000000..37de0cc05 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/log/cherry.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/arboriculture/logs/cherry", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/log/chestnut.json b/src/main/resources/assets/forestry/models/item/log/chestnut.json new file mode 100644 index 000000000..7adcf1a9b --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/log/chestnut.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/arboriculture/logs/chestnut", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/log/citrus.json b/src/main/resources/assets/forestry/models/item/log/citrus.json new file mode 100644 index 000000000..c62e6070f --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/log/citrus.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/arboriculture/logs/citrus", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/log/cocobolo.json b/src/main/resources/assets/forestry/models/item/log/cocobolo.json new file mode 100644 index 000000000..026634827 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/log/cocobolo.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/arboriculture/logs/cocobolo", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/log/ebony.json b/src/main/resources/assets/forestry/models/item/log/ebony.json new file mode 100644 index 000000000..8481d9986 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/log/ebony.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/arboriculture/logs/ebony", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/log/giganteum.json b/src/main/resources/assets/forestry/models/item/log/giganteum.json new file mode 100644 index 000000000..aca72bbeb --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/log/giganteum.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/arboriculture/logs/giganteum", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/log/greenheart.json b/src/main/resources/assets/forestry/models/item/log/greenheart.json new file mode 100644 index 000000000..e034fa1f0 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/log/greenheart.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/arboriculture/logs/greenheart", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/log/ipe.json b/src/main/resources/assets/forestry/models/item/log/ipe.json new file mode 100644 index 000000000..4c887c8bc --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/log/ipe.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/arboriculture/logs/ipe", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/log/kapok.json b/src/main/resources/assets/forestry/models/item/log/kapok.json new file mode 100644 index 000000000..42216a485 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/log/kapok.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/arboriculture/logs/kapok", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/log/larch.json b/src/main/resources/assets/forestry/models/item/log/larch.json new file mode 100644 index 000000000..15ba3d72a --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/log/larch.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/arboriculture/logs/larch", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/log/lime.json b/src/main/resources/assets/forestry/models/item/log/lime.json new file mode 100644 index 000000000..a565bb351 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/log/lime.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/arboriculture/logs/lime", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/log/mahoe.json b/src/main/resources/assets/forestry/models/item/log/mahoe.json new file mode 100644 index 000000000..842c686b1 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/log/mahoe.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/arboriculture/logs/mahoe", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/log/mahogany.json b/src/main/resources/assets/forestry/models/item/log/mahogany.json new file mode 100644 index 000000000..94b6c7dfa --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/log/mahogany.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/arboriculture/logs/mahogany", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/log/maple.json b/src/main/resources/assets/forestry/models/item/log/maple.json new file mode 100644 index 000000000..3defe04da --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/log/maple.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/arboriculture/logs/maple", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/log/padauk.json b/src/main/resources/assets/forestry/models/item/log/padauk.json new file mode 100644 index 000000000..9778dfb86 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/log/padauk.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/arboriculture/logs/padauk", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/log/palm.json b/src/main/resources/assets/forestry/models/item/log/palm.json new file mode 100644 index 000000000..26f5ad121 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/log/palm.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/arboriculture/logs/palm", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/log/papaya.json b/src/main/resources/assets/forestry/models/item/log/papaya.json new file mode 100644 index 000000000..1ca644e22 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/log/papaya.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/arboriculture/logs/papaya", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/log/pine.json b/src/main/resources/assets/forestry/models/item/log/pine.json new file mode 100644 index 000000000..b338df772 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/log/pine.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/arboriculture/logs/pine", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/log/plum.json b/src/main/resources/assets/forestry/models/item/log/plum.json new file mode 100644 index 000000000..e5df74268 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/log/plum.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/arboriculture/logs/plum", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/log/poplar.json b/src/main/resources/assets/forestry/models/item/log/poplar.json new file mode 100644 index 000000000..a3d19aa8d --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/log/poplar.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/arboriculture/logs/poplar", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/log/sequoia.json b/src/main/resources/assets/forestry/models/item/log/sequoia.json new file mode 100644 index 000000000..9caac2c78 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/log/sequoia.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/arboriculture/logs/sequoia", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/log/teak.json b/src/main/resources/assets/forestry/models/item/log/teak.json new file mode 100644 index 000000000..7b880d54f --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/log/teak.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/arboriculture/logs/teak", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/log/walnut.json b/src/main/resources/assets/forestry/models/item/log/walnut.json new file mode 100644 index 000000000..9b4cd8e12 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/log/walnut.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/arboriculture/logs/walnut", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/log/wenge.json b/src/main/resources/assets/forestry/models/item/log/wenge.json new file mode 100644 index 000000000..115298b42 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/log/wenge.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/arboriculture/logs/wenge", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/log/willow.json b/src/main/resources/assets/forestry/models/item/log/willow.json new file mode 100644 index 000000000..ad6954fc6 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/log/willow.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/arboriculture/logs/willow", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/log/zebrawood.json b/src/main/resources/assets/forestry/models/item/log/zebrawood.json new file mode 100644 index 000000000..c4c8f9724 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/log/zebrawood.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/arboriculture/logs/zebrawood", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/mail/letter.0.emptied.json b/src/main/resources/assets/forestry/models/item/mail/letter.0.emptied.json new file mode 100644 index 000000000..0e2c32f0d --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/mail/letter.0.emptied.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/mail/letter.0.emptied" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/mail/letter.0.fresh.json b/src/main/resources/assets/forestry/models/item/mail/letter.0.fresh.json new file mode 100644 index 000000000..3f78ebd17 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/mail/letter.0.fresh.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/mail/letter.0.fresh" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/mail/letter.0.opened.json b/src/main/resources/assets/forestry/models/item/mail/letter.0.opened.json new file mode 100644 index 000000000..847d6b13e --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/mail/letter.0.opened.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/mail/letter.0.opened" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/mail/letter.0.stamped.json b/src/main/resources/assets/forestry/models/item/mail/letter.0.stamped.json new file mode 100644 index 000000000..fdd664a54 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/mail/letter.0.stamped.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/mail/letter.0.stamped" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/mail/letter.1.emptied.json b/src/main/resources/assets/forestry/models/item/mail/letter.1.emptied.json new file mode 100644 index 000000000..63db24abb --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/mail/letter.1.emptied.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/mail/letter.1.emptied" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/mail/letter.1.fresh.json b/src/main/resources/assets/forestry/models/item/mail/letter.1.fresh.json new file mode 100644 index 000000000..d886dc5c7 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/mail/letter.1.fresh.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/mail/letter.1.fresh" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/mail/letter.1.opened.json b/src/main/resources/assets/forestry/models/item/mail/letter.1.opened.json new file mode 100644 index 000000000..810f6ee5f --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/mail/letter.1.opened.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/mail/letter.1.opened" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/mail/letter.1.stamped.json b/src/main/resources/assets/forestry/models/item/mail/letter.1.stamped.json new file mode 100644 index 000000000..0bd5b0438 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/mail/letter.1.stamped.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/mail/letter.1.stamped" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/mail/letter.2.emptied.json b/src/main/resources/assets/forestry/models/item/mail/letter.2.emptied.json new file mode 100644 index 000000000..2a735d48a --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/mail/letter.2.emptied.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/mail/letter.2.emptied" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/mail/letter.2.fresh.json b/src/main/resources/assets/forestry/models/item/mail/letter.2.fresh.json new file mode 100644 index 000000000..4b92ec3df --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/mail/letter.2.fresh.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/mail/letter.2.fresh" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/mail/letter.2.opened.json b/src/main/resources/assets/forestry/models/item/mail/letter.2.opened.json new file mode 100644 index 000000000..ec909d5c4 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/mail/letter.2.opened.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/mail/letter.2.opened" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/mail/letter.2.stamped.json b/src/main/resources/assets/forestry/models/item/mail/letter.2.stamped.json new file mode 100644 index 000000000..7d73c9591 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/mail/letter.2.stamped.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/mail/letter.2.stamped" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/mail_mailbox.json b/src/main/resources/assets/forestry/models/item/mail_mailbox.json new file mode 100644 index 000000000..31d02e3b7 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/mail_mailbox.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/mail_mailbox", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/mail_philatelist.json b/src/main/resources/assets/forestry/models/item/mail_philatelist.json new file mode 100644 index 000000000..b0eaaeed1 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/mail_philatelist.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/mail_philatelist", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/mail_tradestation.json b/src/main/resources/assets/forestry/models/item/mail_tradestation.json new file mode 100644 index 000000000..038856336 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/mail_tradestation.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/mail_tradestation", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/mouldyWheat.json b/src/main/resources/assets/forestry/models/item/mouldyWheat.json new file mode 100644 index 000000000..b54374be1 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/mouldyWheat.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/mouldyWheat" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/mulch.json b/src/main/resources/assets/forestry/models/item/mulch.json new file mode 100644 index 000000000..e2944f909 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/mulch.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/mulch" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/naturalistHelmet.json b/src/main/resources/assets/forestry/models/item/naturalistHelmet.json new file mode 100644 index 000000000..a4bab9058 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/naturalistHelmet.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/spectacles" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/oakStick.json b/src/main/resources/assets/forestry/models/item/oakStick.json new file mode 100644 index 000000000..f88d23c9c --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/oakStick.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/oakStick" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/ores/apatite.json b/src/main/resources/assets/forestry/models/item/ores/apatite.json new file mode 100644 index 000000000..60032c907 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/ores/apatite.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/ores/apatite", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/ores/copper.json b/src/main/resources/assets/forestry/models/item/ores/copper.json new file mode 100644 index 000000000..079333bb6 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/ores/copper.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/ores/copper", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/ores/tin.json b/src/main/resources/assets/forestry/models/item/ores/tin.json new file mode 100644 index 000000000..b1363b672 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/ores/tin.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/ores/tin", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/peat.json b/src/main/resources/assets/forestry/models/item/peat.json new file mode 100644 index 000000000..c4efb8454 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/peat.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/peat" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/phosphor.json b/src/main/resources/assets/forestry/models/item/phosphor.json new file mode 100644 index 000000000..ea5cbcece --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/phosphor.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/phosphor" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/pipette.0.json b/src/main/resources/assets/forestry/models/item/pipette.0.json new file mode 100644 index 000000000..04ce19488 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/pipette.0.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/pipette.0" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/pipette.1.json b/src/main/resources/assets/forestry/models/item/pipette.1.json new file mode 100644 index 000000000..9395e4595 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/pipette.1.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/pipette.1" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/planks.json b/src/main/resources/assets/forestry/models/item/planks.json new file mode 100644 index 000000000..f3edb1513 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/planks.json @@ -0,0 +1,13 @@ +{ + "parent": "block/acacia_planks", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": [ 0, 180, 0 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/planks/acacia.json b/src/main/resources/assets/forestry/models/item/planks/acacia.json new file mode 100644 index 000000000..bf7041f43 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/planks/acacia.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/arboriculture/planks/acacia", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/planks/balsa.json b/src/main/resources/assets/forestry/models/item/planks/balsa.json new file mode 100644 index 000000000..00fc17562 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/planks/balsa.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/arboriculture/planks/balsa", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/planks/baobab.json b/src/main/resources/assets/forestry/models/item/planks/baobab.json new file mode 100644 index 000000000..d71fbb173 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/planks/baobab.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/arboriculture/planks/baobab", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/planks/cherry.json b/src/main/resources/assets/forestry/models/item/planks/cherry.json new file mode 100644 index 000000000..7444e5e98 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/planks/cherry.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/arboriculture/planks/cherry", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/planks/chestnut.json b/src/main/resources/assets/forestry/models/item/planks/chestnut.json new file mode 100644 index 000000000..1cda39ac3 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/planks/chestnut.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/arboriculture/planks/chestnut", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/planks/citrus.json b/src/main/resources/assets/forestry/models/item/planks/citrus.json new file mode 100644 index 000000000..b6f85517d --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/planks/citrus.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/arboriculture/planks/citrus", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/planks/cocobolo.json b/src/main/resources/assets/forestry/models/item/planks/cocobolo.json new file mode 100644 index 000000000..bdd390ef1 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/planks/cocobolo.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/arboriculture/planks/cocobolo", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/planks/ebony.json b/src/main/resources/assets/forestry/models/item/planks/ebony.json new file mode 100644 index 000000000..4404dcbce --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/planks/ebony.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/arboriculture/planks/ebony", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/planks/giganteum.json b/src/main/resources/assets/forestry/models/item/planks/giganteum.json new file mode 100644 index 000000000..9650a8ffd --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/planks/giganteum.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/arboriculture/planks/giganteum", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/planks/greenheart.json b/src/main/resources/assets/forestry/models/item/planks/greenheart.json new file mode 100644 index 000000000..efac92509 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/planks/greenheart.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/arboriculture/planks/greenheart", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/planks/ipe.json b/src/main/resources/assets/forestry/models/item/planks/ipe.json new file mode 100644 index 000000000..105de00a3 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/planks/ipe.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/arboriculture/planks/ipe", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/planks/kapok.json b/src/main/resources/assets/forestry/models/item/planks/kapok.json new file mode 100644 index 000000000..a65f43639 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/planks/kapok.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/arboriculture/planks/kapok", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/planks/larch.json b/src/main/resources/assets/forestry/models/item/planks/larch.json new file mode 100644 index 000000000..30388a20a --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/planks/larch.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/arboriculture/planks/larch", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/planks/lime.json b/src/main/resources/assets/forestry/models/item/planks/lime.json new file mode 100644 index 000000000..7b221008a --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/planks/lime.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/arboriculture/planks/lime", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/planks/mahoe.json b/src/main/resources/assets/forestry/models/item/planks/mahoe.json new file mode 100644 index 000000000..f03ab2028 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/planks/mahoe.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/arboriculture/planks/mahoe", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/planks/mahogany.json b/src/main/resources/assets/forestry/models/item/planks/mahogany.json new file mode 100644 index 000000000..6e95fb43a --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/planks/mahogany.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/arboriculture/planks/mahogany", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/planks/maple.json b/src/main/resources/assets/forestry/models/item/planks/maple.json new file mode 100644 index 000000000..7178135b1 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/planks/maple.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/arboriculture/planks/maple", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/planks/padauk.json b/src/main/resources/assets/forestry/models/item/planks/padauk.json new file mode 100644 index 000000000..0364e7cfb --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/planks/padauk.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/arboriculture/planks/padauk", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/planks/palm.json b/src/main/resources/assets/forestry/models/item/planks/palm.json new file mode 100644 index 000000000..3d537a517 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/planks/palm.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/arboriculture/planks/palm", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/planks/papaya.json b/src/main/resources/assets/forestry/models/item/planks/papaya.json new file mode 100644 index 000000000..a97ddb57b --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/planks/papaya.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/arboriculture/planks/papaya", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/planks/pine.json b/src/main/resources/assets/forestry/models/item/planks/pine.json new file mode 100644 index 000000000..75a653422 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/planks/pine.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/arboriculture/planks/pine", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/planks/plum.json b/src/main/resources/assets/forestry/models/item/planks/plum.json new file mode 100644 index 000000000..c04badf8a --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/planks/plum.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/arboriculture/planks/plum", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/planks/poplar.json b/src/main/resources/assets/forestry/models/item/planks/poplar.json new file mode 100644 index 000000000..66c0558c0 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/planks/poplar.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/arboriculture/planks/poplar", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/planks/sequoia.json b/src/main/resources/assets/forestry/models/item/planks/sequoia.json new file mode 100644 index 000000000..509c60cb5 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/planks/sequoia.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/arboriculture/planks/sequoia", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/planks/teak.json b/src/main/resources/assets/forestry/models/item/planks/teak.json new file mode 100644 index 000000000..5c9fea377 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/planks/teak.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/arboriculture/planks/teak", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/planks/walnut.json b/src/main/resources/assets/forestry/models/item/planks/walnut.json new file mode 100644 index 000000000..0a4c00272 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/planks/walnut.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/arboriculture/planks/walnut", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/planks/wenge.json b/src/main/resources/assets/forestry/models/item/planks/wenge.json new file mode 100644 index 000000000..a90bac3c0 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/planks/wenge.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/arboriculture/planks/wenge", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/planks/willow.json b/src/main/resources/assets/forestry/models/item/planks/willow.json new file mode 100644 index 000000000..b08089fa4 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/planks/willow.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/arboriculture/planks/willow", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/planks/zebrawood.json b/src/main/resources/assets/forestry/models/item/planks/zebrawood.json new file mode 100644 index 000000000..4de6e32b7 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/planks/zebrawood.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/arboriculture/planks/zebrawood", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/pollen.json b/src/main/resources/assets/forestry/models/item/pollen.json new file mode 100644 index 000000000..f3b2f62eb --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/pollen.json @@ -0,0 +1,19 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/pollen.0", + "layer1": "forestry:items/pollen.1" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/propolis.json b/src/main/resources/assets/forestry/models/item/propolis.json new file mode 100644 index 000000000..a0a3a5abc --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/propolis.json @@ -0,0 +1,13 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/propolis.0" + }, + "display": { + "thirdperson": { + "rotation": [ 0, 90, -35 ], + "translation": [ 0, 1.25, -3.5 ], + "scale": [ 0.85, 0.85, 0.85 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/pulsatingDust.json b/src/main/resources/assets/forestry/models/item/pulsatingDust.json new file mode 100644 index 000000000..7f958e947 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/pulsatingDust.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/pulsatingDust" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/pulsatingMesh.json b/src/main/resources/assets/forestry/models/item/pulsatingMesh.json new file mode 100644 index 000000000..2f9b393f7 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/pulsatingMesh.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/pulsatingMesh" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/refractoryWax.json b/src/main/resources/assets/forestry/models/item/refractoryWax.json new file mode 100644 index 000000000..3961140ab --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/refractoryWax.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/refractoryWax" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/researchNote.json b/src/main/resources/assets/forestry/models/item/researchNote.json new file mode 100644 index 000000000..a21d2630c --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/researchNote.json @@ -0,0 +1,3 @@ +{ + "parent": "item/paper" +} diff --git a/src/main/resources/assets/forestry/models/item/resources_copper.json b/src/main/resources/assets/forestry/models/item/resources_copper.json new file mode 100644 index 000000000..13df1a7bf --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/resources_copper.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/ores/resource_copper", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/royalJelly.json b/src/main/resources/assets/forestry/models/item/royalJelly.json new file mode 100644 index 000000000..3540256cd --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/royalJelly.json @@ -0,0 +1,13 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/royalJelly" + }, + "display": { + "thirdperson": { + "rotation": [ 0, 90, -35 ], + "translation": [ 0, 1.25, -3.5 ], + "scale": [ 0.85, 0.85, 0.85 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/scentedPaneling.json b/src/main/resources/assets/forestry/models/item/scentedPaneling.json new file mode 100644 index 000000000..225cb5827 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/scentedPaneling.json @@ -0,0 +1,13 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/scentedPaneling" + }, + "display": { + "thirdperson": { + "rotation": [ 0, 90, -35 ], + "translation": [ 0, 1.25, -3.5 ], + "scale": [ 0.85, 0.85, 0.85 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/scoop.json b/src/main/resources/assets/forestry/models/item/scoop.json new file mode 100644 index 000000000..26652a4cf --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/scoop.json @@ -0,0 +1,13 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/scoop" + }, + "display": { + "thirdperson": { + "rotation": [ 0, 90, -35 ], + "translation": [ 0, 1.25, -3.5 ], + "scale": [ 0.85, 0.85, 0.85 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/silkWisp.json b/src/main/resources/assets/forestry/models/item/silkWisp.json new file mode 100644 index 000000000..8d3ebf31e --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/silkWisp.json @@ -0,0 +1,13 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/silkWisp" + }, + "display": { + "thirdperson": { + "rotation": [ 0, 90, -35 ], + "translation": [ 0, 1.25, -3.5 ], + "scale": [ 0.85, 0.85, 0.85 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/slab/acacia.json b/src/main/resources/assets/forestry/models/item/slab/acacia.json new file mode 100644 index 000000000..a2940cc5c --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/slab/acacia.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/arboriculture/slab/acacia_half", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/slab/balsa.json b/src/main/resources/assets/forestry/models/item/slab/balsa.json new file mode 100644 index 000000000..001280132 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/slab/balsa.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/arboriculture/slab/balsa_half", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/slab/baobab.json b/src/main/resources/assets/forestry/models/item/slab/baobab.json new file mode 100644 index 000000000..9a947a478 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/slab/baobab.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/arboriculture/slab/baobab_half", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/slab/cherry.json b/src/main/resources/assets/forestry/models/item/slab/cherry.json new file mode 100644 index 000000000..8f8b27a92 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/slab/cherry.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/arboriculture/slab/cherry_half", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/slab/chestnut.json b/src/main/resources/assets/forestry/models/item/slab/chestnut.json new file mode 100644 index 000000000..81f4efe2b --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/slab/chestnut.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/arboriculture/slab/chestnut_half", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/slab/citrus.json b/src/main/resources/assets/forestry/models/item/slab/citrus.json new file mode 100644 index 000000000..0ae8ba4c4 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/slab/citrus.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/arboriculture/slab/citrus_half", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/slab/cocobolo.json b/src/main/resources/assets/forestry/models/item/slab/cocobolo.json new file mode 100644 index 000000000..572c12fc2 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/slab/cocobolo.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/arboriculture/slab/cocobolo_half", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/slab/ebony.json b/src/main/resources/assets/forestry/models/item/slab/ebony.json new file mode 100644 index 000000000..9199a1043 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/slab/ebony.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/arboriculture/slab/ebony_half", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/slab/giganteum.json b/src/main/resources/assets/forestry/models/item/slab/giganteum.json new file mode 100644 index 000000000..4784966a7 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/slab/giganteum.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/arboriculture/slab/giganteum_half", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/slab/greenheart.json b/src/main/resources/assets/forestry/models/item/slab/greenheart.json new file mode 100644 index 000000000..d3a9dadd9 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/slab/greenheart.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/arboriculture/slab/greenheart_half", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/slab/ipe.json b/src/main/resources/assets/forestry/models/item/slab/ipe.json new file mode 100644 index 000000000..510c7bbcb --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/slab/ipe.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/arboriculture/slab/ipe_half", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/slab/kapok.json b/src/main/resources/assets/forestry/models/item/slab/kapok.json new file mode 100644 index 000000000..35e031cb2 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/slab/kapok.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/arboriculture/slab/kapok_half", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/slab/larch.json b/src/main/resources/assets/forestry/models/item/slab/larch.json new file mode 100644 index 000000000..e246f0e5d --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/slab/larch.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/arboriculture/slab/larch_half", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/slab/lime.json b/src/main/resources/assets/forestry/models/item/slab/lime.json new file mode 100644 index 000000000..aab1c8b56 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/slab/lime.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/arboriculture/slab/lime_half", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/slab/mahoe.json b/src/main/resources/assets/forestry/models/item/slab/mahoe.json new file mode 100644 index 000000000..f89966b0d --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/slab/mahoe.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/arboriculture/slab/mahoe_half", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/slab/mahogany.json b/src/main/resources/assets/forestry/models/item/slab/mahogany.json new file mode 100644 index 000000000..797c214c0 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/slab/mahogany.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/arboriculture/slab/mahogany_half", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/slab/maple.json b/src/main/resources/assets/forestry/models/item/slab/maple.json new file mode 100644 index 000000000..5e98e77ee --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/slab/maple.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/arboriculture/slab/maple_half", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/slab/padauk.json b/src/main/resources/assets/forestry/models/item/slab/padauk.json new file mode 100644 index 000000000..2de4ef5af --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/slab/padauk.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/arboriculture/slab/padauk_half", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/slab/palm.json b/src/main/resources/assets/forestry/models/item/slab/palm.json new file mode 100644 index 000000000..ecf06d4d7 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/slab/palm.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/arboriculture/slab/palm_half", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/slab/papaya.json b/src/main/resources/assets/forestry/models/item/slab/papaya.json new file mode 100644 index 000000000..ad67bd5c7 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/slab/papaya.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/arboriculture/slab/papaya_half", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/slab/pine.json b/src/main/resources/assets/forestry/models/item/slab/pine.json new file mode 100644 index 000000000..2494bb06d --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/slab/pine.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/arboriculture/slab/pine_half", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/slab/plum.json b/src/main/resources/assets/forestry/models/item/slab/plum.json new file mode 100644 index 000000000..b247f57b2 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/slab/plum.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/arboriculture/slab/plum_half", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/slab/poplar.json b/src/main/resources/assets/forestry/models/item/slab/poplar.json new file mode 100644 index 000000000..6a00d6b21 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/slab/poplar.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/arboriculture/slab/poplar_half", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/slab/sequoia.json b/src/main/resources/assets/forestry/models/item/slab/sequoia.json new file mode 100644 index 000000000..9d6531798 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/slab/sequoia.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/arboriculture/slab/sequoia_half", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/slab/teak.json b/src/main/resources/assets/forestry/models/item/slab/teak.json new file mode 100644 index 000000000..14d9f0e9f --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/slab/teak.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/arboriculture/slab/teak_half", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/slab/walnut.json b/src/main/resources/assets/forestry/models/item/slab/walnut.json new file mode 100644 index 000000000..28da3a334 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/slab/walnut.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/arboriculture/slab/walnut_half", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/slab/wenge.json b/src/main/resources/assets/forestry/models/item/slab/wenge.json new file mode 100644 index 000000000..85eda7945 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/slab/wenge.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/arboriculture/slab/wenge_half", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/slab/willow.json b/src/main/resources/assets/forestry/models/item/slab/willow.json new file mode 100644 index 000000000..7f60ff2e2 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/slab/willow.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/arboriculture/slab/willow_half", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/slab/zebrawood.json b/src/main/resources/assets/forestry/models/item/slab/zebrawood.json new file mode 100644 index 000000000..97e7e5b98 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/slab/zebrawood.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/arboriculture/slab/zebrawood_half", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/slabs.json b/src/main/resources/assets/forestry/models/item/slabs.json new file mode 100644 index 000000000..c5a4a8ed6 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/slabs.json @@ -0,0 +1,13 @@ +{ + "parent": "block/acacia_slabs", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": [ 0, 180, 0 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/soil/bog.json b/src/main/resources/assets/forestry/models/item/soil/bog.json new file mode 100644 index 000000000..415a2a1b1 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/soil/bog.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/soil/bog", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/soil/humus.json b/src/main/resources/assets/forestry/models/item/soil/humus.json new file mode 100644 index 000000000..bf246f770 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/soil/humus.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/soil/humus", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/soil/peat.json b/src/main/resources/assets/forestry/models/item/soil/peat.json new file mode 100644 index 000000000..b4ca0e269 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/soil/peat.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/soil/peat", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/solderingIron.json b/src/main/resources/assets/forestry/models/item/solderingIron.json new file mode 100644 index 000000000..0606bbc55 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/solderingIron.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/solderingIron" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/stairs.json b/src/main/resources/assets/forestry/models/item/stairs.json new file mode 100644 index 000000000..b1ca6ff7b --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/stairs.json @@ -0,0 +1,13 @@ +{ + "parent": "block/acacia_stairs", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": [ 0, 180, 0 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/stairs/acacia.json b/src/main/resources/assets/forestry/models/item/stairs/acacia.json new file mode 100644 index 000000000..9af89033b --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/stairs/acacia.json @@ -0,0 +1,13 @@ +{ + "parent": "forestry:block/arboriculture/stairs/acacia", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": [ 0, 180, 0 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/stairs/balsa.json b/src/main/resources/assets/forestry/models/item/stairs/balsa.json new file mode 100644 index 000000000..377d7eaba --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/stairs/balsa.json @@ -0,0 +1,13 @@ +{ + "parent": "forestry:block/arboriculture/stairs/balsa", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": [ 0, 180, 0 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/stairs/baobab.json b/src/main/resources/assets/forestry/models/item/stairs/baobab.json new file mode 100644 index 000000000..6a26ce4cb --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/stairs/baobab.json @@ -0,0 +1,13 @@ +{ + "parent": "forestry:block/arboriculture/stairs/baobab", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": [ 0, 180, 0 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/stairs/cherry.json b/src/main/resources/assets/forestry/models/item/stairs/cherry.json new file mode 100644 index 000000000..4e6ae96af --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/stairs/cherry.json @@ -0,0 +1,13 @@ +{ + "parent": "forestry:block/arboriculture/stairs/cherry", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": [ 0, 180, 0 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/stairs/chestnut.json b/src/main/resources/assets/forestry/models/item/stairs/chestnut.json new file mode 100644 index 000000000..e12e3ffd6 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/stairs/chestnut.json @@ -0,0 +1,13 @@ +{ + "parent": "forestry:block/arboriculture/stairs/chestnut", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": [ 0, 180, 0 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/stairs/citrus.json b/src/main/resources/assets/forestry/models/item/stairs/citrus.json new file mode 100644 index 000000000..4e12a9adb --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/stairs/citrus.json @@ -0,0 +1,13 @@ +{ + "parent": "forestry:block/arboriculture/stairs/citrus", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": [ 0, 180, 0 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/stairs/cocobolo.json b/src/main/resources/assets/forestry/models/item/stairs/cocobolo.json new file mode 100644 index 000000000..29cbd4b12 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/stairs/cocobolo.json @@ -0,0 +1,13 @@ +{ + "parent": "forestry:block/arboriculture/stairs/cocobolo", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": [ 0, 180, 0 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/stairs/ebony.json b/src/main/resources/assets/forestry/models/item/stairs/ebony.json new file mode 100644 index 000000000..2de21965b --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/stairs/ebony.json @@ -0,0 +1,13 @@ +{ + "parent": "forestry:block/arboriculture/stairs/ebony", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": [ 0, 180, 0 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/stairs/giganteum.json b/src/main/resources/assets/forestry/models/item/stairs/giganteum.json new file mode 100644 index 000000000..c60378b63 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/stairs/giganteum.json @@ -0,0 +1,13 @@ +{ + "parent": "forestry:block/arboriculture/stairs/giganteum", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": [ 0, 180, 0 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/stairs/greenheart.json b/src/main/resources/assets/forestry/models/item/stairs/greenheart.json new file mode 100644 index 000000000..edb1d7e30 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/stairs/greenheart.json @@ -0,0 +1,13 @@ +{ + "parent": "forestry:block/arboriculture/stairs/greenheart", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": [ 0, 180, 0 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/stairs/ipe.json b/src/main/resources/assets/forestry/models/item/stairs/ipe.json new file mode 100644 index 000000000..fd4cf66c6 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/stairs/ipe.json @@ -0,0 +1,13 @@ +{ + "parent": "forestry:block/arboriculture/stairs/ipe", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": [ 0, 180, 0 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/stairs/kapok.json b/src/main/resources/assets/forestry/models/item/stairs/kapok.json new file mode 100644 index 000000000..392b1d63b --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/stairs/kapok.json @@ -0,0 +1,13 @@ +{ + "parent": "forestry:block/arboriculture/stairs/kapok", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": [ 0, 180, 0 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/stairs/larch.json b/src/main/resources/assets/forestry/models/item/stairs/larch.json new file mode 100644 index 000000000..e80bedb72 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/stairs/larch.json @@ -0,0 +1,13 @@ +{ + "parent": "forestry:block/arboriculture/stairs/larch", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": [ 0, 180, 0 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/item/stairs/lime.json b/src/main/resources/assets/forestry/models/item/stairs/lime.json new file mode 100644 index 000000000..59a80f175 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/stairs/lime.json @@ -0,0 +1,13 @@ +{ + "parent": "forestry:block/arboriculture/stairs/lime", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": [ 0, 180, 0 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/stairs/mahoe.json b/src/main/resources/assets/forestry/models/item/stairs/mahoe.json new file mode 100644 index 000000000..59e36a008 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/stairs/mahoe.json @@ -0,0 +1,13 @@ +{ + "parent": "forestry:block/arboriculture/stairs/mahoe", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": [ 0, 180, 0 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/stairs/mahogany.json b/src/main/resources/assets/forestry/models/item/stairs/mahogany.json new file mode 100644 index 000000000..75c0332af --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/stairs/mahogany.json @@ -0,0 +1,13 @@ +{ + "parent": "forestry:block/arboriculture/stairs/mahogany", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": [ 0, 180, 0 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/stairs/maple.json b/src/main/resources/assets/forestry/models/item/stairs/maple.json new file mode 100644 index 000000000..aaaf2926e --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/stairs/maple.json @@ -0,0 +1,13 @@ +{ + "parent": "forestry:block/arboriculture/stairs/maple", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": [ 0, 180, 0 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/stairs/padauk.json b/src/main/resources/assets/forestry/models/item/stairs/padauk.json new file mode 100644 index 000000000..800ee5881 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/stairs/padauk.json @@ -0,0 +1,13 @@ +{ + "parent": "forestry:block/arboriculture/stairs/padauk", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": [ 0, 180, 0 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/stairs/palm.json b/src/main/resources/assets/forestry/models/item/stairs/palm.json new file mode 100644 index 000000000..4dc3b6221 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/stairs/palm.json @@ -0,0 +1,13 @@ +{ + "parent": "forestry:block/arboriculture/stairs/palm", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": [ 0, 180, 0 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/stairs/papaya.json b/src/main/resources/assets/forestry/models/item/stairs/papaya.json new file mode 100644 index 000000000..4c32ed6cd --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/stairs/papaya.json @@ -0,0 +1,13 @@ +{ + "parent": "forestry:block/arboriculture/stairs/papaya", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": [ 0, 180, 0 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/stairs/pine.json b/src/main/resources/assets/forestry/models/item/stairs/pine.json new file mode 100644 index 000000000..0ff01ddab --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/stairs/pine.json @@ -0,0 +1,13 @@ +{ + "parent": "forestry:block/arboriculture/stairs/pine", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": [ 0, 180, 0 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/stairs/plum.json b/src/main/resources/assets/forestry/models/item/stairs/plum.json new file mode 100644 index 000000000..1050ec9cc --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/stairs/plum.json @@ -0,0 +1,13 @@ +{ + "parent": "forestry:block/arboriculture/stairs/plum", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": [ 0, 180, 0 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/stairs/poplar.json b/src/main/resources/assets/forestry/models/item/stairs/poplar.json new file mode 100644 index 000000000..10f09549e --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/stairs/poplar.json @@ -0,0 +1,13 @@ +{ + "parent": "forestry:block/arboriculture/stairs/poplar", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": [ 0, 180, 0 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/stairs/sequoia.json b/src/main/resources/assets/forestry/models/item/stairs/sequoia.json new file mode 100644 index 000000000..43d27d4a0 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/stairs/sequoia.json @@ -0,0 +1,13 @@ +{ + "parent": "forestry:block/arboriculture/stairs/sequoia", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": [ 0, 180, 0 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/stairs/teak.json b/src/main/resources/assets/forestry/models/item/stairs/teak.json new file mode 100644 index 000000000..d91a61eb1 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/stairs/teak.json @@ -0,0 +1,13 @@ +{ + "parent": "forestry:block/arboriculture/stairs/teak", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": [ 0, 180, 0 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/stairs/walnut.json b/src/main/resources/assets/forestry/models/item/stairs/walnut.json new file mode 100644 index 000000000..c7034daa5 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/stairs/walnut.json @@ -0,0 +1,13 @@ +{ + "parent": "forestry:block/arboriculture/stairs/walnut", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": [ 0, 180, 0 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/stairs/wenge.json b/src/main/resources/assets/forestry/models/item/stairs/wenge.json new file mode 100644 index 000000000..861ab2955 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/stairs/wenge.json @@ -0,0 +1,13 @@ +{ + "parent": "forestry:block/arboriculture/stairs/wenge", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": [ 0, 180, 0 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/stairs/willow.json b/src/main/resources/assets/forestry/models/item/stairs/willow.json new file mode 100644 index 000000000..90cf0604d --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/stairs/willow.json @@ -0,0 +1,13 @@ +{ + "parent": "forestry:block/arboriculture/stairs/willow", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": [ 0, 180, 0 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/stairs/zebrawood.json b/src/main/resources/assets/forestry/models/item/stairs/zebrawood.json new file mode 100644 index 000000000..5587fc8fd --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/stairs/zebrawood.json @@ -0,0 +1,13 @@ +{ + "parent": "forestry:block/arboriculture/stairs/zebrawood", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": [ 0, 180, 0 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/stairsFireproof.json b/src/main/resources/assets/forestry/models/item/stairsFireproof.json new file mode 100644 index 000000000..b1ca6ff7b --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/stairsFireproof.json @@ -0,0 +1,13 @@ +{ + "parent": "block/acacia_stairs", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": [ 0, 180, 0 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/stamps.json b/src/main/resources/assets/forestry/models/item/stamps.json new file mode 100644 index 000000000..4bcc46896 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/stamps.json @@ -0,0 +1,19 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/stamps.0", + "layer1": "forestry:items/stamps.1" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/stick.json b/src/main/resources/assets/forestry/models/item/stick.json new file mode 100644 index 000000000..daa1fbb46 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/stick.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "items/stick" + }, + "display": { + "thirdperson": { + "rotation": [ 0, 90, -35 ], + "translation": [ 0, 1.25, -3.5 ], + "scale": [ 0.85, 0.85, 0.85 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/storage/apatite.json b/src/main/resources/assets/forestry/models/item/storage/apatite.json new file mode 100644 index 000000000..ecb7ee3d2 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/storage/apatite.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/storage/apatite", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/storage/bronze.json b/src/main/resources/assets/forestry/models/item/storage/bronze.json new file mode 100644 index 000000000..cc7c34bce --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/storage/bronze.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/storage/bronze", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/storage/copper.json b/src/main/resources/assets/forestry/models/item/storage/copper.json new file mode 100644 index 000000000..1ee732a62 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/storage/copper.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/storage/copper", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/storage/tin.json b/src/main/resources/assets/forestry/models/item/storage/tin.json new file mode 100644 index 000000000..4dfe9401c --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/storage/tin.json @@ -0,0 +1,10 @@ +{ + "parent": "forestry:block/storage/tin", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/stump.json b/src/main/resources/assets/forestry/models/item/stump.json new file mode 100644 index 000000000..ef6f99503 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/stump.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:blocks/stump" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/sturdyMachine.json b/src/main/resources/assets/forestry/models/item/sturdyMachine.json new file mode 100644 index 000000000..84b7cd99a --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/sturdyMachine.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/sturdyMachine" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/thermionicTubes.json b/src/main/resources/assets/forestry/models/item/thermionicTubes.json new file mode 100644 index 000000000..b33b0cfd1 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/thermionicTubes.json @@ -0,0 +1,19 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/thermionicTubes.0", + "layer1": "forestry:items/thermionicTubes.1" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/treealyzer.json b/src/main/resources/assets/forestry/models/item/treealyzer.json new file mode 100644 index 000000000..4e565f23f --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/treealyzer.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/treealyzer" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/waxCast.json b/src/main/resources/assets/forestry/models/item/waxCast.json new file mode 100644 index 000000000..86f598050 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/waxCast.json @@ -0,0 +1,13 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/waxCast" + }, + "display": { + "thirdperson": { + "rotation": [ 0, 90, -35 ], + "translation": [ 0, 1.25, -3.5 ], + "scale": [ 0.85, 0.85, 0.85 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/woodPulp.json b/src/main/resources/assets/forestry/models/item/woodPulp.json new file mode 100644 index 000000000..147c36a04 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/woodPulp.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/woodPulp" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/wovenSilk.json b/src/main/resources/assets/forestry/models/item/wovenSilk.json new file mode 100644 index 000000000..0ad7ea060 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/wovenSilk.json @@ -0,0 +1,13 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/wovenSilk" + }, + "display": { + "thirdperson": { + "rotation": [ 0, 90, -35 ], + "translation": [ 0, 1.25, -3.5 ], + "scale": [ 0.85, 0.85, 0.85 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/wrench.json b/src/main/resources/assets/forestry/models/item/wrench.json new file mode 100644 index 000000000..489d8fe9b --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/wrench.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/wrench" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forgedebugmultilayermodel/blockstates/test_layer_block.json b/src/main/resources/assets/forgedebugmultilayermodel/blockstates/test_layer_block.json new file mode 100644 index 000000000..15a23f01c --- /dev/null +++ b/src/main/resources/assets/forgedebugmultilayermodel/blockstates/test_layer_block.json @@ -0,0 +1,23 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "forge:multi-layer", + "custom": { + // base is used for model properties - camera transforms, isGui3d, e.t.c. + "base": "forgedebugmultilayermodel:test_layer_block#aux", + // per-layer models + "Solid": "forgedebugmultilayermodel:test_layer_block#aux", + "Translucent": "minecraft:pink_stained_glass_pane#east=true,north=false,south=false,west=true" + }, + "transform": "forge:default-block" + }, + "variants": { + "normal": [{}], + "inventory": [{}], + "aux": [{ + "model": "cube_all", + "textures": { "all": "blocks/slime" }, + "transform": { "scale": .5 } + }] + } +}