idk anymore

src/main/java/com/drmangotea/tfmg/blocks/engines/diesel/DieselEngineBlockEntity.java

@@ -16,6 +16,7 @@ import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour
 import com.simibubi.create.foundation.blockEntity.behaviour.fluid.SmartFluidTankBehaviour;
 import com.simibubi.create.foundation.blockEntity.behaviour.scrollValue.ScrollOptionBehaviour;
 import com.simibubi.create.foundation.fluid.CombinedTankWrapper;
+import com.simibubi.create.foundation.fluid.SmartFluidTank;
 import com.simibubi.create.foundation.utility.*;
 import net.minecraft.ChatFormatting;
 import net.minecraft.core.BlockPos;
@@ -23,10 +24,12 @@ import net.minecraft.core.Direction;
 import net.minecraft.core.Direction.Axis;
 import net.minecraft.core.Direction.AxisDirection;
 import net.minecraft.nbt.CompoundTag;
+import net.minecraft.nbt.NbtUtils;
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.entity.BlockEntityType;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.material.Fluid;
 import net.minecraft.world.phys.AABB;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
@@ -35,6 +38,7 @@ import net.minecraftforge.common.util.LazyOptional;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.capability.CapabilityFluidHandler;
 import net.minecraftforge.fluids.capability.IFluidHandler;
+import net.minecraftforge.fluids.capability.templates.FluidTank;
 import net.minecraftforge.fml.DistExecutor;
 
 import javax.annotation.Nonnull;
@@ -50,30 +54,18 @@ public class DieselEngineBlockEntity extends SmartBlockEntity implements IHaveGo
 	public WeakReference<PoweredShaftBlockEntity> target;
 ///////////
 
-	public SmartFluidTankBehaviour inputTank;
-	protected SmartFluidTankBehaviour exhaustTank;
+	public FluidTank fuelTank;
+	protected FluidTank exhaustTank;
+
+	protected FluidTank airTank;
 	private boolean contentsChanged;
 	private int consumptionTimer=0;
 	public float engineStrength = 0;
-	private Couple<SmartFluidTankBehaviour> tanks;
-
-	public boolean connectionVerticalX=false;
-	public boolean connectionVerticalZ=false;
-
-	public boolean connectionX=false;
-	public boolean connectionX2=false;
-
-	public boolean connectionZ=false;
-	public boolean connectionZ2=false;
-
-	protected LazyOptional<IFluidHandler> fluidCapability;
+	private Couple<FluidTank> tanks;
 
 
 
-
-
-
-	List<IntAttached<FluidStack>> visualizedOutputFluids;
+	protected LazyOptional<CombinedTankWrapper> fluidCapability;
 
 	public DieselEngineBlockEntity(BlockEntityType<?> type, BlockPos pos, BlockState state) {
 		super(type, pos, state);
@@ -84,14 +76,18 @@ public class DieselEngineBlockEntity extends SmartBlockEntity implements IHaveGo
 
 
 		contentsChanged = true;
+		fuelTank = createInventory(TFMGFluids.DIESEL.getSource(),false);
 
 
 
-		tanks = Couple.create(inputTank, exhaustTank);
-		tanks.get(true).forbidExtraction();
-		tanks.get(false).forbidInsertion();
+		exhaustTank = createInventory(TFMGFluids.CARBON_DIOXIDE.getSource(),true);
+		airTank = createInventory(TFMGFluids.AIR.getSource(),false);
 
 
+		tanks = Couple.create(fuelTank, exhaustTank);
+
+		fluidCapability = LazyOptional.of(() -> new CombinedTankWrapper(fuelTank,airTank, exhaustTank));
+
 
 	}
 
@@ -111,21 +107,6 @@ public class DieselEngineBlockEntity extends SmartBlockEntity implements IHaveGo
 		behaviours.add(new DirectBeltInputBehaviour(this));
 
 
-
-		inputTank = new SmartFluidTankBehaviour(SmartFluidTankBehaviour.INPUT, this, 1, 1000, true)
-				.whenFluidUpdates(() -> contentsChanged = true);
-
-		exhaustTank = new SmartFluidTankBehaviour(SmartFluidTankBehaviour.OUTPUT, this, 1, 1000, true)
-				.whenFluidUpdates(() -> contentsChanged = true)
-				.forbidInsertion();
-		behaviours.add(inputTank);
-		behaviours.add(exhaustTank);
-
-		fluidCapability = LazyOptional.of(() -> {
-			LazyOptional<? extends IFluidHandler> inputCap = inputTank.getCapability();
-			LazyOptional<? extends IFluidHandler> outputCap = exhaustTank.getCapability();
-			return new CombinedTankWrapper(outputCap.orElse(null), inputCap.orElse(null));
-		});
 	}
 
 	private void onDirectionChanged() {}
@@ -135,17 +116,6 @@ public class DieselEngineBlockEntity extends SmartBlockEntity implements IHaveGo
 		super.tick();
 
 
-	spawnConnections();
-
-
-
-	if(!level.isClientSide()){
-
-
-
-	}
-
-
 
 		PoweredShaftBlockEntity shaft = getShaft();
 
@@ -165,7 +135,8 @@ public class DieselEngineBlockEntity extends SmartBlockEntity implements IHaveGo
 				shaft.update(worldPosition, 0, 0);
 			return;
 		}
-		engineProcess();
+		if(!level.isClientSide)
+			engineProcess();
 		boolean verticalTarget = false;
 		BlockState shaftState = shaft.getBlockState();
 		Axis targetAxis = Axis.X;
@@ -181,9 +152,6 @@ public class DieselEngineBlockEntity extends SmartBlockEntity implements IHaveGo
 			facing = blockState.getValue(DieselEngineBlock.FACING);
 
 
-		//if (engineStrength > 0)
-
-		//	award(AllAdvancements.STEAM_ENGINE);
 
 		int conveyedSpeedLevel =
 			engineStrength == 0 ? 1 : verticalTarget ? 1 : (int) GeneratingKineticBlockEntity.convertToDirection(1, facing)*2;
@@ -237,86 +205,37 @@ public class DieselEngineBlockEntity extends SmartBlockEntity implements IHaveGo
 		prevAngle = angle;
 	}
 
