From c5c76f4009d5c844aaafa97e5bf8c1365c28636d Mon Sep 17 00:00:00 2001 From: Nedelosk Date: Mon, 10 Apr 2017 21:01:13 +0200 Subject: [PATCH] Cache MultiFence Models --- .../block/decor/BlockMultiFence.java | 6 +-- .../decor => models}/ModelMultiFence.java | 39 ++++++++++++------- 2 files changed, 26 insertions(+), 19 deletions(-) rename src/main/java/binnie/extratrees/{block/decor => models}/ModelMultiFence.java (89%) diff --git a/src/main/java/binnie/extratrees/block/decor/BlockMultiFence.java b/src/main/java/binnie/extratrees/block/decor/BlockMultiFence.java index 59742c19..76d8aa78 100644 --- a/src/main/java/binnie/extratrees/block/decor/BlockMultiFence.java +++ b/src/main/java/binnie/extratrees/block/decor/BlockMultiFence.java @@ -4,7 +4,6 @@ import java.util.List; import javax.annotation.Nullable; -import binnie.Binnie; import binnie.core.block.BlockMetadata; import binnie.core.block.IBlockMetadata; import binnie.core.block.TileEntityMetadata; @@ -14,18 +13,15 @@ import binnie.extratrees.ExtraTrees; import binnie.extratrees.block.IPlankType; import binnie.extratrees.block.PlankType; import binnie.extratrees.block.WoodManager; +import binnie.extratrees.models.ModelMultiFence; import forestry.api.core.IItemModelRegister; import forestry.api.core.IModelManager; import forestry.api.core.IStateMapperRegister; import forestry.api.core.Tabs; import forestry.arboriculture.PluginArboriculture; -import forestry.arboriculture.WoodAccess; -import forestry.arboriculture.items.ItemBlockWood; -import forestry.arboriculture.items.ItemBlockWoodDoor; import forestry.core.blocks.properties.UnlistedBlockAccess; import forestry.core.blocks.properties.UnlistedBlockPos; import forestry.core.models.BlockModelEntry; -import forestry.core.utils.Translator; import net.minecraft.block.Block; import net.minecraft.block.BlockFence; import net.minecraft.block.BlockFenceGate; diff --git a/src/main/java/binnie/extratrees/block/decor/ModelMultiFence.java b/src/main/java/binnie/extratrees/models/ModelMultiFence.java similarity index 89% rename from src/main/java/binnie/extratrees/block/decor/ModelMultiFence.java rename to src/main/java/binnie/extratrees/models/ModelMultiFence.java index ff03903b..1ecde567 100644 --- a/src/main/java/binnie/extratrees/block/decor/ModelMultiFence.java +++ b/src/main/java/binnie/extratrees/models/ModelMultiFence.java @@ -1,14 +1,15 @@ -package binnie.extratrees.block.decor; +package binnie.extratrees.models; import binnie.core.block.TileEntityMetadata; import binnie.core.models.AABBModelBaker; import binnie.core.models.ModelManager; -import binnie.extratrees.ExtraTrees; import binnie.extratrees.block.WoodManager; +import binnie.extratrees.block.decor.BlockMultiFence; +import binnie.extratrees.block.decor.FenceType; import forestry.api.core.IModelBaker; import forestry.core.blocks.properties.UnlistedBlockAccess; import forestry.core.blocks.properties.UnlistedBlockPos; -import forestry.core.models.ModelBlockDefault; +import forestry.core.models.ModelBlockCached; import net.minecraft.block.Block; import net.minecraft.block.BlockFence; import net.minecraft.block.state.IBlockState; @@ -20,7 +21,7 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.property.IExtendedBlockState; -public class ModelMultiFence extends ModelBlockDefault { +public class ModelMultiFence extends ModelBlockCached { public static final float POST_WIDGTH = 0.25F; public static final float POST_HEIGHT = 1F; @@ -29,11 +30,22 @@ public class ModelMultiFence extends ModelBlockDefault