diff --git a/src/generated/resources/.cache/2d06ea55ee27bcb1f7f87fa8ec3e037afa7e1ad9 b/src/generated/resources/.cache/2d06ea55ee27bcb1f7f87fa8ec3e037afa7e1ad9 index 367b85a5..1482a952 100644 --- a/src/generated/resources/.cache/2d06ea55ee27bcb1f7f87fa8ec3e037afa7e1ad9 +++ b/src/generated/resources/.cache/2d06ea55ee27bcb1f7f87fa8ec3e037afa7e1ad9 @@ -1,4 +1,4 @@ -// 1.19.2 2023-11-16T14:05:17.9404943 Registrate Provider for createindustry [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-11-20T19:08:09.5245416 Registrate Provider for createindustry [Recipes, Advancements, Loot tables, Tags (blocks), Tags (items), Tags (fluids), Tags (entity_types), Blockstates, Item models, Lang (en_us/en_ud)] 50db526af77cf0ead08cadfd3f7daa8b84a40312 assets/createindustry/blockstates/air_intake.json 429437419b2ec98bd716e7ba15583b84da7488d5 assets/createindustry/blockstates/aluminum_bars.json 9e2417e479011e42ebf00685068e6b6f515f0b11 assets/createindustry/blockstates/aluminum_block.json @@ -129,7 +129,7 @@ a04aa3b50ecd99ff544eec3545839c366842c1b7 assets/createindustry/blockstates/machi 8453d4ffb2826b584ae6ef773bb113bffa26b1ea assets/createindustry/blockstates/magenta_concrete_slab.json 4f1d369aa9c02f0c277885b3909682a95c664c78 assets/createindustry/blockstates/magenta_concrete_stairs.json 3bc7a4d0af2794756d182fc52e661942d878b7e5 assets/createindustry/blockstates/magenta_concrete_wall.json -3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/createindustry/blockstates/molten_metal.json +ce7a208542270254883a475968f523a870003f14 assets/createindustry/blockstates/molten_metal.json 30f034e7a1ffe0e36446a0b884ab4f242d61f827 assets/createindustry/blockstates/molten_slag.json e55a75698478f584341b6aaecfb0db76792ac694 assets/createindustry/blockstates/molten_steel.json c4a26bc7214af60c64265bee05f5da0cbe8f38ac assets/createindustry/blockstates/napalm.json @@ -460,6 +460,7 @@ be225406ccfe1e027fadff7d0d00c0f77fc9f43f assets/createindustry/models/block/liqu 6937de3a01866ccf1becffb9d0edbe22fecc5d49 assets/createindustry/models/block/magenta_concrete_wall_post.json 16876518edec74e2ca18d638df3dbdf61302cf3f assets/createindustry/models/block/magenta_concrete_wall_side.json 6064a0289d3b3a6c1e6cdd7fb061450877baed81 assets/createindustry/models/block/magenta_concrete_wall_side_tall.json +92d069ac97d6691292e025af5ac73de00655666a assets/createindustry/models/block/molten_metal.json b1ad411dce4232640e5affc15296f184aab9e600 assets/createindustry/models/block/molten_slag.json c89f3bea30b47f666fc2f95d7fe6df21c9bb8fb4 assets/createindustry/models/block/molten_steel.json 3b339d809be62ca8790afeb2cad9ace793840d27 assets/createindustry/models/block/napalm.json @@ -657,7 +658,7 @@ c2f7be5a86f2e90c2d4df99b977e20f2d69b1560 assets/createindustry/models/item/brown 80078af280956744a32d80f3483558659f15ed15 assets/createindustry/models/item/brown_concrete_stairs.json e4cd211a7f3dc7dbe2b5fc2934a4ce93a65d4c47 assets/createindustry/models/item/brown_concrete_wall.json bd1274aa4df047befd8aa63d073ae6a2e382432a assets/createindustry/models/item/casting_basin.json -6b6680d10eca9b055ca4c904557258a63b4987a4 assets/createindustry/models/item/casting_spout.json +c16644574407f152b635b950f5c15a0eb3cb1bdf assets/createindustry/models/item/casting_spout.json bcc628930b459ed69c16e0cc33f2e04d5c367045 assets/createindustry/models/item/cast_iron_block.json 7dfdd11724f4ba63589d32f8418eaf78d448b14e assets/createindustry/models/item/cast_iron_distillation_controller.json a9894a4751c14ceddcf13cfee01305ffa950aa17 assets/createindustry/models/item/cast_iron_distillation_output.json diff --git a/src/generated/resources/assets/createindustry/blockstates/molten_metal.json b/src/generated/resources/assets/createindustry/blockstates/molten_metal.json index 2c8f02f0..c4894b7f 100644 --- a/src/generated/resources/assets/createindustry/blockstates/molten_metal.json +++ b/src/generated/resources/assets/createindustry/blockstates/molten_metal.json @@ -1,7 +1,7 @@ { "variants": { "": { - "model": "minecraft:block/air" + "model": "createindustry:block/molten_metal" } } } \ No newline at end of file diff --git a/src/generated/resources/assets/createindustry/models/block/molten_metal.json b/src/generated/resources/assets/createindustry/models/block/molten_metal.json new file mode 100644 index 00000000..a44057ea --- /dev/null +++ b/src/generated/resources/assets/createindustry/models/block/molten_metal.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "createindustry:block/molten_metal" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/createindustry/models/item/casting_spout.json b/src/generated/resources/assets/createindustry/models/item/casting_spout.json index d5854ccd..9a5ff84b 100644 --- a/src/generated/resources/assets/createindustry/models/item/casting_spout.json +++ b/src/generated/resources/assets/createindustry/models/item/casting_spout.json @@ -1,3 +1,3 @@ { - "parent": "createindustry:block/casting_spout/block" + "parent": "createindustry:block/casting_spout/item" } \ No newline at end of file diff --git a/src/main/java/com/drmangotea/createindustry/blocks/machines/metal_processing/casting_basin/CastingBasinBlock.java b/src/main/java/com/drmangotea/createindustry/blocks/machines/metal_processing/casting_basin/CastingBasinBlock.java index 4bdddd66..06c3be9b 100644 --- a/src/main/java/com/drmangotea/createindustry/blocks/machines/metal_processing/casting_basin/CastingBasinBlock.java +++ b/src/main/java/com/drmangotea/createindustry/blocks/machines/metal_processing/casting_basin/CastingBasinBlock.java @@ -4,6 +4,8 @@ package com.drmangotea.createindustry.blocks.machines.metal_processing.casting_b import com.drmangotea.createindustry.blocks.machines.metal_processing.coke_oven.CokeOvenBlock; import com.drmangotea.createindustry.registry.TFMGBlockEntities; import com.drmangotea.createindustry.registry.TFMGItems; +import com.drmangotea.createindustry.registry.TFMGShapes; +import com.simibubi.create.AllShapes; import com.simibubi.create.content.equipment.wrench.IWrenchable; import com.simibubi.create.foundation.block.IBE; import net.minecraft.core.BlockPos; @@ -12,6 +14,7 @@ import net.minecraft.world.InteractionResult; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; +import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.entity.BlockEntityType; @@ -19,6 +22,8 @@ import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.StateDefinition; import net.minecraft.world.level.block.state.properties.EnumProperty; import net.minecraft.world.phys.BlockHitResult; +import net.minecraft.world.phys.shapes.CollisionContext; +import net.minecraft.world.phys.shapes.VoxelShape; public class CastingBasinBlock extends Block implements IBE, IWrenchable { @@ -28,7 +33,11 @@ public class CastingBasinBlock extends Block implements IBE { + + public CastingBasinRenderer(BlockEntityRendererProvider.Context context) { + } + + @Override + protected void renderSafe(CastingBasinBlockEntity be, float partialTicks, PoseStack ms, MultiBufferSource buffer, + int light, int overlay) { + + + + + + + + + ms.pushPose(); + BlockState blockState = be.getBlockState(); + VertexConsumer vb = buffer.getBuffer(RenderType.solid()); + + + + if(be.getBlockState().getValue(MOLD_TYPE)== CastingBasinBlockEntity.MoldType.INGOT) + CachedBufferer.partial(TFMGPartialModels.INGOT_MOLD, blockState) + .light(light) + .renderInto(ms, vb); + + if(be.getBlockState().getValue(MOLD_TYPE)== CastingBasinBlockEntity.MoldType.BLOCK) + CachedBufferer.partial(TFMGPartialModels.BlOCK_MOLD, blockState) + .light(light) + .renderInto(ms, vb); + + ms.popPose(); + + } + +} \ No newline at end of file diff --git a/src/main/java/com/drmangotea/createindustry/blocks/machines/metal_processing/casting_spout/CastingSpoutBlock.java b/src/main/java/com/drmangotea/createindustry/blocks/machines/metal_processing/casting_spout/CastingSpoutBlock.java index 5dcd8117..2feddae0 100644 --- a/src/main/java/com/drmangotea/createindustry/blocks/machines/metal_processing/casting_spout/CastingSpoutBlock.java +++ b/src/main/java/com/drmangotea/createindustry/blocks/machines/metal_processing/casting_spout/CastingSpoutBlock.java @@ -2,9 +2,15 @@ package com.drmangotea.createindustry.blocks.machines.metal_processing.casting_s import com.drmangotea.createindustry.registry.TFMGBlockEntities; +import com.drmangotea.createindustry.registry.TFMGShapes; import com.simibubi.create.foundation.block.IBE; +import net.minecraft.core.BlockPos; +import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.entity.BlockEntityType; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.phys.shapes.CollisionContext; +import net.minecraft.world.phys.shapes.VoxelShape; public class CastingSpoutBlock extends Block implements IBE { public CastingSpoutBlock(Properties p_49795_) { @@ -15,7 +21,11 @@ public class CastingSpoutBlock extends Block implements IBE getBlockEntityClass() { return CastingSpoutBlockEntity.class; } + @Override + public VoxelShape getShape(BlockState pState, BlockGetter worldIn, BlockPos pos, CollisionContext context) { + return TFMGShapes.CASTING_SPOUT; + } @Override public BlockEntityType getBlockEntityType() { return TFMGBlockEntities.CASTING_SPOUT.get(); diff --git a/src/main/java/com/drmangotea/createindustry/blocks/machines/oil_processing/distillation/distillation_tower/DistillationControllerBlockEntity.java b/src/main/java/com/drmangotea/createindustry/blocks/machines/oil_processing/distillation/distillation_tower/DistillationControllerBlockEntity.java index c162cef8..5d6d2bf4 100644 --- a/src/main/java/com/drmangotea/createindustry/blocks/machines/oil_processing/distillation/distillation_tower/DistillationControllerBlockEntity.java +++ b/src/main/java/com/drmangotea/createindustry/blocks/machines/oil_processing/distillation/distillation_tower/DistillationControllerBlockEntity.java @@ -63,10 +63,11 @@ public class DistillationControllerBlockEntity extends DistilleryControllerBlock towerLevel = 0; return; } - hasTank = true; + hasTank = true; + + towerLevel = tank.tower.towerLevel; - towerLevel = tank.tower.towerLevel; diff --git a/src/main/java/com/drmangotea/createindustry/blocks/machines/oil_processing/distillation/distillation_tower/DistillationOutputBlockEntity.java b/src/main/java/com/drmangotea/createindustry/blocks/machines/oil_processing/distillation/distillation_tower/DistillationOutputBlockEntity.java index 079257e8..8d98fc55 100644 --- a/src/main/java/com/drmangotea/createindustry/blocks/machines/oil_processing/distillation/distillation_tower/DistillationOutputBlockEntity.java +++ b/src/main/java/com/drmangotea/createindustry/blocks/machines/oil_processing/distillation/distillation_tower/DistillationOutputBlockEntity.java @@ -2,6 +2,7 @@ package com.drmangotea.createindustry.blocks.machines.oil_processing.distillatio +import com.drmangotea.createindustry.CreateTFMG; import com.drmangotea.createindustry.blocks.machines.oil_processing.distillation.distillery.DistilleryOutputBlockEntity; import com.drmangotea.createindustry.recipes.distillation.DistillationRecipe; import com.drmangotea.createindustry.recipes.distillation.AbstractDistillationRecipe; @@ -179,7 +180,6 @@ public class DistillationOutputBlockEntity extends DistilleryOutputBlockEntity i - if(!hasIndustrialPipes(foundOutputs)) return; @@ -251,11 +251,16 @@ if(fluidInRecipe2!=null) if (!controller.getTanks().get(true).isEmpty()) { - if(!level.isClientSide) { + + // if(((AdvancedDistillationRecipe)currentRecipe).getInputFluid().getMatchingFluidStacks().get(0).getFluid() != TFMGFluids.HEAVY_OIL.get()) // return; + + if(!controller.hasTank) return; + + if(controller.towerLevel<4) return; @@ -274,10 +279,10 @@ if(fluidInRecipe2!=null) if(controller.getTank().height=2) diff --git a/src/main/java/com/drmangotea/createindustry/blocks/machines/oil_processing/distillation/distillation_tower/DistillationTowerData.java b/src/main/java/com/drmangotea/createindustry/blocks/machines/oil_processing/distillation/distillation_tower/DistillationTowerData.java index 8468fd0f..06ae85d3 100644 --- a/src/main/java/com/drmangotea/createindustry/blocks/machines/oil_processing/distillation/distillation_tower/DistillationTowerData.java +++ b/src/main/java/com/drmangotea/createindustry/blocks/machines/oil_processing/distillation/distillation_tower/DistillationTowerData.java @@ -1,6 +1,7 @@ package com.drmangotea.createindustry.blocks.machines.oil_processing.distillation.distillation_tower; +import com.drmangotea.createindustry.CreateTFMG; import com.drmangotea.createindustry.blocks.tanks.SteelTankBlock; import com.drmangotea.createindustry.blocks.tanks.SteelTankBlockEntity; import com.drmangotea.createindustry.registry.TFMGBlocks; @@ -68,7 +69,9 @@ public class DistillationTowerData { public LerpedFloat gauge = LerpedFloat.linear(); public void tick(SteelTankBlockEntity controller) { - towerLevel = Math.min(activeHeat, maxHeatForSize); + + + towerLevel = activeHeat; tank=controller; // tank.tankInventory.drain(2, IFluidHandler.FluidAction.EXECUTE); @@ -77,7 +80,7 @@ public class DistillationTowerData { float current = gauge.getValue(1); if (current > 1 && Create.RANDOM.nextFloat() < 1 / 2f) gauge.setValueNoUpdate(current + Math.min(-(current - 1) * Create.RANDOM.nextFloat(), 0)); - return; + // return; } if (needsHeatLevelUpdate && updateTemperature(controller)) diff --git a/src/main/java/com/drmangotea/createindustry/registry/TFMGBlockEntities.java b/src/main/java/com/drmangotea/createindustry/registry/TFMGBlockEntities.java index 74ca5d74..fd20bfb6 100644 --- a/src/main/java/com/drmangotea/createindustry/registry/TFMGBlockEntities.java +++ b/src/main/java/com/drmangotea/createindustry/registry/TFMGBlockEntities.java @@ -30,6 +30,7 @@ import com.drmangotea.createindustry.blocks.machines.metal_processing.blast_furn import com.drmangotea.createindustry.blocks.machines.metal_processing.blast_furnace.BlastFurnaceRenderer; import com.drmangotea.createindustry.blocks.machines.metal_processing.blast_furnace.MoltenMetalBlockEntity; import com.drmangotea.createindustry.blocks.machines.metal_processing.casting_basin.CastingBasinBlockEntity; +import com.drmangotea.createindustry.blocks.machines.metal_processing.casting_basin.CastingBasinRenderer; import com.drmangotea.createindustry.blocks.machines.metal_processing.casting_spout.CastingSpoutBlockEntity; import com.drmangotea.createindustry.blocks.machines.metal_processing.casting_spout.CastingSpoutRenderer; import com.drmangotea.createindustry.blocks.machines.metal_processing.coke_oven.CokeOvenBlockEntity; @@ -184,6 +185,7 @@ public class TFMGBlockEntities { public static final BlockEntityEntry CASTING_BASIN = REGISTRATE .blockEntity("casting_basin", CastingBasinBlockEntity::new) + .renderer(()-> CastingBasinRenderer::new) .validBlocks(TFMGBlocks.CASTING_BASIN) .register(); diff --git a/src/main/java/com/drmangotea/createindustry/registry/TFMGBlocks.java b/src/main/java/com/drmangotea/createindustry/registry/TFMGBlocks.java index d1b70d43..3729e5f0 100644 --- a/src/main/java/com/drmangotea/createindustry/registry/TFMGBlocks.java +++ b/src/main/java/com/drmangotea/createindustry/registry/TFMGBlocks.java @@ -607,8 +607,7 @@ public static final BlockEntry STEEL_DISTILLATION_OUTPU .properties(p -> p.noOcclusion() .noLootTable() .air()) - .blockstate((c, p) -> p.getVariantBuilder(c.get()) - .forAllStatesExcept(BlockStateGen.mapToAir(p))) + .register(); //--Casting Basin @@ -634,7 +633,7 @@ public static final BlockEntry STEEL_DISTILLATION_OUTPU .blockstate((ctx, prov) -> prov.simpleBlock(ctx.getEntry(), AssetLookup.partialBaseModel(ctx, prov))) .addLayer(() -> RenderType::cutoutMipped) .item() - .build() + .transform(customItemModel()) .lang("Casting Spout") .register(); diff --git a/src/main/java/com/drmangotea/createindustry/registry/TFMGPartialModels.java b/src/main/java/com/drmangotea/createindustry/registry/TFMGPartialModels.java index def770b8..99d54bf6 100644 --- a/src/main/java/com/drmangotea/createindustry/registry/TFMGPartialModels.java +++ b/src/main/java/com/drmangotea/createindustry/registry/TFMGPartialModels.java @@ -49,7 +49,10 @@ public class TFMGPartialModels { CAST_IRON_FLUID_PIPE_CASING = block("cast_iron_pipe/casing"), BRASS_FLUID_PIPE_CASING = block("brass_pipe/casing"), PLASTIC_FLUID_PIPE_CASING = block("plastic_pipe/casing"), - ALUMINUM_FLUID_PIPE_CASING = block("aluminum_pipe/casing") + ALUMINUM_FLUID_PIPE_CASING = block("aluminum_pipe/casing"), + + INGOT_MOLD = block("casting_basin/mold_base"), + BlOCK_MOLD = block("casting_basin/block_mold") ; diff --git a/src/main/java/com/drmangotea/createindustry/registry/TFMGShapes.java b/src/main/java/com/drmangotea/createindustry/registry/TFMGShapes.java index fb1c1a5a..bc21ab53 100644 --- a/src/main/java/com/drmangotea/createindustry/registry/TFMGShapes.java +++ b/src/main/java/com/drmangotea/createindustry/registry/TFMGShapes.java @@ -27,6 +27,9 @@ public class TFMGShapes { + + + ; public static final VoxelShape @@ -36,6 +39,9 @@ public class TFMGShapes { INDUSTRIAL_PIPE = shape(4, 0, 4, 12, 16, 12).build(), FLARESTACK = shape(3, 0, 3, 13, 14, 14).build(), PUMPJACK_BASE = shape(3, 0, 3, 13, 16, 13).build(), + + CASTING_SPOUT = shape(1, 2, 1, 15, 14, 15) + .build(), SURFACE_SCANNER = shape(2, 0, 2, 14, 14, 14).build(); ; diff --git a/src/main/resources/assets/createindustry/models/block/casting_basin/block.json b/src/main/resources/assets/createindustry/models/block/casting_basin/block.json index e12a8ccb..2ac28a25 100644 --- a/src/main/resources/assets/createindustry/models/block/casting_basin/block.json +++ b/src/main/resources/assets/createindustry/models/block/casting_basin/block.json @@ -2,8 +2,8 @@ "credit": "Made with Blockbench", "parent": "block/block", "textures": { - "12": "create:block/basin", - "particle": "create:block/industrial_iron_block" + "12": "createindustry:block/casting_basin", + "particle": "createindustry:block/industrial_iron_block" }, "elements": [ { diff --git a/src/main/resources/assets/createindustry/models/block/casting_basin/block_mold.json b/src/main/resources/assets/createindustry/models/block/casting_basin/block_mold.json new file mode 100644 index 00000000..16f0cf6f --- /dev/null +++ b/src/main/resources/assets/createindustry/models/block/casting_basin/block_mold.json @@ -0,0 +1,20 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "1": "createindustry:item/block_mold" + }, + "elements": [ + { + "from": [0, 15, 0], + "to": [16, 15, 16], + "color": 2, + "faces": { + "north": {"uv": [0, 0, 16, 0], "texture": "#1"}, + "east": {"uv": [0, 0, 16, 0], "texture": "#1"}, + "south": {"uv": [0, 0, 16, 0], "texture": "#1"}, + "west": {"uv": [0, 0, 16, 0], "texture": "#1"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#1"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/createindustry/models/block/casting_basin/mold_base.json b/src/main/resources/assets/createindustry/models/block/casting_basin/mold_base.json new file mode 100644 index 00000000..b352155f --- /dev/null +++ b/src/main/resources/assets/createindustry/models/block/casting_basin/mold_base.json @@ -0,0 +1,20 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "1": "createindustry:item/ingot_mold" + }, + "elements": [ + { + "from": [0, 15, 0], + "to": [16, 15, 16], + "color": 2, + "faces": { + "north": {"uv": [0, 0, 16, 0], "texture": "#1"}, + "east": {"uv": [0, 0, 16, 0], "texture": "#1"}, + "south": {"uv": [0, 0, 16, 0], "texture": "#1"}, + "west": {"uv": [0, 0, 16, 0], "texture": "#1"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#1"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/createindustry/models/block/casting_spout/block.json b/src/main/resources/assets/createindustry/models/block/casting_spout/block.json index c49ac478..83f995fe 100644 --- a/src/main/resources/assets/createindustry/models/block/casting_spout/block.json +++ b/src/main/resources/assets/createindustry/models/block/casting_spout/block.json @@ -1,43 +1,46 @@ { "credit": "Made with Blockbench", + "parent": "block/block", + "texture_size": [32, 32], + "textures": { + "1": "createindustry:block/casting_spout", + "particle": "createindustry:block/industrial_iron_block" + }, "elements": [ { "from": [1, 2, 1], "to": [15, 14, 15], - "color": 2, "faces": { - "north": {"uv": [0, 0, 14, 12], "texture": "#missing"}, - "east": {"uv": [0, 0, 14, 12], "texture": "#missing"}, - "south": {"uv": [0, 0, 14, 12], "texture": "#missing"}, - "west": {"uv": [0, 0, 14, 12], "texture": "#missing"}, - "up": {"uv": [0, 0, 14, 14], "texture": "#missing"}, - "down": {"uv": [0, 0, 14, 14], "texture": "#missing"} + "north": {"uv": [0, 1, 7, 7], "texture": "#1"}, + "east": {"uv": [0, 1, 7, 7], "texture": "#1"}, + "south": {"uv": [0, 1, 7, 7], "texture": "#1"}, + "west": {"uv": [0, 1, 7, 7], "texture": "#1"}, + "up": {"uv": [0, 8.5, 7, 15.5], "texture": "#1"}, + "down": {"uv": [8, 8.5, 15, 15.5], "texture": "#1"} } }, { "from": [2, 0, 2], "to": [14, 2, 14], - "color": 7, "faces": { - "north": {"uv": [0, 0, 12, 2], "texture": "#missing"}, - "east": {"uv": [0, 0, 12, 2], "texture": "#missing"}, - "south": {"uv": [0, 0, 12, 2], "texture": "#missing"}, - "west": {"uv": [0, 0, 12, 2], "texture": "#missing"}, - "up": {"uv": [0, 0, 12, 12], "texture": "#missing"}, - "down": {"uv": [0, 0, 12, 12], "texture": "#missing"} + "north": {"uv": [0.5, 7, 6.5, 8], "texture": "#1"}, + "east": {"uv": [0.5, 7, 6.5, 8], "texture": "#1"}, + "south": {"uv": [0.5, 7, 6.5, 8], "texture": "#1"}, + "west": {"uv": [0.5, 7, 6.5, 8], "texture": "#1"}, + "up": {"uv": [8.5, 9, 14.5, 15], "texture": "#1"}, + "down": {"uv": [8.5, 9, 14.5, 15], "texture": "#1"} } }, { "from": [2, 14, 2], "to": [14, 16, 14], - "color": 7, "faces": { - "north": {"uv": [0, 0, 12, 2], "texture": "#missing"}, - "east": {"uv": [0, 0, 12, 2], "texture": "#missing"}, - "south": {"uv": [0, 0, 12, 2], "texture": "#missing"}, - "west": {"uv": [0, 0, 12, 2], "texture": "#missing"}, - "up": {"uv": [0, 0, 12, 12], "texture": "#missing"}, - "down": {"uv": [0, 0, 12, 12], "texture": "#missing"} + "north": {"uv": [0.5, 0, 6.5, 1], "texture": "#1"}, + "east": {"uv": [0.5, 0, 6.5, 1], "texture": "#1"}, + "south": {"uv": [0.5, 0, 6.5, 1], "texture": "#1"}, + "west": {"uv": [0.5, 0, 6.5, 1], "texture": "#1"}, + "up": {"uv": [0.5, 9, 6.5, 15], "texture": "#1"}, + "down": {"uv": [0.5, 9, 6.5, 15], "texture": "#1"} } } ] diff --git a/src/main/resources/assets/createindustry/models/block/casting_spout/bottom.json b/src/main/resources/assets/createindustry/models/block/casting_spout/bottom.json index d10dede4..e38b55d1 100644 --- a/src/main/resources/assets/createindustry/models/block/casting_spout/bottom.json +++ b/src/main/resources/assets/createindustry/models/block/casting_spout/bottom.json @@ -1,30 +1,34 @@ { "credit": "Made with Blockbench", + "parent": "block/block", + "texture_size": [32, 32], + "textures": { + "1": "createindustry:block/casting_spout" + }, "elements": [ - { - "from": [6, -5, 6], - "to": [10, -2, 10], - "color": 5, - "faces": { - "north": {"uv": [0, 0, 4, 3], "texture": "#missing"}, - "east": {"uv": [0, 0, 4, 3], "texture": "#missing"}, - "south": {"uv": [0, 0, 4, 3], "texture": "#missing"}, - "west": {"uv": [0, 0, 4, 3], "texture": "#missing"}, - "up": {"uv": [0, 0, 4, 4], "texture": "#missing"}, - "down": {"uv": [0, 0, 4, 4], "texture": "#missing"} - } - }, + { "from": [5, -7, 5], "to": [11, -5, 11], - "color": 5, "faces": { - "north": {"uv": [0, 0, 6, 2], "texture": "#missing"}, - "east": {"uv": [0, 0, 6, 2], "texture": "#missing"}, - "south": {"uv": [0, 0, 6, 2], "texture": "#missing"}, - "west": {"uv": [0, 0, 6, 2], "texture": "#missing"}, - "up": {"uv": [0, 0, 6, 6], "texture": "#missing"}, - "down": {"uv": [0, 0, 6, 6], "texture": "#missing"} + "north": {"uv": [8, 4.5, 11, 5.5], "texture": "#1"}, + "east": {"uv": [8, 4.5, 11, 5.5], "texture": "#1"}, + "south": {"uv": [8, 4.5, 11, 5.5], "texture": "#1"}, + "west": {"uv": [8, 4.5, 11, 5.5], "texture": "#1"}, + "up": {"uv": [8, 5.5, 11, 8.5], "texture": "#1"}, + "down": {"uv": [8, 5.5, 11, 8.5], "texture": "#1"} + } + }, + { + "from": [6, -5, 6], + "to": [10, -2, 10], + "faces": { + "north": {"uv": [11.5, 0.5, 13.5, 2], "texture": "#1"}, + "east": {"uv": [11.5, 0.5, 13.5, 2], "texture": "#1"}, + "south": {"uv": [11.5, 0.5, 13.5, 2], "texture": "#1"}, + "west": {"uv": [11.5, 0.5, 13.5, 2], "texture": "#1"}, + "up": {"uv": [13.5, 0, 15.5, 2], "texture": "#1"}, + "down": {"uv": [13.5, 0, 15.5, 2], "texture": "#1"} } } ] diff --git a/src/main/resources/assets/createindustry/models/block/casting_spout/connector.json b/src/main/resources/assets/createindustry/models/block/casting_spout/connector.json index 3b0e6f17..8c9809a3 100644 --- a/src/main/resources/assets/createindustry/models/block/casting_spout/connector.json +++ b/src/main/resources/assets/createindustry/models/block/casting_spout/connector.json @@ -1,17 +1,22 @@ { "credit": "Made with Blockbench", + "parent": "block/block", + "texture_size": [32, 32], + "textures": { + "1": "createindustry:block/casting_spout" + }, "elements": [ + { "from": [4, -2, 4], "to": [12, 0, 12], - "color": 5, "faces": { - "north": {"uv": [0, 0, 8, 2], "texture": "#missing"}, - "east": {"uv": [0, 0, 8, 2], "texture": "#missing"}, - "south": {"uv": [0, 0, 8, 2], "texture": "#missing"}, - "west": {"uv": [0, 0, 8, 2], "texture": "#missing"}, - "up": {"uv": [0, 0, 8, 8], "texture": "#missing"}, - "down": {"uv": [0, 0, 8, 8], "texture": "#missing"} + "north": {"uv": [11.5, 6, 15.5, 7], "texture": "#1"}, + "east": {"uv": [11.5, 6, 15.5, 7], "texture": "#1"}, + "south": {"uv": [11.5, 6, 15.5, 7], "texture": "#1"}, + "west": {"uv": [11.5, 6, 15.5, 7], "texture": "#1"}, + "up": {"uv": [9.5, 10, 13.5, 14], "texture": "#1"}, + "down": {"uv": [11.5, 2, 15.5, 6], "texture": "#1"} } } ] diff --git a/src/main/resources/assets/createindustry/models/block/casting_spout/item.json b/src/main/resources/assets/createindustry/models/block/casting_spout/item.json index 4f64b8ea..81b65a7e 100644 --- a/src/main/resources/assets/createindustry/models/block/casting_spout/item.json +++ b/src/main/resources/assets/createindustry/models/block/casting_spout/item.json @@ -1,82 +1,81 @@ { "credit": "Made with Blockbench", + "parent": "block/block", + "texture_size": [32, 32], + "textures": { + "1": "createindustry:block/casting_spout" + }, "elements": [ { "from": [1, 2, 1], "to": [15, 14, 15], - "color": 2, "faces": { - "north": {"uv": [0, 0, 14, 12], "texture": "#missing"}, - "east": {"uv": [0, 0, 14, 12], "texture": "#missing"}, - "south": {"uv": [0, 0, 14, 12], "texture": "#missing"}, - "west": {"uv": [0, 0, 14, 12], "texture": "#missing"}, - "up": {"uv": [0, 0, 14, 14], "texture": "#missing"}, - "down": {"uv": [0, 0, 14, 14], "texture": "#missing"} + "north": {"uv": [0, 1, 7, 7], "texture": "#1"}, + "east": {"uv": [0, 1, 7, 7], "texture": "#1"}, + "south": {"uv": [0, 1, 7, 7], "texture": "#1"}, + "west": {"uv": [0, 1, 7, 7], "texture": "#1"}, + "up": {"uv": [0, 8.5, 7, 15.5], "texture": "#1"}, + "down": {"uv": [8, 8.5, 15, 15.5], "texture": "#1"} } }, { "from": [2, 0, 2], "to": [14, 2, 14], - "color": 7, "faces": { - "north": {"uv": [0, 0, 12, 2], "texture": "#missing"}, - "east": {"uv": [0, 0, 12, 2], "texture": "#missing"}, - "south": {"uv": [0, 0, 12, 2], "texture": "#missing"}, - "west": {"uv": [0, 0, 12, 2], "texture": "#missing"}, - "up": {"uv": [0, 0, 12, 12], "texture": "#missing"}, - "down": {"uv": [0, 0, 12, 12], "texture": "#missing"} + "north": {"uv": [0.5, 7, 6.5, 8], "texture": "#1"}, + "east": {"uv": [0.5, 7, 6.5, 8], "texture": "#1"}, + "south": {"uv": [0.5, 7, 6.5, 8], "texture": "#1"}, + "west": {"uv": [0.5, 7, 6.5, 8], "texture": "#1"}, + "up": {"uv": [8.5, 9, 14.5, 15], "texture": "#1"}, + "down": {"uv": [8.5, 9, 14.5, 15], "texture": "#1"} } }, { "from": [2, 14, 2], "to": [14, 16, 14], - "color": 7, "faces": { - "north": {"uv": [0, 0, 12, 2], "texture": "#missing"}, - "east": {"uv": [0, 0, 12, 2], "texture": "#missing"}, - "south": {"uv": [0, 0, 12, 2], "texture": "#missing"}, - "west": {"uv": [0, 0, 12, 2], "texture": "#missing"}, - "up": {"uv": [0, 0, 12, 12], "texture": "#missing"}, - "down": {"uv": [0, 0, 12, 12], "texture": "#missing"} + "north": {"uv": [0.5, 0, 6.5, 1], "texture": "#1"}, + "east": {"uv": [0.5, 0, 6.5, 1], "texture": "#1"}, + "south": {"uv": [0.5, 0, 6.5, 1], "texture": "#1"}, + "west": {"uv": [0.5, 0, 6.5, 1], "texture": "#1"}, + "up": {"uv": [0.5, 9, 6.5, 15], "texture": "#1"}, + "down": {"uv": [0.5, 9, 6.5, 15], "texture": "#1"} } }, { "from": [4, -2, 4], "to": [12, 0, 12], - "color": 5, "faces": { - "north": {"uv": [0, 0, 8, 2], "texture": "#missing"}, - "east": {"uv": [0, 0, 8, 2], "texture": "#missing"}, - "south": {"uv": [0, 0, 8, 2], "texture": "#missing"}, - "west": {"uv": [0, 0, 8, 2], "texture": "#missing"}, - "up": {"uv": [0, 0, 8, 8], "texture": "#missing"}, - "down": {"uv": [0, 0, 8, 8], "texture": "#missing"} + "north": {"uv": [11.5, 6, 15.5, 7], "texture": "#1"}, + "east": {"uv": [11.5, 6, 15.5, 7], "texture": "#1"}, + "south": {"uv": [11.5, 6, 15.5, 7], "texture": "#1"}, + "west": {"uv": [11.5, 6, 15.5, 7], "texture": "#1"}, + "up": {"uv": [9.5, 10, 13.5, 14], "texture": "#1"}, + "down": {"uv": [11.5, 2, 15.5, 6], "texture": "#1"} } }, { "from": [5, -7, 5], "to": [11, -5, 11], - "color": 5, "faces": { - "north": {"uv": [0, 0, 6, 2], "texture": "#missing"}, - "east": {"uv": [0, 0, 6, 2], "texture": "#missing"}, - "south": {"uv": [0, 0, 6, 2], "texture": "#missing"}, - "west": {"uv": [0, 0, 6, 2], "texture": "#missing"}, - "up": {"uv": [0, 0, 6, 6], "texture": "#missing"}, - "down": {"uv": [0, 0, 6, 6], "texture": "#missing"} + "north": {"uv": [8, 4.5, 11, 5.5], "texture": "#1"}, + "east": {"uv": [8, 4.5, 11, 5.5], "texture": "#1"}, + "south": {"uv": [8, 4.5, 11, 5.5], "texture": "#1"}, + "west": {"uv": [8, 4.5, 11, 5.5], "texture": "#1"}, + "up": {"uv": [8, 5.5, 11, 8.5], "texture": "#1"}, + "down": {"uv": [8, 5.5, 11, 8.5], "texture": "#1"} } }, { "from": [6, -5, 6], "to": [10, -2, 10], - "color": 5, "faces": { - "north": {"uv": [0, 0, 4, 3], "texture": "#missing"}, - "east": {"uv": [0, 0, 4, 3], "texture": "#missing"}, - "south": {"uv": [0, 0, 4, 3], "texture": "#missing"}, - "west": {"uv": [0, 0, 4, 3], "texture": "#missing"}, - "up": {"uv": [0, 0, 4, 4], "texture": "#missing"}, - "down": {"uv": [0, 0, 4, 4], "texture": "#missing"} + "north": {"uv": [11.5, 0.5, 13.5, 2], "texture": "#1"}, + "east": {"uv": [11.5, 0.5, 13.5, 2], "texture": "#1"}, + "south": {"uv": [11.5, 0.5, 13.5, 2], "texture": "#1"}, + "west": {"uv": [11.5, 0.5, 13.5, 2], "texture": "#1"}, + "up": {"uv": [13.5, 0, 15.5, 2], "texture": "#1"}, + "down": {"uv": [13.5, 0, 15.5, 2], "texture": "#1"} } } ] diff --git a/src/main/resources/assets/createindustry/models/block/coal_coke_dust_layer.json b/src/main/resources/assets/createindustry/models/block/coal_coke_dust_layer.json index d8c93c9c..981075f2 100644 --- a/src/main/resources/assets/createindustry/models/block/coal_coke_dust_layer.json +++ b/src/main/resources/assets/createindustry/models/block/coal_coke_dust_layer.json @@ -1,8 +1,8 @@ { "credit": "Made with Blockbench", "textures": { - "0": "createindustry:block/steel_block", - "particle": "createindustry:block/steel_block" + "0": "createindustry:block/coal_coke_dust", + "particle": "createindustry:block/coal_coke_dust" }, "elements": [ { diff --git a/src/main/resources/assets/createindustry/textures/block/asphalt.png b/src/main/resources/assets/createindustry/textures/block/asphalt.png index efdf2708..48620f94 100644 Binary files a/src/main/resources/assets/createindustry/textures/block/asphalt.png and b/src/main/resources/assets/createindustry/textures/block/asphalt.png differ diff --git a/src/main/resources/assets/createindustry/textures/block/casting_basin.png b/src/main/resources/assets/createindustry/textures/block/casting_basin.png new file mode 100644 index 00000000..edbc1769 Binary files /dev/null and b/src/main/resources/assets/createindustry/textures/block/casting_basin.png differ diff --git a/src/main/resources/assets/createindustry/textures/block/casting_spout.png b/src/main/resources/assets/createindustry/textures/block/casting_spout.png new file mode 100644 index 00000000..2f010263 Binary files /dev/null and b/src/main/resources/assets/createindustry/textures/block/casting_spout.png differ diff --git a/src/main/resources/assets/createindustry/textures/block/coal_coke_dust.png b/src/main/resources/assets/createindustry/textures/block/coal_coke_dust.png new file mode 100644 index 00000000..94e581c9 Binary files /dev/null and b/src/main/resources/assets/createindustry/textures/block/coal_coke_dust.png differ diff --git a/src/main/resources/assets/createindustry/textures/block/molten_metal.png b/src/main/resources/assets/createindustry/textures/block/molten_metal.png new file mode 100644 index 00000000..f79b04ca Binary files /dev/null and b/src/main/resources/assets/createindustry/textures/block/molten_metal.png differ diff --git a/src/main/resources/assets/createindustry/textures/fluid/liquid_asphalt.png b/src/main/resources/assets/createindustry/textures/fluid/liquid_asphalt.png index 17fa30fe..8d837f89 100644 Binary files a/src/main/resources/assets/createindustry/textures/fluid/liquid_asphalt.png and b/src/main/resources/assets/createindustry/textures/fluid/liquid_asphalt.png differ diff --git a/src/main/resources/assets/createindustry/textures/fluid/molten_slag_flow.png b/src/main/resources/assets/createindustry/textures/fluid/molten_slag_flow.png index 299558f9..249e6a13 100644 Binary files a/src/main/resources/assets/createindustry/textures/fluid/molten_slag_flow.png and b/src/main/resources/assets/createindustry/textures/fluid/molten_slag_flow.png differ diff --git a/src/main/resources/assets/createindustry/textures/fluid/molten_slag_still.png b/src/main/resources/assets/createindustry/textures/fluid/molten_slag_still.png index b328465a..42314ac9 100644 Binary files a/src/main/resources/assets/createindustry/textures/fluid/molten_slag_still.png and b/src/main/resources/assets/createindustry/textures/fluid/molten_slag_still.png differ diff --git a/src/main/resources/assets/createindustry/textures/fluid/molten_steel_flow.png b/src/main/resources/assets/createindustry/textures/fluid/molten_steel_flow.png index 299558f9..69420ff2 100644 Binary files a/src/main/resources/assets/createindustry/textures/fluid/molten_steel_flow.png and b/src/main/resources/assets/createindustry/textures/fluid/molten_steel_flow.png differ diff --git a/src/main/resources/assets/createindustry/textures/fluid/molten_steel_still.png b/src/main/resources/assets/createindustry/textures/fluid/molten_steel_still.png index b328465a..f79b04ca 100644 Binary files a/src/main/resources/assets/createindustry/textures/fluid/molten_steel_still.png and b/src/main/resources/assets/createindustry/textures/fluid/molten_steel_still.png differ diff --git a/src/main/resources/assets/createindustry/textures/item/liquid_asphalt_bucket.png b/src/main/resources/assets/createindustry/textures/item/liquid_asphalt_bucket.png index efdf2708..375c39db 100644 Binary files a/src/main/resources/assets/createindustry/textures/item/liquid_asphalt_bucket.png and b/src/main/resources/assets/createindustry/textures/item/liquid_asphalt_bucket.png differ