-	private void spawnConnections(){
-		if(((DieselEngineBlock)this.getBlockState().getBlock()).getConnectedDirection(this.getBlockState()) == Direction.UP||
-				((DieselEngineBlock)this.getBlockState().getBlock()).getConnectedDirection(this.getBlockState()) == Direction.DOWN){
-
-			if(
-					level.getBlockState(this.getBlockPos().north()).is(TFMGBlocks.DIESEL_ENGINE.get())||
-							level.getBlockState(this.getBlockPos().south()).is(TFMGBlocks.DIESEL_ENGINE.get())
-			){
-				connectionVerticalZ=true;
-			} else connectionVerticalZ=false;
-			if(
-					level.getBlockState(this.getBlockPos().west()).is(TFMGBlocks.DIESEL_ENGINE.get())||
-							level.getBlockState(this.getBlockPos().east()).is(TFMGBlocks.DIESEL_ENGINE.get())
-			){
-				connectionVerticalX=true;
-			} else connectionVerticalX=false;
-
-
-
-		}
-		if(((DieselEngineBlock)this.getBlockState().getBlock()).getConnectedDirection(this.getBlockState()) == Direction.WEST||
-				((DieselEngineBlock)this.getBlockState().getBlock()).getConnectedDirection(this.getBlockState()) == Direction.EAST){
-
-			if(
-					level.getBlockState(this.getBlockPos().north()).is(TFMGBlocks.DIESEL_ENGINE.get())||
-							level.getBlockState(this.getBlockPos().south()).is(TFMGBlocks.DIESEL_ENGINE.get())
-			){
-				connectionZ=true;
-			} else connectionZ=false;
-			if(
-					level.getBlockState(this.getBlockPos().above()).is(TFMGBlocks.DIESEL_ENGINE.get())||
-							level.getBlockState(this.getBlockPos().below()).is(TFMGBlocks.DIESEL_ENGINE.get())
-			){
-				connectionZ2=true;
-			} else connectionZ2=false;
-
-
-
-		}
-		if(((DieselEngineBlock)this.getBlockState().getBlock()).getConnectedDirection(this.getBlockState()) == Direction.NORTH||
-				((DieselEngineBlock)this.getBlockState().getBlock()).getConnectedDirection(this.getBlockState()) == Direction.SOUTH){
-
-			if(
-					level.getBlockState(this.getBlockPos().west()).is(TFMGBlocks.DIESEL_ENGINE.get())||
-							level.getBlockState(this.getBlockPos().east()).is(TFMGBlocks.DIESEL_ENGINE.get())
-			){
-				connectionX=true;
-			} else connectionX=false;
-			if(
-					level.getBlockState(this.getBlockPos().above()).is(TFMGBlocks.DIESEL_ENGINE.get())||
-							level.getBlockState(this.getBlockPos().below()).is(TFMGBlocks.DIESEL_ENGINE.get())
-			){
-				connectionX2=true;
-			} else connectionX2=false;
-
-
-
-		}
-	}
 
 
 	private void engineProcess() {
-		if(tanks.get(true).getPrimaryHandler().isEmpty()||tanks.get(true).getPrimaryHandler().isEmpty()) {
+		if(tanks.get(true).isEmpty()||tanks.get(true).isEmpty()) {
 			engineStrength=0;
 			return;
 		}
-		if(tanks.get(false).getPrimaryHandler().getFluidAmount()+5>1000) {
+		if(airTank.isEmpty()){
 			engineStrength = 0;
 			return;
 		}
-		if(tanks.get(true).getPrimaryHandler().getFluid().getFluid().isSame(TFMGFluids.DIESEL.getSource())) {
 
-
-
-		if(consumptionTimer>=3) {
-			//if(signal!=0)
-				tanks.get(true).getPrimaryHandler().drain(3, IFluidHandler.FluidAction.EXECUTE);
-				tanks.get(false) .getPrimaryHandler().setFluid(new FluidStack(TFMGFluids.CARBON_DIOXIDE.getSource(), tanks.get(false).getPrimaryHandler().getFluidAmount()+1));
-		consumptionTimer=0;
+		if(tanks.get(false).getFluidAmount()+5>1000) {
+			engineStrength = 0;
+			return;
 		}
+		if(tanks.get(true).getFluid().getFluid().isSame(TFMGFluids.DIESEL.getSource())) {
+
+
+
+		if(consumptionTimer>=10) {
+			//if(signal!=0)
+				fuelTank.setFluid(new FluidStack(TFMGFluids.DIESEL.getSource(),airTank.getFluidAmount()-1));
+			consumptionTimer=0;
+		}
+				//airTank.drain(1, IFluidHandler.FluidAction.EXECUTE);
+
+				airTank.setFluid(new FluidStack(TFMGFluids.AIR.getSource(),airTank.getFluidAmount()-5));
+				exhaustTank.fill(new FluidStack(TFMGFluids.CARBON_DIOXIDE.getSource(),3), IFluidHandler.FluidAction.EXECUTE);
+				//tanks.get(false).setFluid(new FluidStack(TFMGFluids.CARBON_DIOXIDE.getSource(), tanks.get(false).getFluidAmount()+1));
+
 		consumptionTimer++;
 
 		engineStrength=40;
@@ -396,28 +315,28 @@ public class DieselEngineBlockEntity extends SmartBlockEntity implements IHaveGo
 ////////////////////////////////////
 
 	@Override
-	protected void read(CompoundTag compound, boolean clientPacket) {
-		super.read(compound, clientPacket);
+	public void write(CompoundTag compound, boolean clientPacket) {
+
+		compound.put("Fuel", fuelTank.writeToNBT(new CompoundTag()));
+		compound.put("Air", airTank.writeToNBT(new CompoundTag()));
+
+		compound.put("Exhaust", exhaustTank.writeToNBT(new CompoundTag()));
 
 
-		if (!clientPacket)
-			return;
-	//	tanks.get(true).getPrimaryHandler().readFromNBT(compound.getCompound("Fuel"));
-	//	tanks.get(true).getPrimaryHandler().readFromNBT(compound.getCompound("Exhaust"));
-
+		super.write(compound, clientPacket);
 	}
 
 	@Override
-	public void write(CompoundTag compound, boolean clientPacket) {
-		super.write(compound, clientPacket);
+	protected void read(CompoundTag compound, boolean clientPacket) {
+		fuelTank.readFromNBT(compound.getCompound("Fuel"));
+
+		airTank.readFromNBT(compound.getCompound("Air"));
+
+		exhaustTank.readFromNBT(compound.getCompound("Exhaust"));
 
 
 
-		if (!clientPacket)
-			return;
-	//	compound.put("Fuel", tanks.get(true).getPrimaryHandler().writeToNBT(new CompoundTag()));
-	//	compound.put("Exhaust", tanks.get(false).getPrimaryHandler().writeToNBT(new CompoundTag()));
-
+		super.read(compound, clientPacket);
 	}
 
 
@@ -430,6 +349,7 @@ public class DieselEngineBlockEntity extends SmartBlockEntity implements IHaveGo
 
 	@Nonnull
 	@Override
+	@SuppressWarnings("removal")
 	public <T> LazyOptional<T> getCapability(@Nonnull Capability<T> cap, Direction side) {
 
 		if (cap == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY)
@@ -447,7 +367,7 @@ public class DieselEngineBlockEntity extends SmartBlockEntity implements IHaveGo
 
 
 
-	public Couple<SmartFluidTankBehaviour> getTanks() {
+	public Couple<FluidTank> getTanks() {
 		return tanks;
 	}
 
@@ -460,6 +380,7 @@ public class DieselEngineBlockEntity extends SmartBlockEntity implements IHaveGo
 
 
 	@Override
+	@SuppressWarnings("removal")
 	public boolean addToGoggleTooltip(List<Component> tooltip, boolean isPlayerSneaking) {
 
 
@@ -523,23 +444,34 @@ public class DieselEngineBlockEntity extends SmartBlockEntity implements IHaveGo
 	}
 
 
+	protected void onFluidStackChanged(FluidStack newFluidStack) {
+		sendData();
+	}
+	protected SmartFluidTank createInventory(Fluid validFluid,boolean extractionAllowed) {
+		return new SmartFluidTank(1000, this::onFluidStackChanged) {
+			@Override
+			public boolean isFluidValid(FluidStack stack) {
+				return stack.getFluid().isSame(validFluid);
+			}
 
-/*
-	class BasinValueBox extends ValueBoxTransform.Sided {
 
-		@Override
-		protected Vec3 getSouthLocation() {
-			return VecHelper.voxelSpace(8, 12, 15.75);
-		}
 
-		@Override
-		protected boolean isSideActive(BlockState state, Direction direction) {
-			return direction.getAxis()
-					.isHorizontal();
-		}
+			@Override
+			public FluidStack drain(FluidStack resource, FluidAction action) {
+				if (!extractionAllowed)
+					return FluidStack.EMPTY;
+				return super.drain(resource, action);
+			}
 
+			@Override
+			public FluidStack drain(int maxDrain, FluidAction action) {
+				if (!extractionAllowed)
+					return FluidStack.EMPTY;
+				return super.drain(maxDrain, action);
+			}
+
+
+		};
 	}
 
- */
-
 }

src/main/java/com/drmangotea/tfmg/blocks/engines/diesel/DieselEngineInstance.java

@@ -11,6 +11,7 @@ import com.simibubi.create.AllPartialModels;
 import com.simibubi.create.content.kinetics.base.KineticBlockEntityRenderer;
 import com.simibubi.create.content.kinetics.steamEngine.PoweredShaftBlockEntity;
 import com.simibubi.create.foundation.utility.AngleHelper;
+import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.core.Direction.Axis;
 import net.minecraft.util.Mth;
@@ -131,7 +132,9 @@ public class DieselEngineInstance extends BlockEntityInstance<DieselEngineBlockE
 
 	@Override
 	public void updateLight() {
-		relight(pos, piston, linkage, connector);
+
+		BlockPos inFront = pos.above(10);
+		relight(inFront, piston, linkage, connector);
 	}
 
 	@Override

src/main/java/com/drmangotea/tfmg/blocks/engines/diesel/engine_expansion/DieselEngineExpansionBlock.java

@@ -0,0 +1,44 @@
+package com.drmangotea.tfmg.blocks.engines.diesel.engine_expansion;
+
+import com.drmangotea.tfmg.registry.TFMGBlockEntities;
+import com.simibubi.create.content.equipment.wrench.IWrenchable;
+import com.simibubi.create.foundation.block.IBE;
+import com.simibubi.create.foundation.fluid.SmartFluidTank;
+import net.minecraft.core.Direction;
+import net.minecraft.world.item.context.BlockPlaceContext;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.DirectionalBlock;
+import net.minecraft.world.level.block.entity.BlockEntityType;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.StateDefinition;
+import net.minecraft.world.level.material.Fluid;
+import net.minecraftforge.fluids.FluidStack;
+import net.minecraftforge.fluids.capability.templates.FluidTank;
+
+public class DieselEngineExpansionBlock extends DirectionalBlock implements IBE<DieselEngineExpansionBlockEntity>, IWrenchable {
+
+
+
+    public DieselEngineExpansionBlock(Properties p_52591_) {
+        super(p_52591_);
+        this.registerDefaultState(this.stateDefinition.any().setValue(FACING, Direction.DOWN));
+    }
+    protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> p_55125_) {
+        p_55125_.add(FACING);
+    }
+
+
+    @Override
+    public Class<DieselEngineExpansionBlockEntity> getBlockEntityClass() {
+        return DieselEngineExpansionBlockEntity.class;
+    }
+
+    @Override
+    public BlockEntityType<? extends DieselEngineExpansionBlockEntity> getBlockEntityType() {
+        return TFMGBlockEntities.DIESEL_ENGINE_EXPANSION.get();
+    }
+
+    public BlockState getStateForPlacement(BlockPlaceContext p_55087_) {
+        return this.defaultBlockState().setValue(FACING, p_55087_.getNearestLookingDirection().getOpposite().getOpposite());
+    }
+}

src/main/java/com/drmangotea/tfmg/blocks/engines/diesel/engine_expansion/DieselEngineExpansionBlockEntity.java

@@ -0,0 +1,101 @@
+package com.drmangotea.tfmg.blocks.engines.diesel.engine_expansion;
+
+import com.drmangotea.tfmg.registry.TFMGFluids;
+import com.simibubi.create.content.equipment.goggles.IHaveGoggleInformation;
+import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
+import com.simibubi.create.foundation.fluid.CombinedTankWrapper;
+import com.simibubi.create.foundation.fluid.SmartFluidTank;
+import net.minecraft.core.BlockPos;
+import net.minecraft.core.Direction;
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.world.level.block.entity.BlockEntityType;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.material.Fluid;
+import net.minecraftforge.common.capabilities.Capability;
+import net.minecraftforge.common.util.LazyOptional;
+import net.minecraftforge.fluids.FluidStack;
+import net.minecraftforge.fluids.capability.CapabilityFluidHandler;
+import net.minecraftforge.fluids.capability.IFluidHandler;
+import net.minecraftforge.fluids.capability.templates.FluidTank;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import java.util.List;
+
+public class DieselEngineExpansionBlockEntity extends SmartBlockEntity implements IHaveGoggleInformation {
+
+    protected LazyOptional<IFluidHandler> fluidCapability;
+    protected FluidTank coolantTank;
+    protected FluidTank lubricationOilTank;
+    protected FluidTank airTank;
+
+
+
+
+    public DieselEngineExpansionBlockEntity(BlockEntityType<?> type, BlockPos pos, BlockState state) {
+        super(type, pos, state);
+
+        airTank = createUpgradeTankInventory(TFMGFluids.AIR.get());
+        coolantTank = createUpgradeTankInventory(TFMGFluids.COOLING_FLUID.get());
+        lubricationOilTank = createUpgradeTankInventory(TFMGFluids.LUBRICATION_OIL.get());
+
+        fluidCapability = LazyOptional.of(() -> new CombinedTankWrapper(airTank,lubricationOilTank,coolantTank));
+
+
+    }
+
+
+    @Nonnull
+    @Override
+    @SuppressWarnings("removal")
+    public <T> LazyOptional<T> getCapability(@Nonnull Capability<T> cap, @Nullable Direction side) {
+
+        if (cap == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY)
+            return fluidCapability.cast();
+        return super.getCapability(cap, side);
+    }
+    @Override
+    public void invalidate() {
+        super.invalidate();
+        fluidCapability.invalidate();
+    }
+    @Override
+    public void write(CompoundTag compound, boolean clientPacket) {
+
+        compound.put("LubricationOil", lubricationOilTank.writeToNBT(new CompoundTag()));
+        compound.put("Air", airTank.writeToNBT(new CompoundTag()));
+
+        compound.put("Coolant", coolantTank.writeToNBT(new CompoundTag()));
+
+
+        super.write(compound, clientPacket);
+    }
+
+    @Override
+    protected void read(CompoundTag compound, boolean clientPacket) {
+        lubricationOilTank.readFromNBT(compound.getCompound("LubricationOil"));
+
+        airTank.readFromNBT(compound.getCompound("Air"));
+
+        coolantTank.readFromNBT(compound.getCompound("Coolant"));
+
+
+
+        super.read(compound, clientPacket);
+    }
+
+    @Override
+    public void addBehaviours(List<BlockEntityBehaviour> behaviours) {}
+    protected void onFluidStackChanged(FluidStack newFluidStack) {
+        sendData();
+    }
+    protected SmartFluidTank createUpgradeTankInventory(Fluid validFluid) {
+        return new SmartFluidTank(1000, this::onFluidStackChanged){
+            @Override
+            public boolean isFluidValid(FluidStack stack) {
+                return stack.getFluid().isSame(validFluid);
+            }
+        };
+    }
+}

src/main/java/com/drmangotea/tfmg/blocks/engines/intake/AirIntakeBlockEntity.java

@@ -75,11 +75,18 @@ public class AirIntakeBlockEntity extends KineticBlockEntity implements IWrencha
     public void tick(){
         super.tick();
 
-
-        int production = ((int)maxShaftSpeed*((diameter*diameter)))/60;
-        if(tankInventory.getFluidAmount()+production <= tankInventory.getCapacity())
-            tankInventory.fill(new FluidStack(TFMGFluids.AIR.getSource(),production), IFluidHandler.FluidAction.EXECUTE);
-////////////////
+    //if(!level.isClientSide) {
+        int production = ((int) maxShaftSpeed * ((diameter * diameter))) / 60;
+        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()));
+            if(controller!=null) {
+                ((AirIntakeBlockEntity) level.getBlockEntity(controller)).setChanged();
+                ((AirIntakeBlockEntity) level.getBlockEntity(controller)).sendData();
+            }
+        }
+   // }
+        ////////////////
 
 
         if(diameter == 3){
@@ -232,8 +239,8 @@ public class AirIntakeBlockEntity extends KineticBlockEntity implements IWrencha
 
 
 
-        if(controller!=null)
-            refreshCapability();
+        //if(controller!=null)
+        //    refreshCapability();
 
 
 
@@ -251,6 +258,7 @@ public class AirIntakeBlockEntity extends KineticBlockEntity implements IWrencha
         }
 
 
+
         LazyOptional<IFluidHandler> oldFluidCapability = fluidCapability;
 
 if(diameter==1&&!isUsedByController){
@@ -344,13 +352,13 @@ if(diameter==1&&!isUsedByController){
             //if(checkedBE.diameter<3)
             //    ((AirIntakeBlockEntity) level.getBlockEntity(pos)).isController = false;
 
-            if(pos!=this.getBlockPos())
-                if(checkedBE.isController) {
-
-
-                    canBeLarge = false;
-                    break;
-                }
+           // if(pos!=this.getBlockPos())
+           //     if(checkedBE.isController) {
+//
+//
+           //         canBeLarge = false;
+           //         break;
+           //     }
 
 
 
@@ -518,24 +526,20 @@ if(diameter==1&&!isUsedByController){
             public boolean isFluidValid(FluidStack stack) {
                 return stack.getFluid().isSame(TFMGFluids.AIR.getSource());
             }
-            @Override
-            public FluidStack drain(FluidStack resource, FluidAction action) {
-                return FluidStack.EMPTY;
-            }
+        //    @Override
+        //    public FluidStack drain(FluidStack resource, FluidAction action) {
+        //        return FluidStack.EMPTY;
+        //    }
         };
     }
 
     protected void onFluidStackChanged(FluidStack newFluidStack) {
-        if (!hasLevel())
-            return;
-
-
-
-        if (!level.isClientSide) {
             setChanged();
             sendData();
-        }
-
+            if(controller!=null) {
+                ((AirIntakeBlockEntity) level.getBlockEntity(controller)).setChanged();
+                ((AirIntakeBlockEntity) level.getBlockEntity(controller)).sendData();
+            }
 
     }
 

src/main/java/com/drmangotea/tfmg/blocks/engines/small/AbstractEngineTileEntity.java

@@ -5,10 +5,13 @@ import com.drmangotea.tfmg.blocks.engines.small.turbine.TurbineEngineTileEntity;
 import com.drmangotea.tfmg.registry.TFMGBlocks;
 import com.drmangotea.tfmg.registry.TFMGFluids;
 import com.simibubi.create.AllSoundEvents;
+import com.simibubi.create.Create;
 import com.simibubi.create.content.equipment.goggles.IHaveGoggleInformation;
 import com.simibubi.create.content.equipment.wrench.IWrenchable;
 import com.simibubi.create.content.kinetics.base.GeneratingKineticBlockEntity;
 import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
+import com.simibubi.create.foundation.blockEntity.behaviour.fluid.SmartFluidTankBehaviour;
+import com.simibubi.create.foundation.fluid.CombinedTankWrapper;
 import com.simibubi.create.foundation.fluid.SmartFluidTank;
 import com.simibubi.create.foundation.utility.Lang;
 import com.simibubi.create.foundation.utility.LangBuilder;
@@ -41,11 +44,15 @@ import java.util.Optional;
 
 import static com.simibubi.create.content.kinetics.base.DirectionalKineticBlock.FACING;
 
+@SuppressWarnings("removal")
 public abstract class AbstractEngineTileEntity extends GeneratingKineticBlockEntity implements IHaveGoggleInformation, IWrenchable {
 
     protected LazyOptional<IFluidHandler> fluidCapability;
     protected FluidTank tankInventory;
 
+    protected FluidTank lubricationOilTank;
+
+    protected FluidTank coolantTank;
 
     protected int soundTimer=0;
 
@@ -69,6 +76,12 @@ public abstract class AbstractEngineTileEntity extends GeneratingKineticBlockEnt
     protected int syncCooldown;
     protected boolean queuedSync;
 
+    public Fluid lubricationOil = TFMGFluids.LUBRICATION_OIL.get();
+    public Fluid coolant = TFMGFluids.COOLING_FLUID.get();
+
+    public float powerModifier=1;
+    public float efficiencyModifier = 1.4f;
+
 //
 int signal;
 boolean signalChanged;
@@ -80,15 +93,25 @@ boolean signalChanged;
         super(type, pos, state);
          tankInventory = createInventory();
 
-        fluidCapability = LazyOptional.of(() -> tankInventory);
+         lubricationOilTank = createUpgradeTankInventory(lubricationOil);
+         coolantTank = createUpgradeTankInventory(coolant);
+
+
+        //fluidCapability = LazyOptional.of(() -> tankInventory);
+        fluidCapability = LazyOptional.of(() -> {
+            return new CombinedTankWrapper(tankInventory,lubricationOilTank,coolantTank );
+        });
 
         signal = 0;
         setLazyTickRate(40);
-        refreshCapability();
+
     }
 
     @Override
     public void addBehaviours(List<BlockEntityBehaviour> behaviours) {
+
+
+
     }
 
     @Override
@@ -121,7 +144,7 @@ boolean signalChanged;
                 fuelConsumption=0;
         if(!tankInventory.isEmpty()) {
 
-            if(consumptionTimer>=10) {
+            if(consumptionTimer>=17) {
                 if(signal!=0)
                     tankInventory.drain(fuelConsumption, IFluidHandler.FluidAction.EXECUTE);
                 consumptionTimer=0;
@@ -131,7 +154,7 @@ boolean signalChanged;
 
 
 
-            return convertToDirection(signal * signal, getBlockState().getValue(FACING));
+            return convertToDirection((signal * signal)*powerModifier, getBlockState().getValue(FACING));
         }}
         return 0;
 
@@ -156,12 +179,12 @@ boolean signalChanged;
         }
         efficiency=100;
 
-        if(signal>idealSpeed){
-            efficiency=(100-(signal-idealSpeed)*5);
+        if(signal>=idealSpeed){
+            efficiency= (int) ((100-(signal-idealSpeed)*5)/efficiencyModifier);
         }
 
         if(signal<idealSpeed){
-            efficiency=(100-(idealSpeed-signal)*3);
+            efficiency= (int) ((100-(idealSpeed-signal)*3)/efficiencyModifier);
         }
 
 
@@ -258,7 +281,7 @@ boolean signalChanged;
                 .forGoggles(tooltip);
         Lang.translate("goggles.get_engine_efficiency", this.efficiency)
                 .style(ChatFormatting.DARK_AQUA)
-                .add(Lang.translate("goggles.units.percent"))
+                .add(Lang.translate("goggles.misc.percent_symbol"))
                 .forGoggles(tooltip,1);
 
 
@@ -342,6 +365,8 @@ public void write(CompoundTag compound, boolean clientPacket) {
 
 
     compound.put("TankContent", tankInventory.writeToNBT(new CompoundTag()));
+    compound.put("Coolant", coolantTank.writeToNBT(new CompoundTag()));
+    compound.put("LubricationOil", lubricationOilTank.writeToNBT(new CompoundTag()));
 
 
     super.write(compound, clientPacket);
@@ -361,8 +386,10 @@ public void write(CompoundTag compound, boolean clientPacket) {
 
 
             tankInventory.readFromNBT(compound.getCompound("TankContent"));
-            if (tankInventory.getSpace() < 0)
-                tankInventory.drain(-tankInventory.getSpace(), IFluidHandler.FluidAction.EXECUTE);
+            coolantTank.readFromNBT(compound.getCompound("Coolant"));
+            lubricationOilTank.readFromNBT(compound.getCompound("LubricationOil"));
+
+
 
 
 
@@ -394,6 +421,22 @@ public void write(CompoundTag compound, boolean clientPacket) {
     public void tick() {
         super.tick();
 
+        calculateUpgradeModifier();
+
+        //
+        int random1 = Create.RANDOM.nextInt(125);
+        int random2 = Create.RANDOM.nextInt(200);
+
+        if(random1 == 69)
+            coolantTank.drain(1, IFluidHandler.FluidAction.EXECUTE);
+        if(random2 == 69)
+            lubricationOilTank.drain(1, IFluidHandler.FluidAction.EXECUTE);
+
+
+        //
+
+
+
         ///
        // if(signal!=0&&hasBackPart()&&tankInventory.getFluidAmount()!=0&&!overStressed&&isExhaustTankFull()) {
 
@@ -468,6 +511,34 @@ public void write(CompoundTag compound, boolean clientPacket) {
 
     }
 
+
+    public void calculateUpgradeModifier(){
+
+
+        float newPowerModifier=1;
+        float newEfficiencyModifier = 1.4f;
+
+        if(lubricationOilTank.getFluidAmount()>0) {
+            newPowerModifier+=.3f;
+            newEfficiencyModifier-=.1f;
+        }
+        if(coolantTank.getFluidAmount()>0) {
+            newPowerModifier+=.1f;
+            newEfficiencyModifier-=.3f;
+        }
+
+        ////////
+
+
+        ////
+
+        powerModifier=newPowerModifier;
+        efficiencyModifier = newEfficiencyModifier;
+    }
+
+
+
+
     @OnlyIn(Dist.CLIENT)
     private void makeSound(){
         soundTimer=0;
@@ -501,6 +572,14 @@ public void write(CompoundTag compound, boolean clientPacket) {
             }
         };
     }
+    protected SmartFluidTank createUpgradeTankInventory(Fluid validFluid) {
+        return new SmartFluidTank(1000, this::onFluidStackChanged){
+            @Override
+            public boolean isFluidValid(FluidStack stack) {
+                return stack.getFluid().isSame(validFluid);
+            }
+        };
+    }
 
 
 
@@ -534,27 +613,6 @@ public void write(CompoundTag compound, boolean clientPacket) {
 
 
 
-
-
-    private void refreshCapability() {
-        LazyOptional<IFluidHandler> oldCap = fluidCapability;
-        fluidCapability = LazyOptional.of(() -> handlerForCapability());
-        oldCap.invalidate();
-    }
-
-    private IFluidHandler handlerForCapability() {
-        return tankInventory;
-    }
-
-
-
-
-
-
-
-
-
-
     public float getFillState() {
         return (float) tankInventory.getFluidAmount() / tankInventory.getCapacity();
     }
@@ -564,8 +622,7 @@ public void write(CompoundTag compound, boolean clientPacket) {
     @Nonnull
     @Override
     public <T> LazyOptional<T> getCapability(@Nonnull Capability<T> cap, @Nullable Direction side) {
-        if (!fluidCapability.isPresent())
-            refreshCapability();
+
         if (cap == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY)
             return fluidCapability.cast();
         return super.getCapability(cap, side);
@@ -574,6 +631,7 @@ public void write(CompoundTag compound, boolean clientPacket) {
     @Override
     public void invalidate() {
         super.invalidate();
+        fluidCapability.invalidate();
     }
 
 

src/main/java/com/drmangotea/tfmg/blocks/machines/TFMGMachineBlockEntity.java

@@ -5,6 +5,7 @@ import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
 import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 import com.simibubi.create.foundation.blockEntity.behaviour.fluid.SmartFluidTankBehaviour;
 import com.simibubi.create.foundation.fluid.CombinedTankWrapper;
+import com.simibubi.create.foundation.fluid.SmartFluidTank;
 import com.simibubi.create.foundation.utility.Couple;
 import com.simibubi.create.foundation.utility.Lang;
 import com.simibubi.create.foundation.utility.LangBuilder;
@@ -50,14 +51,26 @@ public class TFMGMachineBlockEntity extends SmartBlockEntity  implements IHaveGo
 
         tank2 = new SmartFluidTankBehaviour(SmartFluidTankBehaviour.OUTPUT, this, 1, 1000, true)
                 .whenFluidUpdates(() -> contentsChanged = true);
+
+
+
+
         behaviours.add(tank1);
         behaviours.add(tank2);
 
+
+
+
         fluidCapability = LazyOptional.of(() -> {
             LazyOptional<? extends IFluidHandler> inputCap = tank1.getCapability();
             LazyOptional<? extends IFluidHandler> outputCap = tank2.getCapability();
             return new CombinedTankWrapper(outputCap.orElse(null), inputCap.orElse(null));
         });
+
+
+    }
+    protected void onFluidStackChanged(FluidStack newFluidStack) {
+        sendData();
     }
 
     @Override
@@ -70,6 +83,8 @@ public class TFMGMachineBlockEntity extends SmartBlockEntity  implements IHaveGo
     @Override
     public <T> LazyOptional<T> getCapability(@Nonnull Capability<T> cap, Direction side) {
 
+
+
         if (cap == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY)
             return fluidCapability.cast();
         return super.getCapability(cap, side);

src/main/java/com/drmangotea/tfmg/registry/TFMGBlockEntities.java

@@ -14,6 +14,7 @@ import com.drmangotea.tfmg.blocks.deposits.surface_scanner.SurfaceScannerRendere
 import com.drmangotea.tfmg.blocks.engines.diesel.DieselEngineBlockEntity;
 import com.drmangotea.tfmg.blocks.engines.diesel.DieselEngineInstance;
 import com.drmangotea.tfmg.blocks.engines.diesel.DieselEngineRenderer;
+import com.drmangotea.tfmg.blocks.engines.diesel.engine_expansion.DieselEngineExpansionBlockEntity;
 import com.drmangotea.tfmg.blocks.engines.intake.AirIntakeBlockEntity;
 import com.drmangotea.tfmg.blocks.engines.intake.AirIntakeInstance;
 import com.drmangotea.tfmg.blocks.engines.intake.AirIntakeRenderer;
@@ -202,6 +203,11 @@ public class TFMGBlockEntities {
             .renderer(() -> DieselEngineRenderer::new)
             .register();
 
+    public static final BlockEntityEntry<DieselEngineExpansionBlockEntity> DIESEL_ENGINE_EXPANSION = REGISTRATE
+            .blockEntity("diesel_engine_expansion", DieselEngineExpansionBlockEntity::new)
+            .validBlocks(TFMGBlocks.DIESEL_ENGINE_EXPANSION)
+            .register();
+
     public static final BlockEntityEntry<GasolineEngineTileEntity> GASOLINE_ENGINE = REGISTRATE
             .blockEntity("gasoline_engine", GasolineEngineTileEntity::new)
             .instance(() -> HalfShaftInstance::new, false)

src/main/java/com/drmangotea/tfmg/registry/TFMGBlocks.java

@@ -12,6 +12,7 @@ import com.drmangotea.tfmg.blocks.decoration.doors.TFMGSlidingDoorBlock;
 import com.drmangotea.tfmg.blocks.decoration.flywheels.TFMGFlywheelBlock;
 import com.drmangotea.tfmg.blocks.deposits.FluidDepositBlock;
 import com.drmangotea.tfmg.blocks.engines.diesel.DieselEngineBlock;
+import com.drmangotea.tfmg.blocks.engines.diesel.engine_expansion.DieselEngineExpansionBlock;
 import com.drmangotea.tfmg.blocks.engines.intake.AirIntakeBlock;
 import com.drmangotea.tfmg.blocks.engines.intake.AirIntakeGenerator;
 import com.drmangotea.tfmg.blocks.engines.small.EngineGenerator;
@@ -682,7 +683,7 @@ public static final BlockEntry<DistillationOutputBlock> STEEL_DISTILLATION_OUTPU
                     .properties(BlockBehaviour.Properties::noOcclusion)
                     .transform(pickaxeOnly())
                     .blockstate(new EngineGenerator()::generate)
-                    .transform(BlockStressDefaults.setCapacity(60.0))
+                    .transform(BlockStressDefaults.setCapacity(66.0))
                     .transform(BlockStressDefaults.setGeneratorSpeed(() -> Couple.create(0, 256)))
                     .item()
                     .properties(p -> p.rarity(Rarity.UNCOMMON))
@@ -697,7 +698,7 @@ public static final BlockEntry<DistillationOutputBlock> STEEL_DISTILLATION_OUTPU
                     .properties(BlockBehaviour.Properties::noOcclusion)
                     .transform(pickaxeOnly())
                     .blockstate(new EngineGenerator()::generate)
-                    .transform(BlockStressDefaults.setCapacity(60.0))
+                    .transform(BlockStressDefaults.setCapacity(66.0))
                     .transform(BlockStressDefaults.setGeneratorSpeed(() -> Couple.create(0, 256)))
                     .item()
                     .properties(p -> p.rarity(Rarity.UNCOMMON))
@@ -713,7 +714,7 @@ public static final BlockEntry<DistillationOutputBlock> STEEL_DISTILLATION_OUTPU
                     .properties(BlockBehaviour.Properties::noOcclusion)
                     .transform(pickaxeOnly())
                     .blockstate(new EngineGenerator()::generate)
-                    .transform(BlockStressDefaults.setCapacity(60.0))
+                    .transform(BlockStressDefaults.setCapacity(66.0))
                     .transform(BlockStressDefaults.setGeneratorSpeed(() -> Couple.create(0, 256)))
                     .item()
                     .properties(p -> p.rarity(Rarity.UNCOMMON))
@@ -743,7 +744,7 @@ public static final BlockEntry<DistillationOutputBlock> STEEL_DISTILLATION_OUTPU
                     .properties(BlockBehaviour.Properties::noOcclusion)
                     .transform(pickaxeOnly())
                     .blockstate(new EngineGenerator()::generate)
-                    .transform(BlockStressDefaults.setCapacity(60.0))
+                    .transform(BlockStressDefaults.setCapacity(66.0))
                     .transform(BlockStressDefaults.setGeneratorSpeed(() -> Couple.create(0, 256)))
                     .item()
                     .properties(p -> p.rarity(Rarity.UNCOMMON))
@@ -758,7 +759,7 @@ public static final BlockEntry<DistillationOutputBlock> STEEL_DISTILLATION_OUTPU
                     .properties(BlockBehaviour.Properties::noOcclusion)
                     .transform(pickaxeOnly())
                     .blockstate(new EngineGenerator()::generate)
-                    .transform(BlockStressDefaults.setCapacity(60.0))
+                    .transform(BlockStressDefaults.setCapacity(66.0))
                     .transform(BlockStressDefaults.setGeneratorSpeed(() -> Couple.create(0, 256)))
                     .item()
                     .properties(p -> p.rarity(Rarity.UNCOMMON))
@@ -772,12 +773,24 @@ public static final BlockEntry<DistillationOutputBlock> STEEL_DISTILLATION_OUTPU
                     .initialProperties(SharedProperties::copperMetal)
                     .transform(pickaxeOnly())
                     .blockstate((c, p) -> p.horizontalFaceBlock(c.get(), AssetLookup.partialBaseModel(c, p)))
-                    .transform(BlockStressDefaults.setCapacity(14.0))
+                    .transform(BlockStressDefaults.setCapacity(15.0))
                     .transform(BlockStressDefaults.setGeneratorSpeed(DieselEngineBlock::getSpeedRange))
                     .item()
                     .transform(customItemModel())
                     .register();
 
+    public static final BlockEntry<DieselEngineExpansionBlock> DIESEL_ENGINE_EXPANSION = REGISTRATE.block("diesel_engine_expansion", DieselEngineExpansionBlock::new)
+            .initialProperties(() -> Blocks.IRON_BLOCK)
+            .properties(p -> p.color(MaterialColor.TERRACOTTA_CYAN))
+            .properties(p -> p.requiresCorrectToolForDrops())
+            .transform(pickaxeOnly())
+            .blockstate(BlockStateGen.directionalBlockProvider(false))
+            .tag(BlockTags.NEEDS_IRON_TOOL)
+            .item()
+            .build()
+            .lang("Diesel Engine Expansion")
+            .register();
+
     //----------------------PIPES-------------------------------//
 
     //STEEL

src/main/java/com/drmangotea/tfmg/registry/TFMGItems.java

@@ -1,5 +1,6 @@
 package com.drmangotea.tfmg.registry;
 
+import com.drmangotea.tfmg.CreateTFMG;
 import com.drmangotea.tfmg.items.gadgets.explosives.thermite_grenades.ChemicalColor;
 import com.drmangotea.tfmg.items.gadgets.explosives.thermite_grenades.ThermiteGrenadeItem;
 import com.drmangotea.tfmg.items.gadgets.quad_potato_cannon.QuadPotatoCannonItem;
@@ -7,6 +8,8 @@ import com.drmangotea.tfmg.blocks.machines.metal_processing.casting_basin.Castin
 import com.drmangotea.tfmg.blocks.machines.metal_processing.casting_basin.CastingMoldItem;
 import com.drmangotea.tfmg.items.CoalCokeItem;
 import com.drmangotea.tfmg.items.ScrewdriverItem;
+import com.simibubi.create.Create;
+import com.simibubi.create.content.processing.sequenced.SequencedAssemblyItem;
 import com.simibubi.create.foundation.data.AssetLookup;
 import com.tterrag.registrate.util.entry.ItemEntry;
 import net.minecraft.tags.TagKey;
@@ -32,6 +35,33 @@ public class TFMGItems {
           //  LEAD_INGOT = taggedIngredient("lead_ingot", forgeItemTag("ingots/lead"), CREATE_INGOTS.tag)
       ;
 
+    public static final ItemEntry<Item>
+            REBAR = REGISTRATE.item("rebar", Item::new).register();
+
+
+    public static final ItemEntry<Item>
+
+            STEEL_MECHANISM = REGISTRATE.item("steel_mechanism", Item::new).register(),
+            CHARCOAL_DUST = REGISTRATE.item("charcoal_dust", Item::new).register(),
+            NITRATE_DUST = REGISTRATE.item("nitrate_dust", Item::new).register(),
+            SULFUR_DUST = REGISTRATE.item("sulfur_dust", Item::new).register();
+
+
+    public static final ItemEntry<SequencedAssemblyItem>
+
+            UNFINISHED_STEEL_MECHANISM = sequencedIngredient("unfinished_steel_mechanism");
+
+    public static final ItemEntry<SequencedAssemblyItem>
+    UNFINISHED_GASOLINE_ENGINE = REGISTRATE.item("unfinished_gasoline_engine", SequencedAssemblyItem::new)
+            .model((c, p) -> p.withExistingParent(c.getName(), CreateTFMG.asResource("item/unfinished_engine")))
+            .register(),
+    UNFINISHED_LPG_ENGINE = REGISTRATE.item("unfinished_lpg_engine", SequencedAssemblyItem::new)
+            .model((c, p) -> p.withExistingParent(c.getName(), CreateTFMG.asResource("item/unfinished_engine")))
+            .register(),
+    UNFINISHED_TURBINE_ENGINE = REGISTRATE.item("unfinished_turbine_engine", SequencedAssemblyItem::new)
+            .model((c, p) -> p.withExistingParent(c.getName(), CreateTFMG.asResource("item/unfinished_engine")))
+            .register();
+
     public static final ItemEntry<Item>
             COAL_COKE_DUST = taggedIngredient("coal_coke_dust", forgeItemTag("dusts/coal_coke"));
 
@@ -65,6 +95,10 @@ public class TFMGItems {
                 .tag(tags)
                 .register();
     }
+    private static ItemEntry<SequencedAssemblyItem> sequencedIngredient(String name) {
+        return REGISTRATE.item(name, SequencedAssemblyItem::new)
+                .register();
+    }
 
     private static ItemEntry<ThermiteGrenadeItem> thermiteGrenade(String name, ChemicalColor color) {
         return REGISTRATE.item(name,  p -> new ThermiteGrenadeItem(p, color))

src/main/resources/assets/tfmg/lang/default/interface.json

@@ -35,5 +35,14 @@
   "create.goggles.coke_oven.item_count": "Item Count In Internal Storage: %1$s",
   "create.goggles.coke_oven.invalid": "Coke Oven Invalid",
   "create.goggles.coke_oven.tank_full": "One of Internal Tanks Is Full",
-  "create.goggles.coke_oven.progress": "Progress: %1$s"
+  "create.goggles.coke_oven.progress": "Progress: %1$s",
+  "create.goggles.engine_stats": "Engine Stats:",
+  "create.goggles.engine_exhaust_stats": "Engine Exhaust Stats:",
+  "create.goggles.fuel_container": "Fluid Storage",
+  "create.goggles.engine.backpartmissing": "Back Part Missing:",
+  "create.goggles.engine_redstone_input" : "Speed:",
+  "create.goggles.engine.efficiency" : "Efficiency:",
+  "create.tooltip.engine_analog_strength": "%1$s/15",
+  "create.goggles.get_engine_efficiency": "%1$s",
+  "create.goggles.engine.stress": "%1$ssu"
 }

src/main/resources/assets/tfmg/models/block/air_intake/block_large.json

@@ -8,8 +8,8 @@
 	},
 	"elements": [
 		{
-			"from": [-16, -16, 1],
-			"to": [32, 32, 1],
+			"from": [-16, -16, 9],
+			"to": [32, 32, 9],
 			"rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]},
 			"faces": {
 				"east": {"uv": [0, 0, 16, 0], "rotation": 270, "texture": "#1"},
@@ -20,8 +20,8 @@
 			}
 		},
 		{
-			"from": [31.999, -16, 1],
-			"to": [31.999, 32, 16],
+			"from": [29.999, -16, 1],
+			"to": [29.999, 32, 16],
 			"rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]},
 			"faces": {
 				"north": {"uv": [0, 0, 0, 16], "texture": "#0"},
@@ -32,8 +32,8 @@
 			}
 		},
 		{
-			"from": [-16, -15.999, 1],
-			"to": [32, -15.999, 16],
+			"from": [-16, -13.999, 1],
+			"to": [32, -13.999, 16],
 			"rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]},
 			"faces": {
 				"north": {"uv": [0, 0, 0, 16], "rotation": 90, "texture": "#0"},
@@ -44,8 +44,8 @@
 			}
 		},
 		{
-			"from": [-16, 31.99, 1],
-			"to": [32, 31.99, 16],
+			"from": [-16, 29.99, 1],
+			"to": [32, 29.99, 16],
 			"rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]},
 			"faces": {
 				"north": {"uv": [0, 0, 0, 16], "rotation": 90, "texture": "#0"},
@@ -56,8 +56,8 @@
 			}
 		},
 		{
-			"from": [-15.999, -16, 1],
-			"to": [-15.999, 32, 16],
+			"from": [-13.999, -16, 1],
+			"to": [-13.999, 32, 16],
 			"rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]},
 			"faces": {
 				"north": {"uv": [0, 0, 0, 16], "texture": "#0"},

src/main/resources/assets/tfmg/models/block/air_intake/block_medium.json

@@ -21,8 +21,8 @@
 			}
 		},
 		{
-			"from": [-16, 0, 1],
-			"to": [16, 32, 1],
+			"from": [-16, 0, 8.5],
+			"to": [16, 32, 8.5],
 			"rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]},
 			"faces": {
 				"east": {"uv": [0, 0, 16, 0], "rotation": 270, "texture": "#2"},
@@ -33,8 +33,8 @@
 			}
 		},
 		{
-			"from": [-15.99, 0, 1],
-			"to": [-15.99, 32, 15],
+			"from": [-13.99, 0, 2],
+			"to": [-13.99, 32, 16],
 			"rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]},
 			"faces": {
 				"north": {"uv": [0, 0, 16, 0], "rotation": 90, "texture": "#0"},
@@ -45,8 +45,8 @@
 			}
 		},
 		{
-			"from": [15.99, 0, 1],
-			"to": [15.99, 32, 15],
+			"from": [13.99, 0, 2],
+			"to": [13.99, 32, 16],
 			"rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]},
 			"faces": {
 				"north": {"uv": [0, 0, 16, 0], "rotation": 90, "texture": "#0"},
@@ -57,8 +57,8 @@
 			}
 		},
 		{
-			"from": [-16, 31.999, 1],
-			"to": [16, 31.999, 15],
+			"from": [-16, 29.999, 2],
+			"to": [16, 29.999, 16],
 			"rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]},
 			"faces": {
 				"north": {"uv": [0, 0, 16, 0], "texture": "#0"},
@@ -69,8 +69,8 @@
 			}
 		},
 		{
-			"from": [-16, 0.001, 1],
-			"to": [16, 0.001, 15],
+			"from": [-16, 2.001, 2],
+			"to": [16, 2.001, 16],
 			"rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]},
 			"faces": {
 				"north": {"uv": [0, 0, 16, 0], "texture": "#0"},

src/main/resources/assets/tfmg/models/block/diesel_engine/block.json

@@ -2,145 +2,23 @@
 	"credit": "Made with Blockbench",
 	"parent": "create:block/block",
 	"textures": {
-		"2": "create:block/pipes",
-		"4": "create:block/pump",
-		"particle": "create:block/pump"
+		"0": "tfmg:block/diesel_engine_back",
+		"1": "tfmg:block/diesel_engine_front",
+		"2": "tfmg:block/diesel_engine_side",
+		"particle": "tfmg:block/diesel_engine_back"
 	},
 	"elements": [
 		{
-			"name": "middle",
-			"from": [4, 4, 4],
-			"to": [12, 12, 12],
-			"rotation": {"angle": 0, "axis": "z", "origin": [8.33333, 8.5, 8]},
+			"from": [0, 0, 0],
+			"to": [16, 16, 16],
 			"faces": {
-				"north": {"uv": [0, 6.5, 4, 2.5], "rotation": 90, "texture": "#2"},
-				"east": {"uv": [0, 6.5, 4, 2.5], "rotation": 90, "texture": "#2"},
-				"south": {"uv": [0, 6.5, 4, 2.5], "rotation": 90, "texture": "#2"},
-				"west": {"uv": [0, 6.5, 4, 2.5], "rotation": 90, "texture": "#2"},
-				"up": {"uv": [0, 6.5, 4, 2.5], "rotation": 90, "texture": "#2"},
-				"down": {"uv": [0, 6.5, 4, 2.5], "rotation": 90, "texture": "#2"}
-			}
-		},
-		{
-			"name": "back",
-			"from": [2, 0, 2],
-			"to": [14, 5, 14],
-			"rotation": {"angle": 0, "axis": "z", "origin": [8.33333, 8.5, 8]},
-			"faces": {
-				"north": {"uv": [13.5, 2, 16, 8], "rotation": 270, "texture": "#2"},
-				"east": {"uv": [13.5, 2, 16, 8], "rotation": 270, "texture": "#2"},
-				"south": {"uv": [13.5, 2, 16, 8], "rotation": 270, "texture": "#2"},
-				"west": {"uv": [13.5, 2, 16, 8], "rotation": 270, "texture": "#2"},
-				"up": {"uv": [0, 0, 12, 12], "rotation": 180, "texture": "#4"},
-				"down": {"uv": [0, 0, 12, 12], "texture": "#4"}
-			}
-		},
-		{
-			"name": "front",
-			"from": [3, 11, 3],
-			"to": [13, 16, 13],
-			"rotation": {"angle": 0, "axis": "z", "origin": [8.33333, 8.5, 8]},
-			"faces": {
-				"north": {"uv": [10.5, 2.5, 13, 7.5], "rotation": 90, "texture": "#2"},
-				"east": {"uv": [10.5, 2.5, 13, 7.5], "rotation": 90, "texture": "#2"},
-				"south": {"uv": [10.5, 2.5, 13, 7.5], "rotation": 90, "texture": "#2"},
-				"west": {"uv": [10.5, 2.5, 13, 7.5], "rotation": 90, "texture": "#2"},
-				"up": {"uv": [11, 11, 16, 16], "texture": "#2"},
-				"down": {"uv": [6, 11, 11, 16], "texture": "#2"}
-			}
-		},
-		{
-			"from": [5.85355, 13.25, 1.75],
-			"to": [9.85355, 15.25, 13.75],
-			"rotation": {"angle": 45, "axis": "z", "origin": [8.35355, 13.25, 7.75]},
-			"faces": {
-				"north": {"uv": [16, 0, 12, 2], "texture": "#4"},
-				"east": {"uv": [15, 0, 16, 2], "texture": "#4"},
-				"south": {"uv": [12, 0, 16, 2], "texture": "#4"},
-				"west": {"uv": [12, 0, 13, 2], "texture": "#4"},
-				"up": {"uv": [12, 0, 16, 1], "texture": "#4"},
-				"down": {"uv": [12, 1, 16, 2], "texture": "#4"}
-			}
-		},
-		{
-			"from": [7.85355, 11.25, 1.75],
-			"to": [9.85355, 13.25, 13.75],
-			"rotation": {"angle": 45, "axis": "z", "origin": [8.35355, 13.25, 7.75]},
-			"faces": {
-				"north": {"uv": [16, 2, 14, 4], "texture": "#4"},
-				"east": {"uv": [15, 2, 16, 4], "texture": "#4"},
-				"south": {"uv": [14, 2, 16, 4], "texture": "#4"},
-				"west": {"uv": [14, 2, 15, 4], "texture": "#4"},
-				"down": {"uv": [14, 3, 16, 4], "texture": "#4"}
-			}
-		},
-		{
-			"from": [2.35355, 10.75, 7.75],
-			"to": [14.35355, 12.75, 9.75],
-			"rotation": {"angle": -45, "axis": "x", "origin": [8.35355, 13.25, 7.75]},
-			"faces": {
-				"north": {"uv": [14, 2, 15, 4], "texture": "#4"},
-				"east": {"uv": [16, 2, 14, 4], "texture": "#4"},
-				"south": {"uv": [15, 2, 16, 4], "texture": "#4"},
-				"west": {"uv": [14, 2, 16, 4], "texture": "#4"},
-				"down": {"uv": [14, 3, 16, 4], "rotation": 270, "texture": "#4"}
-			}
-		},
-		{
-			"from": [2.35355, 12.75, 5.75],
-			"to": [14.35355, 14.75, 9.75],
-			"rotation": {"angle": -45, "axis": "x", "origin": [8.35355, 13.25, 7.75]},
-			"faces": {
-				"north": {"uv": [12, 0, 13, 2], "texture": "#4"},
-				"east": {"uv": [16, 0, 12, 2], "texture": "#4"},
-				"south": {"uv": [15, 0, 16, 2], "texture": "#4"},
-				"west": {"uv": [12, 0, 16, 2], "texture": "#4"},
-				"up": {"uv": [12, 0, 16, 1], "rotation": 90, "texture": "#4"},
-				"down": {"uv": [12, 1, 16, 2], "rotation": 270, "texture": "#4"}
+				"north": {"uv": [0, 0, 16, 16], "texture": "#2"},
+				"east": {"uv": [0, 0, 16, 16], "texture": "#2"},
+				"south": {"uv": [0, 0, 16, 16], "texture": "#2"},
+				"west": {"uv": [0, 0, 16, 16], "texture": "#2"},
+				"up": {"uv": [0, 0, 16, 16], "texture": "#1"},
+				"down": {"uv": [0, 0, 16, 16], "texture": "#0"}
 			}
 		}
-	],
-	"display": {
-		"thirdperson_righthand": {
-			"rotation": [75, 45, 0],
-			"translation": [0, 2.5, 0],
-			"scale": [0.375, 0.375, 0.375]
-		},
-		"thirdperson_lefthand": {
-			"rotation": [75, 45, 0],
-			"translation": [0, 2.5, 0],
-			"scale": [0.375, 0.375, 0.375]
-		},
-		"firstperson_righthand": {
-			"rotation": [0, 45, 0],
-			"scale": [0.4, 0.4, 0.4]
-		},
-		"firstperson_lefthand": {
-			"rotation": [0, 225, 0],
-			"scale": [0.4, 0.4, 0.4]
-		},
-		"ground": {
-			"translation": [0, 3, 0],
-			"scale": [0.25, 0.25, 0.25]
-		},
-		"gui": {
-			"rotation": [30, 135, 0],
-			"scale": [0.625, 0.625, 0.625]
-		},
-		"fixed": {
-			"scale": [0.5, 0.5, 0.5]
-		}
-	},
-	"groups": [
-		{
-			"name": "pump",
-			"origin": [8, 8, 8],
-			"color": 0,
-			"children": [0, 1, 2]
-		},
-		3,
-		4,
-		5,
-		6
 	]
 }

src/main/resources/assets/tfmg/models/block/diesel_engine/item.json

@@ -2,145 +2,23 @@
 	"credit": "Made with Blockbench",
 	"parent": "create:block/block",
 	"textures": {
-		"2": "create:block/pipes",
-		"4": "create:block/pump",
-		"particle": "create:block/pump"
+		"0": "tfmg:block/diesel_engine_back",
+		"1": "tfmg:block/diesel_engine_front",
+		"2": "tfmg:block/diesel_engine_side",
+		"particle": "tfmg:block/diesel_engine_back"
 	},
 	"elements": [
 		{
-			"name": "middle",
-			"from": [4, 4, 4],
-			"to": [12, 12, 12],
-			"rotation": {"angle": 0, "axis": "z", "origin": [8.33333, 8.5, 8]},
+			"from": [0, 0, 0],
+			"to": [16, 16, 16],
 			"faces": {
-				"north": {"uv": [0, 6.5, 4, 2.5], "rotation": 90, "texture": "#2"},
-				"east": {"uv": [0, 6.5, 4, 2.5], "rotation": 90, "texture": "#2"},
-				"south": {"uv": [0, 6.5, 4, 2.5], "rotation": 90, "texture": "#2"},
-				"west": {"uv": [0, 6.5, 4, 2.5], "rotation": 90, "texture": "#2"},
-				"up": {"uv": [0, 6.5, 4, 2.5], "rotation": 90, "texture": "#2"},
-				"down": {"uv": [0, 6.5, 4, 2.5], "rotation": 90, "texture": "#2"}
-			}
-		},
-		{
-			"name": "back",
-			"from": [2, 0, 2],
-			"to": [14, 5, 14],
-			"rotation": {"angle": 0, "axis": "z", "origin": [8.33333, 8.5, 8]},
-			"faces": {
-				"north": {"uv": [13.5, 2, 16, 8], "rotation": 270, "texture": "#2"},
-				"east": {"uv": [13.5, 2, 16, 8], "rotation": 270, "texture": "#2"},
-				"south": {"uv": [13.5, 2, 16, 8], "rotation": 270, "texture": "#2"},
-				"west": {"uv": [13.5, 2, 16, 8], "rotation": 270, "texture": "#2"},
-				"up": {"uv": [0, 0, 12, 12], "rotation": 180, "texture": "#4"},
-				"down": {"uv": [0, 0, 12, 12], "texture": "#4"}
-			}
-		},
-		{
-			"name": "front",
-			"from": [3, 11, 3],
-			"to": [13, 16, 13],
-			"rotation": {"angle": 0, "axis": "z", "origin": [8.33333, 8.5, 8]},
-			"faces": {
-				"north": {"uv": [10.5, 2.5, 13, 7.5], "rotation": 90, "texture": "#2"},
-				"east": {"uv": [10.5, 2.5, 13, 7.5], "rotation": 90, "texture": "#2"},
-				"south": {"uv": [10.5, 2.5, 13, 7.5], "rotation": 90, "texture": "#2"},
-				"west": {"uv": [10.5, 2.5, 13, 7.5], "rotation": 90, "texture": "#2"},
-				"up": {"uv": [11, 11, 16, 16], "texture": "#2"},
-				"down": {"uv": [6, 11, 11, 16], "texture": "#2"}
-			}
-		},
-		{
-			"from": [5.85355, 13.25, 1.75],
-			"to": [9.85355, 15.25, 13.75],
-			"rotation": {"angle": 45, "axis": "z", "origin": [8.35355, 13.25, 7.75]},
-			"faces": {
-				"north": {"uv": [16, 0, 12, 2], "texture": "#4"},
-				"east": {"uv": [15, 0, 16, 2], "texture": "#4"},
-				"south": {"uv": [12, 0, 16, 2], "texture": "#4"},
-				"west": {"uv": [12, 0, 13, 2], "texture": "#4"},
-				"up": {"uv": [12, 0, 16, 1], "texture": "#4"},
-				"down": {"uv": [12, 1, 16, 2], "texture": "#4"}
-			}
-		},
-		{
-			"from": [7.85355, 11.25, 1.75],
-			"to": [9.85355, 13.25, 13.75],
-			"rotation": {"angle": 45, "axis": "z", "origin": [8.35355, 13.25, 7.75]},
-			"faces": {
-				"north": {"uv": [16, 2, 14, 4], "texture": "#4"},
-				"east": {"uv": [15, 2, 16, 4], "texture": "#4"},
-				"south": {"uv": [14, 2, 16, 4], "texture": "#4"},
-				"west": {"uv": [14, 2, 15, 4], "texture": "#4"},
-				"down": {"uv": [14, 3, 16, 4], "texture": "#4"}
-			}
-		},
-		{
-			"from": [2.35355, 10.75, 7.75],
-			"to": [14.35355, 12.75, 9.75],
-			"rotation": {"angle": -45, "axis": "x", "origin": [8.35355, 13.25, 7.75]},
-			"faces": {
-				"north": {"uv": [14, 2, 15, 4], "texture": "#4"},
-				"east": {"uv": [16, 2, 14, 4], "texture": "#4"},
-				"south": {"uv": [15, 2, 16, 4], "texture": "#4"},
-				"west": {"uv": [14, 2, 16, 4], "texture": "#4"},
-				"down": {"uv": [14, 3, 16, 4], "rotation": 270, "texture": "#4"}
-			}
-		},
-		{
-			"from": [2.35355, 12.75, 5.75],
-			"to": [14.35355, 14.75, 9.75],
-			"rotation": {"angle": -45, "axis": "x", "origin": [8.35355, 13.25, 7.75]},
-			"faces": {
-				"north": {"uv": [12, 0, 13, 2], "texture": "#4"},
-				"east": {"uv": [16, 0, 12, 2], "texture": "#4"},
-				"south": {"uv": [15, 0, 16, 2], "texture": "#4"},
-				"west": {"uv": [12, 0, 16, 2], "texture": "#4"},
-				"up": {"uv": [12, 0, 16, 1], "rotation": 90, "texture": "#4"},
-				"down": {"uv": [12, 1, 16, 2], "rotation": 270, "texture": "#4"}
+				"north": {"uv": [0, 0, 16, 16], "texture": "#2"},
+				"east": {"uv": [0, 0, 16, 16], "texture": "#2"},
+				"south": {"uv": [0, 0, 16, 16], "texture": "#2"},
+				"west": {"uv": [0, 0, 16, 16], "texture": "#2"},
+				"up": {"uv": [0, 0, 16, 16], "texture": "#1"},
+				"down": {"uv": [0, 0, 16, 16], "texture": "#0"}
 			}
 		}
-	],
-	"display": {
-		"thirdperson_righthand": {
-			"rotation": [75, 45, 0],
-			"translation": [0, 2.5, 0],
-			"scale": [0.375, 0.375, 0.375]
-		},
-		"thirdperson_lefthand": {
-			"rotation": [75, 45, 0],
-			"translation": [0, 2.5, 0],
-			"scale": [0.375, 0.375, 0.375]
-		},
-		"firstperson_righthand": {
-			"rotation": [0, 45, 0],
-			"scale": [0.4, 0.4, 0.4]
-		},
-		"firstperson_lefthand": {
-			"rotation": [0, 225, 0],
-			"scale": [0.4, 0.4, 0.4]
-		},
-		"ground": {
-			"translation": [0, 3, 0],
-			"scale": [0.25, 0.25, 0.25]
-		},
-		"gui": {
-			"rotation": [30, 135, 0],
-			"scale": [0.625, 0.625, 0.625]
-		},
-		"fixed": {
-			"scale": [0.5, 0.5, 0.5]
-		}
-	},
-	"groups": [
-		{
-			"name": "pump",
-			"origin": [8, 8, 8],
-			"color": 0,
-			"children": [0, 1, 2]
-		},
-		3,
-		4,
-		5,
-		6
 	]
 }

src/main/resources/assets/tfmg/models/block/diesel_engine_expansion.json

@@ -0,0 +1,23 @@
+{
+	"credit": "Made with Blockbench",
+	"parent": "block/block",
+	"textures": {
+		"0": "tfmg:block/diesel_engine_back",
+		"1": "tfmg:block/diesel_engine_expansion",
+		"particle": "tfmg:block/diesel_engine_back"
+	},
+	"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": "#1"},
+				"west": {"uv": [0, 0, 16, 16], "texture": "#1"},
+				"up": {"uv": [0, 0, 16, 16], "texture": "#0"},
+				"down": {"uv": [0, 0, 16, 16], "texture": "#0"}
+			}
+		}
+	]
+}

src/main/resources/assets/tfmg/models/block/diesel_engine_expansion/block.json

@@ -0,0 +1,22 @@
+{
+	"credit": "Made with Blockbench",
+	"textures": {
+		"0": "tfmg:block/diesel_engine_back",
+		"1": "tfmg:block/diesel_engine_expansion",
+		"particle": "tfmg:block/diesel_engine_back"
+	},
+	"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": "#1"},
+				"west": {"uv": [0, 0, 16, 16], "texture": "#1"},
+				"up": {"uv": [0, 0, 16, 16], "texture": "#0"},
+				"down": {"uv": [0, 0, 16, 16], "texture": "#0"}
+			}
+		}
+	]
+}

src/main/resources/assets/tfmg/models/block/diesel_engine_expansion/item.json

@@ -0,0 +1,22 @@
+{
+	"credit": "Made with Blockbench",
+	"textures": {
+		"0": "tfmg:block/diesel_engine_back",
+		"1": "tfmg:block/diesel_engine_expansion",
+		"particle": "tfmg:block/diesel_engine_back"
+	},
+	"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": "#1"},
+				"west": {"uv": [0, 0, 16, 16], "texture": "#1"},
+				"up": {"uv": [0, 0, 16, 16], "texture": "#0"},
+				"down": {"uv": [0, 0, 16, 16], "texture": "#0"}
+			}
+		}
+	]
+}

src/main/resources/assets/tfmg/models/block/gasoline_engine/block.json

@@ -2,8 +2,8 @@
 	"credit": "Made with Blockbench",
 	"parent": "minecraft:block/block",
 	"textures": {
-		"1": "tfmg:block/gasoline_engine",
-		"particle": "minecraft:block/anvil"
+		"2": "tfmg:block/engines/gasoline",
+		"particle": "tfmg:block/engines/gasoline"
 	},
 	"elements": [
 		{
@@ -11,12 +11,12 @@
 			"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": "#2"},
+				"east": {"uv": [3.5, 12.25, 0, 15.25], "texture": "#2"},
+				"south": {"uv": [5.5, 0, 8, 3], "texture": "#2"},
+				"west": {"uv": [0, 12.25, 3.5, 15.25], "texture": "#2"},
+				"up": {"uv": [1, 7, 3.5, 10.5], "rotation": 180, "texture": "#2"},
+				"down": {"uv": [5.5, 3.5, 8, 7], "rotation": 180, "texture": "#2"}
 			}
 		},
 		{
@@ -24,12 +24,11 @@
 			"to": [8.08658, 16.3806, 15],
 			"rotation": {"angle": 22.5, "axis": "z", "origin": [8, 5, 8]},
 			"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": [13.75, 0, 12.75, 2.25], "texture": "#2"},
+				"east": {"uv": [12.75, 0, 13.75, 2.25], "texture": "#2"},
+				"south": {"uv": [12.75, 0, 13.75, 2.25], "texture": "#2"},
+				"west": {"uv": [12.75, 0, 13.75, 2.25], "texture": "#2"},
+				"up": {"uv": [12.75, 2.25, 13.75, 3.25], "texture": "#2"}
 			}
 		},
 		{
@@ -37,12 +36,11 @@
 			"to": [11.91342, 16.3806, 9],
 			"rotation": {"angle": -22.5, "axis": "z", "origin": [8, 5, 8]},
 			"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": [15.5, 1.375, 16, 1.875], "texture": "#1"}
+				"north": {"uv": [12.75, 0, 13.75, 2.25], "texture": "#2"},
+				"east": {"uv": [12.75, 0, 13.75, 2.25], "texture": "#2"},
+				"south": {"uv": [12.75, 0, 13.75, 2.25], "texture": "#2"},
+				"west": {"uv": [12.75, 0, 13.75, 2.25], "texture": "#2"},
+				"up": {"uv": [12.75, 2.25, 13.75, 3.25], "texture": "#2"}
 			}
 		},
 		{
@@ -50,12 +48,11 @@
 			"to": [11.91342, 16.3806, 15],
 			"rotation": {"angle": -22.5, "axis": "z", "origin": [8, 5, 8]},
 			"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": [9.5, 4.75, 10, 5.25], "texture": "#1"}
+				"north": {"uv": [12.75, 0, 13.75, 2.25], "texture": "#2"},
+				"east": {"uv": [12.75, 0, 13.75, 2.25], "texture": "#2"},
+				"south": {"uv": [12.75, 0, 13.75, 2.25], "texture": "#2"},
+				"west": {"uv": [12.75, 0, 13.75, 2.25], "texture": "#2"},
+				"up": {"uv": [12.75, 2.25, 13.75, 3.25], "texture": "#2"}
 			}
 		},
 		{
@@ -63,12 +60,11 @@
 			"to": [8.08658, 16.3806, 9],
 			"rotation": {"angle": 22.5, "axis": "z", "origin": [8, 5, 8]},
 			"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": [12.75, 0, 13.75, 2.25], "texture": "#2"},
