From c2f05f4d114c42bd9a9589c12e18bff15d3c8381 Mon Sep 17 00:00:00 2001 From: Bob Date: Sat, 10 Jun 2023 10:16:15 +0200 Subject: [PATCH] gold capacitor --- src/main/java/com/hbm/blocks/ModBlocks.java | 5 ++++- .../hbm/blocks/machine/MachineCapacitor.java | 20 ++++++++++++------ .../java/com/hbm/tileentity/TileMappings.java | 2 ++ .../hbm/textures/blocks/capacitor_bus_out.png | Bin 195 -> 301 bytes .../textures/blocks/capacitor_gold_bottom.png | Bin 0 -> 551 bytes .../blocks/capacitor_gold_inner_side.png | Bin 0 -> 169 bytes .../blocks/capacitor_gold_inner_top.png | Bin 0 -> 272 bytes .../textures/blocks/capacitor_gold_side.png | Bin 0 -> 357 bytes .../textures/blocks/capacitor_gold_top.png | Bin 0 -> 219 bytes 9 files changed, 20 insertions(+), 7 deletions(-) create mode 100644 src/main/resources/assets/hbm/textures/blocks/capacitor_gold_bottom.png create mode 100644 src/main/resources/assets/hbm/textures/blocks/capacitor_gold_inner_side.png create mode 100644 src/main/resources/assets/hbm/textures/blocks/capacitor_gold_inner_top.png create mode 100644 src/main/resources/assets/hbm/textures/blocks/capacitor_gold_side.png create mode 100644 src/main/resources/assets/hbm/textures/blocks/capacitor_gold_top.png diff --git a/src/main/java/com/hbm/blocks/ModBlocks.java b/src/main/java/com/hbm/blocks/ModBlocks.java index 0d2b78975..da8ec07e3 100644 --- a/src/main/java/com/hbm/blocks/ModBlocks.java +++ b/src/main/java/com/hbm/blocks/ModBlocks.java @@ -759,6 +759,7 @@ public class ModBlocks { public static Block capacitor_bus; public static Block capacitor_copper; + public static Block capacitor_gold; public static Block machine_coal_off; public static Block machine_coal_on; @@ -1883,7 +1884,8 @@ public class ModBlocks { machine_fensu = new MachineFENSU(Material.iron).setBlockName("machine_fensu").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":machine_fensu"); capacitor_bus = new MachineCapacitorBus(Material.iron).setBlockName("capacitor_bus").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab); - capacitor_copper = new MachineCapacitor(Material.iron, 1_000_000L).setBlockName("capacitor_copper").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":block_copper"); + capacitor_copper = new MachineCapacitor(Material.iron, 1_000_000L, "copper").setBlockName("capacitor_copper").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":block_copper"); + capacitor_gold = new MachineCapacitor(Material.iron, 5_000_000L, "gold").setBlockName("capacitor_gold").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName("gold_block"); machine_coal_off = new MachineCoal(false).setBlockName("machine_coal_off").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab); machine_coal_on = new MachineCoal(true).setBlockName("machine_coal_on").setHardness(5.0F).setLightLevel(1.0F).setResistance(10.0F); @@ -3200,6 +3202,7 @@ public class ModBlocks { register(machine_fensu); register(capacitor_bus); register(capacitor_copper); + register(capacitor_gold); GameRegistry.registerBlock(machine_transformer, machine_transformer.getUnlocalizedName()); GameRegistry.registerBlock(machine_transformer_20, machine_transformer_20.getUnlocalizedName()); GameRegistry.registerBlock(machine_transformer_dnt, machine_transformer_dnt.getUnlocalizedName()); diff --git a/src/main/java/com/hbm/blocks/machine/MachineCapacitor.java b/src/main/java/com/hbm/blocks/machine/MachineCapacitor.java index ad9effd70..64a76e113 100644 --- a/src/main/java/com/hbm/blocks/machine/MachineCapacitor.java +++ b/src/main/java/com/hbm/blocks/machine/MachineCapacitor.java @@ -21,6 +21,7 @@ import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -41,21 +42,23 @@ public class MachineCapacitor extends BlockContainer implements ILookOverlay, IP @SideOnly(Side.CLIENT) public IIcon iconInnerSide; protected long power; + String name; - public MachineCapacitor(Material mat, long power) { + public MachineCapacitor(Material mat, long power, String name) { super(mat); this.power = power; + this.name = name; } @Override @SideOnly(Side.CLIENT) public void registerBlockIcons(IIconRegister iconRegister) { super.registerBlockIcons(iconRegister); - this.iconTop = iconRegister.registerIcon(RefStrings.MODID + ":capacitor_copper_top"); - this.iconSide = iconRegister.registerIcon(RefStrings.MODID + ":capacitor_copper_side"); - this.iconBottom = iconRegister.registerIcon(RefStrings.MODID + ":capacitor_copper_bottom"); - this.iconInnerTop = iconRegister.registerIcon(RefStrings.MODID + ":capacitor_copper_inner_top"); - this.iconInnerSide = iconRegister.registerIcon(RefStrings.MODID + ":capacitor_copper_inner_side"); + this.iconTop = iconRegister.registerIcon(RefStrings.MODID + ":capacitor_" + name + "_top"); + this.iconSide = iconRegister.registerIcon(RefStrings.MODID + ":capacitor_" + name + "_side"); + this.iconBottom = iconRegister.registerIcon(RefStrings.MODID + ":capacitor_" + name + "_bottom"); + this.iconInnerTop = iconRegister.registerIcon(RefStrings.MODID + ":capacitor_" + name + "_inner_top"); + this.iconInnerSide = iconRegister.registerIcon(RefStrings.MODID + ":capacitor_" + name + "_inner_side"); } public static int renderID = RenderingRegistry.getNextAvailableRenderId(); @@ -104,6 +107,11 @@ public class MachineCapacitor extends BlockContainer implements ILookOverlay, IP return IPersistentNBT.getDrops(world, x, y, z, this); } + @Override + public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack itemStack) { + IPersistentNBT.restoreData(world, x, y, z, itemStack); + } + @Override public void onBlockHarvested(World world, int x, int y, int z, int meta, EntityPlayer player) { diff --git a/src/main/java/com/hbm/tileentity/TileMappings.java b/src/main/java/com/hbm/tileentity/TileMappings.java index 824ecb205..f7098e052 100644 --- a/src/main/java/com/hbm/tileentity/TileMappings.java +++ b/src/main/java/com/hbm/tileentity/TileMappings.java @@ -13,6 +13,7 @@ import com.hbm.blocks.generic.BlockLoot.TileEntityLoot; import com.hbm.blocks.generic.BlockMotherOfAllOres.TileEntityRandomOre; import com.hbm.blocks.generic.BlockSnowglobe.TileEntitySnowglobe; import com.hbm.blocks.generic.PartEmitter.TileEntityPartEmitter; +import com.hbm.blocks.machine.MachineCapacitor.TileEntityCapacitor; import com.hbm.blocks.machine.MachineFan.TileEntityFan; import com.hbm.blocks.machine.PistonInserter.TileEntityPistonInserter; import com.hbm.blocks.machine.WatzPump.TileEntityWatzPump; @@ -61,6 +62,7 @@ public class TileMappings { put(TileEntityDecoPoleTop.class, "tileentity_poletop"); put(TileEntityDecoPoleSatelliteReceiver.class, "tileentity_satellitereceicer"); put(TileEntityMachineBattery.class, "tileentity_battery"); + put(TileEntityCapacitor.class, "tileentity_capacitor"); put(TileEntityMachineCoal.class, "tileentity_coal"); put(TileEntityRedBarrel.class, "tileentity_barrel"); put(TileEntityYellowBarrel.class, "tileentity_nukebarrel"); diff --git a/src/main/resources/assets/hbm/textures/blocks/capacitor_bus_out.png b/src/main/resources/assets/hbm/textures/blocks/capacitor_bus_out.png index c9a207e23aea062507bc44b8c20b64fa7bdda6c9..2cb5d71316a30234599dfb6a09c8febbc20eeb40 100644 GIT binary patch delta 257 zcmV+c0sj8O0j&a%G=JntL_t(Ijir;j4Z<)KMNd9-AS@~`f#f0sz!srp3?^a=Qd5K! z86u^nNGSjX3a}JAHs4dl&%XEh$}f>p>c$_W078hL#9HfzfmwXYuwfe705}u{0PEGt zs!J(png)P4)WwM1Z zOs9}#bC$~)N#Z{c52G=F+YL_t(Ijjd9#4Zt7_GZjNePRR-Ma&i(M(4ndXs168fDHE|{ zCpZx)*nkIs5W*5U=Zs@#IsjWBsUoSa3DiVO#IuJhMsqTC@J>soHpQGY0;9ZNJ^x-| zCU@WCM5OF|BzlEDD|1J8P!p_Z)WL{2bTA7KJj+S}R002ovPDHLk FV1h-rI`aSk diff --git a/src/main/resources/assets/hbm/textures/blocks/capacitor_gold_bottom.png b/src/main/resources/assets/hbm/textures/blocks/capacitor_gold_bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..bac7489b5696a6071c4e64f6c43050616c9102da GIT binary patch literal 551 zcmV+?0@(eDP)+m-}(6XK-P8T^YfEZ z3IHNP&Y6@FkB^U}ln5cl)^Mkgb*6YIF6K3=(>(`^?eUO z*LA$Syzu?~jn-NtBCQ#~7(rw62-I5dsGet~ zR0Cd?g>Bo=BGL*W1cqTiMDFySbpY=@-g}&LSZmSyzPDnGk$Ik*)^q>s$F^-PYNZr< z7=}B_N-0Vy?O&WA-upZHXQVoW(A*c1|It4a*|rU!{fm9ye^bag^YHM{SX?d_o}Qin zsI_8@;q=KEb7%5@DgElP){=8(o@bO&)LI+u7-N%Xtp(sXj$a8{>z4oJa%s({7cs`h zqSi{SwV5a)h;xo{9C>|xy_>k>IN0~SO=SpyX_{Eqm3`mo`~EkHx3{{%VX0;LbY8&!uO2B+@Qzt0phd OE(T9mKbLh*2~7am={vdr literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/hbm/textures/blocks/capacitor_gold_inner_top.png b/src/main/resources/assets/hbm/textures/blocks/capacitor_gold_inner_top.png new file mode 100644 index 0000000000000000000000000000000000000000..52ffe26c57d2f80c46e565d1f7c7555ba099fade GIT binary patch literal 272 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#VfyU$h+x$s-jxHO5bVLpwx^#{CiOju&X6_%^2C z+f}UZ9;$nP_Kn~34NsdBk19qmEPlDE)Z&w{l6@#c!*&~U{`OOO)|+`44Cbwuni0H6 z;b~>C)9Q+cs(xD^S_GsmpWhq9#NZ?LI&1U%4?CW*PGx8~n>WL{`rW*H3v7~f85}qm z8>Vdf<`>SM5p;{MBu)20o#msQZL%S@A;}IOyQ3KYO}*L8UB z*=#m=?`hkXG)?i|qm)7jfiZ^r{Z5i)8F`+w+wGoQhGD=tM@-VTEqR{PG!4!?j-Sr$Y3AWvlv(X@`2)X4)02y3We4W>vNW*YX>1L3h?pz_ PbRC1ItDnm{r-UW|aA!_` literal 0 HcmV?d00001