Banner Upgrade WIP

This commit is contained in:
Kam committed 2025-01-26 15:47:04 -05:00
1 parent db9ac7f7c4
commit 4aa0a96f1f
19 files changed
+190 -54

No files matched your search

@@ -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;
}
}
@@ -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;
}
}
@@ -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;
@@ -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;
@@ -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);
@@ -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);
@@ -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);
}
}
@@ -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);
@@ -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);