+				"east": {"uv": [12.75, 0, 13.75, 2.25], "texture": "#2"},
+				"south": {"uv": [12.75, 0, 13.75, 2.25], "texture": "#2"},
+				"west": {"uv": [12.75, 0, 13.75, 2.25], "texture": "#2"},
+				"up": {"uv": [12.75, 2.25, 13.75, 3.25], "texture": "#2"}
 			}
 		},
 		{
@@ -76,12 +72,11 @@
 			"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"}
+				"north": {"uv": [3.5, 1.25, 4.25, 3], "texture": "#2"},
+				"south": {"uv": [4.75, 1.25, 5.5, 3], "texture": "#2"},
+				"west": {"uv": [0, 13.75, 3.5, 15.5], "texture": "#2"},
+				"up": {"uv": [0, 3.5, 0.75, 7], "texture": "#2"},
+				"down": {"uv": [8.625, 7, 8, 3.5], "texture": "#2"}
 			}
 		},
 		{
@@ -89,12 +84,11 @@
 			"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": "#2"},
+				"east": {"uv": [3.5, 13.75, 0, 15.5], "texture": "#2"},
+				"south": {"uv": [8, 1.25, 8.75, 3], "texture": "#2"},
+				"up": {"uv": [3.75, 3.5, 4.5, 7], "texture": "#2"},
+				"down": {"uv": [5.5, 3.5, 4.75, 7], "texture": "#2"}
 			}
 		},
 		{
@@ -102,12 +96,11 @@
 			"to": [3, 10, 4],
 			"rotation": {"angle": 0, "axis": "y", "origin": [8, 5, 8]},
 			"faces": {
-				"north": {"uv": [14.375, 0, 14.5, 0.375], "texture": "#1"},
-				"east": {"uv": [11.625, 0, 13.625, 3], "texture": "#1"},
-				"south": {"uv": [14.375, 0, 14.5, 0.375], "texture": "#1"},
-				"west": {"uv": [14.5, 0.125, 14.75, 0.5], "texture": "#1"},
-				"up": {"uv": [14.375, 0, 14.5, 0.25], "texture": "#1"},
-				"down": {"uv": [14.25, 0, 15.25, 2], "texture": "#1"}
+				"north": {"uv": [14, 1, 14.25, 1.75], "texture": "#2"},
+				"south": {"uv": [14, 1, 14.25, 1.75], "texture": "#2"},
+				"west": {"uv": [14, 1, 14.5, 1.75], "texture": "#2"},
+				"up": {"uv": [14, 1.25, 14.5, 1.5], "texture": "#2"},
+				"down": {"uv": [14.25, 0, 15.25, 2], "texture": "#2"}
 			}
 		},
 		{
@@ -115,25 +108,11 @@
 			"to": [14, 10, 4],
 			"rotation": {"angle": 0, "axis": "y", "origin": [8, 5, 8]},
 			"faces": {
-				"north": {"uv": [14.375, 0, 14.5, 0.375], "texture": "#1"},
-				"east": {"uv": [14.375, 0, 14.625, 0.375], "texture": "#1"},
-				"south": {"uv": [14.375, 0, 14.5, 0.375], "texture": "#1"},
-				"west": {"uv": [10.875, 0, 12.875, 3], "texture": "#1"},
-				"up": {"uv": [14.375, 0, 14.5, 0.25], "texture": "#1"},
-				"down": {"uv": [15, 0.125, 16, 2.125], "texture": "#1"}
-			}
-		},
-		{
-			"from": [6, 12, 2],
-			"to": [10, 13, 16],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, 5, 8]},
-			"faces": {
-				"north": {"uv": [12.25, 0.5, 12.75, 0.625], "texture": "#1"},
-				"east": {"uv": [12.25, 7.25, 14, 7.125], "texture": "#1"},
-				"south": {"uv": [12.25, 0.5, 12.75, 0.625], "texture": "#1"},
-				"west": {"uv": [12.25, 7.125, 14, 7.25], "texture": "#1"},
-				"up": {"uv": [15.125, 2.125, 14.625, 3.75], "texture": "#1"},
-				"down": {"uv": [0, 0, 4, 15], "texture": "#1"}
+				"north": {"uv": [14, 1, 14.25, 1.75], "texture": "#2"},
+				"east": {"uv": [14, 1, 14.5, 1.75], "texture": "#2"},
+				"south": {"uv": [14, 1, 14.25, 1.75], "texture": "#2"},
+				"up": {"uv": [14, 1.25, 14.5, 1.5], "texture": "#2"},
+				"down": {"uv": [14.25, 0.125, 15.25, 2.125], "texture": "#2"}
 			}
 		}
 	]

