mirror of
https://github.com/KAMKEEL/CustomNPC-Plus.git
synced 2026-11-18 12:39:05 +00:00
Rename to Banner Trim
This commit is contained in:
1 parent
cb2c7910cf
commit
3c610e7105
4 files changed
+8
-8
No files matched your search
@@ -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);
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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]);
|
||||
|
||||
@@ -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]);
|
||||
|
||||
Reference in new issue
Block a user