From 3c610e710570d6fc5d2fa21e86f5ca9e6d34245b Mon Sep 17 00:00:00 2001 From: Kam Date: Thu, 13 Feb 2025 02:14:07 -0500 Subject: [PATCH] Rename to Banner Trim --- src/main/java/noppes/npcs/ServerEventsHandler.java | 4 ++-- src/main/java/noppes/npcs/blocks/tiles/TileBanner.java | 8 ++++---- .../npcs/client/renderer/blocks/BlockBannerRenderer.java | 2 +- .../client/renderer/blocks/BlockWallBannerRenderer.java | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/noppes/npcs/ServerEventsHandler.java b/src/main/java/noppes/npcs/ServerEventsHandler.java index f8d0cac9e..5e0333f7c 100644 --- a/src/main/java/noppes/npcs/ServerEventsHandler.java +++ b/src/main/java/noppes/npcs/ServerEventsHandler.java @@ -236,9 +236,9 @@ public class ServerEventsHandler { 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 currentVariantIndex = tile.bannerTrim.ordinal(); int nextVariantIndex = (currentVariantIndex + 1) % EnumBannerVariant.values().length; - tile.variant = EnumBannerVariant.values()[nextVariantIndex]; + tile.bannerTrim = EnumBannerVariant.values()[nextVariantIndex]; 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 3cbc87b43..360f65a1c 100644 --- a/src/main/java/noppes/npcs/blocks/tiles/TileBanner.java +++ b/src/main/java/noppes/npcs/blocks/tiles/TileBanner.java @@ -8,7 +8,7 @@ import noppes.npcs.constants.EnumBannerVariant; public class TileBanner extends TileColorable { public ItemStack icon; - public EnumBannerVariant variant = EnumBannerVariant.Normal; + public EnumBannerVariant bannerTrim = EnumBannerVariant.Normal; public long time = 0; public void readFromNBT(NBTTagCompound compound){ @@ -17,9 +17,9 @@ public class TileBanner extends TileColorable { int variantIndex = compound.getInteger("BannerVariant"); if (variantIndex >= 0 && variantIndex < EnumBannerVariant.values().length) { - variant = EnumBannerVariant.values()[variantIndex]; + bannerTrim = EnumBannerVariant.values()[variantIndex]; } else { - variant = EnumBannerVariant.Normal; + bannerTrim = EnumBannerVariant.Normal; } } @@ -27,7 +27,7 @@ public class TileBanner extends TileColorable { super.writeToNBT(compound); if(icon != null) compound.setTag("BannerIcon", icon.writeToNBT(new NBTTagCompound())); - compound.setInteger("BannerVariant", variant.ordinal()); + compound.setInteger("BannerVariant", bannerTrim.ordinal()); } @Override 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 ed8d6aeb8..8483ad0e9 100644 --- a/src/main/java/noppes/npcs/client/renderer/blocks/BlockBannerRenderer.java +++ b/src/main/java/noppes/npcs/client/renderer/blocks/BlockBannerRenderer.java @@ -91,7 +91,7 @@ public class BlockBannerRenderer extends BlockRendererInterface{ setBannerMaterial(var1.getBlockMetadata()); banner.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); - setFlagType(tile.variant); + setFlagType(tile.bannerTrim); float[] color = colorTable[tile.color]; GL11.glPushMatrix(); GL11.glColor3f(color[0], color[1], color[2]); 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 773cb0b24..cd0a3ca2f 100644 --- a/src/main/java/noppes/npcs/client/renderer/blocks/BlockWallBannerRenderer.java +++ b/src/main/java/noppes/npcs/client/renderer/blocks/BlockWallBannerRenderer.java @@ -77,7 +77,7 @@ public class BlockWallBannerRenderer extends BlockRendererInterface{ BlockBannerRenderer.setBannerMaterial(var1.getBlockMetadata()); model.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); - BlockBannerRenderer.setFlagType(tile.variant); + BlockBannerRenderer.setFlagType(tile.bannerTrim); float[] color = colorTable[tile.color]; GL11.glPushMatrix(); GL11.glColor3f(color[0], color[1], color[2]);