src/main/resources/assets/tfmg/models/block/gasoline_engine/item.json

@@ -2,10 +2,8 @@
 	"credit": "Made with Blockbench",
 	"parent": "minecraft:block/block",
 	"textures": {
-		"1": "tfmg:block/gasoline_engine",
-		"4": "create:block/axis",
-		"5": "create:block/axis_top",
-		"particle": "block/anvil"
+		"2": "tfmg:block/engines/gasoline",
+		"particle": "tfmg:block/engines/gasoline"
 	},
 	"elements": [
 		{
@@ -13,12 +11,12 @@
 			"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": "#2"},
+				"east": {"uv": [3.5, 12.25, 0, 15.25], "texture": "#2"},
+				"south": {"uv": [5.5, 0, 8, 3], "texture": "#2"},
+				"west": {"uv": [0, 12.25, 3.5, 15.25], "texture": "#2"},
+				"up": {"uv": [1, 7, 3.5, 10.5], "rotation": 180, "texture": "#2"},
+				"down": {"uv": [5.5, 3.5, 8, 7], "rotation": 180, "texture": "#2"}
 			}
 		},
 		{
@@ -26,12 +24,11 @@
 			"to": [8.08658, 16.3806, 15],
 			"rotation": {"angle": 22.5, "axis": "z", "origin": [8, 5, 8]},
 			"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": [13.75, 0, 12.75, 2.25], "texture": "#2"},
