diff --git a/src/main/java/forestry/apiculture/blocks/BlockAlveary.java b/src/main/java/forestry/apiculture/blocks/BlockAlveary.java index 8ede96e59..ef04f76b1 100644 --- a/src/main/java/forestry/apiculture/blocks/BlockAlveary.java +++ b/src/main/java/forestry/apiculture/blocks/BlockAlveary.java @@ -50,9 +50,9 @@ import forestry.core.blocks.BlockStructure; import forestry.core.proxy.Proxies; public class BlockAlveary extends BlockStructure implements IStateMapperRegister { - private static final PropertyEnum TYPE = PropertyEnum.create("alveary", Type.class); + private static final PropertyEnum TYPE = PropertyEnum.create("alveary", AlvearyType.class); private static final PropertyEnum STATE = PropertyEnum.create("state", State.class); - private static final PropertyEnum LEVEL = PropertyEnum.create("type", Level.class); + private static final PropertyEnum LEVEL = PropertyEnum.create("type", AlvearyLevel.class); private enum State implements IStringSerializable { ON, OFF; @@ -63,8 +63,8 @@ public class BlockAlveary extends BlockStructure implements IStateMapperRegister } } - private enum Level implements IStringSerializable { - BOTTOM, LEFT, RIGHT; + private enum AlvearyLevel implements IStringSerializable { + MIDDLE, LEFT, RIGHT; @Override public String getName() { @@ -72,7 +72,7 @@ public class BlockAlveary extends BlockStructure implements IStateMapperRegister } } - public enum Type implements IStringSerializable { + public enum AlvearyType implements IStringSerializable { PLAIN, ENTRANCE, SWARMER, @@ -82,7 +82,7 @@ public class BlockAlveary extends BlockStructure implements IStateMapperRegister STABILISER, SIEVE; - public static final Type[] VALUES = values(); + public static final AlvearyType[] VALUES = values(); @Override public String getName() { @@ -95,7 +95,8 @@ public class BlockAlveary extends BlockStructure implements IStateMapperRegister 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)); + setStepSound(soundTypeWood); + setDefaultState(this.blockState.getBaseState().withProperty(TYPE, AlvearyType.PLAIN).withProperty(STATE, State.OFF).withProperty(LEVEL, AlvearyLevel.MIDDLE)); } @SuppressWarnings({"rawtypes", "unchecked"}) @@ -137,11 +138,11 @@ public class BlockAlveary extends BlockStructure implements IStateMapperRegister @Override public TileEntity createTileEntity(World world, IBlockState state) { int metadata = getMetaFromState(state); - if (metadata < 0 || metadata > Type.VALUES.length) { + if (metadata < 0 || metadata > AlvearyType.VALUES.length) { return null; } - Type type = Type.VALUES[metadata]; + AlvearyType type = AlvearyType.VALUES[metadata]; switch (type) { case SWARMER: return new TileAlvearySwarmer(); @@ -183,12 +184,12 @@ public class BlockAlveary extends BlockStructure implements IStateMapperRegister /* STATES */ @Override public IBlockState getStateFromMeta(int meta) { - return getDefaultState().withProperty(TYPE, Type.values()[meta]); + return getDefaultState().withProperty(TYPE, AlvearyType.values()[meta]); } @Override public int getMetaFromState(IBlockState state) { - return ((Type) state.getValue(TYPE)).ordinal(); + return ((AlvearyType) state.getValue(TYPE)).ordinal(); } @Override @@ -217,33 +218,30 @@ public class BlockAlveary extends BlockStructure implements IStateMapperRegister } } - int meta = ((Type) state.getValue(TYPE)).ordinal(); + IBlockState stateXP = world.getBlockState(new BlockPos(pos.getX() + 1, pos.getY(), pos.getZ())); + IBlockState stateXM = world.getBlockState(new BlockPos(pos.getX() - 1, pos.getY(), pos.getZ())); + Block blockXP = stateXP.getBlock(); + Block blockXM = stateXM.getBlock(); - 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); + state = state.withProperty(LEVEL, AlvearyLevel.MIDDLE); if (blockXP == this && blockXM != this) { - - IBlockState stateNeighbor = world.getBlockState(new BlockPos(pos.getX() + 1, pos.getY(), pos.getZ())); - if (stateNeighbor.getBlock().getMetaFromState(stateNeighbor) == 1) { + if (stateXP.getValue(TYPE) == AlvearyType.ENTRANCE) { if (world.getBlockState(new BlockPos(pos.getX(), pos.getY(), pos.getZ() + 1)).getBlock() != this) { - switchForSide(state, world, pos); + state = state.withProperty(LEVEL, AlvearyLevel.RIGHT); } else { - switchForSide(state, world, pos); + state = state.withProperty(LEVEL, AlvearyLevel.LEFT); } } } else if (blockXP != this && blockXM == this) { - IBlockState stateNeighbor = world.getBlockState(new BlockPos(pos.getX() - 1, pos.getY(), pos.getZ())); - if (stateNeighbor.getBlock().getMetaFromState(stateNeighbor) == 1) { + if (stateXM.getValue(TYPE) == AlvearyType.ENTRANCE) { if (world.getBlockState(new BlockPos(pos.getX(), pos.getY(), pos.getZ() + 1)).getBlock() != this) { - switchForSide(state, world, pos); + state = state.withProperty(LEVEL, AlvearyLevel.LEFT); } else { - switchForSide(state, world, pos); + state = state.withProperty(LEVEL, AlvearyLevel.RIGHT); } } @@ -252,22 +250,6 @@ public class BlockAlveary extends BlockStructure implements IStateMapperRegister return super.getActualState(state, world, pos); } - private void switchForSide(IBlockState state, IBlockAccess world, BlockPos pos) { - - 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); - } - - } - @Override public void registerStateMapper() { Proxies.render.registerStateMapper(this, new AlvearyStateMapper()); @@ -279,14 +261,14 @@ public class BlockAlveary extends BlockStructure implements IStateMapperRegister @Override protected ModelResourceLocation getModelResourceLocation(IBlockState state) { LinkedHashMap linkedhashmap = Maps.newLinkedHashMap(state.getProperties()); - if (linkedhashmap.get(TYPE) != Type.PLAIN) { + if (linkedhashmap.get(TYPE) != AlvearyType.PLAIN) { linkedhashmap.remove(LEVEL); } - 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) { + if (linkedhashmap.get(TYPE) == AlvearyType.SIEVE + || linkedhashmap.get(TYPE) == AlvearyType.ENTRANCE + || linkedhashmap.get(TYPE) == AlvearyType.STABILISER + || linkedhashmap.get(TYPE) == AlvearyType.HYGRO + || linkedhashmap.get(TYPE) == AlvearyType.PLAIN) { linkedhashmap.remove(STATE); } String s = String.format("%s:%s", @@ -311,7 +293,7 @@ public class BlockAlveary extends BlockStructure implements IStateMapperRegister } } - public ItemStack get(Type type) { + public ItemStack get(AlvearyType type) { return new ItemStack(this, 1, type.ordinal()); } } diff --git a/src/main/java/forestry/apiculture/blocks/BlockCandle.java b/src/main/java/forestry/apiculture/blocks/BlockCandle.java index 74e109e8f..e01fcc68b 100644 --- a/src/main/java/forestry/apiculture/blocks/BlockCandle.java +++ b/src/main/java/forestry/apiculture/blocks/BlockCandle.java @@ -128,6 +128,7 @@ public class BlockCandle extends BlockTorch implements IItemModelRegister { @Override public void registerModel(Item item, IModelManager manager) { manager.registerItemModel(item, 0, "candle"); + manager.registerItemModel(item, 1, "candle"); } @Override @@ -141,10 +142,7 @@ public class BlockCandle extends BlockTorch implements IItemModelRegister { @Override public int colorMultiplier(IBlockAccess worldIn, BlockPos pos, int renderPass) { - if(renderPass < 3){ - return ((TileCandle)worldIn.getTileEntity(pos)).getColour(); - } - return 16777215; + return ((TileCandle)worldIn.getTileEntity(pos)).getColour(); } @SuppressWarnings({"rawtypes", "unchecked"}) diff --git a/src/main/java/forestry/apiculture/items/ItemBlockCandle.java b/src/main/java/forestry/apiculture/items/ItemBlockCandle.java index e210e9da6..3abc3cc30 100644 --- a/src/main/java/forestry/apiculture/items/ItemBlockCandle.java +++ b/src/main/java/forestry/apiculture/items/ItemBlockCandle.java @@ -30,8 +30,8 @@ public class ItemBlockCandle extends ItemBlockForestry { int value = 0xffffff; if (pass == 1 && stack.hasTagCompound()) { NBTTagCompound tag = stack.getTagCompound(); - if (tag.hasKey("colour")) { - value = tag.getInteger("colour"); + if (tag.hasKey(BlockCandle.colourTagName)) { + value = tag.getInteger(BlockCandle.colourTagName); } } return value; diff --git a/src/main/java/forestry/apiculture/multiblock/TileAlveary.java b/src/main/java/forestry/apiculture/multiblock/TileAlveary.java index 9980ff757..cfc1a44ba 100644 --- a/src/main/java/forestry/apiculture/multiblock/TileAlveary.java +++ b/src/main/java/forestry/apiculture/multiblock/TileAlveary.java @@ -48,10 +48,10 @@ public abstract class TileAlveary extends MultiblockTileEntityForestry 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); + this.worldObj.setBlockState(getPos(), getBlockType().getStateFromMeta(BlockAlveary.AlvearyType.ENTRANCE.ordinal()), 2); } } } @@ -49,7 +49,7 @@ public class TileAlvearyPlain extends TileAlveary implements ITriggerProvider { if (!worldObj.isRemote) { // set alveary entrance block meta back to normal - this.worldObj.setBlockState(getPos(), getBlockType().getStateFromMeta(BlockAlveary.Type.PLAIN.ordinal()), 2); + this.worldObj.setBlockState(getPos(), getBlockType().getStateFromMeta(BlockAlveary.AlvearyType.PLAIN.ordinal()), 2); } } diff --git a/src/main/java/forestry/apiculture/multiblock/TileAlvearySieve.java b/src/main/java/forestry/apiculture/multiblock/TileAlvearySieve.java index 5867b8d55..22b922109 100644 --- a/src/main/java/forestry/apiculture/multiblock/TileAlvearySieve.java +++ b/src/main/java/forestry/apiculture/multiblock/TileAlvearySieve.java @@ -33,7 +33,7 @@ public class TileAlvearySieve extends TileAlveary implements IAlvearyComponent.B private final InventoryAlvearySieve inventory; public TileAlvearySieve() { - super(BlockAlveary.Type.SIEVE); + super(BlockAlveary.AlvearyType.SIEVE); this.inventory = new InventoryAlvearySieve(this); this.beeListener = new AlvearySieveBeeListener(inventory); } diff --git a/src/main/java/forestry/apiculture/multiblock/TileAlvearySwarmer.java b/src/main/java/forestry/apiculture/multiblock/TileAlvearySwarmer.java index 27f7c930a..818c7378c 100644 --- a/src/main/java/forestry/apiculture/multiblock/TileAlvearySwarmer.java +++ b/src/main/java/forestry/apiculture/multiblock/TileAlvearySwarmer.java @@ -45,7 +45,7 @@ public class TileAlvearySwarmer extends TileAlveary implements ISidedInventory, private boolean active; public TileAlvearySwarmer() { - super(BlockAlveary.Type.SWARMER); + super(BlockAlveary.AlvearyType.SWARMER); this.inventory = new InventorySwarmer(this); } diff --git a/src/main/java/forestry/arboriculture/blocks/BlockForestryLeaves.java b/src/main/java/forestry/arboriculture/blocks/BlockForestryLeaves.java index 581968340..508fa9b27 100644 --- a/src/main/java/forestry/arboriculture/blocks/BlockForestryLeaves.java +++ b/src/main/java/forestry/arboriculture/blocks/BlockForestryLeaves.java @@ -279,14 +279,18 @@ public class BlockForestryLeaves extends BlockLeavesBase implements ITileEntityP TileLeaves leaves = getLeafTile(world,pos); if (leaves == null) { - return super.colorMultiplier(world, pos); + return super.colorMultiplier(world, pos, 0); } + int colour = super.colorMultiplier(world, pos, 0); + if(renderPass == 0){ + colour = leaves.getFoliageColour(Proxies.common.getClientInstance().thePlayer); + if (colour == PluginArboriculture.proxy.getFoliageColorBasic()) { + return super.colorMultiplier(world, pos, 0); + } - int colour = leaves.getFoliageColour(Proxies.common.getClientInstance().thePlayer); - if (colour == PluginArboriculture.proxy.getFoliageColorBasic()) { - colour = super.colorMultiplier(world, pos); + }else{ + colour = leaves.getFruitColour(); } - return colour; } diff --git a/src/main/java/forestry/arboriculture/items/ItemBlockLeaves.java b/src/main/java/forestry/arboriculture/items/ItemBlockLeaves.java index cf94e5d54..71b282396 100644 --- a/src/main/java/forestry/arboriculture/items/ItemBlockLeaves.java +++ b/src/main/java/forestry/arboriculture/items/ItemBlockLeaves.java @@ -62,8 +62,12 @@ public class ItemBlockLeaves extends ItemBlockForestry { TileLeaves tileLeaves = new TileLeaves(); tileLeaves.readFromNBT(itemStack.getTagCompound()); - - return tileLeaves.getFoliageColour(Proxies.common.getPlayer()); + + if(renderPass == 1){ + return tileLeaves.getFruitColour(); + }else{ + return tileLeaves.getFoliageColour(Proxies.common.getPlayer()); + } } @Override diff --git a/src/main/java/forestry/arboriculture/items/ItemBlockWood.java b/src/main/java/forestry/arboriculture/items/ItemBlockWood.java index 74048d15c..e4035b1ff 100644 --- a/src/main/java/forestry/arboriculture/items/ItemBlockWood.java +++ b/src/main/java/forestry/arboriculture/items/ItemBlockWood.java @@ -35,7 +35,7 @@ import forestry.arboriculture.IWoodTyped; import forestry.arboriculture.tiles.TileWood; import forestry.core.config.Constants; import forestry.core.items.ItemBlockForestry; -import forestry.core.render.model.ModelManager; +import forestry.core.models.ModelManager; import forestry.core.utils.BlockUtil; import forestry.core.utils.StringUtil; diff --git a/src/main/java/forestry/arboriculture/proxy/ProxyArboricultureClient.java b/src/main/java/forestry/arboriculture/proxy/ProxyArboricultureClient.java index 6200ce297..e45220f5e 100644 --- a/src/main/java/forestry/arboriculture/proxy/ProxyArboricultureClient.java +++ b/src/main/java/forestry/arboriculture/proxy/ProxyArboricultureClient.java @@ -14,8 +14,8 @@ import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.world.ColorizerFoliage; import forestry.arboriculture.render.ModelLeaves; +import forestry.core.models.BlockModelIndex; import forestry.core.proxy.Proxies; -import forestry.core.render.model.BlockModelIndex; import forestry.plugins.PluginArboriculture; public class ProxyArboricultureClient extends ProxyArboriculture { diff --git a/src/main/java/forestry/arboriculture/render/ModelLeaves.java b/src/main/java/forestry/arboriculture/render/ModelLeaves.java index 1c3a76ac9..369404ebb 100644 --- a/src/main/java/forestry/arboriculture/render/ModelLeaves.java +++ b/src/main/java/forestry/arboriculture/render/ModelLeaves.java @@ -10,8 +10,6 @@ ******************************************************************************/ 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; @@ -21,13 +19,13 @@ import forestry.arboriculture.blocks.BlockForestryLeaves; import forestry.arboriculture.genetics.TreeHelper; import forestry.arboriculture.items.ItemBlockLeaves; import forestry.arboriculture.tiles.TileLeaves; +import forestry.core.models.ModelBlockOverlay; import forestry.core.proxy.Proxies; -import forestry.core.render.model.ModelBlockOverlay; -public class ModelLeaves extends ModelBlockOverlay { +public class ModelLeaves extends ModelBlockOverlay { @Override - public void renderInventory(Block block, ItemStack itemStack, IModelBaker renderer) { + public void renderInventory(BlockForestryLeaves block, ItemStack itemStack, IModelBaker baker) { if (!(itemStack.getItem() instanceof ItemBlockLeaves) || block == null) { return; @@ -40,48 +38,40 @@ public class ModelLeaves extends ModelBlockOverlay { leaves.setTree(TreeHelper.treeTemplates.get(0)); } - TextureAtlasSprite leavesIcon = leaves.getSprite(Proxies.render.fancyGraphicsEnabled()); + TextureAtlasSprite leavesIcon = leaves.getLeaveSprite(Proxies.render.fancyGraphicsEnabled()); if (leavesIcon == null) { return; } - int color = leaves.getFoliageColour(Proxies.common.getPlayer()); - renderer.setColor(color); + baker.setColorIndex(0); - 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); + baker.renderFaceYNeg(null, leavesIcon); + baker.renderFaceYPos(null, leavesIcon); + baker.renderFaceZNeg(null, leavesIcon); + baker.renderFaceZPos(null, leavesIcon); + baker.renderFaceXNeg(null, leavesIcon); + baker.renderFaceXPos(null, leavesIcon); // add fruit if (!leaves.hasFruit()) { return; } - TextureAtlasSprite fruitTexture = leaves.getFruitTexture(); + TextureAtlasSprite fruitTexture = leaves.getFruitSprite(); if (fruitTexture == null) { return; } - int fruitColor = leaves.getFruitColour(); - renderer.setColor(fruitColor); + baker.setColorIndex(1); - 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); + baker.renderFaceYNeg(null, fruitTexture); + baker.renderFaceYPos(null, fruitTexture); + baker.renderFaceZNeg(null, fruitTexture); + baker.renderFaceZPos(null, fruitTexture); + baker.renderFaceXNeg(null, fruitTexture); + baker.renderFaceXPos(null, fruitTexture); } @Override - public boolean renderInWorld(Block block, IBlockAccess world, BlockPos pos, IModelBaker renderer) { + public boolean renderInWorld(BlockForestryLeaves block, IBlockAccess world, BlockPos pos, IModelBaker baker) { TileLeaves tile = BlockForestryLeaves.getLeafTile(world, pos); if (tile == null) { @@ -89,58 +79,28 @@ public class ModelLeaves extends ModelBlockOverlay { } // Render the plain leaf block. - renderer.renderStandardBlock(block, pos, tile.getSprite(Proxies.render.fancyGraphicsEnabled())); + baker.renderStandardBlock(block, pos, tile.getLeaveSprite(Proxies.render.fancyGraphicsEnabled())); // Render overlay for fruit leaves. - TextureAtlasSprite fruitIcon = tile.getFruitTexture(); + TextureAtlasSprite fruitSprite = tile.getFruitSprite(); - if (fruitIcon != null) { - int fruitColor = tile.getFruitColour(); - renderFruitOverlay(world, block, pos, renderer, fruitIcon, fruitColor); + if (fruitSprite != null) { + renderFruitOverlay(world, block, pos, baker, fruitSprite, 1); } 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; + private boolean renderFruitOverlay(IBlockAccess world, BlockForestryLeaves block, BlockPos pos, IModelBaker baker, TextureAtlasSprite sprite, int colorIndex) { // 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); + renderBottomFace(world, block, pos, baker, sprite, colorIndex); + renderTopFace(world, block, pos, baker, sprite, colorIndex); + renderEastFace(world, block, pos, baker, sprite, colorIndex); + renderWestFace(world, block, pos, baker, sprite, colorIndex); + renderNorthFace(world, block, pos, baker, sprite, colorIndex); + renderSouthFace(world, block, pos, baker, sprite, colorIndex); return true; } - - @Override - public TextureAtlasSprite getParticleTexture() { - // TODO Auto-generated method stub - return super.getParticleTexture(); - } } diff --git a/src/main/java/forestry/arboriculture/tiles/TileLeaves.java b/src/main/java/forestry/arboriculture/tiles/TileLeaves.java index 617f6eb23..5369fc5f7 100644 --- a/src/main/java/forestry/arboriculture/tiles/TileLeaves.java +++ b/src/main/java/forestry/arboriculture/tiles/TileLeaves.java @@ -286,7 +286,7 @@ public class TileLeaves extends TileTreeContainer implements IPollinatable, IFru } @SideOnly(Side.CLIENT) - public TextureAtlasSprite getSprite(boolean fancy) { + public TextureAtlasSprite getLeaveSprite(boolean fancy) { if (species == null) { return TreeDefinition.Oak.getIndividual().getGenome().getPrimary().getLeafSprite(false, fancy); } @@ -294,7 +294,7 @@ public class TileLeaves extends TileTreeContainer implements IPollinatable, IFru } @SideOnly(Side.CLIENT) - public TextureAtlasSprite getFruitTexture() { + public TextureAtlasSprite getFruitSprite() { if (textureIndexFruits >= 0) { return TextureManager.getInstance().getSprite(textureIndexFruits); } else { diff --git a/src/main/java/forestry/core/render/model/BlockModelIndex.java b/src/main/java/forestry/core/models/BlockModelIndex.java similarity index 97% rename from src/main/java/forestry/core/render/model/BlockModelIndex.java rename to src/main/java/forestry/core/models/BlockModelIndex.java index dedc0c45a..d24d4a593 100644 --- a/src/main/java/forestry/core/render/model/BlockModelIndex.java +++ b/src/main/java/forestry/core/models/BlockModelIndex.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.core.render.model; +package forestry.core.models; import net.minecraft.block.Block; import net.minecraft.client.resources.model.IBakedModel; diff --git a/src/main/java/forestry/core/render/model/ModelBaker.java b/src/main/java/forestry/core/models/ModelBaker.java similarity index 96% rename from src/main/java/forestry/core/render/model/ModelBaker.java rename to src/main/java/forestry/core/models/ModelBaker.java index 174513fb8..202925eca 100644 --- a/src/main/java/forestry/core/render/model/ModelBaker.java +++ b/src/main/java/forestry/core/models/ModelBaker.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.core.render.model; +package forestry.core.models; import java.util.ArrayList; import java.util.EnumSet; @@ -69,18 +69,18 @@ public class ModelBaker implements IModelBaker { renderMaxZ = i; } - protected int color = -1; + protected int colorIndex = -1; @Override - public void setColor(int color) { - this.color = color; + public void setColorIndex(int colorIndex) { + this.colorIndex = colorIndex; } @Override public boolean renderStandardBlock(Block block, BlockPos pos, TextureAtlasSprite[] textures) { setRenderBoundsFromBlock(block); - setColor(0xffffff); + setColorIndex(0); renderFaceXNeg(pos, textures[EnumFacing.WEST.ordinal()]); renderFaceXPos(pos, textures[EnumFacing.EAST.ordinal()]); @@ -96,7 +96,7 @@ public class ModelBaker implements IModelBaker { public boolean renderStandardBlock(Block block, BlockPos pos, TextureAtlasSprite texture) { setRenderBoundsFromBlock(block); - setColor(0xffffff); + setColorIndex(0); renderFaceXNeg(pos, texture); renderFaceXPos(pos, texture); @@ -241,7 +241,7 @@ public class ModelBaker implements IModelBaker { } 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)); + faces.add(new ModelBakerFace(face, isEdge, colorIndex, to, from, defUVs2, texture)); } @Override @@ -256,10 +256,10 @@ public class ModelBaker implements IModelBaker { 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); + final BlockPartFace bpf = new BlockPartFace(myFace, face.colorIndex, "", 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()); + bf = new IColoredBakedQuad.ColoredBakedQuad(bf.getVertexData(), face.colorIndex, bf.getFace()); if (face.isEdge) this.generatedModel.getFaceQuads(myFace).add(bf); diff --git a/src/main/java/forestry/core/render/model/ModelBakerFace.java b/src/main/java/forestry/core/models/ModelBakerFace.java similarity index 88% rename from src/main/java/forestry/core/render/model/ModelBakerFace.java rename to src/main/java/forestry/core/models/ModelBakerFace.java index a62cd29fc..a2d604884 100644 --- a/src/main/java/forestry/core/render/model/ModelBakerFace.java +++ b/src/main/java/forestry/core/models/ModelBakerFace.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.core.render.model; +package forestry.core.models; import org.lwjgl.util.vector.Vector3f; @@ -27,11 +27,11 @@ public class ModelBakerFace { public final TextureAtlasSprite spite; - public final int color; + public final int colorIndex; - public ModelBakerFace(EnumFacing face, boolean isEdge, int color, Vector3f to, Vector3f from, float[] defUVs2, + public ModelBakerFace(EnumFacing face, boolean isEdge, int colorIndex, Vector3f to, Vector3f from, float[] defUVs2, TextureAtlasSprite sprite) { - this.color = color; + this.colorIndex = colorIndex; this.face = face; this.isEdge = isEdge; this.to = to; diff --git a/src/main/java/forestry/core/render/model/ModelBakerModel.java b/src/main/java/forestry/core/models/ModelBakerModel.java similarity index 98% rename from src/main/java/forestry/core/render/model/ModelBakerModel.java rename to src/main/java/forestry/core/models/ModelBakerModel.java index 5325ccaa7..342a3343c 100644 --- a/src/main/java/forestry/core/render/model/ModelBakerModel.java +++ b/src/main/java/forestry/core/models/ModelBakerModel.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.core.render.model; +package forestry.core.models; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/forestry/core/render/model/ModelBlockOverlay.java b/src/main/java/forestry/core/models/ModelBlockOverlay.java similarity index 55% rename from src/main/java/forestry/core/render/model/ModelBlockOverlay.java rename to src/main/java/forestry/core/models/ModelBlockOverlay.java index 381e14cdb..13a9782ea 100644 --- a/src/main/java/forestry/core/render/model/ModelBlockOverlay.java +++ b/src/main/java/forestry/core/models/ModelBlockOverlay.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.core.render.model; +package forestry.core.models; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; @@ -29,10 +29,9 @@ import forestry.api.core.IModelBaker; import forestry.core.blocks.propertys.UnlistedBlockAccess; import forestry.core.blocks.propertys.UnlistedBlockPos; -public abstract class ModelBlockOverlay implements ISmartItemModel, ISmartBlockModel { +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) { + protected void renderBottomFace(IBlockAccess world, B block, BlockPos pos, IModelBaker baker, TextureAtlasSprite sprite, int colorIndex) { BlockPos posNEW = new BlockPos(pos.getX(), pos.getY() - 1, pos.getZ()); @@ -40,12 +39,11 @@ public abstract class ModelBlockOverlay implements ISmartItemModel, ISmartBlockM return; } - renderer.renderFaceYNeg(pos, textureIndex); + baker.renderFaceYNeg(pos, sprite); } - protected static void renderTopFace(IBlockAccess world, Block block, BlockPos pos, IModelBaker renderer, - TextureAtlasSprite textureIndex, int mixedBrightness, float r, float g, float b) { + protected void renderTopFace(IBlockAccess world, B block, BlockPos pos, IModelBaker baker, TextureAtlasSprite sprite, int colorIndex) { BlockPos posNEW = new BlockPos(pos.getX(), pos.getY() + 1, pos.getZ()); @@ -54,12 +52,11 @@ public abstract class ModelBlockOverlay implements ISmartItemModel, ISmartBlockM } - renderer.renderFaceYPos(pos, textureIndex); + baker.renderFaceYPos(pos, sprite); } - protected static void renderEastFace(IBlockAccess world, Block block, BlockPos pos, IModelBaker renderer, - TextureAtlasSprite textureIndex, int mixedBrightness, float r, float g, float b) { + protected void renderEastFace(IBlockAccess world, B block, BlockPos pos, IModelBaker baker, TextureAtlasSprite sprite, int colorIndex) { BlockPos posNEW = new BlockPos(pos.getX(), pos.getY(), pos.getZ() - 1); @@ -67,12 +64,11 @@ public abstract class ModelBlockOverlay implements ISmartItemModel, ISmartBlockM return; } - renderer.renderFaceZNeg(pos, textureIndex); + baker.renderFaceZNeg(pos, sprite); } - protected static void renderWestFace(IBlockAccess world, Block block, BlockPos pos, IModelBaker renderer, - TextureAtlasSprite textureIndex, int mixedBrightness, float r, float g, float b) { + protected void renderWestFace(IBlockAccess world, B block, BlockPos pos, IModelBaker baker, TextureAtlasSprite sprite, int colorIndex) { BlockPos posNEW = new BlockPos(pos.getX(), pos.getY(), pos.getZ() + 1); @@ -80,12 +76,11 @@ public abstract class ModelBlockOverlay implements ISmartItemModel, ISmartBlockM return; } - renderer.renderFaceZPos(pos, textureIndex); + baker.renderFaceZPos(pos, sprite); } - protected static void renderNorthFace(IBlockAccess world, Block block, BlockPos pos, IModelBaker renderer, - TextureAtlasSprite textureIndex, int mixedBrightness, float r, float g, float b) { + protected void renderNorthFace(IBlockAccess world, B block, BlockPos pos, IModelBaker baker, TextureAtlasSprite sprite, int colorIndex) { BlockPos posNEW = new BlockPos(pos.getX() - 1, pos.getY(), pos.getZ()); @@ -93,12 +88,11 @@ public abstract class ModelBlockOverlay implements ISmartItemModel, ISmartBlockM return; } - renderer.renderFaceXNeg(pos, textureIndex); + baker.renderFaceXNeg(pos, sprite); } - protected static void renderSouthFace(IBlockAccess world, Block block, BlockPos pos, IModelBaker renderer, - TextureAtlasSprite textureIndex, int mixedBrightness, float r, float g, float b) { + protected void renderSouthFace(IBlockAccess world, B block, BlockPos pos, IModelBaker baker, TextureAtlasSprite sprite, int colorIndex) { BlockPos posNEW = new BlockPos(pos.getX() + 1, pos.getY(), pos.getZ()); @@ -106,12 +100,12 @@ public abstract class ModelBlockOverlay implements ISmartItemModel, ISmartBlockM return; } - renderer.renderFaceXPos(pos, textureIndex); + baker.renderFaceXPos(pos, sprite); } @Override - public List getFaceQuads(EnumFacing p_177551_1_) { + public List getFaceQuads(EnumFacing face) { return Collections.emptyList(); } @@ -147,27 +141,41 @@ public abstract class ModelBlockOverlay implements ISmartItemModel, ISmartBlockM @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); + IModelBaker baker = ModelManager.getInstance().createNewRenderer(); + IExtendedBlockState stateExtended = (IExtendedBlockState) state; + + IBlockAccess world = stateExtended.getValue(UnlistedBlockAccess.BLOCKACCESS); + BlockPos pos = stateExtended.getValue(UnlistedBlockPos.POS); + Block block = state.getBlock(); + + baker.setRenderBoundsFromBlock(block); + try{ + renderInWorld((B) block, world, pos, baker); + }catch(Exception e){ + return null; + } + + return baker.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); + IModelBaker baker = ModelManager.getInstance().createNewRenderer(); + Block block = Block.getBlockFromItem(stack.getItem()); + + block.setBlockBoundsForItemRender(); + baker.setRenderBoundsFromBlock(block); + try{ + renderInventory((B) block, stack, baker); + }catch(Exception e){ + return null; + } + + return baker.bakeModel(true); } - protected abstract void renderInventory(Block block, ItemStack item, IModelBaker renderer); + protected abstract void renderInventory(B block, ItemStack item, IModelBaker renderer); - protected abstract boolean renderInWorld(Block block, IBlockAccess world, BlockPos pos, IModelBaker renderer); + protected abstract boolean renderInWorld(B 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/models/ModelCrate.java similarity index 99% rename from src/main/java/forestry/core/render/model/ModelCrate.java rename to src/main/java/forestry/core/models/ModelCrate.java index 58f8e14b8..376b13732 100644 --- a/src/main/java/forestry/core/render/model/ModelCrate.java +++ b/src/main/java/forestry/core/models/ModelCrate.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.core.render.model; +package forestry.core.models; import java.io.IOException; import java.util.Collection; diff --git a/src/main/java/forestry/core/render/model/ModelEscritoire.java b/src/main/java/forestry/core/models/ModelEscritoire.java similarity index 99% rename from src/main/java/forestry/core/render/model/ModelEscritoire.java rename to src/main/java/forestry/core/models/ModelEscritoire.java index 1aac4f384..4c038a1c1 100644 --- a/src/main/java/forestry/core/render/model/ModelEscritoire.java +++ b/src/main/java/forestry/core/models/ModelEscritoire.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.core.render.model; +package forestry.core.models; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; diff --git a/src/main/java/forestry/core/render/model/ModelIndex.java b/src/main/java/forestry/core/models/ModelIndex.java similarity index 96% rename from src/main/java/forestry/core/render/model/ModelIndex.java rename to src/main/java/forestry/core/models/ModelIndex.java index 16c74bfa8..861f49fd1 100644 --- a/src/main/java/forestry/core/render/model/ModelIndex.java +++ b/src/main/java/forestry/core/models/ModelIndex.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.core.render.model; +package forestry.core.models; import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraftforge.client.model.IModel; diff --git a/src/main/java/forestry/core/render/model/ModelManager.java b/src/main/java/forestry/core/models/ModelManager.java similarity index 99% rename from src/main/java/forestry/core/render/model/ModelManager.java rename to src/main/java/forestry/core/models/ModelManager.java index d16e75517..7311beda4 100644 --- a/src/main/java/forestry/core/render/model/ModelManager.java +++ b/src/main/java/forestry/core/models/ModelManager.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.core.render.model; +package forestry.core.models; import forestry.api.core.ForestryAPI; import forestry.api.core.IModelManager; diff --git a/src/main/java/forestry/core/render/model/RenderHandler.java b/src/main/java/forestry/core/models/RenderHandler.java similarity index 97% rename from src/main/java/forestry/core/render/model/RenderHandler.java rename to src/main/java/forestry/core/models/RenderHandler.java index fceecbad3..c4de8e074 100644 --- a/src/main/java/forestry/core/render/model/RenderHandler.java +++ b/src/main/java/forestry/core/models/RenderHandler.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.core.render.model; +package forestry.core.models; import java.util.ArrayList; diff --git a/src/main/java/forestry/core/multiblock/MultiblockControllerBase.java b/src/main/java/forestry/core/multiblock/MultiblockControllerBase.java index 12ec2dcf1..9a0c1e5cc 100644 --- a/src/main/java/forestry/core/multiblock/MultiblockControllerBase.java +++ b/src/main/java/forestry/core/multiblock/MultiblockControllerBase.java @@ -308,6 +308,7 @@ public abstract class MultiblockControllerBase implements IMultiblockControllerI */ private void assembleMachine(AssemblyState oldState) { this.assemblyState = AssemblyState.Assembled; + for (IMultiblockComponent part : connectedParts) { part.onMachineAssembled(this, getMinimumCoord(), getMaximumCoord()); } diff --git a/src/main/java/forestry/core/proxy/ProxyRender.java b/src/main/java/forestry/core/proxy/ProxyRender.java index 054dc941c..208dcc7f5 100755 --- a/src/main/java/forestry/core/proxy/ProxyRender.java +++ b/src/main/java/forestry/core/proxy/ProxyRender.java @@ -19,8 +19,8 @@ import net.minecraft.util.BlockPos; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import forestry.core.fluids.Fluids; -import forestry.core.render.model.BlockModelIndex; -import forestry.core.render.model.ModelIndex; +import forestry.core.models.BlockModelIndex; +import forestry.core.models.ModelIndex; import forestry.core.tiles.MachineDefinition; import forestry.core.tiles.TileEscritoire; import forestry.core.tiles.TileMill; diff --git a/src/main/java/forestry/core/proxy/ProxyRenderClient.java b/src/main/java/forestry/core/proxy/ProxyRenderClient.java index 5b2738fa7..4b5faaf13 100644 --- a/src/main/java/forestry/core/proxy/ProxyRenderClient.java +++ b/src/main/java/forestry/core/proxy/ProxyRenderClient.java @@ -39,15 +39,15 @@ import forestry.core.entities.EntityFXHoneydust; import forestry.core.entities.EntityFXIgnition; import forestry.core.entities.EntityFXSnow; import forestry.core.fluids.Fluids; +import forestry.core.models.BlockModelIndex; +import forestry.core.models.ModelIndex; +import forestry.core.models.ModelManager; +import forestry.core.models.RenderHandler; import forestry.core.render.RenderEscritoire; import forestry.core.render.RenderMachine; import forestry.core.render.RenderMill; import forestry.core.render.RenderNaturalistChest; import forestry.core.render.TextureManager; -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; diff --git a/src/main/java/forestry/core/render/ParticleHelper.java b/src/main/java/forestry/core/render/ParticleHelper.java index 325e21637..dddd35b47 100644 --- a/src/main/java/forestry/core/render/ParticleHelper.java +++ b/src/main/java/forestry/core/render/ParticleHelper.java @@ -102,7 +102,7 @@ public class ParticleHelper { double pz = pos.getZ() + (k + 0.5D) / iterations; int random = rand.nextInt(6); - 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)); + EntityDiggingFX fx = (EntityDiggingFX) effectRenderer.spawnEffectParticle(EnumParticleTypes.BLOCK_CRACK.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)); } diff --git a/src/main/java/forestry/core/render/RenderEscritoire.java b/src/main/java/forestry/core/render/RenderEscritoire.java index d00296336..56219425b 100755 --- a/src/main/java/forestry/core/render/RenderEscritoire.java +++ b/src/main/java/forestry/core/render/RenderEscritoire.java @@ -19,8 +19,8 @@ import org.lwjgl.opengl.GL11; import forestry.core.config.Constants; import forestry.core.inventory.InventoryEscritoire; +import forestry.core.models.ModelEscritoire; import forestry.core.proxy.Proxies; -import forestry.core.render.model.ModelEscritoire; import forestry.core.tiles.TileEscritoire; public class RenderEscritoire extends TileEntitySpecialRenderer { diff --git a/src/main/java/forestry/factory/recipes/jei/fabricator/FabricatorRecipeCategory.java b/src/main/java/forestry/factory/recipes/jei/fabricator/FabricatorRecipeCategory.java index bad6c5ffe..9cbb6d545 100644 --- a/src/main/java/forestry/factory/recipes/jei/fabricator/FabricatorRecipeCategory.java +++ b/src/main/java/forestry/factory/recipes/jei/fabricator/FabricatorRecipeCategory.java @@ -13,7 +13,6 @@ 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; diff --git a/src/main/java/forestry/factory/recipes/jei/squeezer/SqueezerContainerRecipeWrapper.java b/src/main/java/forestry/factory/recipes/jei/squeezer/SqueezerContainerRecipeWrapper.java index 89b07b76c..f6a0ce378 100644 --- a/src/main/java/forestry/factory/recipes/jei/squeezer/SqueezerContainerRecipeWrapper.java +++ b/src/main/java/forestry/factory/recipes/jei/squeezer/SqueezerContainerRecipeWrapper.java @@ -1,12 +1,10 @@ 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; diff --git a/src/main/java/forestry/factory/recipes/jei/squeezer/SqueezerRecipeCategory.java b/src/main/java/forestry/factory/recipes/jei/squeezer/SqueezerRecipeCategory.java index ae9773b1f..b55256c79 100644 --- a/src/main/java/forestry/factory/recipes/jei/squeezer/SqueezerRecipeCategory.java +++ b/src/main/java/forestry/factory/recipes/jei/squeezer/SqueezerRecipeCategory.java @@ -10,7 +10,6 @@ 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; diff --git a/src/main/java/forestry/factory/recipes/jei/squeezer/SqueezerRecipeMaker.java b/src/main/java/forestry/factory/recipes/jei/squeezer/SqueezerRecipeMaker.java index bf3ef5d71..06def2215 100644 --- a/src/main/java/forestry/factory/recipes/jei/squeezer/SqueezerRecipeMaker.java +++ b/src/main/java/forestry/factory/recipes/jei/squeezer/SqueezerRecipeMaker.java @@ -5,14 +5,9 @@ import java.util.List; import forestry.api.recipes.ISqueezerRecipe; import forestry.api.recipes.RecipeManagers; -import forestry.core.fluids.FluidHelper; import forestry.factory.recipes.ISqueezerContainerRecipe; import forestry.factory.recipes.SqueezerRecipeManager; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidContainerRegistry.FluidContainerData; public class SqueezerRecipeMaker { diff --git a/src/main/java/forestry/farming/blocks/BlockFarm.java b/src/main/java/forestry/farming/blocks/BlockFarm.java index d351c4c81..251cd05f6 100644 --- a/src/main/java/forestry/farming/blocks/BlockFarm.java +++ b/src/main/java/forestry/farming/blocks/BlockFarm.java @@ -49,7 +49,7 @@ 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.models.EnumFarmBlockTexture; import forestry.farming.tiles.TileFarm; import forestry.farming.tiles.TileFarmControl; import forestry.farming.tiles.TileFarmGearbox; @@ -61,25 +61,25 @@ public class BlockFarm extends BlockStructure { private final ParticleHelper.Callback particleCallback; - public static final PropertyEnum META = PropertyEnum.create("meta", EnumBlockFarmType.class); + public static final PropertyEnum META = PropertyEnum.create("meta", EnumFarmBlockType.class); public BlockFarm() { super(Material.rock); setHardness(1.0f); setHarvestLevel("pickaxe", 0); this.particleCallback = new FarmCallback(this); - setDefaultState(blockState.getBaseState().withProperty(META, EnumBlockFarmType.BASIC)); + setDefaultState(blockState.getBaseState().withProperty(META, EnumFarmBlockType.PLAIN)); } @Override public IBlockState getStateFromMeta(int meta) { - return getDefaultState().withProperty(META, EnumBlockFarmType.values()[meta]); + return getDefaultState().withProperty(META, EnumFarmBlockType.values()[meta]); } @Override public int getMetaFromState(IBlockState state) { - return ((EnumBlockFarmType) state.getValue(META)).ordinal(); + return ((EnumFarmBlockType) state.getValue(META)).ordinal(); } @Override @@ -230,7 +230,9 @@ public class BlockFarm extends BlockStructure { @Override protected void setTexture(EntityDiggingFX fx, BlockPos pos, IBlockState state) { IExtendedBlockState extend = (IExtendedBlockState) state; - fx.setParticleIcon(EnumFarmBlockTexture.getSprite(EnumFarmBlockTexture.BRICK, 0)); + TileFarm farm = (TileFarm) fx.getEntityWorld().getTileEntity(pos); + + fx.setParticleIcon(EnumFarmBlockTexture.getSprite(farm.getFarmBlockTexture(), 2)); } } @@ -240,7 +242,7 @@ public class BlockFarm extends BlockStructure { return getMetaFromState(world.getBlockState(pos)) == 5; } - public ItemStack get(EnumBlockFarmType type, int amount) { + public ItemStack get(EnumFarmBlockType type, int amount) { return new ItemStack(this, amount, type.ordinal()); } } diff --git a/src/main/java/forestry/farming/blocks/EnumBlockFarmType.java b/src/main/java/forestry/farming/blocks/EnumBlockFarmType.java deleted file mode 100644 index d43a57587..000000000 --- a/src/main/java/forestry/farming/blocks/EnumBlockFarmType.java +++ /dev/null @@ -1,21 +0,0 @@ -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/blocks/EnumFarmBlockType.java b/src/main/java/forestry/farming/blocks/EnumFarmBlockType.java new file mode 100644 index 000000000..8c0611c3f --- /dev/null +++ b/src/main/java/forestry/farming/blocks/EnumFarmBlockType.java @@ -0,0 +1,84 @@ +package forestry.farming.blocks; + +import java.util.Arrays; +import java.util.List; +import java.util.Locale; + +import forestry.core.render.TextureManager; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.util.IStringSerializable; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +public enum EnumFarmBlockType implements IStringSerializable { + PLAIN, + BAND, + GEARBOX, + HATCH, + VALVE, + CONTROL; + + public static final EnumFarmBlockType[] VALUES = values(); + + private static final int TYPE_PLAIN = 0; + private static final int TYPE_REVERSE = 1; + private static final int TYPE_TOP = 2; + private static final int TYPE_BAND = 3; + private static final int TYPE_GEARS = 4; + private static final int TYPE_HATCH = 5; + private static final int TYPE_VALVE = 6; + private static final int TYPE_CONTROL = 7; + + @SideOnly(Side.CLIENT) + private static List sprites; + + @SideOnly(Side.CLIENT) + 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") + ); + } + + /** + * @return The texture sprite from the type of the farm block + */ + @SideOnly(Side.CLIENT) + public static TextureAtlasSprite getSprite(EnumFarmBlockType type, int side) { + switch (type) { + case PLAIN: { + if (side == 2) { + return sprites.get(TYPE_REVERSE); + } else if (side == 0 || side == 1) { + return sprites.get(TYPE_TOP); + } else { + return sprites.get(TYPE_PLAIN); + } + } + case BAND: + return sprites.get(TYPE_BAND); + case GEARBOX: + return sprites.get(TYPE_GEARS); + case HATCH: + return sprites.get(TYPE_HATCH); + case VALVE: + return sprites.get(TYPE_VALVE); + case CONTROL: + return sprites.get(TYPE_CONTROL); + default: + return sprites.get(TYPE_PLAIN); + } + } + + @Override + public String getName() { + return name().toLowerCase(Locale.ENGLISH); + } + +} diff --git a/src/main/java/forestry/farming/items/ItemBlockFarm.java b/src/main/java/forestry/farming/items/ItemBlockFarm.java index d8c4f8f10..f0c6254a2 100644 --- a/src/main/java/forestry/farming/items/ItemBlockFarm.java +++ b/src/main/java/forestry/farming/items/ItemBlockFarm.java @@ -12,13 +12,12 @@ package forestry.farming.items; import java.util.List; +import forestry.farming.models.EnumFarmBlockTexture; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; -import forestry.farming.render.EnumFarmBlockTexture; - public class ItemBlockFarm extends ItemBlock { public ItemBlockFarm(Block block) { diff --git a/src/main/java/forestry/farming/render/EnumFarmBlockTexture.java b/src/main/java/forestry/farming/models/EnumFarmBlockTexture.java similarity index 70% rename from src/main/java/forestry/farming/render/EnumFarmBlockTexture.java rename to src/main/java/forestry/farming/models/EnumFarmBlockTexture.java index 1fc919b54..2ed54a063 100644 --- a/src/main/java/forestry/farming/render/EnumFarmBlockTexture.java +++ b/src/main/java/forestry/farming/models/EnumFarmBlockTexture.java @@ -8,10 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.farming.render; - -import java.util.Arrays; -import java.util.List; +package forestry.farming.models; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.init.Blocks; @@ -20,7 +17,6 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import forestry.core.render.TextureManager; -import forestry.farming.blocks.EnumBlockFarmType; public enum EnumFarmBlockTexture { BRICK_STONE(new ItemStack(Blocks.stonebrick, 1, 0)), @@ -35,68 +31,12 @@ public enum EnumFarmBlockTexture { QUARTZ_CHISELED(new ItemStack(Blocks.quartz_block, 1, 1)), QUARTZ_LINES(new ItemStack(Blocks.quartz_block, 1, 2)); - private static final int TYPE_PLAIN = 0; - private static final int TYPE_REVERSE = 1; - private static final int TYPE_TOP = 2; - private static final int TYPE_BAND = 3; - private static final int TYPE_GEARS = 4; - private static final int TYPE_HATCH = 5; - private static final int TYPE_VALVE = 6; - private static final int TYPE_CONTROL = 7; - - @SideOnly(Side.CLIENT) - private static List sprites; - - @SideOnly(Side.CLIENT) - 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") - ); - } - private final ItemStack base; EnumFarmBlockTexture(ItemStack base) { this.base = base; } - /** - * @return The texture sprite from the type of the farm block - */ - @SideOnly(Side.CLIENT) - public static TextureAtlasSprite getSprite(EnumBlockFarmType type, int side) { - switch (type) { - case BASIC: { - if (side == 2) { - return sprites.get(TYPE_REVERSE); - } else if (side == 0 || side == 1) { - return sprites.get(TYPE_TOP); - } else { - return sprites.get(TYPE_PLAIN); - } - } - case BAND: - return sprites.get(TYPE_BAND); - case GEARBOX: - return sprites.get(TYPE_GEARS); - case HATCH: - return sprites.get(TYPE_HATCH); - case VALVE: - return sprites.get(TYPE_VALVE); - case CONTROL: - return sprites.get(TYPE_CONTROL); - default: - return sprites.get(TYPE_PLAIN); - } - } - /** * @return The texture sprite from the material of the farm block */ diff --git a/src/main/java/forestry/farming/models/ModelFarmBlock.java b/src/main/java/forestry/farming/models/ModelFarmBlock.java new file mode 100644 index 000000000..7cde92ee2 --- /dev/null +++ b/src/main/java/forestry/farming/models/ModelFarmBlock.java @@ -0,0 +1,102 @@ +package forestry.farming.models; + +import forestry.api.core.IModelBaker; +import forestry.core.models.ModelBlockOverlay; +import forestry.farming.blocks.BlockFarm; +import forestry.farming.blocks.EnumFarmBlockType; +import forestry.farming.tiles.TileFarm; +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(BlockFarm blockFarm, ItemStack item, IModelBaker backer) { + if (blockFarm == null) { + return; + } + + EnumFarmBlockTexture type = EnumFarmBlockTexture.getFromCompound(item.getTagCompound()); + + TextureAtlasSprite[] sprites = getSprites(type); + TextureAtlasSprite[] overlaySprites = getOverlaySprites(EnumFarmBlockType.VALUES[item.getItemDamage()]); + + backer.renderFaceYNeg(null, sprites[0]); + backer.renderFaceYNeg(null, overlaySprites[0]); + + backer.renderFaceYPos(null, sprites[1]); + backer.renderFaceYPos(null, overlaySprites[1]); + + backer.renderFaceZNeg(null, sprites[2]); + backer.renderFaceZNeg(null, overlaySprites[2]); + + backer.renderFaceZPos(null, sprites[3]); + backer.renderFaceZPos(null, overlaySprites[3]); + + backer.renderFaceXNeg(null, sprites[4]); + backer.renderFaceXNeg(null, overlaySprites[4]); + + backer.renderFaceXPos(null, sprites[5]); + backer.renderFaceXPos(null, overlaySprites[5]); + + blockFarm.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F); + } + + @Override + public boolean renderInWorld(BlockFarm blockFarm, IBlockAccess world, BlockPos pos, IModelBaker backer) { + + TileFarm farm = (TileFarm) world.getTileEntity(pos); + + TextureAtlasSprite[] textures = getSprites(farm.getFarmBlockTexture()); + TextureAtlasSprite[] texturesOverlay = getOverlaySprites(farm.getFarmBlockType()); + + // Render the plain block. + backer.renderStandardBlock(blockFarm, pos, textures); + renderFarmOverlay(world, blockFarm, pos, backer, texturesOverlay); + + return true; + } + + private void renderFarmOverlay(IBlockAccess world, BlockFarm block, BlockPos pos, IModelBaker renderer, TextureAtlasSprite[] overlaySprites) { + renderBottomFace(world, block, pos, renderer, overlaySprites[0], 0); + renderTopFace(world, block, pos, renderer, overlaySprites[1], 0); + renderEastFace(world, block, pos, renderer, overlaySprites[2], 0); + renderWestFace(world, block, pos, renderer, overlaySprites[3], 0); + renderNorthFace(world, block, pos, renderer, overlaySprites[4], 0); + renderSouthFace(world, block, pos, renderer, overlaySprites[5], 0); + } + + 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(EnumFarmBlockType farmType) { + TextureAtlasSprite[] textures = new TextureAtlasSprite[6]; + textures[0] = getOverlaySprite(farmType, 0); + textures[1] = getOverlaySprite(farmType, 1); + textures[2] = getOverlaySprite(farmType, 2); + textures[3] = getOverlaySprite(farmType, 3); + textures[4] = getOverlaySprite(farmType, 4); + textures[5] = getOverlaySprite(farmType, 5); + return textures; + } + + private static TextureAtlasSprite getOverlaySprite(EnumFarmBlockType texture, int side) { + return EnumFarmBlockType.getSprite(texture, side); + } + + @Override + public TextureAtlasSprite getParticleTexture() { + return getSprites(EnumFarmBlockTexture.BRICK)[0]; + } + +} diff --git a/src/main/java/forestry/farming/proxy/ProxyFarmingClient.java b/src/main/java/forestry/farming/proxy/ProxyFarmingClient.java index f526206a7..b080dd8cf 100644 --- a/src/main/java/forestry/farming/proxy/ProxyFarmingClient.java +++ b/src/main/java/forestry/farming/proxy/ProxyFarmingClient.java @@ -11,9 +11,9 @@ package forestry.farming.proxy; import net.minecraft.client.resources.model.ModelResourceLocation; +import forestry.core.models.BlockModelIndex; import forestry.core.proxy.Proxies; -import forestry.core.render.model.BlockModelIndex; -import forestry.farming.render.ModelFarmBlock; +import forestry.farming.models.ModelFarmBlock; import forestry.plugins.PluginFarming; public class ProxyFarmingClient extends ProxyFarming { diff --git a/src/main/java/forestry/farming/render/ModelFarmBlock.java b/src/main/java/forestry/farming/render/ModelFarmBlock.java deleted file mode 100644 index 5d02d23ea..000000000 --- a/src/main/java/forestry/farming/render/ModelFarmBlock.java +++ /dev/null @@ -1,117 +0,0 @@ -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/tiles/TileFarm.java b/src/main/java/forestry/farming/tiles/TileFarm.java index 0b4f82aab..e7a3dd0c4 100644 --- a/src/main/java/forestry/farming/tiles/TileFarm.java +++ b/src/main/java/forestry/farming/tiles/TileFarm.java @@ -34,10 +34,11 @@ import forestry.core.network.DataInputStreamForestry; import forestry.core.network.DataOutputStreamForestry; import forestry.core.network.IStreamableGui; import forestry.core.tiles.ITitled; +import forestry.farming.blocks.EnumFarmBlockType; import forestry.farming.gui.ContainerFarm; import forestry.farming.gui.GuiFarm; +import forestry.farming.models.EnumFarmBlockTexture; import forestry.farming.multiblock.MultiblockLogicFarm; -import forestry.farming.render.EnumFarmBlockTexture; public abstract class TileFarm extends MultiblockTileEntityForestry implements IFarmComponent, IHintSource, ISocketable, IStreamableGui, IErrorLogicSource, IRestrictedAccess, ITitled { @@ -49,13 +50,13 @@ public abstract class TileFarm extends MultiblockTileEntityForestry(1); FluidStack stack = (FluidStack)data[dataIndex]; - tooltip.add(stack.getFluid().getLocalizedName() + " (" + stack.amount + " milliBuckets)"); + tooltip.add(stack.getFluid().getLocalizedName(stack) + " (" + stack.amount + " milliBuckets)"); } return tooltip; diff --git a/src/main/resources/assets/forestry/blockstates/apiculture/alveary_plain.json b/src/main/resources/assets/forestry/blockstates/apiculture/alveary_plain.json index da3797243..edc08d911 100644 --- a/src/main/resources/assets/forestry/blockstates/apiculture/alveary_plain.json +++ b/src/main/resources/assets/forestry/blockstates/apiculture/alveary_plain.json @@ -1,7 +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" } + "type=right": { "model": "forestry:apiculture/alveary_plain_right" }, + "type=middle": { "model": "forestry:apiculture/alveary_plain_middle" }, + "type=left": { "model": "forestry:apiculture/alveary_plain_left" } } } diff --git a/src/main/resources/assets/forestry/blockstates/stump.json b/src/main/resources/assets/forestry/blockstates/stump.json new file mode 100644 index 000000000..78734994c --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/stump.json @@ -0,0 +1,9 @@ +{ + "variants": { + "facing=up": { "model": "forestry:stump_up" }, + "facing=east": { "model": "forestry:stump" }, + "facing=south": { "model": "forestry:stump", "y": 90 }, + "facing=west": { "model": "forestry:stump", "y": 180 }, + "facing=north": { "model": "forestry:stump", "y": 270 } + } +} 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_left.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/apiculture/alveary_plain_up.json rename to src/main/resources/assets/forestry/models/block/apiculture/alveary_plain_left.json 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_right.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/apiculture/alveary_plain_down.json rename to src/main/resources/assets/forestry/models/block/apiculture/alveary_plain_right.json diff --git a/src/main/resources/assets/forestry/models/block/candle.json b/src/main/resources/assets/forestry/models/block/candle.json index 6444ba4ea..87e67a0ed 100644 --- a/src/main/resources/assets/forestry/models/block/candle.json +++ b/src/main/resources/assets/forestry/models/block/candle.json @@ -16,10 +16,12 @@ "faces": { "down": { "uv": [ 7, 13, 9, 15 ], + "tintindex": 0, "texture": "#candleStump" }, "up": { "uv": [ 7, 6, 9, 8 ], + "tintindex": 0, "texture": "#candleStump" } } @@ -36,10 +38,12 @@ "faces": { "west": { "uv": [ 0, 0, 16, 16 ], + "tintindex": 0, "texture": "candleStump" }, "east": { "uv": [ 0, 0, 16, 16 ], + "tintindex": 0, "texture": "candleStump" } } @@ -56,10 +60,12 @@ "faces": { "north": { "uv": [ 0, 0, 16, 16 ], + "tintindex": 0, "texture": "#candleStump" }, "south": { "uv": [ 0, 0, 16, 16 ], + "tintindex": 0, "texture": "#candleStump" } } diff --git a/src/main/resources/assets/forestry/models/block/candle_up.json b/src/main/resources/assets/forestry/models/block/candle_up.json index cc907c8a1..0f0bd7c7f 100644 --- a/src/main/resources/assets/forestry/models/block/candle_up.json +++ b/src/main/resources/assets/forestry/models/block/candle_up.json @@ -11,10 +11,12 @@ "faces": { "down": { "uv": [ 7, 13, 9, 15 ], + "tintindex": 0, "texture": "#candleStump" }, "up": { "uv": [ 7, 6, 9, 8 ], + "tintindex": 0, "texture": "#candleStump" } } @@ -26,10 +28,12 @@ "faces": { "west": { "uv": [ 0, 0, 16, 16 ], + "tintindex": 0, "texture": "#candleStump" }, "east": { "uv": [ 0, 0, 16, 16 ], + "tintindex": 0, "texture": "#candleStump" } } @@ -41,10 +45,12 @@ "faces": { "north": { "uv": [ 0, 0, 16, 16 ], + "tintindex": 0, "texture": "#candleStump" }, "south": { "uv": [ 0, 0, 16, 16 ], + "tintindex": 0, "texture": "#candleStump" } } diff --git a/src/main/resources/assets/forestry/models/block/stump.json b/src/main/resources/assets/forestry/models/block/stump.json new file mode 100644 index 000000000..d3608a6e6 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/stump.json @@ -0,0 +1,70 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "forestry:blocks/stump", + "stump": "forestry:blocks/stump" + }, + "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": { + "texture": "#stump", + "tintindex": 1, + "uv": [ 7, 13, 9, 15 ] + }, + "up": { + "uv": [ 7, 6, 9, 8 ], + "texture": "#stump" + } + } + }, + { + "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": "stump" + }, + "east": { + "uv": [ 0, 0, 16, 16 ], + "texture": "stump" + } + } + }, + { + "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": "#stump" + }, + "south": { + "uv": [ 0, 0, 16, 16 ], + "texture": "#stump" + } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/stump_up.json b/src/main/resources/assets/forestry/models/block/stump_up.json new file mode 100644 index 000000000..9ca794fe9 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/stump_up.json @@ -0,0 +1,54 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "forestry:blocks/stump", + "stump": "forestry:blocks/stump" + }, + "elements": [ + { + "from": [ 7, 0, 7 ], + "to": [ 9, 10, 9 ], + "shade": false, + "faces": { + "down": { + "uv": [ 7, 13, 9, 15 ], + "texture": "#stump" + }, + "up": { + "uv": [ 7, 6, 9, 8 ], + "texture": "#stump" + } + } + }, + { + "from": [ 7, 0, 0 ], + "to": [ 9, 16, 16 ], + "shade": false, + "faces": { + "west": { + "uv": [ 0, 0, 16, 16 ], + "texture": "#stump" + }, + "east": { + "uv": [ 0, 0, 16, 16 ], + "texture": "#stump" + } + } + }, + { + "from": [ 0, 0, 7 ], + "to": [ 16, 16, 9 ], + "shade": false, + "faces": { + "north": { + "uv": [ 0, 0, 16, 16 ], + "texture": "#stump" + }, + "south": { + "uv": [ 0, 0, 16, 16 ], + "texture": "#stump" + } + } + } + ] +}