diff --git a/src/generated/resources/.cache/ad795fb8576279849034d802e60366ec43bb396a b/src/generated/resources/.cache/ad795fb8576279849034d802e60366ec43bb396a index 0be858e3..07329aec 100644 --- a/src/generated/resources/.cache/ad795fb8576279849034d802e60366ec43bb396a +++ b/src/generated/resources/.cache/ad795fb8576279849034d802e60366ec43bb396a @@ -1,5 +1,7 @@ -// 1.19.2 2023-08-30T15:11:12.5771746 Registrate Provider for tfmg [Recipes, Advancements, Loot tables, Tags (blocks), Tags (items), Tags (fluids), Tags (entity_types), Blockstates, Item models, Lang (en_us/en_ud)] +// 1.19.2 2023-08-30T23:23:40.7821017 Registrate Provider for tfmg [Recipes, Advancements, Loot tables, Tags (blocks), Tags (items), Tags (fluids), Tags (entity_types), Blockstates, Item models, Lang (en_us/en_ud)] 9ca537517fb8baeff3d4e4137c93aebd6b874c81 assets/tfmg/blockstates/cast_iron_block.json +c67b91a7fd9f16cd2d7eaa92dd9b945042d58130 assets/tfmg/blockstates/concrete.json +dca4728ef33ca9d54fb55d707761c2eeb77c32b1 assets/tfmg/blockstates/cooling_fluid.json fa1fa0509cd94e57da7624b5d094c228d6b92593 assets/tfmg/blockstates/creosote.json a9b81338133077138f447a0d159f094edb61242a assets/tfmg/blockstates/crude_oil_fluid.json 03983ce3de10310cd75b98f17c9161653b7034cd assets/tfmg/blockstates/diesel.json @@ -15,9 +17,11 @@ ebd6804b999acea36abbf07c2381ee6dee0d7a16 assets/tfmg/blockstates/napalm.json 89f2902010903aad686571ef37c781b111147456 assets/tfmg/blockstates/naphtha.json e6983072149d1a9a2f4d39e4e1feac599ff7413e assets/tfmg/blockstates/steel_block.json df44115876045e6f863de2f8be6a9166b336a2f1 assets/tfmg/blockstates/steel_casing.json -9b6e45ec197d4be5d93c630ddb0fa693cc0dd731 assets/tfmg/lang/en_ud.json -0e424b3aa9a7543e31f6e5567518fe9453ce75b1 assets/tfmg/lang/en_us.json +b68d0d30eb993662524158c536547497dc507204 assets/tfmg/lang/en_ud.json +841085ce8022c36f4e4a65b8f0133e6f815d9668 assets/tfmg/lang/en_us.json 37789d06ec6cfc0312be7b1b66ac1ec6403d4516 assets/tfmg/models/block/cast_iron_block.json +75c31d328fc5d6d46c8b43e8bde7504f4e51dadc assets/tfmg/models/block/concrete.json +80fb4a90f861992322bfd63f1232593e8cce708e assets/tfmg/models/block/cooling_fluid.json 80fb4a90f861992322bfd63f1232593e8cce708e assets/tfmg/models/block/creosote.json 391762cca00f54de8a43d076b028eb3e3b5cb5cf assets/tfmg/models/block/crude_oil_fluid.json 997750c71f9ead915c393c5821146a57dcd01bfa assets/tfmg/models/block/diesel.json @@ -34,6 +38,8 @@ e8e7bb74d46f9cec768a5443c10870fe1dd2105b assets/tfmg/models/block/naphtha.json 0ceb30eaff16a495c9a165ca16c925cbff836755 assets/tfmg/models/block/steel_block.json 465b1fed10d06090e5e8d19457f9fa48fe890bb4 assets/tfmg/models/block/steel_casing.json ec38882fb9010884823d6d6afa604f8a6512d279 assets/tfmg/models/item/cast_iron_block.json +4a843d55647a606fa97bc2daf745a7603406767d assets/tfmg/models/item/concrete.json +e8c4e68647a6ced815cfca649c679e709fcc7751 assets/tfmg/models/item/cooling_fluid_bucket.json df4e7fa8f3f60908f58794528a8db60dce7d0135 assets/tfmg/models/item/copper_grenade.json 0abf2b2d61995c4fd3e3c88656e740ffe0a2f083 assets/tfmg/models/item/creosote_bucket.json e857cfbd6dfd0fe4b38e48f432f7a92e82dc5e22 assets/tfmg/models/item/crude_oil_fluid_bucket.json @@ -54,6 +60,7 @@ d34ca92f5288cbb5cecee06f046a072763b2926c assets/tfmg/models/item/steel_casing.js f189171410564631c6074593da126b8d13fe9f8b assets/tfmg/models/item/zinc_grenade.json 2b45163d462fba0e86bb1ac8fc299509fbe1e58d data/create/tags/blocks/casing.json 2b45163d462fba0e86bb1ac8fc299509fbe1e58d data/create/tags/items/casing.json +f0989952061266a02499103c1dcd9f2d7da131f5 data/forge/tags/blocks/concrete.json c98956ac34e02a8c1c801122486771ef89fb640b data/forge/tags/blocks/storage_blocks.json 7c5615c56bb169570a061f052ebb1f5115760c16 data/forge/tags/blocks/storage_blocks/cast_iron.json 37b1c9c3ae722d8110db48015993ede3e194c0a0 data/forge/tags/blocks/storage_blocks/steel.json @@ -63,14 +70,16 @@ fe799186308cfd70f041f1dcf56129a0ccbaf219 data/forge/tags/items/buckets/kerosene. a779b7e09e7de79b73efb212644edff6739da610 data/forge/tags/items/buckets/napalm.json fdf3b8fdf1975b0eee671f428803caa4e17dc5bd data/forge/tags/items/buckets/naphtha.json 5f98116af6d1d5e0324ff11449e719e7e2593c0c data/forge/tags/items/buckets/plastic.json +f0989952061266a02499103c1dcd9f2d7da131f5 data/forge/tags/items/concrete.json c98956ac34e02a8c1c801122486771ef89fb640b data/forge/tags/items/storage_blocks.json 7c5615c56bb169570a061f052ebb1f5115760c16 data/forge/tags/items/storage_blocks/cast_iron.json 37b1c9c3ae722d8110db48015993ede3e194c0a0 data/forge/tags/items/storage_blocks/steel.json c98956ac34e02a8c1c801122486771ef89fb640b data/minecraft/tags/blocks/beacon_base_blocks.json 2b45163d462fba0e86bb1ac8fc299509fbe1e58d data/minecraft/tags/blocks/mineable/axe.json -cd26fa5d063cde156d1b1b165bccc033f784c23c data/minecraft/tags/blocks/mineable/pickaxe.json -c98956ac34e02a8c1c801122486771ef89fb640b data/minecraft/tags/blocks/needs_iron_tool.json +b64e309f3dfd304a74fc9c4e1a97b2ea3c2c02e8 data/minecraft/tags/blocks/mineable/pickaxe.json +7f922e1459e98ee497c359655ee2b408bf84e4f4 data/minecraft/tags/blocks/needs_iron_tool.json 60857d034446187e758de87644a80a7bc4d6b150 data/tfmg/loot_tables/blocks/cast_iron_block.json +d32a75f20ca3f2da6ba69b0a91e295c63f65de92 data/tfmg/loot_tables/blocks/concrete.json 661cc61f9c13ddf8c6bf06470defa93170e8ee7f data/tfmg/loot_tables/blocks/heavy_machinery_casing.json 7da9b20012e584104331da961756d6c1d02682b5 data/tfmg/loot_tables/blocks/napalm_bomb.json 01298989d0fe79936cdfa1e6cc07fd05f143ae09 data/tfmg/loot_tables/blocks/steel_block.json diff --git a/src/generated/resources/assets/tfmg/blockstates/concrete.json b/src/generated/resources/assets/tfmg/blockstates/concrete.json new file mode 100644 index 00000000..4baa0690 --- /dev/null +++ b/src/generated/resources/assets/tfmg/blockstates/concrete.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "tfmg:block/concrete" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/blockstates/cooling_fluid.json b/src/generated/resources/assets/tfmg/blockstates/cooling_fluid.json new file mode 100644 index 00000000..b4e6808f --- /dev/null +++ b/src/generated/resources/assets/tfmg/blockstates/cooling_fluid.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "tfmg:block/cooling_fluid" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/lang/en_ud.json b/src/generated/resources/assets/tfmg/lang/en_ud.json index 5b5b4314..4daeb8d9 100644 --- a/src/generated/resources/assets/tfmg/lang/en_ud.json +++ b/src/generated/resources/assets/tfmg/lang/en_ud.json @@ -1,5 +1,7 @@ { "block.tfmg.cast_iron_block": "uoɹI ʇsɐƆ ɟo ʞɔoןᗺ", + "block.tfmg.concrete": "ǝʇǝɹɔuoƆ", + "block.tfmg.cooling_fluid": "pınןℲ buıןooƆ", "block.tfmg.creosote": "ǝʇosoǝɹƆ", "block.tfmg.crude_oil_fluid": "pınןℲ ןıO ǝpnɹƆ", "block.tfmg.diesel": "ןǝsǝıᗡ", @@ -24,6 +26,7 @@ "entity.tfmg.zin_grenade": "ǝpɐuǝɹ⅁ uıZ", "fluid.tfmg.butane": "ǝuɐʇnᗺ", "fluid.tfmg.carbon_dioxide": "ǝpıxoıᗡ uoqɹɐƆ", + "fluid.tfmg.cooling_fluid": "pınןℲ buıןooƆ", "fluid.tfmg.creosote": "ǝʇosoǝɹƆ", "fluid.tfmg.crude_oil_fluid": "ןıO ǝpnɹƆ", "fluid.tfmg.diesel": "ןǝsǝıᗡ", @@ -35,10 +38,11 @@ "fluid.tfmg.liquid_plastic": "ɔıʇsɐןԀ pınbıꞀ", "fluid.tfmg.lpg": "⅁ԀꞀ", "fluid.tfmg.lubrication_oil": "ןıO uoıʇɐɔıɹqnꞀ", - "fluid.tfmg.napalm": "pınןℲ buıןooƆ", + "fluid.tfmg.napalm": "ɯןɐdɐN", "fluid.tfmg.naphtha": "ɐɥʇɥdɐN", "fluid.tfmg.propane": "ǝuɐdoɹԀ", "fluid.tfmg.propylene": "ǝuǝןʎdoɹԀ", + "item.tfmg.cooling_fluid_bucket": "ʇǝʞɔnᗺ pınןℲ buıןooƆ", "item.tfmg.copper_grenade": "ǝpɐuǝɹ⅁ ɹǝddoƆ", "item.tfmg.creosote_bucket": "ʇǝʞɔnᗺ ǝʇosoǝɹƆ", "item.tfmg.crude_oil_fluid_bucket": "ʇǝʞɔnᗺ pınןℲ ןıO ǝpnɹƆ", diff --git a/src/generated/resources/assets/tfmg/lang/en_us.json b/src/generated/resources/assets/tfmg/lang/en_us.json index a3fbfc18..f9eec415 100644 --- a/src/generated/resources/assets/tfmg/lang/en_us.json +++ b/src/generated/resources/assets/tfmg/lang/en_us.json @@ -1,5 +1,7 @@ { "block.tfmg.cast_iron_block": "Block of Cast Iron", + "block.tfmg.concrete": "Concrete", + "block.tfmg.cooling_fluid": "Cooling Fluid", "block.tfmg.creosote": "Creosote", "block.tfmg.crude_oil_fluid": "Crude Oil Fluid", "block.tfmg.diesel": "Diesel", @@ -24,6 +26,7 @@ "entity.tfmg.zin_grenade": "Zin Grenade", "fluid.tfmg.butane": "Butane", "fluid.tfmg.carbon_dioxide": "Carbon Dioxide", + "fluid.tfmg.cooling_fluid": "Cooling Fluid", "fluid.tfmg.creosote": "Creosote", "fluid.tfmg.crude_oil_fluid": "Crude Oil", "fluid.tfmg.diesel": "Diesel", @@ -35,10 +38,11 @@ "fluid.tfmg.liquid_plastic": "Liquid Plastic", "fluid.tfmg.lpg": "LPG", "fluid.tfmg.lubrication_oil": "Lubrication Oil", - "fluid.tfmg.napalm": "Cooling Fluid", + "fluid.tfmg.napalm": "Napalm", "fluid.tfmg.naphtha": "Naphtha", "fluid.tfmg.propane": "Propane", "fluid.tfmg.propylene": "Propylene", + "item.tfmg.cooling_fluid_bucket": "Cooling Fluid Bucket", "item.tfmg.copper_grenade": "Copper Grenade", "item.tfmg.creosote_bucket": "Creosote Bucket", "item.tfmg.crude_oil_fluid_bucket": "Crude Oil Fluid Bucket", diff --git a/src/generated/resources/assets/tfmg/models/block/concrete.json b/src/generated/resources/assets/tfmg/models/block/concrete.json new file mode 100644 index 00000000..031333c6 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/concrete.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "tfmg:block/concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/cooling_fluid.json b/src/generated/resources/assets/tfmg/models/block/cooling_fluid.json new file mode 100644 index 00000000..7bef9534 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/cooling_fluid.json @@ -0,0 +1,5 @@ +{ + "textures": { + "particle": "tfmg:fluid/napalm_still" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/item/concrete.json b/src/generated/resources/assets/tfmg/models/item/concrete.json new file mode 100644 index 00000000..c9f717bd --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/item/concrete.json @@ -0,0 +1,3 @@ +{ + "parent": "tfmg:block/concrete" +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/item/cooling_fluid_bucket.json b/src/generated/resources/assets/tfmg/models/item/cooling_fluid_bucket.json new file mode 100644 index 00000000..e7e6a59e --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/item/cooling_fluid_bucket.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "tfmg:item/cooling_fluid_bucket" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/concrete.json b/src/generated/resources/data/forge/tags/blocks/concrete.json new file mode 100644 index 00000000..b10436bf --- /dev/null +++ b/src/generated/resources/data/forge/tags/blocks/concrete.json @@ -0,0 +1,5 @@ +{ + "values": [ + "tfmg:concrete" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/concrete.json b/src/generated/resources/data/forge/tags/items/concrete.json new file mode 100644 index 00000000..b10436bf --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/concrete.json @@ -0,0 +1,5 @@ +{ + "values": [ + "tfmg:concrete" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json b/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json index 4d4a1f18..e6483217 100644 --- a/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json +++ b/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json @@ -4,6 +4,7 @@ "tfmg:steel_casing", "tfmg:heavy_machinery_casing", "tfmg:steel_block", - "tfmg:cast_iron_block" + "tfmg:cast_iron_block", + "tfmg:concrete" ] } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/needs_iron_tool.json b/src/generated/resources/data/minecraft/tags/blocks/needs_iron_tool.json index 45444180..b4eced41 100644 --- a/src/generated/resources/data/minecraft/tags/blocks/needs_iron_tool.json +++ b/src/generated/resources/data/minecraft/tags/blocks/needs_iron_tool.json @@ -1,6 +1,7 @@ { "values": [ "tfmg:steel_block", - "tfmg:cast_iron_block" + "tfmg:cast_iron_block", + "tfmg:concrete" ] } \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/loot_tables/blocks/concrete.json b/src/generated/resources/data/tfmg/loot_tables/blocks/concrete.json new file mode 100644 index 00000000..d687bf60 --- /dev/null +++ b/src/generated/resources/data/tfmg/loot_tables/blocks/concrete.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "tfmg:concrete" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/java/com/drmangotea/tfmg/CreateTFMG.java b/src/main/java/com/drmangotea/tfmg/CreateTFMG.java index 5debad28..c02f9269 100644 --- a/src/main/java/com/drmangotea/tfmg/CreateTFMG.java +++ b/src/main/java/com/drmangotea/tfmg/CreateTFMG.java @@ -25,7 +25,7 @@ public class CreateTFMG public static final String MOD_ID = "tfmg"; public static final CreateRegistrate REGISTRATE = CreateRegistrate.create(MOD_ID); - private static final Logger LOGGER = LogUtils.getLogger(); + public static final Logger LOGGER = LogUtils.getLogger(); public CreateTFMG() { diff --git a/src/main/java/com/drmangotea/tfmg/content/concrete/ConcreteFluid.java b/src/main/java/com/drmangotea/tfmg/content/concrete/ConcreteFluid.java new file mode 100644 index 00000000..2f9b44a7 --- /dev/null +++ b/src/main/java/com/drmangotea/tfmg/content/concrete/ConcreteFluid.java @@ -0,0 +1,86 @@ +package com.drmangotea.tfmg.content.concrete; + +import com.drmangotea.tfmg.CreateTFMG; +import com.drmangotea.tfmg.content.gadgets.explosives.thermite_grenades.ThermiteGrenade; +import com.drmangotea.tfmg.registry.TFMGBlocks; +import net.minecraft.core.BlockPos; +import net.minecraft.core.Direction; +import net.minecraft.server.level.ServerLevel; +import net.minecraft.util.RandomSource; +import net.minecraft.world.entity.animal.Sheep; +import net.minecraft.world.entity.projectile.Arrow; +import net.minecraft.world.level.GameRules; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.Blocks; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.level.block.state.StateDefinition; +import net.minecraft.world.level.material.Fluid; +import net.minecraft.world.level.material.FluidState; +import net.minecraft.world.level.material.LavaFluid; +import net.minecraftforge.fluids.ForgeFlowingFluid; + +public class ConcreteFluid extends ForgeFlowingFluid { + + + protected ConcreteFluid(Properties properties) { + super(properties); + } + + @Override + public boolean isSource(FluidState p_76140_) { + return true; + } + + @Override + public int getAmount(FluidState p_164509_) { + return 8; + } + + @Override + public void randomTick(Level level, BlockPos pos, FluidState p_230574_, RandomSource randomSource) { + int random = randomSource.nextInt(7) ; + + if(random==2) { + level.setBlock(pos, TFMGBlocks.CONCRETE.get().defaultBlockState(), 3); + } + } + + protected boolean isRandomlyTicking() { + return true; + } + + + // + public static class Flowing extends ConcreteFluid { + public Flowing(Properties properties) { + super(properties); + } + + protected void createFluidStateDefinition(StateDefinition.Builder p_76260_) { + super.createFluidStateDefinition(p_76260_); + p_76260_.add(LEVEL); + } + + public int getAmount(FluidState p_76264_) { + return p_76264_.getValue(LEVEL); + } + + public boolean isSource(FluidState p_76262_) { + return false; + } + } + + public static class Source extends ConcreteFluid { + public Source(Properties properties) { + super(properties); + } + + public int getAmount(FluidState p_76269_) { + return 8; + } + + public boolean isSource(FluidState p_76267_) { + return true; + } + } +} diff --git a/src/main/java/com/drmangotea/tfmg/content/concrete/ConcreteFluidType.java b/src/main/java/com/drmangotea/tfmg/content/concrete/ConcreteFluidType.java new file mode 100644 index 00000000..b54d40f5 --- /dev/null +++ b/src/main/java/com/drmangotea/tfmg/content/concrete/ConcreteFluidType.java @@ -0,0 +1,87 @@ +package com.drmangotea.tfmg.content.concrete; + + + +import com.mojang.math.Vector3f; +import com.simibubi.create.AllFluids; +import com.simibubi.create.foundation.utility.Color; +import com.tterrag.registrate.builders.FluidBuilder; +import net.minecraft.core.BlockPos; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.effect.MobEffectInstance; +import net.minecraft.world.effect.MobEffects; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.entity.MoverType; +import net.minecraft.world.level.BlockAndTintGetter; +import net.minecraft.world.level.material.FluidState; +import net.minecraft.world.phys.Vec3; +import net.minecraftforge.fluids.FluidStack; + + +import java.util.function.Supplier; + +public class ConcreteFluidType extends AllFluids.TintedFluidType { + + private Vector3f fogColor; + private Supplier fogDistance; + + public static FluidBuilder.FluidTypeFactory create(int fogColor, Supplier fogDistance) { + return (p, s, f) -> { + ConcreteFluidType fluidType = new ConcreteFluidType(p, s, f); + fluidType.fogColor = new Color(fogColor, false).asVectorF(); + fluidType.fogDistance = fogDistance; + return fluidType; + }; + } + + private ConcreteFluidType(Properties properties, ResourceLocation stillTexture, + ResourceLocation flowingTexture) { + super(properties, stillTexture, flowingTexture); + } + + @Override + protected int getTintColor(FluidStack stack) { + return NO_TINT; + } + + /* + * Removing alpha from tint prevents optifine from forcibly applying biome + * colors to modded fluids (this workaround only works for fluids in the solid + * render layer) + */ + @Override + public int getTintColor(FluidState state, BlockAndTintGetter world, BlockPos pos) { + return 0x00ffffff; + } + + @Override + protected Vector3f getCustomFogColor() { + return fogColor; + } + + @Override + protected float getFogDistanceModifier() { + return fogDistance.get(); + } + + @Override + public boolean canSwim(Entity entity) + { + return false; + } + @Override + public float getFallDistanceModifier(Entity entity) + { + return 1; + } + @Override + public boolean move(FluidState state, LivingEntity entity, Vec3 movementVector, double gravity) + { + entity.setDeltaMovement(entity.getDeltaMovement().scale(0.2d)); + //entity.addEffect(new MobEffectInstance(MobEffects.MOVEMENT_SLOWDOWN, 30, 5, true, false, false)); + return false; + } + + + } \ No newline at end of file diff --git a/src/main/java/com/drmangotea/tfmg/registry/TFMGBlocks.java b/src/main/java/com/drmangotea/tfmg/registry/TFMGBlocks.java index 732e5998..a4a9a859 100644 --- a/src/main/java/com/drmangotea/tfmg/registry/TFMGBlocks.java +++ b/src/main/java/com/drmangotea/tfmg/registry/TFMGBlocks.java @@ -107,6 +107,17 @@ public class TFMGBlocks { static { REGISTRATE.creativeModeTab(() -> TFMGCreativeModeTabs.TFMG_CONCRETE); } + public static final BlockEntry CONCRETE = REGISTRATE.block("concrete", Block::new) + .initialProperties(() -> Blocks.STONE) + .properties(p -> p.color(MaterialColor.COLOR_LIGHT_GRAY)) + .properties(p -> p.requiresCorrectToolForDrops()) + .transform(pickaxeOnly()) + .blockstate(simpleCubeAll("concrete")) + .tag(BlockTags.NEEDS_IRON_TOOL) + .transform(tagBlockAndItem("concrete")) + .build() + .lang("Concrete") + .register(); public static void register() {} } diff --git a/src/main/java/com/drmangotea/tfmg/registry/TFMGFluids.java b/src/main/java/com/drmangotea/tfmg/registry/TFMGFluids.java index 34173ed5..9d19eabd 100644 --- a/src/main/java/com/drmangotea/tfmg/registry/TFMGFluids.java +++ b/src/main/java/com/drmangotea/tfmg/registry/TFMGFluids.java @@ -9,6 +9,9 @@ import java.util.function.Supplier; import javax.annotation.Nullable; import com.drmangotea.tfmg.CreateTFMG; +import com.drmangotea.tfmg.content.concrete.ConcreteFluid; +import com.drmangotea.tfmg.content.concrete.ConcreteFluidType; +import com.simibubi.create.AllFluids; import com.simibubi.create.AllTags; import org.jetbrains.annotations.NotNull; @@ -298,22 +301,29 @@ public class TFMGFluids { public static final FluidEntry LIQUID_CONCRETE = - REGISTRATE.fluid("liquid_concrete",CONCRETE_RL,CONCRETE_RL) + REGISTRATE.fluid("liquid_concrete",CONCRETE_RL,CONCRETE_RL, + ConcreteFluidType.create(0x333333, + () -> 1f / 24f )) .lang("Liquid Concrete") .properties(b -> b.viscosity(9999) .density(9999)) .fluidProperties(p -> p.levelDecreasePerBlock(0) - .tickRate(9999) + .tickRate(99999) .slopeFindDistance(0) - .explosionResistance(100f)) - - .source(ForgeFlowingFluid.Source::new) + .explosionResistance(4f) + ) + .source(ConcreteFluid.Source::new) .bucket() //.tag(AllTags.forgeItemTag("buckets/napalm")) .build() .register(); + //// + + + + // Load this class public static void register() {