+				"east": {"uv": [12.75, 0, 13.75, 2.25], "texture": "#2"},
+				"south": {"uv": [12.75, 0, 13.75, 2.25], "texture": "#2"},
+				"west": {"uv": [12.75, 0, 13.75, 2.25], "texture": "#2"},
+				"up": {"uv": [12.75, 2.25, 13.75, 3.25], "texture": "#2"}
 			}
 		},
 		{
@@ -39,12 +36,11 @@
 			"to": [11.91342, 16.3806, 9],
 			"rotation": {"angle": -22.5, "axis": "z", "origin": [8, 5, 8]},
 			"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": [15.5, 1.375, 16, 1.875], "texture": "#1"}
+				"north": {"uv": [12.75, 0, 13.75, 2.25], "texture": "#2"},
+				"east": {"uv": [12.75, 0, 13.75, 2.25], "texture": "#2"},
+				"south": {"uv": [12.75, 0, 13.75, 2.25], "texture": "#2"},
+				"west": {"uv": [12.75, 0, 13.75, 2.25], "texture": "#2"},
+				"up": {"uv": [12.75, 2.25, 13.75, 3.25], "texture": "#2"}
 			}
 		},
 		{
@@ -52,12 +48,11 @@
 			"to": [11.91342, 16.3806, 15],
 			"rotation": {"angle": -22.5, "axis": "z", "origin": [8, 5, 8]},
 			"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": [9.5, 4.75, 10, 5.25], "texture": "#1"}
