Upgraded Barrel & Campfire Models

This commit is contained in:
Kam committed 2025-01-25 19:41:54 -05:00
1 parent 435c31ddda
commit db9ac7f7c4
19 files changed
+466 -206

No files matched your search

@@ -5,17 +5,29 @@ import net.minecraft.block.Block;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.IBlockAccess;
import noppes.npcs.CustomItems;
import noppes.npcs.blocks.BlockRotated;
import noppes.npcs.blocks.tiles.TileColorable;
import noppes.npcs.client.model.blocks.ModelCampfire;
import noppes.npcs.client.model.blocks.campfire.ModelCampfireFlame;
import noppes.npcs.client.model.blocks.campfire.ModelCampfireLog;
import noppes.npcs.client.model.blocks.campfire.ModelCampfireStone;
import noppes.npcs.config.ConfigClient;
import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GL12;
public class BlockCampfireRenderer extends BlockRendererInterface{
private final ModelCampfire model = new ModelCampfire();
// Legacy
private final ModelCampfire legacy_model = new ModelCampfire();
// Modern
private final ModelCampfireFlame flameModel = new ModelCampfireFlame();
private final ModelCampfireLog logsModel = new ModelCampfireLog();
private final ModelCampfireStone stonesModel = new ModelCampfireStone();
public BlockCampfireRenderer(){
((BlockRotated)CustomItems.campfire).renderId = RenderingRegistry.getNextAvailableRenderId();
((BlockRotated)CustomItems.campfire_unlit).renderId = ((BlockRotated)CustomItems.campfire).renderId;
@@ -29,15 +41,29 @@ public class BlockCampfireRenderer extends BlockRendererInterface{
GL11.glDisable(GL12.GL_RESCALE_NORMAL);
GL11.glPushMatrix();
GL11.glTranslatef((float)var2 + 0.5f, (float)var4 + 1.5f, (float)var6 + 0.5f);
//GL11.glScalef(0.95f, 0.95f, 0.95f);
GL11.glRotatef(180, 0, 0, 1);
GL11.glRotatef(45 * tile.rotation, 0, 1, 0);
GL11.glColor3f(1, 1, 1);
Minecraft.getMinecraft().getTextureManager().bindTexture(PlanksOak);
model.renderLog(0.0625F);
Minecraft.getMinecraft().getTextureManager().bindTexture(Stone);
model.renderRock(0.0625F);
if(ConfigClient.LegacyCampfire){
Minecraft.getMinecraft().getTextureManager().bindTexture(PlanksOak);
legacy_model.renderLog(0.0625F);
Minecraft.getMinecraft().getTextureManager().bindTexture(Stone);
legacy_model.renderRock(0.0625F);
}
else {
Block block = tile.getBlockType();
Minecraft.getMinecraft().getTextureManager().bindTexture(Logs);
logsModel.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
Minecraft.getMinecraft().getTextureManager().bindTexture(Cobble);
stonesModel.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
if(block == CustomItems.campfire){
Minecraft.getMinecraft().getTextureManager().bindTexture(Flame);
flameModel.render(null, tile.getWorldObj().getWorldTime(), 0, 0, 0, 0.0F, 0.0625F);
}
}
GL11.glPopMatrix();
}
@@ -51,10 +77,19 @@ public class BlockCampfireRenderer extends BlockRendererInterface{
GL11.glRotatef(180, 0, 0, 1);
GL11.glRotatef(180, 0, 1, 0);
GL11.glColor3f(1, 1, 1);
Minecraft.getMinecraft().getTextureManager().bindTexture(PlanksOak);
model.renderLog(0.0625F);
Minecraft.getMinecraft().getTextureManager().bindTexture(Stone);
model.renderRock(0.0625F);
if(ConfigClient.LegacyCampfire){
Minecraft.getMinecraft().getTextureManager().bindTexture(PlanksOak);
legacy_model.renderLog(0.0625F);
Minecraft.getMinecraft().getTextureManager().bindTexture(Stone);
legacy_model.renderRock(0.0625F);
}
else {
Minecraft.getMinecraft().getTextureManager().bindTexture(Logs);
logsModel.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
Minecraft.getMinecraft().getTextureManager().bindTexture(Cobble);
stonesModel.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
}
GL11.glPopMatrix();
}