mirror of
https://github.com/GTNewHorizons/Binnie.git
synced 2026-11-21 20:52:22 +00:00
Rename ModelBaker, fix uv and add multifence model
This commit is contained in:
1 parent
892dee2eb0
commit
a17d9015c1
10 files changed
+721
-359
No files matched your search
@@ -3,7 +3,6 @@ package binnie.core.genetics;
|
||||
import binnie.Binnie;
|
||||
import binnie.core.BinnieCore;
|
||||
import binnie.core.resource.BinnieSprite;
|
||||
import binnie.extrabees.genetics.ExtraBeeMutation;
|
||||
import com.mojang.authlib.GameProfile;
|
||||
import forestry.api.core.ForestryEvent;
|
||||
import forestry.api.genetics.AlleleManager;
|
||||
|
||||
+87
-73
@@ -29,28 +29,28 @@ import javax.annotation.Nullable;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
//AABB = AxisAlignedBoundingBox
|
||||
@SideOnly(Side.CLIENT)
|
||||
public class PanelModelBaker implements IModelBaker {
|
||||
|
||||
private final float[] quadsUV;
|
||||
private final List<ModelBakerFace> faces = new ArrayList<>();
|
||||
public class AABBModelBaker implements IModelBaker {
|
||||
private final static float[] quadsUV = new float[]{0, 0, 1, 1, 0, 0, 1, 1};
|
||||
private final List<BoundModelBakerFace> faces = new ArrayList<>();
|
||||
private final List<Pair<IBlockState, IBakedModel>> bakedModels = new ArrayList<>();
|
||||
protected AxisAlignedBB renderBounds;
|
||||
protected AxisAlignedBB modelBounds;
|
||||
|
||||
protected ModelBakerModel currentModel = new ModelBakerModel(ModelManager.getInstance().getDefaultBlockState());
|
||||
|
||||
protected final FaceBakery faceBakery = new FaceBakery();
|
||||
|
||||
protected final float[] defUVs;
|
||||
|
||||
public PanelModelBaker() {
|
||||
public AABBModelBaker() {
|
||||
this(Block.FULL_BLOCK_AABB);
|
||||
}
|
||||
|
||||
public PanelModelBaker(AxisAlignedBB renderBounds) {
|
||||
quadsUV = new float[]{0, 0, 1, 1, 0, 0, 1, 1};
|
||||
defUVs = new float[]{0, 0, 1, 1};
|
||||
this.renderBounds = renderBounds;
|
||||
public AABBModelBaker(AxisAlignedBB modelBounds) {
|
||||
this.modelBounds = modelBounds;
|
||||
}
|
||||
|
||||
public void setModelBounds(AxisAlignedBB modelBounds) {
|
||||
this.modelBounds = modelBounds;
|
||||
}
|
||||
|
||||
protected int colorIndex = -1;
|
||||
@@ -106,69 +106,72 @@ public class PanelModelBaker implements IModelBaker {
|
||||
}
|
||||
}
|
||||
|
||||
protected float[] getFaceUvs(final EnumFacing face, final Vector3f to_16, final Vector3f from_16) {
|
||||
float from_a = 0;
|
||||
float from_b = 0;
|
||||
float to_a = 0;
|
||||
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;
|
||||
protected float[] getFaceUvs(final EnumFacing face, final Vector3f to, final Vector3f from) {
|
||||
float minU;
|
||||
float minV;
|
||||
float maxU;
|
||||
float maxV;
|
||||
switch(face){
|
||||
case SOUTH:{
|
||||
minU= from.x;
|
||||
minV = from.y;
|
||||
maxU= to.x;
|
||||
maxV = to.y;
|
||||
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;
|
||||
}
|
||||
case NORTH:{
|
||||
minU= from.x;
|
||||
minV = from.y;
|
||||
maxU= to.x;
|
||||
maxV = to.y;
|
||||
break;
|
||||
case SOUTH:
|
||||
from_a = from_16.y / 16.0f;
|
||||
from_b = from_16.x / 16.0f;
|
||||
to_a = to_16.y / 16.0f;
|
||||
to_b = to_16.x / 16.0f;
|
||||
}
|
||||
case WEST:{
|
||||
minU= from.z;
|
||||
minV = from.y;
|
||||
maxU= to.z;
|
||||
maxV = to.y;
|
||||
break;
|
||||
case NORTH:
|
||||
from_a = from_16.y / 16.0f;
|
||||
from_b = from_16.x / 16.0f;
|
||||
to_a = to_16.y / 16.0f;
|
||||
to_b = to_16.x / 16.0f;
|
||||
}
|
||||
case EAST:{
|
||||
minU= from.z;
|
||||
minV = from.y;
|
||||
maxU= to.z;
|
||||
maxV = to.y;
|
||||
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;
|
||||
}
|
||||
case UP:{
|
||||
minU= from.x;
|
||||
minV = from.z;
|
||||
maxU= to.x;
|
||||
maxV = to.z;
|
||||
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;
|
||||
}
|
||||
case DOWN:{
|
||||
minU= from.x;
|
||||
minV = from.z;
|
||||
maxU= to.x;
|
||||
maxV = to.z;
|
||||
break;
|
||||
default:
|
||||
}
|
||||
default:{
|
||||
minU= 6;
|
||||
minV = 0;
|
||||
maxU= 10;
|
||||
maxV = 16;
|
||||
break;
|
||||
}
|
||||
}
|
||||
minU = 16 - minU;
|
||||
minV = 16 - minV;
|
||||
maxU = 16 - maxU;
|
||||
maxV = 16 - maxV;
|
||||
return new float[]{
|
||||
minU,
|
||||
minV,
|
||||
|
||||
from_a = 1.0f - from_a;
|
||||
from_b = 1.0f - from_b;
|
||||
to_a = 1.0f - to_a;
|
||||
to_b = 1.0f - to_b;
|
||||
|
||||
return 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
|
||||
|
||||
16.0f * (quadsUV[0] + quadsUV[2] * to_a + quadsUV[4] * from_b), // 2
|
||||
16.0f * (quadsUV[1] + quadsUV[3] * to_a + quadsUV[5] * from_b), // 3
|
||||
|
||||
16.0f * (quadsUV[0] + quadsUV[2] * to_a + quadsUV[4] * to_b), // 2
|
||||
16.0f * (quadsUV[1] + quadsUV[3] * to_a + quadsUV[5] * to_b), // 3
|
||||
|
||||
16.0f * (quadsUV[0] + quadsUV[2] * from_a + quadsUV[4] * to_b), // 0
|
||||
16.0f * (quadsUV[1] + quadsUV[3] * from_a + quadsUV[5] * to_b), // 1
|
||||
maxU,
|
||||
maxV
|
||||
};
|
||||
}
|
||||
|
||||
@@ -178,7 +181,19 @@ public class PanelModelBaker implements IModelBaker {
|
||||
return;
|
||||
}
|
||||
|
||||
faces.add(new ModelBakerFace(facing, colorIndex, sprite));
|
||||
faces.add(new BoundModelBakerFace(facing, colorIndex, sprite, modelBounds));
|
||||
}
|
||||
|
||||
private static class BoundModelBakerFace extends ModelBakerFace{
|
||||
|
||||
protected final AxisAlignedBB modelBounds;
|
||||
|
||||
public BoundModelBakerFace(EnumFacing face, int colorIndex, TextureAtlasSprite sprite, AxisAlignedBB modelBounds) {
|
||||
super(face, colorIndex, sprite);
|
||||
|
||||
this.modelBounds = modelBounds;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -194,11 +209,10 @@ public class PanelModelBaker implements IModelBaker {
|
||||
currentModel.addModelQuads(bakedModel);
|
||||
}
|
||||
|
||||
Vector3f to = new Vector3f((float) renderBounds.minX * 16.0f, (float) renderBounds.minY * 16.0f, (float) renderBounds.minZ * 16.0f);
|
||||
Vector3f from = new Vector3f((float) renderBounds.maxX * 16.0f, (float) renderBounds.maxY * 16.0f, (float) renderBounds.maxZ * 16.0f);
|
||||
|
||||
for (ModelBakerFace face : faces) {
|
||||
|
||||
for (BoundModelBakerFace face : faces) {
|
||||
final AxisAlignedBB modelBounds = face.modelBounds;
|
||||
final Vector3f to = new Vector3f((float) modelBounds.minX * 16.0f, (float) modelBounds.minY * 16.0f, (float) modelBounds.minZ * 16.0f);
|
||||
final Vector3f from = new Vector3f((float) modelBounds.maxX * 16.0f, (float) modelBounds.maxY * 16.0f, (float) modelBounds.maxZ * 16.0f);
|
||||
final EnumFacing myFace = face.face;
|
||||
final float[] uvs = getFaceUvs(myFace, from, to);
|
||||
|
||||
@@ -41,14 +41,14 @@ public class ModelMutlipass<B extends Block & IMultipassBlock<K>, K> extends Mod
|
||||
return null;
|
||||
}
|
||||
|
||||
IModelBaker baker;
|
||||
AABBModelBaker baker = new AABBModelBaker();
|
||||
if (state instanceof IExtendedBlockState) {
|
||||
IExtendedBlockState stateExtended = (IExtendedBlockState) state;
|
||||
IBlockAccess world = stateExtended.getValue(UnlistedBlockAccess.BLOCKACCESS);
|
||||
BlockPos pos = stateExtended.getValue(UnlistedBlockPos.POS);
|
||||
baker = new PanelModelBaker(state.getBoundingBox(world, pos));
|
||||
baker.setModelBounds(state.getBoundingBox(world, pos));
|
||||
}else{
|
||||
baker = new PanelModelBaker(block.getItemBoundingBox());
|
||||
baker.setModelBounds(block.getItemBoundingBox());
|
||||
}
|
||||
|
||||
bakeBlock(block, key, baker, false);
|
||||
@@ -86,7 +86,7 @@ public class ModelMutlipass<B extends Block & IMultipassBlock<K>, K> extends Mod
|
||||
B bBlock = blockClass.cast(block);
|
||||
|
||||
|
||||
IModelBaker baker = new PanelModelBaker(bBlock.getItemBoundingBox());
|
||||
IModelBaker baker = new AABBModelBaker(bBlock.getItemBoundingBox());
|
||||
bakeBlock(bBlock, key, baker, true);
|
||||
|
||||
return itemModel = baker.bakeModel(true);
|
||||
|
||||
@@ -9,6 +9,7 @@ import binnie.core.network.BinniePacketHandler;
|
||||
import binnie.core.proxy.IProxyCore;
|
||||
import binnie.extrabees.ExtraBees;
|
||||
import binnie.extratrees.alcohol.ModuleAlcohol;
|
||||
import binnie.extratrees.block.IPlankType;
|
||||
import binnie.extratrees.block.ModuleBlocks;
|
||||
import binnie.extratrees.block.PlankType;
|
||||
import binnie.extratrees.carpentry.ModuleCarpentry;
|
||||
@@ -28,7 +29,13 @@ import com.google.common.base.Preconditions;
|
||||
import forestry.api.arboriculture.ITreeRoot;
|
||||
import forestry.api.genetics.AlleleSpeciesRegisterEvent;
|
||||
import forestry.api.lepidopterology.IButterflyRoot;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.gui.GuiButton;
|
||||
import net.minecraft.client.gui.GuiScreen;
|
||||
import net.minecraft.client.gui.inventory.GuiContainer;
|
||||
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
|
||||
import net.minecraft.client.renderer.texture.TextureMap;
|
||||
import net.minecraftforge.client.event.GuiScreenEvent;
|
||||
import net.minecraftforge.client.event.ModelBakeEvent;
|
||||
import net.minecraftforge.client.event.TextureStitchEvent;
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
@@ -190,6 +197,24 @@ public class ExtraTrees extends AbstractMod {
|
||||
super(ExtraBees.instance);
|
||||
}
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
@SubscribeEvent
|
||||
public void openGui(GuiScreenEvent.InitGuiEvent event){
|
||||
if(event.getGui() instanceof GuiContainer){
|
||||
GuiContainer gui = (GuiContainer) event.getGui();
|
||||
event.getButtonList().add(new GuiButton(90, 60, 90, "gfrwgrweg"));
|
||||
}
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
@SubscribeEvent
|
||||
public void openGui(GuiScreenEvent.ActionPerformedEvent event){
|
||||
if(event.getGui() instanceof GuiContainer && event.getButton().id == 90){
|
||||
Minecraft.getMinecraft().displayGuiScreen(new GuiScreen() {
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
@SideOnly(Side.CLIENT)
|
||||
@@ -216,6 +241,16 @@ public class ExtraTrees extends AbstractMod {
|
||||
for (FruitSprite sprite : FruitSprite.VALUES) {
|
||||
sprite.registerSprites();
|
||||
}
|
||||
TextureMap map = Minecraft.getMinecraft().getTextureMapBlocks();
|
||||
for(IPlankType type : PlankType.ExtraTreePlanks.VALUES){
|
||||
type.registerSprites(map);
|
||||
}
|
||||
for(IPlankType type : PlankType.ForestryPlanks.values()){
|
||||
type.registerSprites(map);
|
||||
}
|
||||
for(IPlankType type : PlankType.VanillaPlanks.values()){
|
||||
type.registerSprites(map);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@@ -2,12 +2,21 @@ package binnie.extratrees.block;
|
||||
|
||||
import binnie.extratrees.api.IDesignMaterial;
|
||||
import forestry.api.arboriculture.IWoodType;
|
||||
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
||||
import net.minecraft.client.renderer.texture.TextureMap;
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
|
||||
public interface IPlankType extends IDesignMaterial {
|
||||
// IIcon getIcon();
|
||||
String getPlankTextureName();
|
||||
|
||||
String getDescription();
|
||||
|
||||
IWoodType getWoodType();
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
TextureAtlasSprite getSprite();
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
void registerSprites(TextureMap map);
|
||||
}
|
||||
@@ -216,9 +216,7 @@ public class ModuleBlocks implements IInitializable {
|
||||
woodAccess.registerFenceGates(new ArrayList<>(fenceGatesFireproof));
|
||||
|
||||
blockMultiFence = new BlockMultiFence();
|
||||
GameRegistry.register(blockMultiFence);
|
||||
GameRegistry.register(new ItemMetadata(blockMultiFence).setRegistryName(blockMultiFence.getRegistryName()));
|
||||
//BinnieCore.proxy.registerCustomItemRenderer(Item.getItemFromBlock(ExtraTrees.blockMultiFence), new ItemMetadataRenderer());
|
||||
ExtraTrees.proxy.registerBlock(blockMultiFence, new ItemMetadata(blockMultiFence));
|
||||
|
||||
blockDoor = new BlockETDoor();
|
||||
GameRegistry.register(blockDoor);
|
||||
|
||||
@@ -8,8 +8,13 @@ import forestry.api.arboriculture.EnumVanillaWoodType;
|
||||
import forestry.api.arboriculture.IWoodType;
|
||||
import forestry.api.arboriculture.TreeManager;
|
||||
import forestry.api.arboriculture.WoodBlockKind;
|
||||
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
||||
import net.minecraft.client.renderer.texture.TextureMap;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.IStringSerializable;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
|
||||
public class PlankType {
|
||||
public static final int MAX_PLANKS = 256;
|
||||
@@ -71,7 +76,8 @@ public class PlankType {
|
||||
|
||||
private EnumETLog woodType;
|
||||
private final int color;
|
||||
//IIcon icon;
|
||||
@SideOnly(Side.CLIENT)
|
||||
private TextureAtlasSprite sprite;
|
||||
|
||||
ExtraTreePlanks(final int color) {
|
||||
this.color = color;
|
||||
@@ -154,15 +160,18 @@ public class PlankType {
|
||||
public ItemStack getStack() {
|
||||
return getStack(true);
|
||||
}
|
||||
|
||||
// public IIcon loadIcon(final IIconRegister register) {
|
||||
// return this.icon = ExtraTrees.proxy.getIcon(register, "planks/" + this.toString());
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public IIcon getIcon() {
|
||||
// return this.icon;
|
||||
// }
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
@Override
|
||||
public TextureAtlasSprite getSprite() {
|
||||
return sprite;
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
@Override
|
||||
public void registerSprites(TextureMap map) {
|
||||
sprite = map.registerSprite(new ResourceLocation(getPlankTextureName()));
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack getFence() {
|
||||
@@ -180,6 +189,8 @@ public class PlankType {
|
||||
|
||||
private final IWoodType woodType;
|
||||
private int color;
|
||||
@SideOnly(Side.CLIENT)
|
||||
private TextureAtlasSprite sprite;
|
||||
|
||||
VanillaPlanks(final int color, IWoodType woodType) {
|
||||
this.color = color;
|
||||
@@ -200,6 +211,18 @@ public class PlankType {
|
||||
public String getPlankTextureName() {
|
||||
return "minecraft:blocks/planks_" + name().toLowerCase();
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
@Override
|
||||
public TextureAtlasSprite getSprite() {
|
||||
return sprite;
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
@Override
|
||||
public void registerSprites(TextureMap map) {
|
||||
sprite = map.registerSprite(new ResourceLocation(getPlankTextureName()));
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getColour() {
|
||||
@@ -265,6 +288,8 @@ public class PlankType {
|
||||
|
||||
private final IWoodType woodType;
|
||||
private final int color;
|
||||
@SideOnly(Side.CLIENT)
|
||||
private TextureAtlasSprite sprite;
|
||||
|
||||
ForestryPlanks(final int color, IWoodType woodType) {
|
||||
this.color = color;
|
||||
@@ -285,6 +310,18 @@ public class PlankType {
|
||||
public String getDescription() {
|
||||
return ExtraTrees.proxy.localise("block.planks.forestry." + this.toString().toLowerCase() + ".desc");
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
@Override
|
||||
public TextureAtlasSprite getSprite() {
|
||||
return sprite;
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
@Override
|
||||
public void registerSprites(TextureMap map) {
|
||||
sprite = map.registerSprite(new ResourceLocation(getPlankTextureName()));
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getColour() {
|
||||
|
||||
@@ -1,21 +1,56 @@
|
||||
package binnie.extratrees.block.decor;
|
||||
|
||||
import javax.annotation.Nullable;
|
||||
|
||||
import binnie.Binnie;
|
||||
import binnie.core.block.IBlockMetadata;
|
||||
import binnie.core.block.TileEntityMetadata;
|
||||
import binnie.core.models.DefaultStateMapper;
|
||||
import binnie.core.models.ModelManager;
|
||||
import binnie.extratrees.ExtraTrees;
|
||||
import binnie.extratrees.block.IPlankType;
|
||||
import binnie.extratrees.block.PlankType;
|
||||
import binnie.extratrees.block.WoodManager;
|
||||
import forestry.api.core.IItemModelRegister;
|
||||
import forestry.api.core.IModelManager;
|
||||
import forestry.api.core.IStateMapperRegister;
|
||||
import forestry.core.blocks.properties.UnlistedBlockAccess;
|
||||
import forestry.core.blocks.properties.UnlistedBlockPos;
|
||||
import forestry.core.models.BlockModelEntry;
|
||||
import net.minecraft.block.properties.IProperty;
|
||||
import net.minecraft.block.state.BlockStateContainer;
|
||||
import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.client.renderer.ItemMeshDefinition;
|
||||
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
|
||||
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.NonNullList;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.world.IBlockAccess;
|
||||
import net.minecraftforge.client.model.ModelLoader;
|
||||
import net.minecraftforge.common.property.ExtendedBlockState;
|
||||
import net.minecraftforge.common.property.IExtendedBlockState;
|
||||
import net.minecraftforge.common.property.IUnlistedProperty;
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
|
||||
public class BlockMultiFence extends BlockFence implements IBlockMetadata {
|
||||
public class BlockMultiFence extends BlockFence implements IBlockMetadata, IStateMapperRegister, IItemModelRegister {
|
||||
public BlockMultiFence() {
|
||||
super("multifence");
|
||||
}
|
||||
|
||||
@Override
|
||||
protected BlockStateContainer createBlockState() {
|
||||
return new ExtendedBlockState(this, new IProperty[]{NORTH, EAST, WEST, SOUTH}, new IUnlistedProperty[]{UnlistedBlockPos.POS, UnlistedBlockAccess.BLOCKACCESS});
|
||||
}
|
||||
|
||||
@Override
|
||||
public IBlockState getExtendedState(IBlockState state, IBlockAccess world, BlockPos pos) {
|
||||
return ((IExtendedBlockState) state).withProperty(UnlistedBlockPos.POS, pos).withProperty(UnlistedBlockAccess.BLOCKACCESS, world);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void getSubBlocks(final Item itemIn, final CreativeTabs par2CreativeTabs, final NonNullList<ItemStack> itemList) {
|
||||
@@ -23,11 +58,17 @@ public class BlockMultiFence extends BlockFence implements IBlockMetadata {
|
||||
itemList.add(WoodManager.getFence(PlankType.VanillaPlanks.SPRUCE, PlankType.VanillaPlanks.BIRCH, type, 1));
|
||||
}
|
||||
}
|
||||
|
||||
// @Override
|
||||
// public IIcon getIcon(final int side, final int meta) {
|
||||
// return (FenceRenderer.layer == 0) ? this.getDescription(meta).getPlankType().getIcon() : this.getDescription(meta).getSecondaryPlankType().getIcon();
|
||||
// }
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
@Nullable
|
||||
public TextureAtlasSprite getSprite(int meta, boolean secondary){
|
||||
FenceDescription desc = getDescription(meta);
|
||||
if(desc != null){
|
||||
IPlankType type = secondary ? desc.getSecondaryPlankType() : desc.getPlankType();
|
||||
return type.getSprite();
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
@@ -39,4 +80,30 @@ public class BlockMultiFence extends BlockFence implements IBlockMetadata {
|
||||
final FenceType type3 = this.getDescription(meta).getFenceType();
|
||||
return Binnie.LANGUAGE.localise(ExtraTrees.instance, "block.woodslab.name" + (twoTypes ? "2" : ""), type3.getPrefix(), type1.getName(), type2.getName());
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
@Override
|
||||
public void registerStateMapper() {
|
||||
ResourceLocation registryName = getRegistryName();
|
||||
ModelLoader.setCustomStateMapper(this, new DefaultStateMapper(registryName));
|
||||
ModelManager.registerCustomBlockModel(new BlockModelEntry(
|
||||
new ModelResourceLocation(registryName, "normal"),
|
||||
new ModelResourceLocation(registryName, "inventory"),
|
||||
new ModelMultiFence(), this));
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
@Override
|
||||
public void registerModel(Item item, IModelManager manager) {
|
||||
manager.registerItemModel(item, new FenceMeshDefinition());
|
||||
}
|
||||
|
||||
private class FenceMeshDefinition implements ItemMeshDefinition {
|
||||
|
||||
@Override
|
||||
public ModelResourceLocation getModelLocation(ItemStack stack) {
|
||||
return new ModelResourceLocation(getRegistryName(), "inventory");
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
@@ -1,266 +1,265 @@
|
||||
package binnie.extratrees.block.decor;
|
||||
|
||||
//TODO RENDERING
|
||||
public class FenceRenderer //implements ISimpleBlockRenderingHandler
|
||||
{
|
||||
// public static int layer;
|
||||
//
|
||||
// @Override
|
||||
// public void renderInventoryBlock(final Block block, final int metadata, final int modelID, final RenderBlocks renderer) {
|
||||
// final Tessellator tess = Tessellator.instance;
|
||||
// for (int i = 0; i < 5; ++i) {
|
||||
// final float thickness = 0.125f;
|
||||
// FenceRenderer.layer = 0;
|
||||
// if (i == 0) {
|
||||
// block.setBlockBounds(0.5f - thickness, 0.0f, 0.0f, 0.5f + thickness, 1.0f, thickness * 2.0f);
|
||||
// }
|
||||
// if (i == 1) {
|
||||
// block.setBlockBounds(0.5f - thickness, 0.0f, 1.0f - thickness * 2.0f, 0.5f + thickness, 1.0f, 1.0f);
|
||||
// }
|
||||
// final float s = 0.0625f;
|
||||
// final FenceType fenceType = (block == ExtraTrees.blockMultiFence) ? WoodManager.getFenceType(metadata) : new FenceType(0);
|
||||
// final boolean bottomBar = !fenceType.solid;
|
||||
// float topBarMaxY = 1.0f - s;
|
||||
// float topBarMinY = 1.0f - s * 3.0f;
|
||||
// float bottomBarMaxY = 0.5f - s;
|
||||
// float bottomBarMinY = 0.5f - s * 3.0f;
|
||||
// if (fenceType.size == 2) {
|
||||
// bottomBarMinY -= 4.0f * s;
|
||||
// bottomBarMaxY -= 4.0f * s;
|
||||
// topBarMinY -= 4.0f * s;
|
||||
// topBarMaxY -= 4.0f * s;
|
||||
// }
|
||||
// if (fenceType.size == 1) {
|
||||
// bottomBarMinY -= 4.0f * s;
|
||||
// bottomBarMaxY -= 4.0f * s;
|
||||
// }
|
||||
// if (fenceType.solid) {
|
||||
// topBarMinY = bottomBarMinY;
|
||||
// }
|
||||
// float minX = 0.5f - s;
|
||||
// float maxX = 0.5f + s;
|
||||
// float minZ = -s * 2.0f;
|
||||
// float maxZ = 1.0f + s * 2.0f;
|
||||
// if (i == 2) {
|
||||
// block.setBlockBounds(minX, topBarMinY, minZ, maxX, topBarMaxY, maxZ);
|
||||
// FenceRenderer.layer = 1;
|
||||
// }
|
||||
// if (i == 3) {
|
||||
// if (!bottomBar) {
|
||||
// continue;
|
||||
// }
|
||||
// block.setBlockBounds(minX, bottomBarMinY, minZ, maxX, bottomBarMaxY, maxZ);
|
||||
// FenceRenderer.layer = 1;
|
||||
// }
|
||||
// if (i == 4) {
|
||||
// if (fenceType.embossed) {
|
||||
// minX -= s * 0.9f;
|
||||
// maxX += s * 0.9f;
|
||||
// minZ -= s;
|
||||
// maxZ += s;
|
||||
// float minY = 0.0f;
|
||||
// float maxY = 1.0f;
|
||||
// if (fenceType.size != 1 && !fenceType.solid) {
|
||||
// minY = bottomBarMinY + 2.0f * s;
|
||||
// maxY = topBarMaxY - 2.0f * s;
|
||||
// }
|
||||
// else if (fenceType.size == 1 && fenceType.solid) {
|
||||
// minY = bottomBarMinY + 2.0f * s;
|
||||
// maxY = topBarMaxY - 2.0f * s;
|
||||
// }
|
||||
// else {
|
||||
// minY = 0.5f - 2.0f * s;
|
||||
// maxY = 0.5f + 2.0f * s;
|
||||
// }
|
||||
// if (fenceType.solid && fenceType.size == 0) {
|
||||
// minY -= s;
|
||||
// maxY -= s;
|
||||
// }
|
||||
// if (fenceType.solid && fenceType.size == 2) {
|
||||
// minY += s;
|
||||
// maxY += s;
|
||||
// }
|
||||
// block.setBlockBounds(minX, minY, minZ, maxX, maxY, maxZ);
|
||||
// FenceRenderer.layer = 0;
|
||||
// }
|
||||
// else {
|
||||
// if (fenceType.size != 1 || fenceType.solid) {
|
||||
// continue;
|
||||
// }
|
||||
// block.setBlockBounds(minX, 0.5f - s, minZ, maxX, 0.5f + s, maxZ);
|
||||
// FenceRenderer.layer = 1;
|
||||
// }
|
||||
// }
|
||||
// renderer.setRenderBoundsFromBlock(block);
|
||||
// GlStateManager.translate(-0.5f, -0.5f, -0.5f);
|
||||
// tess.startDrawingQuads();
|
||||
// tess.setNormal(0.0f, -1.0f, 0.0f);
|
||||
// renderer.renderFaceYNeg(block, 0.0, 0.0, 0.0, block.getIcon(0, metadata));
|
||||
// tess.draw();
|
||||
// tess.startDrawingQuads();
|
||||
// tess.setNormal(0.0f, 1.0f, 0.0f);
|
||||
// renderer.renderFaceYPos(block, 0.0, 0.0, 0.0, block.getIcon(1, metadata));
|
||||
// tess.draw();
|
||||
// tess.startDrawingQuads();
|
||||
// tess.setNormal(0.0f, 0.0f, -1.0f);
|
||||
// renderer.renderFaceXPos(block, 0.0, 0.0, 0.0, block.getIcon(2, metadata));
|
||||
// tess.draw();
|
||||
// tess.startDrawingQuads();
|
||||
// tess.setNormal(0.0f, 0.0f, 1.0f);
|
||||
// renderer.renderFaceXNeg(block, 0.0, 0.0, 0.0, block.getIcon(3, metadata));
|
||||
// tess.draw();
|
||||
// tess.startDrawingQuads();
|
||||
// tess.setNormal(-1.0f, 0.0f, 0.0f);
|
||||
// renderer.renderFaceZNeg(block, 0.0, 0.0, 0.0, block.getIcon(4, metadata));
|
||||
// tess.draw();
|
||||
// tess.startDrawingQuads();
|
||||
// tess.setNormal(1.0f, 0.0f, 0.0f);
|
||||
// renderer.renderFaceZPos(block, 0.0, 0.0, 0.0, block.getIcon(5, metadata));
|
||||
// tess.draw();
|
||||
// GlStateManager.translate(0.5f, 0.5f, 0.5f);
|
||||
// }
|
||||
// block.setBlockBounds(0.0f, 0.0f, 0.0f, 1.0f, 1.0f, 1.0f);
|
||||
// renderer.setRenderBoundsFromBlock(block);
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public boolean renderWorldBlock(final IBlockAccess world, final int par2, final int par3, final int par4, final Block block, final int modelId, final RenderBlocks renderer) {
|
||||
// FenceRenderer.layer = 0;
|
||||
// final BlockFence blockFence = (BlockFence) block;
|
||||
// final float i = 0.0625f;
|
||||
// FenceType fenceType = new FenceType(0);
|
||||
// final TileEntity tile = world.getTileEntity(par2, par3, par4);
|
||||
// if (tile != null && tile instanceof TileEntityMetadata && block instanceof BlockMultiFence) {
|
||||
// fenceType = WoodManager.getFenceType(((TileEntityMetadata) tile).getTileMetadata());
|
||||
// }
|
||||
// boolean rendered = false;
|
||||
// final float postWidth = 0.25f;
|
||||
// final float postHeight = 1.0f;
|
||||
// float minPostPos = 0.5f - postWidth / 2.0f;
|
||||
// float maxPostPos = 0.5f + postWidth / 2.0f;
|
||||
// renderer.setRenderBounds(minPostPos, 0.0, minPostPos, maxPostPos, postHeight, maxPostPos);
|
||||
// renderer.renderStandardBlock(block, par2, par3, par4);
|
||||
// rendered = true;
|
||||
// boolean connectAnyX = false;
|
||||
// boolean connectAnyZ = false;
|
||||
// if (blockFence.canConnectFenceTo(renderer.blockAccess, par2 - 1, par3, par4) || blockFence.canConnectFenceTo(renderer.blockAccess, par2 + 1, par3, par4)) {
|
||||
// connectAnyX = true;
|
||||
// }
|
||||
// if (blockFence.canConnectFenceTo(renderer.blockAccess, par2, par3, par4 - 1) || blockFence.canConnectFenceTo(renderer.blockAccess, par2, par3, par4 + 1)) {
|
||||
// connectAnyZ = true;
|
||||
// }
|
||||
// final boolean connectNegX = blockFence.canConnectFenceTo(renderer.blockAccess, par2 - 1, par3, par4);
|
||||
// final boolean connectPosX = blockFence.canConnectFenceTo(renderer.blockAccess, par2 + 1, par3, par4);
|
||||
// final boolean connectNegZ = blockFence.canConnectFenceTo(renderer.blockAccess, par2, par3, par4 - 1);
|
||||
// final boolean connectPosZ = blockFence.canConnectFenceTo(renderer.blockAccess, par2, par3, par4 + 1);
|
||||
// if (!connectAnyX && !connectAnyZ) {
|
||||
// connectAnyX = true;
|
||||
// }
|
||||
// minPostPos = 7.0f * i;
|
||||
// maxPostPos = 9.0f * i;
|
||||
// float barMinY = 12.0f * i;
|
||||
// float barMaxY = 15.0f * i;
|
||||
// final float minX = connectNegX ? 0.0f : minPostPos;
|
||||
// final float maxX = connectPosX ? 1.0f : maxPostPos;
|
||||
// final float minZ = connectNegZ ? 0.0f : minPostPos;
|
||||
// final float maxZ = connectPosZ ? 1.0f : maxPostPos;
|
||||
// boolean renderBottom = true;
|
||||
// if (fenceType.size == 2) {
|
||||
// barMaxY -= 5.0f * i;
|
||||
// barMinY -= 5.0f * i;
|
||||
// }
|
||||
// if (fenceType.solid) {
|
||||
// renderBottom = false;
|
||||
// if (fenceType.size == 0) {
|
||||
// barMinY = 6.0f * i;
|
||||
// }
|
||||
// else {
|
||||
// barMinY = i;
|
||||
// }
|
||||
// }
|
||||
// final float totalMaxY = barMaxY;
|
||||
// FenceRenderer.layer = 1;
|
||||
// if (connectAnyX) {
|
||||
// renderer.setRenderBounds(minX, barMinY, minPostPos, maxX, barMaxY, maxPostPos);
|
||||
// renderer.renderStandardBlock(blockFence, par2, par3, par4);
|
||||
// rendered = true;
|
||||
// }
|
||||
// if (connectAnyZ) {
|
||||
// renderer.setRenderBounds(minPostPos, barMinY, minZ, maxPostPos, barMaxY, maxZ);
|
||||
// renderer.renderStandardBlock(blockFence, par2, par3, par4);
|
||||
// rendered = true;
|
||||
// }
|
||||
// if (renderBottom) {
|
||||
// barMinY -= 6.0f * i;
|
||||
// barMaxY -= 6.0f * i;
|
||||
// if (fenceType.size == 1) {
|
||||
// barMinY += i;
|
||||
// }
|
||||
// if (connectAnyX) {
|
||||
// renderer.setRenderBounds(minX, barMinY, minPostPos, maxX, barMaxY, maxPostPos);
|
||||
// renderer.renderStandardBlock(blockFence, par2, par3, par4);
|
||||
// rendered = true;
|
||||
// }
|
||||
// if (connectAnyZ) {
|
||||
// renderer.setRenderBounds(minPostPos, barMinY, minZ, maxPostPos, barMaxY, maxZ);
|
||||
// renderer.renderStandardBlock(blockFence, par2, par3, par4);
|
||||
// rendered = true;
|
||||
// }
|
||||
// }
|
||||
// if (renderBottom && fenceType.size == 1) {
|
||||
// barMinY -= 6.0f * i;
|
||||
// barMaxY -= 6.0f * i;
|
||||
// barMaxY += i;
|
||||
// if (connectAnyX) {
|
||||
// renderer.setRenderBounds(minX, barMinY, minPostPos, maxX, barMaxY, maxPostPos);
|
||||
// renderer.renderStandardBlock(blockFence, par2, par3, par4);
|
||||
// rendered = true;
|
||||
// }
|
||||
// if (connectAnyZ) {
|
||||
// renderer.setRenderBounds(minPostPos, barMinY, minZ, maxPostPos, barMaxY, maxZ);
|
||||
// renderer.renderStandardBlock(blockFence, par2, par3, par4);
|
||||
// rendered = true;
|
||||
// }
|
||||
// }
|
||||
// final float totalMinY = barMinY;
|
||||
// FenceRenderer.layer = 0;
|
||||
// if (fenceType.embossed) {
|
||||
// minPostPos -= (float) (i - 0.25 * i);
|
||||
// maxPostPos += (float) (i - 0.25 * i);
|
||||
// float minY = totalMinY + 2.0f * i;
|
||||
// float maxY = totalMaxY - 2.0f * i;
|
||||
// if (fenceType.size == 1 && !fenceType.solid) {
|
||||
// minY = 6.0f * i;
|
||||
// maxY = 10.0f * i;
|
||||
// }
|
||||
// else if (fenceType.size == 0 && fenceType.solid) {
|
||||
// minY -= 4.0f * i;
|
||||
// maxY -= 4.0f * i;
|
||||
// }
|
||||
// else if (fenceType.size == 2 && fenceType.solid) {
|
||||
// minY += 4.0f * i;
|
||||
// maxY += 4.0f * i;
|
||||
// }
|
||||
// if (connectAnyX) {
|
||||
// renderer.setRenderBounds(minX, minY, minPostPos, maxX, maxY, maxPostPos);
|
||||
// renderer.renderStandardBlock(block, par2, par3, par4);
|
||||
// }
|
||||
// if (connectAnyZ) {
|
||||
// renderer.setRenderBounds(minPostPos, minY, minZ, maxPostPos, maxY, maxZ);
|
||||
// renderer.renderStandardBlock(block, par2, par3, par4);
|
||||
// }
|
||||
// }
|
||||
// blockFence.setBlockBoundsBasedOnState(renderer.blockAccess, par2, par3, par4);
|
||||
// return rendered;
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public boolean shouldRender3DInInventory(final int i) {
|
||||
// return true;
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public int getRenderId() {
|
||||
// return ExtraTrees.fenceID;
|
||||
// }
|
||||
/*public static int layer;
|
||||
|
||||
@Override
|
||||
public void renderInventoryBlock(final Block block, final int metadata, final int modelID, final RenderBlocks renderer) {
|
||||
final Tessellator tess = Tessellator.instance;
|
||||
for (int i = 0; i < 5; ++i) {
|
||||
final float thickness = 0.125f;
|
||||
FenceRenderer.layer = 0;
|
||||
if (i == 0) {
|
||||
block.setBlockBounds(0.5f - thickness, 0.0f, 0.0f, 0.5f + thickness, 1.0f, thickness * 2.0f);
|
||||
}
|
||||
if (i == 1) {
|
||||
block.setBlockBounds(0.5f - thickness, 0.0f, 1.0f - thickness * 2.0f, 0.5f + thickness, 1.0f, 1.0f);
|
||||
}
|
||||
final float s = 0.0625f;
|
||||
final FenceType fenceType = (block == ExtraTrees.blockMultiFence) ? WoodManager.getFenceType(metadata) : new FenceType(0);
|
||||
final boolean bottomBar = !fenceType.solid;
|
||||
float topBarMaxY = 1.0f - s;
|
||||
float topBarMinY = 1.0f - s * 3.0f;
|
||||
float bottomBarMaxY = 0.5f - s;
|
||||
float bottomBarMinY = 0.5f - s * 3.0f;
|
||||
if (fenceType.size == 2) {
|
||||
bottomBarMinY -= 4.0f * s;
|
||||
bottomBarMaxY -= 4.0f * s;
|
||||
topBarMinY -= 4.0f * s;
|
||||
topBarMaxY -= 4.0f * s;
|
||||
}
|
||||
if (fenceType.size == 1) {
|
||||
bottomBarMinY -= 4.0f * s;
|
||||
bottomBarMaxY -= 4.0f * s;
|
||||
}
|
||||
if (fenceType.solid) {
|
||||
topBarMinY = bottomBarMinY;
|
||||
}
|
||||
float minX = 0.5f - s;
|
||||
float maxX = 0.5f + s;
|
||||
float minZ = -s * 2.0f;
|
||||
float maxZ = 1.0f + s * 2.0f;
|
||||
if (i == 2) {
|
||||
block.setBlockBounds(minX, topBarMinY, minZ, maxX, topBarMaxY, maxZ);
|
||||
FenceRenderer.layer = 1;
|
||||
}
|
||||
if (i == 3) {
|
||||
if (!bottomBar) {
|
||||
continue;
|
||||
}
|
||||
block.setBlockBounds(minX, bottomBarMinY, minZ, maxX, bottomBarMaxY, maxZ);
|
||||
FenceRenderer.layer = 1;
|
||||
}
|
||||
if (i == 4) {
|
||||
if (fenceType.embossed) {
|
||||
minX -= s * 0.9f;
|
||||
maxX += s * 0.9f;
|
||||
minZ -= s;
|
||||
maxZ += s;
|
||||
float minY = 0.0f;
|
||||
float maxY = 1.0f;
|
||||
if (fenceType.size != 1 && !fenceType.solid) {
|
||||
minY = bottomBarMinY + 2.0f * s;
|
||||
maxY = topBarMaxY - 2.0f * s;
|
||||
}
|
||||
else if (fenceType.size == 1 && fenceType.solid) {
|
||||
minY = bottomBarMinY + 2.0f * s;
|
||||
maxY = topBarMaxY - 2.0f * s;
|
||||
}
|
||||
else {
|
||||
minY = 0.5f - 2.0f * s;
|
||||
maxY = 0.5f + 2.0f * s;
|
||||
}
|
||||
if (fenceType.solid && fenceType.size == 0) {
|
||||
minY -= s;
|
||||
maxY -= s;
|
||||
}
|
||||
if (fenceType.solid && fenceType.size == 2) {
|
||||
minY += s;
|
||||
maxY += s;
|
||||
}
|
||||
block.setBlockBounds(minX, minY, minZ, maxX, maxY, maxZ);
|
||||
FenceRenderer.layer = 0;
|
||||
}
|
||||
else {
|
||||
if (fenceType.size != 1 || fenceType.solid) {
|
||||
continue;
|
||||
}
|
||||
block.setBlockBounds(minX, 0.5f - s, minZ, maxX, 0.5f + s, maxZ);
|
||||
FenceRenderer.layer = 1;
|
||||
}
|
||||
}
|
||||
renderer.setRenderBoundsFromBlock(block);
|
||||
GlStateManager.translate(-0.5f, -0.5f, -0.5f);
|
||||
tess.startDrawingQuads();
|
||||
tess.setNormal(0.0f, -1.0f, 0.0f);
|
||||
renderer.renderFaceYNeg(block, 0.0, 0.0, 0.0, block.getIcon(0, metadata));
|
||||
tess.draw();
|
||||
tess.startDrawingQuads();
|
||||
tess.setNormal(0.0f, 1.0f, 0.0f);
|
||||
renderer.renderFaceYPos(block, 0.0, 0.0, 0.0, block.getIcon(1, metadata));
|
||||
tess.draw();
|
||||
tess.startDrawingQuads();
|
||||
tess.setNormal(0.0f, 0.0f, -1.0f);
|
||||
renderer.renderFaceXPos(block, 0.0, 0.0, 0.0, block.getIcon(2, metadata));
|
||||
tess.draw();
|
||||
tess.startDrawingQuads();
|
||||
tess.setNormal(0.0f, 0.0f, 1.0f);
|
||||
renderer.renderFaceXNeg(block, 0.0, 0.0, 0.0, block.getIcon(3, metadata));
|
||||
tess.draw();
|
||||
tess.startDrawingQuads();
|
||||
tess.setNormal(-1.0f, 0.0f, 0.0f);
|
||||
renderer.renderFaceZNeg(block, 0.0, 0.0, 0.0, block.getIcon(4, metadata));
|
||||
tess.draw();
|
||||
tess.startDrawingQuads();
|
||||
tess.setNormal(1.0f, 0.0f, 0.0f);
|
||||
renderer.renderFaceZPos(block, 0.0, 0.0, 0.0, block.getIcon(5, metadata));
|
||||
tess.draw();
|
||||
GlStateManager.translate(0.5f, 0.5f, 0.5f);
|
||||
}
|
||||
block.setBlockBounds(0.0f, 0.0f, 0.0f, 1.0f, 1.0f, 1.0f);
|
||||
renderer.setRenderBoundsFromBlock(block);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean renderWorldBlock(final IBlockAccess world, final int par2, final int par3, final int par4, final Block block, final int modelId, final RenderBlocks renderer) {
|
||||
FenceRenderer.layer = 0;
|
||||
final BlockFence blockFence = (BlockFence) block;
|
||||
final float i = 0.0625f;
|
||||
FenceType fenceType = new FenceType(0);
|
||||
final TileEntity tile = world.getTileEntity(par2, par3, par4);
|
||||
if (tile != null && tile instanceof TileEntityMetadata && block instanceof BlockMultiFence) {
|
||||
fenceType = WoodManager.getFenceType(((TileEntityMetadata) tile).getTileMetadata());
|
||||
}
|
||||
boolean rendered = false;
|
||||
final float postWidth = 0.25f;
|
||||
final float postHeight = 1.0f;
|
||||
float minPostPos = 0.5f - postWidth / 2.0f;
|
||||
float maxPostPos = 0.5f + postWidth / 2.0f;
|
||||
renderer.setRenderBounds(minPostPos, 0.0, minPostPos, maxPostPos, postHeight, maxPostPos);
|
||||
renderer.renderStandardBlock(block, par2, par3, par4);
|
||||
rendered = true;
|
||||
boolean connectAnyX = false;
|
||||
boolean connectAnyZ = false;
|
||||
if (blockFence.canConnectFenceTo(renderer.blockAccess, par2 - 1, par3, par4) || blockFence.canConnectFenceTo(renderer.blockAccess, par2 + 1, par3, par4)) {
|
||||
connectAnyX = true;
|
||||
}
|
||||
if (blockFence.canConnectFenceTo(renderer.blockAccess, par2, par3, par4 - 1) || blockFence.canConnectFenceTo(renderer.blockAccess, par2, par3, par4 + 1)) {
|
||||
connectAnyZ = true;
|
||||
}
|
||||
final boolean connectNegX = blockFence.canConnectFenceTo(renderer.blockAccess, par2 - 1, par3, par4);
|
||||
final boolean connectPosX = blockFence.canConnectFenceTo(renderer.blockAccess, par2 + 1, par3, par4);
|
||||
final boolean connectNegZ = blockFence.canConnectFenceTo(renderer.blockAccess, par2, par3, par4 - 1);
|
||||
final boolean connectPosZ = blockFence.canConnectFenceTo(renderer.blockAccess, par2, par3, par4 + 1);
|
||||
if (!connectAnyX && !connectAnyZ) {
|
||||
connectAnyX = true;
|
||||
}
|
||||
minPostPos = 7.0f * i;
|
||||
maxPostPos = 9.0f * i;
|
||||
float barMinY = 12.0f * i;
|
||||
float barMaxY = 15.0f * i;
|
||||
final float minX = connectNegX ? 0.0f : minPostPos;
|
||||
final float maxX = connectPosX ? 1.0f : maxPostPos;
|
||||
final float minZ = connectNegZ ? 0.0f : minPostPos;
|
||||
final float maxZ = connectPosZ ? 1.0f : maxPostPos;
|
||||
boolean renderBottom = true;
|
||||
if (fenceType.size == 2) {
|
||||
barMaxY -= 5.0f * i;
|
||||
barMinY -= 5.0f * i;
|
||||
}
|
||||
if (fenceType.solid) {
|
||||
renderBottom = false;
|
||||
if (fenceType.size == 0) {
|
||||
barMinY = 6.0f * i;
|
||||
}
|
||||
else {
|
||||
barMinY = i;
|
||||
}
|
||||
}
|
||||
final float totalMaxY = barMaxY;
|
||||
FenceRenderer.layer = 1;
|
||||
if (connectAnyX) {
|
||||
renderer.setRenderBounds(minX, barMinY, minPostPos, maxX, barMaxY, maxPostPos);
|
||||
renderer.renderStandardBlock(blockFence, par2, par3, par4);
|
||||
rendered = true;
|
||||
}
|
||||
if (connectAnyZ) {
|
||||
renderer.setRenderBounds(minPostPos, barMinY, minZ, maxPostPos, barMaxY, maxZ);
|
||||
renderer.renderStandardBlock(blockFence, par2, par3, par4);
|
||||
rendered = true;
|
||||
}
|
||||
if (renderBottom) {
|
||||
barMinY -= 6.0f * i;
|
||||
barMaxY -= 6.0f * i;
|
||||
if (fenceType.size == 1) {
|
||||
barMinY += i;
|
||||
}
|
||||
if (connectAnyX) {
|
||||
renderer.setRenderBounds(minX, barMinY, minPostPos, maxX, barMaxY, maxPostPos);
|
||||
renderer.renderStandardBlock(blockFence, par2, par3, par4);
|
||||
rendered = true;
|
||||
}
|
||||
if (connectAnyZ) {
|
||||
renderer.setRenderBounds(minPostPos, barMinY, minZ, maxPostPos, barMaxY, maxZ);
|
||||
renderer.renderStandardBlock(blockFence, par2, par3, par4);
|
||||
rendered = true;
|
||||
}
|
||||
}
|
||||
if (renderBottom && fenceType.size == 1) {
|
||||
barMinY -= 6.0f * i;
|
||||
barMaxY -= 6.0f * i;
|
||||
barMaxY += i;
|
||||
if (connectAnyX) {
|
||||
renderer.setRenderBounds(minX, barMinY, minPostPos, maxX, barMaxY, maxPostPos);
|
||||
renderer.renderStandardBlock(blockFence, par2, par3, par4);
|
||||
rendered = true;
|
||||
}
|
||||
if (connectAnyZ) {
|
||||
renderer.setRenderBounds(minPostPos, barMinY, minZ, maxPostPos, barMaxY, maxZ);
|
||||
renderer.renderStandardBlock(blockFence, par2, par3, par4);
|
||||
rendered = true;
|
||||
}
|
||||
}
|
||||
final float totalMinY = barMinY;
|
||||
FenceRenderer.layer = 0;
|
||||
if (fenceType.embossed) {
|
||||
minPostPos -= (float) (i - 0.25 * i);
|
||||
maxPostPos += (float) (i - 0.25 * i);
|
||||
float minY = totalMinY + 2.0f * i;
|
||||
float maxY = totalMaxY - 2.0f * i;
|
||||
if (fenceType.size == 1 && !fenceType.solid) {
|
||||
minY = 6.0f * i;
|
||||
maxY = 10.0f * i;
|
||||
}
|
||||
else if (fenceType.size == 0 && fenceType.solid) {
|
||||
minY -= 4.0f * i;
|
||||
maxY -= 4.0f * i;
|
||||
}
|
||||
else if (fenceType.size == 2 && fenceType.solid) {
|
||||
minY += 4.0f * i;
|
||||
maxY += 4.0f * i;
|
||||
}
|
||||
if (connectAnyX) {
|
||||
renderer.setRenderBounds(minX, minY, minPostPos, maxX, maxY, maxPostPos);
|
||||
renderer.renderStandardBlock(block, par2, par3, par4);
|
||||
}
|
||||
if (connectAnyZ) {
|
||||
renderer.setRenderBounds(minPostPos, minY, minZ, maxPostPos, maxY, maxZ);
|
||||
renderer.renderStandardBlock(block, par2, par3, par4);
|
||||
}
|
||||
}
|
||||
blockFence.setBlockBoundsBasedOnState(renderer.blockAccess, par2, par3, par4);
|
||||
return rendered;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean shouldRender3DInInventory(final int i) {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getRenderId() {
|
||||
return ExtraTrees.fenceID;
|
||||
}*/
|
||||
}
|
||||
@@ -0,0 +1,204 @@
|
||||
package binnie.extratrees.block.decor;
|
||||
|
||||
import binnie.core.block.TileEntityMetadata;
|
||||
import binnie.core.models.AABBModelBaker;
|
||||
import binnie.extratrees.ExtraTrees;
|
||||
import binnie.extratrees.block.WoodManager;
|
||||
import forestry.api.core.IModelBaker;
|
||||
import forestry.core.blocks.properties.UnlistedBlockAccess;
|
||||
import forestry.core.blocks.properties.UnlistedBlockPos;
|
||||
import forestry.core.models.ModelBlockDefault;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.client.renderer.block.model.IBakedModel;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.math.AxisAlignedBB;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.world.IBlockAccess;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.common.property.IExtendedBlockState;
|
||||
|
||||
public class ModelMultiFence extends ModelBlockDefault<BlockMultiFence, ModelMultiFence.Key> {
|
||||
|
||||
public static class Key{
|
||||
private int meta;
|
||||
private FenceType type;
|
||||
private IBlockState state;
|
||||
public Key(int meta, IBlockState state) {
|
||||
this.meta = meta;
|
||||
this.type = WoodManager.getFenceType(meta);
|
||||
this.state = state;
|
||||
}
|
||||
}
|
||||
|
||||
public ModelMultiFence() {
|
||||
super(BlockMultiFence.class);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected Key getInventoryKey(ItemStack stack) {
|
||||
return new Key(stack.getItemDamage(), ExtraTrees.blocks().blockMultiFence.getDefaultState());
|
||||
}
|
||||
|
||||
@Override
|
||||
protected Key getWorldKey(IBlockState state) {
|
||||
IExtendedBlockState stateExtended = (IExtendedBlockState) state;
|
||||
IBlockAccess world = stateExtended.getValue(UnlistedBlockAccess.BLOCKACCESS);
|
||||
BlockPos pos = stateExtended.getValue(UnlistedBlockPos.POS);
|
||||
TileEntity tileEntity = world.getTileEntity(pos);
|
||||
int meta;
|
||||
if(tileEntity instanceof TileEntityMetadata){
|
||||
TileEntityMetadata tileMeta = (TileEntityMetadata) tileEntity;
|
||||
meta = tileMeta.getBlockMetadata();
|
||||
}else{
|
||||
meta = 0;
|
||||
}
|
||||
return new Key(meta, stateExtended);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected IBakedModel bakeModel(IBlockState state, Key key, BlockMultiFence block) {
|
||||
if (key == null) {
|
||||
return null;
|
||||
}
|
||||
|
||||
AABBModelBaker baker = new AABBModelBaker();
|
||||
bakeBlock(block, key, baker, false);
|
||||
|
||||
blockModel = baker.bakeModel(false);
|
||||
onCreateModel(blockModel);
|
||||
return blockModel;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected IBakedModel bakeModel(ItemStack stack, World world, Key key) {
|
||||
if (key == null) {
|
||||
return null;
|
||||
}
|
||||
|
||||
Block block = Block.getBlockFromItem(stack.getItem());
|
||||
if (!blockClass.isInstance(block)) {
|
||||
return null;
|
||||
}
|
||||
BlockMultiFence bBlock = blockClass.cast(block);
|
||||
|
||||
|
||||
IModelBaker baker = new AABBModelBaker();
|
||||
bakeBlock(bBlock, key, baker, true);
|
||||
|
||||
return itemModel = baker.bakeModel(true);
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
protected void bakeBlock(BlockMultiFence block, Key key, IModelBaker baker, boolean inventory) {
|
||||
AABBModelBaker modelBaker = (AABBModelBaker) baker;
|
||||
final float scale = 0.0625f;
|
||||
IBlockState state = key.state;
|
||||
int meta = key.meta;
|
||||
FenceType fenceType = key.type;
|
||||
final float postWidth = 0.25f;
|
||||
final float postHeight = 1.0f;
|
||||
float minPostPos = 0.5f - postWidth / 2.0f;
|
||||
float maxPostPos = 0.5f + postWidth / 2.0f;
|
||||
modelBaker.setModelBounds(new AxisAlignedBB(minPostPos, 0.0, minPostPos, maxPostPos, postHeight, maxPostPos));
|
||||
modelBaker.addBlockModel(null, block.getSprite(meta, false), 0);
|
||||
final boolean connectNegX = state.getValue(net.minecraft.block.BlockFence.WEST);
|
||||
final boolean connectPosX = state.getValue(net.minecraft.block.BlockFence.EAST);
|
||||
final boolean connectNegZ = state.getValue(net.minecraft.block.BlockFence.NORTH);
|
||||
final boolean connectPosZ = state.getValue(net.minecraft.block.BlockFence.SOUTH);
|
||||
boolean connectAnyX = connectNegX || connectPosX;
|
||||
boolean connectAnyZ = connectNegZ || connectPosZ;
|
||||
if (!connectAnyX && !connectAnyZ) {
|
||||
connectAnyX = true;
|
||||
}
|
||||
minPostPos = 7.0f * scale;
|
||||
maxPostPos = 9.0f * scale;
|
||||
float barMinY = 12.0f * scale;
|
||||
float barMaxY = 15.0f * scale;
|
||||
final float minX = connectNegX ? 0.0f : minPostPos;
|
||||
final float maxX = connectPosX ? 1.0f : maxPostPos;
|
||||
final float minZ = connectNegZ ? 0.0f : minPostPos;
|
||||
final float maxZ = connectPosZ ? 1.0f : maxPostPos;
|
||||
boolean renderBottom = true;
|
||||
if (fenceType.size == 2) {
|
||||
barMaxY -= 5.0f * scale;
|
||||
barMinY -= 5.0f * scale;
|
||||
}
|
||||
if (fenceType.solid) {
|
||||
renderBottom = false;
|
||||
if (fenceType.size == 0) {
|
||||
barMinY = 6.0f * scale;
|
||||
}
|
||||
else {
|
||||
barMinY = scale;
|
||||
}
|
||||
}
|
||||
final float totalMaxY = barMaxY;
|
||||
if (connectAnyX) {
|
||||
modelBaker.setModelBounds(new AxisAlignedBB(minX, barMinY, minPostPos, maxX, barMaxY, maxPostPos));
|
||||
modelBaker.addBlockModel(null, block.getSprite(meta, true), 0);
|
||||
}
|
||||
if (connectAnyZ) {
|
||||
modelBaker.setModelBounds(new AxisAlignedBB(minPostPos, barMinY, minZ, maxPostPos, barMaxY, maxZ));
|
||||
modelBaker.addBlockModel(null, block.getSprite(meta, true), 0);
|
||||
}
|
||||
if (renderBottom) {
|
||||
barMinY -= 6.0f * scale;
|
||||
barMaxY -= 6.0f * scale;
|
||||
if (fenceType.size == 1) {
|
||||
barMinY += scale;
|
||||
}
|
||||
if (connectAnyX) {
|
||||
modelBaker.setModelBounds(new AxisAlignedBB(minX, barMinY, minPostPos, maxX, barMaxY, maxPostPos));
|
||||
modelBaker.addBlockModel(null, block.getSprite(meta, true), 0);
|
||||
}
|
||||
if (connectAnyZ) {
|
||||
modelBaker.setModelBounds(new AxisAlignedBB(minPostPos, barMinY, minZ, maxPostPos, barMaxY, maxZ));
|
||||
modelBaker.addBlockModel(null, block.getSprite(meta, true), 0);
|
||||
}
|
||||
}
|
||||
if (renderBottom && fenceType.size == 1) {
|
||||
barMinY -= 6.0f * scale;
|
||||
barMaxY -= 6.0f * scale;
|
||||
barMaxY += scale;
|
||||
if (connectAnyX) {
|
||||
modelBaker.setModelBounds(new AxisAlignedBB(minX, barMinY, minPostPos, maxX, barMaxY, maxPostPos));
|
||||
modelBaker.addBlockModel(null, block.getSprite(meta, true), 0);
|
||||
}
|
||||
if (connectAnyZ) {
|
||||
modelBaker.setModelBounds(new AxisAlignedBB(minPostPos, barMinY, minZ, maxPostPos, barMaxY, maxZ));
|
||||
modelBaker.addBlockModel(null, block.getSprite(meta, true), 0);
|
||||
}
|
||||
}
|
||||
final float totalMinY = barMinY;
|
||||
if (fenceType.embossed) {
|
||||
minPostPos -= (float) (scale - 0.25 * scale);
|
||||
maxPostPos += (float) (scale - 0.25 * scale);
|
||||
float minY = totalMinY + 2.0f * scale;
|
||||
float maxY = totalMaxY - 2.0f * scale;
|
||||
if (fenceType.size == 1 && !fenceType.solid) {
|
||||
minY = 6.0f * scale;
|
||||
maxY = 10.0f * scale;
|
||||
}
|
||||
else if (fenceType.size == 0 && fenceType.solid) {
|
||||
minY -= 4.0f * scale;
|
||||
maxY -= 4.0f * scale;
|
||||
}
|
||||
else if (fenceType.size == 2 && fenceType.solid) {
|
||||
minY += 4.0f * scale;
|
||||
maxY += 4.0f * scale;
|
||||
}
|
||||
if (connectAnyX) {
|
||||
modelBaker.setModelBounds(new AxisAlignedBB(minX, minY, minPostPos, maxX, maxY, maxPostPos));
|
||||
modelBaker.addBlockModel(null, block.getSprite(meta, false), 0);
|
||||
}
|
||||
if (connectAnyZ) {
|
||||
modelBaker.setModelBounds(new AxisAlignedBB(minPostPos, minY, minZ, maxPostPos, maxY, maxZ));
|
||||
modelBaker.addBlockModel(null, block.getSprite(meta, false), 0);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
Reference in new issue
Block a user