From db9ac7f7c44effffda0fc85fcc229e78bc672301 Mon Sep 17 00:00:00 2001 From: Kam Date: Sat, 25 Jan 2025 19:41:54 -0500 Subject: [PATCH 1/8] Upgraded Barrel & Campfire Models --- .../noppes/npcs/blocks/BlockCampfire.java | 27 ++-- .../model/blocks/barrel/BarrelCore.java | 69 ---------- .../model/blocks/barrel/BarrelTrim.java | 47 ------- .../model/blocks/barrel/ModelBarrel.java | 80 +++++++++++ .../blocks/campfire/ModelCampfireFlame.java | 57 ++++++++ .../blocks/campfire/ModelCampfireLog.java | 51 +++++++ .../blocks/campfire/ModelCampfireStone.java | 57 ++++++++ .../ModelLegacyBarrel.java} | 38 +++--- .../ModelLegacyBarrelLid.java} | 16 +-- .../renderer/blocks/BlockBarrelRenderer.java | 125 +++++++++++++----- .../blocks/BlockCampfireRenderer.java | 59 +++++++-- .../blocks/BlockRendererInterface.java | 15 +-- .../java/noppes/npcs/config/ConfigClient.java | 14 ++ .../customnpcs/textures/models/BarrelTrim.png | Bin 405 -> 0 bytes .../textures/models/barrel/oak_lid.png | Bin 0 -> 511 bytes .../textures/models/barrel/trim.png | Bin 0 -> 269 bytes .../customnpcs/textures/models/flame.png | Bin 0 -> 1693 bytes .../textures/models/flame.png.mcmeta | 17 +++ .../textures/models/flame_single.png | Bin 0 -> 387 bytes 19 files changed, 466 insertions(+), 206 deletions(-) delete mode 100644 src/main/java/noppes/npcs/client/model/blocks/barrel/BarrelCore.java delete mode 100644 src/main/java/noppes/npcs/client/model/blocks/barrel/BarrelTrim.java create mode 100644 src/main/java/noppes/npcs/client/model/blocks/barrel/ModelBarrel.java create mode 100644 src/main/java/noppes/npcs/client/model/blocks/campfire/ModelCampfireFlame.java create mode 100644 src/main/java/noppes/npcs/client/model/blocks/campfire/ModelCampfireLog.java create mode 100644 src/main/java/noppes/npcs/client/model/blocks/campfire/ModelCampfireStone.java rename src/main/java/noppes/npcs/client/model/blocks/{ModelBarrel.java => legacy/ModelLegacyBarrel.java} (94%) rename src/main/java/noppes/npcs/client/model/blocks/{ModelBarrelLit.java => legacy/ModelLegacyBarrelLid.java} (85%) delete mode 100644 src/main/resources/assets/customnpcs/textures/models/BarrelTrim.png create mode 100644 src/main/resources/assets/customnpcs/textures/models/barrel/oak_lid.png create mode 100644 src/main/resources/assets/customnpcs/textures/models/barrel/trim.png create mode 100644 src/main/resources/assets/customnpcs/textures/models/flame.png create mode 100644 src/main/resources/assets/customnpcs/textures/models/flame.png.mcmeta create mode 100644 src/main/resources/assets/customnpcs/textures/models/flame_single.png diff --git a/src/main/java/noppes/npcs/blocks/BlockCampfire.java b/src/main/java/noppes/npcs/blocks/BlockCampfire.java index 12019ee2a..a00d5fc3e 100644 --- a/src/main/java/noppes/npcs/blocks/BlockCampfire.java +++ b/src/main/java/noppes/npcs/blocks/BlockCampfire.java @@ -14,6 +14,7 @@ import noppes.npcs.CustomItems; import noppes.npcs.CustomNpcs; import noppes.npcs.NoppesUtilServer; import noppes.npcs.blocks.tiles.TileCampfire; +import noppes.npcs.config.ConfigClient; import org.lwjgl.opengl.GL11; import java.util.Random; @@ -31,14 +32,14 @@ public class BlockCampfire extends BlockLightable{ public TileEntity createNewTileEntity(World var1, int var2) { return new TileCampfire(); } - - @Override + + @Override public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int par6, float par7, float par8, float par9){ ItemStack item = player.inventory.getCurrentItem(); if(item == null) return true; int meta = world.getBlockMetadata(x, y, z); - + if((item.getItem() == Items.flint || item.getItem() == Items.flint_and_steel) && unlitBlock() == this){ if(world.rand.nextInt(3) == 0 && !world.isRemote) super.onBlockActivated(world, x, y, z, player, par6, par7, par8, par9); @@ -49,11 +50,11 @@ public class BlockCampfire extends BlockLightable{ item.damageItem(1, player); return true; } - + if(item.getItem() == Item.getItemFromBlock(Blocks.sand) && litBlock() == this){ super.onBlockActivated(world, x, y, z, player, par6, par7, par8, par9); } - + return true; } @@ -68,23 +69,25 @@ public class BlockCampfire extends BlockLightable{ int meta = world.getBlockMetadata(x, y, z); if(meta == 1) return; - + if(random.nextInt(36) == 0){ world.playSound(x + 0.5F, y + 0.5F, z + 0.5F, "fire.fire", 1.0F + random.nextFloat(), 0.3F + random.nextFloat() * 0.7f , false); } - + TileCampfire tile = (TileCampfire) world.getTileEntity(x, y, z); - + float xOffset = 0.5f, yOffset = 0.7f, zOffset = 0.5f; double d0 = (double)((float)x + xOffset); double d1 = (double)((float)y + yOffset); double d2 = (double)((float)z + zOffset); - + GL11.glPushMatrix(); - - CustomNpcs.proxy.spawnParticle("largesmoke", d0, d1, d2, 0.0D, 0.0D, 0.0D, 2); - CustomNpcs.proxy.spawnParticle("flame", d0, d1, d2, 0.0D, 0.0D, 0.0D, 4); + + if(ConfigClient.LegacyCampfire){ + CustomNpcs.proxy.spawnParticle("largesmoke", d0, d1, d2, 0.0D, 0.0D, 0.0D, 2); + CustomNpcs.proxy.spawnParticle("flame", d0, d1, d2, 0.0D, 0.0D, 0.0D, 4); + } GL11.glPopMatrix(); } diff --git a/src/main/java/noppes/npcs/client/model/blocks/barrel/BarrelCore.java b/src/main/java/noppes/npcs/client/model/blocks/barrel/BarrelCore.java deleted file mode 100644 index fb3aa099a..000000000 --- a/src/main/java/noppes/npcs/client/model/blocks/barrel/BarrelCore.java +++ /dev/null @@ -1,69 +0,0 @@ -package noppes.npcs.client.model.blocks.barrel; - -import net.minecraft.client.model.ModelBase; -import net.minecraft.client.model.ModelBox; -import net.minecraft.client.model.ModelRenderer; -import net.minecraft.entity.Entity; - -public class BarrelCore extends ModelBase { - private final ModelRenderer bb_main; - private final ModelRenderer cube_r1; - private final ModelRenderer cube_r2; - private final ModelRenderer cube_r3; - private final ModelRenderer cube_r4; - private final ModelRenderer cube_r5; - - public BarrelCore() { - textureWidth = 64; - textureHeight = 32; - - bb_main = new ModelRenderer(this); - bb_main.setRotationPoint(0.0F, 24.0F, 0.0F); - - cube_r1 = new ModelRenderer(this); - cube_r1.setRotationPoint(0.0F, 0.0F, 0.0F); - bb_main.addChild(cube_r1); - setRotationAngle(cube_r1, 1.5708F, 0.0F, -1.5708F); - cube_r1.cubeList.add(new ModelBox(cube_r1, 6, -6, 0.0F, -5.0F, -5.0F, 0, 10, 10, 0.0F)); - - cube_r2 = new ModelRenderer(this); - cube_r2.setRotationPoint(0.0F, -14.5F, 0.0F); - bb_main.addChild(cube_r2); - setRotationAngle(cube_r2, 0.0F, 0.0F, 1.5708F); - cube_r2.cubeList.add(new ModelBox(cube_r2, 0, 2, 2.5F, -5.5F, 5.5F, 8, 11, 0, 0.0F)); - cube_r2.cubeList.add(new ModelBox(cube_r2, 8, 2, 2.5F, -5.5F, -5.5F, 8, 11, 0, 0.0F)); - cube_r2.cubeList.add(new ModelBox(cube_r2, 0, 3, -1.5F, -5.0F, -5.0F, 16, 10, 0, 0.0F)); - - cube_r3 = new ModelRenderer(this); - cube_r3.setRotationPoint(0.0F, -14.5F, 0.0F); - bb_main.addChild(cube_r3); - setRotationAngle(cube_r3, 1.5708F, 0.0F, 1.5708F); - cube_r3.cubeList.add(new ModelBox(cube_r3, 8, 2, 2.5F, -5.5F, -5.5F, 8, 11, 0, 0.0F)); - cube_r3.cubeList.add(new ModelBox(cube_r3, 0, 2, 2.5F, -5.5F, 5.5F, 8, 11, 0, 0.0F)); - cube_r3.cubeList.add(new ModelBox(cube_r3, 6, -5, -1.5F, -5.0F, -5.0F, 0, 10, 10, 0.0F)); - cube_r3.cubeList.add(new ModelBox(cube_r3, 0, 5, -1.5F, -5.0F, -5.0F, 16, 10, 0, 0.0F)); - - cube_r4 = new ModelRenderer(this); - cube_r4.setRotationPoint(0.0F, -14.5F, 0.0F); - bb_main.addChild(cube_r4); - setRotationAngle(cube_r4, -1.5708F, 0.0F, 1.5708F); - cube_r4.cubeList.add(new ModelBox(cube_r4, 0, 4, -1.5F, -5.0F, -5.0F, 16, 10, 0, 0.0F)); - - cube_r5 = new ModelRenderer(this); - cube_r5.setRotationPoint(0.0F, -8.0F, 5.0F); - bb_main.addChild(cube_r5); - setRotationAngle(cube_r5, 3.1416F, 0.0F, 1.5708F); - cube_r5.cubeList.add(new ModelBox(cube_r5, 0, 3, -8.0F, -5.0F, 0.0F, 16, 10, 0, 0.0F)); - } - - @Override - public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { - bb_main.render(f5); - } - - public void setRotationAngle(ModelRenderer modelRenderer, float x, float y, float z) { - modelRenderer.rotateAngleX = x; - modelRenderer.rotateAngleY = y; - modelRenderer.rotateAngleZ = z; - } -} diff --git a/src/main/java/noppes/npcs/client/model/blocks/barrel/BarrelTrim.java b/src/main/java/noppes/npcs/client/model/blocks/barrel/BarrelTrim.java deleted file mode 100644 index b5404428e..000000000 --- a/src/main/java/noppes/npcs/client/model/blocks/barrel/BarrelTrim.java +++ /dev/null @@ -1,47 +0,0 @@ -package noppes.npcs.client.model.blocks.barrel;// Made with Blockbench 4.9.4 -// Exported for Minecraft version 1.7 - 1.12 -// Paste this class into your mod and generate all required imports - - -import net.minecraft.client.model.ModelBase; -import net.minecraft.client.model.ModelBox; -import net.minecraft.client.model.ModelRenderer; -import net.minecraft.entity.Entity; - -public class BarrelTrim extends ModelBase { - private final ModelRenderer bb_main; - private final ModelRenderer cube_r1; - private final ModelRenderer cube_r2; - - public BarrelTrim() { - textureWidth = 32; - textureHeight = 32; - - bb_main = new ModelRenderer(this); - bb_main.setRotationPoint(0.0F, 24.0F, 0.0F); - bb_main.cubeList.add(new ModelBox(bb_main, 0, 7, 0.0F, -16.5F, -4.0F, 2, 1, 2, 0.0F)); - - cube_r1 = new ModelRenderer(this); - cube_r1.setRotationPoint(0.0F, -8.0F, 0.0F); - bb_main.addChild(cube_r1); - setRotationAngle(cube_r1, -1.5708F, 0.0F, 1.5708F); - cube_r1.cubeList.add(new ModelBox(cube_r1, 0, 0, -6.0F, -6.0F, -6.0F, 2, 12, 12, 0.0F)); - - cube_r2 = new ModelRenderer(this); - cube_r2.setRotationPoint(0.0F, -3.0F, 0.0F); - bb_main.addChild(cube_r2); - setRotationAngle(cube_r2, 1.5708F, 0.0F, 1.5708F); - cube_r2.cubeList.add(new ModelBox(cube_r2, 0, 0, -1.0F, -6.0F, -6.0F, 2, 12, 12, 0.0F)); - } - - @Override - public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { - bb_main.render(f5); - } - - public void setRotationAngle(ModelRenderer modelRenderer, float x, float y, float z) { - modelRenderer.rotateAngleX = x; - modelRenderer.rotateAngleY = y; - modelRenderer.rotateAngleZ = z; - } -} diff --git a/src/main/java/noppes/npcs/client/model/blocks/barrel/ModelBarrel.java b/src/main/java/noppes/npcs/client/model/blocks/barrel/ModelBarrel.java new file mode 100644 index 000000000..6c1a2692f --- /dev/null +++ b/src/main/java/noppes/npcs/client/model/blocks/barrel/ModelBarrel.java @@ -0,0 +1,80 @@ +package noppes.npcs.client.model.blocks.barrel; + +import net.minecraft.client.model.ModelBase; +import net.minecraft.client.model.ModelBox; +import net.minecraft.client.model.ModelRenderer; +import net.minecraft.entity.Entity; + +public class ModelBarrel extends ModelBase { + private final ModelRenderer Wall; + private final ModelRenderer cube_r1; + private final ModelRenderer cube_r2; + private final ModelRenderer cube_r3; + private final ModelRenderer Trim; + private final ModelRenderer Base; + + public ModelBarrel() { + textureWidth = 64; + textureHeight = 32; + + Wall = new ModelRenderer(this); + Wall.setRotationPoint(0.0F, 24.0F, 0.0F); + Wall.cubeList.add(new ModelBox(Wall, 0, 0, 5.0F, -16.0F, 5.0F, 1, 16, 1, 0.0F)); + Wall.cubeList.add(new ModelBox(Wall, 0, 0, 5.0F, -16.0F, -6.0F, 1, 16, 1, 0.0F)); + Wall.cubeList.add(new ModelBox(Wall, 0, 0, -6.0F, -16.0F, -6.0F, 1, 16, 1, 0.0F)); + Wall.cubeList.add(new ModelBox(Wall, 0, 0, -6.0F, -16.0F, 5.0F, 1, 16, 1, 0.0F)); + + cube_r1 = new ModelRenderer(this); + cube_r1.setRotationPoint(-6.5F, -8.0F, 0.0F); + Wall.addChild(cube_r1); + setRotationAngle(cube_r1, 1.5708F, 0.0F, 0.0F); + cube_r1.cubeList.add(new ModelBox(cube_r1, 0, 0, -0.5F, -6.0F, -8.0F, 1, 12, 16, 0.0F)); + + cube_r2 = new ModelRenderer(this); + cube_r2.setRotationPoint(0.0F, -8.0F, 6.5F); + Wall.addChild(cube_r2); + setRotationAngle(cube_r2, 0.0F, 0.0F, 1.5708F); + cube_r2.cubeList.add(new ModelBox(cube_r2, 0, 14, -8.0F, -6.0F, -0.5F, 16, 12, 1, 0.0F)); + cube_r2.cubeList.add(new ModelBox(cube_r2, 0, 14, -8.0F, -6.0F, -13.5F, 16, 12, 1, 0.0F)); + + cube_r3 = new ModelRenderer(this); + cube_r3.setRotationPoint(6.5F, -8.0F, 0.0F); + Wall.addChild(cube_r3); + setRotationAngle(cube_r3, -1.5708F, 0.0F, 0.0F); + cube_r3.cubeList.add(new ModelBox(cube_r3, 0, 0, -0.5F, -6.0F, -8.0F, 1, 12, 16, 0.0F)); + + Trim = new ModelRenderer(this); + Trim.setRotationPoint(0.0F, 24.0F, 0.0F); + Trim.cubeList.add(new ModelBox(Trim, 4, 28, -6.5F, -5.0F, 5.5F, 13, 2, 2, 0.0F)); + Trim.cubeList.add(new ModelBox(Trim, 34, 17, 5.5F, -5.0F, -6.5F, 2, 2, 13, 0.0F)); + Trim.cubeList.add(new ModelBox(Trim, 4, 28, -6.5F, -5.0F, -7.5F, 13, 2, 2, 0.0F)); + Trim.cubeList.add(new ModelBox(Trim, 34, 17, -7.5F, -5.0F, -6.5F, 2, 2, 13, 0.0F)); + Trim.cubeList.add(new ModelBox(Trim, 4, 28, -6.5F, -13.0F, -7.5F, 13, 2, 2, 0.0F)); + Trim.cubeList.add(new ModelBox(Trim, 4, 28, -6.5F, -13.0F, 5.5F, 13, 2, 2, 0.0F)); + Trim.cubeList.add(new ModelBox(Trim, 34, 17, -7.5F, -13.0F, -6.5F, 2, 2, 13, 0.0F)); + Trim.cubeList.add(new ModelBox(Trim, 34, 17, 5.5F, -13.0F, -6.5F, 2, 2, 13, 0.0F)); + + Base = new ModelRenderer(this); + Base.setRotationPoint(0.0F, 24.0F, 0.0F); + Base.cubeList.add(new ModelBox(Base, 16, 2, -6.0F, -15.0F, -6.0F, 12, 1, 12, 0.0F)); + Base.cubeList.add(new ModelBox(Base, 16, 2, -6.0F, -2.0F, -6.0F, 12, 1, 12, 0.0F)); + } + + public void renderBase(float f5){ + Base.render(f5); + } + + public void renderTrim(float f5){ + Trim.render(f5); + } + + public void renderWall(float f5){ + Wall.render(f5); + } + + public void setRotationAngle(ModelRenderer modelRenderer, float x, float y, float z) { + modelRenderer.rotateAngleX = x; + modelRenderer.rotateAngleY = y; + modelRenderer.rotateAngleZ = z; + } +} diff --git a/src/main/java/noppes/npcs/client/model/blocks/campfire/ModelCampfireFlame.java b/src/main/java/noppes/npcs/client/model/blocks/campfire/ModelCampfireFlame.java new file mode 100644 index 000000000..23b20b30a --- /dev/null +++ b/src/main/java/noppes/npcs/client/model/blocks/campfire/ModelCampfireFlame.java @@ -0,0 +1,57 @@ +package noppes.npcs.client.model.blocks.campfire; + +import net.minecraft.client.model.ModelBase; +import net.minecraft.client.model.ModelBox; +import net.minecraft.client.model.ModelRenderer; +import net.minecraft.entity.Entity; + +public class ModelCampfireFlame extends ModelBase { + private final ModelRenderer[] frames; + private static int frameDuration = 2; + + public ModelCampfireFlame() { + textureWidth = 16; + textureHeight = 144; + + frames = new ModelRenderer[9]; + + // Create frames and add them to the array + frames[0] = new ModelRenderer(this); + frames[0].setRotationPoint(0.0F, 16.5F, 0.0F); + frames[0].cubeList.add(new ModelBox(frames[0], 0, 0, -8.0F, -8.5F, 0.0F, 16, 16, 0, 0.0F)); + + ModelRenderer cube_r1 = new ModelRenderer(this); + cube_r1.setRotationPoint(0.0F, 0.0F, 0.0F); + frames[0].addChild(cube_r1); + setRotationAngle(cube_r1, 0.0F, -1.5708F, 0.0F); + cube_r1.cubeList.add(new ModelBox(cube_r1, 0, 0, -8.0F, -8.5F, 0.0F, 16, 16, 0, 0.0F)); + + // Repeat the above for all frames, incrementing texture offsets for each frame + for (int i = 1; i < 9; i++) { + frames[i] = new ModelRenderer(this); + frames[i].setRotationPoint(0.0F, 16.5F, 0.0F); + frames[i].cubeList.add(new ModelBox(frames[i], 0, i * 16 + 1, -8.0F, -8.5F, 0.0F, 16, 16, 0, 0.0F)); + + ModelRenderer cube_r = new ModelRenderer(this); + cube_r.setRotationPoint(0.0F, 0.0F, 0.0F); + frames[i].addChild(cube_r); + setRotationAngle(cube_r, 0.0F, -1.5708F, 0.0F); + cube_r.cubeList.add(new ModelBox(cube_r, 0, i * 16 + 1, -8.0F, -8.5F, 0.0F, 16, 16, 0, 0.0F)); + } + } + + @Override + public void render(Entity entity, float world_time, float f1, float f2, float f3, float f4, float f5) { + // Calculate the current frame directly using modulo arithmetic + int frameIndex = ((int) world_time / frameDuration) % frames.length; + + // Render only the current frame + frames[frameIndex].render(f5); + } + + public void setRotationAngle(ModelRenderer modelRenderer, float x, float y, float z) { + modelRenderer.rotateAngleX = x; + modelRenderer.rotateAngleY = y; + modelRenderer.rotateAngleZ = z; + } +} diff --git a/src/main/java/noppes/npcs/client/model/blocks/campfire/ModelCampfireLog.java b/src/main/java/noppes/npcs/client/model/blocks/campfire/ModelCampfireLog.java new file mode 100644 index 000000000..20acf6bfc --- /dev/null +++ b/src/main/java/noppes/npcs/client/model/blocks/campfire/ModelCampfireLog.java @@ -0,0 +1,51 @@ +package noppes.npcs.client.model.blocks.campfire; + +import net.minecraft.client.model.ModelBase; +import net.minecraft.client.model.ModelBox; +import net.minecraft.client.model.ModelRenderer; +import net.minecraft.entity.Entity; + +public class ModelCampfireLog extends ModelBase { + private final ModelRenderer bb_main; + private final ModelRenderer cube_r1; + private final ModelRenderer cube_r2; + private final ModelRenderer cube_r3; + + public ModelCampfireLog() { + textureWidth = 16; + textureHeight = 16; + + bb_main = new ModelRenderer(this); + bb_main.setRotationPoint(0.0F, 24.0F, 0.0F); + + + cube_r1 = new ModelRenderer(this); + cube_r1.setRotationPoint(1.25F, -6.3F, 1.25F); + bb_main.addChild(cube_r1); + setRotationAngle(cube_r1, 0.5449F, -1.0854F, -0.744F); + cube_r1.cubeList.add(new ModelBox(cube_r1, 0, 0, -1.0F, -4.0F, -1.0F, 3, 10, 3, 0.0F)); + + cube_r2 = new ModelRenderer(this); + cube_r2.setRotationPoint(-1.5F, -6.0F, -0.25F); + bb_main.addChild(cube_r2); + setRotationAngle(cube_r2, 0.0F, 0.0F, 0.3927F); + cube_r2.cubeList.add(new ModelBox(cube_r2, 0, 0, -2.0F, -4.0F, -1.0F, 3, 10, 3, 0.0F)); + + cube_r3 = new ModelRenderer(this); + cube_r3.setRotationPoint(1.5F, -6.0F, -2.25F); + bb_main.addChild(cube_r3); + setRotationAngle(cube_r3, -0.3295F, 0.7268F, -0.4754F); + cube_r3.cubeList.add(new ModelBox(cube_r3, 0, 0, -2.0F, -4.5F, -1.0F, 3, 10, 3, 0.0F)); + } + + @Override + public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { + bb_main.render(f5); + } + + public void setRotationAngle(ModelRenderer modelRenderer, float x, float y, float z) { + modelRenderer.rotateAngleX = x; + modelRenderer.rotateAngleY = y; + modelRenderer.rotateAngleZ = z; + } +} diff --git a/src/main/java/noppes/npcs/client/model/blocks/campfire/ModelCampfireStone.java b/src/main/java/noppes/npcs/client/model/blocks/campfire/ModelCampfireStone.java new file mode 100644 index 000000000..feded698a --- /dev/null +++ b/src/main/java/noppes/npcs/client/model/blocks/campfire/ModelCampfireStone.java @@ -0,0 +1,57 @@ +package noppes.npcs.client.model.blocks.campfire; + +import net.minecraft.client.model.ModelBase; +import net.minecraft.client.model.ModelBox; +import net.minecraft.client.model.ModelRenderer; +import net.minecraft.entity.Entity; + +public class ModelCampfireStone extends ModelBase { + private final ModelRenderer bb_main; + private final ModelRenderer cube_r1; + private final ModelRenderer cube_r2; + private final ModelRenderer cube_r3; + + public ModelCampfireStone() { + textureWidth = 16; + textureHeight = 16; + + bb_main = new ModelRenderer(this); + bb_main.setRotationPoint(0.0F, 24.0F, 0.0F); + bb_main.cubeList.add(new ModelBox(bb_main, 18, 5, 4.0F, -2.0F, 1.0F, 3, 2, 4, 0.0F)); + bb_main.cubeList.add(new ModelBox(bb_main, 18, 2, -4.0F, -3.0F, -7.0F, 4, 3, 3, 0.0F)); + bb_main.cubeList.add(new ModelBox(bb_main, 17, 0, -3.0F, -3.0F, 5.0F, 4, 3, 3, 0.0F)); + bb_main.cubeList.add(new ModelBox(bb_main, 18, 2, -8.0F, -3.0F, -1.0F, 3, 3, 4, 0.0F)); + bb_main.cubeList.add(new ModelBox(bb_main, 18, 11, -6.0F, -2.0F, 3.0F, 3, 2, 3, 0.0F)); + bb_main.cubeList.add(new ModelBox(bb_main, 16, 0, -7.0F, -2.0F, -5.0F, 3, 2, 4, 0.0F)); + bb_main.cubeList.add(new ModelBox(bb_main, 18, 11, 4.0F, -2.0F, -6.0F, 3, 2, 3, 0.0F)); + + cube_r1 = new ModelRenderer(this); + cube_r1.setRotationPoint(6.5F, -1.5F, -1.0F); + bb_main.addChild(cube_r1); + setRotationAngle(cube_r1, 0.0F, -1.5708F, 0.0F); + cube_r1.cubeList.add(new ModelBox(cube_r1, 18, 2, -2.0F, -1.5F, -1.5F, 4, 3, 3, 0.0F)); + + cube_r2 = new ModelRenderer(this); + cube_r2.setRotationPoint(2.5F, -1.5F, -6.0F); + bb_main.addChild(cube_r2); + setRotationAngle(cube_r2, 0.0F, 1.5708F, 0.0F); + cube_r2.cubeList.add(new ModelBox(cube_r2, 18, 5, -1.0F, -0.5F, -2.5F, 3, 2, 4, 0.0F)); + + cube_r3 = new ModelRenderer(this); + cube_r3.setRotationPoint(3.5F, -1.5F, 5.5F); + bb_main.addChild(cube_r3); + setRotationAngle(cube_r3, 0.0F, -1.5708F, 0.0F); + cube_r3.cubeList.add(new ModelBox(cube_r3, 20, 1, -0.5F, -0.5F, -1.5F, 2, 2, 4, 0.0F)); + } + + @Override + public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { + bb_main.render(f5); + } + + public void setRotationAngle(ModelRenderer modelRenderer, float x, float y, float z) { + modelRenderer.rotateAngleX = x; + modelRenderer.rotateAngleY = y; + modelRenderer.rotateAngleZ = z; + } +} diff --git a/src/main/java/noppes/npcs/client/model/blocks/ModelBarrel.java b/src/main/java/noppes/npcs/client/model/blocks/legacy/ModelLegacyBarrel.java similarity index 94% rename from src/main/java/noppes/npcs/client/model/blocks/ModelBarrel.java rename to src/main/java/noppes/npcs/client/model/blocks/legacy/ModelLegacyBarrel.java index acf209070..19ca1d92c 100644 --- a/src/main/java/noppes/npcs/client/model/blocks/ModelBarrel.java +++ b/src/main/java/noppes/npcs/client/model/blocks/legacy/ModelLegacyBarrel.java @@ -1,10 +1,10 @@ -package noppes.npcs.client.model.blocks; +package noppes.npcs.client.model.blocks.legacy; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; -public class ModelBarrel extends ModelBase +public class ModelLegacyBarrel extends ModelBase { ModelRenderer Plank1; ModelRenderer Plank2; @@ -18,70 +18,70 @@ public class ModelBarrel extends ModelBase ModelRenderer Plank10; ModelRenderer Plank11; ModelRenderer Plank12; - - public ModelBarrel() - { + + public ModelLegacyBarrel() + { Plank1 = new ModelRenderer(this, 10, 0); Plank1.addBox(0F, 6.5F, -2F, 17, 1, 4); Plank1.setRotationPoint(0F, 7.01F, 0F); setRotation(Plank1, 0F, 0F, 1.570796F); - + Plank2 = new ModelRenderer(this, 10, 8); Plank2.addBox(0F, 6.5F, -2F, 17, 1, 4); Plank2.setRotationPoint(0F, 7F, 0F); setRotation(Plank2, 0F, 0.5235988F, 1.570796F); - + Plank3 = new ModelRenderer(this, 10, 0); Plank3.addBox(0F, 6.5F, -2F, 17, 1, 4); Plank3.setRotationPoint(0F, 7.01F, 0F); setRotation(Plank3, 0F, 1.047198F, 1.570796F); - + Plank4 = new ModelRenderer(this, 10, 8); Plank4.addBox(0F, 6.5F, -2F, 17, 1, 4); Plank4.setRotationPoint(0F, 7F, 0F); setRotation(Plank4, 0F, 1.570796F, 1.570796F); - + Plank5 = new ModelRenderer(this, 10, 0); Plank5.addBox(0F, 6.5F, -2F, 17, 1, 4); Plank5.setRotationPoint(0F, 7.01F, 0F); setRotation(Plank5, 0F, 2.094395F, 1.570796F); - + Plank6 = new ModelRenderer(this, 10, 8); Plank6.addBox(0F, 6.5F, -2F, 17, 1, 4); Plank6.setRotationPoint(0F, 7F, 0F); setRotation(Plank6, 0F, 2.617994F, 1.570796F); - + Plank7 = new ModelRenderer(this, 10, 0); Plank7.addBox(0F, 6.5F, -2F, 17, 1, 4); Plank7.setRotationPoint(0F, 7.01F, 0F); setRotation(Plank7, 0F, 3.150901F, 1.570796F); - + Plank8 = new ModelRenderer(this, 10, 8); Plank8.addBox(0F, 6.5F, -2F, 17, 1, 4); Plank8.setRotationPoint(0F, 7F, 0F); setRotation(Plank8, 0F, -2.617994F, 1.570796F); - + Plank9 = new ModelRenderer(this, 10, 0); Plank9.addBox(0F, 6.5F, -2F, 17, 1, 4); Plank9.setRotationPoint(0F, 7.01F, 0F); setRotation(Plank9, 0F, -2.094395F, 1.570796F); - + Plank10 = new ModelRenderer(this, 10, 8); Plank10.addBox(0F, 6.5F, -2F, 17, 1, 4); Plank10.setRotationPoint(0F, 7F, 0F); setRotation(Plank10, 0F, -1.570796F, 1.570796F); - + Plank11 = new ModelRenderer(this, 10, 0); Plank11.addBox(0F, 6.5F, -2F, 17, 1, 4); Plank11.setRotationPoint(0F, 7.01F, 0F); setRotation(Plank11, 0F, -1.047198F, 1.570796F); - + Plank12 = new ModelRenderer(this, 10, 0); Plank12.addBox(0F, 6.5F, -2F, 17, 1, 4); Plank12.setRotationPoint(0F, 7F, 0F); setRotation(Plank12, 0F, -0.5235988F, 1.570796F); } - + public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { super.render(entity, f, f1, f2, f3, f4, f5); @@ -98,13 +98,13 @@ public class ModelBarrel extends ModelBase Plank11.render(f5); Plank12.render(f5); } - + private void setRotation(ModelRenderer model, float x, float y, float z) { model.rotateAngleX = y; model.rotateAngleY = x; model.rotateAngleZ = z; } - + } diff --git a/src/main/java/noppes/npcs/client/model/blocks/ModelBarrelLit.java b/src/main/java/noppes/npcs/client/model/blocks/legacy/ModelLegacyBarrelLid.java similarity index 85% rename from src/main/java/noppes/npcs/client/model/blocks/ModelBarrelLit.java rename to src/main/java/noppes/npcs/client/model/blocks/legacy/ModelLegacyBarrelLid.java index 00db785bc..b8efe0a8f 100644 --- a/src/main/java/noppes/npcs/client/model/blocks/ModelBarrelLit.java +++ b/src/main/java/noppes/npcs/client/model/blocks/legacy/ModelLegacyBarrelLid.java @@ -1,38 +1,38 @@ -package noppes.npcs.client.model.blocks; +package noppes.npcs.client.model.blocks.legacy; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; -public class ModelBarrelLit extends ModelBase +public class ModelLegacyBarrelLid extends ModelBase { ModelRenderer Top; ModelRenderer Bottom; - - public ModelBarrelLit() + + public ModelLegacyBarrelLid() { Top = new ModelRenderer(this, 0, 0); Top.addBox(0F, 0F, 0F, 16, 0, 16); Top.setRotationPoint(-8F, 9F, -8F); - + Bottom = new ModelRenderer(this, 0, 0); Bottom.addBox(0F, 0F, 0F, 16, 0, 16); Bottom.setRotationPoint(-8F, 23F, -8F); } - + public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { super.render(entity, f, f1, f2, f3, f4, f5); Bottom.render(f5); Top.render(f5); } - + private void setRotation(ModelRenderer model, float x, float y, float z) { model.rotateAngleX = y; model.rotateAngleY = x; model.rotateAngleZ = z; } - + } diff --git a/src/main/java/noppes/npcs/client/renderer/blocks/BlockBarrelRenderer.java b/src/main/java/noppes/npcs/client/renderer/blocks/BlockBarrelRenderer.java index e90dd504f..71c66c9c8 100644 --- a/src/main/java/noppes/npcs/client/renderer/blocks/BlockBarrelRenderer.java +++ b/src/main/java/noppes/npcs/client/renderer/blocks/BlockBarrelRenderer.java @@ -4,28 +4,37 @@ 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.BlockBarrel; import noppes.npcs.blocks.tiles.TileColorable; -import noppes.npcs.client.model.blocks.ModelBarrel; -import noppes.npcs.client.model.blocks.ModelBarrelLit; -import noppes.npcs.client.model.blocks.barrel.BarrelCore; -import noppes.npcs.client.model.blocks.barrel.BarrelTrim; +import noppes.npcs.client.model.blocks.barrel.ModelBarrel; +import noppes.npcs.client.model.blocks.legacy.ModelLegacyBarrel; +import noppes.npcs.client.model.blocks.legacy.ModelLegacyBarrelLid; +import noppes.npcs.config.ConfigClient; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; public class BlockBarrelRenderer extends BlockRendererInterface{ - private final ModelBarrel model = new ModelBarrel(); - private final ModelBarrelLit modelLit = new ModelBarrelLit(); - private static final ResourceLocation resource1 = new ResourceLocation("customnpcs","textures/models/Barrel.png"); + // Legacy + private final ModelLegacyBarrel legacyModel = new ModelLegacyBarrel(); + private final ModelLegacyBarrelLid legacyLid = new ModelLegacyBarrelLid(); + private static final ResourceLocation legacy_texture = new ResourceLocation("customnpcs","textures/models/Barrel.png"); - private final BarrelCore core = new BarrelCore(); - private final BarrelTrim trim = new BarrelTrim(); - private static final ResourceLocation trimTexture = new ResourceLocation("customnpcs","textures/models/BarrelTrim.png"); + // Modern + private final ModelBarrel barrel = new ModelBarrel(); + private static final ResourceLocation trimTexture = new ResourceLocation("customnpcs","textures/models/barrel/trim.png"); + + private static final ResourceLocation oak_lid = new ResourceLocation("customnpcs","textures/models/barrel/oak_lid.png"); + private static final ResourceLocation spruce_lid = new ResourceLocation("customnpcs","textures/models/barrel/oak_lid.png"); + private static final ResourceLocation birch_lid = new ResourceLocation("customnpcs","textures/models/barrel/oak_lid.png"); + private static final ResourceLocation jungle_lid = new ResourceLocation("customnpcs","textures/models/barrel/oak_lid.png"); + private static final ResourceLocation acacia_lid = new ResourceLocation("customnpcs","textures/models/barrel/oak_lid.png"); + private static final ResourceLocation dark_oak_lid = new ResourceLocation("customnpcs","textures/models/barrel/oak_lid.png"); public BlockBarrelRenderer(){ ((BlockBarrel)CustomItems.barrel).renderId = RenderingRegistry.getNextAvailableRenderId(); @@ -39,17 +48,38 @@ public class BlockBarrelRenderer extends BlockRendererInterface{ GL11.glDisable(GL12.GL_RESCALE_NORMAL); GL11.glEnable(GL11.GL_ALPHA_TEST); GL11.glPushMatrix(); - GL11.glTranslatef((float)var2 + 0.5f, (float)var4 + 1.42f, (float)var6 + 0.5f); - GL11.glScalef(1.2f, 0.94f,1.2f); - GL11.glRotatef(180, 0, 0, 1); - GL11.glRotatef(45 * tile.rotation, 0, 1, 0); - GL11.glColor3f(1, 1, 1); - GL11.glEnable(GL11.GL_CULL_FACE); - setWoodTexture(var1.getBlockMetadata()); - core.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); - Minecraft.getMinecraft().getTextureManager().bindTexture(trimTexture); - trim.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); + + if(ConfigClient.LegacyBarrel){ + GL11.glTranslatef((float)var2 + 0.5f, (float)var4 + 1.42f, (float)var6 + 0.5f); + GL11.glScalef(1.2f, 0.94f,1.2f); + GL11.glRotatef(180, 0, 0, 1); + GL11.glRotatef(45 * tile.rotation, 0, 1, 0); + GL11.glColor3f(1, 1, 1); + + GL11.glEnable(GL11.GL_CULL_FACE); + + setWoodTexture(var1.getBlockMetadata()); + legacyModel.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); + Minecraft.getMinecraft().getTextureManager().bindTexture(legacy_texture); + legacyLid.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); + } + else { + GL11.glTranslatef((float)var2 + 0.5f, (float)var4 + 1.5f, (float)var6 + 0.5f); + GL11.glScalef(1.0f, 1.0f,1.0f); + GL11.glRotatef(180, 0, 0, 1); + GL11.glRotatef(45 * tile.rotation, 0, 1, 0); + GL11.glColor3f(1, 1, 1); + + GL11.glEnable(GL11.GL_CULL_FACE); + + setWoodTexture(var1.getBlockMetadata()); + barrel.renderWall(0.0625F); + Minecraft.getMinecraft().getTextureManager().bindTexture(trimTexture); + barrel.renderTrim(0.0625F); + setLidTexture(var1.getBlockMetadata()); + barrel.renderBase(0.0625F); + } GL11.glPopMatrix(); } @@ -58,20 +88,55 @@ public class BlockBarrelRenderer extends BlockRendererInterface{ public void renderInventoryBlock(Block block, int metadata, int modelId, RenderBlocks renderer) { GL11.glPushMatrix(); - GL11.glTranslatef(0, 1.05f, 0); - GL11.glScalef(1f, 1f, 1f); - GL11.glRotatef(180, 0, 0, 1); - GL11.glRotatef(180, 0, 1, 0); + if(ConfigClient.LegacyBarrel){ + GL11.glTranslatef(0, 0.75f, 0); + GL11.glScalef(0.7f, 0.7f, 0.7f); + GL11.glRotatef(180, 0, 0, 1); + GL11.glRotatef(180, 0, 1, 0); + + setWoodTexture(metadata); + GL11.glColor3f(1, 1, 1); + legacyModel.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); + + Minecraft.getMinecraft().getTextureManager().bindTexture(legacy_texture); + legacyLid.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); + } + else { + GL11.glTranslatef(0, 0.9f, 0); + GL11.glScalef(0.9f, 0.9f, 0.9f); + GL11.glRotatef(180, 0, 0, 1); + GL11.glRotatef(180, 0, 1, 0); + + setWoodTexture(metadata); + GL11.glColor3f(1, 1, 1); + barrel.renderWall(0.0625F); + Minecraft.getMinecraft().getTextureManager().bindTexture(trimTexture); + barrel.renderTrim(0.0625F); + setLidTexture(metadata); + barrel.renderBase(0.0625F); + } - setWoodTexture(metadata); - GL11.glColor3f(1, 1, 1); - core.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); - Minecraft.getMinecraft().getTextureManager().bindTexture(trimTexture); - trim.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); GL11.glPopMatrix(); } - @Override + public void setLidTexture(int meta){ + TextureManager manager = Minecraft.getMinecraft().getTextureManager(); + if(meta == 1) + manager.bindTexture(oak_lid); + else if(meta == 2) + manager.bindTexture(oak_lid); + else if(meta == 3) + manager.bindTexture(oak_lid); + else if(meta == 4) + manager.bindTexture(oak_lid); + else if(meta == 5) + manager.bindTexture(oak_lid); + else + manager.bindTexture(oak_lid); + } + + + @Override public int getRenderId() { return CustomItems.barrel.getRenderType(); } diff --git a/src/main/java/noppes/npcs/client/renderer/blocks/BlockCampfireRenderer.java b/src/main/java/noppes/npcs/client/renderer/blocks/BlockCampfireRenderer.java index 9c451f0ca..5e51f1d49 100644 --- a/src/main/java/noppes/npcs/client/renderer/blocks/BlockCampfireRenderer.java +++ b/src/main/java/noppes/npcs/client/renderer/blocks/BlockCampfireRenderer.java @@ -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(); } diff --git a/src/main/java/noppes/npcs/client/renderer/blocks/BlockRendererInterface.java b/src/main/java/noppes/npcs/client/renderer/blocks/BlockRendererInterface.java index 9327b4627..2f203ea3f 100644 --- a/src/main/java/noppes/npcs/client/renderer/blocks/BlockRendererInterface.java +++ b/src/main/java/noppes/npcs/client/renderer/blocks/BlockRendererInterface.java @@ -24,16 +24,13 @@ public abstract class BlockRendererInterface extends TileEntitySpecialRenderer i protected static final ResourceLocation PlanksAcacia = new ResourceLocation("customnpcs","textures/cache/planks_acacia.png"); protected static final ResourceLocation PlanksJungle = new ResourceLocation("customnpcs","textures/cache/planks_jungle.png"); - - protected static final ResourceLocation MCPlanksOak = new ResourceLocation("customnpcs","textures/cache/planks_oak.png"); - protected static final ResourceLocation MCPlanksBigOak = new ResourceLocation("customnpcs","textures/cache/planks_big_oak.png"); - protected static final ResourceLocation MCPlanksSpruce = new ResourceLocation("customnpcs","textures/cache/planks_spruce.png"); - protected static final ResourceLocation MCPlanksBirch = new ResourceLocation("customnpcs","textures/cache/planks_birch.png"); - protected static final ResourceLocation MCPlanksAcacia = new ResourceLocation("customnpcs","textures/cache/planks_acacia.png"); - protected static final ResourceLocation MCPlanksJungle = new ResourceLocation("customnpcs","textures/cache/planks_jungle.png"); - protected static final ResourceLocation Steel = new ResourceLocation("customnpcs","textures/models/Steel.png"); - protected static final RenderItem renderer = new RenderItem(); + + protected static final ResourceLocation Logs = new ResourceLocation("textures/blocks/log_oak.png"); + protected static final ResourceLocation Cobble = new ResourceLocation("textures/blocks/cobblestone.png"); + protected static final ResourceLocation Flame = new ResourceLocation("customnpcs","textures/models/flame.png"); + + protected static final RenderItem renderer = new RenderItem(); public static float colorTable[][] = { { diff --git a/src/main/java/noppes/npcs/config/ConfigClient.java b/src/main/java/noppes/npcs/config/ConfigClient.java index 3b4b7d1b2..06333ac60 100644 --- a/src/main/java/noppes/npcs/config/ConfigClient.java +++ b/src/main/java/noppes/npcs/config/ConfigClient.java @@ -16,6 +16,7 @@ public class ConfigClient public final static String GENERAL = "General"; public final static String VISUAL = "Visual"; public final static String QUESTING = "Questing"; + public final static String MODEL = "Model"; /** @@ -72,6 +73,14 @@ public class ConfigClient public static Property BannerAlertsProperty; public static boolean BannerAlerts = true; + /** + * Model Properties + **/ + public static boolean LegacyCampfire = false; + public static boolean LegacyChair = false; + public static boolean LegacyBarrel = false; + public static boolean LegacyCarpentryBench = false; + public static void init(File configFile) { config = new Configuration(configFile); @@ -128,6 +137,11 @@ public class ConfigClient BannerAlertsProperty = config.get(VISUAL, "All Banner Alerts", true, "Universal enable/disable for Banner Alerts"); BannerAlerts = BannerAlertsProperty.getBoolean(true); + LegacyCampfire = config.get(MODEL, "Legacy Campfire Model", false).getBoolean(false); + LegacyBarrel = config.get(MODEL, "Legacy Barrel Model", false).getBoolean(false); + LegacyChair = config.get(MODEL, "Legacy Chair Model", false).getBoolean(false); + LegacyCarpentryBench = config.get(MODEL, "Legacy Carpentry Bench Model", false).getBoolean(false); + // Convert to Legacy if(CustomNpcs.legacyExist){ EnableChatBubbles = LegacyConfig.EnableChatBubbles; diff --git a/src/main/resources/assets/customnpcs/textures/models/BarrelTrim.png b/src/main/resources/assets/customnpcs/textures/models/BarrelTrim.png deleted file mode 100644 index 6269af2a12e68a6d7b00d554cf5402db372f9962..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 405 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=hEVFgkgHcQKNkg>34Q7=;4w-&#D>wL~h=l1Bv$BiW8Cp zZ|pYo=vAL@s>D@5~2Dwnveul-R-Y52RFVIOYw25Lc zKgblM6vkLstGINF6Nko928Ptgs@tpA{o5tB?2?NEN2ASocKs)-S|hwN867mQzLBeN zV|n4$wEC|UW9`Csi}UtR=}_g}T<%z+!^Le=p0*{gXtt0k>-QC_u07zqyEFUq=b}tk zn>ck&yK~PSGjGWAUE3>PC9wBxnHYoF?cC?F0bD^!|11T9t_J%%%wK=wbL@o1l`NbO ztQcd%>Jzu{&tJcQqu^})^qcH~6Btez{gW4Zx9=bC{PhwH_x#m=7vEue(UbPw^24kG wZXgK$!S>pvQYRqe@&RC=@})+2ruq6ZXaU(AKnwzxf+vG0Pgg&ebxsLQ0HiRV2><{9 diff --git a/src/main/resources/assets/customnpcs/textures/models/barrel/oak_lid.png b/src/main/resources/assets/customnpcs/textures/models/barrel/oak_lid.png new file mode 100644 index 0000000000000000000000000000000000000000..6a15e03678685c57a46e50b4347c2169c5376d0b GIT binary patch literal 511 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQjEnx?oJHr&dIz4a#+$GeH|GX zHuiJ>Nn{1`ISV`@iy0XB4ude`@%$AjKn+toT^vI)oZn76=y%9Lpsjt9Q*f?F$Bl~b zj9;F4FK~aXT=C7(<`c)U#d})BAH~KUm>}VtyMmjwFm3m0QK`c*VnWZo|D7rMt^W4S zxiaoU_RG^28L!j#`|T*u5XAMUjK$N;xV$c4mCZJmzWv`nl;mCN{oqsLrTs;bXO=;g zZ-N2WE@#p5m#$HX&f0nJlP~rj>WQ#F!1TGw^J*R6Idz32S5+2G;9~MPmR#X4G*>ut z*_IUsNmu<!KHYk5PRHl`181K`+8_G%w_7Cq$K^e<+Lspp+5WwM_kUgu zsrTDgaI7xf@$c--Q!F=Xy*Ih+Xg{rW_-pZvAoe#PCj|$e*rb{EC4=8Be`Q$LbL*4O zO5RQ0QKxrKz2V&F9}B+T-Swr|S?P`GQ9id{jE{cp%vs7D_TAXgRiG@D^ERW5z4&wC xfCn$Pt<%ck=T`Rh31p4gufWlSKq1T@SgriH+F9pY%K#&d!PC{xWt~$(699@i+t~mB literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/customnpcs/textures/models/barrel/trim.png b/src/main/resources/assets/customnpcs/textures/models/barrel/trim.png new file mode 100644 index 0000000000000000000000000000000000000000..f3db64fb9d030fc521adbca8728310fb11bce681 GIT binary patch literal 269 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3-p)I`?e@QjEnx?oJHr&dIz4a#+$GeH|GX zHuiJ>Nn{1``2&1HTx}g3^b8EV{r$sZVt`_f4TT_zwIs+d_&*RZ{NBbF3>4rj@Q5sC zVBk9p!i>lBSEK+1%RF5iLp;3SPITmJFyLSjfA#;q&WW|EcnRS3Ax_p03PV3iVo zy+QQZ!~0skKKWL{@#dpe0^j+C%E{A|zKaBZ5Sl3aYL9G0ll|LcKo>B0y85}Sb4q9e E0Jp?gRR910 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/customnpcs/textures/models/flame.png b/src/main/resources/assets/customnpcs/textures/models/flame.png new file mode 100644 index 0000000000000000000000000000000000000000..35a37eaef0511c8b44e0719aa8c7f2fcbe901055 GIT binary patch literal 1693 zcmV;O24eY%P)Px*S4l)cRA_NfiEctO{M>LP$ukpu)|9U?CWeZ3JpvDTOS2jSGQFAA$S> z;r@X@IF|+&Y8(_7cIDQfW;qfL76fiw2m}&qL`ZQW@shp5dXqOlc6P&Y$N63(kF@jV z&Fp;NeD95c|Ez__PI}ozn)lofrY|qMNWEbnP2Umi!Vbb?C#8;r&^#NRvg(i#XS;jxp}gN8O8$-(m*l$KF~I9!SEDy;#Yy*h_C>`UKg zt^tisR<8B1nNLJCe0?+rmtCa($Q2{=C>GZ*Ok>Fos51a;<`a}_J*@*@CjgM*iNlpx zJOFsOzY@Py+a27VUDzX7MhR}uF0h$Tq=$Ihx&~zH*;H!p?2WOWP2mmus0R(Z1A2f) z-OMNW^x;T2j!qYL2lT*tHWjb$=H*-IwX>>|-;Z;P&i7+r~x*YN&)vl^=}`F1tvZz9SxfxW7WV))P+RaHa8q5lozoe*fi1 zF$I%p4&rcyKYsmLw4c2?N2N7DJ!s@}qCawt3#AfFrUQC?&t9ENd`JXydv;;x#ATGg zV*9Y*Ek00_jx5uF!8t)y=eclJ35D;x zLU5*V<8UP)Ot}J?HG<$IDbZ*gjXQf|Au?2{qfLSGB?6O4@@G2W^CcslyqQn1o=xpy zn{xqKr8SW92CLYP!xiFiB@n2d&>ZGQ2gEkCfDiXq*vu!Qy`D|;`Jf&&1nxKU32t7# z6>SrxN$-?4i9d2tZFfYTpjshn|JTeK3hg=*hzi@?*cD3Mq}q*M@5XMrd$cI=2 z1Nx*LXv$iQgu?5JMCDE2F;bi6;BM@uBrJICfNvtsO4<~n(}mbL-Pea&_MWSio4$i; zy9007$Ijju$WW+82b{*h&PE=(dV)(1NL+CAVapMf)<8@#(*ez2t!8FbFN|vdL%L5T z(cFANt*25!ws5`>oh}3?5+m*GjfLb}&!+jWk#fg}`zyhP6u}eV0~6Z5iw|~>76K%u zj;8Od$pA^;5UW&OePaZ?Bb`FD@&xPL0tDYo-Voa~uy5Q0S_IE;P~z{JaKN!qC}XL% zI|2{H3DtH7{>UwMI-A5cSXm^~0XLOYsBHz4dObi`AUJbw$eaR{jGddQFsV^mJ!nYy zFV}if+nVyIaNW!&l1BQj`vn@6*5e6q!9QXj-yceOf=MT2W+6p#g-i>No%C+(rXSxQ zO4*9(S?$7-?iD$3IF(t^7@Q;}P8ziL>p?@v92HDPMxx6J0q1SjUJr7TZ?GLloy)bJ zm`)t7G&oBw^+$fcPz6wJ!;Z#fln6#55YcCr%+aPmmvr1XwW)++JXqGVDXP+4>o-17 z6E7npapM);LiNOYfNcfqF$!Dp;s0(XEl{{HN#v0SWus9El(>LoPnOit7>4)&?7Ezi za(b2gh}YoE_kz3sC^Ee5et2}el8W=1z@U-5VPCuHL*CIw^%JfU2w2{*k7~Q4)mbz3 zLAln$!~K&}jWHoe~ODIYFaA00000NkvXXu0mjf^VuUv literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/customnpcs/textures/models/flame.png.mcmeta b/src/main/resources/assets/customnpcs/textures/models/flame.png.mcmeta new file mode 100644 index 000000000..503173546 --- /dev/null +++ b/src/main/resources/assets/customnpcs/textures/models/flame.png.mcmeta @@ -0,0 +1,17 @@ +{ + "animation": { + "frametime": 2, + "interpolate": true, + "frames": [ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8 + ] + } +} diff --git a/src/main/resources/assets/customnpcs/textures/models/flame_single.png b/src/main/resources/assets/customnpcs/textures/models/flame_single.png new file mode 100644 index 0000000000000000000000000000000000000000..a913064f4748f48f656edf092bc7f40721e76757 GIT binary patch literal 387 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D%zl|5Y?Lo9mF zPTZJv*g&A|zgYT-ONvK!1f0;)VDS>yXWj2;)zKr%BFo#l$02^n14Zxdj}QD}nd7#U z7)tDsV&c=3+f}i`ac+snjUAHJliz*0U%ub(z Date: Sun, 26 Jan 2025 15:47:04 -0500 Subject: [PATCH 2/8] Banner Upgrade WIP --- .../model/blocks/banner/ModelBannerFloor.java | 69 ++++++++++++++++++ .../blocks/banner/ModelBannerFloorFlag.java | 30 ++++++++ .../ModelLegacyBanner.java} | 30 ++++---- .../ModelLegacyBannerFlag.java} | 14 ++-- .../ModelLegacyWallBanner.java} | 14 ++-- .../ModelLegacyWallBannerFlag.java} | 6 +- .../renderer/blocks/BlockBannerRenderer.java | 65 +++++++++++++---- .../blocks/BlockWallBannerRenderer.java | 14 ++-- .../java/noppes/npcs/config/ConfigClient.java | 2 + .../models/banner/BannerFloorDiamond.png | Bin 0 -> 1465 bytes .../models/banner/BannerFloorGold.png | Bin 0 -> 1368 bytes .../models/banner/BannerFloorIron.png | Bin 0 -> 797 bytes .../models/banner/BannerFloorStone.png | Bin 0 -> 843 bytes .../models/banner/BannerFloorWood.png | Bin 0 -> 776 bytes .../models/banner/flag/BannerFlag1.png | Bin 0 -> 270 bytes .../models/banner/flag/BannerFlag2.png | Bin 0 -> 282 bytes .../models/banner/flag/BannerFlag3.png | Bin 0 -> 297 bytes .../models/banner/flag/BannerFlag4.png | Bin 0 -> 407 bytes .../models/banner/flag/BannerFlag5.png | Bin 0 -> 270 bytes 19 files changed, 190 insertions(+), 54 deletions(-) create mode 100644 src/main/java/noppes/npcs/client/model/blocks/banner/ModelBannerFloor.java create mode 100644 src/main/java/noppes/npcs/client/model/blocks/banner/ModelBannerFloorFlag.java rename src/main/java/noppes/npcs/client/model/blocks/{ModelBanner.java => legacy/ModelLegacyBanner.java} (93%) rename src/main/java/noppes/npcs/client/model/blocks/{ModelBannerFlag.java => legacy/ModelLegacyBannerFlag.java} (83%) rename src/main/java/noppes/npcs/client/model/blocks/{ModelWallBanner.java => legacy/ModelLegacyWallBanner.java} (91%) rename src/main/java/noppes/npcs/client/model/blocks/{ModelWallBannerFlag.java => legacy/ModelLegacyWallBannerFlag.java} (78%) create mode 100644 src/main/resources/assets/customnpcs/textures/models/banner/BannerFloorDiamond.png create mode 100644 src/main/resources/assets/customnpcs/textures/models/banner/BannerFloorGold.png create mode 100644 src/main/resources/assets/customnpcs/textures/models/banner/BannerFloorIron.png create mode 100644 src/main/resources/assets/customnpcs/textures/models/banner/BannerFloorStone.png create mode 100644 src/main/resources/assets/customnpcs/textures/models/banner/BannerFloorWood.png create mode 100644 src/main/resources/assets/customnpcs/textures/models/banner/flag/BannerFlag1.png create mode 100644 src/main/resources/assets/customnpcs/textures/models/banner/flag/BannerFlag2.png create mode 100644 src/main/resources/assets/customnpcs/textures/models/banner/flag/BannerFlag3.png create mode 100644 src/main/resources/assets/customnpcs/textures/models/banner/flag/BannerFlag4.png create mode 100644 src/main/resources/assets/customnpcs/textures/models/banner/flag/BannerFlag5.png diff --git a/src/main/java/noppes/npcs/client/model/blocks/banner/ModelBannerFloor.java b/src/main/java/noppes/npcs/client/model/blocks/banner/ModelBannerFloor.java new file mode 100644 index 000000000..b58c134a1 --- /dev/null +++ b/src/main/java/noppes/npcs/client/model/blocks/banner/ModelBannerFloor.java @@ -0,0 +1,69 @@ +package noppes.npcs.client.model.blocks.banner; + +import net.minecraft.client.model.ModelBase; +import net.minecraft.client.model.ModelBox; +import net.minecraft.client.model.ModelRenderer; +import net.minecraft.entity.Entity; + +public class ModelBannerFloor extends ModelBase { + private final ModelRenderer FloorBanner; + private final ModelRenderer Leg4_r1; + private final ModelRenderer Leg3_r1; + private final ModelRenderer Leg2_r1; + private final ModelRenderer Leg1_r1; + private final ModelRenderer Point1_r1; + + public ModelBannerFloor() { + textureWidth = 64; + textureHeight = 64; + + FloorBanner = new ModelRenderer(this); + FloorBanner.setRotationPoint(0.0F, 24.0F, 0.0F); + FloorBanner.cubeList.add(new ModelBox(FloorBanner, 0, 0, -8.0F, -32.0F, -1.0F, 16, 3, 3, 0.0F)); + FloorBanner.cubeList.add(new ModelBox(FloorBanner, 0, 8, -6.0F, -36.0F, 0.5F, 4, 4, 0, 0.0F)); + FloorBanner.cubeList.add(new ModelBox(FloorBanner, 0, 13, -1.0F, -29.0F, -0.5F, 2, 26, 2, 0.0F)); + FloorBanner.cubeList.add(new ModelBox(FloorBanner, 18, 28, -6.0F, -2.0F, -5.0F, 12, 2, 11, 0.0F)); + FloorBanner.cubeList.add(new ModelBox(FloorBanner, 26, 19, -4.0F, -4.0F, -3.0F, 8, 2, 7, 0.0F)); + + Leg4_r1 = new ModelRenderer(this); + Leg4_r1.setRotationPoint(-3.5F, -2.1F, 0.5F); + FloorBanner.addChild(Leg4_r1); + setRotationAngle(Leg4_r1, 0.0F, 0.0F, 1.1781F); + Leg4_r1.cubeList.add(new ModelBox(Leg4_r1, 10, 29, -1.0F, -3.0F, -1.0F, 2, 6, 2, 0.0F)); + + Leg3_r1 = new ModelRenderer(this); + Leg3_r1.setRotationPoint(0.0F, -2.1F, 4.0F); + FloorBanner.addChild(Leg3_r1); + setRotationAngle(Leg3_r1, 1.1781F, 0.0F, 0.0F); + Leg3_r1.cubeList.add(new ModelBox(Leg3_r1, 10, 29, -1.0F, -3.0F, -1.0F, 2, 6, 2, 0.0F)); + + Leg2_r1 = new ModelRenderer(this); + Leg2_r1.setRotationPoint(0.0F, -2.1F, -3.0F); + FloorBanner.addChild(Leg2_r1); + setRotationAngle(Leg2_r1, -1.1781F, 0.0F, 0.0F); + Leg2_r1.cubeList.add(new ModelBox(Leg2_r1, 10, 29, -1.0F, -3.0F, -1.0F, 2, 6, 2, 0.0F)); + + Leg1_r1 = new ModelRenderer(this); + Leg1_r1.setRotationPoint(3.5F, -2.1F, 0.5F); + FloorBanner.addChild(Leg1_r1); + setRotationAngle(Leg1_r1, 0.0F, 0.0F, -1.1781F); + Leg1_r1.cubeList.add(new ModelBox(Leg1_r1, 10, 29, -1.0F, -3.0F, -1.0F, 2, 6, 2, 0.0F)); + + Point1_r1 = new ModelRenderer(this); + Point1_r1.setRotationPoint(4.0F, -34.0F, 0.5F); + FloorBanner.addChild(Point1_r1); + setRotationAngle(Point1_r1, 0.0F, 3.1416F, 0.0F); + Point1_r1.cubeList.add(new ModelBox(Point1_r1, 0, 8, -2.0F, -2.0F, 0.0F, 4, 4, 0, 0.0F)); + } + + @Override + public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { + FloorBanner.render(f5); + } + + public void setRotationAngle(ModelRenderer modelRenderer, float x, float y, float z) { + modelRenderer.rotateAngleX = x; + modelRenderer.rotateAngleY = y; + modelRenderer.rotateAngleZ = z; + } +} diff --git a/src/main/java/noppes/npcs/client/model/blocks/banner/ModelBannerFloorFlag.java b/src/main/java/noppes/npcs/client/model/blocks/banner/ModelBannerFloorFlag.java new file mode 100644 index 000000000..25adeb70d --- /dev/null +++ b/src/main/java/noppes/npcs/client/model/blocks/banner/ModelBannerFloorFlag.java @@ -0,0 +1,30 @@ +package noppes.npcs.client.model.blocks.banner; + +import net.minecraft.client.model.ModelBase; +import net.minecraft.client.model.ModelBox; +import net.minecraft.client.model.ModelRenderer; +import net.minecraft.entity.Entity; + +public class ModelBannerFloorFlag extends ModelBase { + private final ModelRenderer BannerFlag; + + public ModelBannerFloorFlag() { + textureWidth = 32; + textureHeight = 32; + + BannerFlag = new ModelRenderer(this); + BannerFlag.setRotationPoint(0.0F, -8.0F, 5.0F); + BannerFlag.cubeList.add(new ModelBox(BannerFlag, 0, 0, -8.0F, 0.0F, -6.05F, 16, 32, 0, 0.0F)); + } + + @Override + public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { + BannerFlag.render(f5); + } + + public void setRotationAngle(ModelRenderer modelRenderer, float x, float y, float z) { + modelRenderer.rotateAngleX = x; + modelRenderer.rotateAngleY = y; + modelRenderer.rotateAngleZ = z; + } +} diff --git a/src/main/java/noppes/npcs/client/model/blocks/ModelBanner.java b/src/main/java/noppes/npcs/client/model/blocks/legacy/ModelLegacyBanner.java similarity index 93% rename from src/main/java/noppes/npcs/client/model/blocks/ModelBanner.java rename to src/main/java/noppes/npcs/client/model/blocks/legacy/ModelLegacyBanner.java index 4f9bde1f8..086e27b65 100644 --- a/src/main/java/noppes/npcs/client/model/blocks/ModelBanner.java +++ b/src/main/java/noppes/npcs/client/model/blocks/legacy/ModelLegacyBanner.java @@ -1,11 +1,11 @@ -package noppes.npcs.client.model.blocks; +package noppes.npcs.client.model.blocks.legacy; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; -public class ModelBanner extends ModelBase +public class ModelLegacyBanner extends ModelBase { //fields ModelRenderer Base; @@ -18,50 +18,50 @@ public class ModelBanner extends ModelBase ModelRenderer BaseDeco2; ModelRenderer BaseDeco3; ModelRenderer BaseDeco4; - - public ModelBanner() + + public ModelLegacyBanner() { Base = new ModelRenderer(this, 3, 1); Base.addBox(-7F, 0F, -7F, 14, 1, 14); Base.setRotationPoint(0F, 23F, 0F); - + MiddleStick = new ModelRenderer(this, 12, 2); MiddleStick.addBox(-1F, 0F, -1F, 2, 32, 2); MiddleStick.setRotationPoint(0F, -9F, 0F); - + StickDecoration = new ModelRenderer(this, 11, 12); StickDecoration.addBox(0F, 0F, 0F, 16, 3, 3); StickDecoration.setRotationPoint(-8F, -7.5F, -1.5F); - + TopDecoration = new ModelRenderer(this, 45, 19); TopDecoration.addBox(0F, 0F, 0F, 1, 1, 1); TopDecoration.setRotationPoint(-0.5F, -10F, -0.5F); - + FlagPole1 = new ModelRenderer(this, 45, 19); FlagPole1.addBox(0F, 0F, 0F, 1, 1, 1); FlagPole1.setRotationPoint(-7F, -6.5F, -2.5F); - + FlagPole2 = new ModelRenderer(this, 45, 19); FlagPole2.addBox(0F, 0F, 0F, 1, 1, 1); FlagPole2.setRotationPoint(6F, -6.5F, -2.5F); - + BaseDeco1 = new ModelRenderer(this, 1, 14); BaseDeco1.addBox(0F, 0F, 0F, 12, 1, 1); BaseDeco1.setRotationPoint(-6F, 23F, -8F); - + BaseDeco2 = new ModelRenderer(this, 1, 14); BaseDeco2.addBox(0F, 0F, 0F, 12, 1, 1); BaseDeco2.setRotationPoint(-6F, 23F, 7F); - + BaseDeco3 = new ModelRenderer(this, 2, 2); BaseDeco3.addBox(0F, 0F, 0F, 1, 1, 12); BaseDeco3.setRotationPoint(-8F, 23F, -6F); - + BaseDeco4 = new ModelRenderer(this, 2, 2); BaseDeco4.addBox(0F, 0F, 0F, 1, 1, 12); BaseDeco4.setRotationPoint(7F, 23F, -6F); } - + public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { super.render(entity, f, f1, f2, f3, f4, f5); @@ -76,7 +76,7 @@ public class ModelBanner extends ModelBase BaseDeco3.render(f5); BaseDeco4.render(f5); } - + private void setRotation(ModelRenderer model, float x, float y, float z) { model.rotateAngleX = x; diff --git a/src/main/java/noppes/npcs/client/model/blocks/ModelBannerFlag.java b/src/main/java/noppes/npcs/client/model/blocks/legacy/ModelLegacyBannerFlag.java similarity index 83% rename from src/main/java/noppes/npcs/client/model/blocks/ModelBannerFlag.java rename to src/main/java/noppes/npcs/client/model/blocks/legacy/ModelLegacyBannerFlag.java index bc3ea2656..b6830ad7a 100644 --- a/src/main/java/noppes/npcs/client/model/blocks/ModelBannerFlag.java +++ b/src/main/java/noppes/npcs/client/model/blocks/legacy/ModelLegacyBannerFlag.java @@ -1,31 +1,31 @@ -package noppes.npcs.client.model.blocks; +package noppes.npcs.client.model.blocks.legacy; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; -public class ModelBannerFlag extends ModelBase +public class ModelLegacyBannerFlag extends ModelBase { ModelRenderer Flag; - - public ModelBannerFlag() + + public ModelLegacyBannerFlag() { textureWidth = 32; textureHeight = 32; - + Flag = new ModelRenderer(this, 0, 0); Flag.addBox(0F, 0F, 0F, 15, 27, 0); Flag.setRotationPoint(-7.5F, -7F, -2F); Flag.setTextureSize(32, 32); } - + public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { super.render(entity, f, f1, f2, f3, f4, f5); Flag.render(f5); } - + private void setRotation(ModelRenderer model, float x, float y, float z) { model.rotateAngleX = x; diff --git a/src/main/java/noppes/npcs/client/model/blocks/ModelWallBanner.java b/src/main/java/noppes/npcs/client/model/blocks/legacy/ModelLegacyWallBanner.java similarity index 91% rename from src/main/java/noppes/npcs/client/model/blocks/ModelWallBanner.java rename to src/main/java/noppes/npcs/client/model/blocks/legacy/ModelLegacyWallBanner.java index a4f9610a5..851201603 100644 --- a/src/main/java/noppes/npcs/client/model/blocks/ModelWallBanner.java +++ b/src/main/java/noppes/npcs/client/model/blocks/legacy/ModelLegacyWallBanner.java @@ -4,13 +4,13 @@ // Keep in mind that you still need to fill in some blanks // - ZeuX -package noppes.npcs.client.model.blocks; +package noppes.npcs.client.model.blocks.legacy; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; -public class ModelWallBanner extends ModelBase { +public class ModelLegacyWallBanner extends ModelBase { // fields ModelRenderer MiddleStick; ModelRenderer StickDecoration; @@ -18,24 +18,24 @@ public class ModelWallBanner extends ModelBase { ModelRenderer FlagPole1; ModelRenderer FlagPole2; - public ModelWallBanner() { + public ModelLegacyWallBanner() { MiddleStick = new ModelRenderer(this, 56, 0); MiddleStick.addBox(-1F, 0F, -1F, 2, 3, 2); MiddleStick.setRotationPoint(0F, -9F, 6.5F); - + StickDecoration = new ModelRenderer(this, 11, 12); StickDecoration.addBox(0F, 0F, 0F, 16, 3, 3); StickDecoration.setRotationPoint(-8F, -7.5F, 5F); - + TopDecoration = new ModelRenderer(this, 45, 19); TopDecoration.addBox(0F, 0F, 0F, 1, 1, 1); TopDecoration.setRotationPoint(-0.5F, -10F, 6F); - + FlagPole1 = new ModelRenderer(this, 45, 19); FlagPole1.addBox(0F, 0F, 0F, 1, 1, 1); FlagPole1.setRotationPoint(-7F, -6.5F, 4F); - + FlagPole2 = new ModelRenderer(this, 45, 19); FlagPole2.addBox(0F, 0F, 0F, 1, 1, 1); FlagPole2.setRotationPoint(6F, -6.5F, 4F); diff --git a/src/main/java/noppes/npcs/client/model/blocks/ModelWallBannerFlag.java b/src/main/java/noppes/npcs/client/model/blocks/legacy/ModelLegacyWallBannerFlag.java similarity index 78% rename from src/main/java/noppes/npcs/client/model/blocks/ModelWallBannerFlag.java rename to src/main/java/noppes/npcs/client/model/blocks/legacy/ModelLegacyWallBannerFlag.java index a32a5fed6..17e152f3a 100644 --- a/src/main/java/noppes/npcs/client/model/blocks/ModelWallBannerFlag.java +++ b/src/main/java/noppes/npcs/client/model/blocks/legacy/ModelLegacyWallBannerFlag.java @@ -1,13 +1,13 @@ -package noppes.npcs.client.model.blocks; +package noppes.npcs.client.model.blocks.legacy; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; -public class ModelWallBannerFlag extends ModelBase { +public class ModelLegacyWallBannerFlag extends ModelBase { ModelRenderer Flag; - public ModelWallBannerFlag() { + public ModelLegacyWallBannerFlag() { textureWidth = 32; textureHeight = 32; Flag = new ModelRenderer(this, 0, 0); diff --git a/src/main/java/noppes/npcs/client/renderer/blocks/BlockBannerRenderer.java b/src/main/java/noppes/npcs/client/renderer/blocks/BlockBannerRenderer.java index 163428087..f428c0372 100644 --- a/src/main/java/noppes/npcs/client/renderer/blocks/BlockBannerRenderer.java +++ b/src/main/java/noppes/npcs/client/renderer/blocks/BlockBannerRenderer.java @@ -14,19 +14,31 @@ import net.minecraft.util.ResourceLocation; import noppes.npcs.CustomItems; import noppes.npcs.blocks.BlockBanner; import noppes.npcs.blocks.tiles.TileBanner; -import noppes.npcs.client.model.blocks.ModelBanner; -import noppes.npcs.client.model.blocks.ModelBannerFlag; +import noppes.npcs.client.model.blocks.banner.ModelBannerFloor; +import noppes.npcs.client.model.blocks.banner.ModelBannerFloorFlag; +import noppes.npcs.client.model.blocks.legacy.ModelLegacyBanner; +import noppes.npcs.client.model.blocks.legacy.ModelLegacyBannerFlag; +import noppes.npcs.config.ConfigClient; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; public class BlockBannerRenderer extends BlockRendererInterface{ - private final ModelBanner model = new ModelBanner(); - private final ModelBannerFlag flag = new ModelBannerFlag(); + private final ModelLegacyBanner legacyBanner = new ModelLegacyBanner(); + private final ModelLegacyBannerFlag legacyFlag = new ModelLegacyBannerFlag(); - public static final ResourceLocation resourceFlag = new ResourceLocation("customnpcs","textures/models/BannerFlag.png"); + private final ModelBannerFloor banner = new ModelBannerFloor(); + private final ModelBannerFloorFlag flag = new ModelBannerFloorFlag(); + public static final ResourceLocation legacyFlagResource = new ResourceLocation("customnpcs","textures/models/BannerFlag.png"); + public static final ResourceLocation flagResource = new ResourceLocation("customnpcs","textures/models/banner/flag/BannerFlag1.png"); + + protected static final ResourceLocation BannerWood = new ResourceLocation("customnpcs","textures/models/banner/BannerFloorWood.png"); + protected static final ResourceLocation BannerStone = new ResourceLocation("customnpcs","textures/models/banner/BannerFloorStone.png"); + protected static final ResourceLocation BannerIron = new ResourceLocation("customnpcs","textures/models/banner/BannerFloorIron.png"); + protected static final ResourceLocation BannerGold = new ResourceLocation("customnpcs","textures/models/banner/BannerFloorGold.png"); + protected static final ResourceLocation BannerDiamond = new ResourceLocation("customnpcs","textures/models/banner/BannerFloorDiamond.png"); public BlockBannerRenderer(){ ((BlockBanner)CustomItems.banner).renderId = RenderingRegistry.getNextAvailableRenderId(); @@ -46,13 +58,24 @@ public class BlockBannerRenderer extends BlockRendererInterface{ GL11.glRotatef(90 * tile.rotation, 0, 1, 0); GL11.glColor3f(1, 1, 1); - setMaterialTexture(var1.getBlockMetadata()); - model.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); + if(ConfigClient.LegacyBanner){ + setMaterialTexture(var1.getBlockMetadata()); + legacyBanner.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); - this.bindTexture(resourceFlag); - float[] color = colorTable[tile.color]; - GL11.glColor3f(color[0], color[1], color[2]); - flag.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); + this.bindTexture(legacyFlagResource); + float[] color = colorTable[tile.color]; + GL11.glColor3f(color[0], color[1], color[2]); + legacyFlag.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); + } + else { + setBannerMaterial(var1.getBlockMetadata()); + banner.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); + + this.bindTexture(flagResource); + float[] color = colorTable[tile.color]; + GL11.glColor3f(color[0], color[1], color[2]); + flag.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); + } GL11.glPopMatrix(); GL11.glColor3f(1, 1, 1); @@ -135,12 +158,12 @@ public class BlockBannerRenderer extends BlockRendererInterface{ setMaterialTexture(metadata); GL11.glColor3f(1, 1, 1); - model.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); + legacyBanner.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); - this.bindTexture(resourceFlag); + this.bindTexture(legacyFlagResource); float[] color = colorTable[15 - metadata]; GL11.glColor3f(color[0], color[1], color[2]); - flag.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); + legacyFlag.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); GL11.glPopMatrix(); } @@ -152,4 +175,18 @@ public class BlockBannerRenderer extends BlockRendererInterface{ public int specialRenderDistance(){ return 26; } + + public void setBannerMaterial(int meta){ + TextureManager manager = Minecraft.getMinecraft().getTextureManager(); + if(meta == 1) + manager.bindTexture(BannerStone); + else if(meta == 2) + manager.bindTexture(BannerIron); + else if(meta == 3) + manager.bindTexture(BannerGold); + else if(meta == 4) + manager.bindTexture(BannerDiamond); + else + manager.bindTexture(BannerWood); + } } diff --git a/src/main/java/noppes/npcs/client/renderer/blocks/BlockWallBannerRenderer.java b/src/main/java/noppes/npcs/client/renderer/blocks/BlockWallBannerRenderer.java index d76e72669..0b83c9fa3 100644 --- a/src/main/java/noppes/npcs/client/renderer/blocks/BlockWallBannerRenderer.java +++ b/src/main/java/noppes/npcs/client/renderer/blocks/BlockWallBannerRenderer.java @@ -2,8 +2,6 @@ package noppes.npcs.client.renderer.blocks; import cpw.mods.fml.client.registry.RenderingRegistry; import net.minecraft.block.Block; -import net.minecraft.block.BlockColored; -import net.minecraft.block.material.MapColor; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.RenderBlocks; @@ -17,15 +15,15 @@ import net.minecraft.util.ResourceLocation; import noppes.npcs.CustomItems; import noppes.npcs.blocks.BlockWallBanner; import noppes.npcs.blocks.tiles.TileWallBanner; -import noppes.npcs.client.model.blocks.ModelWallBanner; -import noppes.npcs.client.model.blocks.ModelWallBannerFlag; +import noppes.npcs.client.model.blocks.legacy.ModelLegacyWallBanner; +import noppes.npcs.client.model.blocks.legacy.ModelLegacyWallBannerFlag; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; public class BlockWallBannerRenderer extends BlockRendererInterface{ - private final ModelWallBanner model = new ModelWallBanner(); - private final ModelWallBannerFlag flag = new ModelWallBannerFlag(); + private final ModelLegacyWallBanner model = new ModelLegacyWallBanner(); + private final ModelLegacyWallBannerFlag flag = new ModelLegacyWallBannerFlag(); public BlockWallBannerRenderer(){ ((BlockWallBanner)CustomItems.wallBanner).renderId = RenderingRegistry.getNextAvailableRenderId(); @@ -48,7 +46,7 @@ public class BlockWallBannerRenderer extends BlockRendererInterface{ GL11.glColor3f(1, 1, 1); model.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); - this.bindTexture(BlockBannerRenderer.resourceFlag); + this.bindTexture(BlockBannerRenderer.legacyFlagResource); float[] color = BlockBannerRenderer.colorTable[tile.color]; GL11.glColor3f(color[0], color[1], color[2]); flag.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); @@ -154,7 +152,7 @@ public class BlockWallBannerRenderer extends BlockRendererInterface{ GL11.glColor3f(1, 1, 1); model.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); - this.bindTexture(BlockBannerRenderer.resourceFlag); + this.bindTexture(BlockBannerRenderer.legacyFlagResource); float[] color = BlockBannerRenderer.colorTable[15 - metadata]; GL11.glColor3f(color[0], color[1], color[2]); flag.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); diff --git a/src/main/java/noppes/npcs/config/ConfigClient.java b/src/main/java/noppes/npcs/config/ConfigClient.java index 06333ac60..3824f8e9b 100644 --- a/src/main/java/noppes/npcs/config/ConfigClient.java +++ b/src/main/java/noppes/npcs/config/ConfigClient.java @@ -77,6 +77,7 @@ public class ConfigClient * Model Properties **/ public static boolean LegacyCampfire = false; + public static boolean LegacyBanner = false; public static boolean LegacyChair = false; public static boolean LegacyBarrel = false; public static boolean LegacyCarpentryBench = false; @@ -138,6 +139,7 @@ public class ConfigClient BannerAlerts = BannerAlertsProperty.getBoolean(true); LegacyCampfire = config.get(MODEL, "Legacy Campfire Model", false).getBoolean(false); + LegacyBanner = config.get(MODEL, "Legacy Banner Model", false).getBoolean(false); LegacyBarrel = config.get(MODEL, "Legacy Barrel Model", false).getBoolean(false); LegacyChair = config.get(MODEL, "Legacy Chair Model", false).getBoolean(false); LegacyCarpentryBench = config.get(MODEL, "Legacy Carpentry Bench Model", false).getBoolean(false); diff --git a/src/main/resources/assets/customnpcs/textures/models/banner/BannerFloorDiamond.png b/src/main/resources/assets/customnpcs/textures/models/banner/BannerFloorDiamond.png new file mode 100644 index 0000000000000000000000000000000000000000..e55449a68934b636848eb47ace05287084dce32c GIT binary patch literal 1465 zcmV;q1xEUbP)Px)b4f%&RCt{2nonpPRT#j36SwZLnRT)uDNUrXRx7r~LP{%?P})OL>P4g;JlR5v zR>-LoJQmMNPlZ&mXz?Hgdyoo65HysfVp{{-wbjPPTug#l_K!Qe&eq8DF!SEd&d#pc zq`QmF{4Uvf-?wkx_ulut?|W~f;o*a~_Y3*?@cHk^P~zufF9Fc6M*&za+5o)y`S)Zf zQ8@J)0Hw+b0P$D^fZJ!kVmg)Km2;B-44XOtWxMM1^Xa!tr!pMxXGZ|K*fb%QBYR+w9~Sjv^vV5LD4ufg*3JLnvk7*o1syUJ3o%-o_ysj{Nv zm8xjyubV{PePgc}Hg%SZHp8awu9CrRS3$0<*AOqVy7oCP)-+IvS|R4XqJL9&DeICJrb zN7@r2cn&m`YU_i~qlgNDjbLmLk)TF-;@b$55~)-LTLztD?%bkPC+yZO&C9t(VHF#< zn(?Gj_dGLiHRu?o;OoJWHSbe_9?)&9qK07#&L%dKqTrEKN#pECyQs1&xk*VT7~oX? z4}vDH9Rkx}sj|XSuDq^}+eI4x(SP4?~cgp@UmTPaQlaOJ3H~)QeaN?r@FN;DJ&6` zA^}oQZE2Y%8h#m~gPve#7udJw*}69GihBRbc0W??$2*boyQ@i&5t>wd54#GKD{;$L z_!wqw(6u&!Rn!I#o(2ej3JkAM`V299@F}S;XP#COM|N6~)ZH=QR zS->y_Cq#mewLCP*>)R9Yx(R5eU-J;>`A(tO)>!(yMwjhsUF>&qLhfpgi?6n*3DWn5 zhxCG-17=&}h{*I;wyU1gU#+bZSVfJg#9#0q#(Q`1DT4LoUg6hYEq!z;3;0=073WQD ze*M{eNf|F!e>`cl9|En;{GGZF@UB`bn$-f{cJI#LOurR9xeu_48tFuH_YX2e9*rG0 z*XrWl+rD$a66k?hL$E-PLbm`p_sp{(6_=hxP(+{r)}f6pHK|Fv;Q^l4Q)cyZcKXS_ssaw@!=) zm9}f)!Z$bA{mc&Zp;30b9wG5Q%l`Mdha>r3nq&*Z6!rH3{=DCA9nfH4qRD4h_xjD+ zib|TTsB~|?Tz=nw$WmkRz1Q2emQ6DxBqSsxBqSsxBqSsxBqSsxBqSsxPx)5=lfsRCt{2nZb)2RT#j3n@lE?WXp6L7k62fLJMsVixfo*f)v}M|A4pNs$P1q zf?%Pgg^CAzQ9LA;-J%O6ghons9kQ7uvrWds%zJq=nZ!-D$zc0_ zm&|7j28D zPMbyB3TJ6v&X6#MP`a;dAtEnXL0@6OJJ)vQN3MRHf$|c!uGXX>?_ArJ?+)6RIkEh% zPiXX6g@aMd&xLMjg#()0h2!s%;S|1W=~zjAI1)}FwVmdG2TmKq?fBGonlc6ttv;l{mR zUuaJ-PzoARkqs6;FD^0!UIt~87&s3=In{X?jAFPQpQU3#nY;aDFVZ-xQyTZT(|*?3 zACQ|XtC9Pp#H?%QD88{Z@j8|00kbCS?9;V#6wZDGyBpEQx)c1CZA>*=UARE&!M7wC zZX6P~!G`;c+D`LOFCG`6{Jk5$aO3iNAgnvI_G+~DYJEcpb~l1&4vB$s5|b+7%x^zw zNs(8rfSr@q;?P9aEpcy|fDFpEr;?UIPAmt( z!OST{W>onV@;LG51*##%vj^EC4TfZV&pQk3&%{Wf$n$IeO(QWa?i9f`om&FuxQrz_9*u z@e>}?cE=h^Mpat;{Uw;DK{CDI;Ps$MO;Z0zc!XYHTE(%(VTkQd{O=dgmraALvk!m% zc(8tgA^pW#G0^{jWSG$|Fu(z_xJZr=>)+a|N#*72udI$A0;6jFX`KhCvo?xhxjRV!r0b(q~{V|`AY`G?I1Ca=HuDgc}J8+dIuTPx%*GWV{RCt{2nlXzLK@`XTSr&HL7y<(UZ7uQ*3|L%iuhm^4K@hGGu~4uOk#N;P zEUvH+6tObJ!hHZs3&HDBZgJRMATSVeyX-<>EG}=DOg49?atYaaziM}8*q!(0y?OKA zZVd+g{T)TuyKlciN{Qq5PXPe+FaQ9ICpiG%dH)zvO8ort0st`0W&nUj-W&AITK;FwlwtLM3WZJJ*$wqDSeVQ-o8k2A93z?P z$&x^XDKK3NA<%BO_1H8oFp?=w&(1N;X1YHs)Y9|TiT`@{o@zBij3+r-&2YX-xAXv7 zSyK=bYOjYEW62r@2YY(VgJ&Ngguv%FkF0>^Qzgb>as!D;kK#Y}{-p~PepEad{OQR{U(dgUnzGLNwDzW%DT zCHOEBnyk1y@u?!(1zZre48N?AGCmiS;$?+GBk~tgRbo?BnswrQ6ex9pX*P4h{6Pw! zN{owmC@FHTYO5k1)$7Z+tgk98>;WzaY~$I*P?L35XE(({7#vS>CxkZfuwwO{3WLx! z{Hs^L*X<}XYuxs1@vp-meF2JsS|yIk*Ny_cZb#W^a;q7lzrUl>yx3Yx@J*rZufMiJ z>@2YgS))gjPxAs+q@U}w5gS03r4@eth(PuO4H$0*j7;m z7tux0vOhn}bHU-@WGi?1tI$VbGw!>R3WG~x);YkA`!1%(48t%C!!QiPFbu;m48t%C bQ(^u9JtmjdZcEJD00000NkvXXu0mjfSZryy literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/customnpcs/textures/models/banner/BannerFloorStone.png b/src/main/resources/assets/customnpcs/textures/models/banner/BannerFloorStone.png new file mode 100644 index 0000000000000000000000000000000000000000..ae032ed57a564216f56f127f790260bf13f9c378 GIT binary patch literal 843 zcmV-R1GM~!P)Px&1xZ9fRCt{2n$K&~P#nNNje&$_Yqh1I2M?8=Cy36AI|%B@v+Oo+`v(M%vZJtn zU^l%DkFwJgWb7a+3{(UUWj%OUp)|AY5)$Z$hxR>RW4g`57Mi@zDam^z`Tly}_x&aX z6xLUlB5{2E?oAr?5?im{1K`*e0G(a{z?0R7G+TXsfByl%z#jrIUo-)z-&>$sad@-w z4uD$O2EYqK03JVmK-cy7w!J5x|7>Hozy)KfC!JnE(Hgx&qh12wYQ>S`1Aj=ZY)c^; z^%7e<9*%8E#lUF%cEzFD>Ql4|QhD=5Q!1$0>eHx~v7mS2F0rJV-(Nvf)FnV@xzE(+2-{z|Wn(E*!s?5LS58N#WFN^=Z5Da5{esKa6O* zo_wfk;ltkXgyq|=$Ns?)1Ai#p-wz`>Cw?!-wq$HqD-HvH$o|0*ZP$~}acqmKqL{dc zX*3#*Mx!}5`QllZ3}fYQ~;gHjAXjF>N)6Q!yktuD<)lKU)>7y<)-m<#tuC_r>#@`!ss zdGYDm4Px%!bwCyRCt{2nz4)1P#niU4Z(!=N}+dwx}DqYVkd8KIBpa-w=TlrCD*fUUR9Q$~83keWoNYwD0@N@ArQ1_e)whoE+`v z=J?g;pTv_XcdmB<=!5|P@k|5o@#_`h$&~vC0{{|r20*v%1Mu|q7_Aa+53d3c^+Etr zodNLjLxNTb_YSVv|9^P;rp21^-II8xX$SK;#FP012mOH^Pt+MvFC^6&@nnit3FB#( zP8e9jKxjn*w1bv4UbpRA13?0gK~!dKzgGO>g=H~w(XL@SVXzRC*n3>T<~Z8!6FZ)h z>Woxps4OSyg?8MWt4vb`{-e7$@~9UQ&ooglTs);M`1Bndmv@D@nCqQzey=g$;hqQV z0Py_nH=^x6H+O$nLmuvV#IvoX@zV#lau!BkS2+0XptW$za3S{JUAXvLMyz4b@7QBE zoDAb>dd>qc8((EP<7sMR@PAym_*+JdRtYhXsGZVq(&`H_z;5@PhY5lp2!e2F*qw@7 z2vJdCQUzYs6R4Wj@n~qDyxGCITiD0X-qqR@e4OpBsmN9pK6S)~Koi84ajqYL)75E$ zQ9PC9bld(?scNXIOS4WIp9M-oAW>(HaDR*eOedy^csOa#r6~sSOuxR2-;LFUr8S@l zf{S>j16#J}t+P8@6-#L_p6N!2cJWy8^c$51S*-dOc|CPJ8s=`*xarm6U#CIy2B;mh zYOz(ma27Zo4fA4|9Q8s@j`s6ZXB+DYzAM@YGeV07DOQPfs2V*pdGp>+WjXG(y5n=f zEa1j_G4?lkE%42vRz^{n`3z>&`6g0Y4zHr<6?F&^+Y~MP^26O1JbCecBUkx9VYk9= z-fv1NjI_iG`+#EJZ(?~Y2!bF8f*=TjAP9mW2!bF8HRcz&i+dx7-4_A?0000ygM1AJ9M0{3{@ZgeUD52SFX!`S;TO{sV{e%WGGenT zjAPdnYMcbATDT!HPfBx{Dx$=lh?bUwn;LQ)p=gm@0N-qBG zdce+Vx8@>^u2Y921P!ga*}G-F-4vYkc7bP*rC9!#4GVTL-!Wpl%2UQ226P64r>mdK II;Vst0AmPV<^TWy literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/customnpcs/textures/models/banner/flag/BannerFlag2.png b/src/main/resources/assets/customnpcs/textures/models/banner/flag/BannerFlag2.png new file mode 100644 index 0000000000000000000000000000000000000000..ea3b68322c77c2ecf27210bea5f6529b448c1b83 GIT binary patch literal 282 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}S3F%DLn2z= zPB-K`tia=HAE?HErz^Nvn?LR{=My$91&gdJpWKB%&X-MY>^79M=$!d*Z~id`g_Z|h z4;soC6c!~dR990nzQ@pzTh;FQ_RO5qvyF06^_3FRq#M4(XD^#?@+sH*_Ep}s3j6Lc zb3c$|2xsd$D&RDW*>msQTswBRei6aOj=E$K{RY+z4D%R2Twi>Hv0>k=?FuE&Hiv)W znV{gNm5}(4?E-gVX5VK`4#gcINwHb7n@#i?Oj`1c()JzQ!^LnlMrqRK{fGCglz1Fi ey+<$d6{|{Yxpz$NEeW9i7(8A5T-G@yGywpaNoi#O literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/customnpcs/textures/models/banner/flag/BannerFlag3.png b/src/main/resources/assets/customnpcs/textures/models/banner/flag/BannerFlag3.png new file mode 100644 index 0000000000000000000000000000000000000000..6639685fd308503f930cec00dbe66d62a651399a GIT binary patch literal 297 zcmV+^0oMMBP)Px#<4Ht8R9J=WmoW~*APhx+P$mz#6(``hT*$Krujx`pQInJ;I4Y|6qe1wA;R_Er z=NTUo5lqumi~&H5ao7YeXaoQv+6)^n9km8cOSU=q=*Pa^dDB-0XjejXak^GE4Czi z@yD%LRhKV!&Us$XdEAQE$?^XCdmVWZfSGrjjTqy=%+CTaGg3;2olZ*09by4c)vw9d v5T4}-BC@G@Np>eZUP8dl2D7#)?J~Up9659R9hV%u00000NkvXXu0mjfi5hgO literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/customnpcs/textures/models/banner/flag/BannerFlag4.png b/src/main/resources/assets/customnpcs/textures/models/banner/flag/BannerFlag4.png new file mode 100644 index 0000000000000000000000000000000000000000..221b9c757a41a85cde975ccd401fa61f2b2a7fe5 GIT binary patch literal 407 zcmV;I0cie-P)Px$QAtEWR9J=WS241MAPig_s}$7lF4UZWb8-SMWSt_dzsei+;Yc)ge;a2I+)W4@ z46U^l2QV{YjF)2okaG?{g9gk1Ktw+;M#evP>2cq?8^-e8kMm-}GvPXVELU zh=7@01WYl;9r+oy>CQO^UH4c31`COZpat7nTdxG01OPxvDU1|Vt<{YjdI~TYl_#;n zbPC=OG2w-@ng!gcW)BmB`ha3I3!XkOk9fclL$(D9bU2;s(hX~^>zxm|b;CP8;EA0NSc>ZvE4JVj zD_)kRd-Ls$c@!YFr$9tdO1ZohiHM5p}nk002ovPDHLkV1ja2 Bsh|J= literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/customnpcs/textures/models/banner/flag/BannerFlag5.png b/src/main/resources/assets/customnpcs/textures/models/banner/flag/BannerFlag5.png new file mode 100644 index 0000000000000000000000000000000000000000..f2ad436b759ea003ac80c5093229354609198eb6 GIT binary patch literal 270 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Cp=voLn2z= zPPgVeV!+`NzbHgxU#Q>P=)enU+F|!Zm)ug~&?_6k0zja9yTXy)$f7wgq}gg*Y@ zS<+C>u_H-CP_5;6!{Zkz?Y|G)jQ4U8nD~FgBasPAK?kf^mWVDFweRFRuw6O7b>><< z#kZD>(SmV|{!cnXzb@bZ_JZrA$D$d5*>j(DcX4YhZ4u1p%4pqk|KbtO Date: Sun, 26 Jan 2025 16:48:53 -0500 Subject: [PATCH 3/8] Campfire Model Completed + Particles --- src/main/java/noppes/npcs/CommonProxy.java | 8 +- .../noppes/npcs/blocks/BlockCampfire.java | 6 +- .../npcs/blocks/tiles/TileCampfire.java | 53 ++++- .../java/noppes/npcs/client/ClientProxy.java | 15 +- .../npcs/client/fx/EntityBigSmokeFX.java | 218 ++++++++++++++++++ .../blocks/campfire/ModelCampfireCoals.java | 30 +++ .../blocks/campfire/ModelCampfireLog.java | 68 +++--- .../blocks/BlockCampfireRenderer.java | 10 + .../textures/models/CampfireCoals.png | Bin 0 -> 307 bytes .../textures/particle/big_smoke_0.png | Bin 0 -> 130 bytes .../textures/particle/big_smoke_1.png | Bin 0 -> 139 bytes .../textures/particle/big_smoke_10.png | Bin 0 -> 124 bytes .../textures/particle/big_smoke_11.png | Bin 0 -> 101 bytes .../textures/particle/big_smoke_2.png | Bin 0 -> 165 bytes .../textures/particle/big_smoke_3.png | Bin 0 -> 169 bytes .../textures/particle/big_smoke_4.png | Bin 0 -> 177 bytes .../textures/particle/big_smoke_5.png | Bin 0 -> 159 bytes .../textures/particle/big_smoke_6.png | Bin 0 -> 156 bytes .../textures/particle/big_smoke_7.png | Bin 0 -> 150 bytes .../textures/particle/big_smoke_8.png | Bin 0 -> 140 bytes .../textures/particle/big_smoke_9.png | Bin 0 -> 128 bytes 21 files changed, 368 insertions(+), 40 deletions(-) create mode 100644 src/main/java/noppes/npcs/client/fx/EntityBigSmokeFX.java create mode 100644 src/main/java/noppes/npcs/client/model/blocks/campfire/ModelCampfireCoals.java create mode 100644 src/main/resources/assets/customnpcs/textures/models/CampfireCoals.png create mode 100644 src/main/resources/assets/customnpcs/textures/particle/big_smoke_0.png create mode 100644 src/main/resources/assets/customnpcs/textures/particle/big_smoke_1.png create mode 100644 src/main/resources/assets/customnpcs/textures/particle/big_smoke_10.png create mode 100644 src/main/resources/assets/customnpcs/textures/particle/big_smoke_11.png create mode 100644 src/main/resources/assets/customnpcs/textures/particle/big_smoke_2.png create mode 100644 src/main/resources/assets/customnpcs/textures/particle/big_smoke_3.png create mode 100644 src/main/resources/assets/customnpcs/textures/particle/big_smoke_4.png create mode 100644 src/main/resources/assets/customnpcs/textures/particle/big_smoke_5.png create mode 100644 src/main/resources/assets/customnpcs/textures/particle/big_smoke_6.png create mode 100644 src/main/resources/assets/customnpcs/textures/particle/big_smoke_7.png create mode 100644 src/main/resources/assets/customnpcs/textures/particle/big_smoke_8.png create mode 100644 src/main/resources/assets/customnpcs/textures/particle/big_smoke_9.png diff --git a/src/main/java/noppes/npcs/CommonProxy.java b/src/main/java/noppes/npcs/CommonProxy.java index 067e2f1b3..a19cb1791 100644 --- a/src/main/java/noppes/npcs/CommonProxy.java +++ b/src/main/java/noppes/npcs/CommonProxy.java @@ -17,7 +17,7 @@ import noppes.npcs.containers.*; import noppes.npcs.controllers.data.PlayerData; import noppes.npcs.entity.EntityNPCInterface; -public class CommonProxy implements IGuiHandler { +public abstract class CommonProxy implements IGuiHandler { public boolean newVersionAvailable = false; public int revision = 1; @@ -159,11 +159,13 @@ public class CommonProxy implements IGuiHandler { } - public String getAchievementDesc(Achievement achievement) { + public abstract void generateBigSmokeParticles(World world, int x, int y, int z, boolean signalFire); + + public String getAchievementDesc(Achievement achievement) { return ""; } public boolean isGUIOpen(){ return false; } -} \ No newline at end of file +} diff --git a/src/main/java/noppes/npcs/blocks/BlockCampfire.java b/src/main/java/noppes/npcs/blocks/BlockCampfire.java index a00d5fc3e..1c3cd08db 100644 --- a/src/main/java/noppes/npcs/blocks/BlockCampfire.java +++ b/src/main/java/noppes/npcs/blocks/BlockCampfire.java @@ -19,6 +19,8 @@ import org.lwjgl.opengl.GL11; import java.util.Random; +import static noppes.npcs.client.ClientProxy.RAND; + public class BlockCampfire extends BlockLightable{ public BlockCampfire(boolean lit) { @@ -88,7 +90,9 @@ public class BlockCampfire extends BlockLightable{ CustomNpcs.proxy.spawnParticle("largesmoke", d0, d1, d2, 0.0D, 0.0D, 0.0D, 2); CustomNpcs.proxy.spawnParticle("flame", d0, d1, d2, 0.0D, 0.0D, 0.0D, 4); } - + else { + tile.updateEntity(); + } GL11.glPopMatrix(); } diff --git a/src/main/java/noppes/npcs/blocks/tiles/TileCampfire.java b/src/main/java/noppes/npcs/blocks/tiles/TileCampfire.java index 178bc5d3d..e0e50f6ba 100644 --- a/src/main/java/noppes/npcs/blocks/tiles/TileCampfire.java +++ b/src/main/java/noppes/npcs/blocks/tiles/TileCampfire.java @@ -1,7 +1,58 @@ package noppes.npcs.blocks.tiles; +import noppes.npcs.CustomNpcs; + +import java.util.Random; public class TileCampfire extends TileColorable { - + + public static final Random RAND = new Random(); + private boolean rainAndSky = false; + private boolean previousTickLit = false; + + @Override + public void updateEntity() + { + if (getWorldObj().isRemote) + { + if (isLit()) + { + if (!previousTickLit || distributedInterval(50L)) + rainAndSky = isBeingRainedOn(); + + addParticles(); + } + + previousTickLit = isLit(); + } + } + + public boolean distributedInterval(long interval) + { + if (hasWorldObj()) + return (getWorldObj().getTotalWorldTime() + (long) (xCoord + yCoord + zCoord)) % interval == 0L; + else + return false; + } + + protected void addParticles() + { + CustomNpcs.proxy.generateBigSmokeParticles(getWorldObj(), xCoord, yCoord, zCoord, false); + if (rainAndSky) + { + for (int i = 0; i < RAND.nextInt(3); ++i) + getWorldObj().spawnParticle("smoke", xCoord + RAND.nextDouble(), yCoord + 0.9, zCoord + RAND.nextDouble(), 0.0, 0.0, 0.0); + } + } + public boolean isBeingRainedOn() + { + return getWorldObj().isRaining() && getWorldObj().getPrecipitationHeight(xCoord, zCoord) <= yCoord + 1 + && getWorldObj().getBiomeGenForCoords(xCoord, zCoord).canSpawnLightningBolt(); + } + + public boolean isLit() + { + return this.getBlockMetadata() == 0; + } } diff --git a/src/main/java/noppes/npcs/client/ClientProxy.java b/src/main/java/noppes/npcs/client/ClientProxy.java index b13a75387..8b511254e 100644 --- a/src/main/java/noppes/npcs/client/ClientProxy.java +++ b/src/main/java/noppes/npcs/client/ClientProxy.java @@ -6,6 +6,7 @@ import cpw.mods.fml.client.registry.RenderingRegistry; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.ObfuscationReflectionHelper; import kamkeel.addon.client.DBCClient; +import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.model.ModelBiped; @@ -32,6 +33,7 @@ import noppes.npcs.*; import noppes.npcs.api.IWorld; import noppes.npcs.blocks.tiles.*; import noppes.npcs.client.controllers.*; +import noppes.npcs.client.fx.EntityBigSmokeFX; import noppes.npcs.client.fx.EntityElementalStaffFX; import noppes.npcs.client.fx.EntityEnderFX; import noppes.npcs.client.fx.EntityRainbowFX; @@ -76,7 +78,7 @@ import java.util.Random; public class ClientProxy extends CommonProxy { public static KeyBinding NPCButton; - + public static final Random RAND = new Random(); public static FontContainer Font; public void load() { @@ -541,6 +543,17 @@ public class ClientProxy extends CommonProxy { } } + @Override + public void generateBigSmokeParticles(World world, int x, int y, int z, boolean signalFire) + { + if (RAND.nextFloat() < 0.11F) + { + float[] colours = new float[0]; + for (int i = 0; i < RAND.nextInt(2) + 1; ++i) + Minecraft.getMinecraft().effectRenderer.addEffect(new EntityBigSmokeFX(world, x, y, z, signalFire, colours)); + } + } + @Override public String getAchievementDesc(Achievement achievement) { return achievement.getDescription(); diff --git a/src/main/java/noppes/npcs/client/fx/EntityBigSmokeFX.java b/src/main/java/noppes/npcs/client/fx/EntityBigSmokeFX.java new file mode 100644 index 000000000..c645c637e --- /dev/null +++ b/src/main/java/noppes/npcs/client/fx/EntityBigSmokeFX.java @@ -0,0 +1,218 @@ +package noppes.npcs.client.fx; + +import org.lwjgl.opengl.GL11; + +import cpw.mods.fml.common.eventhandler.Cancelable; +import cpw.mods.fml.relauncher.Side; +import net.minecraft.client.Minecraft; +import net.minecraft.client.particle.EntityFX; +import net.minecraft.client.renderer.ActiveRenderInfo; +import net.minecraft.client.renderer.OpenGlHelper; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.init.Blocks; +import net.minecraft.util.MathHelper; +import net.minecraft.util.ResourceLocation; +import net.minecraft.world.World; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.entity.EntityEvent.EntityConstructing; + +public class EntityBigSmokeFX extends EntityFX +{ + + /** there are 12 smoke textures. */ + public static final int TEXTURE_COUNT = 12; + public static final ResourceLocation[] TEXTURES = new ResourceLocation[TEXTURE_COUNT]; + static + { + for (int i = 0; i < TEXTURE_COUNT; i++) + TEXTURES[i] = new ResourceLocation("customnpcs" + ":" + "textures/particle/big_smoke_" + i + ".png"); + } + + protected final int texIndex; + protected boolean alphaFading = false; + protected float alphaFadePerTick = -0.015F; + protected boolean localizedCombustion = true; + protected boolean isColored = false; + + /** + * Posts a {@link EntityBigSmokeFXConstructingEvent}. + */ + public EntityBigSmokeFX(World world, int x, int y, int z, boolean signalFire, float[] colours) { + super(world, x, y, z); + + // Position: Centered above the spawn point with slight randomness + this.setPosition( + x + 0.5 + (rand.nextDouble() / 10.0 * (rand.nextBoolean() ? 1 : -1)), // Small horizontal offset + y + 0.1 + (rand.nextDouble() * 0.1), // Start slightly above y + z + 0.5 + (rand.nextDouble() / 10.0 * (rand.nextBoolean() ? 1 : -1)) + ); + + // Scale: Smoke size + this.particleScale = 4.0F * (rand.nextFloat() * 0.5F + 0.5F); // Smaller size + this.setSize(0.25F, 0.25F); + + // Gravity: Slows upward motion gradually + this.particleGravity = 0.005F; + + // Upward motion: Slow, with slight randomness + this.motionX = 0; // No horizontal motion + this.motionY = 0.02F + rand.nextFloat() * 0.01F; + this.motionZ = 0; // No horizontal motion + + this.particleMaxAge = rand.nextInt(50) + 100; // Shorter lifetime for normal smoke + this.particleAlpha = 0.8F; + + if (colours.length == 3) { + this.setRBGColorF(colours[0], colours[1], colours[2]); + } + + // Smoke appearance + this.texIndex = rand.nextInt(TEXTURE_COUNT); + this.isColored = this.particleRed != 1.0F || this.particleGreen != 1.0F || this.particleBlue != 1.0F; + } + + @Override + public void renderParticle(Tessellator tess, float partialTicks, float rotX, float rotXZ, float rotZ, float rotYZ, float rotXY) + { + rotX = ActiveRenderInfo.rotationX; + rotXZ = ActiveRenderInfo.rotationXZ; + rotZ = ActiveRenderInfo.rotationZ; + rotYZ = ActiveRenderInfo.rotationYZ; + rotXY = ActiveRenderInfo.rotationXY; + + EntityLivingBase view = Minecraft.getMinecraft().renderViewEntity; + double interpX = view.lastTickPosX + (view.posX - view.lastTickPosX) * partialTicks; + double interpY = view.lastTickPosY + (view.posY - view.lastTickPosY) * partialTicks; + double interpZ = view.lastTickPosZ + (view.posZ - view.lastTickPosZ) * partialTicks; + + float partialPosX = (float) (prevPosX + (posX - prevPosX) * partialTicks - interpX); + float partialPosY = (float) (prevPosY + (posY - prevPosY) * partialTicks - interpY); + float partialPosZ = (float) (prevPosZ + (posZ - prevPosZ) * partialTicks - interpZ); + + float scale = 0.1F * particleScale; + + double minU = this.particleTextureIndexX * 0.25; + double maxU = minU + 0.25; + double minV = this.particleTextureIndexY * 0.125; + double maxV = minV + 0.125; + + GL11.glEnable(GL11.GL_BLEND); + OpenGlHelper.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, GL11.GL_ONE, GL11.GL_ZERO); + GL11.glDepthMask(true); + GL11.glEnable(GL11.GL_ALPHA_TEST); + GL11.glAlphaFunc(GL11.GL_GREATER, 0.003921569F); + + Minecraft.getMinecraft().renderEngine.bindTexture(TEXTURES[this.texIndex % TEXTURES.length]); + + tess.startDrawingQuads(); + + tess.setColorRGBA_F(particleRed, particleGreen, particleBlue, particleAlpha); + tess.setBrightness(15 << 20 | 14 << 4); // slightly less than MiscUtil.MAX_LIGHT_BRIGHTNESS so that smoke doesn't glow super bright with shaders + + tess.addVertexWithUV(partialPosX - rotX * scale - rotYZ * scale, partialPosY - rotXZ * scale, partialPosZ - rotZ * scale - rotXY * scale, 1, 1); + tess.addVertexWithUV(partialPosX - rotX * scale + rotYZ * scale, partialPosY + rotXZ * scale, partialPosZ - rotZ * scale + rotXY * scale, 1, 0); + tess.addVertexWithUV(partialPosX + rotX * scale + rotYZ * scale, partialPosY + rotXZ * scale, partialPosZ + rotZ * scale + rotXY * scale, 0, 0); + tess.addVertexWithUV(partialPosX + rotX * scale - rotYZ * scale, partialPosY - rotXZ * scale, partialPosZ + rotZ * scale - rotXY * scale, 0, 1); + + tess.draw(); + GL11.glDisable(GL11.GL_BLEND); + GL11.glDepthMask(false); + GL11.glAlphaFunc(GL11.GL_GREATER, 0.1F); + } + + @Override + public int getFXLayer() + { + return 3; + } + + @Override + public void onUpdate() { + this.prevPosX = this.posX; + this.prevPosY = this.posY; + this.prevPosZ = this.posZ; + + // Age-based behavior: Fade out near the end of lifetime + if (this.particleAge++ >= this.particleMaxAge - 40) { + this.alphaFading = true; + } + + if (this.particleAge < this.particleMaxAge && this.particleAlpha > 0.0F) { + // Minimal horizontal drift for slight randomness + float horizontalMotionScale = 0.001F; // Very small horizontal movement + this.motionX += this.rand.nextFloat() * horizontalMotionScale * (this.rand.nextBoolean() ? 1 : -1); + this.motionZ += this.rand.nextFloat() * horizontalMotionScale * (this.rand.nextBoolean() ? 1 : -1); + + // Move the particle + this.moveEntity(this.motionX, this.motionY, this.motionZ); + + // Fade out alpha if needed + if (this.alphaFading) { + this.particleAlpha = MathHelper.clamp_float(this.particleAlpha + this.alphaFadePerTick, 0.0F, 1.0F); + } + } else { + // Kill the particle if it has faded out or reached max age + this.setDead(); + } + } + + + + /** + * Allows you to change various aspects of campfire smoke particles:
+ * - {@link #particleRed}, {@link #particleGreen}, and {@link #particleBlue} are the float r, g, b values of the smoke.
+ * - {@link #motionX}, {@link #motionY}, and {@link #motionZ} are the x, y, z motion of the smoke.
+ * - {@link #particleGravity} is the amount the smoke's y motion changes per tick.
+ * - {@link #particleAlpha} is the smoke's initial alpha.
+ * - {@link #alphaFading} is whether the smoke's alpha should currently be changing (fading in or out).
+ * - {@link #alphaFadePerTick} is the amount the smoke's alpha changes per tick if {@link #alphaFading} is true. Negative values make it fade out, positive values make it fade + * back in.
+ * - {@link #particleMaxAge} is the maximum number of ticks the particle will live for.
+ *
+ * You're also given {@link #campfirePosition}, which is the x, y, z position of the campfire tile entity where the smoke was created.
+ *
+ * Also, {@link EntityBigSmokeFX} are only created on the client side, so you should mark your subscribe event with {@link Side#CLIENT}.
+ *
+ * This event is posted from {@link EntityBigSmokeFX#EntityBigSmokeFX} on the {@link MinecraftForge#EVENT_BUS}.
+ * This event is {@link Cancelable}. If canceled, the entity will be removed.
+ */ + @Cancelable + public static class EntityBigSmokeFXConstructingEvent extends EntityConstructing + { + public final int[] campfirePosition; + + public float particleRed; + public float particleGreen; + public float particleBlue; + public double motionX; + public double motionY; + public double motionZ; + public float particleGravity; + public float particleAlpha; + public boolean alphaFading; + public float alphaFadePerTick; + public int particleMaxAge; + + public EntityBigSmokeFXConstructingEvent(EntityBigSmokeFX entity, int x, int y, int z) + { + super(entity); + + campfirePosition = new int[] { x, y, z }; + + particleRed = entity.particleRed; + particleGreen = entity.particleGreen; + particleBlue = entity.particleBlue; + motionX = entity.motionX; + motionY = entity.motionY; + motionZ = entity.motionZ; + particleGravity = entity.particleGravity; + particleAlpha = entity.particleAlpha; + alphaFading = entity.alphaFading; + alphaFadePerTick = entity.alphaFadePerTick; + particleMaxAge = entity.particleMaxAge; + } + + } + +} diff --git a/src/main/java/noppes/npcs/client/model/blocks/campfire/ModelCampfireCoals.java b/src/main/java/noppes/npcs/client/model/blocks/campfire/ModelCampfireCoals.java new file mode 100644 index 000000000..9f10ef8c9 --- /dev/null +++ b/src/main/java/noppes/npcs/client/model/blocks/campfire/ModelCampfireCoals.java @@ -0,0 +1,30 @@ +package noppes.npcs.client.model.blocks.campfire; + +import net.minecraft.client.model.ModelBase; +import net.minecraft.client.model.ModelBox; +import net.minecraft.client.model.ModelRenderer; +import net.minecraft.entity.Entity; + +public class ModelCampfireCoals extends ModelBase { + private final ModelRenderer bb_main; + + public ModelCampfireCoals() { + textureWidth = 64; + textureHeight = 64; + + bb_main = new ModelRenderer(this); + bb_main.setRotationPoint(0.0F, 24.0F, 0.0F); + bb_main.cubeList.add(new ModelBox(bb_main, -10, 0, -5.0F, -0.02F, -5.0F, 10, 0, 10, 0.0F)); + } + + @Override + public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { + bb_main.render(f5); + } + + public void setRotationAngle(ModelRenderer modelRenderer, float x, float y, float z) { + modelRenderer.rotateAngleX = x; + modelRenderer.rotateAngleY = y; + modelRenderer.rotateAngleZ = z; + } +} diff --git a/src/main/java/noppes/npcs/client/model/blocks/campfire/ModelCampfireLog.java b/src/main/java/noppes/npcs/client/model/blocks/campfire/ModelCampfireLog.java index 20acf6bfc..414fff49b 100644 --- a/src/main/java/noppes/npcs/client/model/blocks/campfire/ModelCampfireLog.java +++ b/src/main/java/noppes/npcs/client/model/blocks/campfire/ModelCampfireLog.java @@ -6,46 +6,46 @@ import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; public class ModelCampfireLog extends ModelBase { - private final ModelRenderer bb_main; - private final ModelRenderer cube_r1; - private final ModelRenderer cube_r2; - private final ModelRenderer cube_r3; + private final ModelRenderer bb_main; + private final ModelRenderer cube_r1; + private final ModelRenderer cube_r2; + private final ModelRenderer cube_r3; - public ModelCampfireLog() { - textureWidth = 16; - textureHeight = 16; + public ModelCampfireLog() { + textureWidth = 16; + textureHeight = 16; - bb_main = new ModelRenderer(this); - bb_main.setRotationPoint(0.0F, 24.0F, 0.0F); + bb_main = new ModelRenderer(this); + bb_main.setRotationPoint(0.0F, 24.0F, 0.0F); - cube_r1 = new ModelRenderer(this); - cube_r1.setRotationPoint(1.25F, -6.3F, 1.25F); - bb_main.addChild(cube_r1); - setRotationAngle(cube_r1, 0.5449F, -1.0854F, -0.744F); - cube_r1.cubeList.add(new ModelBox(cube_r1, 0, 0, -1.0F, -4.0F, -1.0F, 3, 10, 3, 0.0F)); + cube_r1 = new ModelRenderer(this); + cube_r1.setRotationPoint(1.25F, -6.3F, 1.25F); + bb_main.addChild(cube_r1); + setRotationAngle(cube_r1, 0.5449F, -1.0854F, -0.744F); + cube_r1.cubeList.add(new ModelBox(cube_r1, 0, 0, -1.0F, -2.0F, -1.0F, 3, 8, 3, 0.0F)); - cube_r2 = new ModelRenderer(this); - cube_r2.setRotationPoint(-1.5F, -6.0F, -0.25F); - bb_main.addChild(cube_r2); - setRotationAngle(cube_r2, 0.0F, 0.0F, 0.3927F); - cube_r2.cubeList.add(new ModelBox(cube_r2, 0, 0, -2.0F, -4.0F, -1.0F, 3, 10, 3, 0.0F)); + cube_r2 = new ModelRenderer(this); + cube_r2.setRotationPoint(-1.5F, -6.0F, -0.25F); + bb_main.addChild(cube_r2); + setRotationAngle(cube_r2, 0.0F, 0.0F, 0.3927F); + cube_r2.cubeList.add(new ModelBox(cube_r2, 0, 0, -2.0F, -2.0F, -1.0F, 3, 8, 3, 0.0F)); - cube_r3 = new ModelRenderer(this); - cube_r3.setRotationPoint(1.5F, -6.0F, -2.25F); - bb_main.addChild(cube_r3); - setRotationAngle(cube_r3, -0.3295F, 0.7268F, -0.4754F); - cube_r3.cubeList.add(new ModelBox(cube_r3, 0, 0, -2.0F, -4.5F, -1.0F, 3, 10, 3, 0.0F)); - } + cube_r3 = new ModelRenderer(this); + cube_r3.setRotationPoint(1.5F, -6.0F, -2.25F); + bb_main.addChild(cube_r3); + setRotationAngle(cube_r3, -0.3295F, 0.7268F, -0.4754F); + cube_r3.cubeList.add(new ModelBox(cube_r3, 0, 0, -2.0F, -2.5F, -1.0F, 3, 8, 3, 0.0F)); + } - @Override - public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { - bb_main.render(f5); - } + @Override + public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { + bb_main.render(f5); + } - public void setRotationAngle(ModelRenderer modelRenderer, float x, float y, float z) { - modelRenderer.rotateAngleX = x; - modelRenderer.rotateAngleY = y; - modelRenderer.rotateAngleZ = z; - } + public void setRotationAngle(ModelRenderer modelRenderer, float x, float y, float z) { + modelRenderer.rotateAngleX = x; + modelRenderer.rotateAngleY = y; + modelRenderer.rotateAngleZ = z; + } } diff --git a/src/main/java/noppes/npcs/client/renderer/blocks/BlockCampfireRenderer.java b/src/main/java/noppes/npcs/client/renderer/blocks/BlockCampfireRenderer.java index 5e51f1d49..9b98638d1 100644 --- a/src/main/java/noppes/npcs/client/renderer/blocks/BlockCampfireRenderer.java +++ b/src/main/java/noppes/npcs/client/renderer/blocks/BlockCampfireRenderer.java @@ -5,11 +5,13 @@ import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.ResourceLocation; 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.ModelCampfireCoals; import noppes.npcs.client.model.blocks.campfire.ModelCampfireFlame; import noppes.npcs.client.model.blocks.campfire.ModelCampfireLog; import noppes.npcs.client.model.blocks.campfire.ModelCampfireStone; @@ -26,7 +28,9 @@ public class BlockCampfireRenderer extends BlockRendererInterface{ private final ModelCampfireFlame flameModel = new ModelCampfireFlame(); private final ModelCampfireLog logsModel = new ModelCampfireLog(); private final ModelCampfireStone stonesModel = new ModelCampfireStone(); + private final ModelCampfireCoals coalsModel = new ModelCampfireCoals(); + protected static final ResourceLocation coalsTexture = new ResourceLocation("customnpcs","textures/models/CampfireCoals.png"); public BlockCampfireRenderer(){ ((BlockRotated)CustomItems.campfire).renderId = RenderingRegistry.getNextAvailableRenderId(); @@ -60,9 +64,15 @@ public class BlockCampfireRenderer extends BlockRendererInterface{ Minecraft.getMinecraft().getTextureManager().bindTexture(Cobble); stonesModel.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); if(block == CustomItems.campfire){ + GL11.glDisable(GL11.GL_LIGHTING); + GL11.glEnable(GL11.GL_ALPHA_TEST); Minecraft.getMinecraft().getTextureManager().bindTexture(Flame); flameModel.render(null, tile.getWorldObj().getWorldTime(), 0, 0, 0, 0.0F, 0.0625F); + GL11.glDisable(GL11.GL_ALPHA_TEST); + GL11.glEnable(GL11.GL_LIGHTING); } + Minecraft.getMinecraft().getTextureManager().bindTexture(coalsTexture); + coalsModel.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); } GL11.glPopMatrix(); diff --git a/src/main/resources/assets/customnpcs/textures/models/CampfireCoals.png b/src/main/resources/assets/customnpcs/textures/models/CampfireCoals.png new file mode 100644 index 0000000000000000000000000000000000000000..f2732b51bfa56f067979fdc2c5e0078554a64906 GIT binary patch literal 307 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`212l#}zN=nOVn>bs#$Au=91I1V;8i#?Xk|4j}|3JX-dmCRcP=K?*BeIx* zf$uN~Gak=hkpdK)`Wm^v{6+8bv zjlX2=qtc7#jy=6&E41#|-O%h%({KCI7=+BijDk5E53gYjnzeK7fdhqB&HG|cf4bRd zRo>rnp6Sg!&pU@L%KKBe&ptSHKAdOD!lvI6;*o-U3d z7N?UFBv`kwo2Ih!lvI6-|o-U3d z7N?UFBv`jFex2(2f1;u5EKeg1edC|@cFY`7O*ssDhaDcV@H!ql(RT1i$0x3vvo>EA l`v16y*K=cI&IJQ@2D9`^)i0CZmH!lvI6!lvI6-so-U3d x7XHZz60C=1uY^wf!lvI6-ro-U3d z7N?UFB=#-Xxa)~MPw34hfP7c>2%tjSr>T^KGT|XiP?2lJ0AnXfxG+Ju08!X1!xb0 Mr>mdKI;Vst06nKSHvj+t literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/customnpcs/textures/particle/big_smoke_3.png b/src/main/resources/assets/customnpcs/textures/particle/big_smoke_3.png new file mode 100644 index 0000000000000000000000000000000000000000..4a5f8224dd4b5ad07ee1b76616d287cb11e98b7e GIT binary patch literal 169 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6-Do-U3d z7QJ`-47m;{@G$(%RbLo8C+63uX&mf|GcXLY z?7333{kVGkx)Xlp3Q8MJtUO%A#~h`mvBQW_)=7aW@4&xB?i#l{_R3q?Pq}z``&Q25 RT|m1SJYD@<);T3K0RZ;bJ5~Sy literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/customnpcs/textures/particle/big_smoke_4.png b/src/main/resources/assets/customnpcs/textures/particle/big_smoke_4.png new file mode 100644 index 0000000000000000000000000000000000000000..17c35e5a746b0a182cde4f176372175b31359a78 GIT binary patch literal 177 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6-To-U3d z7N?UFB(5yjxacP*=o@LIu0VIE~^w@qm!&L_+o7L;>j9(vt7>5tALlfzdMO&M;o z<>bsr6X?Clkiz<+?ZA^niPelJ;u?2yv|Kbz21<+WFxcd3!MH1FQO>bcfj~1p3kHS{ Xv5W^TCus5l?PTzD^>bP0l+XkKBab>7 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/customnpcs/textures/particle/big_smoke_5.png b/src/main/resources/assets/customnpcs/textures/particle/big_smoke_5.png new file mode 100644 index 0000000000000000000000000000000000000000..3dbb32af4ad4684ef8307bd76ae81d4d92376a33 GIT binary patch literal 159 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;Go-U3d z7N?UFB=#-XyYZF1mDgXaQmH*=nRod=sIE=Y4?!lvI6mTLT!lvI6mP%f0W`OQ=OACzoA^&jQ?8$4QB9k^>bP0l+XkKMw~1| literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/customnpcs/textures/particle/big_smoke_8.png b/src/main/resources/assets/customnpcs/textures/particle/big_smoke_8.png new file mode 100644 index 0000000000000000000000000000000000000000..a704e860a2aae8f54829ab40b8c3a662c1bd634f GIT binary patch literal 140 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6pEx6>xA&^*|B1XSboKxFZ(93;t?>p6FT>52JnJ*8F1wkQNk|H( mTKgDp@}BT>@yRYX28N)mk<~vgpWg;Fj=|H_&t;ucLK6UTn=Ntx literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/customnpcs/textures/particle/big_smoke_9.png b/src/main/resources/assets/customnpcs/textures/particle/big_smoke_9.png new file mode 100644 index 0000000000000000000000000000000000000000..4dd14f324a9be157d5291fac738d8f7191bc9bf1 GIT binary patch literal 128 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6<$o-U3d z7N?UFBv_jzu7pne^Zs=P%j0*`cKuJuZrkW-#?azuc9=);wCIT$DrdJoJ^Fv*%Rq-@ a28L_gCXzQ Date: Sun, 26 Jan 2025 17:39:04 -0500 Subject: [PATCH 4/8] Legacy Chair Config --- .../model/blocks/legacy/ModelLegacyChair.java | 126 ++++++++++++++++++ .../renderer/blocks/BlockChairRenderer.java | 14 +- 2 files changed, 137 insertions(+), 3 deletions(-) create mode 100644 src/main/java/noppes/npcs/client/model/blocks/legacy/ModelLegacyChair.java diff --git a/src/main/java/noppes/npcs/client/model/blocks/legacy/ModelLegacyChair.java b/src/main/java/noppes/npcs/client/model/blocks/legacy/ModelLegacyChair.java new file mode 100644 index 000000000..4b6cfcfe4 --- /dev/null +++ b/src/main/java/noppes/npcs/client/model/blocks/legacy/ModelLegacyChair.java @@ -0,0 +1,126 @@ +package noppes.npcs.client.model.blocks.legacy; + +import net.minecraft.client.model.ModelBase; +import net.minecraft.client.model.ModelRenderer; +import net.minecraft.entity.Entity; + +public class ModelLegacyChair extends ModelBase +{ + //fields + ModelRenderer Leg1; + ModelRenderer Leg2; + ModelRenderer Leg3; + ModelRenderer Leg4; + ModelRenderer Shape1; + ModelRenderer Shape2; + ModelRenderer Shape3; + ModelRenderer Shape4; + ModelRenderer Shape5; + ModelRenderer Shape6; + ModelRenderer Shape7; + ModelRenderer Shape8; + ModelRenderer Shape9; + ModelRenderer Shape10; + ModelRenderer Shape11; + + public ModelLegacyChair() + { + Leg1 = new ModelRenderer(this, 0, 0); + Leg1.mirror = true; + Leg1.addBox(0F, 0F, 0F, 1, 18, 1); + Leg1.setRotationPoint(4.01F, 6F, 5.01F); + + Leg2 = new ModelRenderer(this, 0, 0); + Leg2.mirror = true; + Leg2.addBox(0F, 0F, 0F, 1, 9, 1); + Leg2.setRotationPoint(4.01F, 15.5F, -5.01F); + + Leg3 = new ModelRenderer(this, 0, 0); + Leg3.addBox(0F, 0F, 0F, 1, 18, 1); + Leg3.setRotationPoint(-5.01F, 6F, 5.01F); + + Leg4 = new ModelRenderer(this, 0, 0); + Leg4.addBox(0F, 0F, 0F, 1, 9, 1); + Leg4.setRotationPoint(-5.01F, 15.5F, -5.01F); + + Shape1 = new ModelRenderer(this, 8, 2); + Shape1.addBox(0F, 0F, 0F, 10, 1, 11); + Shape1.setRotationPoint(-5F, 16F, -5F); + + Shape2 = new ModelRenderer(this, 4, 4); + Shape2.addBox(0F, 0F, 0F, 3, 2, 1); + Shape2.setRotationPoint(-1.5F, 6.51F, 5.5F); + + Shape3 = new ModelRenderer(this, 4, 4); + Shape3.mirror = true; + Shape3.addBox(-3F, 0F, 0F, 3, 2, 1); + Shape3.setRotationPoint(4F, 6.5F, 5F); + setRotation(Shape3, 0F, 0.2094395F, 0F); + + Shape4 = new ModelRenderer(this, 4, 4); + Shape4.addBox(0F, 0F, 0F, 3, 2, 1); + Shape4.setRotationPoint(-4F, 6.5F, 5F); + setRotation(Shape4, 0F, -0.2094395F, 0F); + + Shape5 = new ModelRenderer(this, 46, 0); + Shape5.addBox(0F, 0F, 0F, 9, 1, 1); + Shape5.setRotationPoint(-4F, 19F, 5F); + + Shape6 = new ModelRenderer(this, 46, 0); + Shape6.addBox(0F, 0F, 0F, 8, 1, 1); + Shape6.setRotationPoint(-4F, 19F, -5F); + + Shape7 = new ModelRenderer(this, 11, 13); + Shape7.addBox(0F, 0F, 0F, 1, 1, 9); + Shape7.setRotationPoint(-5F, 20F, -4F); + + Shape8 = new ModelRenderer(this, 11, 13); + Shape8.mirror = true; + Shape8.addBox(0F, 0F, 0F, 1, 1, 9); + Shape8.setRotationPoint(4F, 20F, -4F); + + Shape9 = new ModelRenderer(this, 0, 0); + Shape9.mirror = true; + Shape9.addBox(0F, 0F, 0F, 1, 8, 1); + Shape9.setRotationPoint(2F, 8F, 5.5F); + setRotation(Shape9, -0.0523599F, 0F, 0F); + + Shape10 = new ModelRenderer(this, 0, 0); + Shape10.addBox(0F, 0F, 0F, 1, 8, 1); + Shape10.setRotationPoint(-3F, 8F, 5.5F); + setRotation(Shape10, -0.0523599F, 0F, 0F); + + Shape11 = new ModelRenderer(this, 0, 0); + Shape11.addBox(0F, 0F, 0F, 1, 8, 1); + Shape11.setRotationPoint(-0.5F, 8F, 5.6F); + setRotation(Shape11, -0.0698132F, 0F, 0F); + } + + public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) + { + super.render(entity, f, f1, f2, f3, f4, f5); + Leg1.render(f5); + Leg2.render(f5); + Leg3.render(f5); + Leg4.render(f5); + Shape1.render(f5); + Shape2.render(f5); + Shape3.render(f5); + Shape4.render(f5); + Shape5.render(f5); + Shape6.render(f5); + Shape7.render(f5); + Shape8.render(f5); + Shape9.render(f5); + Shape10.render(f5); + Shape11.render(f5); + } + + private void setRotation(ModelRenderer model, float x, float y, float z) + { + model.rotateAngleX = x; + model.rotateAngleY = y; + model.rotateAngleZ = z; + } + +} diff --git a/src/main/java/noppes/npcs/client/renderer/blocks/BlockChairRenderer.java b/src/main/java/noppes/npcs/client/renderer/blocks/BlockChairRenderer.java index 9557d2229..d5a04a32c 100644 --- a/src/main/java/noppes/npcs/client/renderer/blocks/BlockChairRenderer.java +++ b/src/main/java/noppes/npcs/client/renderer/blocks/BlockChairRenderer.java @@ -8,11 +8,14 @@ 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.legacy.ModelLegacyChair; +import noppes.npcs.config.ConfigClient; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; public class BlockChairRenderer extends BlockRendererInterface{ + private final ModelLegacyChair legacyModel = new ModelLegacyChair(); private final ModelChair model = new ModelChair(); public BlockChairRenderer(){ @@ -32,7 +35,10 @@ public class BlockChairRenderer extends BlockRendererInterface{ GL11.glColor3f(1, 1, 1); setWoodTexture(var1.getBlockMetadata()); - model.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); + 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); GL11.glPopMatrix(); } @@ -48,8 +54,10 @@ public class BlockChairRenderer extends BlockRendererInterface{ setWoodTexture(metadata); GL11.glColor3f(1, 1, 1); - model.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); - + 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); GL11.glPopMatrix(); } From 2f5d5f84c2183b40d41a9cb01f01095a51002f57 Mon Sep 17 00:00:00 2001 From: Kam Date: Sun, 26 Jan 2025 17:55:25 -0500 Subject: [PATCH 5/8] Modern Stool --- .../npcs/client/model/blocks/ModelStool.java | 91 +++++------------- .../model/blocks/legacy/ModelLegacyStool.java | 83 ++++++++++++++++ .../renderer/blocks/BlockStoolRenderer.java | 53 ++++++++-- .../java/noppes/npcs/config/ConfigClient.java | 2 + .../npcs/controllers/data/RecipesDefault.java | 54 +++++------ .../customnpcs/textures/models/stool/oak.png | Bin 0 -> 607 bytes 6 files changed, 180 insertions(+), 103 deletions(-) create mode 100644 src/main/java/noppes/npcs/client/model/blocks/legacy/ModelLegacyStool.java create mode 100644 src/main/resources/assets/customnpcs/textures/models/stool/oak.png diff --git a/src/main/java/noppes/npcs/client/model/blocks/ModelStool.java b/src/main/java/noppes/npcs/client/model/blocks/ModelStool.java index 1da08f6e6..2cf65f015 100644 --- a/src/main/java/noppes/npcs/client/model/blocks/ModelStool.java +++ b/src/main/java/noppes/npcs/client/model/blocks/ModelStool.java @@ -1,83 +1,38 @@ package noppes.npcs.client.model.blocks; import net.minecraft.client.model.ModelBase; +import net.minecraft.client.model.ModelBox; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; public class ModelStool extends ModelBase { - ModelRenderer Base; - ModelRenderer Leg1; - ModelRenderer Leg2; - ModelRenderer Leg3; - ModelRenderer Leg4; - ModelRenderer Shape1; - ModelRenderer Shape2; - ModelRenderer Shape3; - ModelRenderer Shape4; + private final ModelRenderer stool; public ModelStool() { - Base = new ModelRenderer(this, 9, 3); - Base.addBox(-5F, 0F, -5F, 10, 1, 10); - Base.setRotationPoint(0F, 16F, 0F); - - Leg1 = new ModelRenderer(this, 0, 12); - Leg1.addBox(-1F, 0F, 0F, 2, 8, 1); - Leg1.setRotationPoint(2F, 17F, 2F); - setRotation(Leg1, 0.3316126F, 0.7853982F, 0F); - - Leg2 = new ModelRenderer(this, 0, 12); - Leg2.addBox(-1F, 0F, 0F, 2, 8, 1); - Leg2.setRotationPoint(2F, 17F, -2F); - setRotation(Leg2, 0.3316126F, 2.356194F, -0.0081449F); - - Leg3 = new ModelRenderer(this, 0, 12); - Leg3.addBox(-1F, 0F, 0F, 2, 8, 1); - Leg3.setRotationPoint(-2F, 17F, 2F); - setRotation(Leg3, 0.3316126F, -0.7853982F, 0F); - - Leg4 = new ModelRenderer(this, 0, 12); - Leg4.addBox(-1F, 0F, 0F, 2, 8, 1); - Leg4.setRotationPoint(-2F, 17F, -2F); - setRotation(Leg4, 0.3316126F, -2.356194F, 0F); - - Shape1 = new ModelRenderer(this, 0, 11); - Shape1.addBox(-3F, 0F, 0F, 6, 1, 1); - Shape1.setRotationPoint(2.4F, 19F, 0F); - setRotation(Shape1, 0F, 1.570796F, 0F); - - Shape2 = new ModelRenderer(this, 0, 11); - Shape2.addBox(-3F, 0F, 0F, 6, 1, 1); - Shape2.setRotationPoint(0F, 19F, 2.4F); - - Shape3 = new ModelRenderer(this, 0, 11); - Shape3.addBox(-3F, 0F, 0F, 6, 1, 1); - Shape3.setRotationPoint(0F, 19F, -3.4F); - - Shape4 = new ModelRenderer(this, 0, 11); - Shape4.addBox(-3F, 0F, 0F, 6, 1, 1); - Shape4.setRotationPoint(-3.4F, 19F, 0F); - setRotation(Shape4, 0F, 1.570796F, 0F); + textureWidth = 64; + textureHeight = 64; + + stool = new ModelRenderer(this); + stool.setRotationPoint(0.0F, 24.0F, 0.0F); + stool.cubeList.add(new ModelBox(stool, 0, 0, -5.0F, -9.0F, -5.0F, 10, 2, 10, 0.0F)); + stool.cubeList.add(new ModelBox(stool, 0, 12, 2.0F, -7.0F, -4.0F, 2, 7, 2, 0.0F)); + stool.cubeList.add(new ModelBox(stool, 8, 8, 3.0F, -5.0F, -2.0F, 0, 2, 4, 0.0F)); + stool.cubeList.add(new ModelBox(stool, 8, 12, -2.0F, -5.0F, -3.0F, 4, 2, 0, 0.0F)); + stool.cubeList.add(new ModelBox(stool, 0, 12, -4.0F, -7.0F, -4.0F, 2, 7, 2, 0.0F)); + stool.cubeList.add(new ModelBox(stool, 0, 12, -4.0F, -7.0F, 2.0F, 2, 7, 2, 0.0F)); + stool.cubeList.add(new ModelBox(stool, 8, 8, -3.0F, -5.0F, -2.0F, 0, 2, 4, 0.0F)); + stool.cubeList.add(new ModelBox(stool, 0, 12, 2.0F, -7.0F, 2.0F, 2, 7, 2, 0.0F)); + stool.cubeList.add(new ModelBox(stool, 8, 12, -2.0F, -5.0F, 3.0F, 4, 2, 0, 0.0F)); } - public void render(Entity entity, float f, float f1, float f2, float f3, - float f4, float f5) { - super.render(entity, f, f1, f2, f3, f4, f5); - Base.render(f5); - Leg1.render(f5); - Leg2.render(f5); - Leg3.render(f5); - Leg4.render(f5); - Shape1.render(f5); - Shape2.render(f5); - Shape3.render(f5); - Shape4.render(f5); + @Override + public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { + stool.render(f5); } - private void setRotation(ModelRenderer model, float x, float y, float z) { - model.rotateAngleX = x; - model.rotateAngleY = y; - model.rotateAngleZ = z; + public void setRotationAngle(ModelRenderer modelRenderer, float x, float y, float z) { + modelRenderer.rotateAngleX = x; + modelRenderer.rotateAngleY = y; + modelRenderer.rotateAngleZ = z; } - - } diff --git a/src/main/java/noppes/npcs/client/model/blocks/legacy/ModelLegacyStool.java b/src/main/java/noppes/npcs/client/model/blocks/legacy/ModelLegacyStool.java new file mode 100644 index 000000000..0c964f5ec --- /dev/null +++ b/src/main/java/noppes/npcs/client/model/blocks/legacy/ModelLegacyStool.java @@ -0,0 +1,83 @@ +package noppes.npcs.client.model.blocks.legacy; + +import net.minecraft.client.model.ModelBase; +import net.minecraft.client.model.ModelRenderer; +import net.minecraft.entity.Entity; + +public class ModelLegacyStool extends ModelBase { + ModelRenderer Base; + ModelRenderer Leg1; + ModelRenderer Leg2; + ModelRenderer Leg3; + ModelRenderer Leg4; + ModelRenderer Shape1; + ModelRenderer Shape2; + ModelRenderer Shape3; + ModelRenderer Shape4; + + public ModelLegacyStool() { + Base = new ModelRenderer(this, 9, 3); + Base.addBox(-5F, 0F, -5F, 10, 1, 10); + Base.setRotationPoint(0F, 16F, 0F); + + Leg1 = new ModelRenderer(this, 0, 12); + Leg1.addBox(-1F, 0F, 0F, 2, 8, 1); + Leg1.setRotationPoint(2F, 17F, 2F); + setRotation(Leg1, 0.3316126F, 0.7853982F, 0F); + + Leg2 = new ModelRenderer(this, 0, 12); + Leg2.addBox(-1F, 0F, 0F, 2, 8, 1); + Leg2.setRotationPoint(2F, 17F, -2F); + setRotation(Leg2, 0.3316126F, 2.356194F, -0.0081449F); + + Leg3 = new ModelRenderer(this, 0, 12); + Leg3.addBox(-1F, 0F, 0F, 2, 8, 1); + Leg3.setRotationPoint(-2F, 17F, 2F); + setRotation(Leg3, 0.3316126F, -0.7853982F, 0F); + + Leg4 = new ModelRenderer(this, 0, 12); + Leg4.addBox(-1F, 0F, 0F, 2, 8, 1); + Leg4.setRotationPoint(-2F, 17F, -2F); + setRotation(Leg4, 0.3316126F, -2.356194F, 0F); + + Shape1 = new ModelRenderer(this, 0, 11); + Shape1.addBox(-3F, 0F, 0F, 6, 1, 1); + Shape1.setRotationPoint(2.4F, 19F, 0F); + setRotation(Shape1, 0F, 1.570796F, 0F); + + Shape2 = new ModelRenderer(this, 0, 11); + Shape2.addBox(-3F, 0F, 0F, 6, 1, 1); + Shape2.setRotationPoint(0F, 19F, 2.4F); + + Shape3 = new ModelRenderer(this, 0, 11); + Shape3.addBox(-3F, 0F, 0F, 6, 1, 1); + Shape3.setRotationPoint(0F, 19F, -3.4F); + + Shape4 = new ModelRenderer(this, 0, 11); + Shape4.addBox(-3F, 0F, 0F, 6, 1, 1); + Shape4.setRotationPoint(-3.4F, 19F, 0F); + setRotation(Shape4, 0F, 1.570796F, 0F); + } + + public void render(Entity entity, float f, float f1, float f2, float f3, + float f4, float f5) { + super.render(entity, f, f1, f2, f3, f4, f5); + Base.render(f5); + Leg1.render(f5); + Leg2.render(f5); + Leg3.render(f5); + Leg4.render(f5); + Shape1.render(f5); + Shape2.render(f5); + Shape3.render(f5); + Shape4.render(f5); + } + + private void setRotation(ModelRenderer model, float x, float y, float z) { + model.rotateAngleX = x; + model.rotateAngleY = y; + model.rotateAngleZ = z; + } + + +} diff --git a/src/main/java/noppes/npcs/client/renderer/blocks/BlockStoolRenderer.java b/src/main/java/noppes/npcs/client/renderer/blocks/BlockStoolRenderer.java index 42f72ad0a..cecdfce85 100644 --- a/src/main/java/noppes/npcs/client/renderer/blocks/BlockStoolRenderer.java +++ b/src/main/java/noppes/npcs/client/renderer/blocks/BlockStoolRenderer.java @@ -2,19 +2,27 @@ 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.BlockStool; import noppes.npcs.blocks.tiles.TileColorable; import noppes.npcs.client.model.blocks.ModelStool; +import noppes.npcs.client.model.blocks.legacy.ModelLegacyStool; +import noppes.npcs.config.ConfigClient; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; public class BlockStoolRenderer extends BlockRendererInterface{ - private final ModelStool model = new ModelStool(); - + 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"); + public BlockStoolRenderer(){ ((BlockStool)CustomItems.stool).renderId = RenderingRegistry.getNextAvailableRenderId(); RenderingRegistry.registerBlockHandler(this); @@ -29,9 +37,15 @@ public class BlockStoolRenderer extends BlockRendererInterface{ GL11.glScalef(1.2f, 1.1f, 1.2f); GL11.glRotatef(180, 0, 0, 1); GL11.glColor3f(1, 1, 1); - setWoodTexture(var1.getBlockMetadata()); - model.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); + if(ConfigClient.LegacyStool){ + setWoodTexture(var1.getBlockMetadata()); + legacyStool.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); + } + else { + setStoolTexture(var1.getBlockMetadata()); + stool.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); + } GL11.glPopMatrix(); } @@ -44,13 +58,36 @@ public class BlockStoolRenderer extends BlockRendererInterface{ GL11.glRotatef(180, 0, 0, 1); GL11.glRotatef(180, 0, 1, 0); - setWoodTexture(metadata); - GL11.glColor3f(1, 1, 1); - model.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); - + if(ConfigClient.LegacyStool){ + setWoodTexture(metadata); + GL11.glColor3f(1, 1, 1); + legacyStool.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); + } + else { + setStoolTexture(metadata); + GL11.glColor3f(1, 1, 1); + stool.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); + } + GL11.glPopMatrix(); } + public void setStoolTexture(int meta){ + TextureManager manager = Minecraft.getMinecraft().getTextureManager(); + if(meta == 1) + manager.bindTexture(oak); + else if(meta == 2) + manager.bindTexture(oak); + else if(meta == 3) + manager.bindTexture(oak); + else if(meta == 4) + manager.bindTexture(oak); + else if(meta == 5) + manager.bindTexture(oak); + else + manager.bindTexture(oak); + } + @Override public int getRenderId() { return CustomItems.stool.getRenderType(); diff --git a/src/main/java/noppes/npcs/config/ConfigClient.java b/src/main/java/noppes/npcs/config/ConfigClient.java index 3824f8e9b..22ef51590 100644 --- a/src/main/java/noppes/npcs/config/ConfigClient.java +++ b/src/main/java/noppes/npcs/config/ConfigClient.java @@ -79,6 +79,7 @@ public class ConfigClient public static boolean LegacyCampfire = false; public static boolean LegacyBanner = false; public static boolean LegacyChair = false; + public static boolean LegacyStool = false; public static boolean LegacyBarrel = false; public static boolean LegacyCarpentryBench = false; @@ -142,6 +143,7 @@ public class ConfigClient LegacyBanner = config.get(MODEL, "Legacy Banner Model", false).getBoolean(false); LegacyBarrel = config.get(MODEL, "Legacy Barrel Model", false).getBoolean(false); LegacyChair = config.get(MODEL, "Legacy Chair Model", false).getBoolean(false); + LegacyStool = config.get(MODEL, "Legacy Stool Model", false).getBoolean(false); LegacyCarpentryBench = config.get(MODEL, "Legacy Carpentry Bench Model", false).getBoolean(false); // Convert to Legacy diff --git a/src/main/java/noppes/npcs/controllers/data/RecipesDefault.java b/src/main/java/noppes/npcs/controllers/data/RecipesDefault.java index 3ef4ffdb3..f20b25264 100644 --- a/src/main/java/noppes/npcs/controllers/data/RecipesDefault.java +++ b/src/main/java/noppes/npcs/controllers/data/RecipesDefault.java @@ -18,7 +18,7 @@ public class RecipesDefault { item = new ItemStack((Block)ob); else item = (ItemStack) ob; - + RecipeCarpentry recipeAnvil = new RecipeCarpentry(name); recipeAnvil.isGlobal = isGlobal; recipeAnvil = RecipeCarpentry.saveRecipe(recipeAnvil, item, recipe); @@ -29,7 +29,7 @@ public class RecipesDefault { addRecipe("Npc Wand", CustomItems.wand, true, "XX"," Y"," Y",'X', Items.bread,'Y', Items.stick); addRecipe("Mob Cloner", CustomItems.cloner, true, "XX","XY"," Y",'X', Items.bread,'Y', Items.stick); addRecipe("Carpentry Bench", CustomItems.carpentyBench, true, "XYX","Z Z","Z Z", 'X', Blocks.planks, 'Z', Items.stick, 'Y', Blocks.crafting_table); - + if(!ConfigMain.DisableExtraItems){ addRecipe("Mana", CustomItems.mana, true, "XY",'X',Items.redstone,'Y',Items.glowstone_dust); addRecipe("Gun Wooden", CustomItems.gunWood, false, "XXXY"," ZM "," M ",'Y', Blocks.lever, 'M', Items.stick, 'Z', Blocks.stone_button,'X', Blocks.planks); @@ -39,7 +39,7 @@ public class RecipesDefault { addRecipe("Gun Diamond", CustomItems.gunDiamond, false, "XXXY"," ZM "," M ",'Y', Blocks.lever, 'M', Items.stick, 'Z', Blocks.stone_button,'X', Items.diamond); addRecipe("Gun Emerald", CustomItems.gunEmerald, false, "XXXY"," ZM "," M ",'Y', Blocks.lever, 'M', Items.stick, 'Z', Blocks.stone_button,'X', Items.emerald); addRecipe("Gun Bronze", CustomItems.gunBronze, false, "XXXY"," ZM "," M ",'Y', Blocks.lever, 'M', Items.stick, 'Z', Blocks.stone_button,'X', CustomItems.bronze_ingot); - + addRecipe("Bullet Wooden", CustomItems.bulletWood, true, "X",'X', Blocks.planks); addRecipe("Bullet Stone", CustomItems.bulletStone, true, "X",'X', Blocks.cobblestone); addRecipe("Bullet Iron", CustomItems.bulletIron, true, "X",'X', Items.iron_ingot); @@ -56,96 +56,96 @@ public class RecipesDefault { addRecipe("WallBanner Iron", new ItemStack(CustomItems.wallBanner, 1, 2), false, "XXX","ZZZ","ZZZ","Z Z",'Z', Blocks.wool, 'X', Items.iron_ingot); addRecipe("WallBanner Gold", new ItemStack(CustomItems.wallBanner, 1, 3), false, "XXX","ZZZ","ZZZ","Z Z",'Z', Blocks.wool, 'X', Items.gold_ingot); addRecipe("WallBanner Diamond", new ItemStack(CustomItems.wallBanner, 1, 4), false, "XXX","ZZZ","ZZZ","Z Z",'Z', Blocks.wool, 'X', Items.diamond); - + addRecipe("Banner Wooden", new ItemStack(CustomItems.banner, 1, 0), false, " X "," Z "," Z ","ZZZ", 'X', new ItemStack(CustomItems.wallBanner,1,0), 'Z', Blocks.planks); addRecipe("Banner Stone", new ItemStack(CustomItems.banner, 1, 1), false, " X "," Z "," Z ","ZZZ", 'X', new ItemStack(CustomItems.wallBanner,1,1), 'Z', Blocks.cobblestone); addRecipe("Banner Iron", new ItemStack(CustomItems.banner, 1, 2), false, " X "," Z "," Z ","ZZZ", 'X', new ItemStack(CustomItems.wallBanner,1,2), 'Z', Items.iron_ingot); addRecipe("Banner Gold", new ItemStack(CustomItems.banner, 1, 3), false, " X "," Z "," Z ","ZZZ", 'X', new ItemStack(CustomItems.wallBanner,1,3), 'Z', Items.gold_ingot); addRecipe("Banner Diamond", new ItemStack(CustomItems.banner, 1, 4), false, " X "," Z "," Z ","ZZZ", 'X', new ItemStack(CustomItems.wallBanner,1,4), 'Z', Items.diamond); - + addRecipe("Lamp Wooden", new ItemStack(CustomItems.tallLamp, 1, 0), false, "YXY"," Z "," Z ","ZZZ", 'X', Blocks.torch, 'Y', Blocks.wool, 'Z', Blocks.planks); addRecipe("Lamp Stone", new ItemStack(CustomItems.tallLamp, 1, 1), false, "YXY"," Z "," Z ","ZZZ", 'X', Blocks.torch, 'Y', Blocks.wool, 'Z', Blocks.cobblestone); addRecipe("Lamp Iron", new ItemStack(CustomItems.tallLamp, 1, 2), false, "YXY"," Z "," Z ","ZZZ", 'X', Blocks.torch, 'Y', Blocks.wool, 'Z', Items.iron_ingot); addRecipe("Lamp Gold", new ItemStack(CustomItems.tallLamp, 1, 3), false, "YXY"," Z "," Z ","ZZZ", 'X', Blocks.torch, 'Y', Blocks.wool, 'Z', Items.gold_ingot); addRecipe("Lamp Diamond", new ItemStack(CustomItems.tallLamp, 1, 4), false, "YXY"," Z "," Z ","ZZZ", 'X', Blocks.torch, 'Y', Blocks.wool, 'Z', Items.diamond); - + addRecipe("Chair Wooden1", new ItemStack(CustomItems.chair, 1, 0), false, " X", " X","XXX","X X", 'X', new ItemStack(Blocks.planks,1,0)); addRecipe("Chair Wooden2", new ItemStack(CustomItems.chair, 1, 1), false, " X", " X","XXX","X X", 'X', new ItemStack(Blocks.planks,1,1)); addRecipe("Chair Wooden3", new ItemStack(CustomItems.chair, 1, 2), false, " X", " X","XXX","X X", 'X', new ItemStack(Blocks.planks,1,2)); addRecipe("Chair Wooden4", new ItemStack(CustomItems.chair, 1, 3), false, " X", " X","XXX","X X", 'X', new ItemStack(Blocks.planks,1,3)); addRecipe("Chair Wooden5", new ItemStack(CustomItems.chair, 1, 4), false, " X", " X","XXX","X X", 'X', new ItemStack(Blocks.planks,1,4)); addRecipe("Chair Wooden6", new ItemStack(CustomItems.chair, 1, 5), false, " X", " X","XXX","X X", 'X', new ItemStack(Blocks.planks,1,5)); - + addRecipe("Crate Wooden1", new ItemStack(CustomItems.crate, 1, 0), false, "XXXX","X X","X X","XXXX", 'X', new ItemStack(Blocks.planks,1,0)); addRecipe("Crate Wooden2", new ItemStack(CustomItems.crate, 1, 1), false, "XXXX","X X","X X","XXXX", 'X', new ItemStack(Blocks.planks,1,1)); addRecipe("Crate Wooden3", new ItemStack(CustomItems.crate, 1, 2), false, "XXXX","X X","X X","XXXX", 'X', new ItemStack(Blocks.planks,1,2)); addRecipe("Crate Wooden4", new ItemStack(CustomItems.crate, 1, 3), false, "XXXX","X X","X X","XXXX", 'X', new ItemStack(Blocks.planks,1,3)); addRecipe("Crate Wooden5", new ItemStack(CustomItems.crate, 1, 4), false, "XXXX","X X","X X","XXXX", 'X', new ItemStack(Blocks.planks,1,4)); addRecipe("Crate Wooden6", new ItemStack(CustomItems.crate, 1, 5), false, "XXXX","X X","X X","XXXX", 'X', new ItemStack(Blocks.planks,1,5)); - + addRecipe("WeaponRack Wooden1", new ItemStack(CustomItems.weaponsRack, 1, 0), false, "XXX","XYX","XYX","XXX", 'X', new ItemStack(Blocks.planks,1,0),'Y', Items.stick); addRecipe("WeaponRack Wooden2", new ItemStack(CustomItems.weaponsRack, 1, 1), false, "XXX","XYX","XYX","XXX", 'X', new ItemStack(Blocks.planks,1,1),'Y', Items.stick); addRecipe("WeaponRack Wooden3", new ItemStack(CustomItems.weaponsRack, 1, 2), false, "XXX","XYX","XYX","XXX", 'X', new ItemStack(Blocks.planks,1,2),'Y', Items.stick); addRecipe("WeaponRack Wooden4", new ItemStack(CustomItems.weaponsRack, 1, 3), false, "XXX","XYX","XYX","XXX", 'X', new ItemStack(Blocks.planks,1,3),'Y', Items.stick); addRecipe("WeaponRack Wooden5", new ItemStack(CustomItems.weaponsRack, 1, 4), false, "XXX","XYX","XYX","XXX", 'X', new ItemStack(Blocks.planks,1,4),'Y', Items.stick); addRecipe("WeaponRack Wooden6", new ItemStack(CustomItems.weaponsRack, 1, 5), false, "XXX","XYX","XYX","XXX", 'X', new ItemStack(Blocks.planks,1,5),'Y', Items.stick); - + addRecipe("Couch Wooden1", new ItemStack(CustomItems.couchWood, 1, 0), false, " X"," X","XXXX","X X", 'X', new ItemStack(Blocks.planks,1,0)); addRecipe("Couch Wooden2", new ItemStack(CustomItems.couchWood, 1, 1), false, " X"," X","XXXX","X X", 'X', new ItemStack(Blocks.planks,1,1)); addRecipe("Couch Wooden3", new ItemStack(CustomItems.couchWood, 1, 2), false, " X"," X","XXXX","X X", 'X', new ItemStack(Blocks.planks,1,2)); addRecipe("Couch Wooden4", new ItemStack(CustomItems.couchWood, 1, 3), false, " X"," X","XXXX","X X", 'X', new ItemStack(Blocks.planks,1,3)); addRecipe("Couch Wooden5", new ItemStack(CustomItems.couchWood, 1, 4), false, " X"," X","XXXX","X X", 'X', new ItemStack(Blocks.planks,1,4)); addRecipe("Couch Wooden6", new ItemStack(CustomItems.couchWood, 1, 5), false, " X"," X","XXXX","X X", 'X', new ItemStack(Blocks.planks,1,5)); - + addRecipe("Couch Wool1", new ItemStack(CustomItems.couchWool, 1, 0), false, " Z", " Z","ZZZZ","X X", 'X', new ItemStack(Blocks.planks,1,0), 'Z', Blocks.wool); addRecipe("Couch Wool2", new ItemStack(CustomItems.couchWool, 1, 1), false, " Z", " Z","ZZZZ","X X", 'X', new ItemStack(Blocks.planks,1,1), 'Z', Blocks.wool); addRecipe("Couch Wool3", new ItemStack(CustomItems.couchWool, 1, 2), false, " Z", " Z","ZZZZ","X X", 'X', new ItemStack(Blocks.planks,1,2), 'Z', Blocks.wool); addRecipe("Couch Wool4", new ItemStack(CustomItems.couchWool, 1, 3), false, " Z", " Z","ZZZZ","X X", 'X', new ItemStack(Blocks.planks,1,3), 'Z', Blocks.wool); addRecipe("Couch Wool5", new ItemStack(CustomItems.couchWool, 1, 4), false, " Z", " Z","ZZZZ","X X", 'X', new ItemStack(Blocks.planks,1,4), 'Z', Blocks.wool); addRecipe("Couch Wool6", new ItemStack(CustomItems.couchWool, 1, 5), false, " Z", " Z","ZZZZ","X X", 'X', new ItemStack(Blocks.planks,1,5), 'Z', Blocks.wool); - + addRecipe("Table Wood1", new ItemStack(CustomItems.table, 1, 0), false, "XXXX","X X","X X", 'X', new ItemStack(Blocks.planks,1,0), 'Z', Blocks.wool); addRecipe("Table Wood2", new ItemStack(CustomItems.table, 1, 1), false, "XXXX","X X","X X", 'X', new ItemStack(Blocks.planks,1,1), 'Z', Blocks.wool); addRecipe("Table Wood3", new ItemStack(CustomItems.table, 1, 2), false, "XXXX","X X","X X", 'X', new ItemStack(Blocks.planks,1,2), 'Z', Blocks.wool); addRecipe("Table Wood4", new ItemStack(CustomItems.table, 1, 3), false, "XXXX","X X","X X", 'X', new ItemStack(Blocks.planks,1,3), 'Z', Blocks.wool); addRecipe("Table Wood5", new ItemStack(CustomItems.table, 1, 4), false, "XXXX","X X","X X", 'X', new ItemStack(Blocks.planks,1,4), 'Z', Blocks.wool); addRecipe("Table Wood6", new ItemStack(CustomItems.table, 1, 5), false, "XXXX","X X","X X", 'X', new ItemStack(Blocks.planks,1,5), 'Z', Blocks.wool); - - addRecipe("Stool Wood1", new ItemStack(CustomItems.stool, 1, 0), false, "XXX"," X ","X X", 'X', new ItemStack(Blocks.planks,1,0)); - addRecipe("Stool Wood2", new ItemStack(CustomItems.stool, 1, 1), false, "XXX"," X ","X X", 'X', new ItemStack(Blocks.planks,1,1)); - addRecipe("Stool Wood3", new ItemStack(CustomItems.stool, 1, 2), false, "XXX"," X ","X X", 'X', new ItemStack(Blocks.planks,1,2)); - addRecipe("Stool Wood4", new ItemStack(CustomItems.stool, 1, 3), false, "XXX"," X ","X X", 'X', new ItemStack(Blocks.planks,1,3)); - addRecipe("Stool Wood5", new ItemStack(CustomItems.stool, 1, 4), false, "XXX"," X ","X X", 'X', new ItemStack(Blocks.planks,1,4)); - addRecipe("Stool Wood6", new ItemStack(CustomItems.stool, 1, 5), false, "XXX"," X ","X X", 'X', new ItemStack(Blocks.planks,1,5)); - + + addRecipe("noppes.npcs.client.model.blocks.Stool Wood1", new ItemStack(CustomItems.stool, 1, 0), false, "XXX"," X ","X X", 'X', new ItemStack(Blocks.planks,1,0)); + addRecipe("noppes.npcs.client.model.blocks.Stool Wood2", new ItemStack(CustomItems.stool, 1, 1), false, "XXX"," X ","X X", 'X', new ItemStack(Blocks.planks,1,1)); + addRecipe("noppes.npcs.client.model.blocks.Stool Wood3", new ItemStack(CustomItems.stool, 1, 2), false, "XXX"," X ","X X", 'X', new ItemStack(Blocks.planks,1,2)); + addRecipe("noppes.npcs.client.model.blocks.Stool Wood4", new ItemStack(CustomItems.stool, 1, 3), false, "XXX"," X ","X X", 'X', new ItemStack(Blocks.planks,1,3)); + addRecipe("noppes.npcs.client.model.blocks.Stool Wood5", new ItemStack(CustomItems.stool, 1, 4), false, "XXX"," X ","X X", 'X', new ItemStack(Blocks.planks,1,4)); + addRecipe("noppes.npcs.client.model.blocks.Stool Wood6", new ItemStack(CustomItems.stool, 1, 5), false, "XXX"," X ","X X", 'X', new ItemStack(Blocks.planks,1,5)); + addRecipe("Barrel Wood1", new ItemStack(CustomItems.barrel, 1, 0), false, "XXX","X X","X X", "XXX", 'X', new ItemStack(Blocks.planks,1,0)); addRecipe("Barrel Wood2", new ItemStack(CustomItems.barrel, 1, 1), false, "XXX","X X","X X", "XXX", 'X', new ItemStack(Blocks.planks,1,1)); addRecipe("Barrel Wood3", new ItemStack(CustomItems.barrel, 1, 2), false, "XXX","X X","X X", "XXX", 'X', new ItemStack(Blocks.planks,1,2)); addRecipe("Barrel Wood4", new ItemStack(CustomItems.barrel, 1, 3), false, "XXX","X X","X X", "XXX", 'X', new ItemStack(Blocks.planks,1,3)); addRecipe("Barrel Wood5", new ItemStack(CustomItems.barrel, 1, 4), false, "XXX","X X","X X", "XXX", 'X', new ItemStack(Blocks.planks,1,4)); addRecipe("Barrel Wood6", new ItemStack(CustomItems.barrel, 1, 5), false, "XXX","X X","X X", "XXX", 'X', new ItemStack(Blocks.planks,1,5)); - + addRecipe("Shelf Wood1", new ItemStack(CustomItems.shelf, 2, 0), false, "XXX","XY ","X ", 'Y', Items.stick, 'X', new ItemStack(Blocks.planks,1,0)); addRecipe("Shelf Wood2", new ItemStack(CustomItems.shelf, 2, 1), false, "XXX","XY ","X ", 'Y', Items.stick, 'X', new ItemStack(Blocks.planks,1,1)); addRecipe("Shelf Wood3", new ItemStack(CustomItems.shelf, 2, 2), false, "XXX","XY ","X ", 'Y', Items.stick, 'X', new ItemStack(Blocks.planks,1,2)); addRecipe("Shelf Wood4", new ItemStack(CustomItems.shelf, 2, 3), false, "XXX","XY ","X ", 'Y', Items.stick, 'X', new ItemStack(Blocks.planks,1,3)); addRecipe("Shelf Wood5", new ItemStack(CustomItems.shelf, 2, 4), false, "XXX","XY ","X ", 'Y', Items.stick, 'X', new ItemStack(Blocks.planks,1,4)); addRecipe("Shelf Wood6", new ItemStack(CustomItems.shelf, 2, 5), false, "XXX","XY ","X ", 'Y', Items.stick, 'X', new ItemStack(Blocks.planks,1,5)); - + addRecipe("Beam Wood1", new ItemStack(CustomItems.beam, 2, 0), false, "XXX", "XXX", 'X', new ItemStack(Blocks.planks,1,0)); addRecipe("Beam Wood2", new ItemStack(CustomItems.beam, 2, 1), false, "XXX", "XXX", 'X', new ItemStack(Blocks.planks,1,1)); addRecipe("Beam Wood3", new ItemStack(CustomItems.beam, 2, 2), false, "XXX", "XXX", 'X', new ItemStack(Blocks.planks,1,2)); addRecipe("Beam Wood4", new ItemStack(CustomItems.beam, 2, 3), false, "XXX", "XXX", 'X', new ItemStack(Blocks.planks,1,3)); addRecipe("Beam Wood5", new ItemStack(CustomItems.beam, 2, 4), false, "XXX", "XXX", 'X', new ItemStack(Blocks.planks,1,4)); addRecipe("Beam Wood6", new ItemStack(CustomItems.beam, 2, 5), false, "XXX", "XXX", 'X', new ItemStack(Blocks.planks,1,5)); - + addRecipe("Sign Wood1", new ItemStack(CustomItems.sign, 1, 0), false, "YYY", "XXX", "XXX", 'X', new ItemStack(Blocks.planks,1,0), 'Y', Items.iron_ingot); addRecipe("Sign Wood2", new ItemStack(CustomItems.sign, 1, 1), false, "YYY", "XXX", "XXX", 'X', new ItemStack(Blocks.planks,1,1), 'Y', Items.iron_ingot); addRecipe("Sign Wood3", new ItemStack(CustomItems.sign, 1, 2), false, "YYY", "XXX", "XXX", 'X', new ItemStack(Blocks.planks,1,2), 'Y', Items.iron_ingot); addRecipe("Sign Wood4", new ItemStack(CustomItems.sign, 1, 3), false, "YYY", "XXX", "XXX", 'X', new ItemStack(Blocks.planks,1,3), 'Y', Items.iron_ingot); addRecipe("Sign Wood5", new ItemStack(CustomItems.sign, 1, 4), false, "YYY", "XXX", "XXX", 'X', new ItemStack(Blocks.planks,1,4), 'Y', Items.iron_ingot); addRecipe("Sign Wood6", new ItemStack(CustomItems.sign, 1, 5), false, "YYY", "XXX", "XXX", 'X', new ItemStack(Blocks.planks,1,5), 'Y', Items.iron_ingot); - + addRecipe("Lamp", new ItemStack(CustomItems.lamp), false, "XXX","YZY","XXX", 'X', Items.iron_ingot, 'Y', Blocks.glass, 'Z', Blocks.torch); addRecipe("Candle", new ItemStack(CustomItems.candle), false, "XZX"," X ", 'X', Items.iron_ingot, 'Z', Blocks.torch); addRecipe("BigSign", new ItemStack(CustomItems.bigsign, 2), false, "XXX","XXX","XXX", 'X', Blocks.planks); @@ -159,7 +159,7 @@ public class RecipesDefault { addRecipe("Battle Axe5", CustomItems.battleAxeDiamond, false, "XX","XY"," Y", " Y", 'Y', Items.stick, 'X', Items.diamond); addRecipe("Battle Axe6", CustomItems.battleAxeBronze, false, "XX","XY"," Y", " Y", 'Y', Items.stick, 'X', CustomItems.bronze_ingot); addRecipe("Battle Axe7", CustomItems.battleAxeEmerald, false, "XX","XY"," Y", " Y", 'Y', Items.stick, 'X', Items.emerald); - + addRecipe("Halberd1", CustomItems.halberdWood, false, " X ","XYX"," Y ", " Y ", 'Y', Items.stick, 'X', Blocks.planks); addRecipe("Halberd2", CustomItems.halberdStone, false, " X ","XYX"," Y ", " Y ", 'Y', Items.stick, 'X', Blocks.cobblestone); addRecipe("Halberd3", CustomItems.halberdIron, false, " X ","XYX"," Y ", " Y ", 'Y', Items.stick, 'X', Items.iron_ingot); @@ -167,7 +167,7 @@ public class RecipesDefault { addRecipe("Halberd5", CustomItems.halberdDiamond, false, " X ","XYX"," Y ", " Y ", 'Y', Items.stick, 'X', Items.diamond); addRecipe("Halberd6", CustomItems.halberdBronze, false, " X ","XYX"," Y ", " Y ", 'Y', Items.stick, 'X', CustomItems.bronze_ingot); addRecipe("Halberd7", CustomItems.halberdEmerald, false, " X ","XYX"," Y ", " Y ", 'Y', Items.stick, 'X', Items.emerald); - + addRecipe("Glaive1", CustomItems.glaiveWood, false, "X "," Y "," Y ", " X", 'Y', Items.stick, 'X', Blocks.planks); addRecipe("Glaive2", CustomItems.glaiveStone, false, "X "," Y "," Y ", " X", 'Y', Items.stick, 'X', Blocks.cobblestone); addRecipe("Glaive3", CustomItems.glaiveIron, false, "X "," Y "," Y ", " X", 'Y', Items.stick, 'X', Items.iron_ingot); @@ -175,7 +175,7 @@ public class RecipesDefault { addRecipe("Glaive5", CustomItems.glaiveDiamond, false, "X "," Y "," Y ", " X", 'Y', Items.stick, 'X', Items.diamond); addRecipe("Glaive6", CustomItems.glaiveBronze, false, "X "," Y "," Y ", " X", 'Y', Items.stick, 'X', CustomItems.bronze_ingot); addRecipe("Glaive7", CustomItems.glaiveEmerald, false, "X "," Y "," Y ", " X", 'Y', Items.stick, 'X', Items.emerald); - + addRecipe("Trident1", CustomItems.tridentWood, false, "X X"," X "," Y ", " Y ", 'Y', Items.stick, 'X', Blocks.planks); addRecipe("Trident2", CustomItems.tridentStone, false, "X X"," X "," Y ", " Y ", 'Y', Items.stick, 'X', Blocks.cobblestone); addRecipe("Trident3", CustomItems.tridentIron, false, "X X"," X "," Y ", " Y ", 'Y', Items.stick, 'X', Items.iron_ingot); @@ -183,7 +183,7 @@ public class RecipesDefault { addRecipe("Trident5", CustomItems.tridentDiamond, false, "X X"," X "," Y ", " Y ", 'Y', Items.stick, 'X', Items.diamond); addRecipe("Trident6", CustomItems.tridentBronze, false, "X X"," X "," Y ", " Y ", 'Y', Items.stick, 'X', CustomItems.bronze_ingot); addRecipe("Trident7", CustomItems.tridentEmerald, false, "X X"," X "," Y ", " Y ", 'Y', Items.stick, 'X', Items.emerald); - + } } } diff --git a/src/main/resources/assets/customnpcs/textures/models/stool/oak.png b/src/main/resources/assets/customnpcs/textures/models/stool/oak.png new file mode 100644 index 0000000000000000000000000000000000000000..54d8277a23a38693f56187613e6d981380bfaa86 GIT binary patch literal 607 zcmV-l0-*hgP)Px%8A(JzRCt{2*S~AqKoke?uY(p_HsWb8IABORCR>-R9kcWg$dVy*|AlmD|AovQ zy7Uj|lA&Aa5Ga8xfe!gW69~AVLs+WFkg9`p%2|=|*~CN^-_IhSc-Zp2cXv-MSUNn| zNe9va0EpLx3L}Wu1pufp0s!2pzW@N6xR0MsTDHHvOpa~fKstD}IRpSa+=mc59 z5|1Ii006{OP+?>hR~Ob3ptao|lKcwen#AKG!}G+wH0udCyZAFv;<~(Hl>R7)C&shl z>cDye-n`y~_)=sN0M@fg$9A6C%c~oR*R_hPi#6Looy8;`KeT2 zbK?Dj3e-e-!zg|GxR=-Z^5Ja?BReMZ;gMH?F7c{Z({p{_-utgh?HHZ&>k$UhseCY< zvGeN@ke}=N-mF&mIlph2irGCp*h%&7-1pt0S3f@5PhoU&nqJqt?>^U}r(aaD2aJLk zecvrUYbsC>U$Pc9FH2pr<+5Kzt>dHpblM*iUsgWDv#gn=-FAB@kDJax#g1LID>s#s z#N(nrPx71Pag#avy&dK|duiNc&bRMBv9-|$0Q@-p1>`R==D5k6?8wU+lgHz)JSHL{ tA|fIpA|fIpA|fIpA|fIpA|j#{^B-DKcVg0$m7@Rv002ovPDHLkV1n3T8~FeL literal 0 HcmV?d00001 From 4d2ced4528634e6d2f0a28e679c07d13e9b6eaeb Mon Sep 17 00:00:00 2001 From: Kam Date: Mon, 27 Jan 2025 17:21:11 -0500 Subject: [PATCH 6/8] Updated Banners --- .../java/noppes/npcs/ServerEventsHandler.java | 15 ++- .../noppes/npcs/blocks/tiles/TileBanner.java | 16 ++- .../npcs/client/model/blocks/ModelStool.java | 27 +++-- .../blocks/banner/ModelBannerFloorFlag.java | 35 +++--- .../model/blocks/banner/ModelBannerWall.java | 37 +++++++ .../blocks/banner/ModelBannerWallFlag.java | 31 ++++++ .../blocks/legacy/ModelLegacyWallBanner.java | 6 -- .../renderer/blocks/BlockBannerRenderer.java | 102 ++++++++++++++---- .../blocks/BlockCarpentryBenchRenderer.java | 4 +- .../renderer/blocks/BlockChairRenderer.java | 2 + .../renderer/blocks/BlockStoolRenderer.java | 10 +- .../blocks/BlockWallBannerRenderer.java | 101 +++++++++++++---- .../java/noppes/npcs/config/ConfigClient.java | 8 ++ .../npcs/constants/EnumBannerVariant.java | 5 + .../models/banner/flag/BannerFlag1.png | Bin 270 -> 0 bytes .../models/banner/flag/BannerFlag2.png | Bin 282 -> 0 bytes .../models/banner/flag/BannerFlag3.png | Bin 297 -> 0 bytes .../models/banner/flag/BannerFlag4.png | Bin 407 -> 0 bytes .../models/banner/flag/BannerFlag5.png | Bin 270 -> 0 bytes .../textures/models/banner/flag/curved.png | Bin 0 -> 284 bytes .../textures/models/banner/flag/normal.png | Bin 0 -> 319 bytes .../textures/models/banner/flag/pointy.png | Bin 0 -> 305 bytes .../textures/models/banner/flag/torn.png | Bin 0 -> 447 bytes .../textures/models/banner/flag/triangle.png | Bin 0 -> 328 bytes .../customnpcs/textures/models/stool/oak.png | Bin 607 -> 399 bytes 25 files changed, 314 insertions(+), 85 deletions(-) create mode 100644 src/main/java/noppes/npcs/client/model/blocks/banner/ModelBannerWall.java create mode 100644 src/main/java/noppes/npcs/client/model/blocks/banner/ModelBannerWallFlag.java create mode 100644 src/main/java/noppes/npcs/constants/EnumBannerVariant.java delete mode 100644 src/main/resources/assets/customnpcs/textures/models/banner/flag/BannerFlag1.png delete mode 100644 src/main/resources/assets/customnpcs/textures/models/banner/flag/BannerFlag2.png delete mode 100644 src/main/resources/assets/customnpcs/textures/models/banner/flag/BannerFlag3.png delete mode 100644 src/main/resources/assets/customnpcs/textures/models/banner/flag/BannerFlag4.png delete mode 100644 src/main/resources/assets/customnpcs/textures/models/banner/flag/BannerFlag5.png create mode 100644 src/main/resources/assets/customnpcs/textures/models/banner/flag/curved.png create mode 100644 src/main/resources/assets/customnpcs/textures/models/banner/flag/normal.png create mode 100644 src/main/resources/assets/customnpcs/textures/models/banner/flag/pointy.png create mode 100644 src/main/resources/assets/customnpcs/textures/models/banner/flag/torn.png create mode 100644 src/main/resources/assets/customnpcs/textures/models/banner/flag/triangle.png diff --git a/src/main/java/noppes/npcs/ServerEventsHandler.java b/src/main/java/noppes/npcs/ServerEventsHandler.java index e4c8b9ff6..f67759ed5 100644 --- a/src/main/java/noppes/npcs/ServerEventsHandler.java +++ b/src/main/java/noppes/npcs/ServerEventsHandler.java @@ -11,6 +11,7 @@ import net.minecraft.entity.passive.EntityVillager; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.init.Blocks; +import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; @@ -255,11 +256,23 @@ public class ServerEventsHandler { } if(!player.worldObj.isRemote){ + if(block == CustomItems.banner || block == CustomItems.wallBanner){ + // If sneaking and using shear + if(player.isSneaking() && item.getItem() == Items.shears){ + int currentVariantIndex = tile.variant.ordinal(); + int nextVariantIndex = (currentVariantIndex + 1) % EnumBannerVariant.values().length; + tile.variant = EnumBannerVariant.values()[nextVariantIndex]; + + player.worldObj.markBlockForUpdate(event.x, y, event.z); + event.setCanceled(true); + return; + } + } + tile.icon = item.copy(); player.worldObj.markBlockForUpdate(event.x, y, event.z); event.setCanceled(true); } - } } diff --git a/src/main/java/noppes/npcs/blocks/tiles/TileBanner.java b/src/main/java/noppes/npcs/blocks/tiles/TileBanner.java index bb8075346..3cbc87b43 100644 --- a/src/main/java/noppes/npcs/blocks/tiles/TileBanner.java +++ b/src/main/java/noppes/npcs/blocks/tiles/TileBanner.java @@ -3,29 +3,39 @@ package noppes.npcs.blocks.tiles; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; +import noppes.npcs.constants.EnumBannerVariant; public class TileBanner extends TileColorable { - + public ItemStack icon; + public EnumBannerVariant variant = EnumBannerVariant.Normal; public long time = 0; public void readFromNBT(NBTTagCompound compound){ super.readFromNBT(compound); icon = ItemStack.loadItemStackFromNBT(compound.getCompoundTag("BannerIcon")); + + int variantIndex = compound.getInteger("BannerVariant"); + if (variantIndex >= 0 && variantIndex < EnumBannerVariant.values().length) { + variant = EnumBannerVariant.values()[variantIndex]; + } else { + variant = EnumBannerVariant.Normal; + } } public void writeToNBT(NBTTagCompound compound){ super.writeToNBT(compound); if(icon != null) compound.setTag("BannerIcon", icon.writeToNBT(new NBTTagCompound())); + compound.setInteger("BannerVariant", variant.ordinal()); } @Override public AxisAlignedBB getRenderBoundingBox(){ return AxisAlignedBB.getBoundingBox(xCoord, yCoord, zCoord, xCoord + 1, yCoord + 2, zCoord + 1); } - + public boolean canEdit(){ - return System.currentTimeMillis() - time < 10000; + return System.currentTimeMillis() - time < 20000; } } diff --git a/src/main/java/noppes/npcs/client/model/blocks/ModelStool.java b/src/main/java/noppes/npcs/client/model/blocks/ModelStool.java index 2cf65f015..429e5ea96 100644 --- a/src/main/java/noppes/npcs/client/model/blocks/ModelStool.java +++ b/src/main/java/noppes/npcs/client/model/blocks/ModelStool.java @@ -9,21 +9,20 @@ public class ModelStool extends ModelBase { private final ModelRenderer stool; public ModelStool() { - textureWidth = 64; - textureHeight = 64; + textureWidth = 64; + textureHeight = 32; - stool = new ModelRenderer(this); - stool.setRotationPoint(0.0F, 24.0F, 0.0F); - stool.cubeList.add(new ModelBox(stool, 0, 0, -5.0F, -9.0F, -5.0F, 10, 2, 10, 0.0F)); - stool.cubeList.add(new ModelBox(stool, 0, 12, 2.0F, -7.0F, -4.0F, 2, 7, 2, 0.0F)); - stool.cubeList.add(new ModelBox(stool, 8, 8, 3.0F, -5.0F, -2.0F, 0, 2, 4, 0.0F)); - stool.cubeList.add(new ModelBox(stool, 8, 12, -2.0F, -5.0F, -3.0F, 4, 2, 0, 0.0F)); - stool.cubeList.add(new ModelBox(stool, 0, 12, -4.0F, -7.0F, -4.0F, 2, 7, 2, 0.0F)); - stool.cubeList.add(new ModelBox(stool, 0, 12, -4.0F, -7.0F, 2.0F, 2, 7, 2, 0.0F)); - stool.cubeList.add(new ModelBox(stool, 8, 8, -3.0F, -5.0F, -2.0F, 0, 2, 4, 0.0F)); - stool.cubeList.add(new ModelBox(stool, 0, 12, 2.0F, -7.0F, 2.0F, 2, 7, 2, 0.0F)); - stool.cubeList.add(new ModelBox(stool, 8, 12, -2.0F, -5.0F, 3.0F, 4, 2, 0, 0.0F)); - } + stool = new ModelRenderer(this); + stool.setRotationPoint(0.0F, 24.0F, 0.0F); + stool.cubeList.add(new ModelBox(stool, 0, 0, -5.0F, -9.0F, -5.0F, 10, 2, 10, 0.0F)); + stool.cubeList.add(new ModelBox(stool, 0, 12, 2.0F, -7.0F, -4.0F, 2, 7, 2, 0.0F)); + stool.cubeList.add(new ModelBox(stool, 8, 8, 3.0F, -5.0F, -2.0F, 0, 2, 4, 0.0F)); + stool.cubeList.add(new ModelBox(stool, 8, 12, -2.0F, -5.0F, -3.0F, 4, 2, 0, 0.0F)); + stool.cubeList.add(new ModelBox(stool, 0, 12, -4.0F, -7.0F, -4.0F, 2, 7, 2, 0.0F)); + stool.cubeList.add(new ModelBox(stool, 0, 12, -4.0F, -7.0F, 2.0F, 2, 7, 2, 0.0F)); + stool.cubeList.add(new ModelBox(stool, 8, 8, -3.0F, -5.0F, -2.0F, 0, 2, 4, 0.0F)); + stool.cubeList.add(new ModelBox(stool, 0, 12, 2.0F, -7.0F, 2.0F, 2, 7, 2, 0.0F)); + stool.cubeList.add(new ModelBox(stool, 8, 12, -2.0F, -5.0F, 3.0F, 4, 2, 0, 0.0F)); } @Override public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { diff --git a/src/main/java/noppes/npcs/client/model/blocks/banner/ModelBannerFloorFlag.java b/src/main/java/noppes/npcs/client/model/blocks/banner/ModelBannerFloorFlag.java index 25adeb70d..030145314 100644 --- a/src/main/java/noppes/npcs/client/model/blocks/banner/ModelBannerFloorFlag.java +++ b/src/main/java/noppes/npcs/client/model/blocks/banner/ModelBannerFloorFlag.java @@ -6,25 +6,26 @@ import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; public class ModelBannerFloorFlag extends ModelBase { - private final ModelRenderer BannerFlag; + public final ModelRenderer BannerFlag; - public ModelBannerFloorFlag() { - textureWidth = 32; - textureHeight = 32; + public ModelBannerFloorFlag() { + textureWidth = 32; + textureHeight = 32; - BannerFlag = new ModelRenderer(this); - BannerFlag.setRotationPoint(0.0F, -8.0F, 5.0F); - BannerFlag.cubeList.add(new ModelBox(BannerFlag, 0, 0, -8.0F, 0.0F, -6.05F, 16, 32, 0, 0.0F)); - } + BannerFlag = new ModelRenderer(this); + BannerFlag.setRotationPoint(0.0F, -8.0F, 5.0F); + BannerFlag.cubeList.add(new ModelBox(BannerFlag, 2, 0, -7.0F, 0.4F, -6.05F, 14, 29, 0, 0.0F)); + } - @Override - public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { - BannerFlag.render(f5); - } + @Override + public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { + // Render the flag + BannerFlag.render(f5); + } - public void setRotationAngle(ModelRenderer modelRenderer, float x, float y, float z) { - modelRenderer.rotateAngleX = x; - modelRenderer.rotateAngleY = y; - modelRenderer.rotateAngleZ = z; - } + public void setRotationAngle(ModelRenderer modelRenderer, float x, float y, float z) { + modelRenderer.rotateAngleX = x; + modelRenderer.rotateAngleY = y; + modelRenderer.rotateAngleZ = z; + } } diff --git a/src/main/java/noppes/npcs/client/model/blocks/banner/ModelBannerWall.java b/src/main/java/noppes/npcs/client/model/blocks/banner/ModelBannerWall.java new file mode 100644 index 000000000..e3756d963 --- /dev/null +++ b/src/main/java/noppes/npcs/client/model/blocks/banner/ModelBannerWall.java @@ -0,0 +1,37 @@ +package noppes.npcs.client.model.blocks.banner; + +import net.minecraft.client.model.ModelBase; +import net.minecraft.client.model.ModelBox; +import net.minecraft.client.model.ModelRenderer; +import net.minecraft.entity.Entity; + +public class ModelBannerWall extends ModelBase { + private final ModelRenderer bb_main; + private final ModelRenderer cube_r1; + + public ModelBannerWall() { + textureWidth = 64; + textureHeight = 64; + + bb_main = new ModelRenderer(this); + bb_main.setRotationPoint(0.0F, 24.0F, 0.0F); + bb_main.cubeList.add(new ModelBox(bb_main, 0, 0, -8.0F, -32.0F, 5.0F, 16, 3, 3, 0.0F)); + bb_main.cubeList.add(new ModelBox(bb_main, 0, 8, -6.0F, -36.0F, 6.5F, 4, 4, 0, 0.0F)); + + cube_r1 = new ModelRenderer(this); + cube_r1.setRotationPoint(4.0F, -34.0F, 6.5F); + bb_main.addChild(cube_r1); + setRotationAngle(cube_r1, 0.0F, 3.1416F, 0.0F); + cube_r1.cubeList.add(new ModelBox(cube_r1, 0, 8, -2.0F, -2.0F, 0.0F, 4, 4, 0, 0.0F));} + + @Override + public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { + bb_main.render(f5); + } + + public void setRotationAngle(ModelRenderer modelRenderer, float x, float y, float z) { + modelRenderer.rotateAngleX = x; + modelRenderer.rotateAngleY = y; + modelRenderer.rotateAngleZ = z; + } +} diff --git a/src/main/java/noppes/npcs/client/model/blocks/banner/ModelBannerWallFlag.java b/src/main/java/noppes/npcs/client/model/blocks/banner/ModelBannerWallFlag.java new file mode 100644 index 000000000..486db9504 --- /dev/null +++ b/src/main/java/noppes/npcs/client/model/blocks/banner/ModelBannerWallFlag.java @@ -0,0 +1,31 @@ +package noppes.npcs.client.model.blocks.banner; + +import net.minecraft.client.model.ModelBase; +import net.minecraft.client.model.ModelBox; +import net.minecraft.client.model.ModelRenderer; +import net.minecraft.entity.Entity; + +public class ModelBannerWallFlag extends ModelBase { + public final ModelRenderer BannerFlag; + + public ModelBannerWallFlag() { + textureWidth = 32; + textureHeight = 32; + + BannerFlag = new ModelRenderer(this); + BannerFlag.setRotationPoint(0.0F, -8.0F, 5.0F); + BannerFlag.cubeList.add(new ModelBox(BannerFlag, 2, 0, -7.0F, 0.4F, -0.05F, 14, 29, 0, 0.0F)); + } + + @Override + public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { + // Render the flag + BannerFlag.render(f5); + } + + public void setRotationAngle(ModelRenderer modelRenderer, float x, float y, float z) { + modelRenderer.rotateAngleX = x; + modelRenderer.rotateAngleY = y; + modelRenderer.rotateAngleZ = z; + } +} diff --git a/src/main/java/noppes/npcs/client/model/blocks/legacy/ModelLegacyWallBanner.java b/src/main/java/noppes/npcs/client/model/blocks/legacy/ModelLegacyWallBanner.java index 851201603..8c3a6dd8a 100644 --- a/src/main/java/noppes/npcs/client/model/blocks/legacy/ModelLegacyWallBanner.java +++ b/src/main/java/noppes/npcs/client/model/blocks/legacy/ModelLegacyWallBanner.java @@ -1,9 +1,3 @@ -// Date: 21-2-2014 11:50:33 -// Template version 1.1 -// Java generated by Techne -// Keep in mind that you still need to fill in some blanks -// - ZeuX - package noppes.npcs.client.model.blocks.legacy; import net.minecraft.client.model.ModelBase; diff --git a/src/main/java/noppes/npcs/client/renderer/blocks/BlockBannerRenderer.java b/src/main/java/noppes/npcs/client/renderer/blocks/BlockBannerRenderer.java index f428c0372..2bfc59e26 100644 --- a/src/main/java/noppes/npcs/client/renderer/blocks/BlockBannerRenderer.java +++ b/src/main/java/noppes/npcs/client/renderer/blocks/BlockBannerRenderer.java @@ -10,6 +10,7 @@ import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; +import net.minecraft.util.MathHelper; import net.minecraft.util.ResourceLocation; import noppes.npcs.CustomItems; import noppes.npcs.blocks.BlockBanner; @@ -19,6 +20,7 @@ import noppes.npcs.client.model.blocks.banner.ModelBannerFloorFlag; import noppes.npcs.client.model.blocks.legacy.ModelLegacyBanner; import noppes.npcs.client.model.blocks.legacy.ModelLegacyBannerFlag; import noppes.npcs.config.ConfigClient; +import noppes.npcs.constants.EnumBannerVariant; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; @@ -30,9 +32,13 @@ public class BlockBannerRenderer extends BlockRendererInterface{ private final ModelBannerFloor banner = new ModelBannerFloor(); private final ModelBannerFloorFlag flag = new ModelBannerFloorFlag(); - public static final ResourceLocation legacyFlagResource = new ResourceLocation("customnpcs","textures/models/BannerFlag.png"); - public static final ResourceLocation flagResource = new ResourceLocation("customnpcs","textures/models/banner/flag/BannerFlag1.png"); + + public static final ResourceLocation normalFlag = new ResourceLocation("customnpcs","textures/models/banner/flag/normal.png"); + public static final ResourceLocation pointyFlag = new ResourceLocation("customnpcs","textures/models/banner/flag/pointy.png"); + public static final ResourceLocation triangleFlag = new ResourceLocation("customnpcs","textures/models/banner/flag/triangle.png"); + public static final ResourceLocation tornFlag = new ResourceLocation("customnpcs","textures/models/banner/flag/torn.png"); + public static final ResourceLocation curvedFlag = new ResourceLocation("customnpcs","textures/models/banner/flag/curved.png"); protected static final ResourceLocation BannerWood = new ResourceLocation("customnpcs","textures/models/banner/BannerFloorWood.png"); protected static final ResourceLocation BannerStone = new ResourceLocation("customnpcs","textures/models/banner/BannerFloorStone.png"); @@ -66,31 +72,56 @@ public class BlockBannerRenderer extends BlockRendererInterface{ float[] color = colorTable[tile.color]; GL11.glColor3f(color[0], color[1], color[2]); legacyFlag.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); + + GL11.glPopMatrix(); + GL11.glColor3f(1, 1, 1); + if(tile.icon != null && !this.playerTooFar(tile)){ + doRender(var2, var4, var6, tile.rotation, tile.icon, 0); + } } else { + long worldTime = tile.getWorldObj() != null ? tile.getWorldObj().getTotalWorldTime() : 0; + // 100 is one full revolution, so we can just mod by 100 without affecting the result + int animationProgress100 = (((tile.xCoord % 100) * 7 + (tile.yCoord % 100) * 9 + (tile.zCoord % 100) * 13) + (int) (worldTime % 100)) % 100; + float f3 = (float) animationProgress100 + var8; + float angle_x = (-0.0125F + 0.01F * MathHelper.cos(f3 * 0.01F * 2F * (float) Math.PI)) * (float) Math.PI; + flag.BannerFlag.rotateAngleX = angle_x; + setBannerMaterial(var1.getBlockMetadata()); banner.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); - this.bindTexture(flagResource); + setFlagType(tile.variant); float[] color = colorTable[tile.color]; + GL11.glPushMatrix(); GL11.glColor3f(color[0], color[1], color[2]); - flag.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); - } + flag.render(null, 0, 0, 0, f3, 0.0F, 0.0625F); + GL11.glPopMatrix(); - GL11.glPopMatrix(); - GL11.glColor3f(1, 1, 1); - if(tile.icon != null && !this.playerTooFar(tile)){ - doRender(var2, var4, var6, tile.rotation, tile.icon); + GL11.glPopMatrix(); + GL11.glColor3f(1, 1, 1); + if(tile.icon != null && !this.playerTooFar(tile)){ + doRender(var2, var4, var6, tile.rotation, tile.icon, angle_x); + } } } - public void doRender(double par2, double par4, double par6, int meta, ItemStack iicon) + public void doRender(double par2, double par4, double par6, int meta, ItemStack iicon, float rotate) { GL11.glPushMatrix(); bindTexture(TextureMap.locationItemsTexture); GL11.glTranslatef((float)par2 + 0.5f, (float)par4 +1.3f, (float)par6 + 0.5f); GL11.glRotatef(180, 0, 0, 1); GL11.glRotatef(90 * meta, 0, 1, 0); - GL11.glTranslatef(0, 0, -0.14f); + if(ConfigClient.LegacyBanner){ + GL11.glTranslatef(0, 0, -0.14f); + } + else { + GL11.glTranslatef(0, 0, -0.075f); + + GL11.glTranslatef(0, -0.6f, 0); // Translate to pivot point + GL11.glRotatef((float) Math.toDegrees(rotate), 1, 0, 0); // Apply sway rotation + GL11.glTranslatef(0, 0.6f, 0); // Translate back after rotation + } + GL11.glDepthMask(false); float f2 = 0.05f; Minecraft mc = Minecraft.getMinecraft(); @@ -156,14 +187,26 @@ public class BlockBannerRenderer extends BlockRendererInterface{ GL11.glRotatef(180, 0, 0, 1); GL11.glRotatef(180, 0, 1, 0); - setMaterialTexture(metadata); - GL11.glColor3f(1, 1, 1); - legacyBanner.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); + if(ConfigClient.LegacyBanner){ + setMaterialTexture(metadata); + GL11.glColor3f(1, 1, 1); + legacyBanner.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); + + this.bindTexture(legacyFlagResource); + float[] color = colorTable[15 - metadata]; + GL11.glColor3f(color[0], color[1], color[2]); + legacyFlag.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); + } + else { + setBannerMaterial(metadata); + banner.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); + + this.bindTexture(normalFlag); + float[] color = colorTable[15 - metadata]; + GL11.glColor3f(color[0], color[1], color[2]); + flag.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); + } - this.bindTexture(legacyFlagResource); - float[] color = colorTable[15 - metadata]; - GL11.glColor3f(color[0], color[1], color[2]); - legacyFlag.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); GL11.glPopMatrix(); } @@ -176,7 +219,7 @@ public class BlockBannerRenderer extends BlockRendererInterface{ return 26; } - public void setBannerMaterial(int meta){ + public static void setBannerMaterial(int meta){ TextureManager manager = Minecraft.getMinecraft().getTextureManager(); if(meta == 1) manager.bindTexture(BannerStone); @@ -189,4 +232,25 @@ public class BlockBannerRenderer extends BlockRendererInterface{ else manager.bindTexture(BannerWood); } + + public static void setFlagType(EnumBannerVariant variant){ + TextureManager manager = Minecraft.getMinecraft().getTextureManager(); + switch (variant){ + case Pointy: + manager.bindTexture(pointyFlag); + break; + case Triangle: + manager.bindTexture(triangleFlag); + break; + case Torn: + manager.bindTexture(tornFlag); + break; + case Curved: + manager.bindTexture(curvedFlag); + break; + default: + manager.bindTexture(normalFlag); + break; + } + } } diff --git a/src/main/java/noppes/npcs/client/renderer/blocks/BlockCarpentryBenchRenderer.java b/src/main/java/noppes/npcs/client/renderer/blocks/BlockCarpentryBenchRenderer.java index 57c8c5f43..81a8de7d3 100644 --- a/src/main/java/noppes/npcs/client/renderer/blocks/BlockCarpentryBenchRenderer.java +++ b/src/main/java/noppes/npcs/client/renderer/blocks/BlockCarpentryBenchRenderer.java @@ -40,9 +40,11 @@ public class BlockCarpentryBenchRenderer extends TileEntitySpecialRenderer imple this.bindTexture(anvilTexture); anvil.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); } - else{ + else { + GL11.glEnable(GL11.GL_ALPHA_TEST); this.bindTexture(carpentryBench); model.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); + GL11.glDisable(GL11.GL_ALPHA_TEST); } GL11.glPopMatrix(); } diff --git a/src/main/java/noppes/npcs/client/renderer/blocks/BlockChairRenderer.java b/src/main/java/noppes/npcs/client/renderer/blocks/BlockChairRenderer.java index d5a04a32c..86ff10676 100644 --- a/src/main/java/noppes/npcs/client/renderer/blocks/BlockChairRenderer.java +++ b/src/main/java/noppes/npcs/client/renderer/blocks/BlockChairRenderer.java @@ -34,11 +34,13 @@ public class BlockChairRenderer extends BlockRendererInterface{ GL11.glRotatef(90 * tile.rotation, 0, 1, 0); GL11.glColor3f(1, 1, 1); + GL11.glEnable(GL11.GL_ALPHA_TEST); 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); + GL11.glDisable(GL11.GL_ALPHA_TEST); GL11.glPopMatrix(); } diff --git a/src/main/java/noppes/npcs/client/renderer/blocks/BlockStoolRenderer.java b/src/main/java/noppes/npcs/client/renderer/blocks/BlockStoolRenderer.java index cecdfce85..32ea1655c 100644 --- a/src/main/java/noppes/npcs/client/renderer/blocks/BlockStoolRenderer.java +++ b/src/main/java/noppes/npcs/client/renderer/blocks/BlockStoolRenderer.java @@ -38,14 +38,22 @@ public class BlockStoolRenderer extends BlockRendererInterface{ GL11.glRotatef(180, 0, 0, 1); GL11.glColor3f(1, 1, 1); + + GL11.glEnable(GL11.GL_ALPHA_TEST); if(ConfigClient.LegacyStool){ setWoodTexture(var1.getBlockMetadata()); legacyStool.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); } else { - setStoolTexture(var1.getBlockMetadata()); + if(ConfigClient.WoodTextures) { + setWoodTexture(var1.getBlockMetadata()); + } + else { + setStoolTexture(var1.getBlockMetadata()); + } stool.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); } + GL11.glDisable(GL11.GL_ALPHA_TEST); GL11.glPopMatrix(); } diff --git a/src/main/java/noppes/npcs/client/renderer/blocks/BlockWallBannerRenderer.java b/src/main/java/noppes/npcs/client/renderer/blocks/BlockWallBannerRenderer.java index 0b83c9fa3..8ccbe2f75 100644 --- a/src/main/java/noppes/npcs/client/renderer/blocks/BlockWallBannerRenderer.java +++ b/src/main/java/noppes/npcs/client/renderer/blocks/BlockWallBannerRenderer.java @@ -11,19 +11,26 @@ import net.minecraft.init.Blocks; import net.minecraft.item.*; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; +import net.minecraft.util.MathHelper; import net.minecraft.util.ResourceLocation; import noppes.npcs.CustomItems; import noppes.npcs.blocks.BlockWallBanner; import noppes.npcs.blocks.tiles.TileWallBanner; +import noppes.npcs.client.model.blocks.banner.ModelBannerWall; +import noppes.npcs.client.model.blocks.banner.ModelBannerWallFlag; import noppes.npcs.client.model.blocks.legacy.ModelLegacyWallBanner; import noppes.npcs.client.model.blocks.legacy.ModelLegacyWallBannerFlag; +import noppes.npcs.config.ConfigClient; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; public class BlockWallBannerRenderer extends BlockRendererInterface{ - private final ModelLegacyWallBanner model = new ModelLegacyWallBanner(); - private final ModelLegacyWallBannerFlag flag = new ModelLegacyWallBannerFlag(); + private final ModelLegacyWallBanner modelLegacyWallBanner = new ModelLegacyWallBanner(); + private final ModelLegacyWallBannerFlag modelLegacyWallBannerFlag = new ModelLegacyWallBannerFlag(); + + private final ModelBannerWall model = new ModelBannerWall(); + private final ModelBannerWallFlag flag = new ModelBannerWallFlag(); public BlockWallBannerRenderer(){ ((BlockWallBanner)CustomItems.wallBanner).renderId = RenderingRegistry.getNextAvailableRenderId(); @@ -42,29 +49,66 @@ public class BlockWallBannerRenderer extends BlockRendererInterface{ GL11.glRotatef(180, 0, 0, 1); GL11.glRotatef(90 * tile.rotation, 0, 1, 0); - setMaterialTexture(var1.getBlockMetadata()); - GL11.glColor3f(1, 1, 1); - model.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); + if(ConfigClient.LegacyBanner){ + setMaterialTexture(var1.getBlockMetadata()); + GL11.glColor3f(1, 1, 1); + modelLegacyWallBanner.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); - this.bindTexture(BlockBannerRenderer.legacyFlagResource); - float[] color = BlockBannerRenderer.colorTable[tile.color]; - GL11.glColor3f(color[0], color[1], color[2]); - flag.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); + this.bindTexture(BlockBannerRenderer.legacyFlagResource); + float[] color = BlockBannerRenderer.colorTable[tile.color]; + GL11.glColor3f(color[0], color[1], color[2]); + modelLegacyWallBannerFlag.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); - GL11.glPopMatrix(); - GL11.glColor3f(1, 1, 1); - if(tile.icon != null && !this.playerTooFar(tile)){ - doRender(var2, var4, var6, tile.rotation, tile.icon); + GL11.glPopMatrix(); + GL11.glColor3f(1, 1, 1); + if(tile.icon != null && !this.playerTooFar(tile)){ + doRender(var2, var4, var6, tile.rotation, tile.icon, 0); + } + } + else { + long worldTime = tile.getWorldObj() != null ? tile.getWorldObj().getTotalWorldTime() : 0; + // 100 is one full revolution, so we can just mod by 100 without affecting the result + int animationProgress100 = (((tile.xCoord % 100) * 7 + (tile.yCoord % 100) * 9 + (tile.zCoord % 100) * 13) + (int) (worldTime % 100)) % 100; + float f3 = (float) animationProgress100 + var8; + float angle_x = (-0.0125F + 0.01F * MathHelper.cos(f3 * 0.01F * 2F * (float) Math.PI)) * (float) Math.PI; + flag.BannerFlag.rotateAngleX = angle_x; + + BlockBannerRenderer.setBannerMaterial(var1.getBlockMetadata()); + model.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); + + BlockBannerRenderer.setFlagType(tile.variant); + float[] color = colorTable[tile.color]; + GL11.glPushMatrix(); + GL11.glColor3f(color[0], color[1], color[2]); + flag.render(null, 0, 0, 0, f3, 0.0F, 0.0625F); + GL11.glPopMatrix(); + + GL11.glPopMatrix(); + GL11.glColor3f(1, 1, 1); + if(tile.icon != null && !this.playerTooFar(tile)){ + doRender(var2, var4, var6, tile.rotation, tile.icon, angle_x); + } } } - public void doRender(double par2, double par4, double par6, int meta, ItemStack iicon) + public void doRender(double par2, double par4, double par6, int meta, ItemStack iicon, float rotate) { GL11.glPushMatrix(); bindTexture(TextureMap.locationItemsTexture); - GL11.glTranslatef((float)par2 + 0.5f, (float)par4 +0.2f, (float)par6 + 0.5f); + GL11.glTranslatef((float)par2 + 0.5f, (float)par4 + 0.2f, (float)par6 + 0.5f); GL11.glRotatef(180, 0, 0, 1); GL11.glRotatef(90 * meta, 0, 1, 0); - GL11.glTranslatef(0, 0, 0.26f); + + if(ConfigClient.LegacyBanner){ + GL11.glTranslatef(0, 0, 0.26f); + } + else { + GL11.glTranslatef(0, 0, 0.3f); + + GL11.glTranslatef(0, -0.6f, 0); // Translate to pivot point + GL11.glRotatef((float) Math.toDegrees(rotate), 1, 0, 0); // Apply sway rotation + GL11.glTranslatef(0, 0.6f, 0); // Translate to pivot point + } + GL11.glDepthMask(false); float f2 = 0.05f; Minecraft mc = Minecraft.getMinecraft(); @@ -148,14 +192,25 @@ public class BlockWallBannerRenderer extends BlockRendererInterface{ GL11.glRotatef(180, 0, 0, 1); GL11.glRotatef(180, 0, 1, 0); - setMaterialTexture(metadata); - GL11.glColor3f(1, 1, 1); - model.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); + if(ConfigClient.LegacyBanner){ + setMaterialTexture(metadata); + GL11.glColor3f(1, 1, 1); + modelLegacyWallBanner.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); - this.bindTexture(BlockBannerRenderer.legacyFlagResource); - float[] color = BlockBannerRenderer.colorTable[15 - metadata]; - GL11.glColor3f(color[0], color[1], color[2]); - flag.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); + this.bindTexture(BlockBannerRenderer.legacyFlagResource); + float[] color = BlockBannerRenderer.colorTable[15 - metadata]; + GL11.glColor3f(color[0], color[1], color[2]); + modelLegacyWallBannerFlag.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); + } + else { + BlockBannerRenderer.setBannerMaterial(metadata); + model.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); + + this.bindTexture(BlockBannerRenderer.normalFlag); + float[] color = colorTable[15 - metadata]; + GL11.glColor3f(color[0], color[1], color[2]); + flag.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); + } GL11.glPopMatrix(); } diff --git a/src/main/java/noppes/npcs/config/ConfigClient.java b/src/main/java/noppes/npcs/config/ConfigClient.java index 22ef51590..f44dda428 100644 --- a/src/main/java/noppes/npcs/config/ConfigClient.java +++ b/src/main/java/noppes/npcs/config/ConfigClient.java @@ -17,6 +17,7 @@ public class ConfigClient public final static String VISUAL = "Visual"; public final static String QUESTING = "Questing"; public final static String MODEL = "Model"; + public final static String TEXTURE = "Texture"; /** @@ -73,6 +74,11 @@ public class ConfigClient public static Property BannerAlertsProperty; public static boolean BannerAlerts = true; + /** + * Texture Properties + **/ + public static boolean WoodTextures = false; + /** * Model Properties **/ @@ -139,6 +145,8 @@ public class ConfigClient BannerAlertsProperty = config.get(VISUAL, "All Banner Alerts", true, "Universal enable/disable for Banner Alerts"); BannerAlerts = BannerAlertsProperty.getBoolean(true); + WoodTextures = config.get(TEXTURE, "Wood Textures", false, "Models like Chairs and Stools will use default MC Wood Textures").getBoolean(false); + LegacyCampfire = config.get(MODEL, "Legacy Campfire Model", false).getBoolean(false); LegacyBanner = config.get(MODEL, "Legacy Banner Model", false).getBoolean(false); LegacyBarrel = config.get(MODEL, "Legacy Barrel Model", false).getBoolean(false); diff --git a/src/main/java/noppes/npcs/constants/EnumBannerVariant.java b/src/main/java/noppes/npcs/constants/EnumBannerVariant.java new file mode 100644 index 000000000..343d14c3f --- /dev/null +++ b/src/main/java/noppes/npcs/constants/EnumBannerVariant.java @@ -0,0 +1,5 @@ +package noppes.npcs.constants; + +public enum EnumBannerVariant { + Normal, Curved, Pointy, Triangle, Torn +} diff --git a/src/main/resources/assets/customnpcs/textures/models/banner/flag/BannerFlag1.png b/src/main/resources/assets/customnpcs/textures/models/banner/flag/BannerFlag1.png deleted file mode 100644 index 03e0daa429e693cea2b62d4917bdaefb896fd676..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 270 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCikh0(?STckkZ4cJ11uM~?ypB)3jj3Q|`RygM1AJ9M0{3{@ZgeUD52SFX!`S;TO{sV{e%WGGenT zjAPdnYMcbATDT!HPfBx{Dx$=lh?bUwn;LQ)p=gm@0N-qBG zdce+Vx8@>^u2Y921P!ga*}G-F-4vYkc7bP*rC9!#4GVTL-!Wpl%2UQ226P64r>mdK II;Vst0AmPV<^TWy diff --git a/src/main/resources/assets/customnpcs/textures/models/banner/flag/BannerFlag2.png b/src/main/resources/assets/customnpcs/textures/models/banner/flag/BannerFlag2.png deleted file mode 100644 index ea3b68322c77c2ecf27210bea5f6529b448c1b83..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 282 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}S3F%DLn2z= zPB-K`tia=HAE?HErz^Nvn?LR{=My$91&gdJpWKB%&X-MY>^79M=$!d*Z~id`g_Z|h z4;soC6c!~dR990nzQ@pzTh;FQ_RO5qvyF06^_3FRq#M4(XD^#?@+sH*_Ep}s3j6Lc zb3c$|2xsd$D&RDW*>msQTswBRei6aOj=E$K{RY+z4D%R2Twi>Hv0>k=?FuE&Hiv)W znV{gNm5}(4?E-gVX5VK`4#gcINwHb7n@#i?Oj`1c()JzQ!^LnlMrqRK{fGCglz1Fi ey+<$d6{|{Yxpz$NEeW9i7(8A5T-G@yGywpaNoi#O diff --git a/src/main/resources/assets/customnpcs/textures/models/banner/flag/BannerFlag3.png b/src/main/resources/assets/customnpcs/textures/models/banner/flag/BannerFlag3.png deleted file mode 100644 index 6639685fd308503f930cec00dbe66d62a651399a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 297 zcmV+^0oMMBP)Px#<4Ht8R9J=WmoW~*APhx+P$mz#6(``hT*$Krujx`pQInJ;I4Y|6qe1wA;R_Er z=NTUo5lqumi~&H5ao7YeXaoQv+6)^n9km8cOSU=q=*Pa^dDB-0XjejXak^GE4Czi z@yD%LRhKV!&Us$XdEAQE$?^XCdmVWZfSGrjjTqy=%+CTaGg3;2olZ*09by4c)vw9d v5T4}-BC@G@Np>eZUP8dl2D7#)?J~Up9659R9hV%u00000NkvXXu0mjfi5hgO diff --git a/src/main/resources/assets/customnpcs/textures/models/banner/flag/BannerFlag4.png b/src/main/resources/assets/customnpcs/textures/models/banner/flag/BannerFlag4.png deleted file mode 100644 index 221b9c757a41a85cde975ccd401fa61f2b2a7fe5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 407 zcmV;I0cie-P)Px$QAtEWR9J=WS241MAPig_s}$7lF4UZWb8-SMWSt_dzsei+;Yc)ge;a2I+)W4@ z46U^l2QV{YjF)2okaG?{g9gk1Ktw+;M#evP>2cq?8^-e8kMm-}GvPXVELU zh=7@01WYl;9r+oy>CQO^UH4c31`COZpat7nTdxG01OPxvDU1|Vt<{YjdI~TYl_#;n zbPC=OG2w-@ng!gcW)BmB`ha3I3!XkOk9fclL$(D9bU2;s(hX~^>zxm|b;CP8;EA0NSc>ZvE4JVj zD_)kRd-Ls$c@!YFr$9tdO1ZohiHM5p}nk002ovPDHLkV1ja2 Bsh|J= diff --git a/src/main/resources/assets/customnpcs/textures/models/banner/flag/BannerFlag5.png b/src/main/resources/assets/customnpcs/textures/models/banner/flag/BannerFlag5.png deleted file mode 100644 index f2ad436b759ea003ac80c5093229354609198eb6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 270 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Cp=voLn2z= zPPgVeV!+`NzbHgxU#Q>P=)enU+F|!Zm)ug~&?_6k0zja9yTXy)$f7wgq}gg*Y@ zS<+C>u_H-CP_5;6!{Zkz?Y|G)jQ4U8nD~FgBasPAK?kf^mWVDFweRFRuw6O7b>><< z#kZD>(SmV|{!cnXzb@bZ_JZrA$D$d5*>j(DcX4YhZ4u1p%4pqk|KbtOPx#)=5M`R9J=WS1}U9APiG-ojl}Mc{RWC;I&=qoMRwR+B6xgiGbx33i!-~H&RMZ zI50DoWy!`Z^zhboodDorCy6Kvv~zx4M84tyz}&T^6R|nK%$r@RxV8%s0W-sLM|e8{ z`kzX6dbBM6gg3VWdXkOuG67d01l&u2Ef6i(*ijyQ9Z~i0H5s z_waDLGY|qoK-7V#16N?OAKIF$r6N)t!?f0;Ja`9mK?8l`SxYj?%N+1-lpYv9!LN9S i2}`f0vv`5P-|+&icEbb#;6=Ou0000Px#`AI}UR9J=WmN62;APfW#PbwAsiWlgeegVHyq1I^vg8>Ijk_iP@d9W5A2i9Ql zlK1{VCJ}+Pws>x-hjY#u0C=Q>L{t=}WBGek{fGmAt!qg?R7^lbVqC%T)hbjKB7&41 z;Z6p^KGovP)r$NMx3vm-CL84n1OL!6FqeU}L9~?Cj&jKRKv3&c*Z${G?$if*eDMeV`U=PtJppR5-p|n> R2gCpX002ovPDHLkV1l-Fhh+c& literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/customnpcs/textures/models/banner/flag/pointy.png b/src/main/resources/assets/customnpcs/textures/models/banner/flag/pointy.png new file mode 100644 index 0000000000000000000000000000000000000000..2bceb94cdf20eea9a35acb3f0dea6ca35b10b129 GIT binary patch literal 305 zcmV-10nYx3P)Px#>q$gGR9J=Wmpcx`APhu@Xe$@F6{q&CT)1VM1ra`h1!WUynJOQiGZ<_UgO8Zm zA(4n+-}mggr5?^&YXIOCKO~}TVEin7uc}iV0Bl`Tx=+#Xm4mVw(1{AD9D@eMP(-ln3e;b1w+Wd?eKr9o!6Y!g~*jbEqII+udXaK$R{ z!P0|gEyxU4Ekh5eYM8~@$7i{!nAw&7ny%uOmVT}`vuD$I{~aOo00000NkvXXu0mjf Di=}_M literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/customnpcs/textures/models/banner/flag/torn.png b/src/main/resources/assets/customnpcs/textures/models/banner/flag/torn.png new file mode 100644 index 0000000000000000000000000000000000000000..1eeb7c55d7e842c95b9ffbbc37f21d9e641098c6 GIT binary patch literal 447 zcmV;w0YLtVP)Px$c}YY;R9J=WmobvVAPhx6JEZt`;u#L@M=)xmk*wUoK#b85(R8q~&&qWM03f9_9gK+T1hjIU0Zi6{c950p z=D;vQb70wT>@Z76?|G4ph5S-H-DHdscwyZ?++2hp}|!<#U(n*O^S zv>IS$q?As-+nHJY0b=E*C*f~ALpuqzSLwbKS!tsfqqA~q2F_9|pEEPw?>9cdT`K3i pYyX(EwNG%T!EQqjxPSdUeFG~$M==EDUikn3002ovPDHLkV1lEz$Xx&c literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/customnpcs/textures/models/banner/flag/triangle.png b/src/main/resources/assets/customnpcs/textures/models/banner/flag/triangle.png new file mode 100644 index 0000000000000000000000000000000000000000..aed0c6050f427505b0136b3fcc2701f819507c99 GIT binary patch literal 328 zcmV-O0k{5%P)Px$0!c(cR9J=WmoW~*APhx6RVNR*l~2HNb0N8!Qs= z(!TExR8m!J+txgf5sZPCg)*7Y!40jt%@C2LX8Uz2(GH@*eWrG;0oIA^*?gL4qUEMp+v)o%B@E#{3 z0ug;|#U2iq+XKtMGO+qUFF^0Cd-{Nf!)Onf8JIaRb2yu3FL!7_MDooQuUo8$3_pIB z>lzRd#27<89%K9%Y=&zLm{~VS8LXGqSuPt;)m*!yAW5mV=_WnHH3m@pt$0+|d4^kB ax`dve%*?1iZP23t0000E(U;|NoB11}qsW+NT#zw^@0qg;9To z*WHOzOja&aalXhkW1Gt6oTFz-G@=;28_|MB_bsoTz3T~%QXD;^!J z2(!PWl93em_#bodwy&E1*A@O}l&E{XHL2)8&+Fv}19^BKJFSfS*_jX@2N-HZ?IMN-=1lm-(cSG`8~tdI!28M W!<{RSCDj9c&fw|l=d#Wzp$Pz6h^VXp delta 595 zcmV-Z0<8Uy1K$LY7k@wq1^@s6s%dfF00001b5ch_0Itp)=>Px%8A(JzRCt{2*S~Aq zKoke?uY(p_HsWb8IABORCR>-R9kcWg$dVy*|AlmD|AovQy7Uj|lA&Aa5Ga8xfe!gW z69~AVLs+WFkg9`p%2|=|*~CN^-_IhSc-Zp2cXv-MSUNn|Nq+~@0RV{Cg$g5x*98Em zFaiMFslNaKo4AjkPFl9Vy-bd6;6OTfwK)U;Jluy6e~7l*LlTc6z5oEkQ&3@K6;~J5 z6QH%-9+LbDAd*~_aNh=13$imQt?+d!SgBpyGxM!_u}?!&p_>SCcKu(i=Ic6SvVGtXB9r zzi*j}**!eiN%ijB_uZmbKR((|VRUkuUe~+tKG&kBUsSONjDi?_-z`3CDo_w#vKBTk zOI@<%vR_55m_+8+~NRzAbCteK_Vc6%s~o6bSSj$O4YH`R==D5k6?8wU+lgHz)JSHL{A|fIpA|fIpA|fIp hA|fIpA|j#{^B-DKcVg0$m7@Rv002ovPDHLkV1oHR9Y6p8 From 26f4158c17e339850b7dbb56ac7a36959b4731ba Mon Sep 17 00:00:00 2001 From: Kam Date: Mon, 27 Jan 2025 23:21:30 -0500 Subject: [PATCH 7/8] Legacy Carpentry Bench Support --- .../legacy/ModelLegacyCarpentryBench.java | 113 ++++++++++++++++++ .../renderer/blocks/BlockBannerRenderer.java | 2 +- .../blocks/BlockCarpentryBenchRenderer.java | 33 +++-- .../{BannerFlag.png => legacy/banner.png} | Bin .../textures/models/legacy/bench.png | Bin 0 -> 1727 bytes 5 files changed, 139 insertions(+), 9 deletions(-) create mode 100644 src/main/java/noppes/npcs/client/model/blocks/legacy/ModelLegacyCarpentryBench.java rename src/main/resources/assets/customnpcs/textures/models/{BannerFlag.png => legacy/banner.png} (100%) create mode 100644 src/main/resources/assets/customnpcs/textures/models/legacy/bench.png diff --git a/src/main/java/noppes/npcs/client/model/blocks/legacy/ModelLegacyCarpentryBench.java b/src/main/java/noppes/npcs/client/model/blocks/legacy/ModelLegacyCarpentryBench.java new file mode 100644 index 000000000..9ccbd93e2 --- /dev/null +++ b/src/main/java/noppes/npcs/client/model/blocks/legacy/ModelLegacyCarpentryBench.java @@ -0,0 +1,113 @@ +package noppes.npcs.client.model.blocks.legacy; + +import net.minecraft.client.model.ModelBase; +import net.minecraft.client.model.ModelRenderer; +import net.minecraft.entity.Entity; + +public class ModelLegacyCarpentryBench extends ModelBase { + // fields + ModelRenderer Leg1; + ModelRenderer Leg2; + ModelRenderer Leg3; + ModelRenderer Leg4; + ModelRenderer Bottom_plate; + ModelRenderer Desktop; + ModelRenderer Backboard; + ModelRenderer Vice_Jaw1; + ModelRenderer Vice_Jaw2; + ModelRenderer Vice_Base1; + ModelRenderer Vice_Base2; + ModelRenderer Vice_Crank; + ModelRenderer Vice_Screw; + ModelRenderer Blueprint; + + public ModelLegacyCarpentryBench() { + this.textureWidth = 128; + this.textureHeight = 64; + + Leg1 = new ModelRenderer(this, 0, 0); + Leg1.addBox(0F, 0F, 0F, 2, 14, 2); + Leg1.setRotationPoint(6F, 10F, 5F); + + Leg2 = new ModelRenderer(this, 0, 0); + Leg2.addBox(0F, 0F, 0F, 2, 14, 2); + Leg2.setRotationPoint(6F, 10F, -5F); + + Leg3 = new ModelRenderer(this, 0, 0); + Leg3.addBox(0F, 0F, 0F, 2, 14, 2); + Leg3.setRotationPoint(-8F, 10F, 5F); + + Leg4 = new ModelRenderer(this, 0, 0); + Leg4.addBox(0F, 0F, 0F, 2, 14, 2); + Leg4.setRotationPoint(-8F, 10F, -5F); + + Bottom_plate = new ModelRenderer(this, 0, 24); + Bottom_plate.addBox(0F, 0F, 0F, 14, 1, 10); + Bottom_plate.setRotationPoint(-7F, 21F, -4F); + Bottom_plate.setTextureSize(130, 64); + + Desktop = new ModelRenderer(this, 0, 3); + Desktop.addBox(0F, 0F, 0F, 18, 2, 13); + Desktop.setRotationPoint(-9F, 9F, -6F); + + Backboard = new ModelRenderer(this, 0, 18); + Backboard.addBox(-1F, 0F, 0F, 18, 5, 1); + Backboard.setRotationPoint(-8F, 7F, 7F); + + Vice_Jaw1 = new ModelRenderer(this, 54, 18); + Vice_Jaw1.addBox(0F, 0F, 0F, 3, 2, 1); + Vice_Jaw1.setRotationPoint(3F, 6F, -8F); + + Vice_Jaw2 = new ModelRenderer(this, 54, 21); + Vice_Jaw2.addBox(0F, 0F, 0F, 3, 2, 1); + Vice_Jaw2.setRotationPoint(3F, 6F, -6F); + + Vice_Base1 = new ModelRenderer(this, 38, 30); + Vice_Base1.addBox(0F, 0F, 0F, 3, 1, 3); + Vice_Base1.setRotationPoint(3F, 8F, -5F); + + Vice_Base2 = new ModelRenderer(this, 38, 25); + Vice_Base2.addBox(0F, 0F, 0F, 1, 2, 2); + Vice_Base2.setRotationPoint(4F, 7F, -5F); + + Vice_Crank = new ModelRenderer(this, 54, 24); + Vice_Crank.addBox(0F, 0F, 0F, 1, 5, 1); + Vice_Crank.setRotationPoint(6F, 6F, -9F); + + Vice_Screw = new ModelRenderer(this, 44, 25); + Vice_Screw.addBox(0F, 0F, 0F, 1, 1, 4); + Vice_Screw.setRotationPoint(4F, 8F, -8F); + + Blueprint = new ModelRenderer(this, 31, 18); + Blueprint.addBox(0F, 0F, 0F, 8, 0, 7); + Blueprint.setRotationPoint(0F, 9F, 1F); + setRotation(Blueprint, 0.3271718F, 0.1487144F, 0F); + } + + public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { + super.render(entity, f, f1, f2, f3, f4, f5); + setRotationAngles(f, f1, f2, f3, f4, f5,entity); + Leg1.render(f5); + Leg2.render(f5); + Leg3.render(f5); + Leg4.render(f5); + Bottom_plate.render(f5); + Desktop.render(f5); + Backboard.render(f5); + Vice_Jaw1.render(f5); + Vice_Jaw2.render(f5); + Vice_Base1.render(f5); + Vice_Base2.render(f5); + Vice_Crank.render(f5); + Vice_Screw.render(f5); + Blueprint.render(f5); + } + + private void setRotation(ModelRenderer model, float x, float y, float z) { + model.rotateAngleX = x; + model.rotateAngleY = y; + model.rotateAngleZ = z; + } + + +} diff --git a/src/main/java/noppes/npcs/client/renderer/blocks/BlockBannerRenderer.java b/src/main/java/noppes/npcs/client/renderer/blocks/BlockBannerRenderer.java index 2bfc59e26..d7e19393e 100644 --- a/src/main/java/noppes/npcs/client/renderer/blocks/BlockBannerRenderer.java +++ b/src/main/java/noppes/npcs/client/renderer/blocks/BlockBannerRenderer.java @@ -32,7 +32,7 @@ public class BlockBannerRenderer extends BlockRendererInterface{ private final ModelBannerFloor banner = new ModelBannerFloor(); private final ModelBannerFloorFlag flag = new ModelBannerFloorFlag(); - public static final ResourceLocation legacyFlagResource = new ResourceLocation("customnpcs","textures/models/BannerFlag.png"); + public static final ResourceLocation legacyFlagResource = new ResourceLocation("customnpcs","textures/models/legacy/banner.png"); public static final ResourceLocation normalFlag = new ResourceLocation("customnpcs","textures/models/banner/flag/normal.png"); public static final ResourceLocation pointyFlag = new ResourceLocation("customnpcs","textures/models/banner/flag/pointy.png"); diff --git a/src/main/java/noppes/npcs/client/renderer/blocks/BlockCarpentryBenchRenderer.java b/src/main/java/noppes/npcs/client/renderer/blocks/BlockCarpentryBenchRenderer.java index 81a8de7d3..70df788b1 100644 --- a/src/main/java/noppes/npcs/client/renderer/blocks/BlockCarpentryBenchRenderer.java +++ b/src/main/java/noppes/npcs/client/renderer/blocks/BlockCarpentryBenchRenderer.java @@ -12,15 +12,21 @@ import noppes.npcs.CustomItems; import noppes.npcs.blocks.BlockCarpentryBench; import noppes.npcs.client.model.blocks.ModelAnvil; import noppes.npcs.client.model.blocks.ModelCarpentryBench; +import noppes.npcs.client.model.blocks.legacy.ModelLegacyCarpentryBench; +import noppes.npcs.config.ConfigClient; import org.lwjgl.opengl.GL11; public class BlockCarpentryBenchRenderer extends TileEntitySpecialRenderer implements ISimpleBlockRenderingHandler{ - private final ModelCarpentryBench model = new ModelCarpentryBench(); - private final ModelAnvil anvil = new ModelAnvil(); - private static final ResourceLocation anvilTexture = new ResourceLocation("customnpcs","textures/models/Steel.png"); - private static final ResourceLocation carpentryBench = new ResourceLocation("customnpcs","textures/models/CarpentryBench.png"); + private final ModelCarpentryBench modelCarpentryBench = new ModelCarpentryBench(); + private static final ResourceLocation carpentryBenchTexture = new ResourceLocation("customnpcs","textures/models/CarpentryBench.png"); + private final ModelAnvil anvil = new ModelAnvil(); + + private static final ResourceLocation anvilTexture = new ResourceLocation("customnpcs","textures/models/Steel.png"); + + private final ModelLegacyCarpentryBench legacyBench = new ModelLegacyCarpentryBench(); + private static final ResourceLocation legacyCarpentryBench = new ResourceLocation("customnpcs","textures/models/legacy/bench.png"); public BlockCarpentryBenchRenderer(){ ((BlockCarpentryBench)CustomItems.carpentyBench).renderId = RenderingRegistry.getNextAvailableRenderId(); @@ -41,9 +47,15 @@ public class BlockCarpentryBenchRenderer extends TileEntitySpecialRenderer imple anvil.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); } else { + GL11.glEnable(GL11.GL_ALPHA_TEST); - this.bindTexture(carpentryBench); - model.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); + if(ConfigClient.LegacyCarpentryBench){ + this.bindTexture(legacyCarpentryBench); + legacyBench.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); + } else { + this.bindTexture(carpentryBenchTexture); + modelCarpentryBench.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); + } GL11.glDisable(GL11.GL_ALPHA_TEST); } GL11.glPopMatrix(); @@ -60,8 +72,13 @@ public class BlockCarpentryBenchRenderer extends TileEntitySpecialRenderer imple GL11.glColor3f(1, 1, 1); if(metadata == 0){ - this.bindTexture(carpentryBench); - model.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); + if(ConfigClient.LegacyCarpentryBench){ + this.bindTexture(legacyCarpentryBench); + legacyBench.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); + } else { + this.bindTexture(carpentryBenchTexture); + modelCarpentryBench.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); + } } else{ this.bindTexture(anvilTexture); diff --git a/src/main/resources/assets/customnpcs/textures/models/BannerFlag.png b/src/main/resources/assets/customnpcs/textures/models/legacy/banner.png similarity index 100% rename from src/main/resources/assets/customnpcs/textures/models/BannerFlag.png rename to src/main/resources/assets/customnpcs/textures/models/legacy/banner.png diff --git a/src/main/resources/assets/customnpcs/textures/models/legacy/bench.png b/src/main/resources/assets/customnpcs/textures/models/legacy/bench.png new file mode 100644 index 0000000000000000000000000000000000000000..e94ff193695782921584591994ef11166312a4ed GIT binary patch literal 1727 zcmV;w20;0VP)~r?sXV1y3^?lzy zXHqEK!RY7D*%!yU3~kS$Cyo7qIzj(OPlo~O5foevz>J{t1NRsfGXSXbfwO1NT7Q4P z4Gav}$jFGDJ9o~;#>Q-Xd_1+}V)Jkgo;hqWg@X^8rL6MMZRb(J44v(i;HB-T+=~@ZA^I%@di&Y5*LE0cwOA z0Bt1$3=R(3hi`06gaM|erc#S+0CJ4X>OXn%Wa8V09!rGiN{;Cq--k8y{sL8i5znZl z0T`(|A3z3R)I<0+58OX5xYl4ab=W%8le$S1E4hESmy)C0KTTf09x<0=Ia z24FPneBk`~^9v#xqH;rsbC|-H1`=zc^-lpH1ZDjPv+6!Ggg*}h)Ce_zF9~@Dz*B(M zb!HF{CeSjV^H~Cz?!D+)WkBmc86}`bcmpu)S26%H0LAtZ&J2L-d?9YeY-@n&%TE;D;Qs_r zcqRKOm=};4K(F!i*Z6*B8Q)iE_|bX?%+_|@u)?aD()ssRSb5F%c9#s$@N-22Y}~lf zKtz5^ON(vUvL%@S$6a07o7=jCk2+5ZbvH^tGC)c6?=IX*(Oy{jQ;9#=-dAR9;=vdk%c%k8!lHkAFzV7R`ZqJ|g+Ixun z>!}ZhP{EZ*{eBOydGqFE0_*{h8T5OoTVzG0k5)epVKl1I@Am+wKHfiX4bQCgd?xU7 z?|ay6#iPI3;I}vJ>u+w`(G!2nML+fit8Y~_KvPpws{I=_Y)Jb6M1HYYESCfQ9s(6` z^x)(6{LV+puXsW9fp0!FH`deBQ|?n@&NFQfrIz!R>_@w%-K=<^^dzu$=8oudEFPGn z3a$hocFHD!+Cd>9JcLB6LgKBQ3d!rT#HJ~{NqEf9!lZQ7JXtmIq%V zytvE|K7;7|yiJ_mS6&9trwknrR0$PQ4d6v&d7v>!Um7$sU|m0^pHDF2*`mh#bF}CS z11vLCNWdF_^u_@5YP{|Vbj*LYf1R84Hcy`bl!0YHmQcD6(E86kfD+N}vxAlf%>b2N z=c?e!z%oEZq>w(^eeGwT&knvUXwCO!0LT8bbt9;6^HgwUU>TqyQb>SxpY%dznSkb? z0n}LF`t|E`H-gLtXki45tLR~XCBmm)eQd)yT0f^!glEm;+WtDOz1Ve2SzrI2Kp+qZ z1OkCTAP@)y0)apv5C{YUfj}S-2m}IwKp+qZ1OkCTAP@)y0)apv5C{YUfk5D%#lNUI V=$88WJN^Iw002ovPDHLkV1m+*P1*ne literal 0 HcmV?d00001 From c95341b60ba344f481cfd344c2e08d83d2d2bae6 Mon Sep 17 00:00:00 2001 From: Kam Date: Tue, 28 Jan 2025 01:12:41 -0500 Subject: [PATCH 8/8] Stool and Chair Models Completed --- .../client/model/blocks/chair/ModelChair.java | 41 +++++++++++++ .../ModelChairSpoof.java} | 6 +- .../{ => legacy/couch}/ModelCouchCorner.java | 18 +++--- .../couch}/ModelCouchCornerWool.java | 10 ++-- .../{ => legacy/couch}/ModelCouchLeft.java | 14 ++--- .../couch}/ModelCouchLeftWool.java | 4 +- .../{ => legacy/couch}/ModelCouchMiddle.java | 18 +++--- .../couch}/ModelCouchMiddleWool.java | 12 ++-- .../{ => legacy/couch}/ModelCouchRight.java | 14 ++--- .../couch}/ModelCouchRightWool.java | 4 +- .../couch}/ModelCouchWoodLeft.java | 36 ++++++------ .../couch}/ModelCouchWoodMiddle.java | 4 +- .../couch}/ModelCouchWoodRight.java | 2 +- .../couch}/ModelCouchWoodSingle.java | 18 +++--- .../renderer/blocks/BlockChairRenderer.java | 54 +++++++++++++++--- .../blocks/BlockCouchWoodRenderer.java | 14 ++--- .../blocks/BlockCouchWoolRenderer.java | 6 +- .../blocks/BlockRendererInterface.java | 16 ------ .../renderer/blocks/BlockStoolRenderer.java | 19 +++--- .../textures/models/chair/acacia.png | Bin 0 -> 900 bytes .../textures/models/chair/birch.png | Bin 0 -> 991 bytes .../textures/models/chair/dark_oak.png | Bin 0 -> 970 bytes .../textures/models/chair/jungle.png | Bin 0 -> 920 bytes .../customnpcs/textures/models/chair/oak.png | Bin 0 -> 985 bytes .../textures/models/chair/spruce.png | Bin 0 -> 941 bytes .../textures/models/stool/acacia.png | Bin 0 -> 595 bytes .../textures/models/stool/birch.png | Bin 0 -> 621 bytes .../textures/models/stool/dark_oak.png | Bin 0 -> 590 bytes .../textures/models/stool/jungle.png | Bin 0 -> 617 bytes .../customnpcs/textures/models/stool/oak.png | Bin 399 -> 635 bytes .../textures/models/stool/spruce.png | Bin 0 -> 593 bytes 31 files changed, 190 insertions(+), 120 deletions(-) create mode 100644 src/main/java/noppes/npcs/client/model/blocks/chair/ModelChair.java rename src/main/java/noppes/npcs/client/model/blocks/{ModelChair.java => chair/ModelChairSpoof.java} (93%) rename src/main/java/noppes/npcs/client/model/blocks/{ => legacy/couch}/ModelCouchCorner.java (96%) rename src/main/java/noppes/npcs/client/model/blocks/{ => legacy/couch}/ModelCouchCornerWool.java (92%) rename src/main/java/noppes/npcs/client/model/blocks/{ => legacy/couch}/ModelCouchLeft.java (96%) rename src/main/java/noppes/npcs/client/model/blocks/{ => legacy/couch}/ModelCouchLeftWool.java (93%) rename src/main/java/noppes/npcs/client/model/blocks/{ => legacy/couch}/ModelCouchMiddle.java (94%) rename src/main/java/noppes/npcs/client/model/blocks/{ => legacy/couch}/ModelCouchMiddleWool.java (90%) rename src/main/java/noppes/npcs/client/model/blocks/{ => legacy/couch}/ModelCouchRight.java (96%) rename src/main/java/noppes/npcs/client/model/blocks/{ => legacy/couch}/ModelCouchRightWool.java (94%) rename src/main/java/noppes/npcs/client/model/blocks/{ => legacy/couch}/ModelCouchWoodLeft.java (97%) rename src/main/java/noppes/npcs/client/model/blocks/{ => legacy/couch}/ModelCouchWoodMiddle.java (98%) rename src/main/java/noppes/npcs/client/model/blocks/{ => legacy/couch}/ModelCouchWoodRight.java (98%) rename src/main/java/noppes/npcs/client/model/blocks/{ => legacy/couch}/ModelCouchWoodSingle.java (98%) create mode 100644 src/main/resources/assets/customnpcs/textures/models/chair/acacia.png create mode 100644 src/main/resources/assets/customnpcs/textures/models/chair/birch.png create mode 100644 src/main/resources/assets/customnpcs/textures/models/chair/dark_oak.png create mode 100644 src/main/resources/assets/customnpcs/textures/models/chair/jungle.png create mode 100644 src/main/resources/assets/customnpcs/textures/models/chair/oak.png create mode 100644 src/main/resources/assets/customnpcs/textures/models/chair/spruce.png create mode 100644 src/main/resources/assets/customnpcs/textures/models/stool/acacia.png create mode 100644 src/main/resources/assets/customnpcs/textures/models/stool/birch.png create mode 100644 src/main/resources/assets/customnpcs/textures/models/stool/dark_oak.png create mode 100644 src/main/resources/assets/customnpcs/textures/models/stool/jungle.png create mode 100644 src/main/resources/assets/customnpcs/textures/models/stool/spruce.png diff --git a/src/main/java/noppes/npcs/client/model/blocks/chair/ModelChair.java b/src/main/java/noppes/npcs/client/model/blocks/chair/ModelChair.java new file mode 100644 index 000000000..84bff4eac --- /dev/null +++ b/src/main/java/noppes/npcs/client/model/blocks/chair/ModelChair.java @@ -0,0 +1,41 @@ +package noppes.npcs.client.model.blocks.chair; + +import net.minecraft.client.model.ModelBase; +import net.minecraft.client.model.ModelBox; +import net.minecraft.client.model.ModelRenderer; +import net.minecraft.entity.Entity; + +public class ModelChair extends ModelBase { + private final ModelRenderer bb_main; + + public ModelChair(){ + textureWidth = 64; + textureHeight = 32; + + bb_main = new ModelRenderer(this); + bb_main.setRotationPoint(0.0F, 24.0F, 0.0F); + bb_main.cubeList.add(new ModelBox(bb_main, 0, 17, 4.0F, -6.0F, 4.0F, 2, 6, 2, 0.0F)); + bb_main.cubeList.add(new ModelBox(bb_main, 0, 17, -6.0F, -6.0F, 4.0F, 2, 6, 2, 0.0F)); + bb_main.cubeList.add(new ModelBox(bb_main, 0, 17, -6.0F, -6.0F, -6.0F, 2, 6, 2, 0.0F)); + bb_main.cubeList.add(new ModelBox(bb_main, 0, 17, 4.0F, -6.0F, -6.0F, 2, 6, 2, 0.0F)); + bb_main.cubeList.add(new ModelBox(bb_main, 0, 0, -6.0F, -8.0F, -6.0F, 12, 2, 12, 0.0F)); + bb_main.cubeList.add(new ModelBox(bb_main, 8, 17, 4.0F, -20.0F, 4.0F, 2, 12, 2, 0.0F)); + bb_main.cubeList.add(new ModelBox(bb_main, 8, 17, -6.0F, -20.0F, 4.0F, 2, 12, 2, 0.0F)); + bb_main.cubeList.add(new ModelBox(bb_main, 16, 18, -4.0F, -19.0F, 5.0F, 8, 11, 0, 0.0F)); + bb_main.cubeList.add(new ModelBox(bb_main, 16, 8, 5.0F, -4.0F, -4.0F, 0, 2, 8, 0.0F)); + bb_main.cubeList.add(new ModelBox(bb_main, 16, 16, -4.0F, -4.0F, -5.0F, 8, 2, 0, 0.0F)); + bb_main.cubeList.add(new ModelBox(bb_main, 16, 8, -5.0F, -4.0F, -4.0F, 0, 2, 8, 0.0F)); + bb_main.cubeList.add(new ModelBox(bb_main, 16, 16, -4.0F, -4.0F, 5.0F, 8, 2, 0, 0.0F)); + } + + @Override + public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { + bb_main.render(f5); + } + + public void setRotationAngle(ModelRenderer modelRenderer, float x, float y, float z) { + modelRenderer.rotateAngleX = x; + modelRenderer.rotateAngleY = y; + modelRenderer.rotateAngleZ = z; + } +} diff --git a/src/main/java/noppes/npcs/client/model/blocks/ModelChair.java b/src/main/java/noppes/npcs/client/model/blocks/chair/ModelChairSpoof.java similarity index 93% rename from src/main/java/noppes/npcs/client/model/blocks/ModelChair.java rename to src/main/java/noppes/npcs/client/model/blocks/chair/ModelChairSpoof.java index 6f7f94e46..eccad5767 100644 --- a/src/main/java/noppes/npcs/client/model/blocks/ModelChair.java +++ b/src/main/java/noppes/npcs/client/model/blocks/chair/ModelChairSpoof.java @@ -1,4 +1,4 @@ -package noppes.npcs.client.model.blocks; +package noppes.npcs.client.model.blocks.chair; import net.minecraft.client.model.ModelBase; @@ -6,11 +6,11 @@ import net.minecraft.client.model.ModelBox; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; -public class ModelChair extends ModelBase { +public class ModelChairSpoof extends ModelBase { private final ModelRenderer chairBase; - public ModelChair() { + public ModelChairSpoof() { textureWidth = 64; textureHeight = 32; diff --git a/src/main/java/noppes/npcs/client/model/blocks/ModelCouchCorner.java b/src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelCouchCorner.java similarity index 96% rename from src/main/java/noppes/npcs/client/model/blocks/ModelCouchCorner.java rename to src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelCouchCorner.java index 36f02c5a5..180c0b15e 100644 --- a/src/main/java/noppes/npcs/client/model/blocks/ModelCouchCorner.java +++ b/src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelCouchCorner.java @@ -1,4 +1,4 @@ -package noppes.npcs.client.model.blocks; +package noppes.npcs.client.model.blocks.legacy.couch; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; @@ -19,35 +19,35 @@ public class ModelCouchCorner extends ModelBase { Leg1 = new ModelRenderer(this, 0, 0); Leg1.addBox(0F, 0F, 0F, 1, 1, 2); Leg1.setRotationPoint(7F, 23F, 6F); - + Leg2 = new ModelRenderer(this, 0, 0); Leg2.addBox(0F, 0F, 0F, 2, 1, 1); Leg2.setRotationPoint(4F, 23F, -8F); - + Leg3 = new ModelRenderer(this, 0, 0); Leg3.addBox(0F, 0F, 0F, 2, 1, 1); Leg3.setRotationPoint(-8F, 23F, -8F); - + Leg4 = new ModelRenderer(this, 0, 0); Leg4.addBox(0F, 0F, 0F, 2, 1, 2); Leg4.setRotationPoint(-8F, 23F, 6F); - + Leg5 = new ModelRenderer(this, 0, 0); Leg5.addBox(0F, 0F, 0F, 1, 1, 2); Leg5.setRotationPoint(7F, 23F, -6F); - + Back = new ModelRenderer(this, 1, 1); Back.addBox(0F, 0F, 0F, 1, 15, 15); Back.setRotationPoint(-8F, 6F, -8F); - + Back2 = new ModelRenderer(this, 14, 15); Back2.addBox(0F, 0F, 0F, 16, 15, 1); Back2.setRotationPoint(-8F, 6F, 7F); - + Bottom = new ModelRenderer(this, 4, 0); Bottom.addBox(0F, 0F, 0F, 16, 2, 14); Bottom.setRotationPoint(-8F, 21F, -6F); - + Bottom2 = new ModelRenderer(this, 0, 0); Bottom2.addBox(0F, 0F, 0F, 14, 2, 2); Bottom2.setRotationPoint(-8F, 21F, -8F); diff --git a/src/main/java/noppes/npcs/client/model/blocks/ModelCouchCornerWool.java b/src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelCouchCornerWool.java similarity index 92% rename from src/main/java/noppes/npcs/client/model/blocks/ModelCouchCornerWool.java rename to src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelCouchCornerWool.java index 69bfaa4d6..a35306c59 100644 --- a/src/main/java/noppes/npcs/client/model/blocks/ModelCouchCornerWool.java +++ b/src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelCouchCornerWool.java @@ -1,4 +1,4 @@ -package noppes.npcs.client.model.blocks; +package noppes.npcs.client.model.blocks.legacy.couch; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; @@ -10,19 +10,19 @@ public class ModelCouchCornerWool extends ModelBase { ModelRenderer Wool3; ModelRenderer Wool4; - public ModelCouchCornerWool() { + public ModelCouchCornerWool() { Wool1 = new ModelRenderer(this, 11, 3); Wool1.addBox(0F, 0F, 0F, 13, 5, 2); Wool1.setRotationPoint(-7F, 16F, -8F); - + Wool2 = new ModelRenderer(this, 2, 4); Wool2.addBox(0F, 0F, 0F, 2, 10, 13); Wool2.setRotationPoint(-7F, 6F, -8F); - + Wool3 = new ModelRenderer(this, 14, 15); Wool3.addBox(0F, 0F, 0F, 15, 10, 2); Wool3.setRotationPoint(-7F, 6F, 5F); - + Wool4 = new ModelRenderer(this, 0, 45); Wool4.addBox(0F, 0F, 0F, 15, 5, 13); Wool4.setRotationPoint(-7F, 16F, -6F); diff --git a/src/main/java/noppes/npcs/client/model/blocks/ModelCouchLeft.java b/src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelCouchLeft.java similarity index 96% rename from src/main/java/noppes/npcs/client/model/blocks/ModelCouchLeft.java rename to src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelCouchLeft.java index c07f32051..3deb6a847 100644 --- a/src/main/java/noppes/npcs/client/model/blocks/ModelCouchLeft.java +++ b/src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelCouchLeft.java @@ -1,4 +1,4 @@ -package noppes.npcs.client.model.blocks; +package noppes.npcs.client.model.blocks.legacy.couch; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; @@ -17,27 +17,27 @@ public class ModelCouchLeft extends ModelBase { Leg1 = new ModelRenderer(this, 0, 0); Leg1.addBox(0F, 0F, 0F, 2, 1, 2); Leg1.setRotationPoint(-8F, 23F, 6F); - + Leg2 = new ModelRenderer(this, 0, 0); Leg2.addBox(0F, 0F, 0F, 1, 1, 2); Leg2.setRotationPoint(7F, 23F, -6F); - + Leg3 = new ModelRenderer(this, 0, 0); Leg3.addBox(0F, 0F, 0F, 2, 1, 2); Leg3.setRotationPoint(-8F, 23F, -6F); - + Leg4 = new ModelRenderer(this, 0, 0); Leg4.addBox(0F, 0F, 0F, 1, 1, 2); Leg4.setRotationPoint(7F, 23F, 6F); - + Back = new ModelRenderer(this, 1, 15); Back.addBox(0F, 0F, 0F, 14, 15, 1); Back.setRotationPoint(-6F, 6F, 7F); - + Side = new ModelRenderer(this, 1, 28); Side.addBox(0F, 0F, 0F, 2, 11, 14); Side.setRotationPoint(-8F, 12F, -6F); - + Bottom = new ModelRenderer(this, 3, 1); Bottom.addBox(0F, 0F, 0F, 14, 2, 14); Bottom.setRotationPoint(-6F, 21F, -6F); diff --git a/src/main/java/noppes/npcs/client/model/blocks/ModelCouchLeftWool.java b/src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelCouchLeftWool.java similarity index 93% rename from src/main/java/noppes/npcs/client/model/blocks/ModelCouchLeftWool.java rename to src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelCouchLeftWool.java index 039d843ba..6957a129b 100644 --- a/src/main/java/noppes/npcs/client/model/blocks/ModelCouchLeftWool.java +++ b/src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelCouchLeftWool.java @@ -1,4 +1,4 @@ -package noppes.npcs.client.model.blocks; +package noppes.npcs.client.model.blocks.legacy.couch; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; @@ -12,7 +12,7 @@ public class ModelCouchLeftWool extends ModelBase { Wool1 = new ModelRenderer(this, 3, 0); Wool1.addBox(0F, 0F, 0F, 14, 5, 13); Wool1.setRotationPoint(-6F, 16F, -6F); - + Wool2 = new ModelRenderer(this, 14, 0); Wool2.addBox(0F, 0F, 0F, 14, 10, 2); Wool2.setRotationPoint(-6F, 6F, 5F); diff --git a/src/main/java/noppes/npcs/client/model/blocks/ModelCouchMiddle.java b/src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelCouchMiddle.java similarity index 94% rename from src/main/java/noppes/npcs/client/model/blocks/ModelCouchMiddle.java rename to src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelCouchMiddle.java index 563b9ff20..15648b0d6 100644 --- a/src/main/java/noppes/npcs/client/model/blocks/ModelCouchMiddle.java +++ b/src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelCouchMiddle.java @@ -1,4 +1,4 @@ -package noppes.npcs.client.model.blocks; +package noppes.npcs.client.model.blocks.legacy.couch; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; @@ -13,33 +13,33 @@ public class ModelCouchMiddle extends ModelBase ModelRenderer Leg4; ModelRenderer Bottom; ModelRenderer Back; - + public ModelCouchMiddle(){ Leg1 = new ModelRenderer(this, 0, 0); Leg1.addBox(0F, 0F, 0F, 1, 1, 2); Leg1.setRotationPoint(7F, 23F, 6F); - + Leg2 = new ModelRenderer(this, 0, 0); Leg2.addBox(0F, 0F, 0F, 1, 1, 2); Leg2.setRotationPoint(7F, 23F, -6F); - + Leg3 = new ModelRenderer(this, 0, 0); Leg3.addBox(0F, 0F, 0F, 1, 1, 2); Leg3.setRotationPoint(-8F, 23F, -6F); - + Leg4 = new ModelRenderer(this, 0, 0); Leg4.addBox(0F, 0F, 0F, 1, 1, 2); Leg4.setRotationPoint(-8F, 23F, 6F); - + Bottom = new ModelRenderer(this, 2, 0); Bottom.addBox(0F, 0F, 0F, 16, 2, 14); Bottom.setRotationPoint(-8F, 21F, -6F); - + Back = new ModelRenderer(this, 14, 15); Back.addBox(0F, 0F, 0F, 16, 15, 1); Back.setRotationPoint(-8F, 6F, 7F); } - + public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { super.render(entity, f, f1, f2, f3, f4, f5); @@ -50,7 +50,7 @@ public class ModelCouchMiddle extends ModelBase Bottom.render(f5); Back.render(f5); } - + private void setRotation(ModelRenderer model, float x, float y, float z) { model.rotateAngleX = x; diff --git a/src/main/java/noppes/npcs/client/model/blocks/ModelCouchMiddleWool.java b/src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelCouchMiddleWool.java similarity index 90% rename from src/main/java/noppes/npcs/client/model/blocks/ModelCouchMiddleWool.java rename to src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelCouchMiddleWool.java index 8746975b6..6729a8915 100644 --- a/src/main/java/noppes/npcs/client/model/blocks/ModelCouchMiddleWool.java +++ b/src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelCouchMiddleWool.java @@ -1,4 +1,4 @@ -package noppes.npcs.client.model.blocks; +package noppes.npcs.client.model.blocks.legacy.couch; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; @@ -8,24 +8,24 @@ public class ModelCouchMiddleWool extends ModelBase { ModelRenderer Wool1; ModelRenderer Wool2; - - public ModelCouchMiddleWool(){ + + public ModelCouchMiddleWool(){ Wool1 = new ModelRenderer(this, 3, 0); Wool1.addBox(0F, 0F, 0F, 16, 5, 13); Wool1.setRotationPoint(-8F, 16F, -6F); - + Wool2 = new ModelRenderer(this, 14, 0); Wool2.addBox(0F, 0F, 0F, 16, 10, 2); Wool2.setRotationPoint(-8F, 6F, 5F); } - + public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { super.render(entity, f, f1, f2, f3, f4, f5); Wool1.render(f5); Wool2.render(f5); } - + private void setRotation(ModelRenderer model, float x, float y, float z) { model.rotateAngleX = x; diff --git a/src/main/java/noppes/npcs/client/model/blocks/ModelCouchRight.java b/src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelCouchRight.java similarity index 96% rename from src/main/java/noppes/npcs/client/model/blocks/ModelCouchRight.java rename to src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelCouchRight.java index 33f96e40c..517ebc831 100644 --- a/src/main/java/noppes/npcs/client/model/blocks/ModelCouchRight.java +++ b/src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelCouchRight.java @@ -1,4 +1,4 @@ -package noppes.npcs.client.model.blocks; +package noppes.npcs.client.model.blocks.legacy.couch; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; @@ -18,29 +18,29 @@ public class ModelCouchRight extends ModelBase { Leg1 = new ModelRenderer(this, 0, 0); Leg1.addBox(0F, 0F, 0F, 2, 1, 2); Leg1.setRotationPoint(6F, 23F, 6F); - + Leg2 = new ModelRenderer(this, 0, 0); Leg2.addBox(0F, 0F, 0F, 1, 1, 2); Leg2.setRotationPoint(-8F, 23F, -6F); - + Leg3 = new ModelRenderer(this, 0, 0); Leg3.addBox(0F, 0F, 0F, 2, 1, 2); Leg3.setRotationPoint(6F, 23F, -6F); - + Leg4 = new ModelRenderer(this, 0, 0); Leg4.addBox(0F, 0F, 0F, 1, 1, 2); Leg4.setRotationPoint(-8F, 23F, 6F); - + Back = new ModelRenderer(this, 1, 15); Back.mirror = true; Back.addBox(0F, 0F, 0F, 14, 15, 1); Back.setRotationPoint(-8F, 6F, 7F); - + Bottom = new ModelRenderer(this, 3, 1); Bottom.mirror = true; Bottom.addBox(0F, 0F, 0F, 14, 2, 14); Bottom.setRotationPoint(-8F, 21F, -6F); - + Side = new ModelRenderer(this, 1, 28); Side.mirror = true; Side.addBox(0F, 0F, 0F, 2, 11, 14); diff --git a/src/main/java/noppes/npcs/client/model/blocks/ModelCouchRightWool.java b/src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelCouchRightWool.java similarity index 94% rename from src/main/java/noppes/npcs/client/model/blocks/ModelCouchRightWool.java rename to src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelCouchRightWool.java index ae9617417..62ecdb8da 100644 --- a/src/main/java/noppes/npcs/client/model/blocks/ModelCouchRightWool.java +++ b/src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelCouchRightWool.java @@ -1,4 +1,4 @@ -package noppes.npcs.client.model.blocks; +package noppes.npcs.client.model.blocks.legacy.couch; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; @@ -13,7 +13,7 @@ public class ModelCouchRightWool extends ModelBase { Wool1.mirror = true; Wool1.addBox(0F, 0F, 0F, 14, 5, 13); Wool1.setRotationPoint(-8F, 16F, -6F); - + Wool2 = new ModelRenderer(this, 14, 0); Wool2.mirror = true; Wool2.addBox(0F, 0F, 0F, 14, 10, 2); diff --git a/src/main/java/noppes/npcs/client/model/blocks/ModelCouchWoodLeft.java b/src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelCouchWoodLeft.java similarity index 97% rename from src/main/java/noppes/npcs/client/model/blocks/ModelCouchWoodLeft.java rename to src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelCouchWoodLeft.java index 227e40c22..5d889b3b3 100644 --- a/src/main/java/noppes/npcs/client/model/blocks/ModelCouchWoodLeft.java +++ b/src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelCouchWoodLeft.java @@ -1,4 +1,4 @@ -package noppes.npcs.client.model.blocks; +package noppes.npcs.client.model.blocks.legacy.couch; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; @@ -29,77 +29,77 @@ public class ModelCouchWoodLeft extends ModelBase { Shape1.mirror = true; Shape1.addBox(0F, 0F, 0F, 2, 3, 10); Shape1.setRotationPoint(-8F, 18F, -4F); - + Shape2 = new ModelRenderer(this, 0, 0); Shape2.addBox(0F, 0F, 0F, 1, 3, 2); Shape2.setRotationPoint(7F, 21F, -6F); - + Shape3 = new ModelRenderer(this, 0, 0); Shape3.mirror = true; Shape3.addBox(0F, 0F, 0F, 2, 4, 1); Shape3.setRotationPoint(-8F, 14F, 0.5F); - + Shape4 = new ModelRenderer(this, 0, 0); Shape4.mirror = true; Shape4.addBox(0F, 0F, 0F, 14, 2, 1); Shape4.setRotationPoint(-6F, 7F, 7F); - + Shape5 = new ModelRenderer(this, 0, 0); Shape5.mirror = true; Shape5.addBox(0F, 0F, 0F, 14, 2, 2); Shape5.setRotationPoint(-6F, 19F, 6F); - + Shape6 = new ModelRenderer(this, 0, 0); Shape6.mirror = true; Shape6.addBox(0F, 0F, 0F, 2, 1, 13); Shape6.setRotationPoint(-8F, 13F, -7F); - + Shape7 = new ModelRenderer(this, 0, 0); Shape7.addBox(0F, 0F, 0F, 1, 1, 10); Shape7.setRotationPoint(-6F, 19F, -4F); - + Shape8 = new ModelRenderer(this, 0, 0); Shape8.addBox(0F, 0F, 0F, 1, 3, 2); Shape8.setRotationPoint(7F, 21F, 6F); - + Shape9 = new ModelRenderer(this, 0, 0); Shape9.addBox(0F, 0F, 0F, 2, 1, 10); Shape9.setRotationPoint(5F, 19F, -4F); - + Shape10 = new ModelRenderer(this, 0, 0); Shape10.addBox(0F, 0F, 0F, 1, 10, 1); Shape10.setRotationPoint(-6F, 9F, 7F); - + Shape11 = new ModelRenderer(this, 0, 0); Shape11.mirror = true; Shape11.addBox(0F, 0F, 0F, 14, 2, 2); Shape11.setRotationPoint(-6F, 19F, -6F); - + Shape12 = new ModelRenderer(this, 0, 0); Shape12.addBox(0F, 0F, 0F, 2, 1, 10); Shape12.setRotationPoint(-3F, 19F, -4F); - + Shape13 = new ModelRenderer(this, 0, 0); Shape13.addBox(0F, 0F, 0F, 2, 1, 10); Shape13.setRotationPoint(1F, 19F, -4F); - + Shape14 = new ModelRenderer(this, 0, 0); Shape14.addBox(0F, 0F, 0F, 2, 10, 1); Shape14.setRotationPoint(-3F, 9F, 7F); - + Shape15 = new ModelRenderer(this, 0, 0); Shape15.addBox(0F, 0F, 0F, 2, 10, 1); Shape15.setRotationPoint(1F, 9F, 7F); - + Shape16 = new ModelRenderer(this, 0, 0); Shape16.addBox(0F, 0F, 0F, 2, 10, 1); Shape16.setRotationPoint(5F, 9F, 7F); - + Shape17 = new ModelRenderer(this, 0, 0); Shape17.mirror = true; Shape17.addBox(0F, 0F, 0F, 2, 10, 2); Shape17.setRotationPoint(-8F, 14F, -6F); - + Shape18 = new ModelRenderer(this, 0, 0); Shape18.mirror = true; Shape18.addBox(0F, 0F, 0F, 2, 18, 2); diff --git a/src/main/java/noppes/npcs/client/model/blocks/ModelCouchWoodMiddle.java b/src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelCouchWoodMiddle.java similarity index 98% rename from src/main/java/noppes/npcs/client/model/blocks/ModelCouchWoodMiddle.java rename to src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelCouchWoodMiddle.java index 5248f938a..f59932b83 100644 --- a/src/main/java/noppes/npcs/client/model/blocks/ModelCouchWoodMiddle.java +++ b/src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelCouchWoodMiddle.java @@ -1,4 +1,4 @@ -package noppes.npcs.client.model.blocks; +package noppes.npcs.client.model.blocks.legacy.couch; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; @@ -26,7 +26,7 @@ public class ModelCouchWoodMiddle extends ModelBase { Shape2 = new ModelRenderer(this, 0, 0); Shape2.addBox(0F, 0F, 0F, 1, 3, 2); Shape2.setRotationPoint(-8F, 21F, -6F); - + Shape4 = new ModelRenderer(this, 0, 0); Shape4.addBox(0F, 0F, 0F, 16, 2, 1); Shape4.setRotationPoint(-8F, 7F, 7F); diff --git a/src/main/java/noppes/npcs/client/model/blocks/ModelCouchWoodRight.java b/src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelCouchWoodRight.java similarity index 98% rename from src/main/java/noppes/npcs/client/model/blocks/ModelCouchWoodRight.java rename to src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelCouchWoodRight.java index 5819b2ada..951af09c2 100644 --- a/src/main/java/noppes/npcs/client/model/blocks/ModelCouchWoodRight.java +++ b/src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelCouchWoodRight.java @@ -1,4 +1,4 @@ -package noppes.npcs.client.model.blocks; +package noppes.npcs.client.model.blocks.legacy.couch; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; diff --git a/src/main/java/noppes/npcs/client/model/blocks/ModelCouchWoodSingle.java b/src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelCouchWoodSingle.java similarity index 98% rename from src/main/java/noppes/npcs/client/model/blocks/ModelCouchWoodSingle.java rename to src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelCouchWoodSingle.java index 7023ba6b1..f43549102 100644 --- a/src/main/java/noppes/npcs/client/model/blocks/ModelCouchWoodSingle.java +++ b/src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelCouchWoodSingle.java @@ -1,4 +1,4 @@ -package noppes.npcs.client.model.blocks; +package noppes.npcs.client.model.blocks.legacy.couch; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; @@ -33,30 +33,30 @@ public class ModelCouchWoodSingle extends ModelBase { Shape1.mirror = true; Shape1.addBox(0F, 0F, 0F, 2, 3, 10); Shape1.setRotationPoint(-8F, 18F, -4F); - + Shape2 = new ModelRenderer(this, 0, 0); Shape2.mirror = true; Shape2.addBox(0F, 0F, 0F, 2, 10, 2); Shape2.setRotationPoint(-8F, 14F, -6F); - + Shape3 = new ModelRenderer(this, 0, 0); Shape3.mirror = true; Shape3.addBox(0F, 0F, 0F, 2, 4, 1); Shape3.setRotationPoint(-8F, 14F, 0.5F); - + Shape4 = new ModelRenderer(this, 0, 0); Shape4.addBox(0F, 0F, 0F, 12, 2, 1); Shape4.setRotationPoint(-6F, 7F, 7F); - + Shape5 = new ModelRenderer(this, 0, 0); Shape5.addBox(0F, 0F, 0F, 12, 2, 2); Shape5.setRotationPoint(-6F, 19F, 6F); - + Shape6 = new ModelRenderer(this, 0, 0); Shape6.mirror = true; Shape6.addBox(0F, 0F, 0F, 2, 1, 13); Shape6.setRotationPoint(-8F, 13F, -7F); - + Shape7 = new ModelRenderer(this, 0, 0); Shape7.addBox(0F, 0F, 0F, 1, 1, 10); Shape7.setRotationPoint(-6F, 19F, -4F); @@ -109,11 +109,11 @@ public class ModelCouchWoodSingle extends ModelBase { Shape19 = new ModelRenderer(this, 0, 0); Shape19.addBox(0F, 0F, 0F, 2, 10, 2); Shape19.setRotationPoint(6F, 14F, -6F); - + Shape20 = new ModelRenderer(this, 0, 0); Shape20.addBox(0F, 0F, 0F, 2, 3, 10); Shape20.setRotationPoint(6F, 18F, -4F); - + Shape21 = new ModelRenderer(this, 0, 0); Shape21.addBox(0F, 0F, 0F, 2, 4, 1); Shape21.setRotationPoint(6F, 14F, 0.5F); diff --git a/src/main/java/noppes/npcs/client/renderer/blocks/BlockChairRenderer.java b/src/main/java/noppes/npcs/client/renderer/blocks/BlockChairRenderer.java index 86ff10676..b394ba01b 100644 --- a/src/main/java/noppes/npcs/client/renderer/blocks/BlockChairRenderer.java +++ b/src/main/java/noppes/npcs/client/renderer/blocks/BlockChairRenderer.java @@ -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 diff --git a/src/main/java/noppes/npcs/client/renderer/blocks/BlockCouchWoodRenderer.java b/src/main/java/noppes/npcs/client/renderer/blocks/BlockCouchWoodRenderer.java index f2cd94a0c..c4c8fb970 100644 --- a/src/main/java/noppes/npcs/client/renderer/blocks/BlockCouchWoodRenderer.java +++ b/src/main/java/noppes/npcs/client/renderer/blocks/BlockCouchWoodRenderer.java @@ -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(); } diff --git a/src/main/java/noppes/npcs/client/renderer/blocks/BlockCouchWoolRenderer.java b/src/main/java/noppes/npcs/client/renderer/blocks/BlockCouchWoolRenderer.java index 6c75e9d38..49fc72d05 100644 --- a/src/main/java/noppes/npcs/client/renderer/blocks/BlockCouchWoolRenderer.java +++ b/src/main/java/noppes/npcs/client/renderer/blocks/BlockCouchWoolRenderer.java @@ -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); diff --git a/src/main/java/noppes/npcs/client/renderer/blocks/BlockRendererInterface.java b/src/main/java/noppes/npcs/client/renderer/blocks/BlockRendererInterface.java index 2f203ea3f..97cc97b64 100644 --- a/src/main/java/noppes/npcs/client/renderer/blocks/BlockRendererInterface.java +++ b/src/main/java/noppes/npcs/client/renderer/blocks/BlockRendererInterface.java @@ -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) diff --git a/src/main/java/noppes/npcs/client/renderer/blocks/BlockStoolRenderer.java b/src/main/java/noppes/npcs/client/renderer/blocks/BlockStoolRenderer.java index 32ea1655c..3775a35d3 100644 --- a/src/main/java/noppes/npcs/client/renderer/blocks/BlockStoolRenderer.java +++ b/src/main/java/noppes/npcs/client/renderer/blocks/BlockStoolRenderer.java @@ -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); } diff --git a/src/main/resources/assets/customnpcs/textures/models/chair/acacia.png b/src/main/resources/assets/customnpcs/textures/models/chair/acacia.png new file mode 100644 index 0000000000000000000000000000000000000000..65e9fa9401f527618121826dd06196e04e788cc9 GIT binary patch literal 900 zcmV-~1AF|5P)Px&K1oDDRA_R(z zjv{oVjdTS9Q5dw6<@HK-iu3G^KhDSANj6Bl=5}_*mS^Yf%9g!KZ5z{S(E#LkugYBX-jvq;<8_X+C-prl68Op_F{q_pro zGhWrcZ>*FAxdZ%{k2$4n?fb-PNzik#9r=(-RZ17tcd2s3Nj6V{miB$ZdI7$EiXeQi zv6lguqy}h+AT$oz*!PWi47%%si`3+=M>l0_I<;80pcV>oMf!M)n@++wvVZ{ z)7ZwoPdHbn2L;L~+)GtyTLG9ko}`G@U8rYw;d{7yl=!wQD)ThA>ibVFZ`V3IY)s?S zB&dg%w2`D}j_=Rec;3y`pCRzWkW{Mj;bg0H-lzb!@BhFDR>#_B@9VR}0xc~r@B6#- zM;AA}p8xAGRp9)1zo14W@Z845#AG}wcu)WR=Whq)o)*5>XmL^N0K4=Q+GHdT$B;3Q?(-38WXOUDo2{6Glxq|#-oC+xR&XM z#;dkKn@kPL$>puXD*^3&nQ7CdU7a2j^end-n*IRb-aXD~c=ss5<>q0fJ#!yj+&D7R zt`OBpoDlY6@>3KDBqIzP~pty%FM9S$r%r{U&<(b+L2{OyhZJqv}A8lkNlW a82bA($#VR0000 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/customnpcs/textures/models/chair/birch.png b/src/main/resources/assets/customnpcs/textures/models/chair/birch.png new file mode 100644 index 0000000000000000000000000000000000000000..cc108d17496d489c8bd63395379eed7cb9fbf889 GIT binary patch literal 991 zcmV<510ei~P)Px&nMp)JRA_^-zlev$_O6ntCmr)`2<;Rxd}jj7MD=UD(?Y#%3#9Z)J~;JGdib2&gu zV^wwll*+-LsePOX ze?mgLkc5UX+M>>94-X`%ncBw*V+Wj^6yVrI5}OJ^YT_*Kc@|3LjFElZNSgjYq^ak+ z@LV@?wgnuUz_E#pu8DozFwTJN;Q{(RwWf0*JiqD(i`s5#A2$-MMvWtkLc9Gt(zXJS zdn!qZv|a|it#xdIe$PjtXh-(N-n!3!_VU97cRP1`Dnkd+Q`b>q z6NnB&0nyESK5>#8J^vo}SRWhD-tDia9CKRSvBm+5^p)rDVx9kW$STmRS9xzR000#8 z`I(D}AKyQ5w||CQ;Rpb5^7L&2AsIR0Y%k8YATU*4rr#!{1A2o2iut@;>+oDxeu&z? zt1K+CVNq09>9>JI`|BxR7CD5aP%TZWUSt5mG*?q!e~xZLeYSBK+Z0Ltrp8oebSl@n z4WrYDUcU(vx@{r_Ekg5Ty)jYODp!bXS`^h*qsASZ?A{U3$5maXK11q3VrF!G^f-%O zKZ6NRkRw8dpV!%`+2i)l(CrNI>doivR)K!c2XTU#sDJJQfRxj@;Jk{n4r@MhGdhK1 zvzfi9K3W=gA^ia$)f)^@M3nu7%;-S&?!nCtxpM}9+X;_Eu+^w>MyCt!_M7!8Cr)zf z#HV8Ai+ua?o)c?7QVFOs%`rNaP7*0DA|2cYW2rvwe}w4xr~3fvvj`E2*|KIUPW zZd+IxiB_Y=MF~_pJ2tw)?S$_Xp{;|J8Nlci#7Tlqm{Pi!)ZODh$6x4wtRNpC*Ej$G N002ovPDHLkV1gu=&ZhtX literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/customnpcs/textures/models/chair/dark_oak.png b/src/main/resources/assets/customnpcs/textures/models/chair/dark_oak.png new file mode 100644 index 0000000000000000000000000000000000000000..cf6c641d28bfc736546b92aab470489d658be690 GIT binary patch literal 970 zcmV;*12z1KP)Px&gh@m}RA_T{`99%nfX_!moE(Kf?KOhW8KNN6 zVJ*u>K_~gUw@~Z#a5g|R3Xl{6@yG{SVQkY%d)igLPdFQZiW+%SNCmN|Lf9X0eFgvq z?kwLoHY$Rq0_Jb?Y^H##e4p5;2nLx%9CAFPw8ED9ds^g3GO3H2t9+kuHo*Bw4DNMv z8GtTo(I~J69vAt(i{QZZ1G;q;0!bmP+$M0Z`q4@`$oCEB2uL!Cqz-8SU?UD$Dl42} z^maPC$oC2M?aQe`?SpQbTw;wa@!bVv37%~l$7CCakIvv3E``_`7&9Qaky%<+Dq}}Gs zD!+>V^J=>s-WIwGjL#319$b9YSxkKYdZyA`AquMNAHOCHbxw1yQi$@K3YbZ+;_niA z4#)*V;41{aS~`&>h0uy5h0ynx*SAcTjUl*Kon=|^*75sObvf9@_*AX(9O_nRwkDHL ziVI-6^c!pLpKB+?>BTI5hnT0D}U&gTDK!!;NJ=nNfg zx;>b*`HD&X-q(;Ef3m7)(+-f}b69D#OAO8TIb=1kv}t`O?WgNO;2{oq^{$ty6aF*+ zRUTJX8u$Z_INW^|984bOV2Xn&j>*FuCQV-B9>7$ijEN+Z5DRH7I-`Jrd(FFndq5O0 zOGYf@UQBYsTri!BRQ=7|q}iP|J5>09$|!MI>Ii7V9DzG?!Jb6G@b}&0$|`*FF;M2# zrk(%fMXD2I99nV^Xr3pTHh))m)jmL$b|IvR^82DZUb7GI2OP3Q z-O8FGNej%r|CRODSZ@H%04M-WQKW9LY|Zt*VXXnuTtP7jf54IERUzYE6$LWye~tat sSX%?8v#Kr9Px&Qb|NXRA_=T-Lu#9xpmq_c{@z^l@k z>V84+2jq@GtPTRF5G)f=*(xr=x;9R=SLmCY9XD=9!)^lk8t2V>4*TA``QDphFvMBq zC@2-PQqJdWj3*xQIU4{lo_JC>98CcLCiXvCx6JgLHo=zZA4Bi%{(%MaR3OMa{z#4*>X(303d`2?XIbPQZNp{-GjT7+Il*Z z-t%W6`MLH67zdXB|zQ=K1JsqAfm-p`~Fq>@AaRF-v4#TDsWag3jQ}P+e;4>K zl>SkAwWX!wK|B$)uC7m;1T*wezVAT@fhZY^v{&_gX8_lIgztMO*P4u+sWw_n2!V2~ z$!MKb`m~X0cY0E2cY09esLM*!g9o+KDlY4lU_9|+^=TvH`7?Cy9dz#WBk{OiwO zX-FTd_vrbY9a#ygjTX!2>{xx;h&_Lo^-4gjO_hLpcm1xviYuPdr_KS-G4g#cR0b`} zmU7=2$fl^;XfblATx+tvGlVF#Z8G2IQdIk9Q3K0000Px&lSxEDRA_K_H&5ql`*{KZxh{km}9@jr?j75TU0`!-Txy9ufSM?7Q zW0RmqXiZ6I5UcIy`37(Ik)Voym{1PD-Hl~1gAF~qg4E!1MV5IJRPhfRV{!n4W7PnE z3yY#gOp+Eis{Ua^IRFjbMuV40PVdU|E4DL8ZuiD&{$V2W?%Dkw{8jkzv)Wg-0+2dN zQes<=0=N3hT4pd5ie+qXtoG@JZrt}jc=}muxb5KZ=wyJTgpM+Fa2$L_ zfL4G)PXohk2d3o?WB}FoU*QVlW8&WXV1K8FAtf!X`$yUDJ$V~y{~v_R0(-lgJyD3v z8`{9d#OF7Ud-duua{223fIAOgM&O@mW-zav_0P8;Fe;C-&k`~KrsZPZ(BwD>$EwMR z(E7bpF|no1A!RHM^!KHT2>{sk3n6NEteUjX5|M-bo!+RGgP#g%YNB?UIz@pa>@=+j zf8itE`{>1|*&cy}mX;qZRwyV746`?Qd*CXI84PEqHcAyQO)cdzvgx4#x(sP7h9RZs zfE*}H=s4_4%xNP=&veIE24$fWvM5}Za+#1nclwws6w7G3T{PV;3dJ(0Oq-Ra+XXHO zb59d7kMTV={=@#BT&kF|b{Ab8GnfoQ)9qq!ceA&(z96r>1UhaDg<=^1u)VQ5z$cDX z!!??c0kXyG|3OALHvpxIiM1Q^fXij=zD8_U_{Z@Z(hPv;RLt6U00000NkvXX Hu0mjf?h4gl literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/customnpcs/textures/models/chair/spruce.png b/src/main/resources/assets/customnpcs/textures/models/chair/spruce.png new file mode 100644 index 0000000000000000000000000000000000000000..ae8753c7ff779ff773ceb24f80486c8270162f44 GIT binary patch literal 941 zcmV;e15*5nP)Px&XGugsRA_~rSK0}N@H+gWKKR#cv()MOTo=DcVO@WIf&%fu(LZHH?y-dZ* zDA>bClCdWGS;N=?grb{|M?#N>b3j}66T54wpB0Q9aNW2Y3GGgp3};$bs+*7>tDhx| z9q@AV1$MWd1M#jA2D|B?E&HgHTy(;oHqcDJz6iS>4Pytm!p7CjJ$ARA0jV$^Cj&6n z&l1KCprl5-*_M5HfdT+jNuXZ<4u&oEquA@VJhY=nV{gqFGQiUkk7OrmYfjEST)R2*! z+?eWT4dY*Kwj`P@$!dB}pWjYskJNS=o9JhW+~@aiBE-Ak1u{Wf0q8lNq$sQ>p%eBJ za>2H6S#RR?b~Q0ibF)7G^z34;-odIhd{oz6NEPC`aW|5rXpU#-^f>(;0%w3U&mALG z2&K9s6~OfQPk6%Yn7j8rIo^*jhSGB0KWY8T_urZJ|7qwvY22(w$%x-MoHL z+L^TM1$c0shz-U#hCoi@x~l>UW2k6aP7@P8CLY1LLYm!i9sqV%xC(XL;{7==Xid}d za4y-pdcj)ex44Ujby;s>XR{2%v=o4r$KBknS_sdJ+`EJANQgmc<7JRQ+@1Fc6anK} zUEby0`h(|D>Evr9FP#VcJg-lDfsb#C5x=!b=Lbq`e4Y$X%Tz|OLXq^ScDNJv5{Zz1 zUe=palN=>UFGwc6l}Liq6e=YVhkTFm0;Ml7|NA63O@ZIq@PBu(0$19Lz*Gm^`dvuX zL!~4VXW0uBI^puJvKEE4X$rN54_6FWT&>}w*6`z;V4>FVvw6!W{5$*wu*j2gPv4K| P00000NkvXXu0mjf1NXq? literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/customnpcs/textures/models/stool/acacia.png b/src/main/resources/assets/customnpcs/textures/models/stool/acacia.png new file mode 100644 index 0000000000000000000000000000000000000000..7aa0dcbe2c3b5f353314f5aab219358be4be3c13 GIT binary patch literal 595 zcmV-Z0<8UsP)Px$^GQTORA_=-l$*C!$MpTvGLK8lqK;Co6JHwHitBWSjVgN)EAj=w& z1OUjg24G!O0J!Mh-F}_9e*2V!uEIQvITr~4veKN3gfvT0g+jFZwHtQPjRofeFr-~QM{#S+KyDSk& z;G`Q1&S5lFRE6q|tBpifdXR1`91#JS=dG=cz4u4pux<<-9RXwOGhnrmh&b9CfyZ=X zVQ>Ui8`-nBh@*DgK7%g0vEb|gW8W5ytRC9CuNk6yI%Xf=zG|SY&SEKf`CI_7SW4!3 z+Uw+u#k+Jbx4*UCn-5=3+A)UrYek;L$g-r=wXImGYg@7Vb!*{PR|EQBE8JagS2uLM zQ({l|=IWv`w{sE&wpYKqzHER8?>hX>_3QVaM$ywBi@gI%U6VwC{cVtyM#NFu!ftJ8 zEIYP0{TOC<*O$#>8xwK#&sX>m!LGH_ETuc2Iw8=zh4Px%4M{{nRA_>7&|6VL>s&bUU^r#>Y^9u1$u)la)EZ;Tp)|y zAQ$KbvItp(WTj0Zn_!2KP16c7_-A2tVU3W-F&>MWOw2qRX~c`<(f59zURN;W?DQz@ zv|9l9qKb@X_@WAcjAsD+{___A6Wy2N9~IMQZxhc{*lD*2-v;?w1W*fnrinykm(_+% zbhfbZFR2Co(ovnO3U8u&X^b6k|M<9IabL(K>yIYmh4ng}4H&y5l(gS#ilzU%XAa%~iraguLD#xq8faq0VQll<+TogSrXIydW$JgZ0NCn<$Qr%-*} z|Mb<0Okb9K28az<Px$?ny*JRA_C!^kH|iw57pi2S8>P}N z!@KBSo8S%j@#_zdPfNhK!Dbt3>z7hI$6>lI5WE4?^D*h5&LqGn%Kp8ME#dz-3KiNcN~PDvqSUBrH(giQs{}44r>?sft8!xrY}0jty-UE_dX(kP_Aiyd zCf%DYfuhuF_D%;z<2Sr*x~>rH0Bc_`3s9B*$KFlNF1pu5eEN8)!DQ##&m|w;p91FD zuVKJF+f4d2o7i#BrK-H8qA zW|w-?!qUOp&+s;md}|L=K{M_<39#0MU+T(zCGl$;Ob=+reI~KL+rhVdGwv_R&HaLl ziM_0te`%U=pGit7+{MHmf6X`&i9{liNF)-8^p3x&scj@2r7#Bo000hUSV?A0O#mtY c000O800000007cclK=n!07*qoM6N<$g4@ItuK)l5 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/customnpcs/textures/models/stool/jungle.png b/src/main/resources/assets/customnpcs/textures/models/stool/jungle.png new file mode 100644 index 0000000000000000000000000000000000000000..4ba3ed52d518276de7dd3b3fb48da033762321e0 GIT binary patch literal 617 zcmV-v0+#)WP)Px%2}wjjRA_y{r7R1xlSWf*3NianmNnW)c&*IWXlD6ov@`Gb-aNIi zIzdRBNIF3XK%7Vbe*OLffQ|0c`BlsIw>ODrD;)IN?DzKoP)f4j-^2HPwAKhQ+h8Y< z#EG=h!PQzfQkPe&e!=&Bgb49{KbxDeiSR1A=f>Ir-|nN5#f`lox4u-<(tMe&30NP% z`=i5BL;xGmfYzFy;|DrHXr<%pns)GySf_xAqSkuuGm0iCC0Eilg<2`__OPE- z_c)OYQ(&2{3DiyjW9x2rmrgK2i15)ASfqQgDG)`IIeX{VTWGCo3f2yo+4rIJtZ46C z!wS0Rr}gD*n8GYNm)EzvJ9-1a<@IeThaumHiDZ##aa-4VA4lgK?HIkAyD@`an>dk3 zHAN|zjZMUE?#2L_uK4n14CVX3x?WMY>Ux_bJKfXaacZh_D0Z@5{bF>I0;PK$^1S|V z_PG%~eO||quQW7CTwAPs|jb)p5r`Mr%F*->XZA^&p#YcDsZuykfIaZ9JOPvN{|Nhr{7; zI2?|(@)ysjcP#Aa!X5ws01jnXNoGw=04e|g00;m8000000Mb*F00000NkvXXu0mjf D@Q5Rq literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/customnpcs/textures/models/stool/oak.png b/src/main/resources/assets/customnpcs/textures/models/stool/oak.png index a26851f002caace9e50740cd7a37cc32f83f9c9e..f14d9cd0d14384cb3d880a0e431fd8a2681ad267 100644 GIT binary patch delta 621 zcmV-z0+RiY1N#J!8Gi-<005$$euMx300DDSM?wIu&K&6g00J9HL_t(&f$f(+Yui8= z#(xf4{15SJFgRdHx)jnaONK5TyYvHe$&fi;AsyPUkhw#bet<3+x|Ixt66g}h&^9!I zf(kl>rHTxxI!LETN{r8@CW^SW;j1YGKfC?i3 zeyKkInCRZT{oFDA?N#EK3dhpp(dGnz>#Gp)CUpBll6Z=E0)V&*6-Gw7reM4Qnr?qc zl8=v&U&z8}Pu`8-_{Fy4S?+nb0dg_8j5S<-ouJNx~| z1>z2jbWLH+RDY;lOycRSF$ylZz6ux8HHD>0U~6MkobD=&W|qJ_T@zTk1az#|CmK#C>+YY<``0g0a(9kT z&Um{07=YuGvq}w)9AW>zW=TfJ^iv2XMi8X zjJ$sFS)&4lc#^fSc`S8g>#=``bdC;p(^-E^JbCaA&tt6|?QVZaecpB)O3rKUI+fds zlf=`aKW0zzFYEI*q{SRCZ;#IWw1%u67LCEd~2k%3`jKlh(RRv=#@z$e7D zHpzTivE%Y4-yKupw)XlToS&T@paYatoK|!ZNO6<|`33)n0ETanMpx_%%7sn6}@3)gr*7F@!;Bo2Yeft0Zj>iTp87kVR7f!cXd8vg_e}>oH ziBn8gE>m&7$Tee|%I2J-XG%1p7`+>kSR2X^kUl8&wQ@h3457C z@+=p(uFGIuqx<09O(xN`4awZQwle^wG7qM=zfA0j1u6gW`QxeE&RJby4HYXM9jpkm zzoe3p6!-WabMUsWn*Y}o{%4e^d%ZQO=s?fwu<&nk3POX&mUD0#Ta+#+vD%4N7`?&RrcSWX`SC--thT7!`3=RjR?b? UD~~1B1AWfm>FVdQ&MBb@07q`9pa1{> diff --git a/src/main/resources/assets/customnpcs/textures/models/stool/spruce.png b/src/main/resources/assets/customnpcs/textures/models/stool/spruce.png new file mode 100644 index 0000000000000000000000000000000000000000..620ebddea3ad3811b7e230b96d1260ca7eca8ffe GIT binary patch literal 593 zcmV-X0Px$@kvBMRA_~zGplnZ;ksH?0Wd-d6kW^?f zadcUrD!hzt*JvNWd;fFB;-0YQtk1bWGf&fH0qp}gK5U_E6IICxB>=$T{vKQw;NzQt zI<}S$=xuHnYf#V?$||}nm>UNpAD$R5rOOH{MWEfPgK?qky(j`{x-76p1WIa@woi^g zvhL4DU@-FM>>Ymwb#z%l+X2$P5>Je0?46`pMz<@h>xiC=D;TJQGZd8-{GdFzkRtWhv7z`3s~#<{O5_SPQ((|28dm(~i$*Nf_wU2mJH z)4e=D3gzwWI3?AqcdpJtL^?T%%=OLPQzm-)RZ-sK+=t_o)Mtq&#wgnaE(??`rDe1B zrmuq4xjG9MZLDmQKVRWA3Q=oUXc6&w-XVxoUXpYx=M@sowj>YP)`k3L`F|0Cmu?^J zRvnl&E13R?iO%y3;oMh^iG2RzbA!QPFc=I5gTatHegIOCjtBZlf-(RA01jnXNoGw= f04e|g00;m8000000Mb*F00000NkvXXu0mjfN~Qt4 literal 0 HcmV?d00001