+				"north": {"uv": [12.75, 0, 13.75, 2.25], "texture": "#2"},
+				"east": {"uv": [12.75, 0, 13.75, 2.25], "texture": "#2"},
+				"south": {"uv": [12.75, 0, 13.75, 2.25], "texture": "#2"},
+				"west": {"uv": [12.75, 0, 13.75, 2.25], "texture": "#2"},
+				"up": {"uv": [12.75, 2.25, 13.75, 3.25], "texture": "#2"}
 			}
 		},
 		{
@@ -65,12 +60,11 @@
 			"to": [8.08658, 16.3806, 9],
 			"rotation": {"angle": 22.5, "axis": "z", "origin": [8, 5, 8]},
 			"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": [12.75, 0, 13.75, 2.25], "texture": "#2"},
+				"east": {"uv": [12.75, 0, 13.75, 2.25], "texture": "#2"},
+				"south": {"uv": [12.75, 0, 13.75, 2.25], "texture": "#2"},
+				"west": {"uv": [12.75, 0, 13.75, 2.25], "texture": "#2"},
+				"up": {"uv": [12.75, 2.25, 13.75, 3.25], "texture": "#2"}
 			}
 		},
 		{
@@ -78,12 +72,11 @@
 			"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"}
+				"north": {"uv": [3.5, 1.25, 4.25, 3], "texture": "#2"},
+				"south": {"uv": [4.75, 1.25, 5.5, 3], "texture": "#2"},
+				"west": {"uv": [0, 13.75, 3.5, 15.5], "texture": "#2"},
+				"up": {"uv": [0, 3.5, 0.75, 7], "texture": "#2"},
+				"down": {"uv": [8.625, 7, 8, 3.5], "texture": "#2"}
 			}
 		},
 		{
@@ -91,12 +84,11 @@
 			"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": "#2"},
