From 32df415e58015016525c25be3a30885ed7c9d8c5 Mon Sep 17 00:00:00 2001 From: Bob Date: Mon, 18 Jan 2021 23:34:32 +0100 Subject: [PATCH] cha cha real smooth --- .../textures/blocks/armor_table_bottom.png | Bin 0 -> 165 bytes .../hbm/textures/blocks/armor_table_side.png | Bin 0 -> 148 bytes .../hbm/textures/blocks/armor_table_top.png | Bin 0 -> 216 bytes .../assets/hbm/textures/gui/generic_54.png | Bin 0 -> 2758 bytes .../hbm/textures/gui/gui_armor_modifier.png | Bin 0 -> 2294 bytes src/main/java/com/hbm/blocks/ModBlocks.java | 5 ++ .../hbm/blocks/machine/BlockArmorTable.java | 53 ++++++++++++++++++ .../blocks/machine/BlockConverterHeRf.java | 3 - .../blocks/machine/BlockConverterRfHe.java | 3 - 9 files changed, 58 insertions(+), 6 deletions(-) create mode 100644 src/main/java/assets/hbm/textures/blocks/armor_table_bottom.png create mode 100644 src/main/java/assets/hbm/textures/blocks/armor_table_side.png create mode 100644 src/main/java/assets/hbm/textures/blocks/armor_table_top.png create mode 100755 src/main/java/assets/hbm/textures/gui/generic_54.png create mode 100644 src/main/java/assets/hbm/textures/gui/gui_armor_modifier.png create mode 100644 src/main/java/com/hbm/blocks/machine/BlockArmorTable.java diff --git a/src/main/java/assets/hbm/textures/blocks/armor_table_bottom.png b/src/main/java/assets/hbm/textures/blocks/armor_table_bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..f211c4645f5fb774b3b2f66f2f6698078afac426 GIT binary patch literal 165 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#VfL%IEGmC zKAo_W_kaNpvwp+%izZUBk6(Cd?cN@w;&J1%!@Y&8)EhcB2pcmeq^L2x+s8U%FKb6f tJL6mK(5q1f)$s)d)d#Cp{@pmpx;U|`YQf&lzd&OdJYD@<);T3K0RZBnG2;LL literal 0 HcmV?d00001 diff --git a/src/main/java/assets/hbm/textures/blocks/armor_table_top.png b/src/main/java/assets/hbm/textures/blocks/armor_table_top.png new file mode 100644 index 0000000000000000000000000000000000000000..faad67b64e82f1f1b98b37812edebf96087cba71 GIT binary patch literal 216 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#VfJyymVAm-s4n1+ebe@8Mp{kp0XmSIpOE) zNzz@c3jiQ_d%1rA00u$~&?Z6?8dn$z4W8lV;|4(aDZQCJ1o&Mi)+;C;0E1iTgE3mR zg#&=@K5uuofW)woZcN-_Z)3cl{L{~3ZM!p~R_y2Qj<64=AKX!FnE%cvsyfGTBOCQK zGKtNeeKD$-dEq(FWR-}xUc{VTku8?y;)4wnH5s<5n$>h2NiP1pq02?z+~S1<11qJh zEmfyu6Y;%T;>r5Hq@-#??W>wTBXP@y1V;LU0cXJ3rdsYVpn)ylM373M3~_YRTk;~L z2XLN)jRw_(#K$Y0L)G&9`$p8l=}|iL7uneYz<)-NO;ruIFpy~F9hw8$0(yMJS-3|y zxTiJcGJBLM02^DMTl3i}Eg)U#>>E$$(d9qOX)>bbn4q6aeFJ^2>xp|~U05HBL?UK> z`GuPoCU|!(hx)?tixrKwpjj`fnQoG5Q?`a3X~Uc7=r}zOraQLK>&M)I>@mbsdH2jB zP?yu6U2vT+RTure<=ZhrI|mw|Ps3Hg=va$38S*j~JBTM*sTwn?F`fnlAQTg^Hqe;_ z_frG+Rvt%3lr<92z6x3pc&63N7_A8X10~225J)+^69L2*2d!VAba)R+{;ME2^u+4v z**m#w6gEwab>=)mgYn#q$=}ob)A1YyN7?4IP)lP!b*GSheclJre}7|-^^zT)>Skzcs`z!82$ZoKkXzRG2pRggJhX> z%X`U@jVVBx4m!2RrzbCX_~ad(l-k2Yo!SwWSzPLWfW8I!Nb1(z!e6jw;*&#S;(}r; zggQ?(b01N#T!-kmnh;P0Vlbz+srQHq$Trksig)~EC!u#gs31VIa$ zw&b}wqLqlRnj+DGEVGMNSEH4`9fX3F!ut7DyuY`SiLY4Du$hmtD`3}hLf$~Szrb0* zr6Q7_GXtddG0BYX&A1)PbG2< zJ1lffiQWd!xj4-Xkjd<^1QhW1FZ64f3cI?sVqKO9G;)=EdaPN&7^xi-$%f8W&c!G8 zr^IaFKDkX@i!BqC30;kM<*a0#D|hXHBk;E65RSv_Wfe%Z$4UKW*J3M=z+qL5ox)!B zBt}U1X~%stYUt|6=E?BgjBV6YA3K|TrO214OL^r^RT;7XUUUDR;#Vy zy=T#EDocvu^4kuGx;9=?qe-B=OFnZ--wG)Lp;b8ZQ}tu&#FD#e<+m#^wZ!o#YAvyA z=a+*8=<(PWqpYh$p!1D*WUmG>dF#WO@#~-~RbRqhziUIbbq25bRsp863-pY~FOSTc z`FIjevf2~8MXz4&viVm1oD%Wz(kjWL7*F9yVr_K&jEV{5dkIzF+r!sguyJ?V&p#5$VE_OC literal 0 HcmV?d00001 diff --git a/src/main/java/assets/hbm/textures/gui/gui_armor_modifier.png b/src/main/java/assets/hbm/textures/gui/gui_armor_modifier.png new file mode 100644 index 0000000000000000000000000000000000000000..0ff74fa7e00bc9be70b2bf341592f36ab92d1395 GIT binary patch literal 2294 zcmb7`X;9Ni7Qp)-q9iDY2oaGO6c3Qo6BRHVGJ%BR7SM3SMG-HqARuRu1;hgoL85Y5 za;e23AZVfxOOZ^mk{FIaA_NhL0Ye0YaK&t#S$Atc%uG#xd9UB=>ev1H^{+eA%>}2b zqN4%;P<3)V;sF4pP$7U=sStjVRly1YC)+uBArvhEaqFa`~#XR z-Qvt2pKUr3g@ImN2mQF*i)9_t%gm~yTGl3+nip9MU1JVi>61I~Wg^1jr{Yqzg1Pn5 zyvc%2X@%9a#p&)BK)U2F^UUZN&E?43CtqG1zDs0hFTXn`yQPWEUszst7Rk4SuK$|& z*1&s8F3vp!eVyReM!rnh5D*yXi8p-N+FIF2+FCl_x>PAk8?N;B)Q8#xk`hs1%AwV1 zlwr(va3DVvVemZyM(Gk6MYRcBfelHa-=QIy7#PJ<6fk4vzeD{77}}d2I*&{_p|DYD zd^7kW5xJ$Ek$>}JWCg2H@I8kenEKP=w@^vofUf&>WX zA5#O^I-pJk6b2l?w*$SpWU>`=W@cu5e+~CsTwENl)M8QThB1`G;X<^x;%I&pKT-x2 z0QKWdYZ>no6B5euT1qlAT1p;c?IWcboCN& z?lL>b)@os(^B<$>CX2Fyf&ziO#8SnV zJXbUxNXO=M8N&3+8$-1GGVg!$m9G{XmOFw*$+Xnug}ZtV?#Wt)TZ&NvvppW-e4{Dp zYjlq9m4aTKRVf;6*zWZWThBXzM%__k$@CS!dN^Y?4qd2n&NaoPsFVKyyG^$m`{w30 zP+VNRvho#;%RRXNsrG~`5;u{JzB(L^v@x^PY$Kt5&n^K3pK--T$2gr$&ZcQY<`18{ z^L<9%NvmC}ZYeVF5|6ACX4xJr8odm>Wf-4?!@dIncGtzjXBr|w*+5xx&7 zww4y<5TrgM+IDao{H5F4!kkZ+_NFZ}w^!Mfnwmn?YT}0q`S|)^I3uV6wS-8aA;C%$ zS>N9APZ~d0((=UKUH9k;2D`pbk+1g~-NhyRhrzt}(FXs(9$jIB&km#ZFMn{^_Z4?h zap<3jL3E;OvZWVrRvqQvMv=QFbK5Bmihfz1(D=eu5a_IAM{2_XLPa4@;t`)GGMRr6 z3ykkX^2UpTgQ1~og#Xr=QPLVcX-)IKTBW+{cdE74Q1Yf(9bB3kV|Q@Vm|}gFZxE%s z_TexQXaU}A7O%tD^Y%q^RfMA6e^FGc7dNvkplVEaCY!(N{!k=+xG`VoC>P8u(Dw=g=$@T!Q_V|@GeXw4xw$!d zAi-E9_`t3F_W7S=rVb#mya|J`(;=IkwUTEfd_G^IPE{$}C%Z@Xj_EyZ)L#J=v|KZ8 zUt$SS$(Ha)%|Z4=_h5c|lpc|pgk&F%&A58TWvcdA4R7_Y1)6e>&2diaoSK!G8+?A8 zHH#%OX&QCJ`9xduW_GW!kJx2)Ht}V}e8F5;mF#|9l#JzFp9RuYlBqzOKBV8m1o@C21^En#e{lJ?=dudFXZiF-c}1RSLC5I#g#}St8tLv@#%Oys y#=#Oscm_SYF}W(%jI+wuWlBl$Ir;Nuxv)n2*o{=k{o#fm1DzaPj?~zZF8>=@edk*M literal 0 HcmV?d00001 diff --git a/src/main/java/com/hbm/blocks/ModBlocks.java b/src/main/java/com/hbm/blocks/ModBlocks.java index 7dd39cc37..c2986187c 100644 --- a/src/main/java/com/hbm/blocks/ModBlocks.java +++ b/src/main/java/com/hbm/blocks/ModBlocks.java @@ -746,6 +746,9 @@ public class ModBlocks { public static Block machine_keyforge; public static final int guiID_keyforge = 67; + public static Block machine_armor_table; + public static final int guiID_armor_taable = 67; + public static Block machine_reactor_small; public static final int guiID_reactor_small = 65; @@ -1304,6 +1307,7 @@ public class ModBlocks { machine_satlinker = new MachineSatLinker(Material.iron).setBlockName("machine_satlinker").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.missileTab).setBlockTextureName(RefStrings.MODID + ":machine_satlinker_side"); machine_telelinker = new MachineTeleLinker(Material.iron).setBlockName("machine_telelinker").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.nukeTab).setBlockTextureName(RefStrings.MODID + ":machine_telelinker_side"); machine_keyforge = new MachineKeyForge(Material.iron).setBlockName("machine_keyforge").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.consumableTab).setBlockTextureName(RefStrings.MODID + ":machine_keyforge_side"); + machine_armor_table = new BlockArmorTable(Material.iron).setBlockName("machine_armor_table").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.consumableTab); machine_solar_boiler = new MachineSolarBoiler(Material.iron).setBlockName("machine_solar_boiler").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":machine_solar_boiler"); solar_mirror = new SolarMirror(Material.iron).setBlockName("solar_mirror").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":solar_mirror"); @@ -2104,6 +2108,7 @@ public class ModBlocks { GameRegistry.registerBlock(machine_satlinker, machine_satlinker.getUnlocalizedName()); GameRegistry.registerBlock(machine_telelinker, machine_telelinker.getUnlocalizedName()); GameRegistry.registerBlock(machine_keyforge, machine_keyforge.getUnlocalizedName()); + GameRegistry.registerBlock(machine_armor_table, machine_armor_table.getUnlocalizedName()); GameRegistry.registerBlock(machine_forcefield, machine_forcefield.getUnlocalizedName()); GameRegistry.registerBlock(radiorec, radiorec.getUnlocalizedName()); GameRegistry.registerBlock(radiobox, radiobox.getUnlocalizedName()); diff --git a/src/main/java/com/hbm/blocks/machine/BlockArmorTable.java b/src/main/java/com/hbm/blocks/machine/BlockArmorTable.java new file mode 100644 index 000000000..eafe59b1c --- /dev/null +++ b/src/main/java/com/hbm/blocks/machine/BlockArmorTable.java @@ -0,0 +1,53 @@ +package com.hbm.blocks.machine; + +import com.hbm.lib.RefStrings; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.util.IIcon; +import net.minecraft.world.World; + +public class BlockArmorTable extends Block { + + @SideOnly(Side.CLIENT) + private IIcon iconTop; + @SideOnly(Side.CLIENT) + private IIcon iconBottom; + + public BlockArmorTable(Material p_i45394_1_) { + super(p_i45394_1_); + } + + @Override + @SideOnly(Side.CLIENT) + public void registerBlockIcons(IIconRegister iconRegister) { + + this.iconTop = iconRegister.registerIcon(RefStrings.MODID + ":armor_table_top"); + this.iconBottom = iconRegister.registerIcon(RefStrings.MODID + ":armor_table_bottom"); + this.blockIcon = iconRegister.registerIcon(RefStrings.MODID + ":armor_table_side"); + } + + @Override + @SideOnly(Side.CLIENT) + public IIcon getIcon(int side, int metadata) { + return side == 0 ? this.iconBottom : (side == 1 ? this.iconTop : this.blockIcon); + } + + @Override + public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) { + + if(world.isRemote) { + return true; + } else if(!player.isSneaking()) { + + return true; + } + + return false; + } + +} diff --git a/src/main/java/com/hbm/blocks/machine/BlockConverterHeRf.java b/src/main/java/com/hbm/blocks/machine/BlockConverterHeRf.java index 873724220..2b3880812 100644 --- a/src/main/java/com/hbm/blocks/machine/BlockConverterHeRf.java +++ b/src/main/java/com/hbm/blocks/machine/BlockConverterHeRf.java @@ -1,10 +1,7 @@ package com.hbm.blocks.machine; -import com.hbm.blocks.ModBlocks; -import com.hbm.main.MainRegistry; import com.hbm.tileentity.machine.TileEntityConverterHeRf; -import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/com/hbm/blocks/machine/BlockConverterRfHe.java b/src/main/java/com/hbm/blocks/machine/BlockConverterRfHe.java index b4793ee36..ad3bfa72f 100644 --- a/src/main/java/com/hbm/blocks/machine/BlockConverterRfHe.java +++ b/src/main/java/com/hbm/blocks/machine/BlockConverterRfHe.java @@ -1,10 +1,7 @@ package com.hbm.blocks.machine; -import com.hbm.blocks.ModBlocks; -import com.hbm.main.MainRegistry; import com.hbm.tileentity.machine.TileEntityConverterRfHe; -import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer;