From 9f62f1f8533b2f99c6c7ab044982842b6ba102ef Mon Sep 17 00:00:00 2001 From: Nedelosk Date: Sun, 20 Mar 2016 09:17:09 +0100 Subject: [PATCH] Add fence gates --- lang | 2 +- .../api/greenhouse/IGreenhouseHousing.java | 1 - .../blocks/BlockRegistryArboriculture.java | 14 ++++++++++++++ .../blocks/WoodTypeStateMapper.java | 16 ++++++++++++++-- .../forestry/greenhouse/GreenhouseHelper.java | 2 -- .../multiblock/GreenhouseController.java | 1 - 6 files changed, 29 insertions(+), 7 deletions(-) diff --git a/lang b/lang index 28e4bea04..9fde9895a 160000 --- a/lang +++ b/lang @@ -1 +1 @@ -Subproject commit 28e4bea04f0b461475678dcf6a94e5e9e08d4aef +Subproject commit 9fde9895a6777f42d007f584da1516cbe583f99a diff --git a/src/main/java/forestry/api/greenhouse/IGreenhouseHousing.java b/src/main/java/forestry/api/greenhouse/IGreenhouseHousing.java index e4fecbfa0..6b259da31 100644 --- a/src/main/java/forestry/api/greenhouse/IGreenhouseHousing.java +++ b/src/main/java/forestry/api/greenhouse/IGreenhouseHousing.java @@ -8,7 +8,6 @@ package forestry.api.greenhouse; import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; import forestry.api.core.IErrorLogicSource; -import net.minecraft.util.BlockPos; import net.minecraft.world.World; public interface IGreenhouseHousing extends IErrorLogicSource { diff --git a/src/main/java/forestry/arboriculture/blocks/BlockRegistryArboriculture.java b/src/main/java/forestry/arboriculture/blocks/BlockRegistryArboriculture.java index 8ee12a3d7..07de985bf 100644 --- a/src/main/java/forestry/arboriculture/blocks/BlockRegistryArboriculture.java +++ b/src/main/java/forestry/arboriculture/blocks/BlockRegistryArboriculture.java @@ -40,6 +40,8 @@ public class BlockRegistryArboriculture extends BlockRegistry { public final List slabsDoubleFireproof; public final List fences; public final List fencesFireproof; + public final List fenceGates; + public final List fenceGatesFireproof; public final List stairs; public final List stairsFireproof; @@ -108,6 +110,18 @@ public class BlockRegistryArboriculture extends BlockRegistry { registerOreDictWildcard("fenceWood", fenceFireproof); fencesFireproof.add(fenceFireproof); } + + fenceGates = new ArrayList<>(); + fenceGatesFireproof = new ArrayList<>(); + for (EnumWoodType woodType : EnumWoodType.VALUES) { + BlockArbFenceGate fence = registerBlock(new BlockArbFenceGate(false, woodType), ItemBlockWood.class, "fence.gates." + woodType); + registerOreDictWildcard("fenceGateWood", fence); + fenceGates.add(fence); + + BlockArbFenceGate fenceFireproof = registerBlock(new BlockArbFenceGate(true, woodType), ItemBlockWood.class, "fence.gates.fireproof." + woodType); + registerOreDictWildcard("fenceGateWood", fenceFireproof); + fenceGatesFireproof.add(fenceFireproof); + } stairs = new ArrayList<>(); for (BlockArbPlanks plank : planks) { diff --git a/src/main/java/forestry/arboriculture/blocks/WoodTypeStateMapper.java b/src/main/java/forestry/arboriculture/blocks/WoodTypeStateMapper.java index 48aadda29..7e8c2786a 100644 --- a/src/main/java/forestry/arboriculture/blocks/WoodTypeStateMapper.java +++ b/src/main/java/forestry/arboriculture/blocks/WoodTypeStateMapper.java @@ -5,6 +5,8 @@ import com.google.common.collect.Maps; import javax.annotation.Nonnull; import javax.annotation.Nullable; +import java.util.ArrayList; +import java.util.List; import java.util.Map; import net.minecraft.block.Block; @@ -12,7 +14,6 @@ import net.minecraft.block.properties.IProperty; import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.block.statemap.StateMapperBase; import net.minecraft.client.resources.model.ModelResourceLocation; - import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -29,6 +30,8 @@ class WoodTypeStateMapper extends StateMapperBase { private final String blockPath; @Nullable private final PropertyWoodType propertyWoodType; + @Nonnull + private final List propertysToRemove = new ArrayList(); public WoodTypeStateMapper(@Nonnull IWoodTyped woodTyped, @Nullable PropertyWoodType propertyWoodType) { this.woodTyped = woodTyped; @@ -41,6 +44,11 @@ class WoodTypeStateMapper extends StateMapperBase { this.blockPath = blockPath; this.propertyWoodType = propertyWoodType; } + + public WoodTypeStateMapper addPropertyToRemove(IProperty property){ + this.propertysToRemove.add(property); + return this; + } @Override protected ModelResourceLocation getModelResourceLocation(IBlockState state) { @@ -49,7 +57,11 @@ class WoodTypeStateMapper extends StateMapperBase { properties = Maps.newLinkedHashMap(state.getProperties()); properties.remove(propertyWoodType); } else { - properties = state.getProperties(); + properties = Maps.newLinkedHashMap(state.getProperties()); + } + + for(IProperty property : propertysToRemove){ + properties.remove(property); } Block block = state.getBlock(); diff --git a/src/main/java/forestry/greenhouse/GreenhouseHelper.java b/src/main/java/forestry/greenhouse/GreenhouseHelper.java index 97a47236b..6c5235561 100644 --- a/src/main/java/forestry/greenhouse/GreenhouseHelper.java +++ b/src/main/java/forestry/greenhouse/GreenhouseHelper.java @@ -10,11 +10,9 @@ ******************************************************************************/ package forestry.greenhouse; -import forestry.api.core.IClimateManager; import forestry.api.greenhouse.IGreenhouseHelper; import forestry.api.greenhouse.IGreenhouseState; import forestry.api.greenhouse.IInternalBlock; -import forestry.api.multiblock.IGreenhouseController; import forestry.core.multiblock.IMultiblockControllerInternal; import forestry.core.multiblock.MultiblockRegistry; import forestry.greenhouse.multiblock.IGreenhouseControllerInternal; diff --git a/src/main/java/forestry/greenhouse/multiblock/GreenhouseController.java b/src/main/java/forestry/greenhouse/multiblock/GreenhouseController.java index 3cf2d9254..aad5448a2 100644 --- a/src/main/java/forestry/greenhouse/multiblock/GreenhouseController.java +++ b/src/main/java/forestry/greenhouse/multiblock/GreenhouseController.java @@ -30,7 +30,6 @@ import forestry.api.greenhouse.GreenhouseEvents.CreateInternalBlockEvent; import forestry.api.core.EnumCamouflageType; import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; -import forestry.api.core.ForestryAPI; import forestry.api.core.ICamouflagedBlock; import forestry.api.multiblock.IGreenhouseComponent; import forestry.api.multiblock.IGreenhouseController;