+				"east": {"uv": [3.5, 13.75, 0, 15.5], "texture": "#2"},
+				"south": {"uv": [8, 1.25, 8.75, 3], "texture": "#2"},
+				"up": {"uv": [3.75, 3.5, 4.5, 7], "texture": "#2"},
+				"down": {"uv": [5.5, 3.5, 4.75, 7], "texture": "#2"}
 			}
 		},
 		{
@@ -104,12 +96,11 @@
 			"to": [3, 10, 4],
 			"rotation": {"angle": 0, "axis": "y", "origin": [8, 5, 8]},
 			"faces": {
-				"north": {"uv": [14.375, 0, 14.5, 0.375], "texture": "#1"},
-				"east": {"uv": [11.625, 0, 13.625, 3], "texture": "#1"},
-				"south": {"uv": [14.375, 0, 14.5, 0.375], "texture": "#1"},
-				"west": {"uv": [14.5, 0.125, 14.75, 0.5], "texture": "#1"},
-				"up": {"uv": [14.375, 0, 14.5, 0.25], "texture": "#1"},
-				"down": {"uv": [14.25, 0, 15.25, 2], "texture": "#1"}
+				"north": {"uv": [14, 1, 14.25, 1.75], "texture": "#2"},
+				"south": {"uv": [14, 1, 14.25, 1.75], "texture": "#2"},
+				"west": {"uv": [14, 1, 14.5, 1.75], "texture": "#2"},
+				"up": {"uv": [14, 1.25, 14.5, 1.5], "texture": "#2"},
+				"down": {"uv": [14.25, 0, 15.25, 2], "texture": "#2"}
 			}
 		},
 		{
@@ -117,39 +108,11 @@
 			"to": [14, 10, 4],
 			"rotation": {"angle": 0, "axis": "y", "origin": [8, 5, 8]},
 			"faces": {
-				"north": {"uv": [14.375, 0, 14.5, 0.375], "texture": "#1"},
-				"east": {"uv": [14.375, 0, 14.625, 0.375], "texture": "#1"},
-				"south": {"uv": [14.375, 0, 14.5, 0.375], "texture": "#1"},
-				"west": {"uv": [10.875, 0, 12.875, 3], "texture": "#1"},
-				"up": {"uv": [14.375, 0, 14.5, 0.25], "texture": "#1"},
-				"down": {"uv": [15, 0.125, 16, 2.125], "texture": "#1"}
-			}
-		},
-		{
-			"from": [6, 12, 2],
-			"to": [10, 13, 16],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, 5, 8]},
-			"faces": {
-				"north": {"uv": [12.25, 0.5, 12.75, 0.625], "texture": "#1"},
-				"east": {"uv": [12.25, 7.25, 14, 7.125], "texture": "#1"},
-				"south": {"uv": [12.25, 0.5, 12.75, 0.625], "texture": "#1"},
-				"west": {"uv": [12.25, 7.125, 14, 7.25], "texture": "#1"},
-				"up": {"uv": [15.125, 2.125, 14.625, 3.75], "texture": "#1"},
-				"down": {"uv": [0, 0, 4, 15], "texture": "#1"}
-			}
-		},
-		{
-			"name": "Axis",
-			"from": [6, 6, 0],
-			"to": [10, 10, 10],
-			"rotation": {"angle": -22.5, "axis": "z", "origin": [8, 8, 8]},
-			"faces": {
-				"north": {"uv": [6, 6, 10, 10], "texture": "#5"},
-				"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": [14, 1, 14.25, 1.75], "texture": "#2"},
+				"east": {"uv": [14, 1, 14.5, 1.75], "texture": "#2"},
+				"south": {"uv": [14, 1, 14.25, 1.75], "texture": "#2"},
+				"up": {"uv": [14, 1.25, 14.5, 1.5], "texture": "#2"},
+				"down": {"uv": [14.25, 0.125, 15.25, 2.125], "texture": "#2"}
 			}
 		}
 	]

src/main/resources/assets/tfmg/models/block/gasoline_engine_back/block.json

@@ -2,8 +2,8 @@
 	"credit": "Made with Blockbench",
 	"parent": "minecraft:block/block",
 	"textures": {
-		"0": "tfmg:block/gasoline_engine",
-		"particle": "minecraft:block/anvil"
+		"1": "tfmg:block/engines/gasoline",
+		"particle": "tfmg:block/engines/gasoline"
 	},
 	"elements": [
 		{
@@ -11,25 +11,11 @@
 			"to": [13, 12, 14],
 			"rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 0]},
 			"faces": {
-				"north": {"uv": [7.375, 0.375, 8.625, 1.875], "texture": "#0"},
-				"east": {"uv": [6.125, 2.125, 7.875, 3.625], "texture": "#0"},
-				"south": {"uv": [5.4875, 5.375, 6.75, 7.2625], "texture": "#0"},
-				"west": {"uv": [7.875, 2.125, 9.625, 3.625], "texture": "#0"},
-				"up": {"uv": [9.875, 2.125, 11.125, 3.875], "rotation": 180, "texture": "#0"},
-				"down": {"uv": [5.5, 5.625, 6.75, 7.375], "rotation": 180, "texture": "#0"}
-			}
-		},
-		{
-			"from": [6, 12, 0],
-			"to": [10, 13, 14],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 0]},
-			"faces": {
-				"north": {"uv": [12.25, 0.5, 12.75, 0.625], "texture": "#0"},
-				"east": {"uv": [13.375, 6.875, 15.125, 7], "texture": "#0"},
-				"south": {"uv": [0, 0, 4, 1], "texture": "#0"},
-				"west": {"uv": [12.375, 7.275, 14.125, 7.15], "texture": "#0"},
-				"up": {"uv": [14.5, 2.25, 14, 4], "texture": "#0"},
-				"down": {"uv": [1, 0, 5, 14], "rotation": 180, "texture": "#0"}
+				"north": {"uv": [5.5, 0, 8, 3], "texture": "#1"},
+				"east": {"uv": [7, 12.25, 3.5, 15.25], "texture": "#1"},
+				"west": {"uv": [3.5, 12.25, 7, 15.25], "texture": "#1"},
+				"up": {"uv": [1, 10.5, 3.5, 7], "rotation": 180, "texture": "#1"},
+				"down": {"uv": [5.5, 7, 8, 10.5], "rotation": 180, "texture": "#1"}
 			}
 		},
 		{
@@ -37,12 +23,12 @@
 			"to": [16, 13, 16],
 			"rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 0]},
 			"faces": {
-				"north": {"uv": [11.5, 2.125, 13.5, 3.75], "texture": "#0"},
-				"east": {"uv": [16, 6, 15.75, 7.625], "texture": "#0"},
-				"south": {"uv": [9.125, 0.25, 11.125, 1.875], "texture": "#0"},
-				"west": {"uv": [15.75, 3.75, 16, 5.375], "texture": "#0"},
-				"up": {"uv": [11.5, 2.625, 13.5, 2.875], "texture": "#0"},
-				"down": {"uv": [5.125, 7.25, 7.125, 7.5], "rotation": 180, "texture": "#0"}
+				"north": {"uv": [11.25, 7, 15.25, 10.25], "texture": "#1"},
+				"east": {"uv": [10.5, 3.75, 11, 7], "texture": "#1"},
+				"south": {"uv": [11.25, 3.75, 15.25, 6.75], "texture": "#1"},
+				"west": {"uv": [15.5, 3.75, 16, 7], "texture": "#1"},
+				"up": {"uv": [11.25, 9.5, 15.25, 9], "texture": "#1"},
+				"down": {"uv": [4.75, 10.5, 8.75, 11], "rotation": 180, "texture": "#1"}
 			}
 		},
 		{
@@ -50,12 +36,12 @@
 			"to": [10, 16, 11],
 			"rotation": {"angle": -22.5, "axis": "z", "origin": [8, 0, 0]},
 			"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], "texture": "#0"},
-				"down": {"uv": [15.5, 1.375, 16, 1.875], "texture": "#0"}
+				"north": {"uv": [12.75, 0, 13.75, 2.25], "texture": "#1"},
+				"east": {"uv": [12.75, 0, 13.75, 2.25], "texture": "#1"},
+				"south": {"uv": [12.75, 0, 13.75, 2.25], "texture": "#1"},
+				"west": {"uv": [12.75, 0, 13.75, 2.25], "texture": "#1"},
+				"up": {"uv": [12.75, 2.25, 13.75, 3.25], "texture": "#1"},
+				"down": {"uv": [0, 0, 0, 0], "texture": "#1"}
 			}
 		},
 		{
@@ -63,12 +49,12 @@
 			"to": [10, 16, 11],
 			"rotation": {"angle": 22.5, "axis": "z", "origin": [8, 0, 0]},
 			"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], "texture": "#0"},
-				"down": {"uv": [15.5, 1.375, 16, 1.875], "texture": "#0"}
+				"north": {"uv": [12.75, 0, 13.75, 2.25], "texture": "#1"},
+				"east": {"uv": [12.75, 0, 13.75, 2.25], "texture": "#1"},
+				"south": {"uv": [12.75, 0, 13.75, 2.25], "texture": "#1"},
+				"west": {"uv": [12.75, 0, 13.75, 2.25], "texture": "#1"},
+				"up": {"uv": [12.75, 2.25, 13.75, 3.25], "texture": "#1"},
+				"down": {"uv": [0, 0, 0, 0], "texture": "#1"}
 			}
 		},
 		{
@@ -76,12 +62,12 @@
 			"to": [10, 16, 5],
 			"rotation": {"angle": 22.5, "axis": "z", "origin": [8, 0, 0]},
 			"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], "texture": "#0"},
-				"down": {"uv": [12, 0, 16, 4], "texture": "#0"}
+				"north": {"uv": [12.75, 0, 13.75, 2.25], "texture": "#1"},
+				"east": {"uv": [12.75, 0, 13.75, 2.25], "texture": "#1"},
+				"south": {"uv": [12.75, 0, 13.75, 2.25], "texture": "#1"},
+				"west": {"uv": [12.75, 0, 13.75, 2.25], "texture": "#1"},
+				"up": {"uv": [12.75, 2.25, 13.75, 3.25], "texture": "#1"},
+				"down": {"uv": [0, 0, 0, 0], "texture": "#1"}
 			}
 		},
 		{
@@ -89,12 +75,12 @@
 			"to": [10, 16, 5],
 			"rotation": {"angle": -22.5, "axis": "z", "origin": [8, 0, 0]},
 			"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], "texture": "#0"},
-				"down": {"uv": [15.5, 1.375, 16, 1.875], "texture": "#0"}
+				"north": {"uv": [12.75, 0, 13.75, 2.25], "texture": "#1"},
+				"east": {"uv": [12.75, 0, 13.75, 2.25], "texture": "#1"},
+				"south": {"uv": [12.75, 0, 13.75, 2.25], "texture": "#1"},
+				"west": {"uv": [12.75, 0, 13.75, 2.25], "texture": "#1"},
+				"up": {"uv": [12.75, 2.25, 13.75, 3.25], "texture": "#1"},
+				"down": {"uv": [0, 0, 0, 0], "texture": "#1"}
 			}
 		},
 		{
@@ -102,12 +88,11 @@
 			"to": [3, 7, 14],
 			"rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 0]},
 			"faces": {
-				"north": {"uv": [8.625, 1, 9, 1.875], "texture": "#0"},
-				"east": {"uv": [0, 0, 16, 7], "texture": "#0"},
-				"south": {"uv": [0, 0, 3, 7], "texture": "#0"},
-				"west": {"uv": [13.75, 4.5, 15.5, 5.375], "texture": "#0"},
-				"up": {"uv": [8.625, 3.75, 9, 5.5], "texture": "#0"},
-				"down": {"uv": [6.75, 5.625, 7.125, 7.375], "rotation": 180, "texture": "#0"}
+				"north": {"uv": [8, 1.25, 8.75, 3], "texture": "#1"},
+				"east": {"uv": [0, 0, 0, 0], "texture": "#1"},
+				"west": {"uv": [3.5, 13.75, 7, 15.5], "texture": "#1"},
+				"up": {"uv": [0, 7, 0.75, 10.5], "texture": "#1"},
+				"down": {"uv": [8, 7, 8.75, 10.5], "rotation": 180, "texture": "#1"}
 			}
 		},
 		{
@@ -115,12 +100,11 @@
 			"to": [16, 7, 14],
 			"rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 0]},
 			"faces": {
-				"north": {"uv": [7, 1, 7.375, 1.875], "texture": "#0"},
-				"east": {"uv": [13.625, 7.625, 15.375, 6.75], "rotation": 180, "texture": "#0"},
-				"south": {"uv": [0, 0, 3, 7], "texture": "#0"},
-				"west": {"uv": [0, 0, 16, 7], "texture": "#0"},
-				"up": {"uv": [9, 3.75, 8.625, 5.5], "rotation": 180, "texture": "#0"},
-				"down": {"uv": [5.5, 7.375, 5.125, 5.625], "texture": "#0"}
+				"north": {"uv": [4.75, 1.25, 5.5, 3], "texture": "#1"},
+				"east": {"uv": [3.5, 15.5, 7, 13.75], "rotation": 180, "texture": "#1"},
+				"west": {"uv": [0, 0, 0, 0], "texture": "#1"},
+				"up": {"uv": [4.5, 10.5, 3.75, 7], "rotation": 180, "texture": "#1"},
+				"down": {"uv": [5.5, 7, 4.75, 10.5], "texture": "#1"}
 			}
 		}
 	]

