From ba21416f69b6f1d52ea6f63c8df5d006ee6dde86 Mon Sep 17 00:00:00 2001 From: Boblet Date: Fri, 16 Sep 2022 15:14:47 +0200 Subject: [PATCH] small test with finite fluids --- src/main/java/com/hbm/blocks/ModBlocks.java | 6 ++ .../hbm/blocks/fluid/GenericFiniteFluid.java | 52 ++++++++++++++++++ .../com/hbm/items/tool/ItemModBucket.java | 48 +++++++++++++++- .../hbm/textures/blocks/concrete_liquid.png | Bin 0 -> 646 bytes .../blocks/concrete_liquid_flowing.png | Bin 0 -> 744 bytes 5 files changed, 104 insertions(+), 2 deletions(-) create mode 100644 src/main/java/com/hbm/blocks/fluid/GenericFiniteFluid.java create mode 100644 src/main/resources/assets/hbm/textures/blocks/concrete_liquid.png create mode 100644 src/main/resources/assets/hbm/textures/blocks/concrete_liquid_flowing.png diff --git a/src/main/java/com/hbm/blocks/ModBlocks.java b/src/main/java/com/hbm/blocks/ModBlocks.java index 1b7256727..a9e7c586f 100644 --- a/src/main/java/com/hbm/blocks/ModBlocks.java +++ b/src/main/java/com/hbm/blocks/ModBlocks.java @@ -1231,6 +1231,8 @@ public class ModBlocks { public static Block sulfuric_acid_block; public static Fluid sulfuric_acid_fluid; + public static Block concrete_liquid; + public static Block volcano_core; public static Block dummy_block_flare; @@ -2319,6 +2321,9 @@ public class ModBlocks { sulfuric_acid_fluid = new GenericFluid("sulfuric_acid_fluid").setDensity(1840).setViscosity(1000).setTemperature(273); FluidRegistry.registerFluid(sulfuric_acid_fluid); sulfuric_acid_block = new GenericFluidBlock(sulfuric_acid_fluid, Material.water, "sulfuric_acid_still", "sulfuric_acid_flowing").setDamage(ModDamageSource.acid, 5F).setBlockName("sulfuric_acid_block").setResistance(500F); + + Fluid liquidConcrete = new GenericFluid("concrete_liquid").setViscosity(2000); + concrete_liquid = new GenericFiniteFluid(liquidConcrete, Material.rock, "concrete_liquid", "concrete_liquid_flowing").setQuantaPerBlock(4).setBlockName("concrete_liquid").setResistance(500F); dummy_block_flare = new DummyBlockFlare(Material.iron, false).setBlockName("dummy_block_flare").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":block_aluminium"); dummy_port_flare = new DummyBlockFlare(Material.iron, true).setBlockName("dummy_port_flare").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":block_aluminium"); @@ -3363,6 +3368,7 @@ public class ModBlocks { GameRegistry.registerBlock(corium_block, corium_block.getUnlocalizedName()); GameRegistry.registerBlock(volcanic_lava_block, volcanic_lava_block.getUnlocalizedName()); GameRegistry.registerBlock(sulfuric_acid_block, sulfuric_acid_block.getUnlocalizedName()); + GameRegistry.registerBlock(concrete_liquid, concrete_liquid.getUnlocalizedName()); //Multiblock Dummy Blocks GameRegistry.registerBlock(dummy_block_flare, dummy_block_flare.getUnlocalizedName()); diff --git a/src/main/java/com/hbm/blocks/fluid/GenericFiniteFluid.java b/src/main/java/com/hbm/blocks/fluid/GenericFiniteFluid.java new file mode 100644 index 000000000..df77a5130 --- /dev/null +++ b/src/main/java/com/hbm/blocks/fluid/GenericFiniteFluid.java @@ -0,0 +1,52 @@ +package com.hbm.blocks.fluid; + +import java.util.Random; + +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.util.IIcon; +import net.minecraft.world.World; +import net.minecraftforge.fluids.BlockFluidFinite; +import net.minecraftforge.fluids.Fluid; + +public class GenericFiniteFluid extends BlockFluidFinite { + + @SideOnly(Side.CLIENT) + public static IIcon stillIcon; + @SideOnly(Side.CLIENT) + public static IIcon flowingIcon; + public Random rand = new Random(); + + private String stillName; + private String flowingName; + + public GenericFiniteFluid(Fluid fluid, Material material, String still, String flowing) { + super(fluid, material); + setCreativeTab(null); + stillName = still; + flowingName = flowing; + displacements.put(this, false); + } + + @Override + @SideOnly(Side.CLIENT) + public IIcon getIcon(int side, int meta) { + return (side == 0 || side == 1) ? stillIcon : flowingIcon; + } + + @Override + @SideOnly(Side.CLIENT) + public void registerBlockIcons(IIconRegister register) { + stillIcon = register.registerIcon(RefStrings.MODID + ":" + stillName); + flowingIcon = register.registerIcon(RefStrings.MODID + ":" + flowingName); + } + + @Override + public int onBlockPlaced(World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ, int meta) { + return this.quantaPerBlock - 1; + } +} diff --git a/src/main/java/com/hbm/items/tool/ItemModBucket.java b/src/main/java/com/hbm/items/tool/ItemModBucket.java index 33c5b7c4b..86caf2476 100644 --- a/src/main/java/com/hbm/items/tool/ItemModBucket.java +++ b/src/main/java/com/hbm/items/tool/ItemModBucket.java @@ -1,12 +1,56 @@ package com.hbm.items.tool; import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.init.Blocks; import net.minecraft.item.ItemBucket; +import net.minecraft.world.World; public class ItemModBucket extends ItemBucket { + + protected int overrideFluidMeta = 0; + protected Block containedFluid; - public ItemModBucket(Block p_i45331_1_) { - super(p_i45331_1_); + public ItemModBucket(Block fluid) { + super(fluid); + this.containedFluid = fluid; + } + + public ItemModBucket(Block fluid, int meta) { + this(fluid); + this.overrideFluidMeta = meta; + } + + @Override + public boolean tryPlaceContainedLiquid(World world, int x, int y, int z) { + + if(this.containedFluid == Blocks.air) { + return false; + } else { + Material material = world.getBlock(x, y, z).getMaterial(); + boolean flag = !material.isSolid(); + + if(!world.isAirBlock(x, y, z) && !flag) { + return false; + } else { + if(world.provider.isHellWorld && this.containedFluid == Blocks.flowing_water) { + world.playSoundEffect((double) ((float) x + 0.5F), (double) ((float) y + 0.5F), (double) ((float) z + 0.5F), "random.fizz", 0.5F, + 2.6F + (world.rand.nextFloat() - world.rand.nextFloat()) * 0.8F); + + for(int l = 0; l < 8; ++l) { + world.spawnParticle("largesmoke", (double) x + Math.random(), (double) y + Math.random(), (double) z + Math.random(), 0.0D, 0.0D, 0.0D); + } + } else { + if(!world.isRemote && flag && !material.isLiquid()) { + world.func_147480_a(x, y, z, true); + } + + world.setBlock(x, y, z, this.containedFluid, overrideFluidMeta, 3); + } + + return true; + } + } } } diff --git a/src/main/resources/assets/hbm/textures/blocks/concrete_liquid.png b/src/main/resources/assets/hbm/textures/blocks/concrete_liquid.png new file mode 100644 index 0000000000000000000000000000000000000000..5d76282fe5c8438b922d95686c704a2396eb572e GIT binary patch literal 646 zcmV;10(t$3P)*cR5k zi@XS)Hd=_8IY;N4KVM&8f9H9|drzL{e1CsqjN$qDnd9*Yz%)&4+eQe15CX$6pp>Gj zDt6N}F^(f41gfgy^YfEo7yt+%q~aJO<2d5IM{5nhJkRXLab%h%>bk~zk8_U4xn8eW zYni4AV+iAp_Jl$J|`;xd7h(`;&!{;8z`mH1b}fI z)BW=DLS5Hrtr3xALu<{tuB_{da?T+lbX~_ZO;~F&#*pVZzrVk{zP>U|6W)82Qiw?U zaIH1Udrt^~x3{-csI_LEXRNifZHrQhx~}QEjx5U%5!Q7j%QALVRZ*7Z|6+6xLeic}^TCtu<}iQWOQlFwnLwP167{ z3TcoDeOVS_j2L6?5C1Jo2!TA$IUbM6O4oH< zE|)u%5BcLbvfu9kxZQ3^W?k0_AQ1uJ{r#P)s&LM+^WIaIB_e`zF2(b(BO)|SL*Mr} g=Qy2C06cc+AKE5D8*cmd+5i9m07*qoM6N<$f(yhcMgRZ+ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/hbm/textures/blocks/concrete_liquid_flowing.png b/src/main/resources/assets/hbm/textures/blocks/concrete_liquid_flowing.png new file mode 100644 index 0000000000000000000000000000000000000000..13ce2f116cd520a22f3b9bab02b640d20ee3fbc0 GIT binary patch literal 744 zcmVP)lVurso@0z5NfMM&91e#lB|w^{ zD5bbwuK+CNS4ydP!rMf*_ineNEK9W3h)9%CYt1;0jN|xi!hhkFa}E*Va=FlT9oAZm zF{EkA*Vh+MPfv7RhxZ<(6e1EYoYtD9yz<@?Lg4xNIf7bi`o70n%jtANDMeY9TrL-q zBtb+N$B`sSSjw-8q9D)nZ#J3dnTLl54u=EA7|OC_nkLrkHGSVBB519drirEe>ShV= zJt9H~0c$PJIbL61@!nI{H6p?=42mvMgh> z*^p&f{DD#`2G7mMOL?WW=5#udWf@J=a5|l+stSOnX$T=8A{0e|F@|9nFvc*?GXP6@ zWsIS!DnbZ&?@5w`d7eqrlq}2e-s8Oo;BYvw*=%CiXsubws}Mqz>E>mn6adb-m|Vj! zV6EkNJR%|}rRe*frM$YGZWspUdBzy?`@^4Q5keqMQ?}b}l=5=9a6BGK)0CyWy2;nJ zE$j6ffa~=dWh%=u28f6N@bdCPQ4~1mSjw-w_vCqwh~S)y_PEI@B2-mHUDr70*zfni z_Z_f=UsY8_-}j8;$Zofb`#edKZ=0(qikNVJ>jVGF-}}J558V5}y${^`z`YOL`@nzi a1HS-iZ2B5uxhg9F0000