mirror of
https://github.com/KAMKEEL/CustomNPC-Plus.git
synced 2026-11-22 13:10:04 +00:00
Stool and Chair Models Completed
This commit is contained in:
1 parent
26f4158c17
commit
c95341b60b
31 files changed
+190
-120
No files matched your search
@@ -2,12 +2,16 @@ package noppes.npcs.client.renderer.blocks;
|
||||
|
||||
import cpw.mods.fml.client.registry.RenderingRegistry;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.RenderBlocks;
|
||||
import net.minecraft.client.renderer.texture.TextureManager;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import noppes.npcs.CustomItems;
|
||||
import noppes.npcs.blocks.BlockChair;
|
||||
import noppes.npcs.blocks.tiles.TileColorable;
|
||||
import noppes.npcs.client.model.blocks.ModelChair;
|
||||
import noppes.npcs.client.model.blocks.chair.ModelChair;
|
||||
import noppes.npcs.client.model.blocks.chair.ModelChairSpoof;
|
||||
import noppes.npcs.client.model.blocks.legacy.ModelLegacyChair;
|
||||
import noppes.npcs.config.ConfigClient;
|
||||
import org.lwjgl.opengl.GL11;
|
||||
@@ -16,7 +20,16 @@ import org.lwjgl.opengl.GL12;
|
||||
public class BlockChairRenderer extends BlockRendererInterface{
|
||||
|
||||
private final ModelLegacyChair legacyModel = new ModelLegacyChair();
|
||||
private final ModelChair model = new ModelChair();
|
||||
|
||||
private final ModelChairSpoof chairSpoof = new ModelChairSpoof();
|
||||
private final ModelChair chair = new ModelChair();
|
||||
|
||||
private static final ResourceLocation oak = new ResourceLocation("customnpcs","textures/models/chair/oak.png");
|
||||
private static final ResourceLocation spruce = new ResourceLocation("customnpcs","textures/models/chair/spruce.png");
|
||||
private static final ResourceLocation birch = new ResourceLocation("customnpcs","textures/models/chair/birch.png");
|
||||
private static final ResourceLocation jungle = new ResourceLocation("customnpcs","textures/models/chair/jungle.png");
|
||||
private static final ResourceLocation dark_oak = new ResourceLocation("customnpcs","textures/models/chair/dark_oak.png");
|
||||
private static final ResourceLocation acacia = new ResourceLocation("customnpcs","textures/models/chair/acacia.png");
|
||||
|
||||
public BlockChairRenderer(){
|
||||
((BlockChair)CustomItems.chair).renderId = RenderingRegistry.getNextAvailableRenderId();
|
||||
@@ -28,7 +41,7 @@ public class BlockChairRenderer extends BlockRendererInterface{
|
||||
TileColorable tile = (TileColorable) var1;
|
||||
GL11.glDisable(GL12.GL_RESCALE_NORMAL);
|
||||
GL11.glPushMatrix();
|
||||
GL11.glTranslatef((float)var2 + 0.5f, (float)var4 + 1.68f, (float)var6 + 0.5f);
|
||||
GL11.glTranslatef((float)var2 + 0.5f, (float)var4 + 1.65f, (float)var6 + 0.5f);
|
||||
GL11.glScalef(1.2f, 1.1f, 1.2f);
|
||||
GL11.glRotatef(180, 0, 0, 1);
|
||||
GL11.glRotatef(90 * tile.rotation, 0, 1, 0);
|
||||
@@ -38,8 +51,14 @@ public class BlockChairRenderer extends BlockRendererInterface{
|
||||
setWoodTexture(var1.getBlockMetadata());
|
||||
if(ConfigClient.LegacyChair)
|
||||
legacyModel.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
|
||||
else
|
||||
model.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
|
||||
else {
|
||||
if(ConfigClient.WoodTextures)
|
||||
chairSpoof.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
|
||||
else {
|
||||
setChairTexture(var1.getBlockMetadata());
|
||||
chair.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
|
||||
}
|
||||
}
|
||||
GL11.glDisable(GL11.GL_ALPHA_TEST);
|
||||
|
||||
GL11.glPopMatrix();
|
||||
@@ -58,11 +77,32 @@ public class BlockChairRenderer extends BlockRendererInterface{
|
||||
GL11.glColor3f(1, 1, 1);
|
||||
if(ConfigClient.LegacyChair)
|
||||
legacyModel.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
|
||||
else
|
||||
model.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
|
||||
else {
|
||||
if(ConfigClient.WoodTextures)
|
||||
chairSpoof.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
|
||||
else {
|
||||
setChairTexture(metadata);
|
||||
chair.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
|
||||
}
|
||||
}
|
||||
GL11.glPopMatrix();
|
||||
}
|
||||
|
||||
public void setChairTexture(int meta){
|
||||
TextureManager manager = Minecraft.getMinecraft().getTextureManager();
|
||||
if(meta == 1)
|
||||
manager.bindTexture(spruce);
|
||||
else if(meta == 2)
|
||||
manager.bindTexture(birch);
|
||||
else if(meta == 3)
|
||||
manager.bindTexture(jungle);
|
||||
else if(meta == 4)
|
||||
manager.bindTexture(acacia);
|
||||
else if(meta == 5)
|
||||
manager.bindTexture(dark_oak);
|
||||
else
|
||||
manager.bindTexture(oak);
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
|
||||
@@ -8,10 +8,10 @@ import net.minecraft.tileentity.TileEntity;
|
||||
import noppes.npcs.CustomItems;
|
||||
import noppes.npcs.blocks.BlockCouchWood;
|
||||
import noppes.npcs.blocks.tiles.TileCouchWood;
|
||||
import noppes.npcs.client.model.blocks.ModelCouchWoodLeft;
|
||||
import noppes.npcs.client.model.blocks.ModelCouchWoodMiddle;
|
||||
import noppes.npcs.client.model.blocks.ModelCouchWoodRight;
|
||||
import noppes.npcs.client.model.blocks.ModelCouchWoodSingle;
|
||||
import noppes.npcs.client.model.blocks.legacy.couch.ModelCouchWoodLeft;
|
||||
import noppes.npcs.client.model.blocks.legacy.couch.ModelCouchWoodMiddle;
|
||||
import noppes.npcs.client.model.blocks.legacy.couch.ModelCouchWoodRight;
|
||||
import noppes.npcs.client.model.blocks.legacy.couch.ModelCouchWoodSingle;
|
||||
import org.lwjgl.opengl.GL11;
|
||||
import org.lwjgl.opengl.GL12;
|
||||
|
||||
@@ -24,7 +24,7 @@ public class BlockCouchWoodRenderer extends BlockRendererInterface{
|
||||
private final ModelBase modelRight = new ModelCouchWoodRight();
|
||||
|
||||
private final ModelBase modelCorner = new ModelCouchWoodSingle();
|
||||
|
||||
|
||||
public BlockCouchWoodRenderer(){
|
||||
((BlockCouchWood)CustomItems.couchWood).renderId = RenderingRegistry.getNextAvailableRenderId();
|
||||
RenderingRegistry.registerBlockHandler(this);
|
||||
@@ -40,7 +40,7 @@ public class BlockCouchWoodRenderer extends BlockRendererInterface{
|
||||
GL11.glRotatef(180, 0, 0, 1);
|
||||
GL11.glRotatef(90 * tile.rotation, 0, 1, 0);
|
||||
GL11.glColor3f(1, 1, 1);
|
||||
|
||||
|
||||
setWoodTexture(var1.getBlockMetadata());
|
||||
if(tile.hasLeft && tile.hasRight)
|
||||
model.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
|
||||
@@ -66,7 +66,7 @@ public class BlockCouchWoodRenderer extends BlockRendererInterface{
|
||||
setWoodTexture(metadata);
|
||||
GL11.glColor3f(1, 1, 1);
|
||||
modelCorner.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
|
||||
|
||||
|
||||
GL11.glPopMatrix();
|
||||
}
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@ import net.minecraft.tileentity.TileEntity;
|
||||
import noppes.npcs.CustomItems;
|
||||
import noppes.npcs.blocks.BlockCouchWool;
|
||||
import noppes.npcs.blocks.tiles.TileCouchWool;
|
||||
import noppes.npcs.client.model.blocks.*;
|
||||
import noppes.npcs.client.model.blocks.legacy.couch.*;
|
||||
import org.lwjgl.opengl.GL11;
|
||||
import org.lwjgl.opengl.GL12;
|
||||
|
||||
@@ -25,7 +25,7 @@ public class BlockCouchWoolRenderer extends BlockRendererInterface{
|
||||
|
||||
private final ModelBase modelCorner = new ModelCouchCorner();
|
||||
private final ModelBase modelCorner2 = new ModelCouchCornerWool();
|
||||
|
||||
|
||||
public BlockCouchWoolRenderer(){
|
||||
((BlockCouchWool)CustomItems.couchWool).renderId = RenderingRegistry.getNextAvailableRenderId();
|
||||
RenderingRegistry.registerBlockHandler(this);
|
||||
@@ -41,7 +41,7 @@ public class BlockCouchWoolRenderer extends BlockRendererInterface{
|
||||
GL11.glRotatef(180, 0, 0, 1);
|
||||
GL11.glRotatef(90 * tile.rotation, 0, 1, 0);
|
||||
GL11.glColor3f(1, 1, 1);
|
||||
|
||||
|
||||
setWoodTexture(var1.getBlockMetadata());
|
||||
if(tile.hasCornerLeft)
|
||||
modelCorner.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
|
||||
|
||||
@@ -108,22 +108,6 @@ public abstract class BlockRendererInterface extends TileEntitySpecialRenderer i
|
||||
manager.bindTexture(PlanksOak);
|
||||
}
|
||||
|
||||
public void setDefaultWoodTexture(int meta){
|
||||
TextureManager manager = Minecraft.getMinecraft().getTextureManager();
|
||||
if(meta == 1)
|
||||
manager.bindTexture(PlanksSpruce);
|
||||
else if(meta == 2)
|
||||
manager.bindTexture(PlanksBirch);
|
||||
else if(meta == 3)
|
||||
manager.bindTexture(PlanksJungle);
|
||||
else if(meta == 4)
|
||||
manager.bindTexture(PlanksAcacia);
|
||||
else if(meta == 5)
|
||||
manager.bindTexture(PlanksBigOak);
|
||||
else
|
||||
manager.bindTexture(PlanksOak);
|
||||
}
|
||||
|
||||
public static void setMaterialTexture(int meta){
|
||||
TextureManager manager = Minecraft.getMinecraft().getTextureManager();
|
||||
if(meta == 1)
|
||||
|
||||
@@ -21,7 +21,12 @@ public class BlockStoolRenderer extends BlockRendererInterface{
|
||||
private final ModelLegacyStool legacyStool = new ModelLegacyStool();
|
||||
private final ModelStool stool = new ModelStool();
|
||||
|
||||
protected static final ResourceLocation oak = new ResourceLocation("customnpcs","textures/models/stool/oak.png");
|
||||
private static final ResourceLocation oak = new ResourceLocation("customnpcs","textures/models/stool/oak.png");
|
||||
private static final ResourceLocation spruce = new ResourceLocation("customnpcs","textures/models/stool/spruce.png");
|
||||
private static final ResourceLocation birch = new ResourceLocation("customnpcs","textures/models/stool/birch.png");
|
||||
private static final ResourceLocation jungle = new ResourceLocation("customnpcs","textures/models/stool/jungle.png");
|
||||
private static final ResourceLocation dark_oak = new ResourceLocation("customnpcs","textures/models/stool/dark_oak.png");
|
||||
private static final ResourceLocation acacia = new ResourceLocation("customnpcs","textures/models/stool/acacia.png");
|
||||
|
||||
public BlockStoolRenderer(){
|
||||
((BlockStool)CustomItems.stool).renderId = RenderingRegistry.getNextAvailableRenderId();
|
||||
@@ -33,7 +38,7 @@ public class BlockStoolRenderer extends BlockRendererInterface{
|
||||
TileColorable tile = (TileColorable) var1;
|
||||
GL11.glDisable(GL12.GL_RESCALE_NORMAL);
|
||||
GL11.glPushMatrix();
|
||||
GL11.glTranslatef((float)var2 + 0.5f, (float)var4 + 1.68f, (float)var6 + 0.5f);
|
||||
GL11.glTranslatef((float)var2 + 0.5f, (float)var4 + 1.65f, (float)var6 + 0.5f);
|
||||
GL11.glScalef(1.2f, 1.1f, 1.2f);
|
||||
GL11.glRotatef(180, 0, 0, 1);
|
||||
GL11.glColor3f(1, 1, 1);
|
||||
@@ -83,15 +88,15 @@ public class BlockStoolRenderer extends BlockRendererInterface{
|
||||
public void setStoolTexture(int meta){
|
||||
TextureManager manager = Minecraft.getMinecraft().getTextureManager();
|
||||
if(meta == 1)
|
||||
manager.bindTexture(oak);
|
||||
manager.bindTexture(spruce);
|
||||
else if(meta == 2)
|
||||
manager.bindTexture(oak);
|
||||
manager.bindTexture(birch);
|
||||
else if(meta == 3)
|
||||
manager.bindTexture(oak);
|
||||
manager.bindTexture(jungle);
|
||||
else if(meta == 4)
|
||||
manager.bindTexture(oak);
|
||||
manager.bindTexture(acacia);
|
||||
else if(meta == 5)
|
||||
manager.bindTexture(oak);
|
||||
manager.bindTexture(dark_oak);
|
||||
else
|
||||
manager.bindTexture(oak);
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user