From 08a18a123efccb2eac9c56003641b8fd76af7fa7 Mon Sep 17 00:00:00 2001 From: Kam Date: Sun, 9 Mar 2025 19:06:47 -0400 Subject: [PATCH] Campfire Item 2D Texture --- src/main/java/noppes/npcs/CustomItems.java | 8 ++++---- .../java/noppes/npcs/blocks/BlockCampfire.java | 17 ++++++++++++++++- .../renderer/blocks/BlockCampfireRenderer.java | 5 +++++ .../customnpcs/textures/blocks/campfire.png | Bin 0 -> 451 bytes 4 files changed, 25 insertions(+), 5 deletions(-) create mode 100644 src/main/resources/assets/customnpcs/textures/blocks/campfire.png diff --git a/src/main/java/noppes/npcs/CustomItems.java b/src/main/java/noppes/npcs/CustomItems.java index d4289300e..fe7864812 100644 --- a/src/main/java/noppes/npcs/CustomItems.java +++ b/src/main/java/noppes/npcs/CustomItems.java @@ -296,13 +296,13 @@ public class CustomItems { couchWool = new BlockCouchWool().setBlockName("npcCouchWool").setHardness(5.0F).setResistance(10.0F).setStepSound(Block.soundTypeWood).setCreativeTab(tabBlocks); table = new BlockTable().setBlockName("npcTable").setHardness(5.0F).setResistance(10.0F).setStepSound(Block.soundTypeWood).setCreativeTab(tabBlocks); couchWood = new BlockCouchWood().setBlockName("npcCouchWood").setHardness(5.0F).setResistance(10.0F).setStepSound(Block.soundTypeWood).setCreativeTab(tabBlocks); - lantern = new BlockLantern(true).setBlockName("npcLamp").setHardness(5.0F).setResistance(10.0F).setStepSound(Block.soundTypeMetal).setCreativeTab(tabBlocks).setBlockTextureName("customnpcs:lantern");; - candle = new BlockCandle(true).setBlockName("npcCandle").setHardness(5.0F).setResistance(10.0F).setStepSound(Block.soundTypeStone).setCreativeTab(tabBlocks).setBlockTextureName("customnpcs:candle");; + lantern = new BlockLantern(true).setBlockName("npcLamp").setHardness(5.0F).setResistance(10.0F).setStepSound(Block.soundTypeMetal).setCreativeTab(tabBlocks).setBlockTextureName("customnpcs:lantern"); + candle = new BlockCandle(true).setBlockName("npcCandle").setHardness(5.0F).setResistance(10.0F).setStepSound(Block.soundTypeStone).setCreativeTab(tabBlocks).setBlockTextureName("customnpcs:candle"); stool = new BlockStool().setBlockName("npcStool").setHardness(5.0F).setResistance(10.0F).setStepSound(Block.soundTypeWood).setCreativeTab(tabBlocks); Block placeholder = new BlockPlaceholder().setBlockName("npcPlaceholder").setHardness(5.0F).setResistance(10.0F).setStepSound(Block.soundTypeWood).setCreativeTab(tabMisc); bigsign = new BlockBigSign().setBlockName("npcBigSign").setHardness(5.0F).setResistance(10.0F).setStepSound(Block.soundTypeWood).setCreativeTab(tabBlocks); barrel = new BlockBarrel().setBlockName("npcBarrel").setHardness(5.0F).setResistance(10.0F).setStepSound(Block.soundTypeWood).setCreativeTab(tabBlocks); - campfire = new BlockCampfire(true).setBlockName("npcCampfire").setHardness(5.0F).setResistance(10.0F).setStepSound(Block.soundTypeStone).setCreativeTab(tabBlocks); + campfire = new BlockCampfire(true).setBlockName("npcCampfire").setHardness(5.0F).setResistance(10.0F).setStepSound(Block.soundTypeStone).setCreativeTab(tabBlocks).setBlockTextureName("customnpcs:campfire"); tombstone = new BlockTombstone().setBlockName("npcTombstone").setHardness(5.0F).setResistance(10.0F).setStepSound(Block.soundTypeStone).setCreativeTab(tabBlocks); shelf = new BlockShelf().setBlockName("npcShelf").setHardness(5.0F).setResistance(10.0F).setStepSound(Block.soundTypeWood).setCreativeTab(tabBlocks); sign = new BlockSign().setBlockName("npcSign").setHardness(5.0F).setResistance(10.0F).setStepSound(Block.soundTypeWood).setCreativeTab(tabBlocks); @@ -311,7 +311,7 @@ public class CustomItems { pedestal = new BlockPedestal().setBlockName("npcPedestal").setHardness(5.0F).setResistance(10.0F).setStepSound(Block.soundTypeWood).setCreativeTab(tabBlocks); crystal = new BlockCrystal().setBlockName("npcCrystal").setBlockTextureName("customnpcs:npcCrystal").setHardness(5.0F).setResistance(10.0F).setStepSound(Block.soundTypeGlass).setCreativeTab(tabBlocks); - campfire_unlit = new BlockCampfire(false).setBlockName("npcCampfire").setHardness(5.0F).setResistance(10.0F).setStepSound(Block.soundTypeStone); + campfire_unlit = new BlockCampfire(false).setBlockName("npcCampfire").setHardness(5.0F).setResistance(10.0F).setStepSound(Block.soundTypeStone).setBlockTextureName("customnpcs:campfire"); lantern_unlit = new BlockLantern(false).setBlockName("npcLamp").setHardness(5.0F).setResistance(10.0F).setStepSound(Block.soundTypeMetal).setBlockTextureName("customnpcs:lantern"); candle_unlit = new BlockCandle(false).setBlockName("npcCandle").setHardness(5.0F).setResistance(10.0F).setStepSound(Block.soundTypeStone).setBlockTextureName("customnpcs:candle"); diff --git a/src/main/java/noppes/npcs/blocks/BlockCampfire.java b/src/main/java/noppes/npcs/blocks/BlockCampfire.java index 56d718863..9b858ae96 100644 --- a/src/main/java/noppes/npcs/blocks/BlockCampfire.java +++ b/src/main/java/noppes/npcs/blocks/BlockCampfire.java @@ -3,12 +3,14 @@ package noppes.npcs.blocks; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; +import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.IIcon; import net.minecraft.world.World; import noppes.npcs.CustomItems; import noppes.npcs.CustomNpcs; @@ -62,7 +64,20 @@ public class BlockCampfire extends BlockLightable{ return 8; } - @Override + @SideOnly(Side.CLIENT) + @Override + public void registerBlockIcons(IIconRegister par1IconRegister){ + this.blockIcon = par1IconRegister.registerIcon(this.getTextureName()); + } + + @Override + @SideOnly(Side.CLIENT) + public IIcon getIcon(int p_149691_1_, int meta){ + return this.blockIcon; + } + + + @Override @SideOnly(Side.CLIENT) public void randomDisplayTick(World world, int x, int y, int z, Random random){ int meta = world.getBlockMetadata(x, y, 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 ae5f00fbf..7632b2849 100644 --- a/src/main/java/noppes/npcs/client/renderer/blocks/BlockCampfireRenderer.java +++ b/src/main/java/noppes/npcs/client/renderer/blocks/BlockCampfireRenderer.java @@ -105,6 +105,11 @@ public class BlockCampfireRenderer extends BlockRendererInterface { GL11.glPopMatrix(); } + @Override + public boolean shouldRender3DInInventory(int modelId) { + return ConfigClient.LegacyCampfire; + } + @Override public int getRenderId() { return CustomItems.campfire.getRenderType(); diff --git a/src/main/resources/assets/customnpcs/textures/blocks/campfire.png b/src/main/resources/assets/customnpcs/textures/blocks/campfire.png new file mode 100644 index 0000000000000000000000000000000000000000..d50c7f26f85b2da8d4bcf11fe4f73889359b1b46 GIT binary patch literal 451 zcmV;!0X+VRP)Px$V@X6oR5*>blg&y3Q5c3FokZz}2|^o~ka8=wbkm|`t}H|^;Ox7Ix`@`^fDO4T zW+fq3%Z3uAjYGju40K2r7Q?j3!QY`4y}NV1?|t6$ox_3uR(&5otRDHT`LHp+HyQ@e zatc~b32T`T7$v9jS^!!!%EA-e9xD@&MOvDduH_U`d5!h#-p_6maH!+?(|0igm^Lq` zD-#eJUib)(<#F}6%lku<<#dJE#t{H#mpYE+O}EbijFl`;w#)0C6PUZzbKc$uTbBZcoreV#A^f>QYw}FEnVlJP(VtFX__-><#HJ*CAC@& z!!RNM%E+v$Dm&XdBoYbip3UcQNU>N%*L7k`F+PVwlF1}?&!#`