diff --git a/src/generated/resources/.cache/2d06ea55ee27bcb1f7f87fa8ec3e037afa7e1ad9 b/src/generated/resources/.cache/2d06ea55ee27bcb1f7f87fa8ec3e037afa7e1ad9 index 1482a952..d09b6d30 100644 --- a/src/generated/resources/.cache/2d06ea55ee27bcb1f7f87fa8ec3e037afa7e1ad9 +++ b/src/generated/resources/.cache/2d06ea55ee27bcb1f7f87fa8ec3e037afa7e1ad9 @@ -1,4 +1,4 @@ -// 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)] +// 1.19.2 2023-11-24T16:01:59.4253252 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 @@ -17,7 +17,7 @@ e464e2a4f734edddc561ed16c6ef59cff24f7c48 assets/createindustry/blockstates/aspha 35f7a107bbc2bbfad56a162600e61ea7cdda7b46 assets/createindustry/blockstates/black_concrete_slab.json 93a81066656b7dd0e3ddfa5c0acef85773691cbe assets/createindustry/blockstates/black_concrete_stairs.json e7be4ba03250473eed90673c18fa8ff499df4b2e assets/createindustry/blockstates/black_concrete_wall.json -28a19ed8b175249688bc50ae3a35112d8abd512d assets/createindustry/blockstates/blast_furnace_output.json +9444760b497a6f7a8b01dbbb9ef3c6d1c4cce578 assets/createindustry/blockstates/blast_furnace_output.json f844fd0e8d4d18f36fc3cf4e8872f1427f273101 assets/createindustry/blockstates/blue_concrete.json c45124689815c652aae0f78c9be6eb6e28d4d5d4 assets/createindustry/blockstates/blue_concrete_slab.json b1cbcdfd1c4d9db7fb6a8d11ab91ffa9e877178a assets/createindustry/blockstates/blue_concrete_stairs.json @@ -259,7 +259,6 @@ b1cb25fd75ba3214259057a2dcf15a1e53d172a7 assets/createindustry/models/block/blac 2874710cce75d9843bfda790d33450fa9d3c8633 assets/createindustry/models/block/black_concrete_wall_post.json 91f43a357e0bc0eab574dcd1dbc99cce0c95a1a6 assets/createindustry/models/block/black_concrete_wall_side.json 6d174eda9847bedac4bf8b5cd8e8fa1a60dee253 assets/createindustry/models/block/black_concrete_wall_side_tall.json -8d715dbacd408caf5dbb2b9e7a4ae33375791bbf assets/createindustry/models/block/blast_furnace_output.json f63e93efe0f94a2ac0305a22da0bd789be4e54b0 assets/createindustry/models/block/blue_concrete.json 67fd5155f2c2023090effe05a3dc74fc9246d581 assets/createindustry/models/block/blue_concrete_bottom.json 0bd92cb7c5640afb38fb39bc39b5cf6fdc83c51f assets/createindustry/models/block/blue_concrete_stairs.json @@ -643,7 +642,7 @@ d781586c69140d00c4698d434426725148e53127 assets/createindustry/models/item/black 9cf294ab7912a46233883d3e8118cfa2171d3676 assets/createindustry/models/item/black_concrete_stairs.json 28865a2b9212f1bcc4a65a32002623bc186da9b1 assets/createindustry/models/item/black_concrete_wall.json bffbc5ebd39352eaca157e47c44cf3a7d43a29dc assets/createindustry/models/item/blasting_mixture.json -fc1b51136dffe2202bca9af77b0888e91a0b6232 assets/createindustry/models/item/blast_furnace_output.json +eb79e25c93a3d2251496fddc141e749d2ace2b01 assets/createindustry/models/item/blast_furnace_output.json c7e6bbd897b6eb363505e2840b62ec9cee129894 assets/createindustry/models/item/block_mold.json 0e500b3a21b83741ff9a6015fa60bd944f4a9dc0 assets/createindustry/models/item/blue_concrete.json d45354dde8bd8d573bd9ef0e879562795b9b0816 assets/createindustry/models/item/blue_concrete_slab.json @@ -698,7 +697,7 @@ a41929b5df14622b2132c410bcf434b0d728359b assets/createindustry/models/item/cyan_ c41b0d18dd34675d2a9bde1a1a47fb62800e0197 assets/createindustry/models/item/diesel_bucket.json a52e5b74d112f98514db2f39db50cf3f90f9e21c assets/createindustry/models/item/diesel_engine.json 6bff071e67b471a8c6cf0da2442568022ad03edf assets/createindustry/models/item/diesel_engine_expansion.json -d3cd252768cca977d57b814d836630e8eb5ef561 assets/createindustry/models/item/engine_base.json +48a0ea668640b5c304f741b2dc65897ec0810d13 assets/createindustry/models/item/engine_base.json 83e4b84c02445ef94071122a1f9e4841bc4f6672 assets/createindustry/models/item/engine_chamber.json 2e64755176a4d754a4157884e654ea010f9f11aa assets/createindustry/models/item/exhaust.json 19de5aea7331fb1d50f95ee5ac3524e1c4de73e6 assets/createindustry/models/item/factory_floor.json @@ -708,7 +707,7 @@ a3aa70d1667e1cb2ad3a355aa2df5f02fe19fa87 assets/createindustry/models/item/facto b59c027fe75c566a73d1c068f0558e0c8d262226 assets/createindustry/models/item/fireclay_ball.json 3458844b44afee270059968cc283e48783833311 assets/createindustry/models/item/fireproof_brick.json 5977d3dbc4baaef30bbaf5fc1f0dba0ee8df2008 assets/createindustry/models/item/fireproof_bricks.json -1aa5286394e981be037c8f4b5f5d98004bd70122 assets/createindustry/models/item/fireproof_brick_reinforcement.json +4375c1b9f57ca9b5b5cf700b9b7c4ff25c554650 assets/createindustry/models/item/fireproof_brick_reinforcement.json 004725e848bb688280bcb1e0bb03901ab640318a assets/createindustry/models/item/flarestack.json 51b592f033acb1ebef30bcccb5893e8532169eeb assets/createindustry/models/item/formwork_block.json 643ec369a783780a0c783c3190613930536d2141 assets/createindustry/models/item/fossilstone.json diff --git a/src/generated/resources/.cache/9047e4e94996e73e9dfde3738763637fb609e07e b/src/generated/resources/.cache/9047e4e94996e73e9dfde3738763637fb609e07e index bf78217f..2b233a82 100644 --- a/src/generated/resources/.cache/9047e4e94996e73e9dfde3738763637fb609e07e +++ b/src/generated/resources/.cache/9047e4e94996e73e9dfde3738763637fb609e07e @@ -1,2 +1,2 @@ -// 1.19.2 2023-11-16T14:05:17.9855042 Create: The Factory Must Grow's lang merger -8022b7f5699915d93776d948467ffc363cef009e assets/createindustry/lang/en_us.json +// 1.19.2 2023-11-24T16:01:59.4223239 Create: The Factory Must Grow's lang merger +b27bea40ccf70838d54173cae8099faafdd1ee11 assets/createindustry/lang/en_us.json diff --git a/src/generated/resources/assets/createindustry/blockstates/blast_furnace_output.json b/src/generated/resources/assets/createindustry/blockstates/blast_furnace_output.json index d2a22bdd..2f48a669 100644 --- a/src/generated/resources/assets/createindustry/blockstates/blast_furnace_output.json +++ b/src/generated/resources/assets/createindustry/blockstates/blast_furnace_output.json @@ -1,7 +1,19 @@ { "variants": { - "": { - "model": "createindustry:block/blast_furnace_output" + "facing=east": { + "model": "createindustry:block/blast_furnace_output/block", + "y": 90 + }, + "facing=north": { + "model": "createindustry:block/blast_furnace_output/block" + }, + "facing=south": { + "model": "createindustry:block/blast_furnace_output/block", + "y": 180 + }, + "facing=west": { + "model": "createindustry:block/blast_furnace_output/block", + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/createindustry/lang/en_us.json b/src/generated/resources/assets/createindustry/lang/en_us.json index 05f8ed52..753ec63c 100644 --- a/src/generated/resources/assets/createindustry/lang/en_us.json +++ b/src/generated/resources/assets/createindustry/lang/en_us.json @@ -419,6 +419,9 @@ "createindustry.ponder.tag.oil.description": "Machines that extract, process or use Crude Oil and its byproducts", "createindustry.ponder.tag.metallurgy.description": "Machines that produce, process or use Metal and raw materials as such", + "createindustry.subtitle.engine_sounds": "Engine Sounds", + "createindustry.subtitle.diesel_engine_sounds": "Diesel Engine Sounds", + "_": "->------------------------] UI & Messages [------------------------<-", @@ -494,6 +497,9 @@ "create.recipe.casting": "Casting", "create.recipe.coking": "Coking", + "createindustry.subtitle.engine_sounds": "Engine Sounds", + "createindustry.subtitle.diesel_engine_sounds": "Diesel Engine Sounds", + "_": "->------------------------] Ponders [------------------------<-", diff --git a/src/generated/resources/assets/createindustry/models/block/blast_furnace_output.json b/src/generated/resources/assets/createindustry/models/block/blast_furnace_output.json deleted file mode 100644 index 6d2e241c..00000000 --- a/src/generated/resources/assets/createindustry/models/block/blast_furnace_output.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "createindustry:block/blast_furnace_output" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/createindustry/models/item/blast_furnace_output.json b/src/generated/resources/assets/createindustry/models/item/blast_furnace_output.json index 07e7cc48..3e79ac6c 100644 --- a/src/generated/resources/assets/createindustry/models/item/blast_furnace_output.json +++ b/src/generated/resources/assets/createindustry/models/item/blast_furnace_output.json @@ -1,3 +1,3 @@ { - "parent": "createindustry:block/blast_furnace_output" + "parent": "createindustry:block/blast_furnace_output/item" } \ No newline at end of file diff --git a/src/generated/resources/assets/createindustry/models/item/engine_base.json b/src/generated/resources/assets/createindustry/models/item/engine_base.json index 155b490f..1281f108 100644 --- a/src/generated/resources/assets/createindustry/models/item/engine_base.json +++ b/src/generated/resources/assets/createindustry/models/item/engine_base.json @@ -1,3 +1,3 @@ { - "parent": "createindustry:item/engine_base" + "parent": "createindustry:item/unfinished_engine" } \ No newline at end of file diff --git a/src/generated/resources/assets/createindustry/models/item/fireproof_brick_reinforcement.json b/src/generated/resources/assets/createindustry/models/item/fireproof_brick_reinforcement.json index d730d30b..5267cb80 100644 --- a/src/generated/resources/assets/createindustry/models/item/fireproof_brick_reinforcement.json +++ b/src/generated/resources/assets/createindustry/models/item/fireproof_brick_reinforcement.json @@ -1,3 +1,6 @@ { - "parent": "createindustry:block/fireproof_brick_reinforcement" + "parent": "minecraft:block/wall_inventory", + "textures": { + "wall": "createindustry:block/fireproof_brick_reinforcement" + } } \ No newline at end of file diff --git a/src/main/java/com/drmangotea/createindustry/blocks/engines/diesel/DieselEngineBlockEntity.java b/src/main/java/com/drmangotea/createindustry/blocks/engines/diesel/DieselEngineBlockEntity.java index d9e9eac6..ca426749 100644 --- a/src/main/java/com/drmangotea/createindustry/blocks/engines/diesel/DieselEngineBlockEntity.java +++ b/src/main/java/com/drmangotea/createindustry/blocks/engines/diesel/DieselEngineBlockEntity.java @@ -54,7 +54,7 @@ import static net.minecraft.world.level.block.HorizontalDirectionalBlock.FACING; public class DieselEngineBlockEntity extends SmartBlockEntity implements IHaveGoggleInformation { - protected ScrollOptionBehaviour movementDirection; + //protected ScrollOptionBehaviour movementDirection; public WeakReference target; /////////// @@ -66,6 +66,8 @@ public class DieselEngineBlockEntity extends SmartBlockEntity implements IHaveGo private int consumptionTimer=0; public float engineStrength = 0; + + private Couple tanks; public BlockPos expansionPos; @@ -103,14 +105,14 @@ public class DieselEngineBlockEntity extends SmartBlockEntity implements IHaveGo public void addBehaviours(List behaviours) { //movementDirection = new ScrollOptionBehaviour<>(WindmillBearingBlockEntity.RotationDirection.class, // Lang.translateDirect("contraptions.windmill.rotation_direction"), this, new DieselEngineValueBox()); - movementDirection = new ScrollOptionBehaviour<>(WindmillBearingBlockEntity.RotationDirection.class, - Lang.translateDirect("contraptions.windmill.rotation_direction"), this, new SteamEngineValueBox()); - movementDirection.onlyActiveWhen(() -> { - PoweredShaftBlockEntity shaft = getShaft(); - return shaft == null || !shaft.hasSource(); - }); - movementDirection.withCallback($ -> onDirectionChanged()); - behaviours.add(movementDirection); + //movementDirection = new ScrollOptionBehaviour<>(WindmillBearingBlockEntity.RotationDirection.class, + // Lang.translateDirect("contraptions.windmill.rotation_direction"), this, new SteamEngineValueBox()); + //movementDirection.onlyActiveWhen(() -> { + // PoweredShaftBlockEntity shaft = getShaft(); + // return shaft == null || !shaft.hasSource(); + //}); + //movementDirection.withCallback($ -> onDirectionChanged()); + //behaviours.add(movementDirection); //////////////////////////////////////////// behaviours.add(new DirectBeltInputBehaviour(this)); @@ -124,7 +126,13 @@ public class DieselEngineBlockEntity extends SmartBlockEntity implements IHaveGo super.tick(); Direction direction; - DistExecutor.unsafeRunWhenOn(Dist.CLIENT, () -> this::makeSound); + + + + + + + if(getBlockState().getValue(FACE)==AttachFace.WALL) expansionPos = this.getBlockPos().relative(getBlockState().getValue(FACING).getOpposite()); @@ -184,33 +192,68 @@ public class DieselEngineBlockEntity extends SmartBlockEntity implements IHaveGo if(!level.isClientSide) if(getShaft() != null) engineProcess(targetAxis,verticalTarget); + //DistExecutor.unsafeRunWhenOn(Dist.CLIENT, () -> this::makeSound); + makeSound(targetAxis,verticalTarget); int conveyedSpeedLevel = engineStrength == 0 ? 1 : verticalTarget ? 1 : (int) GeneratingKineticBlockEntity.convertToDirection(1, facing)*2; if (targetAxis == Axis.Z) conveyedSpeedLevel *= -1; - if (movementDirection.get() == WindmillBearingBlockEntity.RotationDirection.COUNTER_CLOCKWISE) - conveyedSpeedLevel *= -1; + //if (movementDirection.get() == WindmillBearingBlockEntity.RotationDirection.COUNTER_CLOCKWISE) + // conveyedSpeedLevel *= -1; float shaftSpeed = shaft.getTheoreticalSpeed(); if (shaft.hasSource() && shaftSpeed != 0 && conveyedSpeedLevel != 0 && (shaftSpeed > 0) != (conveyedSpeedLevel > 0)) { - movementDirection.setValue(1 - movementDirection.get() - .ordinal()); + //movementDirection.setValue(1 - movementDirection.get() + // .ordinal()); conveyedSpeedLevel *= -1; } - shaft.update(worldPosition, conveyedSpeedLevel, engineStrength); + //shaft.update(worldPosition, conveyedSpeedLevel, engineStrength); + + //shaft.update(worldPosition, conveyedSpeedLevel, 40); } + + + @OnlyIn(Dist.CLIENT) - private void makeSound(){ + private void makeSound(Axis targetAxis, boolean verticalTarget){ Float targetAngle = getTargetAngle(); PoweredShaftBlockEntity ste = target.get(); if (ste == null) return; //if (engineStrength == 0) // return; + PoweredShaftBlockEntity shaft = getShaft(); + + if(tanks.get(true).isEmpty()||tanks.get(true).isEmpty()) { + engineStrength=0; + + shaft.update(worldPosition, getConveyedSpeedLevel(engineStrength,targetAxis,verticalTarget), engineStrength); + return; + } + + if(expansionBE != null){ + if(airTank.isEmpty()&&expansionBE.airTank.isEmpty()){ + engineStrength = 0; + shaft.update(worldPosition, getConveyedSpeedLevel(engineStrength,targetAxis,verticalTarget), engineStrength); + return; + } + }else + if(airTank.isEmpty()){ + engineStrength = 0; + shaft.update(worldPosition, getConveyedSpeedLevel(engineStrength,targetAxis,verticalTarget), engineStrength); + return; + } + + if(tanks.get(false).getFluidAmount()+5>1000) { + engineStrength = 0; + shaft.update(worldPosition, getConveyedSpeedLevel(engineStrength,targetAxis,verticalTarget), engineStrength); + return; + } + if (targetAngle == null) return; @@ -218,7 +261,7 @@ public class DieselEngineBlockEntity extends SmartBlockEntity implements IHaveGo angle += (angle < 0) ? -180 + 75 : 360 - 75; angle %= 360; - PoweredShaftBlockEntity shaft = getShaft(); + if (shaft == null || shaft.getSpeed() == 0) return; @@ -232,7 +275,7 @@ public class DieselEngineBlockEntity extends SmartBlockEntity implements IHaveGo return; } - TFMGSoundEvents.ENGINE.playAt(level, worldPosition, 1.0f, 1f, false); + TFMGSoundEvents.DIESEL_ENGINE.playAt(level, worldPosition, 0.4f, 1f, false); prevAngle = angle; } @@ -244,15 +287,15 @@ public class DieselEngineBlockEntity extends SmartBlockEntity implements IHaveGo engineStrength == 0 ? 1 : verticalTarget ? 1 : (int) GeneratingKineticBlockEntity.convertToDirection(1, facing)*2; if (targetAxis == Axis.Z) conveyedSpeedLevel *= -1; - if (movementDirection.get() == WindmillBearingBlockEntity.RotationDirection.COUNTER_CLOCKWISE) - conveyedSpeedLevel *= -1; + //if (movementDirection.get() == WindmillBearingBlockEntity.RotationDirection.COUNTER_CLOCKWISE) + // conveyedSpeedLevel *= -1; float shaftSpeed = shaft.getTheoreticalSpeed(); if (shaft.hasSource() && shaftSpeed != 0 && conveyedSpeedLevel != 0 && (shaftSpeed > 0) != (conveyedSpeedLevel > 0)) { - movementDirection.setValue(1 - movementDirection.get() - .ordinal()); + //movementDirection.setValue(1 - movementDirection.get() + // .ordinal()); conveyedSpeedLevel *= -1; } diff --git a/src/main/java/com/drmangotea/createindustry/blocks/engines/intake/AirIntakeBlockEntity.java b/src/main/java/com/drmangotea/createindustry/blocks/engines/intake/AirIntakeBlockEntity.java index 90b5e6e2..f6c46b96 100644 --- a/src/main/java/com/drmangotea/createindustry/blocks/engines/intake/AirIntakeBlockEntity.java +++ b/src/main/java/com/drmangotea/createindustry/blocks/engines/intake/AirIntakeBlockEntity.java @@ -76,7 +76,7 @@ public class AirIntakeBlockEntity extends KineticBlockEntity implements IWrencha super.tick(); //if(!level.isClientSide) { - int production = ((int) maxShaftSpeed * ((diameter * diameter))) / 40; + int production = ((int) maxShaftSpeed * ((diameter * diameter))) / 10; if (tankInventory.getFluidAmount() + production <= tankInventory.getCapacity()) { //tankInventory.fill(new FluidStack(TFMGFluids.AIR.getSource(), production), IFluidHandler.FluidAction.EXECUTE); tankInventory.setFluid(new FluidStack(TFMGFluids.AIR.getSource(), production + tankInventory.getFluidAmount())); diff --git a/src/main/java/com/drmangotea/createindustry/blocks/engines/small/AbstractEngineTileEntity.java b/src/main/java/com/drmangotea/createindustry/blocks/engines/small/AbstractEngineTileEntity.java index 2e508097..cec62000 100644 --- a/src/main/java/com/drmangotea/createindustry/blocks/engines/small/AbstractEngineTileEntity.java +++ b/src/main/java/com/drmangotea/createindustry/blocks/engines/small/AbstractEngineTileEntity.java @@ -542,11 +542,11 @@ public void write(CompoundTag compound, boolean clientPacket) { private void makeSound(){ soundTimer=0; if(this instanceof TurbineEngineTileEntity){ - TFMGSoundEvents.ENGINE.playAt(level, worldPosition, 0.4f, 1.5f, false); + TFMGSoundEvents.ENGINE.playAt(level, worldPosition, 0.2f, 1.5f, false); } else - TFMGSoundEvents.ENGINE.playAt(level, worldPosition, 0.6f, 1f, false); + TFMGSoundEvents.ENGINE.playAt(level, worldPosition, 0.3f, 1f, false); } diff --git a/src/main/java/com/drmangotea/createindustry/blocks/machines/exhaust/ExhaustBlockEntity.java b/src/main/java/com/drmangotea/createindustry/blocks/machines/exhaust/ExhaustBlockEntity.java index f06311e2..5bd7a590 100644 --- a/src/main/java/com/drmangotea/createindustry/blocks/machines/exhaust/ExhaustBlockEntity.java +++ b/src/main/java/com/drmangotea/createindustry/blocks/machines/exhaust/ExhaustBlockEntity.java @@ -169,9 +169,8 @@ public class ExhaustBlockEntity extends SmartBlockEntity implements IHaveGoggleI smokeTimer = 100; spawnsSmoke = true; - int random = Create.RANDOM.nextInt(5); - if(random==0) - tankInventory.drain(35, IFluidHandler.FluidAction.EXECUTE); + + tankInventory.drain(20, IFluidHandler.FluidAction.EXECUTE); diff --git a/src/main/java/com/drmangotea/createindustry/blocks/machines/metal_processing/blast_furnace/BlastFurnaceOutputBlockEntity.java b/src/main/java/com/drmangotea/createindustry/blocks/machines/metal_processing/blast_furnace/BlastFurnaceOutputBlockEntity.java index aa4002c3..4072d5d9 100644 --- a/src/main/java/com/drmangotea/createindustry/blocks/machines/metal_processing/blast_furnace/BlastFurnaceOutputBlockEntity.java +++ b/src/main/java/com/drmangotea/createindustry/blocks/machines/metal_processing/blast_furnace/BlastFurnaceOutputBlockEntity.java @@ -222,10 +222,17 @@ public class BlastFurnaceOutputBlockEntity extends TFMGMachineBlockEntity implem if (timer>0&&type == BlastFurnaceType.SMALL) { posToSpawn = this.getBlockPos().relative(outputFacing.getOpposite()).above(); - level.setBlock(posToSpawn, TFMGBlocks.MOLTEN_METAL.getDefaultState(),3); - level.setBlock(posToSpawn.above(), TFMGBlocks.MOLTEN_METAL.getDefaultState(),3); + if(!level.getBlockState(posToSpawn).is(TFMGBlocks.MOLTEN_METAL.get())) { + level.setBlock(posToSpawn, TFMGBlocks.MOLTEN_METAL.getDefaultState(), 3); + level.setBlock(posToSpawn.above(), TFMGBlocks.MOLTEN_METAL.getDefaultState(), 3); + }else { + + ((MoltenMetalBlockEntity) level.getBlockEntity(posToSpawn)).discardTimer = 40; + ((MoltenMetalBlockEntity) level.getBlockEntity(posToSpawn.above())).discardTimer = 40; + + } } ////// @@ -235,15 +242,33 @@ public class BlastFurnaceOutputBlockEntity extends TFMGMachineBlockEntity implem posToSpawn2 = this.getBlockPos().relative(outputFacing.getOpposite()).above().relative(outputFacing.getCounterClockWise()); posToSpawn3 = this.getBlockPos().relative(outputFacing.getOpposite(),2).above().relative(outputFacing.getCounterClockWise()); - level.setBlock(posToSpawn, TFMGBlocks.MOLTEN_METAL.getDefaultState(),3); - level.setBlock(posToSpawn1, TFMGBlocks.MOLTEN_METAL.getDefaultState(),3); - level.setBlock(posToSpawn2, TFMGBlocks.MOLTEN_METAL.getDefaultState(),3); - level.setBlock(posToSpawn3, TFMGBlocks.MOLTEN_METAL.getDefaultState(),3); - level.setBlock(posToSpawn.above(), TFMGBlocks.MOLTEN_METAL.getDefaultState(),3); - level.setBlock(posToSpawn1.above(), TFMGBlocks.MOLTEN_METAL.getDefaultState(),3); - level.setBlock(posToSpawn2.above(), TFMGBlocks.MOLTEN_METAL.getDefaultState(),3); - level.setBlock(posToSpawn3.above(), TFMGBlocks.MOLTEN_METAL.getDefaultState(),3); + + if(!level.getBlockState(posToSpawn).is(TFMGBlocks.MOLTEN_METAL.get())) { + level.setBlock(posToSpawn, TFMGBlocks.MOLTEN_METAL.getDefaultState(), 3); + level.setBlock(posToSpawn1, TFMGBlocks.MOLTEN_METAL.getDefaultState(), 3); + level.setBlock(posToSpawn2, TFMGBlocks.MOLTEN_METAL.getDefaultState(), 3); + level.setBlock(posToSpawn3, TFMGBlocks.MOLTEN_METAL.getDefaultState(), 3); + + level.setBlock(posToSpawn.above(), TFMGBlocks.MOLTEN_METAL.getDefaultState(), 3); + level.setBlock(posToSpawn1.above(), TFMGBlocks.MOLTEN_METAL.getDefaultState(), 3); + level.setBlock(posToSpawn2.above(), TFMGBlocks.MOLTEN_METAL.getDefaultState(), 3); + level.setBlock(posToSpawn3.above(), TFMGBlocks.MOLTEN_METAL.getDefaultState(), 3); + + }else { + ((MoltenMetalBlockEntity) level.getBlockEntity(posToSpawn)).discardTimer = 40; + ((MoltenMetalBlockEntity) level.getBlockEntity(posToSpawn.above())).discardTimer = 40; + + ((MoltenMetalBlockEntity) level.getBlockEntity(posToSpawn1)).discardTimer = 40; + ((MoltenMetalBlockEntity) level.getBlockEntity(posToSpawn1.above())).discardTimer = 40; + + ((MoltenMetalBlockEntity) level.getBlockEntity(posToSpawn2)).discardTimer = 40; + ((MoltenMetalBlockEntity) level.getBlockEntity(posToSpawn2.above())).discardTimer = 40; + + ((MoltenMetalBlockEntity) level.getBlockEntity(posToSpawn3)).discardTimer = 40; + ((MoltenMetalBlockEntity) level.getBlockEntity(posToSpawn3.above())).discardTimer = 40; + + } } @@ -254,6 +279,9 @@ public class BlastFurnaceOutputBlockEntity extends TFMGMachineBlockEntity implem posToSpawn2 = this.getBlockPos().relative(outputFacing.getOpposite()).above().relative(outputFacing.getClockWise()); posToSpawn3 = this.getBlockPos().relative(outputFacing.getOpposite(),2).above().relative(outputFacing.getClockWise()); + + + if(!level.getBlockState(posToSpawn).is(TFMGBlocks.MOLTEN_METAL.get())) { level.setBlock(posToSpawn, TFMGBlocks.MOLTEN_METAL.getDefaultState(),3); level.setBlock(posToSpawn1, TFMGBlocks.MOLTEN_METAL.getDefaultState(),3); level.setBlock(posToSpawn2, TFMGBlocks.MOLTEN_METAL.getDefaultState(),3); @@ -263,7 +291,20 @@ public class BlastFurnaceOutputBlockEntity extends TFMGMachineBlockEntity implem level.setBlock(posToSpawn1.above(), TFMGBlocks.MOLTEN_METAL.getDefaultState(),3); level.setBlock(posToSpawn2.above(), TFMGBlocks.MOLTEN_METAL.getDefaultState(),3); level.setBlock(posToSpawn3.above(), TFMGBlocks.MOLTEN_METAL.getDefaultState(),3); + }else { + ((MoltenMetalBlockEntity) level.getBlockEntity(posToSpawn)).discardTimer = 40; + ((MoltenMetalBlockEntity) level.getBlockEntity(posToSpawn.above())).discardTimer = 40; + ((MoltenMetalBlockEntity) level.getBlockEntity(posToSpawn1)).discardTimer = 40; + ((MoltenMetalBlockEntity) level.getBlockEntity(posToSpawn1.above())).discardTimer = 40; + + ((MoltenMetalBlockEntity) level.getBlockEntity(posToSpawn2)).discardTimer = 40; + ((MoltenMetalBlockEntity) level.getBlockEntity(posToSpawn2.above())).discardTimer = 40; + + ((MoltenMetalBlockEntity) level.getBlockEntity(posToSpawn3)).discardTimer = 40; + ((MoltenMetalBlockEntity) level.getBlockEntity(posToSpawn3.above())).discardTimer = 40; + + } } } diff --git a/src/main/java/com/drmangotea/createindustry/blocks/machines/metal_processing/blast_furnace/MoltenMetalBlockEntity.java b/src/main/java/com/drmangotea/createindustry/blocks/machines/metal_processing/blast_furnace/MoltenMetalBlockEntity.java index adaff39b..e45f779e 100644 --- a/src/main/java/com/drmangotea/createindustry/blocks/machines/metal_processing/blast_furnace/MoltenMetalBlockEntity.java +++ b/src/main/java/com/drmangotea/createindustry/blocks/machines/metal_processing/blast_furnace/MoltenMetalBlockEntity.java @@ -17,7 +17,7 @@ public class MoltenMetalBlockEntity extends SmartBlockEntity { public MoltenMetalBlockEntity(BlockEntityType type, BlockPos pos, BlockState state) { super(type, pos, state); - discardTimer=20; + discardTimer=40; } diff --git a/src/main/java/com/drmangotea/createindustry/registry/TFMGBlocks.java b/src/main/java/com/drmangotea/createindustry/registry/TFMGBlocks.java index 3729e5f0..c8085091 100644 --- a/src/main/java/com/drmangotea/createindustry/registry/TFMGBlocks.java +++ b/src/main/java/com/drmangotea/createindustry/registry/TFMGBlocks.java @@ -588,6 +588,7 @@ public static final BlockEntry STEEL_DISTILLATION_OUTPU .tag(BlockTags.WALLS) .blockstate((c, p) -> TFMGVanillaBlockStates.generateWallBlockState(c, p, "fireproof_brick_reinforcement")) .item() + .transform(b -> TFMGVanillaBlockStates.transformWallItem(b, "fireproof_brick_reinforcement")) .build() .lang("Fireproof Brick Reinforcement") .register(); @@ -595,9 +596,11 @@ public static final BlockEntry STEEL_DISTILLATION_OUTPU .initialProperties(() -> Blocks.BRICKS) .properties(p -> p.color(MaterialColor.COLOR_RED)) .properties(p -> p.requiresCorrectToolForDrops()) + .blockstate((c, p) -> p.horizontalBlock(c.get(), p.models() + .getExistingFile(p.modLoc("block/blast_furnace_output/block")))) .transform(pickaxeOnly()) .item() - .build() + .transform(customItemModel()) .lang("Blast Furnace Output") .register(); public static final BlockEntry MOLTEN_METAL = diff --git a/src/main/java/com/drmangotea/createindustry/registry/TFMGItems.java b/src/main/java/com/drmangotea/createindustry/registry/TFMGItems.java index 42998785..3c0a5908 100644 --- a/src/main/java/com/drmangotea/createindustry/registry/TFMGItems.java +++ b/src/main/java/com/drmangotea/createindustry/registry/TFMGItems.java @@ -52,7 +52,7 @@ public class TFMGItems { HEAVY_PLATE = REGISTRATE.item("heavy_plate", Item::new).register(), ENGINE_CHAMBER = REGISTRATE.item("engine_chamber", Item::new).register(), ENGINE_BASE = REGISTRATE.item("engine_base", Item::new) - .model((c, p) -> p.withExistingParent(c.getName(), CreateTFMG.asResource("item/engine_base"))) + .model((c, p) -> p.withExistingParent(c.getName(), CreateTFMG.asResource("item/unfinished_engine"))) .register(), TURBINE_BLADE = REGISTRATE.item("turbine_blade", Item::new).register(), THERMITE_POWDER = REGISTRATE.item("thermite_powder", Item::new).register(), diff --git a/src/main/java/com/drmangotea/createindustry/registry/TFMGSoundEvents.java b/src/main/java/com/drmangotea/createindustry/registry/TFMGSoundEvents.java index ad017204..b93f4e2a 100644 --- a/src/main/java/com/drmangotea/createindustry/registry/TFMGSoundEvents.java +++ b/src/main/java/com/drmangotea/createindustry/registry/TFMGSoundEvents.java @@ -41,11 +41,17 @@ public class TFMGSoundEvents { public static final TFMGSoundEvents.SoundEntry - ENGINE = create("diesel_engine") - .subtitle("idk how to call this :3") + ENGINE = create("engine") + .subtitle("Engine Sounds") .category(SoundSource.BLOCKS) .attenuationDistance(10) - .build(); + .build(), + + DIESEL_ENGINE = create("diesel_engine") + .subtitle("Diese Engine Sounds") + .category(SoundSource.BLOCKS) + .attenuationDistance(10) + .build(); diff --git a/src/main/java/com/drmangotea/createindustry/registry/TFMGSounds.java b/src/main/java/com/drmangotea/createindustry/registry/TFMGSounds.java deleted file mode 100644 index 458c9a17..00000000 --- a/src/main/java/com/drmangotea/createindustry/registry/TFMGSounds.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.drmangotea.createindustry.registry; - -public class TFMGSounds { -} diff --git a/src/main/resources/assets/createindustry/lang/default/interface.json b/src/main/resources/assets/createindustry/lang/default/interface.json index 5215424e..41abbc1c 100644 --- a/src/main/resources/assets/createindustry/lang/default/interface.json +++ b/src/main/resources/assets/createindustry/lang/default/interface.json @@ -64,5 +64,8 @@ "create.recipe.advanced_distillation": "Advanced Distillation", "create.recipe.industrial_blasting": "Industrial Blasting", "create.recipe.casting": "Casting", - "create.recipe.coking": "Coking" + "create.recipe.coking": "Coking", + + "createindustry.subtitle.engine_sounds": "Engine Sounds", + "createindustry.subtitle.diesel_engine_sounds": "Diesel Engine Sounds" } diff --git a/src/main/resources/assets/createindustry/models/block/aluminum_fluid_valve/block_horizontal_closed.json b/src/main/resources/assets/createindustry/models/block/aluminum_fluid_valve/block_horizontal_closed.json index aa081f55..762970e6 100644 --- a/src/main/resources/assets/createindustry/models/block/aluminum_fluid_valve/block_horizontal_closed.json +++ b/src/main/resources/assets/createindustry/models/block/aluminum_fluid_valve/block_horizontal_closed.json @@ -1,9 +1,9 @@ { "credit": "Made with Blockbench", "textures": { - "2": "create:block/fluid_valve", - "4": "create:block/pipes", - "particle": "create:block/copper_plating" + "2": "createindustry:block/aluminum_fluid_valve", + "4": "createindustry:block/aluminum_pipes", + "particle": "createindustry:block/aluminum_block" }, "elements": [ { diff --git a/src/main/resources/assets/createindustry/models/block/aluminum_fluid_valve/block_horizontal_open.json b/src/main/resources/assets/createindustry/models/block/aluminum_fluid_valve/block_horizontal_open.json index 4f830bff..ee6567d9 100644 --- a/src/main/resources/assets/createindustry/models/block/aluminum_fluid_valve/block_horizontal_open.json +++ b/src/main/resources/assets/createindustry/models/block/aluminum_fluid_valve/block_horizontal_open.json @@ -1,9 +1,9 @@ { "credit": "Made with Blockbench", "textures": { - "2": "create:block/fluid_valve", - "4": "create:block/pipes", - "particle": "create:block/copper_plating" + "2": "createindustry:block/aluminum_fluid_valve", + "4": "createindustry:block/aluminum_pipes", + "particle": "createindustry:block/aluminum_block" }, "elements": [ { diff --git a/src/main/resources/assets/createindustry/models/block/aluminum_fluid_valve/block_vertical_closed.json b/src/main/resources/assets/createindustry/models/block/aluminum_fluid_valve/block_vertical_closed.json index 1f7b5fee..419f84ea 100644 --- a/src/main/resources/assets/createindustry/models/block/aluminum_fluid_valve/block_vertical_closed.json +++ b/src/main/resources/assets/createindustry/models/block/aluminum_fluid_valve/block_vertical_closed.json @@ -1,9 +1,9 @@ { "credit": "Made with Blockbench", "textures": { - "2": "create:block/fluid_valve", - "3": "create:block/pipes", - "particle": "create:block/copper_plating" + "2": "createindustry:block/aluminum_fluid_valve", + "3": "createindustry:block/aluminum_pipes", + "particle": "createindustry:block/aluminum_block" }, "elements": [ { diff --git a/src/main/resources/assets/createindustry/models/block/aluminum_fluid_valve/block_vertical_open.json b/src/main/resources/assets/createindustry/models/block/aluminum_fluid_valve/block_vertical_open.json index b95cd9a3..b9af91cd 100644 --- a/src/main/resources/assets/createindustry/models/block/aluminum_fluid_valve/block_vertical_open.json +++ b/src/main/resources/assets/createindustry/models/block/aluminum_fluid_valve/block_vertical_open.json @@ -1,9 +1,9 @@ { "credit": "Made with Blockbench", "textures": { - "2": "create:block/fluid_valve", - "3": "create:block/pipes", - "particle": "create:block/copper_plating" + "2": "createindustry:block/aluminum_fluid_valve", + "3": "createindustry:block/aluminum_pipes", + "particle": "createindustry:block/aluminum_block" }, "elements": [ { diff --git a/src/main/resources/assets/createindustry/models/block/aluminum_fluid_valve/item.json b/src/main/resources/assets/createindustry/models/block/aluminum_fluid_valve/item.json index b09bd0b7..c91c92a8 100644 --- a/src/main/resources/assets/createindustry/models/block/aluminum_fluid_valve/item.json +++ b/src/main/resources/assets/createindustry/models/block/aluminum_fluid_valve/item.json @@ -1,12 +1,12 @@ { "credit": "Made with Blockbench", "textures": { - "2": "create:block/fluid_valve", - "3": "create:block/pipes", + "2": "createindustry:block/aluminum_fluid_valve", + "3": "createindustry:block/aluminum_pipes", "4": "create:block/pump", "1_1": "create:block/axis_top", "1_0": "create:block/axis", - "particle": "create:block/copper_plating" + "particle": "createindustry:block/aluminum_block" }, "elements": [ { diff --git a/src/main/resources/assets/createindustry/models/block/aluminum_fluid_valve/pointer.json b/src/main/resources/assets/createindustry/models/block/aluminum_fluid_valve/pointer.json index 2e9eed35..5d41beef 100644 --- a/src/main/resources/assets/createindustry/models/block/aluminum_fluid_valve/pointer.json +++ b/src/main/resources/assets/createindustry/models/block/aluminum_fluid_valve/pointer.json @@ -1,9 +1,9 @@ { "credit": "Made with Blockbench", "textures": { - "2": "create:block/fluid_valve", + "2": "createindustry:block/aluminum_fluid_valve", "4": "create:block/pump", - "particle": "create:block/copper_plating" + "particle": "createindustry:block/aluminum_block" }, "elements": [ { diff --git a/src/main/resources/assets/createindustry/models/block/aluminum_mechanical_pump/block.json b/src/main/resources/assets/createindustry/models/block/aluminum_mechanical_pump/block.json index 8dd3ab9b..0b78bceb 100644 --- a/src/main/resources/assets/createindustry/models/block/aluminum_mechanical_pump/block.json +++ b/src/main/resources/assets/createindustry/models/block/aluminum_mechanical_pump/block.json @@ -2,9 +2,9 @@ "credit": "Made with Blockbench", "parent": "create:block/block", "textures": { - "2": "create:block/pipes", - "4": "create:block/pump", - "particle": "create:block/pump" + "2": "createindustry:block/aluminum_pipes", + "4": "createindustry:block/aluminum_pump", + "particle": "createindustry:block/aluminum_pump" }, "elements": [ { diff --git a/src/main/resources/assets/createindustry/models/block/aluminum_mechanical_pump/item.json b/src/main/resources/assets/createindustry/models/block/aluminum_mechanical_pump/item.json index 161c4910..f0201f77 100644 --- a/src/main/resources/assets/createindustry/models/block/aluminum_mechanical_pump/item.json +++ b/src/main/resources/assets/createindustry/models/block/aluminum_mechanical_pump/item.json @@ -2,10 +2,10 @@ "credit": "Made with Blockbench", "parent": "create:block/block", "textures": { - "2": "create:block/pipes", - "4": "create:block/pump", + "2": "createindustry:block/aluminum_pipes", + "4": "createindustry:block/aluminum_pump", "5": "create:block/millstone", - "particle": "create:block/pump" + "particle": "createindustry:block/aluminum_pump" }, "elements": [ { diff --git a/src/main/resources/assets/createindustry/models/block/aluminum_smart_fluid_pipe/block.json b/src/main/resources/assets/createindustry/models/block/aluminum_smart_fluid_pipe/block.json index 1f674588..b2c12552 100644 --- a/src/main/resources/assets/createindustry/models/block/aluminum_smart_fluid_pipe/block.json +++ b/src/main/resources/assets/createindustry/models/block/aluminum_smart_fluid_pipe/block.json @@ -2,9 +2,9 @@ "credit": "Made with Blockbench", "parent": "block/block", "textures": { - "2": "create:block/smart_pipe_1", - "3": "create:block/smart_pipe_2", - "particle": "create:block/smart_pipe_2" + "2": "createindustry:block/aluminum_smart_pipe_1", + "3": "createindustry:block/aluminum_smart_pipe_2", + "particle": "createindustry:block/aluminum_smart_pipe_2" }, "elements": [ { diff --git a/src/main/resources/assets/createindustry/models/block/aluminum_smart_fluid_pipe/item.json b/src/main/resources/assets/createindustry/models/block/aluminum_smart_fluid_pipe/item.json index a3df689d..4d410eaa 100644 --- a/src/main/resources/assets/createindustry/models/block/aluminum_smart_fluid_pipe/item.json +++ b/src/main/resources/assets/createindustry/models/block/aluminum_smart_fluid_pipe/item.json @@ -2,9 +2,9 @@ "credit": "Made with Blockbench", "parent": "block/block", "textures": { - "1": "create:block/pipes", - "2": "create:block/smart_pipe_1", - "3": "create:block/smart_pipe_2" + "1": "createindustry:block/aluminum_pipes", + "2": "createindustry:block/aluminum_smart_pipe_1", + "3": "createindustry:block/aluminum_smart_pipe_2" }, "elements": [ { diff --git a/src/main/resources/assets/createindustry/models/block/blast_furnace_output/blast_furnace_output.json b/src/main/resources/assets/createindustry/models/block/blast_furnace_output/blast_furnace_output.json new file mode 100644 index 00000000..18e1eaf3 --- /dev/null +++ b/src/main/resources/assets/createindustry/models/block/blast_furnace_output/blast_furnace_output.json @@ -0,0 +1,22 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "createindustry:block/blast_furnace_output", + "1": "createindustry:block/fireproof_bricks", + "particle": "createindustry:block/blast_furnace_output" + }, + "elements": [ + { + "from": [0, 0, 0], + "to": [16, 16, 16], + "faces": { + "north": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "east": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "south": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "up": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#1"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#1"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/createindustry/models/block/blast_furnace_output/block.json b/src/main/resources/assets/createindustry/models/block/blast_furnace_output/block.json new file mode 100644 index 00000000..47d40962 --- /dev/null +++ b/src/main/resources/assets/createindustry/models/block/blast_furnace_output/block.json @@ -0,0 +1,23 @@ +{ + "credit": "Made with Blockbench", + "parent": "minecraft:block/block", + "textures": { + "0": "createindustry:block/blast_furnace_output", + "1": "createindustry:block/fireproof_bricks", + "particle": "createindustry:block/blast_furnace_output" + }, + "elements": [ + { + "from": [0, 0, 0], + "to": [16, 16, 16], + "faces": { + "north": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "east": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "south": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "down": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#1"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/createindustry/models/block/blast_furnace_output/item.json b/src/main/resources/assets/createindustry/models/block/blast_furnace_output/item.json new file mode 100644 index 00000000..6d0e87d7 --- /dev/null +++ b/src/main/resources/assets/createindustry/models/block/blast_furnace_output/item.json @@ -0,0 +1,23 @@ +{ + "credit": "Made with Blockbench", + "parent": "minecraft:block/block", + "textures": { + "0": "createindustry:block/blast_furnace_output", + "1": "createindustry:block/fireproof_bricks", + "particle": "createindustry:block/blast_furnace_output" + }, + "elements": [ + { + "from": [0, 0, -1], + "to": [16, 16, 15], + "faces": { + "north": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "east": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "south": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "down": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#1"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_bottom.json b/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_bottom.json deleted file mode 100644 index 6e1ed256..00000000 --- a/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_bottom.json +++ /dev/null @@ -1,74 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "0": "createindustry:block/brass_fluid_tank_top", - "1": "createindustry:block/brass_fluid_tank", - "4": "createindustry:block/brass_fluid_tank_inner", - "particle": "createindustry:block/fluid_tank" - }, - "elements": [ - { - "name": "Lid", - "from": [0, 0, 0], - "to": [16, 4, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]}, - "faces": { - "north": {"uv": [0, 12, 16, 16], "texture": "#1", "cullface": "north"}, - "east": {"uv": [0, 12, 16, 16], "texture": "#1", "cullface": "east"}, - "south": {"uv": [0, 12, 16, 16], "texture": "#1", "cullface": "south"}, - "west": {"uv": [0, 12, 16, 16], "texture": "#1", "cullface": "west"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#4"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "down"} - } - }, - { - "name": "SideRight", - "from": [0, 4, 0], - "to": [16, 16, 1], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, -23]}, - "faces": { - "north": {"uv": [0, 0, 16, 12], "texture": "#1", "cullface": "north"}, - "south": {"uv": [0, 0, 16, 12], "texture": "#1", "cullface": "north"} - } - }, - { - "name": "SideRight", - "from": [15, 4, 0], - "to": [16, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]}, - "faces": { - "east": {"uv": [0, 0, 16, 12], "texture": "#1", "cullface": "east"}, - "west": {"uv": [0, 0, 16, 12], "texture": "#1", "cullface": "east"} - } - }, - { - "name": "SideRight", - "from": [0, 4, 15], - "to": [16, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]}, - "faces": { - "north": {"uv": [0, 0, 16, 12], "texture": "#1", "cullface": "south"}, - "south": {"uv": [0, 0, 16, 12], "texture": "#1", "cullface": "south"} - } - }, - { - "name": "SideRight", - "from": [0, 4, 0], - "to": [1, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]}, - "faces": { - "east": {"uv": [0, 0, 16, 12], "texture": "#1", "cullface": "west"}, - "west": {"uv": [0, 0, 16, 12], "texture": "#1", "cullface": "west"} - } - } - ], - "groups": [ - { - "name": "tank", - "origin": [8, 8, -23], - "color": 0, - "children": [0, 1, 2, 3, 4] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_bottom_window.json b/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_bottom_window.json deleted file mode 100644 index cb629ef5..00000000 --- a/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_bottom_window.json +++ /dev/null @@ -1,154 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "0": "createindustry:block/brass_fluid_tank_top", - "1": "createindustry:block/brass_fluid_tank", - "3": "createindustry:block/brass_fluid_tank_window", - "4": "createindustry:block/brass_fluid_tank_inner", - "particle": "createindustry:block/brass_fluid_tank" - }, - "elements": [ - { - "name": "SideRight", - "from": [0, 4, 0], - "to": [4, 16, 1], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]}, - "faces": { - "north": {"uv": [12, 0, 16, 12], "texture": "#1", "cullface": "north"}, - "east": {"uv": [0, 0, 1, 12], "texture": "#1", "cullface": "north"}, - "south": {"uv": [0, 0, 4, 12], "texture": "#1", "cullface": "north"} - } - }, - { - "name": "SideRight", - "from": [15, 4, 0], - "to": [16, 16, 4], - "faces": { - "east": {"uv": [12, 0, 16, 12], "texture": "#1", "cullface": "east"}, - "south": {"uv": [0, 0, 1, 12], "texture": "#1", "cullface": "east"}, - "west": {"uv": [0, 0, 4, 12], "texture": "#1", "cullface": "east"} - } - }, - { - "name": "SideRight", - "from": [12, 4, 15], - "to": [16, 16, 16], - "faces": { - "north": {"uv": [0, 0, 4, 12], "texture": "#1", "cullface": "south"}, - "south": {"uv": [12, 0, 16, 12], "texture": "#1", "cullface": "south"}, - "west": {"uv": [0, 0, 1, 12], "texture": "#1", "cullface": "south"} - } - }, - { - "name": "SideRight", - "from": [0, 4, 12], - "to": [1, 16, 16], - "faces": { - "north": {"uv": [0, 0, 1, 12], "texture": "#1", "cullface": "west"}, - "east": {"uv": [0, 0, 4, 12], "texture": "#1", "cullface": "west"}, - "west": {"uv": [12, 0, 16, 12], "texture": "#1", "cullface": "west"} - } - }, - { - "name": "Window", - "from": [4, 4, 0.95], - "to": [12, 16, 0.95], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]}, - "faces": { - "north": {"uv": [0, 4, 8, 16], "texture": "#3", "cullface": "north"}, - "south": {"uv": [0, 4, 8, 16], "texture": "#3", "cullface": "north"} - } - }, - { - "name": "Window", - "from": [15.05, 4, 4], - "to": [15.05, 16, 12], - "faces": { - "east": {"uv": [0, 4, 8, 16], "texture": "#3", "cullface": "east"}, - "west": {"uv": [0, 4, 8, 16], "texture": "#3", "cullface": "east"} - } - }, - { - "name": "Window", - "from": [4, 4, 15.05], - "to": [12, 16, 15.05], - "faces": { - "north": {"uv": [0, 4, 8, 16], "texture": "#3", "cullface": "south"}, - "south": {"uv": [0, 4, 8, 16], "texture": "#3", "cullface": "south"} - } - }, - { - "name": "Window", - "from": [0.95, 4, 4], - "to": [0.95, 16, 12], - "faces": { - "east": {"uv": [0, 4, 8, 16], "texture": "#3", "cullface": "west"}, - "west": {"uv": [0, 4, 8, 16], "texture": "#3", "cullface": "west"} - } - }, - { - "name": "SideLeft", - "from": [12, 4, 0], - "to": [16, 16, 1], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]}, - "faces": { - "north": {"uv": [0, 0, 4, 12], "texture": "#1", "cullface": "north"}, - "south": {"uv": [12, 0, 16, 12], "texture": "#1", "cullface": "north"}, - "west": {"uv": [15, 0, 16, 12], "texture": "#1", "cullface": "north"} - } - }, - { - "name": "SideLeft", - "from": [15, 4, 12], - "to": [16, 16, 16], - "faces": { - "north": {"uv": [15, 0, 16, 12], "texture": "#1", "cullface": "east"}, - "east": {"uv": [0, 0, 4, 12], "texture": "#1", "cullface": "east"}, - "west": {"uv": [12, 0, 16, 12], "texture": "#1", "cullface": "east"} - } - }, - { - "name": "SideLeft", - "from": [0, 4, 15], - "to": [4, 16, 16], - "faces": { - "north": {"uv": [12, 0, 16, 12], "texture": "#1", "cullface": "south"}, - "east": {"uv": [15, 0, 16, 12], "texture": "#1", "cullface": "south"}, - "south": {"uv": [0, 0, 4, 12], "texture": "#1", "cullface": "south"} - } - }, - { - "name": "SideLeft", - "from": [0, 4, 0], - "to": [1, 16, 4], - "faces": { - "east": {"uv": [12, 0, 16, 12], "texture": "#1", "cullface": "west"}, - "south": {"uv": [15, 0, 16, 12], "texture": "#1", "cullface": "west"}, - "west": {"uv": [0, 0, 4, 12], "texture": "#1", "cullface": "west"} - } - }, - { - "name": "Bottom", - "from": [0, 0, 0], - "to": [16, 4, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]}, - "faces": { - "north": {"uv": [0, 12, 16, 16], "texture": "#1", "cullface": "north"}, - "east": {"uv": [0, 12, 16, 16], "texture": "#1", "cullface": "east"}, - "south": {"uv": [0, 12, 16, 16], "texture": "#1", "cullface": "south"}, - "west": {"uv": [0, 12, 16, 16], "texture": "#1", "cullface": "west"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#4"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "down"} - } - } - ], - "groups": [ - { - "name": "tank", - "origin": [8, 8, -23], - "color": 0, - "children": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_bottom_window_ne.json b/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_bottom_window_ne.json deleted file mode 100644 index 2ee1e66b..00000000 --- a/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_bottom_window_ne.json +++ /dev/null @@ -1,73 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "0": "createindustry:block/brass_fluid_tank_top", - "1": "createindustry:block/brass_fluid_tank", - "3": "createindustry:block/brass_fluid_tank_window", - "4": "createindustry:block/brass_fluid_tank_inner", - "particle": "createindustry:block/brass_fluid_tank" - }, - "elements": [ - { - "name": "SideRight", - "from": [15, 4, 0], - "to": [16, 16, 12], - "faces": { - "east": {"uv": [4, 0, 16, 12], "texture": "#1"}, - "south": {"uv": [4, 0, 5, 12], "texture": "#1"}, - "west": {"uv": [0, 0, 12, 12], "texture": "#1"} - } - }, - { - "name": "Window", - "from": [0, 4, 0.95], - "to": [4, 16, 0.95], - "faces": { - "north": {"uv": [0, 4, 4, 16], "texture": "#3"}, - "south": {"uv": [4, 4, 8, 16], "texture": "#3"} - } - }, - { - "name": "Window", - "from": [15.05, 4, 12], - "to": [15.05, 16, 16], - "faces": { - "east": {"uv": [4, 4, 8, 16], "texture": "#3"}, - "west": {"uv": [0, 4, 4, 16], "texture": "#3"} - } - }, - { - "name": "SideLeft", - "from": [4, 4, 0], - "to": [16, 16, 1], - "faces": { - "north": {"uv": [0, 0, 12, 12], "texture": "#1"}, - "south": {"uv": [4, 0, 16, 12], "texture": "#1"}, - "west": {"uv": [11, 0, 12, 12], "texture": "#1"} - } - }, - { - "name": "Bottom", - "from": [0, 0, 0], - "to": [16, 4, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [-23, 8, 8]}, - "faces": { - "north": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "east": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "south": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "west": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#4"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "down"} - } - } - ], - "groups": [ - { - "name": "tank", - "origin": [8, 8, -23], - "color": 0, - "children": [0, 1, 2, 3, 4] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_bottom_window_nw.json b/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_bottom_window_nw.json deleted file mode 100644 index 86181c66..00000000 --- a/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_bottom_window_nw.json +++ /dev/null @@ -1,73 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "0": "createindustry:block/brass_fluid_tank_top", - "1": "createindustry:block/brass_fluid_tank", - "3": "createindustry:block/brass_fluid_tank_window", - "4": "createindustry:block/brass_fluid_tank_inner", - "particle": "createindustry:block/brass_fluid_tank" - }, - "elements": [ - { - "name": "SideRight", - "from": [0, 4, 0], - "to": [12, 16, 1], - "faces": { - "north": {"uv": [4, 0, 16, 12], "texture": "#1"}, - "east": {"uv": [4, 0, 5, 12], "texture": "#1"}, - "south": {"uv": [0, 0, 12, 12], "texture": "#1"} - } - }, - { - "name": "Window", - "from": [0.95, 4, 12], - "to": [0.95, 16, 16], - "faces": { - "east": {"uv": [4, 4, 8, 16], "texture": "#3"}, - "west": {"uv": [0, 4, 4, 16], "texture": "#3"} - } - }, - { - "name": "Window", - "from": [12, 4, 0.95], - "to": [16, 16, 0.95], - "faces": { - "north": {"uv": [4, 4, 8, 16], "texture": "#3"}, - "south": {"uv": [0, 4, 4, 16], "texture": "#3"} - } - }, - { - "name": "SideLeft", - "from": [0, 4, 0], - "to": [1, 16, 12], - "faces": { - "east": {"uv": [4, 0, 16, 12], "texture": "#1"}, - "south": {"uv": [11, 0, 12, 12], "texture": "#1"}, - "west": {"uv": [0, 0, 12, 12], "texture": "#1"} - } - }, - { - "name": "Bottom", - "from": [0, 0, 0], - "to": [16, 4, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 39]}, - "faces": { - "north": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "east": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "south": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "west": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#4"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "down"} - } - } - ], - "groups": [ - { - "name": "tank", - "origin": [8, 8, -23], - "color": 0, - "children": [0, 1, 2, 3, 4] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_bottom_window_se.json b/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_bottom_window_se.json deleted file mode 100644 index 33da5a76..00000000 --- a/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_bottom_window_se.json +++ /dev/null @@ -1,73 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "0": "createindustry:block/brass_fluid_tank_top", - "1": "createindustry:block/brass_fluid_tank", - "3": "createindustry:block/brass_fluid_tank_window", - "4": "createindustry:block/brass_fluid_tank_inner", - "particle": "createindustry:block/brass_fluid_tank" - }, - "elements": [ - { - "name": "SideRight", - "from": [4, 4, 15], - "to": [16, 16, 16], - "faces": { - "north": {"uv": [0, 0, 12, 12], "texture": "#1"}, - "south": {"uv": [4, 0, 16, 12], "texture": "#1"}, - "west": {"uv": [4, 0, 5, 12], "texture": "#1"} - } - }, - { - "name": "Window", - "from": [15.05, 4, 0], - "to": [15.05, 16, 4], - "faces": { - "east": {"uv": [0, 4, 4, 16], "texture": "#3"}, - "west": {"uv": [4, 4, 8, 16], "texture": "#3"} - } - }, - { - "name": "Window", - "from": [0, 4, 15.05], - "to": [4, 16, 15.05], - "faces": { - "north": {"uv": [0, 4, 4, 16], "texture": "#3"}, - "south": {"uv": [4, 4, 8, 16], "texture": "#3"} - } - }, - { - "name": "SideLeft", - "from": [15, 4, 4], - "to": [16, 16, 16], - "faces": { - "north": {"uv": [11, 0, 12, 12], "texture": "#1"}, - "east": {"uv": [0, 0, 12, 12], "texture": "#1"}, - "west": {"uv": [4, 0, 16, 12], "texture": "#1"} - } - }, - { - "name": "Bottom", - "from": [0, 0, 0], - "to": [16, 4, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]}, - "faces": { - "north": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "east": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "south": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "west": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#4"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "down"} - } - } - ], - "groups": [ - { - "name": "tank", - "origin": [8, 8, -23], - "color": 0, - "children": [0, 1, 2, 3, 4] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_bottom_window_sw.json b/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_bottom_window_sw.json deleted file mode 100644 index 128dc3af..00000000 --- a/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_bottom_window_sw.json +++ /dev/null @@ -1,73 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "0": "createindustry:block/brass_fluid_tank_top", - "1": "createindustry:block/brass_fluid_tank", - "3": "createindustry:block/brass_fluid_tank_window", - "4": "createindustry:block/brass_fluid_tank_inner", - "particle": "createindustry:block/brass_fluid_tank" - }, - "elements": [ - { - "name": "SideRight", - "from": [0, 4, 4], - "to": [1, 16, 16], - "faces": { - "north": {"uv": [4, 0, 5, 12], "texture": "#1"}, - "east": {"uv": [0, 0, 12, 12], "texture": "#1"}, - "west": {"uv": [4, 0, 16, 12], "texture": "#1"} - } - }, - { - "name": "Window", - "from": [12, 4, 15.05], - "to": [16, 16, 15.05], - "faces": { - "north": {"uv": [4, 4, 8, 16], "texture": "#3"}, - "south": {"uv": [0, 4, 4, 16], "texture": "#3"} - } - }, - { - "name": "Window", - "from": [0.95, 4, 0], - "to": [0.95, 16, 4], - "faces": { - "east": {"uv": [0, 4, 4, 16], "texture": "#3"}, - "west": {"uv": [4, 4, 8, 16], "texture": "#3"} - } - }, - { - "name": "SideLeft", - "from": [0, 4, 15], - "to": [12, 16, 16], - "faces": { - "north": {"uv": [4, 0, 16, 12], "texture": "#1"}, - "east": {"uv": [11, 0, 12, 12], "texture": "#1"}, - "south": {"uv": [0, 0, 12, 12], "texture": "#1"} - } - }, - { - "name": "Bottom", - "from": [0, 0, 0], - "to": [16, 4, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [39, 8, 8]}, - "faces": { - "north": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "east": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "south": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "west": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#4"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "down"} - } - } - ], - "groups": [ - { - "name": "tank", - "origin": [8, 8, -23], - "color": 0, - "children": [0, 1, 2, 3, 4] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_middle.json b/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_middle.json deleted file mode 100644 index 5bfd2529..00000000 --- a/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_middle.json +++ /dev/null @@ -1,57 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "1": "createindustry:block/brass_fluid_tank", - "particle": "createindustry:block/brass_fluid_tank" - }, - "elements": [ - { - "name": "SideRight", - "from": [0, 0, 0], - "to": [16, 16, 1], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, -23]}, - "faces": { - "north": {"uv": [0, 0, 16, 16], "texture": "#1", "cullface": "north"}, - "south": {"uv": [0, 0, 16, 16], "texture": "#1", "cullface": "north"} - } - }, - { - "name": "SideRight", - "from": [15, 0, 0], - "to": [16, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]}, - "faces": { - "east": {"uv": [0, 0, 16, 16], "texture": "#1", "cullface": "east"}, - "west": {"uv": [0, 0, 16, 16], "texture": "#1", "cullface": "east"} - } - }, - { - "name": "SideRight", - "from": [0, 0, 15], - "to": [16, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]}, - "faces": { - "north": {"uv": [0, 0, 16, 16], "texture": "#1", "cullface": "south"}, - "south": {"uv": [0, 0, 16, 16], "texture": "#1", "cullface": "south"} - } - }, - { - "name": "SideRight", - "from": [0, 0, 0], - "to": [1, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]}, - "faces": { - "east": {"uv": [0, 0, 16, 16], "texture": "#1", "cullface": "west"}, - "west": {"uv": [0, 0, 16, 16], "texture": "#1", "cullface": "west"} - } - } - ], - "groups": [ - { - "name": "tank", - "origin": [8, 8, -23], - "children": [0, 1, 2, 3] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_middle_window.json b/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_middle_window.json deleted file mode 100644 index e7baa967..00000000 --- a/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_middle_window.json +++ /dev/null @@ -1,138 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "1": "createindustry:block/brass_fluid_tank", - "3": "createindustry:block/fluid_tank_window", - "particle": "createindustry:block/fluid_tank" - }, - "elements": [ - { - "name": "SideRight", - "from": [0, 0, 0], - "to": [4, 16, 1], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]}, - "faces": { - "north": {"uv": [12, 0, 16, 16], "texture": "#1", "cullface": "north"}, - "east": {"uv": [0, 0, 1, 16], "texture": "#1", "cullface": "north"}, - "south": {"uv": [0, 0, 4, 16], "texture": "#1", "cullface": "north"} - } - }, - { - "name": "SideRight", - "from": [15, 0, 0], - "to": [16, 16, 4], - "faces": { - "east": {"uv": [12, 0, 16, 16], "texture": "#1", "cullface": "east"}, - "south": {"uv": [0, 0, 1, 16], "texture": "#1", "cullface": "east"}, - "west": {"uv": [0, 0, 4, 16], "texture": "#1", "cullface": "east"} - } - }, - { - "name": "SideRight", - "from": [12, 0, 15], - "to": [16, 16, 16], - "faces": { - "north": {"uv": [0, 0, 4, 16], "texture": "#1", "cullface": "south"}, - "south": {"uv": [12, 0, 16, 16], "texture": "#1", "cullface": "south"}, - "west": {"uv": [0, 0, 1, 16], "texture": "#1", "cullface": "south"} - } - }, - { - "name": "SideRight", - "from": [0, 0, 12], - "to": [1, 16, 16], - "faces": { - "north": {"uv": [0, 0, 1, 16], "texture": "#1", "cullface": "west"}, - "east": {"uv": [0, 0, 4, 16], "texture": "#1", "cullface": "west"}, - "west": {"uv": [12, 0, 16, 16], "texture": "#1", "cullface": "west"} - } - }, - { - "name": "Window", - "from": [4, 0, 0.95], - "to": [12, 16, 0.95], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]}, - "faces": { - "north": {"uv": [8, 0, 16, 16], "texture": "#3", "cullface": "north"}, - "south": {"uv": [8, 0, 16, 16], "texture": "#3", "cullface": "north"} - } - }, - { - "name": "Window", - "from": [15.05, 0, 4], - "to": [15.05, 16, 12], - "faces": { - "east": {"uv": [8, 0, 16, 16], "texture": "#3", "cullface": "east"}, - "west": {"uv": [8, 0, 16, 16], "texture": "#3", "cullface": "east"} - } - }, - { - "name": "Window", - "from": [4, 0, 15.05], - "to": [12, 16, 15.05], - "faces": { - "north": {"uv": [8, 0, 16, 16], "texture": "#3", "cullface": "south"}, - "south": {"uv": [8, 0, 16, 16], "texture": "#3", "cullface": "south"} - } - }, - { - "name": "Window", - "from": [0.95, 0, 4], - "to": [0.95, 16, 12], - "faces": { - "east": {"uv": [8, 0, 16, 16], "texture": "#3", "cullface": "west"}, - "west": {"uv": [8, 0, 16, 16], "texture": "#3", "cullface": "west"} - } - }, - { - "name": "SideLeft", - "from": [12, 0, 0], - "to": [16, 16, 1], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]}, - "faces": { - "north": {"uv": [0, 0, 4, 16], "texture": "#1", "cullface": "north"}, - "south": {"uv": [12, 0, 16, 16], "texture": "#1", "cullface": "north"}, - "west": {"uv": [15, 0, 16, 16], "texture": "#1", "cullface": "north"} - } - }, - { - "name": "SideLeft", - "from": [15, 0, 12], - "to": [16, 16, 16], - "faces": { - "north": {"uv": [15, 0, 16, 16], "texture": "#1", "cullface": "east"}, - "east": {"uv": [0, 0, 4, 16], "texture": "#1", "cullface": "east"}, - "west": {"uv": [12, 0, 16, 16], "texture": "#1", "cullface": "east"} - } - }, - { - "name": "SideLeft", - "from": [0, 0, 15], - "to": [4, 16, 16], - "faces": { - "north": {"uv": [12, 0, 16, 16], "texture": "#1", "cullface": "south"}, - "east": {"uv": [15, 0, 16, 16], "texture": "#1", "cullface": "south"}, - "south": {"uv": [0, 0, 4, 16], "texture": "#1", "cullface": "south"} - } - }, - { - "name": "SideLeft", - "from": [0, 0, 0], - "to": [1, 16, 4], - "faces": { - "east": {"uv": [12, 0, 16, 16], "texture": "#1", "cullface": "west"}, - "south": {"uv": [15, 0, 16, 16], "texture": "#1", "cullface": "west"}, - "west": {"uv": [0, 0, 4, 16], "texture": "#1", "cullface": "west"} - } - } - ], - "groups": [ - { - "name": "tank", - "origin": [8, 8, -23], - "color": 0, - "children": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_middle_window_ne.json b/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_middle_window_ne.json deleted file mode 100644 index 2472b16e..00000000 --- a/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_middle_window_ne.json +++ /dev/null @@ -1,57 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "1": "createindustry:block/brass_fluid_tank", - "3": "createindustry:block/brass_fluid_tank_window", - "particle": "createindustry:block/brass_fluid_tank" - }, - "elements": [ - { - "name": "SideRight", - "from": [15, 0, 0], - "to": [16, 16, 12], - "faces": { - "east": {"uv": [4, 0, 16, 16], "texture": "#1"}, - "south": {"uv": [4, 0, 5, 16], "texture": "#1"}, - "west": {"uv": [0, 0, 12, 16], "texture": "#1"} - } - }, - { - "name": "Window", - "from": [0, 0, 0.95], - "to": [4, 16, 0.95], - "faces": { - "north": {"uv": [8, 0, 12, 16], "texture": "#3"}, - "south": {"uv": [12, 0, 16, 16], "texture": "#3"} - } - }, - { - "name": "Window", - "from": [15.05, 0, 12], - "to": [15.05, 16, 16], - "faces": { - "east": {"uv": [12, 0, 16, 16], "texture": "#3"}, - "west": {"uv": [8, 0, 12, 16], "texture": "#3"} - } - }, - { - "name": "SideLeft", - "from": [4, 0, 0], - "to": [16, 16, 1], - "faces": { - "north": {"uv": [0, 0, 12, 16], "texture": "#1"}, - "south": {"uv": [4, 0, 16, 16], "texture": "#1"}, - "west": {"uv": [11, 0, 12, 16], "texture": "#1"} - } - } - ], - "groups": [ - { - "name": "tank", - "origin": [8, 8, -23], - "color": 0, - "children": [0, 1, 2, 3] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_middle_window_nw.json b/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_middle_window_nw.json deleted file mode 100644 index af2da161..00000000 --- a/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_middle_window_nw.json +++ /dev/null @@ -1,57 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "1": "createindustry:block/brass_fluid_tank", - "3": "createindustry:block/brass_fluid_tank_window", - "particle": "createindustry:block/brass_fluid_tank" - }, - "elements": [ - { - "name": "SideRight", - "from": [0, 0, 0], - "to": [12, 16, 1], - "faces": { - "north": {"uv": [4, 0, 16, 16], "texture": "#1"}, - "east": {"uv": [4, 0, 5, 16], "texture": "#1"}, - "south": {"uv": [0, 0, 12, 16], "texture": "#1"} - } - }, - { - "name": "Window", - "from": [0.95, 0, 12], - "to": [0.95, 16, 16], - "faces": { - "east": {"uv": [12, 0, 16, 16], "texture": "#3"}, - "west": {"uv": [8, 0, 12, 16], "texture": "#3"} - } - }, - { - "name": "Window", - "from": [12, 0, 0.95], - "to": [16, 16, 0.95], - "faces": { - "north": {"uv": [12, 0, 16, 16], "texture": "#3"}, - "south": {"uv": [8, 0, 12, 16], "texture": "#3"} - } - }, - { - "name": "SideLeft", - "from": [0, 0, 0], - "to": [1, 16, 12], - "faces": { - "east": {"uv": [4, 0, 16, 16], "texture": "#1"}, - "south": {"uv": [11, 0, 12, 16], "texture": "#1"}, - "west": {"uv": [0, 0, 12, 16], "texture": "#1"} - } - } - ], - "groups": [ - { - "name": "tank", - "origin": [8, 8, -23], - "color": 0, - "children": [0, 1, 2, 3] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_middle_window_se.json b/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_middle_window_se.json deleted file mode 100644 index 4e0d8abd..00000000 --- a/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_middle_window_se.json +++ /dev/null @@ -1,57 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "1": "createindustry:block/brass_fluid_tank", - "3": "createindustry:block/brass_fluid_tank_window", - "particle": "createindustry:block/brass_fluid_tank" - }, - "elements": [ - { - "name": "SideRight", - "from": [4, 0, 15], - "to": [16, 16, 16], - "faces": { - "north": {"uv": [0, 0, 12, 16], "texture": "#1"}, - "south": {"uv": [4, 0, 16, 16], "texture": "#1"}, - "west": {"uv": [4, 0, 5, 16], "texture": "#1"} - } - }, - { - "name": "Window", - "from": [15.05, 0, 0], - "to": [15.05, 16, 4], - "faces": { - "east": {"uv": [8, 0, 12, 16], "texture": "#3"}, - "west": {"uv": [12, 0, 16, 16], "texture": "#3"} - } - }, - { - "name": "Window", - "from": [0, 0, 15.05], - "to": [4, 16, 15.05], - "faces": { - "north": {"uv": [8, 0, 12, 16], "texture": "#3"}, - "south": {"uv": [12, 0, 16, 16], "texture": "#3"} - } - }, - { - "name": "SideLeft", - "from": [15, 0, 4], - "to": [16, 16, 16], - "faces": { - "north": {"uv": [11, 0, 12, 16], "texture": "#1"}, - "east": {"uv": [0, 0, 12, 16], "texture": "#1"}, - "west": {"uv": [4, 0, 16, 16], "texture": "#1"} - } - } - ], - "groups": [ - { - "name": "tank", - "origin": [8, 8, -23], - "color": 0, - "children": [0, 1, 2, 3] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_middle_window_sw.json b/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_middle_window_sw.json deleted file mode 100644 index fa1bfe8a..00000000 --- a/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_middle_window_sw.json +++ /dev/null @@ -1,57 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "1": "createindustry:block/brass_fluid_tank", - "3": "createindustry:block/brass_fluid_tank_window", - "particle": "createindustry:block/brass_fluid_tank" - }, - "elements": [ - { - "name": "SideRight", - "from": [0, 0, 4], - "to": [1, 16, 16], - "faces": { - "north": {"uv": [4, 0, 5, 16], "texture": "#1"}, - "east": {"uv": [0, 0, 12, 16], "texture": "#1"}, - "west": {"uv": [4, 0, 16, 16], "texture": "#1"} - } - }, - { - "name": "Window", - "from": [12, 0, 15.05], - "to": [16, 16, 15.05], - "faces": { - "north": {"uv": [12, 0, 16, 16], "texture": "#3"}, - "south": {"uv": [8, 0, 12, 16], "texture": "#3"} - } - }, - { - "name": "Window", - "from": [0.95, 0, 0], - "to": [0.95, 16, 4], - "faces": { - "east": {"uv": [8, 0, 12, 16], "texture": "#3"}, - "west": {"uv": [12, 0, 16, 16], "texture": "#3"} - } - }, - { - "name": "SideLeft", - "from": [0, 0, 15], - "to": [12, 16, 16], - "faces": { - "north": {"uv": [4, 0, 16, 16], "texture": "#1"}, - "east": {"uv": [11, 0, 12, 16], "texture": "#1"}, - "south": {"uv": [0, 0, 12, 16], "texture": "#1"} - } - } - ], - "groups": [ - { - "name": "tank", - "origin": [8, 8, -23], - "color": 0, - "children": [0, 1, 2, 3] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_single.json b/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_single.json deleted file mode 100644 index 99dafa73..00000000 --- a/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_single.json +++ /dev/null @@ -1,127 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "0": "createindustry:block/brass_fluid_tank_top", - "1": "createindustry:block/brass_fluid_tank", - "4": "createindustry:block/brass_fluid_tank_inner", - "particle": "createindustry:block/brass_fluid_tank" - }, - "elements": [ - { - "name": "Lid", - "from": [0, 0, 0], - "to": [16, 4, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]}, - "faces": { - "north": {"uv": [0, 12, 16, 16], "texture": "#1", "cullface": "north"}, - "east": {"uv": [0, 12, 16, 16], "texture": "#1", "cullface": "east"}, - "south": {"uv": [0, 12, 16, 16], "texture": "#1", "cullface": "south"}, - "west": {"uv": [0, 12, 16, 16], "texture": "#1", "cullface": "west"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#4"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "down"} - } - }, - { - "name": "SideRight", - "from": [15, 4, 0], - "to": [16, 12, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]}, - "faces": { - "east": {"uv": [0, 4, 16, 12], "texture": "#1", "cullface": "east"}, - "west": {"uv": [0, 4, 16, 12], "texture": "#1", "cullface": "east"} - } - }, - { - "name": "SideRight", - "from": [0, 4, 15], - "to": [16, 12, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]}, - "faces": { - "north": {"uv": [0, 4, 16, 12], "texture": "#1", "cullface": "south"}, - "south": {"uv": [0, 4, 16, 12], "texture": "#1", "cullface": "south"} - } - }, - { - "name": "SideRight", - "from": [0, 4, 0], - "to": [1, 12, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]}, - "faces": { - "east": {"uv": [0, 4, 16, 12], "texture": "#1", "cullface": "west"}, - "west": {"uv": [0, 4, 16, 12], "texture": "#1", "cullface": "west"} - } - }, - { - "name": "Lid", - "from": [0, 12, 0], - "to": [16, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]}, - "faces": { - "north": {"uv": [0, 0, 16, 4], "texture": "#1", "cullface": "north"}, - "east": {"uv": [0, 0, 16, 4], "texture": "#1", "cullface": "east"}, - "south": {"uv": [0, 0, 16, 4], "texture": "#1", "cullface": "south"}, - "west": {"uv": [0, 0, 16, 4], "texture": "#1", "cullface": "west"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "up"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#4"} - } - }, - { - "name": "SideRight", - "from": [0, 4, 0], - "to": [16, 12, 1], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]}, - "faces": { - "north": {"uv": [0, 4, 16, 12], "texture": "#1", "cullface": "north"}, - "south": {"uv": [0, 4, 16, 12], "texture": "#1", "cullface": "north"} - } - } - ], - "groups": [ - { - "name": "tank", - "origin": [8, 8, -23], - "color": 0, - "children": [] - }, - { - "name": "block_middle", - "origin": [8, 8, 8], - "color": 0, - "children": [ - { - "name": "tank", - "origin": [8, 8, -23], - "color": 0, - "children": [] - } - ] - }, - { - "name": "block_bottom", - "origin": [8, 8, 8], - "color": 0, - "children": [ - { - "name": "tank", - "origin": [8, 8, -23], - "color": 0, - "children": [0, 1, 2, 3] - } - ] - }, - { - "name": "block_top", - "origin": [8, 8, 8], - "color": 0, - "children": [ - { - "name": "tank", - "origin": [8, 8, -23], - "color": 0, - "children": [4, 5] - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_single_window.json b/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_single_window.json deleted file mode 100644 index e643ba90..00000000 --- a/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_single_window.json +++ /dev/null @@ -1,168 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "0": "createindustry:block/brass_fluid_tank_top", - "1": "createindustry:block/brass_fluid_tank", - "4": "createindustry:block/brass_fluid_tank_inner", - "5": "createindustry:block/brass_fluid_tank_window_single", - "particle": "createindustry:block/brass_fluid_tank" - }, - "elements": [ - { - "name": "Lid", - "from": [0, 12, 0], - "to": [16, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]}, - "faces": { - "north": {"uv": [0, 0, 16, 4], "texture": "#1", "cullface": "north"}, - "east": {"uv": [0, 0, 16, 4], "texture": "#1", "cullface": "east"}, - "south": {"uv": [0, 0, 16, 4], "texture": "#1", "cullface": "south"}, - "west": {"uv": [0, 0, 16, 4], "texture": "#1", "cullface": "west"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "up"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#4"} - } - }, - { - "name": "SideRight", - "from": [0, 4, 0], - "to": [4, 12, 1], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]}, - "faces": { - "north": {"uv": [12, 4, 16, 12], "texture": "#1", "cullface": "north"}, - "east": {"uv": [8, 4, 9, 12], "texture": "#1", "cullface": "north"}, - "south": {"uv": [0, 4, 4, 12], "texture": "#1", "cullface": "north"} - } - }, - { - "name": "SideRight", - "from": [15, 4, 0], - "to": [16, 12, 4], - "faces": { - "east": {"uv": [12, 4, 16, 12], "texture": "#1", "cullface": "east"}, - "south": {"uv": [8, 4, 9, 12], "texture": "#1", "cullface": "east"}, - "west": {"uv": [0, 4, 4, 12], "texture": "#1", "cullface": "east"} - } - }, - { - "name": "SideRight", - "from": [12, 4, 15], - "to": [16, 12, 16], - "faces": { - "north": {"uv": [0, 4, 4, 12], "texture": "#1", "cullface": "south"}, - "south": {"uv": [12, 4, 16, 12], "texture": "#1", "cullface": "south"}, - "west": {"uv": [8, 4, 9, 12], "texture": "#1", "cullface": "south"} - } - }, - { - "name": "SideRight", - "from": [0, 4, 12], - "to": [1, 12, 16], - "faces": { - "north": {"uv": [8, 4, 9, 12], "texture": "#1", "cullface": "west"}, - "east": {"uv": [0, 4, 4, 12], "texture": "#1", "cullface": "west"}, - "west": {"uv": [12, 4, 16, 12], "texture": "#1", "cullface": "west"} - } - }, - { - "name": "Window", - "from": [4, 4, 0.95], - "to": [12, 12, 0.95], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]}, - "faces": { - "north": {"uv": [0, 0, 8, 8], "texture": "#5", "cullface": "north"}, - "south": {"uv": [0, 0, 8, 8], "texture": "#5", "cullface": "north"} - } - }, - { - "name": "Window", - "from": [15.05, 4, 4], - "to": [15.05, 12, 12], - "faces": { - "east": {"uv": [0, 0, 8, 8], "texture": "#5", "cullface": "east"}, - "west": {"uv": [0, 0, 8, 8], "texture": "#5", "cullface": "east"} - } - }, - { - "name": "Window", - "from": [4, 4, 15.05], - "to": [12, 12, 15.05], - "faces": { - "north": {"uv": [0, 0, 8, 8], "texture": "#5", "cullface": "south"}, - "south": {"uv": [0, 0, 8, 8], "texture": "#5", "cullface": "south"} - } - }, - { - "name": "Window", - "from": [0.95, 4, 4], - "to": [0.95, 12, 12], - "faces": { - "east": {"uv": [0, 0, 8, 8], "texture": "#5", "cullface": "west"}, - "west": {"uv": [0, 0, 8, 8], "texture": "#5", "cullface": "west"} - } - }, - { - "name": "SideLeft", - "from": [12, 4, 0], - "to": [16, 12, 1], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]}, - "faces": { - "north": {"uv": [0, 4, 4, 12], "texture": "#1", "cullface": "north"}, - "south": {"uv": [12, 4, 16, 12], "texture": "#1", "cullface": "north"}, - "west": {"uv": [7, 4, 8, 12], "texture": "#1", "cullface": "north"} - } - }, - { - "name": "SideLeft", - "from": [15, 4, 12], - "to": [16, 12, 16], - "faces": { - "north": {"uv": [7, 4, 8, 12], "texture": "#1", "cullface": "east"}, - "east": {"uv": [0, 4, 4, 12], "texture": "#1", "cullface": "east"}, - "west": {"uv": [12, 4, 16, 12], "texture": "#1", "cullface": "east"} - } - }, - { - "name": "SideLeft", - "from": [0, 4, 15], - "to": [4, 12, 16], - "faces": { - "north": {"uv": [12, 4, 16, 12], "texture": "#1", "cullface": "south"}, - "east": {"uv": [7, 4, 8, 12], "texture": "#1", "cullface": "south"}, - "south": {"uv": [0, 4, 4, 12], "texture": "#1", "cullface": "south"} - } - }, - { - "name": "SideLeft", - "from": [0, 4, 0], - "to": [1, 12, 4], - "faces": { - "east": {"uv": [12, 4, 16, 12], "texture": "#1", "cullface": "west"}, - "south": {"uv": [7, 4, 8, 12], "texture": "#1", "cullface": "west"}, - "west": {"uv": [0, 4, 4, 12], "texture": "#1", "cullface": "west"} - } - }, - { - "name": "Bottom", - "from": [0, 0, 0], - "to": [16, 4, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]}, - "faces": { - "north": {"uv": [0, 12, 16, 16], "texture": "#1", "cullface": "north"}, - "east": {"uv": [0, 12, 16, 16], "texture": "#1", "cullface": "east"}, - "south": {"uv": [0, 12, 16, 16], "texture": "#1", "cullface": "south"}, - "west": {"uv": [0, 12, 16, 16], "texture": "#1", "cullface": "west"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#4"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "down"} - } - } - ], - "groups": [ - { - "name": "tank", - "origin": [8, 8, -23], - "color": 0, - "children": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_single_window_ne.json b/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_single_window_ne.json deleted file mode 100644 index 27bc248e..00000000 --- a/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_single_window_ne.json +++ /dev/null @@ -1,104 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "0": "createindustry:block/brass_fluid_tank_top", - "1": "createindustry:block/brass_fluid_tank", - "4": "createindustry:block/brass_fluid_tank_inner", - "5": "createindustry:block/brass_fluid_tank_window_single", - "particle": "createindustry:block/brass_fluid_tank" - }, - "elements": [ - { - "name": "SideRight", - "from": [15, 4, 0], - "to": [16, 12, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "east": {"uv": [4, 4, 16, 12], "texture": "#1"}, - "south": {"uv": [4, 4, 5, 12], "texture": "#1"}, - "west": {"uv": [0, 4, 12, 12], "texture": "#1"} - } - }, - { - "name": "Window", - "from": [0, 4, 0.95], - "to": [4, 12, 0.95], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "north": {"uv": [0, 0, 4, 8], "texture": "#5"}, - "south": {"uv": [4, 0, 8, 8], "texture": "#5"} - } - }, - { - "name": "Window", - "from": [15.05, 4, 12], - "to": [15.05, 12, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "east": {"uv": [4, 0, 8, 8], "texture": "#5"}, - "west": {"uv": [0, 0, 4, 8], "texture": "#5"} - } - }, - { - "name": "SideLeft", - "from": [4, 4, 0], - "to": [16, 12, 1], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "north": {"uv": [0, 4, 12, 12], "texture": "#1"}, - "south": {"uv": [4, 4, 16, 12], "texture": "#1"}, - "west": {"uv": [11, 4, 12, 12], "texture": "#1"} - } - }, - { - "name": "Bottom", - "from": [0, 12, 0], - "to": [16, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [-23, 8, 8]}, - "faces": { - "north": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "east": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "south": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "west": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "up"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#4"} - } - }, - { - "name": "Bottom", - "from": [0, 0, 0], - "to": [16, 4, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [-23, 8, 8]}, - "faces": { - "north": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "east": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "south": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "west": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#4"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "down"} - } - } - ], - "groups": [ - { - "name": "tank", - "origin": [8, 8, -23], - "color": 0, - "children": [0, 1, 2, 3, 4] - }, - { - "name": "block_bottom_centered_window", - "origin": [8, 8, 8], - "color": 0, - "children": [ - { - "name": "tank", - "origin": [8, 8, -23], - "color": 0, - "children": [5] - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_single_window_nw.json b/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_single_window_nw.json deleted file mode 100644 index f0904e7e..00000000 --- a/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_single_window_nw.json +++ /dev/null @@ -1,104 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "0": "createindustry:block/brass_fluid_tank_top", - "1": "createindustry:block/brass_fluid_tank", - "4": "createindustry:block/brass_fluid_tank_inner", - "5": "createindustry:block/brass_fluid_tank_window_single", - "particle": "createindustry:block/brass_fluid_tank" - }, - "elements": [ - { - "name": "SideRight", - "from": [0, 4, 0], - "to": [12, 12, 1], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "north": {"uv": [4, 4, 16, 12], "texture": "#1"}, - "east": {"uv": [4, 4, 5, 12], "texture": "#1"}, - "south": {"uv": [0, 4, 12, 12], "texture": "#1"} - } - }, - { - "name": "Window", - "from": [0.95, 4, 12], - "to": [0.95, 12, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "east": {"uv": [4, 0, 8, 8], "texture": "#5"}, - "west": {"uv": [0, 0, 4, 8], "texture": "#5"} - } - }, - { - "name": "Window", - "from": [12, 4, 0.95], - "to": [16, 12, 0.95], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "north": {"uv": [4, 0, 8, 8], "texture": "#5"}, - "south": {"uv": [0, 0, 4, 8], "texture": "#5"} - } - }, - { - "name": "SideLeft", - "from": [0, 4, 0], - "to": [1, 12, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "east": {"uv": [4, 4, 16, 12], "texture": "#1"}, - "south": {"uv": [11, 4, 12, 12], "texture": "#1"}, - "west": {"uv": [0, 4, 12, 12], "texture": "#1"} - } - }, - { - "name": "Bottom", - "from": [0, 12, 0], - "to": [16, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 39]}, - "faces": { - "north": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "east": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "south": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "west": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "up"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#4"} - } - }, - { - "name": "Bottom", - "from": [0, 0, 0], - "to": [16, 4, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 39]}, - "faces": { - "north": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "east": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "south": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "west": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#4"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "down"} - } - } - ], - "groups": [ - { - "name": "tank", - "origin": [8, 8, -23], - "color": 0, - "children": [0, 1, 2, 3, 4] - }, - { - "name": "block_bottom_centered_window", - "origin": [8, 8, 8], - "color": 0, - "children": [ - { - "name": "tank", - "origin": [8, 8, -23], - "color": 0, - "children": [5] - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_single_window_se.json b/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_single_window_se.json deleted file mode 100644 index 5c46c1fa..00000000 --- a/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_single_window_se.json +++ /dev/null @@ -1,104 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "0": "createindustry:block/brass_fluid_tank_top", - "1": "createindustry:block/brass_fluid_tank", - "4": "createindustry:block/brass_fluid_tank_inner", - "5": "createindustry:block/brass_fluid_tank_window_single", - "particle": "createindustry:block/fluid_tank" - }, - "elements": [ - { - "name": "SideRight", - "from": [4, 4, 15], - "to": [16, 12, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "north": {"uv": [0, 4, 12, 12], "texture": "#1"}, - "south": {"uv": [4, 4, 16, 12], "texture": "#1"}, - "west": {"uv": [4, 4, 5, 12], "texture": "#1"} - } - }, - { - "name": "Window", - "from": [15.05, 4, 0], - "to": [15.05, 12, 4], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "east": {"uv": [0, 0, 4, 8], "texture": "#5"}, - "west": {"uv": [4, 0, 8, 8], "texture": "#5"} - } - }, - { - "name": "Window", - "from": [0, 4, 15.05], - "to": [4, 12, 15.05], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "north": {"uv": [0, 0, 4, 8], "texture": "#5"}, - "south": {"uv": [4, 0, 8, 8], "texture": "#5"} - } - }, - { - "name": "SideLeft", - "from": [15, 4, 4], - "to": [16, 12, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "north": {"uv": [11, 4, 12, 12], "texture": "#1"}, - "east": {"uv": [0, 4, 12, 12], "texture": "#1"}, - "west": {"uv": [4, 4, 16, 12], "texture": "#1"} - } - }, - { - "name": "Bottom", - "from": [0, 12, 0], - "to": [16, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]}, - "faces": { - "north": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "east": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "south": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "west": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "up"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#4"} - } - }, - { - "name": "Bottom", - "from": [0, 0, 0], - "to": [16, 4, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]}, - "faces": { - "north": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "east": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "south": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "west": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#4"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "down"} - } - } - ], - "groups": [ - { - "name": "tank", - "origin": [8, 8, -23], - "color": 0, - "children": [0, 1, 2, 3, 4] - }, - { - "name": "block_bottom_centered_window", - "origin": [8, 8, 8], - "color": 0, - "children": [ - { - "name": "tank", - "origin": [8, 8, -23], - "color": 0, - "children": [5] - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_single_window_sw.json b/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_single_window_sw.json deleted file mode 100644 index 2fc8b1a0..00000000 --- a/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_single_window_sw.json +++ /dev/null @@ -1,104 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "0": "createindustry:block/brass_fluid_tank_top", - "1": "createindustry:block/brass_fluid_tank", - "4": "createindustry:block/brass_fluid_tank_inner", - "5": "createindustry:block/brass_fluid_tank_window_single", - "particle": "createindustry:block/brass_fluid_tank" - }, - "elements": [ - { - "name": "SideRight", - "from": [0, 4, 4], - "to": [1, 12, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "north": {"uv": [4, 4, 5, 12], "texture": "#1"}, - "east": {"uv": [0, 4, 12, 12], "texture": "#1"}, - "west": {"uv": [4, 4, 16, 12], "texture": "#1"} - } - }, - { - "name": "Window", - "from": [12, 4, 15.05], - "to": [16, 12, 15.05], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "north": {"uv": [4, 0, 8, 8], "texture": "#5"}, - "south": {"uv": [0, 0, 4, 8], "texture": "#5"} - } - }, - { - "name": "Window", - "from": [0.95, 4, 0], - "to": [0.95, 12, 4], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "east": {"uv": [0, 0, 4, 8], "texture": "#5"}, - "west": {"uv": [4, 0, 8, 8], "texture": "#5"} - } - }, - { - "name": "SideLeft", - "from": [0, 4, 15], - "to": [12, 12, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "north": {"uv": [4, 4, 16, 12], "texture": "#1"}, - "east": {"uv": [11, 4, 12, 12], "texture": "#1"}, - "south": {"uv": [0, 4, 12, 12], "texture": "#1"} - } - }, - { - "name": "Bottom", - "from": [0, 12, 0], - "to": [16, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [39, 8, 8]}, - "faces": { - "north": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "east": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "south": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "west": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "up"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#4"} - } - }, - { - "name": "Bottom", - "from": [0, 0, 0], - "to": [16, 4, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [39, 8, 8]}, - "faces": { - "north": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "east": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "south": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "west": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#4"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "down"} - } - } - ], - "groups": [ - { - "name": "tank", - "origin": [8, 8, -23], - "color": 0, - "children": [0, 1, 2, 3, 4] - }, - { - "name": "block_bottom_centered_window", - "origin": [8, 8, 8], - "color": 0, - "children": [ - { - "name": "tank", - "origin": [8, 8, -23], - "color": 0, - "children": [5] - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_top.json b/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_top.json deleted file mode 100644 index ff6be1ea..00000000 --- a/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_top.json +++ /dev/null @@ -1,71 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "0": "createindustry:block/brass_fluid_tank_top", - "1": "createindustry:block/brass_fluid_tank", - "4": "createindustry:block/brass_fluid_tank_inner", - "particle": "createindustry:block/brass_fluid_tank" - }, - "elements": [ - { - "name": "Lid", - "from": [0, 12, 0], - "to": [16, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]}, - "faces": { - "north": {"uv": [0, 0, 16, 4], "texture": "#1", "cullface": "north"}, - "east": {"uv": [0, 0, 16, 4], "texture": "#1", "cullface": "east"}, - "south": {"uv": [0, 0, 16, 4], "texture": "#1", "cullface": "south"}, - "west": {"uv": [0, 0, 16, 4], "texture": "#1", "cullface": "west"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "up"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#4"} - } - }, - { - "name": "SideRight", - "from": [0, 0, 0], - "to": [16, 12, 1], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]}, - "faces": { - "north": {"uv": [0, 4, 16, 16], "texture": "#1", "cullface": "north"}, - "south": {"uv": [0, 4, 16, 16], "texture": "#1", "cullface": "north"} - } - }, - { - "name": "SideRight", - "from": [15, 0, 0], - "to": [16, 12, 16], - "faces": { - "east": {"uv": [0, 4, 16, 16], "texture": "#1", "cullface": "east"}, - "west": {"uv": [0, 4, 16, 16], "texture": "#1", "cullface": "east"} - } - }, - { - "name": "SideRight", - "from": [0, 0, 15], - "to": [16, 12, 16], - "faces": { - "north": {"uv": [0, 4, 16, 16], "texture": "#1", "cullface": "south"}, - "south": {"uv": [0, 4, 16, 16], "texture": "#1", "cullface": "south"} - } - }, - { - "name": "SideRight", - "from": [0, 0, 0], - "to": [1, 12, 16], - "faces": { - "east": {"uv": [0, 4, 16, 16], "texture": "#1", "cullface": "west"}, - "west": {"uv": [0, 4, 16, 16], "texture": "#1", "cullface": "west"} - } - } - ], - "groups": [ - { - "name": "tank", - "origin": [8, 8, -23], - "color": 0, - "children": [0, 1, 2, 3, 4] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_top_window.json b/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_top_window.json deleted file mode 100644 index c3338240..00000000 --- a/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_top_window.json +++ /dev/null @@ -1,154 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "0": "createindustry:block/brass_fluid_tank_top", - "1": "createindustry:block/brass_fluid_tank", - "3": "createindustry:block/brass_fluid_tank_window", - "4": "createindustry:block/brass_fluid_tank_inner", - "particle": "createindustry:block/brass_fluid_tank" - }, - "elements": [ - { - "name": "Lid", - "from": [0, 12, 0], - "to": [16, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]}, - "faces": { - "north": {"uv": [0, 0, 16, 4], "texture": "#1", "cullface": "north"}, - "east": {"uv": [0, 0, 16, 4], "texture": "#1", "cullface": "east"}, - "south": {"uv": [0, 0, 16, 4], "texture": "#1", "cullface": "south"}, - "west": {"uv": [0, 0, 16, 4], "texture": "#1", "cullface": "west"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "up"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#4"} - } - }, - { - "name": "SideRight", - "from": [0, 0, 0], - "to": [4, 12, 1], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]}, - "faces": { - "north": {"uv": [12, 4, 16, 16], "texture": "#1", "cullface": "north"}, - "east": {"uv": [0, 4, 1, 16], "texture": "#1", "cullface": "north"}, - "south": {"uv": [0, 4, 4, 16], "texture": "#1", "cullface": "north"} - } - }, - { - "name": "SideRight", - "from": [15, 0, 0], - "to": [16, 12, 4], - "faces": { - "east": {"uv": [12, 4, 16, 16], "texture": "#1", "cullface": "east"}, - "south": {"uv": [0, 4, 1, 16], "texture": "#1", "cullface": "east"}, - "west": {"uv": [0, 4, 4, 16], "texture": "#1", "cullface": "east"} - } - }, - { - "name": "SideRight", - "from": [12, 0, 15], - "to": [16, 12, 16], - "faces": { - "north": {"uv": [0, 4, 4, 16], "texture": "#1", "cullface": "south"}, - "south": {"uv": [12, 4, 16, 16], "texture": "#1", "cullface": "south"}, - "west": {"uv": [0, 4, 1, 16], "texture": "#1", "cullface": "south"} - } - }, - { - "name": "SideRight", - "from": [0, 0, 12], - "to": [1, 12, 16], - "faces": { - "north": {"uv": [0, 4, 1, 16], "texture": "#1", "cullface": "west"}, - "east": {"uv": [0, 4, 4, 16], "texture": "#1", "cullface": "west"}, - "west": {"uv": [12, 4, 16, 16], "texture": "#1", "cullface": "west"} - } - }, - { - "name": "Window", - "from": [4, 0, 0.95], - "to": [12, 12, 0.95], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]}, - "faces": { - "north": {"uv": [0, 0, 8, 12], "texture": "#3", "cullface": "north"}, - "south": {"uv": [0, 0, 8, 12], "texture": "#3", "cullface": "north"} - } - }, - { - "name": "Window", - "from": [15.05, 0, 4], - "to": [15.05, 12, 12], - "faces": { - "east": {"uv": [0, 0, 8, 12], "texture": "#3", "cullface": "east"}, - "west": {"uv": [0, 0, 8, 12], "texture": "#3", "cullface": "east"} - } - }, - { - "name": "Window", - "from": [4, 0, 15.05], - "to": [12, 12, 15.05], - "faces": { - "north": {"uv": [0, 0, 8, 12], "texture": "#3", "cullface": "south"}, - "south": {"uv": [0, 0, 8, 12], "texture": "#3", "cullface": "south"} - } - }, - { - "name": "Window", - "from": [0.95, 0, 4], - "to": [0.95, 12, 12], - "faces": { - "east": {"uv": [0, 0, 8, 12], "texture": "#3", "cullface": "west"}, - "west": {"uv": [0, 0, 8, 12], "texture": "#3", "cullface": "west"} - } - }, - { - "name": "SideLeft", - "from": [12, 0, 0], - "to": [16, 12, 1], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]}, - "faces": { - "north": {"uv": [0, 4, 4, 16], "texture": "#1", "cullface": "north"}, - "south": {"uv": [12, 4, 16, 16], "texture": "#1", "cullface": "north"}, - "west": {"uv": [15, 4, 16, 16], "texture": "#1", "cullface": "north"} - } - }, - { - "name": "SideLeft", - "from": [15, 0, 12], - "to": [16, 12, 16], - "faces": { - "north": {"uv": [15, 4, 16, 16], "texture": "#1", "cullface": "east"}, - "east": {"uv": [0, 4, 4, 16], "texture": "#1", "cullface": "east"}, - "west": {"uv": [12, 4, 16, 16], "texture": "#1", "cullface": "east"} - } - }, - { - "name": "SideLeft", - "from": [0, 0, 15], - "to": [4, 12, 16], - "faces": { - "north": {"uv": [12, 4, 16, 16], "texture": "#1", "cullface": "south"}, - "east": {"uv": [15, 4, 16, 16], "texture": "#1", "cullface": "south"}, - "south": {"uv": [0, 4, 4, 16], "texture": "#1", "cullface": "south"} - } - }, - { - "name": "SideLeft", - "from": [0, 0, 0], - "to": [1, 12, 4], - "faces": { - "east": {"uv": [12, 4, 16, 16], "texture": "#1", "cullface": "west"}, - "south": {"uv": [15, 4, 16, 16], "texture": "#1", "cullface": "west"}, - "west": {"uv": [0, 4, 4, 16], "texture": "#1", "cullface": "west"} - } - } - ], - "groups": [ - { - "name": "tank", - "origin": [8, 8, -23], - "color": 0, - "children": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_top_window_ne.json b/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_top_window_ne.json deleted file mode 100644 index 8634ac93..00000000 --- a/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_top_window_ne.json +++ /dev/null @@ -1,77 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "0": "createindustry:block/brass_fluid_tank_top", - "1": "createindustry:block/brass_fluid_tank", - "3": "createindustry:block/brass_fluid_tank_window", - "4": "createindustry:block/brass_fluid_tank_inner", - "particle": "createindustry:block/brass_fluid_tank" - }, - "elements": [ - { - "name": "SideRight", - "from": [15, 0, 0], - "to": [16, 12, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "east": {"uv": [4, 4, 16, 16], "texture": "#1"}, - "south": {"uv": [4, 4, 5, 16], "texture": "#1"}, - "west": {"uv": [0, 4, 12, 16], "texture": "#1"} - } - }, - { - "name": "Window", - "from": [0, 0, 0.95], - "to": [4, 12, 0.95], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "north": {"uv": [0, 0, 4, 12], "texture": "#3"}, - "south": {"uv": [4, 0, 8, 12], "texture": "#3"} - } - }, - { - "name": "Window", - "from": [15.05, 0, 12], - "to": [15.05, 12, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "east": {"uv": [4, 0, 8, 12], "texture": "#3"}, - "west": {"uv": [0, 0, 4, 12], "texture": "#3"} - } - }, - { - "name": "SideLeft", - "from": [4, 0, 0], - "to": [16, 12, 1], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "north": {"uv": [0, 4, 12, 16], "texture": "#1"}, - "south": {"uv": [4, 4, 16, 16], "texture": "#1"}, - "west": {"uv": [11, 4, 12, 16], "texture": "#1"} - } - }, - { - "name": "Bottom", - "from": [0, 12, 0], - "to": [16, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [-23, 8, 8]}, - "faces": { - "north": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "east": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "south": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "west": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "up"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#4"} - } - } - ], - "groups": [ - { - "name": "tank", - "origin": [8, 8, -23], - "color": 0, - "children": [0, 1, 2, 3, 4] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_top_window_nw.json b/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_top_window_nw.json deleted file mode 100644 index 71bddf49..00000000 --- a/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_top_window_nw.json +++ /dev/null @@ -1,77 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "0": "createindustry:block/brass_fluid_tank_top", - "1": "createindustry:block/brass_fluid_tank", - "3": "createindustry:block/brass_fluid_tank_window", - "4": "createindustry:block/brass_fluid_tank_inner", - "particle": "createindustry:block/brass_fluid_tank" - }, - "elements": [ - { - "name": "SideRight", - "from": [0, 0, 0], - "to": [12, 12, 1], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "north": {"uv": [4, 4, 16, 16], "texture": "#1"}, - "east": {"uv": [4, 4, 5, 16], "texture": "#1"}, - "south": {"uv": [0, 4, 12, 16], "texture": "#1"} - } - }, - { - "name": "Window", - "from": [0.95, 0, 12], - "to": [0.95, 12, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "east": {"uv": [4, 0, 8, 12], "texture": "#3"}, - "west": {"uv": [0, 0, 4, 12], "texture": "#3"} - } - }, - { - "name": "Window", - "from": [12, 0, 0.95], - "to": [16, 12, 0.95], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "north": {"uv": [4, 0, 8, 12], "texture": "#3"}, - "south": {"uv": [0, 0, 4, 12], "texture": "#3"} - } - }, - { - "name": "SideLeft", - "from": [0, 0, 0], - "to": [1, 12, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "east": {"uv": [4, 4, 16, 16], "texture": "#1"}, - "south": {"uv": [11, 4, 12, 16], "texture": "#1"}, - "west": {"uv": [0, 4, 12, 16], "texture": "#1"} - } - }, - { - "name": "Bottom", - "from": [0, 12, 0], - "to": [16, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 39]}, - "faces": { - "north": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "east": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "south": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "west": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "up"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#4"} - } - } - ], - "groups": [ - { - "name": "tank", - "origin": [8, 8, -23], - "color": 0, - "children": [0, 1, 2, 3, 4] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_top_window_se.json b/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_top_window_se.json deleted file mode 100644 index f2eb53c1..00000000 --- a/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_top_window_se.json +++ /dev/null @@ -1,77 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "0": "createindustry:block/brass_fluid_tank_top", - "1": "createindustry:block/brass_fluid_tank", - "3": "createindustry:block/brass_fluid_tank_window", - "4": "createindustry:block/brass_fluid_tank_inner", - "particle": "createindustry:block/brass_fluid_tank" - }, - "elements": [ - { - "name": "SideRight", - "from": [4, 0, 15], - "to": [16, 12, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "north": {"uv": [0, 4, 12, 16], "texture": "#1"}, - "south": {"uv": [4, 4, 16, 16], "texture": "#1"}, - "west": {"uv": [4, 4, 5, 16], "texture": "#1"} - } - }, - { - "name": "Window", - "from": [15.05, 0, 0], - "to": [15.05, 12, 4], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "east": {"uv": [0, 0, 4, 12], "texture": "#3"}, - "west": {"uv": [4, 0, 8, 12], "texture": "#3"} - } - }, - { - "name": "Window", - "from": [0, 0, 15.05], - "to": [4, 12, 15.05], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "north": {"uv": [0, 0, 4, 12], "texture": "#3"}, - "south": {"uv": [4, 0, 8, 12], "texture": "#3"} - } - }, - { - "name": "SideLeft", - "from": [15, 0, 4], - "to": [16, 12, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "north": {"uv": [11, 4, 12, 16], "texture": "#1"}, - "east": {"uv": [0, 4, 12, 16], "texture": "#1"}, - "west": {"uv": [4, 4, 16, 16], "texture": "#1"} - } - }, - { - "name": "Bottom", - "from": [0, 12, 0], - "to": [16, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]}, - "faces": { - "north": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "east": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "south": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "west": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "up"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#4"} - } - } - ], - "groups": [ - { - "name": "tank", - "origin": [8, 8, -23], - "color": 0, - "children": [0, 1, 2, 3, 4] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_top_window_sw.json b/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_top_window_sw.json deleted file mode 100644 index a4326ce0..00000000 --- a/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_top_window_sw.json +++ /dev/null @@ -1,77 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "0": "createindustry:block/brass_fluid_tank_top", - "1": "createindustry:block/brass_fluid_tank", - "3": "createindustry:block/brass_fluid_tank_window", - "4": "createindustry:block/brass_fluid_tank_inner", - "particle": "createindustry:block/brass_fluid_tank" - }, - "elements": [ - { - "name": "SideRight", - "from": [0, 0, 4], - "to": [1, 12, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "north": {"uv": [4, 4, 5, 16], "texture": "#1"}, - "east": {"uv": [0, 4, 12, 16], "texture": "#1"}, - "west": {"uv": [4, 4, 16, 16], "texture": "#1"} - } - }, - { - "name": "Window", - "from": [12, 0, 15.05], - "to": [16, 12, 15.05], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "north": {"uv": [4, 0, 8, 12], "texture": "#3"}, - "south": {"uv": [0, 0, 4, 12], "texture": "#3"} - } - }, - { - "name": "Window", - "from": [0.95, 0, 0], - "to": [0.95, 12, 4], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "east": {"uv": [0, 0, 4, 12], "texture": "#3"}, - "west": {"uv": [4, 0, 8, 12], "texture": "#3"} - } - }, - { - "name": "SideLeft", - "from": [0, 0, 15], - "to": [12, 12, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "north": {"uv": [4, 4, 16, 16], "texture": "#1"}, - "east": {"uv": [11, 4, 12, 16], "texture": "#1"}, - "south": {"uv": [0, 4, 12, 16], "texture": "#1"} - } - }, - { - "name": "Bottom", - "from": [0, 12, 0], - "to": [16, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [39, 8, 8]}, - "faces": { - "north": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "east": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "south": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "west": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "up"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#4"} - } - } - ], - "groups": [ - { - "name": "tank", - "origin": [8, 8, -23], - "color": 0, - "children": [0, 1, 2, 3, 4] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/createindustry/models/block/brass_fluid_valve/block_horizontal_closed.json b/src/main/resources/assets/createindustry/models/block/brass_fluid_valve/block_horizontal_closed.json index aa081f55..9f3b7260 100644 --- a/src/main/resources/assets/createindustry/models/block/brass_fluid_valve/block_horizontal_closed.json +++ b/src/main/resources/assets/createindustry/models/block/brass_fluid_valve/block_horizontal_closed.json @@ -1,9 +1,9 @@ { "credit": "Made with Blockbench", "textures": { - "2": "create:block/fluid_valve", - "4": "create:block/pipes", - "particle": "create:block/copper_plating" + "2": "createindustry:block/brass_fluid_valve", + "4": "createindustry:block/brass_pipes", + "particle": "create:block/brass_block" }, "elements": [ { diff --git a/src/main/resources/assets/createindustry/models/block/brass_fluid_valve/block_horizontal_open.json b/src/main/resources/assets/createindustry/models/block/brass_fluid_valve/block_horizontal_open.json index 4f830bff..11b3a659 100644 --- a/src/main/resources/assets/createindustry/models/block/brass_fluid_valve/block_horizontal_open.json +++ b/src/main/resources/assets/createindustry/models/block/brass_fluid_valve/block_horizontal_open.json @@ -1,9 +1,9 @@ { "credit": "Made with Blockbench", "textures": { - "2": "create:block/fluid_valve", - "4": "create:block/pipes", - "particle": "create:block/copper_plating" + "2": "createindustry:block/brass_fluid_valve", + "4": "createindustry:block/brass_pipes", + "particle": "create:block/brass_block" }, "elements": [ { diff --git a/src/main/resources/assets/createindustry/models/block/brass_fluid_valve/block_vertical_closed.json b/src/main/resources/assets/createindustry/models/block/brass_fluid_valve/block_vertical_closed.json index 1f7b5fee..255239d4 100644 --- a/src/main/resources/assets/createindustry/models/block/brass_fluid_valve/block_vertical_closed.json +++ b/src/main/resources/assets/createindustry/models/block/brass_fluid_valve/block_vertical_closed.json @@ -1,9 +1,9 @@ { "credit": "Made with Blockbench", "textures": { - "2": "create:block/fluid_valve", - "3": "create:block/pipes", - "particle": "create:block/copper_plating" + "2": "createindustry:block/brass_fluid_valve", + "3": "createindustry:block/brass_pipes", + "particle": "create:block/brass_block" }, "elements": [ { diff --git a/src/main/resources/assets/createindustry/models/block/brass_fluid_valve/block_vertical_open.json b/src/main/resources/assets/createindustry/models/block/brass_fluid_valve/block_vertical_open.json index b95cd9a3..8f419e0b 100644 --- a/src/main/resources/assets/createindustry/models/block/brass_fluid_valve/block_vertical_open.json +++ b/src/main/resources/assets/createindustry/models/block/brass_fluid_valve/block_vertical_open.json @@ -1,9 +1,9 @@ { "credit": "Made with Blockbench", "textures": { - "2": "create:block/fluid_valve", - "3": "create:block/pipes", - "particle": "create:block/copper_plating" + "2": "createindustry:block/brass_fluid_valve", + "3": "createindustry:block/brass_pipes", + "particle": "create:block/brass_block" }, "elements": [ { diff --git a/src/main/resources/assets/createindustry/models/block/brass_fluid_valve/item.json b/src/main/resources/assets/createindustry/models/block/brass_fluid_valve/item.json index b09bd0b7..c730246e 100644 --- a/src/main/resources/assets/createindustry/models/block/brass_fluid_valve/item.json +++ b/src/main/resources/assets/createindustry/models/block/brass_fluid_valve/item.json @@ -1,12 +1,12 @@ { "credit": "Made with Blockbench", "textures": { - "2": "create:block/fluid_valve", - "3": "create:block/pipes", + "2": "createindustry:block/brass_fluid_valve", + "3": "createindustry:block/brass_pipes", "4": "create:block/pump", "1_1": "create:block/axis_top", "1_0": "create:block/axis", - "particle": "create:block/copper_plating" + "particle": "create:block/brass_block" }, "elements": [ { diff --git a/src/main/resources/assets/createindustry/models/block/brass_fluid_valve/pointer.json b/src/main/resources/assets/createindustry/models/block/brass_fluid_valve/pointer.json index 2e9eed35..24d68597 100644 --- a/src/main/resources/assets/createindustry/models/block/brass_fluid_valve/pointer.json +++ b/src/main/resources/assets/createindustry/models/block/brass_fluid_valve/pointer.json @@ -1,9 +1,9 @@ { "credit": "Made with Blockbench", "textures": { - "2": "create:block/fluid_valve", + "2": "createindustry:block/brass_fluid_valve", "4": "create:block/pump", - "particle": "create:block/copper_plating" + "particle": "create:block/brass_block" }, "elements": [ { diff --git a/src/main/resources/assets/createindustry/models/block/brass_mechanical_pump/block.json b/src/main/resources/assets/createindustry/models/block/brass_mechanical_pump/block.json index 8dd3ab9b..6add38cd 100644 --- a/src/main/resources/assets/createindustry/models/block/brass_mechanical_pump/block.json +++ b/src/main/resources/assets/createindustry/models/block/brass_mechanical_pump/block.json @@ -2,9 +2,9 @@ "credit": "Made with Blockbench", "parent": "create:block/block", "textures": { - "2": "create:block/pipes", - "4": "create:block/pump", - "particle": "create:block/pump" + "2": "createindustry:block/brass_pipes", + "4": "createindustry:block/brass_pump", + "particle": "createindustry:block/brass_pump" }, "elements": [ { diff --git a/src/main/resources/assets/createindustry/models/block/brass_mechanical_pump/item.json b/src/main/resources/assets/createindustry/models/block/brass_mechanical_pump/item.json index 161c4910..0fcce674 100644 --- a/src/main/resources/assets/createindustry/models/block/brass_mechanical_pump/item.json +++ b/src/main/resources/assets/createindustry/models/block/brass_mechanical_pump/item.json @@ -2,10 +2,10 @@ "credit": "Made with Blockbench", "parent": "create:block/block", "textures": { - "2": "create:block/pipes", - "4": "create:block/pump", + "2": "createindustry:block/brass_pipes", + "4": "createindustry:block/brass_pump", "5": "create:block/millstone", - "particle": "create:block/pump" + "particle": "createindustry:block/brass_pump" }, "elements": [ { diff --git a/src/main/resources/assets/createindustry/models/block/brass_smart_fluid_pipe/block.json b/src/main/resources/assets/createindustry/models/block/brass_smart_fluid_pipe/block.json index 1f674588..55285f78 100644 --- a/src/main/resources/assets/createindustry/models/block/brass_smart_fluid_pipe/block.json +++ b/src/main/resources/assets/createindustry/models/block/brass_smart_fluid_pipe/block.json @@ -2,9 +2,9 @@ "credit": "Made with Blockbench", "parent": "block/block", "textures": { - "2": "create:block/smart_pipe_1", - "3": "create:block/smart_pipe_2", - "particle": "create:block/smart_pipe_2" + "2": "createindustry:block/brass_smart_pipe_1", + "3": "createindustry:block/brass_smart_pipe_2", + "particle": "createindustry:block/brass_smart_pipe_2" }, "elements": [ { diff --git a/src/main/resources/assets/createindustry/models/block/brass_smart_fluid_pipe/item.json b/src/main/resources/assets/createindustry/models/block/brass_smart_fluid_pipe/item.json index a3df689d..66023714 100644 --- a/src/main/resources/assets/createindustry/models/block/brass_smart_fluid_pipe/item.json +++ b/src/main/resources/assets/createindustry/models/block/brass_smart_fluid_pipe/item.json @@ -2,9 +2,9 @@ "credit": "Made with Blockbench", "parent": "block/block", "textures": { - "1": "create:block/pipes", - "2": "create:block/smart_pipe_1", - "3": "create:block/smart_pipe_2" + "1": "createindustry:block/brass_pipes", + "2": "createindustry:block/brass_smart_pipe_1", + "3": "createindustry:block/brass_smart_pipe_2" }, "elements": [ { diff --git a/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_bottom.json b/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_bottom.json deleted file mode 100644 index f1f25b90..00000000 --- a/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_bottom.json +++ /dev/null @@ -1,74 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "0": "createindustry:block/cast_iron_fluid_tank_top", - "1": "createindustry:block/cast_iron_fluid_tank", - "4": "createindustry:block/cast_iron_fluid_tank_inner", - "particle": "createindustry:block/fluid_tank" - }, - "elements": [ - { - "name": "Lid", - "from": [0, 0, 0], - "to": [16, 4, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]}, - "faces": { - "north": {"uv": [0, 12, 16, 16], "texture": "#1", "cullface": "north"}, - "east": {"uv": [0, 12, 16, 16], "texture": "#1", "cullface": "east"}, - "south": {"uv": [0, 12, 16, 16], "texture": "#1", "cullface": "south"}, - "west": {"uv": [0, 12, 16, 16], "texture": "#1", "cullface": "west"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#4"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "down"} - } - }, - { - "name": "SideRight", - "from": [0, 4, 0], - "to": [16, 16, 1], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, -23]}, - "faces": { - "north": {"uv": [0, 0, 16, 12], "texture": "#1", "cullface": "north"}, - "south": {"uv": [0, 0, 16, 12], "texture": "#1", "cullface": "north"} - } - }, - { - "name": "SideRight", - "from": [15, 4, 0], - "to": [16, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]}, - "faces": { - "east": {"uv": [0, 0, 16, 12], "texture": "#1", "cullface": "east"}, - "west": {"uv": [0, 0, 16, 12], "texture": "#1", "cullface": "east"} - } - }, - { - "name": "SideRight", - "from": [0, 4, 15], - "to": [16, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]}, - "faces": { - "north": {"uv": [0, 0, 16, 12], "texture": "#1", "cullface": "south"}, - "south": {"uv": [0, 0, 16, 12], "texture": "#1", "cullface": "south"} - } - }, - { - "name": "SideRight", - "from": [0, 4, 0], - "to": [1, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]}, - "faces": { - "east": {"uv": [0, 0, 16, 12], "texture": "#1", "cullface": "west"}, - "west": {"uv": [0, 0, 16, 12], "texture": "#1", "cullface": "west"} - } - } - ], - "groups": [ - { - "name": "tank", - "origin": [8, 8, -23], - "color": 0, - "children": [0, 1, 2, 3, 4] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_bottom_window.json b/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_bottom_window.json deleted file mode 100644 index 289e619f..00000000 --- a/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_bottom_window.json +++ /dev/null @@ -1,154 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "0": "createindustry:block/cast_iron_fluid_tank_top", - "1": "createindustry:block/cast_iron_fluid_tank", - "3": "createindustry:block/cast_iron_fluid_tank_window", - "4": "createindustry:block/cast_iron_fluid_tank_inner", - "particle": "createindustry:block/cast_iron_fluid_tank" - }, - "elements": [ - { - "name": "SideRight", - "from": [0, 4, 0], - "to": [4, 16, 1], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]}, - "faces": { - "north": {"uv": [12, 0, 16, 12], "texture": "#1", "cullface": "north"}, - "east": {"uv": [0, 0, 1, 12], "texture": "#1", "cullface": "north"}, - "south": {"uv": [0, 0, 4, 12], "texture": "#1", "cullface": "north"} - } - }, - { - "name": "SideRight", - "from": [15, 4, 0], - "to": [16, 16, 4], - "faces": { - "east": {"uv": [12, 0, 16, 12], "texture": "#1", "cullface": "east"}, - "south": {"uv": [0, 0, 1, 12], "texture": "#1", "cullface": "east"}, - "west": {"uv": [0, 0, 4, 12], "texture": "#1", "cullface": "east"} - } - }, - { - "name": "SideRight", - "from": [12, 4, 15], - "to": [16, 16, 16], - "faces": { - "north": {"uv": [0, 0, 4, 12], "texture": "#1", "cullface": "south"}, - "south": {"uv": [12, 0, 16, 12], "texture": "#1", "cullface": "south"}, - "west": {"uv": [0, 0, 1, 12], "texture": "#1", "cullface": "south"} - } - }, - { - "name": "SideRight", - "from": [0, 4, 12], - "to": [1, 16, 16], - "faces": { - "north": {"uv": [0, 0, 1, 12], "texture": "#1", "cullface": "west"}, - "east": {"uv": [0, 0, 4, 12], "texture": "#1", "cullface": "west"}, - "west": {"uv": [12, 0, 16, 12], "texture": "#1", "cullface": "west"} - } - }, - { - "name": "Window", - "from": [4, 4, 0.95], - "to": [12, 16, 0.95], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]}, - "faces": { - "north": {"uv": [0, 4, 8, 16], "texture": "#3", "cullface": "north"}, - "south": {"uv": [0, 4, 8, 16], "texture": "#3", "cullface": "north"} - } - }, - { - "name": "Window", - "from": [15.05, 4, 4], - "to": [15.05, 16, 12], - "faces": { - "east": {"uv": [0, 4, 8, 16], "texture": "#3", "cullface": "east"}, - "west": {"uv": [0, 4, 8, 16], "texture": "#3", "cullface": "east"} - } - }, - { - "name": "Window", - "from": [4, 4, 15.05], - "to": [12, 16, 15.05], - "faces": { - "north": {"uv": [0, 4, 8, 16], "texture": "#3", "cullface": "south"}, - "south": {"uv": [0, 4, 8, 16], "texture": "#3", "cullface": "south"} - } - }, - { - "name": "Window", - "from": [0.95, 4, 4], - "to": [0.95, 16, 12], - "faces": { - "east": {"uv": [0, 4, 8, 16], "texture": "#3", "cullface": "west"}, - "west": {"uv": [0, 4, 8, 16], "texture": "#3", "cullface": "west"} - } - }, - { - "name": "SideLeft", - "from": [12, 4, 0], - "to": [16, 16, 1], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]}, - "faces": { - "north": {"uv": [0, 0, 4, 12], "texture": "#1", "cullface": "north"}, - "south": {"uv": [12, 0, 16, 12], "texture": "#1", "cullface": "north"}, - "west": {"uv": [15, 0, 16, 12], "texture": "#1", "cullface": "north"} - } - }, - { - "name": "SideLeft", - "from": [15, 4, 12], - "to": [16, 16, 16], - "faces": { - "north": {"uv": [15, 0, 16, 12], "texture": "#1", "cullface": "east"}, - "east": {"uv": [0, 0, 4, 12], "texture": "#1", "cullface": "east"}, - "west": {"uv": [12, 0, 16, 12], "texture": "#1", "cullface": "east"} - } - }, - { - "name": "SideLeft", - "from": [0, 4, 15], - "to": [4, 16, 16], - "faces": { - "north": {"uv": [12, 0, 16, 12], "texture": "#1", "cullface": "south"}, - "east": {"uv": [15, 0, 16, 12], "texture": "#1", "cullface": "south"}, - "south": {"uv": [0, 0, 4, 12], "texture": "#1", "cullface": "south"} - } - }, - { - "name": "SideLeft", - "from": [0, 4, 0], - "to": [1, 16, 4], - "faces": { - "east": {"uv": [12, 0, 16, 12], "texture": "#1", "cullface": "west"}, - "south": {"uv": [15, 0, 16, 12], "texture": "#1", "cullface": "west"}, - "west": {"uv": [0, 0, 4, 12], "texture": "#1", "cullface": "west"} - } - }, - { - "name": "Bottom", - "from": [0, 0, 0], - "to": [16, 4, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]}, - "faces": { - "north": {"uv": [0, 12, 16, 16], "texture": "#1", "cullface": "north"}, - "east": {"uv": [0, 12, 16, 16], "texture": "#1", "cullface": "east"}, - "south": {"uv": [0, 12, 16, 16], "texture": "#1", "cullface": "south"}, - "west": {"uv": [0, 12, 16, 16], "texture": "#1", "cullface": "west"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#4"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "down"} - } - } - ], - "groups": [ - { - "name": "tank", - "origin": [8, 8, -23], - "color": 0, - "children": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_bottom_window_ne.json b/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_bottom_window_ne.json deleted file mode 100644 index 1524e125..00000000 --- a/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_bottom_window_ne.json +++ /dev/null @@ -1,73 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "0": "createindustry:block/cast_iron_fluid_tank_top", - "1": "createindustry:block/cast_iron_fluid_tank", - "3": "createindustry:block/cast_iron_fluid_tank_window", - "4": "createindustry:block/cast_iron_fluid_tank_inner", - "particle": "createindustry:block/cast_iron_fluid_tank" - }, - "elements": [ - { - "name": "SideRight", - "from": [15, 4, 0], - "to": [16, 16, 12], - "faces": { - "east": {"uv": [4, 0, 16, 12], "texture": "#1"}, - "south": {"uv": [4, 0, 5, 12], "texture": "#1"}, - "west": {"uv": [0, 0, 12, 12], "texture": "#1"} - } - }, - { - "name": "Window", - "from": [0, 4, 0.95], - "to": [4, 16, 0.95], - "faces": { - "north": {"uv": [0, 4, 4, 16], "texture": "#3"}, - "south": {"uv": [4, 4, 8, 16], "texture": "#3"} - } - }, - { - "name": "Window", - "from": [15.05, 4, 12], - "to": [15.05, 16, 16], - "faces": { - "east": {"uv": [4, 4, 8, 16], "texture": "#3"}, - "west": {"uv": [0, 4, 4, 16], "texture": "#3"} - } - }, - { - "name": "SideLeft", - "from": [4, 4, 0], - "to": [16, 16, 1], - "faces": { - "north": {"uv": [0, 0, 12, 12], "texture": "#1"}, - "south": {"uv": [4, 0, 16, 12], "texture": "#1"}, - "west": {"uv": [11, 0, 12, 12], "texture": "#1"} - } - }, - { - "name": "Bottom", - "from": [0, 0, 0], - "to": [16, 4, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [-23, 8, 8]}, - "faces": { - "north": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "east": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "south": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "west": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#4"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "down"} - } - } - ], - "groups": [ - { - "name": "tank", - "origin": [8, 8, -23], - "color": 0, - "children": [0, 1, 2, 3, 4] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_bottom_window_nw.json b/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_bottom_window_nw.json deleted file mode 100644 index ab39de67..00000000 --- a/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_bottom_window_nw.json +++ /dev/null @@ -1,73 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "0": "createindustry:block/cast_iron_fluid_tank_top", - "1": "createindustry:block/cast_iron_fluid_tank", - "3": "createindustry:block/cast_iron_fluid_tank_window", - "4": "createindustry:block/cast_iron_fluid_tank_inner", - "particle": "createindustry:block/cast_iron_fluid_tank" - }, - "elements": [ - { - "name": "SideRight", - "from": [0, 4, 0], - "to": [12, 16, 1], - "faces": { - "north": {"uv": [4, 0, 16, 12], "texture": "#1"}, - "east": {"uv": [4, 0, 5, 12], "texture": "#1"}, - "south": {"uv": [0, 0, 12, 12], "texture": "#1"} - } - }, - { - "name": "Window", - "from": [0.95, 4, 12], - "to": [0.95, 16, 16], - "faces": { - "east": {"uv": [4, 4, 8, 16], "texture": "#3"}, - "west": {"uv": [0, 4, 4, 16], "texture": "#3"} - } - }, - { - "name": "Window", - "from": [12, 4, 0.95], - "to": [16, 16, 0.95], - "faces": { - "north": {"uv": [4, 4, 8, 16], "texture": "#3"}, - "south": {"uv": [0, 4, 4, 16], "texture": "#3"} - } - }, - { - "name": "SideLeft", - "from": [0, 4, 0], - "to": [1, 16, 12], - "faces": { - "east": {"uv": [4, 0, 16, 12], "texture": "#1"}, - "south": {"uv": [11, 0, 12, 12], "texture": "#1"}, - "west": {"uv": [0, 0, 12, 12], "texture": "#1"} - } - }, - { - "name": "Bottom", - "from": [0, 0, 0], - "to": [16, 4, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 39]}, - "faces": { - "north": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "east": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "south": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "west": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#4"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "down"} - } - } - ], - "groups": [ - { - "name": "tank", - "origin": [8, 8, -23], - "color": 0, - "children": [0, 1, 2, 3, 4] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_bottom_window_se.json b/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_bottom_window_se.json deleted file mode 100644 index dda4c4ea..00000000 --- a/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_bottom_window_se.json +++ /dev/null @@ -1,73 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "0": "createindustry:block/cast_iron_fluid_tank_top", - "1": "createindustry:block/cast_iron_fluid_tank", - "3": "createindustry:block/cast_iron_fluid_tank_window", - "4": "createindustry:block/cast_iron_fluid_tank_inner", - "particle": "createindustry:block/cast_iron_fluid_tank" - }, - "elements": [ - { - "name": "SideRight", - "from": [4, 4, 15], - "to": [16, 16, 16], - "faces": { - "north": {"uv": [0, 0, 12, 12], "texture": "#1"}, - "south": {"uv": [4, 0, 16, 12], "texture": "#1"}, - "west": {"uv": [4, 0, 5, 12], "texture": "#1"} - } - }, - { - "name": "Window", - "from": [15.05, 4, 0], - "to": [15.05, 16, 4], - "faces": { - "east": {"uv": [0, 4, 4, 16], "texture": "#3"}, - "west": {"uv": [4, 4, 8, 16], "texture": "#3"} - } - }, - { - "name": "Window", - "from": [0, 4, 15.05], - "to": [4, 16, 15.05], - "faces": { - "north": {"uv": [0, 4, 4, 16], "texture": "#3"}, - "south": {"uv": [4, 4, 8, 16], "texture": "#3"} - } - }, - { - "name": "SideLeft", - "from": [15, 4, 4], - "to": [16, 16, 16], - "faces": { - "north": {"uv": [11, 0, 12, 12], "texture": "#1"}, - "east": {"uv": [0, 0, 12, 12], "texture": "#1"}, - "west": {"uv": [4, 0, 16, 12], "texture": "#1"} - } - }, - { - "name": "Bottom", - "from": [0, 0, 0], - "to": [16, 4, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]}, - "faces": { - "north": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "east": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "south": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "west": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#4"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "down"} - } - } - ], - "groups": [ - { - "name": "tank", - "origin": [8, 8, -23], - "color": 0, - "children": [0, 1, 2, 3, 4] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_bottom_window_sw.json b/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_bottom_window_sw.json deleted file mode 100644 index a0a394a4..00000000 --- a/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_bottom_window_sw.json +++ /dev/null @@ -1,73 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "0": "createindustry:block/cast_iron_fluid_tank_top", - "1": "createindustry:block/cast_iron_fluid_tank", - "3": "createindustry:block/cast_iron_fluid_tank_window", - "4": "createindustry:block/cast_iron_fluid_tank_inner", - "particle": "createindustry:block/cast_iron_fluid_tank" - }, - "elements": [ - { - "name": "SideRight", - "from": [0, 4, 4], - "to": [1, 16, 16], - "faces": { - "north": {"uv": [4, 0, 5, 12], "texture": "#1"}, - "east": {"uv": [0, 0, 12, 12], "texture": "#1"}, - "west": {"uv": [4, 0, 16, 12], "texture": "#1"} - } - }, - { - "name": "Window", - "from": [12, 4, 15.05], - "to": [16, 16, 15.05], - "faces": { - "north": {"uv": [4, 4, 8, 16], "texture": "#3"}, - "south": {"uv": [0, 4, 4, 16], "texture": "#3"} - } - }, - { - "name": "Window", - "from": [0.95, 4, 0], - "to": [0.95, 16, 4], - "faces": { - "east": {"uv": [0, 4, 4, 16], "texture": "#3"}, - "west": {"uv": [4, 4, 8, 16], "texture": "#3"} - } - }, - { - "name": "SideLeft", - "from": [0, 4, 15], - "to": [12, 16, 16], - "faces": { - "north": {"uv": [4, 0, 16, 12], "texture": "#1"}, - "east": {"uv": [11, 0, 12, 12], "texture": "#1"}, - "south": {"uv": [0, 0, 12, 12], "texture": "#1"} - } - }, - { - "name": "Bottom", - "from": [0, 0, 0], - "to": [16, 4, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [39, 8, 8]}, - "faces": { - "north": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "east": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "south": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "west": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#4"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "down"} - } - } - ], - "groups": [ - { - "name": "tank", - "origin": [8, 8, -23], - "color": 0, - "children": [0, 1, 2, 3, 4] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_middle.json b/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_middle.json deleted file mode 100644 index aea5d625..00000000 --- a/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_middle.json +++ /dev/null @@ -1,57 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "1": "createindustry:block/cast_iron_fluid_tank", - "particle": "createindustry:block/cast_iron_fluid_tank" - }, - "elements": [ - { - "name": "SideRight", - "from": [0, 0, 0], - "to": [16, 16, 1], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, -23]}, - "faces": { - "north": {"uv": [0, 0, 16, 16], "texture": "#1", "cullface": "north"}, - "south": {"uv": [0, 0, 16, 16], "texture": "#1", "cullface": "north"} - } - }, - { - "name": "SideRight", - "from": [15, 0, 0], - "to": [16, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]}, - "faces": { - "east": {"uv": [0, 0, 16, 16], "texture": "#1", "cullface": "east"}, - "west": {"uv": [0, 0, 16, 16], "texture": "#1", "cullface": "east"} - } - }, - { - "name": "SideRight", - "from": [0, 0, 15], - "to": [16, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]}, - "faces": { - "north": {"uv": [0, 0, 16, 16], "texture": "#1", "cullface": "south"}, - "south": {"uv": [0, 0, 16, 16], "texture": "#1", "cullface": "south"} - } - }, - { - "name": "SideRight", - "from": [0, 0, 0], - "to": [1, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]}, - "faces": { - "east": {"uv": [0, 0, 16, 16], "texture": "#1", "cullface": "west"}, - "west": {"uv": [0, 0, 16, 16], "texture": "#1", "cullface": "west"} - } - } - ], - "groups": [ - { - "name": "tank", - "origin": [8, 8, -23], - "children": [0, 1, 2, 3] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_middle_window.json b/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_middle_window.json deleted file mode 100644 index f77fc237..00000000 --- a/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_middle_window.json +++ /dev/null @@ -1,138 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "1": "createindustry:block/cast_iron_fluid_tank", - "3": "createindustry:block/fluid_tank_window", - "particle": "createindustry:block/fluid_tank" - }, - "elements": [ - { - "name": "SideRight", - "from": [0, 0, 0], - "to": [4, 16, 1], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]}, - "faces": { - "north": {"uv": [12, 0, 16, 16], "texture": "#1", "cullface": "north"}, - "east": {"uv": [0, 0, 1, 16], "texture": "#1", "cullface": "north"}, - "south": {"uv": [0, 0, 4, 16], "texture": "#1", "cullface": "north"} - } - }, - { - "name": "SideRight", - "from": [15, 0, 0], - "to": [16, 16, 4], - "faces": { - "east": {"uv": [12, 0, 16, 16], "texture": "#1", "cullface": "east"}, - "south": {"uv": [0, 0, 1, 16], "texture": "#1", "cullface": "east"}, - "west": {"uv": [0, 0, 4, 16], "texture": "#1", "cullface": "east"} - } - }, - { - "name": "SideRight", - "from": [12, 0, 15], - "to": [16, 16, 16], - "faces": { - "north": {"uv": [0, 0, 4, 16], "texture": "#1", "cullface": "south"}, - "south": {"uv": [12, 0, 16, 16], "texture": "#1", "cullface": "south"}, - "west": {"uv": [0, 0, 1, 16], "texture": "#1", "cullface": "south"} - } - }, - { - "name": "SideRight", - "from": [0, 0, 12], - "to": [1, 16, 16], - "faces": { - "north": {"uv": [0, 0, 1, 16], "texture": "#1", "cullface": "west"}, - "east": {"uv": [0, 0, 4, 16], "texture": "#1", "cullface": "west"}, - "west": {"uv": [12, 0, 16, 16], "texture": "#1", "cullface": "west"} - } - }, - { - "name": "Window", - "from": [4, 0, 0.95], - "to": [12, 16, 0.95], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]}, - "faces": { - "north": {"uv": [8, 0, 16, 16], "texture": "#3", "cullface": "north"}, - "south": {"uv": [8, 0, 16, 16], "texture": "#3", "cullface": "north"} - } - }, - { - "name": "Window", - "from": [15.05, 0, 4], - "to": [15.05, 16, 12], - "faces": { - "east": {"uv": [8, 0, 16, 16], "texture": "#3", "cullface": "east"}, - "west": {"uv": [8, 0, 16, 16], "texture": "#3", "cullface": "east"} - } - }, - { - "name": "Window", - "from": [4, 0, 15.05], - "to": [12, 16, 15.05], - "faces": { - "north": {"uv": [8, 0, 16, 16], "texture": "#3", "cullface": "south"}, - "south": {"uv": [8, 0, 16, 16], "texture": "#3", "cullface": "south"} - } - }, - { - "name": "Window", - "from": [0.95, 0, 4], - "to": [0.95, 16, 12], - "faces": { - "east": {"uv": [8, 0, 16, 16], "texture": "#3", "cullface": "west"}, - "west": {"uv": [8, 0, 16, 16], "texture": "#3", "cullface": "west"} - } - }, - { - "name": "SideLeft", - "from": [12, 0, 0], - "to": [16, 16, 1], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]}, - "faces": { - "north": {"uv": [0, 0, 4, 16], "texture": "#1", "cullface": "north"}, - "south": {"uv": [12, 0, 16, 16], "texture": "#1", "cullface": "north"}, - "west": {"uv": [15, 0, 16, 16], "texture": "#1", "cullface": "north"} - } - }, - { - "name": "SideLeft", - "from": [15, 0, 12], - "to": [16, 16, 16], - "faces": { - "north": {"uv": [15, 0, 16, 16], "texture": "#1", "cullface": "east"}, - "east": {"uv": [0, 0, 4, 16], "texture": "#1", "cullface": "east"}, - "west": {"uv": [12, 0, 16, 16], "texture": "#1", "cullface": "east"} - } - }, - { - "name": "SideLeft", - "from": [0, 0, 15], - "to": [4, 16, 16], - "faces": { - "north": {"uv": [12, 0, 16, 16], "texture": "#1", "cullface": "south"}, - "east": {"uv": [15, 0, 16, 16], "texture": "#1", "cullface": "south"}, - "south": {"uv": [0, 0, 4, 16], "texture": "#1", "cullface": "south"} - } - }, - { - "name": "SideLeft", - "from": [0, 0, 0], - "to": [1, 16, 4], - "faces": { - "east": {"uv": [12, 0, 16, 16], "texture": "#1", "cullface": "west"}, - "south": {"uv": [15, 0, 16, 16], "texture": "#1", "cullface": "west"}, - "west": {"uv": [0, 0, 4, 16], "texture": "#1", "cullface": "west"} - } - } - ], - "groups": [ - { - "name": "tank", - "origin": [8, 8, -23], - "color": 0, - "children": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_middle_window_ne.json b/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_middle_window_ne.json deleted file mode 100644 index 9e997cac..00000000 --- a/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_middle_window_ne.json +++ /dev/null @@ -1,57 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "1": "createindustry:block/cast_iron_fluid_tank", - "3": "createindustry:block/cast_iron_fluid_tank_window", - "particle": "createindustry:block/cast_iron_fluid_tank" - }, - "elements": [ - { - "name": "SideRight", - "from": [15, 0, 0], - "to": [16, 16, 12], - "faces": { - "east": {"uv": [4, 0, 16, 16], "texture": "#1"}, - "south": {"uv": [4, 0, 5, 16], "texture": "#1"}, - "west": {"uv": [0, 0, 12, 16], "texture": "#1"} - } - }, - { - "name": "Window", - "from": [0, 0, 0.95], - "to": [4, 16, 0.95], - "faces": { - "north": {"uv": [8, 0, 12, 16], "texture": "#3"}, - "south": {"uv": [12, 0, 16, 16], "texture": "#3"} - } - }, - { - "name": "Window", - "from": [15.05, 0, 12], - "to": [15.05, 16, 16], - "faces": { - "east": {"uv": [12, 0, 16, 16], "texture": "#3"}, - "west": {"uv": [8, 0, 12, 16], "texture": "#3"} - } - }, - { - "name": "SideLeft", - "from": [4, 0, 0], - "to": [16, 16, 1], - "faces": { - "north": {"uv": [0, 0, 12, 16], "texture": "#1"}, - "south": {"uv": [4, 0, 16, 16], "texture": "#1"}, - "west": {"uv": [11, 0, 12, 16], "texture": "#1"} - } - } - ], - "groups": [ - { - "name": "tank", - "origin": [8, 8, -23], - "color": 0, - "children": [0, 1, 2, 3] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_middle_window_nw.json b/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_middle_window_nw.json deleted file mode 100644 index d0722de3..00000000 --- a/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_middle_window_nw.json +++ /dev/null @@ -1,57 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "1": "createindustry:block/cast_iron_fluid_tank", - "3": "createindustry:block/cast_iron_fluid_tank_window", - "particle": "createindustry:block/cast_iron_fluid_tank" - }, - "elements": [ - { - "name": "SideRight", - "from": [0, 0, 0], - "to": [12, 16, 1], - "faces": { - "north": {"uv": [4, 0, 16, 16], "texture": "#1"}, - "east": {"uv": [4, 0, 5, 16], "texture": "#1"}, - "south": {"uv": [0, 0, 12, 16], "texture": "#1"} - } - }, - { - "name": "Window", - "from": [0.95, 0, 12], - "to": [0.95, 16, 16], - "faces": { - "east": {"uv": [12, 0, 16, 16], "texture": "#3"}, - "west": {"uv": [8, 0, 12, 16], "texture": "#3"} - } - }, - { - "name": "Window", - "from": [12, 0, 0.95], - "to": [16, 16, 0.95], - "faces": { - "north": {"uv": [12, 0, 16, 16], "texture": "#3"}, - "south": {"uv": [8, 0, 12, 16], "texture": "#3"} - } - }, - { - "name": "SideLeft", - "from": [0, 0, 0], - "to": [1, 16, 12], - "faces": { - "east": {"uv": [4, 0, 16, 16], "texture": "#1"}, - "south": {"uv": [11, 0, 12, 16], "texture": "#1"}, - "west": {"uv": [0, 0, 12, 16], "texture": "#1"} - } - } - ], - "groups": [ - { - "name": "tank", - "origin": [8, 8, -23], - "color": 0, - "children": [0, 1, 2, 3] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_middle_window_se.json b/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_middle_window_se.json deleted file mode 100644 index 769dec70..00000000 --- a/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_middle_window_se.json +++ /dev/null @@ -1,57 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "1": "createindustry:block/cast_iron_fluid_tank", - "3": "createindustry:block/cast_iron_fluid_tank_window", - "particle": "createindustry:block/cast_iron_fluid_tank" - }, - "elements": [ - { - "name": "SideRight", - "from": [4, 0, 15], - "to": [16, 16, 16], - "faces": { - "north": {"uv": [0, 0, 12, 16], "texture": "#1"}, - "south": {"uv": [4, 0, 16, 16], "texture": "#1"}, - "west": {"uv": [4, 0, 5, 16], "texture": "#1"} - } - }, - { - "name": "Window", - "from": [15.05, 0, 0], - "to": [15.05, 16, 4], - "faces": { - "east": {"uv": [8, 0, 12, 16], "texture": "#3"}, - "west": {"uv": [12, 0, 16, 16], "texture": "#3"} - } - }, - { - "name": "Window", - "from": [0, 0, 15.05], - "to": [4, 16, 15.05], - "faces": { - "north": {"uv": [8, 0, 12, 16], "texture": "#3"}, - "south": {"uv": [12, 0, 16, 16], "texture": "#3"} - } - }, - { - "name": "SideLeft", - "from": [15, 0, 4], - "to": [16, 16, 16], - "faces": { - "north": {"uv": [11, 0, 12, 16], "texture": "#1"}, - "east": {"uv": [0, 0, 12, 16], "texture": "#1"}, - "west": {"uv": [4, 0, 16, 16], "texture": "#1"} - } - } - ], - "groups": [ - { - "name": "tank", - "origin": [8, 8, -23], - "color": 0, - "children": [0, 1, 2, 3] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_middle_window_sw.json b/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_middle_window_sw.json deleted file mode 100644 index 68dd4b46..00000000 --- a/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_middle_window_sw.json +++ /dev/null @@ -1,57 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "1": "createindustry:block/cast_iron_fluid_tank", - "3": "createindustry:block/cast_iron_fluid_tank_window", - "particle": "createindustry:block/cast_iron_fluid_tank" - }, - "elements": [ - { - "name": "SideRight", - "from": [0, 0, 4], - "to": [1, 16, 16], - "faces": { - "north": {"uv": [4, 0, 5, 16], "texture": "#1"}, - "east": {"uv": [0, 0, 12, 16], "texture": "#1"}, - "west": {"uv": [4, 0, 16, 16], "texture": "#1"} - } - }, - { - "name": "Window", - "from": [12, 0, 15.05], - "to": [16, 16, 15.05], - "faces": { - "north": {"uv": [12, 0, 16, 16], "texture": "#3"}, - "south": {"uv": [8, 0, 12, 16], "texture": "#3"} - } - }, - { - "name": "Window", - "from": [0.95, 0, 0], - "to": [0.95, 16, 4], - "faces": { - "east": {"uv": [8, 0, 12, 16], "texture": "#3"}, - "west": {"uv": [12, 0, 16, 16], "texture": "#3"} - } - }, - { - "name": "SideLeft", - "from": [0, 0, 15], - "to": [12, 16, 16], - "faces": { - "north": {"uv": [4, 0, 16, 16], "texture": "#1"}, - "east": {"uv": [11, 0, 12, 16], "texture": "#1"}, - "south": {"uv": [0, 0, 12, 16], "texture": "#1"} - } - } - ], - "groups": [ - { - "name": "tank", - "origin": [8, 8, -23], - "color": 0, - "children": [0, 1, 2, 3] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_single.json b/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_single.json deleted file mode 100644 index e6b3517f..00000000 --- a/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_single.json +++ /dev/null @@ -1,127 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "0": "createindustry:block/cast_iron_fluid_tank_top", - "1": "createindustry:block/cast_iron_fluid_tank", - "4": "createindustry:block/cast_iron_fluid_tank_inner", - "particle": "createindustry:block/cast_iron_fluid_tank" - }, - "elements": [ - { - "name": "Lid", - "from": [0, 0, 0], - "to": [16, 4, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]}, - "faces": { - "north": {"uv": [0, 12, 16, 16], "texture": "#1", "cullface": "north"}, - "east": {"uv": [0, 12, 16, 16], "texture": "#1", "cullface": "east"}, - "south": {"uv": [0, 12, 16, 16], "texture": "#1", "cullface": "south"}, - "west": {"uv": [0, 12, 16, 16], "texture": "#1", "cullface": "west"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#4"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "down"} - } - }, - { - "name": "SideRight", - "from": [15, 4, 0], - "to": [16, 12, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]}, - "faces": { - "east": {"uv": [0, 4, 16, 12], "texture": "#1", "cullface": "east"}, - "west": {"uv": [0, 4, 16, 12], "texture": "#1", "cullface": "east"} - } - }, - { - "name": "SideRight", - "from": [0, 4, 15], - "to": [16, 12, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]}, - "faces": { - "north": {"uv": [0, 4, 16, 12], "texture": "#1", "cullface": "south"}, - "south": {"uv": [0, 4, 16, 12], "texture": "#1", "cullface": "south"} - } - }, - { - "name": "SideRight", - "from": [0, 4, 0], - "to": [1, 12, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]}, - "faces": { - "east": {"uv": [0, 4, 16, 12], "texture": "#1", "cullface": "west"}, - "west": {"uv": [0, 4, 16, 12], "texture": "#1", "cullface": "west"} - } - }, - { - "name": "Lid", - "from": [0, 12, 0], - "to": [16, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]}, - "faces": { - "north": {"uv": [0, 0, 16, 4], "texture": "#1", "cullface": "north"}, - "east": {"uv": [0, 0, 16, 4], "texture": "#1", "cullface": "east"}, - "south": {"uv": [0, 0, 16, 4], "texture": "#1", "cullface": "south"}, - "west": {"uv": [0, 0, 16, 4], "texture": "#1", "cullface": "west"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "up"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#4"} - } - }, - { - "name": "SideRight", - "from": [0, 4, 0], - "to": [16, 12, 1], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]}, - "faces": { - "north": {"uv": [0, 4, 16, 12], "texture": "#1", "cullface": "north"}, - "south": {"uv": [0, 4, 16, 12], "texture": "#1", "cullface": "north"} - } - } - ], - "groups": [ - { - "name": "tank", - "origin": [8, 8, -23], - "color": 0, - "children": [] - }, - { - "name": "block_middle", - "origin": [8, 8, 8], - "color": 0, - "children": [ - { - "name": "tank", - "origin": [8, 8, -23], - "color": 0, - "children": [] - } - ] - }, - { - "name": "block_bottom", - "origin": [8, 8, 8], - "color": 0, - "children": [ - { - "name": "tank", - "origin": [8, 8, -23], - "color": 0, - "children": [0, 1, 2, 3] - } - ] - }, - { - "name": "block_top", - "origin": [8, 8, 8], - "color": 0, - "children": [ - { - "name": "tank", - "origin": [8, 8, -23], - "color": 0, - "children": [4, 5] - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_single_window.json b/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_single_window.json deleted file mode 100644 index a7dab069..00000000 --- a/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_single_window.json +++ /dev/null @@ -1,168 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "0": "createindustry:block/cast_iron_fluid_tank_top", - "1": "createindustry:block/cast_iron_fluid_tank", - "4": "createindustry:block/cast_iron_fluid_tank_inner", - "5": "createindustry:block/cast_iron_fluid_tank_window_single", - "particle": "createindustry:block/cast_iron_fluid_tank" - }, - "elements": [ - { - "name": "Lid", - "from": [0, 12, 0], - "to": [16, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]}, - "faces": { - "north": {"uv": [0, 0, 16, 4], "texture": "#1", "cullface": "north"}, - "east": {"uv": [0, 0, 16, 4], "texture": "#1", "cullface": "east"}, - "south": {"uv": [0, 0, 16, 4], "texture": "#1", "cullface": "south"}, - "west": {"uv": [0, 0, 16, 4], "texture": "#1", "cullface": "west"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "up"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#4"} - } - }, - { - "name": "SideRight", - "from": [0, 4, 0], - "to": [4, 12, 1], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]}, - "faces": { - "north": {"uv": [12, 4, 16, 12], "texture": "#1", "cullface": "north"}, - "east": {"uv": [8, 4, 9, 12], "texture": "#1", "cullface": "north"}, - "south": {"uv": [0, 4, 4, 12], "texture": "#1", "cullface": "north"} - } - }, - { - "name": "SideRight", - "from": [15, 4, 0], - "to": [16, 12, 4], - "faces": { - "east": {"uv": [12, 4, 16, 12], "texture": "#1", "cullface": "east"}, - "south": {"uv": [8, 4, 9, 12], "texture": "#1", "cullface": "east"}, - "west": {"uv": [0, 4, 4, 12], "texture": "#1", "cullface": "east"} - } - }, - { - "name": "SideRight", - "from": [12, 4, 15], - "to": [16, 12, 16], - "faces": { - "north": {"uv": [0, 4, 4, 12], "texture": "#1", "cullface": "south"}, - "south": {"uv": [12, 4, 16, 12], "texture": "#1", "cullface": "south"}, - "west": {"uv": [8, 4, 9, 12], "texture": "#1", "cullface": "south"} - } - }, - { - "name": "SideRight", - "from": [0, 4, 12], - "to": [1, 12, 16], - "faces": { - "north": {"uv": [8, 4, 9, 12], "texture": "#1", "cullface": "west"}, - "east": {"uv": [0, 4, 4, 12], "texture": "#1", "cullface": "west"}, - "west": {"uv": [12, 4, 16, 12], "texture": "#1", "cullface": "west"} - } - }, - { - "name": "Window", - "from": [4, 4, 0.95], - "to": [12, 12, 0.95], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]}, - "faces": { - "north": {"uv": [0, 0, 8, 8], "texture": "#5", "cullface": "north"}, - "south": {"uv": [0, 0, 8, 8], "texture": "#5", "cullface": "north"} - } - }, - { - "name": "Window", - "from": [15.05, 4, 4], - "to": [15.05, 12, 12], - "faces": { - "east": {"uv": [0, 0, 8, 8], "texture": "#5", "cullface": "east"}, - "west": {"uv": [0, 0, 8, 8], "texture": "#5", "cullface": "east"} - } - }, - { - "name": "Window", - "from": [4, 4, 15.05], - "to": [12, 12, 15.05], - "faces": { - "north": {"uv": [0, 0, 8, 8], "texture": "#5", "cullface": "south"}, - "south": {"uv": [0, 0, 8, 8], "texture": "#5", "cullface": "south"} - } - }, - { - "name": "Window", - "from": [0.95, 4, 4], - "to": [0.95, 12, 12], - "faces": { - "east": {"uv": [0, 0, 8, 8], "texture": "#5", "cullface": "west"}, - "west": {"uv": [0, 0, 8, 8], "texture": "#5", "cullface": "west"} - } - }, - { - "name": "SideLeft", - "from": [12, 4, 0], - "to": [16, 12, 1], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]}, - "faces": { - "north": {"uv": [0, 4, 4, 12], "texture": "#1", "cullface": "north"}, - "south": {"uv": [12, 4, 16, 12], "texture": "#1", "cullface": "north"}, - "west": {"uv": [7, 4, 8, 12], "texture": "#1", "cullface": "north"} - } - }, - { - "name": "SideLeft", - "from": [15, 4, 12], - "to": [16, 12, 16], - "faces": { - "north": {"uv": [7, 4, 8, 12], "texture": "#1", "cullface": "east"}, - "east": {"uv": [0, 4, 4, 12], "texture": "#1", "cullface": "east"}, - "west": {"uv": [12, 4, 16, 12], "texture": "#1", "cullface": "east"} - } - }, - { - "name": "SideLeft", - "from": [0, 4, 15], - "to": [4, 12, 16], - "faces": { - "north": {"uv": [12, 4, 16, 12], "texture": "#1", "cullface": "south"}, - "east": {"uv": [7, 4, 8, 12], "texture": "#1", "cullface": "south"}, - "south": {"uv": [0, 4, 4, 12], "texture": "#1", "cullface": "south"} - } - }, - { - "name": "SideLeft", - "from": [0, 4, 0], - "to": [1, 12, 4], - "faces": { - "east": {"uv": [12, 4, 16, 12], "texture": "#1", "cullface": "west"}, - "south": {"uv": [7, 4, 8, 12], "texture": "#1", "cullface": "west"}, - "west": {"uv": [0, 4, 4, 12], "texture": "#1", "cullface": "west"} - } - }, - { - "name": "Bottom", - "from": [0, 0, 0], - "to": [16, 4, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]}, - "faces": { - "north": {"uv": [0, 12, 16, 16], "texture": "#1", "cullface": "north"}, - "east": {"uv": [0, 12, 16, 16], "texture": "#1", "cullface": "east"}, - "south": {"uv": [0, 12, 16, 16], "texture": "#1", "cullface": "south"}, - "west": {"uv": [0, 12, 16, 16], "texture": "#1", "cullface": "west"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#4"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "down"} - } - } - ], - "groups": [ - { - "name": "tank", - "origin": [8, 8, -23], - "color": 0, - "children": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_single_window_ne.json b/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_single_window_ne.json deleted file mode 100644 index f7594492..00000000 --- a/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_single_window_ne.json +++ /dev/null @@ -1,104 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "0": "createindustry:block/cast_iron_fluid_tank_top", - "1": "createindustry:block/cast_iron_fluid_tank", - "4": "createindustry:block/cast_iron_fluid_tank_inner", - "5": "createindustry:block/cast_iron_fluid_tank_window_single", - "particle": "createindustry:block/cast_iron_fluid_tank" - }, - "elements": [ - { - "name": "SideRight", - "from": [15, 4, 0], - "to": [16, 12, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "east": {"uv": [4, 4, 16, 12], "texture": "#1"}, - "south": {"uv": [4, 4, 5, 12], "texture": "#1"}, - "west": {"uv": [0, 4, 12, 12], "texture": "#1"} - } - }, - { - "name": "Window", - "from": [0, 4, 0.95], - "to": [4, 12, 0.95], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "north": {"uv": [0, 0, 4, 8], "texture": "#5"}, - "south": {"uv": [4, 0, 8, 8], "texture": "#5"} - } - }, - { - "name": "Window", - "from": [15.05, 4, 12], - "to": [15.05, 12, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "east": {"uv": [4, 0, 8, 8], "texture": "#5"}, - "west": {"uv": [0, 0, 4, 8], "texture": "#5"} - } - }, - { - "name": "SideLeft", - "from": [4, 4, 0], - "to": [16, 12, 1], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "north": {"uv": [0, 4, 12, 12], "texture": "#1"}, - "south": {"uv": [4, 4, 16, 12], "texture": "#1"}, - "west": {"uv": [11, 4, 12, 12], "texture": "#1"} - } - }, - { - "name": "Bottom", - "from": [0, 12, 0], - "to": [16, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [-23, 8, 8]}, - "faces": { - "north": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "east": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "south": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "west": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "up"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#4"} - } - }, - { - "name": "Bottom", - "from": [0, 0, 0], - "to": [16, 4, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [-23, 8, 8]}, - "faces": { - "north": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "east": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "south": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "west": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#4"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "down"} - } - } - ], - "groups": [ - { - "name": "tank", - "origin": [8, 8, -23], - "color": 0, - "children": [0, 1, 2, 3, 4] - }, - { - "name": "block_bottom_centered_window", - "origin": [8, 8, 8], - "color": 0, - "children": [ - { - "name": "tank", - "origin": [8, 8, -23], - "color": 0, - "children": [5] - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_single_window_nw.json b/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_single_window_nw.json deleted file mode 100644 index 3f06f6f8..00000000 --- a/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_single_window_nw.json +++ /dev/null @@ -1,104 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "0": "createindustry:block/cast_iron_fluid_tank_top", - "1": "createindustry:block/cast_iron_fluid_tank", - "4": "createindustry:block/cast_iron_fluid_tank_inner", - "5": "createindustry:block/cast_iron_fluid_tank_window_single", - "particle": "createindustry:block/cast_iron_fluid_tank" - }, - "elements": [ - { - "name": "SideRight", - "from": [0, 4, 0], - "to": [12, 12, 1], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "north": {"uv": [4, 4, 16, 12], "texture": "#1"}, - "east": {"uv": [4, 4, 5, 12], "texture": "#1"}, - "south": {"uv": [0, 4, 12, 12], "texture": "#1"} - } - }, - { - "name": "Window", - "from": [0.95, 4, 12], - "to": [0.95, 12, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "east": {"uv": [4, 0, 8, 8], "texture": "#5"}, - "west": {"uv": [0, 0, 4, 8], "texture": "#5"} - } - }, - { - "name": "Window", - "from": [12, 4, 0.95], - "to": [16, 12, 0.95], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "north": {"uv": [4, 0, 8, 8], "texture": "#5"}, - "south": {"uv": [0, 0, 4, 8], "texture": "#5"} - } - }, - { - "name": "SideLeft", - "from": [0, 4, 0], - "to": [1, 12, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "east": {"uv": [4, 4, 16, 12], "texture": "#1"}, - "south": {"uv": [11, 4, 12, 12], "texture": "#1"}, - "west": {"uv": [0, 4, 12, 12], "texture": "#1"} - } - }, - { - "name": "Bottom", - "from": [0, 12, 0], - "to": [16, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 39]}, - "faces": { - "north": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "east": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "south": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "west": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "up"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#4"} - } - }, - { - "name": "Bottom", - "from": [0, 0, 0], - "to": [16, 4, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 39]}, - "faces": { - "north": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "east": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "south": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "west": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#4"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "down"} - } - } - ], - "groups": [ - { - "name": "tank", - "origin": [8, 8, -23], - "color": 0, - "children": [0, 1, 2, 3, 4] - }, - { - "name": "block_bottom_centered_window", - "origin": [8, 8, 8], - "color": 0, - "children": [ - { - "name": "tank", - "origin": [8, 8, -23], - "color": 0, - "children": [5] - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_single_window_se.json b/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_single_window_se.json deleted file mode 100644 index 9e7f5ff8..00000000 --- a/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_single_window_se.json +++ /dev/null @@ -1,104 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "0": "createindustry:block/cast_iron_fluid_tank_top", - "1": "createindustry:block/cast_iron_fluid_tank", - "4": "createindustry:block/cast_iron_fluid_tank_inner", - "5": "createindustry:block/cast_iron_fluid_tank_window_single", - "particle": "createindustry:block/fluid_tank" - }, - "elements": [ - { - "name": "SideRight", - "from": [4, 4, 15], - "to": [16, 12, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "north": {"uv": [0, 4, 12, 12], "texture": "#1"}, - "south": {"uv": [4, 4, 16, 12], "texture": "#1"}, - "west": {"uv": [4, 4, 5, 12], "texture": "#1"} - } - }, - { - "name": "Window", - "from": [15.05, 4, 0], - "to": [15.05, 12, 4], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "east": {"uv": [0, 0, 4, 8], "texture": "#5"}, - "west": {"uv": [4, 0, 8, 8], "texture": "#5"} - } - }, - { - "name": "Window", - "from": [0, 4, 15.05], - "to": [4, 12, 15.05], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "north": {"uv": [0, 0, 4, 8], "texture": "#5"}, - "south": {"uv": [4, 0, 8, 8], "texture": "#5"} - } - }, - { - "name": "SideLeft", - "from": [15, 4, 4], - "to": [16, 12, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "north": {"uv": [11, 4, 12, 12], "texture": "#1"}, - "east": {"uv": [0, 4, 12, 12], "texture": "#1"}, - "west": {"uv": [4, 4, 16, 12], "texture": "#1"} - } - }, - { - "name": "Bottom", - "from": [0, 12, 0], - "to": [16, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]}, - "faces": { - "north": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "east": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "south": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "west": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "up"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#4"} - } - }, - { - "name": "Bottom", - "from": [0, 0, 0], - "to": [16, 4, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]}, - "faces": { - "north": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "east": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "south": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "west": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#4"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "down"} - } - } - ], - "groups": [ - { - "name": "tank", - "origin": [8, 8, -23], - "color": 0, - "children": [0, 1, 2, 3, 4] - }, - { - "name": "block_bottom_centered_window", - "origin": [8, 8, 8], - "color": 0, - "children": [ - { - "name": "tank", - "origin": [8, 8, -23], - "color": 0, - "children": [5] - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_single_window_sw.json b/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_single_window_sw.json deleted file mode 100644 index 3e6ff727..00000000 --- a/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_single_window_sw.json +++ /dev/null @@ -1,104 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "0": "createindustry:block/cast_iron_fluid_tank_top", - "1": "createindustry:block/cast_iron_fluid_tank", - "4": "createindustry:block/cast_iron_fluid_tank_inner", - "5": "createindustry:block/cast_iron_fluid_tank_window_single", - "particle": "createindustry:block/cast_iron_fluid_tank" - }, - "elements": [ - { - "name": "SideRight", - "from": [0, 4, 4], - "to": [1, 12, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "north": {"uv": [4, 4, 5, 12], "texture": "#1"}, - "east": {"uv": [0, 4, 12, 12], "texture": "#1"}, - "west": {"uv": [4, 4, 16, 12], "texture": "#1"} - } - }, - { - "name": "Window", - "from": [12, 4, 15.05], - "to": [16, 12, 15.05], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "north": {"uv": [4, 0, 8, 8], "texture": "#5"}, - "south": {"uv": [0, 0, 4, 8], "texture": "#5"} - } - }, - { - "name": "Window", - "from": [0.95, 4, 0], - "to": [0.95, 12, 4], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "east": {"uv": [0, 0, 4, 8], "texture": "#5"}, - "west": {"uv": [4, 0, 8, 8], "texture": "#5"} - } - }, - { - "name": "SideLeft", - "from": [0, 4, 15], - "to": [12, 12, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "north": {"uv": [4, 4, 16, 12], "texture": "#1"}, - "east": {"uv": [11, 4, 12, 12], "texture": "#1"}, - "south": {"uv": [0, 4, 12, 12], "texture": "#1"} - } - }, - { - "name": "Bottom", - "from": [0, 12, 0], - "to": [16, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [39, 8, 8]}, - "faces": { - "north": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "east": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "south": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "west": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "up"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#4"} - } - }, - { - "name": "Bottom", - "from": [0, 0, 0], - "to": [16, 4, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [39, 8, 8]}, - "faces": { - "north": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "east": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "south": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "west": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#4"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "down"} - } - } - ], - "groups": [ - { - "name": "tank", - "origin": [8, 8, -23], - "color": 0, - "children": [0, 1, 2, 3, 4] - }, - { - "name": "block_bottom_centered_window", - "origin": [8, 8, 8], - "color": 0, - "children": [ - { - "name": "tank", - "origin": [8, 8, -23], - "color": 0, - "children": [5] - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_top.json b/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_top.json deleted file mode 100644 index 002909e5..00000000 --- a/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_top.json +++ /dev/null @@ -1,71 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "0": "createindustry:block/cast_iron_fluid_tank_top", - "1": "createindustry:block/cast_iron_fluid_tank", - "4": "createindustry:block/cast_iron_fluid_tank_inner", - "particle": "createindustry:block/cast_iron_fluid_tank" - }, - "elements": [ - { - "name": "Lid", - "from": [0, 12, 0], - "to": [16, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]}, - "faces": { - "north": {"uv": [0, 0, 16, 4], "texture": "#1", "cullface": "north"}, - "east": {"uv": [0, 0, 16, 4], "texture": "#1", "cullface": "east"}, - "south": {"uv": [0, 0, 16, 4], "texture": "#1", "cullface": "south"}, - "west": {"uv": [0, 0, 16, 4], "texture": "#1", "cullface": "west"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "up"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#4"} - } - }, - { - "name": "SideRight", - "from": [0, 0, 0], - "to": [16, 12, 1], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]}, - "faces": { - "north": {"uv": [0, 4, 16, 16], "texture": "#1", "cullface": "north"}, - "south": {"uv": [0, 4, 16, 16], "texture": "#1", "cullface": "north"} - } - }, - { - "name": "SideRight", - "from": [15, 0, 0], - "to": [16, 12, 16], - "faces": { - "east": {"uv": [0, 4, 16, 16], "texture": "#1", "cullface": "east"}, - "west": {"uv": [0, 4, 16, 16], "texture": "#1", "cullface": "east"} - } - }, - { - "name": "SideRight", - "from": [0, 0, 15], - "to": [16, 12, 16], - "faces": { - "north": {"uv": [0, 4, 16, 16], "texture": "#1", "cullface": "south"}, - "south": {"uv": [0, 4, 16, 16], "texture": "#1", "cullface": "south"} - } - }, - { - "name": "SideRight", - "from": [0, 0, 0], - "to": [1, 12, 16], - "faces": { - "east": {"uv": [0, 4, 16, 16], "texture": "#1", "cullface": "west"}, - "west": {"uv": [0, 4, 16, 16], "texture": "#1", "cullface": "west"} - } - } - ], - "groups": [ - { - "name": "tank", - "origin": [8, 8, -23], - "color": 0, - "children": [0, 1, 2, 3, 4] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_top_window.json b/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_top_window.json deleted file mode 100644 index 7fed7e48..00000000 --- a/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_top_window.json +++ /dev/null @@ -1,154 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "0": "createindustry:block/cast_iron_fluid_tank_top", - "1": "createindustry:block/cast_iron_fluid_tank", - "3": "createindustry:block/cast_iron_fluid_tank_window", - "4": "createindustry:block/cast_iron_fluid_tank_inner", - "particle": "createindustry:block/cast_iron_fluid_tank" - }, - "elements": [ - { - "name": "Lid", - "from": [0, 12, 0], - "to": [16, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]}, - "faces": { - "north": {"uv": [0, 0, 16, 4], "texture": "#1", "cullface": "north"}, - "east": {"uv": [0, 0, 16, 4], "texture": "#1", "cullface": "east"}, - "south": {"uv": [0, 0, 16, 4], "texture": "#1", "cullface": "south"}, - "west": {"uv": [0, 0, 16, 4], "texture": "#1", "cullface": "west"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "up"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#4"} - } - }, - { - "name": "SideRight", - "from": [0, 0, 0], - "to": [4, 12, 1], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]}, - "faces": { - "north": {"uv": [12, 4, 16, 16], "texture": "#1", "cullface": "north"}, - "east": {"uv": [0, 4, 1, 16], "texture": "#1", "cullface": "north"}, - "south": {"uv": [0, 4, 4, 16], "texture": "#1", "cullface": "north"} - } - }, - { - "name": "SideRight", - "from": [15, 0, 0], - "to": [16, 12, 4], - "faces": { - "east": {"uv": [12, 4, 16, 16], "texture": "#1", "cullface": "east"}, - "south": {"uv": [0, 4, 1, 16], "texture": "#1", "cullface": "east"}, - "west": {"uv": [0, 4, 4, 16], "texture": "#1", "cullface": "east"} - } - }, - { - "name": "SideRight", - "from": [12, 0, 15], - "to": [16, 12, 16], - "faces": { - "north": {"uv": [0, 4, 4, 16], "texture": "#1", "cullface": "south"}, - "south": {"uv": [12, 4, 16, 16], "texture": "#1", "cullface": "south"}, - "west": {"uv": [0, 4, 1, 16], "texture": "#1", "cullface": "south"} - } - }, - { - "name": "SideRight", - "from": [0, 0, 12], - "to": [1, 12, 16], - "faces": { - "north": {"uv": [0, 4, 1, 16], "texture": "#1", "cullface": "west"}, - "east": {"uv": [0, 4, 4, 16], "texture": "#1", "cullface": "west"}, - "west": {"uv": [12, 4, 16, 16], "texture": "#1", "cullface": "west"} - } - }, - { - "name": "Window", - "from": [4, 0, 0.95], - "to": [12, 12, 0.95], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]}, - "faces": { - "north": {"uv": [0, 0, 8, 12], "texture": "#3", "cullface": "north"}, - "south": {"uv": [0, 0, 8, 12], "texture": "#3", "cullface": "north"} - } - }, - { - "name": "Window", - "from": [15.05, 0, 4], - "to": [15.05, 12, 12], - "faces": { - "east": {"uv": [0, 0, 8, 12], "texture": "#3", "cullface": "east"}, - "west": {"uv": [0, 0, 8, 12], "texture": "#3", "cullface": "east"} - } - }, - { - "name": "Window", - "from": [4, 0, 15.05], - "to": [12, 12, 15.05], - "faces": { - "north": {"uv": [0, 0, 8, 12], "texture": "#3", "cullface": "south"}, - "south": {"uv": [0, 0, 8, 12], "texture": "#3", "cullface": "south"} - } - }, - { - "name": "Window", - "from": [0.95, 0, 4], - "to": [0.95, 12, 12], - "faces": { - "east": {"uv": [0, 0, 8, 12], "texture": "#3", "cullface": "west"}, - "west": {"uv": [0, 0, 8, 12], "texture": "#3", "cullface": "west"} - } - }, - { - "name": "SideLeft", - "from": [12, 0, 0], - "to": [16, 12, 1], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]}, - "faces": { - "north": {"uv": [0, 4, 4, 16], "texture": "#1", "cullface": "north"}, - "south": {"uv": [12, 4, 16, 16], "texture": "#1", "cullface": "north"}, - "west": {"uv": [15, 4, 16, 16], "texture": "#1", "cullface": "north"} - } - }, - { - "name": "SideLeft", - "from": [15, 0, 12], - "to": [16, 12, 16], - "faces": { - "north": {"uv": [15, 4, 16, 16], "texture": "#1", "cullface": "east"}, - "east": {"uv": [0, 4, 4, 16], "texture": "#1", "cullface": "east"}, - "west": {"uv": [12, 4, 16, 16], "texture": "#1", "cullface": "east"} - } - }, - { - "name": "SideLeft", - "from": [0, 0, 15], - "to": [4, 12, 16], - "faces": { - "north": {"uv": [12, 4, 16, 16], "texture": "#1", "cullface": "south"}, - "east": {"uv": [15, 4, 16, 16], "texture": "#1", "cullface": "south"}, - "south": {"uv": [0, 4, 4, 16], "texture": "#1", "cullface": "south"} - } - }, - { - "name": "SideLeft", - "from": [0, 0, 0], - "to": [1, 12, 4], - "faces": { - "east": {"uv": [12, 4, 16, 16], "texture": "#1", "cullface": "west"}, - "south": {"uv": [15, 4, 16, 16], "texture": "#1", "cullface": "west"}, - "west": {"uv": [0, 4, 4, 16], "texture": "#1", "cullface": "west"} - } - } - ], - "groups": [ - { - "name": "tank", - "origin": [8, 8, -23], - "color": 0, - "children": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_top_window_ne.json b/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_top_window_ne.json deleted file mode 100644 index 5912cd02..00000000 --- a/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_top_window_ne.json +++ /dev/null @@ -1,77 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "0": "createindustry:block/cast_iron_fluid_tank_top", - "1": "createindustry:block/cast_iron_fluid_tank", - "3": "createindustry:block/cast_iron_fluid_tank_window", - "4": "createindustry:block/cast_iron_fluid_tank_inner", - "particle": "createindustry:block/cast_iron_fluid_tank" - }, - "elements": [ - { - "name": "SideRight", - "from": [15, 0, 0], - "to": [16, 12, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "east": {"uv": [4, 4, 16, 16], "texture": "#1"}, - "south": {"uv": [4, 4, 5, 16], "texture": "#1"}, - "west": {"uv": [0, 4, 12, 16], "texture": "#1"} - } - }, - { - "name": "Window", - "from": [0, 0, 0.95], - "to": [4, 12, 0.95], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "north": {"uv": [0, 0, 4, 12], "texture": "#3"}, - "south": {"uv": [4, 0, 8, 12], "texture": "#3"} - } - }, - { - "name": "Window", - "from": [15.05, 0, 12], - "to": [15.05, 12, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "east": {"uv": [4, 0, 8, 12], "texture": "#3"}, - "west": {"uv": [0, 0, 4, 12], "texture": "#3"} - } - }, - { - "name": "SideLeft", - "from": [4, 0, 0], - "to": [16, 12, 1], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "north": {"uv": [0, 4, 12, 16], "texture": "#1"}, - "south": {"uv": [4, 4, 16, 16], "texture": "#1"}, - "west": {"uv": [11, 4, 12, 16], "texture": "#1"} - } - }, - { - "name": "Bottom", - "from": [0, 12, 0], - "to": [16, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [-23, 8, 8]}, - "faces": { - "north": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "east": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "south": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "west": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "up"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#4"} - } - } - ], - "groups": [ - { - "name": "tank", - "origin": [8, 8, -23], - "color": 0, - "children": [0, 1, 2, 3, 4] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_top_window_nw.json b/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_top_window_nw.json deleted file mode 100644 index 2f07162a..00000000 --- a/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_top_window_nw.json +++ /dev/null @@ -1,77 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "0": "createindustry:block/cast_iron_fluid_tank_top", - "1": "createindustry:block/cast_iron_fluid_tank", - "3": "createindustry:block/cast_iron_fluid_tank_window", - "4": "createindustry:block/cast_iron_fluid_tank_inner", - "particle": "createindustry:block/cast_iron_fluid_tank" - }, - "elements": [ - { - "name": "SideRight", - "from": [0, 0, 0], - "to": [12, 12, 1], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "north": {"uv": [4, 4, 16, 16], "texture": "#1"}, - "east": {"uv": [4, 4, 5, 16], "texture": "#1"}, - "south": {"uv": [0, 4, 12, 16], "texture": "#1"} - } - }, - { - "name": "Window", - "from": [0.95, 0, 12], - "to": [0.95, 12, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "east": {"uv": [4, 0, 8, 12], "texture": "#3"}, - "west": {"uv": [0, 0, 4, 12], "texture": "#3"} - } - }, - { - "name": "Window", - "from": [12, 0, 0.95], - "to": [16, 12, 0.95], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "north": {"uv": [4, 0, 8, 12], "texture": "#3"}, - "south": {"uv": [0, 0, 4, 12], "texture": "#3"} - } - }, - { - "name": "SideLeft", - "from": [0, 0, 0], - "to": [1, 12, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "east": {"uv": [4, 4, 16, 16], "texture": "#1"}, - "south": {"uv": [11, 4, 12, 16], "texture": "#1"}, - "west": {"uv": [0, 4, 12, 16], "texture": "#1"} - } - }, - { - "name": "Bottom", - "from": [0, 12, 0], - "to": [16, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 39]}, - "faces": { - "north": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "east": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "south": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "west": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "up"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#4"} - } - } - ], - "groups": [ - { - "name": "tank", - "origin": [8, 8, -23], - "color": 0, - "children": [0, 1, 2, 3, 4] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_top_window_se.json b/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_top_window_se.json deleted file mode 100644 index dc2ff9b9..00000000 --- a/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_top_window_se.json +++ /dev/null @@ -1,77 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "0": "createindustry:block/cast_iron_fluid_tank_top", - "1": "createindustry:block/cast_iron_fluid_tank", - "3": "createindustry:block/cast_iron_fluid_tank_window", - "4": "createindustry:block/cast_iron_fluid_tank_inner", - "particle": "createindustry:block/cast_iron_fluid_tank" - }, - "elements": [ - { - "name": "SideRight", - "from": [4, 0, 15], - "to": [16, 12, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "north": {"uv": [0, 4, 12, 16], "texture": "#1"}, - "south": {"uv": [4, 4, 16, 16], "texture": "#1"}, - "west": {"uv": [4, 4, 5, 16], "texture": "#1"} - } - }, - { - "name": "Window", - "from": [15.05, 0, 0], - "to": [15.05, 12, 4], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "east": {"uv": [0, 0, 4, 12], "texture": "#3"}, - "west": {"uv": [4, 0, 8, 12], "texture": "#3"} - } - }, - { - "name": "Window", - "from": [0, 0, 15.05], - "to": [4, 12, 15.05], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "north": {"uv": [0, 0, 4, 12], "texture": "#3"}, - "south": {"uv": [4, 0, 8, 12], "texture": "#3"} - } - }, - { - "name": "SideLeft", - "from": [15, 0, 4], - "to": [16, 12, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "north": {"uv": [11, 4, 12, 16], "texture": "#1"}, - "east": {"uv": [0, 4, 12, 16], "texture": "#1"}, - "west": {"uv": [4, 4, 16, 16], "texture": "#1"} - } - }, - { - "name": "Bottom", - "from": [0, 12, 0], - "to": [16, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]}, - "faces": { - "north": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "east": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "south": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "west": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "up"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#4"} - } - } - ], - "groups": [ - { - "name": "tank", - "origin": [8, 8, -23], - "color": 0, - "children": [0, 1, 2, 3, 4] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_top_window_sw.json b/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_top_window_sw.json deleted file mode 100644 index b860ee88..00000000 --- a/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_top_window_sw.json +++ /dev/null @@ -1,77 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "0": "createindustry:block/cast_iron_fluid_tank_top", - "1": "createindustry:block/cast_iron_fluid_tank", - "3": "createindustry:block/cast_iron_fluid_tank_window", - "4": "createindustry:block/cast_iron_fluid_tank_inner", - "particle": "createindustry:block/cast_iron_fluid_tank" - }, - "elements": [ - { - "name": "SideRight", - "from": [0, 0, 4], - "to": [1, 12, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "north": {"uv": [4, 4, 5, 16], "texture": "#1"}, - "east": {"uv": [0, 4, 12, 16], "texture": "#1"}, - "west": {"uv": [4, 4, 16, 16], "texture": "#1"} - } - }, - { - "name": "Window", - "from": [12, 0, 15.05], - "to": [16, 12, 15.05], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "north": {"uv": [4, 0, 8, 12], "texture": "#3"}, - "south": {"uv": [0, 0, 4, 12], "texture": "#3"} - } - }, - { - "name": "Window", - "from": [0.95, 0, 0], - "to": [0.95, 12, 4], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "east": {"uv": [0, 0, 4, 12], "texture": "#3"}, - "west": {"uv": [4, 0, 8, 12], "texture": "#3"} - } - }, - { - "name": "SideLeft", - "from": [0, 0, 15], - "to": [12, 12, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "north": {"uv": [4, 4, 16, 16], "texture": "#1"}, - "east": {"uv": [11, 4, 12, 16], "texture": "#1"}, - "south": {"uv": [0, 4, 12, 16], "texture": "#1"} - } - }, - { - "name": "Bottom", - "from": [0, 12, 0], - "to": [16, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [39, 8, 8]}, - "faces": { - "north": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "east": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "south": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "west": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "up"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#4"} - } - } - ], - "groups": [ - { - "name": "tank", - "origin": [8, 8, -23], - "color": 0, - "children": [0, 1, 2, 3, 4] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_valve/block_horizontal_closed.json b/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_valve/block_horizontal_closed.json index aa081f55..aeb19fdd 100644 --- a/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_valve/block_horizontal_closed.json +++ b/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_valve/block_horizontal_closed.json @@ -1,9 +1,9 @@ { "credit": "Made with Blockbench", "textures": { - "2": "create:block/fluid_valve", - "4": "create:block/pipes", - "particle": "create:block/copper_plating" + "2": "createindustry:block/cast_iron_fluid_valve", + "4": "createindustry:block/cast_iron_pipes", + "particle": "createindustry:block/cast_iron_block" }, "elements": [ { diff --git a/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_valve/block_horizontal_open.json b/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_valve/block_horizontal_open.json index 4f830bff..59cee066 100644 --- a/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_valve/block_horizontal_open.json +++ b/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_valve/block_horizontal_open.json @@ -1,9 +1,9 @@ { "credit": "Made with Blockbench", "textures": { - "2": "create:block/fluid_valve", - "4": "create:block/pipes", - "particle": "create:block/copper_plating" + "2": "createindustry:block/cast_iron_fluid_valve", + "4": "createindustry:block/cast_iron_pipes", + "particle": "createindustry:block/cast_iron_block" }, "elements": [ { diff --git a/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_valve/block_vertical_closed.json b/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_valve/block_vertical_closed.json index 1f7b5fee..11df0360 100644 --- a/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_valve/block_vertical_closed.json +++ b/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_valve/block_vertical_closed.json @@ -1,9 +1,9 @@ { "credit": "Made with Blockbench", "textures": { - "2": "create:block/fluid_valve", - "3": "create:block/pipes", - "particle": "create:block/copper_plating" + "2": "createindustry:block/cast_iron_fluid_valve", + "3": "createindustry:block/cast_iron_pipes", + "particle": "createindustry:block/cast_iron_block" }, "elements": [ { diff --git a/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_valve/block_vertical_open.json b/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_valve/block_vertical_open.json index b95cd9a3..6d65fabf 100644 --- a/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_valve/block_vertical_open.json +++ b/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_valve/block_vertical_open.json @@ -1,9 +1,9 @@ { "credit": "Made with Blockbench", "textures": { - "2": "create:block/fluid_valve", - "3": "create:block/pipes", - "particle": "create:block/copper_plating" + "2": "createindustry:block/cast_iron_fluid_valve", + "3": "createindustry:block/cast_iron_pipes", + "particle": "createindustry:block/cast_iron_block" }, "elements": [ { diff --git a/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_valve/item.json b/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_valve/item.json index b09bd0b7..520f945d 100644 --- a/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_valve/item.json +++ b/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_valve/item.json @@ -1,12 +1,12 @@ { "credit": "Made with Blockbench", "textures": { - "2": "create:block/fluid_valve", - "3": "create:block/pipes", + "2": "createindustry:block/cast_iron_fluid_valve", + "3": "createindustry:block/cast_iron_pipes", "4": "create:block/pump", "1_1": "create:block/axis_top", "1_0": "create:block/axis", - "particle": "create:block/copper_plating" + "particle": "createindustry:block/cast_iron_block" }, "elements": [ { diff --git a/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_valve/pointer.json b/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_valve/pointer.json index 2e9eed35..ee557d88 100644 --- a/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_valve/pointer.json +++ b/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_valve/pointer.json @@ -1,9 +1,9 @@ { "credit": "Made with Blockbench", "textures": { - "2": "create:block/fluid_valve", + "2": "createindustry:block/cast_iron_fluid_valve", "4": "create:block/pump", - "particle": "create:block/copper_plating" + "particle": "createindustry:block/cast_iron_block" }, "elements": [ { diff --git a/src/main/resources/assets/createindustry/models/block/cast_iron_mechanical_pump/block.json b/src/main/resources/assets/createindustry/models/block/cast_iron_mechanical_pump/block.json index 8dd3ab9b..406a0f77 100644 --- a/src/main/resources/assets/createindustry/models/block/cast_iron_mechanical_pump/block.json +++ b/src/main/resources/assets/createindustry/models/block/cast_iron_mechanical_pump/block.json @@ -2,9 +2,9 @@ "credit": "Made with Blockbench", "parent": "create:block/block", "textures": { - "2": "create:block/pipes", - "4": "create:block/pump", - "particle": "create:block/pump" + "2": "createindustry:block/cast_iron_pipes", + "4": "createindustry:block/cast_iron_pump", + "particle": "createindustry:block/cast_iron_pump" }, "elements": [ { diff --git a/src/main/resources/assets/createindustry/models/block/cast_iron_mechanical_pump/item.json b/src/main/resources/assets/createindustry/models/block/cast_iron_mechanical_pump/item.json index 161c4910..28cb6388 100644 --- a/src/main/resources/assets/createindustry/models/block/cast_iron_mechanical_pump/item.json +++ b/src/main/resources/assets/createindustry/models/block/cast_iron_mechanical_pump/item.json @@ -2,10 +2,10 @@ "credit": "Made with Blockbench", "parent": "create:block/block", "textures": { - "2": "create:block/pipes", - "4": "create:block/pump", + "2": "createindustry:block/cast_iron_pipes", + "4": "createindustry:block/cast_iron_pump", "5": "create:block/millstone", - "particle": "create:block/pump" + "particle": "createindustry:block/cast_iron_pump" }, "elements": [ { diff --git a/src/main/resources/assets/createindustry/models/block/cast_iron_smart_fluid_pipe/block.json b/src/main/resources/assets/createindustry/models/block/cast_iron_smart_fluid_pipe/block.json index 1f674588..e30a96d3 100644 --- a/src/main/resources/assets/createindustry/models/block/cast_iron_smart_fluid_pipe/block.json +++ b/src/main/resources/assets/createindustry/models/block/cast_iron_smart_fluid_pipe/block.json @@ -2,9 +2,9 @@ "credit": "Made with Blockbench", "parent": "block/block", "textures": { - "2": "create:block/smart_pipe_1", - "3": "create:block/smart_pipe_2", - "particle": "create:block/smart_pipe_2" + "2": "createindustry:block/cast_iron_smart_pipe_1", + "3": "createindustry:block/cast_iron_smart_pipe_2", + "particle": "createindustry:block/cast_iron_smart_pipe_2" }, "elements": [ { diff --git a/src/main/resources/assets/createindustry/models/block/cast_iron_smart_fluid_pipe/item.json b/src/main/resources/assets/createindustry/models/block/cast_iron_smart_fluid_pipe/item.json index a3df689d..5dc14d67 100644 --- a/src/main/resources/assets/createindustry/models/block/cast_iron_smart_fluid_pipe/item.json +++ b/src/main/resources/assets/createindustry/models/block/cast_iron_smart_fluid_pipe/item.json @@ -2,9 +2,9 @@ "credit": "Made with Blockbench", "parent": "block/block", "textures": { - "1": "create:block/pipes", - "2": "create:block/smart_pipe_1", - "3": "create:block/smart_pipe_2" + "1": "createindustry:block/cast_iron_pipes", + "2": "createindustry:block/cast_iron_smart_pipe_1", + "3": "createindustry:block/cast_iron_smart_pipe_2" }, "elements": [ { 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 81b65a7e..801453b9 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 @@ -78,5 +78,12 @@ "down": {"uv": [13.5, 0, 15.5, 2], "texture": "#1"} } } - ] + ], + "display": { + "gui": { + "rotation": [23, 45, 0], + "translation": [0, 1.5, 0], + "scale": [0.6, 0.6, 0.6] + } + } } \ No newline at end of file diff --git a/src/main/resources/assets/createindustry/models/block/copper_encased_aluminum_pipe/block_open.json b/src/main/resources/assets/createindustry/models/block/copper_encased_aluminum_pipe/block_open.json index e5202be8..f70c8efa 100644 --- a/src/main/resources/assets/createindustry/models/block/copper_encased_aluminum_pipe/block_open.json +++ b/src/main/resources/assets/createindustry/models/block/copper_encased_aluminum_pipe/block_open.json @@ -1,8 +1,8 @@ { "credit": "Made with Blockbench", "textures": { - "0": "createindustry:block/copper_encased_steel_pipe", - "particle": "createindustry:block/copper_encased_steel_pipe" + "0": "createindustry:block/copper_encased_aluminum_pipe", + "particle": "createindustry:block/copper_encased_aluminum_pipe" }, "elements": [ { diff --git a/src/main/resources/assets/createindustry/models/block/copper_encased_brass_pipe/block_open.json b/src/main/resources/assets/createindustry/models/block/copper_encased_brass_pipe/block_open.json index e5202be8..69084a96 100644 --- a/src/main/resources/assets/createindustry/models/block/copper_encased_brass_pipe/block_open.json +++ b/src/main/resources/assets/createindustry/models/block/copper_encased_brass_pipe/block_open.json @@ -1,8 +1,8 @@ { "credit": "Made with Blockbench", "textures": { - "0": "createindustry:block/copper_encased_steel_pipe", - "particle": "createindustry:block/copper_encased_steel_pipe" + "0": "createindustry:block/copper_encased_brass_pipe", + "particle": "createindustry:block/copper_encased_brass_pipe" }, "elements": [ { diff --git a/src/main/resources/assets/createindustry/models/block/copper_encased_cast_iron_pipe/block_open.json b/src/main/resources/assets/createindustry/models/block/copper_encased_cast_iron_pipe/block_open.json index e5202be8..4b53aa22 100644 --- a/src/main/resources/assets/createindustry/models/block/copper_encased_cast_iron_pipe/block_open.json +++ b/src/main/resources/assets/createindustry/models/block/copper_encased_cast_iron_pipe/block_open.json @@ -1,8 +1,8 @@ { "credit": "Made with Blockbench", "textures": { - "0": "createindustry:block/copper_encased_steel_pipe", - "particle": "createindustry:block/copper_encased_steel_pipe" + "0": "createindustry:block/copper_encased_cast_iron_pipe", + "particle": "createindustry:block/copper_encased_cast_iron_pipe" }, "elements": [ { diff --git a/src/main/resources/assets/createindustry/models/block/copper_encased_plastic_pipe/block_open.json b/src/main/resources/assets/createindustry/models/block/copper_encased_plastic_pipe/block_open.json index e5202be8..a8363e7d 100644 --- a/src/main/resources/assets/createindustry/models/block/copper_encased_plastic_pipe/block_open.json +++ b/src/main/resources/assets/createindustry/models/block/copper_encased_plastic_pipe/block_open.json @@ -1,8 +1,8 @@ { "credit": "Made with Blockbench", "textures": { - "0": "createindustry:block/copper_encased_steel_pipe", - "particle": "createindustry:block/copper_encased_steel_pipe" + "0": "createindustry:block/copper_encased_plastic_pipe", + "particle": "createindustry:block/copper_encased_plastic_pipe" }, "elements": [ { diff --git a/src/main/resources/assets/createindustry/models/block/gasoline_engine/block.json b/src/main/resources/assets/createindustry/models/block/gasoline_engine/block.json index 6a22507d..1633c558 100644 --- a/src/main/resources/assets/createindustry/models/block/gasoline_engine/block.json +++ b/src/main/resources/assets/createindustry/models/block/gasoline_engine/block.json @@ -3,7 +3,7 @@ "parent": "minecraft:block/block", "textures": { "2": "createindustry:block/engines/gasoline", - "particle": "createindustry:block/engines/gasoline" + "particle": "block/anvil" }, "elements": [ { diff --git a/src/main/resources/assets/createindustry/models/block/gasoline_engine/item.json b/src/main/resources/assets/createindustry/models/block/gasoline_engine/item.json index e6e9f48d..19579e75 100644 --- a/src/main/resources/assets/createindustry/models/block/gasoline_engine/item.json +++ b/src/main/resources/assets/createindustry/models/block/gasoline_engine/item.json @@ -5,7 +5,7 @@ "1": "create:block/axis", "2": "createindustry:block/engines/gasoline", "3": "create:block/axis_top", - "particle": "createindustry:block/engines/gasoline" + "particle": "block/anvil" }, "elements": [ { diff --git a/src/main/resources/assets/createindustry/models/block/lpg_engine/block.json b/src/main/resources/assets/createindustry/models/block/lpg_engine/block.json index 3440aede..f4151382 100644 --- a/src/main/resources/assets/createindustry/models/block/lpg_engine/block.json +++ b/src/main/resources/assets/createindustry/models/block/lpg_engine/block.json @@ -1,105 +1,106 @@ { "credit": "Made with Blockbench", "parent": "minecraft:block/block", + "texture_size": [128, 128], "textures": { - "1": "createindustry:block/gasoline_engine", - "particle": "minecraft:block/anvil" + "0": "createindustry:block/engines/lpg", + "particle": "block/anvil" }, "elements": [ { "from": [2, 3, 2], "to": [14, 12, 16], "faces": { - "north": {"uv": [3.125, 0.375, 4.625, 1.5], "texture": "#1"}, - "east": {"uv": [13.625, 4.5, 11.875, 5.625], "texture": "#1"}, - "south": {"uv": [2.25, 2.125, 3.75, 3.25], "texture": "#1"}, - "west": {"uv": [11.875, 4.5, 13.625, 5.625], "texture": "#1"}, - "up": {"uv": [5.375, 5.7, 6.875, 7.5], "rotation": 180, "texture": "#1"}, - "down": {"uv": [11.875, 0.625, 13.125, 1.5], "texture": "#1"} + "north": {"uv": [0.5, 0, 2, 1.125], "texture": "#0"}, + "east": {"uv": [0.25, 6.125, 2, 7.25], "texture": "#0"}, + "south": {"uv": [2.75, 0, 4.25, 1.125], "texture": "#0"}, + "west": {"uv": [2, 6.125, 3.75, 7.25], "texture": "#0"}, + "up": {"uv": [2, 5.25, 0.5, 3.5], "texture": "#0"}, + "down": {"uv": [4.25, 1.75, 2.75, 3.5], "texture": "#0"} } }, { "from": [0, 0, 2], "to": [16, 3, 16], "faces": { - "north": {"uv": [2.875, 1.5, 4.875, 1.875], "texture": "#1"}, - "east": {"uv": [11.875, 9.625, 13.625, 9.25], "rotation": 180, "texture": "#1"}, - "south": {"uv": [2, 3.25, 4, 3.625], "texture": "#1"}, - "west": {"uv": [11.875, 9.25, 13.625, 9.625], "texture": "#1"}, - "up": {"uv": [0, 0, 16, 14], "texture": "#1"}, - "down": {"uv": [5.125, 3.75, 7.125, 5.5], "rotation": 180, "texture": "#1"} + "north": {"uv": [0.25, 1.125, 2.25, 1.5], "texture": "#0"}, + "east": {"uv": [0.25, 7.375, 2, 7.75], "texture": "#0"}, + "south": {"uv": [2.5, 1.125, 4.5, 1.5], "texture": "#0"}, + "west": {"uv": [2, 7.375, 3.75, 7.75], "texture": "#0"}, + "up": {"uv": [2, 1.75, 0, 0], "texture": "#0"}, + "down": {"uv": [4.5, 1.75, 2.5, 3.5], "texture": "#0"} } }, { "from": [3, 6, 11], "to": [7, 15, 15], "faces": { - "north": {"uv": [15.5, 0, 16, 1.25], "texture": "#1"}, - "east": {"uv": [15.5, 0, 16, 1.25], "texture": "#1"}, - "south": {"uv": [15.5, 0, 16, 1.25], "texture": "#1"}, - "west": {"uv": [15.5, 0, 16, 1.25], "texture": "#1"}, - "up": {"uv": [15.5, 1.375, 16, 1.875], "texture": "#1"}, - "down": {"uv": [0, 0, 4, 4], "texture": "#1"} + "north": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "east": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "south": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "west": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "up": {"uv": [6.875, 1.625, 6.375, 1.125], "texture": "#0"}, + "down": {"uv": [6.875, 1.125, 6.375, 1.625], "texture": "#0"} } }, { "from": [9, 6, 11], "to": [13, 15, 15], "faces": { - "north": {"uv": [15.5, 0, 16, 1.25], "texture": "#1"}, - "east": {"uv": [15.5, 0, 16, 1.25], "texture": "#1"}, - "south": {"uv": [15.5, 0, 16, 1.25], "texture": "#1"}, - "west": {"uv": [15.5, 0, 16, 1.25], "texture": "#1"}, - "up": {"uv": [15.5, 1.375, 16, 1.875], "texture": "#1"}, - "down": {"uv": [0, 0, 4, 4], "texture": "#1"} + "north": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "east": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "south": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "west": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "up": {"uv": [6.875, 1.625, 6.375, 1.125], "texture": "#0"}, + "down": {"uv": [6.875, 1.125, 6.375, 1.625], "texture": "#0"} } }, { "from": [9, 6, 5], "to": [13, 15, 9], "faces": { - "north": {"uv": [16, 0, 15.5, 1.25], "texture": "#1"}, - "east": {"uv": [15.5, 0, 16, 1.25], "texture": "#1"}, - "south": {"uv": [15.5, 0, 16, 1.25], "texture": "#1"}, - "west": {"uv": [15.5, 0, 16, 1.25], "texture": "#1"}, - "up": {"uv": [15.5, 1.375, 16, 1.875], "texture": "#1"}, - "down": {"uv": [0, 0, 4, 4], "texture": "#1"} + "north": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "east": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "south": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "west": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "up": {"uv": [6.875, 1.625, 6.375, 1.125], "texture": "#0"}, + "down": {"uv": [6.875, 1.125, 6.375, 1.625], "texture": "#0"} } }, { "from": [3, 6, 5], "to": [7, 15, 9], "faces": { - "north": {"uv": [15.5, 0, 16, 1.25], "texture": "#1"}, - "east": {"uv": [15.5, 0, 16, 1.25], "texture": "#1"}, - "south": {"uv": [15.5, 0, 16, 1.25], "texture": "#1"}, - "west": {"uv": [15.5, 0, 16, 1.25], "texture": "#1"}, - "up": {"uv": [15.5, 1.375, 16, 1.875], "texture": "#1"}, - "down": {"uv": [0, 0, 4, 4], "texture": "#1"} + "north": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "east": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "south": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "west": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "up": {"uv": [6.875, 1.625, 6.375, 1.125], "texture": "#0"}, + "down": {"uv": [6.875, 1.125, 6.375, 1.625], "texture": "#0"} } }, { "from": [0, 3, 2], "to": [2, 7, 16], "faces": { - "north": {"uv": [4.625, 1, 4.875, 1.5], "texture": "#1"}, - "east": {"uv": [0, 0, 14, 4], "texture": "#1"}, - "south": {"uv": [2, 2.75, 2.25, 3.25], "texture": "#1"}, - "west": {"uv": [11.875, 8.75, 13.625, 9.25], "texture": "#1"}, - "up": {"uv": [8.75, 3.75, 9, 5.5], "texture": "#1"}, - "down": {"uv": [0, 0, 2, 14], "texture": "#1"} + "north": {"uv": [2, 0.625, 2.25, 1.125], "texture": "#0"}, + "east": {"uv": [3.5, 2.25, 5.25, 2.75], "texture": "#0"}, + "south": {"uv": [2.5, 0.625, 2.75, 1.125], "texture": "#0"}, + "west": {"uv": [2, 6.875, 3.75, 7.375], "texture": "#0"}, + "up": {"uv": [2.375, 3.5, 2.125, 1.75], "texture": "#0"}, + "down": {"uv": [5.75, 5.125, 5.5, 6.875], "texture": "#0"} } }, { "from": [14, 3, 2], "to": [16, 7, 16], "faces": { - "north": {"uv": [2.875, 1, 3.125, 1.5], "texture": "#1"}, - "east": {"uv": [13.625, 8.75, 11.875, 9.25], "texture": "#1"}, - "south": {"uv": [3.75, 2.75, 4, 3.25], "texture": "#1"}, - "west": {"uv": [0, 0, 14, 4], "texture": "#1"}, - "up": {"uv": [8.875, 3.75, 8.625, 5.5], "texture": "#1"}, - "down": {"uv": [0, 0, 2, 14], "texture": "#1"} + "north": {"uv": [0.25, 0.625, 0.5, 1.125], "texture": "#0"}, + "east": {"uv": [0.25, 6.875, 2, 7.375], "texture": "#0"}, + "south": {"uv": [4.25, 0.625, 4.5, 1.125], "texture": "#0"}, + "west": {"uv": [3.875, 5.5, 5.625, 6], "texture": "#0"}, + "up": {"uv": [0.375, 3.5, 0.125, 1.75], "texture": "#0"}, + "down": {"uv": [6, 5.125, 5.75, 6.875], "texture": "#0"} } } ] diff --git a/src/main/resources/assets/createindustry/models/block/lpg_engine/item.json b/src/main/resources/assets/createindustry/models/block/lpg_engine/item.json index 221ee827..7dbb5822 100644 --- a/src/main/resources/assets/createindustry/models/block/lpg_engine/item.json +++ b/src/main/resources/assets/createindustry/models/block/lpg_engine/item.json @@ -1,107 +1,107 @@ { "credit": "Made with Blockbench", "parent": "minecraft:block/block", + "texture_size": [128, 128], "textures": { - "1": "createindustry:block/gasoline_engine", - "3": "create:block/axis_top", - "4": "create:block/axis", - "particle": "block/anvil" + "0": "createindustry:block/engines/lpg", + "1": "create:block/axis", + "2": "create:block/axis_top", + "particle": "createindustry:block/engines/lpg" }, "elements": [ { "from": [2, 3, 2], "to": [14, 12, 16], "faces": { - "north": {"uv": [3.125, 0.375, 4.625, 1.5], "texture": "#1"}, - "east": {"uv": [13.625, 4.5, 11.875, 5.625], "texture": "#1"}, - "south": {"uv": [2.25, 2.125, 3.75, 3.25], "texture": "#1"}, - "west": {"uv": [11.875, 4.5, 13.625, 5.625], "texture": "#1"}, - "up": {"uv": [5.375, 5.7, 6.875, 7.5], "rotation": 180, "texture": "#1"}, - "down": {"uv": [11.875, 0.625, 13.125, 1.5], "texture": "#1"} + "north": {"uv": [0.5, 0, 2, 1.125], "texture": "#0"}, + "east": {"uv": [0.25, 6.125, 2, 7.25], "texture": "#0"}, + "south": {"uv": [2.75, 0, 4.25, 1.125], "texture": "#0"}, + "west": {"uv": [2, 6.125, 3.75, 7.25], "texture": "#0"}, + "up": {"uv": [2, 5.25, 0.5, 3.5], "texture": "#0"}, + "down": {"uv": [4.25, 1.75, 2.75, 3.5], "texture": "#0"} } }, { "from": [0, 0, 2], "to": [16, 3, 16], "faces": { - "north": {"uv": [2.875, 1.5, 4.875, 1.875], "texture": "#1"}, - "east": {"uv": [11.875, 9.625, 13.625, 9.25], "rotation": 180, "texture": "#1"}, - "south": {"uv": [2, 3.25, 4, 3.625], "texture": "#1"}, - "west": {"uv": [11.875, 9.25, 13.625, 9.625], "texture": "#1"}, - "up": {"uv": [0, 0, 16, 14], "texture": "#1"}, - "down": {"uv": [5.125, 3.75, 7.125, 5.5], "rotation": 180, "texture": "#1"} + "north": {"uv": [0.25, 1.125, 2.25, 1.5], "texture": "#0"}, + "east": {"uv": [0.25, 7.375, 2, 7.75], "texture": "#0"}, + "south": {"uv": [2.5, 1.125, 4.5, 1.5], "texture": "#0"}, + "west": {"uv": [2, 7.375, 3.75, 7.75], "texture": "#0"}, + "down": {"uv": [4.5, 1.75, 2.5, 3.5], "texture": "#0"} } }, { "from": [3, 6, 11], "to": [7, 15, 15], "faces": { - "north": {"uv": [15.5, 0, 16, 1.25], "texture": "#1"}, - "east": {"uv": [15.5, 0, 16, 1.25], "texture": "#1"}, - "south": {"uv": [15.5, 0, 16, 1.25], "texture": "#1"}, - "west": {"uv": [15.5, 0, 16, 1.25], "texture": "#1"}, - "up": {"uv": [15.5, 1.375, 16, 1.875], "texture": "#1"}, - "down": {"uv": [0, 0, 4, 4], "texture": "#1"} + "north": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "east": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "south": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "west": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "up": {"uv": [6.875, 1.625, 6.375, 1.125], "texture": "#0"}, + "down": {"uv": [6.875, 1.125, 6.375, 1.625], "texture": "#0"} } }, { "from": [9, 6, 11], "to": [13, 15, 15], "faces": { - "north": {"uv": [15.5, 0, 16, 1.25], "texture": "#1"}, - "east": {"uv": [15.5, 0, 16, 1.25], "texture": "#1"}, - "south": {"uv": [15.5, 0, 16, 1.25], "texture": "#1"}, - "west": {"uv": [15.5, 0, 16, 1.25], "texture": "#1"}, - "up": {"uv": [15.5, 1.375, 16, 1.875], "texture": "#1"}, - "down": {"uv": [0, 0, 4, 4], "texture": "#1"} + "north": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "east": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "south": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "west": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "up": {"uv": [6.875, 1.625, 6.375, 1.125], "texture": "#0"}, + "down": {"uv": [6.875, 1.125, 6.375, 1.625], "texture": "#0"} } }, { "from": [9, 6, 5], "to": [13, 15, 9], "faces": { - "north": {"uv": [16, 0, 15.5, 1.25], "texture": "#1"}, - "east": {"uv": [15.5, 0, 16, 1.25], "texture": "#1"}, - "south": {"uv": [15.5, 0, 16, 1.25], "texture": "#1"}, - "west": {"uv": [15.5, 0, 16, 1.25], "texture": "#1"}, - "up": {"uv": [15.5, 1.375, 16, 1.875], "texture": "#1"}, - "down": {"uv": [0, 0, 4, 4], "texture": "#1"} + "north": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "east": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "south": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "west": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "up": {"uv": [6.875, 1.625, 6.375, 1.125], "texture": "#0"}, + "down": {"uv": [6.875, 1.125, 6.375, 1.625], "texture": "#0"} } }, { "from": [3, 6, 5], "to": [7, 15, 9], "faces": { - "north": {"uv": [15.5, 0, 16, 1.25], "texture": "#1"}, - "east": {"uv": [15.5, 0, 16, 1.25], "texture": "#1"}, - "south": {"uv": [15.5, 0, 16, 1.25], "texture": "#1"}, - "west": {"uv": [15.5, 0, 16, 1.25], "texture": "#1"}, - "up": {"uv": [15.5, 1.375, 16, 1.875], "texture": "#1"}, - "down": {"uv": [0, 0, 4, 4], "texture": "#1"} + "north": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "east": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "south": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "west": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "up": {"uv": [6.875, 1.625, 6.375, 1.125], "texture": "#0"}, + "down": {"uv": [6.875, 1.125, 6.375, 1.625], "texture": "#0"} } }, { "from": [0, 3, 2], "to": [2, 7, 16], "faces": { - "north": {"uv": [4.625, 1, 4.875, 1.5], "texture": "#1"}, - "east": {"uv": [0, 0, 14, 4], "texture": "#1"}, - "south": {"uv": [2, 2.75, 2.25, 3.25], "texture": "#1"}, - "west": {"uv": [11.875, 8.75, 13.625, 9.25], "texture": "#1"}, - "up": {"uv": [8.75, 3.75, 9, 5.5], "texture": "#1"}, - "down": {"uv": [0, 0, 2, 14], "texture": "#1"} + "north": {"uv": [2, 0.625, 2.25, 1.125], "texture": "#0"}, + "east": {"uv": [3.5, 2.25, 5.25, 2.75], "texture": "#0"}, + "south": {"uv": [2.5, 0.625, 2.75, 1.125], "texture": "#0"}, + "west": {"uv": [2, 6.875, 3.75, 7.375], "texture": "#0"}, + "up": {"uv": [2.375, 3.5, 2.125, 1.75], "texture": "#0"}, + "down": {"uv": [5.75, 5.125, 5.5, 6.875], "texture": "#0"} } }, { "from": [14, 3, 2], "to": [16, 7, 16], "faces": { - "north": {"uv": [2.875, 1, 3.125, 1.5], "texture": "#1"}, - "east": {"uv": [13.625, 8.75, 11.875, 9.25], "texture": "#1"}, - "south": {"uv": [3.75, 2.75, 4, 3.25], "texture": "#1"}, - "west": {"uv": [0, 0, 14, 4], "texture": "#1"}, - "up": {"uv": [8.875, 3.75, 8.625, 5.5], "texture": "#1"}, - "down": {"uv": [0, 0, 2, 14], "texture": "#1"} + "north": {"uv": [0.25, 0.625, 0.5, 1.125], "texture": "#0"}, + "east": {"uv": [0.25, 6.875, 2, 7.375], "texture": "#0"}, + "south": {"uv": [4.25, 0.625, 4.5, 1.125], "texture": "#0"}, + "west": {"uv": [3.875, 5.5, 5.625, 6], "texture": "#0"}, + "up": {"uv": [0.375, 3.5, 0.125, 1.75], "texture": "#0"}, + "down": {"uv": [6, 5.125, 5.75, 6.875], "texture": "#0"} } }, { @@ -110,12 +110,12 @@ "to": [10, 10, 10], "rotation": {"angle": -22.5, "axis": "z", "origin": [8, 8, 8]}, "faces": { - "north": {"uv": [6, 6, 10, 10], "texture": "#3"}, - "east": {"uv": [6, 0, 10, 10], "rotation": 90, "texture": "#4"}, - "south": {"uv": [6, 6, 10, 10], "rotation": 180, "texture": "#missing"}, - "west": {"uv": [6, 0, 10, 10], "rotation": 270, "texture": "#4"}, - "up": {"uv": [6, 0, 10, 10], "texture": "#4"}, - "down": {"uv": [6, 0, 10, 10], "rotation": 180, "texture": "#4"} + "north": {"uv": [6, 6, 10, 10], "texture": "#2"}, + "east": {"uv": [6, 0, 10, 10], "rotation": 90, "texture": "#1"}, + "south": {"uv": [0, 0, 0, 0], "texture": "#1"}, + "west": {"uv": [6, 0, 10, 10], "rotation": 270, "texture": "#1"}, + "up": {"uv": [6, 0, 10, 10], "texture": "#1"}, + "down": {"uv": [6, 0, 10, 10], "rotation": 180, "texture": "#1"} } } ] diff --git a/src/main/resources/assets/createindustry/models/block/lpg_engine_back/block.json b/src/main/resources/assets/createindustry/models/block/lpg_engine_back/block.json index 7da44390..a5445a6b 100644 --- a/src/main/resources/assets/createindustry/models/block/lpg_engine_back/block.json +++ b/src/main/resources/assets/createindustry/models/block/lpg_engine_back/block.json @@ -1,8 +1,9 @@ { "credit": "Made with Blockbench", "parent": "minecraft:block/block", + "texture_size": [128, 128], "textures": { - "0": "createindustry:block/gasoline_engine", + "0": "createindustry:block/engines/lpg", "particle": "block/anvil" }, "elements": [ @@ -10,110 +11,109 @@ "from": [0, 0, 0], "to": [16, 3, 14], "faces": { - "north": {"uv": [4, 3.25, 6, 3.625], "texture": "#0"}, - "east": {"uv": [11.875, 9.25, 13.625, 9.625], "texture": "#0"}, - "south": {"uv": [0, 0, 16, 3], "texture": "#0"}, - "west": {"uv": [11.875, 9.25, 13.625, 9.625], "texture": "#0"}, - "up": {"uv": [0, 0, 16, 14], "rotation": 180, "texture": "#0"}, - "down": {"uv": [5.125, 5.5, 7.125, 7.25], "rotation": 180, "texture": "#0"} + "north": {"uv": [2.5, 1.125, 4.5, 1.5], "texture": "#0"}, + "east": {"uv": [2, 7.375, 3.75, 7.75], "texture": "#0"}, + "south": {"uv": [5.25, 3.25, 7.25, 3.625], "texture": "#0"}, + "west": {"uv": [2, 7.375, 3.75, 7.75], "texture": "#0"}, + "up": {"uv": [2, 1.75, 0, 0], "texture": "#0"}, + "down": {"uv": [4.5, 3.75, 2.5, 5.5], "texture": "#0"} } }, { "from": [0, 3, 0], "to": [2, 7, 14], "faces": { - "north": {"uv": [4.625, 1, 4.875, 1.5], "texture": "#0"}, - "east": {"uv": [0, 0, 14, 4], "texture": "#0"}, - "south": {"uv": [2, 2.75, 2.25, 3.25], "texture": "#0"}, - "west": {"uv": [11.875, 8.75, 13.625, 9.25], "texture": "#0"}, - "up": {"uv": [8.75, 3.75, 9, 5.5], "texture": "#0"}, - "down": {"uv": [0, 0, 2, 14], "texture": "#0"} + "north": {"uv": [4.25, 0.625, 4.5, 1.125], "texture": "#0"}, + "east": {"uv": [6.75, 5.125, 8.5, 5.625], "texture": "#0"}, + "south": {"uv": [6.5, 4.125, 6.75, 4.625], "texture": "#0"}, + "west": {"uv": [2, 6.875, 3.75, 7.375], "texture": "#0"}, + "up": {"uv": [2.375, 3.5, 2.125, 1.75], "texture": "#0"}, + "down": {"uv": [5.375, 4.375, 5.125, 6.125], "texture": "#0"} } }, { "from": [14, 3, 0], "to": [16, 7, 14], "faces": { - "north": {"uv": [2.875, 1, 3.125, 1.5], "texture": "#0"}, - "east": {"uv": [13.625, 8.75, 11.875, 9.25], "texture": "#0"}, - "south": {"uv": [3.75, 2.75, 4, 3.25], "texture": "#0"}, - "west": {"uv": [0, 0, 14, 4], "texture": "#0"}, - "up": {"uv": [8.875, 3.75, 8.625, 5.5], "texture": "#0"}, - "down": {"uv": [0, 0, 2, 14], "texture": "#0"} + "north": {"uv": [2.5, 0.625, 2.75, 1.125], "texture": "#0"}, + "east": {"uv": [0.25, 6.875, 2, 7.375], "texture": "#0"}, + "south": {"uv": [6.5, 5.75, 6.75, 6.25], "texture": "#0"}, + "west": {"uv": [5, 4.375, 6.75, 4.875], "texture": "#0"}, + "up": {"uv": [0.375, 5.25, 0.125, 3.5], "texture": "#0"}, + "down": {"uv": [0.5, 6.375, 0.25, 8.125], "texture": "#0"} } }, { "from": [2, 3, 0], "to": [14, 12, 14], "faces": { - "north": {"uv": [4.25, 2.125, 5.75, 3.25], "texture": "#0"}, - "east": {"uv": [13.75, 4.5, 15.5, 5.625], "texture": "#0"}, - "south": {"uv": [0, 0, 12, 9], "texture": "#0"}, - "west": {"uv": [13.75, 4.5, 15.5, 5.625], "texture": "#0"}, - "up": {"uv": [5.5, 4.75, 7, 6.55], "texture": "#0"}, - "down": {"uv": [6.75, 10, 10.25, 13.625], "rotation": 180, "texture": "#0"} + "north": {"uv": [2.75, 0, 4.25, 1.125], "texture": "#0"}, + "east": {"uv": [2, 6.125, 3.75, 7.25], "texture": "#0"}, + "south": {"uv": [3.5, 4.375, 5, 5.5], "texture": "#0"}, + "west": {"uv": [2, 6.125, 3.75, 7.25], "texture": "#0"}, + "up": {"uv": [2, 5.25, 0.5, 3.5], "texture": "#0"}, + "down": {"uv": [6, 5.25, 4.5, 7], "texture": "#0"} } }, { "from": [9, 6, 7], "to": [13, 15, 11], "faces": { - "north": {"uv": [15.5, 0, 16, 1.25], "texture": "#0"}, - "east": {"uv": [15.5, 0, 16, 1.25], "texture": "#0"}, - "south": {"uv": [15.5, 0, 16, 1.25], "texture": "#0"}, - "west": {"uv": [15.5, 0, 16, 1.25], "texture": "#0"}, - "up": {"uv": [15.5, 1.375, 16, 1.875], "rotation": 180, "texture": "#0"}, - "down": {"uv": [14.75, 1.5, 15.25, 2], "rotation": 180, "texture": "#0"} + "north": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "east": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "south": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "west": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "up": {"uv": [6.875, 1.625, 6.375, 1.125], "texture": "#0"}, + "down": {"uv": [6.875, 1.125, 6.375, 1.625], "texture": "#0"} } }, { "from": [3, 6, 7], "to": [7, 15, 11], "faces": { - "north": {"uv": [15.5, 0, 16, 1.375], "texture": "#0"}, - "east": {"uv": [15.5, 0, 16, 1.25], "texture": "#0"}, - "south": {"uv": [15.5, 0, 16, 1.25], "texture": "#0"}, - "west": {"uv": [15.5, 0, 16, 1.25], "texture": "#0"}, - "up": {"uv": [15.5, 1.375, 16, 1.875], "rotation": 180, "texture": "#0"}, - "down": {"uv": [0, 9, 4, 13], "rotation": 180, "texture": "#0"} + "north": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "east": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "south": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "west": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "up": {"uv": [6.875, 1.625, 6.375, 1.125], "texture": "#0"}, + "down": {"uv": [6.875, 1.125, 6.375, 1.625], "texture": "#0"} } }, { "from": [3, 6, 1], "to": [7, 15, 5], "faces": { - "north": {"uv": [15.5, 0, 16, 1.25], "texture": "#0"}, - "east": {"uv": [15.5125, 0, 16, 1.275], "texture": "#0"}, - "south": {"uv": [15.5, 0, 16, 1.25], "texture": "#0"}, - "west": {"uv": [15.5, 0, 16, 1.25], "texture": "#0"}, - "up": {"uv": [15.5, 1.375, 16, 1.875], "rotation": 180, "texture": "#0"}, - "down": {"uv": [0, 9.625, 4, 13.625], "rotation": 180, "texture": "#0"} + "north": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "east": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "south": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "west": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "up": {"uv": [6.875, 1.625, 6.375, 1.125], "texture": "#0"}, + "down": {"uv": [6.875, 1.125, 6.375, 1.625], "texture": "#0"} } }, { "from": [9, 6, 1], "to": [13, 15, 5], "faces": { - "north": {"uv": [15.5, 0, 16, 1.25], "texture": "#0"}, - "east": {"uv": [15.5, 0, 16, 1.25], "texture": "#0"}, - "south": {"uv": [15.5, 0, 16, 1.25], "texture": "#0"}, - "west": {"uv": [15.5, 0, 16, 1.25], "texture": "#0"}, - "up": {"uv": [15.5, 1.375, 16, 1.875], "rotation": 180, "texture": "#0"}, - "down": {"uv": [0, 12, 4, 16], "rotation": 180, "texture": "#0"} + "north": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "east": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "south": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "west": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "up": {"uv": [6.875, 1.625, 6.375, 1.125], "texture": "#0"}, + "down": {"uv": [6.875, 1.125, 6.375, 1.625], "texture": "#0"} } }, { "from": [0, 0, 14], "to": [16, 13, 16], "faces": { - "north": {"uv": [9.125, 0.25, 11.125, 1.875], "texture": "#0"}, - "east": {"uv": [9.125, 0.25, 9.375, 1.875], "texture": "#0"}, - "south": {"uv": [9.125, 0.25, 11.125, 1.875], "texture": "#0"}, - "west": {"uv": [10.875, 0.25, 11.125, 1.875], "texture": "#0"}, - "up": {"uv": [6.625, 2.875, 8.625, 3.125], "texture": "#0"}, - "down": {"uv": [5.125, 7.25, 7.125, 7.5], "rotation": 180, "texture": "#0"} + "north": {"uv": [5.625, 1.875, 7.625, 3.5], "texture": "#0"}, + "east": {"uv": [7.75, 1.875, 8, 3.5], "texture": "#0"}, + "south": {"uv": [5.625, 1.875, 7.625, 3.5], "texture": "#0"}, + "west": {"uv": [5.25, 1.875, 5.5, 3.5], "texture": "#0"}, + "up": {"uv": [7.625, 2.125, 5.625, 1.875], "texture": "#0"}, + "down": {"uv": [4.5, 4.625, 2.5, 4.875], "texture": "#0"} } } ] - } \ No newline at end of file diff --git a/src/main/resources/assets/createindustry/models/block/lpg_engine_back/item.json b/src/main/resources/assets/createindustry/models/block/lpg_engine_back/item.json index 7da44390..7f145c09 100644 --- a/src/main/resources/assets/createindustry/models/block/lpg_engine_back/item.json +++ b/src/main/resources/assets/createindustry/models/block/lpg_engine_back/item.json @@ -1,119 +1,119 @@ { "credit": "Made with Blockbench", "parent": "minecraft:block/block", + "texture_size": [128, 128], "textures": { - "0": "createindustry:block/gasoline_engine", - "particle": "block/anvil" + "0": "createindustry:block/engines/lpg", + "particle": "createindustry:block/engines/lpg" }, "elements": [ { "from": [0, 0, 0], "to": [16, 3, 14], "faces": { - "north": {"uv": [4, 3.25, 6, 3.625], "texture": "#0"}, - "east": {"uv": [11.875, 9.25, 13.625, 9.625], "texture": "#0"}, - "south": {"uv": [0, 0, 16, 3], "texture": "#0"}, - "west": {"uv": [11.875, 9.25, 13.625, 9.625], "texture": "#0"}, - "up": {"uv": [0, 0, 16, 14], "rotation": 180, "texture": "#0"}, - "down": {"uv": [5.125, 5.5, 7.125, 7.25], "rotation": 180, "texture": "#0"} + "north": {"uv": [2.5, 1.125, 4.5, 1.5], "texture": "#0"}, + "east": {"uv": [2, 7.375, 3.75, 7.75], "texture": "#0"}, + "south": {"uv": [5.25, 3.25, 7.25, 3.625], "texture": "#0"}, + "west": {"uv": [2, 7.375, 3.75, 7.75], "texture": "#0"}, + "up": {"uv": [2, 1.75, 0, 0], "texture": "#0"}, + "down": {"uv": [4.5, 3.75, 2.5, 5.5], "texture": "#0"} } }, { "from": [0, 3, 0], "to": [2, 7, 14], "faces": { - "north": {"uv": [4.625, 1, 4.875, 1.5], "texture": "#0"}, - "east": {"uv": [0, 0, 14, 4], "texture": "#0"}, - "south": {"uv": [2, 2.75, 2.25, 3.25], "texture": "#0"}, - "west": {"uv": [11.875, 8.75, 13.625, 9.25], "texture": "#0"}, - "up": {"uv": [8.75, 3.75, 9, 5.5], "texture": "#0"}, - "down": {"uv": [0, 0, 2, 14], "texture": "#0"} + "north": {"uv": [4.25, 0.625, 4.5, 1.125], "texture": "#0"}, + "east": {"uv": [6.75, 5.125, 8.5, 5.625], "texture": "#0"}, + "south": {"uv": [6.5, 4.125, 6.75, 4.625], "texture": "#0"}, + "west": {"uv": [2, 6.875, 3.75, 7.375], "texture": "#0"}, + "up": {"uv": [2.375, 3.5, 2.125, 1.75], "texture": "#0"}, + "down": {"uv": [5.375, 4.375, 5.125, 6.125], "texture": "#0"} } }, { "from": [14, 3, 0], "to": [16, 7, 14], "faces": { - "north": {"uv": [2.875, 1, 3.125, 1.5], "texture": "#0"}, - "east": {"uv": [13.625, 8.75, 11.875, 9.25], "texture": "#0"}, - "south": {"uv": [3.75, 2.75, 4, 3.25], "texture": "#0"}, - "west": {"uv": [0, 0, 14, 4], "texture": "#0"}, - "up": {"uv": [8.875, 3.75, 8.625, 5.5], "texture": "#0"}, - "down": {"uv": [0, 0, 2, 14], "texture": "#0"} + "north": {"uv": [2.5, 0.625, 2.75, 1.125], "texture": "#0"}, + "east": {"uv": [0.25, 6.875, 2, 7.375], "texture": "#0"}, + "south": {"uv": [6.5, 5.75, 6.75, 6.25], "texture": "#0"}, + "west": {"uv": [5, 4.375, 6.75, 4.875], "texture": "#0"}, + "up": {"uv": [0.375, 5.25, 0.125, 3.5], "texture": "#0"}, + "down": {"uv": [0.5, 6.375, 0.25, 8.125], "texture": "#0"} } }, { "from": [2, 3, 0], "to": [14, 12, 14], "faces": { - "north": {"uv": [4.25, 2.125, 5.75, 3.25], "texture": "#0"}, - "east": {"uv": [13.75, 4.5, 15.5, 5.625], "texture": "#0"}, - "south": {"uv": [0, 0, 12, 9], "texture": "#0"}, - "west": {"uv": [13.75, 4.5, 15.5, 5.625], "texture": "#0"}, - "up": {"uv": [5.5, 4.75, 7, 6.55], "texture": "#0"}, - "down": {"uv": [6.75, 10, 10.25, 13.625], "rotation": 180, "texture": "#0"} + "north": {"uv": [2.75, 0, 4.25, 1.125], "texture": "#0"}, + "east": {"uv": [2, 6.125, 3.75, 7.25], "texture": "#0"}, + "south": {"uv": [3.5, 4.375, 5, 5.5], "texture": "#0"}, + "west": {"uv": [2, 6.125, 3.75, 7.25], "texture": "#0"}, + "up": {"uv": [2, 5.25, 0.5, 3.5], "texture": "#0"}, + "down": {"uv": [6, 5.25, 4.5, 7], "texture": "#0"} } }, { "from": [9, 6, 7], "to": [13, 15, 11], "faces": { - "north": {"uv": [15.5, 0, 16, 1.25], "texture": "#0"}, - "east": {"uv": [15.5, 0, 16, 1.25], "texture": "#0"}, - "south": {"uv": [15.5, 0, 16, 1.25], "texture": "#0"}, - "west": {"uv": [15.5, 0, 16, 1.25], "texture": "#0"}, - "up": {"uv": [15.5, 1.375, 16, 1.875], "rotation": 180, "texture": "#0"}, - "down": {"uv": [14.75, 1.5, 15.25, 2], "rotation": 180, "texture": "#0"} + "north": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "east": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "south": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "west": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "up": {"uv": [6.875, 1.625, 6.375, 1.125], "texture": "#0"}, + "down": {"uv": [6.875, 1.125, 6.375, 1.625], "texture": "#0"} } }, { "from": [3, 6, 7], "to": [7, 15, 11], "faces": { - "north": {"uv": [15.5, 0, 16, 1.375], "texture": "#0"}, - "east": {"uv": [15.5, 0, 16, 1.25], "texture": "#0"}, - "south": {"uv": [15.5, 0, 16, 1.25], "texture": "#0"}, - "west": {"uv": [15.5, 0, 16, 1.25], "texture": "#0"}, - "up": {"uv": [15.5, 1.375, 16, 1.875], "rotation": 180, "texture": "#0"}, - "down": {"uv": [0, 9, 4, 13], "rotation": 180, "texture": "#0"} + "north": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "east": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "south": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "west": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "up": {"uv": [6.875, 1.625, 6.375, 1.125], "texture": "#0"}, + "down": {"uv": [6.875, 1.125, 6.375, 1.625], "texture": "#0"} } }, { "from": [3, 6, 1], "to": [7, 15, 5], "faces": { - "north": {"uv": [15.5, 0, 16, 1.25], "texture": "#0"}, - "east": {"uv": [15.5125, 0, 16, 1.275], "texture": "#0"}, - "south": {"uv": [15.5, 0, 16, 1.25], "texture": "#0"}, - "west": {"uv": [15.5, 0, 16, 1.25], "texture": "#0"}, - "up": {"uv": [15.5, 1.375, 16, 1.875], "rotation": 180, "texture": "#0"}, - "down": {"uv": [0, 9.625, 4, 13.625], "rotation": 180, "texture": "#0"} + "north": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "east": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "south": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "west": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "up": {"uv": [6.875, 1.625, 6.375, 1.125], "texture": "#0"}, + "down": {"uv": [6.875, 1.125, 6.375, 1.625], "texture": "#0"} } }, { "from": [9, 6, 1], "to": [13, 15, 5], "faces": { - "north": {"uv": [15.5, 0, 16, 1.25], "texture": "#0"}, - "east": {"uv": [15.5, 0, 16, 1.25], "texture": "#0"}, - "south": {"uv": [15.5, 0, 16, 1.25], "texture": "#0"}, - "west": {"uv": [15.5, 0, 16, 1.25], "texture": "#0"}, - "up": {"uv": [15.5, 1.375, 16, 1.875], "rotation": 180, "texture": "#0"}, - "down": {"uv": [0, 12, 4, 16], "rotation": 180, "texture": "#0"} + "north": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "east": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "south": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "west": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "up": {"uv": [6.875, 1.625, 6.375, 1.125], "texture": "#0"}, + "down": {"uv": [6.875, 1.125, 6.375, 1.625], "texture": "#0"} } }, { "from": [0, 0, 14], "to": [16, 13, 16], "faces": { - "north": {"uv": [9.125, 0.25, 11.125, 1.875], "texture": "#0"}, - "east": {"uv": [9.125, 0.25, 9.375, 1.875], "texture": "#0"}, - "south": {"uv": [9.125, 0.25, 11.125, 1.875], "texture": "#0"}, - "west": {"uv": [10.875, 0.25, 11.125, 1.875], "texture": "#0"}, - "up": {"uv": [6.625, 2.875, 8.625, 3.125], "texture": "#0"}, - "down": {"uv": [5.125, 7.25, 7.125, 7.5], "rotation": 180, "texture": "#0"} + "north": {"uv": [5.625, 1.875, 7.625, 3.5], "texture": "#0"}, + "east": {"uv": [7.75, 1.875, 8, 3.5], "texture": "#0"}, + "south": {"uv": [5.625, 1.875, 7.625, 3.5], "texture": "#0"}, + "west": {"uv": [5.25, 1.875, 5.5, 3.5], "texture": "#0"}, + "up": {"uv": [7.625, 2.125, 5.625, 1.875], "texture": "#0"}, + "down": {"uv": [4.5, 4.625, 2.5, 4.875], "texture": "#0"} } } ] - } \ No newline at end of file diff --git a/src/main/resources/assets/createindustry/models/block/plastic_fluid_valve/block_horizontal_closed.json b/src/main/resources/assets/createindustry/models/block/plastic_fluid_valve/block_horizontal_closed.json index aa081f55..dfe50e78 100644 --- a/src/main/resources/assets/createindustry/models/block/plastic_fluid_valve/block_horizontal_closed.json +++ b/src/main/resources/assets/createindustry/models/block/plastic_fluid_valve/block_horizontal_closed.json @@ -1,9 +1,9 @@ { "credit": "Made with Blockbench", "textures": { - "2": "create:block/fluid_valve", - "4": "create:block/pipes", - "particle": "create:block/copper_plating" + "2": "createindustry:block/plastic_fluid_valve", + "4": "createindustry:block/plastic_pipes", + "particle": "createindustry:block/plastic_block" }, "elements": [ { diff --git a/src/main/resources/assets/createindustry/models/block/plastic_fluid_valve/block_horizontal_open.json b/src/main/resources/assets/createindustry/models/block/plastic_fluid_valve/block_horizontal_open.json index 4f830bff..63a5eca5 100644 --- a/src/main/resources/assets/createindustry/models/block/plastic_fluid_valve/block_horizontal_open.json +++ b/src/main/resources/assets/createindustry/models/block/plastic_fluid_valve/block_horizontal_open.json @@ -1,9 +1,9 @@ { "credit": "Made with Blockbench", "textures": { - "2": "create:block/fluid_valve", - "4": "create:block/pipes", - "particle": "create:block/copper_plating" + "2": "createindustry:block/plastic_fluid_valve", + "4": "createindustry:block/plastic_pipes", + "particle": "createindustry:block/plastic_block" }, "elements": [ { diff --git a/src/main/resources/assets/createindustry/models/block/plastic_fluid_valve/block_vertical_closed.json b/src/main/resources/assets/createindustry/models/block/plastic_fluid_valve/block_vertical_closed.json index 1f7b5fee..feef64f3 100644 --- a/src/main/resources/assets/createindustry/models/block/plastic_fluid_valve/block_vertical_closed.json +++ b/src/main/resources/assets/createindustry/models/block/plastic_fluid_valve/block_vertical_closed.json @@ -1,9 +1,9 @@ { "credit": "Made with Blockbench", "textures": { - "2": "create:block/fluid_valve", - "3": "create:block/pipes", - "particle": "create:block/copper_plating" + "2": "createindustry:block/plastic_fluid_valve", + "3": "createindustry:block/plastic_pipes", + "particle": "createindustry:block/plastic_block" }, "elements": [ { diff --git a/src/main/resources/assets/createindustry/models/block/plastic_fluid_valve/block_vertical_open.json b/src/main/resources/assets/createindustry/models/block/plastic_fluid_valve/block_vertical_open.json index b95cd9a3..f0961125 100644 --- a/src/main/resources/assets/createindustry/models/block/plastic_fluid_valve/block_vertical_open.json +++ b/src/main/resources/assets/createindustry/models/block/plastic_fluid_valve/block_vertical_open.json @@ -1,9 +1,9 @@ { "credit": "Made with Blockbench", "textures": { - "2": "create:block/fluid_valve", - "3": "create:block/pipes", - "particle": "create:block/copper_plating" + "2": "createindustry:block/plastic_fluid_valve", + "3": "createindustry:block/plastic_pipes", + "particle": "createindustry:block/plastic_block" }, "elements": [ { diff --git a/src/main/resources/assets/createindustry/models/block/plastic_fluid_valve/item.json b/src/main/resources/assets/createindustry/models/block/plastic_fluid_valve/item.json index b09bd0b7..65f8ddba 100644 --- a/src/main/resources/assets/createindustry/models/block/plastic_fluid_valve/item.json +++ b/src/main/resources/assets/createindustry/models/block/plastic_fluid_valve/item.json @@ -1,12 +1,12 @@ { "credit": "Made with Blockbench", "textures": { - "2": "create:block/fluid_valve", - "3": "create:block/pipes", + "2": "createindustry:block/plastic_fluid_valve", + "3": "createindustry:block/plastic_pipes", "4": "create:block/pump", "1_1": "create:block/axis_top", "1_0": "create:block/axis", - "particle": "create:block/copper_plating" + "particle": "createindustry:block/plastic_block" }, "elements": [ { diff --git a/src/main/resources/assets/createindustry/models/block/plastic_fluid_valve/pointer.json b/src/main/resources/assets/createindustry/models/block/plastic_fluid_valve/pointer.json index 2e9eed35..9945f2ad 100644 --- a/src/main/resources/assets/createindustry/models/block/plastic_fluid_valve/pointer.json +++ b/src/main/resources/assets/createindustry/models/block/plastic_fluid_valve/pointer.json @@ -1,9 +1,9 @@ { "credit": "Made with Blockbench", "textures": { - "2": "create:block/fluid_valve", + "2": "createindustry:block/plastic_fluid_valve", "4": "create:block/pump", - "particle": "create:block/copper_plating" + "particle": "createindustry:block/plastic_block" }, "elements": [ { diff --git a/src/main/resources/assets/createindustry/models/block/plastic_mechanical_pump/block.json b/src/main/resources/assets/createindustry/models/block/plastic_mechanical_pump/block.json index 8dd3ab9b..5ed6e5c4 100644 --- a/src/main/resources/assets/createindustry/models/block/plastic_mechanical_pump/block.json +++ b/src/main/resources/assets/createindustry/models/block/plastic_mechanical_pump/block.json @@ -2,9 +2,9 @@ "credit": "Made with Blockbench", "parent": "create:block/block", "textures": { - "2": "create:block/pipes", - "4": "create:block/pump", - "particle": "create:block/pump" + "2": "createindustry:block/plastic_pipes", + "4": "createindustry:block/plastic_pump", + "particle": "createindustry:block/plastic_pump" }, "elements": [ { diff --git a/src/main/resources/assets/createindustry/models/block/plastic_mechanical_pump/item.json b/src/main/resources/assets/createindustry/models/block/plastic_mechanical_pump/item.json index 161c4910..d8d5adda 100644 --- a/src/main/resources/assets/createindustry/models/block/plastic_mechanical_pump/item.json +++ b/src/main/resources/assets/createindustry/models/block/plastic_mechanical_pump/item.json @@ -2,10 +2,10 @@ "credit": "Made with Blockbench", "parent": "create:block/block", "textures": { - "2": "create:block/pipes", - "4": "create:block/pump", + "2": "createindustry:block/plastic_pipes", + "4": "createindustry:block/plastic_pump", "5": "create:block/millstone", - "particle": "create:block/pump" + "particle": "createindustry:block/plastic_pump" }, "elements": [ { diff --git a/src/main/resources/assets/createindustry/models/block/plastic_smart_fluid_pipe/block.json b/src/main/resources/assets/createindustry/models/block/plastic_smart_fluid_pipe/block.json index 1f674588..b3464292 100644 --- a/src/main/resources/assets/createindustry/models/block/plastic_smart_fluid_pipe/block.json +++ b/src/main/resources/assets/createindustry/models/block/plastic_smart_fluid_pipe/block.json @@ -2,9 +2,9 @@ "credit": "Made with Blockbench", "parent": "block/block", "textures": { - "2": "create:block/smart_pipe_1", - "3": "create:block/smart_pipe_2", - "particle": "create:block/smart_pipe_2" + "2": "createindustry:block/plastic_smart_pipe_1", + "3": "createindustry:block/plastic_smart_pipe_2", + "particle": "createindustry:block/plastic_smart_pipe_2" }, "elements": [ { diff --git a/src/main/resources/assets/createindustry/models/block/plastic_smart_fluid_pipe/item.json b/src/main/resources/assets/createindustry/models/block/plastic_smart_fluid_pipe/item.json index a3df689d..d0503c6b 100644 --- a/src/main/resources/assets/createindustry/models/block/plastic_smart_fluid_pipe/item.json +++ b/src/main/resources/assets/createindustry/models/block/plastic_smart_fluid_pipe/item.json @@ -2,9 +2,9 @@ "credit": "Made with Blockbench", "parent": "block/block", "textures": { - "1": "create:block/pipes", - "2": "create:block/smart_pipe_1", - "3": "create:block/smart_pipe_2" + "1": "createindustry:block/plastic_pipes", + "2": "createindustry:block/plastic_smart_pipe_1", + "3": "createindustry:block/plastic_smart_pipe_2" }, "elements": [ { diff --git a/src/main/resources/assets/createindustry/models/block/steel_fluid_valve/block_horizontal_closed.json b/src/main/resources/assets/createindustry/models/block/steel_fluid_valve/block_horizontal_closed.json index aa081f55..bfb179a1 100644 --- a/src/main/resources/assets/createindustry/models/block/steel_fluid_valve/block_horizontal_closed.json +++ b/src/main/resources/assets/createindustry/models/block/steel_fluid_valve/block_horizontal_closed.json @@ -1,9 +1,9 @@ { "credit": "Made with Blockbench", "textures": { - "2": "create:block/fluid_valve", - "4": "create:block/pipes", - "particle": "create:block/copper_plating" + "2": "createindustry:block/steel_fluid_valve", + "4": "createindustry:block/steel_pipes", + "particle": "createindustry:block/steel_block" }, "elements": [ { diff --git a/src/main/resources/assets/createindustry/models/block/steel_fluid_valve/block_horizontal_open.json b/src/main/resources/assets/createindustry/models/block/steel_fluid_valve/block_horizontal_open.json index 4f830bff..b9b308b6 100644 --- a/src/main/resources/assets/createindustry/models/block/steel_fluid_valve/block_horizontal_open.json +++ b/src/main/resources/assets/createindustry/models/block/steel_fluid_valve/block_horizontal_open.json @@ -1,9 +1,9 @@ { "credit": "Made with Blockbench", "textures": { - "2": "create:block/fluid_valve", - "4": "create:block/pipes", - "particle": "create:block/copper_plating" + "2": "createindustry:block/steel_fluid_valve", + "4": "createindustry:block/steel_pipes", + "particle": "createindustry:block/steel_block" }, "elements": [ { diff --git a/src/main/resources/assets/createindustry/models/block/steel_fluid_valve/block_vertical_closed.json b/src/main/resources/assets/createindustry/models/block/steel_fluid_valve/block_vertical_closed.json index 1f7b5fee..08c8810e 100644 --- a/src/main/resources/assets/createindustry/models/block/steel_fluid_valve/block_vertical_closed.json +++ b/src/main/resources/assets/createindustry/models/block/steel_fluid_valve/block_vertical_closed.json @@ -1,9 +1,9 @@ { "credit": "Made with Blockbench", "textures": { - "2": "create:block/fluid_valve", - "3": "create:block/pipes", - "particle": "create:block/copper_plating" + "2": "createindustry:block/steel_fluid_valve", + "3": "createindustry:block/steel_pipes", + "particle": "createindustry:block/steel_block" }, "elements": [ { diff --git a/src/main/resources/assets/createindustry/models/block/steel_fluid_valve/block_vertical_open.json b/src/main/resources/assets/createindustry/models/block/steel_fluid_valve/block_vertical_open.json index b95cd9a3..6e6c531f 100644 --- a/src/main/resources/assets/createindustry/models/block/steel_fluid_valve/block_vertical_open.json +++ b/src/main/resources/assets/createindustry/models/block/steel_fluid_valve/block_vertical_open.json @@ -1,9 +1,9 @@ { "credit": "Made with Blockbench", "textures": { - "2": "create:block/fluid_valve", - "3": "create:block/pipes", - "particle": "create:block/copper_plating" + "2": "createindustry:block/steel_fluid_valve", + "3": "createindustry:block/steel_pipes", + "particle": "createindustry:block/steel_block" }, "elements": [ { diff --git a/src/main/resources/assets/createindustry/models/block/steel_fluid_valve/item.json b/src/main/resources/assets/createindustry/models/block/steel_fluid_valve/item.json index b09bd0b7..ee47df6c 100644 --- a/src/main/resources/assets/createindustry/models/block/steel_fluid_valve/item.json +++ b/src/main/resources/assets/createindustry/models/block/steel_fluid_valve/item.json @@ -1,12 +1,12 @@ { "credit": "Made with Blockbench", "textures": { - "2": "create:block/fluid_valve", - "3": "create:block/pipes", + "2": "createindustry:block/steel_fluid_valve", + "3": "createindustry:block/steel_pipes", "4": "create:block/pump", "1_1": "create:block/axis_top", "1_0": "create:block/axis", - "particle": "create:block/copper_plating" + "particle": "createindustry:block/steel_block" }, "elements": [ { diff --git a/src/main/resources/assets/createindustry/models/block/steel_fluid_valve/pointer.json b/src/main/resources/assets/createindustry/models/block/steel_fluid_valve/pointer.json index 2e9eed35..20682062 100644 --- a/src/main/resources/assets/createindustry/models/block/steel_fluid_valve/pointer.json +++ b/src/main/resources/assets/createindustry/models/block/steel_fluid_valve/pointer.json @@ -1,9 +1,9 @@ { "credit": "Made with Blockbench", "textures": { - "2": "create:block/fluid_valve", + "2": "createindustry:block/steel_fluid_valve", "4": "create:block/pump", - "particle": "create:block/copper_plating" + "particle": "createindustry:block/steel_block" }, "elements": [ { diff --git a/src/main/resources/assets/createindustry/models/block/steel_smart_fluid_pipe/block.json b/src/main/resources/assets/createindustry/models/block/steel_smart_fluid_pipe/block.json index 1f674588..91df3303 100644 --- a/src/main/resources/assets/createindustry/models/block/steel_smart_fluid_pipe/block.json +++ b/src/main/resources/assets/createindustry/models/block/steel_smart_fluid_pipe/block.json @@ -2,9 +2,9 @@ "credit": "Made with Blockbench", "parent": "block/block", "textures": { - "2": "create:block/smart_pipe_1", - "3": "create:block/smart_pipe_2", - "particle": "create:block/smart_pipe_2" + "2": "createindustry:block/steel_smart_pipe_1", + "3": "createindustry:block/steel_smart_pipe_2", + "particle": "createindustry:block/steel_smart_pipe_2" }, "elements": [ { diff --git a/src/main/resources/assets/createindustry/models/block/steel_smart_fluid_pipe/item.json b/src/main/resources/assets/createindustry/models/block/steel_smart_fluid_pipe/item.json index a3df689d..4142dd33 100644 --- a/src/main/resources/assets/createindustry/models/block/steel_smart_fluid_pipe/item.json +++ b/src/main/resources/assets/createindustry/models/block/steel_smart_fluid_pipe/item.json @@ -2,9 +2,9 @@ "credit": "Made with Blockbench", "parent": "block/block", "textures": { - "1": "create:block/pipes", - "2": "create:block/smart_pipe_1", - "3": "create:block/smart_pipe_2" + "1": "createindustry:block/steel_pipes", + "2": "createindustry:block/steel_smart_pipe_1", + "3": "createindustry:block/steel_smart_pipe_2" }, "elements": [ { diff --git a/src/main/resources/assets/createindustry/models/block/turbine_engine/block.json b/src/main/resources/assets/createindustry/models/block/turbine_engine/block.json index 54efa9e9..2a5a0a6b 100644 --- a/src/main/resources/assets/createindustry/models/block/turbine_engine/block.json +++ b/src/main/resources/assets/createindustry/models/block/turbine_engine/block.json @@ -2,19 +2,19 @@ "credit": "Made with Blockbench", "parent": "minecraft:block/block", "textures": { - "0": "createindustry:block/gasoline_engine", - "particle": "minecraft:block/anvil" + "0": "createindustry:block/engines/turbine", + "particle": "block/anvil" }, "elements": [ { "from": [1, 4, 5], "to": [15, 10, 16], "faces": { - "north": {"uv": [5.25, 3.75, 7, 4.5], "texture": "#0"}, - "east": {"uv": [11.875, 4.5, 13.25, 5.25], "texture": "#0"}, - "south": {"uv": [1.375, 5.625, 3.125, 6.375], "texture": "#0"}, - "west": {"uv": [11.875, 5.25, 13.25, 4.5], "rotation": 180, "texture": "#0"}, - "up": {"uv": [9.875, 2.125, 11.1, 3.875], "rotation": 90, "texture": "#0"}, + "north": {"uv": [2.125, 8.875, 3.875, 9.625], "texture": "#0"}, + "east": {"uv": [1.5, 6.375, 2.875, 7.125], "texture": "#0"}, + "south": {"uv": [2.125, 8.125, 3.875, 8.875], "texture": "#0"}, + "west": {"uv": [1.125, 7.125, 2.5, 6.375], "rotation": 180, "texture": "#0"}, + "up": {"uv": [8.5, 5.875, 9.725, 7.625], "rotation": 90, "texture": "#0"}, "down": {"uv": [0, 0, 14, 11], "texture": "#0"} } }, @@ -22,11 +22,11 @@ "from": [0, 0, 2], "to": [16, 4, 16], "faces": { - "north": {"uv": [0.25, 1.375, 2.25, 1.875], "texture": "#0"}, - "east": {"uv": [13.625, 7.875, 11.875, 8.35], "texture": "#0"}, - "south": {"uv": [1, 4.875, 3, 5.375], "texture": "#0"}, - "west": {"uv": [11.875, 7.875, 13.625, 8.375], "texture": "#0"}, - "up": {"uv": [5.125, 3.75, 7.125, 5.5], "texture": "#0"}, + "north": {"uv": [0.25, 1, 2.25, 1.5], "texture": "#0"}, + "east": {"uv": [4.5, 1, 2.75, 1.475], "texture": "#0"}, + "south": {"uv": [5, 1, 7, 1.5], "texture": "#0"}, + "west": {"uv": [2.75, 1, 4.5, 1.5], "texture": "#0"}, + "up": {"uv": [5.75, 4.5, 7.75, 6.25], "texture": "#0"}, "down": {"uv": [5.125, 5.5, 7.125, 3.75], "texture": "#0"} } }, @@ -34,24 +34,12 @@ "from": [3, 4, 2], "to": [13, 13, 16], "faces": { - "north": {"uv": [0.625, 0.25, 1.875, 1.375], "texture": "#0"}, - "east": {"uv": [9.875, 3.875, 11, 2.125], "rotation": 90, "texture": "#0"}, - "south": {"uv": [1.375, 3.75, 2.625, 4.875], "texture": "#0"}, - "west": {"uv": [10, 2.125, 11.125, 3.875], "rotation": 90, "texture": "#0"}, - "up": {"uv": [9.875, 2.125, 11.125, 3.875], "texture": "#0"}, - "down": {"uv": [0, 0.375, 10, 14.375], "texture": "#0"} - } - }, - { - "from": [6, 13, 2], - "to": [10, 14, 16], - "faces": { - "north": {"uv": [1, 0.125, 1.5, 0.25], "texture": "#0"}, - "east": {"uv": [14.25, 2.25, 14.375, 4], "rotation": 90, "texture": "#0"}, - "south": {"uv": [1, 0.25, 1.5, 0.125], "texture": "#0"}, - "west": {"uv": [14.375, 2.25, 14.25, 4], "rotation": 90, "texture": "#0"}, - "up": {"uv": [14, 2.25, 14.5, 4], "texture": "#0"}, - "down": {"uv": [0, 0, 4, 14], "texture": "#0"} + "north": {"uv": [0.625, 0, 1.875, 1.125], "texture": "#0"}, + "east": {"uv": [0.5, 11, 1.625, 9.25], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5.375, 0, 6.625, 1.125], "texture": "#0"}, + "west": {"uv": [0.5, 9.25, 1.625, 11], "rotation": 90, "texture": "#0"}, + "up": {"uv": [0.625, 1.75, 1.875, 3.5], "texture": "#0"}, + "down": {"uv": [0, 0, 10, 14], "texture": "#0"} } } ] diff --git a/src/main/resources/assets/createindustry/models/block/turbine_engine/item.json b/src/main/resources/assets/createindustry/models/block/turbine_engine/item.json index f2aff988..d7c80ffe 100644 --- a/src/main/resources/assets/createindustry/models/block/turbine_engine/item.json +++ b/src/main/resources/assets/createindustry/models/block/turbine_engine/item.json @@ -2,9 +2,9 @@ "credit": "Made with Blockbench", "parent": "minecraft:block/block", "textures": { - "0": "createindustry:block/gasoline_engine", - "2": "create:block/axis", - "3": "create:block/axis_top", + "0": "createindustry:block/engines/turbine", + "1": "create:block/axis", + "2": "create:block/axis_top", "particle": "block/anvil" }, "elements": [ @@ -12,11 +12,11 @@ "from": [1, 4, 5], "to": [15, 10, 16], "faces": { - "north": {"uv": [5.25, 3.75, 7, 4.5], "texture": "#0"}, - "east": {"uv": [11.875, 4.5, 13.25, 5.25], "texture": "#0"}, - "south": {"uv": [1.375, 5.625, 3.125, 6.375], "texture": "#0"}, - "west": {"uv": [11.875, 5.25, 13.25, 4.5], "rotation": 180, "texture": "#0"}, - "up": {"uv": [9.875, 2.125, 11.1, 3.875], "rotation": 90, "texture": "#0"}, + "north": {"uv": [2.125, 8.875, 3.875, 9.625], "texture": "#0"}, + "east": {"uv": [1.5, 6.375, 2.875, 7.125], "texture": "#0"}, + "south": {"uv": [2.125, 8.125, 3.875, 8.875], "texture": "#0"}, + "west": {"uv": [1.125, 7.125, 2.5, 6.375], "rotation": 180, "texture": "#0"}, + "up": {"uv": [8.5, 5.875, 9.725, 7.625], "rotation": 90, "texture": "#0"}, "down": {"uv": [0, 0, 14, 11], "texture": "#0"} } }, @@ -24,11 +24,11 @@ "from": [0, 0, 2], "to": [16, 4, 16], "faces": { - "north": {"uv": [0.25, 1.375, 2.25, 1.875], "texture": "#0"}, - "east": {"uv": [13.625, 7.875, 11.875, 8.35], "texture": "#0"}, - "south": {"uv": [1, 4.875, 3, 5.375], "texture": "#0"}, - "west": {"uv": [11.875, 7.875, 13.625, 8.375], "texture": "#0"}, - "up": {"uv": [5.125, 3.75, 7.125, 5.5], "texture": "#0"}, + "north": {"uv": [0.25, 1, 2.25, 1.5], "texture": "#0"}, + "east": {"uv": [4.5, 1, 2.75, 1.475], "texture": "#0"}, + "south": {"uv": [5, 1, 7, 1.5], "texture": "#0"}, + "west": {"uv": [2.75, 1, 4.5, 1.5], "texture": "#0"}, + "up": {"uv": [5.75, 4.5, 7.75, 6.25], "texture": "#0"}, "down": {"uv": [5.125, 5.5, 7.125, 3.75], "texture": "#0"} } }, @@ -36,24 +36,12 @@ "from": [3, 4, 2], "to": [13, 13, 16], "faces": { - "north": {"uv": [0.625, 0.25, 1.875, 1.375], "texture": "#0"}, - "east": {"uv": [9.875, 3.875, 11, 2.125], "rotation": 90, "texture": "#0"}, - "south": {"uv": [1.375, 3.75, 2.625, 4.875], "texture": "#0"}, - "west": {"uv": [10, 2.125, 11.125, 3.875], "rotation": 90, "texture": "#0"}, - "up": {"uv": [9.875, 2.125, 11.125, 3.875], "texture": "#0"}, - "down": {"uv": [0, 0.375, 10, 14.375], "texture": "#0"} - } - }, - { - "from": [6, 13, 2], - "to": [10, 14, 16], - "faces": { - "north": {"uv": [1, 0.125, 1.5, 0.25], "texture": "#0"}, - "east": {"uv": [14.25, 2.25, 14.375, 4], "rotation": 90, "texture": "#0"}, - "south": {"uv": [1, 0.25, 1.5, 0.125], "texture": "#0"}, - "west": {"uv": [14.375, 2.25, 14.25, 4], "rotation": 90, "texture": "#0"}, - "up": {"uv": [14, 2.25, 14.5, 4], "texture": "#0"}, - "down": {"uv": [0, 0, 4, 14], "texture": "#0"} + "north": {"uv": [0.625, 0, 1.875, 1.125], "texture": "#0"}, + "east": {"uv": [0.5, 11, 1.625, 9.25], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5.375, 0, 6.625, 1.125], "texture": "#0"}, + "west": {"uv": [0.5, 9.25, 1.625, 11], "rotation": 90, "texture": "#0"}, + "up": {"uv": [0.625, 1.75, 1.875, 3.5], "texture": "#0"}, + "down": {"uv": [0, 0, 10, 14], "texture": "#0"} } }, { @@ -62,12 +50,12 @@ "to": [10, 10, 10], "rotation": {"angle": -22.5, "axis": "z", "origin": [8, 8, 8]}, "faces": { - "north": {"uv": [6, 6, 10, 10], "texture": "#3"}, - "east": {"uv": [6, 0, 10, 10], "rotation": 90, "texture": "#2"}, - "south": {"uv": [6, 6, 10, 10], "rotation": 180, "texture": "#missing"}, - "west": {"uv": [6, 0, 10, 10], "rotation": 270, "texture": "#2"}, - "up": {"uv": [6, 0, 10, 10], "texture": "#2"}, - "down": {"uv": [6, 0, 10, 10], "rotation": 180, "texture": "#2"} + "north": {"uv": [6, 6, 10, 10], "texture": "#2"}, + "east": {"uv": [6, 0, 10, 10], "rotation": 90, "texture": "#1"}, + "south": {"uv": [0, 0, 0, 0], "texture": "#1"}, + "west": {"uv": [6, 0, 10, 10], "rotation": 270, "texture": "#1"}, + "up": {"uv": [6, 0, 10, 10], "texture": "#1"}, + "down": {"uv": [6, 0, 10, 10], "rotation": 180, "texture": "#1"} } } ] diff --git a/src/main/resources/assets/createindustry/models/block/turbine_engine_back/block.json b/src/main/resources/assets/createindustry/models/block/turbine_engine_back/block.json index 9ae1f556..b50640da 100644 --- a/src/main/resources/assets/createindustry/models/block/turbine_engine_back/block.json +++ b/src/main/resources/assets/createindustry/models/block/turbine_engine_back/block.json @@ -2,20 +2,20 @@ "credit": "Made with Blockbench", "parent": "minecraft:block/block", "textures": { - "0": "createindustry:block/gasoline_engine", - "particle": "minecraft:block/anvil" + "0": "createindustry:block/engines/turbine", + "particle": "block/anvil" }, "elements": [ { "from": [0, 0, 0], "to": [16, 4, 16], "faces": { - "north": {"uv": [3, 4.875, 5, 5.375], "texture": "#0"}, - "east": {"uv": [15.75, 7.875, 13.75, 8.375], "texture": "#0"}, - "south": {"uv": [0, 8.75, 2, 9.25], "texture": "#0"}, - "west": {"uv": [13.75, 7.875, 15.75, 8.375], "texture": "#0"}, - "up": {"uv": [5.125, 5.5, 7.125, 7.5], "texture": "#0"}, - "down": {"uv": [5.125, 7.5, 7.125, 5.5], "texture": "#0"} + "north": {"uv": [5, 1, 7, 1.5], "texture": "#0"}, + "east": {"uv": [2.25, 7.125, 0.25, 7.625], "texture": "#0"}, + "south": {"uv": [2.625, 1, 4.625, 1.5], "texture": "#0"}, + "west": {"uv": [0.25, 7.125, 2.25, 7.625], "texture": "#0"}, + "up": {"uv": [5.75, 4.375, 7.75, 6.375], "texture": "#0"}, + "down": {"uv": [2.5, 5.375, 4.5, 3.375], "texture": "#0"} } }, { @@ -23,10 +23,10 @@ "to": [13, 9, 9], "faces": { "north": {"uv": [0, 0, 10, 2], "texture": "#0"}, - "east": {"uv": [5.375, 7.875, 5.625, 8.125], "texture": "#0"}, + "east": {"uv": [8.75, 0.25, 9, 0.5], "texture": "#0"}, "south": {"uv": [0, 0, 10, 2], "texture": "#0"}, "west": {"uv": [0, 0, 2, 2], "texture": "#0"}, - "up": {"uv": [5.375, 7.875, 5.125, 8], "rotation": 90, "texture": "#0"}, + "up": {"uv": [9.375, 0.5, 9.125, 0.625], "rotation": 90, "texture": "#0"}, "down": {"uv": [5.375, 8, 5.625, 8.125], "rotation": 90, "texture": "#0"} } }, @@ -34,11 +34,11 @@ "from": [3, 4, 9], "to": [4, 9, 11], "faces": { - "north": {"uv": [4.875, 7.875, 5, 8.5], "texture": "#0"}, + "north": {"uv": [8.75, 0.25, 8.875, 0.875], "texture": "#0"}, "east": {"uv": [5.125, 7.875, 5.375, 8.5], "texture": "#0"}, - "south": {"uv": [5.125, 7.875, 5.375, 8.5], "texture": "#0"}, - "west": {"uv": [5.125, 7.875, 5.375, 8.5], "texture": "#0"}, - "up": {"uv": [5.125, 7.875, 5.375, 8], "rotation": 90, "texture": "#0"}, + "south": {"uv": [8.75, 0.25, 9, 0.875], "texture": "#0"}, + "west": {"uv": [8.75, 0.25, 9, 0.875], "texture": "#0"}, + "up": {"uv": [9.125, 0.5, 9.375, 0.625], "rotation": 90, "texture": "#0"}, "down": {"uv": [0, 0, 10, 2], "texture": "#0"} } }, @@ -49,9 +49,9 @@ "north": {"uv": [0, 0, 10, 2], "texture": "#0"}, "east": {"uv": [5.375, 7.875, 5.625, 8.125], "texture": "#0"}, "south": {"uv": [0, 0, 10, 2], "texture": "#0"}, - "west": {"uv": [5.375, 7.875, 5.625, 8.125], "texture": "#0"}, - "up": {"uv": [5.125, 7.875, 5.375, 8], "rotation": 90, "texture": "#0"}, - "down": {"uv": [5.375, 8, 5.625, 8.125], "rotation": 90, "texture": "#0"} + "west": {"uv": [9.125, 0.5, 9.375, 0.75], "texture": "#0"}, + "up": {"uv": [8.75, 0.25, 9, 0.375], "rotation": 90, "texture": "#0"}, + "down": {"uv": [8.75, 0.625, 9, 0.75], "rotation": 90, "texture": "#0"} } }, { @@ -59,10 +59,10 @@ "to": [13, 9, 11], "faces": { "north": {"uv": [4.875, 7.875, 5, 8.5], "texture": "#0"}, - "east": {"uv": [5.125, 7.875, 5.375, 8.5], "texture": "#0"}, - "south": {"uv": [5, 7.875, 4.875, 8.5], "texture": "#0"}, + "east": {"uv": [8.75, 0.25, 9, 0.875], "texture": "#0"}, + "south": {"uv": [8.875, 0.25, 8.75, 0.875], "texture": "#0"}, "west": {"uv": [0, 0, 2, 5], "texture": "#0"}, - "up": {"uv": [5.625, 7.875, 5.375, 8], "rotation": 90, "texture": "#0"}, + "up": {"uv": [9, 0.5, 8.75, 0.625], "rotation": 90, "texture": "#0"}, "down": {"uv": [0, 0, 10, 2], "texture": "#0"} } }, @@ -70,11 +70,11 @@ "from": [1, 4, 0], "to": [4, 10, 7], "faces": { - "north": {"uv": [2.75, 6.5, 3.125, 7.25], "texture": "#0"}, + "north": {"uv": [2.75, 6.625, 3.125, 7.375], "texture": "#0"}, "east": {"uv": [0, 0, 7, 6], "texture": "#0"}, - "south": {"uv": [1.375, 6.5, 1.75, 7.25], "texture": "#0"}, - "west": {"uv": [7.375, 3.75, 8.25, 4.5], "texture": "#0"}, - "up": {"uv": [5.125, 3.75, 5.5, 4.625], "texture": "#0"}, + "south": {"uv": [0.375, 6.375, 0.75, 7.125], "texture": "#0"}, + "west": {"uv": [2.625, 6.375, 3.5, 7.125], "texture": "#0"}, + "up": {"uv": [1, 2, 1.375, 2.875], "texture": "#0"}, "down": {"uv": [0, 0, 3, 7], "texture": "#0"} } }, @@ -82,11 +82,11 @@ "from": [12, 4, 0], "to": [15, 10, 7], "faces": { - "north": {"uv": [1.375, 6.5, 1.75, 7.25], "texture": "#0"}, - "east": {"uv": [5.875, 5, 6.75, 5.75], "texture": "#0"}, - "south": {"uv": [2.75, 6.5, 3.125, 7.25], "texture": "#0"}, + "north": {"uv": [0.875, 6.625, 1.25, 7.375], "texture": "#0"}, + "east": {"uv": [0.5, 6.375, 1.375, 7.125], "texture": "#0"}, + "south": {"uv": [2.875, 6.375, 3.25, 7.125], "texture": "#0"}, "west": {"uv": [0, 0, 7, 6], "texture": "#0"}, - "up": {"uv": [6.75, 3.75, 7.125, 4.625], "texture": "#0"}, + "up": {"uv": [1.25, 2, 1.625, 2.875], "texture": "#0"}, "down": {"uv": [0, 0, 3, 7], "texture": "#0"} } }, @@ -94,48 +94,36 @@ "from": [2, 12, -1], "to": [6, 16, 14], "faces": { - "north": {"uv": [6.375, 7.875, 6.875, 8.375], "texture": "#0"}, - "east": {"uv": [6.375, 8.5, 8.25, 9], "texture": "#0"}, - "south": {"uv": [6.375, 7.875, 6.875, 8.375], "texture": "#0"}, - "west": {"uv": [6.375, 8.5, 8.25, 9], "texture": "#0"}, - "up": {"uv": [6.375, 8.5, 8.25, 9], "rotation": 90, "texture": "#0"}, - "down": {"uv": [8.25, 8.5, 6.375, 9], "rotation": 90, "texture": "#0"} + "north": {"uv": [10, 1.75, 10.5, 2.25], "texture": "#0"}, + "east": {"uv": [8.125, 1.75, 10, 2.25], "texture": "#0"}, + "south": {"uv": [10, 1.75, 10.5, 2.25], "texture": "#0"}, + "west": {"uv": [8.125, 2.25, 10, 2.75], "texture": "#0"}, + "up": {"uv": [8.125, 2.25, 10, 2.75], "rotation": 90, "texture": "#0"}, + "down": {"uv": [10, 2.25, 8.125, 2.75], "rotation": 90, "texture": "#0"} } }, { "from": [10, 12, -1], "to": [14, 16, 14], "faces": { - "north": {"uv": [6.375, 7.875, 6.875, 8.375], "texture": "#0"}, - "east": {"uv": [8.25, 8.5, 6.375, 9], "texture": "#0"}, - "south": {"uv": [6.375, 7.875, 6.875, 8.375], "texture": "#0"}, - "west": {"uv": [6.375, 8.5, 8.25, 9], "texture": "#0"}, - "up": {"uv": [6.375, 8.5, 8.25, 9], "rotation": 90, "texture": "#0"}, - "down": {"uv": [8.25, 8.5, 6.375, 9], "rotation": 90, "texture": "#0"} - } - }, - { - "from": [6, 12, 0], - "to": [10, 13, 15], - "faces": { - "north": {"uv": [1, 0.125, 1.5, 0.25], "texture": "#0"}, - "east": {"uv": [0.25, 1.75, 2.25, 1.875], "texture": "#0"}, - "south": {"uv": [1, 0.125, 1.5, 0.25], "texture": "#0"}, - "west": {"uv": [0.25, 1.75, 2.25, 1.875], "texture": "#0"}, - "up": {"uv": [14.625, 2.125, 15.125, 4.125], "texture": "#0"}, - "down": {"uv": [0, 0, 4, 15], "texture": "#0"} + "north": {"uv": [10, 1.75, 10.5, 2.25], "texture": "#0"}, + "east": {"uv": [10, 2.25, 8.125, 2.75], "texture": "#0"}, + "south": {"uv": [10, 1.75, 10.5, 2.25], "texture": "#0"}, + "west": {"uv": [8.125, 2.25, 10, 2.75], "texture": "#0"}, + "up": {"uv": [8.125, 2.25, 10, 2.75], "rotation": 90, "texture": "#0"}, + "down": {"uv": [10, 2.25, 8.125, 2.75], "rotation": 90, "texture": "#0"} } }, { "from": [4, 4, 0], "to": [12, 12, 16], "faces": { - "north": {"uv": [3.5, 3.875, 4.5, 4.875], "texture": "#0"}, - "east": {"uv": [5.125, 6.5, 7.125, 7.5], "texture": "#0"}, - "south": {"uv": [0.5, 7.75, 1.5, 8.75], "texture": "#0"}, - "west": {"uv": [5.125, 6.5, 7.125, 7.5], "texture": "#0"}, - "up": {"uv": [5.125, 5.5, 7.125, 6.5], "rotation": 90, "texture": "#0"}, - "down": {"uv": [0, 0, 8, 16], "texture": "#0"} + "north": {"uv": [5.5, 0, 6.5, 1], "texture": "#0"}, + "east": {"uv": [1.75, 6.125, 3.75, 7.125], "texture": "#0"}, + "south": {"uv": [3.125, 0, 4.125, 1], "texture": "#0"}, + "west": {"uv": [0.25, 6.125, 2.25, 7.125], "texture": "#0"}, + "up": {"uv": [8.5, 4.5, 10.5, 5.5], "rotation": 90, "texture": "#0"}, + "down": {"uv": [8, 0, 16, 16], "texture": "#0"} } } ] diff --git a/src/main/resources/assets/createindustry/models/block/turbine_engine_back/item.json b/src/main/resources/assets/createindustry/models/block/turbine_engine_back/item.json index 9ae1f556..b50640da 100644 --- a/src/main/resources/assets/createindustry/models/block/turbine_engine_back/item.json +++ b/src/main/resources/assets/createindustry/models/block/turbine_engine_back/item.json @@ -2,20 +2,20 @@ "credit": "Made with Blockbench", "parent": "minecraft:block/block", "textures": { - "0": "createindustry:block/gasoline_engine", - "particle": "minecraft:block/anvil" + "0": "createindustry:block/engines/turbine", + "particle": "block/anvil" }, "elements": [ { "from": [0, 0, 0], "to": [16, 4, 16], "faces": { - "north": {"uv": [3, 4.875, 5, 5.375], "texture": "#0"}, - "east": {"uv": [15.75, 7.875, 13.75, 8.375], "texture": "#0"}, - "south": {"uv": [0, 8.75, 2, 9.25], "texture": "#0"}, - "west": {"uv": [13.75, 7.875, 15.75, 8.375], "texture": "#0"}, - "up": {"uv": [5.125, 5.5, 7.125, 7.5], "texture": "#0"}, - "down": {"uv": [5.125, 7.5, 7.125, 5.5], "texture": "#0"} + "north": {"uv": [5, 1, 7, 1.5], "texture": "#0"}, + "east": {"uv": [2.25, 7.125, 0.25, 7.625], "texture": "#0"}, + "south": {"uv": [2.625, 1, 4.625, 1.5], "texture": "#0"}, + "west": {"uv": [0.25, 7.125, 2.25, 7.625], "texture": "#0"}, + "up": {"uv": [5.75, 4.375, 7.75, 6.375], "texture": "#0"}, + "down": {"uv": [2.5, 5.375, 4.5, 3.375], "texture": "#0"} } }, { @@ -23,10 +23,10 @@ "to": [13, 9, 9], "faces": { "north": {"uv": [0, 0, 10, 2], "texture": "#0"}, - "east": {"uv": [5.375, 7.875, 5.625, 8.125], "texture": "#0"}, + "east": {"uv": [8.75, 0.25, 9, 0.5], "texture": "#0"}, "south": {"uv": [0, 0, 10, 2], "texture": "#0"}, "west": {"uv": [0, 0, 2, 2], "texture": "#0"}, - "up": {"uv": [5.375, 7.875, 5.125, 8], "rotation": 90, "texture": "#0"}, + "up": {"uv": [9.375, 0.5, 9.125, 0.625], "rotation": 90, "texture": "#0"}, "down": {"uv": [5.375, 8, 5.625, 8.125], "rotation": 90, "texture": "#0"} } }, @@ -34,11 +34,11 @@ "from": [3, 4, 9], "to": [4, 9, 11], "faces": { - "north": {"uv": [4.875, 7.875, 5, 8.5], "texture": "#0"}, + "north": {"uv": [8.75, 0.25, 8.875, 0.875], "texture": "#0"}, "east": {"uv": [5.125, 7.875, 5.375, 8.5], "texture": "#0"}, - "south": {"uv": [5.125, 7.875, 5.375, 8.5], "texture": "#0"}, - "west": {"uv": [5.125, 7.875, 5.375, 8.5], "texture": "#0"}, - "up": {"uv": [5.125, 7.875, 5.375, 8], "rotation": 90, "texture": "#0"}, + "south": {"uv": [8.75, 0.25, 9, 0.875], "texture": "#0"}, + "west": {"uv": [8.75, 0.25, 9, 0.875], "texture": "#0"}, + "up": {"uv": [9.125, 0.5, 9.375, 0.625], "rotation": 90, "texture": "#0"}, "down": {"uv": [0, 0, 10, 2], "texture": "#0"} } }, @@ -49,9 +49,9 @@ "north": {"uv": [0, 0, 10, 2], "texture": "#0"}, "east": {"uv": [5.375, 7.875, 5.625, 8.125], "texture": "#0"}, "south": {"uv": [0, 0, 10, 2], "texture": "#0"}, - "west": {"uv": [5.375, 7.875, 5.625, 8.125], "texture": "#0"}, - "up": {"uv": [5.125, 7.875, 5.375, 8], "rotation": 90, "texture": "#0"}, - "down": {"uv": [5.375, 8, 5.625, 8.125], "rotation": 90, "texture": "#0"} + "west": {"uv": [9.125, 0.5, 9.375, 0.75], "texture": "#0"}, + "up": {"uv": [8.75, 0.25, 9, 0.375], "rotation": 90, "texture": "#0"}, + "down": {"uv": [8.75, 0.625, 9, 0.75], "rotation": 90, "texture": "#0"} } }, { @@ -59,10 +59,10 @@ "to": [13, 9, 11], "faces": { "north": {"uv": [4.875, 7.875, 5, 8.5], "texture": "#0"}, - "east": {"uv": [5.125, 7.875, 5.375, 8.5], "texture": "#0"}, - "south": {"uv": [5, 7.875, 4.875, 8.5], "texture": "#0"}, + "east": {"uv": [8.75, 0.25, 9, 0.875], "texture": "#0"}, + "south": {"uv": [8.875, 0.25, 8.75, 0.875], "texture": "#0"}, "west": {"uv": [0, 0, 2, 5], "texture": "#0"}, - "up": {"uv": [5.625, 7.875, 5.375, 8], "rotation": 90, "texture": "#0"}, + "up": {"uv": [9, 0.5, 8.75, 0.625], "rotation": 90, "texture": "#0"}, "down": {"uv": [0, 0, 10, 2], "texture": "#0"} } }, @@ -70,11 +70,11 @@ "from": [1, 4, 0], "to": [4, 10, 7], "faces": { - "north": {"uv": [2.75, 6.5, 3.125, 7.25], "texture": "#0"}, + "north": {"uv": [2.75, 6.625, 3.125, 7.375], "texture": "#0"}, "east": {"uv": [0, 0, 7, 6], "texture": "#0"}, - "south": {"uv": [1.375, 6.5, 1.75, 7.25], "texture": "#0"}, - "west": {"uv": [7.375, 3.75, 8.25, 4.5], "texture": "#0"}, - "up": {"uv": [5.125, 3.75, 5.5, 4.625], "texture": "#0"}, + "south": {"uv": [0.375, 6.375, 0.75, 7.125], "texture": "#0"}, + "west": {"uv": [2.625, 6.375, 3.5, 7.125], "texture": "#0"}, + "up": {"uv": [1, 2, 1.375, 2.875], "texture": "#0"}, "down": {"uv": [0, 0, 3, 7], "texture": "#0"} } }, @@ -82,11 +82,11 @@ "from": [12, 4, 0], "to": [15, 10, 7], "faces": { - "north": {"uv": [1.375, 6.5, 1.75, 7.25], "texture": "#0"}, - "east": {"uv": [5.875, 5, 6.75, 5.75], "texture": "#0"}, - "south": {"uv": [2.75, 6.5, 3.125, 7.25], "texture": "#0"}, + "north": {"uv": [0.875, 6.625, 1.25, 7.375], "texture": "#0"}, + "east": {"uv": [0.5, 6.375, 1.375, 7.125], "texture": "#0"}, + "south": {"uv": [2.875, 6.375, 3.25, 7.125], "texture": "#0"}, "west": {"uv": [0, 0, 7, 6], "texture": "#0"}, - "up": {"uv": [6.75, 3.75, 7.125, 4.625], "texture": "#0"}, + "up": {"uv": [1.25, 2, 1.625, 2.875], "texture": "#0"}, "down": {"uv": [0, 0, 3, 7], "texture": "#0"} } }, @@ -94,48 +94,36 @@ "from": [2, 12, -1], "to": [6, 16, 14], "faces": { - "north": {"uv": [6.375, 7.875, 6.875, 8.375], "texture": "#0"}, - "east": {"uv": [6.375, 8.5, 8.25, 9], "texture": "#0"}, - "south": {"uv": [6.375, 7.875, 6.875, 8.375], "texture": "#0"}, - "west": {"uv": [6.375, 8.5, 8.25, 9], "texture": "#0"}, - "up": {"uv": [6.375, 8.5, 8.25, 9], "rotation": 90, "texture": "#0"}, - "down": {"uv": [8.25, 8.5, 6.375, 9], "rotation": 90, "texture": "#0"} + "north": {"uv": [10, 1.75, 10.5, 2.25], "texture": "#0"}, + "east": {"uv": [8.125, 1.75, 10, 2.25], "texture": "#0"}, + "south": {"uv": [10, 1.75, 10.5, 2.25], "texture": "#0"}, + "west": {"uv": [8.125, 2.25, 10, 2.75], "texture": "#0"}, + "up": {"uv": [8.125, 2.25, 10, 2.75], "rotation": 90, "texture": "#0"}, + "down": {"uv": [10, 2.25, 8.125, 2.75], "rotation": 90, "texture": "#0"} } }, { "from": [10, 12, -1], "to": [14, 16, 14], "faces": { - "north": {"uv": [6.375, 7.875, 6.875, 8.375], "texture": "#0"}, - "east": {"uv": [8.25, 8.5, 6.375, 9], "texture": "#0"}, - "south": {"uv": [6.375, 7.875, 6.875, 8.375], "texture": "#0"}, - "west": {"uv": [6.375, 8.5, 8.25, 9], "texture": "#0"}, - "up": {"uv": [6.375, 8.5, 8.25, 9], "rotation": 90, "texture": "#0"}, - "down": {"uv": [8.25, 8.5, 6.375, 9], "rotation": 90, "texture": "#0"} - } - }, - { - "from": [6, 12, 0], - "to": [10, 13, 15], - "faces": { - "north": {"uv": [1, 0.125, 1.5, 0.25], "texture": "#0"}, - "east": {"uv": [0.25, 1.75, 2.25, 1.875], "texture": "#0"}, - "south": {"uv": [1, 0.125, 1.5, 0.25], "texture": "#0"}, - "west": {"uv": [0.25, 1.75, 2.25, 1.875], "texture": "#0"}, - "up": {"uv": [14.625, 2.125, 15.125, 4.125], "texture": "#0"}, - "down": {"uv": [0, 0, 4, 15], "texture": "#0"} + "north": {"uv": [10, 1.75, 10.5, 2.25], "texture": "#0"}, + "east": {"uv": [10, 2.25, 8.125, 2.75], "texture": "#0"}, + "south": {"uv": [10, 1.75, 10.5, 2.25], "texture": "#0"}, + "west": {"uv": [8.125, 2.25, 10, 2.75], "texture": "#0"}, + "up": {"uv": [8.125, 2.25, 10, 2.75], "rotation": 90, "texture": "#0"}, + "down": {"uv": [10, 2.25, 8.125, 2.75], "rotation": 90, "texture": "#0"} } }, { "from": [4, 4, 0], "to": [12, 12, 16], "faces": { - "north": {"uv": [3.5, 3.875, 4.5, 4.875], "texture": "#0"}, - "east": {"uv": [5.125, 6.5, 7.125, 7.5], "texture": "#0"}, - "south": {"uv": [0.5, 7.75, 1.5, 8.75], "texture": "#0"}, - "west": {"uv": [5.125, 6.5, 7.125, 7.5], "texture": "#0"}, - "up": {"uv": [5.125, 5.5, 7.125, 6.5], "rotation": 90, "texture": "#0"}, - "down": {"uv": [0, 0, 8, 16], "texture": "#0"} + "north": {"uv": [5.5, 0, 6.5, 1], "texture": "#0"}, + "east": {"uv": [1.75, 6.125, 3.75, 7.125], "texture": "#0"}, + "south": {"uv": [3.125, 0, 4.125, 1], "texture": "#0"}, + "west": {"uv": [0.25, 6.125, 2.25, 7.125], "texture": "#0"}, + "up": {"uv": [8.5, 4.5, 10.5, 5.5], "rotation": 90, "texture": "#0"}, + "down": {"uv": [8, 0, 16, 16], "texture": "#0"} } } ] diff --git a/src/main/resources/assets/createindustry/models/item/unfinished_engine.json b/src/main/resources/assets/createindustry/models/item/unfinished_engine.json index 8f593216..cf1124ff 100644 --- a/src/main/resources/assets/createindustry/models/item/unfinished_engine.json +++ b/src/main/resources/assets/createindustry/models/item/unfinished_engine.json @@ -2,34 +2,34 @@ "credit": "Made with Blockbench", "parent": "minecraft:block/block", "textures": { - "1": "createindustry:block/gasoline_engine", - "particle": "minecraft:block/anvil" + "0": "createindustry:item/engine_base", + "particle": "createindustry:item/engine_base" }, "elements": [ - { - "from": [0, 0, 2], - "to": [3, 7, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 5, 8]}, - "faces": { - "north": {"uv": [13.125, 1.25, 13.5, 2.125], "texture": "#1"}, - "east": {"uv": [0, 0, 16, 7], "texture": "#1"}, - "south": {"uv": [5, 1, 5.375, 1.875], "texture": "#1"}, - "west": {"uv": [11.875, 4.5, 13.625, 5.375], "texture": "#1"}, - "up": {"uv": [8.625, 3.75, 9, 5.5], "texture": "#1"}, - "down": {"uv": [7.125, 5.75, 6.75, 3.75], "texture": "#1"} - } - }, { "from": [3, 0, 2], "to": [13, 12, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, 5, 8]}, "faces": { - "north": {"uv": [11.875, 0.625, 13.125, 2.125], "texture": "#1"}, - "east": {"uv": [7.875, 2.125, 6.125, 3.625], "texture": "#1"}, - "south": {"uv": [5.375, 0.375, 6.625, 1.875], "texture": "#1"}, - "west": {"uv": [9.625, 2.125, 7.875, 3.625], "texture": "#1"}, - "up": {"uv": [9.875, 2.125, 11.125, 3.875], "texture": "#1"}, - "down": {"uv": [5.5, 3.75, 6.75, 5.5], "rotation": 180, "texture": "#1"} + "north": {"uv": [1, 0, 3.5, 3], "texture": "#0"}, + "east": {"uv": [3.5, 12.25, 0, 15.25], "texture": "#0"}, + "south": {"uv": [5.5, 0, 8, 3], "texture": "#0"}, + "west": {"uv": [0, 12.25, 3.5, 15.25], "texture": "#0"}, + "up": {"uv": [1, 7, 3.5, 10.5], "rotation": 180, "texture": "#0"}, + "down": {"uv": [5.5, 3.5, 8, 7], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [0, 0, 2], + "to": [3, 7, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 5, 8]}, + "faces": { + "north": {"uv": [3.5, 1.25, 4.25, 3], "texture": "#0"}, + "east": {"uv": [0, 0, 0, 0], "texture": "#0"}, + "south": {"uv": [4.75, 1.25, 5.5, 3], "texture": "#0"}, + "west": {"uv": [0, 13.75, 3.5, 15.5], "texture": "#0"}, + "up": {"uv": [0, 7, 0.75, 10.5], "texture": "#0"}, + "down": {"uv": [8.625, 7, 8, 3.5], "texture": "#0"} } }, { @@ -37,12 +37,38 @@ "to": [16, 7, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, 5, 8]}, "faces": { - "north": {"uv": [11.5, 1.25, 11.875, 2.125], "texture": "#1"}, - "east": {"uv": [13.625, 6.75, 11.875, 7.625], "texture": "#1"}, - "south": {"uv": [6.625, 1, 7, 1.875], "texture": "#1"}, - "west": {"uv": [0, 0, 16, 7], "texture": "#1"}, - "up": {"uv": [8.625, 5.625, 9, 7.375], "texture": "#1"}, - "down": {"uv": [5.5, 5.5, 5.125, 3.75], "texture": "#1"} + "north": {"uv": [0.25, 1.25, 1, 3], "texture": "#0"}, + "east": {"uv": [3.5, 13.75, 0, 15.5], "texture": "#0"}, + "south": {"uv": [8, 1.25, 8.75, 3], "texture": "#0"}, + "west": {"uv": [0, 0, 0, 0], "texture": "#0"}, + "up": {"uv": [3.75, 7, 4.5, 10.5], "texture": "#0"}, + "down": {"uv": [5.5, 3.5, 4.75, 7], "texture": "#0"} + } + }, + { + "from": [2, 7, 2], + "to": [3, 10, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 5, 8]}, + "faces": { + "north": {"uv": [14, 1, 14.25, 1.75], "texture": "#0"}, + "east": {"uv": [0, 0, 0, 0], "texture": "#0"}, + "south": {"uv": [14, 1, 14.25, 1.75], "texture": "#0"}, + "west": {"uv": [14, 1, 14.5, 1.75], "texture": "#0"}, + "up": {"uv": [14, 1.25, 14.5, 1.5], "texture": "#0"}, + "down": {"uv": [14.25, 0, 15.25, 2], "texture": "#0"} + } + }, + { + "from": [13, 7, 2], + "to": [14, 10, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 5, 8]}, + "faces": { + "north": {"uv": [14, 1, 14.25, 1.75], "texture": "#0"}, + "east": {"uv": [14, 1, 14.5, 1.75], "texture": "#0"}, + "south": {"uv": [14, 1, 14.25, 1.75], "texture": "#0"}, + "west": {"uv": [0, 0, 0, 0], "texture": "#0"}, + "up": {"uv": [14, 1.25, 14.5, 1.5], "texture": "#0"}, + "down": {"uv": [14.25, 0.125, 15.25, 2.125], "texture": "#0"} } } ] diff --git a/src/main/resources/assets/createindustry/sounds.json b/src/main/resources/assets/createindustry/sounds.json index 7e999b18..06ecf5d8 100644 --- a/src/main/resources/assets/createindustry/sounds.json +++ b/src/main/resources/assets/createindustry/sounds.json @@ -1,5 +1,15 @@ { + "engine": { + "sounds": [ + { + "name": "createindustry:engine", + "type": "file", + "attenuation_distance": 16 + } + ], + "subtitle": "createindustry.subtitle.engine_sounds" + }, "diesel_engine": { "sounds": [ { @@ -8,6 +18,6 @@ "attenuation_distance": 16 } ], - "subtitle": "createindustry.subtitle.engine_sounds" + "subtitle": "createindustry.subtitle.diesel_engine_sounds" } } \ No newline at end of file diff --git a/src/main/resources/assets/createindustry/sounds/diesel_engine.ogg b/src/main/resources/assets/createindustry/sounds/diesel_engine.ogg index a3885eb1..ecd3402a 100644 Binary files a/src/main/resources/assets/createindustry/sounds/diesel_engine.ogg and b/src/main/resources/assets/createindustry/sounds/diesel_engine.ogg differ diff --git a/src/main/resources/assets/createindustry/sounds/diesel_engine_.ogg b/src/main/resources/assets/createindustry/sounds/engine.ogg similarity index 97% rename from src/main/resources/assets/createindustry/sounds/diesel_engine_.ogg rename to src/main/resources/assets/createindustry/sounds/engine.ogg index 5254b4fe..a3885eb1 100644 Binary files a/src/main/resources/assets/createindustry/sounds/diesel_engine_.ogg and b/src/main/resources/assets/createindustry/sounds/engine.ogg differ diff --git a/src/main/resources/assets/createindustry/textures/block/aluminum_pipes.png b/src/main/resources/assets/createindustry/textures/block/aluminum_pipes.png index 2b96340d..3f32cda8 100644 Binary files a/src/main/resources/assets/createindustry/textures/block/aluminum_pipes.png and b/src/main/resources/assets/createindustry/textures/block/aluminum_pipes.png differ diff --git a/src/main/resources/assets/createindustry/textures/block/aluminum_smart_pipe_1.png b/src/main/resources/assets/createindustry/textures/block/aluminum_smart_pipe_1.png index a4dc9c70..948ae215 100644 Binary files a/src/main/resources/assets/createindustry/textures/block/aluminum_smart_pipe_1.png and b/src/main/resources/assets/createindustry/textures/block/aluminum_smart_pipe_1.png differ diff --git a/src/main/resources/assets/createindustry/textures/block/aluminum_smart_pipe_2.png b/src/main/resources/assets/createindustry/textures/block/aluminum_smart_pipe_2.png index c301891f..828427b4 100644 Binary files a/src/main/resources/assets/createindustry/textures/block/aluminum_smart_pipe_2.png and b/src/main/resources/assets/createindustry/textures/block/aluminum_smart_pipe_2.png differ diff --git a/src/main/resources/assets/createindustry/textures/block/blast_furnace_output.png b/src/main/resources/assets/createindustry/textures/block/blast_furnace_output.png index bb5ce18e..2c955d6a 100644 Binary files a/src/main/resources/assets/createindustry/textures/block/blast_furnace_output.png and b/src/main/resources/assets/createindustry/textures/block/blast_furnace_output.png differ diff --git a/src/main/resources/assets/createindustry/textures/block/blast_furnace_slot_lit.png b/src/main/resources/assets/createindustry/textures/block/blast_furnace_slot_lit.png deleted file mode 100644 index 5eb0ea5d..00000000 Binary files a/src/main/resources/assets/createindustry/textures/block/blast_furnace_slot_lit.png and /dev/null differ diff --git a/src/main/resources/assets/createindustry/textures/block/brass_pipes.png b/src/main/resources/assets/createindustry/textures/block/brass_pipes.png index 085b1eb7..efde4111 100644 Binary files a/src/main/resources/assets/createindustry/textures/block/brass_pipes.png and b/src/main/resources/assets/createindustry/textures/block/brass_pipes.png differ diff --git a/src/main/resources/assets/createindustry/textures/block/cast_iron_distillation_controller_side.png b/src/main/resources/assets/createindustry/textures/block/cast_iron_distillation_controller_side.png index 829f2cb8..3c1975b4 100644 Binary files a/src/main/resources/assets/createindustry/textures/block/cast_iron_distillation_controller_side.png and b/src/main/resources/assets/createindustry/textures/block/cast_iron_distillation_controller_side.png differ diff --git a/src/main/resources/assets/createindustry/textures/block/cast_iron_distillation_controller_top.png b/src/main/resources/assets/createindustry/textures/block/cast_iron_distillation_controller_top.png index ad7a0116..8b51ad85 100644 Binary files a/src/main/resources/assets/createindustry/textures/block/cast_iron_distillation_controller_top.png and b/src/main/resources/assets/createindustry/textures/block/cast_iron_distillation_controller_top.png differ diff --git a/src/main/resources/assets/createindustry/textures/block/cast_iron_pipes.png b/src/main/resources/assets/createindustry/textures/block/cast_iron_pipes.png index b853b1ac..04aace74 100644 Binary files a/src/main/resources/assets/createindustry/textures/block/cast_iron_pipes.png and b/src/main/resources/assets/createindustry/textures/block/cast_iron_pipes.png differ diff --git a/src/main/resources/assets/createindustry/textures/block/copper_encased_aluminum_pipe.png b/src/main/resources/assets/createindustry/textures/block/copper_encased_aluminum_pipe.png index 2ce6f97c..a3074fe9 100644 Binary files a/src/main/resources/assets/createindustry/textures/block/copper_encased_aluminum_pipe.png and b/src/main/resources/assets/createindustry/textures/block/copper_encased_aluminum_pipe.png differ diff --git a/src/main/resources/assets/createindustry/textures/block/copper_encased_brass_pipe.png b/src/main/resources/assets/createindustry/textures/block/copper_encased_brass_pipe.png index 2ce6f97c..7672606c 100644 Binary files a/src/main/resources/assets/createindustry/textures/block/copper_encased_brass_pipe.png and b/src/main/resources/assets/createindustry/textures/block/copper_encased_brass_pipe.png differ diff --git a/src/main/resources/assets/createindustry/textures/block/copper_encased_cast_iron_pipe.png b/src/main/resources/assets/createindustry/textures/block/copper_encased_cast_iron_pipe.png index 2ce6f97c..25f84adf 100644 Binary files a/src/main/resources/assets/createindustry/textures/block/copper_encased_cast_iron_pipe.png and b/src/main/resources/assets/createindustry/textures/block/copper_encased_cast_iron_pipe.png differ diff --git a/src/main/resources/assets/createindustry/textures/block/copper_encased_plastic_pipe.png b/src/main/resources/assets/createindustry/textures/block/copper_encased_plastic_pipe.png index 2ce6f97c..7a3270a9 100644 Binary files a/src/main/resources/assets/createindustry/textures/block/copper_encased_plastic_pipe.png and b/src/main/resources/assets/createindustry/textures/block/copper_encased_plastic_pipe.png differ diff --git a/src/main/resources/assets/createindustry/textures/block/distillation_controller.png b/src/main/resources/assets/createindustry/textures/block/distillation_controller.png index 7d3994b4..5e15698c 100644 Binary files a/src/main/resources/assets/createindustry/textures/block/distillation_controller.png and b/src/main/resources/assets/createindustry/textures/block/distillation_controller.png differ diff --git a/src/main/resources/assets/createindustry/textures/block/distillation_controller_front.png b/src/main/resources/assets/createindustry/textures/block/distillation_controller_front.png index f47d98bf..fdc71e0c 100644 Binary files a/src/main/resources/assets/createindustry/textures/block/distillation_controller_front.png and b/src/main/resources/assets/createindustry/textures/block/distillation_controller_front.png differ diff --git a/src/main/resources/assets/createindustry/textures/block/distillation_controller_top.png b/src/main/resources/assets/createindustry/textures/block/distillation_controller_top.png index e6cb1343..90f6712a 100644 Binary files a/src/main/resources/assets/createindustry/textures/block/distillation_controller_top.png and b/src/main/resources/assets/createindustry/textures/block/distillation_controller_top.png differ diff --git a/src/main/resources/assets/createindustry/textures/block/distillation_tower_output.png b/src/main/resources/assets/createindustry/textures/block/distillation_tower_output.png index 363ac206..d610adc8 100644 Binary files a/src/main/resources/assets/createindustry/textures/block/distillation_tower_output.png and b/src/main/resources/assets/createindustry/textures/block/distillation_tower_output.png differ diff --git a/src/main/resources/assets/createindustry/textures/block/distiller_side.png b/src/main/resources/assets/createindustry/textures/block/distiller_side.png index 429f2166..faf8a42d 100644 Binary files a/src/main/resources/assets/createindustry/textures/block/distiller_side.png and b/src/main/resources/assets/createindustry/textures/block/distiller_side.png differ diff --git a/src/main/resources/assets/createindustry/textures/block/engines/lpg.png b/src/main/resources/assets/createindustry/textures/block/engines/lpg.png new file mode 100644 index 00000000..9c9985af Binary files /dev/null and b/src/main/resources/assets/createindustry/textures/block/engines/lpg.png differ diff --git a/src/main/resources/assets/createindustry/textures/block/engines/turbine.png b/src/main/resources/assets/createindustry/textures/block/engines/turbine.png new file mode 100644 index 00000000..5bfad8f6 Binary files /dev/null and b/src/main/resources/assets/createindustry/textures/block/engines/turbine.png differ diff --git a/src/main/resources/assets/createindustry/textures/block/exhaust.png b/src/main/resources/assets/createindustry/textures/block/exhaust.png index f3f8369a..8fecb8c4 100644 Binary files a/src/main/resources/assets/createindustry/textures/block/exhaust.png and b/src/main/resources/assets/createindustry/textures/block/exhaust.png differ diff --git a/src/main/resources/assets/createindustry/textures/block/img.png b/src/main/resources/assets/createindustry/textures/block/img.png deleted file mode 100644 index 98d78d68..00000000 Binary files a/src/main/resources/assets/createindustry/textures/block/img.png and /dev/null differ diff --git a/src/main/resources/assets/createindustry/textures/block/molten_metal.png.mcmeta b/src/main/resources/assets/createindustry/textures/block/molten_metal.png.mcmeta new file mode 100644 index 00000000..0645f48c --- /dev/null +++ b/src/main/resources/assets/createindustry/textures/block/molten_metal.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 2 + } +} diff --git a/src/main/resources/assets/createindustry/textures/block/plastic_pipes.png b/src/main/resources/assets/createindustry/textures/block/plastic_pipes.png index 6baf400e..ee97c8a9 100644 Binary files a/src/main/resources/assets/createindustry/textures/block/plastic_pipes.png and b/src/main/resources/assets/createindustry/textures/block/plastic_pipes.png differ diff --git a/src/main/resources/assets/createindustry/textures/block/pumpjack_hammer_holder.png b/src/main/resources/assets/createindustry/textures/block/pumpjack_hammer_holder.png deleted file mode 100644 index efdf2708..00000000 Binary files a/src/main/resources/assets/createindustry/textures/block/pumpjack_hammer_holder.png and /dev/null differ diff --git a/src/main/resources/assets/createindustry/textures/block/steel_distillation_controller.png b/src/main/resources/assets/createindustry/textures/block/steel_distillation_controller.png deleted file mode 100644 index efdf2708..00000000 Binary files a/src/main/resources/assets/createindustry/textures/block/steel_distillation_controller.png and /dev/null differ diff --git a/src/main/resources/assets/createindustry/textures/block/steel_distillation_output.png b/src/main/resources/assets/createindustry/textures/block/steel_distillation_output.png deleted file mode 100644 index efdf2708..00000000 Binary files a/src/main/resources/assets/createindustry/textures/block/steel_distillation_output.png and /dev/null differ diff --git a/src/main/resources/assets/createindustry/textures/item/engine_base.png b/src/main/resources/assets/createindustry/textures/item/engine_base.png new file mode 100644 index 00000000..b18e27f7 Binary files /dev/null and b/src/main/resources/assets/createindustry/textures/item/engine_base.png differ diff --git a/src/main/resources/assets/createindustry/textures/item/molten_slag_bucket.png b/src/main/resources/assets/createindustry/textures/item/molten_slag_bucket.png index efdf2708..b91b0881 100644 Binary files a/src/main/resources/assets/createindustry/textures/item/molten_slag_bucket.png and b/src/main/resources/assets/createindustry/textures/item/molten_slag_bucket.png differ diff --git a/src/main/resources/assets/createindustry/textures/item/molten_steel_bucket.png b/src/main/resources/assets/createindustry/textures/item/molten_steel_bucket.png index efdf2708..3fa5d17a 100644 Binary files a/src/main/resources/assets/createindustry/textures/item/molten_steel_bucket.png and b/src/main/resources/assets/createindustry/textures/item/molten_steel_bucket.png differ