diff --git a/src/main/java/forestry/api/core/IModelBaker.java b/src/main/java/forestry/api/core/IModelBaker.java index faa1d75e5..a835ae3b4 100644 --- a/src/main/java/forestry/api/core/IModelBaker.java +++ b/src/main/java/forestry/api/core/IModelBaker.java @@ -1,13 +1,12 @@ /******************************************************************************* * Copyright 2011-2014 SirSengir - * + * * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details. ******************************************************************************/ package forestry.api.core; import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.client.resources.model.IBakedModel; import net.minecraft.util.BlockPos; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -20,26 +19,30 @@ public interface IModelBaker { void setRenderBoundsFromBlock(Block block); - void setRenderBounds(double d, double e, double f, double g, double h, double i); + void setRenderBounds(double d, double e, double f, double g, double h, double i ); void setColorIndex(int color); - boolean renderStandardBlock(Block block, BlockPos pos, TextureAtlasSprite[] sprites, int colorIndex); + void addBlockModel(Block block, BlockPos pos, TextureAtlasSprite[] sprites, int colorIndex); - boolean renderStandardBlock(Block block, BlockPos pos, TextureAtlasSprite sprites, int colorIndex); + void addBlockModel(Block block, BlockPos pos, TextureAtlasSprite sprites, int colorIndex); - void renderFaceXNeg(BlockPos pos, TextureAtlasSprite sprite); + void addFaceXNeg(BlockPos pos, TextureAtlasSprite sprite); - void renderFaceYNeg(BlockPos pos, TextureAtlasSprite sprite); + void addFaceYNeg(BlockPos pos, TextureAtlasSprite sprite); - void renderFaceZNeg(BlockPos pos, TextureAtlasSprite sprite); + void addFaceZNeg(BlockPos pos, TextureAtlasSprite sprite); - void renderFaceYPos(BlockPos pos, TextureAtlasSprite sprite); + void addFaceYPos(BlockPos pos, TextureAtlasSprite sprite); - void renderFaceZPos(BlockPos pos, TextureAtlasSprite sprite); + void addFaceZPos(BlockPos pos, TextureAtlasSprite sprite); - void renderFaceXPos(BlockPos pos, TextureAtlasSprite sprite); + void addFaceXPos(BlockPos pos, TextureAtlasSprite sprite); - IBakedModel bakeModel(boolean flip); + IModelBakerModel getCurrentModel(); + + IModelBakerModel bakeModel(boolean flip); + + IModelBakerModel clear(); } diff --git a/src/main/java/forestry/api/core/IModelBakerModel.java b/src/main/java/forestry/api/core/IModelBakerModel.java new file mode 100644 index 000000000..3f80a4893 --- /dev/null +++ b/src/main/java/forestry/api/core/IModelBakerModel.java @@ -0,0 +1,37 @@ +/******************************************************************************* + * Copyright 2011-2014 SirSengir + * + * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details. + ******************************************************************************/ +package forestry.api.core; + +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.renderer.vertex.VertexFormat; +import net.minecraftforge.client.model.IFlexibleBakedModel; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +@SideOnly(Side.CLIENT) +public interface IModelBakerModel extends IFlexibleBakedModel { + + void setGui3d(boolean gui3d); + + void setAmbientOcclusion(boolean ambientOcclusion); + + void setParticleSprite(TextureAtlasSprite particleSprite); + + void setFormat(VertexFormat formate); + + void setRotation(float[] rotation); + + void setTranslation(float[] translation); + + void setScale(float[] scale); + + float[] getRotation(); + + float[] getTranslation(); + + float[] getScale(); + +} diff --git a/src/main/java/forestry/apiculture/items/ItemPollenCluster.java b/src/main/java/forestry/apiculture/items/ItemPollenCluster.java index a73491868..dd08cf65d 100644 --- a/src/main/java/forestry/apiculture/items/ItemPollenCluster.java +++ b/src/main/java/forestry/apiculture/items/ItemPollenCluster.java @@ -17,7 +17,7 @@ import forestry.core.items.ItemOverlay; public class ItemPollenCluster extends ItemOverlay { public ItemPollenCluster() { - super(Tabs.tabApiculture, (IOverlayInfo[]) EnumPollenCluster.VALUES); + super(Tabs.tabApiculture, EnumPollenCluster.VALUES); } public ItemStack get(EnumPollenCluster pollenCluster, int amount) { diff --git a/src/main/java/forestry/apiculture/items/ItemPropolis.java b/src/main/java/forestry/apiculture/items/ItemPropolis.java index 3c25efc5d..585400343 100644 --- a/src/main/java/forestry/apiculture/items/ItemPropolis.java +++ b/src/main/java/forestry/apiculture/items/ItemPropolis.java @@ -17,7 +17,7 @@ import forestry.core.items.ItemOverlay; public class ItemPropolis extends ItemOverlay { public ItemPropolis() { - super(Tabs.tabApiculture, (IOverlayInfo[]) EnumPropolis.VALUES); + super(Tabs.tabApiculture, EnumPropolis.VALUES); } public ItemStack get(EnumPropolis propolis, int amount) { diff --git a/src/main/java/forestry/arboriculture/render/ModelLeaves.java b/src/main/java/forestry/arboriculture/render/ModelLeaves.java index ce24833df..cff28ba8d 100644 --- a/src/main/java/forestry/arboriculture/render/ModelLeaves.java +++ b/src/main/java/forestry/arboriculture/render/ModelLeaves.java @@ -46,14 +46,8 @@ public class ModelLeaves extends ModelBlockOverlay { if (leavesIcon == null) { return; } - baker.setColorIndex(0); - - baker.renderFaceYNeg(null, leavesIcon); - baker.renderFaceYPos(null, leavesIcon); - baker.renderFaceZNeg(null, leavesIcon); - baker.renderFaceZPos(null, leavesIcon); - baker.renderFaceXNeg(null, leavesIcon); - baker.renderFaceXPos(null, leavesIcon); + + baker.addBlockModel(block, null, leavesIcon, 0); // add fruit if (!leaves.hasFruit()) { @@ -64,14 +58,7 @@ public class ModelLeaves extends ModelBlockOverlay { if (fruitTexture == null) { return; } - baker.setColorIndex(1); - - baker.renderFaceYNeg(null, fruitTexture); - baker.renderFaceYPos(null, fruitTexture); - baker.renderFaceZNeg(null, fruitTexture); - baker.renderFaceZPos(null, fruitTexture); - baker.renderFaceXNeg(null, fruitTexture); - baker.renderFaceXPos(null, fruitTexture); + baker.addBlockModel(block, null, fruitTexture, 1); } @Override @@ -82,27 +69,15 @@ public class ModelLeaves extends ModelBlockOverlay { } // Render the plain leaf block. - baker.renderStandardBlock(block, pos, tile.getLeaveSprite(Proxies.render.fancyGraphicsEnabled()), 0); + baker.addBlockModel(block, pos, tile.getLeaveSprite(Proxies.render.fancyGraphicsEnabled()), 0); // Render overlay for fruit leaves. TextureAtlasSprite fruitSprite = tile.getFruitSprite(); if (fruitSprite != null) { - renderFruitOverlay(world, block, pos, baker, fruitSprite, 1); + baker.addBlockModel(block, pos, fruitSprite, 1); } return true; } - - private boolean renderFruitOverlay(IBlockAccess world, BlockForestryLeaves block, BlockPos pos, IModelBaker baker, TextureAtlasSprite sprite, int colorIndex) { - // Bottom - 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; - } } diff --git a/src/main/java/forestry/core/items/ItemElectronTube.java b/src/main/java/forestry/core/items/ItemElectronTube.java index ba625fd90..a088c6dcf 100644 --- a/src/main/java/forestry/core/items/ItemElectronTube.java +++ b/src/main/java/forestry/core/items/ItemElectronTube.java @@ -34,7 +34,7 @@ import forestry.core.utils.StringUtil; public class ItemElectronTube extends ItemOverlay { public ItemElectronTube() { - super(CreativeTabForestry.tabForestry, (IOverlayInfo[]) EnumElectronTube.VALUES); + super(CreativeTabForestry.tabForestry, EnumElectronTube.VALUES); } @SuppressWarnings({"rawtypes", "unchecked"}) diff --git a/src/main/java/forestry/core/models/ModelBlockOverlay.java b/src/main/java/forestry/core/models/ModelBlockOverlay.java index a044a06e6..513bf2fa7 100644 --- a/src/main/java/forestry/core/models/ModelBlockOverlay.java +++ b/src/main/java/forestry/core/models/ModelBlockOverlay.java @@ -45,7 +45,7 @@ public abstract class ModelBlockOverlay implements ISmartItemMo this.blockClass = blockClass; } - protected void renderBottomFace(IBlockAccess world, B block, BlockPos pos, IModelBaker baker, TextureAtlasSprite sprite, int colorIndex) { + protected void addBottomFace(IBlockAccess world, B block, BlockPos pos, IModelBaker baker, TextureAtlasSprite sprite, int colorIndex) { BlockPos posNEW = new BlockPos(pos.getX(), pos.getY() - 1, pos.getZ()); @@ -53,11 +53,11 @@ public abstract class ModelBlockOverlay implements ISmartItemMo return; } - baker.renderFaceYNeg(pos, sprite); + baker.addFaceYNeg(pos, sprite); } - protected void renderTopFace(IBlockAccess world, B block, BlockPos pos, IModelBaker baker, TextureAtlasSprite sprite, int colorIndex) { + protected void addTopFace(IBlockAccess world, B block, BlockPos pos, IModelBaker baker, TextureAtlasSprite sprite, int colorIndex) { BlockPos posNEW = new BlockPos(pos.getX(), pos.getY() + 1, pos.getZ()); @@ -66,11 +66,11 @@ public abstract class ModelBlockOverlay implements ISmartItemMo } - baker.renderFaceYPos(pos, sprite); + baker.addFaceYPos(pos, sprite); } - protected void renderEastFace(IBlockAccess world, B block, BlockPos pos, IModelBaker baker, TextureAtlasSprite sprite, int colorIndex) { + protected void addEastFace(IBlockAccess world, B block, BlockPos pos, IModelBaker baker, TextureAtlasSprite sprite, int colorIndex) { BlockPos posNEW = new BlockPos(pos.getX(), pos.getY(), pos.getZ() - 1); @@ -78,11 +78,11 @@ public abstract class ModelBlockOverlay implements ISmartItemMo return; } - baker.renderFaceZNeg(pos, sprite); + baker.addFaceZNeg(pos, sprite); } - protected void renderWestFace(IBlockAccess world, B block, BlockPos pos, IModelBaker baker, TextureAtlasSprite sprite, int colorIndex) { + protected void addWestFace(IBlockAccess world, B block, BlockPos pos, IModelBaker baker, TextureAtlasSprite sprite, int colorIndex) { BlockPos posNEW = new BlockPos(pos.getX(), pos.getY(), pos.getZ() + 1); @@ -90,11 +90,11 @@ public abstract class ModelBlockOverlay implements ISmartItemMo return; } - baker.renderFaceZPos(pos, sprite); + baker.addFaceZPos(pos, sprite); } - protected void renderNorthFace(IBlockAccess world, B block, BlockPos pos, IModelBaker baker, TextureAtlasSprite sprite, int colorIndex) { + protected void addNorthFace(IBlockAccess world, B block, BlockPos pos, IModelBaker baker, TextureAtlasSprite sprite, int colorIndex) { BlockPos posNEW = new BlockPos(pos.getX() - 1, pos.getY(), pos.getZ()); @@ -102,11 +102,11 @@ public abstract class ModelBlockOverlay implements ISmartItemMo return; } - baker.renderFaceXNeg(pos, sprite); + baker.addFaceXNeg(pos, sprite); } - protected void renderSouthFace(IBlockAccess world, B block, BlockPos pos, IModelBaker baker, TextureAtlasSprite sprite, int colorIndex) { + protected void addSouthFace(IBlockAccess world, B block, BlockPos pos, IModelBaker baker, TextureAtlasSprite sprite, int colorIndex) { BlockPos posNEW = new BlockPos(pos.getX() + 1, pos.getY(), pos.getZ()); @@ -114,7 +114,7 @@ public abstract class ModelBlockOverlay implements ISmartItemMo return; } - baker.renderFaceXPos(pos, sprite); + baker.addFaceXPos(pos, sprite); } diff --git a/src/main/java/forestry/core/models/baker/ModelBaker.java b/src/main/java/forestry/core/models/baker/ModelBaker.java index e54f41360..bb0386442 100644 --- a/src/main/java/forestry/core/models/baker/ModelBaker.java +++ b/src/main/java/forestry/core/models/baker/ModelBaker.java @@ -14,26 +14,26 @@ import java.util.ArrayList; import java.util.EnumSet; import java.util.List; +import org.lwjgl.util.vector.Vector3f; + +import forestry.api.core.ForestryAPI; +import forestry.api.core.IModelBaker; +import forestry.api.core.IModelBakerModel; +import forestry.core.proxy.Proxies; import net.minecraft.block.Block; import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.client.renderer.block.model.BlockFaceUV; import net.minecraft.client.renderer.block.model.BlockPartFace; import net.minecraft.client.renderer.block.model.FaceBakery; import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.client.resources.model.IBakedModel; import net.minecraft.client.resources.model.ModelRotation; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; - +import net.minecraft.world.World; import net.minecraftforge.client.model.IColoredBakedQuad; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.lwjgl.util.vector.Vector3f; - -import forestry.api.core.ForestryAPI; -import forestry.api.core.IModelBaker; - /** * A model baker to make custom models in the mod */ @@ -59,17 +59,16 @@ public class ModelBaker implements IModelBaker { protected double renderMinZ; protected double renderMaxZ; - protected ModelBakerModel generatedModel = new ModelBakerModel(); + protected ModelBakerModel currentModel = new ModelBakerModel(); protected final FaceBakery faceBakery = new FaceBakery(); - protected final float[] defUVs = new float[]{0, 0, 1, 1}; + protected final float[] defUVs = new float[] { 0, 0, 1, 1 }; @Override public void setRenderBoundsFromBlock(Block block) { - if (block == null) { + if (block == null) return; - } renderMinX = block.getBlockBoundsMinX(); renderMinY = block.getBlockBoundsMinY(); @@ -97,40 +96,61 @@ public class ModelBaker implements IModelBaker { } @Override - public boolean renderStandardBlock(Block block, BlockPos pos, TextureAtlasSprite[] textures, int colorIndex) { + public void addBlockModel(Block block, BlockPos pos, TextureAtlasSprite[] textures, int colorIndex) { setRenderBoundsFromBlock(block); - + setColorIndex(colorIndex); + + World world = Proxies.common.getRenderWorld(); + BlockPos posDOWN = null; + BlockPos posUP = null; + BlockPos posEAST = null; + BlockPos posWEST = null; + BlockPos posNORTH = null; + BlockPos posSOUTH = null; + if(pos != null){ + posDOWN = new BlockPos(pos.getX(), pos.getY() - 1, pos.getZ()); + posUP = new BlockPos(pos.getX(), pos.getY() + 1, pos.getZ()); + posEAST = new BlockPos(pos.getX(), pos.getY(), pos.getZ() - 1); + posWEST = new BlockPos(pos.getX(), pos.getY(), pos.getZ() + 1); + posNORTH = new BlockPos(pos.getX() - 1, pos.getY(), pos.getZ()); + posSOUTH = new BlockPos(pos.getX() + 1, pos.getY(), pos.getZ()); + } - renderFaceXNeg(pos, textures[EnumFacing.WEST.ordinal()]); - renderFaceXPos(pos, textures[EnumFacing.EAST.ordinal()]); - renderFaceYNeg(pos, textures[EnumFacing.DOWN.ordinal()]); - renderFaceYPos(pos, textures[EnumFacing.UP.ordinal()]); - renderFaceZNeg(pos, textures[EnumFacing.NORTH.ordinal()]); - renderFaceZPos(pos, textures[EnumFacing.SOUTH.ordinal()]); + if (pos == null || block.shouldSideBeRendered(world, posDOWN, EnumFacing.DOWN)) { + addFaceYNeg(pos, textures[EnumFacing.DOWN.ordinal()]); + } - return false; + if (pos == null || block.shouldSideBeRendered(world, posUP, EnumFacing.UP)) { + addFaceYPos(pos, textures[EnumFacing.UP.ordinal()]); + } + + if (pos == null || block.shouldSideBeRendered(world, posEAST, EnumFacing.EAST)) { + addFaceXPos(pos, textures[EnumFacing.EAST.ordinal()]); + } + + if (pos == null || block.shouldSideBeRendered(world, posWEST, EnumFacing.WEST)) { + addFaceXNeg(pos, textures[EnumFacing.WEST.ordinal()]); + } + + if (pos == null || block.shouldSideBeRendered(world, posNORTH, EnumFacing.NORTH)) { + addFaceZNeg(pos, textures[EnumFacing.NORTH.ordinal()]); + } + + if (pos == null || block.shouldSideBeRendered(world, posSOUTH, EnumFacing.SOUTH)) { + addFaceZPos(pos, textures[EnumFacing.SOUTH.ordinal()]); + } + setRenderBounds(0, 0, 0, 1, 1, 1); } @Override - public boolean renderStandardBlock(Block block, BlockPos pos, TextureAtlasSprite texture, int colorIndex) { - setRenderBoundsFromBlock(block); - - setColorIndex(colorIndex); - - renderFaceXNeg(pos, texture); - renderFaceXPos(pos, texture); - renderFaceYNeg(pos, texture); - renderFaceYPos(pos, texture); - renderFaceZNeg(pos, texture); - renderFaceZPos(pos, texture); - - return false; + public void addBlockModel(Block block, BlockPos pos, TextureAtlasSprite texture, int colorIndex) { + addBlockModel(block, pos, new TextureAtlasSprite[]{ texture , texture, texture, texture, texture, texture }, colorIndex); } - private final float quadsUV[] = new float[]{0, 0, 1, 1, 0, 0, 1, 1}; + private final float quadsUV[] = new float[] { 0, 0, 1, 1, 0, 0, 1, 1 }; protected EnumSet renderFaces = EnumSet.allOf(EnumFacing.class); - private List faces = new ArrayList<>(); + private List faces = new ArrayList(); protected float[] getFaceUvs(final EnumFacing face, final Vector3f to_16, final Vector3f from_16) { float from_a = 0; @@ -139,43 +159,43 @@ public class ModelBaker implements IModelBaker { float to_b = 0; switch (face) { - case UP: - from_a = from_16.x / 16.0f; - from_b = from_16.z / 16.0f; - to_a = to_16.x / 16.0f; - to_b = to_16.z / 16.0f; - break; - case DOWN: - from_a = from_16.x / 16.0f; - from_b = from_16.z / 16.0f; - to_a = to_16.x / 16.0f; - to_b = to_16.z / 16.0f; - break; - case SOUTH: - from_a = from_16.x / 16.0f; - from_b = from_16.y / 16.0f; - to_a = to_16.x / 16.0f; - to_b = to_16.y / 16.0f; - break; - case NORTH: - from_a = from_16.x / 16.0f; - from_b = from_16.y / 16.0f; - to_a = to_16.x / 16.0f; - to_b = to_16.y / 16.0f; - break; - case EAST: - from_a = from_16.y / 16.0f; - from_b = from_16.z / 16.0f; - to_a = to_16.y / 16.0f; - to_b = to_16.z / 16.0f; - break; - case WEST: - from_a = from_16.y / 16.0f; - from_b = from_16.z / 16.0f; - to_a = to_16.y / 16.0f; - to_b = to_16.z / 16.0f; - break; - default: + case UP: + from_a = from_16.x / 16.0f; + from_b = from_16.z / 16.0f; + to_a = to_16.x / 16.0f; + to_b = to_16.z / 16.0f; + break; + case DOWN: + from_a = from_16.x / 16.0f; + from_b = from_16.z / 16.0f; + to_a = to_16.x / 16.0f; + to_b = to_16.z / 16.0f; + break; + case SOUTH: + from_a = from_16.x / 16.0f; + from_b = from_16.y / 16.0f; + to_a = to_16.x / 16.0f; + to_b = to_16.y / 16.0f; + break; + case NORTH: + from_a = from_16.x / 16.0f; + from_b = from_16.y / 16.0f; + to_a = to_16.x / 16.0f; + to_b = to_16.y / 16.0f; + break; + case EAST: + from_a = from_16.y / 16.0f; + from_b = from_16.z / 16.0f; + to_a = to_16.y / 16.0f; + to_b = to_16.z / 16.0f; + break; + case WEST: + from_a = from_16.y / 16.0f; + from_b = from_16.z / 16.0f; + to_a = to_16.y / 16.0f; + to_b = to_16.z / 16.0f; + break; + default: } from_a = 1.0f - from_a; @@ -183,7 +203,7 @@ public class ModelBaker implements IModelBaker { to_a = 1.0f - to_a; to_b = 1.0f - to_b; - final float[] afloat = new float[]{ // :P + final float[] afloat = new float[] { // :P 16.0f * (quadsUV[0] + quadsUV[2] * from_a + quadsUV[4] * from_b), // 0 16.0f * (quadsUV[1] + quadsUV[3] * from_a + quadsUV[5] * from_b), // 1 @@ -201,63 +221,58 @@ public class ModelBaker implements IModelBaker { } @Override - public void renderFaceXNeg(BlockPos pos, TextureAtlasSprite sprite) { + public void addFaceXNeg(BlockPos pos, TextureAtlasSprite sprite) { boolean isEdge = renderMinX < 0.0001; Vector3f to = new Vector3f((float) renderMinX * 16.0f, (float) renderMinY * 16.0f, (float) renderMinZ * 16.0f); Vector3f from = new Vector3f((float) renderMinX * 16.0f, (float) renderMaxY * 16.0f, (float) renderMaxZ * 16.0f); - final EnumFacing myFace = EnumFacing.WEST; - addFace(myFace, isEdge, to, from, defUVs, sprite); + addFace(EnumFacing.WEST, isEdge, to, from, defUVs, sprite); } @Override - public void renderFaceYNeg(BlockPos pos, TextureAtlasSprite sprite) { + public void addFaceYNeg(BlockPos pos, TextureAtlasSprite sprite) { boolean isEdge = renderMinY < 0.0001; Vector3f to = new Vector3f((float) renderMinX * 16.0f, (float) renderMinY * 16.0f, (float) renderMinZ * 16.0f); Vector3f from = new Vector3f((float) renderMaxX * 16.0f, (float) renderMinY * 16.0f, (float) renderMaxZ * 16.0f); - final EnumFacing myFace = EnumFacing.DOWN; - addFace(myFace, isEdge, to, from, defUVs, sprite); + addFace(EnumFacing.DOWN, isEdge, to, from, defUVs, sprite); } @Override - public void renderFaceZNeg(BlockPos pos, TextureAtlasSprite sprite) { + public void addFaceZNeg(BlockPos pos, TextureAtlasSprite sprite) { boolean isEdge = renderMinZ < 0.0001; Vector3f to = new Vector3f((float) renderMinX * 16.0f, (float) renderMinY * 16.0f, (float) renderMinZ * 16.0f); Vector3f from = new Vector3f((float) renderMaxX * 16.0f, (float) renderMaxY * 16.0f, (float) renderMinZ * 16.0f); - final EnumFacing myFace = EnumFacing.NORTH; - addFace(myFace, isEdge, to, from, defUVs, sprite); + addFace(EnumFacing.NORTH, isEdge, to, from, defUVs, sprite); } @Override - public void renderFaceYPos(BlockPos pos, TextureAtlasSprite sprite) { + public void addFaceYPos(BlockPos pos, TextureAtlasSprite sprite) { boolean isEdge = renderMaxY > 0.9999; Vector3f to = new Vector3f((float) renderMinX * 16.0f, (float) renderMaxY * 16.0f, (float) renderMinZ * 16.0f); Vector3f from = new Vector3f((float) renderMaxX * 16.0f, (float) renderMaxY * 16.0f, (float) renderMaxZ * 16.0f); - final EnumFacing myFace = EnumFacing.UP; - addFace(myFace, isEdge, to, from, defUVs, sprite); + addFace(EnumFacing.UP, isEdge, to, from, defUVs, sprite); } @Override - public void renderFaceZPos(BlockPos pos, TextureAtlasSprite sprite) { + public void addFaceZPos(BlockPos pos, TextureAtlasSprite sprite) { boolean isEdge = renderMaxZ > 0.9999; Vector3f to = new Vector3f((float) renderMinX * 16.0f, (float) renderMinY * 16.0f, (float) renderMaxZ * 16.0f); Vector3f from = new Vector3f((float) renderMaxX * 16.0f, (float) renderMaxY * 16.0f, (float) renderMaxZ * 16.0f); - final EnumFacing myFace = EnumFacing.SOUTH; - addFace(myFace, isEdge, to, from, defUVs, sprite); + addFace(EnumFacing.SOUTH, isEdge, to, from, defUVs, sprite); } @Override - public void renderFaceXPos(BlockPos pos, TextureAtlasSprite sprite) { + public void addFaceXPos(BlockPos pos, TextureAtlasSprite sprite) { + boolean isEdge = renderMaxX > 0.9999; Vector3f to = new Vector3f((float) renderMaxX * 16.0f, (float) renderMinY * 16.0f, (float) renderMinZ * 16.0f); Vector3f from = new Vector3f((float) renderMaxX * 16.0f, (float) renderMaxY * 16.0f, (float) renderMaxZ * 16.0f); - final EnumFacing myFace = EnumFacing.EAST; - addFace(myFace, isEdge, to, from, defUVs, sprite); + addFace(EnumFacing.EAST, isEdge, to, from, defUVs, sprite); } protected void addFace(EnumFacing face, boolean isEdge, Vector3f to, Vector3f from, float[] defUVs2, TextureAtlasSprite texture) { @@ -265,12 +280,11 @@ public class ModelBaker implements IModelBaker { } @Override - public IBakedModel bakeModel(boolean flip) { + public IModelBakerModel bakeModel(boolean flip) { ModelRotation mr = ModelRotation.X0_Y0; - if (flip) { + if (flip) mr = ModelRotation.X0_Y180; - } for (ModelBakerFace face : faces) { final EnumFacing myFace = face.face; @@ -282,20 +296,25 @@ public class ModelBaker implements IModelBaker { BakedQuad bf = faceBakery.makeBakedQuad(face.to, face.from, bpf, face.spite, myFace, mr, null, true, true); bf = new IColoredBakedQuad.ColoredBakedQuad(bf.getVertexData(), face.colorIndex, bf.getFace()); - if (face.isEdge) { - this.generatedModel.getFaceQuads(myFace).add(bf); - } else { - this.generatedModel.getGeneralQuads().add(bf); - } + if (face.isEdge) + this.currentModel.getFaceQuads(myFace).add(bf); + else + this.currentModel.getGeneralQuads().add(bf); } - return clearBaker(); + return clear(); } - protected ModelBakerModel clearBaker() { - ModelBakerModel model = generatedModel.copy(); - generatedModel = new ModelBakerModel(); - faces = new ArrayList<>(); + @Override + public IModelBakerModel clear() { + ModelBakerModel model = currentModel.copy(); + currentModel = new ModelBakerModel(); + faces = new ArrayList(); return model; } + + @Override + public IModelBakerModel getCurrentModel() { + return currentModel; + } } diff --git a/src/main/java/forestry/core/models/baker/ModelBakerFace.java b/src/main/java/forestry/core/models/baker/ModelBakerFace.java index 70100b49e..406ce0f71 100644 --- a/src/main/java/forestry/core/models/baker/ModelBakerFace.java +++ b/src/main/java/forestry/core/models/baker/ModelBakerFace.java @@ -10,17 +10,15 @@ ******************************************************************************/ package forestry.core.models.baker; +import org.lwjgl.util.vector.Vector3f; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.util.EnumFacing; - import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.lwjgl.util.vector.Vector3f; - /** - * A face of a baked model + * A face of a {@link ModelBakerModel } */ @SideOnly(Side.CLIENT) public class ModelBakerFace { @@ -37,8 +35,7 @@ public class ModelBakerFace { public final int colorIndex; - public ModelBakerFace(EnumFacing face, boolean isEdge, int colorIndex, Vector3f to, Vector3f from, float[] defUVs2, - TextureAtlasSprite sprite) { + public ModelBakerFace(EnumFacing face, boolean isEdge, int colorIndex, Vector3f to, Vector3f from, float[] defUVs2, TextureAtlasSprite sprite) { this.colorIndex = colorIndex; this.face = face; this.isEdge = isEdge; diff --git a/src/main/java/forestry/core/models/baker/ModelBakerModel.java b/src/main/java/forestry/core/models/baker/ModelBakerModel.java index 2c26b867b..ec6ed9fe4 100644 --- a/src/main/java/forestry/core/models/baker/ModelBakerModel.java +++ b/src/main/java/forestry/core/models/baker/ModelBakerModel.java @@ -11,37 +11,58 @@ package forestry.core.models.baker; import java.util.ArrayList; -import java.util.EnumMap; import java.util.List; +import org.lwjgl.util.vector.Vector3f; + +import forestry.api.core.IModelBakerModel; import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.client.renderer.block.model.ItemTransformVec3f; import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.client.resources.model.IBakedModel; +import net.minecraft.client.renderer.vertex.DefaultVertexFormats; +import net.minecraft.client.renderer.vertex.VertexFormat; import net.minecraft.util.EnumFacing; import net.minecraft.util.MathHelper; - import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.lwjgl.util.vector.Vector3f; - @SideOnly(Side.CLIENT) -public class ModelBakerModel implements IBakedModel { - private EnumMap> faces = new EnumMap<>(EnumFacing.class); - protected List general; +public class ModelBakerModel implements IModelBakerModel { + private List[] faces = new List[6]; + private List general; + private boolean isGui3d; + private boolean isAmbientOcclusion; + private VertexFormat formate; + private TextureAtlasSprite particleSprite; + private float[] rotation = getDefaultRotation(); + private float[] translation = getDefaultTranslation(); + private float[] scale = getDefaultScale(); public ModelBakerModel() { - general = new ArrayList<>(); - for (EnumFacing f : EnumFacing.VALUES) { - faces.put(f, new ArrayList()); - } + general = new ArrayList(); + for (EnumFacing f : EnumFacing.VALUES) + faces[f.ordinal()] = new ArrayList(); + formate = DefaultVertexFormats.BLOCK; + isGui3d = true; + isAmbientOcclusion = false; } - private ModelBakerModel(List general, EnumMap> faces) { + private ModelBakerModel(List general, List[] faces, boolean isGui3d, boolean isAmbientOcclusion, VertexFormat formate, float[] rotation, float[] translation, float[] scale, TextureAtlasSprite particleSprite) { this.general = general; this.faces = faces; + this.isGui3d = isGui3d; + this.isAmbientOcclusion = isAmbientOcclusion; + this.formate = formate; + this.rotation = rotation; + this.translation = translation; + this.scale = scale; + this.particleSprite = particleSprite; + } + + @Override + public void setGui3d(boolean gui3d) { + this.isGui3d = gui3d; } @Override @@ -50,18 +71,38 @@ public class ModelBakerModel implements IBakedModel { } @Override - public boolean isBuiltInRenderer() { - return false; + public void setAmbientOcclusion(boolean ambientOcclusion) { + this.isAmbientOcclusion = ambientOcclusion; } - + @Override public boolean isAmbientOcclusion() { - return true; + return isAmbientOcclusion; + } + + @Override + public void setParticleSprite(TextureAtlasSprite particleSprite) { + this.particleSprite = particleSprite; } @Override public TextureAtlasSprite getParticleTexture() { - return null; + return particleSprite; + } + + @Override + public VertexFormat getFormat() { + return formate; + } + + @Override + public void setFormat(VertexFormat formate) { + this.formate = formate; + } + + @Override + public boolean isBuiltInRenderer() { + return false; } @Override @@ -69,7 +110,7 @@ public class ModelBakerModel implements IBakedModel { return getTransform(); } - public static ItemCameraTransforms getTransform() { + public ItemCameraTransforms getTransform() { Vector3f rotation = new Vector3f(getRotation()[0], getRotation()[1], getRotation()[2]); Vector3f translation = new Vector3f(getTranslation()[0], getTranslation()[1], getTranslation()[2]); translation.scale(0.0625F); @@ -86,29 +127,59 @@ public class ModelBakerModel implements IBakedModel { return new ItemCameraTransforms(transformV, ItemCameraTransforms.DEFAULT.firstPerson, ItemCameraTransforms.DEFAULT.head, ItemCameraTransforms.DEFAULT.gui, ItemCameraTransforms.DEFAULT.ground, ItemCameraTransforms.DEFAULT.fixed); } - protected static float[] getRotation() { - return new float[]{-80, -45, 170}; + public static float[] getDefaultRotation() { + return new float[] { -80, -45, 170 }; } - protected static float[] getTranslation() { - return new float[]{0, 1.5F, -2.75F}; + public static float[] getDefaultTranslation() { + return new float[] { 0, 1.5F, -2.75F }; } - protected static float[] getScale() { - return new float[]{0.375F, 0.375F, 0.375F}; + public static float[] getDefaultScale() { + return new float[] { 0.375F, 0.375F, 0.375F }; + } + + @Override + public void setRotation(float[] rotation) { + this.rotation = rotation; + } + + @Override + public void setTranslation(float[] translation) { + this.translation = translation; + } + + @Override + public void setScale(float[] scale) { + this.scale = scale; + } + + @Override + public float[] getRotation() { + return rotation; } @Override - public List getGeneralQuads() { + public float[] getTranslation() { + return translation; + } + + @Override + public float[] getScale() { + return scale; + } + + @Override + public List getGeneralQuads() { return general; } @Override - public List getFaceQuads(EnumFacing face) { - return faces.get(face); + public List getFaceQuads(EnumFacing face) { + return faces[face.ordinal()]; } public ModelBakerModel copy() { - return new ModelBakerModel(general, faces); + return new ModelBakerModel(general, faces, isGui3d, isAmbientOcclusion, formate, rotation, translation, scale, particleSprite); } } diff --git a/src/main/java/forestry/factory/recipes/jei/FactoryJeiPlugin.java b/src/main/java/forestry/factory/recipes/jei/FactoryJeiPlugin.java index 2b2269228..c2ed1e5d6 100644 --- a/src/main/java/forestry/factory/recipes/jei/FactoryJeiPlugin.java +++ b/src/main/java/forestry/factory/recipes/jei/FactoryJeiPlugin.java @@ -96,7 +96,7 @@ public class FactoryJeiPlugin extends BlankModPlugin { @Nullable @Override public List getGuiExtraAreas(GuiForestry guiContainer) { - GuiForestry guiForestry = (GuiForestry) guiContainer; + GuiForestry guiForestry = guiContainer; return guiForestry.getExtraGuiAreas(); } } diff --git a/src/main/java/forestry/farming/models/ModelFarmBlock.java b/src/main/java/forestry/farming/models/ModelFarmBlock.java index f123a0700..30e537e91 100644 --- a/src/main/java/forestry/farming/models/ModelFarmBlock.java +++ b/src/main/java/forestry/farming/models/ModelFarmBlock.java @@ -25,28 +25,8 @@ public class ModelFarmBlock extends ModelBlockOverlay { EnumFarmBlockTexture type = EnumFarmBlockTexture.getFromCompound(item.getTagCompound()); - TextureAtlasSprite[] sprites = getSprites(type); - TextureAtlasSprite[] overlaySprites = getOverlaySprites(EnumFarmBlockType.VALUES[item.getItemDamage()]); - - baker.renderFaceYNeg(null, sprites[0]); - baker.renderFaceYNeg(null, overlaySprites[0]); - - baker.renderFaceYPos(null, sprites[1]); - baker.renderFaceYPos(null, overlaySprites[1]); - - baker.renderFaceZNeg(null, sprites[2]); - baker.renderFaceZNeg(null, overlaySprites[2]); - - baker.renderFaceZPos(null, sprites[3]); - baker.renderFaceZPos(null, overlaySprites[3]); - - baker.renderFaceXNeg(null, sprites[4]); - baker.renderFaceXNeg(null, overlaySprites[4]); - - baker.renderFaceXPos(null, sprites[5]); - baker.renderFaceXPos(null, overlaySprites[5]); - - blockFarm.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F); + baker.addBlockModel(blockFarm, null, getSprites(type), 0); + baker.addBlockModel(blockFarm, null, getOverlaySprites(EnumFarmBlockType.VALUES[item.getItemDamage()]), 0); } @Override @@ -58,21 +38,12 @@ public class ModelFarmBlock extends ModelBlockOverlay { TextureAtlasSprite[] texturesOverlay = getOverlaySprites(farm.getFarmBlockType()); // Render the plain block. - baker.renderStandardBlock(blockFarm, pos, textures, 0); - renderFarmOverlay(world, blockFarm, pos, baker, texturesOverlay); + baker.addBlockModel(blockFarm, pos, getSprites(farm.getFarmBlockTexture()), 0); + baker.addBlockModel(blockFarm, pos, getOverlaySprites(farm.getFarmBlockType()), 0); 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); diff --git a/src/main/java/forestry/mail/items/ItemStamps.java b/src/main/java/forestry/mail/items/ItemStamps.java index af06e6774..5ad941919 100755 --- a/src/main/java/forestry/mail/items/ItemStamps.java +++ b/src/main/java/forestry/mail/items/ItemStamps.java @@ -19,7 +19,7 @@ import forestry.core.items.ItemOverlay; public class ItemStamps extends ItemOverlay implements IStamps { public ItemStamps() { - super(CreativeTabForestry.tabForestry, (IOverlayInfo[]) EnumStampDefinition.VALUES); + super(CreativeTabForestry.tabForestry, EnumStampDefinition.VALUES); } @Override