src/main/resources/assets/tfmg/models/block/gasoline_engine_back/item.json

@@ -2,8 +2,8 @@
 	"credit": "Made with Blockbench",
 	"parent": "minecraft:block/block",
 	"textures": {
-		"0": "tfmg:block/gasoline_engine",
-		"particle": "minecraft:block/anvil"
+		"1": "tfmg:block/engines/gasoline",
+		"particle": "tfmg:block/engines/gasoline"
 	},
 	"elements": [
 		{
@@ -11,25 +11,11 @@
 			"to": [13, 12, 14],
 			"rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 0]},
 			"faces": {
-				"north": {"uv": [7.375, 0.375, 8.625, 1.875], "texture": "#0"},
-				"east": {"uv": [6.125, 2.125, 7.875, 3.625], "texture": "#0"},
-				"south": {"uv": [5.4875, 5.375, 6.75, 7.2625], "texture": "#0"},
-				"west": {"uv": [7.875, 2.125, 9.625, 3.625], "texture": "#0"},
-				"up": {"uv": [9.875, 2.125, 11.125, 3.875], "rotation": 180, "texture": "#0"},
-				"down": {"uv": [5.5, 5.625, 6.75, 7.375], "rotation": 180, "texture": "#0"}
-			}
-		},
-		{
-			"from": [6, 12, 0],
-			"to": [10, 13, 14],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 0]},
-			"faces": {
-				"north": {"uv": [12.25, 0.5, 12.75, 0.625], "texture": "#0"},
-				"east": {"uv": [13.375, 6.875, 15.125, 7], "texture": "#0"},
-				"south": {"uv": [0, 0, 4, 1], "texture": "#0"},
-				"west": {"uv": [12.375, 7.275, 14.125, 7.15], "texture": "#0"},
-				"up": {"uv": [14.5, 2.25, 14, 4], "texture": "#0"},
-				"down": {"uv": [1, 0, 5, 14], "rotation": 180, "texture": "#0"}
+				"north": {"uv": [5.5, 0, 8, 3], "texture": "#1"},
+				"east": {"uv": [7, 12.25, 3.5, 15.25], "texture": "#1"},
+				"west": {"uv": [3.5, 12.25, 7, 15.25], "texture": "#1"},
+				"up": {"uv": [1, 10.5, 3.5, 7], "rotation": 180, "texture": "#1"},
+				"down": {"uv": [5.5, 7, 8, 10.5], "rotation": 180, "texture": "#1"}
 			}
 		},
 		{
@@ -37,12 +23,12 @@
 			"to": [16, 13, 16],
 			"rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 0]},
 			"faces": {
-				"north": {"uv": [11.5, 2.125, 13.5, 3.75], "texture": "#0"},
-				"east": {"uv": [16, 6, 15.75, 7.625], "texture": "#0"},
-				"south": {"uv": [9.125, 0.25, 11.125, 1.875], "texture": "#0"},
-				"west": {"uv": [15.75, 3.75, 16, 5.375], "texture": "#0"},
-				"up": {"uv": [11.5, 2.625, 13.5, 2.875], "texture": "#0"},
-				"down": {"uv": [5.125, 7.25, 7.125, 7.5], "rotation": 180, "texture": "#0"}
+				"north": {"uv": [11.25, 7, 15.25, 10.25], "texture": "#1"},
+				"east": {"uv": [10.5, 3.75, 11, 7], "texture": "#1"},
+				"south": {"uv": [11.25, 3.75, 15.25, 6.75], "texture": "#1"},
+				"west": {"uv": [15.5, 3.75, 16, 7], "texture": "#1"},
+				"up": {"uv": [11.25, 9.5, 15.25, 9], "texture": "#1"},
+				"down": {"uv": [4.75, 10.5, 8.75, 11], "rotation": 180, "texture": "#1"}
 			}
 		},
 		{
@@ -50,12 +36,12 @@
 			"to": [10, 16, 11],
 			"rotation": {"angle": -22.5, "axis": "z", "origin": [8, 0, 0]},
 			"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], "texture": "#0"},
-				"down": {"uv": [15.5, 1.375, 16, 1.875], "texture": "#0"}
+				"north": {"uv": [12.75, 0, 13.75, 2.25], "texture": "#1"},
+				"east": {"uv": [12.75, 0, 13.75, 2.25], "texture": "#1"},
+				"south": {"uv": [12.75, 0, 13.75, 2.25], "texture": "#1"},
+				"west": {"uv": [12.75, 0, 13.75, 2.25], "texture": "#1"},
+				"up": {"uv": [12.75, 2.25, 13.75, 3.25], "texture": "#1"},
+				"down": {"uv": [0, 0, 0, 0], "texture": "#1"}
 			}
 		},
 		{
@@ -63,12 +49,12 @@
 			"to": [10, 16, 11],
 			"rotation": {"angle": 22.5, "axis": "z", "origin": [8, 0, 0]},
 			"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], "texture": "#0"},
-				"down": {"uv": [15.5, 1.375, 16, 1.875], "texture": "#0"}
+				"north": {"uv": [12.75, 0, 13.75, 2.25], "texture": "#1"},
+				"east": {"uv": [12.75, 0, 13.75, 2.25], "texture": "#1"},
+				"south": {"uv": [12.75, 0, 13.75, 2.25], "texture": "#1"},
+				"west": {"uv": [12.75, 0, 13.75, 2.25], "texture": "#1"},
+				"up": {"uv": [12.75, 2.25, 13.75, 3.25], "texture": "#1"},
+				"down": {"uv": [0, 0, 0, 0], "texture": "#1"}
 			}
 		},
 		{
@@ -76,12 +62,12 @@
 			"to": [10, 16, 5],
 			"rotation": {"angle": 22.5, "axis": "z", "origin": [8, 0, 0]},
 			"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], "texture": "#0"},
-				"down": {"uv": [12, 0, 16, 4], "texture": "#0"}
+				"north": {"uv": [12.75, 0, 13.75, 2.25], "texture": "#1"},
+				"east": {"uv": [12.75, 0, 13.75, 2.25], "texture": "#1"},
+				"south": {"uv": [12.75, 0, 13.75, 2.25], "texture": "#1"},
+				"west": {"uv": [12.75, 0, 13.75, 2.25], "texture": "#1"},
+				"up": {"uv": [12.75, 2.25, 13.75, 3.25], "texture": "#1"},
+				"down": {"uv": [0, 0, 0, 0], "texture": "#1"}
 			}
 		},
 		{
@@ -89,12 +75,12 @@
 			"to": [10, 16, 5],
 			"rotation": {"angle": -22.5, "axis": "z", "origin": [8, 0, 0]},
 			"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], "texture": "#0"},
-				"down": {"uv": [15.5, 1.375, 16, 1.875], "texture": "#0"}
+				"north": {"uv": [12.75, 0, 13.75, 2.25], "texture": "#1"},
+				"east": {"uv": [12.75, 0, 13.75, 2.25], "texture": "#1"},
+				"south": {"uv": [12.75, 0, 13.75, 2.25], "texture": "#1"},
+				"west": {"uv": [12.75, 0, 13.75, 2.25], "texture": "#1"},
+				"up": {"uv": [12.75, 2.25, 13.75, 3.25], "texture": "#1"},
+				"down": {"uv": [0, 0, 0, 0], "texture": "#1"}
 			}
 		},
 		{
@@ -102,12 +88,11 @@
 			"to": [3, 7, 14],
 			"rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 0]},
 			"faces": {
-				"north": {"uv": [8.625, 1, 9, 1.875], "texture": "#0"},
-				"east": {"uv": [0, 0, 16, 7], "texture": "#0"},
-				"south": {"uv": [0, 0, 3, 7], "texture": "#0"},
-				"west": {"uv": [13.75, 4.5, 15.5, 5.375], "texture": "#0"},
-				"up": {"uv": [8.625, 3.75, 9, 5.5], "texture": "#0"},
-				"down": {"uv": [6.75, 5.625, 7.125, 7.375], "rotation": 180, "texture": "#0"}
+				"north": {"uv": [8, 1.25, 8.75, 3], "texture": "#1"},
+				"east": {"uv": [0, 0, 0, 0], "texture": "#1"},
+				"west": {"uv": [3.5, 13.75, 7, 15.5], "texture": "#1"},
+				"up": {"uv": [0, 7, 0.75, 10.5], "texture": "#1"},
+				"down": {"uv": [8, 7, 8.75, 10.5], "rotation": 180, "texture": "#1"}
 			}
 		},
 		{
@@ -115,12 +100,11 @@
 			"to": [16, 7, 14],
 			"rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 0]},
 			"faces": {
-				"north": {"uv": [7, 1, 7.375, 1.875], "texture": "#0"},
-				"east": {"uv": [13.625, 7.625, 15.375, 6.75], "rotation": 180, "texture": "#0"},
-				"south": {"uv": [0, 0, 3, 7], "texture": "#0"},
-				"west": {"uv": [0, 0, 16, 7], "texture": "#0"},
-				"up": {"uv": [9, 3.75, 8.625, 5.5], "rotation": 180, "texture": "#0"},
-				"down": {"uv": [5.5, 7.375, 5.125, 5.625], "texture": "#0"}
+				"north": {"uv": [4.75, 1.25, 5.5, 3], "texture": "#1"},
+				"east": {"uv": [3.5, 15.5, 7, 13.75], "rotation": 180, "texture": "#1"},
+				"west": {"uv": [0, 0, 0, 0], "texture": "#1"},
+				"up": {"uv": [4.5, 10.5, 3.75, 7], "rotation": 180, "texture": "#1"},
+				"down": {"uv": [5.5, 7, 4.75, 10.5], "texture": "#1"}
 			}
 		}
 	]

src/main/resources/assets/tfmg/models/block/steel_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": "tfmg:block/steel_pipes",
+		"4": "tfmg:block/steel_pump",
+		"particle": "tfmg:block/steel_pump"
 	},
 	"elements": [
 		{

src/main/resources/assets/tfmg/models/block/steel_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": "tfmg:block/steel_pipes",
+		"4": "tfmg:block/steel_pump",
 		"5": "create:block/millstone",
-		"particle": "create:block/pump"
+		"particle": "tfmg:block/steel_pump"
 	},
 	"elements": [
 		{

src/main/resources/assets/tfmg/models/item/unfinished_engine.json

@@ -0,0 +1,49 @@
+{
+	"credit": "Made with Blockbench",
+	"parent": "minecraft:block/block",
+	"textures": {
+		"1": "createindustry:block/gasoline_engine",
+		"particle": "minecraft:block/anvil"
+	},
+	"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"}
+			}
+		},
+		{
+			"from": [13, 0, 2],
+			"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"}
+			}
+		}
+	]
+}