From e89464038b966080c883e9fe999a18838a6ad3e2 Mon Sep 17 00:00:00 2001 From: Boblet Date: Fri, 3 Jun 2022 14:57:46 +0200 Subject: [PATCH] and the lord yoinketh away --- src/main/java/com/hbm/blocks/ModBlocks.java | 14 +++-- .../com/hbm/blocks/network/BlockConveyor.java | 4 +- .../hbm/blocks/network/BlockCraneBase.java | 48 ++++++++++++++++++ .../hbm/blocks/network/CraneExtractor.java | 35 +++++++++++++ .../com/hbm/blocks/network/CraneInserter.java | 35 +++++++++++++ .../hbm/textures/blocks/crane_in_top.png | Bin 245 -> 253 bytes .../hbm/textures/blocks/crane_out_top.png | Bin 253 -> 244 bytes .../gui/storage/gui_crane_ejector.png | Bin 0 -> 2399 bytes 8 files changed, 131 insertions(+), 5 deletions(-) create mode 100644 src/main/java/com/hbm/blocks/network/BlockCraneBase.java create mode 100644 src/main/java/com/hbm/blocks/network/CraneExtractor.java create mode 100644 src/main/java/com/hbm/blocks/network/CraneInserter.java create mode 100644 src/main/resources/assets/hbm/textures/gui/storage/gui_crane_ejector.png diff --git a/src/main/java/com/hbm/blocks/ModBlocks.java b/src/main/java/com/hbm/blocks/ModBlocks.java index 2f25a1301..86d8a7b0e 100644 --- a/src/main/java/com/hbm/blocks/ModBlocks.java +++ b/src/main/java/com/hbm/blocks/ModBlocks.java @@ -746,6 +746,8 @@ public class ModBlocks { public static Block fluid_duct_neo; public static Block conveyor; + public static Block crane_extractor; + public static Block crane_inserter; public static Block chain; @@ -1893,9 +1895,12 @@ public class ModBlocks { gas_duct = new BlockGasDuct(Material.iron).setBlockName("gas_duct").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":gas_duct_icon"); fluid_duct = new BlockFluidDuct(Material.iron).setBlockName("fluid_duct").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":fluid_duct_icon"); fluid_duct_solid = new BlockFluidDuctSolid(Material.iron).setBlockName("fluid_duct_solid").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":fluid_duct_solid"); - conveyor = new BlockConveyor(Material.iron).setBlockName("conveyor").setHardness(0.0F).setResistance(2.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":conveyor"); fluid_duct_neo = new FluidDuctStandard(Material.iron).setBlockName("fluid_duct_neo").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":pipe_neo"); + conveyor = new BlockConveyor().setBlockName("conveyor").setHardness(0.0F).setResistance(2.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":conveyor"); + crane_extractor = new CraneExtractor().setBlockName("crane_extractor").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab); + crane_inserter = new CraneInserter().setBlockName("crane_extractor").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab); + chain = new BlockChain(Material.iron).setBlockName("dungeon_chain").setHardness(0.25F).setResistance(2.0F).setCreativeTab(MainRegistry.blockTab).setBlockTextureName(RefStrings.MODID + ":chain"); ladder_sturdy = new BlockNTMLadder().setBlockName("ladder_sturdy").setHardness(0.25F).setResistance(2.0F).setCreativeTab(MainRegistry.blockTab).setBlockTextureName(RefStrings.MODID + ":ladder_sturdy"); @@ -3048,9 +3053,12 @@ public class ModBlocks { GameRegistry.registerBlock(fluid_duct, fluid_duct.getUnlocalizedName()); GameRegistry.registerBlock(fluid_duct_neo, ItemBlockBase.class, fluid_duct_neo.getUnlocalizedName()); GameRegistry.registerBlock(fluid_duct_solid, fluid_duct_solid.getUnlocalizedName()); - GameRegistry.registerBlock(conveyor, conveyor.getUnlocalizedName()); - GameRegistry.registerBlock(chain, chain.getUnlocalizedName()); + GameRegistry.registerBlock(crane_extractor, crane_extractor.getUnlocalizedName()); + GameRegistry.registerBlock(crane_inserter, crane_inserter.getUnlocalizedName()); + GameRegistry.registerBlock(conveyor, conveyor.getUnlocalizedName()); + + GameRegistry.registerBlock(chain, chain.getUnlocalizedName()); GameRegistry.registerBlock(ladder_sturdy, ladder_sturdy.getUnlocalizedName()); GameRegistry.registerBlock(ladder_iron, ladder_iron.getUnlocalizedName()); GameRegistry.registerBlock(ladder_gold, ladder_gold.getUnlocalizedName()); diff --git a/src/main/java/com/hbm/blocks/network/BlockConveyor.java b/src/main/java/com/hbm/blocks/network/BlockConveyor.java index dc9235b89..70ca3a8c4 100644 --- a/src/main/java/com/hbm/blocks/network/BlockConveyor.java +++ b/src/main/java/com/hbm/blocks/network/BlockConveyor.java @@ -27,8 +27,8 @@ public class BlockConveyor extends Block implements IConveyorBelt { @SideOnly(Side.CLIENT) protected IIcon sideIcon; - public BlockConveyor(Material p_i45394_1_) { - super(p_i45394_1_); + public BlockConveyor() { + super(Material.iron); } @Override diff --git a/src/main/java/com/hbm/blocks/network/BlockCraneBase.java b/src/main/java/com/hbm/blocks/network/BlockCraneBase.java new file mode 100644 index 000000000..a979bdb18 --- /dev/null +++ b/src/main/java/com/hbm/blocks/network/BlockCraneBase.java @@ -0,0 +1,48 @@ +package com.hbm.blocks.network; + +import com.hbm.lib.RefStrings; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.block.BlockContainer; +import net.minecraft.block.BlockPistonBase; +import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; +import net.minecraft.world.World; + +public abstract class BlockCraneBase extends BlockContainer { + + @SideOnly(Side.CLIENT) protected IIcon iconSide; + @SideOnly(Side.CLIENT) protected IIcon iconIn; + @SideOnly(Side.CLIENT) protected IIcon iconSideIn; + @SideOnly(Side.CLIENT) protected IIcon iconOut; + @SideOnly(Side.CLIENT) protected IIcon iconSideOut; + @SideOnly(Side.CLIENT) protected IIcon iconDirectional; + + public BlockCraneBase(Material mat) { + super(mat); + } + + @Override + @SideOnly(Side.CLIENT) + public void registerBlockIcons(IIconRegister iconRegister) { + this.blockIcon = iconRegister.registerIcon(RefStrings.MODID + ":crane_top"); + this.iconSide = iconRegister.registerIcon(RefStrings.MODID + ":crane_side"); + this.iconIn = iconRegister.registerIcon(RefStrings.MODID + ":crane_in"); + this.iconSideIn = iconRegister.registerIcon(RefStrings.MODID + ":crane_side_in"); + this.iconOut = iconRegister.registerIcon(RefStrings.MODID + ":crane_out"); + this.iconSideOut = iconRegister.registerIcon(RefStrings.MODID + ":crane_side_out"); + } + + @Override + @SideOnly(Side.CLIENT) + public abstract IIcon getIcon(int side, int metadata); + + public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack stack) { + int l = BlockPistonBase.determineOrientation(world, x, y, z, player); + world.setBlockMetadataWithNotify(x, y, z, l, 2); + } +} diff --git a/src/main/java/com/hbm/blocks/network/CraneExtractor.java b/src/main/java/com/hbm/blocks/network/CraneExtractor.java new file mode 100644 index 000000000..53bdff754 --- /dev/null +++ b/src/main/java/com/hbm/blocks/network/CraneExtractor.java @@ -0,0 +1,35 @@ +package com.hbm.blocks.network; + +import com.hbm.lib.RefStrings; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.IIcon; +import net.minecraft.world.World; + +public class CraneExtractor extends BlockCraneBase { + + public CraneExtractor() { + super(Material.iron); + } + + @Override + public TileEntity createNewTileEntity(World world, int meta) { + return null; + } + + @Override + @SideOnly(Side.CLIENT) + public void registerBlockIcons(IIconRegister iconRegister) { + super.registerBlockIcons(iconRegister); + this.iconDirectional = iconRegister.registerIcon(RefStrings.MODID + ":crane_out_top"); + } + + @Override + public IIcon getIcon(int side, int metadata) { + return null; + } +} diff --git a/src/main/java/com/hbm/blocks/network/CraneInserter.java b/src/main/java/com/hbm/blocks/network/CraneInserter.java new file mode 100644 index 000000000..f1fd9276b --- /dev/null +++ b/src/main/java/com/hbm/blocks/network/CraneInserter.java @@ -0,0 +1,35 @@ +package com.hbm.blocks.network; + +import com.hbm.lib.RefStrings; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.IIcon; +import net.minecraft.world.World; + +public class CraneInserter extends BlockCraneBase{ + + public CraneInserter() { + super(Material.iron); + } + + @Override + public TileEntity createNewTileEntity(World world, int meta) { + return null; + } + + @Override + @SideOnly(Side.CLIENT) + public void registerBlockIcons(IIconRegister iconRegister) { + super.registerBlockIcons(iconRegister); + this.iconDirectional = iconRegister.registerIcon(RefStrings.MODID + ":crane_in_top"); + } + + @Override + public IIcon getIcon(int side, int metadata) { + return null; + } +} diff --git a/src/main/resources/assets/hbm/textures/blocks/crane_in_top.png b/src/main/resources/assets/hbm/textures/blocks/crane_in_top.png index c09006451459f9a9260411c130f5b8604c4538f3..a46e294c95ea17df7cca182062b53a810eb44a29 100644 GIT binary patch delta 209 zcmV;?051Ra0sR4xG=H>7L_t(IjkS}p4Z<)KM33MKeR+mt6o#NCRaz#AcK}+Jp-p2c zBb+Q!p->=$NtDC}an;x9?&(Wke^pggj~}G`ARPILC)I}MNy0Z zYG`P!u{#|nS6&1FfVDOn@ZU2g0haC^D$FY2`4}RS1o?QT&`8w-@;OAACf$;s00000 LNkvXXu0mjf5lLA& delta 201 zcmV;)05<>q0rdfpG=Ho~L_t(IjjfYG4uUWcMW3WAGwBgrdom7C&moC7C@1kMjYpU? zZgnAz6e!Z*U$v9}UNV6m+O~bMBPJb0qza5Negz4()^37T6%irENRx(J;c2&7>21nx zfte0ewOC$Sb0z?|b{znZ;r;~9K<_;vgseMT!CK43xePuQ;6g<~lH8o*G{E-)TwEbZ zdhY>>@T%Y!nDW2>VD0lwGwvGrJPZ-3l4Or*JgChZ38FpHJ~|NE00000NkvXXu0mjf DqVZPA diff --git a/src/main/resources/assets/hbm/textures/blocks/crane_out_top.png b/src/main/resources/assets/hbm/textures/blocks/crane_out_top.png index a46e294c95ea17df7cca182062b53a810eb44a29..224864e9cb3f1ce70f3b4750b43a4bc8b0f0d564 100644 GIT binary patch delta 200 zcmV;(05|{r0rUZoG=Hl}L_t(IjkS}(4Z<)CMITj9$jS&+S78!*>Xk|84C!VSBYZ_% z;Xoq_q$LsJpCZTqIgaIB-}g6uP#q6uR%8qzJOR<{oXavx!psOEP{m-b`8~JV$jj0u zKoXKR0rlF2Bu>LX1B~7?O;i30qWKD3fJ4{Owrw6j66e{xpFv{{a9n|WwBVd$^gdZF zrQ{#1^_$Xv$5;gTHt(gDxivf%!_0~xFUzzHl7L_t(IjkS}p4Z<)KM33MKeR+mt6o#NCRaz#AcK}+Jp-p2c zBb+Q!p->=$NtDC}an;x9?&(Wke^pggj~}G`ARPILC)I}MNy0Z zYG`P!u{#|nS6&1FfVDOn@ZU2g0haC^D$FY2`4}RS1o?QT&`8w-@;OAACf$;s00000 LNkvXXu0mjf5O`TQ diff --git a/src/main/resources/assets/hbm/textures/gui/storage/gui_crane_ejector.png b/src/main/resources/assets/hbm/textures/gui/storage/gui_crane_ejector.png new file mode 100644 index 0000000000000000000000000000000000000000..506cf9f4527a4eed32a6f5cb886caeac18a5d249 GIT binary patch literal 2399 zcmbtVX;2eb5`KwcAgGX_0)lb`0l|_(9=BOu zO&$QS*~t;>3IIfELV(;)QssHM=)6?H!VfyR$w?(%?yqzJ;L1)|2e;_FX`$&wb$8{T zI@?0}#qcTLwwpmAsev1c+#Gnt2Pqf?@3dC2 z>xIVby<1-vAPro{2(fu_3RLTiaI++ydP6`u8RlrrWN)~YxaCFZtv?m^J!-0$W4)Vpnz;$ zjzZ~WIAO7$rl-9IDsqqMg+)h4PuCQM7T=6b;)ecWS04_c*0#;;XJf7#xArL+83D#GmC)_09+FOKEIuT%Ku| zMWKADR5V4hGOj+r(6GD4WHOgWOSvV>(;XAnsXiX?_9pirMErcG3($DE(%Ug2&Q0WqMncN^*r7bux_wl;HIQvRT1t@;(`VpMyN8<3Ti z4Q80CZt}I&P%*=E2Yur5Vw4-bbK~2MihafhACGa5*6IP2(ct4LRfS|z4MwV(e@2$A zOGk$e>ivt6R`&r@=A-sifH1O!y?g!XtNw_{8vGD_Z5LSX0tg|0?p(J6flco zV#T(%wQW~qFv$lPYc3k-rd7$^X}Sk7y-X>fO8fcUXPRnPF?aey<@U{99(2{0{4CEt zbQ`x6d$=;d24!^dj8jpJ#gIfo`7}G*dUrZCHMKqqYTUrDYZ;*VyMdki?9g1RdUw-c z@67fDGnhe+JgvIFNxiaSp=SMOFp)l{MDn`@g3Vxoh6%5G&p^p^U7oPI29{kuuVRnC zGqoapcBxGoZ2{}+X`(^d2p5*U*Ch8W z`HqxoMpadnDx=lHc+ursWZ4iG0~=Wj&j;POwcNh7f;IsL1;d0XAOGw(Y_h);_A!mYIM>C5<}lX6&2p*a zU$;B9D9i9jCiLOC@M{APTXPDn`c#shz7Yy7ZS1_Pf4g47yFtBk{tLs%VnfQ?yFgk| zaMW;4#Ak!RyqKuLa@UV&q0nn3Y>X&_cyJhkxKXIn`A~kyC_^)}iU>*P8*T&DPcms| z12QAfWe365fXw}pgEVtF8npZo3;```v!XpMTNP0P62WeI2KAiLYyFmEsQXt z)<;V&FSxu^V(YAmDS1pLKiW2}qu!}c24htWtk0i@!bpc$KwRb~)^hd%4VgxtcXzAE}8dDwnIV-)|U2ps$e3qKV5BSBKv{om6h3+iih5H}rh?4{Gt@9e%U*M~&N znB(Ci2O6MnG`y}{Ke=X!$6rj-{d3Cy46K6p%z(1P9Oq7|O{?HdKY;yfaBmH(KC>d@ zw<8<9IquB-{Maz`l7)G+WZA@C!>VVF?`XKv#Z~iY$6D*@I8>b>x Scm%<>L{5kC*ouRstN#SkuMzzK literal 0 HcmV?d00001