From 7238886d00e062dfc1f862ccc514e3ec50956fb1 Mon Sep 17 00:00:00 2001 From: Nedelosk Date: Sun, 13 Mar 2016 01:30:47 +0100 Subject: [PATCH] Improve greenhouse multiblock --- .../api/greenhouse/IGreenhouseHousing.java | 10 +-- .../multiblock/MultiblockControllerBase.java | 18 ----- .../forestry/greenhouse/PluginGreenhouse.java | 26 ++++++- .../greenhouse/blocks/BlockGreenhouse.java | 45 ++++++++--- .../blocks/BlockGreenhouseType.java | 1 - .../greenhouse/models/ModelGreenhouse.java | 14 ++++ .../multiblock/FakeGreenhouseController.java | 6 ++ .../multiblock/GreenhouseController.java | 70 ++++++++++++++---- .../GreenhouseMultiblockSizeLimits.java | 4 +- .../IGreenhouseControllerInternal.java | 2 +- .../proxy/ProxyGreenhouseClient.java | 3 - .../textures/blocks/greenhouse/control.png | Bin 0 -> 398 bytes .../textures/blocks/greenhouse/fan.off.png | Bin 0 -> 15188 bytes .../textures/blocks/greenhouse/fan.on.png | Bin 0 -> 15307 bytes .../textures/blocks/greenhouse/gears.png | Bin 0 -> 480 bytes .../textures/blocks/greenhouse/heater.off.png | Bin 0 -> 15217 bytes .../textures/blocks/greenhouse/heater.on.png | Bin 0 -> 15281 bytes .../textures/blocks/greenhouse/valve.png | Bin 0 -> 361 bytes 18 files changed, 141 insertions(+), 58 deletions(-) create mode 100644 src/main/resources/assets/forestry/textures/blocks/greenhouse/control.png create mode 100644 src/main/resources/assets/forestry/textures/blocks/greenhouse/fan.off.png create mode 100644 src/main/resources/assets/forestry/textures/blocks/greenhouse/fan.on.png create mode 100644 src/main/resources/assets/forestry/textures/blocks/greenhouse/gears.png create mode 100644 src/main/resources/assets/forestry/textures/blocks/greenhouse/heater.off.png create mode 100644 src/main/resources/assets/forestry/textures/blocks/greenhouse/heater.on.png create mode 100644 src/main/resources/assets/forestry/textures/blocks/greenhouse/valve.png diff --git a/src/main/java/forestry/api/greenhouse/IGreenhouseHousing.java b/src/main/java/forestry/api/greenhouse/IGreenhouseHousing.java index 39828fb10..ab6eee873 100644 --- a/src/main/java/forestry/api/greenhouse/IGreenhouseHousing.java +++ b/src/main/java/forestry/api/greenhouse/IGreenhouseHousing.java @@ -8,14 +8,14 @@ package forestry.api.greenhouse; import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; import forestry.api.core.IErrorLogicSource; +import forestry.core.tiles.IClimatised; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; -public interface IGreenhouseHousing extends IErrorLogicSource { - - EnumTemperature getTemperature(); - - EnumHumidity getHumidity(); +public interface IGreenhouseHousing extends IErrorLogicSource, IClimatised { World getWorld(); + boolean isInGreenhouse(BlockPos pos); + } diff --git a/src/main/java/forestry/core/multiblock/MultiblockControllerBase.java b/src/main/java/forestry/core/multiblock/MultiblockControllerBase.java index 88dc232f2..49f7b1f54 100644 --- a/src/main/java/forestry/core/multiblock/MultiblockControllerBase.java +++ b/src/main/java/forestry/core/multiblock/MultiblockControllerBase.java @@ -537,24 +537,6 @@ public abstract class MultiblockControllerBase implements IMultiblockControllerI } } - protected BlockPos getMaxXYCoord() { - BlockPos maximumCoord = new BlockPos(0, 0, 0); - - for (IMultiblockComponent part : connectedParts) { - BlockPos partCoords = part.getCoordinates(); - int maxX = maximumCoord.getX(); - int maxZ = maximumCoord.getZ(); - if (partCoords.getX() > maximumCoord.getX()) { - maxX = partCoords.getX(); - } - if (partCoords.getZ() > maximumCoord.getZ()) { - maxZ = partCoords.getZ(); - } - maximumCoord = new BlockPos(maxX, 0, maxZ); - } - return maximumCoord; - } - /** * @return The minimum bounding-box coordinate containing this machine's blocks. */ diff --git a/src/main/java/forestry/greenhouse/PluginGreenhouse.java b/src/main/java/forestry/greenhouse/PluginGreenhouse.java index a6b14c5b0..a508f987d 100644 --- a/src/main/java/forestry/greenhouse/PluginGreenhouse.java +++ b/src/main/java/forestry/greenhouse/PluginGreenhouse.java @@ -6,21 +6,27 @@ import javax.annotation.Nonnull; import com.google.common.collect.Lists; import forestry.core.config.Constants; -import forestry.farming.blocks.EnumFarmBlockType; -import forestry.farming.proxy.ProxyFarming; import forestry.greenhouse.blocks.BlockGreenhouseType; import forestry.greenhouse.blocks.BlockRegistryGreenhouse; import forestry.greenhouse.proxy.ProxyGreenhouse; +import forestry.greenhouse.tiles.TileGreenhouseControl; +import forestry.greenhouse.tiles.TileGreenhouseDryer; +import forestry.greenhouse.tiles.TileGreenhouseFan; +import forestry.greenhouse.tiles.TileGreenhouseGearbox; +import forestry.greenhouse.tiles.TileGreenhouseHeater; +import forestry.greenhouse.tiles.TileGreenhousePlain; +import forestry.greenhouse.tiles.TileGreenhouseSprinkler; +import forestry.greenhouse.tiles.TileGreenhouseValve; import forestry.plugins.BlankForestryPlugin; import forestry.plugins.ForestryPlugin; import forestry.plugins.ForestryPluginUids; -import net.minecraft.client.Minecraft; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; 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.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -38,6 +44,20 @@ public class PluginGreenhouse extends BlankForestryPlugin { blocks = new BlockRegistryGreenhouse(); } + @Override + public void doInit() { + super.doInit(); + + GameRegistry.registerTileEntity(TileGreenhouseFan.class, "forestry.greenhouse.fan"); + GameRegistry.registerTileEntity(TileGreenhouseHeater.class, "forestry.greenhouse.heater"); + GameRegistry.registerTileEntity(TileGreenhouseDryer.class, "forestry.greenhouse.dryer"); + GameRegistry.registerTileEntity(TileGreenhouseSprinkler.class, "forestry.greenhouse.sprinkler"); + GameRegistry.registerTileEntity(TileGreenhouseValve.class, "forestry.greenhouse.valve"); + GameRegistry.registerTileEntity(TileGreenhouseGearbox.class, "forestry.greenhouse.gearbox"); + GameRegistry.registerTileEntity(TileGreenhouseControl.class, "forestry.greenhouse.controller"); + GameRegistry.registerTileEntity(TileGreenhousePlain.class, "forestry.greenhouse.plain"); + } + @Override public void preInit(){ MinecraftForge.EVENT_BUS.register(this); diff --git a/src/main/java/forestry/greenhouse/blocks/BlockGreenhouse.java b/src/main/java/forestry/greenhouse/blocks/BlockGreenhouse.java index 29915a1a9..221969638 100644 --- a/src/main/java/forestry/greenhouse/blocks/BlockGreenhouse.java +++ b/src/main/java/forestry/greenhouse/blocks/BlockGreenhouse.java @@ -16,6 +16,7 @@ import java.util.Map; import javax.annotation.Nonnull; +import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; import net.minecraft.block.properties.PropertyEnum; @@ -23,6 +24,7 @@ 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.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -121,11 +123,6 @@ public abstract class BlockGreenhouse extends BlockStructure { public void getSubBlocks(Item item, CreativeTabs tab, List list) { list.add(new ItemStack(item)); } - - @Override - public int damageDropped(IBlockState state) { - return getMetaFromState(state); - } @Override public TileEntity createTileEntity(World world, IBlockState state) { @@ -159,18 +156,44 @@ public abstract class BlockGreenhouse extends BlockStructure { @Override @SideOnly(Side.CLIENT) public EnumWorldBlockLayer getBlockLayer() { + if(getGreenhouseType() == BlockGreenhouseType.GLASS){ + return EnumWorldBlockLayer.TRANSLUCENT; + } return EnumWorldBlockLayer.CUTOUT; } @Override - public boolean isNormalCube(IBlockAccess world, BlockPos pos) { - IBlockState state = world.getBlockState(pos); - if(getGreenhouseType() == BlockGreenhouseType.SPRINKLER){ - return false; - } - return super.isNormalCube(world, pos); + public boolean isFullCube() { + return getGreenhouseType() != BlockGreenhouseType.GLASS && getGreenhouseType() == BlockGreenhouseType.SPRINKLER; } + @Override + public boolean isOpaqueCube() { + return getGreenhouseType() != BlockGreenhouseType.GLASS; + } + + @SideOnly(Side.CLIENT) + public boolean shouldSideBeRendered(IBlockAccess worldIn, BlockPos pos, EnumFacing side) + { + IBlockState iblockstate = worldIn.getBlockState(pos); + Block block = iblockstate.getBlock(); + + if (getGreenhouseType() == BlockGreenhouseType.GLASS) + { + if (worldIn.getBlockState(pos.offset(side.getOpposite())) != iblockstate) + { + return true; + } + + if (block == this) + { + return false; + } + } + + return block == this ? false : super.shouldSideBeRendered(worldIn, pos, side); + } + @SideOnly(Side.CLIENT) @Override public void registerModel(Item item, IModelManager manager) { diff --git a/src/main/java/forestry/greenhouse/blocks/BlockGreenhouseType.java b/src/main/java/forestry/greenhouse/blocks/BlockGreenhouseType.java index 829f8275a..bcbd0df75 100644 --- a/src/main/java/forestry/greenhouse/blocks/BlockGreenhouseType.java +++ b/src/main/java/forestry/greenhouse/blocks/BlockGreenhouseType.java @@ -72,7 +72,6 @@ public enum BlockGreenhouseType { TextureManager.registerSprite("blocks/greenhouse/fan.on"), TextureManager.registerSprite("blocks/greenhouse/heater.off"), TextureManager.registerSprite("blocks/greenhouse/heater.off"), - TextureManager.registerSprite("blocks/greenhouse/heater"), TextureManager.registerSprite("blocks/greenhouse/dryer"), TextureManager.registerSprite("blocks/greenhouse/control") ); diff --git a/src/main/java/forestry/greenhouse/models/ModelGreenhouse.java b/src/main/java/forestry/greenhouse/models/ModelGreenhouse.java index c28e0d51f..9fbf39f48 100644 --- a/src/main/java/forestry/greenhouse/models/ModelGreenhouse.java +++ b/src/main/java/forestry/greenhouse/models/ModelGreenhouse.java @@ -5,6 +5,7 @@ import forestry.greenhouse.blocks.BlockGreenhouseType; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.BlockModelShapes; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; @@ -45,11 +46,24 @@ public class ModelGreenhouse extends ModelBlockOverlay { BlockModelShapes modelShapes = Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes(); baker.addBakedModel(modelShapes.getModelForState(Block.getBlockFromItem(camouflageBlockStack.getItem()).getStateFromMeta(camouflageBlockStack.getItemDamage()))); } + else if(block.getGreenhouseType() == BlockGreenhouseType.GLASS){ + TextureAtlasSprite glassSprite = BlockGreenhouseType.getSprite(BlockGreenhouseType.GLASS, null); + baker.addBlockModel(block, pos, BlockGreenhouseType.getSprite(BlockGreenhouseType.GLASS, null), 100); + baker.setParticleSprite(glassSprite); + }else{ + TextureAtlasSprite plainSprite = BlockGreenhouseType.getSprite(BlockGreenhouseType.PLAIN, null); + baker.addBlockModel(block, pos, BlockGreenhouseType.getSprite(BlockGreenhouseType.PLAIN, null), 100); + baker.setParticleSprite(plainSprite); + } }else{ if(block.getGreenhouseType() == BlockGreenhouseType.GLASS){ + TextureAtlasSprite glassSprite = BlockGreenhouseType.getSprite(BlockGreenhouseType.GLASS, null); baker.addBlockModel(block, pos, BlockGreenhouseType.getSprite(BlockGreenhouseType.GLASS, null), 100); + baker.setParticleSprite(glassSprite); }else{ + TextureAtlasSprite plainSprite = BlockGreenhouseType.getSprite(BlockGreenhouseType.PLAIN, null); baker.addBlockModel(block, pos, BlockGreenhouseType.getSprite(BlockGreenhouseType.PLAIN, null), 100); + baker.setParticleSprite(plainSprite); } } if(block.getGreenhouseType() != BlockGreenhouseType.PLAIN && block.getGreenhouseType() != BlockGreenhouseType.GLASS){ diff --git a/src/main/java/forestry/greenhouse/multiblock/FakeGreenhouseController.java b/src/main/java/forestry/greenhouse/multiblock/FakeGreenhouseController.java index 50f6f15c5..84550357c 100644 --- a/src/main/java/forestry/greenhouse/multiblock/FakeGreenhouseController.java +++ b/src/main/java/forestry/greenhouse/multiblock/FakeGreenhouseController.java @@ -14,6 +14,7 @@ import forestry.core.fluids.FakeTankManager; import forestry.core.fluids.ITankManager; import forestry.core.multiblock.FakeMultiblockController; import forestry.energy.EnergyManager; +import net.minecraft.util.BlockPos; public class FakeGreenhouseController extends FakeMultiblockController implements IGreenhouseControllerInternal { public static final FakeGreenhouseController instance = new FakeGreenhouseController(); @@ -31,5 +32,10 @@ public class FakeGreenhouseController extends FakeMultiblockController implement public EnergyManager getEnergyManager() { return null; } + + @Override + public boolean isInGreenhouse(BlockPos pos) { + return false; + } } diff --git a/src/main/java/forestry/greenhouse/multiblock/GreenhouseController.java b/src/main/java/forestry/greenhouse/multiblock/GreenhouseController.java index 6fb2ce268..87cc6e99d 100644 --- a/src/main/java/forestry/greenhouse/multiblock/GreenhouseController.java +++ b/src/main/java/forestry/greenhouse/multiblock/GreenhouseController.java @@ -42,6 +42,7 @@ import forestry.core.tiles.ILiquidTankTile; import forestry.energy.EnergyManager; import forestry.greenhouse.blocks.BlockGreenhouse; import forestry.greenhouse.network.packets.PacketCamouflageUpdate; +import forestry.greenhouse.tiles.TileGreenhouseSprinkler; import net.minecraft.block.state.IBlockState; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -341,6 +342,20 @@ public class GreenhouseController extends RectangularMultiblockControllerBase im } + @Override + protected void isBlockGoodForInterior(World world, BlockPos pos) throws MultiblockValidationException { + } + + @Override + public boolean isInGreenhouse(BlockPos pos) { + for(InternalBlock inerBlock : internalBlocks){ + if(inerBlock.pos.equals(pos)){ + return true; + } + } + return false; + } + @Override protected void isMachineWhole() throws MultiblockValidationException { int minX = getSizeLimits().getMinimumXSize(); @@ -442,7 +457,7 @@ public class GreenhouseController extends RectangularMultiblockControllerBase im } } else { if (part != null) { - if (!myClass.equals(part.getMultiblockLogic().getController().getClass())) { + if (myClass.equals(part.getMultiblockLogic().getController().getClass())) { throw new MultiblockValidationException(StatCollector.translateToLocalFormatted("for.multiblock.error.invalid.part", x, y, z, myClass.getSimpleName())); } isGoodForInterior(part); @@ -453,31 +468,49 @@ public class GreenhouseController extends RectangularMultiblockControllerBase im } } if(isNextRoof){ - addInternalBlock(new InternalBlock(getMinimumCoord().add(1, 1, 1)), internalBlocks); - }else{ - throw new MultiblockValidationException(StatCollector.translateToLocalFormatted("for.multiblock.error.space.closed")); + InternalBlock iB = new InternalBlock(getMinimumCoord().add(1, 1, 1)); + internalBlocks.add(iB); + addInternalBlock(iB, internalBlocks); + break; } } + if(internalBlocks.isEmpty()){ + throw new MultiblockValidationException(StatCollector.translateToLocalFormatted("for.multiblock.error.space.closed")); + } this.internalBlocks.addAll(internalBlocks); } - private InternalBlock addInternalBlock(InternalBlock internalBlock, List internalBlocks) throws MultiblockValidationException{ + private void addInternalBlock(InternalBlock internalBlock, List internalBlocks) throws MultiblockValidationException{ isBlockGoodForInterior(worldObj, internalBlock.pos); for(Map.Entry entry : internalBlock.testetFaces.entrySet()){ if(!entry.getValue()){ BlockPos posFacing = new BlockPos(internalBlock.pos.getX() + entry.getKey().getFrontOffsetX(), internalBlock.pos.getY() + entry.getKey().getFrontOffsetY(), internalBlock.pos.getZ() + entry.getKey().getFrontOffsetZ()); BlockPos minPos = getMinimumCoord(); - BlockPos maxPos = getMaxXYCoord(); + BlockPos maxPos = getMaximumCoord(); if(minPos.getX() > posFacing.getX() || minPos.getZ() > posFacing.getZ() || maxPos.getX() < posFacing.getX() || maxPos.getZ() < posFacing.getZ()){ throw new MultiblockValidationException(StatCollector.translateToLocalFormatted("for.multiblock.error.space.closed")); } - if(worldObj.getTileEntity(posFacing) instanceof IGreenhouseComponent && worldObj.getBlockState(posFacing).getBlock().isSideSolid(worldObj, posFacing, entry.getKey())){ - entry.setValue(true); + + TileEntity tile = worldObj.getTileEntity(posFacing); + + if(tile instanceof IGreenhouseComponent){ + if(((IGreenhouseComponent) tile).getMultiblockLogic().getController() != this){ + throw new MultiblockValidationException(StatCollector.translateToLocalFormatted("for.multiblock.error.not.connected.part", posFacing.getX(), posFacing.getY(), posFacing.getZ())); + } + else if(!(tile instanceof TileGreenhouseSprinkler)){ + entry.setValue(true); + } + }else{ + InternalBlock iB = new InternalBlock(posFacing, entry.getKey().getOpposite(), internalBlock); + if(!internalBlocks.contains(iB)){ + internalBlocks.add(iB); + addInternalBlock(iB, internalBlocks); + }else{ + entry.setValue(true); + } } - internalBlocks.add(addInternalBlock(new InternalBlock(posFacing, entry.getKey(), internalBlock), internalBlocks)); } } - return internalBlock; } @Override @@ -485,25 +518,34 @@ public class GreenhouseController extends RectangularMultiblockControllerBase im return CamouflageType.DEFAULT; } - private class InternalBlock{ + private static class InternalBlock{ public BlockPos pos; public EnumMap testetFaces = Maps.newEnumMap(EnumFacing.class); public InternalBlock root; - public InternalBlock(BlockPos pos) { + private InternalBlock(BlockPos pos) { this.pos = pos; for(EnumFacing facing : EnumFacing.VALUES){ testetFaces.put(facing, false); } } - public InternalBlock(BlockPos pos, EnumFacing facing, InternalBlock root) { + private InternalBlock(BlockPos pos, EnumFacing facing, InternalBlock root) { this.pos = pos; for(EnumFacing f : EnumFacing.VALUES){ - testetFaces.put(facing, f == facing); + testetFaces.put(f, f == facing); } this.root = root; } + + @Override + public boolean equals(Object obj) { + if(!(obj instanceof InternalBlock)){ + return false; + } + InternalBlock ib = (InternalBlock) obj; + return ib.pos.equals(pos); + } } } diff --git a/src/main/java/forestry/greenhouse/multiblock/GreenhouseMultiblockSizeLimits.java b/src/main/java/forestry/greenhouse/multiblock/GreenhouseMultiblockSizeLimits.java index 55e7bf91e..22629a967 100644 --- a/src/main/java/forestry/greenhouse/multiblock/GreenhouseMultiblockSizeLimits.java +++ b/src/main/java/forestry/greenhouse/multiblock/GreenhouseMultiblockSizeLimits.java @@ -21,7 +21,7 @@ class GreenhouseMultiblockSizeLimits implements IMultiblockSizeLimits { @Override public int getMinimumNumberOfBlocksForAssembledMachine() { - return 5 * 5 * 6; + return 5 * 5 * 5 - 36; } @Override @@ -51,6 +51,6 @@ class GreenhouseMultiblockSizeLimits implements IMultiblockSizeLimits { @Override public int getMinimumYSize() { - return 6; + return 5; } } diff --git a/src/main/java/forestry/greenhouse/multiblock/IGreenhouseControllerInternal.java b/src/main/java/forestry/greenhouse/multiblock/IGreenhouseControllerInternal.java index b2896f9ee..fda716c0e 100644 --- a/src/main/java/forestry/greenhouse/multiblock/IGreenhouseControllerInternal.java +++ b/src/main/java/forestry/greenhouse/multiblock/IGreenhouseControllerInternal.java @@ -20,7 +20,7 @@ import forestry.core.network.IStreamableGui; import forestry.core.tiles.IClimatised; import forestry.energy.EnergyManager; -public interface IGreenhouseControllerInternal extends IGreenhouseController, IMultiblockControllerInternal, IClimatised, IRestrictedAccess, IStreamableGui { +public interface IGreenhouseControllerInternal extends IGreenhouseController, IMultiblockControllerInternal, IRestrictedAccess, IStreamableGui { ITankManager getTankManager(); diff --git a/src/main/java/forestry/greenhouse/proxy/ProxyGreenhouseClient.java b/src/main/java/forestry/greenhouse/proxy/ProxyGreenhouseClient.java index 6edafb10e..0b0188d07 100644 --- a/src/main/java/forestry/greenhouse/proxy/ProxyGreenhouseClient.java +++ b/src/main/java/forestry/greenhouse/proxy/ProxyGreenhouseClient.java @@ -12,11 +12,8 @@ package forestry.greenhouse.proxy; import net.minecraft.block.Block; import net.minecraft.client.resources.model.ModelResourceLocation; -import net.minecraft.item.ItemStack; import forestry.core.models.BlockModelIndex; import forestry.core.proxy.Proxies; -import forestry.farming.PluginFarming; -import forestry.farming.models.ModelFarmBlock; import forestry.greenhouse.PluginGreenhouse; import forestry.greenhouse.blocks.BlockGreenhouseType; import forestry.greenhouse.models.ModelGreenhouse; diff --git a/src/main/resources/assets/forestry/textures/blocks/greenhouse/control.png b/src/main/resources/assets/forestry/textures/blocks/greenhouse/control.png new file mode 100644 index 0000000000000000000000000000000000000000..37df85dbf34a6c80901735840e2ae33028ef09b6 GIT binary patch literal 398 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 yRj+UCKfJS_owNG6+fcL6|M~om_5T89z|0>2 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/forestry/textures/blocks/greenhouse/gears.png b/src/main/resources/assets/forestry/textures/blocks/greenhouse/gears.png new file mode 100644 index 0000000000000000000000000000000000000000..59bf36b0150b0b405a6d74f7cef4f4bf401ea629 GIT binary patch literal 480 zcmV<60U!Q}P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02p*dSaefwW^{L9 za%BK;VQFr3E^cLXAT%y8E;js(W8VM(0Z~arK~y+TW55Ug|NjrhWCM~6(9_lXZ)|K# zG=^$J02>>t|B8x=C|E#1;J=iV6b8m>fVsIjSks!*cmJ2{zXWEhYiPg?laY~yv#}Zg z5>!!9{lE6qmH#>G4#5?}@cIk4|Ia&m6Tbl<$>oP{{$F_aIheip$j$#{JFkG*bN3wo zUj%d=UIQE)9RBaT{o?lB#1{o2d_i%(w1?*)+L&c|>6&pUhjzl^L5m=D7fwjKFjwDSUf10Hq8l zXa6feHOea}{1=yy_^+X+1~&|^3#4Ub|EsA&6k|(7AdJ%hWUNmhX+yQ)2Xx4d3=9Bn W%`61RW79qW0000PN298nV^M)V&;i2tw%hDel!L=Z*%gFpfpgAp-^At50|=X?Emd)K{L0>*#d zCT;I|zwh%r?|t6)d3yi!^|sb$YO0r2QxsLx(i~}r-?jF8&V%r??$(41zviZzdrXR& zf5Lvx+P7x@;}j+Sp>=j!-O){wVkF(NYQ%s$n@qvk6ct*VP07jtu;>`*)AV}RpI?6E zqBXVNwONRA(NrVo*P4gZpkuhTQyCsmMAfx6Tph|vFhCMmGM!B(bW_UKyK-?Qcx?}} zE;={G8mMlFvgI zUaoL8yb7h&xYQomP)G-@dRM;ZcDY98P#qw^Bt>mOCC7;w_ zI+0tNs<0pdl0dgi=*L&|OZ6L;VfGu-q%6tPCWd&i8@!bjmG0is;^obm6vh>&h<%$+KF)n-jsjf}ZE#G)?c{VqoX5!nJ^cpm)>=VdstlNTi3BMICZ zj+Z#j5hOnoi4iqaEk0BshDVeDQ={bvK7{navxw* zdS8ew4?1R+PLpAtG^D1&yjz|i@|q8bVeUtX5L17BQF;tcS^ zjpBJAFhPHiW7JqIsK()?Ab5(29Kog}dN!@Wz9%OfbL@LjVKP~fgL2TTz`!EMaGZ~4 zWFgKoK~)rkARu~GU#ys-LYOJ3nl%%i)*;6!hG#j~**d_>lShj}Ld$iil$U38)jBj_qGj_I@JHS4dqj; z^vil5P{VBT02c>lwsZOYoLpJOYMok%A^XQkf>jJpl$@&`KEzHLD`(En@3yNkF_@b# z`Z@SwdHb{A>XcE}9=xklMqSIEUAkt4VVlb>6d87S*}tIq_TB*>_CVM#z)l=u(P7l1 zP0NBrcSM7I*tGiz?=SeELPf`(=^PzG!7;y8j>ocG4dzGTLmzzJWJ?d6Q_8c{#qQ@t z`Ht>qR3sKjf&jsr1Q(tUq7qyP5WGon;rSpc!G!?9n*VfgGA2zB7zW(A$_@MUjKNC;A zRCoUQnsMRig24NmE}T0OI5%(I?K-fziu2yM{mSxR=brxHC*SwK-F@Qpo<&=iEbYB+ ze0yto({l$$XLBs&8X0{gvg6{R-N!!b9qzr(9N#r|n0AeVr3)TfcX8}pYX76YXq9V( zU)g$K^o{N3POYxFdFkZtpSzTKJ8BnRId=I&n)+n4cKz|*hX)qFa7L_McxlV!AGiPV zm)JXJ>8elLx)$wPHS+4dhR<&bCypLstG12ni_U*{OT9{ x?h~h%>|eR(o3~%Qy7TVI?kyAEzq{(HsE(D(dXC?Gb2&sowKTOx4z1rh@-OksnFas= literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/forestry/textures/blocks/greenhouse/heater.on.png b/src/main/resources/assets/forestry/textures/blocks/greenhouse/heater.on.png new file mode 100644 index 0000000000000000000000000000000000000000..fc8f2eb7b0aa028b83ff94e8835e1c700f8411e6 GIT binary patch literal 15281 zcmeI3ZEO@p7{?a_NE_N>#DGe0Js_chz1@4+ds(kn${pBB53xO^h(Pyt=h{v0cCWYF z-nD8{BqY2TVgwaGs3^f;M2t142?-)a6BSJq^+RJ~kOahNFq(#dFF1Rz+v#=E1dLzi zlDpk!{_{M~%x~tI+b_Fw-P-$Ws_&|%D5|EVIot-XbIk9oneg|XKdy`LQk81npi@-s zY4bbnxn;F?Q9#KM~AdDpn1E8kvNZ+_WJD(-s^RHm(xzp!Lyu;b#aW-CAc}k?W7AI zTd*451=4a{XbZ0{q=Qz2t=lkC0?TGH8GFWM*V0|A!|(UAoRf7r8Q6o-2UJ7MGOE5P zAEX#340I{2qzpw#%cdB_~-b`K0>N ziQLd+i3JIe1gfD!KSxEsRJUemdbc)7%91>3Vz?%eNGW&4@g|cMQ|rd6eu$uew4$dT z9Y_JT4d_~5S^}&3;Zzn?n!TaK%ZoEElBrBOc92yjaWj>?TW%}lS117IDumKNG_-V7 z(-Oh_E?ZYbNQXkXT}3Zluc)$?(dz>&>QY|sax@SY4G@I;(Zg^qhVw@qyx?#OJhzN< z2pne#lJAMch-k7BAE*$+#R;6(8pF~PjREUN77cMqQLKF}ab!t|Yw4tD1eK)N1=y6@ z6=2JamY$_uC4{tumWIOuL05pS)NJv}?KGi9)eTXVKub6X8|;cA3vrj^mVBa{amHni z;Y7EO@k?=z0kY_ed3dKE#Qiylk%-lOLg=t2^_kTIL+1|`S(9M+@~}L-pNlzx%m5Eu zD2D^^jL+la7$#Hng^Uh)-ORx!v9!x9n+!GU)KIU9xn9Rcix9D}p7}3vr8D9*} z#pm^NjL#v*9l-7L@Nr);MTIaEQZ*|&+^qwaT@3ef?qq8Rz2jSpLPE)%P$@C31GD}b zY{ddB9ciT#%k;_Bu^>w3*%p+{@&Iyx9oJeOR>`yArc7MUsUgV6x42K9Bhw93TzTa~ z<$6sXMAza*MofdIF1SOcQu+C)Xa}r<`!yP5&s>cyvC$yC_=lge<)tKnZ z_4j)?_+cI9Z^6|nqpln9u2va!Eqgw!Dn<|+Mc`VD-V7?VT^ugy%w)DU`p*%~c z*v-5t&*)}GMPiX82oStUaN+qND#3*S!J7mZo)4lDTnG@nNpRu$AS%Iy0KuCC7oHEI z5?lxnyh(83`5-F6g#f{u1Q(tUq7qyP5WGon;rSpc!G!?9n*67|_Q97sX{os_LQ#WDC~9aMMP0oPua_vQkE5uc zJ1I)oPf_!idOlj!**|o)W?KCc`x9IHU*5KZ+cW*O=Gf@(E5dJ5 zGlpBwC)(-Rp~q&#&dIhJ!^=lncM3y#>co;~UawbIZe83$A3FWy@&o%$-R{5j;K)P# z$wzmu`Jrad#f^Ixe-!$B+UB;p??%6^J#y@W+D$VvZ7X_e-r^UwoSeVy{WBw0#LT=By}Z;C1rt33 zJ+nVO$@hV3Zh5*mhFJLTo$SlkWFXMGld01oI-!&C=gKWyn-2WGpH-seswHxvb@HAR zqr<;{r8RC2V_5K|xR!N7(4mzY4{n(?{GBvwTdU3aQ2QJALb*9x0#0l?Bk;V&ESlwk zfu&l2P4ENvKoO>7kw+Fx_rHH*IP&Ax=`#mPV^!bSzTdz)AxpCDjDf$Rm1q6?w+vn< z&#Vz;`B%oYr}|`%(+<%KrRH0YMCYnMsGQAN(xu5#En6?n(8}h-q{`w~e!5{br^afb zOD3jiQP)^B3Nsz9Y<*>aboJ*O{M)|%I(+|y1^